From cd5ecd72c3170ee8898601e2bc845ecf96129bcd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:08:40 -0600
Subject: [PATCH 0001/1648] Test of multi-threaded reading

---
 plugins/net_plugin/net_plugin.cpp | 162 ++++++++++++++++++++++--------
 1 file changed, 118 insertions(+), 44 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e4adc0dd6ac..78935754bf5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,6 +75,12 @@ namespace eosio {
       }
    };
 
+   struct block_greater {
+      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
+         return lhs->block_num() > rhs->block_num();
+      }
+   };
+
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -157,7 +163,7 @@ namespace eosio {
 
       channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
 
-      uint16_t                                  thread_pool_size = 1; // currently used by server_ioc
+      uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
       optional<io_work_t>                       server_ioc_work;
@@ -500,12 +506,12 @@ namespace eosio {
       socket_ptr              socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      fc::optional<std::size_t>        outstanding_read_bytes;
+      std::atomic<std::size_t>         outstanding_read_bytes{0};
 
 
       queued_buffer           buffer_queue;
 
-      uint32_t                reads_in_flight = 0;
+      std::atomic<uint32_t>   reads_in_flight{0};
       uint32_t                trx_in_progress_size = 0;
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
@@ -638,9 +644,9 @@ namespace eosio {
    };
 
    struct msg_handler : public fc::visitor<void> {
-      net_plugin_impl &impl;
+      net_plugin_impl& impl;
       connection_ptr c;
-      msg_handler( net_plugin_impl &imp, const connection_ptr& conn) : impl(imp), c(conn) {}
+      msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
 
       void operator()( const signed_block& msg ) const {
          EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should be called" );
@@ -656,16 +662,30 @@ namespace eosio {
       }
 
       void operator()( signed_block&& msg ) const {
-         impl.handle_message( c, std::make_shared<signed_block>( std::move( msg ) ) );
+         shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
+         connection_wptr weak = c;
+         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c ) impl->handle_message( c, ptr );
+         });
       }
       void operator()( packed_transaction&& msg ) const {
-         impl.handle_message( c, std::make_shared<packed_transaction>( std::move( msg ) ) );
+         shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
+         connection_wptr weak = c;
+         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c) impl->handle_message( c, ptr );
+         });
       }
 
       template <typename T>
       void operator()( T&& msg ) const
       {
-         impl.handle_message( c, std::forward<T>(msg) );
+         connection_wptr weak = c;
+         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
       }
    };
 
@@ -703,6 +723,8 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
+
+      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -774,7 +796,9 @@ namespace eosio {
       initialize();
    }
 
-   connection::~connection() {}
+   connection::~connection() {
+      pending_message_buffer.reset();
+   }
 
    void connection::initialize() {
       auto *rnd = node_id.data();
@@ -822,7 +846,6 @@ namespace eosio {
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
       if( read_delay_timer ) read_delay_timer->cancel();
-      pending_message_buffer.reset();
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -1101,6 +1124,7 @@ namespace eosio {
    static std::shared_ptr<std::vector<char>> create_send_buffer( const signed_block_ptr& sb ) {
       // this implementation is to avoid copy of signed_block to net_message
       // matches which of net_message for signed_block
+      fc_dlog( logger, "sending block ${bn}", ("bn", sb->block_num()) );
       return create_send_buffer( signed_block_which, *sb );
    }
 
@@ -1903,7 +1927,9 @@ namespace eosio {
          return false;
       }
       else {
-         start_read_message( con );
+         boost::asio::post(*server_ioc, [this, con]() {
+            start_read_message( con );
+         });
          ++started_sessions;
          return true;
          // for now, we can just use the application main loop.
@@ -1988,7 +2014,7 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
-         std::size_t minimum_read = conn->outstanding_read_bytes ? *conn->outstanding_read_bytes : message_header_size;
+         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2004,7 +2030,7 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-
+/*
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
@@ -2013,7 +2039,7 @@ namespace eosio {
             if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
                peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
             } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight) );
+               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
             } else {
                peer_wlog( conn, "max trx in progress ${s} bytes", ("s", conn->trx_in_progress_size) );
             }
@@ -2035,19 +2061,19 @@ namespace eosio {
             } ) );
             return;
          }
-
+*/
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             [this,weak_conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
-            app().post( priority::medium, [this,weak_conn, ec, bytes_transferred]() {
                auto conn = weak_conn.lock();
                if (!conn) {
                   return;
                }
 
                --conn->reads_in_flight;
-               conn->outstanding_read_bytes.reset();
+               conn->outstanding_read_bytes = 0;
+               bool close_connection = false;
 
                try {
                   if( !ec ) {
@@ -2061,18 +2087,16 @@ namespace eosio {
                         uint32_t bytes_in_buffer = conn->pending_message_buffer.bytes_to_read();
 
                         if (bytes_in_buffer < message_header_size) {
-                           conn->outstanding_read_bytes.emplace(message_header_size - bytes_in_buffer);
+                           conn->outstanding_read_bytes = message_header_size - bytes_in_buffer;
                            break;
                         } else {
                            uint32_t message_length;
                            auto index = conn->pending_message_buffer.read_index();
                            conn->pending_message_buffer.peek(&message_length, sizeof(message_length), index);
                            if(message_length > def_send_buffer_size*2 || message_length == 0) {
-                              boost::system::error_code ec;
-                              fc_elog( logger,"incoming message length unexpected (${i}), from ${p}",
-                                       ("i", message_length)("p",boost::lexical_cast<std::string>(conn->socket->remote_endpoint(ec))) );
-                              close(conn);
-                              return;
+                              fc_elog( logger,"incoming message length unexpected (${i})", ("i", message_length) );
+                              close_connection = true;
+                              break;
                            }
 
                            auto total_message_bytes = message_length + message_header_size;
@@ -2089,37 +2113,43 @@ namespace eosio {
                                  conn->pending_message_buffer.add_space( outstanding_message_bytes - available_buffer_bytes );
                               }
 
-                              conn->outstanding_read_bytes.emplace(outstanding_message_bytes);
+                              conn->outstanding_read_bytes = outstanding_message_bytes;
                               break;
                            }
                         }
                      }
-                     start_read_message(conn);
+                     if( !close_connection ) start_read_message( conn );
                   } else {
-                     auto pname = conn->peer_name();
                      if (ec.value() != boost::asio::error::eof) {
-                        fc_elog( logger, "Error reading message from ${p}: ${m}",("p",pname)( "m", ec.message() ) );
+                        fc_elog( logger, "Error reading message: ${m}", ( "m", ec.message() ) );
                      } else {
-                        fc_ilog( logger, "Peer ${p} closed connection",("p",pname) );
+                        fc_ilog( logger, "Peer closed connection" );
                      }
-                     close( conn );
+                     close_connection = true;
                   }
                }
                catch(const std::exception &ex) {
-                  fc_elog( logger, "Exception in handling read data from ${p}: ${s}",
-                           ("p",conn->peer_name())("s",ex.what()) );
-                  close( conn );
+                  fc_elog( logger, "Exception in handling read data: ${s}", ("s",ex.what()) );
+                  close_connection = true;
                }
                catch(const fc::exception &ex) {
-                  fc_elog( logger, "Exception in handling read data from ${p}: ${s}",
-                           ("p",conn->peer_name())("s",ex.to_string()) );
-                  close( conn );
+                  fc_elog( logger, "Exception in handling read data ${s}", ("s",ex.to_string()) );
+                  close_connection = true;
                }
                catch (...) {
-                  fc_elog( logger, "Undefined exception handling the read data from ${p}",( "p",conn->peer_name()) );
-                  close( conn );
+                  fc_elog( logger, "Undefined exception handling read data" );
+                  close_connection = true;
+               }
+
+               if( close_connection ) {
+                  connection_wptr weak_conn = conn;
+                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+                     auto conn = weak_conn.lock();
+                     if( !conn ) return;
+                     fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                     close( conn );
+                  });
                }
-            });
          });
       } catch (...) {
          string pname = conn ? conn->peer_name() : "no connection name";
@@ -2131,6 +2161,7 @@ namespace eosio {
    bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) {
       try {
          // if next message is a block we already have, exit early
+/*
          auto peek_ds = conn->pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
@@ -2147,7 +2178,7 @@ namespace eosio {
                return true;
             }
          }
-
+*/
          auto ds = conn->pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
@@ -2528,18 +2559,61 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
-      controller &cc = chain_plug->chain();
-      block_id_type blk_id = msg->id();
-      uint32_t blk_num = msg->block_num();
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
+      signed_block_ptr msg = m;
+      controller& cc = chain_plug->chain();
+      block_id_type blk_id = msg ? msg->id() : block_id_type();
+      uint32_t blk_num = msg ? msg->block_num() : 0;
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-         if( cc.fetch_block_by_id(blk_id)) {
+         if( msg && cc.fetch_block_by_id(blk_id)) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
+         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
+         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
+            // see if top is ready
+            if( !sync_master->incoming_blocks.empty() ) {
+               prev = sync_master->incoming_blocks.top();
+               auto prev_prev = cc.fetch_block_by_id( prev->previous );
+               if( prev_prev != nullptr ) {
+                  sync_master->incoming_blocks.pop();
+                  if(msg) sync_master->incoming_blocks.emplace( msg );
+                  msg = prev;
+                  blk_id = msg->id();
+                  blk_num = msg->block_num();
+                  connection_wptr weak = c;
+                  app().post(priority::medium, "re post blk", [this, weak](){
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  });
+               } else {
+                  if( msg ) {
+                     sync_master->incoming_blocks.emplace( msg );
+
+                     connection_wptr weak = c;
+                     app().post( priority::medium, "re post blk", [this, weak]() {
+                        connection_ptr c = weak.lock();
+                        if( c ) handle_message( c, signed_block_ptr() );
+                     } );
+                  }
+                  return;
+               }
+            } else {
+               if( msg ) {
+                  sync_master->incoming_blocks.emplace( msg );
+
+                  connection_wptr weak = c;
+                  app().post( priority::medium, "re post blk", [this, weak]() {
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  } );
+               }
+               return;
+            }
+         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 1b49c5fc3307d1279ba9d4db27a4cd90a01a7e43 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:16:39 -0600
Subject: [PATCH 0002/1648] Remove descriptions of tasks as not merged into
 develop yet

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 78935754bf5..afc08e4361d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -664,7 +664,7 @@ namespace eosio {
       void operator()( signed_block&& msg ) const {
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c ) impl->handle_message( c, ptr );
          });
@@ -672,7 +672,7 @@ namespace eosio {
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c) impl->handle_message( c, ptr );
          });
@@ -682,7 +682,7 @@ namespace eosio {
       void operator()( T&& msg ) const
       {
          connection_wptr weak = c;
-         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
@@ -2143,7 +2143,7 @@ namespace eosio {
 
                if( close_connection ) {
                   connection_wptr weak_conn = conn;
-                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+                  app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2585,7 +2585,7 @@ namespace eosio {
                   blk_id = msg->id();
                   blk_num = msg->block_num();
                   connection_wptr weak = c;
-                  app().post(priority::medium, "re post blk", [this, weak](){
+                  app().post(priority::medium, [this, weak](){
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2594,7 +2594,7 @@ namespace eosio {
                      sync_master->incoming_blocks.emplace( msg );
 
                      connection_wptr weak = c;
-                     app().post( priority::medium, "re post blk", [this, weak]() {
+                     app().post( priority::medium, [this, weak]() {
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2606,7 +2606,7 @@ namespace eosio {
                   sync_master->incoming_blocks.emplace( msg );
 
                   connection_wptr weak = c;
-                  app().post( priority::medium, "re post blk", [this, weak]() {
+                  app().post( priority::medium, [this, weak]() {
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );

From 14e7a832a22fc469b20b208333b1cef6f3f8909f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:04 -0600
Subject: [PATCH 0003/1648] Use appbase with FIFO priority queue. priority
 queue in net_plugin no longer needed.

---
 plugins/net_plugin/net_plugin.cpp | 53 ++-----------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index afc08e4361d..4de2d122ba9 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,12 +75,6 @@ namespace eosio {
       }
    };
 
-   struct block_greater {
-      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
-         return lhs->block_num() > rhs->block_num();
-      }
-   };
-
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -506,7 +500,7 @@ namespace eosio {
       socket_ptr              socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      std::atomic<std::size_t>         outstanding_read_bytes{0};
+      std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
 
 
       queued_buffer           buffer_queue;
@@ -723,8 +717,6 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
-
-      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2006,6 +1998,7 @@ namespace eosio {
       });
    }
 
+   // only called from server_ioc thread
    void net_plugin_impl::start_read_message(const connection_ptr& conn) {
 
       try {
@@ -2572,48 +2565,6 @@ namespace eosio {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
-         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
-         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
-            // see if top is ready
-            if( !sync_master->incoming_blocks.empty() ) {
-               prev = sync_master->incoming_blocks.top();
-               auto prev_prev = cc.fetch_block_by_id( prev->previous );
-               if( prev_prev != nullptr ) {
-                  sync_master->incoming_blocks.pop();
-                  if(msg) sync_master->incoming_blocks.emplace( msg );
-                  msg = prev;
-                  blk_id = msg->id();
-                  blk_num = msg->block_num();
-                  connection_wptr weak = c;
-                  app().post(priority::medium, [this, weak](){
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  });
-               } else {
-                  if( msg ) {
-                     sync_master->incoming_blocks.emplace( msg );
-
-                     connection_wptr weak = c;
-                     app().post( priority::medium, [this, weak]() {
-                        connection_ptr c = weak.lock();
-                        if( c ) handle_message( c, signed_block_ptr() );
-                     } );
-                  }
-                  return;
-               }
-            } else {
-               if( msg ) {
-                  sync_master->incoming_blocks.emplace( msg );
-
-                  connection_wptr weak = c;
-                  app().post( priority::medium, [this, weak]() {
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  } );
-               }
-               return;
-            }
-         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 9d1bdb3809bab450bb1c466b701e42f78057b8e1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:27 -0600
Subject: [PATCH 0004/1648] Update to appbase with FIFO priority queue

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index da4bf8cb324..5c10377c426 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit da4bf8cb324225b002b3105da42b62769da94ce9
+Subproject commit 5c10377c426d1905c46d781cbb75a34e79728bca

From 6caa09c4dc184009b69650ae15badeb912ba39ad Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:49:28 -0600
Subject: [PATCH 0005/1648] Revert unneeded changes to handle_message

---
 plugins/net_plugin/net_plugin.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4de2d122ba9..46645215bc6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2552,16 +2552,15 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
-      signed_block_ptr msg = m;
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
-      block_id_type blk_id = msg ? msg->id() : block_id_type();
-      uint32_t blk_num = msg ? msg->block_num() : 0;
+      block_id_type blk_id = msg->id();
+      uint32_t blk_num = msg->block_num();
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-         if( msg && cc.fetch_block_by_id(blk_id)) {
+         if( cc.fetch_block_by_id(blk_id) ) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }

From f5d408bdc4bf2c7e4d51f377b1e6109f5a038330 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 14:50:46 -0600
Subject: [PATCH 0006/1648] Logging fixes

---
 plugins/net_plugin/net_plugin.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 46645215bc6..53e46420123 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1636,6 +1636,7 @@ namespace eosio {
 
       uint32_t bnum = bs->block_num;
       peer_block_state pbstate{bs->id, bnum};
+      fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
 
       std::shared_ptr<std::vector<char>> send_buffer;
       for( auto& cp : my_impl->connections ) {
@@ -1650,7 +1651,7 @@ namespace eosio {
             if( !send_buffer ) {
                send_buffer = create_send_buffer( bs->block );
             }
-            fc_dlog(logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()));
+            fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
             cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
          }
       }
@@ -1672,7 +1673,7 @@ namespace eosio {
    }
 
    void dispatch_manager::rejected_block(const block_id_type& id) {
-      fc_dlog(logger,"not sending rejected transaction ${tid}",("tid",id));
+      fc_dlog( logger, "rejected block ${id}", ("id", id) );
       auto range = received_blocks.equal_range(id);
       received_blocks.erase(range.first, range.second);
    }

From c3e779169661f46016ce9bd4140bae0934b0c3f8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Mar 2019 18:26:06 -0600
Subject: [PATCH 0007/1648] Make delay_timer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 56 ++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 53e46420123..393bfab60b9 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -419,6 +419,7 @@ namespace eosio {
          }
       }
 
+      // thread safe
       uint32_t write_queue_size() const { return _write_queue_size; }
 
       bool is_out_queue_empty() const { return _out_queue.empty(); }
@@ -477,7 +478,7 @@ namespace eosio {
          std::function<void( boost::system::error_code, std::size_t )> callback;
       };
 
-      uint32_t _write_queue_size = 0;
+      std::atomic<uint32_t> _write_queue_size{0};
       deque<queued_write> _write_queue;
       deque<queued_write> _sync_write_queue; // sync_write_queue will be sent first
       deque<queued_write> _out_queue;
@@ -506,7 +507,7 @@ namespace eosio {
       queued_buffer           buffer_queue;
 
       std::atomic<uint32_t>   reads_in_flight{0};
-      uint32_t                trx_in_progress_size = 0;
+      std::atomic<uint32_t>   trx_in_progress_size{0};
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
@@ -516,6 +517,7 @@ namespace eosio {
       uint16_t                protocol_version  = 0;
       string                  peer_addr;
       unique_ptr<boost::asio::steady_timer> response_expected;
+      std::mutex                            read_delay_timer_mutex;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
@@ -837,7 +839,10 @@ namespace eosio {
       my_impl->sync_master->reset_lib_num(shared_from_this());
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
-      if( read_delay_timer ) read_delay_timer->cancel();
+      {
+         std::lock_guard<std::mutex> g( read_delay_timer_mutex );
+         if( read_delay_timer ) read_delay_timer->cancel();
+      }
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -2024,27 +2029,36 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-/*
+
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
-            if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
-               peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
-            } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
+            uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
+            uint32_t trx_in_progress_size = conn->trx_in_progress_size;
+            uint32_t reads_in_flight = conn->reads_in_flight;
+            if( write_queue_size > def_max_write_queue_size ) {
+               peer_wlog( conn, "write_queue full ${s} bytes", ("s", write_queue_size) );
+            } else if( reads_in_flight > def_max_reads_in_flight ) {
+               peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
             } else {
-               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", conn->trx_in_progress_size) );
+               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
-            if( conn->buffer_queue.write_queue_size() > 2*def_max_write_queue_size ||
-                conn->reads_in_flight > 2*def_max_reads_in_flight   ||
-                conn->trx_in_progress_size > 2*def_max_trx_in_progress_size )
+            if( write_queue_size > 2*def_max_write_queue_size ||
+                reads_in_flight > 2*def_max_reads_in_flight   ||
+                  trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
-               fc_wlog( logger, "queues over full, giving up on connection ${p}", ("p", conn->peer_name()) );
-               my_impl->close( conn );
+               fc_wlog( logger, "queues over full, giving up on connection" );
+               app().post( priority::medium, [this, weak_conn]() {
+                  auto conn = weak_conn.lock();
+                  if( !conn ) return;
+                  fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                  my_impl->close( conn );
+               });
                return;
             }
+            std::lock_guard<std::mutex> g( conn->read_delay_timer_mutex );
             if( !conn->read_delay_timer ) return;
             conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
             conn->read_delay_timer->async_wait(
@@ -2055,7 +2069,7 @@ namespace eosio {
             } ) );
             return;
          }
-*/
+
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2136,7 +2150,6 @@ namespace eosio {
                }
 
                if( close_connection ) {
-                  connection_wptr weak_conn = conn;
                   app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
@@ -2146,9 +2159,14 @@ namespace eosio {
                }
          });
       } catch (...) {
-         string pname = conn ? conn->peer_name() : "no connection name";
-         fc_elog( logger, "Undefined exception handling reading ${p}",("p",pname) );
-         close( conn );
+         fc_elog( logger, "Undefined exception in start_read_message" );
+         connection_wptr weak_conn = conn;
+         app().post( priority::medium, [this, weak_conn]() {
+            auto conn = weak_conn.lock();
+            if( !conn ) return;
+            fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+            close( conn );
+         });
       }
    }
 

From 1da7c8b9309dd7f66c092b9b41dc44a8ad148304 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:08:40 -0600
Subject: [PATCH 0008/1648] Test of multi-threaded reading

---
 plugins/net_plugin/net_plugin.cpp | 162 ++++++++++++++++++++++--------
 1 file changed, 118 insertions(+), 44 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e4adc0dd6ac..78935754bf5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,6 +75,12 @@ namespace eosio {
       }
    };
 
+   struct block_greater {
+      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
+         return lhs->block_num() > rhs->block_num();
+      }
+   };
+
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -157,7 +163,7 @@ namespace eosio {
 
       channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
 
-      uint16_t                                  thread_pool_size = 1; // currently used by server_ioc
+      uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
       optional<io_work_t>                       server_ioc_work;
@@ -500,12 +506,12 @@ namespace eosio {
       socket_ptr              socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      fc::optional<std::size_t>        outstanding_read_bytes;
+      std::atomic<std::size_t>         outstanding_read_bytes{0};
 
 
       queued_buffer           buffer_queue;
 
-      uint32_t                reads_in_flight = 0;
+      std::atomic<uint32_t>   reads_in_flight{0};
       uint32_t                trx_in_progress_size = 0;
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
@@ -638,9 +644,9 @@ namespace eosio {
    };
 
    struct msg_handler : public fc::visitor<void> {
-      net_plugin_impl &impl;
+      net_plugin_impl& impl;
       connection_ptr c;
-      msg_handler( net_plugin_impl &imp, const connection_ptr& conn) : impl(imp), c(conn) {}
+      msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
 
       void operator()( const signed_block& msg ) const {
          EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should be called" );
@@ -656,16 +662,30 @@ namespace eosio {
       }
 
       void operator()( signed_block&& msg ) const {
-         impl.handle_message( c, std::make_shared<signed_block>( std::move( msg ) ) );
+         shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
+         connection_wptr weak = c;
+         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c ) impl->handle_message( c, ptr );
+         });
       }
       void operator()( packed_transaction&& msg ) const {
-         impl.handle_message( c, std::make_shared<packed_transaction>( std::move( msg ) ) );
+         shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
+         connection_wptr weak = c;
+         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c) impl->handle_message( c, ptr );
+         });
       }
 
       template <typename T>
       void operator()( T&& msg ) const
       {
-         impl.handle_message( c, std::forward<T>(msg) );
+         connection_wptr weak = c;
+         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
       }
    };
 
@@ -703,6 +723,8 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
+
+      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -774,7 +796,9 @@ namespace eosio {
       initialize();
    }
 
-   connection::~connection() {}
+   connection::~connection() {
+      pending_message_buffer.reset();
+   }
 
    void connection::initialize() {
       auto *rnd = node_id.data();
@@ -822,7 +846,6 @@ namespace eosio {
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
       if( read_delay_timer ) read_delay_timer->cancel();
-      pending_message_buffer.reset();
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -1101,6 +1124,7 @@ namespace eosio {
    static std::shared_ptr<std::vector<char>> create_send_buffer( const signed_block_ptr& sb ) {
       // this implementation is to avoid copy of signed_block to net_message
       // matches which of net_message for signed_block
+      fc_dlog( logger, "sending block ${bn}", ("bn", sb->block_num()) );
       return create_send_buffer( signed_block_which, *sb );
    }
 
@@ -1903,7 +1927,9 @@ namespace eosio {
          return false;
       }
       else {
-         start_read_message( con );
+         boost::asio::post(*server_ioc, [this, con]() {
+            start_read_message( con );
+         });
          ++started_sessions;
          return true;
          // for now, we can just use the application main loop.
@@ -1988,7 +2014,7 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
-         std::size_t minimum_read = conn->outstanding_read_bytes ? *conn->outstanding_read_bytes : message_header_size;
+         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2004,7 +2030,7 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-
+/*
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
@@ -2013,7 +2039,7 @@ namespace eosio {
             if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
                peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
             } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight) );
+               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
             } else {
                peer_wlog( conn, "max trx in progress ${s} bytes", ("s", conn->trx_in_progress_size) );
             }
@@ -2035,19 +2061,19 @@ namespace eosio {
             } ) );
             return;
          }
-
+*/
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             [this,weak_conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
-            app().post( priority::medium, [this,weak_conn, ec, bytes_transferred]() {
                auto conn = weak_conn.lock();
                if (!conn) {
                   return;
                }
 
                --conn->reads_in_flight;
-               conn->outstanding_read_bytes.reset();
+               conn->outstanding_read_bytes = 0;
+               bool close_connection = false;
 
                try {
                   if( !ec ) {
@@ -2061,18 +2087,16 @@ namespace eosio {
                         uint32_t bytes_in_buffer = conn->pending_message_buffer.bytes_to_read();
 
                         if (bytes_in_buffer < message_header_size) {
-                           conn->outstanding_read_bytes.emplace(message_header_size - bytes_in_buffer);
+                           conn->outstanding_read_bytes = message_header_size - bytes_in_buffer;
                            break;
                         } else {
                            uint32_t message_length;
                            auto index = conn->pending_message_buffer.read_index();
                            conn->pending_message_buffer.peek(&message_length, sizeof(message_length), index);
                            if(message_length > def_send_buffer_size*2 || message_length == 0) {
-                              boost::system::error_code ec;
-                              fc_elog( logger,"incoming message length unexpected (${i}), from ${p}",
-                                       ("i", message_length)("p",boost::lexical_cast<std::string>(conn->socket->remote_endpoint(ec))) );
-                              close(conn);
-                              return;
+                              fc_elog( logger,"incoming message length unexpected (${i})", ("i", message_length) );
+                              close_connection = true;
+                              break;
                            }
 
                            auto total_message_bytes = message_length + message_header_size;
@@ -2089,37 +2113,43 @@ namespace eosio {
                                  conn->pending_message_buffer.add_space( outstanding_message_bytes - available_buffer_bytes );
                               }
 
-                              conn->outstanding_read_bytes.emplace(outstanding_message_bytes);
+                              conn->outstanding_read_bytes = outstanding_message_bytes;
                               break;
                            }
                         }
                      }
-                     start_read_message(conn);
+                     if( !close_connection ) start_read_message( conn );
                   } else {
-                     auto pname = conn->peer_name();
                      if (ec.value() != boost::asio::error::eof) {
-                        fc_elog( logger, "Error reading message from ${p}: ${m}",("p",pname)( "m", ec.message() ) );
+                        fc_elog( logger, "Error reading message: ${m}", ( "m", ec.message() ) );
                      } else {
-                        fc_ilog( logger, "Peer ${p} closed connection",("p",pname) );
+                        fc_ilog( logger, "Peer closed connection" );
                      }
-                     close( conn );
+                     close_connection = true;
                   }
                }
                catch(const std::exception &ex) {
-                  fc_elog( logger, "Exception in handling read data from ${p}: ${s}",
-                           ("p",conn->peer_name())("s",ex.what()) );
-                  close( conn );
+                  fc_elog( logger, "Exception in handling read data: ${s}", ("s",ex.what()) );
+                  close_connection = true;
                }
                catch(const fc::exception &ex) {
-                  fc_elog( logger, "Exception in handling read data from ${p}: ${s}",
-                           ("p",conn->peer_name())("s",ex.to_string()) );
-                  close( conn );
+                  fc_elog( logger, "Exception in handling read data ${s}", ("s",ex.to_string()) );
+                  close_connection = true;
                }
                catch (...) {
-                  fc_elog( logger, "Undefined exception handling the read data from ${p}",( "p",conn->peer_name()) );
-                  close( conn );
+                  fc_elog( logger, "Undefined exception handling read data" );
+                  close_connection = true;
+               }
+
+               if( close_connection ) {
+                  connection_wptr weak_conn = conn;
+                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+                     auto conn = weak_conn.lock();
+                     if( !conn ) return;
+                     fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                     close( conn );
+                  });
                }
-            });
          });
       } catch (...) {
          string pname = conn ? conn->peer_name() : "no connection name";
@@ -2131,6 +2161,7 @@ namespace eosio {
    bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) {
       try {
          // if next message is a block we already have, exit early
+/*
          auto peek_ds = conn->pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
@@ -2147,7 +2178,7 @@ namespace eosio {
                return true;
             }
          }
-
+*/
          auto ds = conn->pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
@@ -2528,18 +2559,61 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
-      controller &cc = chain_plug->chain();
-      block_id_type blk_id = msg->id();
-      uint32_t blk_num = msg->block_num();
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
+      signed_block_ptr msg = m;
+      controller& cc = chain_plug->chain();
+      block_id_type blk_id = msg ? msg->id() : block_id_type();
+      uint32_t blk_num = msg ? msg->block_num() : 0;
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-         if( cc.fetch_block_by_id(blk_id)) {
+         if( msg && cc.fetch_block_by_id(blk_id)) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
+         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
+         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
+            // see if top is ready
+            if( !sync_master->incoming_blocks.empty() ) {
+               prev = sync_master->incoming_blocks.top();
+               auto prev_prev = cc.fetch_block_by_id( prev->previous );
+               if( prev_prev != nullptr ) {
+                  sync_master->incoming_blocks.pop();
+                  if(msg) sync_master->incoming_blocks.emplace( msg );
+                  msg = prev;
+                  blk_id = msg->id();
+                  blk_num = msg->block_num();
+                  connection_wptr weak = c;
+                  app().post(priority::medium, "re post blk", [this, weak](){
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  });
+               } else {
+                  if( msg ) {
+                     sync_master->incoming_blocks.emplace( msg );
+
+                     connection_wptr weak = c;
+                     app().post( priority::medium, "re post blk", [this, weak]() {
+                        connection_ptr c = weak.lock();
+                        if( c ) handle_message( c, signed_block_ptr() );
+                     } );
+                  }
+                  return;
+               }
+            } else {
+               if( msg ) {
+                  sync_master->incoming_blocks.emplace( msg );
+
+                  connection_wptr weak = c;
+                  app().post( priority::medium, "re post blk", [this, weak]() {
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  } );
+               }
+               return;
+            }
+         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From ce933f4f2ea66c57699e91bccda16e4b956700d0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:16:39 -0600
Subject: [PATCH 0009/1648] Remove descriptions of tasks as not merged into
 develop yet

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 78935754bf5..afc08e4361d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -664,7 +664,7 @@ namespace eosio {
       void operator()( signed_block&& msg ) const {
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c ) impl->handle_message( c, ptr );
          });
@@ -672,7 +672,7 @@ namespace eosio {
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c) impl->handle_message( c, ptr );
          });
@@ -682,7 +682,7 @@ namespace eosio {
       void operator()( T&& msg ) const
       {
          connection_wptr weak = c;
-         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
@@ -2143,7 +2143,7 @@ namespace eosio {
 
                if( close_connection ) {
                   connection_wptr weak_conn = conn;
-                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+                  app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2585,7 +2585,7 @@ namespace eosio {
                   blk_id = msg->id();
                   blk_num = msg->block_num();
                   connection_wptr weak = c;
-                  app().post(priority::medium, "re post blk", [this, weak](){
+                  app().post(priority::medium, [this, weak](){
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2594,7 +2594,7 @@ namespace eosio {
                      sync_master->incoming_blocks.emplace( msg );
 
                      connection_wptr weak = c;
-                     app().post( priority::medium, "re post blk", [this, weak]() {
+                     app().post( priority::medium, [this, weak]() {
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2606,7 +2606,7 @@ namespace eosio {
                   sync_master->incoming_blocks.emplace( msg );
 
                   connection_wptr weak = c;
-                  app().post( priority::medium, "re post blk", [this, weak]() {
+                  app().post( priority::medium, [this, weak]() {
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );

From e269547e68f3213f1b824be232578c42a7cc66bb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:04 -0600
Subject: [PATCH 0010/1648] Use appbase with FIFO priority queue. priority
 queue in net_plugin no longer needed.

---
 plugins/net_plugin/net_plugin.cpp | 53 ++-----------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index afc08e4361d..4de2d122ba9 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,12 +75,6 @@ namespace eosio {
       }
    };
 
-   struct block_greater {
-      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
-         return lhs->block_num() > rhs->block_num();
-      }
-   };
-
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -506,7 +500,7 @@ namespace eosio {
       socket_ptr              socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      std::atomic<std::size_t>         outstanding_read_bytes{0};
+      std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
 
 
       queued_buffer           buffer_queue;
@@ -723,8 +717,6 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
-
-      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2006,6 +1998,7 @@ namespace eosio {
       });
    }
 
+   // only called from server_ioc thread
    void net_plugin_impl::start_read_message(const connection_ptr& conn) {
 
       try {
@@ -2572,48 +2565,6 @@ namespace eosio {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
-         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
-         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
-            // see if top is ready
-            if( !sync_master->incoming_blocks.empty() ) {
-               prev = sync_master->incoming_blocks.top();
-               auto prev_prev = cc.fetch_block_by_id( prev->previous );
-               if( prev_prev != nullptr ) {
-                  sync_master->incoming_blocks.pop();
-                  if(msg) sync_master->incoming_blocks.emplace( msg );
-                  msg = prev;
-                  blk_id = msg->id();
-                  blk_num = msg->block_num();
-                  connection_wptr weak = c;
-                  app().post(priority::medium, [this, weak](){
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  });
-               } else {
-                  if( msg ) {
-                     sync_master->incoming_blocks.emplace( msg );
-
-                     connection_wptr weak = c;
-                     app().post( priority::medium, [this, weak]() {
-                        connection_ptr c = weak.lock();
-                        if( c ) handle_message( c, signed_block_ptr() );
-                     } );
-                  }
-                  return;
-               }
-            } else {
-               if( msg ) {
-                  sync_master->incoming_blocks.emplace( msg );
-
-                  connection_wptr weak = c;
-                  app().post( priority::medium, [this, weak]() {
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  } );
-               }
-               return;
-            }
-         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 40db0f820706d9541656af9b5774ab8962d98bac Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:49:28 -0600
Subject: [PATCH 0011/1648] Revert unneeded changes to handle_message

---
 plugins/net_plugin/net_plugin.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4de2d122ba9..46645215bc6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2552,16 +2552,15 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
-      signed_block_ptr msg = m;
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
-      block_id_type blk_id = msg ? msg->id() : block_id_type();
-      uint32_t blk_num = msg ? msg->block_num() : 0;
+      block_id_type blk_id = msg->id();
+      uint32_t blk_num = msg->block_num();
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-         if( msg && cc.fetch_block_by_id(blk_id)) {
+         if( cc.fetch_block_by_id(blk_id) ) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }

From 5f8094ed5ff26e28d2a7651e337a4a809789dc86 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 14:50:46 -0600
Subject: [PATCH 0012/1648] Logging fixes

---
 plugins/net_plugin/net_plugin.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 46645215bc6..53e46420123 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1636,6 +1636,7 @@ namespace eosio {
 
       uint32_t bnum = bs->block_num;
       peer_block_state pbstate{bs->id, bnum};
+      fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
 
       std::shared_ptr<std::vector<char>> send_buffer;
       for( auto& cp : my_impl->connections ) {
@@ -1650,7 +1651,7 @@ namespace eosio {
             if( !send_buffer ) {
                send_buffer = create_send_buffer( bs->block );
             }
-            fc_dlog(logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()));
+            fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
             cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
          }
       }
@@ -1672,7 +1673,7 @@ namespace eosio {
    }
 
    void dispatch_manager::rejected_block(const block_id_type& id) {
-      fc_dlog(logger,"not sending rejected transaction ${tid}",("tid",id));
+      fc_dlog( logger, "rejected block ${id}", ("id", id) );
       auto range = received_blocks.equal_range(id);
       received_blocks.erase(range.first, range.second);
    }

From d183fae6f6a80cd0c3cbd0ed45ba219409ad2457 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Mar 2019 18:26:06 -0600
Subject: [PATCH 0013/1648] Make delay_timer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 56 ++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 53e46420123..393bfab60b9 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -419,6 +419,7 @@ namespace eosio {
          }
       }
 
+      // thread safe
       uint32_t write_queue_size() const { return _write_queue_size; }
 
       bool is_out_queue_empty() const { return _out_queue.empty(); }
@@ -477,7 +478,7 @@ namespace eosio {
          std::function<void( boost::system::error_code, std::size_t )> callback;
       };
 
-      uint32_t _write_queue_size = 0;
+      std::atomic<uint32_t> _write_queue_size{0};
       deque<queued_write> _write_queue;
       deque<queued_write> _sync_write_queue; // sync_write_queue will be sent first
       deque<queued_write> _out_queue;
@@ -506,7 +507,7 @@ namespace eosio {
       queued_buffer           buffer_queue;
 
       std::atomic<uint32_t>   reads_in_flight{0};
-      uint32_t                trx_in_progress_size = 0;
+      std::atomic<uint32_t>   trx_in_progress_size{0};
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
@@ -516,6 +517,7 @@ namespace eosio {
       uint16_t                protocol_version  = 0;
       string                  peer_addr;
       unique_ptr<boost::asio::steady_timer> response_expected;
+      std::mutex                            read_delay_timer_mutex;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
@@ -837,7 +839,10 @@ namespace eosio {
       my_impl->sync_master->reset_lib_num(shared_from_this());
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
-      if( read_delay_timer ) read_delay_timer->cancel();
+      {
+         std::lock_guard<std::mutex> g( read_delay_timer_mutex );
+         if( read_delay_timer ) read_delay_timer->cancel();
+      }
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -2024,27 +2029,36 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-/*
+
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
-            if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
-               peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
-            } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
+            uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
+            uint32_t trx_in_progress_size = conn->trx_in_progress_size;
+            uint32_t reads_in_flight = conn->reads_in_flight;
+            if( write_queue_size > def_max_write_queue_size ) {
+               peer_wlog( conn, "write_queue full ${s} bytes", ("s", write_queue_size) );
+            } else if( reads_in_flight > def_max_reads_in_flight ) {
+               peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
             } else {
-               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", conn->trx_in_progress_size) );
+               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
-            if( conn->buffer_queue.write_queue_size() > 2*def_max_write_queue_size ||
-                conn->reads_in_flight > 2*def_max_reads_in_flight   ||
-                conn->trx_in_progress_size > 2*def_max_trx_in_progress_size )
+            if( write_queue_size > 2*def_max_write_queue_size ||
+                reads_in_flight > 2*def_max_reads_in_flight   ||
+                  trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
-               fc_wlog( logger, "queues over full, giving up on connection ${p}", ("p", conn->peer_name()) );
-               my_impl->close( conn );
+               fc_wlog( logger, "queues over full, giving up on connection" );
+               app().post( priority::medium, [this, weak_conn]() {
+                  auto conn = weak_conn.lock();
+                  if( !conn ) return;
+                  fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                  my_impl->close( conn );
+               });
                return;
             }
+            std::lock_guard<std::mutex> g( conn->read_delay_timer_mutex );
             if( !conn->read_delay_timer ) return;
             conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
             conn->read_delay_timer->async_wait(
@@ -2055,7 +2069,7 @@ namespace eosio {
             } ) );
             return;
          }
-*/
+
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2136,7 +2150,6 @@ namespace eosio {
                }
 
                if( close_connection ) {
-                  connection_wptr weak_conn = conn;
                   app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
@@ -2146,9 +2159,14 @@ namespace eosio {
                }
          });
       } catch (...) {
-         string pname = conn ? conn->peer_name() : "no connection name";
-         fc_elog( logger, "Undefined exception handling reading ${p}",("p",pname) );
-         close( conn );
+         fc_elog( logger, "Undefined exception in start_read_message" );
+         connection_wptr weak_conn = conn;
+         app().post( priority::medium, [this, weak_conn]() {
+            auto conn = weak_conn.lock();
+            if( !conn ) return;
+            fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+            close( conn );
+         });
       }
    }
 

From e65ad222e238b5a9c25d5a0dee8d97ca5bfc703a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Sat, 2 Mar 2019 11:22:30 -0600
Subject: [PATCH 0014/1648] Remove unneeded access to atomic

---
 plugins/net_plugin/net_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 393bfab60b9..8fc480600ed 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -26,6 +26,8 @@
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
 
+#include <atomic>
+
 using namespace eosio::chain::plugin_interface::compat;
 
 namespace fc {
@@ -2013,7 +2015,9 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
-         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
+         std::size_t minimum_read =
+               std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
+         minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2080,7 +2084,6 @@ namespace eosio {
                }
 
                --conn->reads_in_flight;
-               conn->outstanding_read_bytes = 0;
                bool close_connection = false;
 
                try {

From 44f0ef52a1172fa95f83e4f989357aa6b9f57853 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 4 Mar 2019 15:44:26 -0500
Subject: [PATCH 0015/1648] Move sig recovery in producer plugin to use thread
 pool of chain controller

---
 plugins/producer_plugin/producer_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index f3eb2164cea..9730437af8f 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -351,8 +351,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
          const auto& cfg = chain.get_global_properties().configuration;
-         transaction_metadata::create_signing_keys_future( trx, *_thread_pool, chain.get_chain_id(), fc::microseconds( cfg.max_transaction_cpu_usage ) );
-         boost::asio::post( *_thread_pool, [self = this, trx, persist_until_expired, next]() {
+         fc::microseconds max_trx_cpu_usage{ cfg.max_transaction_cpu_usage };
+         auto& tp = *_thread_pool;
+         boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
+            // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+            transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
             if( trx->signing_keys_future.valid() )
                trx->signing_keys_future.wait();
             app().post(priority::low, [self, trx, persist_until_expired, next]() {

From 67ba7d043857e9d981fa3eb98cd5ee6ffaf23be6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 4 Mar 2019 15:47:26 -0500
Subject: [PATCH 0016/1648] Cache db_read_mode to avoid accessing controller

---
 plugins/net_plugin/net_plugin.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8fc480600ed..8ffe505c4e3 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -145,6 +145,7 @@ namespace eosio {
       bool                          network_version_match = false;
       chain_id_type                 chain_id;
       fc::sha256                    node_id;
+      eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
       string                        user_agent_name;
       chain_plugin*                 chain_plug = nullptr;
@@ -2054,7 +2055,7 @@ namespace eosio {
                   trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
                fc_wlog( logger, "queues over full, giving up on connection" );
-               app().post( priority::medium, [this, weak_conn]() {
+               app().post( priority::medium, [weak_conn]() {
                   auto conn = weak_conn.lock();
                   if( !conn ) return;
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2536,8 +2537,7 @@ namespace eosio {
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
       peer_ilog(c, "received packed_transaction");
-      controller& cc = my_impl->chain_plug->chain();
-      if( cc.get_read_mode() == eosio::db_read_mode::READ_ONLY ) {
+      if( db_read_mode == eosio::db_read_mode::READ_ONLY ) {
          fc_dlog(logger, "got a txn in read-only mode - dropping");
          return;
       }
@@ -3097,7 +3097,8 @@ namespace eosio {
 
       my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
 
-      if( cc.get_read_mode() == chain::db_read_mode::READ_ONLY ) {
+      my->db_read_mode = cc.get_read_mode();
+      if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;
          fc_ilog( logger, "node in read-only mode setting max_nodes_per_host to 0 to prevent connections" );
       }

From 5cf4d317e4e3b22f8383547acb8a9165cc3a9687 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:16:13 -0500
Subject: [PATCH 0017/1648] Make chain_id const since read from thread pool
 threads

---
 libraries/chain/controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 402b61df0cf..efd4bfaed72 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -124,7 +124,7 @@ struct controller_impl {
    resource_limits_manager        resource_limits;
    authorization_manager          authorization;
    controller::config             conf;
-   chain_id_type                  chain_id;
+   const chain_id_type            chain_id; // read by thread_pool threads
    bool                           replaying= false;
    optional<fc::time_point>       replay_head_time;
    db_read_mode                   read_mode = db_read_mode::SPECULATIVE;

From 40b47f54ba25046019aeb10968a116e8cc761da3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:16:54 -0500
Subject: [PATCH 0018/1648] Add trx id to log message

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8ffe505c4e3..abadf27d8e4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2562,7 +2562,7 @@ namespace eosio {
          } else {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
-               fc_dlog(logger, "chain accepted transaction");
+               fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
                this->dispatcher->bcast_transaction(ptrx);
                return;
             }

From 6db8bc3b78ca0862d1f9aeca173fb47b94765ccb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:18:34 -0500
Subject: [PATCH 0019/1648] Use command line max_transaction_time for limit of
 transaction sig recovery. This was done so that global properties
 configuration does not have to be accessed since the plan is to move this
 code into the thread pool.

---
 plugins/producer_plugin/producer_plugin.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 9730437af8f..0ae10077aa6 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -134,7 +134,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       transaction_id_with_expiry_index                          _persistent_transactions;
       fc::optional<boost::asio::thread_pool>                    _thread_pool;
 
-      int32_t                                                   _max_transaction_time_ms;
+      std::atomic<int32_t>                                      _max_transaction_time_ms; // modified by app thread, read by net_plugin thread pool
       fc::microseconds                                          _max_irreversible_block_age_us;
       int32_t                                                   _produce_time_offset_us = 0;
       int32_t                                                   _last_block_time_offset_us = 0;
@@ -350,8 +350,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
-         const auto& cfg = chain.get_global_properties().configuration;
-         fc::microseconds max_trx_cpu_usage{ cfg.max_transaction_cpu_usage };
+         fc::microseconds max_trx_cpu_usage = fc::milliseconds( _max_transaction_time_ms.load() );
          auto& tp = *_thread_pool;
          boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
             // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress

From 7f340f7347da146b360251214fbf655d11a955cd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:58:27 -0500
Subject: [PATCH 0020/1648] Remove unneeded ack of transactions. Already
 processed by handle_message of packed_transaction_ptr

---
 plugins/net_plugin/net_plugin.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index abadf27d8e4..71b71c96518 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -158,8 +158,6 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
-      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
-
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
@@ -189,7 +187,6 @@ namespace eosio {
       void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
 
       void accepted_block(const block_state_ptr&);
-      void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
 
       bool is_valid( const handshake_message &msg);
 
@@ -2769,17 +2766,6 @@ namespace eosio {
       dispatcher->bcast_block(block);
    }
 
-   void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
-      const auto& id = results.second->id;
-      if (results.first) {
-         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
-         dispatcher->rejected_transaction(id);
-      } else {
-         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
-         dispatcher->bcast_transaction(results.second);
-      }
-   }
-
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {
       if(allowed_connections == None)
          return false;
@@ -3095,8 +3081,6 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
-      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
-
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;

From 679b059f823a9955a5b58d79fa6b360fc2b06215 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 15:51:47 -0500
Subject: [PATCH 0021/1648] Revert "Remove unneeded ack of transactions.
 Already processed by handle_message of packed_transaction_ptr"

This reverts commit 7f340f7347da146b360251214fbf655d11a955cd.
---
 plugins/net_plugin/net_plugin.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 71b71c96518..abadf27d8e4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -158,6 +158,8 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
+      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
@@ -187,6 +189,7 @@ namespace eosio {
       void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
 
       void accepted_block(const block_state_ptr&);
+      void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
 
       bool is_valid( const handshake_message &msg);
 
@@ -2766,6 +2769,17 @@ namespace eosio {
       dispatcher->bcast_block(block);
    }
 
+   void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
+      const auto& id = results.second->id;
+      if (results.first) {
+         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
+         dispatcher->rejected_transaction(id);
+      } else {
+         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
+         dispatcher->bcast_transaction(results.second);
+      }
+   }
+
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {
       if(allowed_connections == None)
          return false;
@@ -3081,6 +3095,8 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
+      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
+
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;

From cdcb59dd41bce4ff27c3ae518ffa620b0eb4d6ce Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 18:54:14 -0500
Subject: [PATCH 0022/1648] Fix tests, handle -1 as unlimited
 max_transaction_tim_ms.

---
 plugins/producer_plugin/producer_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 0ae10077aa6..4dfd9d32cce 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -350,7 +350,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
-         fc::microseconds max_trx_cpu_usage = fc::milliseconds( _max_transaction_time_ms.load() );
+         const auto max_trx_time_ms = _max_transaction_time_ms.load();
+         fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
          auto& tp = *_thread_pool;
          boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
             // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress

From 49d80942726746285a82b19e1c3632999968eb70 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 20:25:24 -0500
Subject: [PATCH 0023/1648] force a build

---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index abadf27d8e4..dabd71d85db 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2711,8 +2711,8 @@ namespace eosio {
          auto &stale_blk = c->blk_state.get<by_block_num>();
          stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
-      fc_dlog(logger, "expire_txns ${n}us size ${s} removed ${r}",
-            ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
+      fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
+               ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
    }
 
    void net_plugin_impl::expire_local_txns() {

From f61cc5d11dad254c5da2cb40d24f43e851d54077 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 6 Mar 2019 13:55:44 -0500
Subject: [PATCH 0024/1648] Move more of incoming transaction processing to
 thread pool

---
 plugins/net_plugin/net_plugin.cpp | 144 +++++++++++++++++++-----------
 1 file changed, 94 insertions(+), 50 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index dabd71d85db..7e0599750a5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -152,6 +152,7 @@ namespace eosio {
       producer_plugin*              producer_plug = nullptr;
       int                           started_sessions = 0;
 
+      std::mutex                    local_txns_mtx;
       node_transaction_index        local_txns;
 
       shared_ptr<tcp::resolver>     resolver;
@@ -670,11 +671,7 @@ namespace eosio {
       }
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if( c) impl->handle_message( c, ptr );
-         });
+         impl.handle_message( c, ptr );
       }
 
       template <typename T>
@@ -851,21 +848,35 @@ namespace eosio {
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
       const std::set<transaction_id_type, sha256_less> known_ids(ids.cbegin(), ids.cend());
       my_impl->expire_local_txns();
-      for(auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ){
-         const bool found = known_ids.find( tx->id ) != known_ids.cend();
-         if( !found ) {
-            queue_write( tx->serialized_txn, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      vector<std::shared_ptr<vector<char>>> trx_to_send;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
+            const bool found = known_ids.find( tx->id ) != known_ids.cend();
+            if( !found ) {
+               trx_to_send.emplace_back( tx->serialized_txn );
+            }
          }
       }
+      for( const auto& t : trx_to_send ) {
+         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      }
    }
 
    void connection::txn_send(const vector<transaction_id_type>& ids) {
-      for(const auto& t : ids) {
-         auto tx = my_impl->local_txns.get<by_id>().find(t);
-         if( tx != my_impl->local_txns.end() ) {
-            queue_write( tx->serialized_txn, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      vector<std::shared_ptr<vector<char>>> trx_to_send;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         for( const auto& t : ids ) {
+            auto tx = my_impl->local_txns.get<by_id>().find( t );
+            if( tx != my_impl->local_txns.end()) {
+               trx_to_send.emplace_back( tx->serialized_txn );
+            }
          }
       }
+      for( const auto& t : trx_to_send ) {
+         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      }
    }
 
    void connection::blk_send_branch() {
@@ -1476,7 +1487,10 @@ namespace eosio {
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
-         note.known_trx.pending = my_impl->local_txns.size();
+         {
+            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+            note.known_trx.pending = my_impl->local_txns.size();
+         }
          c->enqueue( note );
          return;
       }
@@ -1696,9 +1710,12 @@ namespace eosio {
       }
       received_transactions.erase(range.first, range.second);
 
-      if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end() ) { //found
-         fc_dlog(logger, "found trxid in local_trxs" );
-         return;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
+            fc_dlog( logger, "found trxid in local_trxs" );
+            return;
+         }
       }
 
       time_point_sec trx_expiration = ptrx->packed_trx->expiration();
@@ -1707,7 +1724,10 @@ namespace eosio {
       auto buff = create_send_buffer( trx );
 
       node_transaction_state nts = {id, trx_expiration, 0, buff};
-      my_impl->local_txns.insert(std::move(nts));
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         my_impl->local_txns.insert( std::move( nts ));
+      }
 
       my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
          if( skips.find(c) != skips.end() || c->syncing ) {
@@ -2438,6 +2458,7 @@ namespace eosio {
             // plan to get all except what we already know about.
             req.req_trx.mode = catch_up;
             send_req = true;
+            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
             size_t known_sum = local_txns.size();
             if( known_sum ) {
                for( const auto& t : local_txns.get<by_id>() ) {
@@ -2534,6 +2555,7 @@ namespace eosio {
              trx->get_signatures().size() * sizeof(signature_type);
    }
 
+   // called from thread_pool threads
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
       peer_ilog(c, "received packed_transaction");
@@ -2541,36 +2563,47 @@ namespace eosio {
          fc_dlog(logger, "got a txn in read-only mode - dropping");
          return;
       }
-      if( sync_master->is_active(c) ) {
-         fc_dlog(logger, "got a txn during sync - dropping");
-         return;
-      }
 
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
 
-      if(local_txns.get<by_id>().find(tid) != local_txns.end()) {
-         fc_dlog(logger, "got a duplicate transaction - dropping");
-         return;
+      {
+         std::lock_guard<std::mutex> g( local_txns_mtx );
+         if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
+            fc_dlog( logger, "got a duplicate transaction - dropping" );
+            return;
+         }
       }
-      dispatcher->recv_transaction(c, tid);
+      connection_wptr weak_ptr = c;
+      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, tid](){
+         auto c = weak_ptr.lock();
+         dispatcher->recv_transaction(c, tid);
+      });
       c->trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
       chain_plug->accept_transaction(ptrx, [c, this, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
+         bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
             peer_dlog(c, "bad packed_transaction : ${m}", ("m",result.get<fc::exception_ptr>()->what()));
          } else {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
                fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
-               this->dispatcher->bcast_transaction(ptrx);
-               return;
+               accepted = true;
             }
 
-            peer_elog(c, "bad packed_transaction : ${m}", ("m",trace->except->what()));
+            if( !accepted ) {
+               peer_elog( c, "bad packed_transaction : ${m}", ("m", trace->except->what()));
+            }
          }
 
-         dispatcher->rejected_transaction(ptrx->id);
+         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}]() {
+            if( accepted ) {
+               dispatcher->bcast_transaction( ptrx );
+            } else {
+               dispatcher->rejected_transaction( ptrx->id );
+            }
+         });
       });
    }
 
@@ -2621,15 +2654,19 @@ namespace eosio {
 
       update_block_num ubn(blk_num);
       if( reason == no_reason ) {
-         for (const auto &recpt : msg->transactions) {
-            auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>() : recpt.trx.get<packed_transaction>().id();
-            auto ltx = local_txns.get<by_id>().find(id);
-            if( ltx != local_txns.end()) {
-               local_txns.modify( ltx, ubn );
-            }
-            auto ctx = c->trx_state.get<by_id>().find(id);
-            if( ctx != c->trx_state.end()) {
-               c->trx_state.modify( ctx, ubn );
+         {
+            std::lock_guard<std::mutex> g( local_txns_mtx );
+            for( const auto& recpt : msg->transactions ) {
+               auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
+                                                  : recpt.trx.get<packed_transaction>().id();
+               auto ltx = local_txns.get<by_id>().find( id );
+               if( ltx != local_txns.end()) {
+                  local_txns.modify( ltx, ubn );
+               }
+               auto ctx = c->trx_state.get<by_id>().find( id );
+               if( ctx != c->trx_state.end()) {
+                  c->trx_state.modify( ctx, ubn );
+               }
             }
          }
          sync_master->recv_block(c, blk_id, blk_num);
@@ -2697,8 +2734,6 @@ namespace eosio {
       start_txn_timer();
 
       auto now = time_point::now();
-      auto start_size = local_txns.size();
-
       expire_local_txns();
 
       controller& cc = chain_plug->chain();
@@ -2711,20 +2746,29 @@ namespace eosio {
          auto &stale_blk = c->blk_state.get<by_block_num>();
          stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
-      fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
-               ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
+      fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
    }
 
    void net_plugin_impl::expire_local_txns() {
-      auto& old = local_txns.get<by_expiry>();
-      auto ex_lo = old.lower_bound( fc::time_point_sec(0) );
-      auto ex_up = old.upper_bound( time_point::now() );
-      old.erase( ex_lo, ex_up );
-
-      auto& stale = local_txns.get<by_block_num>();
       controller& cc = chain_plug->chain();
       uint32_t lib = cc.last_irreversible_block_num();
-      stale.erase( stale.lower_bound(1), stale.upper_bound(lib) );
+      size_t start_size = 0, end_size = 0;
+
+      {
+         std::lock_guard<std::mutex> g( local_txns_mtx );
+
+         start_size = local_txns.size();
+         auto& old = local_txns.get<by_expiry>();
+         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
+         auto ex_up = old.upper_bound( time_point::now());
+         old.erase( ex_lo, ex_up );
+
+         auto& stale = local_txns.get<by_block_num>();
+         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
+         end_size = local_txns.size();
+      }
+
+      fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)("r", start_size - end_size) );
    }
 
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {

From 910840f125f0e0cf6127a79662e89caeab390f5c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:08:40 -0600
Subject: [PATCH 0025/1648] Test of multi-threaded reading

---
 plugins/net_plugin/net_plugin.cpp | 162 ++++++++++++++++++++++--------
 1 file changed, 118 insertions(+), 44 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 320214ae933..0c3ba2d3083 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,6 +75,12 @@ namespace eosio {
       }
    };
 
+   struct block_greater {
+      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
+         return lhs->block_num() > rhs->block_num();
+      }
+   };
+
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -157,7 +163,7 @@ namespace eosio {
 
       channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
 
-      uint16_t                                  thread_pool_size = 1; // currently used by server_ioc
+      uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
       optional<io_work_t>                       server_ioc_work;
@@ -500,12 +506,12 @@ namespace eosio {
       socket_ptr              socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      fc::optional<std::size_t>        outstanding_read_bytes;
+      std::atomic<std::size_t>         outstanding_read_bytes{0};
 
 
       queued_buffer           buffer_queue;
 
-      uint32_t                reads_in_flight = 0;
+      std::atomic<uint32_t>   reads_in_flight{0};
       uint32_t                trx_in_progress_size = 0;
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
@@ -638,9 +644,9 @@ namespace eosio {
    };
 
    struct msg_handler : public fc::visitor<void> {
-      net_plugin_impl &impl;
+      net_plugin_impl& impl;
       connection_ptr c;
-      msg_handler( net_plugin_impl &imp, const connection_ptr& conn) : impl(imp), c(conn) {}
+      msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
 
       void operator()( const signed_block& msg ) const {
          EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should be called" );
@@ -656,16 +662,30 @@ namespace eosio {
       }
 
       void operator()( signed_block&& msg ) const {
-         impl.handle_message( c, std::make_shared<signed_block>( std::move( msg ) ) );
+         shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
+         connection_wptr weak = c;
+         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c ) impl->handle_message( c, ptr );
+         });
       }
       void operator()( packed_transaction&& msg ) const {
-         impl.handle_message( c, std::make_shared<packed_transaction>( std::move( msg ) ) );
+         shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
+         connection_wptr weak = c;
+         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c) impl->handle_message( c, ptr );
+         });
       }
 
       template <typename T>
       void operator()( T&& msg ) const
       {
-         impl.handle_message( c, std::forward<T>(msg) );
+         connection_wptr weak = c;
+         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
       }
    };
 
@@ -703,6 +723,8 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
+
+      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -775,7 +797,9 @@ namespace eosio {
       initialize();
    }
 
-   connection::~connection() {}
+   connection::~connection() {
+      pending_message_buffer.reset();
+   }
 
    void connection::initialize() {
       auto *rnd = node_id.data();
@@ -823,7 +847,6 @@ namespace eosio {
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
       if( read_delay_timer ) read_delay_timer->cancel();
-      pending_message_buffer.reset();
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -1102,6 +1125,7 @@ namespace eosio {
    static std::shared_ptr<std::vector<char>> create_send_buffer( const signed_block_ptr& sb ) {
       // this implementation is to avoid copy of signed_block to net_message
       // matches which of net_message for signed_block
+      fc_dlog( logger, "sending block ${bn}", ("bn", sb->block_num()) );
       return create_send_buffer( signed_block_which, *sb );
    }
 
@@ -1916,7 +1940,9 @@ namespace eosio {
          return false;
       }
       else {
-         start_read_message( con );
+         boost::asio::post(*server_ioc, [this, con]() {
+            start_read_message( con );
+         });
          ++started_sessions;
          return true;
          // for now, we can just use the application main loop.
@@ -2001,7 +2027,7 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
-         std::size_t minimum_read = conn->outstanding_read_bytes ? *conn->outstanding_read_bytes : message_header_size;
+         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2017,7 +2043,7 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-
+/*
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
@@ -2026,7 +2052,7 @@ namespace eosio {
             if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
                peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
             } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight) );
+               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
             } else {
                peer_wlog( conn, "max trx in progress ${s} bytes", ("s", conn->trx_in_progress_size) );
             }
@@ -2048,19 +2074,19 @@ namespace eosio {
             } ) );
             return;
          }
-
+*/
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             [this,weak_conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
-            app().post( priority::medium, [this,weak_conn, ec, bytes_transferred]() {
                auto conn = weak_conn.lock();
                if (!conn) {
                   return;
                }
 
                --conn->reads_in_flight;
-               conn->outstanding_read_bytes.reset();
+               conn->outstanding_read_bytes = 0;
+               bool close_connection = false;
 
                try {
                   if( !ec ) {
@@ -2074,18 +2100,16 @@ namespace eosio {
                         uint32_t bytes_in_buffer = conn->pending_message_buffer.bytes_to_read();
 
                         if (bytes_in_buffer < message_header_size) {
-                           conn->outstanding_read_bytes.emplace(message_header_size - bytes_in_buffer);
+                           conn->outstanding_read_bytes = message_header_size - bytes_in_buffer;
                            break;
                         } else {
                            uint32_t message_length;
                            auto index = conn->pending_message_buffer.read_index();
                            conn->pending_message_buffer.peek(&message_length, sizeof(message_length), index);
                            if(message_length > def_send_buffer_size*2 || message_length == 0) {
-                              boost::system::error_code ec;
-                              fc_elog( logger,"incoming message length unexpected (${i}), from ${p}",
-                                       ("i", message_length)("p",boost::lexical_cast<std::string>(conn->socket->remote_endpoint(ec))) );
-                              close(conn);
-                              return;
+                              fc_elog( logger,"incoming message length unexpected (${i})", ("i", message_length) );
+                              close_connection = true;
+                              break;
                            }
 
                            auto total_message_bytes = message_length + message_header_size;
@@ -2102,37 +2126,43 @@ namespace eosio {
                                  conn->pending_message_buffer.add_space( outstanding_message_bytes - available_buffer_bytes );
                               }
 
-                              conn->outstanding_read_bytes.emplace(outstanding_message_bytes);
+                              conn->outstanding_read_bytes = outstanding_message_bytes;
                               break;
                            }
                         }
                      }
-                     start_read_message(conn);
+                     if( !close_connection ) start_read_message( conn );
                   } else {
-                     auto pname = conn->peer_name();
                      if (ec.value() != boost::asio::error::eof) {
-                        fc_elog( logger, "Error reading message from ${p}: ${m}",("p",pname)( "m", ec.message() ) );
+                        fc_elog( logger, "Error reading message: ${m}", ( "m", ec.message() ) );
                      } else {
-                        fc_ilog( logger, "Peer ${p} closed connection",("p",pname) );
+                        fc_ilog( logger, "Peer closed connection" );
                      }
-                     close( conn );
+                     close_connection = true;
                   }
                }
                catch(const std::exception &ex) {
-                  fc_elog( logger, "Exception in handling read data from ${p}: ${s}",
-                           ("p",conn->peer_name())("s",ex.what()) );
-                  close( conn );
+                  fc_elog( logger, "Exception in handling read data: ${s}", ("s",ex.what()) );
+                  close_connection = true;
                }
                catch(const fc::exception &ex) {
-                  fc_elog( logger, "Exception in handling read data from ${p}: ${s}",
-                           ("p",conn->peer_name())("s",ex.to_string()) );
-                  close( conn );
+                  fc_elog( logger, "Exception in handling read data ${s}", ("s",ex.to_string()) );
+                  close_connection = true;
                }
                catch (...) {
-                  fc_elog( logger, "Undefined exception handling the read data from ${p}",( "p",conn->peer_name()) );
-                  close( conn );
+                  fc_elog( logger, "Undefined exception handling read data" );
+                  close_connection = true;
+               }
+
+               if( close_connection ) {
+                  connection_wptr weak_conn = conn;
+                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+                     auto conn = weak_conn.lock();
+                     if( !conn ) return;
+                     fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                     close( conn );
+                  });
                }
-            });
          });
       } catch (...) {
          string pname = conn ? conn->peer_name() : "no connection name";
@@ -2144,6 +2174,7 @@ namespace eosio {
    bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) {
       try {
          // if next message is a block we already have, exit early
+/*
          auto peek_ds = conn->pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
@@ -2160,7 +2191,7 @@ namespace eosio {
                return true;
             }
          }
-
+*/
          auto ds = conn->pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
@@ -2541,18 +2572,61 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
-      controller &cc = chain_plug->chain();
-      block_id_type blk_id = msg->id();
-      uint32_t blk_num = msg->block_num();
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
+      signed_block_ptr msg = m;
+      controller& cc = chain_plug->chain();
+      block_id_type blk_id = msg ? msg->id() : block_id_type();
+      uint32_t blk_num = msg ? msg->block_num() : 0;
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-         if( cc.fetch_block_by_id(blk_id)) {
+         if( msg && cc.fetch_block_by_id(blk_id)) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
+         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
+         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
+            // see if top is ready
+            if( !sync_master->incoming_blocks.empty() ) {
+               prev = sync_master->incoming_blocks.top();
+               auto prev_prev = cc.fetch_block_by_id( prev->previous );
+               if( prev_prev != nullptr ) {
+                  sync_master->incoming_blocks.pop();
+                  if(msg) sync_master->incoming_blocks.emplace( msg );
+                  msg = prev;
+                  blk_id = msg->id();
+                  blk_num = msg->block_num();
+                  connection_wptr weak = c;
+                  app().post(priority::medium, "re post blk", [this, weak](){
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  });
+               } else {
+                  if( msg ) {
+                     sync_master->incoming_blocks.emplace( msg );
+
+                     connection_wptr weak = c;
+                     app().post( priority::medium, "re post blk", [this, weak]() {
+                        connection_ptr c = weak.lock();
+                        if( c ) handle_message( c, signed_block_ptr() );
+                     } );
+                  }
+                  return;
+               }
+            } else {
+               if( msg ) {
+                  sync_master->incoming_blocks.emplace( msg );
+
+                  connection_wptr weak = c;
+                  app().post( priority::medium, "re post blk", [this, weak]() {
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  } );
+               }
+               return;
+            }
+         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 0e7518c9c3b1dfb5a1cf31dd04eda8550798c514 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:16:39 -0600
Subject: [PATCH 0026/1648] Remove descriptions of tasks as not merged into
 develop yet

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0c3ba2d3083..da049bfc09c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -664,7 +664,7 @@ namespace eosio {
       void operator()( signed_block&& msg ) const {
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c ) impl->handle_message( c, ptr );
          });
@@ -672,7 +672,7 @@ namespace eosio {
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c) impl->handle_message( c, ptr );
          });
@@ -682,7 +682,7 @@ namespace eosio {
       void operator()( T&& msg ) const
       {
          connection_wptr weak = c;
-         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
@@ -2156,7 +2156,7 @@ namespace eosio {
 
                if( close_connection ) {
                   connection_wptr weak_conn = conn;
-                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+                  app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2598,7 +2598,7 @@ namespace eosio {
                   blk_id = msg->id();
                   blk_num = msg->block_num();
                   connection_wptr weak = c;
-                  app().post(priority::medium, "re post blk", [this, weak](){
+                  app().post(priority::medium, [this, weak](){
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2607,7 +2607,7 @@ namespace eosio {
                      sync_master->incoming_blocks.emplace( msg );
 
                      connection_wptr weak = c;
-                     app().post( priority::medium, "re post blk", [this, weak]() {
+                     app().post( priority::medium, [this, weak]() {
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2619,7 +2619,7 @@ namespace eosio {
                   sync_master->incoming_blocks.emplace( msg );
 
                   connection_wptr weak = c;
-                  app().post( priority::medium, "re post blk", [this, weak]() {
+                  app().post( priority::medium, [this, weak]() {
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );

From 70bf0348aeaecf839b71d5cfec2608c3818e174a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:04 -0600
Subject: [PATCH 0027/1648] Use appbase with FIFO priority queue. priority
 queue in net_plugin no longer needed.

---
 plugins/net_plugin/net_plugin.cpp | 53 ++-----------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index da049bfc09c..eacf1da5e8d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,12 +75,6 @@ namespace eosio {
       }
    };
 
-   struct block_greater {
-      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
-         return lhs->block_num() > rhs->block_num();
-      }
-   };
-
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -506,7 +500,7 @@ namespace eosio {
       socket_ptr              socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      std::atomic<std::size_t>         outstanding_read_bytes{0};
+      std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
 
 
       queued_buffer           buffer_queue;
@@ -723,8 +717,6 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
-
-      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2019,6 +2011,7 @@ namespace eosio {
       });
    }
 
+   // only called from server_ioc thread
    void net_plugin_impl::start_read_message(const connection_ptr& conn) {
 
       try {
@@ -2585,48 +2578,6 @@ namespace eosio {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
-         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
-         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
-            // see if top is ready
-            if( !sync_master->incoming_blocks.empty() ) {
-               prev = sync_master->incoming_blocks.top();
-               auto prev_prev = cc.fetch_block_by_id( prev->previous );
-               if( prev_prev != nullptr ) {
-                  sync_master->incoming_blocks.pop();
-                  if(msg) sync_master->incoming_blocks.emplace( msg );
-                  msg = prev;
-                  blk_id = msg->id();
-                  blk_num = msg->block_num();
-                  connection_wptr weak = c;
-                  app().post(priority::medium, [this, weak](){
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  });
-               } else {
-                  if( msg ) {
-                     sync_master->incoming_blocks.emplace( msg );
-
-                     connection_wptr weak = c;
-                     app().post( priority::medium, [this, weak]() {
-                        connection_ptr c = weak.lock();
-                        if( c ) handle_message( c, signed_block_ptr() );
-                     } );
-                  }
-                  return;
-               }
-            } else {
-               if( msg ) {
-                  sync_master->incoming_blocks.emplace( msg );
-
-                  connection_wptr weak = c;
-                  app().post( priority::medium, [this, weak]() {
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  } );
-               }
-               return;
-            }
-         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 65c1436aad62ec3e296384a4f019b2e6f693d901 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:49:28 -0600
Subject: [PATCH 0028/1648] Revert unneeded changes to handle_message

---
 plugins/net_plugin/net_plugin.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index eacf1da5e8d..7e6974f64a4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2565,16 +2565,15 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
-      signed_block_ptr msg = m;
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
-      block_id_type blk_id = msg ? msg->id() : block_id_type();
-      uint32_t blk_num = msg ? msg->block_num() : 0;
+      block_id_type blk_id = msg->id();
+      uint32_t blk_num = msg->block_num();
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-         if( msg && cc.fetch_block_by_id(blk_id)) {
+         if( cc.fetch_block_by_id(blk_id) ) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }

From 518d6e0876ab4581b328004d515bb9442dd7429d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 14:50:46 -0600
Subject: [PATCH 0029/1648] Logging fixes

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7e6974f64a4..b77b2e0c34c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1637,6 +1637,7 @@ namespace eosio {
 
       uint32_t bnum = bs->block_num;
       peer_block_state pbstate{bs->id, bnum};
+      fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
 
       std::shared_ptr<std::vector<char>> send_buffer;
       for( auto& cp : my_impl->connections ) {
@@ -1651,7 +1652,7 @@ namespace eosio {
             if( !send_buffer ) {
                send_buffer = create_send_buffer( bs->block );
             }
-            fc_dlog(logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()));
+            fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
             cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
          }
       }

From 971ba45dba70ba31004883a55d5c1f3ac8778db4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Mar 2019 18:26:06 -0600
Subject: [PATCH 0030/1648] Make delay_timer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 56 ++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b77b2e0c34c..8a06f93c365 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -419,6 +419,7 @@ namespace eosio {
          }
       }
 
+      // thread safe
       uint32_t write_queue_size() const { return _write_queue_size; }
 
       bool is_out_queue_empty() const { return _out_queue.empty(); }
@@ -477,7 +478,7 @@ namespace eosio {
          std::function<void( boost::system::error_code, std::size_t )> callback;
       };
 
-      uint32_t _write_queue_size = 0;
+      std::atomic<uint32_t> _write_queue_size{0};
       deque<queued_write> _write_queue;
       deque<queued_write> _sync_write_queue; // sync_write_queue will be sent first
       deque<queued_write> _out_queue;
@@ -506,7 +507,7 @@ namespace eosio {
       queued_buffer           buffer_queue;
 
       std::atomic<uint32_t>   reads_in_flight{0};
-      uint32_t                trx_in_progress_size = 0;
+      std::atomic<uint32_t>   trx_in_progress_size{0};
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
@@ -516,6 +517,7 @@ namespace eosio {
       uint16_t                protocol_version  = 0;
       string                  peer_addr;
       unique_ptr<boost::asio::steady_timer> response_expected;
+      std::mutex                            read_delay_timer_mutex;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
@@ -838,7 +840,10 @@ namespace eosio {
       my_impl->sync_master->reset_lib_num(shared_from_this());
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
-      if( read_delay_timer ) read_delay_timer->cancel();
+      {
+         std::lock_guard<std::mutex> g( read_delay_timer_mutex );
+         if( read_delay_timer ) read_delay_timer->cancel();
+      }
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -2037,27 +2042,36 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-/*
+
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
-            if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
-               peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
-            } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
+            uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
+            uint32_t trx_in_progress_size = conn->trx_in_progress_size;
+            uint32_t reads_in_flight = conn->reads_in_flight;
+            if( write_queue_size > def_max_write_queue_size ) {
+               peer_wlog( conn, "write_queue full ${s} bytes", ("s", write_queue_size) );
+            } else if( reads_in_flight > def_max_reads_in_flight ) {
+               peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
             } else {
-               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", conn->trx_in_progress_size) );
+               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
-            if( conn->buffer_queue.write_queue_size() > 2*def_max_write_queue_size ||
-                conn->reads_in_flight > 2*def_max_reads_in_flight   ||
-                conn->trx_in_progress_size > 2*def_max_trx_in_progress_size )
+            if( write_queue_size > 2*def_max_write_queue_size ||
+                reads_in_flight > 2*def_max_reads_in_flight   ||
+                  trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
-               fc_wlog( logger, "queues over full, giving up on connection ${p}", ("p", conn->peer_name()) );
-               my_impl->close( conn );
+               fc_wlog( logger, "queues over full, giving up on connection" );
+               app().post( priority::medium, [this, weak_conn]() {
+                  auto conn = weak_conn.lock();
+                  if( !conn ) return;
+                  fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                  my_impl->close( conn );
+               });
                return;
             }
+            std::lock_guard<std::mutex> g( conn->read_delay_timer_mutex );
             if( !conn->read_delay_timer ) return;
             conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
             conn->read_delay_timer->async_wait(
@@ -2068,7 +2082,7 @@ namespace eosio {
             } ) );
             return;
          }
-*/
+
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2149,7 +2163,6 @@ namespace eosio {
                }
 
                if( close_connection ) {
-                  connection_wptr weak_conn = conn;
                   app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
@@ -2159,9 +2172,14 @@ namespace eosio {
                }
          });
       } catch (...) {
-         string pname = conn ? conn->peer_name() : "no connection name";
-         fc_elog( logger, "Undefined exception handling reading ${p}",("p",pname) );
-         close( conn );
+         fc_elog( logger, "Undefined exception in start_read_message" );
+         connection_wptr weak_conn = conn;
+         app().post( priority::medium, [this, weak_conn]() {
+            auto conn = weak_conn.lock();
+            if( !conn ) return;
+            fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+            close( conn );
+         });
       }
    }
 

From f72825020e53048ba674aee1d02946219ae37c97 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:08:40 -0600
Subject: [PATCH 0031/1648] Test of multi-threaded reading

---
 plugins/net_plugin/net_plugin.cpp | 54 +++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8a06f93c365..87489870609 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,6 +75,12 @@ namespace eosio {
       }
    };
 
+   struct block_greater {
+      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
+         return lhs->block_num() > rhs->block_num();
+      }
+   };
+
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -719,6 +725,8 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
+
+      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2042,7 +2050,7 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-
+/*
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
@@ -2082,7 +2090,7 @@ namespace eosio {
             } ) );
             return;
          }
-
+*/
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2596,6 +2604,48 @@ namespace eosio {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
+         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
+         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
+            // see if top is ready
+            if( !sync_master->incoming_blocks.empty() ) {
+               prev = sync_master->incoming_blocks.top();
+               auto prev_prev = cc.fetch_block_by_id( prev->previous );
+               if( prev_prev != nullptr ) {
+                  sync_master->incoming_blocks.pop();
+                  if(msg) sync_master->incoming_blocks.emplace( msg );
+                  msg = prev;
+                  blk_id = msg->id();
+                  blk_num = msg->block_num();
+                  connection_wptr weak = c;
+                  app().post(priority::medium, "re post blk", [this, weak](){
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  });
+               } else {
+                  if( msg ) {
+                     sync_master->incoming_blocks.emplace( msg );
+
+                     connection_wptr weak = c;
+                     app().post( priority::medium, "re post blk", [this, weak]() {
+                        connection_ptr c = weak.lock();
+                        if( c ) handle_message( c, signed_block_ptr() );
+                     } );
+                  }
+                  return;
+               }
+            } else {
+               if( msg ) {
+                  sync_master->incoming_blocks.emplace( msg );
+
+                  connection_wptr weak = c;
+                  app().post( priority::medium, "re post blk", [this, weak]() {
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  } );
+               }
+               return;
+            }
+         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 4e8f9081511df17bd03289436865676253c5a5ce Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:16:39 -0600
Subject: [PATCH 0032/1648] Remove descriptions of tasks as not merged into
 develop yet

---
 plugins/net_plugin/net_plugin.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 87489870609..662d6ba983e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2171,6 +2171,7 @@ namespace eosio {
                }
 
                if( close_connection ) {
+                  connection_wptr weak_conn = conn;
                   app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
@@ -2617,7 +2618,7 @@ namespace eosio {
                   blk_id = msg->id();
                   blk_num = msg->block_num();
                   connection_wptr weak = c;
-                  app().post(priority::medium, "re post blk", [this, weak](){
+                  app().post(priority::medium, [this, weak](){
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2626,7 +2627,7 @@ namespace eosio {
                      sync_master->incoming_blocks.emplace( msg );
 
                      connection_wptr weak = c;
-                     app().post( priority::medium, "re post blk", [this, weak]() {
+                     app().post( priority::medium, [this, weak]() {
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2638,7 +2639,7 @@ namespace eosio {
                   sync_master->incoming_blocks.emplace( msg );
 
                   connection_wptr weak = c;
-                  app().post( priority::medium, "re post blk", [this, weak]() {
+                  app().post( priority::medium, [this, weak]() {
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );

From 328b1ad1e5712d42eec8a7ab7156c533f2ca267f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:04 -0600
Subject: [PATCH 0033/1648] Use appbase with FIFO priority queue. priority
 queue in net_plugin no longer needed.

---
 plugins/net_plugin/net_plugin.cpp | 50 -------------------------------
 1 file changed, 50 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 662d6ba983e..93d780012ad 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,12 +75,6 @@ namespace eosio {
       }
    };
 
-   struct block_greater {
-      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
-         return lhs->block_num() > rhs->block_num();
-      }
-   };
-
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -725,8 +719,6 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
-
-      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2605,48 +2597,6 @@ namespace eosio {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
-         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
-         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
-            // see if top is ready
-            if( !sync_master->incoming_blocks.empty() ) {
-               prev = sync_master->incoming_blocks.top();
-               auto prev_prev = cc.fetch_block_by_id( prev->previous );
-               if( prev_prev != nullptr ) {
-                  sync_master->incoming_blocks.pop();
-                  if(msg) sync_master->incoming_blocks.emplace( msg );
-                  msg = prev;
-                  blk_id = msg->id();
-                  blk_num = msg->block_num();
-                  connection_wptr weak = c;
-                  app().post(priority::medium, [this, weak](){
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  });
-               } else {
-                  if( msg ) {
-                     sync_master->incoming_blocks.emplace( msg );
-
-                     connection_wptr weak = c;
-                     app().post( priority::medium, [this, weak]() {
-                        connection_ptr c = weak.lock();
-                        if( c ) handle_message( c, signed_block_ptr() );
-                     } );
-                  }
-                  return;
-               }
-            } else {
-               if( msg ) {
-                  sync_master->incoming_blocks.emplace( msg );
-
-                  connection_wptr weak = c;
-                  app().post( priority::medium, [this, weak]() {
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  } );
-               }
-               return;
-            }
-         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 21f3607f47163e61afe2e7bcc24c378028a20b33 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Mar 2019 18:26:06 -0600
Subject: [PATCH 0034/1648] Make delay_timer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 93d780012ad..8a06f93c365 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2042,7 +2042,7 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-/*
+
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
@@ -2082,7 +2082,7 @@ namespace eosio {
             } ) );
             return;
          }
-*/
+
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2163,7 +2163,6 @@ namespace eosio {
                }
 
                if( close_connection ) {
-                  connection_wptr weak_conn = conn;
                   app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;

From 5fef638c0c2f7580c8d46b500721bd5f18388555 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Sat, 2 Mar 2019 11:22:30 -0600
Subject: [PATCH 0035/1648] Remove unneeded access to atomic

---
 plugins/net_plugin/net_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8a06f93c365..1a1b9e1ffa3 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -26,6 +26,8 @@
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
 
+#include <atomic>
+
 using namespace eosio::chain::plugin_interface::compat;
 
 namespace fc {
@@ -2026,7 +2028,9 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
-         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
+         std::size_t minimum_read =
+               std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
+         minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2093,7 +2097,6 @@ namespace eosio {
                }
 
                --conn->reads_in_flight;
-               conn->outstanding_read_bytes = 0;
                bool close_connection = false;
 
                try {

From c2b3e2b46f5eac5c7cfb1aaa3468561735bd04e2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 4 Mar 2019 15:44:26 -0500
Subject: [PATCH 0036/1648] Move sig recovery in producer plugin to use thread
 pool of chain controller

---
 plugins/producer_plugin/producer_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index a35fa34a9c5..6b7646e9cdd 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -351,8 +351,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
          const auto& cfg = chain.get_global_properties().configuration;
-         transaction_metadata::create_signing_keys_future( trx, *_thread_pool, chain.get_chain_id(), fc::microseconds( cfg.max_transaction_cpu_usage ) );
-         boost::asio::post( *_thread_pool, [self = this, trx, persist_until_expired, next]() {
+         fc::microseconds max_trx_cpu_usage{ cfg.max_transaction_cpu_usage };
+         auto& tp = *_thread_pool;
+         boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
+            // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+            transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
             if( trx->signing_keys_future.valid() )
                trx->signing_keys_future.wait();
             app().post(priority::low, [self, trx, persist_until_expired, next]() {

From e55a3ab6bade592ffcf82033bf459b078f41520a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 4 Mar 2019 15:47:26 -0500
Subject: [PATCH 0037/1648] Cache db_read_mode to avoid accessing controller

---
 plugins/net_plugin/net_plugin.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 1a1b9e1ffa3..04c0686cdfb 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -145,6 +145,7 @@ namespace eosio {
       bool                          network_version_match = false;
       chain_id_type                 chain_id;
       fc::sha256                    node_id;
+      eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
       string                        user_agent_name;
       chain_plugin*                 chain_plug = nullptr;
@@ -2067,7 +2068,7 @@ namespace eosio {
                   trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
                fc_wlog( logger, "queues over full, giving up on connection" );
-               app().post( priority::medium, [this, weak_conn]() {
+               app().post( priority::medium, [weak_conn]() {
                   auto conn = weak_conn.lock();
                   if( !conn ) return;
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2549,8 +2550,7 @@ namespace eosio {
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
       peer_ilog(c, "received packed_transaction");
-      controller& cc = my_impl->chain_plug->chain();
-      if( cc.get_read_mode() == eosio::db_read_mode::READ_ONLY ) {
+      if( db_read_mode == eosio::db_read_mode::READ_ONLY ) {
          fc_dlog(logger, "got a txn in read-only mode - dropping");
          return;
       }
@@ -3112,7 +3112,8 @@ namespace eosio {
 
       my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
 
-      if( cc.get_read_mode() == chain::db_read_mode::READ_ONLY ) {
+      my->db_read_mode = cc.get_read_mode();
+      if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;
          fc_ilog( logger, "node in read-only mode setting max_nodes_per_host to 0 to prevent connections" );
       }

From 13d2e375b3b9b65c2e64403d9326329755df4f7f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:16:13 -0500
Subject: [PATCH 0038/1648] Make chain_id const since read from thread pool
 threads

---
 libraries/chain/controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index f3b0a841981..b8470993c05 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -124,7 +124,7 @@ struct controller_impl {
    resource_limits_manager        resource_limits;
    authorization_manager          authorization;
    controller::config             conf;
-   chain_id_type                  chain_id;
+   const chain_id_type            chain_id; // read by thread_pool threads
    bool                           replaying= false;
    optional<fc::time_point>       replay_head_time;
    db_read_mode                   read_mode = db_read_mode::SPECULATIVE;

From 4d1e3f006f71139dff984b050ec82a59d1e48d21 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:16:54 -0500
Subject: [PATCH 0039/1648] Add trx id to log message

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 04c0686cdfb..b6984fb4c3f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2575,7 +2575,7 @@ namespace eosio {
          } else {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
-               fc_dlog(logger, "chain accepted transaction");
+               fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
                this->dispatcher->bcast_transaction(ptrx);
                return;
             }

From 8e80ac1e97d9f408cf1d63c7e3b66d1771471564 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:18:34 -0500
Subject: [PATCH 0040/1648] Use command line max_transaction_time for limit of
 transaction sig recovery. This was done so that global properties
 configuration does not have to be accessed since the plan is to move this
 code into the thread pool.

---
 plugins/producer_plugin/producer_plugin.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 6b7646e9cdd..c2d600c467b 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -134,7 +134,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       transaction_id_with_expiry_index                          _persistent_transactions;
       fc::optional<boost::asio::thread_pool>                    _thread_pool;
 
-      int32_t                                                   _max_transaction_time_ms;
+      std::atomic<int32_t>                                      _max_transaction_time_ms; // modified by app thread, read by net_plugin thread pool
       fc::microseconds                                          _max_irreversible_block_age_us;
       int32_t                                                   _produce_time_offset_us = 0;
       int32_t                                                   _last_block_time_offset_us = 0;
@@ -350,8 +350,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
-         const auto& cfg = chain.get_global_properties().configuration;
-         fc::microseconds max_trx_cpu_usage{ cfg.max_transaction_cpu_usage };
+         fc::microseconds max_trx_cpu_usage = fc::milliseconds( _max_transaction_time_ms.load() );
          auto& tp = *_thread_pool;
          boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
             // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress

From e8f864d1eaf3721f4c5c031df318871b682f0380 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:58:27 -0500
Subject: [PATCH 0041/1648] Remove unneeded ack of transactions. Already
 processed by handle_message of packed_transaction_ptr

---
 plugins/net_plugin/net_plugin.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b6984fb4c3f..eb2330f5bb1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -158,8 +158,6 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
-      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
-
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
@@ -189,7 +187,6 @@ namespace eosio {
       void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
 
       void accepted_block(const block_state_ptr&);
-      void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
 
       bool is_valid( const handshake_message &msg);
 
@@ -2784,17 +2781,6 @@ namespace eosio {
       dispatcher->bcast_block(block);
    }
 
-   void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
-      const auto& id = results.second->id;
-      if (results.first) {
-         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
-         dispatcher->rejected_transaction(id);
-      } else {
-         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
-         dispatcher->bcast_transaction(results.second);
-      }
-   }
-
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {
       if(allowed_connections == None)
          return false;
@@ -3110,8 +3096,6 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
-      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
-
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;

From 53c978d53e591aadcdf9f5bdc0997fe1f4ea3953 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 15:51:47 -0500
Subject: [PATCH 0042/1648] Revert "Remove unneeded ack of transactions.
 Already processed by handle_message of packed_transaction_ptr"

This reverts commit 7f340f7347da146b360251214fbf655d11a955cd.
---
 plugins/net_plugin/net_plugin.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index eb2330f5bb1..b6984fb4c3f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -158,6 +158,8 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
+      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
@@ -187,6 +189,7 @@ namespace eosio {
       void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
 
       void accepted_block(const block_state_ptr&);
+      void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
 
       bool is_valid( const handshake_message &msg);
 
@@ -2781,6 +2784,17 @@ namespace eosio {
       dispatcher->bcast_block(block);
    }
 
+   void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
+      const auto& id = results.second->id;
+      if (results.first) {
+         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
+         dispatcher->rejected_transaction(id);
+      } else {
+         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
+         dispatcher->bcast_transaction(results.second);
+      }
+   }
+
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {
       if(allowed_connections == None)
          return false;
@@ -3096,6 +3110,8 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
+      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
+
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;

From 0b347921c09b1a6a40695d66150704d15e741e89 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 18:54:14 -0500
Subject: [PATCH 0043/1648] Fix tests, handle -1 as unlimited
 max_transaction_tim_ms.

---
 plugins/producer_plugin/producer_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index c2d600c467b..217f931a532 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -350,7 +350,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
-         fc::microseconds max_trx_cpu_usage = fc::milliseconds( _max_transaction_time_ms.load() );
+         const auto max_trx_time_ms = _max_transaction_time_ms.load();
+         fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
          auto& tp = *_thread_pool;
          boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
             // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress

From b0838c1fd372b0c28f107353bbc530ebd4aafb3e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 20:25:24 -0500
Subject: [PATCH 0044/1648] force a build

---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b6984fb4c3f..099c3a6621c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2726,8 +2726,8 @@ namespace eosio {
          auto &stale_blk = c->blk_state.get<by_block_num>();
          stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
-      fc_dlog(logger, "expire_txns ${n}us size ${s} removed ${r}",
-            ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
+      fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
+               ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
    }
 
    void net_plugin_impl::expire_local_txns() {

From c546380d444ee233453a221a574454a8178468c1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 6 Mar 2019 13:55:44 -0500
Subject: [PATCH 0045/1648] Move more of incoming transaction processing to
 thread pool

---
 plugins/net_plugin/net_plugin.cpp | 144 +++++++++++++++++++-----------
 1 file changed, 94 insertions(+), 50 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 099c3a6621c..9e828bbb45d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -152,6 +152,7 @@ namespace eosio {
       producer_plugin*              producer_plug = nullptr;
       int                           started_sessions = 0;
 
+      std::mutex                    local_txns_mtx;
       node_transaction_index        local_txns;
 
       shared_ptr<tcp::resolver>     resolver;
@@ -670,11 +671,7 @@ namespace eosio {
       }
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if( c) impl->handle_message( c, ptr );
-         });
+         impl.handle_message( c, ptr );
       }
 
       template <typename T>
@@ -852,21 +849,35 @@ namespace eosio {
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
       const std::set<transaction_id_type, sha256_less> known_ids(ids.cbegin(), ids.cend());
       my_impl->expire_local_txns();
-      for(auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ){
-         const bool found = known_ids.find( tx->id ) != known_ids.cend();
-         if( !found ) {
-            queue_write( tx->serialized_txn, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      vector<std::shared_ptr<vector<char>>> trx_to_send;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
+            const bool found = known_ids.find( tx->id ) != known_ids.cend();
+            if( !found ) {
+               trx_to_send.emplace_back( tx->serialized_txn );
+            }
          }
       }
+      for( const auto& t : trx_to_send ) {
+         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      }
    }
 
    void connection::txn_send(const vector<transaction_id_type>& ids) {
-      for(const auto& t : ids) {
-         auto tx = my_impl->local_txns.get<by_id>().find(t);
-         if( tx != my_impl->local_txns.end() ) {
-            queue_write( tx->serialized_txn, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      vector<std::shared_ptr<vector<char>>> trx_to_send;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         for( const auto& t : ids ) {
+            auto tx = my_impl->local_txns.get<by_id>().find( t );
+            if( tx != my_impl->local_txns.end()) {
+               trx_to_send.emplace_back( tx->serialized_txn );
+            }
          }
       }
+      for( const auto& t : trx_to_send ) {
+         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      }
    }
 
    void connection::blk_send_branch() {
@@ -1477,7 +1488,10 @@ namespace eosio {
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
-         note.known_trx.pending = my_impl->local_txns.size();
+         {
+            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+            note.known_trx.pending = my_impl->local_txns.size();
+         }
          c->enqueue( note );
          return;
       }
@@ -1709,9 +1723,12 @@ namespace eosio {
       }
       received_transactions.erase(range.first, range.second);
 
-      if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end() ) { //found
-         fc_dlog(logger, "found trxid in local_trxs" );
-         return;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
+            fc_dlog( logger, "found trxid in local_trxs" );
+            return;
+         }
       }
 
       time_point_sec trx_expiration = ptrx->packed_trx->expiration();
@@ -1720,7 +1737,10 @@ namespace eosio {
       auto buff = create_send_buffer( trx );
 
       node_transaction_state nts = {id, trx_expiration, 0, buff};
-      my_impl->local_txns.insert(std::move(nts));
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         my_impl->local_txns.insert( std::move( nts ));
+      }
 
       my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
          if( skips.find(c) != skips.end() || c->syncing ) {
@@ -2451,6 +2471,7 @@ namespace eosio {
             // plan to get all except what we already know about.
             req.req_trx.mode = catch_up;
             send_req = true;
+            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
             size_t known_sum = local_txns.size();
             if( known_sum ) {
                for( const auto& t : local_txns.get<by_id>() ) {
@@ -2547,6 +2568,7 @@ namespace eosio {
              trx->get_signatures().size() * sizeof(signature_type);
    }
 
+   // called from thread_pool threads
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
       peer_ilog(c, "received packed_transaction");
@@ -2554,36 +2576,47 @@ namespace eosio {
          fc_dlog(logger, "got a txn in read-only mode - dropping");
          return;
       }
-      if( sync_master->is_active(c) ) {
-         fc_dlog(logger, "got a txn during sync - dropping");
-         return;
-      }
 
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
 
-      if(local_txns.get<by_id>().find(tid) != local_txns.end()) {
-         fc_dlog(logger, "got a duplicate transaction - dropping");
-         return;
+      {
+         std::lock_guard<std::mutex> g( local_txns_mtx );
+         if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
+            fc_dlog( logger, "got a duplicate transaction - dropping" );
+            return;
+         }
       }
-      dispatcher->recv_transaction(c, tid);
+      connection_wptr weak_ptr = c;
+      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, tid](){
+         auto c = weak_ptr.lock();
+         dispatcher->recv_transaction(c, tid);
+      });
       c->trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
       chain_plug->accept_transaction(ptrx, [c, this, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
+         bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
             peer_dlog(c, "bad packed_transaction : ${m}", ("m",result.get<fc::exception_ptr>()->what()));
          } else {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
                fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
-               this->dispatcher->bcast_transaction(ptrx);
-               return;
+               accepted = true;
             }
 
-            peer_elog(c, "bad packed_transaction : ${m}", ("m",trace->except->what()));
+            if( !accepted ) {
+               peer_elog( c, "bad packed_transaction : ${m}", ("m", trace->except->what()));
+            }
          }
 
-         dispatcher->rejected_transaction(ptrx->id);
+         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}]() {
+            if( accepted ) {
+               dispatcher->bcast_transaction( ptrx );
+            } else {
+               dispatcher->rejected_transaction( ptrx->id );
+            }
+         });
       });
    }
 
@@ -2634,15 +2667,19 @@ namespace eosio {
 
       update_block_num ubn(blk_num);
       if( reason == no_reason ) {
-         for (const auto &recpt : msg->transactions) {
-            auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>() : recpt.trx.get<packed_transaction>().id();
-            auto ltx = local_txns.get<by_id>().find(id);
-            if( ltx != local_txns.end()) {
-               local_txns.modify( ltx, ubn );
-            }
-            auto ctx = c->trx_state.get<by_id>().find(id);
-            if( ctx != c->trx_state.end()) {
-               c->trx_state.modify( ctx, ubn );
+         {
+            std::lock_guard<std::mutex> g( local_txns_mtx );
+            for( const auto& recpt : msg->transactions ) {
+               auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
+                                                  : recpt.trx.get<packed_transaction>().id();
+               auto ltx = local_txns.get<by_id>().find( id );
+               if( ltx != local_txns.end()) {
+                  local_txns.modify( ltx, ubn );
+               }
+               auto ctx = c->trx_state.get<by_id>().find( id );
+               if( ctx != c->trx_state.end()) {
+                  c->trx_state.modify( ctx, ubn );
+               }
             }
          }
          sync_master->recv_block(c, blk_id, blk_num);
@@ -2711,8 +2748,6 @@ namespace eosio {
       start_txn_timer();
 
       auto now = time_point::now();
-      auto start_size = local_txns.size();
-
       expire_local_txns();
 
       controller& cc = chain_plug->chain();
@@ -2726,20 +2761,29 @@ namespace eosio {
          auto &stale_blk = c->blk_state.get<by_block_num>();
          stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
-      fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
-               ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
+      fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
    }
 
    void net_plugin_impl::expire_local_txns() {
-      auto& old = local_txns.get<by_expiry>();
-      auto ex_lo = old.lower_bound( fc::time_point_sec(0) );
-      auto ex_up = old.upper_bound( time_point::now() );
-      old.erase( ex_lo, ex_up );
-
-      auto& stale = local_txns.get<by_block_num>();
       controller& cc = chain_plug->chain();
       uint32_t lib = cc.last_irreversible_block_num();
-      stale.erase( stale.lower_bound(1), stale.upper_bound(lib) );
+      size_t start_size = 0, end_size = 0;
+
+      {
+         std::lock_guard<std::mutex> g( local_txns_mtx );
+
+         start_size = local_txns.size();
+         auto& old = local_txns.get<by_expiry>();
+         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
+         auto ex_up = old.upper_bound( time_point::now());
+         old.erase( ex_lo, ex_up );
+
+         auto& stale = local_txns.get<by_block_num>();
+         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
+         end_size = local_txns.size();
+      }
+
+      fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)("r", start_size - end_size) );
    }
 
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {

From 93f620f59dca7379554d407a8c474d31a6af0408 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 7 Mar 2019 09:10:13 -0500
Subject: [PATCH 0046/1648] Use unique_lock instead of lock_guard to clean up
 code

---
 plugins/net_plugin/net_plugin.cpp | 120 ++++++++++++++----------------
 1 file changed, 56 insertions(+), 64 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 9e828bbb45d..af00cba06ff 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -521,7 +521,7 @@ namespace eosio {
       uint16_t                protocol_version  = 0;
       string                  peer_addr;
       unique_ptr<boost::asio::steady_timer> response_expected;
-      std::mutex                            read_delay_timer_mutex;
+      std::mutex                            read_delay_timer_mtx;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
@@ -840,25 +840,23 @@ namespace eosio {
       my_impl->sync_master->reset_lib_num(shared_from_this());
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
-      {
-         std::lock_guard<std::mutex> g( read_delay_timer_mutex );
-         if( read_delay_timer ) read_delay_timer->cancel();
-      }
+
+      std::lock_guard<std::mutex> g( read_delay_timer_mtx );
+      if( read_delay_timer ) read_delay_timer->cancel();
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
       const std::set<transaction_id_type, sha256_less> known_ids(ids.cbegin(), ids.cend());
       my_impl->expire_local_txns();
       vector<std::shared_ptr<vector<char>>> trx_to_send;
-      {
-         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-         for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
-            const bool found = known_ids.find( tx->id ) != known_ids.cend();
-            if( !found ) {
-               trx_to_send.emplace_back( tx->serialized_txn );
-            }
+      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
+      for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
+         const bool found = known_ids.find( tx->id ) != known_ids.cend();
+         if( !found ) {
+            trx_to_send.emplace_back( tx->serialized_txn );
          }
       }
+      g.unlock();
       for( const auto& t : trx_to_send ) {
          queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
       }
@@ -866,15 +864,14 @@ namespace eosio {
 
    void connection::txn_send(const vector<transaction_id_type>& ids) {
       vector<std::shared_ptr<vector<char>>> trx_to_send;
-      {
-         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-         for( const auto& t : ids ) {
-            auto tx = my_impl->local_txns.get<by_id>().find( t );
-            if( tx != my_impl->local_txns.end()) {
-               trx_to_send.emplace_back( tx->serialized_txn );
-            }
+      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
+      for( const auto& t : ids ) {
+         auto tx = my_impl->local_txns.get<by_id>().find( t );
+         if( tx != my_impl->local_txns.end()) {
+            trx_to_send.emplace_back( tx->serialized_txn );
          }
       }
+      g.unlock();
       for( const auto& t : trx_to_send ) {
          queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
       }
@@ -1488,10 +1485,9 @@ namespace eosio {
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
-         {
-            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-            note.known_trx.pending = my_impl->local_txns.size();
-         }
+         std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
+         note.known_trx.pending = my_impl->local_txns.size();
+         g.unlock();
          c->enqueue( note );
          return;
       }
@@ -1723,13 +1719,12 @@ namespace eosio {
       }
       received_transactions.erase(range.first, range.second);
 
-      {
-         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-         if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
-            fc_dlog( logger, "found trxid in local_trxs" );
-            return;
-         }
+      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
+      if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
+         fc_dlog( logger, "found trxid in local_trxs" );
+         return;
       }
+      g.unlock();
 
       time_point_sec trx_expiration = ptrx->packed_trx->expiration();
       const packed_transaction& trx = *ptrx->packed_trx;
@@ -1737,10 +1732,9 @@ namespace eosio {
       auto buff = create_send_buffer( trx );
 
       node_transaction_state nts = {id, trx_expiration, 0, buff};
-      {
-         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-         my_impl->local_txns.insert( std::move( nts ));
-      }
+      g.lock();
+      my_impl->local_txns.insert( std::move( nts ));
+      g.unlock();
 
       my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
          if( skips.find(c) != skips.end() || c->syncing ) {
@@ -2096,7 +2090,7 @@ namespace eosio {
                });
                return;
             }
-            std::lock_guard<std::mutex> g( conn->read_delay_timer_mutex );
+            std::lock_guard<std::mutex> g( conn->read_delay_timer_mtx );
             if( !conn->read_delay_timer ) return;
             conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
             conn->read_delay_timer->async_wait(
@@ -2580,13 +2574,12 @@ namespace eosio {
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
 
-      {
-         std::lock_guard<std::mutex> g( local_txns_mtx );
-         if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
-            fc_dlog( logger, "got a duplicate transaction - dropping" );
-            return;
-         }
+      std::unique_lock<std::mutex> g( local_txns_mtx );
+      if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
+         fc_dlog( logger, "got a duplicate transaction - dropping" );
+         return;
       }
+      g.unlock();
       connection_wptr weak_ptr = c;
       app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, tid](){
          auto c = weak_ptr.lock();
@@ -2667,21 +2660,20 @@ namespace eosio {
 
       update_block_num ubn(blk_num);
       if( reason == no_reason ) {
-         {
-            std::lock_guard<std::mutex> g( local_txns_mtx );
-            for( const auto& recpt : msg->transactions ) {
-               auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
-                                                  : recpt.trx.get<packed_transaction>().id();
-               auto ltx = local_txns.get<by_id>().find( id );
-               if( ltx != local_txns.end()) {
-                  local_txns.modify( ltx, ubn );
-               }
-               auto ctx = c->trx_state.get<by_id>().find( id );
-               if( ctx != c->trx_state.end()) {
-                  c->trx_state.modify( ctx, ubn );
-               }
+         std::unique_lock<std::mutex> g( local_txns_mtx );
+         for( const auto& recpt : msg->transactions ) {
+            auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
+                                               : recpt.trx.get<packed_transaction>().id();
+            auto ltx = local_txns.get<by_id>().find( id );
+            if( ltx != local_txns.end()) {
+               local_txns.modify( ltx, ubn );
+            }
+            auto ctx = c->trx_state.get<by_id>().find( id );
+            if( ctx != c->trx_state.end()) {
+               c->trx_state.modify( ctx, ubn );
             }
          }
+         g.unlock();
          sync_master->recv_block(c, blk_id, blk_num);
       }
       else {
@@ -2769,19 +2761,19 @@ namespace eosio {
       uint32_t lib = cc.last_irreversible_block_num();
       size_t start_size = 0, end_size = 0;
 
-      {
-         std::lock_guard<std::mutex> g( local_txns_mtx );
+      std::unique_lock<std::mutex> g( local_txns_mtx );
 
-         start_size = local_txns.size();
-         auto& old = local_txns.get<by_expiry>();
-         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
-         auto ex_up = old.upper_bound( time_point::now());
-         old.erase( ex_lo, ex_up );
+      start_size = local_txns.size();
+      auto& old = local_txns.get<by_expiry>();
+      auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
+      auto ex_up = old.upper_bound( time_point::now());
+      old.erase( ex_lo, ex_up );
 
-         auto& stale = local_txns.get<by_block_num>();
-         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
-         end_size = local_txns.size();
-      }
+      auto& stale = local_txns.get<by_block_num>();
+      stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
+      end_size = local_txns.size();
+
+      g.unlock();
 
       fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)("r", start_size - end_size) );
    }

From c3830f34882cdbc9d4a3ff9e9861c3262fd65d98 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 8 Mar 2019 09:34:05 -0500
Subject: [PATCH 0047/1648] Move creation of future outside post to prevent
 wait on future right after creation

---
 plugins/producer_plugin/producer_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 217f931a532..569fce37dd8 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -352,10 +352,10 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          chain::controller& chain = chain_plug->chain();
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
+         // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+         transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
          auto& tp = *_thread_pool;
-         boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
-            // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
-            transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
+         boost::asio::post( tp, [self = this, trx, persist_until_expired, next]() {
             if( trx->signing_keys_future.valid() )
                trx->signing_keys_future.wait();
             app().post(priority::low, [self, trx, persist_until_expired, next]() {

From a0207ef200928246cb7ccf056da022ea338933d7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 11 Mar 2019 11:36:25 -0500
Subject: [PATCH 0048/1648] Test run with producer thread pool instead of chain
 controller thread pool

---
 plugins/producer_plugin/producer_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 569fce37dd8..50f6c531d0d 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -352,9 +352,9 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          chain::controller& chain = chain_plug->chain();
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
-         // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
-         transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
          auto& tp = *_thread_pool;
+         // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+         transaction_metadata::create_signing_keys_future( trx, tp, chain.get_chain_id(), max_trx_cpu_usage );
          boost::asio::post( tp, [self = this, trx, persist_until_expired, next]() {
             if( trx->signing_keys_future.valid() )
                trx->signing_keys_future.wait();

From a7a588733d0281f4096ea79deea89d3e9e4eb7b8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 11 Mar 2019 15:57:18 -0500
Subject: [PATCH 0049/1648] Combine received_blocks and blck_state. Make
 blck_state thread safe and use it for short-cut out when receiving block.

---
 plugins/net_plugin/net_plugin.cpp | 135 ++++++++++++++++--------------
 1 file changed, 70 insertions(+), 65 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index af00cba06ff..87a925aa519 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -110,6 +110,7 @@ namespace eosio {
       uint32_t                         max_client_count = 0;
       uint32_t                         max_nodes_per_host = 1;
       uint32_t                         num_clients = 0;
+      uint32_t                         current_connection_id = 0;
 
       vector<string>                   supplied_peers;
       vector<chain::public_key_type>   allowed_peers; ///< peer keys allowed to connect
@@ -363,20 +364,24 @@ namespace eosio {
 
       > transaction_state_index;
 
-   /**
-    *
-    */
    struct peer_block_state {
       block_id_type id;
       uint32_t      block_num;
+      uint32_t      connection_id;
    };
 
    typedef multi_index_container<
       eosio::peer_block_state,
       indexed_by<
-         ordered_unique< tag<by_id>, member<eosio::peer_block_state, block_id_type, &eosio::peer_block_state::id >, sha256_less >,
-         ordered_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
-         >
+         ordered_unique< tag<by_id>,
+               composite_key< peer_block_state,
+                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
+                     member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>
+               >,
+               composite_key_compare< sha256_less, std::less<uint32_t> >
+         >,
+         ordered_non_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
+      >
       > peer_block_state_index;
 
 
@@ -498,7 +503,6 @@ namespace eosio {
       ~connection();
       void initialize();
 
-      peer_block_state_index  blk_state;
       transaction_state_index trx_state;
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
@@ -513,6 +517,7 @@ namespace eosio {
       std::atomic<uint32_t>   reads_in_flight{0};
       std::atomic<uint32_t>   trx_in_progress_size{0};
       fc::sha256              node_id;
+      const uint32_t          connection_id;
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
       int16_t                 sent_handshake_count = 0;
@@ -614,9 +619,6 @@ namespace eosio {
                        bool to_sync_queue = false);
       void do_queue_write(int priority);
 
-      bool add_peer_block(const peer_block_state& pbs);
-      bool peer_has_block(const block_id_type& blkid);
-
       fc::optional<fc::variant_object> _logger_variant;
       const fc::variant_object& get_logger_variant()  {
          if (!_logger_variant) {
@@ -722,10 +724,11 @@ namespace eosio {
    };
 
    class dispatch_manager {
-   public:
-      std::multimap<block_id_type, connection_ptr, sha256_less> received_blocks;
+      std::mutex              blk_state_mtx;
+      peer_block_state_index  blk_state;
       std::multimap<transaction_id_type, connection_ptr, sha256_less> received_transactions;
 
+   public:
       void bcast_transaction(const transaction_metadata_ptr& trx);
       void rejected_transaction(const transaction_id_type& msg);
       void bcast_block(const block_state_ptr& bs);
@@ -737,17 +740,21 @@ namespace eosio {
       void recv_notice(const connection_ptr& conn, const notice_message& msg, bool generated);
 
       void retry_fetch(const connection_ptr& conn);
+
+      bool add_peer_block(const peer_block_state& pbs);
+      bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
+      bool have_block(const block_id_type& blkid);
    };
 
    //---------------------------------------------------------------------------
 
    connection::connection( string endpoint )
-      : blk_state(),
-        trx_state(),
+      : trx_state(),
         peer_requested(),
         server_ioc( my_impl->server_ioc ),
         socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
         node_id(),
+        connection_id( ++my_impl->current_connection_id ),
         last_handshake_recv(),
         last_handshake_sent(),
         sent_handshake_count(0),
@@ -767,12 +774,12 @@ namespace eosio {
    }
 
    connection::connection( socket_ptr s )
-      : blk_state(),
-        trx_state(),
+      : trx_state(),
         peer_requested(),
         server_ioc( my_impl->server_ioc ),
         socket( s ),
         node_id(),
+        connection_id( ++my_impl->current_connection_id ),
         last_handshake_recv(),
         last_handshake_sent(),
         sent_handshake_count(0),
@@ -812,7 +819,6 @@ namespace eosio {
 
    void connection::reset() {
       peer_requested.reset();
-      blk_state.clear();
       trx_state.clear();
    }
 
@@ -933,7 +939,7 @@ namespace eosio {
          signed_block_ptr b = cc.fetch_block_by_id(blkid);
          if(b) {
             fc_dlog(logger,"found block for id at num ${n}",("n",b->block_num()));
-            add_peer_block({blkid, block_header::num_from_id(blkid)});
+            my_impl->dispatcher->add_peer_block({blkid, block_header::num_from_id(blkid), connection_id});
             enqueue_block( b );
          } else {
             fc_ilog( logger, "fetch block by id returned null, id ${id} for ${p}",
@@ -1254,20 +1260,6 @@ namespace eosio {
       sync_wait();
    }
 
-   bool connection::add_peer_block(const peer_block_state& entry) {
-      auto bptr = blk_state.get<by_id>().find(entry.id);
-      bool added = (bptr == blk_state.end());
-      if (added){
-         blk_state.insert(entry);
-      }
-      return added;
-   }
-
-   bool connection::peer_has_block( const block_id_type& blkid ) {
-      auto blk_itr = blk_state.get<by_id>().find(blkid);
-      return blk_itr != blk_state.end();
-   }
-
    //-----------------------------------------------------------
 
     sync_manager::sync_manager( uint32_t req_span )
@@ -1645,26 +1637,48 @@ namespace eosio {
 
    //------------------------------------------------------------------------
 
-   void dispatch_manager::bcast_block(const block_state_ptr& bs) {
-      std::set<connection_ptr> skips;
-      auto range = received_blocks.equal_range(bs->id);
-      for (auto org = range.first; org != range.second; ++org) {
-         skips.insert(org->second);
+   bool dispatch_manager::add_peer_block(const peer_block_state& entry) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(entry.id), entry.connection_id));
+      bool added = (bptr == blk_state.end());
+      if (added){
+         blk_state.insert(entry);
       }
-      received_blocks.erase(range.first, range.second);
+      return added;
+   }
 
+   bool dispatch_manager::peer_has_block( const block_id_type& blkid, uint32_t connection_id ) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      auto blk_itr = blk_state.get<by_id>().find(std::make_tuple(std::ref(blkid), connection_id));
+      return blk_itr != blk_state.end();
+   }
+
+   bool dispatch_manager::have_block( const block_id_type& blkid ) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      auto blk_itr = blk_state.get<by_id>().find( blkid );
+      return blk_itr != blk_state.end();
+   }
+
+   void dispatch_manager::expire_blocks( uint32_t lib_num ) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      auto& stale_blk = blk_state.get<by_block_num>();
+      stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib_num) );
+   }
+
+   void dispatch_manager::bcast_block(const block_state_ptr& bs) {
       uint32_t bnum = bs->block_num;
       peer_block_state pbstate{bs->id, bnum};
       fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
 
       std::shared_ptr<std::vector<char>> send_buffer;
       for( auto& cp : my_impl->connections ) {
-         if( skips.find( cp ) != skips.end() || !cp->current() ) {
+         if( !cp->current() ) {
             continue;
          }
          bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
          if( !has_block ) {
-            if( !cp->add_peer_block( pbstate ) ) {
+            pbstate.connection_id = cp->connection_id;
+            if( !add_peer_block( pbstate ) ) {
                continue;
             }
             if( !send_buffer ) {
@@ -1678,7 +1692,8 @@ namespace eosio {
    }
 
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
-      received_blocks.insert(std::make_pair(id, c));
+      peer_block_state pbstate{id, bnum, c->connection_id};
+      add_peer_block( pbstate );
       if (c &&
           c->last_req &&
           c->last_req->req_blocks.mode != none &&
@@ -1693,20 +1708,6 @@ namespace eosio {
 
    void dispatch_manager::rejected_block(const block_id_type& id) {
       fc_dlog( logger, "rejected block ${id}", ("id", id) );
-      auto range = received_blocks.equal_range(id);
-      received_blocks.erase(range.first, range.second);
-   }
-
-   void dispatch_manager::expire_blocks( uint32_t lib_num ) {
-      for( auto i = received_blocks.begin(); i != received_blocks.end(); ) {
-         const block_id_type& blk_id = i->first;
-         uint32_t blk_num = block_header::num_from_id( blk_id );
-         if( blk_num <= lib_num ) {
-            i = received_blocks.erase( i );
-         } else {
-            ++i;
-         }
-      }
    }
 
    void dispatch_manager::bcast_transaction(const transaction_metadata_ptr& ptrx) {
@@ -1795,7 +1796,7 @@ namespace eosio {
             try {
                b = cc.fetch_block_by_id(blkid); // if exists
                if(b) {
-                  c->add_peer_block({blkid, block_header::num_from_id(blkid)});
+                  add_peer_block({blkid, block_header::num_from_id(blkid), c->connection_id});
                }
             } catch (const assert_exception &ex) {
                fc_ilog( logger, "caught assert on fetch_block_by_id, ${ex}",("ex",ex.what()) );
@@ -1851,7 +1852,7 @@ namespace eosio {
             sendit = trx != conn->trx_state.end();
          }
          else {
-            sendit = conn->peer_has_block(bid);
+            sendit = peer_has_block(bid, c->connection_id);
          }
          if (sendit) {
             conn->enqueue(*c->last_req);
@@ -2204,7 +2205,6 @@ namespace eosio {
    bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) {
       try {
          // if next message is a block we already have, exit early
-/*
          auto peek_ds = conn->pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
@@ -2212,16 +2212,23 @@ namespace eosio {
             block_header bh;
             fc::raw::unpack( peek_ds, bh );
 
-            controller& cc = chain_plug->chain();
             block_id_type blk_id = bh.id();
-            uint32_t blk_num = bh.block_num();
-            if( cc.fetch_block_by_id( blk_id ) ) {
-               sync_master->recv_block( conn, blk_id, blk_num );
+            if( dispatcher->have_block( blk_id ) ) {
+               connection_wptr weak = conn;
+               app().post(priority::low,
+                     [dispatcher = dispatcher.get(), sync_master = sync_master.get(), weak{std::move(weak)}, blk_id] {
+                  connection_ptr c = weak.lock();
+                  if(c) {
+                     auto blk_num = block_header::num_from_id(blk_id);
+                     dispatcher->recv_block(c, blk_id, blk_num);
+                     sync_master->recv_block( c, blk_id, blk_num );
+                  }
+               });
                conn->pending_message_buffer.advance_read_ptr( message_length );
                return true;
             }
          }
-*/
+
          auto ds = conn->pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
@@ -2750,8 +2757,6 @@ namespace eosio {
          stale_txn.erase( stale_txn.lower_bound(1), stale_txn.upper_bound(lib) );
          auto &stale_txn_e = c->trx_state.get<by_expiry>();
          stale_txn_e.erase(stale_txn_e.lower_bound(time_point_sec()), stale_txn_e.upper_bound(time_point::now()));
-         auto &stale_blk = c->blk_state.get<by_block_num>();
-         stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
    }

From 4a588b479f292c0b29ecc41f1679f914326f4174 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 13 Mar 2019 13:27:28 -0500
Subject: [PATCH 0050/1648] Avoid tying up a thread to wait on transaction
 future. Also removes likely safe but undefined behavior.

---
 .../eosio/chain/transaction_metadata.hpp      |  7 ++++++-
 libraries/chain/transaction_metadata.cpp      | 19 ++++++++++---------
 plugins/producer_plugin/producer_plugin.cpp   | 12 +++++-------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 6136580fa44..947b557a1d4 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -52,8 +52,13 @@ class transaction_metadata {
 
       const flat_set<public_key_type>& recover_keys( const chain_id_type& chain_id );
 
+      // must be called from main application thread. signing_keys_future must be accessed only from main application thread.
+      // next() should only be called on main application thread after future is valid, to avoid dependency on appbase,
+      // it is up to the caller to have next() post to the application thread which makes sure future is only accessed from
+      // application thread and that assignment to future in this method has completed.
       static void create_signing_keys_future( const transaction_metadata_ptr& mtrx, boost::asio::thread_pool& thread_pool,
-                                              const chain_id_type& chain_id, fc::microseconds time_limit );
+                                              const chain_id_type& chain_id, fc::microseconds time_limit,
+                                              std::function<void()> next = std::function<void()>() );
 
 };
 
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index 482b3c488f7..e9994167aa0 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -24,21 +24,22 @@ const flat_set<public_key_type>& transaction_metadata::recover_keys( const chain
 }
 
 void transaction_metadata::create_signing_keys_future( const transaction_metadata_ptr& mtrx,
-      boost::asio::thread_pool& thread_pool, const chain_id_type& chain_id, fc::microseconds time_limit ) {
-   if( mtrx->signing_keys_future.valid() || mtrx->signing_keys.valid() ) // already created
+      boost::asio::thread_pool& thread_pool, const chain_id_type& chain_id, fc::microseconds time_limit,
+      std::function<void()> next )
+{
+   if( mtrx->signing_keys_future.valid() || mtrx->signing_keys.valid() ) {// already created
+      if( next ) next();
       return;
+   }
 
-   std::weak_ptr<transaction_metadata> mtrx_wp = mtrx;
-   mtrx->signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_wp]() {
+   mtrx->signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx, next{std::move(next)}]() {
       fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
             fc::time_point::maximum() : fc::time_point::now() + time_limit;
-      auto mtrx = mtrx_wp.lock();
       fc::microseconds cpu_usage;
       flat_set<public_key_type> recovered_pub_keys;
-      if( mtrx ) {
-         const signed_transaction& trn = mtrx->packed_trx->get_signed_transaction();
-         cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
-      }
+      const signed_transaction& trn = mtrx->packed_trx->get_signed_transaction();
+      cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
+      if( next ) next();
       return std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ));
    } );
 }
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 50f6c531d0d..68113333f66 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -354,13 +354,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
          auto& tp = *_thread_pool;
          // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
-         transaction_metadata::create_signing_keys_future( trx, tp, chain.get_chain_id(), max_trx_cpu_usage );
-         boost::asio::post( tp, [self = this, trx, persist_until_expired, next]() {
-            if( trx->signing_keys_future.valid() )
-               trx->signing_keys_future.wait();
-            app().post(priority::low, [self, trx, persist_until_expired, next]() {
-               self->process_incoming_transaction_async( trx, persist_until_expired, next );
-            });
+         transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage,
+               [self = this, trx, persist_until_expired, next{std::move(next)}]() mutable {
+                  app().post(priority::low, [self, trx{std::move(trx)}, persist_until_expired, next{std::move(next)}]() {
+                     self->process_incoming_transaction_async( trx, persist_until_expired, next );
+                  });
          });
       }
 

From ef3d282d7e10e9d5753205e980adec36d63c2a62 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 13 Mar 2019 13:38:50 -0500
Subject: [PATCH 0051/1648] Update comment

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 68113333f66..dbc42ed9282 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -353,7 +353,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
          auto& tp = *_thread_pool;
-         // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+         // use chain thread pool for sig recovery
          transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage,
                [self = this, trx, persist_until_expired, next{std::move(next)}]() mutable {
                   app().post(priority::low, [self, trx{std::move(trx)}, persist_until_expired, next{std::move(next)}]() {

From 94cba19779392b8adb2420e89e35340d9f1380ae Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 14 Mar 2019 09:22:04 -0500
Subject: [PATCH 0052/1648] Assign future on main application thread

---
 plugins/producer_plugin/producer_plugin.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index dbc42ed9282..6f81308aa83 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -352,13 +352,18 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          chain::controller& chain = chain_plug->chain();
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
-         auto& tp = *_thread_pool;
-         // use chain thread pool for sig recovery
-         transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage,
+
+         auto after_sig_recovery =
                [self = this, trx, persist_until_expired, next{std::move(next)}]() mutable {
                   app().post(priority::low, [self, trx{std::move(trx)}, persist_until_expired, next{std::move(next)}]() {
                      self->process_incoming_transaction_async( trx, persist_until_expired, next );
                   });
+               };
+
+         app().post(priority::low, [trx, &chain, max_trx_cpu_usage, after_sig_recovery{std::move(after_sig_recovery)}]() mutable {
+            // use chain thread pool for sig recovery
+            transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(),
+                                                              max_trx_cpu_usage, std::move( after_sig_recovery ) );
          });
       }
 

From b9af7286c7236d2916d45b95a06454a5805af8dc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 14 Mar 2019 12:37:34 -0500
Subject: [PATCH 0053/1648] Acquire lib via lib channel. Make
 expire_local_txns() thread safe.

---
 plugins/net_plugin/net_plugin.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 87a925aa519..a8ade80f317 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -28,7 +28,7 @@
 
 #include <atomic>
 
-using namespace eosio::chain::plugin_interface::compat;
+using namespace eosio::chain::plugin_interface;
 
 namespace fc {
    extern std::unordered_map<std::string,logger>& get_logger_map();
@@ -146,6 +146,7 @@ namespace eosio {
       bool                          network_version_match = false;
       chain_id_type                 chain_id;
       fc::sha256                    node_id;
+      std::atomic<uint32_t>         lib_num{0};
       eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
       string                        user_agent_name;
@@ -160,7 +161,8 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
-      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+      compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+      channels::irreversible_block::channel_type::handle       incoming_irreversible_block_subscription;
 
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
@@ -192,6 +194,9 @@ namespace eosio {
 
       void accepted_block(const block_state_ptr&);
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
+      void on_irreversible_block( const block_state_ptr& blk ) {
+         lib_num = blk->block_num;
+      }
 
       bool is_valid( const handshake_message &msg);
 
@@ -2749,10 +2754,9 @@ namespace eosio {
       auto now = time_point::now();
       expire_local_txns();
 
-      controller& cc = chain_plug->chain();
-      uint32_t lib = cc.last_irreversible_block_num();
+      uint32_t lib = lib_num.load();
       dispatcher->expire_blocks( lib );
-      for ( auto &c : connections ) {
+      for ( auto& c : connections ) {
          auto &stale_txn = c->trx_state.get<by_block_num>();
          stale_txn.erase( stale_txn.lower_bound(1), stale_txn.upper_bound(lib) );
          auto &stale_txn_e = c->trx_state.get<by_expiry>();
@@ -2761,9 +2765,9 @@ namespace eosio {
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
    }
 
+   // thread safe
    void net_plugin_impl::expire_local_txns() {
-      controller& cc = chain_plug->chain();
-      uint32_t lib = cc.last_irreversible_block_num();
+      uint32_t lib = lib_num.load();
       size_t start_size = 0, end_size = 0;
 
       std::unique_lock<std::mutex> g( local_txns_mtx );
@@ -3151,7 +3155,12 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
-      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
+      my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
+            boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
+      my->incoming_irreversible_block_subscription = app().get_channel<channels::irreversible_block>().subscribe(
+            [this]( block_state_ptr s ) {
+               my->on_irreversible_block( s );
+            });
 
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {

From afbcf5af65d8bd8662ad99fe93324dba9b74b05c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 12 Mar 2019 14:18:21 -0500
Subject: [PATCH 0054/1648] Remove unneeded request for arbitrary list of
 transactions

---
 plugins/net_plugin/net_plugin.cpp | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a8ade80f317..eff2a983382 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -595,7 +595,6 @@ namespace eosio {
       const string peer_name();
 
       void txn_send_pending(const vector<transaction_id_type>& ids);
-      void txn_send(const vector<transaction_id_type>& txn_lis);
 
       void blk_send_branch();
       void blk_send(const block_id_type& blkid);
@@ -873,21 +872,6 @@ namespace eosio {
       }
    }
 
-   void connection::txn_send(const vector<transaction_id_type>& ids) {
-      vector<std::shared_ptr<vector<char>>> trx_to_send;
-      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
-      for( const auto& t : ids ) {
-         auto tx = my_impl->local_txns.get<by_id>().find( t );
-         if( tx != my_impl->local_txns.end()) {
-            trx_to_send.emplace_back( tx->serialized_txn );
-         }
-      }
-      g.unlock();
-      for( const auto& t : trx_to_send ) {
-         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
-      }
-   }
-
    void connection::blk_send_branch() {
       controller& cc = my_impl->chain_plug->chain();
       uint32_t head_num = cc.fork_db_head_block_num();
@@ -2480,6 +2464,7 @@ namespace eosio {
             std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
             size_t known_sum = local_txns.size();
             if( known_sum ) {
+               expire_local_txns();
                for( const auto& t : local_txns.get<by_id>() ) {
                   req.req_trx.ids.push_back( t.id );
                }
@@ -2545,12 +2530,16 @@ namespace eosio {
       case catch_up :
          c->txn_send_pending(msg.req_trx.ids);
          break;
-      case normal :
-         c->txn_send(msg.req_trx.ids);
-         break;
       case none :
          if(msg.req_blocks.mode == none)
             c->stop_send();
+         // no break
+      case normal :
+         if( !msg.req_trx.ids.empty() ) {
+            elog( "Invalid request_message, req_trx.ids.size ${s}", ("s", msg.req_trx.ids.size()) );
+            close(c);
+            return;
+         }
          break;
       default:;
       }

From 2bd622003ae6384bcbbe0be6957332e7701230b7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 13 Mar 2019 14:19:32 -0500
Subject: [PATCH 0055/1648] Remove txn_send_pending to avoid large # trxs at
 end of sync

---
 plugins/net_plugin/net_plugin.cpp | 33 -------------------------------
 1 file changed, 33 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index eff2a983382..8ddc22b34cc 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -594,8 +594,6 @@ namespace eosio {
 
       const string peer_name();
 
-      void txn_send_pending(const vector<transaction_id_type>& ids);
-
       void blk_send_branch();
       void blk_send(const block_id_type& blkid);
       void stop_send();
@@ -855,23 +853,6 @@ namespace eosio {
       if( read_delay_timer ) read_delay_timer->cancel();
    }
 
-   void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
-      const std::set<transaction_id_type, sha256_less> known_ids(ids.cbegin(), ids.cend());
-      my_impl->expire_local_txns();
-      vector<std::shared_ptr<vector<char>>> trx_to_send;
-      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
-      for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
-         const bool found = known_ids.find( tx->id ) != known_ids.cend();
-         if( !found ) {
-            trx_to_send.emplace_back( tx->serialized_txn );
-         }
-      }
-      g.unlock();
-      for( const auto& t : trx_to_send ) {
-         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
-      }
-   }
-
    void connection::blk_send_branch() {
       controller& cc = my_impl->chain_plug->chain();
       uint32_t head_num = cc.fork_db_head_block_num();
@@ -2457,19 +2438,6 @@ namespace eosio {
          break;
       }
       case catch_up : {
-         if( msg.known_trx.pending > 0) {
-            // plan to get all except what we already know about.
-            req.req_trx.mode = catch_up;
-            send_req = true;
-            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-            size_t known_sum = local_txns.size();
-            if( known_sum ) {
-               expire_local_txns();
-               for( const auto& t : local_txns.get<by_id>() ) {
-                  req.req_trx.ids.push_back( t.id );
-               }
-            }
-         }
          break;
       }
       case normal: {
@@ -2528,7 +2496,6 @@ namespace eosio {
 
       switch (msg.req_trx.mode) {
       case catch_up :
-         c->txn_send_pending(msg.req_trx.ids);
          break;
       case none :
          if(msg.req_blocks.mode == none)

From d882f464d896954ac70f3be9b918b47279c71a47 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 14 Mar 2019 13:15:20 -0500
Subject: [PATCH 0056/1648] Remove dead code

---
 plugins/net_plugin/net_plugin.cpp | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8ddc22b34cc..d229b459277 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1724,13 +1724,6 @@ namespace eosio {
 
    void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_id_type& id) {
       received_transactions.insert(std::make_pair(id, c));
-      if (c &&
-          c->last_req &&
-          c->last_req->req_trx.mode != none &&
-          !c->last_req->req_trx.ids.empty() &&
-          c->last_req->req_trx.ids.back() == id) {
-         c->last_req.reset();
-      }
 
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
@@ -1797,17 +1790,10 @@ namespace eosio {
          return;
       }
       fc_wlog( logger, "failed to fetch from ${p}",("p",c->peer_name()));
-      transaction_id_type tid;
       block_id_type bid;
-      bool is_txn = false;
-      if( c->last_req->req_trx.mode == normal && !c->last_req->req_trx.ids.empty() ) {
-         is_txn = true;
-         tid = c->last_req->req_trx.ids.back();
-      }
-      else if( c->last_req->req_blocks.mode == normal && !c->last_req->req_blocks.ids.empty() ) {
+      if( c->last_req->req_blocks.mode == normal && !c->last_req->req_blocks.ids.empty() ) {
          bid = c->last_req->req_blocks.ids.back();
-      }
-      else {
+      } else {
          fc_wlog( logger,"no retry, block mpde = ${b} trx mode = ${t}",
                   ("b",modes_str(c->last_req->req_blocks.mode))("t",modes_str(c->last_req->req_trx.mode)));
          return;
@@ -1816,14 +1802,7 @@ namespace eosio {
          if (conn == c || conn->last_req) {
             continue;
          }
-         bool sendit = false;
-         if (is_txn) {
-            auto trx = conn->trx_state.get<by_id>().find(tid);
-            sendit = trx != conn->trx_state.end();
-         }
-         else {
-            sendit = peer_has_block(bid, c->connection_id);
-         }
+         bool sendit = peer_has_block( bid, c->connection_id );
          if (sendit) {
             conn->enqueue(*c->last_req);
             conn->fetch_wait();

From dcc0ea480f8a18cef453f1e01390b51c6c237bf4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 14 Mar 2019 14:03:58 -0500
Subject: [PATCH 0057/1648] Remove dead code including serialized transaction

---
 plugins/net_plugin/net_plugin.cpp | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d229b459277..72b29be6c56 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -63,7 +63,6 @@ namespace eosio {
       transaction_id_type id;
       time_point_sec  expires;  /// time after which this may be purged.
       uint32_t        block_num = 0; /// block transaction was included in
-      std::shared_ptr<vector<char>>   serialized_txn; /// the received raw bundle
    };
 
    struct by_expiry;
@@ -722,7 +721,7 @@ namespace eosio {
       void rejected_block(const connection_ptr& c, uint32_t blk_num);
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
-      void recv_notice(const connection_ptr& c, const notice_message& msg);
+      void sync_recv_notice( const connection_ptr& c, const notice_message& msg);
    };
 
    class dispatch_manager {
@@ -1447,9 +1446,7 @@ namespace eosio {
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
-         std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
-         note.known_trx.pending = my_impl->local_txns.size();
-         g.unlock();
+         note.known_trx.pending = 0;
          c->enqueue( note );
          return;
       }
@@ -1523,8 +1520,10 @@ namespace eosio {
       c->enqueue( req );
    }
 
-   void sync_manager::recv_notice(const connection_ptr& c, const notice_message& msg) {
+   void sync_manager::sync_recv_notice( const connection_ptr& c, const notice_message& msg) {
       fc_ilog(logger, "sync_manager got ${m} block notice",("m",modes_str(msg.known_blocks.mode)));
+      EOS_ASSERT( msg.known_blocks.mode == catch_up || msg.known_blocks.mode == last_irr_catch_up, plugin_exception,
+                  "sync_recv_notice only called on catch_up" );
       if( msg.known_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
                   ("s", msg.known_blocks.ids.size())("p", c->peer_name()) );
@@ -1537,8 +1536,7 @@ namespace eosio {
          } else {
             verify_catchup(c, msg.known_blocks.pending, msg.known_blocks.ids.back());
          }
-      }
-      else {
+      } else if (msg.known_blocks.mode == last_irr_catch_up) {
          c->last_handshake_recv.last_irreversible_block_num = msg.known_trx.pending;
          reset_lib_num(c);
          start_sync(c, msg.known_trx.pending);
@@ -1692,21 +1690,18 @@ namespace eosio {
 
       std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
       if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
+         g.unlock();
          fc_dlog( logger, "found trxid in local_trxs" );
          return;
       }
+      time_point_sec trx_expiration = ptrx->packed_trx->expiration();
+      node_transaction_state nts = {id, trx_expiration, 0};
+      my_impl->local_txns.insert( std::move( nts ));
       g.unlock();
 
-      time_point_sec trx_expiration = ptrx->packed_trx->expiration();
       const packed_transaction& trx = *ptrx->packed_trx;
-
       auto buff = create_send_buffer( trx );
 
-      node_transaction_state nts = {id, trx_expiration, 0, buff};
-      g.lock();
-      my_impl->local_txns.insert( std::move( nts ));
-      g.unlock();
-
       my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
          if( skips.find(c) != skips.end() || c->syncing ) {
             return false;
@@ -2433,7 +2428,7 @@ namespace eosio {
       }
       case last_irr_catch_up:
       case catch_up: {
-         sync_master->recv_notice(c,msg);
+         sync_master->sync_recv_notice(c,msg);
          break;
       }
       case normal : {
@@ -2523,6 +2518,7 @@ namespace eosio {
 
       std::unique_lock<std::mutex> g( local_txns_mtx );
       if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
+         g.unlock();
          fc_dlog( logger, "got a duplicate transaction - dropping" );
          return;
       }

From 219b2ac1a601151d4ce94d4e7233f0fd24365fdf Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 08:58:06 -0500
Subject: [PATCH 0058/1648] Consolidate transaction tracking, reducing memory
 requirements and making thread safe.

---
 plugins/net_plugin/net_plugin.cpp | 467 ++++++++++++++----------------
 1 file changed, 218 insertions(+), 249 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 72b29be6c56..0405832d481 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -50,9 +50,6 @@ namespace eosio {
 
    class connection;
 
-   class sync_manager;
-   class dispatch_manager;
-
    using connection_ptr = std::shared_ptr<connection>;
    using connection_wptr = std::weak_ptr<connection>;
 
@@ -61,8 +58,9 @@ namespace eosio {
 
    struct node_transaction_state {
       transaction_id_type id;
-      time_point_sec  expires;  /// time after which this may be purged.
-      uint32_t        block_num = 0; /// block transaction was included in
+      time_point_sec  expires;        /// time after which this may be purged.
+      uint32_t        block_num = 0;  /// block transaction was included in
+      uint32_t        connection_id = 0;
    };
 
    struct by_expiry;
@@ -80,26 +78,119 @@ namespace eosio {
       node_transaction_state,
       indexed_by<
          ordered_unique<
-            tag< by_id >,
-            member < node_transaction_state,
-                     transaction_id_type,
-                     &node_transaction_state::id >,
-            sha256_less >,
+            tag<by_id>,
+            composite_key< node_transaction_state,
+               member<node_transaction_state, transaction_id_type, &node_transaction_state::id>,
+               member<node_transaction_state, uint32_t, &node_transaction_state::connection_id>
+            >,
+            composite_key_compare< sha256_less, std::less<uint32_t> >
+         >,
          ordered_non_unique<
             tag< by_expiry >,
-            member< node_transaction_state,
-                    fc::time_point_sec,
-                    &node_transaction_state::expires >
-            >,
+            member< node_transaction_state, fc::time_point_sec, &node_transaction_state::expires > >,
          ordered_non_unique<
             tag<by_block_num>,
-            member< node_transaction_state,
-                    uint32_t,
-                    &node_transaction_state::block_num > >
+            member< node_transaction_state, uint32_t, &node_transaction_state::block_num > >
          >
       >
    node_transaction_index;
 
+   struct peer_block_state {
+      block_id_type id;
+      uint32_t      block_num = 0;
+      uint32_t      connection_id = 0;
+   };
+
+   typedef multi_index_container<
+      eosio::peer_block_state,
+      indexed_by<
+         ordered_unique< tag<by_id>,
+               composite_key< peer_block_state,
+                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
+                     member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>
+               >,
+               composite_key_compare< sha256_less, std::less<uint32_t> >
+         >,
+         ordered_non_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
+      >
+      > peer_block_state_index;
+
+
+   struct update_block_num {
+      uint32_t new_bnum;
+      update_block_num(uint32_t bnum) : new_bnum(bnum) {}
+      void operator() (node_transaction_state& nts) {
+         nts.block_num = new_bnum;
+      }
+   };
+
+   class sync_manager {
+   private:
+      enum stages {
+         lib_catchup,
+         head_catchup,
+         in_sync
+      };
+
+      uint32_t       sync_known_lib_num;
+      uint32_t       sync_last_requested_num;
+      uint32_t       sync_next_expected_num;
+      uint32_t       sync_req_span;
+      connection_ptr source;
+      stages         state;
+
+      chain_plugin* chain_plug = nullptr;
+
+      constexpr static auto stage_str(stages s);
+
+   public:
+      explicit sync_manager(uint32_t span);
+      void set_state(stages s);
+      bool sync_required();
+      void send_handshakes();
+      bool is_active(const connection_ptr& conn);
+      void reset_lib_num(const connection_ptr& conn);
+      void request_next_chunk(const connection_ptr& conn = connection_ptr());
+      void start_sync(const connection_ptr& c, uint32_t target);
+      void reassign_fetch(const connection_ptr& c, go_away_reason reason);
+      void verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id);
+      void rejected_block(const connection_ptr& c, uint32_t blk_num);
+      void sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
+      void recv_handshake(const connection_ptr& c, const handshake_message& msg);
+      void sync_recv_notice( const connection_ptr& c, const notice_message& msg);
+   };
+
+   class dispatch_manager {
+      std::mutex              blk_state_mtx;
+      peer_block_state_index  blk_state;
+      std::mutex              local_txns_mtx;
+      node_transaction_index  local_txns;
+
+   public:
+      void bcast_transaction(const transaction_metadata_ptr& trx);
+      void rejected_transaction(const transaction_id_type& msg, uint32_t head_blk_num);
+      void bcast_block(const block_state_ptr& bs);
+      void rejected_block(const block_id_type& id);
+
+      void recv_block(const connection_ptr& conn, const block_id_type& msg, uint32_t bnum);
+      void expire_blocks( uint32_t bnum );
+      void recv_transaction(const connection_ptr& conn, const transaction_metadata_ptr& txn);
+      void recv_notice(const connection_ptr& conn, const notice_message& msg, bool generated);
+
+      void retry_fetch(const connection_ptr& conn);
+
+      bool add_peer_block(const peer_block_state& pbs);
+      bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
+      bool have_block(const block_id_type& blkid);
+
+      bool add_peer_txn( const node_transaction_state& nts );
+      void update_txns_block_num( const signed_block_ptr& sb );
+      void update_txns_block_num( const transaction_id_type& id, uint32_t blk_num );
+      bool peer_has_txn( const transaction_id_type& tid, uint32_t connection_id );
+      bool have_txn( const transaction_id_type& tid );
+      void expire_txns( uint32_t lib_num );
+   };
+
    class net_plugin_impl {
    public:
       unique_ptr<tcp::acceptor>        acceptor;
@@ -146,6 +237,7 @@ namespace eosio {
       chain_id_type                 chain_id;
       fc::sha256                    node_id;
       std::atomic<uint32_t>         lib_num{0};
+      uint32_t                      head_blk_num{0};
       eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
       string                        user_agent_name;
@@ -153,9 +245,6 @@ namespace eosio {
       producer_plugin*              producer_plug = nullptr;
       int                           started_sessions = 0;
 
-      std::mutex                    local_txns_mtx;
-      node_transaction_index        local_txns;
-
       shared_ptr<tcp::resolver>     resolver;
 
       bool                          use_socket_read_watermark = false;
@@ -188,13 +277,12 @@ namespace eosio {
       void close(const connection_ptr& c);
       size_t count_open_sockets() const;
 
-      template<typename VerifierFunc>
-      void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
-
       void accepted_block(const block_state_ptr&);
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
       void on_irreversible_block( const block_state_ptr& blk ) {
          lib_num = blk->block_num;
+         controller& cc = chain_plug->chain();
+         head_blk_num = cc.head_block_num();
       }
 
       bool is_valid( const handshake_message &msg);
@@ -230,7 +318,6 @@ namespace eosio {
       void start_monitors();
 
       void expire_txns();
-      void expire_local_txns();
       void connection_monitor(std::weak_ptr<connection> from_connection);
       /** \name Peer Timestamps
        *  Time message handling
@@ -348,58 +435,6 @@ namespace eosio {
 
    constexpr uint16_t net_version = proto_explicit_sync;
 
-   struct transaction_state {
-      transaction_id_type id;
-      uint32_t            block_num = 0; ///< the block number the transaction was included in
-      time_point_sec      expires;
-   };
-
-   typedef multi_index_container<
-      transaction_state,
-      indexed_by<
-         ordered_unique< tag<by_id>, member<transaction_state, transaction_id_type, &transaction_state::id >, sha256_less >,
-         ordered_non_unique< tag< by_expiry >, member< transaction_state,fc::time_point_sec,&transaction_state::expires >>,
-         ordered_non_unique<
-            tag<by_block_num>,
-            member< transaction_state,
-                    uint32_t,
-                    &transaction_state::block_num > >
-         >
-
-      > transaction_state_index;
-
-   struct peer_block_state {
-      block_id_type id;
-      uint32_t      block_num;
-      uint32_t      connection_id;
-   };
-
-   typedef multi_index_container<
-      eosio::peer_block_state,
-      indexed_by<
-         ordered_unique< tag<by_id>,
-               composite_key< peer_block_state,
-                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
-                     member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>
-               >,
-               composite_key_compare< sha256_less, std::less<uint32_t> >
-         >,
-         ordered_non_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
-      >
-      > peer_block_state_index;
-
-
-   struct update_block_num {
-      uint32_t new_bnum;
-      update_block_num(uint32_t bnum) : new_bnum(bnum) {}
-      void operator() (node_transaction_state& nts) {
-         nts.block_num = new_bnum;
-      }
-      void operator() (transaction_state& ts) {
-         ts.block_num = new_bnum;
-      }
-   };
-
    /**
     * Index by start_block_num
     */
@@ -507,7 +542,6 @@ namespace eosio {
       ~connection();
       void initialize();
 
-      transaction_state_index trx_state;
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
       socket_ptr              socket;
@@ -688,70 +722,10 @@ namespace eosio {
       }
    };
 
-   class sync_manager {
-   private:
-      enum stages {
-         lib_catchup,
-         head_catchup,
-         in_sync
-      };
-
-      uint32_t       sync_known_lib_num;
-      uint32_t       sync_last_requested_num;
-      uint32_t       sync_next_expected_num;
-      uint32_t       sync_req_span;
-      connection_ptr source;
-      stages         state;
-
-      chain_plugin* chain_plug = nullptr;
-
-      constexpr static auto stage_str(stages s);
-
-   public:
-      explicit sync_manager(uint32_t span);
-      void set_state(stages s);
-      bool sync_required();
-      void send_handshakes();
-      bool is_active(const connection_ptr& conn);
-      void reset_lib_num(const connection_ptr& conn);
-      void request_next_chunk(const connection_ptr& conn = connection_ptr());
-      void start_sync(const connection_ptr& c, uint32_t target);
-      void reassign_fetch(const connection_ptr& c, go_away_reason reason);
-      void verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id);
-      void rejected_block(const connection_ptr& c, uint32_t blk_num);
-      void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
-      void recv_handshake(const connection_ptr& c, const handshake_message& msg);
-      void sync_recv_notice( const connection_ptr& c, const notice_message& msg);
-   };
-
-   class dispatch_manager {
-      std::mutex              blk_state_mtx;
-      peer_block_state_index  blk_state;
-      std::multimap<transaction_id_type, connection_ptr, sha256_less> received_transactions;
-
-   public:
-      void bcast_transaction(const transaction_metadata_ptr& trx);
-      void rejected_transaction(const transaction_id_type& msg);
-      void bcast_block(const block_state_ptr& bs);
-      void rejected_block(const block_id_type& id);
-
-      void recv_block(const connection_ptr& conn, const block_id_type& msg, uint32_t bnum);
-      void expire_blocks( uint32_t bnum );
-      void recv_transaction(const connection_ptr& conn, const transaction_id_type& id);
-      void recv_notice(const connection_ptr& conn, const notice_message& msg, bool generated);
-
-      void retry_fetch(const connection_ptr& conn);
-
-      bool add_peer_block(const peer_block_state& pbs);
-      bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
-      bool have_block(const block_id_type& blkid);
-   };
-
    //---------------------------------------------------------------------------
 
    connection::connection( string endpoint )
-      : trx_state(),
-        peer_requested(),
+      : peer_requested(),
         server_ioc( my_impl->server_ioc ),
         socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
         node_id(),
@@ -775,8 +749,7 @@ namespace eosio {
    }
 
    connection::connection( socket_ptr s )
-      : trx_state(),
-        peer_requested(),
+      : peer_requested(),
         server_ioc( my_impl->server_ioc ),
         socket( s ),
         node_id(),
@@ -820,7 +793,6 @@ namespace eosio {
 
    void connection::reset() {
       peer_requested.reset();
-      trx_state.clear();
    }
 
    void connection::flush_queues() {
@@ -1553,7 +1525,7 @@ namespace eosio {
          send_handshakes();
       }
    }
-   void sync_manager::recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
+   void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
       fc_dlog(logger, "got block ${bn} from ${p}",("bn",blk_num)("p",c->peer_name()));
       if (state == lib_catchup) {
          if (blk_num != sync_next_expected_num) {
@@ -1627,6 +1599,68 @@ namespace eosio {
       return blk_itr != blk_state.end();
    }
 
+   bool dispatch_manager::add_peer_txn( const node_transaction_state& nts ) {
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      auto tptr = local_txns.get<by_id>().find( std::make_tuple( std::ref( nts.id ), nts.connection_id ) );
+      bool added = (tptr == local_txns.end());
+      if( added ) {
+         local_txns.insert( nts );
+      }
+      return added;
+   }
+
+   void dispatch_manager::update_txns_block_num( const signed_block_ptr& sb ) {
+      update_block_num ubn( sb->block_num() );
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      for( const auto& recpt : sb->transactions ) {
+         const transaction_id_type& id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
+                                                                  : recpt.trx.get<packed_transaction>().id();
+         auto range = local_txns.get<by_id>().equal_range( id );
+         for( auto itr = range.first; itr != range.second; ++itr ) {
+            local_txns.modify( itr, ubn );
+         }
+      }
+   }
+
+   void dispatch_manager::update_txns_block_num( const transaction_id_type& id, uint32_t blk_num ) {
+      update_block_num ubn( blk_num );
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      auto range = local_txns.get<by_id>().equal_range( id );
+      for( auto itr = range.first; itr != range.second; ++itr ) {
+         local_txns.modify( itr, ubn );
+      }
+   }
+
+   bool dispatch_manager::peer_has_txn( const transaction_id_type& tid, uint32_t connection_id ) {
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      auto tptr = local_txns.get<by_id>().find( std::make_tuple( std::ref( tid ), connection_id ) );
+      return tptr != local_txns.end();
+   }
+
+   bool dispatch_manager::have_txn( const transaction_id_type& tid ) {
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      auto tptr = local_txns.get<by_id>().find( tid );
+      return tptr != local_txns.end();
+   }
+
+   void dispatch_manager::expire_txns( uint32_t lib_num ) {
+      size_t start_size = 0, end_size = 0;
+      {
+         std::lock_guard<std::mutex> g( local_txns_mtx );
+
+         start_size = local_txns.size();
+         auto& old = local_txns.get<by_expiry>();
+         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ) );
+         auto ex_up = old.upper_bound( time_point::now() );
+         old.erase( ex_lo, ex_up );
+
+         auto& stale = local_txns.get<by_block_num>();
+         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib_num ) );
+         end_size = local_txns.size();
+      }
+      fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)( "r", start_size - end_size ) );
+   }
+
    void dispatch_manager::expire_blocks( uint32_t lib_num ) {
       std::lock_guard<std::mutex> g(blk_state_mtx);
       auto& stale_blk = blk_state.get<by_block_num>();
@@ -1679,55 +1713,41 @@ namespace eosio {
    }
 
    void dispatch_manager::bcast_transaction(const transaction_metadata_ptr& ptrx) {
-      std::set<connection_ptr> skips;
       const auto& id = ptrx->id;
-
-      auto range = received_transactions.equal_range(id);
-      for (auto org = range.first; org != range.second; ++org) {
-         skips.insert(org->second);
-      }
-      received_transactions.erase(range.first, range.second);
-
-      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
-      if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
-         g.unlock();
-         fc_dlog( logger, "found trxid in local_trxs" );
-         return;
-      }
-      time_point_sec trx_expiration = ptrx->packed_trx->expiration();
-      node_transaction_state nts = {id, trx_expiration, 0};
-      my_impl->local_txns.insert( std::move( nts ));
-      g.unlock();
-
       const packed_transaction& trx = *ptrx->packed_trx;
-      auto buff = create_send_buffer( trx );
+      time_point_sec trx_expiration = trx.expiration();
+      node_transaction_state nts = {id, trx_expiration, 0, 0};
 
-      my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
-         if( skips.find(c) != skips.end() || c->syncing ) {
-            return false;
-          }
-          const auto& bs = c->trx_state.find(id);
-          bool unknown = bs == c->trx_state.end();
-          if( unknown ) {
-             c->trx_state.insert(transaction_state({id,0,trx_expiration}));
-             fc_dlog(logger, "sending trx to ${n}", ("n",c->peer_name() ) );
-          }
-          return unknown;
-      });
+      std::shared_ptr<std::vector<char>> send_buffer;
+      for( auto& cp : my_impl->connections ) {
+         if( !cp->current() ) {
+            continue;
+         }
+         if( !add_peer_txn(nts) ) {
+            continue;
+         }
+         if( !send_buffer ) {
+            send_buffer = create_send_buffer( trx );
+         }
 
+         fc_dlog(logger, "sending trx to ${n}", ("n", cp->peer_name() ) );
+         cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
+      }
    }
 
-   void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_id_type& id) {
-      received_transactions.insert(std::make_pair(id, c));
+   void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_metadata_ptr& txn) {
+      node_transaction_state nts = {txn->id, txn->packed_trx->expiration(), 0, c->connection_id};
+      add_peer_txn( nts );
 
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
    }
 
-   void dispatch_manager::rejected_transaction(const transaction_id_type& id) {
-      fc_dlog(logger,"not sending rejected transaction ${tid}",("tid",id));
-      auto range = received_transactions.equal_range(id);
-      received_transactions.erase(range.first, range.second);
+   void dispatch_manager::rejected_transaction(const transaction_id_type& id, uint32_t head_blk_num) {
+      fc_dlog( logger, "not sending rejected transaction ${tid}", ("tid", id) );
+      // keep rejected transaction around for awhile so we don't broadcast it
+      // update its block number so it will be purged when current block number is lib
+      update_txns_block_num( id, head_blk_num );
    }
 
    void dispatch_manager::recv_notice(const connection_ptr& c, const notice_message& msg, bool generated) {
@@ -2165,7 +2185,7 @@ namespace eosio {
                   if(c) {
                      auto blk_num = block_header::num_from_id(blk_id);
                      dispatcher->recv_block(c, blk_id, blk_num);
-                     sync_master->recv_block( c, blk_id, blk_num );
+                     sync_master->sync_recv_block( c, blk_id, blk_num );
                   }
                });
                conn->pending_message_buffer.advance_read_ptr( message_length );
@@ -2203,16 +2223,6 @@ namespace eosio {
       return count;
    }
 
-
-   template<typename VerifierFunc>
-   void net_plugin_impl::send_transaction_to_all(const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify) {
-      for( auto &c : connections) {
-         if( c->current() && verify( c )) {
-            c->enqueue_buffer( send_buffer, true, priority::low, no_reason );
-         }
-      }
-   }
-
    bool net_plugin_impl::is_valid(const handshake_message& msg) {
       // Do some basic validation of an incoming handshake_message, so things
       // that really aren't handshake messages can be quickly discarded without
@@ -2516,18 +2526,17 @@ namespace eosio {
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
 
-      std::unique_lock<std::mutex> g( local_txns_mtx );
-      if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
-         g.unlock();
-         fc_dlog( logger, "got a duplicate transaction - dropping" );
-         return;
-      }
-      g.unlock();
+      bool have_trx = dispatcher->have_txn( tid );
       connection_wptr weak_ptr = c;
-      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, tid](){
+      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, ptrx](){
          auto c = weak_ptr.lock();
-         dispatcher->recv_transaction(c, tid);
+         dispatcher->recv_transaction(c, ptrx);
       });
+      if( have_trx ) {
+         fc_dlog( logger, "got a duplicate transaction - dropping" );
+         return;
+      }
+
       c->trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
       chain_plug->accept_transaction(ptrx, [c, this, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
@@ -2546,11 +2555,11 @@ namespace eosio {
             }
          }
 
-         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}]() {
+         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}, head_blk_num = this->head_blk_num]() {
             if( accepted ) {
                dispatcher->bcast_transaction( ptrx );
             } else {
-               dispatcher->rejected_transaction( ptrx->id );
+               dispatcher->rejected_transaction( ptrx->id, head_blk_num );
             }
          });
       });
@@ -2565,7 +2574,7 @@ namespace eosio {
 
       try {
          if( cc.fetch_block_by_id(blk_id) ) {
-            sync_master->recv_block(c, blk_id, blk_num);
+            sync_master->sync_recv_block(c, blk_id, blk_num);
             return;
          }
       } catch( ...) {
@@ -2603,21 +2612,10 @@ namespace eosio {
 
       update_block_num ubn(blk_num);
       if( reason == no_reason ) {
-         std::unique_lock<std::mutex> g( local_txns_mtx );
-         for( const auto& recpt : msg->transactions ) {
-            auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
-                                               : recpt.trx.get<packed_transaction>().id();
-            auto ltx = local_txns.get<by_id>().find( id );
-            if( ltx != local_txns.end()) {
-               local_txns.modify( ltx, ubn );
-            }
-            auto ctx = c->trx_state.get<by_id>().find( id );
-            if( ctx != c->trx_state.end()) {
-               c->trx_state.modify( ctx, ubn );
-            }
-         }
-         g.unlock();
-         sync_master->recv_block(c, blk_id, blk_num);
+         boost::asio::post( *server_ioc, [self = this, msg]() {
+            self->dispatcher->update_txns_block_num( msg );
+         });
+         sync_master->sync_recv_block(c, blk_id, blk_num);
       }
       else {
          sync_master->rejected_block(c, blk_num);
@@ -2683,41 +2681,12 @@ namespace eosio {
       start_txn_timer();
 
       auto now = time_point::now();
-      expire_local_txns();
-
       uint32_t lib = lib_num.load();
       dispatcher->expire_blocks( lib );
-      for ( auto& c : connections ) {
-         auto &stale_txn = c->trx_state.get<by_block_num>();
-         stale_txn.erase( stale_txn.lower_bound(1), stale_txn.upper_bound(lib) );
-         auto &stale_txn_e = c->trx_state.get<by_expiry>();
-         stale_txn_e.erase(stale_txn_e.lower_bound(time_point_sec()), stale_txn_e.upper_bound(time_point::now()));
-      }
+      dispatcher->expire_txns( lib );
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
    }
 
-   // thread safe
-   void net_plugin_impl::expire_local_txns() {
-      uint32_t lib = lib_num.load();
-      size_t start_size = 0, end_size = 0;
-
-      std::unique_lock<std::mutex> g( local_txns_mtx );
-
-      start_size = local_txns.size();
-      auto& old = local_txns.get<by_expiry>();
-      auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
-      auto ex_up = old.upper_bound( time_point::now());
-      old.erase( ex_lo, ex_up );
-
-      auto& stale = local_txns.get<by_block_num>();
-      stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
-      end_size = local_txns.size();
-
-      g.unlock();
-
-      fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)("r", start_size - end_size) );
-   }
-
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
@@ -2764,7 +2733,7 @@ namespace eosio {
       const auto& id = results.second->id;
       if (results.first) {
          fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
-         dispatcher->rejected_transaction(id);
+         dispatcher->rejected_transaction(id, head_blk_num);
       } else {
          fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
          dispatcher->bcast_transaction(results.second);

From a4d5559342720f7d87cbbab4a8efc3a74a498bd4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 09:47:01 -0500
Subject: [PATCH 0059/1648] Fix for missing connection_id

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0405832d481..6064da2d58a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1723,6 +1723,7 @@ namespace eosio {
          if( !cp->current() ) {
             continue;
          }
+         nts.connection_id = cp->connection_id;
          if( !add_peer_txn(nts) ) {
             continue;
          }

From d5aa85b43ac6a8573430160ae1d5eca519b7eee9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 12:32:49 -0500
Subject: [PATCH 0060/1648] Make all timers thread safe. Expire trx/blks on
 thread pool.

---
 plugins/net_plugin/net_plugin.cpp | 117 +++++++++++++++++++-----------
 1 file changed, 74 insertions(+), 43 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6064da2d58a..8b8b0d9ccfa 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -222,14 +222,17 @@ namespace eosio {
       unique_ptr< sync_manager >       sync_master;
       unique_ptr< dispatch_manager >   dispatcher;
 
-      unique_ptr<boost::asio::steady_timer> connector_check;
-      unique_ptr<boost::asio::steady_timer> transaction_check;
+      std::mutex                            connector_check_timer_mtx; 
+      unique_ptr<boost::asio::steady_timer> connector_check_timer;
+      std::mutex                            expire_timer_mtx;
+      unique_ptr<boost::asio::steady_timer> expire_timer;
+      std::mutex                            keepalive_timer_mtx;
       unique_ptr<boost::asio::steady_timer> keepalive_timer;
       boost::asio::steady_timer::duration   connector_period;
       boost::asio::steady_timer::duration   txn_exp_period;
       boost::asio::steady_timer::duration   resp_expected_period;
       boost::asio::steady_timer::duration   keepalive_interval{std::chrono::seconds{32}};
-      int                           max_cleanup_time_ms = 0;
+      int                                   max_cleanup_time_ms = 0;
 
       const std::chrono::system_clock::duration peer_authentication_interval{std::chrono::seconds{1}}; ///< Peer clock may be no more than 1 second skewed from our clock, including network latency.
 
@@ -314,10 +317,10 @@ namespace eosio {
       void handle_message(const connection_ptr& c, const packed_transaction_ptr& msg);
 
       void start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection);
-      void start_txn_timer();
+      void start_expire_timer();
       void start_monitors();
 
-      void expire_txns();
+      void expire();
       void connection_monitor(std::weak_ptr<connection> from_connection);
       /** \name Peer Timestamps
        *  Time message handling
@@ -540,7 +543,9 @@ namespace eosio {
 
       explicit connection( socket_ptr s );
       ~connection();
-      void initialize();
+   private:
+      void initialize(); // only called from constructor
+   public:
 
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
@@ -563,7 +568,8 @@ namespace eosio {
       bool                    syncing = false;
       uint16_t                protocol_version  = 0;
       string                  peer_addr;
-      unique_ptr<boost::asio::steady_timer> response_expected;
+      std::mutex                            response_expected_timer_mtx;
+      unique_ptr<boost::asio::steady_timer> response_expected_timer;
       std::mutex                            read_delay_timer_mtx;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
@@ -737,7 +743,7 @@ namespace eosio {
         syncing(false),
         protocol_version(0),
         peer_addr(endpoint),
-        response_expected(),
+        response_expected_timer(),
         read_delay_timer(),
         no_retry(no_reason),
         fork_head(),
@@ -761,7 +767,7 @@ namespace eosio {
         syncing(false),
         protocol_version(0),
         peer_addr(),
-        response_expected(),
+        response_expected_timer(),
         read_delay_timer(),
         no_retry(no_reason),
         fork_head(),
@@ -779,7 +785,8 @@ namespace eosio {
    void connection::initialize() {
       auto *rnd = node_id.data();
       rnd[0] = 0;
-      response_expected.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
+      // called only from constructor, no mutex needed
+      response_expected_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
       read_delay_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
    }
 
@@ -1116,15 +1123,19 @@ namespace eosio {
                   to_sync_queue);
    }
 
+   // thread safe
    void connection::cancel_wait() {
-      if (response_expected)
-         response_expected->cancel();
+      std::lock_guard<std::mutex> g( response_expected_timer_mtx );
+      if (response_expected_timer)
+         response_expected_timer->cancel();
    }
 
+   // thread safe
    void connection::sync_wait() {
-      response_expected->expires_from_now( my_impl->resp_expected_period);
       connection_wptr c(shared_from_this());
-      response_expected->async_wait( [c]( boost::system::error_code ec ) {
+      std::lock_guard<std::mutex> g( response_expected_timer_mtx );
+      response_expected_timer->expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer->async_wait( [c]( boost::system::error_code ec ) {
          app().post(priority::low, [c, ec]() {
             connection_ptr conn = c.lock();
             if (!conn) {
@@ -1137,10 +1148,12 @@ namespace eosio {
       } );
    }
 
+   // thread safe
    void connection::fetch_wait() {
-      response_expected->expires_from_now( my_impl->resp_expected_period);
       connection_wptr c(shared_from_this());
-      response_expected->async_wait( [c]( boost::system::error_code ec ) {
+      std::lock_guard<std::mutex> g( response_expected_timer_mtx );
+      response_expected_timer->expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer->async_wait( [c]( boost::system::error_code ec ) {
          app().post(priority::low, [c, ec]() {
             connection_ptr conn = c.lock();
             if (!conn) {
@@ -2625,8 +2638,9 @@ namespace eosio {
    }
 
    void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection) {
-      connector_check->expires_from_now( du);
-      connector_check->async_wait( [this, from_connection](boost::system::error_code ec) {
+      std::lock_guard<std::mutex> g( connector_check_timer_mtx );
+      connector_check_timer->expires_from_now( du);
+      connector_check_timer->async_wait( [this, from_connection](boost::system::error_code ec) {
             app().post( priority::low, [this, from_connection, ec]() {
             if( !ec) {
                connection_monitor(from_connection);
@@ -2639,22 +2653,23 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::start_txn_timer() {
-      transaction_check->expires_from_now( txn_exp_period);
-      transaction_check->async_wait( [this]( boost::system::error_code ec ) {
-         int lower_than_low = priority::low - 1;
-         app().post( lower_than_low, [this, ec]() {
-            if( !ec ) {
-               expire_txns();
-            } else {
-               fc_elog( logger, "Error from transaction check monitor: ${m}", ("m", ec.message()));
-               start_txn_timer();
-            }
-         } );
-      });
+   // thread safe
+   void net_plugin_impl::start_expire_timer() {
+      std::lock_guard<std::mutex> g( expire_timer_mtx );
+      expire_timer->expires_from_now( txn_exp_period);
+      expire_timer->async_wait( [this]( boost::system::error_code ec ) {
+         if( !ec ) {
+            expire();
+         } else {
+            fc_elog( logger, "Error from transaction check monitor: ${m}", ("m", ec.message()) );
+            start_expire_timer();
+         }
+      } );
    }
 
+   // thread safe
    void net_plugin_impl::ticker() {
+      std::lock_guard<std::mutex> g( keepalive_timer_mtx );
       keepalive_timer->expires_from_now(keepalive_interval);
       keepalive_timer->async_wait( [this]( boost::system::error_code ec ) {
          app().post( priority::low, [this, ec]() {
@@ -2672,14 +2687,20 @@ namespace eosio {
    }
 
    void net_plugin_impl::start_monitors() {
-      connector_check.reset(new boost::asio::steady_timer( *server_ioc ));
-      transaction_check.reset(new boost::asio::steady_timer( *server_ioc ));
+      {
+         std::lock_guard<std::mutex> g( connector_check_timer_mtx );
+         connector_check_timer.reset(new boost::asio::steady_timer( *server_ioc ));
+      }
+      {
+         std::lock_guard<std::mutex> g( expire_timer_mtx );
+         expire_timer.reset( new boost::asio::steady_timer( *server_ioc ) );
+      }
       start_conn_timer(connector_period, std::weak_ptr<connection>());
-      start_txn_timer();
+      start_expire_timer();
    }
 
-   void net_plugin_impl::expire_txns() {
-      start_txn_timer();
+   void net_plugin_impl::expire() {
+      start_expire_timer();
 
       auto now = time_point::now();
       uint32_t lib = lib_num.load();
@@ -3034,7 +3055,10 @@ namespace eosio {
          }
       }
 
-      my->keepalive_timer.reset( new boost::asio::steady_timer( *my->server_ioc ) );
+      {
+         std::lock_guard<std::mutex> g( my->keepalive_timer_mtx );
+         my->keepalive_timer.reset( new boost::asio::steady_timer( *my->server_ioc ) );
+      }
       my->ticker();
 
       if( my->acceptor ) {
@@ -3088,12 +3112,19 @@ namespace eosio {
          if( my->server_ioc_work )
             my->server_ioc_work->reset();
 
-         if( my->connector_check )
-            my->connector_check->cancel();
-         if( my->transaction_check )
-            my->transaction_check->cancel();
-         if( my->keepalive_timer )
-            my->keepalive_timer->cancel();
+         {
+            std::lock_guard<std::mutex> g( my->connector_check_timer_mtx );
+            if( my->connector_check_timer )
+               my->connector_check_timer->cancel();
+         }{
+            std::lock_guard<std::mutex> g( my->expire_timer_mtx );
+            if( my->expire_timer )
+               my->expire_timer->cancel();
+         }{
+            std::lock_guard<std::mutex> g( my->keepalive_timer_mtx );
+            if( my->keepalive_timer )
+               my->keepalive_timer->cancel();
+         }
 
          my->done = true;
          if( my->acceptor ) {

From b36787a4c3f25a23b6e943ba102ea8707ed77eba Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 14:44:48 -0500
Subject: [PATCH 0061/1648] Break expire into two steps

---
 plugins/net_plugin/net_plugin.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8b8b0d9ccfa..852ced707b5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1658,19 +1658,21 @@ namespace eosio {
 
    void dispatch_manager::expire_txns( uint32_t lib_num ) {
       size_t start_size = 0, end_size = 0;
-      {
-         std::lock_guard<std::mutex> g( local_txns_mtx );
 
-         start_size = local_txns.size();
-         auto& old = local_txns.get<by_expiry>();
-         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ) );
-         auto ex_up = old.upper_bound( time_point::now() );
-         old.erase( ex_lo, ex_up );
+      std::unique_lock<std::mutex> g( local_txns_mtx );
+      start_size = local_txns.size();
+      auto& old = local_txns.get<by_expiry>();
+      auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ) );
+      auto ex_up = old.upper_bound( time_point::now() );
+      old.erase( ex_lo, ex_up );
+      g.unlock(); // allow other threads opportunity to use local_txns
+
+      g.lock();
+      auto& stale = local_txns.get<by_block_num>();
+      stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib_num ) );
+      end_size = local_txns.size();
+      g.unlock();
 
-         auto& stale = local_txns.get<by_block_num>();
-         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib_num ) );
-         end_size = local_txns.size();
-      }
       fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)( "r", start_size - end_size ) );
    }
 
@@ -2700,13 +2702,13 @@ namespace eosio {
    }
 
    void net_plugin_impl::expire() {
-      start_expire_timer();
-
       auto now = time_point::now();
       uint32_t lib = lib_num.load();
       dispatcher->expire_blocks( lib );
       dispatcher->expire_txns( lib );
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
+
+      start_expire_timer();
    }
 
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {

From 91516ed676a480d858511b09b018c664fb063a0a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 18:17:52 -0500
Subject: [PATCH 0062/1648] Fix issue with sync and known block optimization

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 852ced707b5..7f477c07e0f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2195,7 +2195,7 @@ namespace eosio {
             block_id_type blk_id = bh.id();
             if( dispatcher->have_block( blk_id ) ) {
                connection_wptr weak = conn;
-               app().post(priority::low,
+               app().post(priority::high, // high since block processing is high and this needs to run before next block
                      [dispatcher = dispatcher.get(), sync_master = sync_master.get(), weak{std::move(weak)}, blk_id] {
                   connection_ptr c = weak.lock();
                   if(c) {

From f650ec0552c2b0dfd90751539f25dec4f61b87df Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 18:44:16 -0500
Subject: [PATCH 0063/1648] Add transaction id to log message

---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7f477c07e0f..5ccd7d4b8d0 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2533,7 +2533,6 @@ namespace eosio {
    // called from thread_pool threads
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
-      peer_ilog(c, "received packed_transaction");
       if( db_read_mode == eosio::db_read_mode::READ_ONLY ) {
          fc_dlog(logger, "got a txn in read-only mode - dropping");
          return;
@@ -2541,6 +2540,7 @@ namespace eosio {
 
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
+      peer_ilog(c, "received packed_transaction ${id}", ("id", tid));
 
       bool have_trx = dispatcher->have_txn( tid );
       connection_wptr weak_ptr = c;
@@ -2549,7 +2549,7 @@ namespace eosio {
          dispatcher->recv_transaction(c, ptrx);
       });
       if( have_trx ) {
-         fc_dlog( logger, "got a duplicate transaction - dropping" );
+         fc_dlog( logger, "got a duplicate transaction - dropping ${id}", ("id", tid) );
          return;
       }
 

From 4c8a88a52bf8ba84d5295a7447e041e72f4911c7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Mar 2019 07:35:16 -0500
Subject: [PATCH 0064/1648] Remove dead code

---
 .../include/eosio/net_plugin/net_plugin.hpp       |  1 -
 plugins/net_plugin/net_plugin.cpp                 | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
index 01c1383468d..3bc594dd313 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
@@ -38,7 +38,6 @@ namespace eosio {
         optional<connection_status>  status( const string& endpoint )const;
         vector<connection_status>    connections()const;
 
-        size_t num_peers() const;
       private:
         std::unique_ptr<class net_plugin_impl> my;
    };
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5ccd7d4b8d0..df897d887e3 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -278,7 +278,6 @@ namespace eosio {
       bool process_next_message(const connection_ptr& conn, uint32_t message_length);
 
       void close(const connection_ptr& c);
-      size_t count_open_sockets() const;
 
       void accepted_block(const block_state_ptr&);
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
@@ -2229,16 +2228,6 @@ namespace eosio {
       return true;
    }
 
-   size_t net_plugin_impl::count_open_sockets() const
-   {
-      size_t count = 0;
-      for( auto &c : connections) {
-         if(c->socket->is_open())
-            ++count;
-      }
-      return count;
-   }
-
    bool net_plugin_impl::is_valid(const handshake_message& msg) {
       // Do some basic validation of an incoming handshake_message, so things
       // that really aren't handshake messages can be quickly discarded without
@@ -3153,10 +3142,6 @@ namespace eosio {
       FC_CAPTURE_AND_RETHROW()
    }
 
-   size_t net_plugin::num_peers() const {
-      return my->count_open_sockets();
-   }
-
    /**
     *  Used to trigger a new connection from RPC API
     */

From 7e728f4ccbe1a52bb5dc2e8df13576d982d56022 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Mar 2019 08:21:39 -0500
Subject: [PATCH 0065/1648] Protect start_read_message via strand

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index df897d887e3..33a2b8e999e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -548,7 +548,8 @@ namespace eosio {
 
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
-      socket_ptr              socket;
+      boost::asio::io_context::strand           strand;
+      socket_ptr                                socket; // only accessed through strand after construction
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
       std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
@@ -732,6 +733,7 @@ namespace eosio {
    connection::connection( string endpoint )
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
+        strand( *my_impl->server_ioc ),
         socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
@@ -756,6 +758,7 @@ namespace eosio {
    connection::connection( socket_ptr s )
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
+        strand( *my_impl->server_ioc ),
         socket( s ),
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
@@ -1935,7 +1938,7 @@ namespace eosio {
          return false;
       }
       else {
-         boost::asio::post(*server_ioc, [this, con]() {
+         con->strand.post( [this, con]() {
             start_read_message( con );
          });
          ++started_sessions;
@@ -2014,7 +2017,7 @@ namespace eosio {
       });
    }
 
-   // only called from server_ioc thread
+   // only called from strand thread
    void net_plugin_impl::start_read_message(const connection_ptr& conn) {
 
       try {
@@ -2074,7 +2077,7 @@ namespace eosio {
             if( !conn->read_delay_timer ) return;
             conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
             conn->read_delay_timer->async_wait(
-                  app().get_priority_queue().wrap( priority::low, [this, weak_conn]( boost::system::error_code ) {
+                  boost::asio::bind_executor(conn->strand, [this, weak_conn]( boost::system::error_code ) {
                auto conn = weak_conn.lock();
                if( !conn ) return;
                start_read_message( conn );
@@ -2085,6 +2088,7 @@ namespace eosio {
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
+            boost::asio::bind_executor( conn->strand,
             [this,weak_conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                auto conn = weak_conn.lock();
                if (!conn) {
@@ -2168,7 +2172,7 @@ namespace eosio {
                      close( conn );
                   });
                }
-         });
+         }));
       } catch (...) {
          fc_elog( logger, "Undefined exception in start_read_message" );
          connection_wptr weak_conn = conn;

From e1ea686eb64f2cdb84376ab12b4194a7eec13303 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Mar 2019 23:19:07 -0500
Subject: [PATCH 0066/1648] Made all access to impl->connections thread safe

---
 plugins/net_plugin/net_plugin.cpp | 385 ++++++++++++++++--------------
 1 file changed, 207 insertions(+), 178 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 33a2b8e999e..776014afdbd 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -56,6 +56,14 @@ namespace eosio {
    using socket_ptr = std::shared_ptr<tcp::socket>;
    using io_work_t = boost::asio::executor_work_guard<boost::asio::io_context::executor_type>;
 
+   template <typename Strand>
+   void verify_strand_in_this_thread(const Strand& strand, const char* func, int line) {
+      if( !strand.running_in_this_thread() ) {
+         elog( "wrong strand: ${f} : line ${n}, exiting", ("f", func)("n", line) );
+         app().quit();
+      }
+   }
+
    struct node_transaction_state {
       transaction_id_type id;
       time_point_sec  expires;        /// time after which this may be purged.
@@ -199,7 +207,6 @@ namespace eosio {
       string                           p2p_server_address;
       uint32_t                         max_client_count = 0;
       uint32_t                         max_nodes_per_host = 1;
-      uint32_t                         num_clients = 0;
       uint32_t                         current_connection_id = 0;
 
       vector<string>                   supplied_peers;
@@ -217,7 +224,8 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      std::set< connection_ptr >       connections;
+      mutable std::mutex               connections_mtx;
+      std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
       unique_ptr< dispatch_manager >   dispatcher;
@@ -261,7 +269,7 @@ namespace eosio {
       optional<io_work_t>                       server_ioc_work;
 
 
-      void connect(const connection_ptr& c);
+      bool resolve_and_connect(const connection_ptr& c);
       void connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr);
       bool start_session(const connection_ptr& c);
       void start_listen_loop();
@@ -277,8 +285,6 @@ namespace eosio {
        */
       bool process_next_message(const connection_ptr& conn, uint32_t message_length);
 
-      void close(const connection_ptr& c);
-
       void accepted_block(const block_state_ptr&);
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
       void on_irreversible_block( const block_state_ptr& blk ) {
@@ -542,14 +548,28 @@ namespace eosio {
 
       explicit connection( socket_ptr s );
       ~connection();
+
+      void start();
+
+      bool socket_is_open() const { return socket_open.load(); } // thread safe
+      const string& peer_address() const { return peer_addr; } // thread safe
+      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; } // thread safe, not updated after start()
+
    private:
+      static const string unknown;
+
       void initialize(); // only called from constructor
+      void update_endpoints();
+
    public:
 
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
       boost::asio::io_context::strand           strand;
       socket_ptr                                socket; // only accessed through strand after construction
+   private:
+      std::atomic<bool>                         socket_open{false};
+   public:
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
       std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
@@ -567,14 +587,21 @@ namespace eosio {
       bool                    connecting = false;
       bool                    syncing = false;
       uint16_t                protocol_version  = 0;
-      string                  peer_addr;
+   private:
+      const string            peer_addr;
+      string                  remote_endpoint_ip;     // not updated after start
+      string                  remote_endpoint_port;   // not updated after start
+      string                  local_endpoint_ip;      // not updated after start
+      string                  local_endpoint_port;    // not updated after start
+   public:
+
       std::mutex                            response_expected_timer_mtx;
       unique_ptr<boost::asio::steady_timer> response_expected_timer;
       std::mutex                            read_delay_timer_mtx;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
-      uint32_t               fork_head_num = 0;
+      std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
       optional<request_message> last_req;
 
       connection_status get_status()const {
@@ -663,30 +690,24 @@ namespace eosio {
       fc::optional<fc::variant_object> _logger_variant;
       const fc::variant_object& get_logger_variant()  {
          if (!_logger_variant) {
-            boost::system::error_code ec;
-            auto rep = socket->remote_endpoint(ec);
-            string ip = ec ? "<unknown>" : rep.address().to_string();
-            string port = ec ? "<unknown>" : std::to_string(rep.port());
-
-            auto lep = socket->local_endpoint(ec);
-            string lip = ec ? "<unknown>" : lep.address().to_string();
-            string lport = ec ? "<unknown>" : std::to_string(lep.port());
-
             _logger_variant.emplace(fc::mutable_variant_object()
                ("_name", peer_name())
                ("_id", node_id)
                ("_sid", ((string)node_id).substr(0, 7))
-               ("_ip", ip)
-               ("_port", port)
-               ("_lip", lip)
-               ("_lport", lport)
+               ("_ip", remote_endpoint_ip)
+               ("_port", remote_endpoint_port)
+               ("_lip", local_endpoint_ip)
+               ("_lport", local_endpoint_port)
             );
          }
          return *_logger_variant;
       }
    };
 
-   struct msg_handler : public fc::visitor<void> {
+   const string connection::unknown = "<unknown>";
+
+
+struct msg_handler : public fc::visitor<void> {
       net_plugin_impl& impl;
       connection_ptr c;
       msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
@@ -747,8 +768,6 @@ namespace eosio {
         response_expected_timer(),
         read_delay_timer(),
         no_retry(no_reason),
-        fork_head(),
-        fork_head_num(0),
         last_req()
    {
       fc_ilog( logger, "created connection to ${n}", ("n", endpoint) );
@@ -772,8 +791,6 @@ namespace eosio {
         response_expected_timer(),
         read_delay_timer(),
         no_retry(no_reason),
-        fork_head(),
-        fork_head_num(0),
         last_req()
    {
       fc_ilog( logger, "accepted network connection" );
@@ -792,8 +809,26 @@ namespace eosio {
       read_delay_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
    }
 
+   void connection::update_endpoints() {
+      boost::system::error_code ec;
+      auto rep = socket->remote_endpoint(ec);
+      remote_endpoint_ip = ec ? unknown : rep.address().to_string();
+      remote_endpoint_port = ec ? unknown : std::to_string(rep.port());
+
+      auto lep = socket->local_endpoint(ec);
+      local_endpoint_ip = ec ? unknown : lep.address().to_string();
+      local_endpoint_port = ec ? unknown : std::to_string(lep.port());
+   }
+
+   void connection::start() {
+      verify_strand_in_this_thread( strand, __func__, __LINE__ );
+
+      update_endpoints();
+      socket_open = true;
+   }
+
    bool connection::connected() {
-      return (socket && socket->is_open() && !connecting);
+      return socket_is_open() && !connecting;
    }
 
    bool connection::current() {
@@ -809,12 +844,8 @@ namespace eosio {
    }
 
    void connection::close() {
-      if(socket) {
-         socket->close();
-      }
-      else {
-         fc_wlog( logger, "no socket to close!" );
-      }
+      socket_open = false;
+      socket->close();
       flush_queues();
       connecting = false;
       syncing = false;
@@ -943,7 +974,7 @@ namespace eosio {
       if( !buffer_queue.add_write_queue( buff, callback, to_sync_queue )) {
          fc_wlog( logger, "write_queue full ${s} bytes, giving up on connection ${p}",
                   ("s", buffer_queue.write_queue_size())("p", peer_name()) );
-         my_impl->close( shared_from_this() );
+         close();
          return;
       }
       if( buffer_queue.is_out_queue_empty() && trigger_send) {
@@ -957,7 +988,7 @@ namespace eosio {
       connection_wptr c(shared_from_this());
       if(!socket->is_open()) {
          fc_elog(logger,"socket not open to ${p}",("p",peer_name()));
-         my_impl->close(c.lock());
+         close();
          return;
       }
       std::vector<boost::asio::const_buffer> bufs;
@@ -980,7 +1011,7 @@ namespace eosio {
                   else {
                      fc_wlog( logger, "connection closure detected on write to ${p}",("p",pname) );
                   }
-                  my_impl->close(conn);
+                  conn->close();
                   return;
                }
                conn->buffer_queue.clear_out_queue();
@@ -1115,7 +1146,7 @@ namespace eosio {
                         if (close_after_send != no_reason) {
                            fc_elog( logger, "sent a go away message: ${r}, closing connection to ${p}",
                                     ("r", reason_str(close_after_send))("p", conn->peer_name()) );
-                           my_impl->close(conn);
+                           conn->close();
                            return;
                         }
                      } else {
@@ -1183,15 +1214,11 @@ namespace eosio {
       if( !last_handshake_recv.p2p_address.empty() ) {
          return last_handshake_recv.p2p_address;
       }
-      if( !peer_addr.empty() ) {
-         return peer_addr;
+      if( !peer_address().empty() ) {
+         return peer_address();
       }
-      if( socket != nullptr ) {
-         boost::system::error_code ec;
-         auto rep = socket->remote_endpoint(ec);
-         if( !ec ) {
-            return rep.address().to_string() + ':' + std::to_string( rep.port() );
-         }
+      if( remote_endpoint_port != unknown ) {
+         return remote_endpoint_ip + ":" + remote_endpoint_port;
       }
       return "connecting client";
    }
@@ -1247,12 +1274,13 @@ namespace eosio {
       state = newstate;
    }
 
+   // uses controller, only call from application thread
    bool sync_manager::is_active(const connection_ptr& c) {
       if (state == head_catchup && c) {
+         auto fork_head_num = c->fork_head_num.load(); // provide memory barrier for c->fork_head
          bool fhset = c->fork_head != block_id_type();
-         fc_dlog(logger, "fork_head_num = ${fn} fork_head set = ${s}",
-                 ("fn", c->fork_head_num)("s", fhset));
-            return c->fork_head != block_id_type() && c->fork_head_num < chain_plug->chain().fork_db_head_block_num();
+         fc_dlog( logger, "fork_head_num = ${fn} fork_head set = ${s}", ("fn", fork_head_num)( "s", fhset ) );
+         return c->fork_head != block_id_type() && fork_head_num < chain_plug->chain().fork_db_head_block_num();
       }
       return state != in_sync;
    }
@@ -1296,14 +1324,13 @@ namespace eosio {
 
       if (conn && conn->current() ) {
          source = conn;
-      }
-      else {
+      } else {
+         std::lock_guard<std::mutex> g( my_impl->connections_mtx );
          if (my_impl->connections.size() == 1) {
             if (!source) {
                source = *my_impl->connections.begin();
             }
-         }
-         else {
+         } else {
             // init to a linear array search
             auto cptr = my_impl->connections.begin();
             auto cend = my_impl->connections.end();
@@ -1364,8 +1391,9 @@ namespace eosio {
 
    void sync_manager::send_handshakes()
    {
-      for( auto &ci : my_impl->connections) {
-         if( ci->current()) {
+      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+      for( auto& ci : my_impl->connections ) {
+         if( ci->current() ) {
             ci->send_handshake();
          }
       }
@@ -1483,13 +1511,15 @@ namespace eosio {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
+      std::unique_lock<std::mutex> g( my_impl->connections_mtx );
       for (const auto& cc : my_impl->connections) {
-         if (cc->fork_head == id ||
-             cc->fork_head_num > num) {
+         // fork_head_num provides memory barrier for fork_head
+         if( cc->fork_head_num > num || cc->fork_head == id ) {
             req.req_blocks.mode = none;
             break;
          }
       }
+      g.unlock();
       if( req.req_blocks.mode == catch_up ) {
          c->fork_head = id;
          c->fork_head_num = num;
@@ -1498,8 +1528,7 @@ namespace eosio {
          if (state == lib_catchup)
             return;
          set_state(head_catchup);
-      }
-      else {
+      } else {
          c->fork_head = block_id_type();
          c->fork_head_num = 0;
       }
@@ -1514,7 +1543,7 @@ namespace eosio {
       if( msg.known_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
                   ("s", msg.known_blocks.ids.size())("p", c->peer_name()) );
-         my_impl->close(c);
+         c->close();
          return;
       }
       if (msg.known_blocks.mode == catch_up) {
@@ -1535,7 +1564,7 @@ namespace eosio {
          fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_name()) );
          sync_last_requested_num = 0;
          source.reset();
-         my_impl->close(c);
+         c->close();
          set_state(in_sync);
          send_handshakes();
       }
@@ -1546,7 +1575,7 @@ namespace eosio {
          if (blk_num != sync_next_expected_num) {
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
                      ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_name()) );
-            my_impl->close(c);
+            c->close();
             return;
          }
          sync_next_expected_num = blk_num + 1;
@@ -1557,18 +1586,20 @@ namespace eosio {
          source.reset();
 
          block_id_type null_id;
-         for (const auto& cp : my_impl->connections) {
+         std::unique_lock<std::mutex> g( my_impl->connections_mtx );
+         for( const auto& cp : my_impl->connections ) {
+            uint32_t fork_head_num = cp->fork_head_num.load(); // fork_head_num provides memory barrier for fork_head
             if (cp->fork_head == null_id) {
                continue;
             }
-            if (cp->fork_head == blk_id || cp->fork_head_num < blk_num) {
+            if( fork_head_num < blk_num || cp->fork_head == blk_id ) {
                c->fork_head = null_id;
                c->fork_head_num = 0;
-            }
-            else {
+            } else {
                set_state(head_catchup);
             }
          }
+         g.unlock();
 
          if (state == in_sync) {
             send_handshakes();
@@ -1690,6 +1721,7 @@ namespace eosio {
       fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
 
       std::shared_ptr<std::vector<char>> send_buffer;
+      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
@@ -1736,6 +1768,7 @@ namespace eosio {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
+      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
@@ -1831,6 +1864,7 @@ namespace eosio {
                   ("b",modes_str(c->last_req->req_blocks.mode))("t",modes_str(c->last_req->req_trx.mode)));
          return;
       }
+      std::unique_lock<std::mutex> g( my_impl->connections_mtx );
       for (auto& conn : my_impl->connections) {
          if (conn == c || conn->last_req) {
             continue;
@@ -1843,6 +1877,7 @@ namespace eosio {
             return;
          }
       }
+      g.unlock();
 
       // at this point no other peer has it, re-request or do nothing?
       if( c->connected() ) {
@@ -1853,29 +1888,30 @@ namespace eosio {
 
    //------------------------------------------------------------------------
 
-   void net_plugin_impl::connect(const connection_ptr& c) {
+   bool net_plugin_impl::resolve_and_connect(const connection_ptr& c) {
       if( c->no_retry != go_away_reason::no_reason) {
          fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( c->no_retry )));
-         return;
+         return false;
       }
 
-      auto colon = c->peer_addr.find(':');
+      auto colon = c->peer_address().find(':');
 
       if (colon == std::string::npos || colon == 0) {
-         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p",c->peer_addr) );
-         for ( auto itr : connections ) {
-            if((*itr).peer_addr == c->peer_addr) {
-               (*itr).reset();
-               close(itr);
-               connections.erase(itr);
+         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p",c->peer_address()) );
+         std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+         for ( auto& cp : connections ) {
+            if( cp->peer_address() == c->peer_address() ) {
+               cp->reset();
+               cp->close();
+               connections.erase( cp );
                break;
             }
          }
-         return;
+         return false;
       }
 
-      auto host = c->peer_addr.substr( 0, colon );
-      auto port = c->peer_addr.substr( colon + 1);
+      auto host = c->peer_address().substr( 0, colon );
+      auto port = c->peer_address().substr( colon + 1);
       idump((host)(port));
       tcp::resolver::query query( tcp::v4(), host.c_str(), port.c_str() );
       connection_wptr weak_conn = c;
@@ -1889,11 +1925,12 @@ namespace eosio {
                       if( !err ) {
                          connect( c, endpoint_itr );
                       } else {
-                         fc_elog( logger, "Unable to resolve ${peer_addr}: ${error}",
-                                  ("peer_addr", c->peer_name())( "error", err.message()) );
+                         fc_elog( logger, "Unable to resolve ${add}: ${error}",
+                                  ("add", c->peer_name())( "error", err.message()) );
                       }
                    } );
                 } );
+      return true;
    }
 
    void net_plugin_impl::connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr) {
@@ -1915,12 +1952,12 @@ namespace eosio {
                }
             } else {
                if( endpoint_itr != tcp::resolver::iterator()) {
-                  close( c );
+                  c->close();
                   connect( c, endpoint_itr );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;
-                  my_impl->close( c );
+                  c->close();
                }
             }
          } );
@@ -1934,11 +1971,11 @@ namespace eosio {
       if (ec) {
          fc_elog( logger, "connection failed to ${peer}: ${error}", ( "peer", con->peer_name())("error",ec.message()) );
          con->connecting = false;
-         close(con);
+         con->close();
          return false;
-      }
-      else {
+      } else {
          con->strand.post( [this, con]() {
+            con->start();
             start_read_message( con );
          });
          ++started_sessions;
@@ -1951,69 +1988,65 @@ namespace eosio {
 
 
    void net_plugin_impl::start_listen_loop() {
-      auto socket = std::make_shared<tcp::socket>( std::ref( *server_ioc ) );
-      acceptor->async_accept( *socket, [socket, this, ioc = server_ioc]( boost::system::error_code ec ) {
-            app().post( priority::low, [socket, this, ec, ioc{std::move(ioc)}]() {
-            if( !ec ) {
-               uint32_t visitors = 0;
-               uint32_t from_addr = 0;
-               boost::system::error_code rec;
-               auto paddr = socket->remote_endpoint(rec).address();
-               if (rec) {
-                  fc_elog(logger,"Error getting remote endpoint: ${m}",("m", rec.message()));
-               }
-               else {
-                  for (auto &conn : connections) {
-                     if(conn->socket->is_open()) {
-                        if (conn->peer_addr.empty()) {
-                           visitors++;
-                           boost::system::error_code ec;
-                           if (paddr == conn->socket->remote_endpoint(ec).address()) {
-                              from_addr++;
-                           }
+      auto new_socket = std::make_shared<tcp::socket>( std::ref( *server_ioc ) );
+      acceptor->async_accept( *new_socket, [new_socket, this, ioc = server_ioc]( boost::system::error_code ec ) {
+         // called from thread_pool threads, new_socket not shared yet
+         if( !ec ) {
+            uint32_t visitors = 0;
+            uint32_t from_addr = 0;
+            boost::system::error_code rec;
+            const auto& paddr_add = new_socket->remote_endpoint( rec ).address();
+            string paddr_str;
+            if( rec ) {
+               fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
+            } else {
+               paddr_str = paddr_add.to_string();
+               std::unique_lock<std::mutex> g( connections_mtx );
+               for( auto& conn : connections ) {
+                  if( conn->socket_is_open() ) {
+                     if( conn->peer_address().empty() ) {
+                        ++visitors;
+                        if( paddr_str == conn->remote_address() ) {
+                           ++from_addr;
                         }
                      }
                   }
-                  if (num_clients != visitors) {
-                     fc_ilog( logger,"checking max client, visitors = ${v} num clients ${n}",("v",visitors)("n",num_clients) );
-                     num_clients = visitors;
+               }
+               g.unlock();
+               if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
+                  connection_ptr new_connection = std::make_shared<connection>( new_socket );
+                  if( start_session( new_connection ) ) {
+                     g.lock();
+                     connections.insert( new_connection );
+                     g.unlock();
                   }
-                  if( from_addr < max_nodes_per_host && (max_client_count == 0 || num_clients < max_client_count )) {
-                     ++num_clients;
-                     connection_ptr c = std::make_shared<connection>( socket );
-                     connections.insert( c );
-                     start_session( c );
 
+               } else {
+                  if( from_addr >= max_nodes_per_host ) {
+                     fc_elog( logger, "Number of connections (${n}) from ${ra} exceeds limit",
+                              ("n", from_addr + 1)( "ra", paddr_str ) );
+                  } else {
+                     fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count) );
                   }
-                  else {
-                     if (from_addr >= max_nodes_per_host) {
-                        fc_elog(logger, "Number of connections (${n}) from ${ra} exceeds limit",
-                                ("n", from_addr+1)("ra",paddr.to_string()));
-                     }
-                     else {
-                        fc_elog(logger, "Error max_client_count ${m} exceeded",
-                                ( "m", max_client_count) );
-                     }
-                     socket->close();
-                  }
-               }
-            } else {
-               fc_elog( logger, "Error accepting connection: ${m}",( "m", ec.message() ) );
-               // For the listed error codes below, recall start_listen_loop()
-               switch (ec.value()) {
-                  case ECONNABORTED:
-                  case EMFILE:
-                  case ENFILE:
-                  case ENOBUFS:
-                  case ENOMEM:
-                  case EPROTO:
-                     break;
-                  default:
-                     return;
+                  new_socket->close(); // new_socket never associated with a connection
                }
             }
-            start_listen_loop();
-         });
+         } else {
+            fc_elog( logger, "Error accepting connection: ${m}", ("m", ec.message()) );
+            // For the listed error codes below, recall start_listen_loop()
+            switch( ec.value() ) {
+               case ECONNABORTED:
+               case EMFILE:
+               case ENFILE:
+               case ENOBUFS:
+               case ENOMEM:
+               case EPROTO:
+                  break;
+               default:
+                  return;
+            }
+         }
+         start_listen_loop();
       });
    }
 
@@ -2069,7 +2102,7 @@ namespace eosio {
                   auto conn = weak_conn.lock();
                   if( !conn ) return;
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                  my_impl->close( conn );
+                  conn->close();
                });
                return;
             }
@@ -2165,22 +2198,22 @@ namespace eosio {
                }
 
                if( close_connection ) {
-                  app().post( priority::medium, [this, weak_conn]() {
+                  app().post( priority::medium, [weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                     close( conn );
+                     conn->close();
                   });
                }
          }));
       } catch (...) {
          fc_elog( logger, "Undefined exception in start_read_message" );
          connection_wptr weak_conn = conn;
-         app().post( priority::medium, [this, weak_conn]() {
+         app().post( priority::medium, [weak_conn]() {
             auto conn = weak_conn.lock();
             if( !conn ) return;
             fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-            close( conn );
+            conn->close();
          });
       }
    }
@@ -2226,7 +2259,7 @@ namespace eosio {
       } catch( const fc::exception& e ) {
          fc_elog( logger, "Exception in handling message from ${p}: ${s}",
                   ("p", conn->peer_name())("s", e.to_detail_string()) );
-         close( conn );
+         conn->close();
          return false;
       }
       return true;
@@ -2281,9 +2314,10 @@ namespace eosio {
             return;
          }
 
-         if( c->peer_addr.empty() || c->last_handshake_recv.node_id == fc::sha256()) {
+         if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
             fc_dlog(logger, "checking for duplicate" );
-            for(const auto &check : connections) {
+            std::lock_guard<std::mutex> g( connections_mtx );
+            for(const auto& check : connections) {
                if(check == c)
                   continue;
                if(check->connected() && check->peer_name() == msg.p2p_address) {
@@ -2302,9 +2336,9 @@ namespace eosio {
                   return;
                }
             }
-         }
-         else {
-            fc_dlog(logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",("pa",c->peer_addr)("ni",c->last_handshake_recv.node_id));
+         } else {
+            fc_dlog( logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",
+                     ("pa", c->peer_address())( "ni", c->last_handshake_recv.node_id ) );
          }
 
          if( msg.chain_id != chain_id) {
@@ -2375,7 +2409,7 @@ namespace eosio {
          c->node_id = msg.node_id;
       }
       c->flush_queues();
-      close(c);
+      c->close();
    }
 
    void net_plugin_impl::handle_message(const connection_ptr& c, const time_message& msg) {
@@ -2468,7 +2502,7 @@ namespace eosio {
       if( msg.req_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid request_message, req_blocks.ids.size ${s}, closing ${p}",
                   ("s", msg.req_blocks.ids.size())("p",c->peer_name()) );
-         close(c);
+         c->close();
          return;
       }
 
@@ -2496,8 +2530,8 @@ namespace eosio {
          // no break
       case normal :
          if( !msg.req_trx.ids.empty() ) {
-            elog( "Invalid request_message, req_trx.ids.size ${s}", ("s", msg.req_trx.ids.size()) );
-            close(c);
+            fc_elog( logger, "Invalid request_message, req_trx.ids.size ${s}", ("s", msg.req_trx.ids.size()) );
+            c->close();
             return;
          }
          break;
@@ -2672,8 +2706,9 @@ namespace eosio {
             if( ec ) {
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
+            std::lock_guard<std::mutex> g( connections_mtx );
             for( auto& c : connections ) {
-               if( c->socket->is_open()) {
+               if( c->socket_is_open() ) {
                   c->send_time();
                }
             }
@@ -2708,6 +2743,7 @@ namespace eosio {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
+      std::unique_lock<std::mutex> g( connections_mtx );
       auto it = (from ? connections.find(from) : connections.begin());
       if (it == connections.end()) it = connections.begin();
       while (it != connections.end()) {
@@ -2715,32 +2751,20 @@ namespace eosio {
             start_conn_timer(std::chrono::milliseconds(1), *it); // avoid exhausting
             return;
          }
-         if( !(*it)->socket->is_open() && !(*it)->connecting) {
-            if( (*it)->peer_addr.length() > 0) {
-               connect(*it);
-            }
-            else {
+         if( !(*it)->socket_is_open() && !(*it)->connecting) {
+            if( (*it)->peer_address().length() > 0) {
+               resolve_and_connect(*it);
+            } else {
                it = connections.erase(it);
                continue;
             }
          }
          ++it;
       }
+      g.unlock();
       start_conn_timer(connector_period, std::weak_ptr<connection>());
    }
 
-   void net_plugin_impl::close(const connection_ptr& c) {
-      if( c->peer_addr.empty() && c->socket->is_open() ) {
-         if (num_clients == 0) {
-            fc_wlog( logger, "num_clients already at 0");
-         }
-         else {
-            --num_clients;
-         }
-      }
-      c->close();
-   }
-
    void net_plugin_impl::accepted_block(const block_state_ptr& block) {
       fc_dlog(logger,"signaled, id = ${id}",("id", block->id));
       dispatcher->bcast_block(block);
@@ -2943,7 +2967,6 @@ namespace eosio {
          my->resp_expected_period = def_resp_expected_wait;
          my->max_client_count = options.at( "max-clients" ).as<int>();
          my->max_nodes_per_host = options.at( "p2p-max-nodes-per-host" ).as<int>();
-         my->num_clients = 0;
          my->started_sessions = 0;
 
          my->use_socket_read_watermark = options.at( "use-socket-read-watermark" ).as<bool>();
@@ -3090,7 +3113,7 @@ namespace eosio {
 
       my->start_monitors();
 
-      for( auto seed_node : my->supplied_peers ) {
+      for( const auto& seed_node : my->supplied_peers ) {
          connect( seed_node );
       }
       handle_sighup();
@@ -3128,9 +3151,10 @@ namespace eosio {
             my->acceptor->close();
 
             fc_ilog( logger, "close ${s} connections",( "s",my->connections.size()) );
+            std::lock_guard<std::mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p",con->peer_name()) );
-               my->close( con );
+               con->close();
             }
             my->connections.clear();
          }
@@ -3155,18 +3179,21 @@ namespace eosio {
 
       connection_ptr c = std::make_shared<connection>(host);
       fc_dlog(logger,"adding new connection to the list");
+      std::unique_lock<std::mutex> g( my->connections_mtx );
       my->connections.insert( c );
+      g.unlock();
       fc_dlog(logger,"calling active connector");
-      my->connect( c );
+      my->resolve_and_connect( c );
       return "added connection";
    }
 
    string net_plugin::disconnect( const string& host ) {
+      std::lock_guard<std::mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
-         if( (*itr)->peer_addr == host ) {
+         if( (*itr)->peer_address() == host ) {
             (*itr)->reset();
             fc_ilog( logger, "disconnecting: ${p}", ("p", (*itr)->peer_name()) );
-            my->close(*itr);
+            (*itr)->close();
             my->connections.erase(itr);
             return "connection removed";
          }
@@ -3183,6 +3210,7 @@ namespace eosio {
 
    vector<connection_status> net_plugin::connections()const {
       vector<connection_status> result;
+      std::lock_guard<std::mutex> g( my->connections_mtx );
       result.reserve( my->connections.size() );
       for( const auto& c : my->connections ) {
          result.push_back( c->get_status() );
@@ -3190,8 +3218,9 @@ namespace eosio {
       return result;
    }
    connection_ptr net_plugin_impl::find_connection(const string& host )const {
+      std::lock_guard<std::mutex> g( connections_mtx );
       for( const auto& c : connections )
-         if( c->peer_addr == host ) return c;
+         if( c->peer_address() == host ) return c;
       return connection_ptr();
    }
 

From e63b66c3e0fef4974926ece65f795745eb65cfc8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Mar 2019 23:51:21 -0500
Subject: [PATCH 0067/1648] Fix deadlock on close when closing connection that
 is syncing from peer

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 776014afdbd..87b7c59a541 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -856,7 +856,7 @@ struct msg_handler : public fc::visitor<void> {
       sent_handshake_count = 0;
       last_handshake_recv = handshake_message();
       last_handshake_sent = handshake_message();
-      my_impl->sync_master->reset_lib_num(shared_from_this());
+      my_impl->sync_master->reset_lib_num(nullptr);
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
 
@@ -1289,6 +1289,7 @@ struct msg_handler : public fc::visitor<void> {
       if(state == in_sync) {
          source.reset();
       }
+      if( !c ) return;
       if( c->current() ) {
          if( c->last_handshake_recv.last_irreversible_block_num > sync_known_lib_num) {
             sync_known_lib_num =c->last_handshake_recv.last_irreversible_block_num;

From 1bcb0fb81635ccf5732fa65b9c9ba5381db0f437 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Mar 2019 13:28:15 -0500
Subject: [PATCH 0068/1648] Move socket ownership into connection.

---
 plugins/net_plugin/net_plugin.cpp | 309 ++++++++++++------------------
 1 file changed, 119 insertions(+), 190 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 87b7c59a541..6e4636211e7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -53,7 +53,6 @@ namespace eosio {
    using connection_ptr = std::shared_ptr<connection>;
    using connection_wptr = std::weak_ptr<connection>;
 
-   using socket_ptr = std::shared_ptr<tcp::socket>;
    using io_work_t = boost::asio::executor_work_guard<boost::asio::io_context::executor_type>;
 
    template <typename Strand>
@@ -207,7 +206,7 @@ namespace eosio {
       string                           p2p_server_address;
       uint32_t                         max_client_count = 0;
       uint32_t                         max_nodes_per_host = 1;
-      uint32_t                         current_connection_id = 0;
+      std::atomic<uint32_t>            current_connection_id{0};
 
       vector<string>                   supplied_peers;
       vector<chain::public_key_type>   allowed_peers; ///< peer keys allowed to connect
@@ -224,7 +223,7 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      mutable std::mutex               connections_mtx;
+      mutable std::mutex               connections_mtx; // switch to shared_mutex in C++17
       std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
@@ -254,7 +253,6 @@ namespace eosio {
       string                        user_agent_name;
       chain_plugin*                 chain_plug = nullptr;
       producer_plugin*              producer_plug = nullptr;
-      int                           started_sessions = 0;
 
       shared_ptr<tcp::resolver>     resolver;
 
@@ -271,7 +269,6 @@ namespace eosio {
 
       bool resolve_and_connect(const connection_ptr& c);
       void connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr);
-      bool start_session(const connection_ptr& c);
       void start_listen_loop();
       void start_read_message(const connection_ptr& c);
 
@@ -546,19 +543,18 @@ namespace eosio {
    public:
       explicit connection( string endpoint );
 
-      explicit connection( socket_ptr s );
+      connection();
       ~connection();
 
-      void start();
+      bool start_session();
 
-      bool socket_is_open() const { return socket_open.load(); } // thread safe
-      const string& peer_address() const { return peer_addr; } // thread safe
-      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; } // thread safe, not updated after start()
+      bool socket_is_open() const { return socket_open.load(); } // thread safe, atomic
+      const string& peer_address() const { return peer_addr; } // thread safe, const
+      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; } // thread safe, not updated after start_session()
 
    private:
       static const string unknown;
 
-      void initialize(); // only called from constructor
       void update_endpoints();
 
    public:
@@ -566,7 +562,7 @@ namespace eosio {
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
       boost::asio::io_context::strand           strand;
-      socket_ptr                                socket; // only accessed through strand after construction
+      tcp::socket                               socket; // only accessed through strand after construction
    private:
       std::atomic<bool>                         socket_open{false};
    public:
@@ -596,9 +592,9 @@ namespace eosio {
    public:
 
       std::mutex                            response_expected_timer_mtx;
-      unique_ptr<boost::asio::steady_timer> response_expected_timer;
+      boost::asio::steady_timer             response_expected_timer;
       std::mutex                            read_delay_timer_mtx;
-      unique_ptr<boost::asio::steady_timer> read_delay_timer;
+      boost::asio::steady_timer             read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
       std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
@@ -634,6 +630,9 @@ namespace eosio {
       bool current();
       void reset();
       void close();
+   private:
+      static void _close( connection* self ); // for easy capture
+   public:
       void send_handshake();
 
       /** \name Peer Timestamps
@@ -755,7 +754,7 @@ struct msg_handler : public fc::visitor<void> {
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
         strand( *my_impl->server_ioc ),
-        socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
+        socket( *my_impl->server_ioc ),
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
         last_handshake_recv(),
@@ -765,20 +764,20 @@ struct msg_handler : public fc::visitor<void> {
         syncing(false),
         protocol_version(0),
         peer_addr(endpoint),
-        response_expected_timer(),
-        read_delay_timer(),
+        response_expected_timer( *my_impl->server_ioc ),
+        read_delay_timer( *my_impl->server_ioc ),
         no_retry(no_reason),
         last_req()
    {
       fc_ilog( logger, "created connection to ${n}", ("n", endpoint) );
-      initialize();
+      node_id.data()[0] = 0;
    }
 
-   connection::connection( socket_ptr s )
+   connection::connection()
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
         strand( *my_impl->server_ioc ),
-        socket( s ),
+        socket( *my_impl->server_ioc ),
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
         last_handshake_recv(),
@@ -788,43 +787,47 @@ struct msg_handler : public fc::visitor<void> {
         syncing(false),
         protocol_version(0),
         peer_addr(),
-        response_expected_timer(),
-        read_delay_timer(),
+        response_expected_timer( *my_impl->server_ioc ),
+        read_delay_timer( *my_impl->server_ioc ),
         no_retry(no_reason),
         last_req()
    {
       fc_ilog( logger, "accepted network connection" );
-      initialize();
+      node_id.data()[0] = 0;
    }
 
    connection::~connection() {
       pending_message_buffer.reset();
    }
 
-   void connection::initialize() {
-      auto *rnd = node_id.data();
-      rnd[0] = 0;
-      // called only from constructor, no mutex needed
-      response_expected_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
-      read_delay_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
-   }
-
    void connection::update_endpoints() {
       boost::system::error_code ec;
-      auto rep = socket->remote_endpoint(ec);
+      auto rep = socket.remote_endpoint(ec);
       remote_endpoint_ip = ec ? unknown : rep.address().to_string();
       remote_endpoint_port = ec ? unknown : std::to_string(rep.port());
 
-      auto lep = socket->local_endpoint(ec);
+      auto lep = socket.local_endpoint(ec);
       local_endpoint_ip = ec ? unknown : lep.address().to_string();
       local_endpoint_port = ec ? unknown : std::to_string(lep.port());
    }
 
-   void connection::start() {
+   bool connection::start_session() {
       verify_strand_in_this_thread( strand, __func__, __LINE__ );
 
       update_endpoints();
-      socket_open = true;
+      boost::asio::ip::tcp::no_delay nodelay( true );
+      boost::system::error_code ec;
+      socket.set_option( nodelay, ec );
+      if( ec ) {
+         fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", peer_name())( "error", ec.message() ) );
+         connecting = false;
+         close();
+         return false;
+      } else {
+         socket_open = true;
+         my_impl->start_read_message( shared_from_this() );
+         return true;
+      }
    }
 
    bool connection::connected() {
@@ -844,24 +847,30 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void connection::close() {
-      socket_open = false;
-      socket->close();
-      flush_queues();
-      connecting = false;
-      syncing = false;
-      if( last_req ) {
-         my_impl->dispatcher->retry_fetch(shared_from_this());
+      strand.dispatch( [self = shared_from_this()]() {
+         connection::_close( self.get() );
+      });
+   }
+
+   void connection::_close( connection* self ) {
+      self->socket_open = false;
+      self->socket.close();
+      self->flush_queues();
+      self->connecting = false;
+      self->syncing = false;
+      if( self->last_req ) {
+         my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
-      reset();
-      sent_handshake_count = 0;
-      last_handshake_recv = handshake_message();
-      last_handshake_sent = handshake_message();
-      my_impl->sync_master->reset_lib_num(nullptr);
-      fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
-      cancel_wait();
+      self->reset();
+      self->sent_handshake_count = 0;
+      self->last_handshake_recv = handshake_message();
+      self->last_handshake_sent = handshake_message();
+      my_impl->sync_master->reset_lib_num( nullptr );
+      fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) );
+      self->cancel_wait();
 
-      std::lock_guard<std::mutex> g( read_delay_timer_mtx );
-      if( read_delay_timer ) read_delay_timer->cancel();
+      std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
+      self->read_delay_timer.cancel();
    }
 
    void connection::blk_send_branch() {
@@ -985,56 +994,36 @@ struct msg_handler : public fc::visitor<void> {
    void connection::do_queue_write(int priority) {
       if( !buffer_queue.ready_to_send() )
          return;
-      connection_wptr c(shared_from_this());
-      if(!socket->is_open()) {
-         fc_elog(logger,"socket not open to ${p}",("p",peer_name()));
-         close();
-         return;
-      }
+      connection_ptr c(shared_from_this());
+
       std::vector<boost::asio::const_buffer> bufs;
       buffer_queue.fill_out_buffer( bufs );
 
-      boost::asio::async_write(*socket, bufs, [c, priority]( boost::system::error_code ec, std::size_t w ) {
-         app().post(priority, [c, priority, ec, w]() {
+      boost::asio::async_write( socket, bufs,
+            boost::asio::bind_executor( strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
             try {
-               auto conn = c.lock();
-               if(!conn)
-                  return;
-
-               conn->buffer_queue.out_callback( ec, w );
+               c->buffer_queue.out_callback( ec, w );
 
-               if(ec) {
-                  string pname = conn ? conn->peer_name() : "no connection name";
-                  if( ec.value() != boost::asio::error::eof) {
-                     fc_elog( logger, "Error sending to peer ${p}: ${i}", ("p",pname)("i", ec.message()) );
-                  }
-                  else {
-                     fc_wlog( logger, "connection closure detected on write to ${p}",("p",pname) );
+               if( ec ) {
+                  if( ec.value() != boost::asio::error::eof ) {
+                     fc_elog( logger, "Error sending to peer ${p}: ${i}", ("p", c->peer_name())( "i", ec.message() ) );
+                  } else {
+                     fc_wlog( logger, "connection closure detected on write to ${p}", ("p", c->peer_name()) );
                   }
-                  conn->close();
+                  c->close();
                   return;
                }
-               conn->buffer_queue.clear_out_queue();
-               conn->enqueue_sync_block();
-               conn->do_queue_write( priority );
-            }
-            catch(const std::exception &ex) {
-               auto conn = c.lock();
-               string pname = conn ? conn->peer_name() : "no connection name";
-               fc_elog( logger,"Exception in do_queue_write to ${p} ${s}", ("p",pname)("s",ex.what()) );
-            }
-            catch(const fc::exception &ex) {
-               auto conn = c.lock();
-               string pname = conn ? conn->peer_name() : "no connection name";
-               fc_elog( logger,"Exception in do_queue_write to ${p} ${s}", ("p",pname)("s",ex.to_string()) );
-            }
-            catch(...) {
-               auto conn = c.lock();
-               string pname = conn ? conn->peer_name() : "no connection name";
-               fc_elog( logger,"Exception in do_queue_write to ${p}", ("p",pname) );
+               c->buffer_queue.clear_out_queue();
+               c->enqueue_sync_block();
+               c->do_queue_write( priority );
+            } catch( const std::exception& ex ) {
+               fc_elog( logger, "Exception in do_queue_write to ${p} ${s}", ("p", c->peer_name())( "s", ex.what() ) );
+            } catch( const fc::exception& ex ) {
+               fc_elog( logger, "Exception in do_queue_write to ${p} ${s}", ("p", c->peer_name())( "s", ex.to_string() ) );
+            } catch( ... ) {
+               fc_elog( logger, "Exception in do_queue_write to ${p}", ("p", c->peer_name()) );
             }
-         });
-      });
+      }));
    }
 
    void connection::cancel_sync(go_away_reason reason) {
@@ -1138,20 +1127,15 @@ struct msg_handler : public fc::visitor<void> {
                                     bool trigger_send, int priority, go_away_reason close_after_send,
                                     bool to_sync_queue)
    {
-      connection_wptr weak_this = shared_from_this();
+      connection_ptr self = shared_from_this();
       queue_write(send_buffer,trigger_send, priority,
-                  [weak_this, close_after_send](boost::system::error_code ec, std::size_t ) {
-                     connection_ptr conn = weak_this.lock();
-                     if (conn) {
+                  [conn{std::move(self)}, close_after_send](boost::system::error_code ec, std::size_t ) {
                         if (close_after_send != no_reason) {
                            fc_elog( logger, "sent a go away message: ${r}, closing connection to ${p}",
                                     ("r", reason_str(close_after_send))("p", conn->peer_name()) );
                            conn->close();
                            return;
                         }
-                     } else {
-                        fc_wlog(logger, "connection expired before enqueued net_message called callback!");
-                     }
                   },
                   to_sync_queue);
    }
@@ -1159,16 +1143,15 @@ struct msg_handler : public fc::visitor<void> {
    // thread safe
    void connection::cancel_wait() {
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      if (response_expected_timer)
-         response_expected_timer->cancel();
+      response_expected_timer.cancel();
    }
 
    // thread safe
    void connection::sync_wait() {
       connection_wptr c(shared_from_this());
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      response_expected_timer->expires_from_now( my_impl->resp_expected_period);
-      response_expected_timer->async_wait( [c]( boost::system::error_code ec ) {
+      response_expected_timer.expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer.async_wait( [c]( boost::system::error_code ec ) {
          app().post(priority::low, [c, ec]() {
             connection_ptr conn = c.lock();
             if (!conn) {
@@ -1185,8 +1168,8 @@ struct msg_handler : public fc::visitor<void> {
    void connection::fetch_wait() {
       connection_wptr c(shared_from_this());
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      response_expected_timer->expires_from_now( my_impl->resp_expected_period);
-      response_expected_timer->async_wait( [c]( boost::system::error_code ec ) {
+      response_expected_timer.expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer.async_wait( [c]( boost::system::error_code ec ) {
          app().post(priority::low, [c, ec]() {
             connection_ptr conn = c.lock();
             if (!conn) {
@@ -1942,13 +1925,10 @@ struct msg_handler : public fc::visitor<void> {
       auto current_endpoint = *endpoint_itr;
       ++endpoint_itr;
       c->connecting = true;
-      connection_wptr weak_conn = c;
-      c->socket->async_connect( current_endpoint, [weak_conn, endpoint_itr, this]( const boost::system::error_code& err ) {
-         app().post( priority::low, [weak_conn, endpoint_itr, this, err]() {
-            auto c = weak_conn.lock();
-            if( !c ) return;
-            if( !err && c->socket->is_open()) {
-               if( start_session( c )) {
+      c->socket.async_connect( current_endpoint,
+            boost::asio::bind_executor( c->strand, [c, endpoint_itr, this]( const boost::system::error_code& err ) {
+            if( !err && c->socket.is_open()) {
+               if( c->start_session() ) {
                   c->send_handshake();
                }
             } else {
@@ -1961,42 +1941,18 @@ struct msg_handler : public fc::visitor<void> {
                   c->close();
                }
             }
-         } );
-      } );
-   }
-
-   bool net_plugin_impl::start_session(const connection_ptr& con) {
-      boost::asio::ip::tcp::no_delay nodelay( true );
-      boost::system::error_code ec;
-      con->socket->set_option( nodelay, ec );
-      if (ec) {
-         fc_elog( logger, "connection failed to ${peer}: ${error}", ( "peer", con->peer_name())("error",ec.message()) );
-         con->connecting = false;
-         con->close();
-         return false;
-      } else {
-         con->strand.post( [this, con]() {
-            con->start();
-            start_read_message( con );
-         });
-         ++started_sessions;
-         return true;
-         // for now, we can just use the application main loop.
-         //     con->readloop_complete  = bf::async( [=](){ read_loop( con ); } );
-         //     con->writeloop_complete = bf::async( [=](){ write_loop con ); } );
-      }
+      } ) );
    }
 
-
    void net_plugin_impl::start_listen_loop() {
-      auto new_socket = std::make_shared<tcp::socket>( std::ref( *server_ioc ) );
-      acceptor->async_accept( *new_socket, [new_socket, this, ioc = server_ioc]( boost::system::error_code ec ) {
-         // called from thread_pool threads, new_socket not shared yet
+      connection_ptr new_connection = std::make_shared<connection>();
+      acceptor->async_accept( new_connection->socket,
+            boost::asio::bind_executor( new_connection->strand, [new_connection, this]( boost::system::error_code ec ) {
          if( !ec ) {
             uint32_t visitors = 0;
             uint32_t from_addr = 0;
             boost::system::error_code rec;
-            const auto& paddr_add = new_socket->remote_endpoint( rec ).address();
+            const auto& paddr_add = new_connection->socket.remote_endpoint( rec ).address();
             string paddr_str;
             if( rec ) {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
@@ -2015,8 +1971,7 @@ struct msg_handler : public fc::visitor<void> {
                }
                g.unlock();
                if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
-                  connection_ptr new_connection = std::make_shared<connection>( new_socket );
-                  if( start_session( new_connection ) ) {
+                  if( new_connection->start_session() ) {
                      g.lock();
                      connections.insert( new_connection );
                      g.unlock();
@@ -2029,7 +1984,8 @@ struct msg_handler : public fc::visitor<void> {
                   } else {
                      fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count) );
                   }
-                  new_socket->close(); // new_socket never associated with a connection
+                  // new_connection never added to connections and start_session not called, lifetime will end
+                  new_connection->socket.close();
                }
             }
          } else {
@@ -2048,16 +2004,13 @@ struct msg_handler : public fc::visitor<void> {
             }
          }
          start_listen_loop();
-      });
+      }));
    }
 
    // only called from strand thread
    void net_plugin_impl::start_read_message(const connection_ptr& conn) {
 
       try {
-         if(!conn->socket) {
-            return;
-         }
          connection_wptr weak_conn = conn;
 
          std::size_t minimum_read =
@@ -2068,7 +2021,7 @@ struct msg_handler : public fc::visitor<void> {
             const size_t max_socket_read_watermark = 4096;
             std::size_t socket_read_watermark = std::min<std::size_t>(minimum_read, max_socket_read_watermark);
             boost::asio::socket_base::receive_low_watermark read_watermark_opt(socket_read_watermark);
-            conn->socket->set_option(read_watermark_opt);
+            conn->socket.set_option(read_watermark_opt);
          }
 
          auto completion_handler = [minimum_read](boost::system::error_code ec, std::size_t bytes_transferred) -> std::size_t {
@@ -2098,19 +2051,14 @@ struct msg_handler : public fc::visitor<void> {
                 reads_in_flight > 2*def_max_reads_in_flight   ||
                   trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
-               fc_wlog( logger, "queues over full, giving up on connection" );
-               app().post( priority::medium, [weak_conn]() {
-                  auto conn = weak_conn.lock();
-                  if( !conn ) return;
-                  fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                  conn->close();
-               });
+               fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
+                        ("p", conn->peer_name()) );
+               conn->close();
                return;
             }
             std::lock_guard<std::mutex> g( conn->read_delay_timer_mtx );
-            if( !conn->read_delay_timer ) return;
-            conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
-            conn->read_delay_timer->async_wait(
+            conn->read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
+            conn->read_delay_timer.async_wait(
                   boost::asio::bind_executor(conn->strand, [this, weak_conn]( boost::system::error_code ) {
                auto conn = weak_conn.lock();
                if( !conn ) return;
@@ -2120,15 +2068,10 @@ struct msg_handler : public fc::visitor<void> {
          }
 
          ++conn->reads_in_flight;
-         boost::asio::async_read(*conn->socket,
+         boost::asio::async_read( conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             boost::asio::bind_executor( conn->strand,
-            [this,weak_conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
-               auto conn = weak_conn.lock();
-               if (!conn) {
-                  return;
-               }
-
+            [this, conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                --conn->reads_in_flight;
                bool close_connection = false;
 
@@ -2199,23 +2142,13 @@ struct msg_handler : public fc::visitor<void> {
                }
 
                if( close_connection ) {
-                  app().post( priority::medium, [weak_conn]() {
-                     auto conn = weak_conn.lock();
-                     if( !conn ) return;
-                     fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                     conn->close();
-                  });
+                  fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                  conn->close();
                }
          }));
       } catch (...) {
-         fc_elog( logger, "Undefined exception in start_read_message" );
-         connection_wptr weak_conn = conn;
-         app().post( priority::medium, [weak_conn]() {
-            auto conn = weak_conn.lock();
-            if( !conn ) return;
-            fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-            conn->close();
-         });
+         fc_elog( logger, "Undefined exception in start_read_message, closing connection to: ${p}", ("p", conn->peer_name()) );
+         conn->close();
       }
    }
 
@@ -2968,7 +2901,6 @@ struct msg_handler : public fc::visitor<void> {
          my->resp_expected_period = def_resp_expected_wait;
          my->max_client_count = options.at( "max-clients" ).as<int>();
          my->max_nodes_per_host = options.at( "p2p-max-nodes-per-host" ).as<int>();
-         my->started_sessions = 0;
 
          my->use_socket_read_watermark = options.at( "use-socket-read-watermark" ).as<bool>();
 
@@ -3131,6 +3063,9 @@ struct msg_handler : public fc::visitor<void> {
          if( my->server_ioc_work )
             my->server_ioc_work->reset();
 
+         if( my->server_ioc )
+            my->server_ioc->stop();
+
          {
             std::lock_guard<std::mutex> g( my->connector_check_timer_mtx );
             if( my->connector_check_timer )
@@ -3146,22 +3081,16 @@ struct msg_handler : public fc::visitor<void> {
          }
 
          my->done = true;
-         if( my->acceptor ) {
-            fc_ilog( logger, "close acceptor" );
-            my->acceptor->cancel();
-            my->acceptor->close();
-
-            fc_ilog( logger, "close ${s} connections",( "s",my->connections.size()) );
+         {
+            fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
             std::lock_guard<std::mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
-               fc_dlog( logger, "close: ${p}", ("p",con->peer_name()) );
+               fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
                con->close();
             }
             my->connections.clear();
          }
 
-         if( my->server_ioc )
-            my->server_ioc->stop();
          if( my->thread_pool ) {
             my->thread_pool->join();
             my->thread_pool->stop();

From c66bf7ecb22065fa02011eebb06b70d50af653ac Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Mar 2019 13:55:14 -0500
Subject: [PATCH 0069/1648] Make queued_buffer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 50 +++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6e4636211e7..fccdb9d01da 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -458,33 +458,44 @@ namespace eosio {
       static void populate(handshake_message &hello);
    };
 
+   // thread safe
    class queued_buffer : boost::noncopyable {
    public:
       void clear_write_queue() {
+         std::lock_guard<std::mutex> g( _mtx );
          _write_queue.clear();
          _sync_write_queue.clear();
          _write_queue_size = 0;
       }
 
       void clear_out_queue() {
+         std::lock_guard<std::mutex> g( _mtx );
          while ( _out_queue.size() > 0 ) {
             _out_queue.pop_front();
          }
       }
 
-      // thread safe
-      uint32_t write_queue_size() const { return _write_queue_size; }
+      uint32_t write_queue_size() const {
+         std::lock_guard<std::mutex> g( _mtx );
+         return _write_queue_size;
+      }
 
-      bool is_out_queue_empty() const { return _out_queue.empty(); }
+      bool is_out_queue_empty() const {
+         std::lock_guard<std::mutex> g( _mtx );
+         return _out_queue.empty();
+      }
 
       bool ready_to_send() const {
+         std::lock_guard<std::mutex> g( _mtx );
          // if out_queue is not empty then async_write is in progress
          return ((!_sync_write_queue.empty() || !_write_queue.empty()) && _out_queue.empty());
       }
 
+      // @param callback must not callback into queued_buffer
       bool add_write_queue( const std::shared_ptr<vector<char>>& buff,
                             std::function<void( boost::system::error_code, std::size_t )> callback,
                             bool to_sync_queue ) {
+         std::lock_guard<std::mutex> g( _mtx );
          if( to_sync_queue ) {
             _sync_write_queue.push_back( {buff, callback} );
          } else {
@@ -498,6 +509,7 @@ namespace eosio {
       }
 
       void fill_out_buffer( std::vector<boost::asio::const_buffer>& bufs ) {
+         std::lock_guard<std::mutex> g( _mtx );
          if( _sync_write_queue.size() > 0 ) { // always send msgs from sync_write_queue first
             fill_out_buffer( bufs, _sync_write_queue );
          } else { // postpone real_time write_queue if sync queue is not empty
@@ -507,6 +519,7 @@ namespace eosio {
       }
 
       void out_callback( boost::system::error_code ec, std::size_t w ) {
+         std::lock_guard<std::mutex> g( _mtx );
          for( auto& m : _out_queue ) {
             m.callback( ec, w );
          }
@@ -531,7 +544,8 @@ namespace eosio {
          std::function<void( boost::system::error_code, std::size_t )> callback;
       };
 
-      std::atomic<uint32_t> _write_queue_size{0};
+      mutable std::mutex  _mtx;
+      uint32_t            _write_queue_size{0};
       deque<queued_write> _write_queue;
       deque<queued_write> _sync_write_queue; // sync_write_queue will be sent first
       deque<queued_write> _out_queue;
@@ -847,7 +861,7 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void connection::close() {
-      strand.dispatch( [self = shared_from_this()]() {
+      strand.post( [self = shared_from_this()]() {
          connection::_close( self.get() );
       });
    }
@@ -950,12 +964,15 @@ struct msg_handler : public fc::visitor<void> {
       syncing = false;
    }
 
+   // thread safe
    void connection::send_handshake() {
-      handshake_initializer::populate(last_handshake_sent);
-      last_handshake_sent.generation = ++sent_handshake_count;
-      fc_dlog(logger, "Sending handshake generation ${g} to ${ep}",
-              ("g",last_handshake_sent.generation)("ep", peer_name()));
-      enqueue(last_handshake_sent);
+      app().post( priority::low, [c = shared_from_this()]() {
+         handshake_initializer::populate( c->last_handshake_sent );
+         c->last_handshake_sent.generation = ++c->sent_handshake_count;
+         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}",
+                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_name() ) );
+         c->enqueue( c->last_handshake_sent );
+      });
    }
 
    void connection::send_time() {
@@ -991,6 +1008,7 @@ struct msg_handler : public fc::visitor<void> {
       }
    }
 
+   // called from connection strand and application thread
    void connection::do_queue_write(int priority) {
       if( !buffer_queue.ready_to_send() )
          return;
@@ -999,8 +1017,9 @@ struct msg_handler : public fc::visitor<void> {
       std::vector<boost::asio::const_buffer> bufs;
       buffer_queue.fill_out_buffer( bufs );
 
-      boost::asio::async_write( socket, bufs,
-            boost::asio::bind_executor( strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
+      strand.dispatch( [c{std::move(c)}, bufs{std::move(bufs)}, priority]() {
+         boost::asio::async_write( c->socket, bufs,
+            boost::asio::bind_executor( c->strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
             try {
                c->buffer_queue.out_callback( ec, w );
 
@@ -1023,7 +1042,8 @@ struct msg_handler : public fc::visitor<void> {
             } catch( ... ) {
                fc_elog( logger, "Exception in do_queue_write to ${p}", ("p", c->peer_name()) );
             }
-      }));
+         }));
+      });
    }
 
    void connection::cancel_sync(go_away_reason reason) {
@@ -2789,8 +2809,8 @@ struct msg_handler : public fc::visitor<void> {
       return chain::signature_type();
    }
 
-   void
-   handshake_initializer::populate( handshake_message &hello) {
+   // call from main application thread
+   void handshake_initializer::populate( handshake_message& hello ) {
       hello.network_version = net_version_base + net_version;
       hello.chain_id = my_impl->chain_id;
       hello.node_id = my_impl->node_id;

From ba140e8443b67d45354849901f30bbe0d1e4c57c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Mar 2019 15:58:17 -0500
Subject: [PATCH 0070/1648] Make use of resolver thread safe

---
 plugins/net_plugin/net_plugin.cpp | 86 ++++++++++++++-----------------
 1 file changed, 38 insertions(+), 48 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index fccdb9d01da..e70a74ccdf4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -254,8 +254,6 @@ namespace eosio {
       chain_plugin*                 chain_plug = nullptr;
       producer_plugin*              producer_plug = nullptr;
 
-      shared_ptr<tcp::resolver>     resolver;
-
       bool                          use_socket_read_watermark = false;
 
       compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
@@ -268,7 +266,7 @@ namespace eosio {
 
 
       bool resolve_and_connect(const connection_ptr& c);
-      void connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr);
+      void connect(const connection_ptr& c, const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
       void start_listen_loop();
       void start_read_message(const connection_ptr& c);
 
@@ -594,7 +592,7 @@ namespace eosio {
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
       int16_t                 sent_handshake_count = 0;
-      bool                    connecting = false;
+      std::atomic<bool>       connecting{false};
       bool                    syncing = false;
       uint16_t                protocol_version  = 0;
    private:
@@ -609,7 +607,7 @@ namespace eosio {
       boost::asio::steady_timer             response_expected_timer;
       std::mutex                            read_delay_timer_mtx;
       boost::asio::steady_timer             read_delay_timer;
-      go_away_reason         no_retry = no_reason;
+      std::atomic<go_away_reason>           no_retry{no_reason};
       block_id_type          fork_head;
       std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
       optional<request_message> last_req;
@@ -1892,52 +1890,42 @@ struct msg_handler : public fc::visitor<void> {
 
    //------------------------------------------------------------------------
 
+   // called from any thread
    bool net_plugin_impl::resolve_and_connect(const connection_ptr& c) {
       if( c->no_retry != go_away_reason::no_reason) {
          fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( c->no_retry )));
          return false;
       }
 
-      auto colon = c->peer_address().find(':');
-
+      string::size_type colon = c->peer_address().find(':');
       if (colon == std::string::npos || colon == 0) {
          fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p",c->peer_address()) );
-         std::lock_guard<std::mutex> g( my_impl->connections_mtx );
-         for ( auto& cp : connections ) {
-            if( cp->peer_address() == c->peer_address() ) {
-               cp->reset();
-               cp->close();
-               connections.erase( cp );
-               break;
-            }
-         }
          return false;
       }
 
-      auto host = c->peer_address().substr( 0, colon );
-      auto port = c->peer_address().substr( colon + 1);
+      string host = c->peer_address().substr( 0, colon );
+      string port = c->peer_address().substr( colon + 1);
       idump((host)(port));
-      tcp::resolver::query query( tcp::v4(), host.c_str(), port.c_str() );
+      tcp::resolver::query query( tcp::v4(), host, port );
       connection_wptr weak_conn = c;
       // Note: need to add support for IPv6 too
 
+      auto resolver = std::make_shared<tcp::resolver>( *server_ioc );
       resolver->async_resolve( query,
-                [weak_conn, this]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
-                   app().post( priority::low, [err, endpoint_itr, weak_conn, this]() {
-                      auto c = weak_conn.lock();
-                      if( !c ) return;
-                      if( !err ) {
-                         connect( c, endpoint_itr );
-                      } else {
-                         fc_elog( logger, "Unable to resolve ${add}: ${error}",
-                                  ("add", c->peer_name())( "error", err.message()) );
-                      }
-                   } );
-                } );
+            [resolver, ioc = server_ioc, weak_conn, this]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
+               auto c = weak_conn.lock();
+               if( !c ) return;
+               if( !err ) {
+                  connect( c, resolver, endpoint_itr );
+               } else {
+                  fc_elog( logger, "Unable to resolve ${add}: ${error}", ("add", c->peer_name())( "error", err.message() ) );
+               }
+            } );
       return true;
    }
 
-   void net_plugin_impl::connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr) {
+   // called from any thread
+   void net_plugin_impl::connect(const connection_ptr& c, const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr) {
       if( c->no_retry != go_away_reason::no_reason) {
          string rsn = reason_str(c->no_retry);
          return;
@@ -1946,7 +1934,7 @@ struct msg_handler : public fc::visitor<void> {
       ++endpoint_itr;
       c->connecting = true;
       c->socket.async_connect( current_endpoint,
-            boost::asio::bind_executor( c->strand, [c, endpoint_itr, this]( const boost::system::error_code& err ) {
+            boost::asio::bind_executor( c->strand, [resolver, c, endpoint_itr, this]( const boost::system::error_code& err ) {
             if( !err && c->socket.is_open()) {
                if( c->start_session() ) {
                   c->send_handshake();
@@ -1954,7 +1942,7 @@ struct msg_handler : public fc::visitor<void> {
             } else {
                if( endpoint_itr != tcp::resolver::iterator()) {
                   c->close();
-                  connect( c, endpoint_itr );
+                  connect( c, resolver, endpoint_itr );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;
@@ -2620,19 +2608,17 @@ struct msg_handler : public fc::visitor<void> {
       }
    }
 
+   // called from any thread
    void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection) {
       std::lock_guard<std::mutex> g( connector_check_timer_mtx );
       connector_check_timer->expires_from_now( du);
       connector_check_timer->async_wait( [this, from_connection](boost::system::error_code ec) {
-            app().post( priority::low, [this, from_connection, ec]() {
             if( !ec) {
                connection_monitor(from_connection);
-            }
-            else {
+            } else {
                fc_elog( logger, "Error from connection check monitor: ${m}",( "m", ec.message()));
                start_conn_timer( connector_period, std::weak_ptr<connection>());
             }
-         });
       });
    }
 
@@ -2693,6 +2679,7 @@ struct msg_handler : public fc::visitor<void> {
       start_expire_timer();
    }
 
+   // called from any thread
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
@@ -2707,7 +2694,10 @@ struct msg_handler : public fc::visitor<void> {
          }
          if( !(*it)->socket_is_open() && !(*it)->connecting) {
             if( (*it)->peer_address().length() > 0) {
-               resolve_and_connect(*it);
+               if( !resolve_and_connect(*it) ) {
+                  it = connections.erase(it);
+                  continue;
+               }
             } else {
                it = connections.erase(it);
                continue;
@@ -2997,14 +2987,14 @@ struct msg_handler : public fc::visitor<void> {
          boost::asio::post( *my->thread_pool, [ioc = my->server_ioc]() { ioc->run(); } );
       }
 
-      my->resolver = std::make_shared<tcp::resolver>( std::ref( *my->server_ioc ));
       if( my->p2p_address.size() > 0 ) {
          auto host = my->p2p_address.substr( 0, my->p2p_address.find( ':' ));
          auto port = my->p2p_address.substr( host.size() + 1, my->p2p_address.size());
          tcp::resolver::query query( tcp::v4(), host.c_str(), port.c_str());
          // Note: need to add support for IPv6 too?
 
-         my->listen_endpoint = *my->resolver->resolve( query );
+         tcp::resolver resolver( *my->server_ioc );
+         my->listen_endpoint = *resolver.resolve( query );
 
          my->acceptor.reset( new tcp::acceptor( *my->server_ioc ) );
 
@@ -3127,13 +3117,13 @@ struct msg_handler : public fc::visitor<void> {
       if( my->find_connection( host ) )
          return "already connected";
 
-      connection_ptr c = std::make_shared<connection>(host);
-      fc_dlog(logger,"adding new connection to the list");
-      std::unique_lock<std::mutex> g( my->connections_mtx );
-      my->connections.insert( c );
-      g.unlock();
-      fc_dlog(logger,"calling active connector");
-      my->resolve_and_connect( c );
+      connection_ptr c = std::make_shared<connection>( host );
+      fc_dlog( logger, "calling active connector" );
+      if( my->resolve_and_connect( c ) ) {
+         fc_dlog( logger, "adding new connection to the list" );
+         std::unique_lock<std::mutex> g( my->connections_mtx );
+         my->connections.insert( c );
+      }
       return "added connection";
    }
 

From 22f9e666070fe2e08d7d2d1839e30c7baefe525f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Mar 2019 23:08:28 -0500
Subject: [PATCH 0071/1648] Use boost::shared_mutex for connections.
 Multithread broadcast block.

---
 plugins/net_plugin/net_plugin.cpp | 88 ++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 36 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e70a74ccdf4..e1d3dbbf2b1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -25,6 +25,8 @@
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <atomic>
 
@@ -223,7 +225,7 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      mutable std::mutex               connections_mtx; // switch to shared_mutex in C++17
+      mutable boost::shared_mutex      connections_mtx; // switch to std::shared_mutex in C++17
       std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
@@ -593,7 +595,7 @@ namespace eosio {
       handshake_message       last_handshake_sent;
       int16_t                 sent_handshake_count = 0;
       std::atomic<bool>       connecting{false};
-      bool                    syncing = false;
+      std::atomic<bool>       syncing{false};
       uint16_t                protocol_version  = 0;
    private:
       const string            peer_addr;
@@ -1327,7 +1329,7 @@ struct msg_handler : public fc::visitor<void> {
       if (conn && conn->current() ) {
          source = conn;
       } else {
-         std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+         boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          if (my_impl->connections.size() == 1) {
             if (!source) {
                source = *my_impl->connections.begin();
@@ -1393,7 +1395,7 @@ struct msg_handler : public fc::visitor<void> {
 
    void sync_manager::send_handshakes()
    {
-      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& ci : my_impl->connections ) {
          if( ci->current() ) {
             ci->send_handshake();
@@ -1513,7 +1515,7 @@ struct msg_handler : public fc::visitor<void> {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
-      std::unique_lock<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for (const auto& cc : my_impl->connections) {
          // fork_head_num provides memory barrier for fork_head
          if( cc->fork_head_num > num || cc->fork_head == id ) {
@@ -1588,7 +1590,7 @@ struct msg_handler : public fc::visitor<void> {
          source.reset();
 
          block_id_type null_id;
-         std::unique_lock<std::mutex> g( my_impl->connections_mtx );
+         boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          for( const auto& cp : my_impl->connections ) {
             uint32_t fork_head_num = cp->fork_head_num.load(); // fork_head_num provides memory barrier for fork_head
             if (cp->fork_head == null_id) {
@@ -1717,31 +1719,43 @@ struct msg_handler : public fc::visitor<void> {
       stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib_num) );
    }
 
+   // thread safe
    void dispatch_manager::bcast_block(const block_state_ptr& bs) {
-      uint32_t bnum = bs->block_num;
-      peer_block_state pbstate{bs->id, bnum};
-      fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
+      fc_dlog( logger, "bcast block ${b}", ("b", bs->block_num) );
 
-      std::shared_ptr<std::vector<char>> send_buffer;
-      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      bool have_connection = false;
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
          }
-         bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
-         if( !has_block ) {
-            pbstate.connection_id = cp->connection_id;
-            if( !add_peer_block( pbstate ) ) {
-               continue;
-            }
-            if( !send_buffer ) {
-               send_buffer = create_send_buffer( bs->block );
-            }
-            fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
-            cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
-         }
+         have_connection = true;
+         break;
       }
+      g.unlock();
 
+      if( !have_connection ) return;
+      std::shared_ptr<std::vector<char>> send_buffer = create_send_buffer( bs->block );
+
+      g.lock();
+      for( auto& cp : my_impl->connections ) {
+         if( !cp->current() ) {
+            continue;
+         }
+         cp->strand.post( [this, cp, bs, send_buffer]() {
+            uint32_t bnum = bs->block_num;
+            // todo protect cp->last_handshake_recv
+            bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
+            if( !has_block ) {
+               peer_block_state pbstate{bs->id, bnum, cp->connection_id};
+               if( !add_peer_block( pbstate ) ) {
+                  return;
+               }
+               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
+               cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
+            }
+         });
+      }
    }
 
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
@@ -1770,7 +1784,7 @@ struct msg_handler : public fc::visitor<void> {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
-      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
@@ -1866,7 +1880,7 @@ struct msg_handler : public fc::visitor<void> {
                   ("b",modes_str(c->last_req->req_blocks.mode))("t",modes_str(c->last_req->req_trx.mode)));
          return;
       }
-      std::unique_lock<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for (auto& conn : my_impl->connections) {
          if (conn == c || conn->last_req) {
             continue;
@@ -1966,7 +1980,7 @@ struct msg_handler : public fc::visitor<void> {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
             } else {
                paddr_str = paddr_add.to_string();
-               std::unique_lock<std::mutex> g( connections_mtx );
+               boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
                for( auto& conn : connections ) {
                   if( conn->socket_is_open() ) {
                      if( conn->peer_address().empty() ) {
@@ -2258,7 +2272,7 @@ struct msg_handler : public fc::visitor<void> {
 
          if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
             fc_dlog(logger, "checking for duplicate" );
-            std::lock_guard<std::mutex> g( connections_mtx );
+            boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
             for(const auto& check : connections) {
                if(check == c)
                   continue;
@@ -2646,7 +2660,7 @@ struct msg_handler : public fc::visitor<void> {
             if( ec ) {
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
-            std::lock_guard<std::mutex> g( connections_mtx );
+            boost::shared_lock<boost::shared_mutex> g( connections_mtx );
             for( auto& c : connections ) {
                if( c->socket_is_open() ) {
                   c->send_time();
@@ -2684,7 +2698,7 @@ struct msg_handler : public fc::visitor<void> {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
-      std::unique_lock<std::mutex> g( connections_mtx );
+      boost::unique_lock<boost::shared_mutex> g( connections_mtx );
       auto it = (from ? connections.find(from) : connections.begin());
       if (it == connections.end()) it = connections.begin();
       while (it != connections.end()) {
@@ -2710,8 +2724,10 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void net_plugin_impl::accepted_block(const block_state_ptr& block) {
-      fc_dlog(logger,"signaled, id = ${id}",("id", block->id));
-      dispatcher->bcast_block(block);
+      boost::asio::post( *server_ioc, [this, ioc=server_ioc, block]() {
+         fc_dlog( logger, "signaled, id = ${id}", ("id", block->id) );
+         dispatcher->bcast_block( block );
+      });
    }
 
    void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
@@ -3093,7 +3109,7 @@ struct msg_handler : public fc::visitor<void> {
          my->done = true;
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
-            std::lock_guard<std::mutex> g( my->connections_mtx );
+            boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
                con->close();
@@ -3121,14 +3137,14 @@ struct msg_handler : public fc::visitor<void> {
       fc_dlog( logger, "calling active connector" );
       if( my->resolve_and_connect( c ) ) {
          fc_dlog( logger, "adding new connection to the list" );
-         std::unique_lock<std::mutex> g( my->connections_mtx );
+         boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
          my->connections.insert( c );
       }
       return "added connection";
    }
 
    string net_plugin::disconnect( const string& host ) {
-      std::lock_guard<std::mutex> g( my->connections_mtx );
+      boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
          if( (*itr)->peer_address() == host ) {
             (*itr)->reset();
@@ -3150,7 +3166,7 @@ struct msg_handler : public fc::visitor<void> {
 
    vector<connection_status> net_plugin::connections()const {
       vector<connection_status> result;
-      std::lock_guard<std::mutex> g( my->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my->connections_mtx );
       result.reserve( my->connections.size() );
       for( const auto& c : my->connections ) {
          result.push_back( c->get_status() );
@@ -3158,7 +3174,7 @@ struct msg_handler : public fc::visitor<void> {
       return result;
    }
    connection_ptr net_plugin_impl::find_connection(const string& host )const {
-      std::lock_guard<std::mutex> g( connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( connections_mtx );
       for( const auto& c : connections )
          if( c->peer_address() == host ) return c;
       return connection_ptr();

From 90b479db92d387618a82b3106e1132676c130bf7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 26 Mar 2019 07:16:05 -0500
Subject: [PATCH 0072/1648] Work toward making sync_manager and handshake
 message thread safe.

---
 plugins/net_plugin/net_plugin.cpp | 682 +++++++++++++++++-------------
 1 file changed, 382 insertions(+), 300 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e1d3dbbf2b1..205bfbfb105 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -141,28 +141,29 @@ namespace eosio {
          in_sync
       };
 
+      std::mutex     sync_mtx;
       uint32_t       sync_known_lib_num;
       uint32_t       sync_last_requested_num;
       uint32_t       sync_next_expected_num;
       uint32_t       sync_req_span;
-      connection_ptr source;
-      stages         state;
+      connection_ptr sync_source;
+      stages         sync_state;
 
       chain_plugin* chain_plug = nullptr;
 
-      constexpr static auto stage_str(stages s);
+   private:
+      constexpr static auto stage_str( stages s );
+      void set_state( stages s );
+      bool is_sync_required();
+      void request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn = connection_ptr() );
+      void start_sync( const connection_ptr& c, uint32_t target );
+      void verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
+      static void send_handshakes();
 
    public:
       explicit sync_manager(uint32_t span);
-      void set_state(stages s);
-      bool sync_required();
-      void send_handshakes();
-      bool is_active(const connection_ptr& conn);
-      void reset_lib_num(const connection_ptr& conn);
-      void request_next_chunk(const connection_ptr& conn = connection_ptr());
-      void start_sync(const connection_ptr& c, uint32_t target);
-      void reassign_fetch(const connection_ptr& c, go_away_reason reason);
-      void verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id);
+      void sync_reset_lib_num(const connection_ptr& conn);
+      void sync_reassign_fetch(const connection_ptr& c, go_away_reason reason);
       void rejected_block(const connection_ptr& c, uint32_t blk_num);
       void sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
@@ -214,6 +215,7 @@ namespace eosio {
       vector<chain::public_key_type>   allowed_peers; ///< peer keys allowed to connect
       std::map<chain::public_key_type,
                chain::private_key_type> private_keys; ///< overlapping with producer keys, also authenticating non-producing nodes
+                                                      // thread safe, only updated in plugin initialize
 
       enum possible_connections : char {
          None = 0,
@@ -246,17 +248,24 @@ namespace eosio {
       const std::chrono::system_clock::duration peer_authentication_interval{std::chrono::seconds{1}}; ///< Peer clock may be no more than 1 second skewed from our clock, including network latency.
 
       bool                          network_version_match = false;
-      chain_id_type                 chain_id;
-      fc::sha256                    node_id;
-      std::atomic<uint32_t>         lib_num{0};
-      uint32_t                      head_blk_num{0};
+      chain_id_type                 chain_id; // thread safe, only updated in plugin_initialize
+      fc::sha256                    node_id;  // thread safe, only updated in plugin initialize
+      string                        user_agent_name; // thread safe, only updated in plugin initialize
+
+      mutable std::mutex            chain_info_mtx;
+      uint32_t                      chain_lib_num{0};
+      uint32_t                      chain_head_blk_num{0};
+      uint32_t                      chain_fork_head_blk_num{0};
+      block_id_type                 chain_lib_id;
+      block_id_type                 chain_head_blk_id;
+      block_id_type                 chain_fork_head_blk_id;
+
       eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
-      string                        user_agent_name;
       chain_plugin*                 chain_plug = nullptr;
       producer_plugin*              producer_plug = nullptr;
 
-      bool                          use_socket_read_watermark = false;
+      bool                          use_socket_read_watermark = false; // thread safe, not modified outside plugin_initialize
 
       compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
       channels::irreversible_block::channel_type::handle       incoming_irreversible_block_subscription;
@@ -266,31 +275,17 @@ namespace eosio {
       std::shared_ptr<boost::asio::io_context>  server_ioc;
       optional<io_work_t>                       server_ioc_work;
 
+      void update_chain_info();
+      //         lib_num, head_block_num, fork_head_blk_num, lib_id, head_blk_id, fork_head_blk_id
+      std::tuple<uint32_t, uint32_t, uint32_t, block_id_type, block_id_type, block_id_type> get_chain_info() const;
 
-      bool resolve_and_connect(const connection_ptr& c);
-      void connect(const connection_ptr& c, const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
       void start_listen_loop();
-      void start_read_message(const connection_ptr& c);
 
-      /** \brief Process the next message from the pending message buffer
-       *
-       * Process the next message from the pending_message_buffer.
-       * message_length is the already determined length of the data
-       * part of the message that will handle the message.
-       * Returns true is successful. Returns false if an error was
-       * encountered unpacking or processing the message.
-       */
-      bool process_next_message(const connection_ptr& conn, uint32_t message_length);
-
-      void accepted_block(const block_state_ptr&);
+      void on_accepted_block( const block_state_ptr& bs );
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
-      void on_irreversible_block( const block_state_ptr& blk ) {
-         lib_num = blk->block_num;
-         controller& cc = chain_plug->chain();
-         head_blk_num = cc.head_block_num();
-      }
+      void on_irreversible_block( const block_state_ptr& blk );
 
-      bool is_valid( const handshake_message &msg);
+      static bool is_valid( const handshake_message& msg );
 
       void handle_message(const connection_ptr& c, const handshake_message& msg);
       void handle_message(const connection_ptr& c, const chain_size_message& msg);
@@ -455,7 +450,7 @@ namespace eosio {
    };
 
    struct handshake_initializer {
-      static void populate(handshake_message &hello);
+      static void populate(handshake_message& hello);
    };
 
    // thread safe
@@ -647,6 +642,21 @@ namespace eosio {
    private:
       static void _close( connection* self ); // for easy capture
    public:
+
+      bool resolve_and_connect();
+      void connect(const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
+      void start_read_message();
+
+      /** \brief Process the next message from the pending message buffer
+       *
+       * Process the next message from the pending_message_buffer.
+       * message_length is the already determined length of the data
+       * part of the message that will handle the message.
+       * Returns true is successful. Returns false if an error was
+       * encountered unpacking or processing the message.
+       */
+      bool process_next_message(uint32_t message_length);
+
       void send_handshake();
 
       /** \name Peer Timestamps
@@ -719,8 +729,8 @@ namespace eosio {
 
    const string connection::unknown = "<unknown>";
 
-
-struct msg_handler : public fc::visitor<void> {
+   // called from connection strand
+   struct msg_handler : public fc::visitor<void> {
       net_plugin_impl& impl;
       connection_ptr c;
       msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
@@ -746,16 +756,61 @@ struct msg_handler : public fc::visitor<void> {
             if( c ) impl->handle_message( c, ptr );
          });
       }
+
       void operator()( packed_transaction&& msg ) const {
+         // continue call to handle_message on connection strand
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
          impl.handle_message( c, ptr );
       }
 
-      template <typename T>
-      void operator()( T&& msg ) const
-      {
+      void operator()( const handshake_message& msg ) const {
+         // continue call to handle_message on connection strand
+         impl.handle_message( c, msg );
+      }
+
+      void operator()( const chain_size_message& msg ) const {
          connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const go_away_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const time_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const notice_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const request_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const sync_request_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
@@ -839,7 +894,7 @@ struct msg_handler : public fc::visitor<void> {
          return false;
       } else {
          socket_open = true;
-         my_impl->start_read_message( shared_from_this() );
+         start_read_message();
          return true;
       }
    }
@@ -879,7 +934,7 @@ struct msg_handler : public fc::visitor<void> {
       self->sent_handshake_count = 0;
       self->last_handshake_recv = handshake_message();
       self->last_handshake_sent = handshake_message();
-      my_impl->sync_master->reset_lib_num( nullptr );
+      my_impl->sync_master->sync_reset_lib_num( nullptr );
       fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) );
       self->cancel_wait();
 
@@ -964,9 +1019,8 @@ struct msg_handler : public fc::visitor<void> {
       syncing = false;
    }
 
-   // thread safe
    void connection::send_handshake() {
-      app().post( priority::low, [c = shared_from_this()]() {
+      strand.post( [c = shared_from_this()]() {
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          fc_dlog( logger, "Sending handshake generation ${g} to ${ep}",
@@ -1168,20 +1222,13 @@ struct msg_handler : public fc::visitor<void> {
 
    // thread safe
    void connection::sync_wait() {
-      connection_wptr c(shared_from_this());
+      connection_ptr c(shared_from_this());
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
       response_expected_timer.expires_from_now( my_impl->resp_expected_period);
-      response_expected_timer.async_wait( [c]( boost::system::error_code ec ) {
-         app().post(priority::low, [c, ec]() {
-            connection_ptr conn = c.lock();
-            if (!conn) {
-               // connection was destroyed before this lambda was delivered
-               return;
-            }
-
-            conn->sync_timeout(ec);
-         });
-      } );
+      response_expected_timer.async_wait(
+            boost::asio::bind_executor( c->strand, [c]( boost::system::error_code ec ) {
+               c->sync_timeout( ec );
+            } ) );
    }
 
    // thread safe
@@ -1202,17 +1249,17 @@ struct msg_handler : public fc::visitor<void> {
       } );
    }
 
+   // called from connection strand
    void connection::sync_timeout( boost::system::error_code ec ) {
       if( !ec ) {
-         my_impl->sync_master->reassign_fetch(shared_from_this(), benign_other);
-      }
-      else if( ec == boost::asio::error::operation_aborted) {
-      }
-      else {
-         fc_elog( logger,"setting timer for sync request got error ${ec}",("ec", ec.message()) );
+         my_impl->sync_master->sync_reassign_fetch( shared_from_this(), benign_other );
+      } else if( ec == boost::asio::error::operation_aborted ) {
+      } else {
+         fc_elog( logger, "setting timer for sync request got error ${ec}", ("ec", ec.message()) );
       }
    }
 
+   // todo: last_handshake_recv not thread safe
    const string connection::peer_name() {
       if( !last_handshake_recv.p2p_address.empty() ) {
          return last_handshake_recv.p2p_address;
@@ -1253,8 +1300,8 @@ struct msg_handler : public fc::visitor<void> {
       ,sync_last_requested_num( 0 )
       ,sync_next_expected_num( 1 )
       ,sync_req_span( req_span )
-      ,source()
-      ,state(in_sync)
+      ,sync_source()
+      ,sync_state(in_sync)
    {
       chain_plug = app().find_plugin<chain_plugin>();
       EOS_ASSERT( chain_plug, chain::missing_chain_plugin_exception, ""  );
@@ -1270,53 +1317,48 @@ struct msg_handler : public fc::visitor<void> {
   }
 
    void sync_manager::set_state(stages newstate) {
-      if (state == newstate) {
+      if( sync_state == newstate ) {
          return;
       }
-      fc_dlog(logger, "old state ${os} becoming ${ns}",("os",stage_str(state))("ns",stage_str(newstate)));
-      state = newstate;
+      fc_dlog( logger, "old state ${os} becoming ${ns}", ("os", stage_str( sync_state ))( "ns", stage_str( newstate ) ) );
+      sync_state = newstate;
    }
 
-   // uses controller, only call from application thread
-   bool sync_manager::is_active(const connection_ptr& c) {
-      if (state == head_catchup && c) {
-         auto fork_head_num = c->fork_head_num.load(); // provide memory barrier for c->fork_head
-         bool fhset = c->fork_head != block_id_type();
-         fc_dlog( logger, "fork_head_num = ${fn} fork_head set = ${s}", ("fn", fork_head_num)( "s", fhset ) );
-         return c->fork_head != block_id_type() && fork_head_num < chain_plug->chain().fork_db_head_block_num();
-      }
-      return state != in_sync;
-   }
-
-   void sync_manager::reset_lib_num(const connection_ptr& c) {
-      if(state == in_sync) {
-         source.reset();
+   void sync_manager::sync_reset_lib_num(const connection_ptr& c) {
+      std::unique_lock<std::mutex> g( sync_mtx );
+      if( sync_state == in_sync ) {
+         sync_source.reset();
       }
       if( !c ) return;
       if( c->current() ) {
-         if( c->last_handshake_recv.last_irreversible_block_num > sync_known_lib_num) {
-            sync_known_lib_num =c->last_handshake_recv.last_irreversible_block_num;
+         if( c->last_handshake_recv.last_irreversible_block_num > sync_known_lib_num ) {
+            sync_known_lib_num = c->last_handshake_recv.last_irreversible_block_num;
          }
-      } else if( c == source ) {
+      } else if( c == sync_source ) {
          sync_last_requested_num = 0;
-         request_next_chunk();
+         request_next_chunk( std::move(g) );
       }
    }
 
-   bool sync_manager::sync_required() {
-      fc_dlog(logger, "last req = ${req}, last recv = ${recv} known = ${known} our head = ${head}",
-              ("req",sync_last_requested_num)("recv",sync_next_expected_num)("known",sync_known_lib_num)("head",chain_plug->chain().fork_db_head_block_num()));
+   bool sync_manager::is_sync_required() {
+      fc_dlog( logger, "last req = ${req}, last recv = ${recv} known = ${known} our head = ${head}",
+               ("req", sync_last_requested_num)( "recv", sync_next_expected_num )( "known", sync_known_lib_num )
+               ("head", chain_plug->chain().fork_db_head_block_num() ) );
 
       return( sync_last_requested_num < sync_known_lib_num ||
               chain_plug->chain().fork_db_head_block_num() < sync_last_requested_num );
    }
 
-   void sync_manager::request_next_chunk( const connection_ptr& conn ) {
-      uint32_t head_block = chain_plug->chain().fork_db_head_block_num();
+   // call with g_sync locked
+   void sync_manager::request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn ) {
+      uint32_t fork_head_block_num = 0;
+      uint32_t lib_block_num = 0;
+      std::tie( lib_block_num, std::ignore, fork_head_block_num,
+                std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
 
-      if (head_block < sync_last_requested_num && source && source->current()) {
-         fc_ilog(logger, "ignoring request, head is ${h} last req = ${r} source is ${p}",
-                  ("h",head_block)("r",sync_last_requested_num)("p",source->peer_name()));
+      if( fork_head_block_num < sync_last_requested_num && sync_source && sync_source->current() ) {
+         fc_ilog( logger, "ignoring request, head is ${h} last req = ${r} source is ${p}",
+                  ("h", fork_head_block_num)( "r", sync_last_requested_num )( "p", sync_source->peer_address() ) );
          return;
       }
 
@@ -1327,25 +1369,25 @@ struct msg_handler : public fc::visitor<void> {
        */
 
       if (conn && conn->current() ) {
-         source = conn;
+         sync_source = conn;
       } else {
          boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          if (my_impl->connections.size() == 1) {
-            if (!source) {
-               source = *my_impl->connections.begin();
+            if (!sync_source) {
+               sync_source = *my_impl->connections.begin();
             }
          } else {
             // init to a linear array search
             auto cptr = my_impl->connections.begin();
             auto cend = my_impl->connections.end();
             // do we remember the previous source?
-            if (source) {
+            if (sync_source) {
                //try to find it in the list
-               cptr = my_impl->connections.find(source);
+               cptr = my_impl->connections.find( sync_source );
                cend = cptr;
                if (cptr == my_impl->connections.end()) {
                   //not there - must have been closed! cend is now connections.end, so just flatten the ring.
-                  source.reset();
+                  sync_source.reset();
                   cptr = my_impl->connections.begin();
                } else {
                   //was found - advance the start to the next. cend is the old source.
@@ -1359,8 +1401,8 @@ struct msg_handler : public fc::visitor<void> {
             auto cstart_it = cptr;
             do {
                //select the first one which is current and break out.
-               if((*cptr)->current()) {
-                  source = *cptr;
+               if( (*cptr)->current() ) {
+                  sync_source = *cptr;
                   break;
                }
                if(++cptr == my_impl->connections.end())
@@ -1371,11 +1413,11 @@ struct msg_handler : public fc::visitor<void> {
       }
 
       // verify there is an available source
-      if (!source || !source->current() ) {
+      if( !sync_source || !sync_source->current() ) {
          fc_elog( logger, "Unable to continue syncing at this time");
-         sync_known_lib_num = chain_plug->chain().last_irreversible_block_num();
+         sync_known_lib_num = lib_block_num;
          sync_last_requested_num = 0;
-         set_state(in_sync); // probably not, but we can't do anything else
+         set_state( in_sync ); // probably not, but we can't do anything else
          return;
       }
 
@@ -1385,16 +1427,18 @@ struct msg_handler : public fc::visitor<void> {
          if( end > sync_known_lib_num )
             end = sync_known_lib_num;
          if( end > 0 && end >= start ) {
-            fc_ilog(logger, "requesting range ${s} to ${e}, from ${n}",
-                    ("n",source->peer_name())("s",start)("e",end));
-            source->request_sync_blocks(start, end);
             sync_last_requested_num = end;
+            connection_ptr c = sync_source;
+            g_sync.unlock();
+            fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}",
+                     ("n", c->peer_address())( "s", start )( "e", end ) );
+            c->request_sync_blocks( start, end );
          }
       }
    }
 
-   void sync_manager::send_handshakes()
-   {
+   // static, thread safe
+   void sync_manager::send_handshakes() {
       boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& ci : my_impl->connections ) {
          if( ci->current() ) {
@@ -1404,37 +1448,40 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void sync_manager::start_sync(const connection_ptr& c, uint32_t target) {
+      std::unique_lock<std::mutex> g_sync( sync_mtx );
       if( target > sync_known_lib_num) {
          sync_known_lib_num = target;
       }
 
-      if (!sync_required()) {
+      if( !is_sync_required() ) {
          uint32_t bnum = chain_plug->chain().last_irreversible_block_num();
          uint32_t hnum = chain_plug->chain().fork_db_head_block_num();
          fc_dlog( logger, "We are already caught up, my irr = ${b}, head = ${h}, target = ${t}",
-                  ("b",bnum)("h",hnum)("t",target));
+                  ("b", bnum)( "h", hnum )( "t", target ) );
          return;
       }
 
-      if (state == in_sync) {
-         set_state(lib_catchup);
+      if( sync_state == in_sync ) {
+         set_state( lib_catchup );
          sync_next_expected_num = chain_plug->chain().last_irreversible_block_num() + 1;
       }
 
-      fc_ilog(logger, "Catching up with chain, our last req is ${cc}, theirs is ${t} peer ${p}",
-              ( "cc",sync_last_requested_num)("t",target)("p",c->peer_name()));
+      fc_ilog( logger, "Catching up with chain, our last req is ${cc}, theirs is ${t} peer ${p}",
+               ("cc", sync_last_requested_num)( "t", target )( "p", c->peer_address() ) );
 
-      request_next_chunk(c);
+      request_next_chunk( std::move( g_sync ), c );
    }
 
-   void sync_manager::reassign_fetch(const connection_ptr& c, go_away_reason reason) {
-      fc_ilog(logger, "reassign_fetch, our last req is ${cc}, next expected is ${ne} peer ${p}",
-              ( "cc",sync_last_requested_num)("ne",sync_next_expected_num)("p",c->peer_name()));
+   // called from connection strand
+   void sync_manager::sync_reassign_fetch(const connection_ptr& c, go_away_reason reason) {
+      std::unique_lock<std::mutex> g( sync_mtx );
+      fc_ilog( logger, "reassign_fetch, our last req is ${cc}, next expected is ${ne} peer ${p}",
+               ("cc", sync_last_requested_num)( "ne", sync_next_expected_num )( "p", c->peer_address() ) );
 
-      if (c == source) {
+      if( c == sync_source ) {
          c->cancel_sync(reason);
          sync_last_requested_num = 0;
-         request_next_chunk();
+         request_next_chunk( std::move(g) );
       }
    }
 
@@ -1442,7 +1489,7 @@ struct msg_handler : public fc::visitor<void> {
       controller& cc = chain_plug->chain();
       uint32_t lib_num = cc.last_irreversible_block_num();
       uint32_t peer_lib = msg.last_irreversible_block_num;
-      reset_lib_num(c);
+      sync_reset_lib_num(c);
       c->syncing = false;
 
       //--------------------------------
@@ -1527,11 +1574,14 @@ struct msg_handler : public fc::visitor<void> {
       if( req.req_blocks.mode == catch_up ) {
          c->fork_head = id;
          c->fork_head_num = num;
-         fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} target LIB = ${lib} next_expected = ${ne}",
-                  ("s",stage_str(state))("fhn",num)("lib",sync_known_lib_num)("ne", sync_next_expected_num) );
-         if (state == lib_catchup)
+         std::lock_guard<std::mutex> g( sync_mtx );
+         fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} "
+                          "target LIB = ${lib} next_expected = ${ne}",
+                  ("s", stage_str( sync_state ))( "fhn", num )( "lib", sync_known_lib_num )
+                  ("ne", sync_next_expected_num ) );
+         if( sync_state == lib_catchup )
             return;
-         set_state(head_catchup);
+         set_state( head_catchup );
       } else {
          c->fork_head = block_id_type();
          c->fork_head_num = 0;
@@ -1541,12 +1591,12 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void sync_manager::sync_recv_notice( const connection_ptr& c, const notice_message& msg) {
-      fc_ilog(logger, "sync_manager got ${m} block notice",("m",modes_str(msg.known_blocks.mode)));
+      fc_ilog( logger, "sync_manager got ${m} block notice", ("m", modes_str( msg.known_blocks.mode )) );
       EOS_ASSERT( msg.known_blocks.mode == catch_up || msg.known_blocks.mode == last_irr_catch_up, plugin_exception,
                   "sync_recv_notice only called on catch_up" );
       if( msg.known_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
-                  ("s", msg.known_blocks.ids.size())("p", c->peer_name()) );
+                  ("s", msg.known_blocks.ids.size())("p", c->peer_address()) );
          c->close();
          return;
       }
@@ -1558,24 +1608,31 @@ struct msg_handler : public fc::visitor<void> {
          }
       } else if (msg.known_blocks.mode == last_irr_catch_up) {
          c->last_handshake_recv.last_irreversible_block_num = msg.known_trx.pending;
-         reset_lib_num(c);
+         sync_reset_lib_num(c);
          start_sync(c, msg.known_trx.pending);
       }
    }
 
-   void sync_manager::rejected_block(const connection_ptr& c, uint32_t blk_num) {
-      if (state != in_sync ) {
-         fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_name()) );
+   // called from connection strand
+   void sync_manager::rejected_block( const connection_ptr& c, uint32_t blk_num ) {
+      std::unique_lock<std::mutex> g( sync_mtx );
+      if( sync_state != in_sync ) {
+         fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_address()) );
          sync_last_requested_num = 0;
-         source.reset();
+         sync_source.reset();
+         set_state( in_sync );
+         g.unlock();
          c->close();
-         set_state(in_sync);
          send_handshakes();
       }
    }
+
+   // called from connection strand
    void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
-      fc_dlog(logger, "got block ${bn} from ${p}",("bn",blk_num)("p",c->peer_name()));
-      if (state == lib_catchup) {
+      fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_address() ) );
+      std::unique_lock<std::mutex> g_sync( sync_mtx );
+      stages state = sync_state;
+      if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
                      ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_name()) );
@@ -1583,13 +1640,14 @@ struct msg_handler : public fc::visitor<void> {
             return;
          }
          sync_next_expected_num = blk_num + 1;
-      }
-      if (state == head_catchup) {
-         fc_dlog(logger, "sync_manager in head_catchup state");
-         set_state(in_sync);
-         source.reset();
+      } else if( state == head_catchup ) {
+         fc_dlog( logger, "sync_manager in head_catchup state" );
+         set_state( in_sync );
+         sync_source.reset();
+         g_sync.unlock();
 
          block_id_type null_id;
+         bool set_state_to_head_catchup = false;
          boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          for( const auto& cp : my_impl->connections ) {
             uint32_t fork_head_num = cp->fork_head_num.load(); // fork_head_num provides memory barrier for fork_head
@@ -1600,26 +1658,29 @@ struct msg_handler : public fc::visitor<void> {
                c->fork_head = null_id;
                c->fork_head_num = 0;
             } else {
-               set_state(head_catchup);
+               set_state_to_head_catchup = true;
             }
          }
          g.unlock();
 
-         if (state == in_sync) {
+         if( set_state_to_head_catchup ) {
+            g_sync.lock();
+            set_state( head_catchup );
+            g_sync.unlock();
+         } else {
             send_handshakes();
          }
-      }
-      else if (state == lib_catchup) {
+      } else if( state == lib_catchup ) {
          if( blk_num == sync_known_lib_num ) {
-            fc_dlog( logger, "All caught up with last known last irreversible block resending handshake");
-            set_state(in_sync);
+            fc_dlog( logger, "All caught up with last known last irreversible block resending handshake" );
+            set_state( in_sync );
+            g_sync.unlock();
             send_handshakes();
-         }
-         else if (blk_num == sync_last_requested_num) {
-            request_next_chunk();
-         }
-         else {
-            fc_dlog(logger,"calling sync_wait on connection ${p}",("p",c->peer_name()));
+         } else if( blk_num == sync_last_requested_num ) {
+            request_next_chunk( std::move( g_sync) );
+         } else {
+            g_sync.unlock();
+            fc_dlog( logger, "calling sync_wait on connection ${p}", ("p", c->peer_address()) );
             c->sync_wait();
          }
       }
@@ -1627,11 +1688,12 @@ struct msg_handler : public fc::visitor<void> {
 
    //------------------------------------------------------------------------
 
+   // thread safe
    bool dispatch_manager::add_peer_block(const peer_block_state& entry) {
-      std::lock_guard<std::mutex> g(blk_state_mtx);
+      std::lock_guard<std::mutex> g( blk_state_mtx );
       auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(entry.id), entry.connection_id));
       bool added = (bptr == blk_state.end());
-      if (added){
+      if( added ) {
          blk_state.insert(entry);
       }
       return added;
@@ -1659,6 +1721,7 @@ struct msg_handler : public fc::visitor<void> {
       return added;
    }
 
+   // thread safe
    void dispatch_manager::update_txns_block_num( const signed_block_ptr& sb ) {
       update_block_num ubn( sb->block_num() );
       std::lock_guard<std::mutex> g( local_txns_mtx );
@@ -1672,6 +1735,7 @@ struct msg_handler : public fc::visitor<void> {
       }
    }
 
+   // thread safe
    void dispatch_manager::update_txns_block_num( const transaction_id_type& id, uint32_t blk_num ) {
       update_block_num ubn( blk_num );
       std::lock_guard<std::mutex> g( local_txns_mtx );
@@ -1758,6 +1822,7 @@ struct msg_handler : public fc::visitor<void> {
       }
    }
 
+   // called from connection strand
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
       peer_block_state pbstate{id, bnum, c->connection_id};
       add_peer_block( pbstate );
@@ -1905,58 +1970,57 @@ struct msg_handler : public fc::visitor<void> {
    //------------------------------------------------------------------------
 
    // called from any thread
-   bool net_plugin_impl::resolve_and_connect(const connection_ptr& c) {
-      if( c->no_retry != go_away_reason::no_reason) {
-         fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( c->no_retry )));
+   bool connection::resolve_and_connect() {
+      if( no_retry != go_away_reason::no_reason) {
+         fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( no_retry )));
          return false;
       }
 
-      string::size_type colon = c->peer_address().find(':');
+      string::size_type colon = peer_address().find(':');
       if (colon == std::string::npos || colon == 0) {
-         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p",c->peer_address()) );
+         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p", peer_address()) );
          return false;
       }
 
-      string host = c->peer_address().substr( 0, colon );
-      string port = c->peer_address().substr( colon + 1);
+      string host = peer_address().substr( 0, colon );
+      string port = peer_address().substr( colon + 1);
       idump((host)(port));
       tcp::resolver::query query( tcp::v4(), host, port );
-      connection_wptr weak_conn = c;
+      connection_wptr weak_conn = shared_from_this();
       // Note: need to add support for IPv6 too
 
       auto resolver = std::make_shared<tcp::resolver>( *server_ioc );
-      resolver->async_resolve( query,
-            [resolver, ioc = server_ioc, weak_conn, this]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
+      resolver->async_resolve( query, boost::asio::bind_executor( strand,
+            [resolver, ioc = server_ioc, weak_conn]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
                auto c = weak_conn.lock();
                if( !c ) return;
                if( !err ) {
-                  connect( c, resolver, endpoint_itr );
+                  c->connect( resolver, endpoint_itr );
                } else {
                   fc_elog( logger, "Unable to resolve ${add}: ${error}", ("add", c->peer_name())( "error", err.message() ) );
                }
-            } );
+            } ) );
       return true;
    }
 
-   // called from any thread
-   void net_plugin_impl::connect(const connection_ptr& c, const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr) {
-      if( c->no_retry != go_away_reason::no_reason) {
-         string rsn = reason_str(c->no_retry);
+   // called from connection strand
+   void connection::connect( const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr ) {
+      if( no_retry != go_away_reason::no_reason) {
          return;
       }
       auto current_endpoint = *endpoint_itr;
       ++endpoint_itr;
-      c->connecting = true;
-      c->socket.async_connect( current_endpoint,
-            boost::asio::bind_executor( c->strand, [resolver, c, endpoint_itr, this]( const boost::system::error_code& err ) {
-            if( !err && c->socket.is_open()) {
+      connecting = true;
+      socket.async_connect( current_endpoint,
+            boost::asio::bind_executor( strand, [resolver, c = shared_from_this(), endpoint_itr]( const boost::system::error_code& err ) {
+            if( !err && c->socket.is_open() ) {
                if( c->start_session() ) {
                   c->send_handshake();
                }
             } else {
-               if( endpoint_itr != tcp::resolver::iterator()) {
+               if( endpoint_itr != tcp::resolver::iterator() ) {
                   c->close();
-                  connect( c, resolver, endpoint_itr );
+                  c->connect( resolver, endpoint_itr );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;
@@ -2030,20 +2094,17 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    // only called from strand thread
-   void net_plugin_impl::start_read_message(const connection_ptr& conn) {
-
+   void connection::start_read_message() {
       try {
-         connection_wptr weak_conn = conn;
-
          std::size_t minimum_read =
-               std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
+               std::atomic_exchange<decltype(outstanding_read_bytes.load())>( &outstanding_read_bytes, 0 );
          minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
 
-         if (use_socket_read_watermark) {
+         if (my_impl->use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
             std::size_t socket_read_watermark = std::min<std::size_t>(minimum_read, max_socket_read_watermark);
             boost::asio::socket_base::receive_low_watermark read_watermark_opt(socket_read_watermark);
-            conn->socket.set_option(read_watermark_opt);
+            socket.set_option(read_watermark_opt);
          }
 
          auto completion_handler = [minimum_read](boost::system::error_code ec, std::size_t bytes_transferred) -> std::size_t {
@@ -2054,46 +2115,46 @@ struct msg_handler : public fc::visitor<void> {
             }
          };
 
-         if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
-             conn->reads_in_flight > def_max_reads_in_flight   ||
-             conn->trx_in_progress_size > def_max_trx_in_progress_size )
+         if( buffer_queue.write_queue_size() > def_max_write_queue_size ||
+             reads_in_flight > def_max_reads_in_flight   ||
+             trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
-            uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
-            uint32_t trx_in_progress_size = conn->trx_in_progress_size;
-            uint32_t reads_in_flight = conn->reads_in_flight;
+            uint32_t write_queue_size = buffer_queue.write_queue_size();
+            uint32_t trx_in_progress_size = this->trx_in_progress_size.load();
+            uint32_t reads_in_flight = this->reads_in_flight.load();
             if( write_queue_size > def_max_write_queue_size ) {
-               peer_wlog( conn, "write_queue full ${s} bytes", ("s", write_queue_size) );
+               peer_wlog( this, "write_queue full ${s} bytes", ("s", write_queue_size) );
             } else if( reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
+               peer_wlog( this, "max reads in flight ${s}", ("s", reads_in_flight) );
             } else {
-               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
+               peer_wlog( this, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
             if( write_queue_size > 2*def_max_write_queue_size ||
                 reads_in_flight > 2*def_max_reads_in_flight   ||
-                  trx_in_progress_size > 2*def_max_trx_in_progress_size )
+                trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
                fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
-                        ("p", conn->peer_name()) );
-               conn->close();
+                        ("p", peer_name()) );
+               close();
                return;
             }
-            std::lock_guard<std::mutex> g( conn->read_delay_timer_mtx );
-            conn->read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
-            conn->read_delay_timer.async_wait(
-                  boost::asio::bind_executor(conn->strand, [this, weak_conn]( boost::system::error_code ) {
+            std::lock_guard<std::mutex> g( read_delay_timer_mtx );
+            read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
+            connection_wptr weak_conn = shared_from_this();
+            read_delay_timer.async_wait( boost::asio::bind_executor(strand, [weak_conn]( boost::system::error_code ) {
                auto conn = weak_conn.lock();
                if( !conn ) return;
-               start_read_message( conn );
+               conn->start_read_message();
             } ) );
             return;
          }
 
-         ++conn->reads_in_flight;
-         boost::asio::async_read( conn->socket,
-            conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
-            boost::asio::bind_executor( conn->strand,
-            [this, conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
+         ++reads_in_flight;
+         boost::asio::async_read( socket,
+            pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
+            boost::asio::bind_executor( strand,
+            [conn = shared_from_this()]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                --conn->reads_in_flight;
                bool close_connection = false;
 
@@ -2125,7 +2186,7 @@ struct msg_handler : public fc::visitor<void> {
 
                            if (bytes_in_buffer >= total_message_bytes) {
                               conn->pending_message_buffer.advance_read_ptr(message_header_size);
-                              if (!process_next_message(conn, message_length)) {
+                              if (!conn->process_next_message(message_length)) {
                                  return;
                               }
                            } else {
@@ -2140,7 +2201,7 @@ struct msg_handler : public fc::visitor<void> {
                            }
                         }
                      }
-                     if( !close_connection ) start_read_message( conn );
+                     if( !close_connection ) conn->start_read_message();
                   } else {
                      if (ec.value() != boost::asio::error::eof) {
                         fc_elog( logger, "Error reading message: ${m}", ( "m", ec.message() ) );
@@ -2169,15 +2230,16 @@ struct msg_handler : public fc::visitor<void> {
                }
          }));
       } catch (...) {
-         fc_elog( logger, "Undefined exception in start_read_message, closing connection to: ${p}", ("p", conn->peer_name()) );
-         conn->close();
+         fc_elog( logger, "Undefined exception in start_read_message, closing connection to: ${p}", ("p", peer_name()) );
+         close();
       }
    }
 
-   bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) {
+   // called from connection strand
+   bool connection::process_next_message( uint32_t message_length ) {
       try {
          // if next message is a block we already have, exit early
-         auto peek_ds = conn->pending_message_buffer.create_peek_datastream();
+         auto peek_ds = pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
          if( which == signed_block_which ) {
@@ -2185,26 +2247,21 @@ struct msg_handler : public fc::visitor<void> {
             fc::raw::unpack( peek_ds, bh );
 
             block_id_type blk_id = bh.id();
-            if( dispatcher->have_block( blk_id ) ) {
-               connection_wptr weak = conn;
-               app().post(priority::high, // high since block processing is high and this needs to run before next block
-                     [dispatcher = dispatcher.get(), sync_master = sync_master.get(), weak{std::move(weak)}, blk_id] {
-                  connection_ptr c = weak.lock();
-                  if(c) {
-                     auto blk_num = block_header::num_from_id(blk_id);
-                     dispatcher->recv_block(c, blk_id, blk_num);
-                     sync_master->sync_recv_block( c, blk_id, blk_num );
-                  }
-               });
-               conn->pending_message_buffer.advance_read_ptr( message_length );
+            if( my_impl->dispatcher->have_block( blk_id ) ) {
+               auto blk_num = block_header::num_from_id( blk_id );
+               connection_ptr c = shared_from_this();
+               my_impl->dispatcher->recv_block( c, blk_id, blk_num );
+               my_impl->sync_master->sync_recv_block( c, blk_id, blk_num );
+
+               pending_message_buffer.advance_read_ptr( message_length );
                return true;
             }
          }
 
-         auto ds = conn->pending_message_buffer.create_datastream();
+         auto ds = pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
-         msg_handler m( *this, conn );
+         msg_handler m( *my_impl, shared_from_this() );
          if( msg.contains<signed_block>() ) {
             m( std::move( msg.get<signed_block>() ) );
          } else if( msg.contains<packed_transaction>() ) {
@@ -2214,14 +2271,35 @@ struct msg_handler : public fc::visitor<void> {
          }
       } catch( const fc::exception& e ) {
          fc_elog( logger, "Exception in handling message from ${p}: ${s}",
-                  ("p", conn->peer_name())("s", e.to_detail_string()) );
-         conn->close();
+                  ("p", peer_name())("s", e.to_detail_string()) );
+         close();
          return false;
       }
       return true;
    }
 
-   bool net_plugin_impl::is_valid(const handshake_message& msg) {
+   // call only from main application thread
+   void net_plugin_impl::update_chain_info() {
+      controller& cc = chain_plug->chain();
+      std::lock_guard<std::mutex> g( chain_info_mtx );
+      chain_lib_num = cc.last_irreversible_block_num();
+      chain_lib_id = cc.last_irreversible_block_id();
+      chain_head_blk_num = cc.head_block_num();
+      chain_head_blk_id = cc.head_block_id();
+      chain_fork_head_blk_num = cc.fork_db_head_block_num();
+      chain_fork_head_blk_id = cc.fork_db_head_block_id();
+   }
+
+   //         lib_num, head_blk_num, fork_head_blk_num, lib_id, head_blk_id, fork_head_blk_id
+   std::tuple<uint32_t, uint32_t, uint32_t, block_id_type, block_id_type, block_id_type>
+   net_plugin_impl::get_chain_info() const {
+      std::lock_guard<std::mutex> g( chain_info_mtx );
+      return std::make_tuple(
+            chain_lib_num, chain_head_blk_num, chain_fork_head_blk_num,
+            chain_lib_id, chain_head_blk_id, chain_fork_head_blk_id );
+   }
+
+   bool net_plugin_impl::is_valid( const handshake_message& msg ) {
       // Do some basic validation of an incoming handshake_message, so things
       // that really aren't handshake messages can be quickly discarded without
       // affecting state.
@@ -2250,16 +2328,14 @@ struct msg_handler : public fc::visitor<void> {
       peer_ilog(c, "received chain_size_message");
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const handshake_message& msg) {
+   // called from connection strand
+   void net_plugin_impl::handle_message( const connection_ptr& c, const handshake_message& msg ) {
       peer_ilog(c, "received handshake_message");
-      if (!is_valid(msg)) {
+      if( !is_valid( msg ) ) {
          peer_elog( c, "bad handshake message");
-         c->enqueue( go_away_message( fatal_other ));
+         c->enqueue( go_away_message( fatal_other ) );
          return;
       }
-      controller& cc = chain_plug->chain();
-      uint32_t lib_num = cc.last_irreversible_block_num();
-      uint32_t peer_lib = msg.last_irreversible_block_num;
       if( c->connecting ) {
          c->connecting = false;
       }
@@ -2325,28 +2401,32 @@ struct msg_handler : public fc::visitor<void> {
             return;
          }
 
-         bool on_fork = false;
-         fc_dlog(logger, "lib_num = ${ln} peer_lib = ${pl}",("ln",lib_num)("pl",peer_lib));
+         uint32_t peer_lib = msg.last_irreversible_block_num;
+         app().post( priority::low, [peer_lib, chain_plug = this->chain_plug, c, msg_lib_id = msg.last_irreversible_block_id]() {
+            controller& cc = chain_plug->chain();
+            uint32_t lib_num = cc.last_irreversible_block_num();
 
-         if( peer_lib <= lib_num && peer_lib > 0) {
-            try {
-               block_id_type peer_lib_id =  cc.get_block_id_for_num( peer_lib);
-               on_fork =( msg.last_irreversible_block_id != peer_lib_id);
-            }
-            catch( const unknown_block_exception &ex) {
-               fc_wlog( logger, "peer last irreversible block ${pl} is unknown", ("pl", peer_lib) );
-               on_fork = true;
-            }
-            catch( ...) {
-               fc_wlog( logger, "caught an exception getting block id for ${pl}",("pl",peer_lib) );
-               on_fork = true;
-            }
-            if( on_fork) {
-               fc_elog( logger, "Peer chain is forked" );
-               c->enqueue( go_away_message( forked ));
-               return;
+            bool on_fork = false;
+            fc_dlog( logger, "lib_num = ${ln} peer_lib = ${pl}", ("ln", lib_num)( "pl", peer_lib ) );
+
+            if( peer_lib <= lib_num && peer_lib > 0 ) {
+               try {
+                  block_id_type peer_lib_id = cc.get_block_id_for_num( peer_lib );
+                  on_fork = (msg_lib_id != peer_lib_id);
+               } catch( const unknown_block_exception& ex ) {
+                  fc_wlog( logger, "peer last irreversible block ${pl} is unknown", ("pl", peer_lib) );
+                  on_fork = true;
+               } catch( ... ) {
+                  fc_wlog( logger, "caught an exception getting block id for ${pl}", ("pl", peer_lib) );
+                  on_fork = true;
+               }
+               if( on_fork ) {
+                  fc_elog( logger, "Peer chain is forked" );
+                  c->enqueue( go_away_message( forked ) );
+                  return;
+               }
             }
-         }
+         });
 
          if (c->sent_handshake_count == 0) {
             c->send_handshake();
@@ -2513,7 +2593,7 @@ struct msg_handler : public fc::visitor<void> {
              trx->get_signatures().size() * sizeof(signature_type);
    }
 
-   // called from thread_pool threads
+   // called from connection strand
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
       if( db_read_mode == eosio::db_read_mode::READ_ONLY ) {
@@ -2538,6 +2618,7 @@ struct msg_handler : public fc::visitor<void> {
 
       c->trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
       chain_plug->accept_transaction(ptrx, [c, this, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+         // next (this lambda) called from application thread
          c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2554,7 +2635,10 @@ struct msg_handler : public fc::visitor<void> {
             }
          }
 
-         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}, head_blk_num = this->head_blk_num]() {
+         controller& cc = chain_plug->chain();
+         uint32_t head_blk_num = cc.head_block_num();
+
+         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}, head_blk_num]() {
             if( accepted ) {
                dispatcher->bcast_transaction( ptrx );
             } else {
@@ -2564,6 +2648,7 @@ struct msg_handler : public fc::visitor<void> {
       });
    }
 
+   // called from application thread
    void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
       block_id_type blk_id = msg->id();
@@ -2573,7 +2658,9 @@ struct msg_handler : public fc::visitor<void> {
 
       try {
          if( cc.fetch_block_by_id(blk_id) ) {
-            sync_master->sync_recv_block(c, blk_id, blk_num);
+            c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {
+               sync_master->sync_recv_block( c, blk_id, blk_num );
+            });
             return;
          }
       } catch( ...) {
@@ -2581,14 +2668,16 @@ struct msg_handler : public fc::visitor<void> {
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );
       }
 
-      dispatcher->recv_block(c, blk_id, blk_num);
+      c->strand.post( [dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+         dispatcher->recv_block( c, blk_id, blk_num );
+      });
       fc::microseconds age( fc::time_point::now() - msg->timestamp);
       peer_ilog(c, "received signed_block : #${n} block age in secs = ${age}",
               ("n",blk_num)("age",age.to_seconds()));
 
       go_away_reason reason = fatal_other;
       try {
-         chain_plug->accept_block(msg); //, sync_master->is_active(c));
+         chain_plug->accept_block(msg);
          reason = no_reason;
       } catch( const unlinkable_block_exception &ex) {
          peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));
@@ -2609,16 +2698,18 @@ struct msg_handler : public fc::visitor<void> {
          fc_elog( logger, "handle sync block caught something else from ${p}",("num",blk_num)("p",c->peer_name()));
       }
 
-      update_block_num ubn(blk_num);
       if( reason == no_reason ) {
          boost::asio::post( *server_ioc, [self = this, msg]() {
             self->dispatcher->update_txns_block_num( msg );
          });
-         sync_master->sync_recv_block(c, blk_id, blk_num);
-      }
-      else {
-         sync_master->rejected_block(c, blk_num);
-         dispatcher->rejected_block( blk_id );
+         c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {
+            sync_master->sync_recv_block( c, blk_id, blk_num );
+         });
+      } else {
+         c->strand.post( [sync_master = sync_master.get(), dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+            sync_master->rejected_block( c, blk_num );
+            dispatcher->rejected_block( blk_id );
+         });
       }
    }
 
@@ -2685,7 +2776,8 @@ struct msg_handler : public fc::visitor<void> {
 
    void net_plugin_impl::expire() {
       auto now = time_point::now();
-      uint32_t lib = lib_num.load();
+      uint32_t lib = 0;
+      std::tie( lib, std::ignore, std::ignore, std::ignore, std::ignore, std::ignore ) = get_chain_info();
       dispatcher->expire_blocks( lib );
       dispatcher->expire_txns( lib );
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
@@ -2708,7 +2800,7 @@ struct msg_handler : public fc::visitor<void> {
          }
          if( !(*it)->socket_is_open() && !(*it)->connecting) {
             if( (*it)->peer_address().length() > 0) {
-               if( !resolve_and_connect(*it) ) {
+               if( !(*it)->resolve_and_connect() ) {
                   it = connections.erase(it);
                   continue;
                }
@@ -2723,17 +2815,28 @@ struct msg_handler : public fc::visitor<void> {
       start_conn_timer(connector_period, std::weak_ptr<connection>());
    }
 
-   void net_plugin_impl::accepted_block(const block_state_ptr& block) {
+   // called from application thread
+   void net_plugin_impl::on_accepted_block(const block_state_ptr& block) {
+      update_chain_info();
       boost::asio::post( *server_ioc, [this, ioc=server_ioc, block]() {
          fc_dlog( logger, "signaled, id = ${id}", ("id", block->id) );
          dispatcher->bcast_block( block );
       });
    }
 
+   // called from application thread
+   void net_plugin_impl::on_irreversible_block( const block_state_ptr& ) {
+      update_chain_info();
+   }
+
+   // called from application thread
    void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
       const auto& id = results.second->id;
       if (results.first) {
          fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
+
+         controller& cc = chain_plug->chain();
+         uint32_t head_blk_num = cc.head_block_num();
          dispatcher->rejected_transaction(id, head_blk_num);
       } else {
          fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
@@ -2815,7 +2918,7 @@ struct msg_handler : public fc::visitor<void> {
       return chain::signature_type();
    }
 
-   // call from main application thread
+   // call from connection strand
    void handshake_initializer::populate( handshake_message& hello ) {
       hello.network_version = net_version_base + net_version;
       hello.chain_id = my_impl->chain_id;
@@ -2839,29 +2942,8 @@ struct msg_handler : public fc::visitor<void> {
 #endif
       hello.agent = my_impl->user_agent_name;
 
-
-      controller& cc = my_impl->chain_plug->chain();
-      hello.head_id = fc::sha256();
-      hello.last_irreversible_block_id = fc::sha256();
-      hello.head_num = cc.fork_db_head_block_num();
-      hello.last_irreversible_block_num = cc.last_irreversible_block_num();
-      if( hello.last_irreversible_block_num ) {
-         try {
-            hello.last_irreversible_block_id = cc.get_block_id_for_num(hello.last_irreversible_block_num);
-         }
-         catch( const unknown_block_exception &ex) {
-            fc_wlog( logger, "caught unkown_block" );
-            hello.last_irreversible_block_num = 0;
-         }
-      }
-      if( hello.head_num ) {
-         try {
-            hello.head_id = cc.get_block_id_for_num( hello.head_num );
-         }
-         catch( const unknown_block_exception &ex) {
-           hello.head_num = 0;
-         }
-      }
+      std::tie( hello.last_irreversible_block_num, std::ignore, hello.head_num,
+                hello.last_irreversible_block_id, std::ignore, hello.head_id ) = my_impl->get_chain_info();
    }
 
    net_plugin::net_plugin()
@@ -3054,7 +3136,7 @@ struct msg_handler : public fc::visitor<void> {
       }
       chain::controller&cc = my->chain_plug->chain();
       {
-         cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
+         cc.accepted_block.connect(  boost::bind(&net_plugin_impl::on_accepted_block, my.get(), _1));
       }
 
       my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
@@ -3135,7 +3217,7 @@ struct msg_handler : public fc::visitor<void> {
 
       connection_ptr c = std::make_shared<connection>( host );
       fc_dlog( logger, "calling active connector" );
-      if( my->resolve_and_connect( c ) ) {
+      if( c->resolve_and_connect() ) {
          fc_dlog( logger, "adding new connection to the list" );
          boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
          my->connections.insert( c );

From b8762f851b9683b8e6e42d4c7471adc5caed66f4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 26 Mar 2019 11:36:38 -0500
Subject: [PATCH 0073/1648] Make sync_manager::recv_handshake connection strand
 safe

---
 plugins/net_plugin/net_plugin.cpp | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 205bfbfb105..07a3203da4b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -161,13 +161,13 @@ namespace eosio {
       static void send_handshakes();
 
    public:
-      explicit sync_manager(uint32_t span);
-      void sync_reset_lib_num(const connection_ptr& conn);
-      void sync_reassign_fetch(const connection_ptr& c, go_away_reason reason);
-      void rejected_block(const connection_ptr& c, uint32_t blk_num);
-      void sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
-      void recv_handshake(const connection_ptr& c, const handshake_message& msg);
-      void sync_recv_notice( const connection_ptr& c, const notice_message& msg);
+      explicit sync_manager( uint32_t span );
+      void sync_reset_lib_num( const connection_ptr& conn );
+      void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
+      void rejected_block( const connection_ptr& c, uint32_t blk_num );
+      void sync_recv_block( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num );
+      void recv_handshake( const connection_ptr& c, const handshake_message& msg );
+      void sync_recv_notice( const connection_ptr& c, const notice_message& msg );
    };
 
    class dispatch_manager {
@@ -1485,10 +1485,15 @@ namespace eosio {
       }
    }
 
-   void sync_manager::recv_handshake(const connection_ptr& c, const handshake_message& msg) {
-      controller& cc = chain_plug->chain();
-      uint32_t lib_num = cc.last_irreversible_block_num();
+   void sync_manager::recv_handshake( const connection_ptr& c, const handshake_message& msg ) {
+      uint32_t lib_num = 0;
       uint32_t peer_lib = msg.last_irreversible_block_num;
+      uint32_t head = 0;
+      block_id_type head_id;
+
+      std::tie( lib_num, std::ignore, head,
+                std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
+
       sync_reset_lib_num(c);
       c->syncing = false;
 
@@ -1504,8 +1509,6 @@ namespace eosio {
       //
       //-----------------------------
 
-      uint32_t head = cc.fork_db_head_block_num();
-      block_id_type head_id = cc.fork_db_head_block_id();
       if (head_id == msg.head_id) {
          fc_dlog(logger, "sync check state 0");
          // notify peer of our pending transactions
@@ -1520,7 +1523,7 @@ namespace eosio {
          fc_dlog(logger, "sync check state 1");
          // wait for receipt of a notice message before initiating sync
          if (c->protocol_version < proto_explicit_sync) {
-            start_sync( c, peer_lib);
+            start_sync( c, peer_lib );
          }
          return;
       }

From 99b422067955fa9d4fa5b3dd2e8af64fa977dc9d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 26 Mar 2019 22:26:39 -0500
Subject: [PATCH 0074/1648] Handle almost every net_message on net_plugin
 thread pool. Optimize bcast_block to not send when syncing.

---
 plugins/net_plugin/net_plugin.cpp | 396 +++++++++++++++---------------
 1 file changed, 193 insertions(+), 203 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 07a3203da4b..2cc242b9659 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -147,14 +147,14 @@ namespace eosio {
       uint32_t       sync_next_expected_num;
       uint32_t       sync_req_span;
       connection_ptr sync_source;
-      stages         sync_state;
+      std::atomic<stages> sync_state;
 
       chain_plugin* chain_plug = nullptr;
 
    private:
       constexpr static auto stage_str( stages s );
       void set_state( stages s );
-      bool is_sync_required();
+      bool is_sync_required( uint32_t fork_head_block_num );
       void request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn = connection_ptr() );
       void start_sync( const connection_ptr& c, uint32_t target );
       void verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
@@ -162,6 +162,7 @@ namespace eosio {
 
    public:
       explicit sync_manager( uint32_t span );
+      bool syncing_with_peer() const { return sync_state == lib_catchup; }
       void sync_reset_lib_num( const connection_ptr& conn );
       void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
       void rejected_block( const connection_ptr& c, uint32_t blk_num );
@@ -637,7 +638,6 @@ namespace eosio {
 
       bool connected();
       bool current();
-      void reset();
       void close();
    private:
       static void _close( connection* self ); // for easy capture
@@ -759,61 +759,51 @@ namespace eosio {
 
       void operator()( packed_transaction&& msg ) const {
          // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle packed_transaction" );
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
          impl.handle_message( c, ptr );
       }
 
       void operator()( const handshake_message& msg ) const {
          // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle handshake_message" );
          impl.handle_message( c, msg );
       }
 
       void operator()( const chain_size_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle chain_size_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const go_away_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle go_away_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const time_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle time_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const notice_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle notice_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const request_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle request_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const sync_request_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle sync_request_message" );
+         impl.handle_message( c, msg );
       }
    };
 
@@ -907,10 +897,6 @@ namespace eosio {
       return (connected() && !syncing);
    }
 
-   void connection::reset() {
-      peer_requested.reset();
-   }
-
    void connection::flush_queues() {
       buffer_queue.clear_write_queue();
    }
@@ -930,7 +916,7 @@ namespace eosio {
       if( self->last_req ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
-      self->reset();
+      self->peer_requested.reset();
       self->sent_handshake_count = 0;
       self->last_handshake_recv = handshake_message();
       self->last_handshake_sent = handshake_message();
@@ -943,8 +929,11 @@ namespace eosio {
    }
 
    void connection::blk_send_branch() {
-      controller& cc = my_impl->chain_plug->chain();
-      uint32_t head_num = cc.fork_db_head_block_num();
+      uint32_t head_num = 0;
+      block_id_type head_id;
+      std::tie( std::ignore, std::ignore, head_num,
+                std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
+
       notice_message note;
       note.known_blocks.mode = normal;
       note.known_blocks.pending = 0;
@@ -953,30 +942,16 @@ namespace eosio {
          enqueue(note);
          return;
       }
-      block_id_type head_id;
-      block_id_type lib_id;
       block_id_type remote_head_id;
       uint32_t remote_head_num = 0;
-      try {
-         if (last_handshake_recv.generation >= 1) {
-            remote_head_id = last_handshake_recv.head_id;
-            remote_head_num = block_header::num_from_id(remote_head_id);
-            fc_dlog(logger, "maybe truncating branch at  = ${h}:${id}",("h",remote_head_num)("id",remote_head_id));
-         }
-
-         lib_id = last_handshake_recv.last_irreversible_block_id;
-         head_id = cc.fork_db_head_block_id();
-      }
-      catch (const assert_exception& ex) {
-         fc_elog( logger, "unable to retrieve block info: ${n} for ${p}",("n",ex.to_string())("p",peer_name()) );
-         enqueue(note);
-         return;
-      }
-      catch (const fc::exception& ex) {
-      }
-      catch (...) {
+      if( last_handshake_recv.generation >= 1 ) {
+         remote_head_id = last_handshake_recv.head_id;
+         remote_head_num = block_header::num_from_id(remote_head_id);
+         fc_dlog( logger, "maybe truncating branch at  = ${h}:${id}", ("h", remote_head_num)( "id", remote_head_id ) );
       }
 
+      block_id_type lib_id = last_handshake_recv.last_irreversible_block_id;
+
       if( !peer_requested ) {
          peer_requested = sync_state( block_header::num_from_id(lib_id)+1,
                                       block_header::num_from_id(head_id),
@@ -992,27 +967,29 @@ namespace eosio {
       syncing = false;
    }
 
-   void connection::blk_send(const block_id_type& blkid) {
-      controller &cc = my_impl->chain_plug->chain();
-      try {
-         signed_block_ptr b = cc.fetch_block_by_id(blkid);
-         if(b) {
-            fc_dlog(logger,"found block for id at num ${n}",("n",b->block_num()));
-            my_impl->dispatcher->add_peer_block({blkid, block_header::num_from_id(blkid), connection_id});
-            enqueue_block( b );
-         } else {
-            fc_ilog( logger, "fetch block by id returned null, id ${id} for ${p}",
-                     ("id",blkid)("p",peer_name()) );
+   void connection::blk_send( const block_id_type& blkid ) {
+      app().post( priority::low, [blkid, c = shared_from_this()]() {
+         controller& cc = my_impl->chain_plug->chain();
+         try {
+            signed_block_ptr b = cc.fetch_block_by_id( blkid );
+            if( b ) {
+               fc_dlog( logger, "found block for id at num ${n}", ("n", b->block_num()) );
+               my_impl->dispatcher->add_peer_block( {blkid, block_header::num_from_id( blkid ), c->connection_id} );
+               c->strand.post( [c, b{std::move(b)}]() {
+                  c->enqueue_block( b );
+               } );
+            } else {
+               fc_ilog( logger, "fetch block by id returned null, id ${id} for ${p}",
+                        ("id", blkid)( "p", c->peer_address() ) );
+            }
+         } catch( const assert_exception& ex ) {
+            fc_elog( logger, "caught assert on fetch_block_by_id, ${ex}, id ${id} for ${p}",
+                     ("ex", ex.to_string())( "id", blkid )( "p", c->peer_address() ) );
+         } catch( ... ) {
+            fc_elog( logger, "caught other exception fetching block id ${id} for ${p}",
+                     ("id", blkid)( "p", c->peer_address() ) );
          }
-      }
-      catch (const assert_exception &ex) {
-         fc_elog( logger, "caught assert on fetch_block_by_id, ${ex}, id ${id} for ${p}",
-                  ("ex",ex.to_string())("id",blkid)("p",peer_name()) );
-      }
-      catch (...) {
-         fc_elog( logger, "caught other exception fetching block id ${id} for ${p}",
-                  ("id",blkid)("p",peer_name()) );
-      }
+      });
    }
 
    void connection::stop_send() {
@@ -1024,7 +1001,7 @@ namespace eosio {
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          fc_dlog( logger, "Sending handshake generation ${g} to ${ep}",
-                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_name() ) );
+                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() ) );
          c->enqueue( c->last_handshake_sent );
       });
    }
@@ -1062,7 +1039,6 @@ namespace eosio {
       }
    }
 
-   // called from connection strand and application thread
    void connection::do_queue_write(int priority) {
       if( !buffer_queue.ready_to_send() )
          return;
@@ -1101,8 +1077,8 @@ namespace eosio {
    }
 
    void connection::cancel_sync(go_away_reason reason) {
-      fc_dlog(logger,"cancel sync reason = ${m}, write queue size ${o} bytes peer ${p}",
-              ("m",reason_str(reason)) ("o", buffer_queue.write_queue_size())("p", peer_name()));
+      fc_dlog( logger, "cancel sync reason = ${m}, write queue size ${o} bytes peer ${p}",
+               ("m", reason_str( reason ))( "o", buffer_queue.write_queue_size() )( "p", peer_address() ) );
       cancel_wait();
       flush_queues();
       switch (reason) {
@@ -1113,33 +1089,38 @@ namespace eosio {
          break;
       }
       default:
-         fc_dlog(logger, "sending empty request but not calling sync wait on ${p}", ("p",peer_name()));
+         fc_dlog(logger, "sending empty request but not calling sync wait on ${p}", ("p",peer_address()));
          enqueue( ( sync_request_message ) {0,0} );
       }
    }
 
    bool connection::enqueue_sync_block() {
-      if (!peer_requested)
+      if( !peer_requested ) {
+         fc_dlog( logger, "enqueue sync block, with no peer_requested" );
          return false;
+      } else {
+         fc_dlog( logger, "enqueue sync block ${num}", ("num", peer_requested->last + 1) );
+      }
       uint32_t num = ++peer_requested->last;
-      bool trigger_send = num == peer_requested->start_block;
+      bool trigger_send = true; // todo: = num == peer_requested->start_block;
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      try {
+      app().post( priority::low, [num, trigger_send, c = shared_from_this()]() {
          controller& cc = my_impl->chain_plug->chain();
-         signed_block_ptr sb = cc.fetch_block_by_number(num);
-         if(sb) {
-            enqueue_block( sb, trigger_send, true);
-            return true;
+         signed_block_ptr sb = cc.fetch_block_by_number( num );
+         if( sb ) {
+            c->strand.post( [c, sb{std::move(sb)}, trigger_send]() {
+               c->enqueue_block( sb, trigger_send, true );
+            });
          }
-      } catch ( ... ) {
-         fc_wlog( logger, "write loop exception" );
-      }
-      return false;
+      });
+
+      return true;
    }
 
    void connection::enqueue( const net_message& m, bool trigger_send ) {
+      verify_strand_in_this_thread( strand, __func__, __LINE__ );
       go_away_reason close_after_send = no_reason;
       if (m.contains<go_away_message>()) {
          close_after_send = m.get<go_away_message>().reason;
@@ -1194,6 +1175,8 @@ namespace eosio {
    }
 
    void connection::enqueue_block( const signed_block_ptr& sb, bool trigger_send, bool to_sync_queue) {
+      fc_dlog( logger, "enqueue block ${num}", ("num", sb->block_num()) );
+      verify_strand_in_this_thread( strand, __func__, __LINE__ );
       enqueue_buffer( create_send_buffer( sb ), trigger_send, priority::low, no_reason, to_sync_queue);
    }
 
@@ -1224,7 +1207,7 @@ namespace eosio {
    void connection::sync_wait() {
       connection_ptr c(shared_from_this());
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      response_expected_timer.expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer.expires_from_now( my_impl->resp_expected_period );
       response_expected_timer.async_wait(
             boost::asio::bind_executor( c->strand, [c]( boost::system::error_code ec ) {
                c->sync_timeout( ec );
@@ -1233,20 +1216,13 @@ namespace eosio {
 
    // thread safe
    void connection::fetch_wait() {
-      connection_wptr c(shared_from_this());
+      connection_ptr c( shared_from_this() );
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      response_expected_timer.expires_from_now( my_impl->resp_expected_period);
-      response_expected_timer.async_wait( [c]( boost::system::error_code ec ) {
-         app().post(priority::low, [c, ec]() {
-            connection_ptr conn = c.lock();
-            if (!conn) {
-               // connection was destroyed before this lambda was delivered
-               return;
-            }
-
-            conn->fetch_timeout(ec);
-         });
-      } );
+      response_expected_timer.expires_from_now( my_impl->resp_expected_period );
+      response_expected_timer.async_wait(
+            boost::asio::bind_executor( c->strand, [c]( boost::system::error_code ec ) {
+               c->fetch_timeout(ec);
+            } ) );
    }
 
    // called from connection strand
@@ -1275,21 +1251,19 @@ namespace eosio {
 
    void connection::fetch_timeout( boost::system::error_code ec ) {
       if( !ec ) {
-         my_impl->dispatcher->retry_fetch(shared_from_this());
-      }
-      else if( ec == boost::asio::error::operation_aborted ) {
+         my_impl->dispatcher->retry_fetch( shared_from_this() );
+      } else if( ec == boost::asio::error::operation_aborted ) {
          if( !connected() ) {
-            fc_dlog(logger, "fetch timeout was cancelled due to dead connection");
+            fc_dlog( logger, "fetch timeout was cancelled due to dead connection" );
          }
-      }
-      else {
+      } else {
          fc_elog( logger, "setting timer for fetch request got error ${ec}", ("ec", ec.message() ) );
       }
    }
 
    void connection::request_sync_blocks(uint32_t start, uint32_t end) {
       sync_request_message srm = {start,end};
-      enqueue( net_message(srm));
+      enqueue( net_message(srm) );
       sync_wait();
    }
 
@@ -1340,15 +1314,6 @@ namespace eosio {
       }
    }
 
-   bool sync_manager::is_sync_required() {
-      fc_dlog( logger, "last req = ${req}, last recv = ${recv} known = ${known} our head = ${head}",
-               ("req", sync_last_requested_num)( "recv", sync_next_expected_num )( "known", sync_known_lib_num )
-               ("head", chain_plug->chain().fork_db_head_block_num() ) );
-
-      return( sync_last_requested_num < sync_known_lib_num ||
-              chain_plug->chain().fork_db_head_block_num() < sync_last_requested_num );
-   }
-
    // call with g_sync locked
    void sync_manager::request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn ) {
       uint32_t fork_head_block_num = 0;
@@ -1430,9 +1395,10 @@ namespace eosio {
             sync_last_requested_num = end;
             connection_ptr c = sync_source;
             g_sync.unlock();
-            fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}",
-                     ("n", c->peer_address())( "s", start )( "e", end ) );
-            c->request_sync_blocks( start, end );
+            c->strand.post( [c, start, end]() {
+               fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}", ("n", c->peer_address())( "s", start )( "e", end ) );
+               c->request_sync_blocks( start, end );
+            } );
          }
       }
    }
@@ -1447,23 +1413,35 @@ namespace eosio {
       }
    }
 
+   bool sync_manager::is_sync_required( uint32_t fork_head_block_num ) {
+      fc_dlog( logger, "last req = ${req}, last recv = ${recv} known = ${known} our head = ${head}",
+               ("req", sync_last_requested_num)( "recv", sync_next_expected_num )( "known", sync_known_lib_num )
+               ("head", fork_head_block_num ) );
+
+      return( sync_last_requested_num < sync_known_lib_num ||
+              fork_head_block_num < sync_last_requested_num );
+   }
+
    void sync_manager::start_sync(const connection_ptr& c, uint32_t target) {
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       if( target > sync_known_lib_num) {
          sync_known_lib_num = target;
       }
 
-      if( !is_sync_required() ) {
-         uint32_t bnum = chain_plug->chain().last_irreversible_block_num();
-         uint32_t hnum = chain_plug->chain().fork_db_head_block_num();
+      uint32_t lib_num = 0;
+      uint32_t fork_head_block_num = 0;
+      std::tie( lib_num, std::ignore, fork_head_block_num,
+                std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
+
+      if( !is_sync_required( fork_head_block_num ) ) {
          fc_dlog( logger, "We are already caught up, my irr = ${b}, head = ${h}, target = ${t}",
-                  ("b", bnum)( "h", hnum )( "t", target ) );
+                  ("b", lib_num)( "h", fork_head_block_num )( "t", target ) );
          return;
       }
 
       if( sync_state == in_sync ) {
          set_state( lib_catchup );
-         sync_next_expected_num = chain_plug->chain().last_irreversible_block_num() + 1;
+         sync_next_expected_num = lib_num + 1;
       }
 
       fc_ilog( logger, "Catching up with chain, our last req is ${cc}, theirs is ${t} peer ${p}",
@@ -1635,6 +1613,7 @@ namespace eosio {
       fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_address() ) );
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       stages state = sync_state;
+      fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
       if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
@@ -1643,7 +1622,8 @@ namespace eosio {
             return;
          }
          sync_next_expected_num = blk_num + 1;
-      } else if( state == head_catchup ) {
+      }
+      if( state == head_catchup ) {
          fc_dlog( logger, "sync_manager in head_catchup state" );
          set_state( in_sync );
          sync_source.reset();
@@ -1790,9 +1770,14 @@ namespace eosio {
    void dispatch_manager::bcast_block(const block_state_ptr& bs) {
       fc_dlog( logger, "bcast block ${b}", ("b", bs->block_num) );
 
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      if( my_impl->sync_master->syncing_with_peer() ) return;
       bool have_connection = false;
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
+
+         peer_dlog( cp, "socket_is_open ${s}, connecting ${c}, syncing ${ss}",
+                    ("s", cp->socket_is_open())("c", cp->connecting.load())("ss", cp->syncing.load()) );
+
          if( !cp->current() ) {
             continue;
          }
@@ -1818,7 +1803,7 @@ namespace eosio {
                if( !add_peer_block( pbstate ) ) {
                   return;
                }
-               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
+               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_address() ) );
                cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
             }
          });
@@ -1865,8 +1850,10 @@ namespace eosio {
             send_buffer = create_send_buffer( trx );
          }
 
-         fc_dlog(logger, "sending trx to ${n}", ("n", cp->peer_name() ) );
-         cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
+         cp->strand.post( [cp, send_buffer]() {
+            fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_address()) );
+            cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
+         } );
       }
    }
 
@@ -1885,67 +1872,65 @@ namespace eosio {
       update_txns_block_num( id, head_blk_num );
    }
 
+   // called from connection strand
    void dispatch_manager::recv_notice(const connection_ptr& c, const notice_message& msg, bool generated) {
       request_message req;
       req.req_trx.mode = none;
       req.req_blocks.mode = none;
-      bool send_req = false;
       if (msg.known_trx.mode == normal) {
          req.req_trx.mode = normal;
          req.req_trx.pending = 0;
-         send_req = false;
-      }
-      else if (msg.known_trx.mode != none) {
-         fc_elog( logger,"passed a notice_message with something other than a normal on none known_trx" );
+      } else if (msg.known_trx.mode != none) {
+         fc_elog( logger, "passed a notice_message with something other than a normal on none known_trx" );
          return;
       }
       if (msg.known_blocks.mode == normal) {
          req.req_blocks.mode = normal;
-         controller& cc = my_impl->chain_plug->chain();
          // known_blocks.ids is never > 1
          if( !msg.known_blocks.ids.empty() ) {
-            const block_id_type& blkid = msg.known_blocks.ids.back();
-            signed_block_ptr b;
-            try {
-               b = cc.fetch_block_by_id(blkid); // if exists
-               if(b) {
-                  add_peer_block({blkid, block_header::num_from_id(blkid), c->connection_id});
+            app().post( priority::low, [this, msg{std::move(msg)}, req{std::move(req)}, c]() mutable {
+               const block_id_type& blkid = msg.known_blocks.ids.back();
+               signed_block_ptr b;
+               try {
+                  controller& cc = my_impl->chain_plug->chain();
+                  b = cc.fetch_block_by_id( blkid ); // if exists
+                  if( b ) {
+                     add_peer_block( {blkid, block_header::num_from_id( blkid ), c->connection_id} );
+                  }
+               } catch( const assert_exception& ex ) {
+                  fc_ilog( logger, "caught assert on fetch_block_by_id, ${ex}", ("ex", ex.what()) );
+                  // keep going, client can ask another peer
+               } catch( ... ) {
+                  fc_elog( logger, "failed to retrieve block for id" );
                }
-            } catch (const assert_exception &ex) {
-               fc_ilog( logger, "caught assert on fetch_block_by_id, ${ex}",("ex",ex.what()) );
-               // keep going, client can ask another peer
-            } catch (...) {
-               fc_elog( logger, "failed to retrieve block for id");
-            }
-            if (!b) {
-               send_req = true;
-               req.req_blocks.ids.push_back( blkid );
-            }
+               if( !b ) {
+                  req.req_blocks.ids.push_back( blkid );
+                  c->strand.post( [req{std::move(req)}, c{std::move(c)}]() mutable {
+                     fc_dlog( logger, "send req" );
+                     c->enqueue( req );
+                     c->fetch_wait();
+                     c->last_req = std::move( req );
+                  });
+               }
+            });
          }
-      }
-      else if (msg.known_blocks.mode != none) {
+      } else if (msg.known_blocks.mode != none) {
          fc_elog( logger, "passed a notice_message with something other than a normal on none known_blocks" );
          return;
       }
-      fc_dlog( logger, "send req = ${sr}", ("sr",send_req));
-      if( send_req) {
-         c->enqueue(req);
-         c->fetch_wait();
-         c->last_req = std::move(req);
-      }
    }
 
    void dispatch_manager::retry_fetch(const connection_ptr& c) {
       if (!c->last_req) {
          return;
       }
-      fc_wlog( logger, "failed to fetch from ${p}",("p",c->peer_name()));
+      fc_wlog( logger, "failed to fetch from ${p}", ("p", c->peer_address()) );
       block_id_type bid;
       if( c->last_req->req_blocks.mode == normal && !c->last_req->req_blocks.ids.empty() ) {
          bid = c->last_req->req_blocks.ids.back();
       } else {
-         fc_wlog( logger,"no retry, block mpde = ${b} trx mode = ${t}",
-                  ("b",modes_str(c->last_req->req_blocks.mode))("t",modes_str(c->last_req->req_trx.mode)));
+         fc_wlog( logger, "no retry, block mpde = ${b} trx mode = ${t}",
+                  ("b", modes_str( c->last_req->req_blocks.mode ))( "t", modes_str( c->last_req->req_trx.mode ) ) );
          return;
       }
       boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
@@ -1955,9 +1940,11 @@ namespace eosio {
          }
          bool sendit = peer_has_block( bid, c->connection_id );
          if (sendit) {
-            conn->enqueue(*c->last_req);
-            conn->fetch_wait();
-            conn->last_req = c->last_req;
+            conn->strand.post( [conn, last_req = *c->last_req]() {
+               conn->enqueue( last_req );
+               conn->fetch_wait();
+               conn->last_req = last_req;
+            } );
             return;
          }
       }
@@ -2291,6 +2278,8 @@ namespace eosio {
       chain_head_blk_id = cc.head_block_id();
       chain_fork_head_blk_num = cc.fork_db_head_block_num();
       chain_fork_head_blk_id = cc.fork_db_head_block_id();
+      fc_dlog( logger, "updating chain info lib ${lib}, head ${head}, fork ${fork}",
+               ("lib", chain_lib_num)("head", chain_head_blk_num)("fork", chain_fork_head_blk_num) );
    }
 
    //         lib_num, head_blk_num, fork_head_blk_num, lib_id, head_blk_id, fork_head_blk_id
@@ -2409,10 +2398,10 @@ namespace eosio {
             controller& cc = chain_plug->chain();
             uint32_t lib_num = cc.last_irreversible_block_num();
 
-            bool on_fork = false;
-            fc_dlog( logger, "lib_num = ${ln} peer_lib = ${pl}", ("ln", lib_num)( "pl", peer_lib ) );
+            fc_dlog( logger, "handshake, check for fork lib_num = ${ln} peer_lib = ${pl}", ("ln", lib_num)( "pl", peer_lib ) );
 
             if( peer_lib <= lib_num && peer_lib > 0 ) {
+               bool on_fork = false;
                try {
                   block_id_type peer_lib_id = cc.get_block_id_for_num( peer_lib );
                   on_fork = (msg_lib_id != peer_lib_id);
@@ -2424,9 +2413,10 @@ namespace eosio {
                   on_fork = true;
                }
                if( on_fork ) {
-                  fc_elog( logger, "Peer chain is forked" );
-                  c->enqueue( go_away_message( forked ) );
-                  return;
+                  c->strand.post( [c]() {
+                     fc_elog( logger, "Peer chain is forked" );
+                     c->enqueue( go_away_message( forked ) );
+                  } );
                }
             }
          });
@@ -2438,13 +2428,13 @@ namespace eosio {
 
       c->last_handshake_recv = msg;
       c->_logger_variant.reset();
-      sync_master->recv_handshake(c,msg);
+      sync_master->recv_handshake( c, msg );
    }
 
    void net_plugin_impl::handle_message(const connection_ptr& c, const go_away_message& msg) {
-      peer_wlog(c, "received go_away_message, reason = ${r}", ("r",reason_str( msg.reason )) );
+      peer_wlog( c, "received go_away_message, reason = ${r}", ("r", reason_str( msg.reason )) );
       c->no_retry = msg.reason;
-      if(msg.reason == duplicate ) {
+      if( msg.reason == duplicate ) {
          c->node_id = msg.node_id;
       }
       c->flush_queues();
@@ -2452,7 +2442,7 @@ namespace eosio {
    }
 
    void net_plugin_impl::handle_message(const connection_ptr& c, const time_message& msg) {
-      peer_ilog(c, "received time_message");
+      peer_ilog( c, "received time_message" );
       /* We've already lost however many microseconds it took to dispatch
        * the message, but it can't be helped.
        */
@@ -2488,12 +2478,13 @@ namespace eosio {
       // peer tells us about one or more blocks or txns. When done syncing, forward on
       // notices of previously unknown blocks or txns,
       //
-      peer_ilog(c, "received notice_message");
+      peer_ilog( c, "received notice_message" );
       c->connecting = false;
       request_message req;
       bool send_req = false;
-      if (msg.known_trx.mode != none) {
-         fc_dlog(logger,"this is a ${m} notice with ${n} transactions", ("m",modes_str(msg.known_trx.mode))("n",msg.known_trx.pending));
+      if( msg.known_trx.mode != none ) {
+         fc_dlog( logger, "this is a ${m} notice with ${n} transactions",
+                  ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
       }
       switch (msg.known_trx.mode) {
       case none:
@@ -2579,12 +2570,13 @@ namespace eosio {
 
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const sync_request_message& msg) {
-      if( msg.end_block == 0) {
+   void net_plugin_impl::handle_message( const connection_ptr& c, const sync_request_message& msg ) {
+      fc_dlog( logger, "peer requested ${start} to ${end}", ("start", msg.start_block)("end", msg.end_block) );
+      if( msg.end_block == 0 ) {
          c->peer_requested.reset();
          c->flush_queues();
       } else {
-         c->peer_requested = sync_state( msg.start_block,msg.end_block,msg.start_block-1);
+         c->peer_requested = sync_state( msg.start_block, msg.end_block, msg.start_block-1);
          c->enqueue_sync_block();
       }
    }
@@ -2609,11 +2601,7 @@ namespace eosio {
       peer_ilog(c, "received packed_transaction ${id}", ("id", tid));
 
       bool have_trx = dispatcher->have_txn( tid );
-      connection_wptr weak_ptr = c;
-      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, ptrx](){
-         auto c = weak_ptr.lock();
-         dispatcher->recv_transaction(c, ptrx);
-      });
+      dispatcher->recv_transaction(c, ptrx);
       if( have_trx ) {
          fc_dlog( logger, "got a duplicate transaction - dropping ${id}", ("id", tid) );
          return;
@@ -2641,11 +2629,11 @@ namespace eosio {
          controller& cc = chain_plug->chain();
          uint32_t head_blk_num = cc.head_block_num();
 
-         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}, head_blk_num]() {
+         boost::asio::post( *my_impl->server_ioc, [accepted, ptrx{std::move(ptrx)}, head_blk_num]() {
             if( accepted ) {
-               dispatcher->bcast_transaction( ptrx );
+               my_impl->dispatcher->bcast_transaction( ptrx );
             } else {
-               dispatcher->rejected_transaction( ptrx->id, head_blk_num );
+               my_impl->dispatcher->rejected_transaction( ptrx->id, head_blk_num );
             }
          });
       });
@@ -2749,7 +2737,6 @@ namespace eosio {
       std::lock_guard<std::mutex> g( keepalive_timer_mtx );
       keepalive_timer->expires_from_now(keepalive_interval);
       keepalive_timer->async_wait( [this]( boost::system::error_code ec ) {
-         app().post( priority::low, [this, ec]() {
             ticker();
             if( ec ) {
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
@@ -2757,11 +2744,12 @@ namespace eosio {
             boost::shared_lock<boost::shared_mutex> g( connections_mtx );
             for( auto& c : connections ) {
                if( c->socket_is_open() ) {
-                  c->send_time();
+                  c->strand.post( [c]() {
+                     c->send_time();
+                  } );
                }
             }
          } );
-      } );
    }
 
    void net_plugin_impl::start_monitors() {
@@ -3078,6 +3066,8 @@ namespace eosio {
    }
 
    void net_plugin::plugin_startup() {
+      handle_sighup();
+
       my->producer_plug = app().find_plugin<producer_plugin>();
 
       my->thread_pool.emplace( my->thread_pool_size );
@@ -3157,10 +3147,11 @@ namespace eosio {
 
       my->start_monitors();
 
+      my->update_chain_info();
+
       for( const auto& seed_node : my->supplied_peers ) {
          connect( seed_node );
       }
-      handle_sighup();
    }
 
    void net_plugin::handle_sighup() {
@@ -3232,7 +3223,6 @@ namespace eosio {
       boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
          if( (*itr)->peer_address() == host ) {
-            (*itr)->reset();
             fc_ilog( logger, "disconnecting: ${p}", ("p", (*itr)->peer_name()) );
             (*itr)->close();
             my->connections.erase(itr);

From 3eb770ad3850d4ac7430153e4efad916c14420ed Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Mar 2019 07:34:57 -0500
Subject: [PATCH 0075/1648] Accept block_state_ptr as const&

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2cc242b9659..4c6a5bfaf28 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3135,7 +3135,7 @@ namespace eosio {
       my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
             boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
       my->incoming_irreversible_block_subscription = app().get_channel<channels::irreversible_block>().subscribe(
-            [this]( block_state_ptr s ) {
+            [this]( const block_state_ptr& s ) {
                my->on_irreversible_block( s );
             });
 

From 541b9c7acc090879f8539f33ff1f3bf6ba2fd0d6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Mar 2019 12:10:16 -0500
Subject: [PATCH 0076/1648] Protect last_req and fix syncing issue

---
 plugins/net_plugin/net_plugin.cpp | 49 +++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4c6a5bfaf28..b9a1dfe9d74 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -228,7 +228,7 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      mutable boost::shared_mutex      connections_mtx; // switch to std::shared_mutex in C++17
+      mutable boost::shared_mutex      connections_mtx; // switch to std::shared_mutex in C++17, also protects connection::last_req
       std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
@@ -608,7 +608,7 @@ namespace eosio {
       std::atomic<go_away_reason>           no_retry{no_reason};
       block_id_type          fork_head;
       std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
-      optional<request_message> last_req;
+      optional<request_message> last_req; // mutex protected by connections_mtx
 
       connection_status get_status()const {
          connection_status stat;
@@ -913,14 +913,18 @@ namespace eosio {
       self->flush_queues();
       self->connecting = false;
       self->syncing = false;
-      if( self->last_req ) {
+
+      boost::shared_lock<boost::shared_mutex> g_conn( my_impl->connections_mtx );
+      bool has_last_req = !!self->last_req;
+      g_conn.unlock();
+      if( has_last_req ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
       self->peer_requested.reset();
       self->sent_handshake_count = 0;
       self->last_handshake_recv = handshake_message();
       self->last_handshake_sent = handshake_message();
-      my_impl->sync_master->sync_reset_lib_num( nullptr );
+      my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
       fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) );
       self->cancel_wait();
 
@@ -1814,13 +1818,16 @@ namespace eosio {
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
       peer_block_state pbstate{id, bnum, c->connection_id};
       add_peer_block( pbstate );
+      boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       if (c &&
           c->last_req &&
           c->last_req->req_blocks.mode != none &&
           !c->last_req->req_blocks.ids.empty() &&
           c->last_req->req_blocks.ids.back() == id) {
+         fc_dlog( logger, "reseting last_req" );
          c->last_req.reset();
       }
+      g.unlock();
 
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
@@ -1909,6 +1916,7 @@ namespace eosio {
                      fc_dlog( logger, "send req" );
                      c->enqueue( req );
                      c->fetch_wait();
+                     boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
                      c->last_req = std::move( req );
                   });
                }
@@ -1921,6 +1929,8 @@ namespace eosio {
    }
 
    void dispatch_manager::retry_fetch(const connection_ptr& c) {
+      fc_dlog( logger, "retry fetch" );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       if (!c->last_req) {
          return;
       }
@@ -1933,24 +1943,37 @@ namespace eosio {
                   ("b", modes_str( c->last_req->req_blocks.mode ))( "t", modes_str( c->last_req->req_trx.mode ) ) );
          return;
       }
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
-      for (auto& conn : my_impl->connections) {
-         if (conn == c || conn->last_req) {
+      for( auto& conn : my_impl->connections ) {
+         if( conn == c || conn->last_req ) {
             continue;
          }
-         bool sendit = peer_has_block( bid, c->connection_id );
-         if (sendit) {
+         bool sendit = peer_has_block( bid, conn->connection_id );
+         if( sendit ) {
             conn->strand.post( [conn, last_req = *c->last_req]() {
                conn->enqueue( last_req );
                conn->fetch_wait();
+               boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
                conn->last_req = last_req;
             } );
             return;
          }
       }
-      g.unlock();
+      // found no peer that we know has it, so ask some random connection
+      for( auto& conn : my_impl->connections ) {
+         if( conn == c || conn->last_req ) {
+            continue;
+         }
+         conn->strand.post( [conn, last_req = *c->last_req]() {
+            conn->enqueue( last_req );
+            conn->fetch_wait();
+            boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+            conn->last_req = last_req;
+         } );
+         return;
+      }
 
       // at this point no other peer has it, re-request or do nothing?
+      fc_wlog( logger, "no peer has last_req" );
       if( c->connected() ) {
          c->enqueue(*c->last_req);
          c->fetch_wait();
@@ -2009,8 +2032,10 @@ namespace eosio {
                }
             } else {
                if( endpoint_itr != tcp::resolver::iterator() ) {
-                  c->close();
-                  c->connect( resolver, endpoint_itr );
+                  c->close(); // close posts to strand, so also post connect otherwise connect will happen before close
+                  c->strand.post( [resolver, c, endpoint_itr]() {
+                     c->connect( resolver, endpoint_itr );
+                  } );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;

From 1e051295a05ebd0bfe497fb6b1c1dcd76560b128 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Mar 2019 13:04:21 -0500
Subject: [PATCH 0077/1648] Get sync block at medium priority

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b9a1dfe9d74..105d332be6a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1110,7 +1110,7 @@ namespace eosio {
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      app().post( priority::low, [num, trigger_send, c = shared_from_this()]() {
+      app().post( priority::medium, [num, trigger_send, c = shared_from_this()]() {
          controller& cc = my_impl->chain_plug->chain();
          signed_block_ptr sb = cc.fetch_block_by_number( num );
          if( sb ) {

From 27651ec9ba89a4cff5a02a83e5d30c70711fd57b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Mar 2019 13:29:35 -0500
Subject: [PATCH 0078/1648] Remove dead code

---
 plugins/net_plugin/net_plugin.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 105d332be6a..4851bc51992 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1004,8 +1004,10 @@ namespace eosio {
       strand.post( [c = shared_from_this()]() {
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
-         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}",
-                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() ) );
+         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}",
+                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() )
+                  ( "lib", c->last_handshake_sent.last_irreversible_block_num )
+                  ( "head", c->last_handshake_sent.head_num ) );
          c->enqueue( c->last_handshake_sent );
       });
    }
@@ -2506,7 +2508,6 @@ namespace eosio {
       peer_ilog( c, "received notice_message" );
       c->connecting = false;
       request_message req;
-      bool send_req = false;
       if( msg.known_trx.mode != none ) {
          fc_dlog( logger, "this is a ${m} notice with ${n} transactions",
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
@@ -2547,10 +2548,6 @@ namespace eosio {
          peer_elog(c, "bad notice_message : invalid known_blocks.mode ${m}",("m",static_cast<uint32_t>(msg.known_blocks.mode)));
       }
       }
-      fc_dlog(logger, "send req = ${sr}", ("sr",send_req));
-      if( send_req) {
-         c->enqueue(req);
-      }
    }
 
    void net_plugin_impl::handle_message(const connection_ptr& c, const request_message& msg) {

From 790e8889ab9168837c426fef6589479bc1bb23ca Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 07:48:45 -0500
Subject: [PATCH 0079/1648] Add protection for last_handshake_*, last_req, and
 socket close

---
 .../include/eosio/net_plugin/protocol.hpp     |   2 +-
 plugins/net_plugin/net_plugin.cpp             | 148 +++++++++++-------
 2 files changed, 96 insertions(+), 54 deletions(-)

diff --git a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
index 7170c1abd20..cdb3d98fd2f 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
@@ -36,7 +36,7 @@ namespace eosio {
       block_id_type              head_id;
       string                     os;
       string                     agent;
-      int16_t                    generation;
+      int16_t                    generation = 0;
    };
 
 
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4851bc51992..9068329b158 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -587,8 +587,6 @@ namespace eosio {
       std::atomic<uint32_t>   trx_in_progress_size{0};
       fc::sha256              node_id;
       const uint32_t          connection_id;
-      handshake_message       last_handshake_recv;
-      handshake_message       last_handshake_sent;
       int16_t                 sent_handshake_count = 0;
       std::atomic<bool>       connecting{false};
       std::atomic<bool>       syncing{false};
@@ -608,16 +606,13 @@ namespace eosio {
       std::atomic<go_away_reason>           no_retry{no_reason};
       block_id_type          fork_head;
       std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
-      optional<request_message> last_req; // mutex protected by connections_mtx
 
-      connection_status get_status()const {
-         connection_status stat;
-         stat.peer = peer_addr;
-         stat.connecting = connecting;
-         stat.syncing = syncing;
-         stat.last_handshake = last_handshake_recv;
-         return stat;
-      }
+      mutable std::mutex          conn_mtx; // mtx for last_req, last_handshake_recv, last_handshake_sent
+      optional<request_message>   last_req;
+      handshake_message           last_handshake_recv;
+      handshake_message           last_handshake_sent;
+
+      connection_status get_status()const;
 
       /** \name Peer Timestamps
        *  Time message handling
@@ -816,8 +811,6 @@ namespace eosio {
         socket( *my_impl->server_ioc ),
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
-        last_handshake_recv(),
-        last_handshake_sent(),
         sent_handshake_count(0),
         connecting(false),
         syncing(false),
@@ -826,7 +819,9 @@ namespace eosio {
         response_expected_timer( *my_impl->server_ioc ),
         read_delay_timer( *my_impl->server_ioc ),
         no_retry(no_reason),
-        last_req()
+        last_req(),
+        last_handshake_recv(),
+        last_handshake_sent()
    {
       fc_ilog( logger, "created connection to ${n}", ("n", endpoint) );
       node_id.data()[0] = 0;
@@ -839,8 +834,6 @@ namespace eosio {
         socket( *my_impl->server_ioc ),
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
-        last_handshake_recv(),
-        last_handshake_sent(),
         sent_handshake_count(0),
         connecting(true),
         syncing(false),
@@ -849,14 +842,15 @@ namespace eosio {
         response_expected_timer( *my_impl->server_ioc ),
         read_delay_timer( *my_impl->server_ioc ),
         no_retry(no_reason),
-        last_req()
+        last_req(),
+        last_handshake_recv(),
+        last_handshake_sent()
    {
       fc_ilog( logger, "accepted network connection" );
       node_id.data()[0] = 0;
    }
 
    connection::~connection() {
-      pending_message_buffer.reset();
    }
 
    void connection::update_endpoints() {
@@ -870,6 +864,16 @@ namespace eosio {
       local_endpoint_port = ec ? unknown : std::to_string(lep.port());
    }
 
+   connection_status connection::get_status()const {
+      connection_status stat;
+      stat.peer = peer_addr;
+      stat.connecting = connecting;
+      stat.syncing = syncing;
+      std::lock_guard<std::mutex> g( conn_mtx );
+      stat.last_handshake = last_handshake_recv;
+      return stat;
+   }
+
    bool connection::start_session() {
       verify_strand_in_this_thread( strand, __func__, __LINE__ );
 
@@ -914,7 +918,7 @@ namespace eosio {
       self->connecting = false;
       self->syncing = false;
 
-      boost::shared_lock<boost::shared_mutex> g_conn( my_impl->connections_mtx );
+      std::unique_lock<std::mutex> g_conn( self->conn_mtx );
       bool has_last_req = !!self->last_req;
       g_conn.unlock();
       if( has_last_req ) {
@@ -922,14 +926,18 @@ namespace eosio {
       }
       self->peer_requested.reset();
       self->sent_handshake_count = 0;
+      g_conn.lock();
       self->last_handshake_recv = handshake_message();
       self->last_handshake_sent = handshake_message();
+      g_conn.unlock();
       my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
-      fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) );
+      fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();
 
       std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
       self->read_delay_timer.cancel();
+
+      self->pending_message_buffer.reset();
    }
 
    void connection::blk_send_branch() {
@@ -948,13 +956,15 @@ namespace eosio {
       }
       block_id_type remote_head_id;
       uint32_t remote_head_num = 0;
+      std::unique_lock<std::mutex> g_conn( conn_mtx );
       if( last_handshake_recv.generation >= 1 ) {
          remote_head_id = last_handshake_recv.head_id;
          remote_head_num = block_header::num_from_id(remote_head_id);
-         fc_dlog( logger, "maybe truncating branch at  = ${h}:${id}", ("h", remote_head_num)( "id", remote_head_id ) );
+         fc_dlog( logger, "maybe truncating branch at = ${h}:${id}", ("h", remote_head_num)( "id", remote_head_id ) );
       }
 
       block_id_type lib_id = last_handshake_recv.last_irreversible_block_id;
+      g_conn.unlock();
 
       if( !peer_requested ) {
          peer_requested = sync_state( block_header::num_from_id(lib_id)+1,
@@ -965,6 +975,7 @@ namespace eosio {
          uint32_t end   = std::max( peer_requested->end_block, block_header::num_from_id(head_id) );
          peer_requested = sync_state( start, end, start - 1 );
       }
+      fc_dlog( logger, "enqueue ${s} - ${e}", ("s", peer_requested->start_block)("e", peer_requested->end_block) );
       enqueue_sync_block();
 
       // still want to send transactions along during blk branch sync
@@ -1002,13 +1013,16 @@ namespace eosio {
 
    void connection::send_handshake() {
       strand.post( [c = shared_from_this()]() {
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          fc_dlog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}",
                   ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() )
                   ( "lib", c->last_handshake_sent.last_irreversible_block_num )
                   ( "head", c->last_handshake_sent.head_num ) );
-         c->enqueue( c->last_handshake_sent );
+         auto cpy = c->last_handshake_sent;
+         g_conn.unlock();
+         c->enqueue( cpy );
       });
    }
 
@@ -1057,6 +1071,9 @@ namespace eosio {
          boost::asio::async_write( c->socket, bufs,
             boost::asio::bind_executor( c->strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
             try {
+               // May have closed connection and cleared buffer_queue
+               if( !c->socket_is_open() ) return;
+
                c->buffer_queue.out_callback( ec, w );
 
                if( ec ) {
@@ -1112,7 +1129,8 @@ namespace eosio {
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      app().post( priority::medium, [num, trigger_send, c = shared_from_this()]() {
+      const int higher_than_low = priority::low + 2; // otherwise client gets very little if we are syncing to a peer
+      app().post( higher_than_low, [num, trigger_send, c = shared_from_this()]() {
          controller& cc = my_impl->chain_plug->chain();
          signed_block_ptr sb = cc.fetch_block_by_number( num );
          if( sb ) {
@@ -1241,11 +1259,13 @@ namespace eosio {
       }
    }
 
-   // todo: last_handshake_recv not thread safe
+   // locks conn_mtx, do not call while holding conn_mtx
    const string connection::peer_name() {
+      std::unique_lock<std::mutex> g_conn( conn_mtx );
       if( !last_handshake_recv.p2p_address.empty() ) {
          return last_handshake_recv.p2p_address;
       }
+      g_conn.unlock();
       if( !peer_address().empty() ) {
          return peer_address();
       }
@@ -1311,6 +1331,7 @@ namespace eosio {
       }
       if( !c ) return;
       if( c->current() ) {
+         std::lock_guard<std::mutex> g_conn( c->conn_mtx );
          if( c->last_handshake_recv.last_irreversible_block_num > sync_known_lib_num ) {
             sync_known_lib_num = c->last_handshake_recv.last_irreversible_block_num;
          }
@@ -1594,7 +1615,9 @@ namespace eosio {
             verify_catchup(c, msg.known_blocks.pending, msg.known_blocks.ids.back());
          }
       } else if (msg.known_blocks.mode == last_irr_catch_up) {
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          c->last_handshake_recv.last_irreversible_block_num = msg.known_trx.pending;
+         g_conn.unlock();
          sync_reset_lib_num(c);
          start_sync(c, msg.known_trx.pending);
       }
@@ -1607,7 +1630,7 @@ namespace eosio {
          fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_address()) );
          sync_last_requested_num = 0;
          sync_source.reset();
-         set_state( in_sync );
+         //todo: set_state( in_sync );
          g.unlock();
          c->close();
          send_handshakes();
@@ -1623,7 +1646,7 @@ namespace eosio {
       if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
-                     ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_name()) );
+                     ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_address()) );
             c->close();
             return;
          }
@@ -1802,14 +1825,15 @@ namespace eosio {
          }
          cp->strand.post( [this, cp, bs, send_buffer]() {
             uint32_t bnum = bs->block_num;
-            // todo protect cp->last_handshake_recv
+            std::unique_lock<std::mutex> g_conn( cp->conn_mtx );
             bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
+            g_conn.unlock();
             if( !has_block ) {
                peer_block_state pbstate{bs->id, bnum, cp->connection_id};
                if( !add_peer_block( pbstate ) ) {
                   return;
                }
-               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_address() ) );
+               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
                cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
             }
          });
@@ -1820,7 +1844,7 @@ namespace eosio {
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
       peer_block_state pbstate{id, bnum, c->connection_id};
       add_peer_block( pbstate );
-      boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      std::unique_lock<std::mutex> g( c->conn_mtx );
       if (c &&
           c->last_req &&
           c->last_req->req_blocks.mode != none &&
@@ -1918,7 +1942,7 @@ namespace eosio {
                      fc_dlog( logger, "send req" );
                      c->enqueue( req );
                      c->fetch_wait();
-                     boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+                     std::lock_guard<std::mutex> g( c->conn_mtx );
                      c->last_req = std::move( req );
                   });
                }
@@ -1932,8 +1956,8 @@ namespace eosio {
 
    void dispatch_manager::retry_fetch(const connection_ptr& c) {
       fc_dlog( logger, "retry fetch" );
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
-      if (!c->last_req) {
+      std::unique_lock<std::mutex> g_c_conn( c->conn_mtx );
+      if( !c->last_req ) {
          return;
       }
       fc_wlog( logger, "failed to fetch from ${p}", ("p", c->peer_address()) );
@@ -1945,39 +1969,39 @@ namespace eosio {
                   ("b", modes_str( c->last_req->req_blocks.mode ))( "t", modes_str( c->last_req->req_trx.mode ) ) );
          return;
       }
+      g_c_conn.unlock();
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& conn : my_impl->connections ) {
-         if( conn == c || conn->last_req ) {
+         if( conn == c ) continue;
+
+         std::unique_lock<std::mutex> g_conn_conn( conn->conn_mtx );
+         if( conn->last_req ) {
             continue;
          }
+         g_conn_conn.unlock();
          bool sendit = peer_has_block( bid, conn->connection_id );
          if( sendit ) {
-            conn->strand.post( [conn, last_req = *c->last_req]() {
+            g.unlock();
+            g_c_conn.lock();
+            auto last_req = *c->last_req;
+            g_c_conn.unlock();
+            conn->strand.post( [conn, last_req{std::move(last_req)}]() {
                conn->enqueue( last_req );
                conn->fetch_wait();
-               boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+               std::lock_guard<std::mutex> g_conn_conn( conn->conn_mtx );
                conn->last_req = last_req;
             } );
             return;
          }
       }
-      // found no peer that we know has it, so ask some random connection
-      for( auto& conn : my_impl->connections ) {
-         if( conn == c || conn->last_req ) {
-            continue;
-         }
-         conn->strand.post( [conn, last_req = *c->last_req]() {
-            conn->enqueue( last_req );
-            conn->fetch_wait();
-            boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
-            conn->last_req = last_req;
-         } );
-         return;
-      }
 
       // at this point no other peer has it, re-request or do nothing?
       fc_wlog( logger, "no peer has last_req" );
       if( c->connected() ) {
-         c->enqueue(*c->last_req);
+         g_c_conn.lock();
+         auto last_req = *c->last_req;
+         g_c_conn.unlock();
+         c->enqueue( last_req );
          c->fetch_wait();
       }
    }
@@ -2173,8 +2197,11 @@ namespace eosio {
             boost::asio::bind_executor( strand,
             [conn = shared_from_this()]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                --conn->reads_in_flight;
-               bool close_connection = false;
 
+               // may have closed connection and cleared pending_message_buffer
+               if( !conn->socket_is_open() ) return;
+
+               bool close_connection = false;
                try {
                   if( !ec ) {
                      if (bytes_transferred > conn->pending_message_buffer.bytes_to_write()) {
@@ -2355,6 +2382,10 @@ namespace eosio {
          c->enqueue( go_away_message( fatal_other ) );
          return;
       }
+      fc_dlog( logger, "received handshake gen ${g} from ${ep}, lib ${lib}, head ${head}",
+               ("g", msg.generation)( "ep", c->peer_address() )
+               ( "lib", msg.last_irreversible_block_num )( "head", msg.head_num ) );
+
       if( c->connecting ) {
          c->connecting = false;
       }
@@ -2365,7 +2396,9 @@ namespace eosio {
             return;
          }
 
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
+            g_conn.unlock();
             fc_dlog(logger, "checking for duplicate" );
             boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
             for(const auto& check : connections) {
@@ -2376,7 +2409,13 @@ namespace eosio {
                   // we need to avoid the case where they would both tell a different connection to go away.
                   // Using the sum of the initial handshake times of the two connections, we will
                   // arbitrarily (but consistently between the two peers) keep one of them.
-                  if (msg.time + c->last_handshake_sent.time <= check->last_handshake_sent.time + check->last_handshake_recv.time)
+                  std::unique_lock<std::mutex> g_check_conn( check->conn_mtx );
+                  auto check_time = check->last_handshake_sent.time + check->last_handshake_recv.time;
+                  g_check_conn.unlock();
+                  g_conn.lock();
+                  auto c_time = c->last_handshake_sent.time;
+                  g_conn.unlock();
+                  if (msg.time + c_time <= check_time)
                      continue;
 
                   fc_dlog( logger, "sending go_away duplicate to ${ep}", ("ep",msg.p2p_address) );
@@ -2390,6 +2429,7 @@ namespace eosio {
          } else {
             fc_dlog( logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",
                      ("pa", c->peer_address())( "ni", c->last_handshake_recv.node_id ) );
+            g_conn.unlock();
          }
 
          if( msg.chain_id != chain_id) {
@@ -2453,7 +2493,9 @@ namespace eosio {
          }
       }
 
+      std::unique_lock<std::mutex> g_conn( c->conn_mtx );
       c->last_handshake_recv = msg;
+      g_conn.unlock();
       c->_logger_variant.reset();
       sync_master->recv_handshake( c, msg );
    }
@@ -2507,7 +2549,6 @@ namespace eosio {
       //
       peer_ilog( c, "received notice_message" );
       c->connecting = false;
-      request_message req;
       if( msg.known_trx.mode != none ) {
          fc_dlog( logger, "this is a ${m} notice with ${n} transactions",
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
@@ -2516,8 +2557,9 @@ namespace eosio {
       case none:
          break;
       case last_irr_catch_up: {
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          c->last_handshake_recv.head_num = msg.known_trx.pending;
-         req.req_trx.mode = none;
+         g_conn.unlock();
          break;
       }
       case catch_up : {

From 30e9676f1d438c912c5221f26240bb8d1ec1dc66 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 09:21:34 -0500
Subject: [PATCH 0080/1648] Protect connection fork_head, fork_head_num.
 Improve logging.

---
 plugins/net_plugin/net_plugin.cpp | 32 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 9068329b158..7ba52469f3b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -604,13 +604,13 @@ namespace eosio {
       std::mutex                            read_delay_timer_mtx;
       boost::asio::steady_timer             read_delay_timer;
       std::atomic<go_away_reason>           no_retry{no_reason};
-      block_id_type          fork_head;
-      std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
 
-      mutable std::mutex          conn_mtx; // mtx for last_req, last_handshake_recv, last_handshake_sent
+      mutable std::mutex          conn_mtx; // mtx for last_req, last_handshake_recv, last_handshake_sent, fork_head, fork_head_num
       optional<request_message>   last_req;
       handshake_message           last_handshake_recv;
       handshake_message           last_handshake_sent;
+      block_id_type               fork_head;
+      uint32_t                    fork_head_num{0};
 
       connection_status get_status()const;
 
@@ -1119,7 +1119,6 @@ namespace eosio {
 
    bool connection::enqueue_sync_block() {
       if( !peer_requested ) {
-         fc_dlog( logger, "enqueue sync block, with no peer_requested" );
          return false;
       } else {
          fc_dlog( logger, "enqueue sync block ${num}", ("num", peer_requested->last + 1) );
@@ -1572,7 +1571,7 @@ namespace eosio {
       req.req_blocks.mode = catch_up;
       boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for (const auto& cc : my_impl->connections) {
-         // fork_head_num provides memory barrier for fork_head
+         std::lock_guard<std::mutex> g_conn( cc->conn_mtx );
          if( cc->fork_head_num > num || cc->fork_head == id ) {
             req.req_blocks.mode = none;
             break;
@@ -1580,8 +1579,10 @@ namespace eosio {
       }
       g.unlock();
       if( req.req_blocks.mode == catch_up ) {
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          c->fork_head = id;
          c->fork_head_num = num;
+         g_conn.unlock();
          std::lock_guard<std::mutex> g( sync_mtx );
          fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} "
                           "target LIB = ${lib} next_expected = ${ne}",
@@ -1591,6 +1592,7 @@ namespace eosio {
             return;
          set_state( head_catchup );
       } else {
+         std::lock_guard<std::mutex> g_conn( c->conn_mtx );
          c->fork_head = block_id_type();
          c->fork_head_num = 0;
       }
@@ -1639,14 +1641,16 @@ namespace eosio {
 
    // called from connection strand
    void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
-      fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_address() ) );
+      fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_name() ) );
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       stages state = sync_state;
       fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
       if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
+            auto sync_next_expected = sync_next_expected_num;
+            g_sync.unlock();
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
-                     ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_address()) );
+                     ("ne", sync_next_expected)( "bn", blk_num )( "p", c->peer_name() ) );
             c->close();
             return;
          }
@@ -1662,11 +1666,15 @@ namespace eosio {
          bool set_state_to_head_catchup = false;
          boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          for( const auto& cp : my_impl->connections ) {
-            uint32_t fork_head_num = cp->fork_head_num.load(); // fork_head_num provides memory barrier for fork_head
-            if (cp->fork_head == null_id) {
+            std::unique_lock<std::mutex> g_cp_conn( cp->conn_mtx );
+            uint32_t fork_head_num = cp->fork_head_num;
+            block_id_type fork_head_id = cp->fork_head;
+            g_cp_conn.unlock();
+            if( fork_head_id == null_id ) {
                continue;
             }
-            if( fork_head_num < blk_num || cp->fork_head == blk_id ) {
+            if( fork_head_num < blk_num || fork_head_id == blk_id ) {
+               std::lock_guard<std::mutex> g_conn( c->conn_mtx );
                c->fork_head = null_id;
                c->fork_head_num = 0;
             } else {
@@ -1884,7 +1892,7 @@ namespace eosio {
          }
 
          cp->strand.post( [cp, send_buffer]() {
-            fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_address()) );
+            fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_name()) );
             cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
          } );
       }
@@ -2383,7 +2391,7 @@ namespace eosio {
          return;
       }
       fc_dlog( logger, "received handshake gen ${g} from ${ep}, lib ${lib}, head ${head}",
-               ("g", msg.generation)( "ep", c->peer_address() )
+               ("g", msg.generation)( "ep", c->peer_name() )
                ( "lib", msg.last_irreversible_block_num )( "head", msg.head_num ) );
 
       if( c->connecting ) {

From f5d5f74198961768bd54f9f1b6ddebd182a2a5ca Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 12:37:34 -0500
Subject: [PATCH 0081/1648] Fix protection of connections. Record block after
 verify it links.

---
 plugins/net_plugin/net_plugin.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7ba52469f3b..eda58c0f794 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1128,8 +1128,7 @@ namespace eosio {
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      const int higher_than_low = priority::low + 2; // otherwise client gets very little if we are syncing to a peer
-      app().post( higher_than_low, [num, trigger_send, c = shared_from_this()]() {
+      app().post( priority::medium, [num, trigger_send, c = shared_from_this()]() {
          controller& cc = my_impl->chain_plug->chain();
          signed_block_ptr sb = cc.fetch_block_by_number( num );
          if( sb ) {
@@ -2107,9 +2106,9 @@ namespace eosio {
                g.unlock();
                if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
                   if( new_connection->start_session() ) {
-                     g.lock();
+                     boost::unique_lock<boost::shared_mutex> g_unique( connections_mtx );
                      connections.insert( new_connection );
-                     g.unlock();
+                     g_unique.unlock();
                   }
 
                } else {
@@ -2731,9 +2730,9 @@ namespace eosio {
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );
       }
 
-      c->strand.post( [dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
-         dispatcher->recv_block( c, blk_id, blk_num );
-      });
+//      c->strand.post( [dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+//         dispatcher->recv_block( c, blk_id, blk_num );
+//      });
       fc::microseconds age( fc::time_point::now() - msg->timestamp);
       peer_ilog(c, "received signed_block : #${n} block age in secs = ${age}",
               ("n",blk_num)("age",age.to_seconds()));
@@ -2765,7 +2764,8 @@ namespace eosio {
          boost::asio::post( *server_ioc, [self = this, msg]() {
             self->dispatcher->update_txns_block_num( msg );
          });
-         c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {
+         c->strand.post( [sync_master = sync_master.get(), dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+            dispatcher->recv_block( c, blk_id, blk_num );
             sync_master->sync_recv_block( c, blk_id, blk_num );
          });
       } else {
@@ -2882,7 +2882,7 @@ namespace eosio {
    void net_plugin_impl::on_accepted_block(const block_state_ptr& block) {
       update_chain_info();
       boost::asio::post( *server_ioc, [this, ioc=server_ioc, block]() {
-         fc_dlog( logger, "signaled, id = ${id}", ("id", block->id) );
+         fc_dlog( logger, "signaled, blk id = ${id}", ("id", block->id) );
          dispatcher->bcast_block( block );
       });
    }

From 7fd099ca3ff4ad3b5de1cbf33bfb4b699f2cb08e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:08:40 -0600
Subject: [PATCH 0082/1648] Test of multi-threaded reading

---
 plugins/net_plugin/net_plugin.cpp | 164 ++++++++++++++++++++++--------
 1 file changed, 119 insertions(+), 45 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a26353ab387..062f72f5fb1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,6 +75,12 @@ namespace eosio {
       }
    };
 
+   struct block_greater {
+      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
+         return lhs->block_num() > rhs->block_num();
+      }
+   };
+
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -157,7 +163,7 @@ namespace eosio {
 
       channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
 
-      uint16_t                                  thread_pool_size = 1; // currently used by server_ioc
+      uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
       optional<io_work_t>                       server_ioc_work;
@@ -501,12 +507,12 @@ namespace eosio {
       socket_ptr                                socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      fc::optional<std::size_t>        outstanding_read_bytes;
+      std::atomic<std::size_t>         outstanding_read_bytes{0};
 
 
       queued_buffer           buffer_queue;
 
-      uint32_t                reads_in_flight = 0;
+      std::atomic<uint32_t>   reads_in_flight{0};
       uint32_t                trx_in_progress_size = 0;
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
@@ -639,9 +645,9 @@ namespace eosio {
    };
 
    struct msg_handler : public fc::visitor<void> {
-      net_plugin_impl &impl;
+      net_plugin_impl& impl;
       connection_ptr c;
-      msg_handler( net_plugin_impl &imp, const connection_ptr& conn) : impl(imp), c(conn) {}
+      msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
 
       void operator()( const signed_block& msg ) const {
          EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should be called" );
@@ -657,16 +663,30 @@ namespace eosio {
       }
 
       void operator()( signed_block&& msg ) const {
-         impl.handle_message( c, std::make_shared<signed_block>( std::move( msg ) ) );
+         shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
+         connection_wptr weak = c;
+         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c ) impl->handle_message( c, ptr );
+         });
       }
       void operator()( packed_transaction&& msg ) const {
-         impl.handle_message( c, std::make_shared<packed_transaction>( std::move( msg ) ) );
+         shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
+         connection_wptr weak = c;
+         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c) impl->handle_message( c, ptr );
+         });
       }
 
       template <typename T>
       void operator()( T&& msg ) const
       {
-         impl.handle_message( c, std::forward<T>(msg) );
+         connection_wptr weak = c;
+         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
       }
    };
 
@@ -704,6 +724,8 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
+
+      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -778,7 +800,9 @@ namespace eosio {
       initialize();
    }
 
-   connection::~connection() {}
+   connection::~connection() {
+      pending_message_buffer.reset();
+   }
 
    void connection::initialize() {
       auto *rnd = node_id.data();
@@ -826,7 +850,6 @@ namespace eosio {
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
       if( read_delay_timer ) read_delay_timer->cancel();
-      pending_message_buffer.reset();
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -1106,6 +1129,7 @@ namespace eosio {
    static std::shared_ptr<std::vector<char>> create_send_buffer( const signed_block_ptr& sb ) {
       // this implementation is to avoid copy of signed_block to net_message
       // matches which of net_message for signed_block
+      fc_dlog( logger, "sending block ${bn}", ("bn", sb->block_num()) );
       return create_send_buffer( signed_block_which, *sb );
    }
 
@@ -1921,7 +1945,9 @@ namespace eosio {
          return false;
       }
       else {
-         start_read_message( con );
+         boost::asio::post(*server_ioc, [this, con]() {
+            start_read_message( con );
+         });
          ++started_sessions;
          return true;
          // for now, we can just use the application main loop.
@@ -2006,7 +2032,7 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
-         std::size_t minimum_read = conn->outstanding_read_bytes ? *conn->outstanding_read_bytes : message_header_size;
+         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2022,7 +2048,7 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-
+/*
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
@@ -2031,7 +2057,7 @@ namespace eosio {
             if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
                peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
             } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight) );
+               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
             } else {
                peer_wlog( conn, "max trx in progress ${s} bytes", ("s", conn->trx_in_progress_size) );
             }
@@ -2053,20 +2079,20 @@ namespace eosio {
             } ) );
             return;
          }
-
+*/
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             boost::asio::bind_executor( conn->strand,
             [this,weak_conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
-            app().post( priority::medium, [this,weak_conn, ec, bytes_transferred]() {
                auto conn = weak_conn.lock();
                if (!conn) {
                   return;
                }
 
                --conn->reads_in_flight;
-               conn->outstanding_read_bytes.reset();
+               conn->outstanding_read_bytes = 0;
+               bool close_connection = false;
 
                try {
                   if( !ec ) {
@@ -2080,18 +2106,16 @@ namespace eosio {
                         uint32_t bytes_in_buffer = conn->pending_message_buffer.bytes_to_read();
 
                         if (bytes_in_buffer < message_header_size) {
-                           conn->outstanding_read_bytes.emplace(message_header_size - bytes_in_buffer);
+                           conn->outstanding_read_bytes = message_header_size - bytes_in_buffer;
                            break;
                         } else {
                            uint32_t message_length;
                            auto index = conn->pending_message_buffer.read_index();
                            conn->pending_message_buffer.peek(&message_length, sizeof(message_length), index);
                            if(message_length > def_send_buffer_size*2 || message_length == 0) {
-                              boost::system::error_code ec;
-                              fc_elog( logger,"incoming message length unexpected (${i}), from ${p}",
-                                       ("i", message_length)("p",boost::lexical_cast<std::string>(conn->socket->remote_endpoint(ec))) );
-                              close(conn);
-                              return;
+                              fc_elog( logger,"incoming message length unexpected (${i})", ("i", message_length) );
+                              close_connection = true;
+                              break;
                            }
 
                            auto total_message_bytes = message_length + message_header_size;
@@ -2108,38 +2132,44 @@ namespace eosio {
                                  conn->pending_message_buffer.add_space( outstanding_message_bytes - available_buffer_bytes );
                               }
 
-                              conn->outstanding_read_bytes.emplace(outstanding_message_bytes);
+                              conn->outstanding_read_bytes = outstanding_message_bytes;
                               break;
                            }
                         }
                      }
-                     start_read_message(conn);
+                     if( !close_connection ) start_read_message( conn );
                   } else {
-                     auto pname = conn->peer_name();
                      if (ec.value() != boost::asio::error::eof) {
-                        fc_elog( logger, "Error reading message from ${p}: ${m}",("p",pname)( "m", ec.message() ) );
+                        fc_elog( logger, "Error reading message: ${m}", ( "m", ec.message() ) );
                      } else {
-                        fc_ilog( logger, "Peer ${p} closed connection",("p",pname) );
+                        fc_ilog( logger, "Peer closed connection" );
                      }
-                     close( conn );
+                     close_connection = true;
                   }
                }
                catch(const std::exception &ex) {
-                  fc_elog( logger, "Exception in handling read data from ${p}: ${s}",
-                           ("p",conn->peer_name())("s",ex.what()) );
-                  close( conn );
+                  fc_elog( logger, "Exception in handling read data: ${s}", ("s",ex.what()) );
+                  close_connection = true;
                }
                catch(const fc::exception &ex) {
-                  fc_elog( logger, "Exception in handling read data from ${p}: ${s}",
-                           ("p",conn->peer_name())("s",ex.to_string()) );
-                  close( conn );
+                  fc_elog( logger, "Exception in handling read data ${s}", ("s",ex.to_string()) );
+                  close_connection = true;
                }
                catch (...) {
-                  fc_elog( logger, "Undefined exception handling the read data from ${p}",( "p",conn->peer_name()) );
-                  close( conn );
+                  fc_elog( logger, "Undefined exception handling read data" );
+                  close_connection = true;
                }
-            });
-         }));
+
+               if( close_connection ) {
+                  connection_wptr weak_conn = conn;
+                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+                     auto conn = weak_conn.lock();
+                     if( !conn ) return;
+                     fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                     close( conn );
+                  });
+               }
+         });
       } catch (...) {
          string pname = conn ? conn->peer_name() : "no connection name";
          fc_elog( logger, "Undefined exception handling reading ${p}",("p",pname) );
@@ -2150,6 +2180,7 @@ namespace eosio {
    bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) {
       try {
          // if next message is a block we already have, exit early
+/*
          auto peek_ds = conn->pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
@@ -2166,7 +2197,7 @@ namespace eosio {
                return true;
             }
          }
-
+*/
          auto ds = conn->pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
@@ -2547,18 +2578,61 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
-      controller &cc = chain_plug->chain();
-      block_id_type blk_id = msg->id();
-      uint32_t blk_num = msg->block_num();
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
+      signed_block_ptr msg = m;
+      controller& cc = chain_plug->chain();
+      block_id_type blk_id = msg ? msg->id() : block_id_type();
+      uint32_t blk_num = msg ? msg->block_num() : 0;
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-         if( cc.fetch_block_by_id(blk_id)) {
+         if( msg && cc.fetch_block_by_id(blk_id)) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
+         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
+         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
+            // see if top is ready
+            if( !sync_master->incoming_blocks.empty() ) {
+               prev = sync_master->incoming_blocks.top();
+               auto prev_prev = cc.fetch_block_by_id( prev->previous );
+               if( prev_prev != nullptr ) {
+                  sync_master->incoming_blocks.pop();
+                  if(msg) sync_master->incoming_blocks.emplace( msg );
+                  msg = prev;
+                  blk_id = msg->id();
+                  blk_num = msg->block_num();
+                  connection_wptr weak = c;
+                  app().post(priority::medium, "re post blk", [this, weak](){
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  });
+               } else {
+                  if( msg ) {
+                     sync_master->incoming_blocks.emplace( msg );
+
+                     connection_wptr weak = c;
+                     app().post( priority::medium, "re post blk", [this, weak]() {
+                        connection_ptr c = weak.lock();
+                        if( c ) handle_message( c, signed_block_ptr() );
+                     } );
+                  }
+                  return;
+               }
+            } else {
+               if( msg ) {
+                  sync_master->incoming_blocks.emplace( msg );
+
+                  connection_wptr weak = c;
+                  app().post( priority::medium, "re post blk", [this, weak]() {
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  } );
+               }
+               return;
+            }
+         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From c27007616c1e89a74eda90da45e2c0eabaab99fa Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:16:39 -0600
Subject: [PATCH 0083/1648] Remove descriptions of tasks as not merged into
 develop yet

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 062f72f5fb1..1c7d7eb0cad 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -665,7 +665,7 @@ namespace eosio {
       void operator()( signed_block&& msg ) const {
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c ) impl->handle_message( c, ptr );
          });
@@ -673,7 +673,7 @@ namespace eosio {
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c) impl->handle_message( c, ptr );
          });
@@ -683,7 +683,7 @@ namespace eosio {
       void operator()( T&& msg ) const
       {
          connection_wptr weak = c;
-         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
@@ -2162,7 +2162,7 @@ namespace eosio {
 
                if( close_connection ) {
                   connection_wptr weak_conn = conn;
-                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+                  app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2604,7 +2604,7 @@ namespace eosio {
                   blk_id = msg->id();
                   blk_num = msg->block_num();
                   connection_wptr weak = c;
-                  app().post(priority::medium, "re post blk", [this, weak](){
+                  app().post(priority::medium, [this, weak](){
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2613,7 +2613,7 @@ namespace eosio {
                      sync_master->incoming_blocks.emplace( msg );
 
                      connection_wptr weak = c;
-                     app().post( priority::medium, "re post blk", [this, weak]() {
+                     app().post( priority::medium, [this, weak]() {
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2625,7 +2625,7 @@ namespace eosio {
                   sync_master->incoming_blocks.emplace( msg );
 
                   connection_wptr weak = c;
-                  app().post( priority::medium, "re post blk", [this, weak]() {
+                  app().post( priority::medium, [this, weak]() {
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );

From bde8ae642cc391f544bd2e938ea94aacdd97bc2a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:04 -0600
Subject: [PATCH 0084/1648] Use appbase with FIFO priority queue. priority
 queue in net_plugin no longer needed.

---
 plugins/net_plugin/net_plugin.cpp | 53 ++-----------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 1c7d7eb0cad..13a0e5d524a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -75,12 +75,6 @@ namespace eosio {
       }
    };
 
-   struct block_greater {
-      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
-         return lhs->block_num() > rhs->block_num();
-      }
-   };
-
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -507,7 +501,7 @@ namespace eosio {
       socket_ptr                                socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      std::atomic<std::size_t>         outstanding_read_bytes{0};
+      std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
 
 
       queued_buffer           buffer_queue;
@@ -724,8 +718,6 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
-
-      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2024,6 +2016,7 @@ namespace eosio {
       });
    }
 
+   // only called from server_ioc thread
    void net_plugin_impl::start_read_message(const connection_ptr& conn) {
 
       try {
@@ -2591,48 +2584,6 @@ namespace eosio {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
-         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
-         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
-            // see if top is ready
-            if( !sync_master->incoming_blocks.empty() ) {
-               prev = sync_master->incoming_blocks.top();
-               auto prev_prev = cc.fetch_block_by_id( prev->previous );
-               if( prev_prev != nullptr ) {
-                  sync_master->incoming_blocks.pop();
-                  if(msg) sync_master->incoming_blocks.emplace( msg );
-                  msg = prev;
-                  blk_id = msg->id();
-                  blk_num = msg->block_num();
-                  connection_wptr weak = c;
-                  app().post(priority::medium, [this, weak](){
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  });
-               } else {
-                  if( msg ) {
-                     sync_master->incoming_blocks.emplace( msg );
-
-                     connection_wptr weak = c;
-                     app().post( priority::medium, [this, weak]() {
-                        connection_ptr c = weak.lock();
-                        if( c ) handle_message( c, signed_block_ptr() );
-                     } );
-                  }
-                  return;
-               }
-            } else {
-               if( msg ) {
-                  sync_master->incoming_blocks.emplace( msg );
-
-                  connection_wptr weak = c;
-                  app().post( priority::medium, [this, weak]() {
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  } );
-               }
-               return;
-            }
-         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From d44dae9effb98ef04d045d772ba1ec44fd55f659 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:49:28 -0600
Subject: [PATCH 0085/1648] Revert unneeded changes to handle_message

---
 plugins/net_plugin/net_plugin.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 13a0e5d524a..a654a4fa699 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2571,16 +2571,15 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
-      signed_block_ptr msg = m;
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
-      block_id_type blk_id = msg ? msg->id() : block_id_type();
-      uint32_t blk_num = msg ? msg->block_num() : 0;
+      block_id_type blk_id = msg->id();
+      uint32_t blk_num = msg->block_num();
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-         if( msg && cc.fetch_block_by_id(blk_id)) {
+         if( cc.fetch_block_by_id(blk_id) ) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }

From 1f605e2fc85fc2c3d3e7dc83f4511e4b9056e600 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 14:50:46 -0600
Subject: [PATCH 0086/1648] Logging fixes

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a654a4fa699..ef0e7fc6b02 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1641,6 +1641,7 @@ namespace eosio {
 
       uint32_t bnum = bs->block_num;
       peer_block_state pbstate{bs->id, bnum};
+      fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
 
       std::shared_ptr<std::vector<char>> send_buffer;
       for( auto& cp : my_impl->connections ) {
@@ -1655,7 +1656,7 @@ namespace eosio {
             if( !send_buffer ) {
                send_buffer = create_send_buffer( bs->block );
             }
-            fc_dlog(logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()));
+            fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
             cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
          }
       }

From 3c96f68234ab0b1fa2dd23017346636888d2477e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Mar 2019 18:26:06 -0600
Subject: [PATCH 0087/1648] Make delay_timer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 56 ++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ef0e7fc6b02..eb6e0ac1ac6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -419,6 +419,7 @@ namespace eosio {
          }
       }
 
+      // thread safe
       uint32_t write_queue_size() const { return _write_queue_size; }
 
       bool is_out_queue_empty() const { return _out_queue.empty(); }
@@ -477,7 +478,7 @@ namespace eosio {
          std::function<void( boost::system::error_code, std::size_t )> callback;
       };
 
-      uint32_t _write_queue_size = 0;
+      std::atomic<uint32_t> _write_queue_size{0};
       deque<queued_write> _write_queue;
       deque<queued_write> _sync_write_queue; // sync_write_queue will be sent first
       deque<queued_write> _out_queue;
@@ -507,7 +508,7 @@ namespace eosio {
       queued_buffer           buffer_queue;
 
       std::atomic<uint32_t>   reads_in_flight{0};
-      uint32_t                trx_in_progress_size = 0;
+      std::atomic<uint32_t>   trx_in_progress_size{0};
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
@@ -517,6 +518,7 @@ namespace eosio {
       uint16_t                protocol_version  = 0;
       string                  peer_addr;
       unique_ptr<boost::asio::steady_timer> response_expected;
+      std::mutex                            read_delay_timer_mutex;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
@@ -841,7 +843,10 @@ namespace eosio {
       my_impl->sync_master->reset_lib_num(shared_from_this());
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
-      if( read_delay_timer ) read_delay_timer->cancel();
+      {
+         std::lock_guard<std::mutex> g( read_delay_timer_mutex );
+         if( read_delay_timer ) read_delay_timer->cancel();
+      }
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -2042,27 +2047,36 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-/*
+
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
-            if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
-               peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
-            } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
+            uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
+            uint32_t trx_in_progress_size = conn->trx_in_progress_size;
+            uint32_t reads_in_flight = conn->reads_in_flight;
+            if( write_queue_size > def_max_write_queue_size ) {
+               peer_wlog( conn, "write_queue full ${s} bytes", ("s", write_queue_size) );
+            } else if( reads_in_flight > def_max_reads_in_flight ) {
+               peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
             } else {
-               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", conn->trx_in_progress_size) );
+               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
-            if( conn->buffer_queue.write_queue_size() > 2*def_max_write_queue_size ||
-                conn->reads_in_flight > 2*def_max_reads_in_flight   ||
-                conn->trx_in_progress_size > 2*def_max_trx_in_progress_size )
+            if( write_queue_size > 2*def_max_write_queue_size ||
+                reads_in_flight > 2*def_max_reads_in_flight   ||
+                  trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
-               fc_wlog( logger, "queues over full, giving up on connection ${p}", ("p", conn->peer_name()) );
-               my_impl->close( conn );
+               fc_wlog( logger, "queues over full, giving up on connection" );
+               app().post( priority::medium, [this, weak_conn]() {
+                  auto conn = weak_conn.lock();
+                  if( !conn ) return;
+                  fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                  my_impl->close( conn );
+               });
                return;
             }
+            std::lock_guard<std::mutex> g( conn->read_delay_timer_mutex );
             if( !conn->read_delay_timer ) return;
             conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
             conn->read_delay_timer->async_wait(
@@ -2073,7 +2087,7 @@ namespace eosio {
             } ) );
             return;
          }
-*/
+
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2155,7 +2169,6 @@ namespace eosio {
                }
 
                if( close_connection ) {
-                  connection_wptr weak_conn = conn;
                   app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
@@ -2165,9 +2178,14 @@ namespace eosio {
                }
          });
       } catch (...) {
-         string pname = conn ? conn->peer_name() : "no connection name";
-         fc_elog( logger, "Undefined exception handling reading ${p}",("p",pname) );
-         close( conn );
+         fc_elog( logger, "Undefined exception in start_read_message" );
+         connection_wptr weak_conn = conn;
+         app().post( priority::medium, [this, weak_conn]() {
+            auto conn = weak_conn.lock();
+            if( !conn ) return;
+            fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+            close( conn );
+         });
       }
    }
 

From 85f929898331815939421af6eccb4fe8aabf3b23 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:16:39 -0600
Subject: [PATCH 0088/1648] Remove descriptions of tasks as not merged into
 develop yet

---
 plugins/net_plugin/net_plugin.cpp | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index eb6e0ac1ac6..b47ee19118d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2169,6 +2169,7 @@ namespace eosio {
                }
 
                if( close_connection ) {
+                  connection_wptr weak_conn = conn;
                   app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
@@ -2602,6 +2603,50 @@ namespace eosio {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
+<<<<<<< HEAD
+=======
+         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
+         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
+            // see if top is ready
+            if( !sync_master->incoming_blocks.empty() ) {
+               prev = sync_master->incoming_blocks.top();
+               auto prev_prev = cc.fetch_block_by_id( prev->previous );
+               if( prev_prev != nullptr ) {
+                  sync_master->incoming_blocks.pop();
+                  if(msg) sync_master->incoming_blocks.emplace( msg );
+                  msg = prev;
+                  blk_id = msg->id();
+                  blk_num = msg->block_num();
+                  connection_wptr weak = c;
+                  app().post(priority::medium, [this, weak](){
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  });
+               } else {
+                  if( msg ) {
+                     sync_master->incoming_blocks.emplace( msg );
+
+                     connection_wptr weak = c;
+                     app().post( priority::medium, [this, weak]() {
+                        connection_ptr c = weak.lock();
+                        if( c ) handle_message( c, signed_block_ptr() );
+                     } );
+                  }
+                  return;
+               }
+            } else {
+               if( msg ) {
+                  sync_master->incoming_blocks.emplace( msg );
+
+                  connection_wptr weak = c;
+                  app().post( priority::medium, [this, weak]() {
+                     connection_ptr c = weak.lock();
+                     if( c ) handle_message( c, signed_block_ptr() );
+                  } );
+               }
+               return;
+            }
+         }
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 53e79fb6bb902125274f7c81453b3d1ece4cbf39 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:04 -0600
Subject: [PATCH 0089/1648] Use appbase with FIFO priority queue. priority
 queue in net_plugin no longer needed.

---
 plugins/net_plugin/net_plugin.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b47ee19118d..f6b8919c548 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2604,6 +2604,7 @@ namespace eosio {
             return;
          }
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
          signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
          if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
@@ -2647,6 +2648,8 @@ namespace eosio {
                return;
             }
          }
+=======
+>>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 4021df9cb9b080737b4fd4ff2f50ac3af0d05a24 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Mar 2019 18:26:06 -0600
Subject: [PATCH 0090/1648] Make delay_timer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f6b8919c548..eda987724f7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2169,7 +2169,6 @@ namespace eosio {
                }
 
                if( close_connection ) {
-                  connection_wptr weak_conn = conn;
                   app().post( priority::medium, [this, weak_conn]() {
                      auto conn = weak_conn.lock();
                      if( !conn ) return;

From 6732a0fe7e843b17647ba9616945391a953c846a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Sat, 2 Mar 2019 11:22:30 -0600
Subject: [PATCH 0091/1648] Remove unneeded access to atomic

---
 plugins/net_plugin/net_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index eda987724f7..b91bdaf21f7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -26,6 +26,8 @@
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
 
+#include <atomic>
+
 using namespace eosio::chain::plugin_interface::compat;
 
 namespace fc {
@@ -2031,7 +2033,9 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
-         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
+         std::size_t minimum_read =
+               std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
+         minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2099,7 +2103,6 @@ namespace eosio {
                }
 
                --conn->reads_in_flight;
-               conn->outstanding_read_bytes = 0;
                bool close_connection = false;
 
                try {

From eceaa9bb5cd551e3d38b15ddeeb5404421fdc786 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 4 Mar 2019 15:44:26 -0500
Subject: [PATCH 0092/1648] Move sig recovery in producer plugin to use thread
 pool of chain controller

---
 plugins/producer_plugin/producer_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index a35fa34a9c5..6b7646e9cdd 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -351,8 +351,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
          const auto& cfg = chain.get_global_properties().configuration;
-         transaction_metadata::create_signing_keys_future( trx, *_thread_pool, chain.get_chain_id(), fc::microseconds( cfg.max_transaction_cpu_usage ) );
-         boost::asio::post( *_thread_pool, [self = this, trx, persist_until_expired, next]() {
+         fc::microseconds max_trx_cpu_usage{ cfg.max_transaction_cpu_usage };
+         auto& tp = *_thread_pool;
+         boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
+            // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+            transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
             if( trx->signing_keys_future.valid() )
                trx->signing_keys_future.wait();
             app().post(priority::low, [self, trx, persist_until_expired, next]() {

From c6766b0f2f41a85a55a8131d6275d52fce2b94fd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 4 Mar 2019 15:47:26 -0500
Subject: [PATCH 0093/1648] Cache db_read_mode to avoid accessing controller

---
 plugins/net_plugin/net_plugin.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b91bdaf21f7..e27d8ac0168 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -145,6 +145,7 @@ namespace eosio {
       bool                          network_version_match = false;
       chain_id_type                 chain_id;
       fc::sha256                    node_id;
+      eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
       string                        user_agent_name;
       chain_plugin*                 chain_plug = nullptr;
@@ -2072,7 +2073,7 @@ namespace eosio {
                   trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
                fc_wlog( logger, "queues over full, giving up on connection" );
-               app().post( priority::medium, [this, weak_conn]() {
+               app().post( priority::medium, [weak_conn]() {
                   auto conn = weak_conn.lock();
                   if( !conn ) return;
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2555,8 +2556,7 @@ namespace eosio {
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
       peer_ilog(c, "received packed_transaction");
-      controller& cc = my_impl->chain_plug->chain();
-      if( cc.get_read_mode() == eosio::db_read_mode::READ_ONLY ) {
+      if( db_read_mode == eosio::db_read_mode::READ_ONLY ) {
          fc_dlog(logger, "got a txn in read-only mode - dropping");
          return;
       }
@@ -3165,7 +3165,8 @@ namespace eosio {
 
       my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
 
-      if( cc.get_read_mode() == chain::db_read_mode::READ_ONLY ) {
+      my->db_read_mode = cc.get_read_mode();
+      if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;
          fc_ilog( logger, "node in read-only mode setting max_nodes_per_host to 0 to prevent connections" );
       }

From e63fdbf35c9e3976f47e878fe8db3e978df9bddc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:16:13 -0500
Subject: [PATCH 0094/1648] Make chain_id const since read from thread pool
 threads

---
 libraries/chain/controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index f3b0a841981..b8470993c05 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -124,7 +124,7 @@ struct controller_impl {
    resource_limits_manager        resource_limits;
    authorization_manager          authorization;
    controller::config             conf;
-   chain_id_type                  chain_id;
+   const chain_id_type            chain_id; // read by thread_pool threads
    bool                           replaying= false;
    optional<fc::time_point>       replay_head_time;
    db_read_mode                   read_mode = db_read_mode::SPECULATIVE;

From a7c46d7c8a87c1887e9ab01269dd085e25e83a8f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:16:54 -0500
Subject: [PATCH 0095/1648] Add trx id to log message

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e27d8ac0168..6a3f72f23e8 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2581,7 +2581,7 @@ namespace eosio {
          } else {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
-               fc_dlog(logger, "chain accepted transaction");
+               fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
                this->dispatcher->bcast_transaction(ptrx);
                return;
             }

From 2453be99b6c02d7aaaa0564ec36713df007c5238 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:18:34 -0500
Subject: [PATCH 0096/1648] Use command line max_transaction_time for limit of
 transaction sig recovery. This was done so that global properties
 configuration does not have to be accessed since the plan is to move this
 code into the thread pool.

---
 plugins/producer_plugin/producer_plugin.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 6b7646e9cdd..c2d600c467b 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -134,7 +134,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       transaction_id_with_expiry_index                          _persistent_transactions;
       fc::optional<boost::asio::thread_pool>                    _thread_pool;
 
-      int32_t                                                   _max_transaction_time_ms;
+      std::atomic<int32_t>                                      _max_transaction_time_ms; // modified by app thread, read by net_plugin thread pool
       fc::microseconds                                          _max_irreversible_block_age_us;
       int32_t                                                   _produce_time_offset_us = 0;
       int32_t                                                   _last_block_time_offset_us = 0;
@@ -350,8 +350,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
-         const auto& cfg = chain.get_global_properties().configuration;
-         fc::microseconds max_trx_cpu_usage{ cfg.max_transaction_cpu_usage };
+         fc::microseconds max_trx_cpu_usage = fc::milliseconds( _max_transaction_time_ms.load() );
          auto& tp = *_thread_pool;
          boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
             // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress

From eb1efbdce026b5b117c2b60bed129663137482c0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:58:27 -0500
Subject: [PATCH 0097/1648] Remove unneeded ack of transactions. Already
 processed by handle_message of packed_transaction_ptr

---
 plugins/net_plugin/net_plugin.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6a3f72f23e8..37fafb45685 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -158,8 +158,6 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
-      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
-
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
@@ -189,7 +187,6 @@ namespace eosio {
       void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
 
       void accepted_block(const block_state_ptr&);
-      void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
 
       bool is_valid( const handshake_message &msg);
 
@@ -2837,17 +2834,6 @@ namespace eosio {
       dispatcher->bcast_block(block);
    }
 
-   void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
-      const auto& id = results.second->id;
-      if (results.first) {
-         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
-         dispatcher->rejected_transaction(id);
-      } else {
-         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
-         dispatcher->bcast_transaction(results.second);
-      }
-   }
-
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {
       if(allowed_connections == None)
          return false;
@@ -3163,8 +3149,6 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
-      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
-
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;

From fb9c07b3f0949053ea369a2178be9682da451412 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 15:51:47 -0500
Subject: [PATCH 0098/1648] Revert "Remove unneeded ack of transactions.
 Already processed by handle_message of packed_transaction_ptr"

This reverts commit 7f340f7347da146b360251214fbf655d11a955cd.
---
 plugins/net_plugin/net_plugin.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 37fafb45685..6a3f72f23e8 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -158,6 +158,8 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
+      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
@@ -187,6 +189,7 @@ namespace eosio {
       void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
 
       void accepted_block(const block_state_ptr&);
+      void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
 
       bool is_valid( const handshake_message &msg);
 
@@ -2834,6 +2837,17 @@ namespace eosio {
       dispatcher->bcast_block(block);
    }
 
+   void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
+      const auto& id = results.second->id;
+      if (results.first) {
+         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
+         dispatcher->rejected_transaction(id);
+      } else {
+         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
+         dispatcher->bcast_transaction(results.second);
+      }
+   }
+
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {
       if(allowed_connections == None)
          return false;
@@ -3149,6 +3163,8 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
+      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
+
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;

From 8663321960cc1dc9afcbc9b5cf5e7008f1fe7b11 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 18:54:14 -0500
Subject: [PATCH 0099/1648] Fix tests, handle -1 as unlimited
 max_transaction_tim_ms.

---
 plugins/producer_plugin/producer_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index c2d600c467b..217f931a532 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -350,7 +350,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
-         fc::microseconds max_trx_cpu_usage = fc::milliseconds( _max_transaction_time_ms.load() );
+         const auto max_trx_time_ms = _max_transaction_time_ms.load();
+         fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
          auto& tp = *_thread_pool;
          boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
             // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress

From 9e53b90063bdb7562fc5773c8527b4d18a5ccb9e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 20:25:24 -0500
Subject: [PATCH 0100/1648] force a build

---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6a3f72f23e8..12a88400353 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2779,8 +2779,8 @@ namespace eosio {
          auto &stale_blk = c->blk_state.get<by_block_num>();
          stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
-      fc_dlog(logger, "expire_txns ${n}us size ${s} removed ${r}",
-            ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
+      fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
+               ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
    }
 
    void net_plugin_impl::expire_local_txns() {

From d28405837b1939ea3f1bd1d7472a7ff58ee9ef86 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 6 Mar 2019 13:55:44 -0500
Subject: [PATCH 0101/1648] Move more of incoming transaction processing to
 thread pool

---
 plugins/net_plugin/net_plugin.cpp | 144 +++++++++++++++++++-----------
 1 file changed, 94 insertions(+), 50 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 12a88400353..78b7caa80e2 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -152,6 +152,7 @@ namespace eosio {
       producer_plugin*              producer_plug = nullptr;
       int                           started_sessions = 0;
 
+      std::mutex                    local_txns_mtx;
       node_transaction_index        local_txns;
 
       shared_ptr<tcp::resolver>     resolver;
@@ -671,11 +672,7 @@ namespace eosio {
       }
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if( c) impl->handle_message( c, ptr );
-         });
+         impl.handle_message( c, ptr );
       }
 
       template <typename T>
@@ -855,21 +852,35 @@ namespace eosio {
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
       const std::set<transaction_id_type, sha256_less> known_ids(ids.cbegin(), ids.cend());
       my_impl->expire_local_txns();
-      for(auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ){
-         const bool found = known_ids.find( tx->id ) != known_ids.cend();
-         if( !found ) {
-            queue_write( tx->serialized_txn, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      vector<std::shared_ptr<vector<char>>> trx_to_send;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
+            const bool found = known_ids.find( tx->id ) != known_ids.cend();
+            if( !found ) {
+               trx_to_send.emplace_back( tx->serialized_txn );
+            }
          }
       }
+      for( const auto& t : trx_to_send ) {
+         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      }
    }
 
    void connection::txn_send(const vector<transaction_id_type>& ids) {
-      for(const auto& t : ids) {
-         auto tx = my_impl->local_txns.get<by_id>().find(t);
-         if( tx != my_impl->local_txns.end() ) {
-            queue_write( tx->serialized_txn, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      vector<std::shared_ptr<vector<char>>> trx_to_send;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         for( const auto& t : ids ) {
+            auto tx = my_impl->local_txns.get<by_id>().find( t );
+            if( tx != my_impl->local_txns.end()) {
+               trx_to_send.emplace_back( tx->serialized_txn );
+            }
          }
       }
+      for( const auto& t : trx_to_send ) {
+         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
+      }
    }
 
    void connection::blk_send_branch() {
@@ -1481,7 +1492,10 @@ namespace eosio {
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
-         note.known_trx.pending = my_impl->local_txns.size();
+         {
+            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+            note.known_trx.pending = my_impl->local_txns.size();
+         }
          c->enqueue( note );
          return;
       }
@@ -1713,9 +1727,12 @@ namespace eosio {
       }
       received_transactions.erase(range.first, range.second);
 
-      if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end() ) { //found
-         fc_dlog(logger, "found trxid in local_trxs" );
-         return;
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
+            fc_dlog( logger, "found trxid in local_trxs" );
+            return;
+         }
       }
 
       time_point_sec trx_expiration = ptrx->packed_trx->expiration();
@@ -1724,7 +1741,10 @@ namespace eosio {
       auto buff = create_send_buffer( trx );
 
       node_transaction_state nts = {id, trx_expiration, 0, buff};
-      my_impl->local_txns.insert(std::move(nts));
+      {
+         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
+         my_impl->local_txns.insert( std::move( nts ));
+      }
 
       my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
          if( skips.find(c) != skips.end() || c->syncing ) {
@@ -2457,6 +2477,7 @@ namespace eosio {
             // plan to get all except what we already know about.
             req.req_trx.mode = catch_up;
             send_req = true;
+            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
             size_t known_sum = local_txns.size();
             if( known_sum ) {
                for( const auto& t : local_txns.get<by_id>() ) {
@@ -2553,6 +2574,7 @@ namespace eosio {
              trx->get_signatures().size() * sizeof(signature_type);
    }
 
+   // called from thread_pool threads
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
       peer_ilog(c, "received packed_transaction");
@@ -2560,36 +2582,47 @@ namespace eosio {
          fc_dlog(logger, "got a txn in read-only mode - dropping");
          return;
       }
-      if( sync_master->is_active(c) ) {
-         fc_dlog(logger, "got a txn during sync - dropping");
-         return;
-      }
 
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
 
-      if(local_txns.get<by_id>().find(tid) != local_txns.end()) {
-         fc_dlog(logger, "got a duplicate transaction - dropping");
-         return;
+      {
+         std::lock_guard<std::mutex> g( local_txns_mtx );
+         if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
+            fc_dlog( logger, "got a duplicate transaction - dropping" );
+            return;
+         }
       }
-      dispatcher->recv_transaction(c, tid);
+      connection_wptr weak_ptr = c;
+      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, tid](){
+         auto c = weak_ptr.lock();
+         dispatcher->recv_transaction(c, tid);
+      });
       c->trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
       chain_plug->accept_transaction(ptrx, [c, this, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
+         bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
             peer_dlog(c, "bad packed_transaction : ${m}", ("m",result.get<fc::exception_ptr>()->what()));
          } else {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
                fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
-               this->dispatcher->bcast_transaction(ptrx);
-               return;
+               accepted = true;
             }
 
-            peer_elog(c, "bad packed_transaction : ${m}", ("m",trace->except->what()));
+            if( !accepted ) {
+               peer_elog( c, "bad packed_transaction : ${m}", ("m", trace->except->what()));
+            }
          }
 
-         dispatcher->rejected_transaction(ptrx->id);
+         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}]() {
+            if( accepted ) {
+               dispatcher->bcast_transaction( ptrx );
+            } else {
+               dispatcher->rejected_transaction( ptrx->id );
+            }
+         });
       });
    }
 
@@ -2687,15 +2720,19 @@ namespace eosio {
 
       update_block_num ubn(blk_num);
       if( reason == no_reason ) {
-         for (const auto &recpt : msg->transactions) {
-            auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>() : recpt.trx.get<packed_transaction>().id();
-            auto ltx = local_txns.get<by_id>().find(id);
-            if( ltx != local_txns.end()) {
-               local_txns.modify( ltx, ubn );
-            }
-            auto ctx = c->trx_state.get<by_id>().find(id);
-            if( ctx != c->trx_state.end()) {
-               c->trx_state.modify( ctx, ubn );
+         {
+            std::lock_guard<std::mutex> g( local_txns_mtx );
+            for( const auto& recpt : msg->transactions ) {
+               auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
+                                                  : recpt.trx.get<packed_transaction>().id();
+               auto ltx = local_txns.get<by_id>().find( id );
+               if( ltx != local_txns.end()) {
+                  local_txns.modify( ltx, ubn );
+               }
+               auto ctx = c->trx_state.get<by_id>().find( id );
+               if( ctx != c->trx_state.end()) {
+                  c->trx_state.modify( ctx, ubn );
+               }
             }
          }
          sync_master->recv_block(c, blk_id, blk_num);
@@ -2764,8 +2801,6 @@ namespace eosio {
       start_txn_timer();
 
       auto now = time_point::now();
-      auto start_size = local_txns.size();
-
       expire_local_txns();
 
       controller& cc = chain_plug->chain();
@@ -2779,20 +2814,29 @@ namespace eosio {
          auto &stale_blk = c->blk_state.get<by_block_num>();
          stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
-      fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
-               ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
+      fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
    }
 
    void net_plugin_impl::expire_local_txns() {
-      auto& old = local_txns.get<by_expiry>();
-      auto ex_lo = old.lower_bound( fc::time_point_sec(0) );
-      auto ex_up = old.upper_bound( time_point::now() );
-      old.erase( ex_lo, ex_up );
-
-      auto& stale = local_txns.get<by_block_num>();
       controller& cc = chain_plug->chain();
       uint32_t lib = cc.last_irreversible_block_num();
-      stale.erase( stale.lower_bound(1), stale.upper_bound(lib) );
+      size_t start_size = 0, end_size = 0;
+
+      {
+         std::lock_guard<std::mutex> g( local_txns_mtx );
+
+         start_size = local_txns.size();
+         auto& old = local_txns.get<by_expiry>();
+         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
+         auto ex_up = old.upper_bound( time_point::now());
+         old.erase( ex_lo, ex_up );
+
+         auto& stale = local_txns.get<by_block_num>();
+         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
+         end_size = local_txns.size();
+      }
+
+      fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)("r", start_size - end_size) );
    }
 
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {

From 11e2252a7132ff9d9505cc73272acab723957a0d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:08:40 -0600
Subject: [PATCH 0102/1648] Test of multi-threaded reading

---
 plugins/net_plugin/net_plugin.cpp | 90 ++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 78b7caa80e2..d9725977e53 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -77,6 +77,12 @@ namespace eosio {
       }
    };
 
+   struct block_greater {
+      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
+         return lhs->block_num() > rhs->block_num();
+      }
+   };
+
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -506,13 +512,21 @@ namespace eosio {
       socket_ptr                                socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
+<<<<<<< HEAD
       std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
+=======
+      std::atomic<std::size_t>         outstanding_read_bytes{0};
+>>>>>>> Test of multi-threaded reading
 
 
       queued_buffer           buffer_queue;
 
       std::atomic<uint32_t>   reads_in_flight{0};
+<<<<<<< HEAD
       std::atomic<uint32_t>   trx_in_progress_size{0};
+=======
+      uint32_t                trx_in_progress_size = 0;
+>>>>>>> Test of multi-threaded reading
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
@@ -665,21 +679,37 @@ namespace eosio {
       void operator()( signed_block&& msg ) const {
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
          connection_wptr weak = c;
+<<<<<<< HEAD
          app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+=======
+         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+>>>>>>> Test of multi-threaded reading
             connection_ptr c = weak.lock();
             if( c ) impl->handle_message( c, ptr );
          });
       }
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
+<<<<<<< HEAD
          impl.handle_message( c, ptr );
+=======
+         connection_wptr weak = c;
+         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if( c) impl->handle_message( c, ptr );
+         });
+>>>>>>> Test of multi-threaded reading
       }
 
       template <typename T>
       void operator()( T&& msg ) const
       {
          connection_wptr weak = c;
+<<<<<<< HEAD
          app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+=======
+         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+>>>>>>> Test of multi-threaded reading
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
@@ -720,6 +750,8 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
+
+      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -843,10 +875,14 @@ namespace eosio {
       my_impl->sync_master->reset_lib_num(shared_from_this());
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
+<<<<<<< HEAD
       {
          std::lock_guard<std::mutex> g( read_delay_timer_mutex );
          if( read_delay_timer ) read_delay_timer->cancel();
       }
+=======
+      if( read_delay_timer ) read_delay_timer->cancel();
+>>>>>>> Test of multi-threaded reading
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -2054,9 +2090,13 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
+<<<<<<< HEAD
          std::size_t minimum_read =
                std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
          minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
+=======
+         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
+>>>>>>> Test of multi-threaded reading
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2072,12 +2112,13 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-
+/*
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
+<<<<<<< HEAD
             uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
             uint32_t trx_in_progress_size = conn->trx_in_progress_size;
             uint32_t reads_in_flight = conn->reads_in_flight;
@@ -2085,6 +2126,12 @@ namespace eosio {
                peer_wlog( conn, "write_queue full ${s} bytes", ("s", write_queue_size) );
             } else if( reads_in_flight > def_max_reads_in_flight ) {
                peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
+=======
+            if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
+               peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
+            } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
+               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
+>>>>>>> Test of multi-threaded reading
             } else {
                peer_wlog( conn, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
@@ -2112,7 +2159,7 @@ namespace eosio {
             } ) );
             return;
          }
-
+*/
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2124,6 +2171,10 @@ namespace eosio {
                }
 
                --conn->reads_in_flight;
+<<<<<<< HEAD
+=======
+               conn->outstanding_read_bytes = 0;
+>>>>>>> Test of multi-threaded reading
                bool close_connection = false;
 
                try {
@@ -2193,7 +2244,12 @@ namespace eosio {
                }
 
                if( close_connection ) {
+<<<<<<< HEAD
                   app().post( priority::medium, [this, weak_conn]() {
+=======
+                  connection_wptr weak_conn = conn;
+                  app().post( priority::medium, "close conn", [this, weak_conn]() {
+>>>>>>> Test of multi-threaded reading
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2626,14 +2682,23 @@ namespace eosio {
       });
    }
 
+<<<<<<< HEAD
    void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
       block_id_type blk_id = msg->id();
       uint32_t blk_num = msg->block_num();
+=======
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
+      signed_block_ptr msg = m;
+      controller& cc = chain_plug->chain();
+      block_id_type blk_id = msg ? msg->id() : block_id_type();
+      uint32_t blk_num = msg ? msg->block_num() : 0;
+>>>>>>> Test of multi-threaded reading
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
+<<<<<<< HEAD
          if( cc.fetch_block_by_id(blk_id) ) {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
@@ -2641,6 +2706,12 @@ namespace eosio {
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
+=======
+         if( msg && cc.fetch_block_by_id(blk_id)) {
+            sync_master->recv_block(c, blk_id, blk_num);
+            return;
+         }
+>>>>>>> Test of multi-threaded reading
          signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
          if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
             // see if top is ready
@@ -2654,7 +2725,11 @@ namespace eosio {
                   blk_id = msg->id();
                   blk_num = msg->block_num();
                   connection_wptr weak = c;
+<<<<<<< HEAD
                   app().post(priority::medium, [this, weak](){
+=======
+                  app().post(priority::medium, "re post blk", [this, weak](){
+>>>>>>> Test of multi-threaded reading
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2663,7 +2738,11 @@ namespace eosio {
                      sync_master->incoming_blocks.emplace( msg );
 
                      connection_wptr weak = c;
+<<<<<<< HEAD
                      app().post( priority::medium, [this, weak]() {
+=======
+                     app().post( priority::medium, "re post blk", [this, weak]() {
+>>>>>>> Test of multi-threaded reading
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2675,7 +2754,11 @@ namespace eosio {
                   sync_master->incoming_blocks.emplace( msg );
 
                   connection_wptr weak = c;
+<<<<<<< HEAD
                   app().post( priority::medium, [this, weak]() {
+=======
+                  app().post( priority::medium, "re post blk", [this, weak]() {
+>>>>>>> Test of multi-threaded reading
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );
@@ -2683,8 +2766,11 @@ namespace eosio {
                return;
             }
          }
+<<<<<<< HEAD
 =======
 >>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
+=======
+>>>>>>> Test of multi-threaded reading
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 0cb84d61f02fc44ac3f0f9ba43df942c8c2ef24b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:16:39 -0600
Subject: [PATCH 0103/1648] Remove descriptions of tasks as not merged into
 develop yet

---
 plugins/net_plugin/net_plugin.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d9725977e53..0aaf1f66336 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -679,11 +679,15 @@ namespace eosio {
       void operator()( signed_block&& msg ) const {
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
          connection_wptr weak = c;
+<<<<<<< HEAD
 <<<<<<< HEAD
          app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
 =======
          app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
 >>>>>>> Test of multi-threaded reading
+=======
+         app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
             connection_ptr c = weak.lock();
             if( c ) impl->handle_message( c, ptr );
          });
@@ -694,7 +698,7 @@ namespace eosio {
          impl.handle_message( c, ptr );
 =======
          connection_wptr weak = c;
-         app().post(priority::low, "handle trx", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
             if( c) impl->handle_message( c, ptr );
          });
@@ -705,11 +709,15 @@ namespace eosio {
       void operator()( T&& msg ) const
       {
          connection_wptr weak = c;
+<<<<<<< HEAD
 <<<<<<< HEAD
          app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
 =======
          app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
 >>>>>>> Test of multi-threaded reading
+=======
+         app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
@@ -2248,8 +2256,12 @@ namespace eosio {
                   app().post( priority::medium, [this, weak_conn]() {
 =======
                   connection_wptr weak_conn = conn;
+<<<<<<< HEAD
                   app().post( priority::medium, "close conn", [this, weak_conn]() {
 >>>>>>> Test of multi-threaded reading
+=======
+                  app().post( priority::medium, [this, weak_conn]() {
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2725,11 +2737,15 @@ namespace eosio {
                   blk_id = msg->id();
                   blk_num = msg->block_num();
                   connection_wptr weak = c;
+<<<<<<< HEAD
 <<<<<<< HEAD
                   app().post(priority::medium, [this, weak](){
 =======
                   app().post(priority::medium, "re post blk", [this, weak](){
 >>>>>>> Test of multi-threaded reading
+=======
+                  app().post(priority::medium, [this, weak](){
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2738,11 +2754,15 @@ namespace eosio {
                      sync_master->incoming_blocks.emplace( msg );
 
                      connection_wptr weak = c;
+<<<<<<< HEAD
 <<<<<<< HEAD
                      app().post( priority::medium, [this, weak]() {
 =======
                      app().post( priority::medium, "re post blk", [this, weak]() {
 >>>>>>> Test of multi-threaded reading
+=======
+                     app().post( priority::medium, [this, weak]() {
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2754,11 +2774,15 @@ namespace eosio {
                   sync_master->incoming_blocks.emplace( msg );
 
                   connection_wptr weak = c;
+<<<<<<< HEAD
 <<<<<<< HEAD
                   app().post( priority::medium, [this, weak]() {
 =======
                   app().post( priority::medium, "re post blk", [this, weak]() {
 >>>>>>> Test of multi-threaded reading
+=======
+                  app().post( priority::medium, [this, weak]() {
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );

From 6444c1a380e0744dee455b29b5068050754a37cc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:04 -0600
Subject: [PATCH 0104/1648] Use appbase with FIFO priority queue. priority
 queue in net_plugin no longer needed.

---
 plugins/net_plugin/net_plugin.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0aaf1f66336..8446c09b2ce 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -77,12 +77,6 @@ namespace eosio {
       }
    };
 
-   struct block_greater {
-      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
-         return lhs->block_num() > rhs->block_num();
-      }
-   };
-
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -512,11 +506,15 @@ namespace eosio {
       socket_ptr                                socket;
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
+<<<<<<< HEAD
 <<<<<<< HEAD
       std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
 =======
       std::atomic<std::size_t>         outstanding_read_bytes{0};
 >>>>>>> Test of multi-threaded reading
+=======
+      std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
+>>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
 
 
       queued_buffer           buffer_queue;
@@ -758,8 +756,6 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
-
-      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2723,6 +2719,7 @@ namespace eosio {
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
+<<<<<<< HEAD
 >>>>>>> Test of multi-threaded reading
          signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
          if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
@@ -2795,6 +2792,8 @@ namespace eosio {
 >>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
 =======
 >>>>>>> Test of multi-threaded reading
+=======
+>>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 8d4e010b0eed1e111a3e52627c2eb3c92dd17a9e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:49:28 -0600
Subject: [PATCH 0105/1648] Revert unneeded changes to handle_message

---
 plugins/net_plugin/net_plugin.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8446c09b2ce..24d9a625c60 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2690,6 +2690,7 @@ namespace eosio {
       });
    }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
    void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
@@ -2702,10 +2703,17 @@ namespace eosio {
       block_id_type blk_id = msg ? msg->id() : block_id_type();
       uint32_t blk_num = msg ? msg->block_num() : 0;
 >>>>>>> Test of multi-threaded reading
+=======
+   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
+      controller& cc = chain_plug->chain();
+      block_id_type blk_id = msg->id();
+      uint32_t blk_num = msg->block_num();
+>>>>>>> Revert unneeded changes to handle_message
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
+<<<<<<< HEAD
 <<<<<<< HEAD
          if( cc.fetch_block_by_id(blk_id) ) {
             sync_master->recv_block(c, blk_id, blk_num);
@@ -2716,6 +2724,9 @@ namespace eosio {
 =======
 =======
          if( msg && cc.fetch_block_by_id(blk_id)) {
+=======
+         if( cc.fetch_block_by_id(blk_id) ) {
+>>>>>>> Revert unneeded changes to handle_message
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }

From 8f47db7641a0900803d1921338ba1b21bb6764ea Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Mar 2019 18:26:06 -0600
Subject: [PATCH 0106/1648] Make delay_timer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 24d9a625c60..ba9ee05358a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -520,11 +520,15 @@ namespace eosio {
       queued_buffer           buffer_queue;
 
       std::atomic<uint32_t>   reads_in_flight{0};
+<<<<<<< HEAD
 <<<<<<< HEAD
       std::atomic<uint32_t>   trx_in_progress_size{0};
 =======
       uint32_t                trx_in_progress_size = 0;
 >>>>>>> Test of multi-threaded reading
+=======
+      std::atomic<uint32_t>   trx_in_progress_size{0};
+>>>>>>> Make delay_timer thread safe
       fc::sha256              node_id;
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
@@ -880,13 +884,19 @@ namespace eosio {
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Make delay_timer thread safe
       {
          std::lock_guard<std::mutex> g( read_delay_timer_mutex );
          if( read_delay_timer ) read_delay_timer->cancel();
       }
+<<<<<<< HEAD
 =======
       if( read_delay_timer ) read_delay_timer->cancel();
 >>>>>>> Test of multi-threaded reading
+=======
+>>>>>>> Make delay_timer thread safe
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
@@ -2116,13 +2126,16 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-/*
+
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Make delay_timer thread safe
             uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
             uint32_t trx_in_progress_size = conn->trx_in_progress_size;
             uint32_t reads_in_flight = conn->reads_in_flight;
@@ -2130,12 +2143,15 @@ namespace eosio {
                peer_wlog( conn, "write_queue full ${s} bytes", ("s", write_queue_size) );
             } else if( reads_in_flight > def_max_reads_in_flight ) {
                peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
+<<<<<<< HEAD
 =======
             if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
                peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
             } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
                peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
 >>>>>>> Test of multi-threaded reading
+=======
+>>>>>>> Make delay_timer thread safe
             } else {
                peer_wlog( conn, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
@@ -2144,7 +2160,11 @@ namespace eosio {
                   trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
                fc_wlog( logger, "queues over full, giving up on connection" );
+<<<<<<< HEAD
                app().post( priority::medium, [weak_conn]() {
+=======
+               app().post( priority::medium, [this, weak_conn]() {
+>>>>>>> Make delay_timer thread safe
                   auto conn = weak_conn.lock();
                   if( !conn ) return;
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
@@ -2163,7 +2183,7 @@ namespace eosio {
             } ) );
             return;
          }
-*/
+
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2248,6 +2268,7 @@ namespace eosio {
                }
 
                if( close_connection ) {
+<<<<<<< HEAD
 <<<<<<< HEAD
                   app().post( priority::medium, [this, weak_conn]() {
 =======
@@ -2256,6 +2277,8 @@ namespace eosio {
                   app().post( priority::medium, "close conn", [this, weak_conn]() {
 >>>>>>> Test of multi-threaded reading
 =======
+=======
+>>>>>>> Make delay_timer thread safe
                   app().post( priority::medium, [this, weak_conn]() {
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
                      auto conn = weak_conn.lock();

From de7418f4a1d0230ec312f8025111a6a770e4e179 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:08:40 -0600
Subject: [PATCH 0107/1648] Test of multi-threaded reading

---
 plugins/net_plugin/net_plugin.cpp | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ba9ee05358a..aa4d5880b07 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -77,6 +77,12 @@ namespace eosio {
       }
    };
 
+   struct block_greater {
+      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
+         return lhs->block_num() > rhs->block_num();
+      }
+   };
+
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -760,6 +766,8 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
+
+      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2126,7 +2134,7 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-
+/*
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
@@ -2183,7 +2191,7 @@ namespace eosio {
             } ) );
             return;
          }
-
+*/
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2744,6 +2752,7 @@ namespace eosio {
          }
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
          if( msg && cc.fetch_block_by_id(blk_id)) {
@@ -2754,6 +2763,8 @@ namespace eosio {
             return;
          }
 <<<<<<< HEAD
+>>>>>>> Test of multi-threaded reading
+=======
 >>>>>>> Test of multi-threaded reading
          signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
          if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
@@ -2769,6 +2780,7 @@ namespace eosio {
                   blk_num = msg->block_num();
                   connection_wptr weak = c;
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                   app().post(priority::medium, [this, weak](){
 =======
@@ -2777,6 +2789,9 @@ namespace eosio {
 =======
                   app().post(priority::medium, [this, weak](){
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
+=======
+                  app().post(priority::medium, "re post blk", [this, weak](){
+>>>>>>> Test of multi-threaded reading
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2786,6 +2801,7 @@ namespace eosio {
 
                      connection_wptr weak = c;
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                      app().post( priority::medium, [this, weak]() {
 =======
@@ -2794,6 +2810,9 @@ namespace eosio {
 =======
                      app().post( priority::medium, [this, weak]() {
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
+=======
+                     app().post( priority::medium, "re post blk", [this, weak]() {
+>>>>>>> Test of multi-threaded reading
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2806,6 +2825,7 @@ namespace eosio {
 
                   connection_wptr weak = c;
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                   app().post( priority::medium, [this, weak]() {
 =======
@@ -2814,6 +2834,9 @@ namespace eosio {
 =======
                   app().post( priority::medium, [this, weak]() {
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
+=======
+                  app().post( priority::medium, "re post blk", [this, weak]() {
+>>>>>>> Test of multi-threaded reading
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );
@@ -2822,12 +2845,15 @@ namespace eosio {
             }
          }
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
 =======
 >>>>>>> Test of multi-threaded reading
 =======
 >>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
+=======
+>>>>>>> Test of multi-threaded reading
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 8bd71aa32ae4c1c0a08c17caddf7a262bbb96bd9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Feb 2019 08:16:39 -0600
Subject: [PATCH 0108/1648] Remove descriptions of tasks as not merged into
 develop yet

---
 plugins/net_plugin/net_plugin.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index aa4d5880b07..feabdadd631 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2278,6 +2278,10 @@ namespace eosio {
                if( close_connection ) {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+                  connection_wptr weak_conn = conn;
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
                   app().post( priority::medium, [this, weak_conn]() {
 =======
                   connection_wptr weak_conn = conn;
@@ -2781,6 +2785,7 @@ namespace eosio {
                   connection_wptr weak = c;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                   app().post(priority::medium, [this, weak](){
 =======
@@ -2792,6 +2797,9 @@ namespace eosio {
 =======
                   app().post(priority::medium, "re post blk", [this, weak](){
 >>>>>>> Test of multi-threaded reading
+=======
+                  app().post(priority::medium, [this, weak](){
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   });
@@ -2802,6 +2810,7 @@ namespace eosio {
                      connection_wptr weak = c;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                      app().post( priority::medium, [this, weak]() {
 =======
@@ -2813,6 +2822,9 @@ namespace eosio {
 =======
                      app().post( priority::medium, "re post blk", [this, weak]() {
 >>>>>>> Test of multi-threaded reading
+=======
+                     app().post( priority::medium, [this, weak]() {
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
                         connection_ptr c = weak.lock();
                         if( c ) handle_message( c, signed_block_ptr() );
                      } );
@@ -2826,6 +2838,7 @@ namespace eosio {
                   connection_wptr weak = c;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                   app().post( priority::medium, [this, weak]() {
 =======
@@ -2837,6 +2850,9 @@ namespace eosio {
 =======
                   app().post( priority::medium, "re post blk", [this, weak]() {
 >>>>>>> Test of multi-threaded reading
+=======
+                  app().post( priority::medium, [this, weak]() {
+>>>>>>> Remove descriptions of tasks as not merged into develop yet
                      connection_ptr c = weak.lock();
                      if( c ) handle_message( c, signed_block_ptr() );
                   } );

From c1b652dec0353d30e001998a7e50df113dfb8d8c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Feb 2019 11:45:04 -0600
Subject: [PATCH 0109/1648] Use appbase with FIFO priority queue. priority
 queue in net_plugin no longer needed.

---
 plugins/net_plugin/net_plugin.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index feabdadd631..16c0a83eef5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -77,12 +77,6 @@ namespace eosio {
       }
    };
 
-   struct block_greater {
-      bool operator()( const std::shared_ptr<signed_block>& lhs, const std::shared_ptr<signed_block>& rhs ) const {
-         return lhs->block_num() > rhs->block_num();
-      }
-   };
-
    typedef multi_index_container<
       node_transaction_state,
       indexed_by<
@@ -766,8 +760,6 @@ namespace eosio {
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
       void recv_notice(const connection_ptr& c, const notice_message& msg);
-
-      std::priority_queue<std::shared_ptr<signed_block>, std::deque<std::shared_ptr<signed_block>>, block_greater> incoming_blocks;
    };
 
    class dispatch_manager {
@@ -2767,6 +2759,7 @@ namespace eosio {
             return;
          }
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> Test of multi-threaded reading
 =======
 >>>>>>> Test of multi-threaded reading
@@ -2870,6 +2863,8 @@ namespace eosio {
 >>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
 =======
 >>>>>>> Test of multi-threaded reading
+=======
+>>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );

From 76768c8c2ef06d2060bc7c81e886fa8ad14f2cb0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Mar 2019 18:26:06 -0600
Subject: [PATCH 0110/1648] Make delay_timer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 16c0a83eef5..d7d17b585c7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2126,7 +2126,7 @@ namespace eosio {
                return minimum_read - bytes_transferred;
             }
          };
-/*
+
          if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
              conn->reads_in_flight > def_max_reads_in_flight   ||
              conn->trx_in_progress_size > def_max_trx_in_progress_size )
@@ -2183,7 +2183,7 @@ namespace eosio {
             } ) );
             return;
          }
-*/
+
          ++conn->reads_in_flight;
          boost::asio::async_read(*conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2271,9 +2271,12 @@ namespace eosio {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                   connection_wptr weak_conn = conn;
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
+=======
+>>>>>>> Make delay_timer thread safe
                   app().post( priority::medium, [this, weak_conn]() {
 =======
                   connection_wptr weak_conn = conn;

From 223c2d5855d530e57dd8047afe74dd32a6f0cdfd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Sat, 2 Mar 2019 11:22:30 -0600
Subject: [PATCH 0111/1648] Remove unneeded access to atomic

---
 plugins/net_plugin/net_plugin.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d7d17b585c7..0cb134be77c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2104,6 +2104,7 @@ namespace eosio {
          }
          connection_wptr weak_conn = conn;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
          std::size_t minimum_read =
                std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
@@ -2111,6 +2112,11 @@ namespace eosio {
 =======
          std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
 >>>>>>> Test of multi-threaded reading
+=======
+         std::size_t minimum_read =
+               std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
+         minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
+>>>>>>> Remove unneeded access to atomic
 
          if (use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2196,9 +2202,12 @@ namespace eosio {
 
                --conn->reads_in_flight;
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                conn->outstanding_read_bytes = 0;
 >>>>>>> Test of multi-threaded reading
+=======
+>>>>>>> Remove unneeded access to atomic
                bool close_connection = false;
 
                try {

From e03e1fb10fdaf2d9146b2991fb20fad4edd9f03b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:16:54 -0500
Subject: [PATCH 0112/1648] Add trx id to log message

---
 plugins/net_plugin/net_plugin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0cb134be77c..915f7774a26 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2711,7 +2711,12 @@ namespace eosio {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
                fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
+<<<<<<< HEAD
                accepted = true;
+=======
+               this->dispatcher->bcast_transaction(ptrx);
+               return;
+>>>>>>> Add trx id to log message
             }
 
             if( !accepted ) {

From a5567cded12caba5b3b134e93e365d705c703e37 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 14:58:27 -0500
Subject: [PATCH 0113/1648] Remove unneeded ack of transactions. Already
 processed by handle_message of packed_transaction_ptr

---
 plugins/net_plugin/net_plugin.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 915f7774a26..23ddfe2fc36 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -159,8 +159,6 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
-      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
-
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
@@ -190,7 +188,6 @@ namespace eosio {
       void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
 
       void accepted_block(const block_state_ptr&);
-      void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
 
       bool is_valid( const handshake_message &msg);
 
@@ -3078,17 +3075,6 @@ namespace eosio {
       dispatcher->bcast_block(block);
    }
 
-   void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
-      const auto& id = results.second->id;
-      if (results.first) {
-         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
-         dispatcher->rejected_transaction(id);
-      } else {
-         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
-         dispatcher->bcast_transaction(results.second);
-      }
-   }
-
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {
       if(allowed_connections == None)
          return false;
@@ -3404,8 +3390,6 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
-      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
-
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;

From 4a5aa34ab92aceede64153c1602cdafbbf60d8a8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 15:51:47 -0500
Subject: [PATCH 0114/1648] Revert "Remove unneeded ack of transactions.
 Already processed by handle_message of packed_transaction_ptr"

This reverts commit 7f340f7347da146b360251214fbf655d11a955cd.
---
 plugins/net_plugin/net_plugin.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 23ddfe2fc36..915f7774a26 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -159,6 +159,8 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
+      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
       std::shared_ptr<boost::asio::io_context>  server_ioc;
@@ -188,6 +190,7 @@ namespace eosio {
       void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
 
       void accepted_block(const block_state_ptr&);
+      void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
 
       bool is_valid( const handshake_message &msg);
 
@@ -3075,6 +3078,17 @@ namespace eosio {
       dispatcher->bcast_block(block);
    }
 
+   void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
+      const auto& id = results.second->id;
+      if (results.first) {
+         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
+         dispatcher->rejected_transaction(id);
+      } else {
+         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
+         dispatcher->bcast_transaction(results.second);
+      }
+   }
+
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {
       if(allowed_connections == None)
          return false;
@@ -3390,6 +3404,8 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
+      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
+
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
          my->max_nodes_per_host = 0;

From 8ce8f45e79acff196ad1d2fa2b9e65bbdf7b4093 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 5 Mar 2019 20:25:24 -0500
Subject: [PATCH 0115/1648] force a build

---
 plugins/net_plugin/net_plugin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 915f7774a26..692cbeb76f4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3011,7 +3011,12 @@ namespace eosio {
          auto &stale_blk = c->blk_state.get<by_block_num>();
          stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
+<<<<<<< HEAD
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
+=======
+      fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
+               ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
+>>>>>>> force a build
    }
 
    void net_plugin_impl::expire_local_txns() {

From 47c1ce83a1cd5f41a9378350846de22c4d30593e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 6 Mar 2019 13:55:44 -0500
Subject: [PATCH 0116/1648] Move more of incoming transaction processing to
 thread pool

---
 plugins/net_plugin/net_plugin.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 692cbeb76f4..a476fabb53e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -696,6 +696,7 @@ namespace eosio {
       }
       void operator()( packed_transaction&& msg ) const {
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
+<<<<<<< HEAD
 <<<<<<< HEAD
          impl.handle_message( c, ptr );
 =======
@@ -705,6 +706,9 @@ namespace eosio {
             if( c) impl->handle_message( c, ptr );
          });
 >>>>>>> Test of multi-threaded reading
+=======
+         impl.handle_message( c, ptr );
+>>>>>>> Move more of incoming transaction processing to thread pool
       }
 
       template <typename T>
@@ -2711,12 +2715,16 @@ namespace eosio {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
                fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
+<<<<<<< HEAD
 <<<<<<< HEAD
                accepted = true;
 =======
                this->dispatcher->bcast_transaction(ptrx);
                return;
 >>>>>>> Add trx id to log message
+=======
+               accepted = true;
+>>>>>>> Move more of incoming transaction processing to thread pool
             }
 
             if( !accepted ) {
@@ -3011,12 +3019,16 @@ namespace eosio {
          auto &stale_blk = c->blk_state.get<by_block_num>();
          stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
+<<<<<<< HEAD
 <<<<<<< HEAD
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
 =======
       fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
                ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
 >>>>>>> force a build
+=======
+      fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
+>>>>>>> Move more of incoming transaction processing to thread pool
    }
 
    void net_plugin_impl::expire_local_txns() {

From ab91589cd32e1a0eea40203fb3647ef14214c05d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 7 Mar 2019 09:10:13 -0500
Subject: [PATCH 0117/1648] Use unique_lock instead of lock_guard to clean up
 code

---
 plugins/net_plugin/net_plugin.cpp | 119 +++++++++++++++---------------
 1 file changed, 59 insertions(+), 60 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a476fabb53e..f4e80ae6231 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -538,7 +538,7 @@ namespace eosio {
       uint16_t                protocol_version  = 0;
       string                  peer_addr;
       unique_ptr<boost::asio::steady_timer> response_expected;
-      std::mutex                            read_delay_timer_mutex;
+      std::mutex                            read_delay_timer_mtx;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
@@ -889,6 +889,7 @@ namespace eosio {
       cancel_wait();
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Make delay_timer thread safe
       {
@@ -901,21 +902,25 @@ namespace eosio {
 >>>>>>> Test of multi-threaded reading
 =======
 >>>>>>> Make delay_timer thread safe
+=======
+
+      std::lock_guard<std::mutex> g( read_delay_timer_mtx );
+      if( read_delay_timer ) read_delay_timer->cancel();
+>>>>>>> Use unique_lock instead of lock_guard to clean up code
    }
 
    void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
       const std::set<transaction_id_type, sha256_less> known_ids(ids.cbegin(), ids.cend());
       my_impl->expire_local_txns();
       vector<std::shared_ptr<vector<char>>> trx_to_send;
-      {
-         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-         for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
-            const bool found = known_ids.find( tx->id ) != known_ids.cend();
-            if( !found ) {
-               trx_to_send.emplace_back( tx->serialized_txn );
-            }
+      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
+      for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
+         const bool found = known_ids.find( tx->id ) != known_ids.cend();
+         if( !found ) {
+            trx_to_send.emplace_back( tx->serialized_txn );
          }
       }
+      g.unlock();
       for( const auto& t : trx_to_send ) {
          queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
       }
@@ -923,15 +928,14 @@ namespace eosio {
 
    void connection::txn_send(const vector<transaction_id_type>& ids) {
       vector<std::shared_ptr<vector<char>>> trx_to_send;
-      {
-         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-         for( const auto& t : ids ) {
-            auto tx = my_impl->local_txns.get<by_id>().find( t );
-            if( tx != my_impl->local_txns.end()) {
-               trx_to_send.emplace_back( tx->serialized_txn );
-            }
+      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
+      for( const auto& t : ids ) {
+         auto tx = my_impl->local_txns.get<by_id>().find( t );
+         if( tx != my_impl->local_txns.end()) {
+            trx_to_send.emplace_back( tx->serialized_txn );
          }
       }
+      g.unlock();
       for( const auto& t : trx_to_send ) {
          queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
       }
@@ -1546,10 +1550,9 @@ namespace eosio {
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
-         {
-            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-            note.known_trx.pending = my_impl->local_txns.size();
-         }
+         std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
+         note.known_trx.pending = my_impl->local_txns.size();
+         g.unlock();
          c->enqueue( note );
          return;
       }
@@ -1781,13 +1784,12 @@ namespace eosio {
       }
       received_transactions.erase(range.first, range.second);
 
-      {
-         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-         if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
-            fc_dlog( logger, "found trxid in local_trxs" );
-            return;
-         }
+      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
+      if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
+         fc_dlog( logger, "found trxid in local_trxs" );
+         return;
       }
+      g.unlock();
 
       time_point_sec trx_expiration = ptrx->packed_trx->expiration();
       const packed_transaction& trx = *ptrx->packed_trx;
@@ -1795,10 +1797,9 @@ namespace eosio {
       auto buff = create_send_buffer( trx );
 
       node_transaction_state nts = {id, trx_expiration, 0, buff};
-      {
-         std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-         my_impl->local_txns.insert( std::move( nts ));
-      }
+      g.lock();
+      my_impl->local_txns.insert( std::move( nts ));
+      g.unlock();
 
       my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
          if( skips.find(c) != skips.end() || c->syncing ) {
@@ -2182,7 +2183,7 @@ namespace eosio {
                });
                return;
             }
-            std::lock_guard<std::mutex> g( conn->read_delay_timer_mutex );
+            std::lock_guard<std::mutex> g( conn->read_delay_timer_mtx );
             if( !conn->read_delay_timer ) return;
             conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
             conn->read_delay_timer->async_wait(
@@ -2693,13 +2694,12 @@ namespace eosio {
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
 
-      {
-         std::lock_guard<std::mutex> g( local_txns_mtx );
-         if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
-            fc_dlog( logger, "got a duplicate transaction - dropping" );
-            return;
-         }
+      std::unique_lock<std::mutex> g( local_txns_mtx );
+      if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
+         fc_dlog( logger, "got a duplicate transaction - dropping" );
+         return;
       }
+      g.unlock();
       connection_wptr weak_ptr = c;
       app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, tid](){
          auto c = weak_ptr.lock();
@@ -2925,21 +2925,20 @@ namespace eosio {
 
       update_block_num ubn(blk_num);
       if( reason == no_reason ) {
-         {
-            std::lock_guard<std::mutex> g( local_txns_mtx );
-            for( const auto& recpt : msg->transactions ) {
-               auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
-                                                  : recpt.trx.get<packed_transaction>().id();
-               auto ltx = local_txns.get<by_id>().find( id );
-               if( ltx != local_txns.end()) {
-                  local_txns.modify( ltx, ubn );
-               }
-               auto ctx = c->trx_state.get<by_id>().find( id );
-               if( ctx != c->trx_state.end()) {
-                  c->trx_state.modify( ctx, ubn );
-               }
+         std::unique_lock<std::mutex> g( local_txns_mtx );
+         for( const auto& recpt : msg->transactions ) {
+            auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
+                                               : recpt.trx.get<packed_transaction>().id();
+            auto ltx = local_txns.get<by_id>().find( id );
+            if( ltx != local_txns.end()) {
+               local_txns.modify( ltx, ubn );
+            }
+            auto ctx = c->trx_state.get<by_id>().find( id );
+            if( ctx != c->trx_state.end()) {
+               c->trx_state.modify( ctx, ubn );
             }
          }
+         g.unlock();
          sync_master->recv_block(c, blk_id, blk_num);
       }
       else {
@@ -3036,19 +3035,19 @@ namespace eosio {
       uint32_t lib = cc.last_irreversible_block_num();
       size_t start_size = 0, end_size = 0;
 
-      {
-         std::lock_guard<std::mutex> g( local_txns_mtx );
+      std::unique_lock<std::mutex> g( local_txns_mtx );
 
-         start_size = local_txns.size();
-         auto& old = local_txns.get<by_expiry>();
-         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
-         auto ex_up = old.upper_bound( time_point::now());
-         old.erase( ex_lo, ex_up );
+      start_size = local_txns.size();
+      auto& old = local_txns.get<by_expiry>();
+      auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
+      auto ex_up = old.upper_bound( time_point::now());
+      old.erase( ex_lo, ex_up );
 
-         auto& stale = local_txns.get<by_block_num>();
-         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
-         end_size = local_txns.size();
-      }
+      auto& stale = local_txns.get<by_block_num>();
+      stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
+      end_size = local_txns.size();
+
+      g.unlock();
 
       fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)("r", start_size - end_size) );
    }

From 679852fd1225dd52245eaa4863e4aa70d5cf85bd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 8 Mar 2019 09:34:05 -0500
Subject: [PATCH 0118/1648] Move creation of future outside post to prevent
 wait on future right after creation

---
 plugins/producer_plugin/producer_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 217f931a532..569fce37dd8 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -352,10 +352,10 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          chain::controller& chain = chain_plug->chain();
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
+         // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+         transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
          auto& tp = *_thread_pool;
-         boost::asio::post( tp, [self = this, &chain, max_trx_cpu_usage, trx, persist_until_expired, next]() {
-            // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
-            transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
+         boost::asio::post( tp, [self = this, trx, persist_until_expired, next]() {
             if( trx->signing_keys_future.valid() )
                trx->signing_keys_future.wait();
             app().post(priority::low, [self, trx, persist_until_expired, next]() {

From 050e84aad9e1b5a59a3a8260993deef7ca97b4c7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 11 Mar 2019 11:36:25 -0500
Subject: [PATCH 0119/1648] Test run with producer thread pool instead of chain
 controller thread pool

---
 plugins/producer_plugin/producer_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 569fce37dd8..50f6c531d0d 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -352,9 +352,9 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          chain::controller& chain = chain_plug->chain();
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
-         // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
-         transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage );
          auto& tp = *_thread_pool;
+         // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+         transaction_metadata::create_signing_keys_future( trx, tp, chain.get_chain_id(), max_trx_cpu_usage );
          boost::asio::post( tp, [self = this, trx, persist_until_expired, next]() {
             if( trx->signing_keys_future.valid() )
                trx->signing_keys_future.wait();

From 48024faccfea29e0d2bc7d2babbbd99ded8e1ac6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 11 Mar 2019 15:57:18 -0500
Subject: [PATCH 0120/1648] Combine received_blocks and blck_state. Make
 blck_state thread safe and use it for short-cut out when receiving block.

---
 plugins/net_plugin/net_plugin.cpp | 135 ++++++++++++++++--------------
 1 file changed, 70 insertions(+), 65 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f4e80ae6231..98606c73929 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -110,6 +110,7 @@ namespace eosio {
       uint32_t                         max_client_count = 0;
       uint32_t                         max_nodes_per_host = 1;
       uint32_t                         num_clients = 0;
+      uint32_t                         current_connection_id = 0;
 
       vector<string>                   supplied_peers;
       vector<chain::public_key_type>   allowed_peers; ///< peer keys allowed to connect
@@ -363,20 +364,24 @@ namespace eosio {
 
       > transaction_state_index;
 
-   /**
-    *
-    */
    struct peer_block_state {
       block_id_type id;
       uint32_t      block_num;
+      uint32_t      connection_id;
    };
 
    typedef multi_index_container<
       eosio::peer_block_state,
       indexed_by<
-         ordered_unique< tag<by_id>, member<eosio::peer_block_state, block_id_type, &eosio::peer_block_state::id >, sha256_less >,
-         ordered_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
-         >
+         ordered_unique< tag<by_id>,
+               composite_key< peer_block_state,
+                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
+                     member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>
+               >,
+               composite_key_compare< sha256_less, std::less<uint32_t> >
+         >,
+         ordered_non_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
+      >
       > peer_block_state_index;
 
 
@@ -498,7 +503,6 @@ namespace eosio {
       ~connection();
       void initialize();
 
-      peer_block_state_index  blk_state;
       transaction_state_index trx_state;
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
@@ -530,6 +534,7 @@ namespace eosio {
       std::atomic<uint32_t>   trx_in_progress_size{0};
 >>>>>>> Make delay_timer thread safe
       fc::sha256              node_id;
+      const uint32_t          connection_id;
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
       int16_t                 sent_handshake_count = 0;
@@ -631,9 +636,6 @@ namespace eosio {
                        bool to_sync_queue = false);
       void do_queue_write(int priority);
 
-      bool add_peer_block(const peer_block_state& pbs);
-      bool peer_has_block(const block_id_type& blkid);
-
       fc::optional<fc::variant_object> _logger_variant;
       const fc::variant_object& get_logger_variant()  {
          if (!_logger_variant) {
@@ -767,10 +769,11 @@ namespace eosio {
    };
 
    class dispatch_manager {
-   public:
-      std::multimap<block_id_type, connection_ptr, sha256_less> received_blocks;
+      std::mutex              blk_state_mtx;
+      peer_block_state_index  blk_state;
       std::multimap<transaction_id_type, connection_ptr, sha256_less> received_transactions;
 
+   public:
       void bcast_transaction(const transaction_metadata_ptr& trx);
       void rejected_transaction(const transaction_id_type& msg);
       void bcast_block(const block_state_ptr& bs);
@@ -782,18 +785,22 @@ namespace eosio {
       void recv_notice(const connection_ptr& conn, const notice_message& msg, bool generated);
 
       void retry_fetch(const connection_ptr& conn);
+
+      bool add_peer_block(const peer_block_state& pbs);
+      bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
+      bool have_block(const block_id_type& blkid);
    };
 
    //---------------------------------------------------------------------------
 
    connection::connection( string endpoint )
-      : blk_state(),
-        trx_state(),
+      : trx_state(),
         peer_requested(),
         server_ioc( my_impl->server_ioc ),
         strand( app().get_io_service() ),
         socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
         node_id(),
+        connection_id( ++my_impl->current_connection_id ),
         last_handshake_recv(),
         last_handshake_sent(),
         sent_handshake_count(0),
@@ -813,13 +820,13 @@ namespace eosio {
    }
 
    connection::connection( socket_ptr s )
-      : blk_state(),
-        trx_state(),
+      : trx_state(),
         peer_requested(),
         server_ioc( my_impl->server_ioc ),
         strand( app().get_io_service() ),
         socket( s ),
         node_id(),
+        connection_id( ++my_impl->current_connection_id ),
         last_handshake_recv(),
         last_handshake_sent(),
         sent_handshake_count(0),
@@ -859,7 +866,6 @@ namespace eosio {
 
    void connection::reset() {
       peer_requested.reset();
-      blk_state.clear();
       trx_state.clear();
    }
 
@@ -997,7 +1003,7 @@ namespace eosio {
          signed_block_ptr b = cc.fetch_block_by_id(blkid);
          if(b) {
             fc_dlog(logger,"found block for id at num ${n}",("n",b->block_num()));
-            add_peer_block({blkid, block_header::num_from_id(blkid)});
+            my_impl->dispatcher->add_peer_block({blkid, block_header::num_from_id(blkid), connection_id});
             enqueue_block( b );
          } else {
             fc_ilog( logger, "fetch block by id returned null, id ${id} for ${p}",
@@ -1319,20 +1325,6 @@ namespace eosio {
       sync_wait();
    }
 
-   bool connection::add_peer_block(const peer_block_state& entry) {
-      auto bptr = blk_state.get<by_id>().find(entry.id);
-      bool added = (bptr == blk_state.end());
-      if (added){
-         blk_state.insert(entry);
-      }
-      return added;
-   }
-
-   bool connection::peer_has_block( const block_id_type& blkid ) {
-      auto blk_itr = blk_state.get<by_id>().find(blkid);
-      return blk_itr != blk_state.end();
-   }
-
    //-----------------------------------------------------------
 
     sync_manager::sync_manager( uint32_t req_span )
@@ -1710,26 +1702,48 @@ namespace eosio {
 
    //------------------------------------------------------------------------
 
-   void dispatch_manager::bcast_block(const block_state_ptr& bs) {
-      std::set<connection_ptr> skips;
-      auto range = received_blocks.equal_range(bs->id);
-      for (auto org = range.first; org != range.second; ++org) {
-         skips.insert(org->second);
+   bool dispatch_manager::add_peer_block(const peer_block_state& entry) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(entry.id), entry.connection_id));
+      bool added = (bptr == blk_state.end());
+      if (added){
+         blk_state.insert(entry);
       }
-      received_blocks.erase(range.first, range.second);
+      return added;
+   }
 
+   bool dispatch_manager::peer_has_block( const block_id_type& blkid, uint32_t connection_id ) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      auto blk_itr = blk_state.get<by_id>().find(std::make_tuple(std::ref(blkid), connection_id));
+      return blk_itr != blk_state.end();
+   }
+
+   bool dispatch_manager::have_block( const block_id_type& blkid ) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      auto blk_itr = blk_state.get<by_id>().find( blkid );
+      return blk_itr != blk_state.end();
+   }
+
+   void dispatch_manager::expire_blocks( uint32_t lib_num ) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      auto& stale_blk = blk_state.get<by_block_num>();
+      stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib_num) );
+   }
+
+   void dispatch_manager::bcast_block(const block_state_ptr& bs) {
       uint32_t bnum = bs->block_num;
       peer_block_state pbstate{bs->id, bnum};
       fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
 
       std::shared_ptr<std::vector<char>> send_buffer;
       for( auto& cp : my_impl->connections ) {
-         if( skips.find( cp ) != skips.end() || !cp->current() ) {
+         if( !cp->current() ) {
             continue;
          }
          bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
          if( !has_block ) {
-            if( !cp->add_peer_block( pbstate ) ) {
+            pbstate.connection_id = cp->connection_id;
+            if( !add_peer_block( pbstate ) ) {
                continue;
             }
             if( !send_buffer ) {
@@ -1743,7 +1757,8 @@ namespace eosio {
    }
 
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
-      received_blocks.insert(std::make_pair(id, c));
+      peer_block_state pbstate{id, bnum, c->connection_id};
+      add_peer_block( pbstate );
       if (c &&
           c->last_req &&
           c->last_req->req_blocks.mode != none &&
@@ -1758,20 +1773,6 @@ namespace eosio {
 
    void dispatch_manager::rejected_block(const block_id_type& id) {
       fc_dlog( logger, "rejected block ${id}", ("id", id) );
-      auto range = received_blocks.equal_range(id);
-      received_blocks.erase(range.first, range.second);
-   }
-
-   void dispatch_manager::expire_blocks( uint32_t lib_num ) {
-      for( auto i = received_blocks.begin(); i != received_blocks.end(); ) {
-         const block_id_type& blk_id = i->first;
-         uint32_t blk_num = block_header::num_from_id( blk_id );
-         if( blk_num <= lib_num ) {
-            i = received_blocks.erase( i );
-         } else {
-            ++i;
-         }
-      }
    }
 
    void dispatch_manager::bcast_transaction(const transaction_metadata_ptr& ptrx) {
@@ -1860,7 +1861,7 @@ namespace eosio {
             try {
                b = cc.fetch_block_by_id(blkid); // if exists
                if(b) {
-                  c->add_peer_block({blkid, block_header::num_from_id(blkid)});
+                  add_peer_block({blkid, block_header::num_from_id(blkid), c->connection_id});
                }
             } catch (const assert_exception &ex) {
                fc_ilog( logger, "caught assert on fetch_block_by_id, ${ex}",("ex",ex.what()) );
@@ -1916,7 +1917,7 @@ namespace eosio {
             sendit = trx != conn->trx_state.end();
          }
          else {
-            sendit = conn->peer_has_block(bid);
+            sendit = peer_has_block(bid, c->connection_id);
          }
          if (sendit) {
             conn->enqueue(*c->last_req);
@@ -2324,7 +2325,6 @@ namespace eosio {
    bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) {
       try {
          // if next message is a block we already have, exit early
-/*
          auto peek_ds = conn->pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
@@ -2332,16 +2332,23 @@ namespace eosio {
             block_header bh;
             fc::raw::unpack( peek_ds, bh );
 
-            controller& cc = chain_plug->chain();
             block_id_type blk_id = bh.id();
-            uint32_t blk_num = bh.block_num();
-            if( cc.fetch_block_by_id( blk_id ) ) {
-               sync_master->recv_block( conn, blk_id, blk_num );
+            if( dispatcher->have_block( blk_id ) ) {
+               connection_wptr weak = conn;
+               app().post(priority::low,
+                     [dispatcher = dispatcher.get(), sync_master = sync_master.get(), weak{std::move(weak)}, blk_id] {
+                  connection_ptr c = weak.lock();
+                  if(c) {
+                     auto blk_num = block_header::num_from_id(blk_id);
+                     dispatcher->recv_block(c, blk_id, blk_num);
+                     sync_master->recv_block( c, blk_id, blk_num );
+                  }
+               });
                conn->pending_message_buffer.advance_read_ptr( message_length );
                return true;
             }
          }
-*/
+
          auto ds = conn->pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
@@ -3015,8 +3022,6 @@ namespace eosio {
          stale_txn.erase( stale_txn.lower_bound(1), stale_txn.upper_bound(lib) );
          auto &stale_txn_e = c->trx_state.get<by_expiry>();
          stale_txn_e.erase(stale_txn_e.lower_bound(time_point_sec()), stale_txn_e.upper_bound(time_point::now()));
-         auto &stale_blk = c->blk_state.get<by_block_num>();
-         stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib) );
       }
 <<<<<<< HEAD
 <<<<<<< HEAD

From cf6e9ca9685b1ec60c296af5fb87f141d1f27267 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 13 Mar 2019 13:27:28 -0500
Subject: [PATCH 0121/1648] Avoid tying up a thread to wait on transaction
 future. Also removes likely safe but undefined behavior.

---
 .../eosio/chain/transaction_metadata.hpp      |  7 ++++++-
 libraries/chain/transaction_metadata.cpp      | 19 ++++++++++---------
 plugins/producer_plugin/producer_plugin.cpp   | 12 +++++-------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 6136580fa44..947b557a1d4 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -52,8 +52,13 @@ class transaction_metadata {
 
       const flat_set<public_key_type>& recover_keys( const chain_id_type& chain_id );
 
+      // must be called from main application thread. signing_keys_future must be accessed only from main application thread.
+      // next() should only be called on main application thread after future is valid, to avoid dependency on appbase,
+      // it is up to the caller to have next() post to the application thread which makes sure future is only accessed from
+      // application thread and that assignment to future in this method has completed.
       static void create_signing_keys_future( const transaction_metadata_ptr& mtrx, boost::asio::thread_pool& thread_pool,
-                                              const chain_id_type& chain_id, fc::microseconds time_limit );
+                                              const chain_id_type& chain_id, fc::microseconds time_limit,
+                                              std::function<void()> next = std::function<void()>() );
 
 };
 
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index 482b3c488f7..e9994167aa0 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -24,21 +24,22 @@ const flat_set<public_key_type>& transaction_metadata::recover_keys( const chain
 }
 
 void transaction_metadata::create_signing_keys_future( const transaction_metadata_ptr& mtrx,
-      boost::asio::thread_pool& thread_pool, const chain_id_type& chain_id, fc::microseconds time_limit ) {
-   if( mtrx->signing_keys_future.valid() || mtrx->signing_keys.valid() ) // already created
+      boost::asio::thread_pool& thread_pool, const chain_id_type& chain_id, fc::microseconds time_limit,
+      std::function<void()> next )
+{
+   if( mtrx->signing_keys_future.valid() || mtrx->signing_keys.valid() ) {// already created
+      if( next ) next();
       return;
+   }
 
-   std::weak_ptr<transaction_metadata> mtrx_wp = mtrx;
-   mtrx->signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_wp]() {
+   mtrx->signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx, next{std::move(next)}]() {
       fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
             fc::time_point::maximum() : fc::time_point::now() + time_limit;
-      auto mtrx = mtrx_wp.lock();
       fc::microseconds cpu_usage;
       flat_set<public_key_type> recovered_pub_keys;
-      if( mtrx ) {
-         const signed_transaction& trn = mtrx->packed_trx->get_signed_transaction();
-         cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
-      }
+      const signed_transaction& trn = mtrx->packed_trx->get_signed_transaction();
+      cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
+      if( next ) next();
       return std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ));
    } );
 }
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 50f6c531d0d..68113333f66 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -354,13 +354,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
          auto& tp = *_thread_pool;
          // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
-         transaction_metadata::create_signing_keys_future( trx, tp, chain.get_chain_id(), max_trx_cpu_usage );
-         boost::asio::post( tp, [self = this, trx, persist_until_expired, next]() {
-            if( trx->signing_keys_future.valid() )
-               trx->signing_keys_future.wait();
-            app().post(priority::low, [self, trx, persist_until_expired, next]() {
-               self->process_incoming_transaction_async( trx, persist_until_expired, next );
-            });
+         transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage,
+               [self = this, trx, persist_until_expired, next{std::move(next)}]() mutable {
+                  app().post(priority::low, [self, trx{std::move(trx)}, persist_until_expired, next{std::move(next)}]() {
+                     self->process_incoming_transaction_async( trx, persist_until_expired, next );
+                  });
          });
       }
 

From f5596ebaabda61c0841c38876a1a555cfc04e834 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 13 Mar 2019 13:38:50 -0500
Subject: [PATCH 0122/1648] Update comment

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 68113333f66..dbc42ed9282 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -353,7 +353,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
          auto& tp = *_thread_pool;
-         // use chain thread pool for sig recovery so that future wait below is not in the same thread pool preventing progress
+         // use chain thread pool for sig recovery
          transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage,
                [self = this, trx, persist_until_expired, next{std::move(next)}]() mutable {
                   app().post(priority::low, [self, trx{std::move(trx)}, persist_until_expired, next{std::move(next)}]() {

From 0aeabc6edf6d85fb7402c97501eb08c7812b6c89 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 14 Mar 2019 09:22:04 -0500
Subject: [PATCH 0123/1648] Assign future on main application thread

---
 plugins/producer_plugin/producer_plugin.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index dbc42ed9282..6f81308aa83 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -352,13 +352,18 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          chain::controller& chain = chain_plug->chain();
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
-         auto& tp = *_thread_pool;
-         // use chain thread pool for sig recovery
-         transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(), max_trx_cpu_usage,
+
+         auto after_sig_recovery =
                [self = this, trx, persist_until_expired, next{std::move(next)}]() mutable {
                   app().post(priority::low, [self, trx{std::move(trx)}, persist_until_expired, next{std::move(next)}]() {
                      self->process_incoming_transaction_async( trx, persist_until_expired, next );
                   });
+               };
+
+         app().post(priority::low, [trx, &chain, max_trx_cpu_usage, after_sig_recovery{std::move(after_sig_recovery)}]() mutable {
+            // use chain thread pool for sig recovery
+            transaction_metadata::create_signing_keys_future( trx, chain.get_thread_pool(), chain.get_chain_id(),
+                                                              max_trx_cpu_usage, std::move( after_sig_recovery ) );
          });
       }
 

From 3c2fe4b10de784ecec2d15cba12d28582f7b0413 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 14 Mar 2019 12:37:34 -0500
Subject: [PATCH 0124/1648] Acquire lib via lib channel. Make
 expire_local_txns() thread safe.

---
 plugins/net_plugin/net_plugin.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 98606c73929..b2a0e9119c5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -28,7 +28,7 @@
 
 #include <atomic>
 
-using namespace eosio::chain::plugin_interface::compat;
+using namespace eosio::chain::plugin_interface;
 
 namespace fc {
    extern std::unordered_map<std::string,logger>& get_logger_map();
@@ -146,6 +146,7 @@ namespace eosio {
       bool                          network_version_match = false;
       chain_id_type                 chain_id;
       fc::sha256                    node_id;
+      std::atomic<uint32_t>         lib_num{0};
       eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
       string                        user_agent_name;
@@ -160,7 +161,8 @@ namespace eosio {
 
       bool                          use_socket_read_watermark = false;
 
-      channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+      compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+      channels::irreversible_block::channel_type::handle       incoming_irreversible_block_subscription;
 
       uint16_t                                  thread_pool_size = 4;
       optional<boost::asio::thread_pool>        thread_pool;
@@ -192,6 +194,9 @@ namespace eosio {
 
       void accepted_block(const block_state_ptr&);
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
+      void on_irreversible_block( const block_state_ptr& blk ) {
+         lib_num = blk->block_num;
+      }
 
       bool is_valid( const handshake_message &msg);
 
@@ -3014,10 +3019,9 @@ namespace eosio {
       auto now = time_point::now();
       expire_local_txns();
 
-      controller& cc = chain_plug->chain();
-      uint32_t lib = cc.last_irreversible_block_num();
+      uint32_t lib = lib_num.load();
       dispatcher->expire_blocks( lib );
-      for ( auto &c : connections ) {
+      for ( auto& c : connections ) {
          auto &stale_txn = c->trx_state.get<by_block_num>();
          stale_txn.erase( stale_txn.lower_bound(1), stale_txn.upper_bound(lib) );
          auto &stale_txn_e = c->trx_state.get<by_expiry>();
@@ -3035,9 +3039,9 @@ namespace eosio {
 >>>>>>> Move more of incoming transaction processing to thread pool
    }
 
+   // thread safe
    void net_plugin_impl::expire_local_txns() {
-      controller& cc = chain_plug->chain();
-      uint32_t lib = cc.last_irreversible_block_num();
+      uint32_t lib = lib_num.load();
       size_t start_size = 0, end_size = 0;
 
       std::unique_lock<std::mutex> g( local_txns_mtx );
@@ -3425,7 +3429,12 @@ namespace eosio {
          cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
       }
 
-      my->incoming_transaction_ack_subscription = app().get_channel<channels::transaction_ack>().subscribe(boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
+      my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
+            boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
+      my->incoming_irreversible_block_subscription = app().get_channel<channels::irreversible_block>().subscribe(
+            [this]( block_state_ptr s ) {
+               my->on_irreversible_block( s );
+            });
 
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {

From e754a794d1a4afce8d3ab438c350a4a88022ed7a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 12 Mar 2019 14:18:21 -0500
Subject: [PATCH 0125/1648] Remove unneeded request for arbitrary list of
 transactions

---
 plugins/net_plugin/net_plugin.cpp | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b2a0e9119c5..9dcbe8e756e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -612,7 +612,6 @@ namespace eosio {
       const string peer_name();
 
       void txn_send_pending(const vector<transaction_id_type>& ids);
-      void txn_send(const vector<transaction_id_type>& txn_lis);
 
       void blk_send_branch();
       void blk_send(const block_id_type& blkid);
@@ -937,21 +936,6 @@ namespace eosio {
       }
    }
 
-   void connection::txn_send(const vector<transaction_id_type>& ids) {
-      vector<std::shared_ptr<vector<char>>> trx_to_send;
-      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
-      for( const auto& t : ids ) {
-         auto tx = my_impl->local_txns.get<by_id>().find( t );
-         if( tx != my_impl->local_txns.end()) {
-            trx_to_send.emplace_back( tx->serialized_txn );
-         }
-      }
-      g.unlock();
-      for( const auto& t : trx_to_send ) {
-         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
-      }
-   }
-
    void connection::blk_send_branch() {
       controller& cc = my_impl->chain_plug->chain();
       uint32_t head_num = cc.fork_db_head_block_num();
@@ -2600,6 +2584,7 @@ namespace eosio {
             std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
             size_t known_sum = local_txns.size();
             if( known_sum ) {
+               expire_local_txns();
                for( const auto& t : local_txns.get<by_id>() ) {
                   req.req_trx.ids.push_back( t.id );
                }
@@ -2665,12 +2650,16 @@ namespace eosio {
       case catch_up :
          c->txn_send_pending(msg.req_trx.ids);
          break;
-      case normal :
-         c->txn_send(msg.req_trx.ids);
-         break;
       case none :
          if(msg.req_blocks.mode == none)
             c->stop_send();
+         // no break
+      case normal :
+         if( !msg.req_trx.ids.empty() ) {
+            elog( "Invalid request_message, req_trx.ids.size ${s}", ("s", msg.req_trx.ids.size()) );
+            close(c);
+            return;
+         }
          break;
       default:;
       }

From 10d96f31cb56fd708e4a6bfdd8ddd6edcbfd0a87 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 13 Mar 2019 14:19:32 -0500
Subject: [PATCH 0126/1648] Remove txn_send_pending to avoid large # trxs at
 end of sync

---
 plugins/net_plugin/net_plugin.cpp | 33 -------------------------------
 1 file changed, 33 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 9dcbe8e756e..4c25f256163 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -611,8 +611,6 @@ namespace eosio {
 
       const string peer_name();
 
-      void txn_send_pending(const vector<transaction_id_type>& ids);
-
       void blk_send_branch();
       void blk_send(const block_id_type& blkid);
       void stop_send();
@@ -919,23 +917,6 @@ namespace eosio {
 >>>>>>> Use unique_lock instead of lock_guard to clean up code
    }
 
-   void connection::txn_send_pending(const vector<transaction_id_type>& ids) {
-      const std::set<transaction_id_type, sha256_less> known_ids(ids.cbegin(), ids.cend());
-      my_impl->expire_local_txns();
-      vector<std::shared_ptr<vector<char>>> trx_to_send;
-      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
-      for( auto tx = my_impl->local_txns.begin(); tx != my_impl->local_txns.end(); ++tx ) {
-         const bool found = known_ids.find( tx->id ) != known_ids.cend();
-         if( !found ) {
-            trx_to_send.emplace_back( tx->serialized_txn );
-         }
-      }
-      g.unlock();
-      for( const auto& t : trx_to_send ) {
-         queue_write( t, true, priority::low, []( boost::system::error_code ec, std::size_t ) {} );
-      }
-   }
-
    void connection::blk_send_branch() {
       controller& cc = my_impl->chain_plug->chain();
       uint32_t head_num = cc.fork_db_head_block_num();
@@ -2577,19 +2558,6 @@ namespace eosio {
          break;
       }
       case catch_up : {
-         if( msg.known_trx.pending > 0) {
-            // plan to get all except what we already know about.
-            req.req_trx.mode = catch_up;
-            send_req = true;
-            std::lock_guard<std::mutex> g( my_impl->local_txns_mtx );
-            size_t known_sum = local_txns.size();
-            if( known_sum ) {
-               expire_local_txns();
-               for( const auto& t : local_txns.get<by_id>() ) {
-                  req.req_trx.ids.push_back( t.id );
-               }
-            }
-         }
          break;
       }
       case normal: {
@@ -2648,7 +2616,6 @@ namespace eosio {
 
       switch (msg.req_trx.mode) {
       case catch_up :
-         c->txn_send_pending(msg.req_trx.ids);
          break;
       case none :
          if(msg.req_blocks.mode == none)

From 9611a24eb5ea7a21ddd215f8db803644eb59c9a7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 14 Mar 2019 13:15:20 -0500
Subject: [PATCH 0127/1648] Remove dead code

---
 plugins/net_plugin/net_plugin.cpp | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4c25f256163..73b3ca5dd60 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1789,13 +1789,6 @@ namespace eosio {
 
    void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_id_type& id) {
       received_transactions.insert(std::make_pair(id, c));
-      if (c &&
-          c->last_req &&
-          c->last_req->req_trx.mode != none &&
-          !c->last_req->req_trx.ids.empty() &&
-          c->last_req->req_trx.ids.back() == id) {
-         c->last_req.reset();
-      }
 
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
@@ -1862,17 +1855,10 @@ namespace eosio {
          return;
       }
       fc_wlog( logger, "failed to fetch from ${p}",("p",c->peer_name()));
-      transaction_id_type tid;
       block_id_type bid;
-      bool is_txn = false;
-      if( c->last_req->req_trx.mode == normal && !c->last_req->req_trx.ids.empty() ) {
-         is_txn = true;
-         tid = c->last_req->req_trx.ids.back();
-      }
-      else if( c->last_req->req_blocks.mode == normal && !c->last_req->req_blocks.ids.empty() ) {
+      if( c->last_req->req_blocks.mode == normal && !c->last_req->req_blocks.ids.empty() ) {
          bid = c->last_req->req_blocks.ids.back();
-      }
-      else {
+      } else {
          fc_wlog( logger,"no retry, block mpde = ${b} trx mode = ${t}",
                   ("b",modes_str(c->last_req->req_blocks.mode))("t",modes_str(c->last_req->req_trx.mode)));
          return;
@@ -1881,14 +1867,7 @@ namespace eosio {
          if (conn == c || conn->last_req) {
             continue;
          }
-         bool sendit = false;
-         if (is_txn) {
-            auto trx = conn->trx_state.get<by_id>().find(tid);
-            sendit = trx != conn->trx_state.end();
-         }
-         else {
-            sendit = peer_has_block(bid, c->connection_id);
-         }
+         bool sendit = peer_has_block( bid, c->connection_id );
          if (sendit) {
             conn->enqueue(*c->last_req);
             conn->fetch_wait();

From e3ce304a3ac0e3becf470f7dfd0113cc9a1c4c6b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 14 Mar 2019 14:03:58 -0500
Subject: [PATCH 0128/1648] Remove dead code including serialized transaction

---
 plugins/net_plugin/net_plugin.cpp | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 73b3ca5dd60..2d372bd5f62 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -63,7 +63,6 @@ namespace eosio {
       transaction_id_type id;
       time_point_sec  expires;  /// time after which this may be purged.
       uint32_t        block_num = 0; /// block transaction was included in
-      std::shared_ptr<vector<char>>   serialized_txn; /// the received raw bundle
    };
 
    struct by_expiry;
@@ -767,7 +766,7 @@ namespace eosio {
       void rejected_block(const connection_ptr& c, uint32_t blk_num);
       void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
-      void recv_notice(const connection_ptr& c, const notice_message& msg);
+      void sync_recv_notice( const connection_ptr& c, const notice_message& msg);
    };
 
    class dispatch_manager {
@@ -1512,9 +1511,7 @@ namespace eosio {
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
-         std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
-         note.known_trx.pending = my_impl->local_txns.size();
-         g.unlock();
+         note.known_trx.pending = 0;
          c->enqueue( note );
          return;
       }
@@ -1588,8 +1585,10 @@ namespace eosio {
       c->enqueue( req );
    }
 
-   void sync_manager::recv_notice(const connection_ptr& c, const notice_message& msg) {
+   void sync_manager::sync_recv_notice( const connection_ptr& c, const notice_message& msg) {
       fc_ilog(logger, "sync_manager got ${m} block notice",("m",modes_str(msg.known_blocks.mode)));
+      EOS_ASSERT( msg.known_blocks.mode == catch_up || msg.known_blocks.mode == last_irr_catch_up, plugin_exception,
+                  "sync_recv_notice only called on catch_up" );
       if( msg.known_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
                   ("s", msg.known_blocks.ids.size())("p", c->peer_name()) );
@@ -1602,8 +1601,7 @@ namespace eosio {
          } else {
             verify_catchup(c, msg.known_blocks.pending, msg.known_blocks.ids.back());
          }
-      }
-      else {
+      } else if (msg.known_blocks.mode == last_irr_catch_up) {
          c->last_handshake_recv.last_irreversible_block_num = msg.known_trx.pending;
          reset_lib_num(c);
          start_sync(c, msg.known_trx.pending);
@@ -1757,21 +1755,18 @@ namespace eosio {
 
       std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
       if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
+         g.unlock();
          fc_dlog( logger, "found trxid in local_trxs" );
          return;
       }
+      time_point_sec trx_expiration = ptrx->packed_trx->expiration();
+      node_transaction_state nts = {id, trx_expiration, 0};
+      my_impl->local_txns.insert( std::move( nts ));
       g.unlock();
 
-      time_point_sec trx_expiration = ptrx->packed_trx->expiration();
       const packed_transaction& trx = *ptrx->packed_trx;
-
       auto buff = create_send_buffer( trx );
 
-      node_transaction_state nts = {id, trx_expiration, 0, buff};
-      g.lock();
-      my_impl->local_txns.insert( std::move( nts ));
-      g.unlock();
-
       my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
          if( skips.find(c) != skips.end() || c->syncing ) {
             return false;
@@ -2553,7 +2548,7 @@ namespace eosio {
       }
       case last_irr_catch_up:
       case catch_up: {
-         sync_master->recv_notice(c,msg);
+         sync_master->sync_recv_notice(c,msg);
          break;
       }
       case normal : {
@@ -2643,6 +2638,7 @@ namespace eosio {
 
       std::unique_lock<std::mutex> g( local_txns_mtx );
       if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
+         g.unlock();
          fc_dlog( logger, "got a duplicate transaction - dropping" );
          return;
       }

From 2281543a65ed525fd89bc9f716710a1f196d36d0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 08:58:06 -0500
Subject: [PATCH 0129/1648] Consolidate transaction tracking, reducing memory
 requirements and making thread safe.

---
 plugins/net_plugin/net_plugin.cpp | 466 ++++++++++++++----------------
 1 file changed, 224 insertions(+), 242 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2d372bd5f62..de838d20bc4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -50,9 +50,6 @@ namespace eosio {
 
    class connection;
 
-   class sync_manager;
-   class dispatch_manager;
-
    using connection_ptr = std::shared_ptr<connection>;
    using connection_wptr = std::weak_ptr<connection>;
 
@@ -61,8 +58,9 @@ namespace eosio {
 
    struct node_transaction_state {
       transaction_id_type id;
-      time_point_sec  expires;  /// time after which this may be purged.
-      uint32_t        block_num = 0; /// block transaction was included in
+      time_point_sec  expires;        /// time after which this may be purged.
+      uint32_t        block_num = 0;  /// block transaction was included in
+      uint32_t        connection_id = 0;
    };
 
    struct by_expiry;
@@ -80,26 +78,119 @@ namespace eosio {
       node_transaction_state,
       indexed_by<
          ordered_unique<
-            tag< by_id >,
-            member < node_transaction_state,
-                     transaction_id_type,
-                     &node_transaction_state::id >,
-            sha256_less >,
+            tag<by_id>,
+            composite_key< node_transaction_state,
+               member<node_transaction_state, transaction_id_type, &node_transaction_state::id>,
+               member<node_transaction_state, uint32_t, &node_transaction_state::connection_id>
+            >,
+            composite_key_compare< sha256_less, std::less<uint32_t> >
+         >,
          ordered_non_unique<
             tag< by_expiry >,
-            member< node_transaction_state,
-                    fc::time_point_sec,
-                    &node_transaction_state::expires >
-            >,
+            member< node_transaction_state, fc::time_point_sec, &node_transaction_state::expires > >,
          ordered_non_unique<
             tag<by_block_num>,
-            member< node_transaction_state,
-                    uint32_t,
-                    &node_transaction_state::block_num > >
+            member< node_transaction_state, uint32_t, &node_transaction_state::block_num > >
          >
       >
    node_transaction_index;
 
+   struct peer_block_state {
+      block_id_type id;
+      uint32_t      block_num = 0;
+      uint32_t      connection_id = 0;
+   };
+
+   typedef multi_index_container<
+      eosio::peer_block_state,
+      indexed_by<
+         ordered_unique< tag<by_id>,
+               composite_key< peer_block_state,
+                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
+                     member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>
+               >,
+               composite_key_compare< sha256_less, std::less<uint32_t> >
+         >,
+         ordered_non_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
+      >
+      > peer_block_state_index;
+
+
+   struct update_block_num {
+      uint32_t new_bnum;
+      update_block_num(uint32_t bnum) : new_bnum(bnum) {}
+      void operator() (node_transaction_state& nts) {
+         nts.block_num = new_bnum;
+      }
+   };
+
+   class sync_manager {
+   private:
+      enum stages {
+         lib_catchup,
+         head_catchup,
+         in_sync
+      };
+
+      uint32_t       sync_known_lib_num;
+      uint32_t       sync_last_requested_num;
+      uint32_t       sync_next_expected_num;
+      uint32_t       sync_req_span;
+      connection_ptr source;
+      stages         state;
+
+      chain_plugin* chain_plug = nullptr;
+
+      constexpr static auto stage_str(stages s);
+
+   public:
+      explicit sync_manager(uint32_t span);
+      void set_state(stages s);
+      bool sync_required();
+      void send_handshakes();
+      bool is_active(const connection_ptr& conn);
+      void reset_lib_num(const connection_ptr& conn);
+      void request_next_chunk(const connection_ptr& conn = connection_ptr());
+      void start_sync(const connection_ptr& c, uint32_t target);
+      void reassign_fetch(const connection_ptr& c, go_away_reason reason);
+      void verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id);
+      void rejected_block(const connection_ptr& c, uint32_t blk_num);
+      void sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
+      void recv_handshake(const connection_ptr& c, const handshake_message& msg);
+      void sync_recv_notice( const connection_ptr& c, const notice_message& msg);
+   };
+
+   class dispatch_manager {
+      std::mutex              blk_state_mtx;
+      peer_block_state_index  blk_state;
+      std::mutex              local_txns_mtx;
+      node_transaction_index  local_txns;
+
+   public:
+      void bcast_transaction(const transaction_metadata_ptr& trx);
+      void rejected_transaction(const transaction_id_type& msg, uint32_t head_blk_num);
+      void bcast_block(const block_state_ptr& bs);
+      void rejected_block(const block_id_type& id);
+
+      void recv_block(const connection_ptr& conn, const block_id_type& msg, uint32_t bnum);
+      void expire_blocks( uint32_t bnum );
+      void recv_transaction(const connection_ptr& conn, const transaction_metadata_ptr& txn);
+      void recv_notice(const connection_ptr& conn, const notice_message& msg, bool generated);
+
+      void retry_fetch(const connection_ptr& conn);
+
+      bool add_peer_block(const peer_block_state& pbs);
+      bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
+      bool have_block(const block_id_type& blkid);
+
+      bool add_peer_txn( const node_transaction_state& nts );
+      void update_txns_block_num( const signed_block_ptr& sb );
+      void update_txns_block_num( const transaction_id_type& id, uint32_t blk_num );
+      bool peer_has_txn( const transaction_id_type& tid, uint32_t connection_id );
+      bool have_txn( const transaction_id_type& tid );
+      void expire_txns( uint32_t lib_num );
+   };
+
    class net_plugin_impl {
    public:
       unique_ptr<tcp::acceptor>        acceptor;
@@ -146,6 +237,7 @@ namespace eosio {
       chain_id_type                 chain_id;
       fc::sha256                    node_id;
       std::atomic<uint32_t>         lib_num{0};
+      uint32_t                      head_blk_num{0};
       eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
       string                        user_agent_name;
@@ -153,9 +245,6 @@ namespace eosio {
       producer_plugin*              producer_plug = nullptr;
       int                           started_sessions = 0;
 
-      std::mutex                    local_txns_mtx;
-      node_transaction_index        local_txns;
-
       shared_ptr<tcp::resolver>     resolver;
 
       bool                          use_socket_read_watermark = false;
@@ -188,13 +277,12 @@ namespace eosio {
       void close(const connection_ptr& c);
       size_t count_open_sockets() const;
 
-      template<typename VerifierFunc>
-      void send_transaction_to_all( const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify );
-
       void accepted_block(const block_state_ptr&);
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
       void on_irreversible_block( const block_state_ptr& blk ) {
          lib_num = blk->block_num;
+         controller& cc = chain_plug->chain();
+         head_blk_num = cc.head_block_num();
       }
 
       bool is_valid( const handshake_message &msg);
@@ -230,7 +318,6 @@ namespace eosio {
       void start_monitors();
 
       void expire_txns();
-      void expire_local_txns();
       void connection_monitor(std::weak_ptr<connection> from_connection);
       /** \name Peer Timestamps
        *  Time message handling
@@ -348,58 +435,6 @@ namespace eosio {
 
    constexpr uint16_t net_version = proto_explicit_sync;
 
-   struct transaction_state {
-      transaction_id_type id;
-      uint32_t            block_num = 0; ///< the block number the transaction was included in
-      time_point_sec      expires;
-   };
-
-   typedef multi_index_container<
-      transaction_state,
-      indexed_by<
-         ordered_unique< tag<by_id>, member<transaction_state, transaction_id_type, &transaction_state::id >, sha256_less >,
-         ordered_non_unique< tag< by_expiry >, member< transaction_state,fc::time_point_sec,&transaction_state::expires >>,
-         ordered_non_unique<
-            tag<by_block_num>,
-            member< transaction_state,
-                    uint32_t,
-                    &transaction_state::block_num > >
-         >
-
-      > transaction_state_index;
-
-   struct peer_block_state {
-      block_id_type id;
-      uint32_t      block_num;
-      uint32_t      connection_id;
-   };
-
-   typedef multi_index_container<
-      eosio::peer_block_state,
-      indexed_by<
-         ordered_unique< tag<by_id>,
-               composite_key< peer_block_state,
-                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
-                     member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>
-               >,
-               composite_key_compare< sha256_less, std::less<uint32_t> >
-         >,
-         ordered_non_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
-      >
-      > peer_block_state_index;
-
-
-   struct update_block_num {
-      uint32_t new_bnum;
-      update_block_num(uint32_t bnum) : new_bnum(bnum) {}
-      void operator() (node_transaction_state& nts) {
-         nts.block_num = new_bnum;
-      }
-      void operator() (transaction_state& ts) {
-         ts.block_num = new_bnum;
-      }
-   };
-
    /**
     * Index by start_block_num
     */
@@ -507,7 +542,6 @@ namespace eosio {
       ~connection();
       void initialize();
 
-      transaction_state_index trx_state;
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
       boost::asio::io_context::strand           strand;
@@ -733,70 +767,10 @@ namespace eosio {
       }
    };
 
-   class sync_manager {
-   private:
-      enum stages {
-         lib_catchup,
-         head_catchup,
-         in_sync
-      };
-
-      uint32_t       sync_known_lib_num;
-      uint32_t       sync_last_requested_num;
-      uint32_t       sync_next_expected_num;
-      uint32_t       sync_req_span;
-      connection_ptr source;
-      stages         state;
-
-      chain_plugin* chain_plug = nullptr;
-
-      constexpr static auto stage_str(stages s);
-
-   public:
-      explicit sync_manager(uint32_t span);
-      void set_state(stages s);
-      bool sync_required();
-      void send_handshakes();
-      bool is_active(const connection_ptr& conn);
-      void reset_lib_num(const connection_ptr& conn);
-      void request_next_chunk(const connection_ptr& conn = connection_ptr());
-      void start_sync(const connection_ptr& c, uint32_t target);
-      void reassign_fetch(const connection_ptr& c, go_away_reason reason);
-      void verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id);
-      void rejected_block(const connection_ptr& c, uint32_t blk_num);
-      void recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
-      void recv_handshake(const connection_ptr& c, const handshake_message& msg);
-      void sync_recv_notice( const connection_ptr& c, const notice_message& msg);
-   };
-
-   class dispatch_manager {
-      std::mutex              blk_state_mtx;
-      peer_block_state_index  blk_state;
-      std::multimap<transaction_id_type, connection_ptr, sha256_less> received_transactions;
-
-   public:
-      void bcast_transaction(const transaction_metadata_ptr& trx);
-      void rejected_transaction(const transaction_id_type& msg);
-      void bcast_block(const block_state_ptr& bs);
-      void rejected_block(const block_id_type& id);
-
-      void recv_block(const connection_ptr& conn, const block_id_type& msg, uint32_t bnum);
-      void expire_blocks( uint32_t bnum );
-      void recv_transaction(const connection_ptr& conn, const transaction_id_type& id);
-      void recv_notice(const connection_ptr& conn, const notice_message& msg, bool generated);
-
-      void retry_fetch(const connection_ptr& conn);
-
-      bool add_peer_block(const peer_block_state& pbs);
-      bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
-      bool have_block(const block_id_type& blkid);
-   };
-
    //---------------------------------------------------------------------------
 
    connection::connection( string endpoint )
-      : trx_state(),
-        peer_requested(),
+      : peer_requested(),
         server_ioc( my_impl->server_ioc ),
         strand( app().get_io_service() ),
         socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
@@ -821,8 +795,7 @@ namespace eosio {
    }
 
    connection::connection( socket_ptr s )
-      : trx_state(),
-        peer_requested(),
+      : peer_requested(),
         server_ioc( my_impl->server_ioc ),
         strand( app().get_io_service() ),
         socket( s ),
@@ -867,7 +840,6 @@ namespace eosio {
 
    void connection::reset() {
       peer_requested.reset();
-      trx_state.clear();
    }
 
    void connection::flush_queues() {
@@ -1618,7 +1590,7 @@ namespace eosio {
          send_handshakes();
       }
    }
-   void sync_manager::recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
+   void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
       fc_dlog(logger, "got block ${bn} from ${p}",("bn",blk_num)("p",c->peer_name()));
       if (state == lib_catchup) {
          if (blk_num != sync_next_expected_num) {
@@ -1692,6 +1664,68 @@ namespace eosio {
       return blk_itr != blk_state.end();
    }
 
+   bool dispatch_manager::add_peer_txn( const node_transaction_state& nts ) {
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      auto tptr = local_txns.get<by_id>().find( std::make_tuple( std::ref( nts.id ), nts.connection_id ) );
+      bool added = (tptr == local_txns.end());
+      if( added ) {
+         local_txns.insert( nts );
+      }
+      return added;
+   }
+
+   void dispatch_manager::update_txns_block_num( const signed_block_ptr& sb ) {
+      update_block_num ubn( sb->block_num() );
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      for( const auto& recpt : sb->transactions ) {
+         const transaction_id_type& id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
+                                                                  : recpt.trx.get<packed_transaction>().id();
+         auto range = local_txns.get<by_id>().equal_range( id );
+         for( auto itr = range.first; itr != range.second; ++itr ) {
+            local_txns.modify( itr, ubn );
+         }
+      }
+   }
+
+   void dispatch_manager::update_txns_block_num( const transaction_id_type& id, uint32_t blk_num ) {
+      update_block_num ubn( blk_num );
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      auto range = local_txns.get<by_id>().equal_range( id );
+      for( auto itr = range.first; itr != range.second; ++itr ) {
+         local_txns.modify( itr, ubn );
+      }
+   }
+
+   bool dispatch_manager::peer_has_txn( const transaction_id_type& tid, uint32_t connection_id ) {
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      auto tptr = local_txns.get<by_id>().find( std::make_tuple( std::ref( tid ), connection_id ) );
+      return tptr != local_txns.end();
+   }
+
+   bool dispatch_manager::have_txn( const transaction_id_type& tid ) {
+      std::lock_guard<std::mutex> g( local_txns_mtx );
+      auto tptr = local_txns.get<by_id>().find( tid );
+      return tptr != local_txns.end();
+   }
+
+   void dispatch_manager::expire_txns( uint32_t lib_num ) {
+      size_t start_size = 0, end_size = 0;
+      {
+         std::lock_guard<std::mutex> g( local_txns_mtx );
+
+         start_size = local_txns.size();
+         auto& old = local_txns.get<by_expiry>();
+         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ) );
+         auto ex_up = old.upper_bound( time_point::now() );
+         old.erase( ex_lo, ex_up );
+
+         auto& stale = local_txns.get<by_block_num>();
+         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib_num ) );
+         end_size = local_txns.size();
+      }
+      fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)( "r", start_size - end_size ) );
+   }
+
    void dispatch_manager::expire_blocks( uint32_t lib_num ) {
       std::lock_guard<std::mutex> g(blk_state_mtx);
       auto& stale_blk = blk_state.get<by_block_num>();
@@ -1744,55 +1778,41 @@ namespace eosio {
    }
 
    void dispatch_manager::bcast_transaction(const transaction_metadata_ptr& ptrx) {
-      std::set<connection_ptr> skips;
       const auto& id = ptrx->id;
-
-      auto range = received_transactions.equal_range(id);
-      for (auto org = range.first; org != range.second; ++org) {
-         skips.insert(org->second);
-      }
-      received_transactions.erase(range.first, range.second);
-
-      std::unique_lock<std::mutex> g( my_impl->local_txns_mtx );
-      if( my_impl->local_txns.get<by_id>().find( id ) != my_impl->local_txns.end()) { //found
-         g.unlock();
-         fc_dlog( logger, "found trxid in local_trxs" );
-         return;
-      }
-      time_point_sec trx_expiration = ptrx->packed_trx->expiration();
-      node_transaction_state nts = {id, trx_expiration, 0};
-      my_impl->local_txns.insert( std::move( nts ));
-      g.unlock();
-
       const packed_transaction& trx = *ptrx->packed_trx;
-      auto buff = create_send_buffer( trx );
+      time_point_sec trx_expiration = trx.expiration();
+      node_transaction_state nts = {id, trx_expiration, 0, 0};
 
-      my_impl->send_transaction_to_all( buff, [&id, &skips, trx_expiration](const connection_ptr& c) -> bool {
-         if( skips.find(c) != skips.end() || c->syncing ) {
-            return false;
-          }
-          const auto& bs = c->trx_state.find(id);
-          bool unknown = bs == c->trx_state.end();
-          if( unknown ) {
-             c->trx_state.insert(transaction_state({id,0,trx_expiration}));
-             fc_dlog(logger, "sending trx to ${n}", ("n",c->peer_name() ) );
-          }
-          return unknown;
-      });
+      std::shared_ptr<std::vector<char>> send_buffer;
+      for( auto& cp : my_impl->connections ) {
+         if( !cp->current() ) {
+            continue;
+         }
+         if( !add_peer_txn(nts) ) {
+            continue;
+         }
+         if( !send_buffer ) {
+            send_buffer = create_send_buffer( trx );
+         }
 
+         fc_dlog(logger, "sending trx to ${n}", ("n", cp->peer_name() ) );
+         cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
+      }
    }
 
-   void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_id_type& id) {
-      received_transactions.insert(std::make_pair(id, c));
+   void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_metadata_ptr& txn) {
+      node_transaction_state nts = {txn->id, txn->packed_trx->expiration(), 0, c->connection_id};
+      add_peer_txn( nts );
 
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
    }
 
-   void dispatch_manager::rejected_transaction(const transaction_id_type& id) {
-      fc_dlog(logger,"not sending rejected transaction ${tid}",("tid",id));
-      auto range = received_transactions.equal_range(id);
-      received_transactions.erase(range.first, range.second);
+   void dispatch_manager::rejected_transaction(const transaction_id_type& id, uint32_t head_blk_num) {
+      fc_dlog( logger, "not sending rejected transaction ${tid}", ("tid", id) );
+      // keep rejected transaction around for awhile so we don't broadcast it
+      // update its block number so it will be purged when current block number is lib
+      update_txns_block_num( id, head_blk_num );
    }
 
    void dispatch_manager::recv_notice(const connection_ptr& c, const notice_message& msg, bool generated) {
@@ -2285,7 +2305,7 @@ namespace eosio {
                   if(c) {
                      auto blk_num = block_header::num_from_id(blk_id);
                      dispatcher->recv_block(c, blk_id, blk_num);
-                     sync_master->recv_block( c, blk_id, blk_num );
+                     sync_master->sync_recv_block( c, blk_id, blk_num );
                   }
                });
                conn->pending_message_buffer.advance_read_ptr( message_length );
@@ -2323,16 +2343,6 @@ namespace eosio {
       return count;
    }
 
-
-   template<typename VerifierFunc>
-   void net_plugin_impl::send_transaction_to_all(const std::shared_ptr<std::vector<char>>& send_buffer, VerifierFunc verify) {
-      for( auto &c : connections) {
-         if( c->current() && verify( c )) {
-            c->enqueue_buffer( send_buffer, true, priority::low, no_reason );
-         }
-      }
-   }
-
    bool net_plugin_impl::is_valid(const handshake_message& msg) {
       // Do some basic validation of an incoming handshake_message, so things
       // that really aren't handshake messages can be quickly discarded without
@@ -2636,18 +2646,17 @@ namespace eosio {
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
 
-      std::unique_lock<std::mutex> g( local_txns_mtx );
-      if( local_txns.get<by_id>().find( tid ) != local_txns.end()) {
-         g.unlock();
-         fc_dlog( logger, "got a duplicate transaction - dropping" );
-         return;
-      }
-      g.unlock();
+      bool have_trx = dispatcher->have_txn( tid );
       connection_wptr weak_ptr = c;
-      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, tid](){
+      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, ptrx](){
          auto c = weak_ptr.lock();
-         dispatcher->recv_transaction(c, tid);
+         dispatcher->recv_transaction(c, ptrx);
       });
+      if( have_trx ) {
+         fc_dlog( logger, "got a duplicate transaction - dropping" );
+         return;
+      }
+
       c->trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
       chain_plug->accept_transaction(ptrx, [c, this, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
@@ -2675,11 +2684,11 @@ namespace eosio {
             }
          }
 
-         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}]() {
+         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}, head_blk_num = this->head_blk_num]() {
             if( accepted ) {
                dispatcher->bcast_transaction( ptrx );
             } else {
-               dispatcher->rejected_transaction( ptrx->id );
+               dispatcher->rejected_transaction( ptrx->id, head_blk_num );
             }
          });
       });
@@ -2722,8 +2731,12 @@ namespace eosio {
          if( msg && cc.fetch_block_by_id(blk_id)) {
 =======
          if( cc.fetch_block_by_id(blk_id) ) {
+<<<<<<< HEAD
 >>>>>>> Revert unneeded changes to handle_message
             sync_master->recv_block(c, blk_id, blk_num);
+=======
+            sync_master->sync_recv_block(c, blk_id, blk_num);
+>>>>>>> Consolidate transaction tracking, reducing memory requirements and making thread safe.
             return;
          }
 <<<<<<< HEAD
@@ -2868,21 +2881,10 @@ namespace eosio {
 
       update_block_num ubn(blk_num);
       if( reason == no_reason ) {
-         std::unique_lock<std::mutex> g( local_txns_mtx );
-         for( const auto& recpt : msg->transactions ) {
-            auto id = (recpt.trx.which() == 0) ? recpt.trx.get<transaction_id_type>()
-                                               : recpt.trx.get<packed_transaction>().id();
-            auto ltx = local_txns.get<by_id>().find( id );
-            if( ltx != local_txns.end()) {
-               local_txns.modify( ltx, ubn );
-            }
-            auto ctx = c->trx_state.get<by_id>().find( id );
-            if( ctx != c->trx_state.end()) {
-               c->trx_state.modify( ctx, ubn );
-            }
-         }
-         g.unlock();
-         sync_master->recv_block(c, blk_id, blk_num);
+         boost::asio::post( *server_ioc, [self = this, msg]() {
+            self->dispatcher->update_txns_block_num( msg );
+         });
+         sync_master->sync_recv_block(c, blk_id, blk_num);
       }
       else {
          sync_master->rejected_block(c, blk_num);
@@ -2948,10 +2950,9 @@ namespace eosio {
       start_txn_timer();
 
       auto now = time_point::now();
-      expire_local_txns();
-
       uint32_t lib = lib_num.load();
       dispatcher->expire_blocks( lib );
+<<<<<<< HEAD
       for ( auto& c : connections ) {
          auto &stale_txn = c->trx_state.get<by_block_num>();
          stale_txn.erase( stale_txn.lower_bound(1), stale_txn.upper_bound(lib) );
@@ -2966,32 +2967,13 @@ namespace eosio {
                ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
 >>>>>>> force a build
 =======
+=======
+      dispatcher->expire_txns( lib );
+>>>>>>> Consolidate transaction tracking, reducing memory requirements and making thread safe.
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
 >>>>>>> Move more of incoming transaction processing to thread pool
    }
 
-   // thread safe
-   void net_plugin_impl::expire_local_txns() {
-      uint32_t lib = lib_num.load();
-      size_t start_size = 0, end_size = 0;
-
-      std::unique_lock<std::mutex> g( local_txns_mtx );
-
-      start_size = local_txns.size();
-      auto& old = local_txns.get<by_expiry>();
-      auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ));
-      auto ex_up = old.upper_bound( time_point::now());
-      old.erase( ex_lo, ex_up );
-
-      auto& stale = local_txns.get<by_block_num>();
-      stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib ));
-      end_size = local_txns.size();
-
-      g.unlock();
-
-      fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)("r", start_size - end_size) );
-   }
-
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
@@ -3038,7 +3020,7 @@ namespace eosio {
       const auto& id = results.second->id;
       if (results.first) {
          fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
-         dispatcher->rejected_transaction(id);
+         dispatcher->rejected_transaction(id, head_blk_num);
       } else {
          fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
          dispatcher->bcast_transaction(results.second);

From 565f39ded9e4e1778da0964c61b86946fe56ba02 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 09:47:01 -0500
Subject: [PATCH 0130/1648] Fix for missing connection_id

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index de838d20bc4..d8ce6fa0652 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1788,6 +1788,7 @@ namespace eosio {
          if( !cp->current() ) {
             continue;
          }
+         nts.connection_id = cp->connection_id;
          if( !add_peer_txn(nts) ) {
             continue;
          }

From 3218065417fcaff856a8cbe8ebd8f7df12459b91 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 12:32:49 -0500
Subject: [PATCH 0131/1648] Make all timers thread safe. Expire trx/blks on
 thread pool.

---
 plugins/net_plugin/net_plugin.cpp | 117 +++++++++++++++++++-----------
 1 file changed, 74 insertions(+), 43 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d8ce6fa0652..c589280d649 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -222,14 +222,17 @@ namespace eosio {
       unique_ptr< sync_manager >       sync_master;
       unique_ptr< dispatch_manager >   dispatcher;
 
-      unique_ptr<boost::asio::steady_timer> connector_check;
-      unique_ptr<boost::asio::steady_timer> transaction_check;
+      std::mutex                            connector_check_timer_mtx; 
+      unique_ptr<boost::asio::steady_timer> connector_check_timer;
+      std::mutex                            expire_timer_mtx;
+      unique_ptr<boost::asio::steady_timer> expire_timer;
+      std::mutex                            keepalive_timer_mtx;
       unique_ptr<boost::asio::steady_timer> keepalive_timer;
       boost::asio::steady_timer::duration   connector_period;
       boost::asio::steady_timer::duration   txn_exp_period;
       boost::asio::steady_timer::duration   resp_expected_period;
       boost::asio::steady_timer::duration   keepalive_interval{std::chrono::seconds{32}};
-      int                           max_cleanup_time_ms = 0;
+      int                                   max_cleanup_time_ms = 0;
 
       const std::chrono::system_clock::duration peer_authentication_interval{std::chrono::seconds{1}}; ///< Peer clock may be no more than 1 second skewed from our clock, including network latency.
 
@@ -314,10 +317,10 @@ namespace eosio {
       void handle_message(const connection_ptr& c, const packed_transaction_ptr& msg);
 
       void start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection);
-      void start_txn_timer();
+      void start_expire_timer();
       void start_monitors();
 
-      void expire_txns();
+      void expire();
       void connection_monitor(std::weak_ptr<connection> from_connection);
       /** \name Peer Timestamps
        *  Time message handling
@@ -540,7 +543,9 @@ namespace eosio {
 
       explicit connection( socket_ptr s );
       ~connection();
-      void initialize();
+   private:
+      void initialize(); // only called from constructor
+   public:
 
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
@@ -580,7 +585,8 @@ namespace eosio {
       bool                    syncing = false;
       uint16_t                protocol_version  = 0;
       string                  peer_addr;
-      unique_ptr<boost::asio::steady_timer> response_expected;
+      std::mutex                            response_expected_timer_mtx;
+      unique_ptr<boost::asio::steady_timer> response_expected_timer;
       std::mutex                            read_delay_timer_mtx;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
@@ -783,7 +789,7 @@ namespace eosio {
         syncing(false),
         protocol_version(0),
         peer_addr(endpoint),
-        response_expected(),
+        response_expected_timer(),
         read_delay_timer(),
         no_retry(no_reason),
         fork_head(),
@@ -808,7 +814,7 @@ namespace eosio {
         syncing(false),
         protocol_version(0),
         peer_addr(),
-        response_expected(),
+        response_expected_timer(),
         read_delay_timer(),
         no_retry(no_reason),
         fork_head(),
@@ -826,7 +832,8 @@ namespace eosio {
    void connection::initialize() {
       auto *rnd = node_id.data();
       rnd[0] = 0;
-      response_expected.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
+      // called only from constructor, no mutex needed
+      response_expected_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
       read_delay_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
    }
 
@@ -1181,15 +1188,19 @@ namespace eosio {
                   to_sync_queue);
    }
 
+   // thread safe
    void connection::cancel_wait() {
-      if (response_expected)
-         response_expected->cancel();
+      std::lock_guard<std::mutex> g( response_expected_timer_mtx );
+      if (response_expected_timer)
+         response_expected_timer->cancel();
    }
 
+   // thread safe
    void connection::sync_wait() {
-      response_expected->expires_from_now( my_impl->resp_expected_period);
       connection_wptr c(shared_from_this());
-      response_expected->async_wait( [c]( boost::system::error_code ec ) {
+      std::lock_guard<std::mutex> g( response_expected_timer_mtx );
+      response_expected_timer->expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer->async_wait( [c]( boost::system::error_code ec ) {
          app().post(priority::low, [c, ec]() {
             connection_ptr conn = c.lock();
             if (!conn) {
@@ -1202,10 +1213,12 @@ namespace eosio {
       } );
    }
 
+   // thread safe
    void connection::fetch_wait() {
-      response_expected->expires_from_now( my_impl->resp_expected_period);
       connection_wptr c(shared_from_this());
-      response_expected->async_wait( [c]( boost::system::error_code ec ) {
+      std::lock_guard<std::mutex> g( response_expected_timer_mtx );
+      response_expected_timer->expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer->async_wait( [c]( boost::system::error_code ec ) {
          app().post(priority::low, [c, ec]() {
             connection_ptr conn = c.lock();
             if (!conn) {
@@ -2894,8 +2907,9 @@ namespace eosio {
    }
 
    void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection) {
-      connector_check->expires_from_now( du);
-      connector_check->async_wait( [this, from_connection](boost::system::error_code ec) {
+      std::lock_guard<std::mutex> g( connector_check_timer_mtx );
+      connector_check_timer->expires_from_now( du);
+      connector_check_timer->async_wait( [this, from_connection](boost::system::error_code ec) {
             app().post( priority::low, [this, from_connection, ec]() {
             if( !ec) {
                connection_monitor(from_connection);
@@ -2908,22 +2922,23 @@ namespace eosio {
       });
    }
 
-   void net_plugin_impl::start_txn_timer() {
-      transaction_check->expires_from_now( txn_exp_period);
-      transaction_check->async_wait( [this]( boost::system::error_code ec ) {
-         int lower_than_low = priority::low - 1;
-         app().post( lower_than_low, [this, ec]() {
-            if( !ec ) {
-               expire_txns();
-            } else {
-               fc_elog( logger, "Error from transaction check monitor: ${m}", ("m", ec.message()));
-               start_txn_timer();
-            }
-         } );
-      });
+   // thread safe
+   void net_plugin_impl::start_expire_timer() {
+      std::lock_guard<std::mutex> g( expire_timer_mtx );
+      expire_timer->expires_from_now( txn_exp_period);
+      expire_timer->async_wait( [this]( boost::system::error_code ec ) {
+         if( !ec ) {
+            expire();
+         } else {
+            fc_elog( logger, "Error from transaction check monitor: ${m}", ("m", ec.message()) );
+            start_expire_timer();
+         }
+      } );
    }
 
+   // thread safe
    void net_plugin_impl::ticker() {
+      std::lock_guard<std::mutex> g( keepalive_timer_mtx );
       keepalive_timer->expires_from_now(keepalive_interval);
       keepalive_timer->async_wait( [this]( boost::system::error_code ec ) {
          app().post( priority::low, [this, ec]() {
@@ -2941,14 +2956,20 @@ namespace eosio {
    }
 
    void net_plugin_impl::start_monitors() {
-      connector_check.reset(new boost::asio::steady_timer( *server_ioc ));
-      transaction_check.reset(new boost::asio::steady_timer( *server_ioc ));
+      {
+         std::lock_guard<std::mutex> g( connector_check_timer_mtx );
+         connector_check_timer.reset(new boost::asio::steady_timer( *server_ioc ));
+      }
+      {
+         std::lock_guard<std::mutex> g( expire_timer_mtx );
+         expire_timer.reset( new boost::asio::steady_timer( *server_ioc ) );
+      }
       start_conn_timer(connector_period, std::weak_ptr<connection>());
-      start_txn_timer();
+      start_expire_timer();
    }
 
-   void net_plugin_impl::expire_txns() {
-      start_txn_timer();
+   void net_plugin_impl::expire() {
+      start_expire_timer();
 
       auto now = time_point::now();
       uint32_t lib = lib_num.load();
@@ -3321,7 +3342,10 @@ namespace eosio {
          }
       }
 
-      my->keepalive_timer.reset( new boost::asio::steady_timer( *my->server_ioc ) );
+      {
+         std::lock_guard<std::mutex> g( my->keepalive_timer_mtx );
+         my->keepalive_timer.reset( new boost::asio::steady_timer( *my->server_ioc ) );
+      }
       my->ticker();
 
       if( my->acceptor ) {
@@ -3375,12 +3399,19 @@ namespace eosio {
          if( my->server_ioc_work )
             my->server_ioc_work->reset();
 
-         if( my->connector_check )
-            my->connector_check->cancel();
-         if( my->transaction_check )
-            my->transaction_check->cancel();
-         if( my->keepalive_timer )
-            my->keepalive_timer->cancel();
+         {
+            std::lock_guard<std::mutex> g( my->connector_check_timer_mtx );
+            if( my->connector_check_timer )
+               my->connector_check_timer->cancel();
+         }{
+            std::lock_guard<std::mutex> g( my->expire_timer_mtx );
+            if( my->expire_timer )
+               my->expire_timer->cancel();
+         }{
+            std::lock_guard<std::mutex> g( my->keepalive_timer_mtx );
+            if( my->keepalive_timer )
+               my->keepalive_timer->cancel();
+         }
 
          my->done = true;
          if( my->acceptor ) {

From 22742eb8aa95f088713c111eb133d0ef5b156b5c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 14:44:48 -0500
Subject: [PATCH 0132/1648] Break expire into two steps

---
 plugins/net_plugin/net_plugin.cpp | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c589280d649..c9d148e1c9a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1723,19 +1723,21 @@ namespace eosio {
 
    void dispatch_manager::expire_txns( uint32_t lib_num ) {
       size_t start_size = 0, end_size = 0;
-      {
-         std::lock_guard<std::mutex> g( local_txns_mtx );
 
-         start_size = local_txns.size();
-         auto& old = local_txns.get<by_expiry>();
-         auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ) );
-         auto ex_up = old.upper_bound( time_point::now() );
-         old.erase( ex_lo, ex_up );
+      std::unique_lock<std::mutex> g( local_txns_mtx );
+      start_size = local_txns.size();
+      auto& old = local_txns.get<by_expiry>();
+      auto ex_lo = old.lower_bound( fc::time_point_sec( 0 ) );
+      auto ex_up = old.upper_bound( time_point::now() );
+      old.erase( ex_lo, ex_up );
+      g.unlock(); // allow other threads opportunity to use local_txns
+
+      g.lock();
+      auto& stale = local_txns.get<by_block_num>();
+      stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib_num ) );
+      end_size = local_txns.size();
+      g.unlock();
 
-         auto& stale = local_txns.get<by_block_num>();
-         stale.erase( stale.lower_bound( 1 ), stale.upper_bound( lib_num ) );
-         end_size = local_txns.size();
-      }
       fc_dlog( logger, "expire_local_txns size ${s} removed ${r}", ("s", start_size)( "r", start_size - end_size ) );
    }
 
@@ -2969,8 +2971,6 @@ namespace eosio {
    }
 
    void net_plugin_impl::expire() {
-      start_expire_timer();
-
       auto now = time_point::now();
       uint32_t lib = lib_num.load();
       dispatcher->expire_blocks( lib );
@@ -2993,7 +2993,12 @@ namespace eosio {
       dispatcher->expire_txns( lib );
 >>>>>>> Consolidate transaction tracking, reducing memory requirements and making thread safe.
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
+<<<<<<< HEAD
 >>>>>>> Move more of incoming transaction processing to thread pool
+=======
+
+      start_expire_timer();
+>>>>>>> Break expire into two steps
    }
 
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {

From 8f216a5af692732291552a991d5220b75ca36bcf Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 18:17:52 -0500
Subject: [PATCH 0133/1648] Fix issue with sync and known block optimization

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c9d148e1c9a..c0795f044a6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2315,7 +2315,7 @@ namespace eosio {
             block_id_type blk_id = bh.id();
             if( dispatcher->have_block( blk_id ) ) {
                connection_wptr weak = conn;
-               app().post(priority::low,
+               app().post(priority::high, // high since block processing is high and this needs to run before next block
                      [dispatcher = dispatcher.get(), sync_master = sync_master.get(), weak{std::move(weak)}, blk_id] {
                   connection_ptr c = weak.lock();
                   if(c) {

From b6f9911c3f82b33855a8bedfb948b9c3e9cffa5f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 15 Mar 2019 18:44:16 -0500
Subject: [PATCH 0134/1648] Add transaction id to log message

---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c0795f044a6..e1f1138f855 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2653,7 +2653,6 @@ namespace eosio {
    // called from thread_pool threads
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
-      peer_ilog(c, "received packed_transaction");
       if( db_read_mode == eosio::db_read_mode::READ_ONLY ) {
          fc_dlog(logger, "got a txn in read-only mode - dropping");
          return;
@@ -2661,6 +2660,7 @@ namespace eosio {
 
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
+      peer_ilog(c, "received packed_transaction ${id}", ("id", tid));
 
       bool have_trx = dispatcher->have_txn( tid );
       connection_wptr weak_ptr = c;
@@ -2669,7 +2669,7 @@ namespace eosio {
          dispatcher->recv_transaction(c, ptrx);
       });
       if( have_trx ) {
-         fc_dlog( logger, "got a duplicate transaction - dropping" );
+         fc_dlog( logger, "got a duplicate transaction - dropping ${id}", ("id", tid) );
          return;
       }
 

From e3f2869b046f7dbb996e2f7e90b1e2affbc164db Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Mar 2019 07:35:16 -0500
Subject: [PATCH 0135/1648] Remove dead code

---
 .../include/eosio/net_plugin/net_plugin.hpp       |  1 -
 plugins/net_plugin/net_plugin.cpp                 | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
index 01c1383468d..3bc594dd313 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
@@ -38,7 +38,6 @@ namespace eosio {
         optional<connection_status>  status( const string& endpoint )const;
         vector<connection_status>    connections()const;
 
-        size_t num_peers() const;
       private:
         std::unique_ptr<class net_plugin_impl> my;
    };
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e1f1138f855..7286d4eac28 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -278,7 +278,6 @@ namespace eosio {
       bool process_next_message(const connection_ptr& conn, uint32_t message_length);
 
       void close(const connection_ptr& c);
-      size_t count_open_sockets() const;
 
       void accepted_block(const block_state_ptr&);
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
@@ -2349,16 +2348,6 @@ namespace eosio {
       return true;
    }
 
-   size_t net_plugin_impl::count_open_sockets() const
-   {
-      size_t count = 0;
-      for( auto &c : connections) {
-         if(c->socket->is_open())
-            ++count;
-      }
-      return count;
-   }
-
    bool net_plugin_impl::is_valid(const handshake_message& msg) {
       // Do some basic validation of an incoming handshake_message, so things
       // that really aren't handshake messages can be quickly discarded without
@@ -3443,10 +3432,6 @@ namespace eosio {
       FC_CAPTURE_AND_RETHROW()
    }
 
-   size_t net_plugin::num_peers() const {
-      return my->count_open_sockets();
-   }
-
    /**
     *  Used to trigger a new connection from RPC API
     */

From c2b934417bacdcf00bb982413038e3b5f8fdd924 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Mar 2019 08:21:39 -0500
Subject: [PATCH 0136/1648] Protect start_read_message via strand

---
 plugins/net_plugin/net_plugin.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7286d4eac28..976ea7e44c7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -549,7 +549,11 @@ namespace eosio {
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
       boost::asio::io_context::strand           strand;
+<<<<<<< HEAD
       socket_ptr                                socket;
+=======
+      socket_ptr                                socket; // only accessed through strand after construction
+>>>>>>> Protect start_read_message via strand
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
 <<<<<<< HEAD
@@ -777,7 +781,11 @@ namespace eosio {
    connection::connection( string endpoint )
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
+<<<<<<< HEAD
         strand( app().get_io_service() ),
+=======
+        strand( *my_impl->server_ioc ),
+>>>>>>> Protect start_read_message via strand
         socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
@@ -802,7 +810,11 @@ namespace eosio {
    connection::connection( socket_ptr s )
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
+<<<<<<< HEAD
         strand( app().get_io_service() ),
+=======
+        strand( *my_impl->server_ioc ),
+>>>>>>> Protect start_read_message via strand
         socket( s ),
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
@@ -2001,7 +2013,7 @@ namespace eosio {
          return false;
       }
       else {
-         boost::asio::post(*server_ioc, [this, con]() {
+         con->strand.post( [this, con]() {
             start_read_message( con );
          });
          ++started_sessions;
@@ -2080,7 +2092,7 @@ namespace eosio {
       });
    }
 
-   // only called from server_ioc thread
+   // only called from strand thread
    void net_plugin_impl::start_read_message(const connection_ptr& conn) {
 
       try {
@@ -2167,7 +2179,7 @@ namespace eosio {
             if( !conn->read_delay_timer ) return;
             conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
             conn->read_delay_timer->async_wait(
-                  app().get_priority_queue().wrap( priority::low, [this, weak_conn]( boost::system::error_code ) {
+                  boost::asio::bind_executor(conn->strand, [this, weak_conn]( boost::system::error_code ) {
                auto conn = weak_conn.lock();
                if( !conn ) return;
                start_read_message( conn );
@@ -2288,7 +2300,7 @@ namespace eosio {
                      close( conn );
                   });
                }
-         });
+         }));
       } catch (...) {
          fc_elog( logger, "Undefined exception in start_read_message" );
          connection_wptr weak_conn = conn;

From 3b9b19517d775a27d516b968d0b5c3f63849b8e0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Mar 2019 23:19:07 -0500
Subject: [PATCH 0137/1648] Made all access to impl->connections thread safe

---
 plugins/net_plugin/net_plugin.cpp | 394 ++++++++++++++++--------------
 1 file changed, 217 insertions(+), 177 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 976ea7e44c7..d1b899c32c6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -56,6 +56,14 @@ namespace eosio {
    using socket_ptr = std::shared_ptr<tcp::socket>;
    using io_work_t = boost::asio::executor_work_guard<boost::asio::io_context::executor_type>;
 
+   template <typename Strand>
+   void verify_strand_in_this_thread(const Strand& strand, const char* func, int line) {
+      if( !strand.running_in_this_thread() ) {
+         elog( "wrong strand: ${f} : line ${n}, exiting", ("f", func)("n", line) );
+         app().quit();
+      }
+   }
+
    struct node_transaction_state {
       transaction_id_type id;
       time_point_sec  expires;        /// time after which this may be purged.
@@ -199,7 +207,6 @@ namespace eosio {
       string                           p2p_server_address;
       uint32_t                         max_client_count = 0;
       uint32_t                         max_nodes_per_host = 1;
-      uint32_t                         num_clients = 0;
       uint32_t                         current_connection_id = 0;
 
       vector<string>                   supplied_peers;
@@ -217,7 +224,8 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      std::set< connection_ptr >       connections;
+      mutable std::mutex               connections_mtx;
+      std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
       unique_ptr< dispatch_manager >   dispatcher;
@@ -261,7 +269,7 @@ namespace eosio {
       optional<io_work_t>                       server_ioc_work;
 
 
-      void connect(const connection_ptr& c);
+      bool resolve_and_connect(const connection_ptr& c);
       void connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr);
       bool start_session(const connection_ptr& c);
       void start_listen_loop();
@@ -277,8 +285,6 @@ namespace eosio {
        */
       bool process_next_message(const connection_ptr& conn, uint32_t message_length);
 
-      void close(const connection_ptr& c);
-
       void accepted_block(const block_state_ptr&);
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
       void on_irreversible_block( const block_state_ptr& blk ) {
@@ -542,8 +548,19 @@ namespace eosio {
 
       explicit connection( socket_ptr s );
       ~connection();
+
+      void start();
+
+      bool socket_is_open() const { return socket_open.load(); } // thread safe
+      const string& peer_address() const { return peer_addr; } // thread safe
+      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; } // thread safe, not updated after start()
+
    private:
+      static const string unknown;
+
       void initialize(); // only called from constructor
+      void update_endpoints();
+
    public:
 
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
@@ -553,7 +570,13 @@ namespace eosio {
       socket_ptr                                socket;
 =======
       socket_ptr                                socket; // only accessed through strand after construction
+<<<<<<< HEAD
 >>>>>>> Protect start_read_message via strand
+=======
+   private:
+      std::atomic<bool>                         socket_open{false};
+   public:
+>>>>>>> Made all access to impl->connections thread safe
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
 <<<<<<< HEAD
@@ -587,14 +610,21 @@ namespace eosio {
       bool                    connecting = false;
       bool                    syncing = false;
       uint16_t                protocol_version  = 0;
-      string                  peer_addr;
+   private:
+      const string            peer_addr;
+      string                  remote_endpoint_ip;     // not updated after start
+      string                  remote_endpoint_port;   // not updated after start
+      string                  local_endpoint_ip;      // not updated after start
+      string                  local_endpoint_port;    // not updated after start
+   public:
+
       std::mutex                            response_expected_timer_mtx;
       unique_ptr<boost::asio::steady_timer> response_expected_timer;
       std::mutex                            read_delay_timer_mtx;
       unique_ptr<boost::asio::steady_timer> read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
-      uint32_t               fork_head_num = 0;
+      std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
       optional<request_message> last_req;
 
       connection_status get_status()const {
@@ -683,30 +713,24 @@ namespace eosio {
       fc::optional<fc::variant_object> _logger_variant;
       const fc::variant_object& get_logger_variant()  {
          if (!_logger_variant) {
-            boost::system::error_code ec;
-            auto rep = socket->remote_endpoint(ec);
-            string ip = ec ? "<unknown>" : rep.address().to_string();
-            string port = ec ? "<unknown>" : std::to_string(rep.port());
-
-            auto lep = socket->local_endpoint(ec);
-            string lip = ec ? "<unknown>" : lep.address().to_string();
-            string lport = ec ? "<unknown>" : std::to_string(lep.port());
-
             _logger_variant.emplace(fc::mutable_variant_object()
                ("_name", peer_name())
                ("_id", node_id)
                ("_sid", ((string)node_id).substr(0, 7))
-               ("_ip", ip)
-               ("_port", port)
-               ("_lip", lip)
-               ("_lport", lport)
+               ("_ip", remote_endpoint_ip)
+               ("_port", remote_endpoint_port)
+               ("_lip", local_endpoint_ip)
+               ("_lport", local_endpoint_port)
             );
          }
          return *_logger_variant;
       }
    };
 
-   struct msg_handler : public fc::visitor<void> {
+   const string connection::unknown = "<unknown>";
+
+
+struct msg_handler : public fc::visitor<void> {
       net_plugin_impl& impl;
       connection_ptr c;
       msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
@@ -799,8 +823,6 @@ namespace eosio {
         response_expected_timer(),
         read_delay_timer(),
         no_retry(no_reason),
-        fork_head(),
-        fork_head_num(0),
         last_req()
    {
       fc_ilog( logger, "created connection to ${n}", ("n", endpoint) );
@@ -828,8 +850,6 @@ namespace eosio {
         response_expected_timer(),
         read_delay_timer(),
         no_retry(no_reason),
-        fork_head(),
-        fork_head_num(0),
         last_req()
    {
       fc_ilog( logger, "accepted network connection" );
@@ -848,8 +868,26 @@ namespace eosio {
       read_delay_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
    }
 
+   void connection::update_endpoints() {
+      boost::system::error_code ec;
+      auto rep = socket->remote_endpoint(ec);
+      remote_endpoint_ip = ec ? unknown : rep.address().to_string();
+      remote_endpoint_port = ec ? unknown : std::to_string(rep.port());
+
+      auto lep = socket->local_endpoint(ec);
+      local_endpoint_ip = ec ? unknown : lep.address().to_string();
+      local_endpoint_port = ec ? unknown : std::to_string(lep.port());
+   }
+
+   void connection::start() {
+      verify_strand_in_this_thread( strand, __func__, __LINE__ );
+
+      update_endpoints();
+      socket_open = true;
+   }
+
    bool connection::connected() {
-      return (socket && socket->is_open() && !connecting);
+      return socket_is_open() && !connecting;
    }
 
    bool connection::current() {
@@ -865,12 +903,8 @@ namespace eosio {
    }
 
    void connection::close() {
-      if(socket) {
-         socket->close();
-      }
-      else {
-         fc_wlog( logger, "no socket to close!" );
-      }
+      socket_open = false;
+      socket->close();
       flush_queues();
       connecting = false;
       syncing = false;
@@ -1016,7 +1050,7 @@ namespace eosio {
       if( !buffer_queue.add_write_queue( buff, callback, to_sync_queue )) {
          fc_wlog( logger, "write_queue full ${s} bytes, giving up on connection ${p}",
                   ("s", buffer_queue.write_queue_size())("p", peer_name()) );
-         my_impl->close( shared_from_this() );
+         close();
          return;
       }
       if( buffer_queue.is_out_queue_empty() && trigger_send) {
@@ -1030,7 +1064,7 @@ namespace eosio {
       connection_wptr c(shared_from_this());
       if(!socket->is_open()) {
          fc_elog(logger,"socket not open to ${p}",("p",peer_name()));
-         my_impl->close(c.lock());
+         close();
          return;
       }
       std::vector<boost::asio::const_buffer> bufs;
@@ -1054,7 +1088,7 @@ namespace eosio {
                   else {
                      fc_wlog( logger, "connection closure detected on write to ${p}",("p",pname) );
                   }
-                  my_impl->close(conn);
+                  conn->close();
                   return;
                }
                conn->buffer_queue.clear_out_queue();
@@ -1189,7 +1223,7 @@ namespace eosio {
                         if (close_after_send != no_reason) {
                            fc_elog( logger, "sent a go away message: ${r}, closing connection to ${p}",
                                     ("r", reason_str(close_after_send))("p", conn->peer_name()) );
-                           my_impl->close(conn);
+                           conn->close();
                            return;
                         }
                      } else {
@@ -1257,15 +1291,11 @@ namespace eosio {
       if( !last_handshake_recv.p2p_address.empty() ) {
          return last_handshake_recv.p2p_address;
       }
-      if( !peer_addr.empty() ) {
-         return peer_addr;
+      if( !peer_address().empty() ) {
+         return peer_address();
       }
-      if( socket != nullptr ) {
-         boost::system::error_code ec;
-         auto rep = socket->remote_endpoint(ec);
-         if( !ec ) {
-            return rep.address().to_string() + ':' + std::to_string( rep.port() );
-         }
+      if( remote_endpoint_port != unknown ) {
+         return remote_endpoint_ip + ":" + remote_endpoint_port;
       }
       return "connecting client";
    }
@@ -1321,12 +1351,13 @@ namespace eosio {
       state = newstate;
    }
 
+   // uses controller, only call from application thread
    bool sync_manager::is_active(const connection_ptr& c) {
       if (state == head_catchup && c) {
+         auto fork_head_num = c->fork_head_num.load(); // provide memory barrier for c->fork_head
          bool fhset = c->fork_head != block_id_type();
-         fc_dlog(logger, "fork_head_num = ${fn} fork_head set = ${s}",
-                 ("fn", c->fork_head_num)("s", fhset));
-            return c->fork_head != block_id_type() && c->fork_head_num < chain_plug->chain().fork_db_head_block_num();
+         fc_dlog( logger, "fork_head_num = ${fn} fork_head set = ${s}", ("fn", fork_head_num)( "s", fhset ) );
+         return c->fork_head != block_id_type() && fork_head_num < chain_plug->chain().fork_db_head_block_num();
       }
       return state != in_sync;
    }
@@ -1370,14 +1401,13 @@ namespace eosio {
 
       if (conn && conn->current() ) {
          source = conn;
-      }
-      else {
+      } else {
+         std::lock_guard<std::mutex> g( my_impl->connections_mtx );
          if (my_impl->connections.size() == 1) {
             if (!source) {
                source = *my_impl->connections.begin();
             }
-         }
-         else {
+         } else {
             // init to a linear array search
             auto cptr = my_impl->connections.begin();
             auto cend = my_impl->connections.end();
@@ -1438,8 +1468,9 @@ namespace eosio {
 
    void sync_manager::send_handshakes()
    {
-      for( auto &ci : my_impl->connections) {
-         if( ci->current()) {
+      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+      for( auto& ci : my_impl->connections ) {
+         if( ci->current() ) {
             ci->send_handshake();
          }
       }
@@ -1557,13 +1588,15 @@ namespace eosio {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
+      std::unique_lock<std::mutex> g( my_impl->connections_mtx );
       for (const auto& cc : my_impl->connections) {
-         if (cc->fork_head == id ||
-             cc->fork_head_num > num) {
+         // fork_head_num provides memory barrier for fork_head
+         if( cc->fork_head_num > num || cc->fork_head == id ) {
             req.req_blocks.mode = none;
             break;
          }
       }
+      g.unlock();
       if( req.req_blocks.mode == catch_up ) {
          c->fork_head = id;
          c->fork_head_num = num;
@@ -1572,8 +1605,7 @@ namespace eosio {
          if (state == lib_catchup)
             return;
          set_state(head_catchup);
-      }
-      else {
+      } else {
          c->fork_head = block_id_type();
          c->fork_head_num = 0;
       }
@@ -1588,7 +1620,7 @@ namespace eosio {
       if( msg.known_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
                   ("s", msg.known_blocks.ids.size())("p", c->peer_name()) );
-         my_impl->close(c);
+         c->close();
          return;
       }
       if (msg.known_blocks.mode == catch_up) {
@@ -1609,7 +1641,7 @@ namespace eosio {
          fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_name()) );
          sync_last_requested_num = 0;
          source.reset();
-         my_impl->close(c);
+         c->close();
          set_state(in_sync);
          send_handshakes();
       }
@@ -1620,7 +1652,7 @@ namespace eosio {
          if (blk_num != sync_next_expected_num) {
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
                      ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_name()) );
-            my_impl->close(c);
+            c->close();
             return;
          }
          sync_next_expected_num = blk_num + 1;
@@ -1631,18 +1663,20 @@ namespace eosio {
          source.reset();
 
          block_id_type null_id;
-         for (const auto& cp : my_impl->connections) {
+         std::unique_lock<std::mutex> g( my_impl->connections_mtx );
+         for( const auto& cp : my_impl->connections ) {
+            uint32_t fork_head_num = cp->fork_head_num.load(); // fork_head_num provides memory barrier for fork_head
             if (cp->fork_head == null_id) {
                continue;
             }
-            if (cp->fork_head == blk_id || cp->fork_head_num < blk_num) {
+            if( fork_head_num < blk_num || cp->fork_head == blk_id ) {
                c->fork_head = null_id;
                c->fork_head_num = 0;
-            }
-            else {
+            } else {
                set_state(head_catchup);
             }
          }
+         g.unlock();
 
          if (state == in_sync) {
             send_handshakes();
@@ -1764,6 +1798,7 @@ namespace eosio {
       fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
 
       std::shared_ptr<std::vector<char>> send_buffer;
+      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
@@ -1810,6 +1845,7 @@ namespace eosio {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
+      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
@@ -1905,6 +1941,7 @@ namespace eosio {
                   ("b",modes_str(c->last_req->req_blocks.mode))("t",modes_str(c->last_req->req_trx.mode)));
          return;
       }
+      std::unique_lock<std::mutex> g( my_impl->connections_mtx );
       for (auto& conn : my_impl->connections) {
          if (conn == c || conn->last_req) {
             continue;
@@ -1917,6 +1954,7 @@ namespace eosio {
             return;
          }
       }
+      g.unlock();
 
       // at this point no other peer has it, re-request or do nothing?
       if( c->connected() ) {
@@ -1927,29 +1965,30 @@ namespace eosio {
 
    //------------------------------------------------------------------------
 
-   void net_plugin_impl::connect(const connection_ptr& c) {
+   bool net_plugin_impl::resolve_and_connect(const connection_ptr& c) {
       if( c->no_retry != go_away_reason::no_reason) {
          fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( c->no_retry )));
-         return;
+         return false;
       }
 
-      auto colon = c->peer_addr.find(':');
+      auto colon = c->peer_address().find(':');
 
       if (colon == std::string::npos || colon == 0) {
-         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p",c->peer_addr) );
-         for ( auto itr : connections ) {
-            if((*itr).peer_addr == c->peer_addr) {
-               (*itr).reset();
-               close(itr);
-               connections.erase(itr);
+         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p",c->peer_address()) );
+         std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+         for ( auto& cp : connections ) {
+            if( cp->peer_address() == c->peer_address() ) {
+               cp->reset();
+               cp->close();
+               connections.erase( cp );
                break;
             }
          }
-         return;
+         return false;
       }
 
-      auto host = c->peer_addr.substr( 0, colon );
-      auto port = c->peer_addr.substr( colon + 1);
+      auto host = c->peer_address().substr( 0, colon );
+      auto port = c->peer_address().substr( colon + 1);
       idump((host)(port));
       tcp::resolver::query query( tcp::v4(), host.c_str(), port.c_str() );
       connection_wptr weak_conn = c;
@@ -1963,11 +2002,16 @@ namespace eosio {
                       if( !err ) {
                          connect( c, endpoint_itr );
                       } else {
-                         fc_elog( logger, "Unable to resolve ${peer_addr}: ${error}",
-                                  ("peer_addr", c->peer_name())( "error", err.message()) );
+                         fc_elog( logger, "Unable to resolve ${add}: ${error}",
+                                  ("add", c->peer_name())( "error", err.message()) );
                       }
                    } );
+<<<<<<< HEAD
                 } ) );
+=======
+                } );
+      return true;
+>>>>>>> Made all access to impl->connections thread safe
    }
 
    void net_plugin_impl::connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr) {
@@ -1990,12 +2034,12 @@ namespace eosio {
                }
             } else {
                if( endpoint_itr != tcp::resolver::iterator()) {
-                  close( c );
+                  c->close();
                   connect( c, endpoint_itr );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;
-                  my_impl->close( c );
+                  c->close();
                }
             }
          } );
@@ -2009,11 +2053,11 @@ namespace eosio {
       if (ec) {
          fc_elog( logger, "connection failed to ${peer}: ${error}", ( "peer", con->peer_name())("error",ec.message()) );
          con->connecting = false;
-         close(con);
+         con->close();
          return false;
-      }
-      else {
+      } else {
          con->strand.post( [this, con]() {
+            con->start();
             start_read_message( con );
          });
          ++started_sessions;
@@ -2026,69 +2070,65 @@ namespace eosio {
 
 
    void net_plugin_impl::start_listen_loop() {
-      auto socket = std::make_shared<tcp::socket>( std::ref( *server_ioc ) );
-      acceptor->async_accept( *socket, [socket, this, ioc = server_ioc]( boost::system::error_code ec ) {
-            app().post( priority::low, [socket, this, ec, ioc{std::move(ioc)}]() {
-            if( !ec ) {
-               uint32_t visitors = 0;
-               uint32_t from_addr = 0;
-               boost::system::error_code rec;
-               auto paddr = socket->remote_endpoint(rec).address();
-               if (rec) {
-                  fc_elog(logger,"Error getting remote endpoint: ${m}",("m", rec.message()));
-               }
-               else {
-                  for (auto &conn : connections) {
-                     if(conn->socket->is_open()) {
-                        if (conn->peer_addr.empty()) {
-                           visitors++;
-                           boost::system::error_code ec;
-                           if (paddr == conn->socket->remote_endpoint(ec).address()) {
-                              from_addr++;
-                           }
+      auto new_socket = std::make_shared<tcp::socket>( std::ref( *server_ioc ) );
+      acceptor->async_accept( *new_socket, [new_socket, this, ioc = server_ioc]( boost::system::error_code ec ) {
+         // called from thread_pool threads, new_socket not shared yet
+         if( !ec ) {
+            uint32_t visitors = 0;
+            uint32_t from_addr = 0;
+            boost::system::error_code rec;
+            const auto& paddr_add = new_socket->remote_endpoint( rec ).address();
+            string paddr_str;
+            if( rec ) {
+               fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
+            } else {
+               paddr_str = paddr_add.to_string();
+               std::unique_lock<std::mutex> g( connections_mtx );
+               for( auto& conn : connections ) {
+                  if( conn->socket_is_open() ) {
+                     if( conn->peer_address().empty() ) {
+                        ++visitors;
+                        if( paddr_str == conn->remote_address() ) {
+                           ++from_addr;
                         }
                      }
                   }
-                  if (num_clients != visitors) {
-                     fc_ilog( logger,"checking max client, visitors = ${v} num clients ${n}",("v",visitors)("n",num_clients) );
-                     num_clients = visitors;
+               }
+               g.unlock();
+               if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
+                  connection_ptr new_connection = std::make_shared<connection>( new_socket );
+                  if( start_session( new_connection ) ) {
+                     g.lock();
+                     connections.insert( new_connection );
+                     g.unlock();
                   }
-                  if( from_addr < max_nodes_per_host && (max_client_count == 0 || num_clients < max_client_count )) {
-                     ++num_clients;
-                     connection_ptr c = std::make_shared<connection>( socket );
-                     connections.insert( c );
-                     start_session( c );
 
+               } else {
+                  if( from_addr >= max_nodes_per_host ) {
+                     fc_elog( logger, "Number of connections (${n}) from ${ra} exceeds limit",
+                              ("n", from_addr + 1)( "ra", paddr_str ) );
+                  } else {
+                     fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count) );
                   }
-                  else {
-                     if (from_addr >= max_nodes_per_host) {
-                        fc_elog(logger, "Number of connections (${n}) from ${ra} exceeds limit",
-                                ("n", from_addr+1)("ra",paddr.to_string()));
-                     }
-                     else {
-                        fc_elog(logger, "Error max_client_count ${m} exceeded",
-                                ( "m", max_client_count) );
-                     }
-                     socket->close();
-                  }
-               }
-            } else {
-               fc_elog( logger, "Error accepting connection: ${m}",( "m", ec.message() ) );
-               // For the listed error codes below, recall start_listen_loop()
-               switch (ec.value()) {
-                  case ECONNABORTED:
-                  case EMFILE:
-                  case ENFILE:
-                  case ENOBUFS:
-                  case ENOMEM:
-                  case EPROTO:
-                     break;
-                  default:
-                     return;
+                  new_socket->close(); // new_socket never associated with a connection
                }
             }
-            start_listen_loop();
-         });
+         } else {
+            fc_elog( logger, "Error accepting connection: ${m}", ("m", ec.message()) );
+            // For the listed error codes below, recall start_listen_loop()
+            switch( ec.value() ) {
+               case ECONNABORTED:
+               case EMFILE:
+               case ENFILE:
+               case ENOBUFS:
+               case ENOMEM:
+               case EPROTO:
+                  break;
+               default:
+                  return;
+            }
+         }
+         start_listen_loop();
       });
    }
 
@@ -2171,7 +2211,7 @@ namespace eosio {
                   auto conn = weak_conn.lock();
                   if( !conn ) return;
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                  my_impl->close( conn );
+                  conn->close();
                });
                return;
             }
@@ -2278,6 +2318,7 @@ namespace eosio {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                   connection_wptr weak_conn = conn;
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
@@ -2294,21 +2335,24 @@ namespace eosio {
 >>>>>>> Make delay_timer thread safe
                   app().post( priority::medium, [this, weak_conn]() {
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
+=======
+                  app().post( priority::medium, [weak_conn]() {
+>>>>>>> Made all access to impl->connections thread safe
                      auto conn = weak_conn.lock();
                      if( !conn ) return;
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                     close( conn );
+                     conn->close();
                   });
                }
          }));
       } catch (...) {
          fc_elog( logger, "Undefined exception in start_read_message" );
          connection_wptr weak_conn = conn;
-         app().post( priority::medium, [this, weak_conn]() {
+         app().post( priority::medium, [weak_conn]() {
             auto conn = weak_conn.lock();
             if( !conn ) return;
             fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-            close( conn );
+            conn->close();
          });
       }
    }
@@ -2354,7 +2398,7 @@ namespace eosio {
       } catch( const fc::exception& e ) {
          fc_elog( logger, "Exception in handling message from ${p}: ${s}",
                   ("p", conn->peer_name())("s", e.to_detail_string()) );
-         close( conn );
+         conn->close();
          return false;
       }
       return true;
@@ -2409,9 +2453,10 @@ namespace eosio {
             return;
          }
 
-         if( c->peer_addr.empty() || c->last_handshake_recv.node_id == fc::sha256()) {
+         if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
             fc_dlog(logger, "checking for duplicate" );
-            for(const auto &check : connections) {
+            std::lock_guard<std::mutex> g( connections_mtx );
+            for(const auto& check : connections) {
                if(check == c)
                   continue;
                if(check->connected() && check->peer_name() == msg.p2p_address) {
@@ -2430,9 +2475,9 @@ namespace eosio {
                   return;
                }
             }
-         }
-         else {
-            fc_dlog(logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",("pa",c->peer_addr)("ni",c->last_handshake_recv.node_id));
+         } else {
+            fc_dlog( logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",
+                     ("pa", c->peer_address())( "ni", c->last_handshake_recv.node_id ) );
          }
 
          if( msg.chain_id != chain_id) {
@@ -2503,7 +2548,7 @@ namespace eosio {
          c->node_id = msg.node_id;
       }
       c->flush_queues();
-      close(c);
+      c->close();
    }
 
    void net_plugin_impl::handle_message(const connection_ptr& c, const time_message& msg) {
@@ -2596,7 +2641,7 @@ namespace eosio {
       if( msg.req_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid request_message, req_blocks.ids.size ${s}, closing ${p}",
                   ("s", msg.req_blocks.ids.size())("p",c->peer_name()) );
-         close(c);
+         c->close();
          return;
       }
 
@@ -2624,8 +2669,8 @@ namespace eosio {
          // no break
       case normal :
          if( !msg.req_trx.ids.empty() ) {
-            elog( "Invalid request_message, req_trx.ids.size ${s}", ("s", msg.req_trx.ids.size()) );
-            close(c);
+            fc_elog( logger, "Invalid request_message, req_trx.ids.size ${s}", ("s", msg.req_trx.ids.size()) );
+            c->close();
             return;
          }
          break;
@@ -2949,8 +2994,9 @@ namespace eosio {
             if( ec ) {
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
+            std::lock_guard<std::mutex> g( connections_mtx );
             for( auto& c : connections ) {
-               if( c->socket->is_open()) {
+               if( c->socket_is_open() ) {
                   c->send_time();
                }
             }
@@ -3006,6 +3052,7 @@ namespace eosio {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
+      std::unique_lock<std::mutex> g( connections_mtx );
       auto it = (from ? connections.find(from) : connections.begin());
       if (it == connections.end()) it = connections.begin();
       while (it != connections.end()) {
@@ -3013,32 +3060,20 @@ namespace eosio {
             start_conn_timer(std::chrono::milliseconds(1), *it); // avoid exhausting
             return;
          }
-         if( !(*it)->socket->is_open() && !(*it)->connecting) {
-            if( (*it)->peer_addr.length() > 0) {
-               connect(*it);
-            }
-            else {
+         if( !(*it)->socket_is_open() && !(*it)->connecting) {
+            if( (*it)->peer_address().length() > 0) {
+               resolve_and_connect(*it);
+            } else {
                it = connections.erase(it);
                continue;
             }
          }
          ++it;
       }
+      g.unlock();
       start_conn_timer(connector_period, std::weak_ptr<connection>());
    }
 
-   void net_plugin_impl::close(const connection_ptr& c) {
-      if( c->peer_addr.empty() && c->socket->is_open() ) {
-         if (num_clients == 0) {
-            fc_wlog( logger, "num_clients already at 0");
-         }
-         else {
-            --num_clients;
-         }
-      }
-      c->close();
-   }
-
    void net_plugin_impl::accepted_block(const block_state_ptr& block) {
       fc_dlog(logger,"signaled, id = ${id}",("id", block->id));
       dispatcher->bcast_block(block);
@@ -3241,7 +3276,6 @@ namespace eosio {
          my->resp_expected_period = def_resp_expected_wait;
          my->max_client_count = options.at( "max-clients" ).as<int>();
          my->max_nodes_per_host = options.at( "p2p-max-nodes-per-host" ).as<int>();
-         my->num_clients = 0;
          my->started_sessions = 0;
 
          my->use_socket_read_watermark = options.at( "use-socket-read-watermark" ).as<bool>();
@@ -3388,7 +3422,7 @@ namespace eosio {
 
       my->start_monitors();
 
-      for( auto seed_node : my->supplied_peers ) {
+      for( const auto& seed_node : my->supplied_peers ) {
          connect( seed_node );
       }
       handle_sighup();
@@ -3426,9 +3460,10 @@ namespace eosio {
             my->acceptor->close();
 
             fc_ilog( logger, "close ${s} connections",( "s",my->connections.size()) );
+            std::lock_guard<std::mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p",con->peer_name()) );
-               my->close( con );
+               con->close();
             }
             my->connections.clear();
          }
@@ -3453,18 +3488,21 @@ namespace eosio {
 
       connection_ptr c = std::make_shared<connection>(host);
       fc_dlog(logger,"adding new connection to the list");
+      std::unique_lock<std::mutex> g( my->connections_mtx );
       my->connections.insert( c );
+      g.unlock();
       fc_dlog(logger,"calling active connector");
-      my->connect( c );
+      my->resolve_and_connect( c );
       return "added connection";
    }
 
    string net_plugin::disconnect( const string& host ) {
+      std::lock_guard<std::mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
-         if( (*itr)->peer_addr == host ) {
+         if( (*itr)->peer_address() == host ) {
             (*itr)->reset();
             fc_ilog( logger, "disconnecting: ${p}", ("p", (*itr)->peer_name()) );
-            my->close(*itr);
+            (*itr)->close();
             my->connections.erase(itr);
             return "connection removed";
          }
@@ -3481,6 +3519,7 @@ namespace eosio {
 
    vector<connection_status> net_plugin::connections()const {
       vector<connection_status> result;
+      std::lock_guard<std::mutex> g( my->connections_mtx );
       result.reserve( my->connections.size() );
       for( const auto& c : my->connections ) {
          result.push_back( c->get_status() );
@@ -3488,8 +3527,9 @@ namespace eosio {
       return result;
    }
    connection_ptr net_plugin_impl::find_connection(const string& host )const {
+      std::lock_guard<std::mutex> g( connections_mtx );
       for( const auto& c : connections )
-         if( c->peer_addr == host ) return c;
+         if( c->peer_address() == host ) return c;
       return connection_ptr();
    }
 

From 4a40807dbbf04fa71772a82edc1bc6a888d4267e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Mar 2019 23:51:21 -0500
Subject: [PATCH 0138/1648] Fix deadlock on close when closing connection that
 is syncing from peer

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d1b899c32c6..8cdccb7c9ee 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -915,7 +915,7 @@ struct msg_handler : public fc::visitor<void> {
       sent_handshake_count = 0;
       last_handshake_recv = handshake_message();
       last_handshake_sent = handshake_message();
-      my_impl->sync_master->reset_lib_num(shared_from_this());
+      my_impl->sync_master->reset_lib_num(nullptr);
       fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
       cancel_wait();
 <<<<<<< HEAD
@@ -1366,6 +1366,7 @@ struct msg_handler : public fc::visitor<void> {
       if(state == in_sync) {
          source.reset();
       }
+      if( !c ) return;
       if( c->current() ) {
          if( c->last_handshake_recv.last_irreversible_block_num > sync_known_lib_num) {
             sync_known_lib_num =c->last_handshake_recv.last_irreversible_block_num;

From a0489e137a10d375079f4636570a053340691c11 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Mar 2019 13:28:15 -0500
Subject: [PATCH 0139/1648] Move socket ownership into connection.

---
 plugins/net_plugin/net_plugin.cpp | 279 ++++++++++++++++--------------
 1 file changed, 149 insertions(+), 130 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8cdccb7c9ee..7d201ee720f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -53,7 +53,6 @@ namespace eosio {
    using connection_ptr = std::shared_ptr<connection>;
    using connection_wptr = std::weak_ptr<connection>;
 
-   using socket_ptr = std::shared_ptr<tcp::socket>;
    using io_work_t = boost::asio::executor_work_guard<boost::asio::io_context::executor_type>;
 
    template <typename Strand>
@@ -207,7 +206,7 @@ namespace eosio {
       string                           p2p_server_address;
       uint32_t                         max_client_count = 0;
       uint32_t                         max_nodes_per_host = 1;
-      uint32_t                         current_connection_id = 0;
+      std::atomic<uint32_t>            current_connection_id{0};
 
       vector<string>                   supplied_peers;
       vector<chain::public_key_type>   allowed_peers; ///< peer keys allowed to connect
@@ -224,7 +223,7 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      mutable std::mutex               connections_mtx;
+      mutable std::mutex               connections_mtx; // switch to shared_mutex in C++17
       std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
@@ -254,7 +253,6 @@ namespace eosio {
       string                        user_agent_name;
       chain_plugin*                 chain_plug = nullptr;
       producer_plugin*              producer_plug = nullptr;
-      int                           started_sessions = 0;
 
       shared_ptr<tcp::resolver>     resolver;
 
@@ -271,7 +269,6 @@ namespace eosio {
 
       bool resolve_and_connect(const connection_ptr& c);
       void connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr);
-      bool start_session(const connection_ptr& c);
       void start_listen_loop();
       void start_read_message(const connection_ptr& c);
 
@@ -546,19 +543,18 @@ namespace eosio {
    public:
       explicit connection( string endpoint );
 
-      explicit connection( socket_ptr s );
+      connection();
       ~connection();
 
-      void start();
+      bool start_session();
 
-      bool socket_is_open() const { return socket_open.load(); } // thread safe
-      const string& peer_address() const { return peer_addr; } // thread safe
-      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; } // thread safe, not updated after start()
+      bool socket_is_open() const { return socket_open.load(); } // thread safe, atomic
+      const string& peer_address() const { return peer_addr; } // thread safe, const
+      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; } // thread safe, not updated after start_session()
 
    private:
       static const string unknown;
 
-      void initialize(); // only called from constructor
       void update_endpoints();
 
    public:
@@ -566,6 +562,7 @@ namespace eosio {
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
       boost::asio::io_context::strand           strand;
+<<<<<<< HEAD
 <<<<<<< HEAD
       socket_ptr                                socket;
 =======
@@ -573,6 +570,9 @@ namespace eosio {
 <<<<<<< HEAD
 >>>>>>> Protect start_read_message via strand
 =======
+=======
+      tcp::socket                               socket; // only accessed through strand after construction
+>>>>>>> Move socket ownership into connection.
    private:
       std::atomic<bool>                         socket_open{false};
    public:
@@ -619,9 +619,9 @@ namespace eosio {
    public:
 
       std::mutex                            response_expected_timer_mtx;
-      unique_ptr<boost::asio::steady_timer> response_expected_timer;
+      boost::asio::steady_timer             response_expected_timer;
       std::mutex                            read_delay_timer_mtx;
-      unique_ptr<boost::asio::steady_timer> read_delay_timer;
+      boost::asio::steady_timer             read_delay_timer;
       go_away_reason         no_retry = no_reason;
       block_id_type          fork_head;
       std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
@@ -657,6 +657,9 @@ namespace eosio {
       bool current();
       void reset();
       void close();
+   private:
+      static void _close( connection* self ); // for easy capture
+   public:
       void send_handshake();
 
       /** \name Peer Timestamps
@@ -809,8 +812,12 @@ struct msg_handler : public fc::visitor<void> {
         strand( app().get_io_service() ),
 =======
         strand( *my_impl->server_ioc ),
+<<<<<<< HEAD
 >>>>>>> Protect start_read_message via strand
         socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
+=======
+        socket( *my_impl->server_ioc ),
+>>>>>>> Move socket ownership into connection.
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
         last_handshake_recv(),
@@ -820,24 +827,28 @@ struct msg_handler : public fc::visitor<void> {
         syncing(false),
         protocol_version(0),
         peer_addr(endpoint),
-        response_expected_timer(),
-        read_delay_timer(),
+        response_expected_timer( *my_impl->server_ioc ),
+        read_delay_timer( *my_impl->server_ioc ),
         no_retry(no_reason),
         last_req()
    {
       fc_ilog( logger, "created connection to ${n}", ("n", endpoint) );
-      initialize();
+      node_id.data()[0] = 0;
    }
 
-   connection::connection( socket_ptr s )
+   connection::connection()
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
 <<<<<<< HEAD
         strand( app().get_io_service() ),
 =======
         strand( *my_impl->server_ioc ),
+<<<<<<< HEAD
 >>>>>>> Protect start_read_message via strand
         socket( s ),
+=======
+        socket( *my_impl->server_ioc ),
+>>>>>>> Move socket ownership into connection.
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
         last_handshake_recv(),
@@ -847,43 +858,47 @@ struct msg_handler : public fc::visitor<void> {
         syncing(false),
         protocol_version(0),
         peer_addr(),
-        response_expected_timer(),
-        read_delay_timer(),
+        response_expected_timer( *my_impl->server_ioc ),
+        read_delay_timer( *my_impl->server_ioc ),
         no_retry(no_reason),
         last_req()
    {
       fc_ilog( logger, "accepted network connection" );
-      initialize();
+      node_id.data()[0] = 0;
    }
 
    connection::~connection() {
       pending_message_buffer.reset();
    }
 
-   void connection::initialize() {
-      auto *rnd = node_id.data();
-      rnd[0] = 0;
-      // called only from constructor, no mutex needed
-      response_expected_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
-      read_delay_timer.reset(new boost::asio::steady_timer( *my_impl->server_ioc ));
-   }
-
    void connection::update_endpoints() {
       boost::system::error_code ec;
-      auto rep = socket->remote_endpoint(ec);
+      auto rep = socket.remote_endpoint(ec);
       remote_endpoint_ip = ec ? unknown : rep.address().to_string();
       remote_endpoint_port = ec ? unknown : std::to_string(rep.port());
 
-      auto lep = socket->local_endpoint(ec);
+      auto lep = socket.local_endpoint(ec);
       local_endpoint_ip = ec ? unknown : lep.address().to_string();
       local_endpoint_port = ec ? unknown : std::to_string(lep.port());
    }
 
-   void connection::start() {
+   bool connection::start_session() {
       verify_strand_in_this_thread( strand, __func__, __LINE__ );
 
       update_endpoints();
-      socket_open = true;
+      boost::asio::ip::tcp::no_delay nodelay( true );
+      boost::system::error_code ec;
+      socket.set_option( nodelay, ec );
+      if( ec ) {
+         fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", peer_name())( "error", ec.message() ) );
+         connecting = false;
+         close();
+         return false;
+      } else {
+         socket_open = true;
+         my_impl->start_read_message( shared_from_this() );
+         return true;
+      }
    }
 
    bool connection::connected() {
@@ -903,14 +918,21 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void connection::close() {
-      socket_open = false;
-      socket->close();
-      flush_queues();
-      connecting = false;
-      syncing = false;
-      if( last_req ) {
-         my_impl->dispatcher->retry_fetch(shared_from_this());
+      strand.dispatch( [self = shared_from_this()]() {
+         connection::_close( self.get() );
+      });
+   }
+
+   void connection::_close( connection* self ) {
+      self->socket_open = false;
+      self->socket.close();
+      self->flush_queues();
+      self->connecting = false;
+      self->syncing = false;
+      if( self->last_req ) {
+         my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
+<<<<<<< HEAD
       reset();
       sent_handshake_count = 0;
       last_handshake_recv = handshake_message();
@@ -938,6 +960,18 @@ struct msg_handler : public fc::visitor<void> {
       std::lock_guard<std::mutex> g( read_delay_timer_mtx );
       if( read_delay_timer ) read_delay_timer->cancel();
 >>>>>>> Use unique_lock instead of lock_guard to clean up code
+=======
+      self->reset();
+      self->sent_handshake_count = 0;
+      self->last_handshake_recv = handshake_message();
+      self->last_handshake_sent = handshake_message();
+      my_impl->sync_master->reset_lib_num( nullptr );
+      fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) );
+      self->cancel_wait();
+
+      std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
+      self->read_delay_timer.cancel();
+>>>>>>> Move socket ownership into connection.
    }
 
    void connection::blk_send_branch() {
@@ -1061,56 +1095,45 @@ struct msg_handler : public fc::visitor<void> {
    void connection::do_queue_write(int priority) {
       if( !buffer_queue.ready_to_send() )
          return;
-      connection_wptr c(shared_from_this());
-      if(!socket->is_open()) {
-         fc_elog(logger,"socket not open to ${p}",("p",peer_name()));
-         close();
-         return;
-      }
+      connection_ptr c(shared_from_this());
+
       std::vector<boost::asio::const_buffer> bufs;
       buffer_queue.fill_out_buffer( bufs );
 
+<<<<<<< HEAD
       boost::asio::async_write(*socket, bufs,
             boost::asio::bind_executor(strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
          app().post(priority, [c, priority, ec, w]() {
+=======
+      boost::asio::async_write( socket, bufs,
+            boost::asio::bind_executor( strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
+>>>>>>> Move socket ownership into connection.
             try {
-               auto conn = c.lock();
-               if(!conn)
-                  return;
+               c->buffer_queue.out_callback( ec, w );
 
-               conn->buffer_queue.out_callback( ec, w );
-
-               if(ec) {
-                  string pname = conn ? conn->peer_name() : "no connection name";
-                  if( ec.value() != boost::asio::error::eof) {
-                     fc_elog( logger, "Error sending to peer ${p}: ${i}", ("p",pname)("i", ec.message()) );
-                  }
-                  else {
-                     fc_wlog( logger, "connection closure detected on write to ${p}",("p",pname) );
+               if( ec ) {
+                  if( ec.value() != boost::asio::error::eof ) {
+                     fc_elog( logger, "Error sending to peer ${p}: ${i}", ("p", c->peer_name())( "i", ec.message() ) );
+                  } else {
+                     fc_wlog( logger, "connection closure detected on write to ${p}", ("p", c->peer_name()) );
                   }
-                  conn->close();
+                  c->close();
                   return;
                }
-               conn->buffer_queue.clear_out_queue();
-               conn->enqueue_sync_block();
-               conn->do_queue_write( priority );
-            }
-            catch(const std::exception &ex) {
-               auto conn = c.lock();
-               string pname = conn ? conn->peer_name() : "no connection name";
-               fc_elog( logger,"Exception in do_queue_write to ${p} ${s}", ("p",pname)("s",ex.what()) );
-            }
-            catch(const fc::exception &ex) {
-               auto conn = c.lock();
-               string pname = conn ? conn->peer_name() : "no connection name";
-               fc_elog( logger,"Exception in do_queue_write to ${p} ${s}", ("p",pname)("s",ex.to_string()) );
-            }
-            catch(...) {
-               auto conn = c.lock();
-               string pname = conn ? conn->peer_name() : "no connection name";
-               fc_elog( logger,"Exception in do_queue_write to ${p}", ("p",pname) );
+               c->buffer_queue.clear_out_queue();
+               c->enqueue_sync_block();
+               c->do_queue_write( priority );
+            } catch( const std::exception& ex ) {
+               fc_elog( logger, "Exception in do_queue_write to ${p} ${s}", ("p", c->peer_name())( "s", ex.what() ) );
+            } catch( const fc::exception& ex ) {
+               fc_elog( logger, "Exception in do_queue_write to ${p} ${s}", ("p", c->peer_name())( "s", ex.to_string() ) );
+            } catch( ... ) {
+               fc_elog( logger, "Exception in do_queue_write to ${p}", ("p", c->peer_name()) );
             }
+<<<<<<< HEAD
          });
+=======
+>>>>>>> Move socket ownership into connection.
       }));
    }
 
@@ -1215,20 +1238,15 @@ struct msg_handler : public fc::visitor<void> {
                                     bool trigger_send, int priority, go_away_reason close_after_send,
                                     bool to_sync_queue)
    {
-      connection_wptr weak_this = shared_from_this();
+      connection_ptr self = shared_from_this();
       queue_write(send_buffer,trigger_send, priority,
-                  [weak_this, close_after_send](boost::system::error_code ec, std::size_t ) {
-                     connection_ptr conn = weak_this.lock();
-                     if (conn) {
+                  [conn{std::move(self)}, close_after_send](boost::system::error_code ec, std::size_t ) {
                         if (close_after_send != no_reason) {
                            fc_elog( logger, "sent a go away message: ${r}, closing connection to ${p}",
                                     ("r", reason_str(close_after_send))("p", conn->peer_name()) );
                            conn->close();
                            return;
                         }
-                     } else {
-                        fc_wlog(logger, "connection expired before enqueued net_message called callback!");
-                     }
                   },
                   to_sync_queue);
    }
@@ -1236,16 +1254,15 @@ struct msg_handler : public fc::visitor<void> {
    // thread safe
    void connection::cancel_wait() {
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      if (response_expected_timer)
-         response_expected_timer->cancel();
+      response_expected_timer.cancel();
    }
 
    // thread safe
    void connection::sync_wait() {
       connection_wptr c(shared_from_this());
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      response_expected_timer->expires_from_now( my_impl->resp_expected_period);
-      response_expected_timer->async_wait( [c]( boost::system::error_code ec ) {
+      response_expected_timer.expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer.async_wait( [c]( boost::system::error_code ec ) {
          app().post(priority::low, [c, ec]() {
             connection_ptr conn = c.lock();
             if (!conn) {
@@ -1262,8 +1279,8 @@ struct msg_handler : public fc::visitor<void> {
    void connection::fetch_wait() {
       connection_wptr c(shared_from_this());
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      response_expected_timer->expires_from_now( my_impl->resp_expected_period);
-      response_expected_timer->async_wait( [c]( boost::system::error_code ec ) {
+      response_expected_timer.expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer.async_wait( [c]( boost::system::error_code ec ) {
          app().post(priority::low, [c, ec]() {
             connection_ptr conn = c.lock();
             if (!conn) {
@@ -2023,6 +2040,7 @@ struct msg_handler : public fc::visitor<void> {
       auto current_endpoint = *endpoint_itr;
       ++endpoint_itr;
       c->connecting = true;
+<<<<<<< HEAD
       connection_wptr weak_conn = c;
       c->socket->async_connect( current_endpoint, boost::asio::bind_executor( c->strand,
             [weak_conn, endpoint_itr, this]( const boost::system::error_code& err ) {
@@ -2031,6 +2049,12 @@ struct msg_handler : public fc::visitor<void> {
             if( !c ) return;
             if( !err && c->socket->is_open()) {
                if( start_session( c )) {
+=======
+      c->socket.async_connect( current_endpoint,
+            boost::asio::bind_executor( c->strand, [c, endpoint_itr, this]( const boost::system::error_code& err ) {
+            if( !err && c->socket.is_open()) {
+               if( c->start_session() ) {
+>>>>>>> Move socket ownership into connection.
                   c->send_handshake();
                }
             } else {
@@ -2043,6 +2067,7 @@ struct msg_handler : public fc::visitor<void> {
                   c->close();
                }
             }
+<<<<<<< HEAD
          } );
       } ) );
    }
@@ -2067,18 +2092,20 @@ struct msg_handler : public fc::visitor<void> {
          //     con->readloop_complete  = bf::async( [=](){ read_loop( con ); } );
          //     con->writeloop_complete = bf::async( [=](){ write_loop con ); } );
       }
+=======
+      } ) );
+>>>>>>> Move socket ownership into connection.
    }
 
-
    void net_plugin_impl::start_listen_loop() {
-      auto new_socket = std::make_shared<tcp::socket>( std::ref( *server_ioc ) );
-      acceptor->async_accept( *new_socket, [new_socket, this, ioc = server_ioc]( boost::system::error_code ec ) {
-         // called from thread_pool threads, new_socket not shared yet
+      connection_ptr new_connection = std::make_shared<connection>();
+      acceptor->async_accept( new_connection->socket,
+            boost::asio::bind_executor( new_connection->strand, [new_connection, this]( boost::system::error_code ec ) {
          if( !ec ) {
             uint32_t visitors = 0;
             uint32_t from_addr = 0;
             boost::system::error_code rec;
-            const auto& paddr_add = new_socket->remote_endpoint( rec ).address();
+            const auto& paddr_add = new_connection->socket.remote_endpoint( rec ).address();
             string paddr_str;
             if( rec ) {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
@@ -2097,8 +2124,7 @@ struct msg_handler : public fc::visitor<void> {
                }
                g.unlock();
                if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
-                  connection_ptr new_connection = std::make_shared<connection>( new_socket );
-                  if( start_session( new_connection ) ) {
+                  if( new_connection->start_session() ) {
                      g.lock();
                      connections.insert( new_connection );
                      g.unlock();
@@ -2111,7 +2137,8 @@ struct msg_handler : public fc::visitor<void> {
                   } else {
                      fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count) );
                   }
-                  new_socket->close(); // new_socket never associated with a connection
+                  // new_connection never added to connections and start_session not called, lifetime will end
+                  new_connection->socket.close();
                }
             }
          } else {
@@ -2130,16 +2157,13 @@ struct msg_handler : public fc::visitor<void> {
             }
          }
          start_listen_loop();
-      });
+      }));
    }
 
    // only called from strand thread
    void net_plugin_impl::start_read_message(const connection_ptr& conn) {
 
       try {
-         if(!conn->socket) {
-            return;
-         }
          connection_wptr weak_conn = conn;
 
 <<<<<<< HEAD
@@ -2160,7 +2184,7 @@ struct msg_handler : public fc::visitor<void> {
             const size_t max_socket_read_watermark = 4096;
             std::size_t socket_read_watermark = std::min<std::size_t>(minimum_read, max_socket_read_watermark);
             boost::asio::socket_base::receive_low_watermark read_watermark_opt(socket_read_watermark);
-            conn->socket->set_option(read_watermark_opt);
+            conn->socket.set_option(read_watermark_opt);
          }
 
          auto completion_handler = [minimum_read](boost::system::error_code ec, std::size_t bytes_transferred) -> std::size_t {
@@ -2203,6 +2227,7 @@ struct msg_handler : public fc::visitor<void> {
                 reads_in_flight > 2*def_max_reads_in_flight   ||
                   trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
+<<<<<<< HEAD
                fc_wlog( logger, "queues over full, giving up on connection" );
 <<<<<<< HEAD
                app().post( priority::medium, [weak_conn]() {
@@ -2214,12 +2239,16 @@ struct msg_handler : public fc::visitor<void> {
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
                   conn->close();
                });
+=======
+               fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
+                        ("p", conn->peer_name()) );
+               conn->close();
+>>>>>>> Move socket ownership into connection.
                return;
             }
             std::lock_guard<std::mutex> g( conn->read_delay_timer_mtx );
-            if( !conn->read_delay_timer ) return;
-            conn->read_delay_timer->expires_from_now( def_read_delay_for_full_write_queue );
-            conn->read_delay_timer->async_wait(
+            conn->read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
+            conn->read_delay_timer.async_wait(
                   boost::asio::bind_executor(conn->strand, [this, weak_conn]( boost::system::error_code ) {
                auto conn = weak_conn.lock();
                if( !conn ) return;
@@ -2229,15 +2258,10 @@ struct msg_handler : public fc::visitor<void> {
          }
 
          ++conn->reads_in_flight;
-         boost::asio::async_read(*conn->socket,
+         boost::asio::async_read( conn->socket,
             conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             boost::asio::bind_executor( conn->strand,
-            [this,weak_conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
-               auto conn = weak_conn.lock();
-               if (!conn) {
-                  return;
-               }
-
+            [this, conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                --conn->reads_in_flight;
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -2320,6 +2344,7 @@ struct msg_handler : public fc::visitor<void> {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                   connection_wptr weak_conn = conn;
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
@@ -2344,17 +2369,15 @@ struct msg_handler : public fc::visitor<void> {
                      fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
                      conn->close();
                   });
+=======
+                  fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
+                  conn->close();
+>>>>>>> Move socket ownership into connection.
                }
          }));
       } catch (...) {
-         fc_elog( logger, "Undefined exception in start_read_message" );
-         connection_wptr weak_conn = conn;
-         app().post( priority::medium, [weak_conn]() {
-            auto conn = weak_conn.lock();
-            if( !conn ) return;
-            fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-            conn->close();
-         });
+         fc_elog( logger, "Undefined exception in start_read_message, closing connection to: ${p}", ("p", conn->peer_name()) );
+         conn->close();
       }
    }
 
@@ -3277,7 +3300,6 @@ struct msg_handler : public fc::visitor<void> {
          my->resp_expected_period = def_resp_expected_wait;
          my->max_client_count = options.at( "max-clients" ).as<int>();
          my->max_nodes_per_host = options.at( "p2p-max-nodes-per-host" ).as<int>();
-         my->started_sessions = 0;
 
          my->use_socket_read_watermark = options.at( "use-socket-read-watermark" ).as<bool>();
 
@@ -3440,6 +3462,9 @@ struct msg_handler : public fc::visitor<void> {
          if( my->server_ioc_work )
             my->server_ioc_work->reset();
 
+         if( my->server_ioc )
+            my->server_ioc->stop();
+
          {
             std::lock_guard<std::mutex> g( my->connector_check_timer_mtx );
             if( my->connector_check_timer )
@@ -3455,22 +3480,16 @@ struct msg_handler : public fc::visitor<void> {
          }
 
          my->done = true;
-         if( my->acceptor ) {
-            fc_ilog( logger, "close acceptor" );
-            my->acceptor->cancel();
-            my->acceptor->close();
-
-            fc_ilog( logger, "close ${s} connections",( "s",my->connections.size()) );
+         {
+            fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
             std::lock_guard<std::mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
-               fc_dlog( logger, "close: ${p}", ("p",con->peer_name()) );
+               fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
                con->close();
             }
             my->connections.clear();
          }
 
-         if( my->server_ioc )
-            my->server_ioc->stop();
          if( my->thread_pool ) {
             my->thread_pool->join();
             my->thread_pool->stop();

From 75832046b01bf6a4bd32f7bbc289135ea20f206c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Mar 2019 13:55:14 -0500
Subject: [PATCH 0140/1648] Make queued_buffer thread safe

---
 plugins/net_plugin/net_plugin.cpp | 53 ++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7d201ee720f..1214e32060b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -458,33 +458,44 @@ namespace eosio {
       static void populate(handshake_message &hello);
    };
 
+   // thread safe
    class queued_buffer : boost::noncopyable {
    public:
       void clear_write_queue() {
+         std::lock_guard<std::mutex> g( _mtx );
          _write_queue.clear();
          _sync_write_queue.clear();
          _write_queue_size = 0;
       }
 
       void clear_out_queue() {
+         std::lock_guard<std::mutex> g( _mtx );
          while ( _out_queue.size() > 0 ) {
             _out_queue.pop_front();
          }
       }
 
-      // thread safe
-      uint32_t write_queue_size() const { return _write_queue_size; }
+      uint32_t write_queue_size() const {
+         std::lock_guard<std::mutex> g( _mtx );
+         return _write_queue_size;
+      }
 
-      bool is_out_queue_empty() const { return _out_queue.empty(); }
+      bool is_out_queue_empty() const {
+         std::lock_guard<std::mutex> g( _mtx );
+         return _out_queue.empty();
+      }
 
       bool ready_to_send() const {
+         std::lock_guard<std::mutex> g( _mtx );
          // if out_queue is not empty then async_write is in progress
          return ((!_sync_write_queue.empty() || !_write_queue.empty()) && _out_queue.empty());
       }
 
+      // @param callback must not callback into queued_buffer
       bool add_write_queue( const std::shared_ptr<vector<char>>& buff,
                             std::function<void( boost::system::error_code, std::size_t )> callback,
                             bool to_sync_queue ) {
+         std::lock_guard<std::mutex> g( _mtx );
          if( to_sync_queue ) {
             _sync_write_queue.push_back( {buff, callback} );
          } else {
@@ -498,6 +509,7 @@ namespace eosio {
       }
 
       void fill_out_buffer( std::vector<boost::asio::const_buffer>& bufs ) {
+         std::lock_guard<std::mutex> g( _mtx );
          if( _sync_write_queue.size() > 0 ) { // always send msgs from sync_write_queue first
             fill_out_buffer( bufs, _sync_write_queue );
          } else { // postpone real_time write_queue if sync queue is not empty
@@ -507,6 +519,7 @@ namespace eosio {
       }
 
       void out_callback( boost::system::error_code ec, std::size_t w ) {
+         std::lock_guard<std::mutex> g( _mtx );
          for( auto& m : _out_queue ) {
             m.callback( ec, w );
          }
@@ -531,7 +544,8 @@ namespace eosio {
          std::function<void( boost::system::error_code, std::size_t )> callback;
       };
 
-      std::atomic<uint32_t> _write_queue_size{0};
+      mutable std::mutex  _mtx;
+      uint32_t            _write_queue_size{0};
       deque<queued_write> _write_queue;
       deque<queued_write> _sync_write_queue; // sync_write_queue will be sent first
       deque<queued_write> _out_queue;
@@ -918,7 +932,7 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void connection::close() {
-      strand.dispatch( [self = shared_from_this()]() {
+      strand.post( [self = shared_from_this()]() {
          connection::_close( self.get() );
       });
    }
@@ -1051,12 +1065,15 @@ struct msg_handler : public fc::visitor<void> {
       syncing = false;
    }
 
+   // thread safe
    void connection::send_handshake() {
-      handshake_initializer::populate(last_handshake_sent);
-      last_handshake_sent.generation = ++sent_handshake_count;
-      fc_dlog(logger, "Sending handshake generation ${g} to ${ep}",
-              ("g",last_handshake_sent.generation)("ep", peer_name()));
-      enqueue(last_handshake_sent);
+      app().post( priority::low, [c = shared_from_this()]() {
+         handshake_initializer::populate( c->last_handshake_sent );
+         c->last_handshake_sent.generation = ++c->sent_handshake_count;
+         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}",
+                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_name() ) );
+         c->enqueue( c->last_handshake_sent );
+      });
    }
 
    void connection::send_time() {
@@ -1092,6 +1109,7 @@ struct msg_handler : public fc::visitor<void> {
       }
    }
 
+   // called from connection strand and application thread
    void connection::do_queue_write(int priority) {
       if( !buffer_queue.ready_to_send() )
          return;
@@ -1100,6 +1118,7 @@ struct msg_handler : public fc::visitor<void> {
       std::vector<boost::asio::const_buffer> bufs;
       buffer_queue.fill_out_buffer( bufs );
 
+<<<<<<< HEAD
 <<<<<<< HEAD
       boost::asio::async_write(*socket, bufs,
             boost::asio::bind_executor(strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
@@ -1108,6 +1127,11 @@ struct msg_handler : public fc::visitor<void> {
       boost::asio::async_write( socket, bufs,
             boost::asio::bind_executor( strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
 >>>>>>> Move socket ownership into connection.
+=======
+      strand.dispatch( [c{std::move(c)}, bufs{std::move(bufs)}, priority]() {
+         boost::asio::async_write( c->socket, bufs,
+            boost::asio::bind_executor( c->strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
+>>>>>>> Make queued_buffer thread safe
             try {
                c->buffer_queue.out_callback( ec, w );
 
@@ -1130,11 +1154,16 @@ struct msg_handler : public fc::visitor<void> {
             } catch( ... ) {
                fc_elog( logger, "Exception in do_queue_write to ${p}", ("p", c->peer_name()) );
             }
+<<<<<<< HEAD
 <<<<<<< HEAD
          });
 =======
 >>>>>>> Move socket ownership into connection.
       }));
+=======
+         }));
+      });
+>>>>>>> Make queued_buffer thread safe
    }
 
    void connection::cancel_sync(go_away_reason reason) {
@@ -3188,8 +3217,8 @@ struct msg_handler : public fc::visitor<void> {
       return chain::signature_type();
    }
 
-   void
-   handshake_initializer::populate( handshake_message &hello) {
+   // call from main application thread
+   void handshake_initializer::populate( handshake_message& hello ) {
       hello.network_version = net_version_base + net_version;
       hello.chain_id = my_impl->chain_id;
       hello.node_id = my_impl->node_id;

From b9861c8f570bbdb00b0c84f4207759302ba7d7ee Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Mar 2019 15:58:17 -0500
Subject: [PATCH 0141/1648] Make use of resolver thread safe

---
 plugins/net_plugin/net_plugin.cpp | 78 +++++++++++++++++--------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 1214e32060b..d070275b350 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -254,8 +254,6 @@ namespace eosio {
       chain_plugin*                 chain_plug = nullptr;
       producer_plugin*              producer_plug = nullptr;
 
-      shared_ptr<tcp::resolver>     resolver;
-
       bool                          use_socket_read_watermark = false;
 
       compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
@@ -268,7 +266,7 @@ namespace eosio {
 
 
       bool resolve_and_connect(const connection_ptr& c);
-      void connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr);
+      void connect(const connection_ptr& c, const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
       void start_listen_loop();
       void start_read_message(const connection_ptr& c);
 
@@ -621,7 +619,7 @@ namespace eosio {
       handshake_message       last_handshake_recv;
       handshake_message       last_handshake_sent;
       int16_t                 sent_handshake_count = 0;
-      bool                    connecting = false;
+      std::atomic<bool>       connecting{false};
       bool                    syncing = false;
       uint16_t                protocol_version  = 0;
    private:
@@ -636,7 +634,7 @@ namespace eosio {
       boost::asio::steady_timer             response_expected_timer;
       std::mutex                            read_delay_timer_mtx;
       boost::asio::steady_timer             read_delay_timer;
-      go_away_reason         no_retry = no_reason;
+      std::atomic<go_away_reason>           no_retry{no_reason};
       block_id_type          fork_head;
       std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
       optional<request_message> last_req;
@@ -2012,35 +2010,27 @@ struct msg_handler : public fc::visitor<void> {
 
    //------------------------------------------------------------------------
 
+   // called from any thread
    bool net_plugin_impl::resolve_and_connect(const connection_ptr& c) {
       if( c->no_retry != go_away_reason::no_reason) {
          fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( c->no_retry )));
          return false;
       }
 
-      auto colon = c->peer_address().find(':');
-
+      string::size_type colon = c->peer_address().find(':');
       if (colon == std::string::npos || colon == 0) {
          fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p",c->peer_address()) );
-         std::lock_guard<std::mutex> g( my_impl->connections_mtx );
-         for ( auto& cp : connections ) {
-            if( cp->peer_address() == c->peer_address() ) {
-               cp->reset();
-               cp->close();
-               connections.erase( cp );
-               break;
-            }
-         }
          return false;
       }
 
-      auto host = c->peer_address().substr( 0, colon );
-      auto port = c->peer_address().substr( colon + 1);
+      string host = c->peer_address().substr( 0, colon );
+      string port = c->peer_address().substr( colon + 1);
       idump((host)(port));
-      tcp::resolver::query query( tcp::v4(), host.c_str(), port.c_str() );
+      tcp::resolver::query query( tcp::v4(), host, port );
       connection_wptr weak_conn = c;
       // Note: need to add support for IPv6 too
 
+<<<<<<< HEAD
       resolver->async_resolve( query, boost::asio::bind_executor( c->strand,
                 [weak_conn, this]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
                    app().post( priority::low, [err, endpoint_itr, weak_conn, this]() {
@@ -2057,11 +2047,25 @@ struct msg_handler : public fc::visitor<void> {
                 } ) );
 =======
                 } );
+=======
+      auto resolver = std::make_shared<tcp::resolver>( *server_ioc );
+      resolver->async_resolve( query,
+            [resolver, ioc = server_ioc, weak_conn, this]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
+               auto c = weak_conn.lock();
+               if( !c ) return;
+               if( !err ) {
+                  connect( c, resolver, endpoint_itr );
+               } else {
+                  fc_elog( logger, "Unable to resolve ${add}: ${error}", ("add", c->peer_name())( "error", err.message() ) );
+               }
+            } );
+>>>>>>> Make use of resolver thread safe
       return true;
 >>>>>>> Made all access to impl->connections thread safe
    }
 
-   void net_plugin_impl::connect(const connection_ptr& c, tcp::resolver::iterator endpoint_itr) {
+   // called from any thread
+   void net_plugin_impl::connect(const connection_ptr& c, const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr) {
       if( c->no_retry != go_away_reason::no_reason) {
          string rsn = reason_str(c->no_retry);
          return;
@@ -2080,7 +2084,7 @@ struct msg_handler : public fc::visitor<void> {
                if( start_session( c )) {
 =======
       c->socket.async_connect( current_endpoint,
-            boost::asio::bind_executor( c->strand, [c, endpoint_itr, this]( const boost::system::error_code& err ) {
+            boost::asio::bind_executor( c->strand, [resolver, c, endpoint_itr, this]( const boost::system::error_code& err ) {
             if( !err && c->socket.is_open()) {
                if( c->start_session() ) {
 >>>>>>> Move socket ownership into connection.
@@ -2089,7 +2093,7 @@ struct msg_handler : public fc::visitor<void> {
             } else {
                if( endpoint_itr != tcp::resolver::iterator()) {
                   c->close();
-                  connect( c, endpoint_itr );
+                  connect( c, resolver, endpoint_itr );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;
@@ -3007,19 +3011,17 @@ struct msg_handler : public fc::visitor<void> {
       }
    }
 
+   // called from any thread
    void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection) {
       std::lock_guard<std::mutex> g( connector_check_timer_mtx );
       connector_check_timer->expires_from_now( du);
       connector_check_timer->async_wait( [this, from_connection](boost::system::error_code ec) {
-            app().post( priority::low, [this, from_connection, ec]() {
             if( !ec) {
                connection_monitor(from_connection);
-            }
-            else {
+            } else {
                fc_elog( logger, "Error from connection check monitor: ${m}",( "m", ec.message()));
                start_conn_timer( connector_period, std::weak_ptr<connection>());
             }
-         });
       });
    }
 
@@ -3101,6 +3103,7 @@ struct msg_handler : public fc::visitor<void> {
 >>>>>>> Break expire into two steps
    }
 
+   // called from any thread
    void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
@@ -3115,7 +3118,10 @@ struct msg_handler : public fc::visitor<void> {
          }
          if( !(*it)->socket_is_open() && !(*it)->connecting) {
             if( (*it)->peer_address().length() > 0) {
-               resolve_and_connect(*it);
+               if( !resolve_and_connect(*it) ) {
+                  it = connections.erase(it);
+                  continue;
+               }
             } else {
                it = connections.erase(it);
                continue;
@@ -3405,14 +3411,14 @@ struct msg_handler : public fc::visitor<void> {
          boost::asio::post( *my->thread_pool, [ioc = my->server_ioc]() { ioc->run(); } );
       }
 
-      my->resolver = std::make_shared<tcp::resolver>( std::ref( *my->server_ioc ));
       if( my->p2p_address.size() > 0 ) {
          auto host = my->p2p_address.substr( 0, my->p2p_address.find( ':' ));
          auto port = my->p2p_address.substr( host.size() + 1, my->p2p_address.size());
          tcp::resolver::query query( tcp::v4(), host.c_str(), port.c_str());
          // Note: need to add support for IPv6 too?
 
-         my->listen_endpoint = *my->resolver->resolve( query );
+         tcp::resolver resolver( *my->server_ioc );
+         my->listen_endpoint = *resolver.resolve( query );
 
          my->acceptor.reset( new tcp::acceptor( *my->server_ioc ) );
 
@@ -3535,13 +3541,13 @@ struct msg_handler : public fc::visitor<void> {
       if( my->find_connection( host ) )
          return "already connected";
 
-      connection_ptr c = std::make_shared<connection>(host);
-      fc_dlog(logger,"adding new connection to the list");
-      std::unique_lock<std::mutex> g( my->connections_mtx );
-      my->connections.insert( c );
-      g.unlock();
-      fc_dlog(logger,"calling active connector");
-      my->resolve_and_connect( c );
+      connection_ptr c = std::make_shared<connection>( host );
+      fc_dlog( logger, "calling active connector" );
+      if( my->resolve_and_connect( c ) ) {
+         fc_dlog( logger, "adding new connection to the list" );
+         std::unique_lock<std::mutex> g( my->connections_mtx );
+         my->connections.insert( c );
+      }
       return "added connection";
    }
 

From c5b543d2dee2b9acf6d96513bcc986bf4e85f3d3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Mar 2019 23:08:28 -0500
Subject: [PATCH 0142/1648] Use boost::shared_mutex for connections.
 Multithread broadcast block.

---
 plugins/net_plugin/net_plugin.cpp | 88 ++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 36 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d070275b350..077c069e0f3 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -25,6 +25,8 @@
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <atomic>
 
@@ -223,7 +225,7 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      mutable std::mutex               connections_mtx; // switch to shared_mutex in C++17
+      mutable boost::shared_mutex      connections_mtx; // switch to std::shared_mutex in C++17
       std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
@@ -620,7 +622,7 @@ namespace eosio {
       handshake_message       last_handshake_sent;
       int16_t                 sent_handshake_count = 0;
       std::atomic<bool>       connecting{false};
-      bool                    syncing = false;
+      std::atomic<bool>       syncing{false};
       uint16_t                protocol_version  = 0;
    private:
       const string            peer_addr;
@@ -1447,7 +1449,7 @@ struct msg_handler : public fc::visitor<void> {
       if (conn && conn->current() ) {
          source = conn;
       } else {
-         std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+         boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          if (my_impl->connections.size() == 1) {
             if (!source) {
                source = *my_impl->connections.begin();
@@ -1513,7 +1515,7 @@ struct msg_handler : public fc::visitor<void> {
 
    void sync_manager::send_handshakes()
    {
-      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& ci : my_impl->connections ) {
          if( ci->current() ) {
             ci->send_handshake();
@@ -1633,7 +1635,7 @@ struct msg_handler : public fc::visitor<void> {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
-      std::unique_lock<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for (const auto& cc : my_impl->connections) {
          // fork_head_num provides memory barrier for fork_head
          if( cc->fork_head_num > num || cc->fork_head == id ) {
@@ -1708,7 +1710,7 @@ struct msg_handler : public fc::visitor<void> {
          source.reset();
 
          block_id_type null_id;
-         std::unique_lock<std::mutex> g( my_impl->connections_mtx );
+         boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          for( const auto& cp : my_impl->connections ) {
             uint32_t fork_head_num = cp->fork_head_num.load(); // fork_head_num provides memory barrier for fork_head
             if (cp->fork_head == null_id) {
@@ -1837,31 +1839,43 @@ struct msg_handler : public fc::visitor<void> {
       stale_blk.erase( stale_blk.lower_bound(1), stale_blk.upper_bound(lib_num) );
    }
 
+   // thread safe
    void dispatch_manager::bcast_block(const block_state_ptr& bs) {
-      uint32_t bnum = bs->block_num;
-      peer_block_state pbstate{bs->id, bnum};
-      fc_dlog( logger, "bcast block ${b}", ("b", bnum) );
+      fc_dlog( logger, "bcast block ${b}", ("b", bs->block_num) );
 
-      std::shared_ptr<std::vector<char>> send_buffer;
-      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      bool have_connection = false;
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
          }
-         bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
-         if( !has_block ) {
-            pbstate.connection_id = cp->connection_id;
-            if( !add_peer_block( pbstate ) ) {
-               continue;
-            }
-            if( !send_buffer ) {
-               send_buffer = create_send_buffer( bs->block );
-            }
-            fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
-            cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
-         }
+         have_connection = true;
+         break;
       }
+      g.unlock();
 
+      if( !have_connection ) return;
+      std::shared_ptr<std::vector<char>> send_buffer = create_send_buffer( bs->block );
+
+      g.lock();
+      for( auto& cp : my_impl->connections ) {
+         if( !cp->current() ) {
+            continue;
+         }
+         cp->strand.post( [this, cp, bs, send_buffer]() {
+            uint32_t bnum = bs->block_num;
+            // todo protect cp->last_handshake_recv
+            bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
+            if( !has_block ) {
+               peer_block_state pbstate{bs->id, bnum, cp->connection_id};
+               if( !add_peer_block( pbstate ) ) {
+                  return;
+               }
+               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
+               cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
+            }
+         });
+      }
    }
 
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
@@ -1890,7 +1904,7 @@ struct msg_handler : public fc::visitor<void> {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
-      std::lock_guard<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
@@ -1986,7 +2000,7 @@ struct msg_handler : public fc::visitor<void> {
                   ("b",modes_str(c->last_req->req_blocks.mode))("t",modes_str(c->last_req->req_trx.mode)));
          return;
       }
-      std::unique_lock<std::mutex> g( my_impl->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for (auto& conn : my_impl->connections) {
          if (conn == c || conn->last_req) {
             continue;
@@ -2144,7 +2158,7 @@ struct msg_handler : public fc::visitor<void> {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
             } else {
                paddr_str = paddr_add.to_string();
-               std::unique_lock<std::mutex> g( connections_mtx );
+               boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
                for( auto& conn : connections ) {
                   if( conn->socket_is_open() ) {
                      if( conn->peer_address().empty() ) {
@@ -2512,7 +2526,7 @@ struct msg_handler : public fc::visitor<void> {
 
          if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
             fc_dlog(logger, "checking for duplicate" );
-            std::lock_guard<std::mutex> g( connections_mtx );
+            boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
             for(const auto& check : connections) {
                if(check == c)
                   continue;
@@ -3049,7 +3063,7 @@ struct msg_handler : public fc::visitor<void> {
             if( ec ) {
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
-            std::lock_guard<std::mutex> g( connections_mtx );
+            boost::shared_lock<boost::shared_mutex> g( connections_mtx );
             for( auto& c : connections ) {
                if( c->socket_is_open() ) {
                   c->send_time();
@@ -3108,7 +3122,7 @@ struct msg_handler : public fc::visitor<void> {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
-      std::unique_lock<std::mutex> g( connections_mtx );
+      boost::unique_lock<boost::shared_mutex> g( connections_mtx );
       auto it = (from ? connections.find(from) : connections.begin());
       if (it == connections.end()) it = connections.begin();
       while (it != connections.end()) {
@@ -3134,8 +3148,10 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void net_plugin_impl::accepted_block(const block_state_ptr& block) {
-      fc_dlog(logger,"signaled, id = ${id}",("id", block->id));
-      dispatcher->bcast_block(block);
+      boost::asio::post( *server_ioc, [this, ioc=server_ioc, block]() {
+         fc_dlog( logger, "signaled, id = ${id}", ("id", block->id) );
+         dispatcher->bcast_block( block );
+      });
    }
 
    void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
@@ -3517,7 +3533,7 @@ struct msg_handler : public fc::visitor<void> {
          my->done = true;
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
-            std::lock_guard<std::mutex> g( my->connections_mtx );
+            boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
                con->close();
@@ -3545,14 +3561,14 @@ struct msg_handler : public fc::visitor<void> {
       fc_dlog( logger, "calling active connector" );
       if( my->resolve_and_connect( c ) ) {
          fc_dlog( logger, "adding new connection to the list" );
-         std::unique_lock<std::mutex> g( my->connections_mtx );
+         boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
          my->connections.insert( c );
       }
       return "added connection";
    }
 
    string net_plugin::disconnect( const string& host ) {
-      std::lock_guard<std::mutex> g( my->connections_mtx );
+      boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
          if( (*itr)->peer_address() == host ) {
             (*itr)->reset();
@@ -3574,7 +3590,7 @@ struct msg_handler : public fc::visitor<void> {
 
    vector<connection_status> net_plugin::connections()const {
       vector<connection_status> result;
-      std::lock_guard<std::mutex> g( my->connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( my->connections_mtx );
       result.reserve( my->connections.size() );
       for( const auto& c : my->connections ) {
          result.push_back( c->get_status() );
@@ -3582,7 +3598,7 @@ struct msg_handler : public fc::visitor<void> {
       return result;
    }
    connection_ptr net_plugin_impl::find_connection(const string& host )const {
-      std::lock_guard<std::mutex> g( connections_mtx );
+      boost::shared_lock<boost::shared_mutex> g( connections_mtx );
       for( const auto& c : connections )
          if( c->peer_address() == host ) return c;
       return connection_ptr();

From 742181f85493dfe39b0d2d520b4d44276f45a290 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 26 Mar 2019 07:16:05 -0500
Subject: [PATCH 0143/1648] Work toward making sync_manager and handshake
 message thread safe.

---
 plugins/net_plugin/net_plugin.cpp | 694 ++++++++++++++++++------------
 1 file changed, 409 insertions(+), 285 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 077c069e0f3..0677261b2d1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -141,28 +141,29 @@ namespace eosio {
          in_sync
       };
 
+      std::mutex     sync_mtx;
       uint32_t       sync_known_lib_num;
       uint32_t       sync_last_requested_num;
       uint32_t       sync_next_expected_num;
       uint32_t       sync_req_span;
-      connection_ptr source;
-      stages         state;
+      connection_ptr sync_source;
+      stages         sync_state;
 
       chain_plugin* chain_plug = nullptr;
 
-      constexpr static auto stage_str(stages s);
+   private:
+      constexpr static auto stage_str( stages s );
+      void set_state( stages s );
+      bool is_sync_required();
+      void request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn = connection_ptr() );
+      void start_sync( const connection_ptr& c, uint32_t target );
+      void verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
+      static void send_handshakes();
 
    public:
       explicit sync_manager(uint32_t span);
-      void set_state(stages s);
-      bool sync_required();
-      void send_handshakes();
-      bool is_active(const connection_ptr& conn);
-      void reset_lib_num(const connection_ptr& conn);
-      void request_next_chunk(const connection_ptr& conn = connection_ptr());
-      void start_sync(const connection_ptr& c, uint32_t target);
-      void reassign_fetch(const connection_ptr& c, go_away_reason reason);
-      void verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id);
+      void sync_reset_lib_num(const connection_ptr& conn);
+      void sync_reassign_fetch(const connection_ptr& c, go_away_reason reason);
       void rejected_block(const connection_ptr& c, uint32_t blk_num);
       void sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
       void recv_handshake(const connection_ptr& c, const handshake_message& msg);
@@ -214,6 +215,7 @@ namespace eosio {
       vector<chain::public_key_type>   allowed_peers; ///< peer keys allowed to connect
       std::map<chain::public_key_type,
                chain::private_key_type> private_keys; ///< overlapping with producer keys, also authenticating non-producing nodes
+                                                      // thread safe, only updated in plugin initialize
 
       enum possible_connections : char {
          None = 0,
@@ -246,17 +248,24 @@ namespace eosio {
       const std::chrono::system_clock::duration peer_authentication_interval{std::chrono::seconds{1}}; ///< Peer clock may be no more than 1 second skewed from our clock, including network latency.
 
       bool                          network_version_match = false;
-      chain_id_type                 chain_id;
-      fc::sha256                    node_id;
-      std::atomic<uint32_t>         lib_num{0};
-      uint32_t                      head_blk_num{0};
+      chain_id_type                 chain_id; // thread safe, only updated in plugin_initialize
+      fc::sha256                    node_id;  // thread safe, only updated in plugin initialize
+      string                        user_agent_name; // thread safe, only updated in plugin initialize
+
+      mutable std::mutex            chain_info_mtx;
+      uint32_t                      chain_lib_num{0};
+      uint32_t                      chain_head_blk_num{0};
+      uint32_t                      chain_fork_head_blk_num{0};
+      block_id_type                 chain_lib_id;
+      block_id_type                 chain_head_blk_id;
+      block_id_type                 chain_fork_head_blk_id;
+
       eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
 
-      string                        user_agent_name;
       chain_plugin*                 chain_plug = nullptr;
       producer_plugin*              producer_plug = nullptr;
 
-      bool                          use_socket_read_watermark = false;
+      bool                          use_socket_read_watermark = false; // thread safe, not modified outside plugin_initialize
 
       compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
       channels::irreversible_block::channel_type::handle       incoming_irreversible_block_subscription;
@@ -266,31 +275,17 @@ namespace eosio {
       std::shared_ptr<boost::asio::io_context>  server_ioc;
       optional<io_work_t>                       server_ioc_work;
 
+      void update_chain_info();
+      //         lib_num, head_block_num, fork_head_blk_num, lib_id, head_blk_id, fork_head_blk_id
+      std::tuple<uint32_t, uint32_t, uint32_t, block_id_type, block_id_type, block_id_type> get_chain_info() const;
 
-      bool resolve_and_connect(const connection_ptr& c);
-      void connect(const connection_ptr& c, const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
       void start_listen_loop();
-      void start_read_message(const connection_ptr& c);
-
-      /** \brief Process the next message from the pending message buffer
-       *
-       * Process the next message from the pending_message_buffer.
-       * message_length is the already determined length of the data
-       * part of the message that will handle the message.
-       * Returns true is successful. Returns false if an error was
-       * encountered unpacking or processing the message.
-       */
-      bool process_next_message(const connection_ptr& conn, uint32_t message_length);
 
-      void accepted_block(const block_state_ptr&);
+      void on_accepted_block( const block_state_ptr& bs );
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
-      void on_irreversible_block( const block_state_ptr& blk ) {
-         lib_num = blk->block_num;
-         controller& cc = chain_plug->chain();
-         head_blk_num = cc.head_block_num();
-      }
+      void on_irreversible_block( const block_state_ptr& blk );
 
-      bool is_valid( const handshake_message &msg);
+      static bool is_valid( const handshake_message& msg );
 
       void handle_message(const connection_ptr& c, const handshake_message& msg);
       void handle_message(const connection_ptr& c, const chain_size_message& msg);
@@ -455,7 +450,7 @@ namespace eosio {
    };
 
    struct handshake_initializer {
-      static void populate(handshake_message &hello);
+      static void populate(handshake_message& hello);
    };
 
    // thread safe
@@ -674,6 +669,21 @@ namespace eosio {
    private:
       static void _close( connection* self ); // for easy capture
    public:
+
+      bool resolve_and_connect();
+      void connect(const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
+      void start_read_message();
+
+      /** \brief Process the next message from the pending message buffer
+       *
+       * Process the next message from the pending_message_buffer.
+       * message_length is the already determined length of the data
+       * part of the message that will handle the message.
+       * Returns true is successful. Returns false if an error was
+       * encountered unpacking or processing the message.
+       */
+      bool process_next_message(uint32_t message_length);
+
       void send_handshake();
 
       /** \name Peer Timestamps
@@ -746,8 +756,8 @@ namespace eosio {
 
    const string connection::unknown = "<unknown>";
 
-
-struct msg_handler : public fc::visitor<void> {
+   // called from connection strand
+   struct msg_handler : public fc::visitor<void> {
       net_plugin_impl& impl;
       connection_ptr c;
       msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
@@ -781,7 +791,9 @@ struct msg_handler : public fc::visitor<void> {
             if( c ) impl->handle_message( c, ptr );
          });
       }
+
       void operator()( packed_transaction&& msg ) const {
+         // continue call to handle_message on connection strand
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -798,11 +810,15 @@ struct msg_handler : public fc::visitor<void> {
 >>>>>>> Move more of incoming transaction processing to thread pool
       }
 
-      template <typename T>
-      void operator()( T&& msg ) const
-      {
+      void operator()( const handshake_message& msg ) const {
+         // continue call to handle_message on connection strand
+         impl.handle_message( c, msg );
+      }
+
+      void operator()( const chain_size_message& msg ) const {
          connection_wptr weak = c;
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
          app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
 =======
@@ -811,6 +827,49 @@ struct msg_handler : public fc::visitor<void> {
 =======
          app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
 >>>>>>> Remove descriptions of tasks as not merged into develop yet
+=======
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const go_away_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const time_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const notice_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const request_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+            connection_ptr c = weak.lock();
+            if(c) impl->handle_message( c, msg );
+         });
+      }
+
+      void operator()( const sync_request_message& msg ) const {
+         connection_wptr weak = c;
+         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
@@ -910,7 +969,7 @@ struct msg_handler : public fc::visitor<void> {
          return false;
       } else {
          socket_open = true;
-         my_impl->start_read_message( shared_from_this() );
+         start_read_message();
          return true;
       }
    }
@@ -979,7 +1038,7 @@ struct msg_handler : public fc::visitor<void> {
       self->sent_handshake_count = 0;
       self->last_handshake_recv = handshake_message();
       self->last_handshake_sent = handshake_message();
-      my_impl->sync_master->reset_lib_num( nullptr );
+      my_impl->sync_master->sync_reset_lib_num( nullptr );
       fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) );
       self->cancel_wait();
 
@@ -1065,9 +1124,8 @@ struct msg_handler : public fc::visitor<void> {
       syncing = false;
    }
 
-   // thread safe
    void connection::send_handshake() {
-      app().post( priority::low, [c = shared_from_this()]() {
+      strand.post( [c = shared_from_this()]() {
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          fc_dlog( logger, "Sending handshake generation ${g} to ${ep}",
@@ -1288,20 +1346,13 @@ struct msg_handler : public fc::visitor<void> {
 
    // thread safe
    void connection::sync_wait() {
-      connection_wptr c(shared_from_this());
+      connection_ptr c(shared_from_this());
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
       response_expected_timer.expires_from_now( my_impl->resp_expected_period);
-      response_expected_timer.async_wait( [c]( boost::system::error_code ec ) {
-         app().post(priority::low, [c, ec]() {
-            connection_ptr conn = c.lock();
-            if (!conn) {
-               // connection was destroyed before this lambda was delivered
-               return;
-            }
-
-            conn->sync_timeout(ec);
-         });
-      } );
+      response_expected_timer.async_wait(
+            boost::asio::bind_executor( c->strand, [c]( boost::system::error_code ec ) {
+               c->sync_timeout( ec );
+            } ) );
    }
 
    // thread safe
@@ -1322,17 +1373,17 @@ struct msg_handler : public fc::visitor<void> {
       } );
    }
 
+   // called from connection strand
    void connection::sync_timeout( boost::system::error_code ec ) {
       if( !ec ) {
-         my_impl->sync_master->reassign_fetch(shared_from_this(), benign_other);
-      }
-      else if( ec == boost::asio::error::operation_aborted) {
-      }
-      else {
-         fc_elog( logger,"setting timer for sync request got error ${ec}",("ec", ec.message()) );
+         my_impl->sync_master->sync_reassign_fetch( shared_from_this(), benign_other );
+      } else if( ec == boost::asio::error::operation_aborted ) {
+      } else {
+         fc_elog( logger, "setting timer for sync request got error ${ec}", ("ec", ec.message()) );
       }
    }
 
+   // todo: last_handshake_recv not thread safe
    const string connection::peer_name() {
       if( !last_handshake_recv.p2p_address.empty() ) {
          return last_handshake_recv.p2p_address;
@@ -1373,8 +1424,8 @@ struct msg_handler : public fc::visitor<void> {
       ,sync_last_requested_num( 0 )
       ,sync_next_expected_num( 1 )
       ,sync_req_span( req_span )
-      ,source()
-      ,state(in_sync)
+      ,sync_source()
+      ,sync_state(in_sync)
    {
       chain_plug = app().find_plugin<chain_plugin>();
       EOS_ASSERT( chain_plug, chain::missing_chain_plugin_exception, ""  );
@@ -1390,53 +1441,48 @@ struct msg_handler : public fc::visitor<void> {
   }
 
    void sync_manager::set_state(stages newstate) {
-      if (state == newstate) {
+      if( sync_state == newstate ) {
          return;
       }
-      fc_dlog(logger, "old state ${os} becoming ${ns}",("os",stage_str(state))("ns",stage_str(newstate)));
-      state = newstate;
+      fc_dlog( logger, "old state ${os} becoming ${ns}", ("os", stage_str( sync_state ))( "ns", stage_str( newstate ) ) );
+      sync_state = newstate;
    }
 
-   // uses controller, only call from application thread
-   bool sync_manager::is_active(const connection_ptr& c) {
-      if (state == head_catchup && c) {
-         auto fork_head_num = c->fork_head_num.load(); // provide memory barrier for c->fork_head
-         bool fhset = c->fork_head != block_id_type();
-         fc_dlog( logger, "fork_head_num = ${fn} fork_head set = ${s}", ("fn", fork_head_num)( "s", fhset ) );
-         return c->fork_head != block_id_type() && fork_head_num < chain_plug->chain().fork_db_head_block_num();
-      }
-      return state != in_sync;
-   }
-
-   void sync_manager::reset_lib_num(const connection_ptr& c) {
-      if(state == in_sync) {
-         source.reset();
+   void sync_manager::sync_reset_lib_num(const connection_ptr& c) {
+      std::unique_lock<std::mutex> g( sync_mtx );
+      if( sync_state == in_sync ) {
+         sync_source.reset();
       }
       if( !c ) return;
       if( c->current() ) {
-         if( c->last_handshake_recv.last_irreversible_block_num > sync_known_lib_num) {
-            sync_known_lib_num =c->last_handshake_recv.last_irreversible_block_num;
+         if( c->last_handshake_recv.last_irreversible_block_num > sync_known_lib_num ) {
+            sync_known_lib_num = c->last_handshake_recv.last_irreversible_block_num;
          }
-      } else if( c == source ) {
+      } else if( c == sync_source ) {
          sync_last_requested_num = 0;
-         request_next_chunk();
+         request_next_chunk( std::move(g) );
       }
    }
 
-   bool sync_manager::sync_required() {
-      fc_dlog(logger, "last req = ${req}, last recv = ${recv} known = ${known} our head = ${head}",
-              ("req",sync_last_requested_num)("recv",sync_next_expected_num)("known",sync_known_lib_num)("head",chain_plug->chain().fork_db_head_block_num()));
+   bool sync_manager::is_sync_required() {
+      fc_dlog( logger, "last req = ${req}, last recv = ${recv} known = ${known} our head = ${head}",
+               ("req", sync_last_requested_num)( "recv", sync_next_expected_num )( "known", sync_known_lib_num )
+               ("head", chain_plug->chain().fork_db_head_block_num() ) );
 
       return( sync_last_requested_num < sync_known_lib_num ||
               chain_plug->chain().fork_db_head_block_num() < sync_last_requested_num );
    }
 
-   void sync_manager::request_next_chunk( const connection_ptr& conn ) {
-      uint32_t head_block = chain_plug->chain().fork_db_head_block_num();
+   // call with g_sync locked
+   void sync_manager::request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn ) {
+      uint32_t fork_head_block_num = 0;
+      uint32_t lib_block_num = 0;
+      std::tie( lib_block_num, std::ignore, fork_head_block_num,
+                std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
 
-      if (head_block < sync_last_requested_num && source && source->current()) {
-         fc_ilog(logger, "ignoring request, head is ${h} last req = ${r} source is ${p}",
-                  ("h",head_block)("r",sync_last_requested_num)("p",source->peer_name()));
+      if( fork_head_block_num < sync_last_requested_num && sync_source && sync_source->current() ) {
+         fc_ilog( logger, "ignoring request, head is ${h} last req = ${r} source is ${p}",
+                  ("h", fork_head_block_num)( "r", sync_last_requested_num )( "p", sync_source->peer_address() ) );
          return;
       }
 
@@ -1447,25 +1493,25 @@ struct msg_handler : public fc::visitor<void> {
        */
 
       if (conn && conn->current() ) {
-         source = conn;
+         sync_source = conn;
       } else {
          boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          if (my_impl->connections.size() == 1) {
-            if (!source) {
-               source = *my_impl->connections.begin();
+            if (!sync_source) {
+               sync_source = *my_impl->connections.begin();
             }
          } else {
             // init to a linear array search
             auto cptr = my_impl->connections.begin();
             auto cend = my_impl->connections.end();
             // do we remember the previous source?
-            if (source) {
+            if (sync_source) {
                //try to find it in the list
-               cptr = my_impl->connections.find(source);
+               cptr = my_impl->connections.find( sync_source );
                cend = cptr;
                if (cptr == my_impl->connections.end()) {
                   //not there - must have been closed! cend is now connections.end, so just flatten the ring.
-                  source.reset();
+                  sync_source.reset();
                   cptr = my_impl->connections.begin();
                } else {
                   //was found - advance the start to the next. cend is the old source.
@@ -1479,8 +1525,8 @@ struct msg_handler : public fc::visitor<void> {
             auto cstart_it = cptr;
             do {
                //select the first one which is current and break out.
-               if((*cptr)->current()) {
-                  source = *cptr;
+               if( (*cptr)->current() ) {
+                  sync_source = *cptr;
                   break;
                }
                if(++cptr == my_impl->connections.end())
@@ -1491,11 +1537,11 @@ struct msg_handler : public fc::visitor<void> {
       }
 
       // verify there is an available source
-      if (!source || !source->current() ) {
+      if( !sync_source || !sync_source->current() ) {
          fc_elog( logger, "Unable to continue syncing at this time");
-         sync_known_lib_num = chain_plug->chain().last_irreversible_block_num();
+         sync_known_lib_num = lib_block_num;
          sync_last_requested_num = 0;
-         set_state(in_sync); // probably not, but we can't do anything else
+         set_state( in_sync ); // probably not, but we can't do anything else
          return;
       }
 
@@ -1505,16 +1551,18 @@ struct msg_handler : public fc::visitor<void> {
          if( end > sync_known_lib_num )
             end = sync_known_lib_num;
          if( end > 0 && end >= start ) {
-            fc_ilog(logger, "requesting range ${s} to ${e}, from ${n}",
-                    ("n",source->peer_name())("s",start)("e",end));
-            source->request_sync_blocks(start, end);
             sync_last_requested_num = end;
+            connection_ptr c = sync_source;
+            g_sync.unlock();
+            fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}",
+                     ("n", c->peer_address())( "s", start )( "e", end ) );
+            c->request_sync_blocks( start, end );
          }
       }
    }
 
-   void sync_manager::send_handshakes()
-   {
+   // static, thread safe
+   void sync_manager::send_handshakes() {
       boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& ci : my_impl->connections ) {
          if( ci->current() ) {
@@ -1524,37 +1572,40 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void sync_manager::start_sync(const connection_ptr& c, uint32_t target) {
+      std::unique_lock<std::mutex> g_sync( sync_mtx );
       if( target > sync_known_lib_num) {
          sync_known_lib_num = target;
       }
 
-      if (!sync_required()) {
+      if( !is_sync_required() ) {
          uint32_t bnum = chain_plug->chain().last_irreversible_block_num();
          uint32_t hnum = chain_plug->chain().fork_db_head_block_num();
          fc_dlog( logger, "We are already caught up, my irr = ${b}, head = ${h}, target = ${t}",
-                  ("b",bnum)("h",hnum)("t",target));
+                  ("b", bnum)( "h", hnum )( "t", target ) );
          return;
       }
 
-      if (state == in_sync) {
-         set_state(lib_catchup);
+      if( sync_state == in_sync ) {
+         set_state( lib_catchup );
          sync_next_expected_num = chain_plug->chain().last_irreversible_block_num() + 1;
       }
 
-      fc_ilog(logger, "Catching up with chain, our last req is ${cc}, theirs is ${t} peer ${p}",
-              ( "cc",sync_last_requested_num)("t",target)("p",c->peer_name()));
+      fc_ilog( logger, "Catching up with chain, our last req is ${cc}, theirs is ${t} peer ${p}",
+               ("cc", sync_last_requested_num)( "t", target )( "p", c->peer_address() ) );
 
-      request_next_chunk(c);
+      request_next_chunk( std::move( g_sync ), c );
    }
 
-   void sync_manager::reassign_fetch(const connection_ptr& c, go_away_reason reason) {
-      fc_ilog(logger, "reassign_fetch, our last req is ${cc}, next expected is ${ne} peer ${p}",
-              ( "cc",sync_last_requested_num)("ne",sync_next_expected_num)("p",c->peer_name()));
+   // called from connection strand
+   void sync_manager::sync_reassign_fetch(const connection_ptr& c, go_away_reason reason) {
+      std::unique_lock<std::mutex> g( sync_mtx );
+      fc_ilog( logger, "reassign_fetch, our last req is ${cc}, next expected is ${ne} peer ${p}",
+               ("cc", sync_last_requested_num)( "ne", sync_next_expected_num )( "p", c->peer_address() ) );
 
-      if (c == source) {
+      if( c == sync_source ) {
          c->cancel_sync(reason);
          sync_last_requested_num = 0;
-         request_next_chunk();
+         request_next_chunk( std::move(g) );
       }
    }
 
@@ -1562,7 +1613,7 @@ struct msg_handler : public fc::visitor<void> {
       controller& cc = chain_plug->chain();
       uint32_t lib_num = cc.last_irreversible_block_num();
       uint32_t peer_lib = msg.last_irreversible_block_num;
-      reset_lib_num(c);
+      sync_reset_lib_num(c);
       c->syncing = false;
 
       //--------------------------------
@@ -1647,11 +1698,14 @@ struct msg_handler : public fc::visitor<void> {
       if( req.req_blocks.mode == catch_up ) {
          c->fork_head = id;
          c->fork_head_num = num;
-         fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} target LIB = ${lib} next_expected = ${ne}",
-                  ("s",stage_str(state))("fhn",num)("lib",sync_known_lib_num)("ne", sync_next_expected_num) );
-         if (state == lib_catchup)
+         std::lock_guard<std::mutex> g( sync_mtx );
+         fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} "
+                          "target LIB = ${lib} next_expected = ${ne}",
+                  ("s", stage_str( sync_state ))( "fhn", num )( "lib", sync_known_lib_num )
+                  ("ne", sync_next_expected_num ) );
+         if( sync_state == lib_catchup )
             return;
-         set_state(head_catchup);
+         set_state( head_catchup );
       } else {
          c->fork_head = block_id_type();
          c->fork_head_num = 0;
@@ -1661,12 +1715,12 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    void sync_manager::sync_recv_notice( const connection_ptr& c, const notice_message& msg) {
-      fc_ilog(logger, "sync_manager got ${m} block notice",("m",modes_str(msg.known_blocks.mode)));
+      fc_ilog( logger, "sync_manager got ${m} block notice", ("m", modes_str( msg.known_blocks.mode )) );
       EOS_ASSERT( msg.known_blocks.mode == catch_up || msg.known_blocks.mode == last_irr_catch_up, plugin_exception,
                   "sync_recv_notice only called on catch_up" );
       if( msg.known_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
-                  ("s", msg.known_blocks.ids.size())("p", c->peer_name()) );
+                  ("s", msg.known_blocks.ids.size())("p", c->peer_address()) );
          c->close();
          return;
       }
@@ -1678,24 +1732,31 @@ struct msg_handler : public fc::visitor<void> {
          }
       } else if (msg.known_blocks.mode == last_irr_catch_up) {
          c->last_handshake_recv.last_irreversible_block_num = msg.known_trx.pending;
-         reset_lib_num(c);
+         sync_reset_lib_num(c);
          start_sync(c, msg.known_trx.pending);
       }
    }
 
-   void sync_manager::rejected_block(const connection_ptr& c, uint32_t blk_num) {
-      if (state != in_sync ) {
-         fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_name()) );
+   // called from connection strand
+   void sync_manager::rejected_block( const connection_ptr& c, uint32_t blk_num ) {
+      std::unique_lock<std::mutex> g( sync_mtx );
+      if( sync_state != in_sync ) {
+         fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_address()) );
          sync_last_requested_num = 0;
-         source.reset();
+         sync_source.reset();
+         set_state( in_sync );
+         g.unlock();
          c->close();
-         set_state(in_sync);
          send_handshakes();
       }
    }
+
+   // called from connection strand
    void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
-      fc_dlog(logger, "got block ${bn} from ${p}",("bn",blk_num)("p",c->peer_name()));
-      if (state == lib_catchup) {
+      fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_address() ) );
+      std::unique_lock<std::mutex> g_sync( sync_mtx );
+      stages state = sync_state;
+      if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
                      ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_name()) );
@@ -1703,13 +1764,14 @@ struct msg_handler : public fc::visitor<void> {
             return;
          }
          sync_next_expected_num = blk_num + 1;
-      }
-      if (state == head_catchup) {
-         fc_dlog(logger, "sync_manager in head_catchup state");
-         set_state(in_sync);
-         source.reset();
+      } else if( state == head_catchup ) {
+         fc_dlog( logger, "sync_manager in head_catchup state" );
+         set_state( in_sync );
+         sync_source.reset();
+         g_sync.unlock();
 
          block_id_type null_id;
+         bool set_state_to_head_catchup = false;
          boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          for( const auto& cp : my_impl->connections ) {
             uint32_t fork_head_num = cp->fork_head_num.load(); // fork_head_num provides memory barrier for fork_head
@@ -1720,26 +1782,29 @@ struct msg_handler : public fc::visitor<void> {
                c->fork_head = null_id;
                c->fork_head_num = 0;
             } else {
-               set_state(head_catchup);
+               set_state_to_head_catchup = true;
             }
          }
          g.unlock();
 
-         if (state == in_sync) {
+         if( set_state_to_head_catchup ) {
+            g_sync.lock();
+            set_state( head_catchup );
+            g_sync.unlock();
+         } else {
             send_handshakes();
          }
-      }
-      else if (state == lib_catchup) {
+      } else if( state == lib_catchup ) {
          if( blk_num == sync_known_lib_num ) {
-            fc_dlog( logger, "All caught up with last known last irreversible block resending handshake");
-            set_state(in_sync);
+            fc_dlog( logger, "All caught up with last known last irreversible block resending handshake" );
+            set_state( in_sync );
+            g_sync.unlock();
             send_handshakes();
-         }
-         else if (blk_num == sync_last_requested_num) {
-            request_next_chunk();
-         }
-         else {
-            fc_dlog(logger,"calling sync_wait on connection ${p}",("p",c->peer_name()));
+         } else if( blk_num == sync_last_requested_num ) {
+            request_next_chunk( std::move( g_sync) );
+         } else {
+            g_sync.unlock();
+            fc_dlog( logger, "calling sync_wait on connection ${p}", ("p", c->peer_address()) );
             c->sync_wait();
          }
       }
@@ -1747,11 +1812,12 @@ struct msg_handler : public fc::visitor<void> {
 
    //------------------------------------------------------------------------
 
+   // thread safe
    bool dispatch_manager::add_peer_block(const peer_block_state& entry) {
-      std::lock_guard<std::mutex> g(blk_state_mtx);
+      std::lock_guard<std::mutex> g( blk_state_mtx );
       auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(entry.id), entry.connection_id));
       bool added = (bptr == blk_state.end());
-      if (added){
+      if( added ) {
          blk_state.insert(entry);
       }
       return added;
@@ -1779,6 +1845,7 @@ struct msg_handler : public fc::visitor<void> {
       return added;
    }
 
+   // thread safe
    void dispatch_manager::update_txns_block_num( const signed_block_ptr& sb ) {
       update_block_num ubn( sb->block_num() );
       std::lock_guard<std::mutex> g( local_txns_mtx );
@@ -1792,6 +1859,7 @@ struct msg_handler : public fc::visitor<void> {
       }
    }
 
+   // thread safe
    void dispatch_manager::update_txns_block_num( const transaction_id_type& id, uint32_t blk_num ) {
       update_block_num ubn( blk_num );
       std::lock_guard<std::mutex> g( local_txns_mtx );
@@ -1878,6 +1946,7 @@ struct msg_handler : public fc::visitor<void> {
       }
    }
 
+   // called from connection strand
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
       peer_block_state pbstate{id, bnum, c->connection_id};
       add_peer_block( pbstate );
@@ -2025,23 +2094,23 @@ struct msg_handler : public fc::visitor<void> {
    //------------------------------------------------------------------------
 
    // called from any thread
-   bool net_plugin_impl::resolve_and_connect(const connection_ptr& c) {
-      if( c->no_retry != go_away_reason::no_reason) {
-         fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( c->no_retry )));
+   bool connection::resolve_and_connect() {
+      if( no_retry != go_away_reason::no_reason) {
+         fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( no_retry )));
          return false;
       }
 
-      string::size_type colon = c->peer_address().find(':');
+      string::size_type colon = peer_address().find(':');
       if (colon == std::string::npos || colon == 0) {
-         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p",c->peer_address()) );
+         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p", peer_address()) );
          return false;
       }
 
-      string host = c->peer_address().substr( 0, colon );
-      string port = c->peer_address().substr( colon + 1);
+      string host = peer_address().substr( 0, colon );
+      string port = peer_address().substr( colon + 1);
       idump((host)(port));
       tcp::resolver::query query( tcp::v4(), host, port );
-      connection_wptr weak_conn = c;
+      connection_wptr weak_conn = shared_from_this();
       // Note: need to add support for IPv6 too
 
 <<<<<<< HEAD
@@ -2063,29 +2132,33 @@ struct msg_handler : public fc::visitor<void> {
                 } );
 =======
       auto resolver = std::make_shared<tcp::resolver>( *server_ioc );
-      resolver->async_resolve( query,
-            [resolver, ioc = server_ioc, weak_conn, this]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
+      resolver->async_resolve( query, boost::asio::bind_executor( strand,
+            [resolver, ioc = server_ioc, weak_conn]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
                auto c = weak_conn.lock();
                if( !c ) return;
                if( !err ) {
-                  connect( c, resolver, endpoint_itr );
+                  c->connect( resolver, endpoint_itr );
                } else {
                   fc_elog( logger, "Unable to resolve ${add}: ${error}", ("add", c->peer_name())( "error", err.message() ) );
                }
+<<<<<<< HEAD
             } );
 >>>>>>> Make use of resolver thread safe
+=======
+            } ) );
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
       return true;
 >>>>>>> Made all access to impl->connections thread safe
    }
 
-   // called from any thread
-   void net_plugin_impl::connect(const connection_ptr& c, const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr) {
-      if( c->no_retry != go_away_reason::no_reason) {
-         string rsn = reason_str(c->no_retry);
+   // called from connection strand
+   void connection::connect( const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr ) {
+      if( no_retry != go_away_reason::no_reason) {
          return;
       }
       auto current_endpoint = *endpoint_itr;
       ++endpoint_itr;
+<<<<<<< HEAD
       c->connecting = true;
 <<<<<<< HEAD
       connection_wptr weak_conn = c;
@@ -2100,14 +2173,20 @@ struct msg_handler : public fc::visitor<void> {
       c->socket.async_connect( current_endpoint,
             boost::asio::bind_executor( c->strand, [resolver, c, endpoint_itr, this]( const boost::system::error_code& err ) {
             if( !err && c->socket.is_open()) {
+=======
+      connecting = true;
+      socket.async_connect( current_endpoint,
+            boost::asio::bind_executor( strand, [resolver, c = shared_from_this(), endpoint_itr]( const boost::system::error_code& err ) {
+            if( !err && c->socket.is_open() ) {
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
                if( c->start_session() ) {
 >>>>>>> Move socket ownership into connection.
                   c->send_handshake();
                }
             } else {
-               if( endpoint_itr != tcp::resolver::iterator()) {
+               if( endpoint_itr != tcp::resolver::iterator() ) {
                   c->close();
-                  connect( c, resolver, endpoint_itr );
+                  c->connect( resolver, endpoint_itr );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;
@@ -2208,9 +2287,9 @@ struct msg_handler : public fc::visitor<void> {
    }
 
    // only called from strand thread
-   void net_plugin_impl::start_read_message(const connection_ptr& conn) {
-
+   void connection::start_read_message() {
       try {
+<<<<<<< HEAD
          connection_wptr weak_conn = conn;
 
 <<<<<<< HEAD
@@ -2222,16 +2301,18 @@ struct msg_handler : public fc::visitor<void> {
          std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
 >>>>>>> Test of multi-threaded reading
 =======
+=======
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
          std::size_t minimum_read =
-               std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
+               std::atomic_exchange<decltype(outstanding_read_bytes.load())>( &outstanding_read_bytes, 0 );
          minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
 >>>>>>> Remove unneeded access to atomic
 
-         if (use_socket_read_watermark) {
+         if (my_impl->use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
             std::size_t socket_read_watermark = std::min<std::size_t>(minimum_read, max_socket_read_watermark);
             boost::asio::socket_base::receive_low_watermark read_watermark_opt(socket_read_watermark);
-            conn->socket.set_option(read_watermark_opt);
+            socket.set_option(read_watermark_opt);
          }
 
          auto completion_handler = [minimum_read](boost::system::error_code ec, std::size_t bytes_transferred) -> std::size_t {
@@ -2242,21 +2323,28 @@ struct msg_handler : public fc::visitor<void> {
             }
          };
 
-         if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ||
-             conn->reads_in_flight > def_max_reads_in_flight   ||
-             conn->trx_in_progress_size > def_max_trx_in_progress_size )
+         if( buffer_queue.write_queue_size() > def_max_write_queue_size ||
+             reads_in_flight > def_max_reads_in_flight   ||
+             trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> Make delay_timer thread safe
             uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
             uint32_t trx_in_progress_size = conn->trx_in_progress_size;
             uint32_t reads_in_flight = conn->reads_in_flight;
+=======
+            uint32_t write_queue_size = buffer_queue.write_queue_size();
+            uint32_t trx_in_progress_size = this->trx_in_progress_size.load();
+            uint32_t reads_in_flight = this->reads_in_flight.load();
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
             if( write_queue_size > def_max_write_queue_size ) {
-               peer_wlog( conn, "write_queue full ${s} bytes", ("s", write_queue_size) );
+               peer_wlog( this, "write_queue full ${s} bytes", ("s", write_queue_size) );
             } else if( reads_in_flight > def_max_reads_in_flight ) {
+<<<<<<< HEAD
                peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
 <<<<<<< HEAD
 =======
@@ -2267,12 +2355,15 @@ struct msg_handler : public fc::visitor<void> {
 >>>>>>> Test of multi-threaded reading
 =======
 >>>>>>> Make delay_timer thread safe
+=======
+               peer_wlog( this, "max reads in flight ${s}", ("s", reads_in_flight) );
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
             } else {
-               peer_wlog( conn, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
+               peer_wlog( this, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
             if( write_queue_size > 2*def_max_write_queue_size ||
                 reads_in_flight > 2*def_max_reads_in_flight   ||
-                  trx_in_progress_size > 2*def_max_trx_in_progress_size )
+                trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
 <<<<<<< HEAD
                fc_wlog( logger, "queues over full, giving up on connection" );
@@ -2288,27 +2379,32 @@ struct msg_handler : public fc::visitor<void> {
                });
 =======
                fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
+<<<<<<< HEAD
                         ("p", conn->peer_name()) );
                conn->close();
 >>>>>>> Move socket ownership into connection.
+=======
+                        ("p", peer_name()) );
+               close();
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
                return;
             }
-            std::lock_guard<std::mutex> g( conn->read_delay_timer_mtx );
-            conn->read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
-            conn->read_delay_timer.async_wait(
-                  boost::asio::bind_executor(conn->strand, [this, weak_conn]( boost::system::error_code ) {
+            std::lock_guard<std::mutex> g( read_delay_timer_mtx );
+            read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
+            connection_wptr weak_conn = shared_from_this();
+            read_delay_timer.async_wait( boost::asio::bind_executor(strand, [weak_conn]( boost::system::error_code ) {
                auto conn = weak_conn.lock();
                if( !conn ) return;
-               start_read_message( conn );
+               conn->start_read_message();
             } ) );
             return;
          }
 
-         ++conn->reads_in_flight;
-         boost::asio::async_read( conn->socket,
-            conn->pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
-            boost::asio::bind_executor( conn->strand,
-            [this, conn]( boost::system::error_code ec, std::size_t bytes_transferred ) {
+         ++reads_in_flight;
+         boost::asio::async_read( socket,
+            pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
+            boost::asio::bind_executor( strand,
+            [conn = shared_from_this()]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                --conn->reads_in_flight;
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -2347,7 +2443,7 @@ struct msg_handler : public fc::visitor<void> {
 
                            if (bytes_in_buffer >= total_message_bytes) {
                               conn->pending_message_buffer.advance_read_ptr(message_header_size);
-                              if (!process_next_message(conn, message_length)) {
+                              if (!conn->process_next_message(message_length)) {
                                  return;
                               }
                            } else {
@@ -2362,7 +2458,7 @@ struct msg_handler : public fc::visitor<void> {
                            }
                         }
                      }
-                     if( !close_connection ) start_read_message( conn );
+                     if( !close_connection ) conn->start_read_message();
                   } else {
                      if (ec.value() != boost::asio::error::eof) {
                         fc_elog( logger, "Error reading message: ${m}", ( "m", ec.message() ) );
@@ -2423,15 +2519,16 @@ struct msg_handler : public fc::visitor<void> {
                }
          }));
       } catch (...) {
-         fc_elog( logger, "Undefined exception in start_read_message, closing connection to: ${p}", ("p", conn->peer_name()) );
-         conn->close();
+         fc_elog( logger, "Undefined exception in start_read_message, closing connection to: ${p}", ("p", peer_name()) );
+         close();
       }
    }
 
-   bool net_plugin_impl::process_next_message(const connection_ptr& conn, uint32_t message_length) {
+   // called from connection strand
+   bool connection::process_next_message( uint32_t message_length ) {
       try {
          // if next message is a block we already have, exit early
-         auto peek_ds = conn->pending_message_buffer.create_peek_datastream();
+         auto peek_ds = pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
          if( which == signed_block_which ) {
@@ -2439,26 +2536,21 @@ struct msg_handler : public fc::visitor<void> {
             fc::raw::unpack( peek_ds, bh );
 
             block_id_type blk_id = bh.id();
-            if( dispatcher->have_block( blk_id ) ) {
-               connection_wptr weak = conn;
-               app().post(priority::high, // high since block processing is high and this needs to run before next block
-                     [dispatcher = dispatcher.get(), sync_master = sync_master.get(), weak{std::move(weak)}, blk_id] {
-                  connection_ptr c = weak.lock();
-                  if(c) {
-                     auto blk_num = block_header::num_from_id(blk_id);
-                     dispatcher->recv_block(c, blk_id, blk_num);
-                     sync_master->sync_recv_block( c, blk_id, blk_num );
-                  }
-               });
-               conn->pending_message_buffer.advance_read_ptr( message_length );
+            if( my_impl->dispatcher->have_block( blk_id ) ) {
+               auto blk_num = block_header::num_from_id( blk_id );
+               connection_ptr c = shared_from_this();
+               my_impl->dispatcher->recv_block( c, blk_id, blk_num );
+               my_impl->sync_master->sync_recv_block( c, blk_id, blk_num );
+
+               pending_message_buffer.advance_read_ptr( message_length );
                return true;
             }
          }
 
-         auto ds = conn->pending_message_buffer.create_datastream();
+         auto ds = pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
-         msg_handler m( *this, conn );
+         msg_handler m( *my_impl, shared_from_this() );
          if( msg.contains<signed_block>() ) {
             m( std::move( msg.get<signed_block>() ) );
          } else if( msg.contains<packed_transaction>() ) {
@@ -2468,14 +2560,35 @@ struct msg_handler : public fc::visitor<void> {
          }
       } catch( const fc::exception& e ) {
          fc_elog( logger, "Exception in handling message from ${p}: ${s}",
-                  ("p", conn->peer_name())("s", e.to_detail_string()) );
-         conn->close();
+                  ("p", peer_name())("s", e.to_detail_string()) );
+         close();
          return false;
       }
       return true;
    }
 
-   bool net_plugin_impl::is_valid(const handshake_message& msg) {
+   // call only from main application thread
+   void net_plugin_impl::update_chain_info() {
+      controller& cc = chain_plug->chain();
+      std::lock_guard<std::mutex> g( chain_info_mtx );
+      chain_lib_num = cc.last_irreversible_block_num();
+      chain_lib_id = cc.last_irreversible_block_id();
+      chain_head_blk_num = cc.head_block_num();
+      chain_head_blk_id = cc.head_block_id();
+      chain_fork_head_blk_num = cc.fork_db_head_block_num();
+      chain_fork_head_blk_id = cc.fork_db_head_block_id();
+   }
+
+   //         lib_num, head_blk_num, fork_head_blk_num, lib_id, head_blk_id, fork_head_blk_id
+   std::tuple<uint32_t, uint32_t, uint32_t, block_id_type, block_id_type, block_id_type>
+   net_plugin_impl::get_chain_info() const {
+      std::lock_guard<std::mutex> g( chain_info_mtx );
+      return std::make_tuple(
+            chain_lib_num, chain_head_blk_num, chain_fork_head_blk_num,
+            chain_lib_id, chain_head_blk_id, chain_fork_head_blk_id );
+   }
+
+   bool net_plugin_impl::is_valid( const handshake_message& msg ) {
       // Do some basic validation of an incoming handshake_message, so things
       // that really aren't handshake messages can be quickly discarded without
       // affecting state.
@@ -2504,16 +2617,14 @@ struct msg_handler : public fc::visitor<void> {
       peer_ilog(c, "received chain_size_message");
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const handshake_message& msg) {
+   // called from connection strand
+   void net_plugin_impl::handle_message( const connection_ptr& c, const handshake_message& msg ) {
       peer_ilog(c, "received handshake_message");
-      if (!is_valid(msg)) {
+      if( !is_valid( msg ) ) {
          peer_elog( c, "bad handshake message");
-         c->enqueue( go_away_message( fatal_other ));
+         c->enqueue( go_away_message( fatal_other ) );
          return;
       }
-      controller& cc = chain_plug->chain();
-      uint32_t lib_num = cc.last_irreversible_block_num();
-      uint32_t peer_lib = msg.last_irreversible_block_num;
       if( c->connecting ) {
          c->connecting = false;
       }
@@ -2579,28 +2690,32 @@ struct msg_handler : public fc::visitor<void> {
             return;
          }
 
-         bool on_fork = false;
-         fc_dlog(logger, "lib_num = ${ln} peer_lib = ${pl}",("ln",lib_num)("pl",peer_lib));
+         uint32_t peer_lib = msg.last_irreversible_block_num;
+         app().post( priority::low, [peer_lib, chain_plug = this->chain_plug, c, msg_lib_id = msg.last_irreversible_block_id]() {
+            controller& cc = chain_plug->chain();
+            uint32_t lib_num = cc.last_irreversible_block_num();
 
-         if( peer_lib <= lib_num && peer_lib > 0) {
-            try {
-               block_id_type peer_lib_id =  cc.get_block_id_for_num( peer_lib);
-               on_fork =( msg.last_irreversible_block_id != peer_lib_id);
-            }
-            catch( const unknown_block_exception &ex) {
-               fc_wlog( logger, "peer last irreversible block ${pl} is unknown", ("pl", peer_lib) );
-               on_fork = true;
-            }
-            catch( ...) {
-               fc_wlog( logger, "caught an exception getting block id for ${pl}",("pl",peer_lib) );
-               on_fork = true;
-            }
-            if( on_fork) {
-               fc_elog( logger, "Peer chain is forked" );
-               c->enqueue( go_away_message( forked ));
-               return;
+            bool on_fork = false;
+            fc_dlog( logger, "lib_num = ${ln} peer_lib = ${pl}", ("ln", lib_num)( "pl", peer_lib ) );
+
+            if( peer_lib <= lib_num && peer_lib > 0 ) {
+               try {
+                  block_id_type peer_lib_id = cc.get_block_id_for_num( peer_lib );
+                  on_fork = (msg_lib_id != peer_lib_id);
+               } catch( const unknown_block_exception& ex ) {
+                  fc_wlog( logger, "peer last irreversible block ${pl} is unknown", ("pl", peer_lib) );
+                  on_fork = true;
+               } catch( ... ) {
+                  fc_wlog( logger, "caught an exception getting block id for ${pl}", ("pl", peer_lib) );
+                  on_fork = true;
+               }
+               if( on_fork ) {
+                  fc_elog( logger, "Peer chain is forked" );
+                  c->enqueue( go_away_message( forked ) );
+                  return;
+               }
             }
-         }
+         });
 
          if (c->sent_handshake_count == 0) {
             c->send_handshake();
@@ -2767,7 +2882,7 @@ struct msg_handler : public fc::visitor<void> {
              trx->get_signatures().size() * sizeof(signature_type);
    }
 
-   // called from thread_pool threads
+   // called from connection strand
    void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
       fc_dlog(logger, "got a packed transaction, cancel wait");
       if( db_read_mode == eosio::db_read_mode::READ_ONLY ) {
@@ -2792,6 +2907,7 @@ struct msg_handler : public fc::visitor<void> {
 
       c->trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
       chain_plug->accept_transaction(ptrx, [c, this, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+         // next (this lambda) called from application thread
          c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2817,7 +2933,10 @@ struct msg_handler : public fc::visitor<void> {
             }
          }
 
-         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}, head_blk_num = this->head_blk_num]() {
+         controller& cc = chain_plug->chain();
+         uint32_t head_blk_num = cc.head_block_num();
+
+         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}, head_blk_num]() {
             if( accepted ) {
                dispatcher->bcast_transaction( ptrx );
             } else {
@@ -2829,6 +2948,10 @@ struct msg_handler : public fc::visitor<void> {
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+   // called from application thread
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
    void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
       block_id_type blk_id = msg->id();
@@ -2853,6 +2976,7 @@ struct msg_handler : public fc::visitor<void> {
 <<<<<<< HEAD
 <<<<<<< HEAD
          if( cc.fetch_block_by_id(blk_id) ) {
+<<<<<<< HEAD
             sync_master->recv_block(c, blk_id, blk_num);
             return;
          }
@@ -2870,6 +2994,11 @@ struct msg_handler : public fc::visitor<void> {
 =======
             sync_master->sync_recv_block(c, blk_id, blk_num);
 >>>>>>> Consolidate transaction tracking, reducing memory requirements and making thread safe.
+=======
+            c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {
+               sync_master->sync_recv_block( c, blk_id, blk_num );
+            });
+>>>>>>> Work toward making sync_manager and handshake message thread safe.
             return;
          }
 <<<<<<< HEAD
@@ -2984,14 +3113,16 @@ struct msg_handler : public fc::visitor<void> {
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );
       }
 
-      dispatcher->recv_block(c, blk_id, blk_num);
+      c->strand.post( [dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+         dispatcher->recv_block( c, blk_id, blk_num );
+      });
       fc::microseconds age( fc::time_point::now() - msg->timestamp);
       peer_ilog(c, "received signed_block : #${n} block age in secs = ${age}",
               ("n",blk_num)("age",age.to_seconds()));
 
       go_away_reason reason = fatal_other;
       try {
-         chain_plug->accept_block(msg); //, sync_master->is_active(c));
+         chain_plug->accept_block(msg);
          reason = no_reason;
       } catch( const unlinkable_block_exception &ex) {
          peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));
@@ -3012,16 +3143,18 @@ struct msg_handler : public fc::visitor<void> {
          fc_elog( logger, "handle sync block caught something else from ${p}",("num",blk_num)("p",c->peer_name()));
       }
 
-      update_block_num ubn(blk_num);
       if( reason == no_reason ) {
          boost::asio::post( *server_ioc, [self = this, msg]() {
             self->dispatcher->update_txns_block_num( msg );
          });
-         sync_master->sync_recv_block(c, blk_id, blk_num);
-      }
-      else {
-         sync_master->rejected_block(c, blk_num);
-         dispatcher->rejected_block( blk_id );
+         c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {
+            sync_master->sync_recv_block( c, blk_id, blk_num );
+         });
+      } else {
+         c->strand.post( [sync_master = sync_master.get(), dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+            sync_master->rejected_block( c, blk_num );
+            dispatcher->rejected_block( blk_id );
+         });
       }
    }
 
@@ -3088,7 +3221,8 @@ struct msg_handler : public fc::visitor<void> {
 
    void net_plugin_impl::expire() {
       auto now = time_point::now();
-      uint32_t lib = lib_num.load();
+      uint32_t lib = 0;
+      std::tie( lib, std::ignore, std::ignore, std::ignore, std::ignore, std::ignore ) = get_chain_info();
       dispatcher->expire_blocks( lib );
 <<<<<<< HEAD
       for ( auto& c : connections ) {
@@ -3132,7 +3266,7 @@ struct msg_handler : public fc::visitor<void> {
          }
          if( !(*it)->socket_is_open() && !(*it)->connecting) {
             if( (*it)->peer_address().length() > 0) {
-               if( !resolve_and_connect(*it) ) {
+               if( !(*it)->resolve_and_connect() ) {
                   it = connections.erase(it);
                   continue;
                }
@@ -3147,17 +3281,28 @@ struct msg_handler : public fc::visitor<void> {
       start_conn_timer(connector_period, std::weak_ptr<connection>());
    }
 
-   void net_plugin_impl::accepted_block(const block_state_ptr& block) {
+   // called from application thread
+   void net_plugin_impl::on_accepted_block(const block_state_ptr& block) {
+      update_chain_info();
       boost::asio::post( *server_ioc, [this, ioc=server_ioc, block]() {
          fc_dlog( logger, "signaled, id = ${id}", ("id", block->id) );
          dispatcher->bcast_block( block );
       });
    }
 
+   // called from application thread
+   void net_plugin_impl::on_irreversible_block( const block_state_ptr& ) {
+      update_chain_info();
+   }
+
+   // called from application thread
    void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
       const auto& id = results.second->id;
       if (results.first) {
          fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
+
+         controller& cc = chain_plug->chain();
+         uint32_t head_blk_num = cc.head_block_num();
          dispatcher->rejected_transaction(id, head_blk_num);
       } else {
          fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
@@ -3239,7 +3384,7 @@ struct msg_handler : public fc::visitor<void> {
       return chain::signature_type();
    }
 
-   // call from main application thread
+   // call from connection strand
    void handshake_initializer::populate( handshake_message& hello ) {
       hello.network_version = net_version_base + net_version;
       hello.chain_id = my_impl->chain_id;
@@ -3263,29 +3408,8 @@ struct msg_handler : public fc::visitor<void> {
 #endif
       hello.agent = my_impl->user_agent_name;
 
-
-      controller& cc = my_impl->chain_plug->chain();
-      hello.head_id = fc::sha256();
-      hello.last_irreversible_block_id = fc::sha256();
-      hello.head_num = cc.fork_db_head_block_num();
-      hello.last_irreversible_block_num = cc.last_irreversible_block_num();
-      if( hello.last_irreversible_block_num ) {
-         try {
-            hello.last_irreversible_block_id = cc.get_block_id_for_num(hello.last_irreversible_block_num);
-         }
-         catch( const unknown_block_exception &ex) {
-            fc_wlog( logger, "caught unkown_block" );
-            hello.last_irreversible_block_num = 0;
-         }
-      }
-      if( hello.head_num ) {
-         try {
-            hello.head_id = cc.get_block_id_for_num( hello.head_num );
-         }
-         catch( const unknown_block_exception &ex) {
-           hello.head_num = 0;
-         }
-      }
+      std::tie( hello.last_irreversible_block_num, std::ignore, hello.head_num,
+                hello.last_irreversible_block_id, std::ignore, hello.head_id ) = my_impl->get_chain_info();
    }
 
    net_plugin::net_plugin()
@@ -3478,7 +3602,7 @@ struct msg_handler : public fc::visitor<void> {
       }
       chain::controller&cc = my->chain_plug->chain();
       {
-         cc.accepted_block.connect(  boost::bind(&net_plugin_impl::accepted_block, my.get(), _1));
+         cc.accepted_block.connect(  boost::bind(&net_plugin_impl::on_accepted_block, my.get(), _1));
       }
 
       my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
@@ -3559,7 +3683,7 @@ struct msg_handler : public fc::visitor<void> {
 
       connection_ptr c = std::make_shared<connection>( host );
       fc_dlog( logger, "calling active connector" );
-      if( my->resolve_and_connect( c ) ) {
+      if( c->resolve_and_connect() ) {
          fc_dlog( logger, "adding new connection to the list" );
          boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
          my->connections.insert( c );

From 2cc95a6055533342d3595e20ca76e1fdfeb76bd1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 26 Mar 2019 11:36:38 -0500
Subject: [PATCH 0144/1648] Make sync_manager::recv_handshake connection strand
 safe

---
 plugins/net_plugin/net_plugin.cpp | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0677261b2d1..2cca95804fe 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -161,13 +161,13 @@ namespace eosio {
       static void send_handshakes();
 
    public:
-      explicit sync_manager(uint32_t span);
-      void sync_reset_lib_num(const connection_ptr& conn);
-      void sync_reassign_fetch(const connection_ptr& c, go_away_reason reason);
-      void rejected_block(const connection_ptr& c, uint32_t blk_num);
-      void sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num);
-      void recv_handshake(const connection_ptr& c, const handshake_message& msg);
-      void sync_recv_notice( const connection_ptr& c, const notice_message& msg);
+      explicit sync_manager( uint32_t span );
+      void sync_reset_lib_num( const connection_ptr& conn );
+      void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
+      void rejected_block( const connection_ptr& c, uint32_t blk_num );
+      void sync_recv_block( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num );
+      void recv_handshake( const connection_ptr& c, const handshake_message& msg );
+      void sync_recv_notice( const connection_ptr& c, const notice_message& msg );
    };
 
    class dispatch_manager {
@@ -1609,10 +1609,15 @@ namespace eosio {
       }
    }
 
-   void sync_manager::recv_handshake(const connection_ptr& c, const handshake_message& msg) {
-      controller& cc = chain_plug->chain();
-      uint32_t lib_num = cc.last_irreversible_block_num();
+   void sync_manager::recv_handshake( const connection_ptr& c, const handshake_message& msg ) {
+      uint32_t lib_num = 0;
       uint32_t peer_lib = msg.last_irreversible_block_num;
+      uint32_t head = 0;
+      block_id_type head_id;
+
+      std::tie( lib_num, std::ignore, head,
+                std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
+
       sync_reset_lib_num(c);
       c->syncing = false;
 
@@ -1628,8 +1633,6 @@ namespace eosio {
       //
       //-----------------------------
 
-      uint32_t head = cc.fork_db_head_block_num();
-      block_id_type head_id = cc.fork_db_head_block_id();
       if (head_id == msg.head_id) {
          fc_dlog(logger, "sync check state 0");
          // notify peer of our pending transactions
@@ -1644,7 +1647,7 @@ namespace eosio {
          fc_dlog(logger, "sync check state 1");
          // wait for receipt of a notice message before initiating sync
          if (c->protocol_version < proto_explicit_sync) {
-            start_sync( c, peer_lib);
+            start_sync( c, peer_lib );
          }
          return;
       }

From c7b252013251704aa55b343f2e996f3bef1ad927 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 26 Mar 2019 22:26:39 -0500
Subject: [PATCH 0145/1648] Handle almost every net_message on net_plugin
 thread pool. Optimize bcast_block to not send when syncing.

---
 plugins/net_plugin/net_plugin.cpp | 394 +++++++++++++++---------------
 1 file changed, 202 insertions(+), 192 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2cca95804fe..045fcd94b1a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -147,14 +147,14 @@ namespace eosio {
       uint32_t       sync_next_expected_num;
       uint32_t       sync_req_span;
       connection_ptr sync_source;
-      stages         sync_state;
+      std::atomic<stages> sync_state;
 
       chain_plugin* chain_plug = nullptr;
 
    private:
       constexpr static auto stage_str( stages s );
       void set_state( stages s );
-      bool is_sync_required();
+      bool is_sync_required( uint32_t fork_head_block_num );
       void request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn = connection_ptr() );
       void start_sync( const connection_ptr& c, uint32_t target );
       void verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
@@ -162,6 +162,7 @@ namespace eosio {
 
    public:
       explicit sync_manager( uint32_t span );
+      bool syncing_with_peer() const { return sync_state == lib_catchup; }
       void sync_reset_lib_num( const connection_ptr& conn );
       void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
       void rejected_block( const connection_ptr& c, uint32_t blk_num );
@@ -664,7 +665,6 @@ namespace eosio {
 
       bool connected();
       bool current();
-      void reset();
       void close();
    private:
       static void _close( connection* self ); // for easy capture
@@ -794,6 +794,7 @@ namespace eosio {
 
       void operator()( packed_transaction&& msg ) const {
          // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle packed_transaction" );
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -812,10 +813,12 @@ namespace eosio {
 
       void operator()( const handshake_message& msg ) const {
          // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle handshake_message" );
          impl.handle_message( c, msg );
       }
 
       void operator()( const chain_size_message& msg ) const {
+<<<<<<< HEAD
          connection_wptr weak = c;
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -832,47 +835,50 @@ namespace eosio {
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
+=======
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle chain_size_message" );
+         impl.handle_message( c, msg );
+>>>>>>> Handle almost every net_message on net_plugin thread pool. Optimize bcast_block to not send when syncing.
       }
 
       void operator()( const go_away_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle go_away_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const time_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle time_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const notice_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle notice_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const request_message& msg ) const {
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle request_message" );
+         impl.handle_message( c, msg );
       }
 
       void operator()( const sync_request_message& msg ) const {
+<<<<<<< HEAD
          connection_wptr weak = c;
          app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
 >>>>>>> Work toward making sync_manager and handshake message thread safe.
             connection_ptr c = weak.lock();
             if(c) impl->handle_message( c, msg );
          });
+=======
+         // continue call to handle_message on connection strand
+         fc_dlog( logger, "handle sync_request_message" );
+         impl.handle_message( c, msg );
+>>>>>>> Handle almost every net_message on net_plugin thread pool. Optimize bcast_block to not send when syncing.
       }
    };
 
@@ -982,10 +988,6 @@ namespace eosio {
       return (connected() && !syncing);
    }
 
-   void connection::reset() {
-      peer_requested.reset();
-   }
-
    void connection::flush_queues() {
       buffer_queue.clear_write_queue();
    }
@@ -1005,6 +1007,7 @@ namespace eosio {
       if( self->last_req ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
+<<<<<<< HEAD
 <<<<<<< HEAD
       reset();
       sent_handshake_count = 0;
@@ -1035,6 +1038,9 @@ namespace eosio {
 >>>>>>> Use unique_lock instead of lock_guard to clean up code
 =======
       self->reset();
+=======
+      self->peer_requested.reset();
+>>>>>>> Handle almost every net_message on net_plugin thread pool. Optimize bcast_block to not send when syncing.
       self->sent_handshake_count = 0;
       self->last_handshake_recv = handshake_message();
       self->last_handshake_sent = handshake_message();
@@ -1048,8 +1054,11 @@ namespace eosio {
    }
 
    void connection::blk_send_branch() {
-      controller& cc = my_impl->chain_plug->chain();
-      uint32_t head_num = cc.fork_db_head_block_num();
+      uint32_t head_num = 0;
+      block_id_type head_id;
+      std::tie( std::ignore, std::ignore, head_num,
+                std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
+
       notice_message note;
       note.known_blocks.mode = normal;
       note.known_blocks.pending = 0;
@@ -1058,30 +1067,16 @@ namespace eosio {
          enqueue(note);
          return;
       }
-      block_id_type head_id;
-      block_id_type lib_id;
       block_id_type remote_head_id;
       uint32_t remote_head_num = 0;
-      try {
-         if (last_handshake_recv.generation >= 1) {
-            remote_head_id = last_handshake_recv.head_id;
-            remote_head_num = block_header::num_from_id(remote_head_id);
-            fc_dlog(logger, "maybe truncating branch at  = ${h}:${id}",("h",remote_head_num)("id",remote_head_id));
-         }
-
-         lib_id = last_handshake_recv.last_irreversible_block_id;
-         head_id = cc.fork_db_head_block_id();
-      }
-      catch (const assert_exception& ex) {
-         fc_elog( logger, "unable to retrieve block info: ${n} for ${p}",("n",ex.to_string())("p",peer_name()) );
-         enqueue(note);
-         return;
-      }
-      catch (const fc::exception& ex) {
-      }
-      catch (...) {
+      if( last_handshake_recv.generation >= 1 ) {
+         remote_head_id = last_handshake_recv.head_id;
+         remote_head_num = block_header::num_from_id(remote_head_id);
+         fc_dlog( logger, "maybe truncating branch at  = ${h}:${id}", ("h", remote_head_num)( "id", remote_head_id ) );
       }
 
+      block_id_type lib_id = last_handshake_recv.last_irreversible_block_id;
+
       if( !peer_requested ) {
          peer_requested = sync_state( block_header::num_from_id(lib_id)+1,
                                       block_header::num_from_id(head_id),
@@ -1097,27 +1092,29 @@ namespace eosio {
       syncing = false;
    }
 
-   void connection::blk_send(const block_id_type& blkid) {
-      controller &cc = my_impl->chain_plug->chain();
-      try {
-         signed_block_ptr b = cc.fetch_block_by_id(blkid);
-         if(b) {
-            fc_dlog(logger,"found block for id at num ${n}",("n",b->block_num()));
-            my_impl->dispatcher->add_peer_block({blkid, block_header::num_from_id(blkid), connection_id});
-            enqueue_block( b );
-         } else {
-            fc_ilog( logger, "fetch block by id returned null, id ${id} for ${p}",
-                     ("id",blkid)("p",peer_name()) );
+   void connection::blk_send( const block_id_type& blkid ) {
+      app().post( priority::low, [blkid, c = shared_from_this()]() {
+         controller& cc = my_impl->chain_plug->chain();
+         try {
+            signed_block_ptr b = cc.fetch_block_by_id( blkid );
+            if( b ) {
+               fc_dlog( logger, "found block for id at num ${n}", ("n", b->block_num()) );
+               my_impl->dispatcher->add_peer_block( {blkid, block_header::num_from_id( blkid ), c->connection_id} );
+               c->strand.post( [c, b{std::move(b)}]() {
+                  c->enqueue_block( b );
+               } );
+            } else {
+               fc_ilog( logger, "fetch block by id returned null, id ${id} for ${p}",
+                        ("id", blkid)( "p", c->peer_address() ) );
+            }
+         } catch( const assert_exception& ex ) {
+            fc_elog( logger, "caught assert on fetch_block_by_id, ${ex}, id ${id} for ${p}",
+                     ("ex", ex.to_string())( "id", blkid )( "p", c->peer_address() ) );
+         } catch( ... ) {
+            fc_elog( logger, "caught other exception fetching block id ${id} for ${p}",
+                     ("id", blkid)( "p", c->peer_address() ) );
          }
-      }
-      catch (const assert_exception &ex) {
-         fc_elog( logger, "caught assert on fetch_block_by_id, ${ex}, id ${id} for ${p}",
-                  ("ex",ex.to_string())("id",blkid)("p",peer_name()) );
-      }
-      catch (...) {
-         fc_elog( logger, "caught other exception fetching block id ${id} for ${p}",
-                  ("id",blkid)("p",peer_name()) );
-      }
+      });
    }
 
    void connection::stop_send() {
@@ -1129,7 +1126,7 @@ namespace eosio {
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          fc_dlog( logger, "Sending handshake generation ${g} to ${ep}",
-                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_name() ) );
+                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() ) );
          c->enqueue( c->last_handshake_sent );
       });
    }
@@ -1167,7 +1164,6 @@ namespace eosio {
       }
    }
 
-   // called from connection strand and application thread
    void connection::do_queue_write(int priority) {
       if( !buffer_queue.ready_to_send() )
          return;
@@ -1225,8 +1221,8 @@ namespace eosio {
    }
 
    void connection::cancel_sync(go_away_reason reason) {
-      fc_dlog(logger,"cancel sync reason = ${m}, write queue size ${o} bytes peer ${p}",
-              ("m",reason_str(reason)) ("o", buffer_queue.write_queue_size())("p", peer_name()));
+      fc_dlog( logger, "cancel sync reason = ${m}, write queue size ${o} bytes peer ${p}",
+               ("m", reason_str( reason ))( "o", buffer_queue.write_queue_size() )( "p", peer_address() ) );
       cancel_wait();
       flush_queues();
       switch (reason) {
@@ -1237,33 +1233,38 @@ namespace eosio {
          break;
       }
       default:
-         fc_dlog(logger, "sending empty request but not calling sync wait on ${p}", ("p",peer_name()));
+         fc_dlog(logger, "sending empty request but not calling sync wait on ${p}", ("p",peer_address()));
          enqueue( ( sync_request_message ) {0,0} );
       }
    }
 
    bool connection::enqueue_sync_block() {
-      if (!peer_requested)
+      if( !peer_requested ) {
+         fc_dlog( logger, "enqueue sync block, with no peer_requested" );
          return false;
+      } else {
+         fc_dlog( logger, "enqueue sync block ${num}", ("num", peer_requested->last + 1) );
+      }
       uint32_t num = ++peer_requested->last;
-      bool trigger_send = num == peer_requested->start_block;
+      bool trigger_send = true; // todo: = num == peer_requested->start_block;
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      try {
+      app().post( priority::low, [num, trigger_send, c = shared_from_this()]() {
          controller& cc = my_impl->chain_plug->chain();
-         signed_block_ptr sb = cc.fetch_block_by_number(num);
-         if(sb) {
-            enqueue_block( sb, trigger_send, true);
-            return true;
+         signed_block_ptr sb = cc.fetch_block_by_number( num );
+         if( sb ) {
+            c->strand.post( [c, sb{std::move(sb)}, trigger_send]() {
+               c->enqueue_block( sb, trigger_send, true );
+            });
          }
-      } catch ( ... ) {
-         fc_wlog( logger, "write loop exception" );
-      }
-      return false;
+      });
+
+      return true;
    }
 
    void connection::enqueue( const net_message& m, bool trigger_send ) {
+      verify_strand_in_this_thread( strand, __func__, __LINE__ );
       go_away_reason close_after_send = no_reason;
       if (m.contains<go_away_message>()) {
          close_after_send = m.get<go_away_message>().reason;
@@ -1318,6 +1319,8 @@ namespace eosio {
    }
 
    void connection::enqueue_block( const signed_block_ptr& sb, bool trigger_send, bool to_sync_queue) {
+      fc_dlog( logger, "enqueue block ${num}", ("num", sb->block_num()) );
+      verify_strand_in_this_thread( strand, __func__, __LINE__ );
       enqueue_buffer( create_send_buffer( sb ), trigger_send, priority::low, no_reason, to_sync_queue);
    }
 
@@ -1348,7 +1351,7 @@ namespace eosio {
    void connection::sync_wait() {
       connection_ptr c(shared_from_this());
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      response_expected_timer.expires_from_now( my_impl->resp_expected_period);
+      response_expected_timer.expires_from_now( my_impl->resp_expected_period );
       response_expected_timer.async_wait(
             boost::asio::bind_executor( c->strand, [c]( boost::system::error_code ec ) {
                c->sync_timeout( ec );
@@ -1357,20 +1360,13 @@ namespace eosio {
 
    // thread safe
    void connection::fetch_wait() {
-      connection_wptr c(shared_from_this());
+      connection_ptr c( shared_from_this() );
       std::lock_guard<std::mutex> g( response_expected_timer_mtx );
-      response_expected_timer.expires_from_now( my_impl->resp_expected_period);
-      response_expected_timer.async_wait( [c]( boost::system::error_code ec ) {
-         app().post(priority::low, [c, ec]() {
-            connection_ptr conn = c.lock();
-            if (!conn) {
-               // connection was destroyed before this lambda was delivered
-               return;
-            }
-
-            conn->fetch_timeout(ec);
-         });
-      } );
+      response_expected_timer.expires_from_now( my_impl->resp_expected_period );
+      response_expected_timer.async_wait(
+            boost::asio::bind_executor( c->strand, [c]( boost::system::error_code ec ) {
+               c->fetch_timeout(ec);
+            } ) );
    }
 
    // called from connection strand
@@ -1399,21 +1395,19 @@ namespace eosio {
 
    void connection::fetch_timeout( boost::system::error_code ec ) {
       if( !ec ) {
-         my_impl->dispatcher->retry_fetch(shared_from_this());
-      }
-      else if( ec == boost::asio::error::operation_aborted ) {
+         my_impl->dispatcher->retry_fetch( shared_from_this() );
+      } else if( ec == boost::asio::error::operation_aborted ) {
          if( !connected() ) {
-            fc_dlog(logger, "fetch timeout was cancelled due to dead connection");
+            fc_dlog( logger, "fetch timeout was cancelled due to dead connection" );
          }
-      }
-      else {
+      } else {
          fc_elog( logger, "setting timer for fetch request got error ${ec}", ("ec", ec.message() ) );
       }
    }
 
    void connection::request_sync_blocks(uint32_t start, uint32_t end) {
       sync_request_message srm = {start,end};
-      enqueue( net_message(srm));
+      enqueue( net_message(srm) );
       sync_wait();
    }
 
@@ -1464,15 +1458,6 @@ namespace eosio {
       }
    }
 
-   bool sync_manager::is_sync_required() {
-      fc_dlog( logger, "last req = ${req}, last recv = ${recv} known = ${known} our head = ${head}",
-               ("req", sync_last_requested_num)( "recv", sync_next_expected_num )( "known", sync_known_lib_num )
-               ("head", chain_plug->chain().fork_db_head_block_num() ) );
-
-      return( sync_last_requested_num < sync_known_lib_num ||
-              chain_plug->chain().fork_db_head_block_num() < sync_last_requested_num );
-   }
-
    // call with g_sync locked
    void sync_manager::request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn ) {
       uint32_t fork_head_block_num = 0;
@@ -1554,9 +1539,10 @@ namespace eosio {
             sync_last_requested_num = end;
             connection_ptr c = sync_source;
             g_sync.unlock();
-            fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}",
-                     ("n", c->peer_address())( "s", start )( "e", end ) );
-            c->request_sync_blocks( start, end );
+            c->strand.post( [c, start, end]() {
+               fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}", ("n", c->peer_address())( "s", start )( "e", end ) );
+               c->request_sync_blocks( start, end );
+            } );
          }
       }
    }
@@ -1571,23 +1557,35 @@ namespace eosio {
       }
    }
 
+   bool sync_manager::is_sync_required( uint32_t fork_head_block_num ) {
+      fc_dlog( logger, "last req = ${req}, last recv = ${recv} known = ${known} our head = ${head}",
+               ("req", sync_last_requested_num)( "recv", sync_next_expected_num )( "known", sync_known_lib_num )
+               ("head", fork_head_block_num ) );
+
+      return( sync_last_requested_num < sync_known_lib_num ||
+              fork_head_block_num < sync_last_requested_num );
+   }
+
    void sync_manager::start_sync(const connection_ptr& c, uint32_t target) {
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       if( target > sync_known_lib_num) {
          sync_known_lib_num = target;
       }
 
-      if( !is_sync_required() ) {
-         uint32_t bnum = chain_plug->chain().last_irreversible_block_num();
-         uint32_t hnum = chain_plug->chain().fork_db_head_block_num();
+      uint32_t lib_num = 0;
+      uint32_t fork_head_block_num = 0;
+      std::tie( lib_num, std::ignore, fork_head_block_num,
+                std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
+
+      if( !is_sync_required( fork_head_block_num ) ) {
          fc_dlog( logger, "We are already caught up, my irr = ${b}, head = ${h}, target = ${t}",
-                  ("b", bnum)( "h", hnum )( "t", target ) );
+                  ("b", lib_num)( "h", fork_head_block_num )( "t", target ) );
          return;
       }
 
       if( sync_state == in_sync ) {
          set_state( lib_catchup );
-         sync_next_expected_num = chain_plug->chain().last_irreversible_block_num() + 1;
+         sync_next_expected_num = lib_num + 1;
       }
 
       fc_ilog( logger, "Catching up with chain, our last req is ${cc}, theirs is ${t} peer ${p}",
@@ -1759,6 +1757,7 @@ namespace eosio {
       fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_address() ) );
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       stages state = sync_state;
+      fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
       if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
@@ -1767,7 +1766,8 @@ namespace eosio {
             return;
          }
          sync_next_expected_num = blk_num + 1;
-      } else if( state == head_catchup ) {
+      }
+      if( state == head_catchup ) {
          fc_dlog( logger, "sync_manager in head_catchup state" );
          set_state( in_sync );
          sync_source.reset();
@@ -1914,9 +1914,14 @@ namespace eosio {
    void dispatch_manager::bcast_block(const block_state_ptr& bs) {
       fc_dlog( logger, "bcast block ${b}", ("b", bs->block_num) );
 
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      if( my_impl->sync_master->syncing_with_peer() ) return;
       bool have_connection = false;
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
+
+         peer_dlog( cp, "socket_is_open ${s}, connecting ${c}, syncing ${ss}",
+                    ("s", cp->socket_is_open())("c", cp->connecting.load())("ss", cp->syncing.load()) );
+
          if( !cp->current() ) {
             continue;
          }
@@ -1942,7 +1947,7 @@ namespace eosio {
                if( !add_peer_block( pbstate ) ) {
                   return;
                }
-               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
+               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_address() ) );
                cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
             }
          });
@@ -1989,8 +1994,10 @@ namespace eosio {
             send_buffer = create_send_buffer( trx );
          }
 
-         fc_dlog(logger, "sending trx to ${n}", ("n", cp->peer_name() ) );
-         cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
+         cp->strand.post( [cp, send_buffer]() {
+            fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_address()) );
+            cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
+         } );
       }
    }
 
@@ -2009,67 +2016,65 @@ namespace eosio {
       update_txns_block_num( id, head_blk_num );
    }
 
+   // called from connection strand
    void dispatch_manager::recv_notice(const connection_ptr& c, const notice_message& msg, bool generated) {
       request_message req;
       req.req_trx.mode = none;
       req.req_blocks.mode = none;
-      bool send_req = false;
       if (msg.known_trx.mode == normal) {
          req.req_trx.mode = normal;
          req.req_trx.pending = 0;
-         send_req = false;
-      }
-      else if (msg.known_trx.mode != none) {
-         fc_elog( logger,"passed a notice_message with something other than a normal on none known_trx" );
+      } else if (msg.known_trx.mode != none) {
+         fc_elog( logger, "passed a notice_message with something other than a normal on none known_trx" );
          return;
       }
       if (msg.known_blocks.mode == normal) {
          req.req_blocks.mode = normal;
-         controller& cc = my_impl->chain_plug->chain();
          // known_blocks.ids is never > 1
          if( !msg.known_blocks.ids.empty() ) {
-            const block_id_type& blkid = msg.known_blocks.ids.back();
-            signed_block_ptr b;
-            try {
-               b = cc.fetch_block_by_id(blkid); // if exists
-               if(b) {
-                  add_peer_block({blkid, block_header::num_from_id(blkid), c->connection_id});
+            app().post( priority::low, [this, msg{std::move(msg)}, req{std::move(req)}, c]() mutable {
+               const block_id_type& blkid = msg.known_blocks.ids.back();
+               signed_block_ptr b;
+               try {
+                  controller& cc = my_impl->chain_plug->chain();
+                  b = cc.fetch_block_by_id( blkid ); // if exists
+                  if( b ) {
+                     add_peer_block( {blkid, block_header::num_from_id( blkid ), c->connection_id} );
+                  }
+               } catch( const assert_exception& ex ) {
+                  fc_ilog( logger, "caught assert on fetch_block_by_id, ${ex}", ("ex", ex.what()) );
+                  // keep going, client can ask another peer
+               } catch( ... ) {
+                  fc_elog( logger, "failed to retrieve block for id" );
                }
-            } catch (const assert_exception &ex) {
-               fc_ilog( logger, "caught assert on fetch_block_by_id, ${ex}",("ex",ex.what()) );
-               // keep going, client can ask another peer
-            } catch (...) {
-               fc_elog( logger, "failed to retrieve block for id");
-            }
-            if (!b) {
-               send_req = true;
-               req.req_blocks.ids.push_back( blkid );
-            }
+               if( !b ) {
+                  req.req_blocks.ids.push_back( blkid );
+                  c->strand.post( [req{std::move(req)}, c{std::move(c)}]() mutable {
+                     fc_dlog( logger, "send req" );
+                     c->enqueue( req );
+                     c->fetch_wait();
+                     c->last_req = std::move( req );
+                  });
+               }
+            });
          }
-      }
-      else if (msg.known_blocks.mode != none) {
+      } else if (msg.known_blocks.mode != none) {
          fc_elog( logger, "passed a notice_message with something other than a normal on none known_blocks" );
          return;
       }
-      fc_dlog( logger, "send req = ${sr}", ("sr",send_req));
-      if( send_req) {
-         c->enqueue(req);
-         c->fetch_wait();
-         c->last_req = std::move(req);
-      }
    }
 
    void dispatch_manager::retry_fetch(const connection_ptr& c) {
       if (!c->last_req) {
          return;
       }
-      fc_wlog( logger, "failed to fetch from ${p}",("p",c->peer_name()));
+      fc_wlog( logger, "failed to fetch from ${p}", ("p", c->peer_address()) );
       block_id_type bid;
       if( c->last_req->req_blocks.mode == normal && !c->last_req->req_blocks.ids.empty() ) {
          bid = c->last_req->req_blocks.ids.back();
       } else {
-         fc_wlog( logger,"no retry, block mpde = ${b} trx mode = ${t}",
-                  ("b",modes_str(c->last_req->req_blocks.mode))("t",modes_str(c->last_req->req_trx.mode)));
+         fc_wlog( logger, "no retry, block mpde = ${b} trx mode = ${t}",
+                  ("b", modes_str( c->last_req->req_blocks.mode ))( "t", modes_str( c->last_req->req_trx.mode ) ) );
          return;
       }
       boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
@@ -2079,9 +2084,11 @@ namespace eosio {
          }
          bool sendit = peer_has_block( bid, c->connection_id );
          if (sendit) {
-            conn->enqueue(*c->last_req);
-            conn->fetch_wait();
-            conn->last_req = c->last_req;
+            conn->strand.post( [conn, last_req = *c->last_req]() {
+               conn->enqueue( last_req );
+               conn->fetch_wait();
+               conn->last_req = last_req;
+            } );
             return;
          }
       }
@@ -2580,6 +2587,8 @@ namespace eosio {
       chain_head_blk_id = cc.head_block_id();
       chain_fork_head_blk_num = cc.fork_db_head_block_num();
       chain_fork_head_blk_id = cc.fork_db_head_block_id();
+      fc_dlog( logger, "updating chain info lib ${lib}, head ${head}, fork ${fork}",
+               ("lib", chain_lib_num)("head", chain_head_blk_num)("fork", chain_fork_head_blk_num) );
    }
 
    //         lib_num, head_blk_num, fork_head_blk_num, lib_id, head_blk_id, fork_head_blk_id
@@ -2698,10 +2707,10 @@ namespace eosio {
             controller& cc = chain_plug->chain();
             uint32_t lib_num = cc.last_irreversible_block_num();
 
-            bool on_fork = false;
-            fc_dlog( logger, "lib_num = ${ln} peer_lib = ${pl}", ("ln", lib_num)( "pl", peer_lib ) );
+            fc_dlog( logger, "handshake, check for fork lib_num = ${ln} peer_lib = ${pl}", ("ln", lib_num)( "pl", peer_lib ) );
 
             if( peer_lib <= lib_num && peer_lib > 0 ) {
+               bool on_fork = false;
                try {
                   block_id_type peer_lib_id = cc.get_block_id_for_num( peer_lib );
                   on_fork = (msg_lib_id != peer_lib_id);
@@ -2713,9 +2722,10 @@ namespace eosio {
                   on_fork = true;
                }
                if( on_fork ) {
-                  fc_elog( logger, "Peer chain is forked" );
-                  c->enqueue( go_away_message( forked ) );
-                  return;
+                  c->strand.post( [c]() {
+                     fc_elog( logger, "Peer chain is forked" );
+                     c->enqueue( go_away_message( forked ) );
+                  } );
                }
             }
          });
@@ -2727,13 +2737,13 @@ namespace eosio {
 
       c->last_handshake_recv = msg;
       c->_logger_variant.reset();
-      sync_master->recv_handshake(c,msg);
+      sync_master->recv_handshake( c, msg );
    }
 
    void net_plugin_impl::handle_message(const connection_ptr& c, const go_away_message& msg) {
-      peer_wlog(c, "received go_away_message, reason = ${r}", ("r",reason_str( msg.reason )) );
+      peer_wlog( c, "received go_away_message, reason = ${r}", ("r", reason_str( msg.reason )) );
       c->no_retry = msg.reason;
-      if(msg.reason == duplicate ) {
+      if( msg.reason == duplicate ) {
          c->node_id = msg.node_id;
       }
       c->flush_queues();
@@ -2741,7 +2751,7 @@ namespace eosio {
    }
 
    void net_plugin_impl::handle_message(const connection_ptr& c, const time_message& msg) {
-      peer_ilog(c, "received time_message");
+      peer_ilog( c, "received time_message" );
       /* We've already lost however many microseconds it took to dispatch
        * the message, but it can't be helped.
        */
@@ -2777,12 +2787,13 @@ namespace eosio {
       // peer tells us about one or more blocks or txns. When done syncing, forward on
       // notices of previously unknown blocks or txns,
       //
-      peer_ilog(c, "received notice_message");
+      peer_ilog( c, "received notice_message" );
       c->connecting = false;
       request_message req;
       bool send_req = false;
-      if (msg.known_trx.mode != none) {
-         fc_dlog(logger,"this is a ${m} notice with ${n} transactions", ("m",modes_str(msg.known_trx.mode))("n",msg.known_trx.pending));
+      if( msg.known_trx.mode != none ) {
+         fc_dlog( logger, "this is a ${m} notice with ${n} transactions",
+                  ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
       }
       switch (msg.known_trx.mode) {
       case none:
@@ -2868,12 +2879,13 @@ namespace eosio {
 
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const sync_request_message& msg) {
-      if( msg.end_block == 0) {
+   void net_plugin_impl::handle_message( const connection_ptr& c, const sync_request_message& msg ) {
+      fc_dlog( logger, "peer requested ${start} to ${end}", ("start", msg.start_block)("end", msg.end_block) );
+      if( msg.end_block == 0 ) {
          c->peer_requested.reset();
          c->flush_queues();
       } else {
-         c->peer_requested = sync_state( msg.start_block,msg.end_block,msg.start_block-1);
+         c->peer_requested = sync_state( msg.start_block, msg.end_block, msg.start_block-1);
          c->enqueue_sync_block();
       }
    }
@@ -2898,11 +2910,7 @@ namespace eosio {
       peer_ilog(c, "received packed_transaction ${id}", ("id", tid));
 
       bool have_trx = dispatcher->have_txn( tid );
-      connection_wptr weak_ptr = c;
-      app().post(priority::low, [weak_ptr{std::move(weak_ptr)}, &dispatcher = dispatcher, ptrx](){
-         auto c = weak_ptr.lock();
-         dispatcher->recv_transaction(c, ptrx);
-      });
+      dispatcher->recv_transaction(c, ptrx);
       if( have_trx ) {
          fc_dlog( logger, "got a duplicate transaction - dropping ${id}", ("id", tid) );
          return;
@@ -2939,11 +2947,11 @@ namespace eosio {
          controller& cc = chain_plug->chain();
          uint32_t head_blk_num = cc.head_block_num();
 
-         app().post(priority::low, [accepted, &dispatcher = dispatcher, ptrx{std::move(ptrx)}, head_blk_num]() {
+         boost::asio::post( *my_impl->server_ioc, [accepted, ptrx{std::move(ptrx)}, head_blk_num]() {
             if( accepted ) {
-               dispatcher->bcast_transaction( ptrx );
+               my_impl->dispatcher->bcast_transaction( ptrx );
             } else {
-               dispatcher->rejected_transaction( ptrx->id, head_blk_num );
+               my_impl->dispatcher->rejected_transaction( ptrx->id, head_blk_num );
             }
          });
       });
@@ -3194,7 +3202,6 @@ namespace eosio {
       std::lock_guard<std::mutex> g( keepalive_timer_mtx );
       keepalive_timer->expires_from_now(keepalive_interval);
       keepalive_timer->async_wait( [this]( boost::system::error_code ec ) {
-         app().post( priority::low, [this, ec]() {
             ticker();
             if( ec ) {
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
@@ -3202,11 +3209,12 @@ namespace eosio {
             boost::shared_lock<boost::shared_mutex> g( connections_mtx );
             for( auto& c : connections ) {
                if( c->socket_is_open() ) {
-                  c->send_time();
+                  c->strand.post( [c]() {
+                     c->send_time();
+                  } );
                }
             }
          } );
-      } );
    }
 
    void net_plugin_impl::start_monitors() {
@@ -3544,6 +3552,8 @@ namespace eosio {
    }
 
    void net_plugin::plugin_startup() {
+      handle_sighup();
+
       my->producer_plug = app().find_plugin<producer_plugin>();
 
       my->thread_pool.emplace( my->thread_pool_size );
@@ -3623,10 +3633,11 @@ namespace eosio {
 
       my->start_monitors();
 
+      my->update_chain_info();
+
       for( const auto& seed_node : my->supplied_peers ) {
          connect( seed_node );
       }
-      handle_sighup();
    }
 
    void net_plugin::handle_sighup() {
@@ -3698,7 +3709,6 @@ namespace eosio {
       boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
          if( (*itr)->peer_address() == host ) {
-            (*itr)->reset();
             fc_ilog( logger, "disconnecting: ${p}", ("p", (*itr)->peer_name()) );
             (*itr)->close();
             my->connections.erase(itr);

From 26bcddd7cf753bc87e9f20e486b14ce19313e3f0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Mar 2019 07:34:57 -0500
Subject: [PATCH 0146/1648] Accept block_state_ptr as const&

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 045fcd94b1a..a18fc0f1895 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3621,7 +3621,7 @@ namespace eosio {
       my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
             boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
       my->incoming_irreversible_block_subscription = app().get_channel<channels::irreversible_block>().subscribe(
-            [this]( block_state_ptr s ) {
+            [this]( const block_state_ptr& s ) {
                my->on_irreversible_block( s );
             });
 

From 2e0de468238c5ad6bcebeb9b5361d23df94aa043 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Mar 2019 12:10:16 -0500
Subject: [PATCH 0147/1648] Protect last_req and fix syncing issue

---
 plugins/net_plugin/net_plugin.cpp | 49 +++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a18fc0f1895..690d85b2f6f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -228,7 +228,7 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      mutable boost::shared_mutex      connections_mtx; // switch to std::shared_mutex in C++17
+      mutable boost::shared_mutex      connections_mtx; // switch to std::shared_mutex in C++17, also protects connection::last_req
       std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
@@ -635,7 +635,7 @@ namespace eosio {
       std::atomic<go_away_reason>           no_retry{no_reason};
       block_id_type          fork_head;
       std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
-      optional<request_message> last_req;
+      optional<request_message> last_req; // mutex protected by connections_mtx
 
       connection_status get_status()const {
          connection_status stat;
@@ -1004,7 +1004,11 @@ namespace eosio {
       self->flush_queues();
       self->connecting = false;
       self->syncing = false;
-      if( self->last_req ) {
+
+      boost::shared_lock<boost::shared_mutex> g_conn( my_impl->connections_mtx );
+      bool has_last_req = !!self->last_req;
+      g_conn.unlock();
+      if( has_last_req ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
 <<<<<<< HEAD
@@ -1044,7 +1048,7 @@ namespace eosio {
       self->sent_handshake_count = 0;
       self->last_handshake_recv = handshake_message();
       self->last_handshake_sent = handshake_message();
-      my_impl->sync_master->sync_reset_lib_num( nullptr );
+      my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
       fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) );
       self->cancel_wait();
 
@@ -1958,13 +1962,16 @@ namespace eosio {
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
       peer_block_state pbstate{id, bnum, c->connection_id};
       add_peer_block( pbstate );
+      boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       if (c &&
           c->last_req &&
           c->last_req->req_blocks.mode != none &&
           !c->last_req->req_blocks.ids.empty() &&
           c->last_req->req_blocks.ids.back() == id) {
+         fc_dlog( logger, "reseting last_req" );
          c->last_req.reset();
       }
+      g.unlock();
 
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
@@ -2053,6 +2060,7 @@ namespace eosio {
                      fc_dlog( logger, "send req" );
                      c->enqueue( req );
                      c->fetch_wait();
+                     boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
                      c->last_req = std::move( req );
                   });
                }
@@ -2065,6 +2073,8 @@ namespace eosio {
    }
 
    void dispatch_manager::retry_fetch(const connection_ptr& c) {
+      fc_dlog( logger, "retry fetch" );
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       if (!c->last_req) {
          return;
       }
@@ -2077,24 +2087,37 @@ namespace eosio {
                   ("b", modes_str( c->last_req->req_blocks.mode ))( "t", modes_str( c->last_req->req_trx.mode ) ) );
          return;
       }
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
-      for (auto& conn : my_impl->connections) {
-         if (conn == c || conn->last_req) {
+      for( auto& conn : my_impl->connections ) {
+         if( conn == c || conn->last_req ) {
             continue;
          }
-         bool sendit = peer_has_block( bid, c->connection_id );
-         if (sendit) {
+         bool sendit = peer_has_block( bid, conn->connection_id );
+         if( sendit ) {
             conn->strand.post( [conn, last_req = *c->last_req]() {
                conn->enqueue( last_req );
                conn->fetch_wait();
+               boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
                conn->last_req = last_req;
             } );
             return;
          }
       }
-      g.unlock();
+      // found no peer that we know has it, so ask some random connection
+      for( auto& conn : my_impl->connections ) {
+         if( conn == c || conn->last_req ) {
+            continue;
+         }
+         conn->strand.post( [conn, last_req = *c->last_req]() {
+            conn->enqueue( last_req );
+            conn->fetch_wait();
+            boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+            conn->last_req = last_req;
+         } );
+         return;
+      }
 
       // at this point no other peer has it, re-request or do nothing?
+      fc_wlog( logger, "no peer has last_req" );
       if( c->connected() ) {
          c->enqueue(*c->last_req);
          c->fetch_wait();
@@ -2195,8 +2218,10 @@ namespace eosio {
                }
             } else {
                if( endpoint_itr != tcp::resolver::iterator() ) {
-                  c->close();
-                  c->connect( resolver, endpoint_itr );
+                  c->close(); // close posts to strand, so also post connect otherwise connect will happen before close
+                  c->strand.post( [resolver, c, endpoint_itr]() {
+                     c->connect( resolver, endpoint_itr );
+                  } );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;

From 9e88fd63036dc23d3037fd36e25d9bfb8d8c1eb2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Mar 2019 13:04:21 -0500
Subject: [PATCH 0148/1648] Get sync block at medium priority

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 690d85b2f6f..f2395b0dec1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1254,7 +1254,7 @@ namespace eosio {
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      app().post( priority::low, [num, trigger_send, c = shared_from_this()]() {
+      app().post( priority::medium, [num, trigger_send, c = shared_from_this()]() {
          controller& cc = my_impl->chain_plug->chain();
          signed_block_ptr sb = cc.fetch_block_by_number( num );
          if( sb ) {

From eb98a90d744207d1b8197b44bd3277bc132735b0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Mar 2019 13:29:35 -0500
Subject: [PATCH 0149/1648] Remove dead code

---
 plugins/net_plugin/net_plugin.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f2395b0dec1..5e4a95e1293 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1129,8 +1129,10 @@ namespace eosio {
       strand.post( [c = shared_from_this()]() {
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
-         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}",
-                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() ) );
+         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}",
+                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() )
+                  ( "lib", c->last_handshake_sent.last_irreversible_block_num )
+                  ( "head", c->last_handshake_sent.head_num ) );
          c->enqueue( c->last_handshake_sent );
       });
    }
@@ -2815,7 +2817,6 @@ namespace eosio {
       peer_ilog( c, "received notice_message" );
       c->connecting = false;
       request_message req;
-      bool send_req = false;
       if( msg.known_trx.mode != none ) {
          fc_dlog( logger, "this is a ${m} notice with ${n} transactions",
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
@@ -2856,10 +2857,6 @@ namespace eosio {
          peer_elog(c, "bad notice_message : invalid known_blocks.mode ${m}",("m",static_cast<uint32_t>(msg.known_blocks.mode)));
       }
       }
-      fc_dlog(logger, "send req = ${sr}", ("sr",send_req));
-      if( send_req) {
-         c->enqueue(req);
-      }
    }
 
    void net_plugin_impl::handle_message(const connection_ptr& c, const request_message& msg) {

From 712802265ce91d580e20c7de09e128a4be9069e9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 07:48:45 -0500
Subject: [PATCH 0150/1648] Add protection for last_handshake_*, last_req, and
 socket close

---
 .../include/eosio/net_plugin/protocol.hpp     |   2 +-
 plugins/net_plugin/net_plugin.cpp             | 153 ++++++++++++------
 2 files changed, 102 insertions(+), 53 deletions(-)

diff --git a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
index 7170c1abd20..cdb3d98fd2f 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
@@ -36,7 +36,7 @@ namespace eosio {
       block_id_type              head_id;
       string                     os;
       string                     agent;
-      int16_t                    generation;
+      int16_t                    generation = 0;
    };
 
 
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5e4a95e1293..2f823964dbd 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -614,8 +614,6 @@ namespace eosio {
 >>>>>>> Make delay_timer thread safe
       fc::sha256              node_id;
       const uint32_t          connection_id;
-      handshake_message       last_handshake_recv;
-      handshake_message       last_handshake_sent;
       int16_t                 sent_handshake_count = 0;
       std::atomic<bool>       connecting{false};
       std::atomic<bool>       syncing{false};
@@ -635,16 +633,13 @@ namespace eosio {
       std::atomic<go_away_reason>           no_retry{no_reason};
       block_id_type          fork_head;
       std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
-      optional<request_message> last_req; // mutex protected by connections_mtx
 
-      connection_status get_status()const {
-         connection_status stat;
-         stat.peer = peer_addr;
-         stat.connecting = connecting;
-         stat.syncing = syncing;
-         stat.last_handshake = last_handshake_recv;
-         return stat;
-      }
+      mutable std::mutex          conn_mtx; // mtx for last_req, last_handshake_recv, last_handshake_sent
+      optional<request_message>   last_req;
+      handshake_message           last_handshake_recv;
+      handshake_message           last_handshake_sent;
+
+      connection_status get_status()const;
 
       /** \name Peer Timestamps
        *  Time message handling
@@ -899,8 +894,6 @@ namespace eosio {
 >>>>>>> Move socket ownership into connection.
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
-        last_handshake_recv(),
-        last_handshake_sent(),
         sent_handshake_count(0),
         connecting(false),
         syncing(false),
@@ -909,7 +902,9 @@ namespace eosio {
         response_expected_timer( *my_impl->server_ioc ),
         read_delay_timer( *my_impl->server_ioc ),
         no_retry(no_reason),
-        last_req()
+        last_req(),
+        last_handshake_recv(),
+        last_handshake_sent()
    {
       fc_ilog( logger, "created connection to ${n}", ("n", endpoint) );
       node_id.data()[0] = 0;
@@ -930,8 +925,6 @@ namespace eosio {
 >>>>>>> Move socket ownership into connection.
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
-        last_handshake_recv(),
-        last_handshake_sent(),
         sent_handshake_count(0),
         connecting(true),
         syncing(false),
@@ -940,14 +933,15 @@ namespace eosio {
         response_expected_timer( *my_impl->server_ioc ),
         read_delay_timer( *my_impl->server_ioc ),
         no_retry(no_reason),
-        last_req()
+        last_req(),
+        last_handshake_recv(),
+        last_handshake_sent()
    {
       fc_ilog( logger, "accepted network connection" );
       node_id.data()[0] = 0;
    }
 
    connection::~connection() {
-      pending_message_buffer.reset();
    }
 
    void connection::update_endpoints() {
@@ -961,6 +955,16 @@ namespace eosio {
       local_endpoint_port = ec ? unknown : std::to_string(lep.port());
    }
 
+   connection_status connection::get_status()const {
+      connection_status stat;
+      stat.peer = peer_addr;
+      stat.connecting = connecting;
+      stat.syncing = syncing;
+      std::lock_guard<std::mutex> g( conn_mtx );
+      stat.last_handshake = last_handshake_recv;
+      return stat;
+   }
+
    bool connection::start_session() {
       verify_strand_in_this_thread( strand, __func__, __LINE__ );
 
@@ -1005,7 +1009,7 @@ namespace eosio {
       self->connecting = false;
       self->syncing = false;
 
-      boost::shared_lock<boost::shared_mutex> g_conn( my_impl->connections_mtx );
+      std::unique_lock<std::mutex> g_conn( self->conn_mtx );
       bool has_last_req = !!self->last_req;
       g_conn.unlock();
       if( has_last_req ) {
@@ -1046,15 +1050,22 @@ namespace eosio {
       self->peer_requested.reset();
 >>>>>>> Handle almost every net_message on net_plugin thread pool. Optimize bcast_block to not send when syncing.
       self->sent_handshake_count = 0;
+      g_conn.lock();
       self->last_handshake_recv = handshake_message();
       self->last_handshake_sent = handshake_message();
+      g_conn.unlock();
       my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
-      fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) );
+      fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();
 
       std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
       self->read_delay_timer.cancel();
+<<<<<<< HEAD
 >>>>>>> Move socket ownership into connection.
+=======
+
+      self->pending_message_buffer.reset();
+>>>>>>> Add protection for last_handshake_*, last_req, and socket close
    }
 
    void connection::blk_send_branch() {
@@ -1073,13 +1084,15 @@ namespace eosio {
       }
       block_id_type remote_head_id;
       uint32_t remote_head_num = 0;
+      std::unique_lock<std::mutex> g_conn( conn_mtx );
       if( last_handshake_recv.generation >= 1 ) {
          remote_head_id = last_handshake_recv.head_id;
          remote_head_num = block_header::num_from_id(remote_head_id);
-         fc_dlog( logger, "maybe truncating branch at  = ${h}:${id}", ("h", remote_head_num)( "id", remote_head_id ) );
+         fc_dlog( logger, "maybe truncating branch at = ${h}:${id}", ("h", remote_head_num)( "id", remote_head_id ) );
       }
 
       block_id_type lib_id = last_handshake_recv.last_irreversible_block_id;
+      g_conn.unlock();
 
       if( !peer_requested ) {
          peer_requested = sync_state( block_header::num_from_id(lib_id)+1,
@@ -1090,6 +1103,7 @@ namespace eosio {
          uint32_t end   = std::max( peer_requested->end_block, block_header::num_from_id(head_id) );
          peer_requested = sync_state( start, end, start - 1 );
       }
+      fc_dlog( logger, "enqueue ${s} - ${e}", ("s", peer_requested->start_block)("e", peer_requested->end_block) );
       enqueue_sync_block();
 
       // still want to send transactions along during blk branch sync
@@ -1127,13 +1141,16 @@ namespace eosio {
 
    void connection::send_handshake() {
       strand.post( [c = shared_from_this()]() {
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          fc_dlog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}",
                   ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() )
                   ( "lib", c->last_handshake_sent.last_irreversible_block_num )
                   ( "head", c->last_handshake_sent.head_num ) );
-         c->enqueue( c->last_handshake_sent );
+         auto cpy = c->last_handshake_sent;
+         g_conn.unlock();
+         c->enqueue( cpy );
       });
    }
 
@@ -1193,6 +1210,9 @@ namespace eosio {
             boost::asio::bind_executor( c->strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
 >>>>>>> Make queued_buffer thread safe
             try {
+               // May have closed connection and cleared buffer_queue
+               if( !c->socket_is_open() ) return;
+
                c->buffer_queue.out_callback( ec, w );
 
                if( ec ) {
@@ -1256,7 +1276,8 @@ namespace eosio {
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      app().post( priority::medium, [num, trigger_send, c = shared_from_this()]() {
+      const int higher_than_low = priority::low + 2; // otherwise client gets very little if we are syncing to a peer
+      app().post( higher_than_low, [num, trigger_send, c = shared_from_this()]() {
          controller& cc = my_impl->chain_plug->chain();
          signed_block_ptr sb = cc.fetch_block_by_number( num );
          if( sb ) {
@@ -1385,11 +1406,13 @@ namespace eosio {
       }
    }
 
-   // todo: last_handshake_recv not thread safe
+   // locks conn_mtx, do not call while holding conn_mtx
    const string connection::peer_name() {
+      std::unique_lock<std::mutex> g_conn( conn_mtx );
       if( !last_handshake_recv.p2p_address.empty() ) {
          return last_handshake_recv.p2p_address;
       }
+      g_conn.unlock();
       if( !peer_address().empty() ) {
          return peer_address();
       }
@@ -1455,6 +1478,7 @@ namespace eosio {
       }
       if( !c ) return;
       if( c->current() ) {
+         std::lock_guard<std::mutex> g_conn( c->conn_mtx );
          if( c->last_handshake_recv.last_irreversible_block_num > sync_known_lib_num ) {
             sync_known_lib_num = c->last_handshake_recv.last_irreversible_block_num;
          }
@@ -1738,7 +1762,9 @@ namespace eosio {
             verify_catchup(c, msg.known_blocks.pending, msg.known_blocks.ids.back());
          }
       } else if (msg.known_blocks.mode == last_irr_catch_up) {
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          c->last_handshake_recv.last_irreversible_block_num = msg.known_trx.pending;
+         g_conn.unlock();
          sync_reset_lib_num(c);
          start_sync(c, msg.known_trx.pending);
       }
@@ -1751,7 +1777,7 @@ namespace eosio {
          fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_address()) );
          sync_last_requested_num = 0;
          sync_source.reset();
-         set_state( in_sync );
+         //todo: set_state( in_sync );
          g.unlock();
          c->close();
          send_handshakes();
@@ -1767,7 +1793,7 @@ namespace eosio {
       if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
-                     ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_name()) );
+                     ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_address()) );
             c->close();
             return;
          }
@@ -1946,14 +1972,15 @@ namespace eosio {
          }
          cp->strand.post( [this, cp, bs, send_buffer]() {
             uint32_t bnum = bs->block_num;
-            // todo protect cp->last_handshake_recv
+            std::unique_lock<std::mutex> g_conn( cp->conn_mtx );
             bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
+            g_conn.unlock();
             if( !has_block ) {
                peer_block_state pbstate{bs->id, bnum, cp->connection_id};
                if( !add_peer_block( pbstate ) ) {
                   return;
                }
-               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_address() ) );
+               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
                cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
             }
          });
@@ -1964,7 +1991,7 @@ namespace eosio {
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
       peer_block_state pbstate{id, bnum, c->connection_id};
       add_peer_block( pbstate );
-      boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      std::unique_lock<std::mutex> g( c->conn_mtx );
       if (c &&
           c->last_req &&
           c->last_req->req_blocks.mode != none &&
@@ -2062,7 +2089,7 @@ namespace eosio {
                      fc_dlog( logger, "send req" );
                      c->enqueue( req );
                      c->fetch_wait();
-                     boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+                     std::lock_guard<std::mutex> g( c->conn_mtx );
                      c->last_req = std::move( req );
                   });
                }
@@ -2076,8 +2103,8 @@ namespace eosio {
 
    void dispatch_manager::retry_fetch(const connection_ptr& c) {
       fc_dlog( logger, "retry fetch" );
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
-      if (!c->last_req) {
+      std::unique_lock<std::mutex> g_c_conn( c->conn_mtx );
+      if( !c->last_req ) {
          return;
       }
       fc_wlog( logger, "failed to fetch from ${p}", ("p", c->peer_address()) );
@@ -2089,39 +2116,39 @@ namespace eosio {
                   ("b", modes_str( c->last_req->req_blocks.mode ))( "t", modes_str( c->last_req->req_trx.mode ) ) );
          return;
       }
+      g_c_conn.unlock();
+      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for( auto& conn : my_impl->connections ) {
-         if( conn == c || conn->last_req ) {
+         if( conn == c ) continue;
+
+         std::unique_lock<std::mutex> g_conn_conn( conn->conn_mtx );
+         if( conn->last_req ) {
             continue;
          }
+         g_conn_conn.unlock();
          bool sendit = peer_has_block( bid, conn->connection_id );
          if( sendit ) {
-            conn->strand.post( [conn, last_req = *c->last_req]() {
+            g.unlock();
+            g_c_conn.lock();
+            auto last_req = *c->last_req;
+            g_c_conn.unlock();
+            conn->strand.post( [conn, last_req{std::move(last_req)}]() {
                conn->enqueue( last_req );
                conn->fetch_wait();
-               boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+               std::lock_guard<std::mutex> g_conn_conn( conn->conn_mtx );
                conn->last_req = last_req;
             } );
             return;
          }
       }
-      // found no peer that we know has it, so ask some random connection
-      for( auto& conn : my_impl->connections ) {
-         if( conn == c || conn->last_req ) {
-            continue;
-         }
-         conn->strand.post( [conn, last_req = *c->last_req]() {
-            conn->enqueue( last_req );
-            conn->fetch_wait();
-            boost::unique_lock<boost::shared_mutex> g( my_impl->connections_mtx );
-            conn->last_req = last_req;
-         } );
-         return;
-      }
 
       // at this point no other peer has it, re-request or do nothing?
       fc_wlog( logger, "no peer has last_req" );
       if( c->connected() ) {
-         c->enqueue(*c->last_req);
+         g_c_conn.lock();
+         auto last_req = *c->last_req;
+         g_c_conn.unlock();
+         c->enqueue( last_req );
          c->fetch_wait();
       }
    }
@@ -2445,13 +2472,20 @@ namespace eosio {
                --conn->reads_in_flight;
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                conn->outstanding_read_bytes = 0;
 >>>>>>> Test of multi-threaded reading
 =======
 >>>>>>> Remove unneeded access to atomic
                bool close_connection = false;
+=======
+>>>>>>> Add protection for last_handshake_*, last_req, and socket close
+
+               // may have closed connection and cleared pending_message_buffer
+               if( !conn->socket_is_open() ) return;
 
+               bool close_connection = false;
                try {
                   if( !ec ) {
                      if (bytes_transferred > conn->pending_message_buffer.bytes_to_write()) {
@@ -2664,6 +2698,10 @@ namespace eosio {
          c->enqueue( go_away_message( fatal_other ) );
          return;
       }
+      fc_dlog( logger, "received handshake gen ${g} from ${ep}, lib ${lib}, head ${head}",
+               ("g", msg.generation)( "ep", c->peer_address() )
+               ( "lib", msg.last_irreversible_block_num )( "head", msg.head_num ) );
+
       if( c->connecting ) {
          c->connecting = false;
       }
@@ -2674,7 +2712,9 @@ namespace eosio {
             return;
          }
 
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
+            g_conn.unlock();
             fc_dlog(logger, "checking for duplicate" );
             boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
             for(const auto& check : connections) {
@@ -2685,7 +2725,13 @@ namespace eosio {
                   // we need to avoid the case where they would both tell a different connection to go away.
                   // Using the sum of the initial handshake times of the two connections, we will
                   // arbitrarily (but consistently between the two peers) keep one of them.
-                  if (msg.time + c->last_handshake_sent.time <= check->last_handshake_sent.time + check->last_handshake_recv.time)
+                  std::unique_lock<std::mutex> g_check_conn( check->conn_mtx );
+                  auto check_time = check->last_handshake_sent.time + check->last_handshake_recv.time;
+                  g_check_conn.unlock();
+                  g_conn.lock();
+                  auto c_time = c->last_handshake_sent.time;
+                  g_conn.unlock();
+                  if (msg.time + c_time <= check_time)
                      continue;
 
                   fc_dlog( logger, "sending go_away duplicate to ${ep}", ("ep",msg.p2p_address) );
@@ -2699,6 +2745,7 @@ namespace eosio {
          } else {
             fc_dlog( logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",
                      ("pa", c->peer_address())( "ni", c->last_handshake_recv.node_id ) );
+            g_conn.unlock();
          }
 
          if( msg.chain_id != chain_id) {
@@ -2762,7 +2809,9 @@ namespace eosio {
          }
       }
 
+      std::unique_lock<std::mutex> g_conn( c->conn_mtx );
       c->last_handshake_recv = msg;
+      g_conn.unlock();
       c->_logger_variant.reset();
       sync_master->recv_handshake( c, msg );
    }
@@ -2816,7 +2865,6 @@ namespace eosio {
       //
       peer_ilog( c, "received notice_message" );
       c->connecting = false;
-      request_message req;
       if( msg.known_trx.mode != none ) {
          fc_dlog( logger, "this is a ${m} notice with ${n} transactions",
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
@@ -2825,8 +2873,9 @@ namespace eosio {
       case none:
          break;
       case last_irr_catch_up: {
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          c->last_handshake_recv.head_num = msg.known_trx.pending;
-         req.req_trx.mode = none;
+         g_conn.unlock();
          break;
       }
       case catch_up : {

From a93ef99fbe7e866861c9e43ba75c2b9e023d3429 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 09:21:34 -0500
Subject: [PATCH 0151/1648] Protect connection fork_head, fork_head_num.
 Improve logging.

---
 plugins/net_plugin/net_plugin.cpp | 32 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2f823964dbd..c0e581ba0e0 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -631,13 +631,13 @@ namespace eosio {
       std::mutex                            read_delay_timer_mtx;
       boost::asio::steady_timer             read_delay_timer;
       std::atomic<go_away_reason>           no_retry{no_reason};
-      block_id_type          fork_head;
-      std::atomic<uint32_t>  fork_head_num{0}; // provides memory barrier for fork_head
 
-      mutable std::mutex          conn_mtx; // mtx for last_req, last_handshake_recv, last_handshake_sent
+      mutable std::mutex          conn_mtx; // mtx for last_req, last_handshake_recv, last_handshake_sent, fork_head, fork_head_num
       optional<request_message>   last_req;
       handshake_message           last_handshake_recv;
       handshake_message           last_handshake_sent;
+      block_id_type               fork_head;
+      uint32_t                    fork_head_num{0};
 
       connection_status get_status()const;
 
@@ -1266,7 +1266,6 @@ namespace eosio {
 
    bool connection::enqueue_sync_block() {
       if( !peer_requested ) {
-         fc_dlog( logger, "enqueue sync block, with no peer_requested" );
          return false;
       } else {
          fc_dlog( logger, "enqueue sync block ${num}", ("num", peer_requested->last + 1) );
@@ -1719,7 +1718,7 @@ namespace eosio {
       req.req_blocks.mode = catch_up;
       boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
       for (const auto& cc : my_impl->connections) {
-         // fork_head_num provides memory barrier for fork_head
+         std::lock_guard<std::mutex> g_conn( cc->conn_mtx );
          if( cc->fork_head_num > num || cc->fork_head == id ) {
             req.req_blocks.mode = none;
             break;
@@ -1727,8 +1726,10 @@ namespace eosio {
       }
       g.unlock();
       if( req.req_blocks.mode == catch_up ) {
+         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          c->fork_head = id;
          c->fork_head_num = num;
+         g_conn.unlock();
          std::lock_guard<std::mutex> g( sync_mtx );
          fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} "
                           "target LIB = ${lib} next_expected = ${ne}",
@@ -1738,6 +1739,7 @@ namespace eosio {
             return;
          set_state( head_catchup );
       } else {
+         std::lock_guard<std::mutex> g_conn( c->conn_mtx );
          c->fork_head = block_id_type();
          c->fork_head_num = 0;
       }
@@ -1786,14 +1788,16 @@ namespace eosio {
 
    // called from connection strand
    void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
-      fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_address() ) );
+      fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_name() ) );
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       stages state = sync_state;
       fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
       if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
+            auto sync_next_expected = sync_next_expected_num;
+            g_sync.unlock();
             fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
-                     ("ne",sync_next_expected_num)("bn",blk_num)("p",c->peer_address()) );
+                     ("ne", sync_next_expected)( "bn", blk_num )( "p", c->peer_name() ) );
             c->close();
             return;
          }
@@ -1809,11 +1813,15 @@ namespace eosio {
          bool set_state_to_head_catchup = false;
          boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
          for( const auto& cp : my_impl->connections ) {
-            uint32_t fork_head_num = cp->fork_head_num.load(); // fork_head_num provides memory barrier for fork_head
-            if (cp->fork_head == null_id) {
+            std::unique_lock<std::mutex> g_cp_conn( cp->conn_mtx );
+            uint32_t fork_head_num = cp->fork_head_num;
+            block_id_type fork_head_id = cp->fork_head;
+            g_cp_conn.unlock();
+            if( fork_head_id == null_id ) {
                continue;
             }
-            if( fork_head_num < blk_num || cp->fork_head == blk_id ) {
+            if( fork_head_num < blk_num || fork_head_id == blk_id ) {
+               std::lock_guard<std::mutex> g_conn( c->conn_mtx );
                c->fork_head = null_id;
                c->fork_head_num = 0;
             } else {
@@ -2031,7 +2039,7 @@ namespace eosio {
          }
 
          cp->strand.post( [cp, send_buffer]() {
-            fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_address()) );
+            fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_name()) );
             cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
          } );
       }
@@ -2699,7 +2707,7 @@ namespace eosio {
          return;
       }
       fc_dlog( logger, "received handshake gen ${g} from ${ep}, lib ${lib}, head ${head}",
-               ("g", msg.generation)( "ep", c->peer_address() )
+               ("g", msg.generation)( "ep", c->peer_name() )
                ( "lib", msg.last_irreversible_block_num )( "head", msg.head_num ) );
 
       if( c->connecting ) {

From 9f906a9b6dc26c0c59c6560867b9692116f511f1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 12:37:34 -0500
Subject: [PATCH 0152/1648] Fix protection of connections. Record block after
 verify it links.

---
 plugins/net_plugin/net_plugin.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c0e581ba0e0..c8302335d40 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1275,8 +1275,7 @@ namespace eosio {
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      const int higher_than_low = priority::low + 2; // otherwise client gets very little if we are syncing to a peer
-      app().post( higher_than_low, [num, trigger_send, c = shared_from_this()]() {
+      app().post( priority::medium, [num, trigger_send, c = shared_from_this()]() {
          controller& cc = my_impl->chain_plug->chain();
          signed_block_ptr sb = cc.fetch_block_by_number( num );
          if( sb ) {
@@ -2323,9 +2322,9 @@ namespace eosio {
                g.unlock();
                if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
                   if( new_connection->start_session() ) {
-                     g.lock();
+                     boost::unique_lock<boost::shared_mutex> g_unique( connections_mtx );
                      connections.insert( new_connection );
-                     g.unlock();
+                     g_unique.unlock();
                   }
 
                } else {
@@ -3203,9 +3202,9 @@ namespace eosio {
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );
       }
 
-      c->strand.post( [dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
-         dispatcher->recv_block( c, blk_id, blk_num );
-      });
+//      c->strand.post( [dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+//         dispatcher->recv_block( c, blk_id, blk_num );
+//      });
       fc::microseconds age( fc::time_point::now() - msg->timestamp);
       peer_ilog(c, "received signed_block : #${n} block age in secs = ${age}",
               ("n",blk_num)("age",age.to_seconds()));
@@ -3237,7 +3236,8 @@ namespace eosio {
          boost::asio::post( *server_ioc, [self = this, msg]() {
             self->dispatcher->update_txns_block_num( msg );
          });
-         c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {
+         c->strand.post( [sync_master = sync_master.get(), dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+            dispatcher->recv_block( c, blk_id, blk_num );
             sync_master->sync_recv_block( c, blk_id, blk_num );
          });
       } else {
@@ -3375,7 +3375,7 @@ namespace eosio {
    void net_plugin_impl::on_accepted_block(const block_state_ptr& block) {
       update_chain_info();
       boost::asio::post( *server_ioc, [this, ioc=server_ioc, block]() {
-         fc_dlog( logger, "signaled, id = ${id}", ("id", block->id) );
+         fc_dlog( logger, "signaled, blk id = ${id}", ("id", block->id) );
          dispatcher->bcast_block( block );
       });
    }

From a5b764ae6d2561f9bed537a237b085d4087fd790 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 14:44:51 -0500
Subject: [PATCH 0153/1648] Merge with develop

---
 plugins/net_plugin/net_plugin.cpp | 493 ------------------------------
 1 file changed, 493 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c8302335d40..eda58c0f794 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -572,46 +572,19 @@ namespace eosio {
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
       std::shared_ptr<boost::asio::io_context>  server_ioc; // keep ioc alive
       boost::asio::io_context::strand           strand;
-<<<<<<< HEAD
-<<<<<<< HEAD
-      socket_ptr                                socket;
-=======
-      socket_ptr                                socket; // only accessed through strand after construction
-<<<<<<< HEAD
->>>>>>> Protect start_read_message via strand
-=======
-=======
       tcp::socket                               socket; // only accessed through strand after construction
->>>>>>> Move socket ownership into connection.
    private:
       std::atomic<bool>                         socket_open{false};
    public:
->>>>>>> Made all access to impl->connections thread safe
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-<<<<<<< HEAD
-<<<<<<< HEAD
       std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
-=======
-      std::atomic<std::size_t>         outstanding_read_bytes{0};
->>>>>>> Test of multi-threaded reading
-=======
-      std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
->>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
 
 
       queued_buffer           buffer_queue;
 
       std::atomic<uint32_t>   reads_in_flight{0};
-<<<<<<< HEAD
-<<<<<<< HEAD
-      std::atomic<uint32_t>   trx_in_progress_size{0};
-=======
-      uint32_t                trx_in_progress_size = 0;
->>>>>>> Test of multi-threaded reading
-=======
       std::atomic<uint32_t>   trx_in_progress_size{0};
->>>>>>> Make delay_timer thread safe
       fc::sha256              node_id;
       const uint32_t          connection_id;
       int16_t                 sent_handshake_count = 0;
@@ -773,15 +746,7 @@ namespace eosio {
       void operator()( signed_block&& msg ) const {
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
          connection_wptr weak = c;
-<<<<<<< HEAD
-<<<<<<< HEAD
          app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
-=======
-         app().post(priority::high, "handle blk", [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
->>>>>>> Test of multi-threaded reading
-=======
-         app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
->>>>>>> Remove descriptions of tasks as not merged into develop yet
             connection_ptr c = weak.lock();
             if( c ) impl->handle_message( c, ptr );
          });
@@ -791,19 +756,7 @@ namespace eosio {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle packed_transaction" );
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
-<<<<<<< HEAD
-<<<<<<< HEAD
-         impl.handle_message( c, ptr );
-=======
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if( c) impl->handle_message( c, ptr );
-         });
->>>>>>> Test of multi-threaded reading
-=======
          impl.handle_message( c, ptr );
->>>>>>> Move more of incoming transaction processing to thread pool
       }
 
       void operator()( const handshake_message& msg ) const {
@@ -813,28 +766,9 @@ namespace eosio {
       }
 
       void operator()( const chain_size_message& msg ) const {
-<<<<<<< HEAD
-         connection_wptr weak = c;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-         app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
-=======
-         app().post(priority::low, "handle msg", [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
->>>>>>> Test of multi-threaded reading
-=======
-         app().post(priority::low, [impl = &impl, msg{std::forward<T>(msg)}, weak{std::move(weak)}] {
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-=======
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
-=======
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle chain_size_message" );
          impl.handle_message( c, msg );
->>>>>>> Handle almost every net_message on net_plugin thread pool. Optimize bcast_block to not send when syncing.
       }
 
       void operator()( const go_away_message& msg ) const {
@@ -862,18 +796,9 @@ namespace eosio {
       }
 
       void operator()( const sync_request_message& msg ) const {
-<<<<<<< HEAD
-         connection_wptr weak = c;
-         app().post(priority::low, [impl = &impl, msg{std::move(msg)}, weak{std::move(weak)}] {
->>>>>>> Work toward making sync_manager and handshake message thread safe.
-            connection_ptr c = weak.lock();
-            if(c) impl->handle_message( c, msg );
-         });
-=======
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle sync_request_message" );
          impl.handle_message( c, msg );
->>>>>>> Handle almost every net_message on net_plugin thread pool. Optimize bcast_block to not send when syncing.
       }
    };
 
@@ -882,16 +807,8 @@ namespace eosio {
    connection::connection( string endpoint )
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
-<<<<<<< HEAD
-        strand( app().get_io_service() ),
-=======
         strand( *my_impl->server_ioc ),
-<<<<<<< HEAD
->>>>>>> Protect start_read_message via strand
-        socket( std::make_shared<tcp::socket>( std::ref( *my_impl->server_ioc ))),
-=======
         socket( *my_impl->server_ioc ),
->>>>>>> Move socket ownership into connection.
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
         sent_handshake_count(0),
@@ -913,16 +830,8 @@ namespace eosio {
    connection::connection()
       : peer_requested(),
         server_ioc( my_impl->server_ioc ),
-<<<<<<< HEAD
-        strand( app().get_io_service() ),
-=======
         strand( *my_impl->server_ioc ),
-<<<<<<< HEAD
->>>>>>> Protect start_read_message via strand
-        socket( s ),
-=======
         socket( *my_impl->server_ioc ),
->>>>>>> Move socket ownership into connection.
         node_id(),
         connection_id( ++my_impl->current_connection_id ),
         sent_handshake_count(0),
@@ -1015,40 +924,7 @@ namespace eosio {
       if( has_last_req ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
-<<<<<<< HEAD
-<<<<<<< HEAD
-      reset();
-      sent_handshake_count = 0;
-      last_handshake_recv = handshake_message();
-      last_handshake_sent = handshake_message();
-      my_impl->sync_master->reset_lib_num(nullptr);
-      fc_dlog(logger, "canceling wait on ${p}", ("p",peer_name()));
-      cancel_wait();
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Make delay_timer thread safe
-      {
-         std::lock_guard<std::mutex> g( read_delay_timer_mutex );
-         if( read_delay_timer ) read_delay_timer->cancel();
-      }
-<<<<<<< HEAD
-=======
-      if( read_delay_timer ) read_delay_timer->cancel();
->>>>>>> Test of multi-threaded reading
-=======
->>>>>>> Make delay_timer thread safe
-=======
-
-      std::lock_guard<std::mutex> g( read_delay_timer_mtx );
-      if( read_delay_timer ) read_delay_timer->cancel();
->>>>>>> Use unique_lock instead of lock_guard to clean up code
-=======
-      self->reset();
-=======
       self->peer_requested.reset();
->>>>>>> Handle almost every net_message on net_plugin thread pool. Optimize bcast_block to not send when syncing.
       self->sent_handshake_count = 0;
       g_conn.lock();
       self->last_handshake_recv = handshake_message();
@@ -1060,12 +936,8 @@ namespace eosio {
 
       std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
       self->read_delay_timer.cancel();
-<<<<<<< HEAD
->>>>>>> Move socket ownership into connection.
-=======
 
       self->pending_message_buffer.reset();
->>>>>>> Add protection for last_handshake_*, last_req, and socket close
    }
 
    void connection::blk_send_branch() {
@@ -1195,20 +1067,9 @@ namespace eosio {
       std::vector<boost::asio::const_buffer> bufs;
       buffer_queue.fill_out_buffer( bufs );
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-      boost::asio::async_write(*socket, bufs,
-            boost::asio::bind_executor(strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
-         app().post(priority, [c, priority, ec, w]() {
-=======
-      boost::asio::async_write( socket, bufs,
-            boost::asio::bind_executor( strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
->>>>>>> Move socket ownership into connection.
-=======
       strand.dispatch( [c{std::move(c)}, bufs{std::move(bufs)}, priority]() {
          boost::asio::async_write( c->socket, bufs,
             boost::asio::bind_executor( c->strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
->>>>>>> Make queued_buffer thread safe
             try {
                // May have closed connection and cleared buffer_queue
                if( !c->socket_is_open() ) return;
@@ -1234,16 +1095,8 @@ namespace eosio {
             } catch( ... ) {
                fc_elog( logger, "Exception in do_queue_write to ${p}", ("p", c->peer_name()) );
             }
-<<<<<<< HEAD
-<<<<<<< HEAD
-         });
-=======
->>>>>>> Move socket ownership into connection.
-      }));
-=======
          }));
       });
->>>>>>> Make queued_buffer thread safe
    }
 
    void connection::cancel_sync(go_away_reason reason) {
@@ -2182,24 +2035,6 @@ namespace eosio {
       connection_wptr weak_conn = shared_from_this();
       // Note: need to add support for IPv6 too
 
-<<<<<<< HEAD
-      resolver->async_resolve( query, boost::asio::bind_executor( c->strand,
-                [weak_conn, this]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
-                   app().post( priority::low, [err, endpoint_itr, weak_conn, this]() {
-                      auto c = weak_conn.lock();
-                      if( !c ) return;
-                      if( !err ) {
-                         connect( c, endpoint_itr );
-                      } else {
-                         fc_elog( logger, "Unable to resolve ${add}: ${error}",
-                                  ("add", c->peer_name())( "error", err.message()) );
-                      }
-                   } );
-<<<<<<< HEAD
-                } ) );
-=======
-                } );
-=======
       auto resolver = std::make_shared<tcp::resolver>( *server_ioc );
       resolver->async_resolve( query, boost::asio::bind_executor( strand,
             [resolver, ioc = server_ioc, weak_conn]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
@@ -2210,14 +2045,8 @@ namespace eosio {
                } else {
                   fc_elog( logger, "Unable to resolve ${add}: ${error}", ("add", c->peer_name())( "error", err.message() ) );
                }
-<<<<<<< HEAD
-            } );
->>>>>>> Make use of resolver thread safe
-=======
             } ) );
->>>>>>> Work toward making sync_manager and handshake message thread safe.
       return true;
->>>>>>> Made all access to impl->connections thread safe
    }
 
    // called from connection strand
@@ -2227,29 +2056,11 @@ namespace eosio {
       }
       auto current_endpoint = *endpoint_itr;
       ++endpoint_itr;
-<<<<<<< HEAD
-      c->connecting = true;
-<<<<<<< HEAD
-      connection_wptr weak_conn = c;
-      c->socket->async_connect( current_endpoint, boost::asio::bind_executor( c->strand,
-            [weak_conn, endpoint_itr, this]( const boost::system::error_code& err ) {
-         app().post( priority::low, [weak_conn, endpoint_itr, this, err]() {
-            auto c = weak_conn.lock();
-            if( !c ) return;
-            if( !err && c->socket->is_open()) {
-               if( start_session( c )) {
-=======
-      c->socket.async_connect( current_endpoint,
-            boost::asio::bind_executor( c->strand, [resolver, c, endpoint_itr, this]( const boost::system::error_code& err ) {
-            if( !err && c->socket.is_open()) {
-=======
       connecting = true;
       socket.async_connect( current_endpoint,
             boost::asio::bind_executor( strand, [resolver, c = shared_from_this(), endpoint_itr]( const boost::system::error_code& err ) {
             if( !err && c->socket.is_open() ) {
->>>>>>> Work toward making sync_manager and handshake message thread safe.
                if( c->start_session() ) {
->>>>>>> Move socket ownership into connection.
                   c->send_handshake();
                }
             } else {
@@ -2264,34 +2075,7 @@ namespace eosio {
                   c->close();
                }
             }
-<<<<<<< HEAD
-         } );
-      } ) );
-   }
-
-   bool net_plugin_impl::start_session(const connection_ptr& con) {
-      boost::asio::ip::tcp::no_delay nodelay( true );
-      boost::system::error_code ec;
-      con->socket->set_option( nodelay, ec );
-      if (ec) {
-         fc_elog( logger, "connection failed to ${peer}: ${error}", ( "peer", con->peer_name())("error",ec.message()) );
-         con->connecting = false;
-         con->close();
-         return false;
-      } else {
-         con->strand.post( [this, con]() {
-            con->start();
-            start_read_message( con );
-         });
-         ++started_sessions;
-         return true;
-         // for now, we can just use the application main loop.
-         //     con->readloop_complete  = bf::async( [=](){ read_loop( con ); } );
-         //     con->writeloop_complete = bf::async( [=](){ write_loop con ); } );
-      }
-=======
       } ) );
->>>>>>> Move socket ownership into connection.
    }
 
    void net_plugin_impl::start_listen_loop() {
@@ -2360,24 +2144,9 @@ namespace eosio {
    // only called from strand thread
    void connection::start_read_message() {
       try {
-<<<<<<< HEAD
-         connection_wptr weak_conn = conn;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-         std::size_t minimum_read =
-               std::atomic_exchange<decltype(conn->outstanding_read_bytes.load())>( &conn->outstanding_read_bytes, 0 );
-         minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
-=======
-         std::size_t minimum_read = conn->outstanding_read_bytes != 0 ? conn->outstanding_read_bytes.load() : message_header_size;
->>>>>>> Test of multi-threaded reading
-=======
-=======
->>>>>>> Work toward making sync_manager and handshake message thread safe.
          std::size_t minimum_read =
                std::atomic_exchange<decltype(outstanding_read_bytes.load())>( &outstanding_read_bytes, 0 );
          minimum_read = minimum_read != 0 ? minimum_read : message_header_size;
->>>>>>> Remove unneeded access to atomic
 
          if (my_impl->use_socket_read_watermark) {
             const size_t max_socket_read_watermark = 4096;
@@ -2399,36 +2168,13 @@ namespace eosio {
              trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Make delay_timer thread safe
-            uint32_t write_queue_size = conn->buffer_queue.write_queue_size();
-            uint32_t trx_in_progress_size = conn->trx_in_progress_size;
-            uint32_t reads_in_flight = conn->reads_in_flight;
-=======
             uint32_t write_queue_size = buffer_queue.write_queue_size();
             uint32_t trx_in_progress_size = this->trx_in_progress_size.load();
             uint32_t reads_in_flight = this->reads_in_flight.load();
->>>>>>> Work toward making sync_manager and handshake message thread safe.
             if( write_queue_size > def_max_write_queue_size ) {
                peer_wlog( this, "write_queue full ${s} bytes", ("s", write_queue_size) );
             } else if( reads_in_flight > def_max_reads_in_flight ) {
-<<<<<<< HEAD
-               peer_wlog( conn, "max reads in flight ${s}", ("s", reads_in_flight) );
-<<<<<<< HEAD
-=======
-            if( conn->buffer_queue.write_queue_size() > def_max_write_queue_size ) {
-               peer_wlog( conn, "write_queue full ${s} bytes", ("s", conn->buffer_queue.write_queue_size()) );
-            } else if( conn->reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( conn, "max reads in flight ${s}", ("s", conn->reads_in_flight.load()) );
->>>>>>> Test of multi-threaded reading
-=======
->>>>>>> Make delay_timer thread safe
-=======
                peer_wlog( this, "max reads in flight ${s}", ("s", reads_in_flight) );
->>>>>>> Work toward making sync_manager and handshake message thread safe.
             } else {
                peer_wlog( this, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
@@ -2436,28 +2182,9 @@ namespace eosio {
                 reads_in_flight > 2*def_max_reads_in_flight   ||
                 trx_in_progress_size > 2*def_max_trx_in_progress_size )
             {
-<<<<<<< HEAD
-               fc_wlog( logger, "queues over full, giving up on connection" );
-<<<<<<< HEAD
-               app().post( priority::medium, [weak_conn]() {
-=======
-               app().post( priority::medium, [this, weak_conn]() {
->>>>>>> Make delay_timer thread safe
-                  auto conn = weak_conn.lock();
-                  if( !conn ) return;
-                  fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                  conn->close();
-               });
-=======
                fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
-<<<<<<< HEAD
-                        ("p", conn->peer_name()) );
-               conn->close();
->>>>>>> Move socket ownership into connection.
-=======
                         ("p", peer_name()) );
                close();
->>>>>>> Work toward making sync_manager and handshake message thread safe.
                return;
             }
             std::lock_guard<std::mutex> g( read_delay_timer_mtx );
@@ -2477,17 +2204,6 @@ namespace eosio {
             boost::asio::bind_executor( strand,
             [conn = shared_from_this()]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                --conn->reads_in_flight;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-               conn->outstanding_read_bytes = 0;
->>>>>>> Test of multi-threaded reading
-=======
->>>>>>> Remove unneeded access to atomic
-               bool close_connection = false;
-=======
->>>>>>> Add protection for last_handshake_*, last_req, and socket close
 
                // may have closed connection and cleared pending_message_buffer
                if( !conn->socket_is_open() ) return;
@@ -2560,40 +2276,8 @@ namespace eosio {
                }
 
                if( close_connection ) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-                  connection_wptr weak_conn = conn;
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-=======
->>>>>>> Make delay_timer thread safe
-                  app().post( priority::medium, [this, weak_conn]() {
-=======
-                  connection_wptr weak_conn = conn;
-<<<<<<< HEAD
-                  app().post( priority::medium, "close conn", [this, weak_conn]() {
->>>>>>> Test of multi-threaded reading
-=======
-=======
->>>>>>> Make delay_timer thread safe
-                  app().post( priority::medium, [this, weak_conn]() {
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-=======
-                  app().post( priority::medium, [weak_conn]() {
->>>>>>> Made all access to impl->connections thread safe
-                     auto conn = weak_conn.lock();
-                     if( !conn ) return;
-                     fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                     conn->close();
-                  });
-=======
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
                   conn->close();
->>>>>>> Move socket ownership into connection.
                }
          }));
       } catch (...) {
@@ -3005,16 +2689,7 @@ namespace eosio {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
                fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
-<<<<<<< HEAD
-<<<<<<< HEAD
                accepted = true;
-=======
-               this->dispatcher->bcast_transaction(ptrx);
-               return;
->>>>>>> Add trx id to log message
-=======
-               accepted = true;
->>>>>>> Move more of incoming transaction processing to thread pool
             }
 
             if( !accepted ) {
@@ -3035,168 +2710,21 @@ namespace eosio {
       });
    }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
    // called from application thread
->>>>>>> Work toward making sync_manager and handshake message thread safe.
    void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
       controller& cc = chain_plug->chain();
       block_id_type blk_id = msg->id();
       uint32_t blk_num = msg->block_num();
-=======
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& m) {
-      signed_block_ptr msg = m;
-      controller& cc = chain_plug->chain();
-      block_id_type blk_id = msg ? msg->id() : block_id_type();
-      uint32_t blk_num = msg ? msg->block_num() : 0;
->>>>>>> Test of multi-threaded reading
-=======
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
-      controller& cc = chain_plug->chain();
-      block_id_type blk_id = msg->id();
-      uint32_t blk_num = msg->block_num();
->>>>>>> Revert unneeded changes to handle_message
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
       try {
-<<<<<<< HEAD
-<<<<<<< HEAD
          if( cc.fetch_block_by_id(blk_id) ) {
-<<<<<<< HEAD
-            sync_master->recv_block(c, blk_id, blk_num);
-            return;
-         }
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
-         if( msg && cc.fetch_block_by_id(blk_id)) {
-=======
-         if( cc.fetch_block_by_id(blk_id) ) {
-<<<<<<< HEAD
->>>>>>> Revert unneeded changes to handle_message
-            sync_master->recv_block(c, blk_id, blk_num);
-=======
-            sync_master->sync_recv_block(c, blk_id, blk_num);
->>>>>>> Consolidate transaction tracking, reducing memory requirements and making thread safe.
-=======
             c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {
                sync_master->sync_recv_block( c, blk_id, blk_num );
             });
->>>>>>> Work toward making sync_manager and handshake message thread safe.
             return;
          }
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> Test of multi-threaded reading
-=======
->>>>>>> Test of multi-threaded reading
-         signed_block_ptr prev = msg ? cc.fetch_block_by_id( msg->previous ) : msg;
-         if( prev == nullptr ){ //&& sync_master->is_active(c) ) {
-            // see if top is ready
-            if( !sync_master->incoming_blocks.empty() ) {
-               prev = sync_master->incoming_blocks.top();
-               auto prev_prev = cc.fetch_block_by_id( prev->previous );
-               if( prev_prev != nullptr ) {
-                  sync_master->incoming_blocks.pop();
-                  if(msg) sync_master->incoming_blocks.emplace( msg );
-                  msg = prev;
-                  blk_id = msg->id();
-                  blk_num = msg->block_num();
-                  connection_wptr weak = c;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                  app().post(priority::medium, [this, weak](){
-=======
-                  app().post(priority::medium, "re post blk", [this, weak](){
->>>>>>> Test of multi-threaded reading
-=======
-                  app().post(priority::medium, [this, weak](){
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-=======
-                  app().post(priority::medium, "re post blk", [this, weak](){
->>>>>>> Test of multi-threaded reading
-=======
-                  app().post(priority::medium, [this, weak](){
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  });
-               } else {
-                  if( msg ) {
-                     sync_master->incoming_blocks.emplace( msg );
-
-                     connection_wptr weak = c;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                     app().post( priority::medium, [this, weak]() {
-=======
-                     app().post( priority::medium, "re post blk", [this, weak]() {
->>>>>>> Test of multi-threaded reading
-=======
-                     app().post( priority::medium, [this, weak]() {
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-=======
-                     app().post( priority::medium, "re post blk", [this, weak]() {
->>>>>>> Test of multi-threaded reading
-=======
-                     app().post( priority::medium, [this, weak]() {
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-                        connection_ptr c = weak.lock();
-                        if( c ) handle_message( c, signed_block_ptr() );
-                     } );
-                  }
-                  return;
-               }
-            } else {
-               if( msg ) {
-                  sync_master->incoming_blocks.emplace( msg );
-
-                  connection_wptr weak = c;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                  app().post( priority::medium, [this, weak]() {
-=======
-                  app().post( priority::medium, "re post blk", [this, weak]() {
->>>>>>> Test of multi-threaded reading
-=======
-                  app().post( priority::medium, [this, weak]() {
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-=======
-                  app().post( priority::medium, "re post blk", [this, weak]() {
->>>>>>> Test of multi-threaded reading
-=======
-                  app().post( priority::medium, [this, weak]() {
->>>>>>> Remove descriptions of tasks as not merged into develop yet
-                     connection_ptr c = weak.lock();
-                     if( c ) handle_message( c, signed_block_ptr() );
-                  } );
-               }
-               return;
-            }
-         }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
-=======
->>>>>>> Test of multi-threaded reading
-=======
->>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
-=======
->>>>>>> Test of multi-threaded reading
-=======
->>>>>>> Use appbase with FIFO priority queue. priority queue in net_plugin no longer needed.
       } catch( ...) {
          // should this even be caught?
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );
@@ -3314,31 +2842,10 @@ namespace eosio {
       uint32_t lib = 0;
       std::tie( lib, std::ignore, std::ignore, std::ignore, std::ignore, std::ignore ) = get_chain_info();
       dispatcher->expire_blocks( lib );
-<<<<<<< HEAD
-      for ( auto& c : connections ) {
-         auto &stale_txn = c->trx_state.get<by_block_num>();
-         stale_txn.erase( stale_txn.lower_bound(1), stale_txn.upper_bound(lib) );
-         auto &stale_txn_e = c->trx_state.get<by_expiry>();
-         stale_txn_e.erase(stale_txn_e.lower_bound(time_point_sec()), stale_txn_e.upper_bound(time_point::now()));
-      }
-<<<<<<< HEAD
-<<<<<<< HEAD
-      fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
-=======
-      fc_dlog( logger, "expire_txns ${n}us size ${s} removed ${r}",
-               ("n", time_point::now() - now)("s", start_size)("r", start_size - local_txns.size()) );
->>>>>>> force a build
-=======
-=======
       dispatcher->expire_txns( lib );
->>>>>>> Consolidate transaction tracking, reducing memory requirements and making thread safe.
       fc_dlog( logger, "expire_txns ${n}us", ("n", time_point::now() - now) );
-<<<<<<< HEAD
->>>>>>> Move more of incoming transaction processing to thread pool
-=======
 
       start_expire_timer();
->>>>>>> Break expire into two steps
    }
 
    // called from any thread

From aa79e4ae91cdc198b3f4fb457ba7989c9184facd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 15:39:55 -0500
Subject: [PATCH 0154/1648] Temporarily disable bnet tests and mongo tests to
 speed up testing.

---
 tests/CMakeLists.txt | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0eea67cbce3..97c73c270d6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,5 @@
 
+
 find_package( Gperftools QUIET )
 if( GPERFTOOLS_FOUND )
     message( STATUS "Found gperftools; compiling tests with TCMalloc")
@@ -51,24 +52,29 @@ add_test(NAME plugin_test COMMAND plugin_test --report_level=detailed --color_ou
 
 add_test(NAME nodeos_sanity_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_sanity_test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME nodeos_sanity_bnet_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --p2p-plugin bnet --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST nodeos_sanity_bnet_test PROPERTY LABELS nonparallelizable_tests)
+
+#
+# TODO: DO NOT MERGE, temp disable of some tests
+#
+
+# add_test(NAME nodeos_sanity_bnet_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --p2p-plugin bnet --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+# set_property(TEST nodeos_sanity_bnet_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME nodeos_run_test COMMAND tests/nodeos_run_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_run_test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME nodeos_run_bnet_test COMMAND tests/nodeos_run_test.py -v --clean-run --p2p-plugin bnet --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST nodeos_run_bnet_test PROPERTY LABELS nonparallelizable_tests)
+# add_test(NAME nodeos_run_bnet_test COMMAND tests/nodeos_run_test.py -v --clean-run --p2p-plugin bnet --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+# set_property(TEST nodeos_run_bnet_test PROPERTY LABELS nonparallelizable_tests)
 
 add_test(NAME p2p_dawn515_test COMMAND tests/p2p_tests/dawn_515/test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST p2p_dawn515_test PROPERTY LABELS nonparallelizable_tests)
 if(BUILD_MONGO_DB_PLUGIN)
-  add_test(NAME nodeos_run_test-mongodb COMMAND tests/nodeos_run_test.py --mongodb -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-  set_property(TEST nodeos_run_test-mongodb PROPERTY LABELS nonparallelizable_tests)
+#  add_test(NAME nodeos_run_test-mongodb COMMAND tests/nodeos_run_test.py --mongodb -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+#  set_property(TEST nodeos_run_test-mongodb PROPERTY LABELS nonparallelizable_tests)
 endif()
 
 add_test(NAME distributed-transactions-test COMMAND tests/distributed-transactions-test.py -d 2 -p 4 -n 6 -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST distributed-transactions-test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME distributed-transactions-bnet-test COMMAND tests/distributed-transactions-test.py -d 2 -p 1 -n 4 --p2p-plugin bnet -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST distributed-transactions-bnet-test PROPERTY LABELS nonparallelizable_tests)
+# add_test(NAME distributed-transactions-bnet-test COMMAND tests/distributed-transactions-test.py -d 2 -p 1 -n 4 --p2p-plugin bnet -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+# set_property(TEST distributed-transactions-bnet-test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME restart-scenarios-test-resync COMMAND tests/restart-scenarios-test.py -c resync -p4 -v --clean-run --dump-error-details WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST restart-scenarios-test-resync PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME restart-scenarios-test-hard_replay COMMAND tests/restart-scenarios-test.py -c hardReplay -p4 -v --clean-run --dump-error-details WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
@@ -85,8 +91,8 @@ add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${C
 # Long running tests
 add_test(NAME nodeos_sanity_lr_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_sanity_lr_test PROPERTY LABELS long_running_tests)
-add_test(NAME nodeos_sanity_bnet_lr_test COMMAND tests/nodeos_run_test.py -v --sanity-test --p2p-plugin bnet --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST nodeos_sanity_bnet_lr_test PROPERTY LABELS long_running_tests)
+# add_test(NAME nodeos_sanity_bnet_lr_test COMMAND tests/nodeos_run_test.py -v --sanity-test --p2p-plugin bnet --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+# set_property(TEST nodeos_sanity_bnet_lr_test PROPERTY LABELS long_running_tests)
 add_test(NAME nodeos_run_check_lr_test COMMAND tests/nodeos_run_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_run_check_lr_test PROPERTY LABELS long_running_tests)
 add_test(NAME nodeos_remote_lr_test COMMAND tests/nodeos_run_remote_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
@@ -101,8 +107,8 @@ set_property(TEST nodeos_forked_chain_lr_test PROPERTY LABELS long_running_tests
 add_test(NAME nodeos_voting_lr_test COMMAND tests/nodeos_voting_test.py -v --wallet-port 9902 --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_voting_lr_test PROPERTY LABELS long_running_tests)
 
-add_test(NAME nodeos_voting_bnet_lr_test COMMAND tests/nodeos_voting_test.py -v --wallet-port 9903 --p2p-plugin bnet --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST nodeos_voting_bnet_lr_test PROPERTY LABELS long_running_tests)
+# add_test(NAME nodeos_voting_bnet_lr_test COMMAND tests/nodeos_voting_test.py -v --wallet-port 9903 --p2p-plugin bnet --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+# set_property(TEST nodeos_voting_bnet_lr_test PROPERTY LABELS long_running_tests)
 
 add_test(NAME nodeos_under_min_avail_ram_lr_test COMMAND tests/nodeos_under_min_avail_ram.py -v --wallet-port 9904 --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_under_min_avail_ram_lr_test PROPERTY LABELS long_running_tests)

From abd93b105dc1a69a4d07d2af21b5c62c34f6a872 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 15:41:09 -0500
Subject: [PATCH 0155/1648] Add a send_handshakes since we can't be sure chain
 has not progressed

---
 plugins/net_plugin/net_plugin.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index eda58c0f794..79602f5a352 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1421,7 +1421,7 @@ namespace eosio {
             connection_ptr c = sync_source;
             g_sync.unlock();
             c->strand.post( [c, start, end]() {
-               fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}", ("n", c->peer_address())( "s", start )( "e", end ) );
+               fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}", ("n", c->peer_name())( "s", start )( "e", end ) );
                c->request_sync_blocks( start, end );
             } );
          }
@@ -1470,7 +1470,7 @@ namespace eosio {
       }
 
       fc_ilog( logger, "Catching up with chain, our last req is ${cc}, theirs is ${t} peer ${p}",
-               ("cc", sync_last_requested_num)( "t", target )( "p", c->peer_address() ) );
+               ("cc", sync_last_requested_num)( "t", target )( "p", c->peer_name() ) );
 
       request_next_chunk( std::move( g_sync ), c );
    }
@@ -1479,7 +1479,7 @@ namespace eosio {
    void sync_manager::sync_reassign_fetch(const connection_ptr& c, go_away_reason reason) {
       std::unique_lock<std::mutex> g( sync_mtx );
       fc_ilog( logger, "reassign_fetch, our last req is ${cc}, next expected is ${ne} peer ${p}",
-               ("cc", sync_last_requested_num)( "ne", sync_next_expected_num )( "p", c->peer_address() ) );
+               ("cc", sync_last_requested_num)( "ne", sync_next_expected_num )( "p", c->peer_name() ) );
 
       if( c == sync_source ) {
          c->cancel_sync(reason);
@@ -1686,6 +1686,7 @@ namespace eosio {
             g_sync.lock();
             set_state( head_catchup );
             g_sync.unlock();
+            send_handshakes();
          } else {
             send_handshakes();
          }

From 05231a2d9fbdb05a0686c5a3607910693eaf7302 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 16:14:19 -0500
Subject: [PATCH 0156/1648] Remove add of send_handshakes

---
 plugins/net_plugin/net_plugin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 33eabe4bfcb..cceb95dc788 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1479,7 +1479,7 @@ namespace eosio {
    void sync_manager::sync_reassign_fetch(const connection_ptr& c, go_away_reason reason) {
       std::unique_lock<std::mutex> g( sync_mtx );
       fc_ilog( logger, "reassign_fetch, our last req is ${cc}, next expected is ${ne} peer ${p}",
-               ("cc", sync_last_requested_num)( "ne", sync_next_expected_num )( "p", c->peer_address() ) );
+               ("cc", sync_last_requested_num)( "ne", sync_next_expected_num )( "p", c->peer_name() ) );
 
       if( c == sync_source ) {
          c->cancel_sync(reason);
@@ -1686,7 +1686,6 @@ namespace eosio {
             g_sync.lock();
             set_state( head_catchup );
             g_sync.unlock();
-            send_handshakes();
          } else {
             send_handshakes();
          }

From f6ee906457d417c05f2746e8834eb3d98bdeb589 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 19:01:36 -0500
Subject: [PATCH 0157/1648] Temp remove duplicate check

---
 plugins/net_plugin/net_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index cceb95dc788..b5b046e4734 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2406,6 +2406,7 @@ namespace eosio {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
             g_conn.unlock();
+            /* todo temp
             fc_dlog(logger, "checking for duplicate" );
             boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
             for(const auto& check : connections) {
@@ -2433,6 +2434,7 @@ namespace eosio {
                   return;
                }
             }
+             */
          } else {
             fc_dlog( logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",
                      ("pa", c->peer_address())( "ni", c->last_handshake_recv.node_id ) );

From 2e7b27442fb93316c2bcdb93bbfb2e924285f2d4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 28 Mar 2019 20:20:31 -0500
Subject: [PATCH 0158/1648] Break out of handle signed block if disconnected

---
 plugins/net_plugin/net_plugin.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b5b046e4734..add33b26d8e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2720,6 +2720,10 @@ namespace eosio {
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
       c->cancel_wait();
 
+      // if we have closed connection then stop processing
+      if( !c->socket_is_open() )
+         return;
+
       try {
          if( cc.fetch_block_by_id(blk_id) ) {
             c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {

From d288bd9d13fdec6f232f9d3cdee72c7be0357679 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 29 Mar 2019 09:29:53 -0500
Subject: [PATCH 0159/1648] Add shutdown to connection close

---
 plugins/net_plugin/net_plugin.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index add33b26d8e..38561c6d4b2 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -913,6 +913,8 @@ namespace eosio {
 
    void connection::_close( connection* self ) {
       self->socket_open = false;
+      boost::system::error_code ec;
+      self->socket.shutdown( tcp::socket::shutdown_both, ec );
       self->socket.close();
       self->flush_queues();
       self->connecting = false;
@@ -1699,7 +1701,7 @@ namespace eosio {
             request_next_chunk( std::move( g_sync) );
          } else {
             g_sync.unlock();
-            fc_dlog( logger, "calling sync_wait on connection ${p}", ("p", c->peer_address()) );
+            fc_dlog( logger, "calling sync_wait on connection ${p}", ("p", c->peer_name()) );
             c->sync_wait();
          }
       }
@@ -2113,8 +2115,8 @@ namespace eosio {
 
                } else {
                   if( from_addr >= max_nodes_per_host ) {
-                     fc_elog( logger, "Number of connections (${n}) from ${ra} exceeds limit",
-                              ("n", from_addr + 1)( "ra", paddr_str ) );
+                     fc_elog( logger, "Number of connections (${n}) from ${ra} exceeds limit ${l}",
+                              ("n", from_addr + 1)( "ra", paddr_str )("l", max_nodes_per_host) );
                   } else {
                      fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count) );
                   }

From d09ad42a01865ec22dfbc89dc7a9f240de35d304 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Sat, 30 Mar 2019 20:36:00 -0400
Subject: [PATCH 0160/1648] Buildkite: Temporarily disabled AWS2 steps because
 "Yum update failed"

---
 .buildkite/long_running_tests.yml |  78 ++++++++++----------
 .buildkite/pipeline.yml           | 118 +++++++++++++++---------------
 2 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/.buildkite/long_running_tests.yml b/.buildkite/long_running_tests.yml
index 6383f57c392..489259a2f08 100644
--- a/.buildkite/long_running_tests.yml
+++ b/.buildkite/long_running_tests.yml
@@ -84,26 +84,26 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build/
-    label: ":aws: 2 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-        workdir: /data/job
-    timeout: 60
+  # - command: |
+  #       echo "+++ :hammer: Building"
+  #       ./scripts/eosio_build.sh -y
+  #       echo "--- :compression: Compressing build directory"
+  #       tar -pczf build.tar.gz build/
+  #   label: ":aws: 2 Build"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   artifact_paths: "build.tar.gz"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v2.1.0:
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+  #       workdir: /data/job
+  #   timeout: 60
 
   - command: |
         echo "+++ :hammer: Building"
@@ -236,25 +236,25 @@ steps:
         workdir: /data/job
     timeout: 90
 
-  - command: | # Amazon AWS-2 Linux Tests
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
-        echo "+++ :microscope: Running LR Tests"
-        ./scripts/long-running-test.sh
-    label: ":aws: 2 LR Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-        workdir: /data/job
-    timeout: 90
+  # - command: | # Amazon AWS-2 Linux Tests
+  #       echo "--- :arrow_down: Downloading Build Directory"
+  #       buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+  #       echo "+++ :microscope: Running LR Tests"
+  #       ./scripts/long-running-test.sh
+  #   label: ":aws: 2 LR Tests"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v2.1.0:
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+  #       workdir: /data/job
+  #   timeout: 90
 
   - command: | # Fedora Tests
         echo "--- :arrow_down: Downloading Build Directory"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 57ce31e5a6c..fa1f88fc3ca 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -84,26 +84,26 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build/
-    label: ":aws: 2 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-        workdir: /data/job
-    timeout: 60
+  # - command: |
+  #       echo "+++ :hammer: Building"
+  #       ./scripts/eosio_build.sh -y
+  #       echo "--- :compression: Compressing build directory"
+  #       tar -pczf build.tar.gz build/
+  #   label: ":aws: 2 Build"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   artifact_paths: "build.tar.gz"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v2.1.0:
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+  #       workdir: /data/job
+  #   timeout: 60
 
   - command: |
         echo "+++ :hammer: Building"
@@ -321,45 +321,45 @@ steps:
     timeout: 60
 
   # Amazon AWS-2 Linux Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/parallel-test.sh
-    label: ":aws: 2 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/serial-test.sh
-    label: ":aws: 2 NP Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-        workdir: /data/job
-    timeout: 60
+  # - command: |
+  #       echo "--- :arrow_down: Downloading Build Directory"
+  #       buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+  #       echo "+++ :microscope: Running Tests"
+  #       ./scripts/parallel-test.sh
+  #   label: ":aws: 2 Tests"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v2.1.0:
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+  #       workdir: /data/job
+  #   timeout: 60
+
+  # - command: |
+  #       echo "--- :arrow_down: Downloading Build Directory"
+  #       buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+  #       echo "+++ :microscope: Running Tests"
+  #       ./scripts/serial-test.sh
+  #   label: ":aws: 2 NP Tests"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v2.1.0:
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+  #       workdir: /data/job
+  #   timeout: 60
 
   # Fedora Tests
   - command: |

From 4e410eed7b4e14538ca70b70a89320476e108f58 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Sat, 30 Mar 2019 21:58:12 -0400
Subject: [PATCH 0161/1648] AWS2 image fixed by hand, revert commit d09ad42

---
 .buildkite/long_running_tests.yml |  78 ++++++++++----------
 .buildkite/pipeline.yml           | 118 +++++++++++++++---------------
 2 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/.buildkite/long_running_tests.yml b/.buildkite/long_running_tests.yml
index 489259a2f08..6383f57c392 100644
--- a/.buildkite/long_running_tests.yml
+++ b/.buildkite/long_running_tests.yml
@@ -84,26 +84,26 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # - command: |
-  #       echo "+++ :hammer: Building"
-  #       ./scripts/eosio_build.sh -y
-  #       echo "--- :compression: Compressing build directory"
-  #       tar -pczf build.tar.gz build/
-  #   label: ":aws: 2 Build"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   artifact_paths: "build.tar.gz"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v2.1.0:
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-  #       workdir: /data/job
-  #   timeout: 60
+  - command: |
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
+        tar -pczf build.tar.gz build/
+    label: ":aws: 2 Build"
+    agents:
+      queue: "automation-large-builder-fleet"
+    artifact_paths: "build.tar.gz"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v2.1.0:
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+        workdir: /data/job
+    timeout: 60
 
   - command: |
         echo "+++ :hammer: Building"
@@ -236,25 +236,25 @@ steps:
         workdir: /data/job
     timeout: 90
 
-  # - command: | # Amazon AWS-2 Linux Tests
-  #       echo "--- :arrow_down: Downloading Build Directory"
-  #       buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
-  #       echo "+++ :microscope: Running LR Tests"
-  #       ./scripts/long-running-test.sh
-  #   label: ":aws: 2 LR Tests"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v2.1.0:
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-  #       workdir: /data/job
-  #   timeout: 90
+  - command: | # Amazon AWS-2 Linux Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+        echo "+++ :microscope: Running LR Tests"
+        ./scripts/long-running-test.sh
+    label: ":aws: 2 LR Tests"
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v2.1.0:
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+        workdir: /data/job
+    timeout: 90
 
   - command: | # Fedora Tests
         echo "--- :arrow_down: Downloading Build Directory"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index fa1f88fc3ca..57ce31e5a6c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -84,26 +84,26 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # - command: |
-  #       echo "+++ :hammer: Building"
-  #       ./scripts/eosio_build.sh -y
-  #       echo "--- :compression: Compressing build directory"
-  #       tar -pczf build.tar.gz build/
-  #   label: ":aws: 2 Build"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   artifact_paths: "build.tar.gz"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v2.1.0:
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-  #       workdir: /data/job
-  #   timeout: 60
+  - command: |
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
+        tar -pczf build.tar.gz build/
+    label: ":aws: 2 Build"
+    agents:
+      queue: "automation-large-builder-fleet"
+    artifact_paths: "build.tar.gz"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v2.1.0:
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+        workdir: /data/job
+    timeout: 60
 
   - command: |
         echo "+++ :hammer: Building"
@@ -321,45 +321,45 @@ steps:
     timeout: 60
 
   # Amazon AWS-2 Linux Tests
-  # - command: |
-  #       echo "--- :arrow_down: Downloading Build Directory"
-  #       buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
-  #       echo "+++ :microscope: Running Tests"
-  #       ./scripts/parallel-test.sh
-  #   label: ":aws: 2 Tests"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v2.1.0:
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-  #       workdir: /data/job
-  #   timeout: 60
-
-  # - command: |
-  #       echo "--- :arrow_down: Downloading Build Directory"
-  #       buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
-  #       echo "+++ :microscope: Running Tests"
-  #       ./scripts/serial-test.sh
-  #   label: ":aws: 2 NP Tests"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v2.1.0:
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-  #       workdir: /data/job
-  #   timeout: 60
+  - command: |
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/parallel-test.sh
+    label: ":aws: 2 Tests"
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v2.1.0:
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+        workdir: /data/job
+    timeout: 60
+
+  - command: |
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/serial-test.sh
+    label: ":aws: 2 NP Tests"
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v2.1.0:
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
+        workdir: /data/job
+    timeout: 60
 
   # Fedora Tests
   - command: |

From 6491771813f6e823675d4970e7bc3d8b9d6e3bdd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 1 Apr 2019 16:45:33 -0400
Subject: [PATCH 0162/1648] Do not reset pending_message_buffer in close since
 async_read might be in flight

---
 plugins/net_plugin/net_plugin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 38561c6d4b2..8d42ee74fe8 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -938,8 +938,6 @@ namespace eosio {
 
       std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
       self->read_delay_timer.cancel();
-
-      self->pending_message_buffer.reset();
    }
 
    void connection::blk_send_branch() {
@@ -2059,6 +2057,7 @@ namespace eosio {
       auto current_endpoint = *endpoint_itr;
       ++endpoint_itr;
       connecting = true;
+      pending_message_buffer.reset();
       socket.async_connect( current_endpoint,
             boost::asio::bind_executor( strand, [resolver, c = shared_from_this(), endpoint_itr]( const boost::system::error_code& err ) {
             if( !err && c->socket.is_open() ) {

From 805a80ed3e2209f9a924c776c2ac35efb7b361f7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 1 Apr 2019 17:38:54 -0400
Subject: [PATCH 0163/1648] Add back duplicate check

---
 plugins/net_plugin/net_plugin.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8d42ee74fe8..cc59cc5ec93 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2407,7 +2407,6 @@ namespace eosio {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
             g_conn.unlock();
-            /* todo temp
             fc_dlog(logger, "checking for duplicate" );
             boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
             for(const auto& check : connections) {
@@ -2435,7 +2434,6 @@ namespace eosio {
                   return;
                }
             }
-             */
          } else {
             fc_dlog( logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",
                      ("pa", c->peer_address())( "ni", c->last_handshake_recv.node_id ) );

From 108a08b0d7d0af7529838e9d5c5e5aa75685ba1d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 1 Apr 2019 18:25:53 -0400
Subject: [PATCH 0164/1648] Use std::shared_timed_mutex instead of
 boost::shared_mutex

---
 plugins/net_plugin/net_plugin.cpp | 39 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index cc59cc5ec93..df8bc94215d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -25,10 +25,9 @@
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
 
 #include <atomic>
+#include <shared_mutex>
 
 using namespace eosio::chain::plugin_interface;
 
@@ -228,7 +227,7 @@ namespace eosio {
 
       connection_ptr find_connection(const string& host)const;
 
-      mutable boost::shared_mutex      connections_mtx; // switch to std::shared_mutex in C++17, also protects connection::last_req
+      mutable std::shared_timed_mutex  connections_mtx; // switch to std::shared_mutex in C++17
       std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
       bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
@@ -1361,7 +1360,7 @@ namespace eosio {
       if (conn && conn->current() ) {
          sync_source = conn;
       } else {
-         boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+         std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
          if (my_impl->connections.size() == 1) {
             if (!sync_source) {
                sync_source = *my_impl->connections.begin();
@@ -1430,7 +1429,7 @@ namespace eosio {
 
    // static, thread safe
    void sync_manager::send_handshakes() {
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
       for( auto& ci : my_impl->connections ) {
          if( ci->current() ) {
             ci->send_handshake();
@@ -1568,7 +1567,7 @@ namespace eosio {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
       for (const auto& cc : my_impl->connections) {
          std::lock_guard<std::mutex> g_conn( cc->conn_mtx );
          if( cc->fork_head_num > num || cc->fork_head == id ) {
@@ -1663,7 +1662,7 @@ namespace eosio {
 
          block_id_type null_id;
          bool set_state_to_head_catchup = false;
-         boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+         std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
          for( const auto& cp : my_impl->connections ) {
             std::unique_lock<std::mutex> g_cp_conn( cp->conn_mtx );
             uint32_t fork_head_num = cp->fork_head_num;
@@ -1808,7 +1807,7 @@ namespace eosio {
 
       if( my_impl->sync_master->syncing_with_peer() ) return;
       bool have_connection = false;
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
 
          peer_dlog( cp, "socket_is_open ${s}, connecting ${c}, syncing ${ss}",
@@ -1877,7 +1876,7 @@ namespace eosio {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
@@ -1977,7 +1976,7 @@ namespace eosio {
          return;
       }
       g_c_conn.unlock();
-      boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
       for( auto& conn : my_impl->connections ) {
          if( conn == c ) continue;
 
@@ -2093,7 +2092,7 @@ namespace eosio {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
             } else {
                paddr_str = paddr_add.to_string();
-               boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+               std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
                for( auto& conn : connections ) {
                   if( conn->socket_is_open() ) {
                      if( conn->peer_address().empty() ) {
@@ -2107,7 +2106,7 @@ namespace eosio {
                g.unlock();
                if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
                   if( new_connection->start_session() ) {
-                     boost::unique_lock<boost::shared_mutex> g_unique( connections_mtx );
+                     std::unique_lock<std::shared_timed_mutex> g_unique( connections_mtx );
                      connections.insert( new_connection );
                      g_unique.unlock();
                   }
@@ -2408,7 +2407,7 @@ namespace eosio {
          if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
             g_conn.unlock();
             fc_dlog(logger, "checking for duplicate" );
-            boost::shared_lock<boost::shared_mutex> g( my_impl->connections_mtx );
+            std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
             for(const auto& check : connections) {
                if(check == c)
                   continue;
@@ -2818,7 +2817,7 @@ namespace eosio {
             if( ec ) {
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
-            boost::shared_lock<boost::shared_mutex> g( connections_mtx );
+            std::shared_lock<std::shared_timed_mutex> g( connections_mtx );
             for( auto& c : connections ) {
                if( c->socket_is_open() ) {
                   c->strand.post( [c]() {
@@ -2858,7 +2857,7 @@ namespace eosio {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
-      boost::unique_lock<boost::shared_mutex> g( connections_mtx );
+      std::unique_lock<std::shared_timed_mutex> g( connections_mtx );
       auto it = (from ? connections.find(from) : connections.begin());
       if (it == connections.end()) it = connections.begin();
       while (it != connections.end()) {
@@ -3262,7 +3261,7 @@ namespace eosio {
          my->done = true;
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
-            boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
+            std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
                con->close();
@@ -3290,14 +3289,14 @@ namespace eosio {
       fc_dlog( logger, "calling active connector" );
       if( c->resolve_and_connect() ) {
          fc_dlog( logger, "adding new connection to the list" );
-         boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
+         std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
          my->connections.insert( c );
       }
       return "added connection";
    }
 
    string net_plugin::disconnect( const string& host ) {
-      boost::unique_lock<boost::shared_mutex> g( my->connections_mtx );
+      std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
          if( (*itr)->peer_address() == host ) {
             fc_ilog( logger, "disconnecting: ${p}", ("p", (*itr)->peer_name()) );
@@ -3318,7 +3317,7 @@ namespace eosio {
 
    vector<connection_status> net_plugin::connections()const {
       vector<connection_status> result;
-      boost::shared_lock<boost::shared_mutex> g( my->connections_mtx );
+      std::shared_lock<std::shared_timed_mutex> g( my->connections_mtx );
       result.reserve( my->connections.size() );
       for( const auto& c : my->connections ) {
          result.push_back( c->get_status() );
@@ -3326,7 +3325,7 @@ namespace eosio {
       return result;
    }
    connection_ptr net_plugin_impl::find_connection(const string& host )const {
-      boost::shared_lock<boost::shared_mutex> g( connections_mtx );
+      std::shared_lock<std::shared_timed_mutex> g( connections_mtx );
       for( const auto& c : connections )
          if( c->peer_address() == host ) return c;
       return connection_ptr();

From f84d4f88b3c43bf6eed3bf182fa198b497339a42 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 2 Apr 2019 09:52:52 -0400
Subject: [PATCH 0165/1648] Try to connect after close

---
 plugins/net_plugin/net_plugin.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index df8bc94215d..123af89d0f2 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -229,7 +229,6 @@ namespace eosio {
 
       mutable std::shared_timed_mutex  connections_mtx; // switch to std::shared_mutex in C++17
       std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
-      bool                             done = false;
       unique_ptr< sync_manager >       sync_master;
       unique_ptr< dispatch_manager >   dispatcher;
 
@@ -935,8 +934,12 @@ namespace eosio {
       fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();
 
-      std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
+      std::unique_lock<std::mutex> g( self->read_delay_timer_mtx );
       self->read_delay_timer.cancel();
+      g.unlock();
+
+      // try to re-connect now
+      my_impl->connection_monitor( connection_wptr() );
    }
 
    void connection::blk_send_branch() {
@@ -3258,7 +3261,6 @@ namespace eosio {
                my->keepalive_timer->cancel();
          }
 
-         my->done = true;
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
             std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );

From 6b1650a8f6c265e2f07116cfc67692ea0da6516a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 2 Apr 2019 17:06:19 -0400
Subject: [PATCH 0166/1648] Fix infinite connection loop

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 123af89d0f2..f0805782ec5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -939,7 +939,7 @@ namespace eosio {
       g.unlock();
 
       // try to re-connect now
-      my_impl->connection_monitor( connection_wptr() );
+      my_impl->start_conn_timer( std::chrono::milliseconds( 1 ), connection_wptr());
    }
 
    void connection::blk_send_branch() {

From 276d3c9deeaa5a3df9ed38e6441bbc0c2596c67a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 2 Apr 2019 18:35:40 -0400
Subject: [PATCH 0167/1648] Fix for infinite connection retry loop

---
 plugins/net_plugin/net_plugin.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f0805782ec5..86f05d6141d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -317,7 +317,7 @@ namespace eosio {
       void start_monitors();
 
       void expire();
-      void connection_monitor(std::weak_ptr<connection> from_connection);
+      void connection_monitor(std::weak_ptr<connection> from_connection, bool reschedule);
       /** \name Peer Timestamps
        *  Time message handling
        *  @{
@@ -939,7 +939,7 @@ namespace eosio {
       g.unlock();
 
       // try to re-connect now
-      my_impl->start_conn_timer( std::chrono::milliseconds( 1 ), connection_wptr());
+      my_impl->connection_monitor( connection_wptr(), false );
    }
 
    void connection::blk_send_branch() {
@@ -2786,10 +2786,10 @@ namespace eosio {
    // called from any thread
    void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection) {
       std::lock_guard<std::mutex> g( connector_check_timer_mtx );
-      connector_check_timer->expires_from_now( du);
+      connector_check_timer->expires_from_now( du );
       connector_check_timer->async_wait( [this, from_connection](boost::system::error_code ec) {
-            if( !ec) {
-               connection_monitor(from_connection);
+            if( !ec ) {
+               connection_monitor(from_connection, true);
             } else {
                fc_elog( logger, "Error from connection check monitor: ${m}",( "m", ec.message()));
                start_conn_timer( connector_period, std::weak_ptr<connection>());
@@ -2856,7 +2856,7 @@ namespace eosio {
    }
 
    // called from any thread
-   void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {
+   void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection, bool reschedule) {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
@@ -2865,7 +2865,9 @@ namespace eosio {
       if (it == connections.end()) it = connections.begin();
       while (it != connections.end()) {
          if (fc::time_point::now() >= max_time) {
-            start_conn_timer(std::chrono::milliseconds(1), *it); // avoid exhausting
+            if( reschedule ) {
+               start_conn_timer( std::chrono::milliseconds( 1 ), *it ); // avoid exhausting
+            }
             return;
          }
          if( !(*it)->socket_is_open() && !(*it)->connecting) {
@@ -2882,7 +2884,9 @@ namespace eosio {
          ++it;
       }
       g.unlock();
-      start_conn_timer(connector_period, std::weak_ptr<connection>());
+      if( reschedule ) {
+         start_conn_timer( connector_period, std::weak_ptr<connection>());
+      }
    }
 
    // called from application thread

From 3254df88997ac44b2422b44ce9714a42f4860d2a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 2 Apr 2019 20:56:52 -0400
Subject: [PATCH 0168/1648] Pause for 5ms before trying to connect again

---
 plugins/net_plugin/net_plugin.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 86f05d6141d..e1d5aa28c7e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -234,6 +234,7 @@ namespace eosio {
 
       std::mutex                            connector_check_timer_mtx; 
       unique_ptr<boost::asio::steady_timer> connector_check_timer;
+      std::atomic<bool>                     connector_check_canceled{false};
       std::mutex                            expire_timer_mtx;
       unique_ptr<boost::asio::steady_timer> expire_timer;
       std::mutex                            keepalive_timer_mtx;
@@ -312,12 +313,12 @@ namespace eosio {
       void handle_message(const connection_ptr& c, const packed_transaction& msg) = delete; // packed_transaction_ptr overload used instead
       void handle_message(const connection_ptr& c, const packed_transaction_ptr& msg);
 
-      void start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection);
+      void start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection, bool cancel_previous);
       void start_expire_timer();
       void start_monitors();
 
       void expire();
-      void connection_monitor(std::weak_ptr<connection> from_connection, bool reschedule);
+      void connection_monitor(std::weak_ptr<connection> from_connection);
       /** \name Peer Timestamps
        *  Time message handling
        *  @{
@@ -939,7 +940,7 @@ namespace eosio {
       g.unlock();
 
       // try to re-connect now
-      my_impl->connection_monitor( connection_wptr(), false );
+      my_impl->start_conn_timer( std::chrono::milliseconds( 5 ), connection_wptr(), true );
    }
 
    void connection::blk_send_branch() {
@@ -2784,15 +2785,18 @@ namespace eosio {
    }
 
    // called from any thread
-   void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection) {
+   void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection, bool cancel_previous) {
       std::lock_guard<std::mutex> g( connector_check_timer_mtx );
+      connector_check_canceled = cancel_previous;
       connector_check_timer->expires_from_now( du );
       connector_check_timer->async_wait( [this, from_connection](boost::system::error_code ec) {
             if( !ec ) {
-               connection_monitor(from_connection, true);
+               connection_monitor(from_connection);
             } else {
-               fc_elog( logger, "Error from connection check monitor: ${m}",( "m", ec.message()));
-               start_conn_timer( connector_period, std::weak_ptr<connection>());
+               if( connector_check_canceled.exchange( false ) ) {
+                  fc_elog( logger, "Error from connection check monitor: ${m}", ("m", ec.message()));
+                  start_conn_timer( connector_period, std::weak_ptr<connection>(), false );
+               }
             }
       });
    }
@@ -2840,7 +2844,7 @@ namespace eosio {
          std::lock_guard<std::mutex> g( expire_timer_mtx );
          expire_timer.reset( new boost::asio::steady_timer( *server_ioc ) );
       }
-      start_conn_timer(connector_period, std::weak_ptr<connection>());
+      start_conn_timer(connector_period, std::weak_ptr<connection>(), false);
       start_expire_timer();
    }
 
@@ -2856,7 +2860,7 @@ namespace eosio {
    }
 
    // called from any thread
-   void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection, bool reschedule) {
+   void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
@@ -2865,9 +2869,7 @@ namespace eosio {
       if (it == connections.end()) it = connections.begin();
       while (it != connections.end()) {
          if (fc::time_point::now() >= max_time) {
-            if( reschedule ) {
-               start_conn_timer( std::chrono::milliseconds( 1 ), *it ); // avoid exhausting
-            }
+            start_conn_timer( std::chrono::milliseconds( 1 ), *it, false ); // avoid exhausting
             return;
          }
          if( !(*it)->socket_is_open() && !(*it)->connecting) {
@@ -2884,9 +2886,7 @@ namespace eosio {
          ++it;
       }
       g.unlock();
-      if( reschedule ) {
-         start_conn_timer( connector_period, std::weak_ptr<connection>());
-      }
+      start_conn_timer( connector_period, std::weak_ptr<connection>(), false );
    }
 
    // called from application thread

From 241acaa5fc50558d8ffa144192a284697ca2ed5f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 2 Apr 2019 22:11:09 -0400
Subject: [PATCH 0169/1648] Correct bool check

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e1d5aa28c7e..4154a8a2b6b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2793,7 +2793,7 @@ namespace eosio {
             if( !ec ) {
                connection_monitor(from_connection);
             } else {
-               if( connector_check_canceled.exchange( false ) ) {
+               if( !connector_check_canceled.exchange( false ) ) {
                   fc_elog( logger, "Error from connection check monitor: ${m}", ("m", ec.message()));
                   start_conn_timer( connector_period, std::weak_ptr<connection>(), false );
                }

From f939ead6edb43c31c98388a6814370aa0d4122cf Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 3 Apr 2019 10:15:53 -0400
Subject: [PATCH 0170/1648] Fix connection monitor

---
 plugins/net_plugin/net_plugin.cpp | 39 +++++++++++++++++++------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4154a8a2b6b..8c132e3c0bc 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -234,7 +234,7 @@ namespace eosio {
 
       std::mutex                            connector_check_timer_mtx; 
       unique_ptr<boost::asio::steady_timer> connector_check_timer;
-      std::atomic<bool>                     connector_check_canceled{false};
+      int                                   connector_checks_in_flight{-1};
       std::mutex                            expire_timer_mtx;
       unique_ptr<boost::asio::steady_timer> expire_timer;
       std::mutex                            keepalive_timer_mtx;
@@ -313,7 +313,7 @@ namespace eosio {
       void handle_message(const connection_ptr& c, const packed_transaction& msg) = delete; // packed_transaction_ptr overload used instead
       void handle_message(const connection_ptr& c, const packed_transaction_ptr& msg);
 
-      void start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection, bool cancel_previous);
+      void start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection);
       void start_expire_timer();
       void start_monitors();
 
@@ -634,7 +634,7 @@ namespace eosio {
       bool current();
       void close();
    private:
-      static void _close( connection* self ); // for easy capture
+      static void _close( connection* self, bool reconnect ); // for easy capture
    public:
 
       bool resolve_and_connect();
@@ -906,11 +906,11 @@ namespace eosio {
 
    void connection::close() {
       strand.post( [self = shared_from_this()]() {
-         connection::_close( self.get() );
+         connection::_close( self.get(), true );
       });
    }
 
-   void connection::_close( connection* self ) {
+   void connection::_close( connection* self, bool reconnect ) {
       self->socket_open = false;
       boost::system::error_code ec;
       self->socket.shutdown( tcp::socket::shutdown_both, ec );
@@ -939,8 +939,9 @@ namespace eosio {
       self->read_delay_timer.cancel();
       g.unlock();
 
-      // try to re-connect now
-      my_impl->start_conn_timer( std::chrono::milliseconds( 5 ), connection_wptr(), true );
+      if( reconnect ) {
+         my_impl->start_conn_timer( std::chrono::milliseconds( 5 ), connection_wptr() );
+      }
    }
 
    void connection::blk_send_branch() {
@@ -2069,8 +2070,8 @@ namespace eosio {
                }
             } else {
                if( endpoint_itr != tcp::resolver::iterator() ) {
-                  c->close(); // close posts to strand, so also post connect otherwise connect will happen before close
                   c->strand.post( [resolver, c, endpoint_itr]() {
+                     connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
                      c->connect( resolver, endpoint_itr );
                   } );
                } else {
@@ -2785,17 +2786,20 @@ namespace eosio {
    }
 
    // called from any thread
-   void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection, bool cancel_previous) {
+   void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection) {
       std::lock_guard<std::mutex> g( connector_check_timer_mtx );
-      connector_check_canceled = cancel_previous;
+      ++connector_checks_in_flight;
       connector_check_timer->expires_from_now( du );
       connector_check_timer->async_wait( [this, from_connection](boost::system::error_code ec) {
+            std::unique_lock<std::mutex> g( connector_check_timer_mtx );
+            int num_in_flight = --connector_checks_in_flight;
+            g.unlock();
             if( !ec ) {
                connection_monitor(from_connection);
             } else {
-               if( !connector_check_canceled.exchange( false ) ) {
+               if( num_in_flight == 0 ) {
                   fc_elog( logger, "Error from connection check monitor: ${m}", ("m", ec.message()));
-                  start_conn_timer( connector_period, std::weak_ptr<connection>(), false );
+                  start_conn_timer( connector_period, std::weak_ptr<connection>() );
                }
             }
       });
@@ -2844,7 +2848,7 @@ namespace eosio {
          std::lock_guard<std::mutex> g( expire_timer_mtx );
          expire_timer.reset( new boost::asio::steady_timer( *server_ioc ) );
       }
-      start_conn_timer(connector_period, std::weak_ptr<connection>(), false);
+      start_conn_timer(connector_period, std::weak_ptr<connection>());
       start_expire_timer();
    }
 
@@ -2867,9 +2871,13 @@ namespace eosio {
       std::unique_lock<std::shared_timed_mutex> g( connections_mtx );
       auto it = (from ? connections.find(from) : connections.begin());
       if (it == connections.end()) it = connections.begin();
+      size_t num_rm = 0;
       while (it != connections.end()) {
          if (fc::time_point::now() >= max_time) {
-            start_conn_timer( std::chrono::milliseconds( 1 ), *it, false ); // avoid exhausting
+            connection_wptr wit = *it;
+            g.unlock();
+            fc_dlog( logger, "Exiting connection monitor early, ran out of time: ${t}", ("t", max_time - fc::time_point::now()) );
+            start_conn_timer( std::chrono::milliseconds( 1 ), wit ); // avoid exhausting
             return;
          }
          if( !(*it)->socket_is_open() && !(*it)->connecting) {
@@ -2886,7 +2894,8 @@ namespace eosio {
          ++it;
       }
       g.unlock();
-      start_conn_timer( connector_period, std::weak_ptr<connection>(), false );
+      fc_dlog( logger, "connection monitor, removed ${n} connections", ("n", num_rm) );
+      start_conn_timer( connector_period, std::weak_ptr<connection>() );
    }
 
    // called from application thread

From 2af05d70c413306a690cd1a2015fa095b944042a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 3 Apr 2019 12:55:32 -0400
Subject: [PATCH 0171/1648] Fix for too many re-try connections

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8c132e3c0bc..fe0c6e97330 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -234,7 +234,7 @@ namespace eosio {
 
       std::mutex                            connector_check_timer_mtx; 
       unique_ptr<boost::asio::steady_timer> connector_check_timer;
-      int                                   connector_checks_in_flight{-1};
+      int                                   connector_checks_in_flight{0};
       std::mutex                            expire_timer_mtx;
       unique_ptr<boost::asio::steady_timer> expire_timer;
       std::mutex                            keepalive_timer_mtx;

From 93276047dbfe92a8cd783f7f0d6fc90520c827c5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 3 Apr 2019 15:20:39 -0400
Subject: [PATCH 0172/1648] Fix connect race condition

---
 plugins/net_plugin/net_plugin.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index fe0c6e97330..49210bcd6d6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -886,6 +886,7 @@ namespace eosio {
          close();
          return false;
       } else {
+         fc_dlog( logger, "connected to ${peer}", ("peer", peer_name()) );
          socket_open = true;
          start_read_message();
          return true;
@@ -3297,14 +3298,14 @@ namespace eosio {
     *  Used to trigger a new connection from RPC API
     */
    string net_plugin::connect( const string& host ) {
+      std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
       if( my->find_connection( host ) )
          return "already connected";
 
       connection_ptr c = std::make_shared<connection>( host );
-      fc_dlog( logger, "calling active connector" );
+      fc_dlog( logger, "calling active connector: ${h}", ("h", host) );
       if( c->resolve_and_connect() ) {
-         fc_dlog( logger, "adding new connection to the list" );
-         std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
+         fc_dlog( logger, "adding new connection to the list: ${c}", ("c", c->peer_name()) );
          my->connections.insert( c );
       }
       return "added connection";
@@ -3324,6 +3325,7 @@ namespace eosio {
    }
 
    optional<connection_status> net_plugin::status( const string& host )const {
+      std::shared_lock<std::shared_timed_mutex> g( my->connections_mtx );
       auto con = my->find_connection( host );
       if( con )
          return con->get_status();
@@ -3339,8 +3341,9 @@ namespace eosio {
       }
       return result;
    }
-   connection_ptr net_plugin_impl::find_connection(const string& host )const {
-      std::shared_lock<std::shared_timed_mutex> g( connections_mtx );
+
+   // call with connections_mtx
+   connection_ptr net_plugin_impl::find_connection( const string& host )const {
       for( const auto& c : connections )
          if( c->peer_address() == host ) return c;
       return connection_ptr();

From 1f3503312bd308c5925ab99bd64d1c6731d3252f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 3 Apr 2019 18:03:05 -0400
Subject: [PATCH 0173/1648] Update log message to use peer_name

---
 plugins/net_plugin/net_plugin.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 49210bcd6d6..c425819ad4c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1021,13 +1021,13 @@ namespace eosio {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          handshake_initializer::populate( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
-         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}",
-                  ("g", c->last_handshake_sent.generation)( "ep", c->peer_address() )
-                  ( "lib", c->last_handshake_sent.last_irreversible_block_num )
-                  ( "head", c->last_handshake_sent.head_num ) );
-         auto cpy = c->last_handshake_sent;
+         auto last_handshake_sent = c->last_handshake_sent;
          g_conn.unlock();
-         c->enqueue( cpy );
+         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}",
+                  ("g", last_handshake_sent.generation)( "ep", c->peer_name() )
+                  ( "lib", last_handshake_sent.last_irreversible_block_num )
+                  ( "head", last_handshake_sent.head_num ) );
+         c->enqueue( last_handshake_sent );
       });
    }
 

From d1ea5f59951074a520c326ddfa7ec3a01a300060 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 3 Apr 2019 22:47:00 -0400
Subject: [PATCH 0174/1648] Send handshakes on go_away

---
 plugins/net_plugin/net_plugin.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c425819ad4c..d7a5fc9a537 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -157,10 +157,10 @@ namespace eosio {
       void request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn = connection_ptr() );
       void start_sync( const connection_ptr& c, uint32_t target );
       void verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
-      static void send_handshakes();
 
    public:
       explicit sync_manager( uint32_t span );
+      static void send_handshakes();
       bool syncing_with_peer() const { return sync_state == lib_catchup; }
       void sync_reset_lib_num( const connection_ptr& conn );
       void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
@@ -1353,7 +1353,7 @@ namespace eosio {
 
       if( fork_head_block_num < sync_last_requested_num && sync_source && sync_source->current() ) {
          fc_ilog( logger, "ignoring request, head is ${h} last req = ${r} source is ${p}",
-                  ("h", fork_head_block_num)( "r", sync_last_requested_num )( "p", sync_source->peer_address() ) );
+                  ("h", fork_head_block_num)( "r", sync_last_requested_num )( "p", sync_source->peer_name() ) );
          return;
       }
 
@@ -2413,7 +2413,7 @@ namespace eosio {
          if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
             g_conn.unlock();
             fc_dlog(logger, "checking for duplicate" );
-            std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+            std::shared_lock<std::shared_timed_mutex> g_cnts( my_impl->connections_mtx );
             for(const auto& check : connections) {
                if(check == c)
                   continue;
@@ -2431,11 +2431,13 @@ namespace eosio {
                   if (msg.time + c_time <= check_time)
                      continue;
 
+                  g_cnts.unlock();
                   fc_dlog( logger, "sending go_away duplicate to ${ep}", ("ep",msg.p2p_address) );
                   go_away_message gam(duplicate);
                   gam.node_id = node_id;
                   c->enqueue(gam);
                   c->no_retry = duplicate;
+                  sync_master->send_handshakes();
                   return;
                }
             }

From 5a998094fb9db1a3efc26c2fb3b0615b3d57b7f0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 4 Apr 2019 09:01:28 -0400
Subject: [PATCH 0175/1648] Fix spin on running connection monitor

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d7a5fc9a537..2308b3e6539 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -318,7 +318,7 @@ namespace eosio {
       void start_monitors();
 
       void expire();
-      void connection_monitor(std::weak_ptr<connection> from_connection);
+      void connection_monitor(std::weak_ptr<connection> from_connection, bool reschedule);
       /** \name Peer Timestamps
        *  Time message handling
        *  @{
@@ -2798,7 +2798,7 @@ namespace eosio {
             int num_in_flight = --connector_checks_in_flight;
             g.unlock();
             if( !ec ) {
-               connection_monitor(from_connection);
+               connection_monitor(from_connection, num_in_flight == 0 );
             } else {
                if( num_in_flight == 0 ) {
                   fc_elog( logger, "Error from connection check monitor: ${m}", ("m", ec.message()));
@@ -2867,7 +2867,7 @@ namespace eosio {
    }
 
    // called from any thread
-   void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection) {
+   void net_plugin_impl::connection_monitor(std::weak_ptr<connection> from_connection, bool reschedule ) {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
@@ -2880,7 +2880,9 @@ namespace eosio {
             connection_wptr wit = *it;
             g.unlock();
             fc_dlog( logger, "Exiting connection monitor early, ran out of time: ${t}", ("t", max_time - fc::time_point::now()) );
-            start_conn_timer( std::chrono::milliseconds( 1 ), wit ); // avoid exhausting
+            if( reschedule ) {
+               start_conn_timer( std::chrono::milliseconds( 1 ), wit ); // avoid exhausting
+            }
             return;
          }
          if( !(*it)->socket_is_open() && !(*it)->connecting) {
@@ -2898,7 +2900,9 @@ namespace eosio {
       }
       g.unlock();
       fc_dlog( logger, "connection monitor, removed ${n} connections", ("n", num_rm) );
-      start_conn_timer( connector_period, std::weak_ptr<connection>() );
+      if( reschedule ) {
+         start_conn_timer( connector_period, std::weak_ptr<connection>());
+      }
    }
 
    // called from application thread

From 8b5271e9e4b091a24236920b413f8856d1c04965 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 4 Apr 2019 11:03:01 -0400
Subject: [PATCH 0176/1648] Fix spam of reconnect

---
 plugins/net_plugin/net_plugin.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2308b3e6539..b8995edca72 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -632,7 +632,7 @@ namespace eosio {
 
       bool connected();
       bool current();
-      void close();
+      void close( bool reconnect = false );
    private:
       static void _close( connection* self, bool reconnect ); // for easy capture
    public:
@@ -905,9 +905,9 @@ namespace eosio {
       buffer_queue.clear_write_queue();
    }
 
-   void connection::close() {
-      strand.post( [self = shared_from_this()]() {
-         connection::_close( self.get(), true );
+   void connection::close( bool reconnect ) {
+      strand.post( [self = shared_from_this(), reconnect]() {
+         connection::_close( self.get(), reconnect );
       });
    }
 
@@ -2078,7 +2078,7 @@ namespace eosio {
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->connecting = false;
-                  c->close();
+                  c->close( false );
                }
             }
       } ) );

From 518a23d7b06f3e52d4ea416e45897206cd191c92 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 4 Apr 2019 15:23:45 -0400
Subject: [PATCH 0177/1648] Removed deprecated operating systems

---
 .buildkite/long_running_tests.yml | 118 +-------------
 .buildkite/pipeline.yml           | 262 ++++--------------------------
 2 files changed, 33 insertions(+), 347 deletions(-)

diff --git a/.buildkite/long_running_tests.yml b/.buildkite/long_running_tests.yml
index dd0d6cbee9d..c242d219b0e 100644
--- a/.buildkite/long_running_tests.yml
+++ b/.buildkite/long_running_tests.yml
@@ -1,6 +1,5 @@
 steps:
-
-  - command: |
+  - command: | # Ubuntu 16.04 Build
         echo "+++ :hammer: Building"
         ./scripts/eosio_build.sh -y
         echo "--- :compression: Compressing build directory"
@@ -21,7 +20,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
+  - command: | # Ubuntu 18.04 Build
         echo "+++ :hammer: Building"
         ./scripts/eosio_build.sh -y
         echo "--- :compression: Compressing build directory"
@@ -42,7 +41,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
+  - command: | # CentOS 7 Build
         echo "+++ :hammer: Building"
         ./scripts/eosio_build.sh -y
         echo "--- :compression: Compressing build directory"
@@ -63,28 +62,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build/
-    label: ":aws: 1 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-2"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
+  - command: | # Amazon Linux 2 Build
         echo "+++ :hammer: Building"
         ./scripts/eosio_build.sh -y
         echo "--- :compression: Compressing build directory"
@@ -105,28 +83,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build/
-    label: ":fedora: 27 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
+  - command: | # macOS Mojave Build
       echo "--- Creating symbolic link to job directory :file_folder:"
       sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job
       echo "+++ Building :hammer:"
@@ -140,20 +97,6 @@ steps:
     artifact_paths: "build.tar.gz"
     timeout: 60
 
-  - command: |
-      echo "--- Creating symbolic link to job directory :file_folder:"
-      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job
-      echo "+++ Building :hammer:"
-      ./scripts/eosio_build.sh -y
-      echo "--- Compressing build directory :compression:"
-      tar -pczf build.tar.gz build/
-    label: ":darwin: High Sierra Build"
-    agents:
-      - "role=builder-v2-1"
-      - "os=high-sierra"
-    artifact_paths: "build.tar.gz"
-    timeout: 60
-
   - wait
 
   - command: | # Ubuntu 16.04 Tests
@@ -216,26 +159,6 @@ steps:
         workdir: /data/job
     timeout: 90
 
-  - command: | # Amazon AWS-1 Linux Tests
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build"
-        echo "+++ :microscope: Running LR Tests"
-        ./scripts/long-running-test.sh
-    label: ":aws: 1 LR Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-2"
-        workdir: /data/job
-    timeout: 90
-
   - command: | # Amazon AWS-2 Linux Tests
         echo "--- :arrow_down: Downloading Build Directory"
         buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
@@ -256,37 +179,6 @@ steps:
         workdir: /data/job
     timeout: 90
 
-  - command: | # Fedora Tests
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build"
-        echo "+++ :microscope: Running LR Tests"
-        ./scripts/long-running-test.sh
-    label: ":fedora: 27 LR Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
-        workdir: /data/job
-    timeout: 90
-
-  - command: | # High Sierra Tests
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build"
-        echo "+++ :microscope: Running LR Tests"
-        ln -s "$(pwd)" /data/job && ./scripts/long-running-test.sh
-    label: ":darwin: High Sierra LR Tests"
-    agents:
-      - "role=tester-v2-1"
-      - "os=high-sierra"
-    timeout: 90
-
   - command: | # Mojave Tests
         echo "--- :arrow_down: Downloading Build Directory"
         buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f83249df044..19bbdf114ff 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,6 +1,5 @@
 steps:
-
-  - command: |
+  - command: | # Ubuntu 16.04 Build
         echo "+++ :hammer: Building"
         ./scripts/eosio_build.sh -y
         echo "--- :compression: Compressing build directory"
@@ -21,7 +20,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
+  - command: | # Ubuntu 18.04 Build
         echo "+++ :hammer: Building"
         ./scripts/eosio_build.sh -y
         echo "--- :compression: Compressing build directory"
@@ -42,7 +41,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
+  - command: | # CentOS 7 Build
         echo "+++ :hammer: Building"
         ./scripts/eosio_build.sh -y
         echo "--- :compression: Compressing build directory"
@@ -63,28 +62,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build/
-    label: ":aws: 1 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-2"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
+  - command: | # Amazon Linux 2 Build
         echo "+++ :hammer: Building"
         ./scripts/eosio_build.sh -y
         echo "--- :compression: Compressing build directory"
@@ -105,28 +83,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build/
-    label: ":fedora: 27 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
+  - command: | # macOS Mojave Build
       echo "--- Creating symbolic link to job directory :file_folder:"
       sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job
       echo "+++ Building :hammer:"
@@ -140,20 +97,6 @@ steps:
     artifact_paths: "build.tar.gz"
     timeout: 60
 
-  - command: |
-      echo "--- Creating symbolic link to job directory :file_folder:"
-      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job
-      echo "+++ Building :hammer:"
-      ./scripts/eosio_build.sh -y
-      echo "--- Compressing build directory :compression:"
-      tar -pczf build.tar.gz build/
-    label: ":darwin: High Sierra Build"
-    agents:
-      - "role=builder-v2-1"
-      - "os=high-sierra"
-    artifact_paths: "build.tar.gz"
-    timeout: 60
-
   - wait
 
   # Ubuntu 16.04 Tests
@@ -279,47 +222,6 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # Amazon AWS-1 Linux Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/parallel-test.sh
-    label: ":aws: 1 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-2"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/serial-test.sh
-    label: ":aws: 1 NP Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-2"
-        workdir: /data/job
-    timeout: 60
-
   # Amazon AWS-2 Linux Tests
   - command: |
         echo "--- :arrow_down: Downloading Build Directory"
@@ -361,71 +263,6 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # Fedora Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/parallel-test.sh
-    label: ":fedora: 27 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/serial-test.sh
-    label: ":fedora: 27 NP Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
-        workdir: /data/job
-    timeout: 60
-
-  # High Sierra Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build"
-        echo "+++ :microscope: Running Tests"
-        ln -s "$(pwd)" /data/job
-        ./scripts/parallel-test.sh
-    label: ":darwin: High Sierra Tests"
-    agents:
-      - "role=tester-v2-1"
-      - "os=high-sierra"
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build"
-        echo "+++ :microscope: Running Tests"
-        ln -s "$(pwd)" /data/job && ./scripts/serial-test.sh
-    label: ":darwin: High Sierra NP Tests"
-    agents:
-      - "role=tester-v2-1"
-      - "os=high-sierra"
-    timeout: 60
-
   # Mojave Tests
   - command: |
         echo "--- :arrow_down: Downloading Build Directory"
@@ -452,37 +289,7 @@ steps:
     
   - wait
 
-  - command: |
-        echo "--- :arrow_down: Downloading build directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        ln -s "$(pwd)" /data/job && cd /data/job/build/packages && bash generate_package.sh brew
-    label: ":darwin: High Sierra Package Builder"
-    agents:
-      - "role=builder-v2-1"
-      - "os=high-sierra"
-    artifact_paths:
-      - "build/packages/*.tar.gz"
-      - "build/packages/*.rb"
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading build directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        ln -s "$(pwd)" /data/job && cd /data/job/build/packages && bash generate_package.sh brew
-    label: ":darwin: Mojave Package Builder"
-    agents:
-      - "role=builder-v2-1"
-      - "os=mojave"
-    artifact_paths:
-      - "build/packages/*.tar.gz"
-      - "build/packages/*.rb"
-    timeout: 60
-
-  - command: |
+  - command: | # Ubuntu 16.04 Package Builder
         echo "--- :arrow_down: Downloading build directory"
         buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build"
         tar -zxf build.tar.gz
@@ -508,7 +315,7 @@ steps:
       PKGTYPE: "deb"
     timeout: 60
 
-  - command: |
+  - command: | # Ubuntu 18.04 Package Builder
         echo "--- :arrow_down: Downloading build directory"
         buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build"
         tar -zxf build.tar.gz
@@ -534,9 +341,9 @@ steps:
       PKGTYPE: "deb"
     timeout: 60
 
-  - command: |
+  - command: | # CentOS 7 Package Builder
         echo "--- :arrow_down: Downloading build directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build"
+        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build"
         tar -zxf build.tar.gz
         echo "+++ :microscope: Starting package build"
         yum install -y rpm-build
@@ -547,7 +354,7 @@ steps:
         mkdir -p /root/rpmbuild/SPECS
         mkdir -p /root/rpmbuild/SRPMS
         cd /data/job/build/packages && bash generate_package.sh rpm
-    label: ":fedora: 27 Package builder"
+    label: ":centos: 7 Package builder"
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths:
@@ -560,57 +367,44 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
         workdir: /data/job
     env:
-      OS: "fc27"
+      OS: "el7"
       PKGTYPE: "rpm"
     timeout: 60
 
-  - command: |
+  - command: | # macOS Mojave Package Builder
         echo "--- :arrow_down: Downloading build directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
         tar -zxf build.tar.gz
         echo "+++ :microscope: Starting package build"
-        yum install -y rpm-build
-        mkdir -p /root/rpmbuild/BUILD
-        mkdir -p /root/rpmbuild/BUILDROOT
-        mkdir -p /root/rpmbuild/RPMS
-        mkdir -p /root/rpmbuild/SOURCES
-        mkdir -p /root/rpmbuild/SPECS
-        mkdir -p /root/rpmbuild/SRPMS
-        cd /data/job/build/packages && bash generate_package.sh rpm
-    label: ":centos: 7 Package builder"
+        ln -s "$(pwd)" /data/job && cd /data/job/build/packages && bash generate_package.sh brew
+    label: ":darwin: Mojave Package Builder"
     agents:
-      queue: "automation-large-builder-fleet"
+      - "role=builder-v2-1"
+      - "os=mojave"
     artifact_paths:
-      - "build/packages/*.rpm"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
-        workdir: /data/job
-    env:
-      OS: "el7"
-      PKGTYPE: "rpm"
+      - "build/packages/*.tar.gz"
+      - "build/packages/*.rb"
     timeout: 60
 
   - wait
 
   - command: |
         echo "--- :arrow_down: Downloading brew files"
-        buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: High Sierra Package Builder"
-        mv build/packages/eosio.rb build/packages/eosio_highsierra.rb
         buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
     label: ":darwin: Brew Updater"
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths:
-      - "build/packages/eosio_highsierra.rb"
       - "build/packages/eosio.rb"
     timeout: 60
+
+  - command: |
+        echo "+++ :microscope: Running git submodule regression check" && \
+        ./scripts/submodule_check.sh
+    label: "Git submodule regression check"
+    agents:
+      queue: "automation-large-builder-fleet"
+    timeout: 240

From 4e6aef547f46ba6218e36d81476f7226ab25e7ff Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 4 Apr 2019 18:44:40 -0400
Subject: [PATCH 0178/1648] Add expiration and block time to expired
 transaction exception log message

---
 plugins/producer_plugin/producer_plugin.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 6f81308aa83..eaef3336a42 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -407,7 +407,10 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
          const auto& id = trx->id;
          if( fc::time_point(trx->packed_trx->expiration()) < block_time ) {
-            send_response(std::static_pointer_cast<fc::exception>(std::make_shared<expired_tx_exception>(FC_LOG_MESSAGE(error, "expired transaction ${id}", ("id", id)) )));
+            send_response(std::static_pointer_cast<fc::exception>(
+                  std::make_shared<expired_tx_exception>(
+                        FC_LOG_MESSAGE(error, "expired transaction ${id}, expiration ${e}, block time ${bt}",
+                                       ("id", id)("e", trx->packed_trx->expiration())("bt", block_time)) )));
             return;
          }
 

From b3905db26e9c7392773b4408be0c0d18518bc5aa Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 4 Apr 2019 20:21:11 -0400
Subject: [PATCH 0179/1648] Do not broadcast blocks when blk branch sync

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b8995edca72..6f9a319b4de 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -984,7 +984,8 @@ namespace eosio {
       enqueue_sync_block();
 
       // still want to send transactions along during blk branch sync
-      syncing = false;
+      // todo: need diff variable for tranasaction sending
+      // todo: syncing = false;
    }
 
    void connection::blk_send( const block_id_type& blkid ) {

From 95d08ca0e9c2a7445fd4dc703e9f11cc7ecad65a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 5 Apr 2019 19:53:30 -0400
Subject: [PATCH 0180/1648] Increase the timeout for
 nodeos_startup_catchup_lr_test from default of 1500 to 3000 seconds

---
 tests/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f2e6958eb15..d57f4d9d81b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -103,6 +103,7 @@ add_test(NAME nodeos_under_min_avail_ram_lr_test COMMAND tests/nodeos_under_min_
 set_property(TEST nodeos_under_min_avail_ram_lr_test PROPERTY LABELS long_running_tests)
 
 add_test(NAME nodeos_startup_catchup_lr_test COMMAND tests/nodeos_startup_catchup.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_tests_properties(nodeos_startup_catchup_lr_test PROPERTIES TIMEOUT 3000)
 set_property(TEST nodeos_startup_catchup_lr_test PROPERTY LABELS long_running_tests)
 
 if(ENABLE_COVERAGE_TESTING)

From f3a38bb8cceef108e4bfde08c9a8893c7e3d2f48 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Sun, 7 Apr 2019 00:00:42 -0500
Subject: [PATCH 0181/1648] Protect net_plugin_impl until net_plugin jobs all
 finished

---
 .../include/eosio/net_plugin/net_plugin.hpp       |  2 +-
 plugins/net_plugin/net_plugin.cpp                 | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
index 3bc594dd313..0fe35dd4277 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
@@ -39,7 +39,7 @@ namespace eosio {
         vector<connection_status>    connections()const;
 
       private:
-        std::unique_ptr<class net_plugin_impl> my;
+        std::shared_ptr<class net_plugin_impl> my;
    };
 
 }
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d60fca3b5e7..2be31bf4caf 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3257,20 +3257,6 @@ namespace eosio {
    void net_plugin::plugin_shutdown() {
       try {
          fc_ilog( logger, "shutdown.." );
-         {
-            std::lock_guard<std::mutex> g( my->connector_check_timer_mtx );
-            if( my->connector_check_timer )
-               my->connector_check_timer->cancel();
-         }{
-            std::lock_guard<std::mutex> g( my->expire_timer_mtx );
-            if( my->expire_timer )
-               my->expire_timer->cancel();
-         }{
-            std::lock_guard<std::mutex> g( my->keepalive_timer_mtx );
-            if( my->keepalive_timer )
-               my->keepalive_timer->cancel();
-         }
-
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
             std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
@@ -3284,6 +3270,7 @@ namespace eosio {
          if( my->thread_pool ) {
             my->thread_pool->stop();
          }
+         app().post( 0, [me = my](){} ); // keep my pointer alive until queue is drained
          fc_ilog( logger, "exit shutdown" );
       }
       FC_CAPTURE_AND_RETHROW()

From bc9bce6da3dcd4231a1e988985c46df5e751c4b0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 8 Apr 2019 08:43:36 -0500
Subject: [PATCH 0182/1648] nodeos can take a considerable amount of time to
 shutdown if busy

---
 tests/Node.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Node.py b/tests/Node.py
index 3e31c396d5f..abbb11e48b6 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1243,7 +1243,7 @@ def myFunc():
         self.killed=True
         return True
 
-    def interruptAndVerifyExitStatus(self, timeout=15):
+    def interruptAndVerifyExitStatus(self, timeout=60):
         if Utils.Debug: Utils.Print("terminating node: %s" % (self.cmd))
         assert self.popenProc is not None, "node: \"%s\" does not have a popenProc, this may be because it is only set after a relaunch." % (self.cmd)
         self.popenProc.send_signal(signal.SIGINT)

From 243f0b6f90ee94230abbc6e82a94a3d85f3d36f8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 8 Apr 2019 14:57:11 -0500
Subject: [PATCH 0183/1648] Safely shutdown timers

---
 plugins/net_plugin/net_plugin.cpp | 48 ++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2be31bf4caf..3e99bfee1be 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -203,7 +203,7 @@ namespace eosio {
       void expire_txns( uint32_t lib_num );
    };
 
-   class net_plugin_impl {
+   class net_plugin_impl : public std::enable_shared_from_this<net_plugin_impl> {
    public:
       unique_ptr<tcp::acceptor>        acceptor;
       tcp::endpoint                    listen_endpoint;
@@ -246,6 +246,7 @@ namespace eosio {
       boost::asio::steady_timer::duration   resp_expected_period;
       boost::asio::steady_timer::duration   keepalive_interval{std::chrono::seconds{32}};
       int                                   max_cleanup_time_ms = 0;
+      std::atomic<bool>                     in_shutdown{false};
 
       const std::chrono::system_clock::duration peer_authentication_interval{std::chrono::seconds{1}}; ///< Peer clock may be no more than 1 second skewed from our clock, including network latency.
 
@@ -2791,19 +2792,21 @@ namespace eosio {
 
    // called from any thread
    void net_plugin_impl::start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection) {
+      if( in_shutdown ) return;
       std::lock_guard<std::mutex> g( connector_check_timer_mtx );
       ++connector_checks_in_flight;
       connector_check_timer->expires_from_now( du );
-      connector_check_timer->async_wait( [this, from_connection](boost::system::error_code ec) {
-            std::unique_lock<std::mutex> g( connector_check_timer_mtx );
-            int num_in_flight = --connector_checks_in_flight;
+      connector_check_timer->async_wait( [my = shared_from_this(), from_connection](boost::system::error_code ec) {
+            std::unique_lock<std::mutex> g( my->connector_check_timer_mtx );
+            int num_in_flight = --my->connector_checks_in_flight;
             g.unlock();
             if( !ec ) {
-               connection_monitor(from_connection, num_in_flight == 0 );
+               my->connection_monitor(from_connection, num_in_flight == 0 );
             } else {
                if( num_in_flight == 0 ) {
+                  if( my->in_shutdown ) return;
                   fc_elog( logger, "Error from connection check monitor: ${m}", ("m", ec.message()));
-                  start_conn_timer( connector_period, std::weak_ptr<connection>() );
+                  my->start_conn_timer( my->connector_period, std::weak_ptr<connection>() );
                }
             }
       });
@@ -2811,29 +2814,33 @@ namespace eosio {
 
    // thread safe
    void net_plugin_impl::start_expire_timer() {
+      if( in_shutdown ) return;
       std::lock_guard<std::mutex> g( expire_timer_mtx );
       expire_timer->expires_from_now( txn_exp_period);
-      expire_timer->async_wait( [this]( boost::system::error_code ec ) {
+      expire_timer->async_wait( [my = shared_from_this()]( boost::system::error_code ec ) {
          if( !ec ) {
-            expire();
+            my->expire();
          } else {
+            if( my->in_shutdown ) return;
             fc_elog( logger, "Error from transaction check monitor: ${m}", ("m", ec.message()) );
-            start_expire_timer();
+            my->start_expire_timer();
          }
       } );
    }
 
    // thread safe
    void net_plugin_impl::ticker() {
+      if( in_shutdown ) return;
       std::lock_guard<std::mutex> g( keepalive_timer_mtx );
       keepalive_timer->expires_from_now(keepalive_interval);
-      keepalive_timer->async_wait( [this]( boost::system::error_code ec ) {
-            ticker();
+      keepalive_timer->async_wait( [my = shared_from_this()]( boost::system::error_code ec ) {
+            my->ticker();
             if( ec ) {
+               if( my->in_shutdown ) return;
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
-            std::shared_lock<std::shared_timed_mutex> g( connections_mtx );
-            for( auto& c : connections ) {
+            std::shared_lock<std::shared_timed_mutex> g( my->connections_mtx );
+            for( auto& c : my->connections ) {
                if( c->socket_is_open() ) {
                   c->strand.post( [c]() {
                      c->send_time();
@@ -3257,6 +3264,21 @@ namespace eosio {
    void net_plugin::plugin_shutdown() {
       try {
          fc_ilog( logger, "shutdown.." );
+         my->in_shutdown = true;
+         {
+            std::lock_guard<std::mutex> g( my->connector_check_timer_mtx );
+            if( my->connector_check_timer )
+               my->connector_check_timer->cancel();
+         }{
+            std::lock_guard<std::mutex> g( my->expire_timer_mtx );
+            if( my->expire_timer )
+               my->expire_timer->cancel();
+         }{
+            std::lock_guard<std::mutex> g( my->keepalive_timer_mtx );
+            if( my->keepalive_timer )
+               my->keepalive_timer->cancel();
+         }
+
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
             std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );

From af2fa989cecab29aad5e4897b64472ad686b57ef Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 9 Apr 2019 12:21:43 -0500
Subject: [PATCH 0184/1648] Don't always immediately try and reconnect. Do not
 close connection on first rejected block.

---
 plugins/net_plugin/net_plugin.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3e99bfee1be..47663d458c5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -402,6 +402,7 @@ namespace eosio {
    constexpr boost::asio::chrono::milliseconds def_read_delay_for_full_write_queue{100};
    constexpr auto     def_max_reads_in_flight = 1000;
    constexpr auto     def_max_trx_in_progress_size = 100*1024*1024; // 100 MB
+   constexpr auto     def_max_consecutive_rejected_blocks = 3; // num of rejected blocks before disconnect
    constexpr auto     def_max_clients = 25; // 0 for unlimited clients
    constexpr auto     def_max_nodes_per_host = 1;
    constexpr auto     def_conn_retry_wait = 30;
@@ -591,6 +592,7 @@ namespace eosio {
       std::atomic<bool>       connecting{false};
       std::atomic<bool>       syncing{false};
       uint16_t                protocol_version  = 0;
+      uint16_t                consecutive_rejected_blocks = 0;
    private:
       const string            peer_addr;
       string                  remote_endpoint_ip;     // not updated after start
@@ -633,7 +635,7 @@ namespace eosio {
 
       bool connected();
       bool current();
-      void close( bool reconnect = false );
+      void close( bool reconnect = true );
    private:
       static void _close( connection* self, bool reconnect ); // for easy capture
    public:
@@ -920,7 +922,7 @@ namespace eosio {
       self->flush_queues();
       self->connecting = false;
       self->syncing = false;
-
+      self->consecutive_rejected_blocks = 0;
       std::unique_lock<std::mutex> g_conn( self->conn_mtx );
       bool has_last_req = !!self->last_req;
       g_conn.unlock();
@@ -1635,19 +1637,22 @@ namespace eosio {
    void sync_manager::rejected_block( const connection_ptr& c, uint32_t blk_num ) {
       std::unique_lock<std::mutex> g( sync_mtx );
       if( sync_state != in_sync ) {
-         fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn",blk_num)("p",c->peer_address()) );
-         sync_last_requested_num = 0;
-         sync_source.reset();
-         //todo: set_state( in_sync );
-         g.unlock();
-         c->close();
-         send_handshakes();
+         if( ++c->consecutive_rejected_blocks > def_max_consecutive_rejected_blocks ) {
+            fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn", blk_num)( "p", c->peer_name() ) );
+            sync_last_requested_num = 0;
+            sync_source.reset();
+            //todo: set_state( in_sync );
+            g.unlock();
+            c->close();
+            send_handshakes();
+         }
       }
    }
 
    // called from connection strand
    void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
       fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_name() ) );
+      c->consecutive_rejected_blocks = 0;
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       stages state = sync_state;
       fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
@@ -3284,7 +3289,7 @@ namespace eosio {
             std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
-               con->close();
+               con->close( false );
             }
             my->connections.clear();
          }

From 217ae1d5d27cb3d70815dd4a537c5d7dd8a15992 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Apr 2019 12:19:20 -0500
Subject: [PATCH 0185/1648] Update to fc with longer application lifetime

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index b6b55f5ff99..641a420d9c8 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit b6b55f5ff993f4be954d2aa556538636fbdaabb4
+Subproject commit 641a420d9c86984d132a1f31f7cd0022ecc370b3

From e2a3f8b5a434d800f0935c507cc321b42d984564 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Apr 2019 13:01:38 -0500
Subject: [PATCH 0186/1648] Temporarly disable gelf logging

---
 programs/eosio-launcher/main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index 7e6bfbaf7b3..08ab8c44fc2 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -1196,12 +1196,12 @@ launcher_def::write_logging_config_file(tn_node_def &node) {
 
   auto log_config = fc::logging_config::default_config();
   if(gelf_enabled) {
-    log_config.appenders.push_back(
-          fc::appender_config( "net", "gelf",
-              fc::mutable_variant_object()
-                  ( "endpoint", node.gelf_endpoint )
-                  ( "host", instance.name )
-             ) );
+//    log_config.appenders.push_back(
+//          fc::appender_config( "net", "gelf",
+//              fc::mutable_variant_object()
+//                  ( "endpoint", node.gelf_endpoint )
+//                  ( "host", instance.name )
+//             ) );
     log_config.loggers.front().appenders.push_back("net");
     fc::logger_config p2p ("net_plugin_impl");
     p2p.level=fc::log_level::debug;

From c7805f9293ddf4ae4b3020c762d40af5ed08ec83 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Apr 2019 13:32:16 -0500
Subject: [PATCH 0187/1648] Temporarily disable gelf logging

---
 programs/eosio-launcher/main.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index 08ab8c44fc2..ca704d73b48 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -1195,13 +1195,14 @@ launcher_def::write_logging_config_file(tn_node_def &node) {
   }
 
   auto log_config = fc::logging_config::default_config();
+  gelf_enabled = false; // todo remove this
   if(gelf_enabled) {
-//    log_config.appenders.push_back(
-//          fc::appender_config( "net", "gelf",
-//              fc::mutable_variant_object()
-//                  ( "endpoint", node.gelf_endpoint )
-//                  ( "host", instance.name )
-//             ) );
+    log_config.appenders.push_back(
+          fc::appender_config( "net", "gelf",
+              fc::mutable_variant_object()
+                  ( "endpoint", node.gelf_endpoint )
+                  ( "host", instance.name )
+             ) );
     log_config.loggers.front().appenders.push_back("net");
     fc::logger_config p2p ("net_plugin_impl");
     p2p.level=fc::log_level::debug;

From a6b56d2c0d0beefe18c53253e2e0fbfb525b8445 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Apr 2019 15:20:40 -0500
Subject: [PATCH 0188/1648] Cleaner shutdown of thread pool

---
 libraries/chain/thread_utils.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/chain/thread_utils.cpp b/libraries/chain/thread_utils.cpp
index 1d8a2707c14..83bf249326b 100644
--- a/libraries/chain/thread_utils.cpp
+++ b/libraries/chain/thread_utils.cpp
@@ -26,11 +26,9 @@ named_thread_pool::named_thread_pool( std::string name_prefix, size_t num_thread
 }
 
 named_thread_pool::~named_thread_pool() {
-   stop();
 }
 
 void named_thread_pool::stop() {
-   _ioc_work.reset();
    _ioc.stop();
    _thread_pool.join();
    _thread_pool.stop();

From 0d181ae368e2efe0126d4926db393bcfb39e0482 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Apr 2019 16:24:31 -0500
Subject: [PATCH 0189/1648] re-enable gelf logging

---
 programs/eosio-launcher/main.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index ca704d73b48..7e6bfbaf7b3 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -1195,7 +1195,6 @@ launcher_def::write_logging_config_file(tn_node_def &node) {
   }
 
   auto log_config = fc::logging_config::default_config();
-  gelf_enabled = false; // todo remove this
   if(gelf_enabled) {
     log_config.appenders.push_back(
           fc::appender_config( "net", "gelf",

From 0b98f71d6f40088bb52c8393797a2885a93fe9b4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Apr 2019 20:54:51 -0500
Subject: [PATCH 0190/1648] Restore destructor call to stop and ioc_worker
 reset. Call stop() before join().

---
 libraries/chain/thread_utils.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/thread_utils.cpp b/libraries/chain/thread_utils.cpp
index 83bf249326b..c17d8cde3e7 100644
--- a/libraries/chain/thread_utils.cpp
+++ b/libraries/chain/thread_utils.cpp
@@ -26,12 +26,14 @@ named_thread_pool::named_thread_pool( std::string name_prefix, size_t num_thread
 }
 
 named_thread_pool::~named_thread_pool() {
+   stop();
 }
 
 void named_thread_pool::stop() {
+   _ioc_work.reset();
    _ioc.stop();
-   _thread_pool.join();
    _thread_pool.stop();
+   _thread_pool.join();
 }
 
 

From e93fff5938d959f99bef30da1ac6afb3983bf5d7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Apr 2019 20:55:28 -0500
Subject: [PATCH 0191/1648] Add close of acceptor and explicit reset of
 thread_pool

---
 plugins/net_plugin/net_plugin.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 47663d458c5..6b4579f498a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3284,6 +3284,11 @@ namespace eosio {
                my->keepalive_timer->cancel();
          }
 
+         if( my->acceptor ) {
+            boost::system::error_code ec;
+            my->acceptor->close( ec );
+         }
+
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
             std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
@@ -3296,6 +3301,7 @@ namespace eosio {
 
          if( my->thread_pool ) {
             my->thread_pool->stop();
+            my->thread_pool.reset();
          }
          app().post( 0, [me = my](){} ); // keep my pointer alive until queue is drained
          fc_ilog( logger, "exit shutdown" );

From fe9168764b0508dd735a13c2d86b79019ec6e301 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Apr 2019 07:16:02 -0500
Subject: [PATCH 0192/1648] Revert appbase to master

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index 641a420d9c8..b6b55f5ff99 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit 641a420d9c86984d132a1f31f7cd0022ecc370b3
+Subproject commit b6b55f5ff993f4be954d2aa556538636fbdaabb4

From 9386e813fd3ae44fe741b6c9face89c127753e76 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Apr 2019 09:42:46 -0500
Subject: [PATCH 0193/1648] Code cleanup. Indicate thread safety of
 net_plugin_impl attributes.

---
 plugins/net_plugin/net_plugin.cpp | 413 +++++++++++++++---------------
 1 file changed, 212 insertions(+), 201 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6b4579f498a..8b0a500c3ca 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -206,56 +206,70 @@ namespace eosio {
    class net_plugin_impl : public std::enable_shared_from_this<net_plugin_impl> {
    public:
       unique_ptr<tcp::acceptor>        acceptor;
-      tcp::endpoint                    listen_endpoint;
-      string                           p2p_address;
-      string                           p2p_server_address;
-      uint32_t                         max_client_count = 0;
-      uint32_t                         max_nodes_per_host = 1;
       std::atomic<uint32_t>            current_connection_id{0};
 
-      vector<string>                   supplied_peers;
-      vector<chain::public_key_type>   allowed_peers; ///< peer keys allowed to connect
-      std::map<chain::public_key_type,
-               chain::private_key_type> private_keys; ///< overlapping with producer keys, also authenticating non-producing nodes
-                                                      // thread safe, only updated in plugin initialize
+      unique_ptr< sync_manager >       sync_master;
+      unique_ptr< dispatch_manager >   dispatcher;
+
+      /**
+       * Thread safe, only updated in plugin initialize
+       *  @{
+       */
+      string                                p2p_address;
+      string                                p2p_server_address;
 
+      vector<string>                        supplied_peers;
+      vector<chain::public_key_type>        allowed_peers; ///< peer keys allowed to connect
+      std::map<chain::public_key_type,
+               chain::private_key_type>     private_keys; ///< overlapping with producer keys, also authenticating non-producing nodes
       enum possible_connections : char {
          None = 0,
             Producers = 1 << 0,
             Specified = 1 << 1,
             Any = 1 << 2
             };
-      possible_connections             allowed_connections{None};
+      possible_connections                  allowed_connections{None};
 
-      connection_ptr find_connection(const string& host)const;
+      boost::asio::steady_timer::duration   connector_period;
+      boost::asio::steady_timer::duration   txn_exp_period;
+      boost::asio::steady_timer::duration   resp_expected_period;
+      boost::asio::steady_timer::duration   keepalive_interval{std::chrono::seconds{32}};
 
-      mutable std::shared_timed_mutex  connections_mtx; // switch to std::shared_mutex in C++17
-      std::set< connection_ptr >       connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
-      unique_ptr< sync_manager >       sync_master;
-      unique_ptr< dispatch_manager >   dispatcher;
+      int                                   max_cleanup_time_ms = 0;
+      uint32_t                              max_client_count = 0;
+      uint32_t                              max_nodes_per_host = 1;
+
+      /// Peer clock may be no more than 1 second skewed from our clock, including network latency.
+      const std::chrono::system_clock::duration peer_authentication_interval{std::chrono::seconds{1}};
+
+      bool                                  network_version_match = false;
+      chain_id_type                         chain_id;
+      fc::sha256                            node_id;
+      string                                user_agent_name;
+
+      eosio::db_read_mode                   db_read_mode = eosio::db_read_mode::SPECULATIVE;
+      chain_plugin*                         chain_plug = nullptr;
+      producer_plugin*                      producer_plug = nullptr;
+      bool                                  use_socket_read_watermark = false;
+      /** @} */
 
-      std::mutex                            connector_check_timer_mtx; 
+      mutable std::shared_timed_mutex       connections_mtx; // switch to std::shared_mutex in C++17
+      std::set< connection_ptr >            connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
+
+      std::mutex                            connector_check_timer_mtx;
       unique_ptr<boost::asio::steady_timer> connector_check_timer;
       int                                   connector_checks_in_flight{0};
+
       std::mutex                            expire_timer_mtx;
       unique_ptr<boost::asio::steady_timer> expire_timer;
+
       std::mutex                            keepalive_timer_mtx;
       unique_ptr<boost::asio::steady_timer> keepalive_timer;
-      boost::asio::steady_timer::duration   connector_period;
-      boost::asio::steady_timer::duration   txn_exp_period;
-      boost::asio::steady_timer::duration   resp_expected_period;
-      boost::asio::steady_timer::duration   keepalive_interval{std::chrono::seconds{32}};
-      int                                   max_cleanup_time_ms = 0;
-      std::atomic<bool>                     in_shutdown{false};
-
-      const std::chrono::system_clock::duration peer_authentication_interval{std::chrono::seconds{1}}; ///< Peer clock may be no more than 1 second skewed from our clock, including network latency.
 
-      bool                          network_version_match = false;
-      chain_id_type                 chain_id; // thread safe, only updated in plugin_initialize
-      fc::sha256                    node_id;  // thread safe, only updated in plugin initialize
-      string                        user_agent_name; // thread safe, only updated in plugin initialize
+      std::atomic<bool>                     in_shutdown{false};
 
-      mutable std::mutex            chain_info_mtx;
+   private:
+      mutable std::mutex            chain_info_mtx; // protects chain_*
       uint32_t                      chain_lib_num{0};
       uint32_t                      chain_head_blk_num{0};
       uint32_t                      chain_fork_head_blk_num{0};
@@ -263,13 +277,7 @@ namespace eosio {
       block_id_type                 chain_head_blk_id;
       block_id_type                 chain_fork_head_blk_id;
 
-      eosio::db_read_mode           db_read_mode = eosio::db_read_mode::SPECULATIVE;
-
-      chain_plugin*                 chain_plug = nullptr;
-      producer_plugin*              producer_plug = nullptr;
-
-      bool                          use_socket_read_watermark = false; // thread safe, not modified outside plugin_initialize
-
+   public:
       compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
       channels::irreversible_block::channel_type::handle       incoming_irreversible_block_subscription;
 
@@ -286,34 +294,6 @@ namespace eosio {
       void transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>&);
       void on_irreversible_block( const block_state_ptr& blk );
 
-      static bool is_valid( const handshake_message& msg );
-
-      void handle_message(const connection_ptr& c, const handshake_message& msg);
-      void handle_message(const connection_ptr& c, const chain_size_message& msg);
-      void handle_message(const connection_ptr& c, const go_away_message& msg );
-      /** \name Peer Timestamps
-       *  Time message handling
-       *  @{
-       */
-      /** \brief Process time_message
-       *
-       * Calculate offset, delay and dispersion.  Note carefully the
-       * implied processing.  The first-order difference is done
-       * directly in 64-bit arithmetic, then the result is converted
-       * to floating double.  All further processing is in
-       * floating-double arithmetic with rounding done by the hardware.
-       * This is necessary in order to avoid overflow and preserve precision.
-       */
-      void handle_message(const connection_ptr& c, const time_message& msg);
-      /** @} */
-      void handle_message(const connection_ptr& c, const notice_message& msg);
-      void handle_message(const connection_ptr& c, const request_message& msg);
-      void handle_message(const connection_ptr& c, const sync_request_message& msg);
-      void handle_message(const connection_ptr& c, const signed_block& msg) = delete; // signed_block_ptr overload used instead
-      void handle_message(const connection_ptr& c, const signed_block_ptr& msg);
-      void handle_message(const connection_ptr& c, const packed_transaction& msg) = delete; // packed_transaction_ptr overload used instead
-      void handle_message(const connection_ptr& c, const packed_transaction_ptr& msg);
-
       void start_conn_timer(boost::asio::steady_timer::duration du, std::weak_ptr<connection> from_connection);
       void start_expire_timer();
       void start_monitors();
@@ -352,7 +332,9 @@ namespace eosio {
        */
       chain::signature_type sign_compact(const chain::public_key_type& signer, const fc::sha256& digest) const;
 
-      uint16_t to_protocol_version(uint16_t v);
+      constexpr uint16_t to_protocol_version(uint16_t v);
+
+      connection_ptr find_connection(const string& host)const; // must call with held mutex
    };
 
    const fc::string logger_name("net_plugin_impl");
@@ -672,7 +654,7 @@ namespace eosio {
        * packet is placed on the send queue.  Calls the kernel time of
        * day routine and converts to a (at least) 64 bit integer.
        */
-      tstamp get_time()
+      static tstamp get_time()
       {
          return std::chrono::system_clock::now().time_since_epoch().count();
       }
@@ -707,6 +689,34 @@ namespace eosio {
                        bool to_sync_queue = false);
       void do_queue_write(int priority);
 
+      static bool is_valid( const handshake_message& msg );
+
+      void handle_message( const handshake_message& msg );
+      void handle_message( const chain_size_message& msg );
+      void handle_message( const go_away_message& msg );
+      /** \name Peer Timestamps
+       *  Time message handling
+       *  @{
+       */
+      /** \brief Process time_message
+       *
+       * Calculate offset, delay and dispersion.  Note carefully the
+       * implied processing.  The first-order difference is done
+       * directly in 64-bit arithmetic, then the result is converted
+       * to floating double.  All further processing is in
+       * floating-double arithmetic with rounding done by the hardware.
+       * This is necessary in order to avoid overflow and preserve precision.
+       */
+      void handle_message( const time_message& msg );
+      /** @} */
+      void handle_message( const notice_message& msg );
+      void handle_message( const request_message& msg );
+      void handle_message( const sync_request_message& msg );
+      void handle_message( const signed_block& msg ) = delete; // signed_block_ptr overload used instead
+      void handle_message( const signed_block_ptr& msg );
+      void handle_message( const packed_transaction& msg ) = delete; // packed_transaction_ptr overload used instead
+      void handle_message( const packed_transaction_ptr& msg );
+
       fc::optional<fc::variant_object> _logger_variant;
       const fc::variant_object& get_logger_variant()  {
          if (!_logger_variant) {
@@ -728,9 +738,8 @@ namespace eosio {
 
    // called from connection strand
    struct msg_handler : public fc::visitor<void> {
-      net_plugin_impl& impl;
       connection_ptr c;
-      msg_handler( net_plugin_impl& imp, const connection_ptr& conn) : impl(imp), c(conn) {}
+      explicit msg_handler( const connection_ptr& conn) : c(conn) {}
 
       void operator()( const signed_block& msg ) const {
          EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should be called" );
@@ -748,9 +757,9 @@ namespace eosio {
       void operator()( signed_block&& msg ) const {
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
          connection_wptr weak = c;
-         app().post(priority::high, [impl = &impl, ptr{std::move(ptr)}, weak{std::move(weak)}] {
+         app().post(priority::high, [ptr{std::move(ptr)}, weak{std::move(weak)}] {
             connection_ptr c = weak.lock();
-            if( c ) impl->handle_message( c, ptr );
+            if( c ) c->handle_message( ptr );
          });
       }
 
@@ -758,49 +767,49 @@ namespace eosio {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle packed_transaction" );
          shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
-         impl.handle_message( c, ptr );
+         c->handle_message( ptr );
       }
 
       void operator()( const handshake_message& msg ) const {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle handshake_message" );
-         impl.handle_message( c, msg );
+         c->handle_message( msg );
       }
 
       void operator()( const chain_size_message& msg ) const {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle chain_size_message" );
-         impl.handle_message( c, msg );
+         c->handle_message( msg );
       }
 
       void operator()( const go_away_message& msg ) const {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle go_away_message" );
-         impl.handle_message( c, msg );
+         c->handle_message( msg );
       }
 
       void operator()( const time_message& msg ) const {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle time_message" );
-         impl.handle_message( c, msg );
+         c->handle_message( msg );
       }
 
       void operator()( const notice_message& msg ) const {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle notice_message" );
-         impl.handle_message( c, msg );
+         c->handle_message( msg );
       }
 
       void operator()( const request_message& msg ) const {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle request_message" );
-         impl.handle_message( c, msg );
+         c->handle_message( msg );
       }
 
       void operator()( const sync_request_message& msg ) const {
          // continue call to handle_message on connection strand
          fc_dlog( logger, "handle sync_request_message" );
-         impl.handle_message( c, msg );
+         c->handle_message( msg );
       }
    };
 
@@ -2325,7 +2334,7 @@ namespace eosio {
          auto ds = pending_message_buffer.create_datastream();
          net_message msg;
          fc::raw::unpack( ds, msg );
-         msg_handler m( *my_impl, shared_from_this() );
+         msg_handler m( shared_from_this() );
          if( msg.contains<signed_block>() ) {
             m( std::move( msg.get<signed_block>() ) );
          } else if( msg.contains<packed_transaction>() ) {
@@ -2365,7 +2374,7 @@ namespace eosio {
             chain_lib_id, chain_head_blk_id, chain_fork_head_blk_id );
    }
 
-   bool net_plugin_impl::is_valid( const handshake_message& msg ) {
+   bool connection::is_valid( const handshake_message& msg ) {
       // Do some basic validation of an incoming handshake_message, so things
       // that really aren't handshake messages can be quickly discarded without
       // affecting state.
@@ -2390,39 +2399,38 @@ namespace eosio {
       return valid;
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const chain_size_message& msg) {
-      peer_ilog(c, "received chain_size_message");
+   void connection::handle_message( const chain_size_message& msg ) {
+      peer_ilog(this, "received chain_size_message");
    }
 
-   // called from connection strand
-   void net_plugin_impl::handle_message( const connection_ptr& c, const handshake_message& msg ) {
-      peer_ilog(c, "received handshake_message");
+   void connection::handle_message( const handshake_message& msg ) {
+      peer_ilog( this, "received handshake_message" );
       if( !is_valid( msg ) ) {
-         peer_elog( c, "bad handshake message");
-         c->enqueue( go_away_message( fatal_other ) );
+         peer_elog( this, "bad handshake message");
+         enqueue( go_away_message( fatal_other ) );
          return;
       }
       fc_dlog( logger, "received handshake gen ${g} from ${ep}, lib ${lib}, head ${head}",
-               ("g", msg.generation)( "ep", c->peer_name() )
+               ("g", msg.generation)( "ep", peer_name() )
                ( "lib", msg.last_irreversible_block_num )( "head", msg.head_num ) );
 
-      if( c->connecting ) {
-         c->connecting = false;
+      if( connecting ) {
+         connecting = false;
       }
       if (msg.generation == 1) {
          if( msg.node_id == node_id) {
             fc_elog( logger, "Self connection detected. Closing connection" );
-            c->enqueue( go_away_message( self ) );
+            enqueue( go_away_message( self ) );
             return;
          }
 
-         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
-         if( c->peer_address().empty() || c->last_handshake_recv.node_id == fc::sha256()) {
+         std::unique_lock<std::mutex> g_conn( conn_mtx );
+         if( peer_address().empty() || last_handshake_recv.node_id == fc::sha256()) {
             g_conn.unlock();
             fc_dlog(logger, "checking for duplicate" );
             std::shared_lock<std::shared_timed_mutex> g_cnts( my_impl->connections_mtx );
-            for(const auto& check : connections) {
-               if(check == c)
+            for(const auto& check : my_impl->connections) {
+               if(check.get() == this)
                   continue;
                if(check->connected() && check->peer_name() == msg.p2p_address) {
                   // It's possible that both peers could arrive here at relatively the same time, so
@@ -2433,7 +2441,7 @@ namespace eosio {
                   auto check_time = check->last_handshake_sent.time + check->last_handshake_recv.time;
                   g_check_conn.unlock();
                   g_conn.lock();
-                  auto c_time = c->last_handshake_sent.time;
+                  auto c_time = last_handshake_sent.time;
                   g_conn.unlock();
                   if (msg.time + c_time <= check_time)
                      continue;
@@ -2442,48 +2450,49 @@ namespace eosio {
                   fc_dlog( logger, "sending go_away duplicate to ${ep}", ("ep",msg.p2p_address) );
                   go_away_message gam(duplicate);
                   gam.node_id = node_id;
-                  c->enqueue(gam);
-                  c->no_retry = duplicate;
-                  sync_master->send_handshakes();
+                  enqueue(gam);
+                  no_retry = duplicate;
+                  my_impl->sync_master->send_handshakes();
                   return;
                }
             }
          } else {
             fc_dlog( logger, "skipping duplicate check, addr == ${pa}, id = ${ni}",
-                     ("pa", c->peer_address())( "ni", c->last_handshake_recv.node_id ) );
+                     ("pa", peer_address())( "ni", last_handshake_recv.node_id ) );
             g_conn.unlock();
          }
 
-         if( msg.chain_id != chain_id) {
+         if( msg.chain_id != my_impl->chain_id ) {
             fc_elog( logger, "Peer on a different chain. Closing connection" );
-            c->enqueue( go_away_message(go_away_reason::wrong_chain) );
+            enqueue( go_away_message(go_away_reason::wrong_chain) );
             return;
          }
-         c->protocol_version = to_protocol_version(msg.network_version);
-         if(c->protocol_version != net_version) {
-            if (network_version_match) {
+         protocol_version = my_impl->to_protocol_version(msg.network_version);
+         if( protocol_version != net_version ) {
+            if( my_impl->network_version_match ) {
                fc_elog( logger, "Peer network version does not match expected ${nv} but got ${mnv}",
-                        ("nv", net_version)("mnv", c->protocol_version) );
-               c->enqueue(go_away_message(wrong_version));
+                        ("nv", net_version)("mnv", protocol_version) );
+               enqueue( go_away_message( wrong_version ) );
                return;
             } else {
                fc_ilog( logger, "Local network version: ${nv} Remote version: ${mnv}",
-                        ("nv", net_version)("mnv", c->protocol_version));
+                        ("nv", net_version)("mnv", protocol_version));
             }
          }
 
-         if(  c->node_id != msg.node_id) {
-            c->node_id = msg.node_id;
+         if( node_id != msg.node_id ) {
+            node_id = msg.node_id;
          }
 
-         if(!authenticate_peer(msg)) {
+         if( !my_impl->authenticate_peer( msg ) ) {
             fc_elog( logger, "Peer not authenticated.  Closing connection." );
-            c->enqueue(go_away_message(authentication));
+            enqueue( go_away_message( authentication ) );
             return;
          }
 
          uint32_t peer_lib = msg.last_irreversible_block_num;
-         app().post( priority::low, [peer_lib, chain_plug = this->chain_plug, c, msg_lib_id = msg.last_irreversible_block_id]() {
+         app().post( priority::low, [peer_lib, chain_plug = my_impl->chain_plug, c = shared_from_this(),
+                                     msg_lib_id = msg.last_irreversible_block_id]() {
             controller& cc = chain_plug->chain();
             uint32_t lib_num = cc.last_irreversible_block_num();
 
@@ -2510,67 +2519,67 @@ namespace eosio {
             }
          });
 
-         if (c->sent_handshake_count == 0) {
-            c->send_handshake();
+         if( sent_handshake_count == 0 ) {
+            send_handshake();
          }
       }
 
-      std::unique_lock<std::mutex> g_conn( c->conn_mtx );
-      c->last_handshake_recv = msg;
+      std::unique_lock<std::mutex> g_conn( conn_mtx );
+      last_handshake_recv = msg;
       g_conn.unlock();
-      c->_logger_variant.reset();
-      sync_master->recv_handshake( c, msg );
+      _logger_variant.reset();
+      my_impl->sync_master->recv_handshake( shared_from_this(), msg );
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const go_away_message& msg) {
-      peer_wlog( c, "received go_away_message, reason = ${r}", ("r", reason_str( msg.reason )) );
-      c->no_retry = msg.reason;
+   void connection::handle_message( const go_away_message& msg ) {
+      peer_wlog( this, "received go_away_message, reason = ${r}", ("r", reason_str( msg.reason )) );
+      no_retry = msg.reason;
       if( msg.reason == duplicate ) {
-         c->node_id = msg.node_id;
+         node_id = msg.node_id;
       }
-      c->flush_queues();
-      c->close();
+      flush_queues();
+      close();
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const time_message& msg) {
-      peer_ilog( c, "received time_message" );
+   void connection::handle_message( const time_message& msg ) {
+      peer_ilog( this, "received time_message" );
       /* We've already lost however many microseconds it took to dispatch
        * the message, but it can't be helped.
        */
-      msg.dst = c->get_time();
+      msg.dst = get_time();
 
       // If the transmit timestamp is zero, the peer is horribly broken.
       if(msg.xmt == 0)
          return;                 /* invalid timestamp */
 
-      if(msg.xmt == c->xmt)
+      if(msg.xmt == xmt)
          return;                 /* duplicate packet */
 
-      c->xmt = msg.xmt;
-      c->rec = msg.rec;
-      c->dst = msg.dst;
+      xmt = msg.xmt;
+      rec = msg.rec;
+      dst = msg.dst;
 
-      if(msg.org == 0)
-         {
-            c->send_time(msg);
-            return;  // We don't have enough data to perform the calculation yet.
-         }
+      if( msg.org == 0 ) {
+         send_time( msg );
+         return;  // We don't have enough data to perform the calculation yet.
+      }
 
-      c->offset = (double(c->rec - c->org) + double(msg.xmt - c->dst)) / 2;
+      offset = (double(rec - org) + double(msg.xmt - dst)) / 2;
       double NsecPerUsec{1000};
 
-      if(logger.is_enabled(fc::log_level::all))
-         logger.log(FC_LOG_MESSAGE(all, "Clock offset is ${o}ns (${us}us)", ("o", c->offset)("us", c->offset/NsecPerUsec)));
-      c->org = 0;
-      c->rec = 0;
+      if( logger.is_enabled( fc::log_level::all ) )
+         logger.log( FC_LOG_MESSAGE( all, "Clock offset is ${o}ns (${us}us)",
+                                     ("o", offset)( "us", offset / NsecPerUsec ) ) );
+      org = 0;
+      rec = 0;
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const notice_message& msg) {
+   void connection::handle_message( const notice_message& msg ) {
       // peer tells us about one or more blocks or txns. When done syncing, forward on
       // notices of previously unknown blocks or txns,
       //
-      peer_ilog( c, "received notice_message" );
-      c->connecting = false;
+      peer_ilog( this, "received notice_message" );
+      connecting = false;
       if( msg.known_trx.mode != none ) {
          fc_dlog( logger, "this is a ${m} notice with ${n} transactions",
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
@@ -2579,8 +2588,8 @@ namespace eosio {
       case none:
          break;
       case last_irr_catch_up: {
-         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
-         c->last_handshake_recv.head_num = msg.known_trx.pending;
+         std::unique_lock<std::mutex> g_conn( conn_mtx );
+         last_handshake_recv.head_num = msg.known_trx.pending;
          g_conn.unlock();
          break;
       }
@@ -2588,12 +2597,13 @@ namespace eosio {
          break;
       }
       case normal: {
-         dispatcher->recv_notice(c, msg, false);
+         my_impl->dispatcher->recv_notice( shared_from_this(), msg, false );
       }
       }
 
-      if (msg.known_blocks.mode != none) {
-         fc_dlog(logger,"this is a ${m} notice with ${n} blocks", ("m",modes_str(msg.known_blocks.mode))("n",msg.known_blocks.pending));
+      if( msg.known_blocks.mode != none ) {
+         fc_dlog( logger, "this is a ${m} notice with ${n} blocks",
+                  ("m", modes_str( msg.known_blocks.mode ))( "n", msg.known_blocks.pending ) );
       }
       switch (msg.known_blocks.mode) {
       case none : {
@@ -2601,36 +2611,37 @@ namespace eosio {
       }
       case last_irr_catch_up:
       case catch_up: {
-         sync_master->sync_recv_notice(c,msg);
+         my_impl->sync_master->sync_recv_notice( shared_from_this(), msg );
          break;
       }
       case normal : {
-         dispatcher->recv_notice(c, msg, false);
+         my_impl->dispatcher->recv_notice( shared_from_this(), msg, false );
          break;
       }
       default: {
-         peer_elog(c, "bad notice_message : invalid known_blocks.mode ${m}",("m",static_cast<uint32_t>(msg.known_blocks.mode)));
+         peer_elog( this, "bad notice_message : invalid known_blocks.mode ${m}",
+                    ("m", static_cast<uint32_t>(msg.known_blocks.mode)) );
       }
       }
    }
 
-   void net_plugin_impl::handle_message(const connection_ptr& c, const request_message& msg) {
+   void connection::handle_message( const request_message& msg ) {
       if( msg.req_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid request_message, req_blocks.ids.size ${s}, closing ${p}",
-                  ("s", msg.req_blocks.ids.size())("p",c->peer_name()) );
-         c->close();
+                  ("s", msg.req_blocks.ids.size())( "p", peer_name() ) );
+         close();
          return;
       }
 
       switch (msg.req_blocks.mode) {
       case catch_up :
-         peer_ilog(c,  "received request_message:catch_up");
-         c->blk_send_branch();
+         peer_ilog( this, "received request_message:catch_up" );
+         blk_send_branch();
          break;
       case normal :
-         peer_ilog(c, "received request_message:normal");
+         peer_ilog( this, "received request_message:normal" );
          if( !msg.req_blocks.ids.empty() ) {
-            c->blk_send(msg.req_blocks.ids.back());
+            blk_send( msg.req_blocks.ids.back() );
          }
          break;
       default:;
@@ -2641,29 +2652,29 @@ namespace eosio {
       case catch_up :
          break;
       case none :
-         if(msg.req_blocks.mode == none)
-            c->stop_send();
+         if( msg.req_blocks.mode == none ) {
+            stop_send();
+         }
          // no break
       case normal :
          if( !msg.req_trx.ids.empty() ) {
             fc_elog( logger, "Invalid request_message, req_trx.ids.size ${s}", ("s", msg.req_trx.ids.size()) );
-            c->close();
+            close();
             return;
          }
          break;
       default:;
       }
-
    }
 
-   void net_plugin_impl::handle_message( const connection_ptr& c, const sync_request_message& msg ) {
+   void connection::handle_message( const sync_request_message& msg ) {
       fc_dlog( logger, "peer requested ${start} to ${end}", ("start", msg.start_block)("end", msg.end_block) );
       if( msg.end_block == 0 ) {
-         c->peer_requested.reset();
-         c->flush_queues();
+         peer_requested.reset();
+         flush_queues();
       } else {
-         c->peer_requested = sync_state( msg.start_block, msg.end_block, msg.start_block-1);
-         c->enqueue_sync_block();
+         peer_requested = sync_state( msg.start_block, msg.end_block, msg.start_block-1);
+         enqueue_sync_block();
       }
    }
 
@@ -2674,27 +2685,27 @@ namespace eosio {
              trx->get_signatures().size() * sizeof(signature_type);
    }
 
-   // called from connection strand
-   void net_plugin_impl::handle_message(const connection_ptr& c, const packed_transaction_ptr& trx) {
-      fc_dlog(logger, "got a packed transaction, cancel wait");
-      if( db_read_mode == eosio::db_read_mode::READ_ONLY ) {
-         fc_dlog(logger, "got a txn in read-only mode - dropping");
+   void connection::handle_message( const packed_transaction_ptr& trx ) {
+      fc_dlog( logger, "got a packed transaction, cancel wait" );
+      if( my_impl->db_read_mode == eosio::db_read_mode::READ_ONLY ) {
+         fc_dlog( logger, "got a txn in read-only mode - dropping" );
          return;
       }
 
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
-      peer_ilog(c, "received packed_transaction ${id}", ("id", tid));
+      peer_ilog( this, "received packed_transaction ${id}", ("id", tid) );
 
-      bool have_trx = dispatcher->have_txn( tid );
-      dispatcher->recv_transaction(c, ptrx);
+      bool have_trx = my_impl->dispatcher->have_txn( tid );
+      my_impl->dispatcher->recv_transaction( shared_from_this(), ptrx );
       if( have_trx ) {
          fc_dlog( logger, "got a duplicate transaction - dropping ${id}", ("id", tid) );
          return;
       }
 
-      c->trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
-      chain_plug->accept_transaction(ptrx, [c, this, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+      trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
+      my_impl->chain_plug->accept_transaction( ptrx,
+            [c = shared_from_this(), ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
          bool accepted = false;
@@ -2712,7 +2723,7 @@ namespace eosio {
             }
          }
 
-         controller& cc = chain_plug->chain();
+         controller& cc = my_impl->chain_plug->chain();
          uint32_t head_blk_num = cc.head_block_num();
 
          boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, ptrx{std::move(ptrx)}, head_blk_num]() {
@@ -2726,11 +2737,13 @@ namespace eosio {
    }
 
    // called from application thread
-   void net_plugin_impl::handle_message(const connection_ptr& c, const signed_block_ptr& msg) {
-      controller& cc = chain_plug->chain();
+   void connection::handle_message( const signed_block_ptr& msg ) {
+      controller& cc = my_impl->chain_plug->chain();
       block_id_type blk_id = msg->id();
       uint32_t blk_num = msg->block_num();
-      fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
+      fc_dlog( logger, "canceling wait on ${p}", ("p", peer_name()) );
+      // use c in this method instead of this to highlight that all methods called on c-> must be thread safe
+      connection_ptr c = shared_from_this();
       c->cancel_wait();
 
       // if we have closed connection then stop processing
@@ -2739,7 +2752,7 @@ namespace eosio {
 
       try {
          if( cc.fetch_block_by_id(blk_id) ) {
-            c->strand.post( [sync_master = sync_master.get(), c, blk_id, blk_num]() {
+            c->strand.post( [sync_master = my_impl->sync_master.get(), c, blk_id, blk_num]() {
                sync_master->sync_recv_block( c, blk_id, blk_num );
             });
             return;
@@ -2749,16 +2762,13 @@ namespace eosio {
          fc_elog( logger,"Caught an unknown exception trying to recall blockID" );
       }
 
-//      c->strand.post( [dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
-//         dispatcher->recv_block( c, blk_id, blk_num );
-//      });
       fc::microseconds age( fc::time_point::now() - msg->timestamp);
-      peer_ilog(c, "received signed_block : #${n} block age in secs = ${age}",
-              ("n",blk_num)("age",age.to_seconds()));
+      peer_ilog( c, "received signed_block : #${n} block age in secs = ${age}",
+                 ("n", blk_num)( "age", age.to_seconds() ) );
 
       go_away_reason reason = fatal_other;
       try {
-         chain_plug->accept_block(msg);
+         my_impl->chain_plug->accept_block(msg);
          reason = no_reason;
       } catch( const unlinkable_block_exception &ex) {
          peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));
@@ -2780,15 +2790,15 @@ namespace eosio {
       }
 
       if( reason == no_reason ) {
-         boost::asio::post( my_impl->thread_pool->get_executor(), [self = this, msg]() {
-            self->dispatcher->update_txns_block_num( msg );
+         boost::asio::post( my_impl->thread_pool->get_executor(), [dispatcher = my_impl->dispatcher.get(), msg]() {
+            dispatcher->update_txns_block_num( msg );
          });
-         c->strand.post( [sync_master = sync_master.get(), dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+         c->strand.post( [sync_master = my_impl->sync_master.get(), dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {
             dispatcher->recv_block( c, blk_id, blk_num );
             sync_master->sync_recv_block( c, blk_id, blk_num );
          });
       } else {
-         c->strand.post( [sync_master = sync_master.get(), dispatcher = dispatcher.get(), c, blk_id, blk_num]() {
+         c->strand.post( [sync_master = my_impl->sync_master.get(), dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {
             sync_master->rejected_block( c, blk_num );
             dispatcher->rejected_block( blk_id );
          });
@@ -3185,6 +3195,7 @@ namespace eosio {
       // currently thread_pool only used for server_ioc
       my->thread_pool.emplace( "net", my->thread_pool_size );
 
+      tcp::endpoint listen_endpoint;
       if( my->p2p_address.size() > 0 ) {
          auto host = my->p2p_address.substr( 0, my->p2p_address.find( ':' ));
          auto port = my->p2p_address.substr( host.size() + 1, my->p2p_address.size());
@@ -3192,14 +3203,14 @@ namespace eosio {
          // Note: need to add support for IPv6 too?
 
          tcp::resolver resolver( my->thread_pool->get_executor() );
-         my->listen_endpoint = *resolver.resolve( query );
+         listen_endpoint = *resolver.resolve( query );
 
          my->acceptor.reset( new tcp::acceptor( my_impl->thread_pool->get_executor() ) );
 
          if( !my->p2p_server_address.empty() ) {
             my->p2p_address = my->p2p_server_address;
          } else {
-            if( my->listen_endpoint.address().to_v4() == address_v4::any()) {
+            if( listen_endpoint.address().to_v4() == address_v4::any()) {
                boost::system::error_code ec;
                auto host = host_name( ec );
                if( ec.value() != boost::system::errc::success ) {
@@ -3221,13 +3232,13 @@ namespace eosio {
       my->ticker();
 
       if( my->acceptor ) {
-         my->acceptor->open(my->listen_endpoint.protocol());
+         my->acceptor->open(listen_endpoint.protocol());
          my->acceptor->set_option(tcp::acceptor::reuse_address(true));
          try {
-           my->acceptor->bind(my->listen_endpoint);
+           my->acceptor->bind(listen_endpoint);
          } catch (const std::exception& e) {
            fc_elog( logger, "net_plugin::plugin_startup failed to bind to port ${port}",
-                    ("port", my->listen_endpoint.port()));
+                    ("port", listen_endpoint.port()));
            throw e;
          }
          my->acceptor->listen();
@@ -3364,7 +3375,7 @@ namespace eosio {
       return connection_ptr();
    }
 
-   uint16_t net_plugin_impl::to_protocol_version(uint16_t v) {
+   constexpr uint16_t net_plugin_impl::to_protocol_version(uint16_t v) {
       if (v >= net_version_base) {
          v -= net_version_base;
          return (v > net_version_range) ? 0 : v;

From b11a6368eab6016e86b2b8b70d89b21bdf61824a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Apr 2019 11:18:04 -0500
Subject: [PATCH 0194/1648] Add explicit cancel of acceptor, reverting to
 original behavior

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8b0a500c3ca..6e2bde31324 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3297,6 +3297,7 @@ namespace eosio {
 
          if( my->acceptor ) {
             boost::system::error_code ec;
+            my->acceptor->cancel( ec );
             my->acceptor->close( ec );
          }
 

From 33a2e306d90ea01959f0ab1e8bbafd6ecc96daea Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Apr 2019 14:05:10 -0500
Subject: [PATCH 0195/1648] Fix corner case of no connections when trying to
 determine who to sync to

---
 plugins/net_plugin/net_plugin.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6e2bde31324..52e96ce3057 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1380,7 +1380,9 @@ namespace eosio {
          sync_source = conn;
       } else {
          std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
-         if (my_impl->connections.size() == 1) {
+         if( my_impl->connections.size() == 0 ) {
+            sync_source.reset();
+         } else if( my_impl->connections.size() == 1 ) {
             if (!sync_source) {
                sync_source = *my_impl->connections.begin();
             }
@@ -1406,16 +1408,18 @@ namespace eosio {
             }
 
             //scan the list of peers looking for another able to provide sync blocks.
-            auto cstart_it = cptr;
-            do {
-               //select the first one which is current and break out.
-               if( (*cptr)->current() ) {
-                  sync_source = *cptr;
-                  break;
-               }
-               if(++cptr == my_impl->connections.end())
+            if( cptr != my_impl->connections.end() ) {
+               auto cstart_it = cptr;
+               do {
+                  //select the first one which is current and break out.
+                  if( (*cptr)->current() ) {
+                     sync_source = *cptr;
+                     break;
+                  }
+                  if( ++cptr == my_impl->connections.end() )
                      cptr = my_impl->connections.begin();
-            } while(cptr != cstart_it);
+               } while( cptr != cstart_it );
+            }
             // no need to check the result, either source advanced or the whole list was checked and the old source is reused.
          }
       }

From 1415b61440de3b904f4577e287c2a80ff65d0262 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 07:36:13 -0500
Subject: [PATCH 0196/1648] Code cleanup

---
 plugins/net_plugin/net_plugin.cpp | 89 ++++++++++---------------------
 1 file changed, 28 insertions(+), 61 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 52e96ce3057..f9afeed611c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -268,6 +268,12 @@ namespace eosio {
 
       std::atomic<bool>                     in_shutdown{false};
 
+      compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
+      channels::irreversible_block::channel_type::handle       incoming_irreversible_block_subscription;
+
+      uint16_t                                  thread_pool_size = 4;
+      optional<eosio::chain::named_thread_pool> thread_pool;
+
    private:
       mutable std::mutex            chain_info_mtx; // protects chain_*
       uint32_t                      chain_lib_num{0};
@@ -278,12 +284,6 @@ namespace eosio {
       block_id_type                 chain_fork_head_blk_id;
 
    public:
-      compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
-      channels::irreversible_block::channel_type::handle       incoming_irreversible_block_subscription;
-
-      uint16_t                                  thread_pool_size = 4;
-      optional<eosio::chain::named_thread_pool> thread_pool;
-
       void update_chain_info();
       //         lib_num, head_block_num, fork_head_blk_num, lib_id, head_blk_id, fork_head_blk_id
       std::tuple<uint32_t, uint32_t, uint32_t, block_id_type, block_id_type, block_id_type> get_chain_info() const;
@@ -535,34 +535,36 @@ namespace eosio {
    class connection : public std::enable_shared_from_this<connection> {
    public:
       explicit connection( string endpoint );
-
       connection();
-      ~connection();
 
       bool start_session();
 
       bool socket_is_open() const { return socket_open.load(); } // thread safe, atomic
       const string& peer_address() const { return peer_addr; } // thread safe, const
-      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; } // thread safe, not updated after start_session()
+      // thread safe, not updated after start_session()
+      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; }
 
    private:
       static const string unknown;
 
       void update_endpoints();
 
-   public:
-
       optional<sync_state>    peer_requested;  // this peer is requesting info from us
-      boost::asio::io_context&                  server_ioc;
-      boost::asio::io_context::strand           strand;
-      tcp::socket                               socket; // only accessed through strand after construction
-   private:
+
       std::atomic<bool>                         socket_open{false};
+
+      const string            peer_addr;
+      string                  remote_endpoint_ip;     // not updated after start
+      string                  remote_endpoint_port;   // not updated after start
+      string                  local_endpoint_ip;      // not updated after start
+      string                  local_endpoint_port;    // not updated after start
+
    public:
+      boost::asio::io_context::strand           strand;
+      tcp::socket                               socket; // only accessed through strand after construction
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
-      std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from server_ioc threads
-
+      std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from strand threads
 
       queued_buffer           buffer_queue;
 
@@ -573,20 +575,15 @@ namespace eosio {
       int16_t                 sent_handshake_count = 0;
       std::atomic<bool>       connecting{false};
       std::atomic<bool>       syncing{false};
-      uint16_t                protocol_version  = 0;
+      uint16_t                protocol_version = 0;
       uint16_t                consecutive_rejected_blocks = 0;
-   private:
-      const string            peer_addr;
-      string                  remote_endpoint_ip;     // not updated after start
-      string                  remote_endpoint_port;   // not updated after start
-      string                  local_endpoint_ip;      // not updated after start
-      string                  local_endpoint_port;    // not updated after start
-   public:
 
       std::mutex                            response_expected_timer_mtx;
       boost::asio::steady_timer             response_expected_timer;
+
       std::mutex                            read_delay_timer_mtx;
       boost::asio::steady_timer             read_delay_timer;
+
       std::atomic<go_away_reason>           no_retry{no_reason};
 
       mutable std::mutex          conn_mtx; // mtx for last_req, last_handshake_recv, last_handshake_sent, fork_head, fork_head_num
@@ -607,12 +604,6 @@ namespace eosio {
       tstamp                         rec{0};          //!< receive timestamp
       tstamp                         dst{0};          //!< destination timestamp
       tstamp                         xmt{0};          //!< transmit timestamp
-
-      // Computed data
-      double                         offset{0};       //!< peer offset
-
-      static const size_t            ts_buffer_size{32};
-      char                           ts[ts_buffer_size];          //!< working buffer for making human readable timestamps
       /** @} */
 
       bool connected();
@@ -654,8 +645,7 @@ namespace eosio {
        * packet is placed on the send queue.  Calls the kernel time of
        * day routine and converts to a (at least) 64 bit integer.
        */
-      static tstamp get_time()
-      {
+      static tstamp get_time() {
          return std::chrono::system_clock::now().time_since_epoch().count();
       }
       /** @} */
@@ -816,21 +806,12 @@ namespace eosio {
    //---------------------------------------------------------------------------
 
    connection::connection( string endpoint )
-      : peer_requested(),
-        server_ioc( my_impl->thread_pool->get_executor() ),
-        strand( my_impl->thread_pool->get_executor() ),
+      : strand( my_impl->thread_pool->get_executor() ),
         socket( my_impl->thread_pool->get_executor() ),
-        node_id(),
         connection_id( ++my_impl->current_connection_id ),
-        sent_handshake_count(0),
-        connecting(false),
-        syncing(false),
-        protocol_version(0),
-        peer_addr(endpoint),
+        peer_addr( endpoint ),
         response_expected_timer( my_impl->thread_pool->get_executor() ),
         read_delay_timer( my_impl->thread_pool->get_executor() ),
-        no_retry(no_reason),
-        last_req(),
         last_handshake_recv(),
         last_handshake_sent()
    {
@@ -839,21 +820,12 @@ namespace eosio {
    }
 
    connection::connection()
-      : peer_requested(),
-        server_ioc( my_impl->thread_pool->get_executor() ),
-        strand( my_impl->thread_pool->get_executor() ),
+      : strand( my_impl->thread_pool->get_executor() ),
         socket( my_impl->thread_pool->get_executor() ),
-        node_id(),
         connection_id( ++my_impl->current_connection_id ),
-        sent_handshake_count(0),
-        connecting(true),
-        syncing(false),
-        protocol_version(0),
         peer_addr(),
         response_expected_timer( my_impl->thread_pool->get_executor() ),
         read_delay_timer( my_impl->thread_pool->get_executor() ),
-        no_retry(no_reason),
-        last_req(),
         last_handshake_recv(),
         last_handshake_sent()
    {
@@ -861,9 +833,6 @@ namespace eosio {
       node_id.data()[0] = 0;
    }
 
-   connection::~connection() {
-   }
-
    void connection::update_endpoints() {
       boost::system::error_code ec;
       auto rep = socket.remote_endpoint(ec);
@@ -1142,7 +1111,7 @@ namespace eosio {
          fc_dlog( logger, "enqueue sync block ${num}", ("num", peer_requested->last + 1) );
       }
       uint32_t num = ++peer_requested->last;
-      bool trigger_send = true; // todo: = num == peer_requested->start_block;
+      bool trigger_send = true;
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
@@ -1654,7 +1623,6 @@ namespace eosio {
             fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn", blk_num)( "p", c->peer_name() ) );
             sync_last_requested_num = 0;
             sync_source.reset();
-            //todo: set_state( in_sync );
             g.unlock();
             c->close();
             send_handshakes();
@@ -2568,7 +2536,7 @@ namespace eosio {
          return;  // We don't have enough data to perform the calculation yet.
       }
 
-      offset = (double(rec - org) + double(msg.xmt - dst)) / 2;
+      double offset = (double(rec - org) + double(msg.xmt - dst)) / 2;
       double NsecPerUsec{1000};
 
       if( logger.is_enabled( fc::log_level::all ) )
@@ -3196,7 +3164,6 @@ namespace eosio {
 
       my->producer_plug = app().find_plugin<producer_plugin>();
 
-      // currently thread_pool only used for server_ioc
       my->thread_pool.emplace( "net", my->thread_pool_size );
 
       tcp::endpoint listen_endpoint;

From ade69babf35c188b4d003ef69b55b36bfa4a5156 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 07:47:55 -0500
Subject: [PATCH 0197/1648] Better handling syncing flag

---
 plugins/net_plugin/net_plugin.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f9afeed611c..5ad787ac402 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -806,10 +806,10 @@ namespace eosio {
    //---------------------------------------------------------------------------
 
    connection::connection( string endpoint )
-      : strand( my_impl->thread_pool->get_executor() ),
+      : peer_addr( endpoint ),
+        strand( my_impl->thread_pool->get_executor() ),
         socket( my_impl->thread_pool->get_executor() ),
         connection_id( ++my_impl->current_connection_id ),
-        peer_addr( endpoint ),
         response_expected_timer( my_impl->thread_pool->get_executor() ),
         read_delay_timer( my_impl->thread_pool->get_executor() ),
         last_handshake_recv(),
@@ -820,10 +820,10 @@ namespace eosio {
    }
 
    connection::connection()
-      : strand( my_impl->thread_pool->get_executor() ),
+      : peer_addr(),
+        strand( my_impl->thread_pool->get_executor() ),
         socket( my_impl->thread_pool->get_executor() ),
         connection_id( ++my_impl->current_connection_id ),
-        peer_addr(),
         response_expected_timer( my_impl->thread_pool->get_executor() ),
         read_delay_timer( my_impl->thread_pool->get_executor() ),
         last_handshake_recv(),
@@ -963,10 +963,6 @@ namespace eosio {
       }
       fc_dlog( logger, "enqueue ${s} - ${e}", ("s", peer_requested->start_block)("e", peer_requested->end_block) );
       enqueue_sync_block();
-
-      // still want to send transactions along during blk branch sync
-      // todo: need diff variable for tranasaction sending
-      // todo: syncing = false;
    }
 
    void connection::blk_send( const block_id_type& blkid ) {
@@ -1106,6 +1102,7 @@ namespace eosio {
 
    bool connection::enqueue_sync_block() {
       if( !peer_requested ) {
+         syncing = false;
          return false;
       } else {
          fc_dlog( logger, "enqueue sync block ${num}", ("num", peer_requested->last + 1) );

From 1881d00ee421a905dddf2e8d4aaaf21cf0af8b93 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 10:58:58 -0500
Subject: [PATCH 0198/1648] revert back to join before stop

---
 libraries/chain/thread_utils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/thread_utils.cpp b/libraries/chain/thread_utils.cpp
index c17d8cde3e7..1d8a2707c14 100644
--- a/libraries/chain/thread_utils.cpp
+++ b/libraries/chain/thread_utils.cpp
@@ -32,8 +32,8 @@ named_thread_pool::~named_thread_pool() {
 void named_thread_pool::stop() {
    _ioc_work.reset();
    _ioc.stop();
-   _thread_pool.stop();
    _thread_pool.join();
+   _thread_pool.stop();
 }
 
 

From 2772d230031dfaa1cb8571171600d3146ee5785e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 10:59:11 -0500
Subject: [PATCH 0199/1648] clean shutdown

---
 plugins/net_plugin/net_plugin.cpp | 33 +++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5ad787ac402..a6aa0eab404 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -537,6 +537,8 @@ namespace eosio {
       explicit connection( string endpoint );
       connection();
 
+      ~connection() {}
+
       bool start_session();
 
       bool socket_is_open() const { return socket_open.load(); } // thread safe, atomic
@@ -966,9 +968,11 @@ namespace eosio {
    }
 
    void connection::blk_send( const block_id_type& blkid ) {
-      app().post( priority::low, [blkid, c = shared_from_this()]() {
-         controller& cc = my_impl->chain_plug->chain();
+      app().post( priority::low, [blkid, weak = weak_from_this()]() {
+         connection_ptr c = weak.lock();
+         if( !c ) return;
          try {
+            controller& cc = my_impl->chain_plug->chain();
             signed_block_ptr b = cc.fetch_block_by_id( blkid );
             if( b ) {
                fc_dlog( logger, "found block for id at num ${n}", ("n", b->block_num()) );
@@ -1112,7 +1116,9 @@ namespace eosio {
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      app().post( priority::medium, [num, trigger_send, c = shared_from_this()]() {
+      app().post( priority::medium, [num, trigger_send, weak = weak_from_this()]() {
+         connection_ptr c = weak.lock();
+         if( !c ) return;
          controller& cc = my_impl->chain_plug->chain();
          signed_block_ptr sb = cc.fetch_block_by_number( num );
          if( sb ) {
@@ -1918,7 +1924,10 @@ namespace eosio {
          req.req_blocks.mode = normal;
          // known_blocks.ids is never > 1
          if( !msg.known_blocks.ids.empty() ) {
-            app().post( priority::low, [this, msg{std::move(msg)}, req{std::move(req)}, c]() mutable {
+            connection_wptr weak = c;
+            app().post( priority::low, [this, msg{std::move(msg)}, req{std::move(req)}, weak{std::move(weak)}]() mutable {
+               connection_ptr c = weak.lock();
+               if( !c ) return;
                const block_id_type& blkid = msg.known_blocks.ids.back();
                signed_block_ptr b;
                try {
@@ -2460,8 +2469,10 @@ namespace eosio {
          }
 
          uint32_t peer_lib = msg.last_irreversible_block_num;
-         app().post( priority::low, [peer_lib, chain_plug = my_impl->chain_plug, c = shared_from_this(),
+         app().post( priority::low, [peer_lib, chain_plug = my_impl->chain_plug, weak = weak_from_this(),
                                      msg_lib_id = msg.last_irreversible_block_id]() {
+            connection_ptr c = weak.lock();
+            if( !c ) return;
             controller& cc = chain_plug->chain();
             uint32_t lib_num = cc.last_irreversible_block_num();
 
@@ -2674,12 +2685,15 @@ namespace eosio {
 
       trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
       my_impl->chain_plug->accept_transaction( ptrx,
-            [c = shared_from_this(), ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak = weak_from_this(), ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
-         c->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
+         connection_ptr conn = weak.lock();
+         if( conn ) {
+            conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
+         }
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
-            peer_dlog(c, "bad packed_transaction : ${m}", ("m",result.get<fc::exception_ptr>()->what()));
+            fc_dlog( logger, "bad packed_transaction : ${m}", ("m", result.get<fc::exception_ptr>()->what()) );
          } else {
             auto trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
@@ -2688,7 +2702,7 @@ namespace eosio {
             }
 
             if( !accepted ) {
-               peer_elog( c, "bad packed_transaction : ${m}", ("m", trace->except->what()));
+               fc_elog( logger, "bad packed_transaction : ${m}", ("m", trace->except->what()));
             }
          }
 
@@ -3281,7 +3295,6 @@ namespace eosio {
 
          if( my->thread_pool ) {
             my->thread_pool->stop();
-            my->thread_pool.reset();
          }
          app().post( 0, [me = my](){} ); // keep my pointer alive until queue is drained
          fc_ilog( logger, "exit shutdown" );

From 1c74c08acabf24968249e2e1ffd1359368bac3ac Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 12:11:56 -0500
Subject: [PATCH 0200/1648] Some platforms do not have weak_from_this()

---
 plugins/net_plugin/net_plugin.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a6aa0eab404..385c9f274e6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -968,7 +968,8 @@ namespace eosio {
    }
 
    void connection::blk_send( const block_id_type& blkid ) {
-      app().post( priority::low, [blkid, weak = weak_from_this()]() {
+      connection_wptr weak = shared_from_this();
+      app().post( priority::low, [blkid, weak{std::move(weak)}]() {
          connection_ptr c = weak.lock();
          if( !c ) return;
          try {
@@ -1116,7 +1117,8 @@ namespace eosio {
       if(num == peer_requested->end_block) {
          peer_requested.reset();
       }
-      app().post( priority::medium, [num, trigger_send, weak = weak_from_this()]() {
+      connection_wptr weak = shared_from_this();
+      app().post( priority::medium, [num, trigger_send, weak{std::move(weak)}]() {
          connection_ptr c = weak.lock();
          if( !c ) return;
          controller& cc = my_impl->chain_plug->chain();
@@ -2469,7 +2471,8 @@ namespace eosio {
          }
 
          uint32_t peer_lib = msg.last_irreversible_block_num;
-         app().post( priority::low, [peer_lib, chain_plug = my_impl->chain_plug, weak = weak_from_this(),
+         connection_wptr weak = shared_from_this();
+         app().post( priority::low, [peer_lib, chain_plug = my_impl->chain_plug, weak{std::move(weak)},
                                      msg_lib_id = msg.last_irreversible_block_id]() {
             connection_ptr c = weak.lock();
             if( !c ) return;
@@ -2684,8 +2687,9 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
+      connection_wptr weak = shared_from_this();
       my_impl->chain_plug->accept_transaction( ptrx,
-            [weak = weak_from_this(), ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak{std::move(weak)}, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          connection_ptr conn = weak.lock();
          if( conn ) {

From 70362ec7511128ec6558bbe703747280ae5703f7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 13:06:22 -0500
Subject: [PATCH 0201/1648] Cut down on reconnect spam. Faster shutdown while
 syncing.

---
 plugins/net_plugin/net_plugin.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 385c9f274e6..97602a240fe 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -924,7 +924,7 @@ namespace eosio {
       g.unlock();
 
       if( reconnect ) {
-         my_impl->start_conn_timer( std::chrono::milliseconds( 5 ), connection_wptr() );
+         my_impl->start_conn_timer( std::chrono::milliseconds( 500 ), connection_wptr() );
       }
    }
 
@@ -1638,6 +1638,10 @@ namespace eosio {
    // called from connection strand
    void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
       fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_name() ) );
+      if( app().is_quiting() ) {
+         c->close( false );
+         return;
+      }
       c->consecutive_rejected_blocks = 0;
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       stages state = sync_state;
@@ -2211,6 +2215,7 @@ namespace eosio {
                if( !conn->socket_is_open() ) return;
 
                bool close_connection = false;
+               bool reconnect = true;
                try {
                   if( !ec ) {
                      if (bytes_transferred > conn->pending_message_buffer.bytes_to_write()) {
@@ -2261,6 +2266,7 @@ namespace eosio {
                      } else {
                         fc_ilog( logger, "Peer closed connection" );
                      }
+                     reconnect = false;
                      close_connection = true;
                   }
                }
@@ -2275,11 +2281,12 @@ namespace eosio {
                catch (...) {
                   fc_elog( logger, "Undefined exception handling read data" );
                   close_connection = true;
+                  reconnect = false;
                }
 
                if( close_connection ) {
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                  conn->close();
+                  conn->close( reconnect );
                }
          }));
       } catch (...) {
@@ -2756,6 +2763,7 @@ namespace eosio {
       go_away_reason reason = fatal_other;
       try {
          my_impl->chain_plug->accept_block(msg);
+         my_impl->update_chain_info();
          reason = no_reason;
       } catch( const unlinkable_block_exception &ex) {
          peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));

From 4426e8183f66668a50d7291f207ab6c4b66c5662 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 13:52:35 -0500
Subject: [PATCH 0202/1648] Reduce info level logging

---
 plugins/net_plugin/net_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 97602a240fe..af7fb809545 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2684,7 +2684,7 @@ namespace eosio {
 
       auto ptrx = std::make_shared<transaction_metadata>( trx );
       const auto& tid = ptrx->id;
-      peer_ilog( this, "received packed_transaction ${id}", ("id", tid) );
+      peer_dlog( this, "received packed_transaction ${id}", ("id", tid) );
 
       bool have_trx = my_impl->dispatcher->have_txn( tid );
       my_impl->dispatcher->recv_transaction( shared_from_this(), ptrx );
@@ -2941,13 +2941,13 @@ namespace eosio {
    void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
       const auto& id = results.second->id;
       if (results.first) {
-         fc_ilog(logger,"signaled NACK, trx-id = ${id} : ${why}",("id", id)("why", results.first->to_detail_string()));
+         fc_dlog( logger, "signaled NACK, trx-id = ${id} : ${why}", ("id", id)( "why", results.first->to_detail_string() ) );
 
          controller& cc = chain_plug->chain();
          uint32_t head_blk_num = cc.head_block_num();
          dispatcher->rejected_transaction(id, head_blk_num);
       } else {
-         fc_ilog(logger,"signaled ACK, trx-id = ${id}",("id", id));
+         fc_dlog( logger, "signaled ACK, trx-id = ${id}", ("id", id) );
          dispatcher->bcast_transaction(results.second);
       }
    }

From f04318f3d885e58f9cf4e667c6f25bbc01d66f50 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 16:52:59 -0500
Subject: [PATCH 0203/1648] Cut down on reconnect spam

---
 plugins/net_plugin/net_plugin.cpp | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index af7fb809545..9adecd1e9a4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -385,6 +385,7 @@ namespace eosio {
    constexpr auto     def_max_reads_in_flight = 1000;
    constexpr auto     def_max_trx_in_progress_size = 100*1024*1024; // 100 MB
    constexpr auto     def_max_consecutive_rejected_blocks = 3; // num of rejected blocks before disconnect
+   constexpr auto     def_max_consecutive_immediate_connection_close = 3; // back off if client keeps closing
    constexpr auto     def_max_clients = 25; // 0 for unlimited clients
    constexpr auto     def_max_nodes_per_host = 1;
    constexpr auto     def_conn_retry_wait = 30;
@@ -579,6 +580,8 @@ namespace eosio {
       std::atomic<bool>       syncing{false};
       uint16_t                protocol_version = 0;
       uint16_t                consecutive_rejected_blocks = 0;
+      uint16_t                consecutive_immediate_connection_close = 0;
+      fc::time_point          last_close;
 
       std::mutex                            response_expected_timer_mtx;
       boost::asio::steady_timer             response_expected_timer;
@@ -903,6 +906,8 @@ namespace eosio {
       self->connecting = false;
       self->syncing = false;
       self->consecutive_rejected_blocks = 0;
+      ++self->consecutive_immediate_connection_close;
+      self->last_close = fc::time_point::now();
       std::unique_lock<std::mutex> g_conn( self->conn_mtx );
       bool has_last_req = !!self->last_req;
       g_conn.unlock();
@@ -1648,11 +1653,13 @@ namespace eosio {
       fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
       if( state == lib_catchup ) {
          if (blk_num != sync_next_expected_num) {
-            auto sync_next_expected = sync_next_expected_num;
-            g_sync.unlock();
-            fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
-                     ("ne", sync_next_expected)( "bn", blk_num )( "p", c->peer_name() ) );
-            c->close();
+            if( ++c->consecutive_rejected_blocks > def_max_consecutive_rejected_blocks ) {
+               auto sync_next_expected = sync_next_expected_num;
+               g_sync.unlock();
+               fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
+                        ("ne", sync_next_expected)( "bn", blk_num )( "p", c->peer_name() ) );
+               c->close();
+            }
             return;
          }
          sync_next_expected_num = blk_num + 1;
@@ -2033,6 +2040,13 @@ namespace eosio {
          return false;
       }
 
+      if( consecutive_immediate_connection_close > def_max_consecutive_immediate_connection_close ) {
+         auto connector_period_us = std::chrono::duration_cast<std::chrono::microseconds>( my_impl->connector_period );
+         if( last_close > fc::time_point::now() - fc::microseconds( connector_period_us.count() ) ) {
+            return true; // true so doesn't remove from valid connections
+         }
+      }
+
       string host = peer_address().substr( 0, colon );
       string port = peer_address().substr( colon + 1);
       idump((host)(port));
@@ -2049,6 +2063,7 @@ namespace eosio {
                   c->connect( resolver, endpoint_itr );
                } else {
                   fc_elog( logger, "Unable to resolve ${add}: ${error}", ("add", c->peer_name())( "error", err.message() ) );
+                  ++c->consecutive_immediate_connection_close;
                }
             } ) );
       return true;
@@ -2215,7 +2230,6 @@ namespace eosio {
                if( !conn->socket_is_open() ) return;
 
                bool close_connection = false;
-               bool reconnect = true;
                try {
                   if( !ec ) {
                      if (bytes_transferred > conn->pending_message_buffer.bytes_to_write()) {
@@ -2244,6 +2258,7 @@ namespace eosio {
 
                            if (bytes_in_buffer >= total_message_bytes) {
                               conn->pending_message_buffer.advance_read_ptr(message_header_size);
+                              conn->consecutive_immediate_connection_close = 0;
                               if (!conn->process_next_message(message_length)) {
                                  return;
                               }
@@ -2266,7 +2281,6 @@ namespace eosio {
                      } else {
                         fc_ilog( logger, "Peer closed connection" );
                      }
-                     reconnect = false;
                      close_connection = true;
                   }
                }
@@ -2281,12 +2295,11 @@ namespace eosio {
                catch (...) {
                   fc_elog( logger, "Undefined exception handling read data" );
                   close_connection = true;
-                  reconnect = false;
                }
 
                if( close_connection ) {
                   fc_elog( logger, "Closing connection to: ${p}", ("p", conn->peer_name()) );
-                  conn->close( reconnect );
+                  conn->close();
                }
          }));
       } catch (...) {

From 5b47b81accc76c39cc1d7aa946542c8809590b0d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Apr 2019 21:14:05 -0500
Subject: [PATCH 0204/1648] Reconnect sooner. Do not cancel wait on transaction
 recv.

---
 plugins/net_plugin/net_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 9adecd1e9a4..2094198dd3f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -385,7 +385,7 @@ namespace eosio {
    constexpr auto     def_max_reads_in_flight = 1000;
    constexpr auto     def_max_trx_in_progress_size = 100*1024*1024; // 100 MB
    constexpr auto     def_max_consecutive_rejected_blocks = 3; // num of rejected blocks before disconnect
-   constexpr auto     def_max_consecutive_immediate_connection_close = 3; // back off if client keeps closing
+   constexpr auto     def_max_consecutive_immediate_connection_close = 9; // back off if client keeps closing
    constexpr auto     def_max_clients = 25; // 0 for unlimited clients
    constexpr auto     def_max_nodes_per_host = 1;
    constexpr auto     def_conn_retry_wait = 30;
@@ -929,7 +929,7 @@ namespace eosio {
       g.unlock();
 
       if( reconnect ) {
-         my_impl->start_conn_timer( std::chrono::milliseconds( 500 ), connection_wptr() );
+         my_impl->start_conn_timer( std::chrono::milliseconds( 100 ), connection_wptr() );
       }
    }
 
@@ -1911,7 +1911,7 @@ namespace eosio {
       add_peer_txn( nts );
 
       fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
-      c->cancel_wait();
+      //todo c->cancel_wait();
    }
 
    void dispatch_manager::rejected_transaction(const transaction_id_type& id, uint32_t head_blk_num) {

From 59b1ea975bcf58360ff789544cbb9f6e55c252c1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 15 Apr 2019 15:26:08 -0500
Subject: [PATCH 0205/1648] Added print of lib when retrieved

---
 tests/Node.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Node.py b/tests/Node.py
index abbb11e48b6..0d3d3caaaab 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1199,6 +1199,7 @@ def getIrreversibleBlockNum(self):
         if not self.enableMongo:
             info=self.getInfo(exitOnError=True)
             if info is not None:
+                Utils.Print("current lib: %d" % (info["last_irreversible_block_num"]))
                 return info["last_irreversible_block_num"]
         else:
             # Either this implementation or the one in getHeadBlockNum are likely wrong.

From 40c9e6870c989c338ee2fd1b0822c7dcbc01b766 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 15 Apr 2019 21:03:44 -0500
Subject: [PATCH 0206/1648] Fix transition from sync

---
 plugins/net_plugin/net_plugin.cpp | 35 +++++++++++++++++++------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2094198dd3f..f12dd353862 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -142,7 +142,7 @@ namespace eosio {
          in_sync
       };
 
-      std::mutex     sync_mtx;
+      mutable std::mutex sync_mtx;
       uint32_t       sync_known_lib_num;
       uint32_t       sync_last_requested_num;
       uint32_t       sync_next_expected_num;
@@ -164,6 +164,7 @@ namespace eosio {
       explicit sync_manager( uint32_t span );
       static void send_handshakes();
       bool syncing_with_peer() const { return sync_state == lib_catchup; }
+      bool block_while_syncing_with_other_peer( const connection_ptr& c ) const;
       void sync_reset_lib_num( const connection_ptr& conn );
       void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
       void rejected_block( const connection_ptr& c, uint32_t blk_num );
@@ -921,7 +922,7 @@ namespace eosio {
       self->last_handshake_sent = handshake_message();
       g_conn.unlock();
       my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
-      fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
+      fc_dlog( logger, "closed, canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();
 
       std::unique_lock<std::mutex> g( self->read_delay_timer_mtx );
@@ -1112,7 +1113,6 @@ namespace eosio {
 
    bool connection::enqueue_sync_block() {
       if( !peer_requested ) {
-         syncing = false;
          return false;
       } else {
          fc_dlog( logger, "enqueue sync block ${num}", ("num", peer_requested->last + 1) );
@@ -1319,6 +1319,14 @@ namespace eosio {
       sync_state = newstate;
    }
 
+   bool sync_manager::block_while_syncing_with_other_peer( const connection_ptr& c ) const {
+      if( syncing_with_peer() ) {
+         std::lock_guard<std::mutex> g( sync_mtx );
+         return c != sync_source;
+      }
+      return false;
+   }
+
    void sync_manager::sync_reset_lib_num(const connection_ptr& c) {
       std::unique_lock<std::mutex> g( sync_mtx );
       if( sync_state == in_sync ) {
@@ -1499,7 +1507,6 @@ namespace eosio {
                 std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
 
       sync_reset_lib_num(c);
-      c->syncing = false;
 
       //--------------------------------
       // sync need checks; (lib == last irreversible block)
@@ -1515,6 +1522,7 @@ namespace eosio {
 
       if (head_id == msg.head_id) {
          fc_dlog(logger, "sync check state 0");
+         c->syncing = false;
          // notify peer of our pending transactions
          notice_message note;
          note.known_blocks.mode = none;
@@ -1525,6 +1533,7 @@ namespace eosio {
       }
       if (head < peer_lib) {
          fc_dlog(logger, "sync check state 1");
+         c->syncing = false;
          // wait for receipt of a notice message before initiating sync
          if (c->protocol_version < proto_explicit_sync) {
             start_sync( c, peer_lib );
@@ -1547,6 +1556,7 @@ namespace eosio {
 
       if (head < msg.head_num ) {
          fc_dlog(logger, "sync check state 3");
+         c->syncing = false;
          verify_catchup(c, msg.head_num, msg.head_id);
          return;
       }
@@ -1563,6 +1573,7 @@ namespace eosio {
          c->syncing = true;
          return;
       }
+      c->syncing = false;
       fc_elog( logger, "sync check failed to resolve status" );
    }
 
@@ -1850,7 +1861,7 @@ namespace eosio {
                   return;
                }
                fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
-               cp->enqueue_buffer( send_buffer, true, priority::high, no_reason );
+               cp->enqueue_buffer( send_buffer, true, priority::medium, no_reason );
             }
          });
       }
@@ -1909,9 +1920,6 @@ namespace eosio {
    void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_metadata_ptr& txn) {
       node_transaction_state nts = {txn->id, txn->packed_trx->expiration(), 0, c->connection_id};
       add_peer_txn( nts );
-
-      fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name()));
-      //todo c->cancel_wait();
    }
 
    void dispatch_manager::rejected_transaction(const transaction_id_type& id, uint32_t head_blk_num) {
@@ -2419,7 +2427,7 @@ namespace eosio {
       }
       if (msg.generation == 1) {
          if( msg.node_id == node_id) {
-            fc_elog( logger, "Self connection detected. Closing connection" );
+            fc_elog( logger, "Self connection detected node_id ${id}. Closing connection", ("id", node_id) );
             enqueue( go_away_message( self ) );
             return;
          }
@@ -2689,7 +2697,6 @@ namespace eosio {
    }
 
    void connection::handle_message( const packed_transaction_ptr& trx ) {
-      fc_dlog( logger, "got a packed transaction, cancel wait" );
       if( my_impl->db_read_mode == eosio::db_read_mode::READ_ONLY ) {
          fc_dlog( logger, "got a txn in read-only mode - dropping" );
          return;
@@ -2748,15 +2755,16 @@ namespace eosio {
       controller& cc = my_impl->chain_plug->chain();
       block_id_type blk_id = msg->id();
       uint32_t blk_num = msg->block_num();
-      fc_dlog( logger, "canceling wait on ${p}", ("p", peer_name()) );
       // use c in this method instead of this to highlight that all methods called on c-> must be thread safe
       connection_ptr c = shared_from_this();
-      c->cancel_wait();
 
       // if we have closed connection then stop processing
       if( !c->socket_is_open() )
          return;
 
+      if( my_impl->sync_master->block_while_syncing_with_other_peer(c) )
+         return;
+
       try {
          if( cc.fetch_block_by_id(blk_id) ) {
             c->strand.post( [sync_master = my_impl->sync_master.get(), c, blk_id, blk_num]() {
@@ -3190,7 +3198,6 @@ namespace eosio {
          EOS_ASSERT( my->chain_plug, chain::missing_chain_plugin_exception, ""  );
          my->chain_id = my->chain_plug->get_chain_id();
          fc::rand_pseudo_bytes( my->node_id.data(), my->node_id.data_size());
-         fc_ilog( logger, "my node_id is ${id}", ("id", my->node_id ));
 
       } FC_LOG_AND_RETHROW()
    }
@@ -3198,6 +3205,8 @@ namespace eosio {
    void net_plugin::plugin_startup() {
       handle_sighup();
 
+      fc_ilog( logger, "my node_id is ${id}", ("id", my->node_id ));
+
       my->producer_plug = app().find_plugin<producer_plugin>();
 
       my->thread_pool.emplace( "net", my->thread_pool_size );

From 2337fc53b219883231a02e76228f454ce16c8bc6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Apr 2019 21:03:18 -0500
Subject: [PATCH 0207/1648] Optimize lib catchup to head catchup

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f12dd353862..4b86cfc1ccb 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1475,7 +1475,7 @@ namespace eosio {
 
       if( sync_state == in_sync ) {
          set_state( lib_catchup );
-         sync_next_expected_num = lib_num + 1;
+         sync_next_expected_num = std::max( lib_num + 1, sync_next_expected_num );
       }
 
       fc_ilog( logger, "Catching up with chain, our last req is ${cc}, theirs is ${t} peer ${p}",

From 571165c1be1fdd3dd80aa6682691110940ecd4d3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 17 Apr 2019 09:07:06 -0500
Subject: [PATCH 0208/1648] Change default thread pool size to 2

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4b86cfc1ccb..70b2b4fa198 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -272,7 +272,7 @@ namespace eosio {
       compat::channels::transaction_ack::channel_type::handle  incoming_transaction_ack_subscription;
       channels::irreversible_block::channel_type::handle       incoming_irreversible_block_subscription;
 
-      uint16_t                                  thread_pool_size = 4;
+      uint16_t                                  thread_pool_size = 2;
       optional<eosio::chain::named_thread_pool> thread_pool;
 
    private:

From c6a7f14dffcf8ca2704748075063bab8eaa50b80 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 17 Apr 2019 11:56:31 -0500
Subject: [PATCH 0209/1648] Hook up to lib signal instead of channel to get
 notificaiton sooner

---
 plugins/net_plugin/net_plugin.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ff374715587..8ac40792f25 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3263,15 +3263,16 @@ namespace eosio {
       }
       chain::controller&cc = my->chain_plug->chain();
       {
-         cc.accepted_block.connect(  boost::bind(&net_plugin_impl::on_accepted_block, my.get(), _1));
+         cc.accepted_block.connect( [my = my]( const block_state_ptr& s ) {
+            my->on_accepted_block( s );
+         } );
+         cc.irreversible_block.connect( [my = my]( const block_state_ptr& s ) {
+            my->on_irreversible_block( s );
+         } );
       }
 
       my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
             boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
-      my->incoming_irreversible_block_subscription = app().get_channel<channels::irreversible_block>().subscribe(
-            [this]( const block_state_ptr& s ) {
-               my->on_irreversible_block( s );
-            });
 
       my->db_read_mode = cc.get_read_mode();
       if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {

From c7ceebb43a6364f7fb7951f93a194a0809fe980f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Apr 2019 08:01:12 -0500
Subject: [PATCH 0210/1648] Fix shutdown of catchup node

---
 tests/nodeos_startup_catchup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/nodeos_startup_catchup.py b/tests/nodeos_startup_catchup.py
index 6d811fbce67..5934750d3a9 100755
--- a/tests/nodeos_startup_catchup.py
+++ b/tests/nodeos_startup_catchup.py
@@ -165,7 +165,7 @@ def waitForNodeStarted(node):
         catchupNode.interruptAndVerifyExitStatus(60)
 
         Print("Restart catchup node")
-        catchupNode.relaunch(catchupNodeNum)
+        catchupNode.relaunch(catchupNodeNum, cachePopen=True)
         waitForNodeStarted(catchupNode)
         lastCatchupLibNum=lib(catchupNode)
 

From 130a74f33a0de6a067b8b9b0b0c637d04b84a8ae Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 19 Apr 2019 10:56:59 -0500
Subject: [PATCH 0211/1648] Test with logging disabled

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8ac40792f25..0747a1ce6b0 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -338,7 +338,7 @@ namespace eosio {
       connection_ptr find_connection(const string& host)const; // must call with held mutex
    };
 
-   const fc::string logger_name("net_plugin_impl");
+   const fc::string logger_name("net_plugin_impl_todo_test");
    fc::logger logger;
    std::string peer_log_format;
 

From 8e3586c13cff6d00423b92b47950254b1c528634 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 19 Apr 2019 13:22:33 -0500
Subject: [PATCH 0212/1648] Restore logging

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0747a1ce6b0..8ac40792f25 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -338,7 +338,7 @@ namespace eosio {
       connection_ptr find_connection(const string& host)const; // must call with held mutex
    };
 
-   const fc::string logger_name("net_plugin_impl_todo_test");
+   const fc::string logger_name("net_plugin_impl");
    fc::logger logger;
    std::string peer_log_format;
 

From 3f2b658c185b35cdc0b0592a49ce0c200fe8ba11 Mon Sep 17 00:00:00 2001
From: UMU618 <umu618@hotmail.com>
Date: Thu, 25 Apr 2019 06:02:37 +0000
Subject: [PATCH 0213/1648] fc::variant to BSON

---
 .../include/eosio/mongo_db_plugin/bson.hpp    | 248 ++++++++++++++++++
 1 file changed, 248 insertions(+)
 create mode 100644 plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp

diff --git a/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp b/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp
new file mode 100644
index 00000000000..37e21d332b4
--- /dev/null
+++ b/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp
@@ -0,0 +1,248 @@
+/**
+ *   @file
+ *   @copyright defined in eos/LICENSE
+ */
+#pragma once
+
+#include <bsoncxx/builder/basic/document.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/builder/stream/document.hpp>
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/exception/exception.hpp>
+#include <bsoncxx/string/to_string.hpp>
+#include <bsoncxx/types.hpp>
+
+#include <fc/variant.hpp>
+
+namespace eosio {
+void to_bson(const fc::variant_object& o, bsoncxx::builder::core& c);
+void to_bson(const fc::variants& v, bsoncxx::builder::core& c);
+void to_bson(const fc::variant& v, bsoncxx::builder::core& c);
+bsoncxx::document::value to_bson(const fc::variant& v);
+
+void from_bson(const bsoncxx::document::view& view, fc::mutable_variant_object& o);
+void from_bson(const bsoncxx::array::view& bson_array, fc::variants& a);
+template <typename T> void from_bson(const T& ele, fc::variant& v);
+fc::variant from_bson(const bsoncxx::document::view& view);
+} // namespace eosio
+
+namespace eosio {
+
+void to_bson(const fc::variant_object& o, bsoncxx::builder::core& c)
+{
+   auto itr = o.begin();
+   while (itr != o.end()) {
+      c.key_owned(itr->key());
+      to_bson(itr->value(), c);
+      ++itr;
+   }
+}
+
+void to_bson(const fc::variants& a, bsoncxx::builder::core& c)
+{
+   auto itr = a.begin();
+   while (itr != a.end()) {
+      to_bson(*itr, c);
+      ++itr;
+   }
+}
+
+void to_bson(const fc::variant& v, bsoncxx::builder::core& c)
+{
+   switch (v.get_type()) {
+      case fc::variant::null_type: {
+         c.append(bsoncxx::types::b_null{});
+         return;
+      }
+      case fc::variant::int64_type:
+      case fc::variant::uint64_type: {
+         c.append(v.as_int64());
+         return;
+      }
+      case fc::variant::double_type:
+         c.append(v.as_double());
+         return;
+      case fc::variant::bool_type:
+         c.append(v.as_bool());
+         return;
+      case fc::variant::string_type: {
+         c.append(v.as_string());
+         return;
+      }
+      case fc::variant::blob_type: {
+         bsoncxx::types::b_binary bin;
+         bin.sub_type = bsoncxx::binary_sub_type::k_binary;
+         bin.size = v.as_blob().data.size();
+         bin.bytes = reinterpret_cast<uint8_t*>(&(*v.as_blob().data.begin()));
+         c.append(bin);
+         return;
+      }
+      case fc::variant::array_type: {
+         const fc::variants& a = v.get_array();
+         bsoncxx::builder::core sub(true);
+         to_bson(a, sub);
+         c.append(sub.extract_array());
+         return;
+      }
+      case fc::variant::object_type: {
+         const fc::variant_object& o = v.get_object();
+         if (o.size() == 1) {
+            const auto value = o.begin()->value();
+            if (o.begin()->key().compare("$oid") == 0) {
+               if (value.get_type() == fc::variant::string_type
+                  && value.as_string().size() == 12 * 2) {
+                  bsoncxx::oid oid(value.as_string());
+                  c.append(oid);
+                  break;
+               }
+            }
+            else if (o.begin()->key().compare("$date") == 0) {
+               if (value.get_type() == fc::variant::int64_type) {
+                  bsoncxx::types::b_date date(std::chrono::milliseconds(value.as_int64()));
+                  c.append(date);
+                  break;
+               }
+               else if (value.get_type() == fc::variant::object_type) {
+                  const fc::variant_object& obj = value.get_object();
+                  if (obj.size() == 1) {
+                     auto number = obj.begin();
+                     if (number->key().compare("$numberLong") == 0) {
+                        bsoncxx::types::b_date date(std::chrono::milliseconds(number->value().as_int64()));
+                        c.append(date);
+                        break;
+                     }
+                  }
+               }
+            }
+            else if (o.begin()->key().compare("$timestamp") == 0) {
+               if (value.get_type() == fc::variant::object_type) {
+                  const fc::variant_object& obj = value.get_object();
+                  if (obj.size() == 2) {
+                     auto t = obj.begin();
+                     auto i = t;
+                     ++i;
+                     if (t->key().compare("t") == 0 && i->key().compare("i") == 0) {
+                        bsoncxx::types::b_timestamp ts;
+                        ts.timestamp = static_cast<uint32_t>(t->value().as_uint64());
+                        ts.increment = static_cast<uint32_t>(i->value().as_uint64());
+                        c.append(ts);
+                        break;
+                     }
+                  }
+               }
+            }
+         }
+         bsoncxx::builder::core sub(false);
+         to_bson(o, sub);
+         c.append(sub.extract_document());
+         return;
+      }
+      default:
+         FC_THROW_EXCEPTION(
+            fc::invalid_arg_exception,
+            "Unsupported fc::variant type: " + std::to_string(v.get_type()));
+   }
+}
+
+bsoncxx::document::value to_bson(const fc::variant& v)
+{
+   bsoncxx::builder::core doc(false);
+   if (v.get_type() == fc::variant::object_type) {
+      const fc::variant_object& o = v.get_object();
+      to_bson(o, doc);
+   }
+   else if (v.get_type() != fc::variant::null_type) {
+      FC_THROW_EXCEPTION(
+         fc::invalid_arg_exception,
+         "Unsupported root fc::variant type: " + std::to_string(v.get_type()));
+   }
+   return doc.extract_document();
+}
+
+void from_bson(const bsoncxx::document::view& view, fc::mutable_variant_object& o)
+{
+   for (bsoncxx::document::element ele : view) {
+      fc::variant v;
+      from_bson(ele, v);
+      o(ele.key().data(), v);
+   }
+}
+
+void from_bson(const bsoncxx::array::view& bson_array, fc::variants& a)
+{
+   a.reserve(std::distance(bson_array.cbegin(), bson_array.cend()));
+   for (bsoncxx::array::element ele : bson_array) {
+      fc::variant v;
+      from_bson(ele, v);
+      a.push_back(v);
+   }
+}
+
+template <typename T>
+void from_bson(const T& ele, fc::variant& v)
+{
+   switch (ele.type()) {
+      case bsoncxx::type::k_double:
+         v = ele.get_double().value;
+         return;
+      case bsoncxx::type::k_utf8:
+         v = bsoncxx::string::to_string(ele.get_utf8().value);
+         return;
+      case bsoncxx::type::k_document: {
+         fc::mutable_variant_object o;
+         from_bson(ele.get_document().value, o);
+         v = o;
+         return;
+      }
+      case bsoncxx::type::k_array: {
+         bsoncxx::array::view sub_array{ele.get_array().value};
+         fc::variants a;
+         from_bson(sub_array, a);
+         v = a;
+         return;
+      }
+      case bsoncxx::type::k_binary: {
+         fc::blob blob;
+         blob.data.resize(ele.get_binary().size);
+         std::copy(ele.get_binary().bytes, ele.get_binary().bytes + ele.get_binary().size, blob.data.begin());
+         v = blob;
+         return;
+      }
+      case bsoncxx::type::k_undefined:
+      case bsoncxx::type::k_null:
+         v = fc::variant();
+         return;
+      case bsoncxx::type::k_oid:
+         v = fc::variant_object("$oid", ele.get_oid().value.to_string());
+         return;
+      case bsoncxx::type::k_bool:
+         v = ele.get_bool().value;
+         return;
+      case bsoncxx::type::k_date:
+         v = fc::variant_object("$date", ele.get_date().to_int64());
+         return;
+      case bsoncxx::type::k_int32:
+         v = ele.get_int32().value;
+         return;
+      case bsoncxx::type::k_timestamp:
+         v = fc::variant_object("$timestamp", fc::mutable_variant_object("t", ele.get_timestamp().timestamp)("i", ele.get_timestamp().increment));
+         return;
+      case bsoncxx::type::k_int64:
+         v = ele.get_int64().value;
+         return;
+      default:
+         FC_THROW_EXCEPTION(
+            fc::invalid_arg_exception,
+            "Unsupported BSON type: " + bsoncxx::to_string(ele.type()));
+   }
+}
+
+fc::variant from_bson(const bsoncxx::document::view& view)
+{
+   fc::mutable_variant_object o;
+   from_bson(view, o);
+   return o;
+}
+
+}   // namespace eosio
+

From f0014e2c46f02fba3949aabc0a567fc2ad663822 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@cryptokylin.c.eosio-211915.internal>
Date: Thu, 25 Apr 2019 07:20:01 +0000
Subject: [PATCH 0214/1648] convert fc::variant to BSON directly

---
 plugins/mongo_db_plugin/mongo_db_plugin.cpp | 127 +++++++-------------
 1 file changed, 41 insertions(+), 86 deletions(-)

diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index e05f1a01815..865ad8809a8 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -3,6 +3,7 @@
  *  @copyright defined in eos/LICENSE
  */
 #include <eosio/mongo_db_plugin/mongo_db_plugin.hpp>
+#include <eosio/mongo_db_plugin/bson.hpp>
 #include <eosio/chain/eosio_contract.hpp>
 #include <eosio/chain/config.hpp>
 #include <eosio/chain/exceptions.hpp>
@@ -22,9 +23,6 @@
 #include <thread>
 #include <mutex>
 
-#include <bsoncxx/builder/basic/kvp.hpp>
-#include <bsoncxx/builder/basic/document.hpp>
-#include <bsoncxx/exception/exception.hpp>
 #include <bsoncxx/json.hpp>
 
 #include <mongocxx/client.hpp>
@@ -615,7 +613,7 @@ optional<abi_serializer> mongo_db_plugin_impl::get_abi_serializer( account_name
             abi_def abi;
             if( view.find( "abi" ) != view.end()) {
                try {
-                  abi = fc::json::from_string( bsoncxx::to_json( view["abi"].get_document())).as<abi_def>();
+                  abi = from_bson( view["abi"].get_document() ).as<abi_def>();
                } catch (...) {
                   ilog( "Unable to convert account abi to abi_def for ${n}", ( "n", n ));
                   return optional<abi_serializer>();
@@ -763,42 +761,34 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
    trans_doc.append( kvp( "trx_id", trx_id_str ) );
 
    auto v = to_variant_with_abi( trx );
-   string trx_json = fc::json::to_string( v );
 
    try {
-      const auto& trx_value = bsoncxx::from_json( trx_json );
+      const auto& trx_value = to_bson( v );
       trans_doc.append( bsoncxx::builder::concatenate_doc{trx_value.view()} );
-   } catch( bsoncxx::exception& ) {
-      try {
-         trx_json = fc::prune_invalid_utf8( trx_json );
-         const auto& trx_value = bsoncxx::from_json( trx_json );
-         trans_doc.append( bsoncxx::builder::concatenate_doc{trx_value.view()} );
-         trans_doc.append( kvp( "non-utf8-purged", b_bool{true} ) );
-      } catch( bsoncxx::exception& e ) {
-         elog( "Unable to convert transaction JSON to MongoDB JSON: ${e}", ("e", e.what()) );
-         elog( "  JSON: ${j}", ("j", trx_json) );
-      }
+   } catch( bsoncxx::exception& e) {
+      elog( "Unable to convert transaction to BSON: ${e}", ("e", e.what()) );
+      elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
    }
 
-   string signing_keys_json;
+   fc::variant signing_keys;
    if( t->signing_keys_future.valid() ) {
-      signing_keys_json = fc::json::to_string( std::get<2>( t->signing_keys_future.get() ) );
+      signing_keys = std::get<2>( t->signing_keys_future.get() );
    } else {
       flat_set<public_key_type> keys;
       trx.get_signature_keys( *chain_id, fc::time_point::maximum(), keys, false );
       if( !keys.empty() ) {
-         signing_keys_json = fc::json::to_string( keys );
+         signing_keys = keys;
       }
    }
 
-   if( !signing_keys_json.empty() ) {
+   if( signing_keys.get_type() == fc::variant::array_type && signing_keys.get_array().size() > 0) {
       try {
-         const auto& keys_value = bsoncxx::from_json( signing_keys_json );
-         trans_doc.append( kvp( "signing_keys", keys_value ) );
+         bsoncxx::builder::core keys_value(true);
+         to_bson( signing_keys.get_array(), keys_value );
+         trans_doc.append( kvp( "signing_keys", keys_value.extract_array() ) );
       } catch( bsoncxx::exception& e ) {
-         // should never fail, so don't attempt to remove invalid utf8
-         elog( "Unable to convert signing keys JSON to MongoDB JSON: ${e}", ("e", e.what()) );
-         elog( "  JSON: ${j}", ("j", signing_keys_json) );
+         elog( "Unable to convert signing keys to BSON: ${e}", ("e", e.what()) );
+         elog( "  JSON: ${j}", ("j", fc::json::to_string(signing_keys)) );
       }
    }
 
@@ -844,20 +834,11 @@ mongo_db_plugin_impl::add_action_trace( mongocxx::bulk_write& bulk_action_traces
       action_traces_doc.append( kvp( "_id", make_custom_oid() ) );
 
       auto v = to_variant_with_abi( atrace );
-      string json = fc::json::to_string( v );
       try {
-         const auto& value = bsoncxx::from_json( json );
-         action_traces_doc.append( bsoncxx::builder::concatenate_doc{value.view()} );
-      } catch( bsoncxx::exception& ) {
-         try {
-            json = fc::prune_invalid_utf8( json );
-            const auto& value = bsoncxx::from_json( json );
-            action_traces_doc.append( bsoncxx::builder::concatenate_doc{value.view()} );
-            action_traces_doc.append( kvp( "non-utf8-purged", b_bool{true} ) );
-         } catch( bsoncxx::exception& e ) {
-            elog( "Unable to convert action trace JSON to MongoDB JSON: ${e}", ("e", e.what()) );
-            elog( "  JSON: ${j}", ("j", json) );
-         }
+         action_traces_doc.append( bsoncxx::builder::concatenate_doc{to_bson( v )} );
+      } catch( bsoncxx::exception& e ) {
+         elog( "Unable to convert action trace to BSON: ${e}", ("e", e.what()) );
+         elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
       }
       if( t->receipt.valid() ) {
          action_traces_doc.append( kvp( "trx_status", std::string( t->receipt->status ) ) );
@@ -904,20 +885,11 @@ void mongo_db_plugin_impl::_process_applied_transaction( const chain::transactio
    if( store_transaction_traces && write_ttrace ) {
       try {
          auto v = to_variant_with_abi( *t );
-         string json = fc::json::to_string( v );
          try {
-            const auto& value = bsoncxx::from_json( json );
-            trans_traces_doc.append( bsoncxx::builder::concatenate_doc{value.view()} );
-         } catch( bsoncxx::exception& ) {
-            try {
-               json = fc::prune_invalid_utf8( json );
-               const auto& value = bsoncxx::from_json( json );
-               trans_traces_doc.append( bsoncxx::builder::concatenate_doc{value.view()} );
-               trans_traces_doc.append( kvp( "non-utf8-purged", b_bool{true} ) );
-            } catch( bsoncxx::exception& e ) {
-               elog( "Unable to convert transaction JSON to MongoDB JSON: ${e}", ("e", e.what()) );
-               elog( "  JSON: ${j}", ("j", json) );
-            }
+            trans_traces_doc.append( bsoncxx::builder::concatenate_doc{to_bson( v )} );
+         } catch( bsoncxx::exception& e ) {
+            elog( "Unable to convert transaction to BSON: ${e}", ("e", e.what()) );
+            elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
          }
          trans_traces_doc.append( kvp( "createdAt", b_date{now} ) );
 
@@ -926,7 +898,7 @@ void mongo_db_plugin_impl::_process_applied_transaction( const chain::transactio
                EOS_ASSERT( false, chain::mongo_db_insert_fail, "Failed to insert trans ${id}", ("id", t->id) );
             }
          } catch( ... ) {
-            handle_mongo_exception( "trans_traces insert: " + json, __LINE__ );
+            handle_mongo_exception( "trans_traces insert: " + fc::json::to_string( v ), __LINE__ );
          }
       } catch( ... ) {
          handle_mongo_exception( "trans_traces serialization: " + t->id.str(), __LINE__ );
@@ -973,20 +945,11 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
 
       const chain::block_header_state& bhs = *bs;
 
-      auto json = fc::json::to_string( bhs );
       try {
-         const auto& value = bsoncxx::from_json( json );
-         block_state_doc.append( kvp( "block_header_state", value ) );
-      } catch( bsoncxx::exception& ) {
-         try {
-            json = fc::prune_invalid_utf8( json );
-            const auto& value = bsoncxx::from_json( json );
-            block_state_doc.append( kvp( "block_header_state", value ) );
-            block_state_doc.append( kvp( "non-utf8-purged", b_bool{true} ) );
-         } catch( bsoncxx::exception& e ) {
-            elog( "Unable to convert block_header_state JSON to MongoDB JSON: ${e}", ("e", e.what()) );
-            elog( "  JSON: ${j}", ("j", json) );
-         }
+         block_state_doc.append( kvp( "block_header_state", to_bson( fc::variant(bhs) ) ) );
+      } catch( bsoncxx::exception& e ) {
+         elog( "Unable to convert block_header_state to BSON: ${e}", ("e", e.what()) );
+         elog( "  JSON: ${j}", ("j", fc::json::to_string( bhs )) );
       }
       block_state_doc.append( kvp( "createdAt", b_date{now} ) );
 
@@ -1003,7 +966,7 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
             }
          }
       } catch( ... ) {
-         handle_mongo_exception( "block_states insert: " + json, __LINE__ );
+         handle_mongo_exception( "block_states insert: " + fc::json::to_string( bhs ), __LINE__ );
       }
    }
 
@@ -1013,20 +976,11 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
                         kvp( "block_id", block_id_str ) );
 
       auto v = to_variant_with_abi( *bs->block );
-      auto json = fc::json::to_string( v );
       try {
-         const auto& value = bsoncxx::from_json( json );
-         block_doc.append( kvp( "block", value ) );
-      } catch( bsoncxx::exception& ) {
-         try {
-            json = fc::prune_invalid_utf8( json );
-            const auto& value = bsoncxx::from_json( json );
-            block_doc.append( kvp( "block", value ) );
-            block_doc.append( kvp( "non-utf8-purged", b_bool{true} ) );
-         } catch( bsoncxx::exception& e ) {
-            elog( "Unable to convert block JSON to MongoDB JSON: ${e}", ("e", e.what()) );
-            elog( "  JSON: ${j}", ("j", json) );
-         }
+         block_doc.append( kvp( "block", to_bson( v ) ) );
+      } catch( bsoncxx::exception& e ) {
+         elog( "Unable to convert block to BSON: ${e}", ("e", e.what()) );
+         elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
       }
       block_doc.append( kvp( "createdAt", b_date{now} ) );
 
@@ -1043,7 +997,7 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
             }
          }
       } catch( ... ) {
-         handle_mongo_exception( "blocks insert: " + json, __LINE__ );
+         handle_mongo_exception( "blocks insert: " + fc::json::to_string( v ), __LINE__ );
       }
    }
 }
@@ -1321,11 +1275,11 @@ void mongo_db_plugin_impl::update_account(const chain::action& act)
          }
          if( account ) {
             abi_def abi_def = fc::raw::unpack<chain::abi_def>( setabi.abi );
-            const string json_str = fc::json::to_string( abi_def );
+            auto v = fc::variant( abi_def );
 
-            try{
+            try {
                auto update_from = make_document(
-                     kvp( "$set", make_document( kvp( "abi", bsoncxx::from_json( json_str )),
+                     kvp( "$set", make_document( kvp( "abi", to_bson( v )),
                                                  kvp( "updatedAt", b_date{now} ))));
 
                try {
@@ -1337,8 +1291,8 @@ void mongo_db_plugin_impl::update_account(const chain::action& act)
                   handle_mongo_exception( "account update", __LINE__ );
                }
             } catch( bsoncxx::exception& e ) {
-               elog( "Unable to convert abi JSON to MongoDB JSON: ${e}", ("e", e.what()));
-               elog( "  JSON: ${j}", ("j", json_str));
+               elog( "Unable to convert abi JSON to BSON: ${e}", ("e", e.what()));
+               elog( "  JSON: ${j}", ("j", fc::json::to_string( v )));
             }
          }
       }
@@ -1439,7 +1393,7 @@ void mongo_db_plugin_impl::init() {
       auto& mongo_conn = *client;
 
       auto accounts = mongo_conn[db_name][accounts_col];
-      if( accounts.count( make_document()) == 0 ) {
+      if( accounts.estimated_document_count() == 0 ) {
          auto now = std::chrono::duration_cast<std::chrono::milliseconds>(
                std::chrono::microseconds{fc::time_point::now().time_since_epoch().count()} );
 
@@ -1725,3 +1679,4 @@ void mongo_db_plugin::plugin_shutdown()
 }
 
 } // namespace eosio
+

From 806338ee903414750aae2773d5ae5d015824e278 Mon Sep 17 00:00:00 2001
From: UMU618 <umu618@hotmail.com>
Date: Fri, 26 Apr 2019 17:20:52 +0800
Subject: [PATCH 0215/1648] * fix normalizeJsonObject

---
 tests/Node.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Node.py b/tests/Node.py
index fc519a41569..0dc753c7de2 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -170,6 +170,7 @@ def normalizeJsonObject(extJStr):
         tmpStr=re.sub(r'ObjectId\("(\w+)"\)', r'"ObjectId-\1"', tmpStr)
         tmpStr=re.sub(r'ISODate\("([\w|\-|\:|\.]+)"\)', r'"ISODate-\1"', tmpStr)
         tmpStr=re.sub(r'NumberLong\("(\w+)"\)', r'"NumberLong-\1"', tmpStr)
+        tmpStr=re.sub(r'NumberLong\((\w+)\)', r'\1', tmpStr)
         return tmpStr
 
     @staticmethod

From e2b77b11524f2ba910214c5dd0237d7a9bb3189e Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Sun, 28 Apr 2019 04:20:43 -0400
Subject: [PATCH 0216/1648] embedding eos-vm

---
 libraries/CMakeLists.txt                      |  3 ++
 libraries/chain/CMakeLists.txt                |  4 +-
 .../eosio/chain/webassembly/eos-vm.hpp        | 32 ++++++++++++
 libraries/chain/webassembly/eos-vm.cpp        | 51 +++++++++++++++++++
 4 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
 create mode 100644 libraries/chain/webassembly/eos-vm.cpp

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 54bb2f80e09..292e7021f46 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -14,6 +14,9 @@ set(RUN_RE2C OFF CACHE BOOL "Run re2c")
 set(WITH_EXCEPTIONS ON CACHE BOOL "Build with exceptions enabled" FORCE)
 add_subdirectory( wabt )
 
+set(USE_EXISTING_SOFTFLOAT 1)
+add_subdirectory( eos-vm )
+
 set(ENABLE_STATIC ON)
 set(CMAKE_MACOSX_RPATH OFF)
 set(BUILD_ONLY_LIB ON CACHE BOOL "Library only build")
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 254d462c5ed..2b424855263 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -39,6 +39,7 @@ add_library( eosio_chain
 
              webassembly/wavm.cpp
              webassembly/wabt.cpp
+	     webassembly/eos-vm.cpp
 
 #             get_config.cpp
 #
@@ -56,11 +57,12 @@ add_library( eosio_chain
              )
 
 target_link_libraries( eosio_chain fc chainbase Logging IR WAST WASM Runtime
-                       softfloat builtins wabt
+                       softfloat builtins wabt eos-vm
                      )
 target_include_directories( eosio_chain
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"
                                    "${CMAKE_CURRENT_SOURCE_DIR}/../wasm-jit/Include"
+				   "${CMAKE_CURRENT_SOURCE_DIR}/libraries/eos-vm/include"
                                    "${CMAKE_SOURCE_DIR}/libraries/wabt"
                                    "${CMAKE_BINARY_DIR}/libraries/wabt"
                             )
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
new file mode 100644
index 00000000000..c60eac758a0
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <eosio/chain/webassembly/common.hpp>
+#include <eosio/chain/webassembly/runtime_interface.hpp>
+#include <eosio/chain/exceptions.hpp>
+#include <eosio/chain/apply_context.hpp>
+#include <softfloat_types.h>
+
+//eos-vm includes
+#include <eosio/wasm_backend/backend.hpp>
+
+namespace eosio { namespace chain { namespace webassembly { namespace eos_vm_runtime {
+
+using namespace fc;
+using namespace eosio::wasm_backend;
+using namespace eosio::chain::webassembly::common;
+
+class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
+   public:
+      eos_vm_runtime();
+      std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) override;
+
+      void immediately_exit_currently_running_module() override;
+
+   private:
+      backend* _bkend;  // non owning pointer to allow for immediate exit
+};
+
+#define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
+   eosio::wasm_backend::registered_host_functions<CLS>::add<&CLS::METHOD, eosio::wasm_backend::backend<CLS>>(#MOD, #NAME);
+
+} } } }// eosio::chain::webassembly::wabt_runtime
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
new file mode 100644
index 00000000000..04882cb6fb3
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -0,0 +1,51 @@
+#include <eosio/chain/webassembly/wabt.hpp>
+#include <eosio/chain/apply_context.hpp>
+#include <eosio/chain/wasm_eosio_constraints.hpp>
+
+//eos-vm includes
+#include <eosio/wasm_backend/backend.hpp>
+
+namespace eosio { namespace chain { namespace webassembly { namespace eos_vm_runtime {
+
+using namespace eosio::wasm_backend;
+
+namespace wasm_constraints = eosio::chain::wasm_constraints;
+
+using backend_t = backend<registered_host_functions<apply_context>>;
+
+class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
+   public:
+      
+      eos_vm_instantiated_module(std::unique_ptr<backend_t> mod) :
+         _instantiated_module(std::move(mod)) {}
+
+      void apply(apply_context& context) override {
+         _instantiated_module->set_wasm_allocator( context.get_wasm_allocator() );
+         if (!(const auto& res = _instantiated_module->run_start()))
+            EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
+
+         if (!(const auto& res = _instantiated_module(context.get_registered_host_functions(), "env", "apply",
+                                             (uint64_t)context.get_receiver(),
+                                             (uint64_t)context.get_action().account(),
+                                             (uint64_t)context.get_action().name))
+             EOS_ASSERT(false, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
+      }
+
+   private:
+      std::unique_ptr<backend_t> _instantiated_module;
+};
+
+eos_vm_runtime::eos_vm_runtime() {}
+
+std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
+   std::vector<uint8_t> cb((uint8_t*)code_bytes, (uint8_t*)code_bytes+code_size);
+   std::unique_ptr<backend_t> bkend = std::make_unique<backend>( cb );
+   _bkend = bkend.get();
+   return std::make_unique<wabt_instantiated_module>(std::move(bkend));
+}
+
+void eos_vm_runtime::immediately_exit_currently_running_module() {
+   _bkend->immediate_exit();
+}
+
+}}}}

From 75b9ca6f22d77f6be70903862b13642475ad47a5 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 29 Apr 2019 01:19:13 -0400
Subject: [PATCH 0217/1648] changes needed for new backend

---
 .../include/eosio/chain/wasm_interface.hpp    |  9 +-
 .../eosio/chain/wasm_interface_private.hpp    | 17 +++-
 .../eosio/chain/webassembly/common.hpp        |  3 +
 .../eosio/chain/webassembly/eos-vm.hpp        | 51 +++++++++-
 libraries/chain/wasm_interface.cpp            | 96 ++++++++++---------
 libraries/chain/webassembly/eos-vm.cpp        | 31 +++---
 .../testing/include/eosio/testing/tester.hpp  |  2 +
 plugins/chain_plugin/chain_plugin.cpp         |  2 +-
 8 files changed, 139 insertions(+), 72 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index 341331989e5..7c2bfa9eb75 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -3,6 +3,7 @@
 #include <eosio/chain/types.hpp>
 #include <eosio/chain/whitelisted_intrinsics.hpp>
 #include <eosio/chain/exceptions.hpp>
+#include <eosio/wasm_backend/allocator.hpp>
 #include "Runtime/Linker.h"
 #include "Runtime/Runtime.h"
 
@@ -73,7 +74,8 @@ namespace eosio { namespace chain {
       public:
          enum class vm_type {
             wavm,
-            wabt
+            wabt,
+	    eos_vm
          };
 
          wasm_interface(vm_type vm, const chainbase::database& db);
@@ -84,6 +86,9 @@ namespace eosio { namespace chain {
 
          //validates code -- does a WASM validation pass and checks the wasm against EOSIO specific constraints
          static void validate(const controller& control, const bytes& code);
+	 
+	 //get the wasm_allocator used for the linear memory for wasm
+	 static wasm_backend::wasm_allocator* get_wasm_allocator();
 
          //indicate that a particular code probably won't be used after given block_num
          void code_block_num_last_used(const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, const uint32_t& block_num);
@@ -108,4 +113,4 @@ namespace eosio{ namespace chain {
    std::istream& operator>>(std::istream& in, wasm_interface::vm_type& runtime);
 }}
 
-FC_REFLECT_ENUM( eosio::chain::wasm_interface::vm_type, (wavm)(wabt) )
+FC_REFLECT_ENUM( eosio::chain::wasm_interface::vm_type, (wavm)(wabt)(eos_vm) )
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 45f70460b02..cf8df0afa9e 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -3,6 +3,7 @@
 #include <eosio/chain/wasm_interface.hpp>
 #include <eosio/chain/webassembly/wavm.hpp>
 #include <eosio/chain/webassembly/wabt.hpp>
+#include <eosio/chain/webassembly/eos-vm.hpp>
 #include <eosio/chain/webassembly/runtime_interface.hpp>
 #include <eosio/chain/wasm_eosio_injection.hpp>
 #include <eosio/chain/transaction_context.hpp>
@@ -16,10 +17,14 @@
 #include "WAST/WAST.h"
 #include "IR/Validate.h"
 
+#include <eosio/wasm_backend/allocator.hpp>
+
 using namespace fc;
 using namespace eosio::chain::webassembly;
+using namespace eosio::wasm_backend;
 using namespace IR;
 using namespace Runtime;
+
 using boost::multi_index_container;
 
 namespace eosio { namespace chain {
@@ -42,6 +47,8 @@ namespace eosio { namespace chain {
             runtime_interface = std::make_unique<webassembly::wavm::wavm_runtime>();
          else if(vm == wasm_interface::vm_type::wabt)
             runtime_interface = std::make_unique<webassembly::wabt_runtime::wabt_runtime>();
+         else if(vm == wasm_interface::vm_type::eos_vm)
+            runtime_interface = std::make_unique<webassembly::eos_vm_runtime::eos_vm_runtime>();
          else
             EOS_THROW(wasm_exception, "wasm_interface_impl fall through");
       }
@@ -54,6 +61,11 @@ namespace eosio { namespace chain {
                });
       }
 
+      static wasm_allocator* get_wasm_allocator() {
+         thread_local wasm_allocator walloc;
+	 return &walloc;
+      }
+
       std::vector<uint8_t> parse_initial_memory(const Module& module) {
          std::vector<uint8_t> mem_image;
 
@@ -167,8 +179,9 @@ namespace eosio { namespace chain {
    };
 
 #define _REGISTER_INTRINSIC_EXPLICIT(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
-   _REGISTER_WAVM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
-   _REGISTER_WABT_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)
+   _REGISTER_WAVM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)         \
+   _REGISTER_WABT_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)         \
+   _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)
 
 #define _REGISTER_INTRINSIC4(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
    _REGISTER_INTRINSIC_EXPLICIT(CLS, MOD, METHOD, WASM_SIG, NAME, SIG )
diff --git a/libraries/chain/include/eosio/chain/webassembly/common.hpp b/libraries/chain/include/eosio/chain/webassembly/common.hpp
index 723bd3039b6..542d3c5b37e 100644
--- a/libraries/chain/include/eosio/chain/webassembly/common.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/common.hpp
@@ -58,6 +58,8 @@ namespace eosio { namespace chain {
     */
    template<typename T>
    struct array_ptr {
+      using type = T;
+      array_ptr() = default;
       explicit array_ptr (T * value) : value(value) {}
 
       typename std::add_lvalue_reference<T>::type operator*() const {
@@ -80,6 +82,7 @@ namespace eosio { namespace chain {
     * class to represent an in-wasm-memory char array that must be null terminated
     */
    struct null_terminated_ptr {
+      null_terminated_ptr() = default;
       explicit null_terminated_ptr(char* value) : value(value) {}
 
       typename std::add_lvalue_reference<char>::type operator*() const {
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index c60eac758a0..fbd2b996b2d 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -9,6 +9,45 @@
 //eos-vm includes
 #include <eosio/wasm_backend/backend.hpp>
 
+// eosio specific specializations
+namespace eosio { namespace wasm_backend {
+   template <>
+   struct reduce_type<chain::name> {
+      typedef uint64_t type;
+   };
+
+   template <typename S, typename T, typename Backend>
+   constexpr auto get_value(Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i64_const_t, T> && 
+                                                          std::is_same_v<chain::name, std::decay_t<S>>, S> {
+      return {(uint64_t)val.data.ui};
+   } 
+   // we can clean these up if we go with custom vms
+   template <typename T>
+   struct reduce_type<eosio::chain::array_ptr<T>> {
+      typedef uint32_t type;
+   };
+   
+   template <typename S, typename T, typename Backend>
+   constexpr auto get_value(Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
+   						  std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
+						 !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
+      return eosio::chain::array_ptr<typename S::type>((typename S::type*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui));
+   }
+
+   template <>
+   struct reduce_type<eosio::chain::null_terminated_ptr> {
+      typedef uint32_t type;
+   };
+   
+   template <typename S, typename T, typename Backend>
+   constexpr auto get_value(Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
+   						  std::is_same_v< eosio::chain::null_terminated_ptr, S> &&
+						 !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
+      return eosio::chain::null_terminated_ptr((char*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui));
+   }
+
+}} // ns eosio::wasm_backend
+
 namespace eosio { namespace chain { namespace webassembly { namespace eos_vm_runtime {
 
 using namespace fc;
@@ -20,13 +59,17 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
       eos_vm_runtime();
       std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) override;
 
-      void immediately_exit_currently_running_module() override;
+      void immediately_exit_currently_running_module() override { _bkend->immediate_exit(); }
 
    private:
-      backend* _bkend;  // non owning pointer to allow for immediate exit
+      backend<apply_context>* _bkend;  // non owning pointer to allow for immediate exit
 };
 
+} } } }// eosio::chain::webassembly::wabt_runtime
+
+#define __EOS_VM_INTRINSIC_NAME(LBL, SUF) LBL##SUF
+#define _EOS_VM_INTRINSIC_NAME(LBL, SUF) __INTRINSIC_NAME(LBL, SUF)
+
 #define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
-   eosio::wasm_backend::registered_host_functions<CLS>::add<&CLS::METHOD, eosio::wasm_backend::backend<CLS>>(#MOD, #NAME);
+   eosio::wasm_backend::registered_function<CLS, &CLS::METHOD, eosio::wasm_backend::backend<CLS>> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__){MOD, NAME};
 
-} } } }// eosio::chain::webassembly::wabt_runtime
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 079983c89e9..ba616952216 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -25,6 +25,8 @@
 #include <fstream>
 #include <string.h>
 
+#include <eosio/wasm_backend/allocator.hpp>
+
 namespace eosio { namespace chain {
    using namespace webassembly;
    using namespace webassembly::common;
@@ -33,6 +35,8 @@ namespace eosio { namespace chain {
 
    wasm_interface::~wasm_interface() {}
 
+   wasm_allocator* wasm_interface::get_wasm_allocator() { return wasm_interface_impl::get_wasm_allocator(); }
+
    void wasm_interface::validate(const controller& control, const bytes& code) {
       Module module;
       try {
@@ -246,19 +250,19 @@ class softfloat_api : public context_aware_api {
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
       // float binops
       float _eosio_f32_add( float a, float b ) {
-         float32_t ret = f32_add( to_softfloat32(a), to_softfloat32(b) );
+         float32_t ret = ::f32_add( to_softfloat32(a), to_softfloat32(b) );
          return *reinterpret_cast<float*>(&ret);
       }
       float _eosio_f32_sub( float a, float b ) {
-         float32_t ret = f32_sub( to_softfloat32(a), to_softfloat32(b) );
+         float32_t ret = ::f32_sub( to_softfloat32(a), to_softfloat32(b) );
          return *reinterpret_cast<float*>(&ret);
       }
       float _eosio_f32_div( float a, float b ) {
-         float32_t ret = f32_div( to_softfloat32(a), to_softfloat32(b) );
+         float32_t ret = ::f32_div( to_softfloat32(a), to_softfloat32(b) );
          return *reinterpret_cast<float*>(&ret);
       }
       float _eosio_f32_mul( float a, float b ) {
-         float32_t ret = f32_mul( to_softfloat32(a), to_softfloat32(b) );
+         float32_t ret = ::f32_mul( to_softfloat32(a), to_softfloat32(b) );
          return *reinterpret_cast<float*>(&ret);
       }
 #pragma GCC diagnostic pop
@@ -274,7 +278,7 @@ class softfloat_api : public context_aware_api {
          if ( f32_sign_bit(a) != f32_sign_bit(b) ) {
             return f32_sign_bit(a) ? af : bf;
          }
-         return f32_lt(a,b) ? af : bf;
+	 return ::f32_lt(a,b) ? af : bf;
       }
       float _eosio_f32_max( float af, float bf ) {
          float32_t a = to_softfloat32(af);
@@ -288,7 +292,7 @@ class softfloat_api : public context_aware_api {
          if ( f32_sign_bit(a) != f32_sign_bit(b) ) {
             return f32_sign_bit(a) ? bf : af;
          }
-         return f32_lt( a, b ) ? bf : af;
+	 return ::f32_lt( a, b ) ? bf : af;
       }
       float _eosio_f32_copysign( float af, float bf ) {
          float32_t a = to_softfloat32(af);
@@ -313,7 +317,7 @@ class softfloat_api : public context_aware_api {
          return from_softfloat32(a);
       }
       float _eosio_f32_sqrt( float a ) {
-         float32_t ret = f32_sqrt( to_softfloat32(a) );
+         float32_t ret = ::f32_sqrt( to_softfloat32(a) );
          return from_softfloat32(ret);
       }
       // ceil, floor, trunc and nearest are lifted from libc
@@ -382,19 +386,19 @@ class softfloat_api : public context_aware_api {
          if (e >= 0x7f+23)
             return af;
          if (s)
-            y = f32_add( f32_sub( a, float32_t{inv_float_eps} ), float32_t{inv_float_eps} );
+            y = ::f32_add( ::f32_sub( a, float32_t{inv_float_eps} ), float32_t{inv_float_eps} );
          else
-            y = f32_sub( f32_add( a, float32_t{inv_float_eps} ), float32_t{inv_float_eps} );
-         if (f32_eq( y, {0} ) )
+            y = ::f32_sub( ::f32_add( a, float32_t{inv_float_eps} ), float32_t{inv_float_eps} );
+         if (::f32_eq( y, {0} ) )
             return s ? -0.0f : 0.0f;
          return from_softfloat32(y);
       }
 
       // float relops
-      bool _eosio_f32_eq( float a, float b ) {  return f32_eq( to_softfloat32(a), to_softfloat32(b) ); }
-      bool _eosio_f32_ne( float a, float b ) { return !f32_eq( to_softfloat32(a), to_softfloat32(b) ); }
-      bool _eosio_f32_lt( float a, float b ) { return f32_lt( to_softfloat32(a), to_softfloat32(b) ); }
-      bool _eosio_f32_le( float a, float b ) { return f32_le( to_softfloat32(a), to_softfloat32(b) ); }
+      bool _eosio_f32_eq( float a, float b ) {  return ::f32_eq( to_softfloat32(a), to_softfloat32(b) ); }
+      bool _eosio_f32_ne( float a, float b ) { return !::f32_eq( to_softfloat32(a), to_softfloat32(b) ); }
+      bool _eosio_f32_lt( float a, float b ) { return ::f32_lt( to_softfloat32(a), to_softfloat32(b) ); }
+      bool _eosio_f32_le( float a, float b ) { return ::f32_le( to_softfloat32(a), to_softfloat32(b) ); }
       bool _eosio_f32_gt( float af, float bf ) {
          float32_t a = to_softfloat32(af);
          float32_t b = to_softfloat32(bf);
@@ -402,7 +406,7 @@ class softfloat_api : public context_aware_api {
             return false;
          if (is_nan(b))
             return false;
-         return !f32_le( a, b );
+         return !::f32_le( a, b );
       }
       bool _eosio_f32_ge( float af, float bf ) {
          float32_t a = to_softfloat32(af);
@@ -411,24 +415,24 @@ class softfloat_api : public context_aware_api {
             return false;
          if (is_nan(b))
             return false;
-         return !f32_lt( a, b );
+         return !::f32_lt( a, b );
       }
 
       // double binops
       double _eosio_f64_add( double a, double b ) {
-         float64_t ret = f64_add( to_softfloat64(a), to_softfloat64(b) );
+         float64_t ret = ::f64_add( to_softfloat64(a), to_softfloat64(b) );
          return from_softfloat64(ret);
       }
       double _eosio_f64_sub( double a, double b ) {
-         float64_t ret = f64_sub( to_softfloat64(a), to_softfloat64(b) );
+         float64_t ret = ::f64_sub( to_softfloat64(a), to_softfloat64(b) );
          return from_softfloat64(ret);
       }
       double _eosio_f64_div( double a, double b ) {
-         float64_t ret = f64_div( to_softfloat64(a), to_softfloat64(b) );
+         float64_t ret = ::f64_div( to_softfloat64(a), to_softfloat64(b) );
          return from_softfloat64(ret);
       }
       double _eosio_f64_mul( double a, double b ) {
-         float64_t ret = f64_mul( to_softfloat64(a), to_softfloat64(b) );
+         float64_t ret = ::f64_mul( to_softfloat64(a), to_softfloat64(b) );
          return from_softfloat64(ret);
       }
       double _eosio_f64_min( double af, double bf ) {
@@ -440,7 +444,7 @@ class softfloat_api : public context_aware_api {
             return bf;
          if (f64_sign_bit(a) != f64_sign_bit(b))
             return f64_sign_bit(a) ? af : bf;
-         return f64_lt( a, b ) ? af : bf;
+	 return ::f64_lt( a, b ) ? af : bf;
       }
       double _eosio_f64_max( double af, double bf ) {
          float64_t a = to_softfloat64(af);
@@ -451,7 +455,7 @@ class softfloat_api : public context_aware_api {
             return bf;
          if (f64_sign_bit(a) != f64_sign_bit(b))
             return f64_sign_bit(a) ? bf : af;
-         return f64_lt( a, b ) ? bf : af;
+	 return ::f64_lt( a, b ) ? bf : af;
       }
       double _eosio_f64_copysign( double af, double bf ) {
          float64_t a = to_softfloat64(af);
@@ -477,7 +481,7 @@ class softfloat_api : public context_aware_api {
          return from_softfloat64(a);
       }
       double _eosio_f64_sqrt( double a ) {
-         float64_t ret = f64_sqrt( to_softfloat64(a) );
+         float64_t ret = ::f64_sqrt( to_softfloat64(a) );
          return from_softfloat64(ret);
       }
       // ceil, floor, trunc and nearest are lifted from libc
@@ -486,22 +490,22 @@ class softfloat_api : public context_aware_api {
          float64_t ret;
          int e = a.v >> 52 & 0x7ff;
          float64_t y;
-         if (e >= 0x3ff+52 || f64_eq( a, { 0 } ))
+         if (e >= 0x3ff+52 || ::f64_eq( a, { 0 } ))
             return af;
          /* y = int(x) - x, where int(x) is an integer neighbor of x */
          if (a.v >> 63)
-            y = f64_sub( f64_add( f64_sub( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} ), a );
+            y = ::f64_sub( ::f64_add( ::f64_sub( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} ), a );
          else
-            y = f64_sub( f64_sub( f64_add( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} ), a );
+            y = ::f64_sub( ::f64_sub( ::f64_add( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} ), a );
          /* special case because of non-nearest rounding modes */
          if (e <= 0x3ff-1) {
             return a.v >> 63 ? -0.0 : 1.0; //float64_t{0x8000000000000000} : float64_t{0xBE99999A3F800000}; //either -0.0 or 1
          }
-         if (f64_lt( y, to_softfloat64(0) )) {
-            ret = f64_add( f64_add( a, y ), to_softfloat64(1) ); // 0xBE99999A3F800000 } ); // plus 1
+         if (::f64_lt( y, to_softfloat64(0) )) {
+            ret = ::f64_add( ::f64_add( a, y ), to_softfloat64(1) ); // 0xBE99999A3F800000 } ); // plus 1
             return from_softfloat64(ret);
          }
-         ret = f64_add( a, y );
+         ret = ::f64_add( a, y );
          return from_softfloat64(ret);
       }
       double _eosio_f64_floor( double af ) {
@@ -517,17 +521,17 @@ class softfloat_api : public context_aware_api {
             return af;
          }
          if (a.v >> 63)
-            y = f64_sub( f64_add( f64_sub( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} ), a );
+            y = ::f64_sub( ::f64_add( ::f64_sub( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} ), a );
          else
-            y = f64_sub( f64_sub( f64_add( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} ), a );
+            y = ::f64_sub( ::f64_sub( ::f64_add( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} ), a );
          if (e <= 0x3FF-1) {
             return a.v>>63 ? -1.0 : 0.0; //float64_t{0xBFF0000000000000} : float64_t{0}; // -1 or 0
          }
-         if ( !f64_le( y, float64_t{0} ) ) {
-            ret = f64_sub( f64_add(a,y), to_softfloat64(1.0));
+         if ( !::f64_le( y, float64_t{0} ) ) {
+            ret = ::f64_sub( ::f64_add(a,y), to_softfloat64(1.0));
             return from_softfloat64(ret);
          }
-         ret = f64_add( a, y );
+         ret = ::f64_add( a, y );
          return from_softfloat64(ret);
       }
       double _eosio_f64_trunc( double af ) {
@@ -553,19 +557,19 @@ class softfloat_api : public context_aware_api {
          if ( e >= 0x3FF+52 )
             return af;
          if ( s )
-            y = f64_add( f64_sub( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} );
+            y = ::f64_add( ::f64_sub( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} );
          else
-            y = f64_sub( f64_add( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} );
-         if ( f64_eq( y, float64_t{0} ) )
+            y = ::f64_sub( ::f64_add( a, float64_t{inv_double_eps} ), float64_t{inv_double_eps} );
+         if ( ::f64_eq( y, float64_t{0} ) )
             return s ? -0.0 : 0.0;
          return from_softfloat64(y);
       }
 
       // double relops
-      bool _eosio_f64_eq( double a, double b ) { return f64_eq( to_softfloat64(a), to_softfloat64(b) ); }
-      bool _eosio_f64_ne( double a, double b ) { return !f64_eq( to_softfloat64(a), to_softfloat64(b) ); }
-      bool _eosio_f64_lt( double a, double b ) { return f64_lt( to_softfloat64(a), to_softfloat64(b) ); }
-      bool _eosio_f64_le( double a, double b ) { return f64_le( to_softfloat64(a), to_softfloat64(b) ); }
+      bool _eosio_f64_eq( double a, double b ) { return ::f64_eq( to_softfloat64(a), to_softfloat64(b) ); }
+      bool _eosio_f64_ne( double a, double b ) { return !::f64_eq( to_softfloat64(a), to_softfloat64(b) ); }
+      bool _eosio_f64_lt( double a, double b ) { return ::f64_lt( to_softfloat64(a), to_softfloat64(b) ); }
+      bool _eosio_f64_le( double a, double b ) { return ::f64_le( to_softfloat64(a), to_softfloat64(b) ); }
       bool _eosio_f64_gt( double af, double bf ) {
          float64_t a = to_softfloat64(af);
          float64_t b = to_softfloat64(bf);
@@ -573,7 +577,7 @@ class softfloat_api : public context_aware_api {
             return false;
          if (is_nan(b))
             return false;
-         return !f64_le( a, b );
+         return !::f64_le( a, b );
       }
       bool _eosio_f64_ge( double af, double bf ) {
          float64_t a = to_softfloat64(af);
@@ -582,7 +586,7 @@ class softfloat_api : public context_aware_api {
             return false;
          if (is_nan(b))
             return false;
-         return !f64_lt( a, b );
+         return !::f64_lt( a, b );
       }
 
       // float and double conversions
@@ -906,8 +910,8 @@ class authorization_api : public context_aware_api {
       return context.has_authorization( account );
    }
 
-   void require_authorization(const account_name& account,
-                                                 const permission_name& permission) {
+   void require_authorization2(const account_name& account,
+			       const permission_name& permission) {
       context.require_authorization( account, permission );
    }
 
@@ -1846,7 +1850,7 @@ REGISTER_INTRINSICS(action_api,
 REGISTER_INTRINSICS(authorization_api,
    (require_recipient,     void(int64_t)          )
    (require_authorization, void(int64_t), "require_auth", void(authorization_api::*)(const account_name&) )
-   (require_authorization, void(int64_t, int64_t), "require_auth2", void(authorization_api::*)(const account_name&, const permission_name& permission) )
+   (require_authorization2, void(int64_t, int64_t), "require_auth2", void(authorization_api::*)(const account_name&, const permission_name& permission) )
    (has_authorization,     int(int64_t), "has_auth", bool(authorization_api::*)(const account_name&)const )
    (is_account,            int(int64_t)           )
 );
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 04882cb6fb3..176a1383fa5 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -1,4 +1,4 @@
-#include <eosio/chain/webassembly/wabt.hpp>
+#include <eosio/chain/webassembly/eos-vm.hpp>
 #include <eosio/chain/apply_context.hpp>
 #include <eosio/chain/wasm_eosio_constraints.hpp>
 
@@ -11,7 +11,7 @@ using namespace eosio::wasm_backend;
 
 namespace wasm_constraints = eosio::chain::wasm_constraints;
 
-using backend_t = backend<registered_host_functions<apply_context>>;
+using backend_t = backend<apply_context>;
 
 class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
    public:
@@ -20,15 +20,15 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          _instantiated_module(std::move(mod)) {}
 
       void apply(apply_context& context) override {
-         _instantiated_module->set_wasm_allocator( context.get_wasm_allocator() );
-         if (!(const auto& res = _instantiated_module->run_start()))
-            EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
-
-         if (!(const auto& res = _instantiated_module(context.get_registered_host_functions(), "env", "apply",
-                                             (uint64_t)context.get_receiver(),
-                                             (uint64_t)context.get_action().account(),
-                                             (uint64_t)context.get_action().name))
-             EOS_ASSERT(false, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
+         _instantiated_module->set_wasm_allocator( wasm_interface::get_wasm_allocator() );
+         //if (!(const auto& res = _instantiated_module->run_start()))
+         //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
+         
+         const auto& res = _instantiated_module->call(&context, "env", "apply",
+                                          (uint64_t)context.get_receiver(),
+                                          (uint64_t)context.get_action().account,
+                                          (uint64_t)context.get_action().name);
+         //EOS_ASSERT(res, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
       }
 
    private:
@@ -39,13 +39,10 @@ eos_vm_runtime::eos_vm_runtime() {}
 
 std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
    std::vector<uint8_t> cb((uint8_t*)code_bytes, (uint8_t*)code_bytes+code_size);
-   std::unique_ptr<backend_t> bkend = std::make_unique<backend>( cb );
+   std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>( cb );
+   registered_host_functions<apply_context>::resolve(bkend->get_module());
    _bkend = bkend.get();
-   return std::make_unique<wabt_instantiated_module>(std::move(bkend));
-}
-
-void eos_vm_runtime::immediately_exit_currently_running_module() {
-   _bkend->immediate_exit();
+   return std::make_unique<eos_vm_instantiated_module>(std::move(bkend));
 }
 
 }}}}
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index cda857ff2c2..83140682834 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -387,6 +387,8 @@ namespace eosio { namespace testing {
                vcfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
             else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
                vcfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
+            else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--eos-vm"))
+               vcfg.wasm_runtime = chain::wasm_interface::vm_type::eos_vm;
          }
          return vcfg;
       }
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 4c0ef6acdb0..27bc99aad9f 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -213,7 +213,7 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
          ("protocol-features-dir", bpo::value<bfs::path>()->default_value("protocol_features"),
           "the location of the protocol_features directory (absolute path or relative to application config dir)")
          ("checkpoint", bpo::value<vector<string>>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.")
-         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("wavm/wabt"), "Override default WASM runtime")
+         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("wavm/wabt/eos-vm"), "Override default WASM runtime")
          ("abi-serializer-max-time-ms", bpo::value<uint32_t>()->default_value(config::default_abi_serializer_max_time_ms),
           "Override default maximum ABI serialization time allowed in ms")
          ("chain-state-db-size-mb", bpo::value<uint64_t>()->default_value(config::default_state_size / (1024  * 1024)), "Maximum size (in MiB) of the chain state database")

From 15d31ffb8003c3d06a701f43016ac5a981364dfe Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 29 Apr 2019 11:04:57 -0400
Subject: [PATCH 0218/1648] bump version to 1.9.0-develop

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abba4ccde42..8c6753dd7a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,9 +30,9 @@ set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 8)
+set(VERSION_MINOR 9)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX rc1)
+set(VERSION_SUFFIX develop)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

From d62678921ed624027b3ef01a099df2e457675923 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 29 Apr 2019 13:13:27 -0400
Subject: [PATCH 0219/1648] solved issue with linking

---
 libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index fbd2b996b2d..01a3ea19483 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -70,6 +70,7 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
 #define __EOS_VM_INTRINSIC_NAME(LBL, SUF) LBL##SUF
 #define _EOS_VM_INTRINSIC_NAME(LBL, SUF) __INTRINSIC_NAME(LBL, SUF)
 
-#define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
-   eosio::wasm_backend::registered_function<CLS, &CLS::METHOD, eosio::wasm_backend::backend<CLS>> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__){MOD, NAME};
+#define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG) \
+   eosio::wasm_backend::registered_function<eosio::chain::apply_context, CLS, &CLS::METHOD, eosio::wasm_backend::backend<eosio::chain::apply_context>> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__)(std::string(MOD), std::string(NAME));
+
 

From a01d6471330d48c7b52891ed83ef4ac165e4a406 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 29 Apr 2019 13:25:05 -0400
Subject: [PATCH 0220/1648] Remove unused cpack bits; these are not being used

---
 CMakeLists.txt               |  4 ---
 CMakeModules/installer.cmake | 49 ------------------------------
 debian/CMakeLists.txt        |  1 -
 debian/postinst              | 58 ------------------------------------
 4 files changed, 112 deletions(-)
 delete mode 100644 CMakeModules/installer.cmake
 delete mode 100644 debian/CMakeLists.txt
 delete mode 100755 debian/postinst

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c6753dd7a5..cd7896c6154 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,9 +43,6 @@ endif()
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )
 set( KEY_STORE_EXECUTABLE_NAME keosd )
-set( GUI_CLIENT_EXECUTABLE_NAME eosio )
-set( CUSTOM_URL_SCHEME "gcs" )
-set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
 
 # http://stackoverflow.com/a/18369825
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@@ -221,7 +218,6 @@ add_subdirectory( scripts )
 add_subdirectory( unittests )
 add_subdirectory( tests )
 add_subdirectory( tools )
-add_subdirectory( debian )
 
 install_directory_permissions(DIRECTORY ${CMAKE_INSTALL_FULL_SYSCONFDIR}/eosio)
 
diff --git a/CMakeModules/installer.cmake b/CMakeModules/installer.cmake
deleted file mode 100644
index e4ca2b7e01f..00000000000
--- a/CMakeModules/installer.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-include(InstallRequiredSystemLibraries)
-
-#install_directory_permissions( DIRECTORY usr/${CMAKE_INSTALL_INCLUDEDIR}/eosio )
-
-set(CPACK_PACKAGE_CONTACT "support@block.one")
-set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_BINARY_DIR}/packages)
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
-endif()
-
-SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/install")
-set(CPACK_PACKAGE_NAME "EOS.IO")
-set(CPACK_PACKAGE_VENDOR "block.one")
-set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_DESCRIPTION "Software for the EOS.IO network")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Software for the EOS.IO network")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "EOS.IO ${CPACK_PACKAGE_VERSION}")
-
-if(WIN32)
-  set(CPACK_GENERATOR "ZIP;NSIS")
-  set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
-  set(CPACK_NSIS_PACKAGE_NAME "EOS.IO v${CPACK_PACKAGE_VERSION}")
-  set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
-  set(CPACK_NSIS_DEFINES "  !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"EOS.IO\\\"")
-  # windows zip files usually don't have a single directory inside them, unix tgz usually do
-  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
-elseif(APPLE)
-  set(CPACK_GENERATOR "DragNDrop")
-else()
-  set(CPACK_GENERATOR "DEB")
-  set(CPACK_DEBIAN_PACKAGE_RELEASE 0)
-  if(CMAKE_VERSION VERSION_GREATER 3.6.0) # Buggy in 3.5, behaves like VERSION_GREATER_EQUAL
-    set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-  else()
-    string(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_DEBIAN_PACKAGE_NAME)
-    execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
-    SET(CPACK_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE})
-  endif()
-  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE)
-  set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE)
-  set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/EOSIO/eos")
-endif()
-
-include(CPack)
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
deleted file mode 100644
index d56b72cde2a..00000000000
--- a/debian/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst" PARENT_SCOPE)
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index 42123695c90..00000000000
--- a/debian/postinst
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-# postinst script for eosio
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-set -e
-
-PACKAGE="eosio"
-USER="eosio"
-GROUP=${USER}
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-# source debconf library
-. /usr/share/debconf/confmodule
-
-case "$1" in
-
-  configure)
-    set +e
-    getent passwd ${USER} > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-      adduser --no-create-home --group --system ${USER}
-    fi
-    set -e
-    chown ${USER}:${GROUP} /var/log/${PACKAGE}
-    chown ${USER}:${GROUP} /var/lib/${PACKAGE}
-    chown ${USER}:${GROUP} /etc/${PACKAGE}
-    chown ${USER}:${GROUP} /etc/${PACKAGE}/node_00
-    chown ${USER} /usr/bin/nodeos
-    chmod u+s /usr/bin/nodeos
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    exit 0
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-
-esac
-
-exit 0

From cc0092bc948d2fab18e5c26f257e6f598d0bce5e Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Mon, 29 Apr 2019 19:28:32 -0400
Subject: [PATCH 0221/1648] new problems

---
 .../eosio/chain/webassembly/eos-vm.hpp        | 33 ++++++++++++++-----
 libraries/chain/webassembly/eos-vm.cpp        | 10 ++++--
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 01a3ea19483..f6d12ca7406 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -16,8 +16,8 @@ namespace eosio { namespace wasm_backend {
       typedef uint64_t type;
    };
 
-   template <typename S, typename T, typename Backend>
-   constexpr auto get_value(Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i64_const_t, T> && 
+   template <typename S, typename Args, size_t I, typename T, typename Backend, typename Cleanups>
+   constexpr auto get_value(eosio::wasm_backend::operand_stack<Backend>& op, Cleanups&, Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i64_const_t, T> && 
                                                           std::is_same_v<chain::name, std::decay_t<S>>, S> {
       return {(uint64_t)val.data.ui};
    } 
@@ -27,11 +27,26 @@ namespace eosio { namespace wasm_backend {
       typedef uint32_t type;
    };
    
-   template <typename S, typename T, typename Backend>
-   constexpr auto get_value(Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
+   template <typename S, typename Args, size_t I, typename T, typename Backend, typename Cleanups>
+   constexpr auto get_value(eosio::wasm_backend::operand_stack<Backend>& op, Cleanups& cleanups, Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
    						  std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
-						 !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
-      return eosio::chain::array_ptr<typename S::type>((typename S::type*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui));
+                      !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
+      size_t i = std::tuple_size<Args>::value-1;
+      auto* ptr = (*((std::remove_reference_t<S>*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui)));
+      if constexpr (std::tuple_size<Args>::value > I) {
+         const auto& len = std::get<to_wasm_t<typename std::tuple_element<I, Args>::type>>(op.get_back(i-I));
+         if ((uintptr_t)ptr % alignof(S) != 0) {
+            align_ptr_triple apt;
+            apt.s = sizeof(S)*len;
+            std::vector<std::remove_const_t<T>> cpy(len > 0 ? len : 1);
+            apt.o = ptr;
+            S* ptr = &cpy[0];
+            apt.n = ptr;
+            memcpy(apt.n, apt.o, apt.s);
+            cleanups.emplace_back(std::move(apt));
+         }
+      }
+      return eosio::chain::array_ptr<typename S::type>(ptr);
    }
 
    template <>
@@ -39,9 +54,9 @@ namespace eosio { namespace wasm_backend {
       typedef uint32_t type;
    };
    
-   template <typename S, typename T, typename Backend>
-   constexpr auto get_value(Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
-   						  std::is_same_v< eosio::chain::null_terminated_ptr, S> &&
+   template <typename S, typename Args, size_t I, typename T, typename Backend, typename Cleanups>
+   constexpr auto get_value(eosio::wasm_backend::operand_stack<Backend>& op, Cleanups&, Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
+                    std::is_same_v< eosio::chain::null_terminated_ptr, S> &&
 						 !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
       return eosio::chain::null_terminated_ptr((char*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui));
    }
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 176a1383fa5..8693aaf4931 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -1,7 +1,7 @@
 #include <eosio/chain/webassembly/eos-vm.hpp>
 #include <eosio/chain/apply_context.hpp>
 #include <eosio/chain/wasm_eosio_constraints.hpp>
-
+#include <fstream>
 //eos-vm includes
 #include <eosio/wasm_backend/backend.hpp>
 
@@ -38,7 +38,13 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
 eos_vm_runtime::eos_vm_runtime() {}
 
 std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
-   std::vector<uint8_t> cb((uint8_t*)code_bytes, (uint8_t*)code_bytes+code_size);
+   //std::vector<uint8_t> cb((uint8_t*)code_bytes, (uint8_t*)code_bytes+code_size);
+   std::vector<uint8_t> cb;
+   cb.resize(code_size);
+   memcpy(cb.data(), code_bytes, code_size);
+   std::ofstream mf("temp.wasm");
+   mf.write((char*)cb.data(), cb.size());
+   mf.close();
    std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>( cb );
    registered_host_functions<apply_context>::resolve(bkend->get_module());
    _bkend = bkend.get();

From f546b2676021bfcde60f9a158def714c14cc402a Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 25 Apr 2019 17:00:50 -0400
Subject: [PATCH 0222/1648] Created pipeline configuration file

---
 pipeline.jsonc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pipeline.jsonc

diff --git a/pipeline.jsonc b/pipeline.jsonc
new file mode 100644
index 00000000000..1db80900c51
--- /dev/null
+++ b/pipeline.jsonc
@@ -0,0 +1,50 @@
+{
+    "eosio":
+    {
+        "pipeline-branch": "legacy-os",
+        "environment":
+        {
+            "DEBUG": "false",
+            "PIPELINE_BRANCH" : "legacy-os",
+            "BUILDKITE_LABEL" : "Ubuntu 18.04 Unit Tests",
+        }
+    },
+    "eosio-dot-cdt":
+    {
+        "pipeline-branch": "master",
+        "dependencies": // dependencies to pull for cdt integration tests, by branch, tag, or commit hash
+        {
+            "eosio": "release/1.7.x"
+        },
+        "environment":
+        {
+        
+        }
+    },
+    "eosio-dot-contracts":
+    {
+        "pipeline-branch": "master",
+        "dependencies": // dependencies to pull for a build of contracts, by branch, tag, or commit hash
+        {
+            "eosio": "9dfd8e2e1b2ab9acc9087b5c6a0bb878b4ad1d0f",
+            "eosio.cdt": "release/1.6.x"
+        }
+    },
+    "eos-multiversion-tests":
+    {
+        "pipeline-branch": "master",
+        "configuration":
+        [
+            "17=release/1.7.x",
+            "16=release/1.6.x",
+        ]
+    },
+    "eosio-sync-tests":
+    {
+        "pipeline-branch": "protocol-features-sync-nodes",
+        "environment":
+        {
+            "DEBUG": "false",
+        }
+    },
+}
\ No newline at end of file

From 9e88287fe4d24c739521313fea355a684ba02d76 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 25 Apr 2019 18:32:28 -0400
Subject: [PATCH 0223/1648] Fix commas

---
 pipeline.jsonc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 1db80900c51..af12c9570b9 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -6,7 +6,7 @@
         {
             "DEBUG": "false",
             "PIPELINE_BRANCH" : "legacy-os",
-            "BUILDKITE_LABEL" : "Ubuntu 18.04 Unit Tests",
+            "BUILDKITE_LABEL" : "Ubuntu 18.04 Unit Tests"
         }
     },
     "eosio-dot-cdt":
@@ -36,7 +36,7 @@
         "configuration":
         [
             "17=release/1.7.x",
-            "16=release/1.6.x",
+            "16=release/1.6.x"
         ]
     },
     "eosio-sync-tests":
@@ -44,7 +44,7 @@
         "pipeline-branch": "protocol-features-sync-nodes",
         "environment":
         {
-            "DEBUG": "false",
+            "DEBUG": "false"
         }
-    },
+    }
 }
\ No newline at end of file

From c46cb9ac4a6a143c972357b3ae97437d7cdc7305 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 26 Apr 2019 00:21:41 -0400
Subject: [PATCH 0224/1648] Updated multiversion configuration

---
 pipeline.jsonc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index af12c9570b9..c9f9729263a 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -35,8 +35,7 @@
         "pipeline-branch": "master",
         "configuration":
         [
-            "17=release/1.7.x",
-            "16=release/1.6.x"
+            "170=v1.7.0"
         ]
     },
     "eosio-sync-tests":

From c930318ec8cc9b0ef1efac6b04d99bb08706a60b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 29 Apr 2019 19:29:55 -0400
Subject: [PATCH 0225/1648] Multiversion tests now point to Areg's sync nodes
 branch

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index c9f9729263a..15449bb271d 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -32,7 +32,7 @@
     },
     "eos-multiversion-tests":
     {
-        "pipeline-branch": "master",
+        "pipeline-branch": "protocol-features-sync-nodes",
         "configuration":
         [
             "170=v1.7.0"

From 80fcfe28ae26c184a02b352b5139874081ef32cc Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 29 Apr 2019 19:38:17 -0400
Subject: [PATCH 0226/1648] Pipeline config needs a separate object for my beta
 testing pipeline

---
 pipeline.jsonc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 15449bb271d..546e27ff7a0 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -38,6 +38,14 @@
             "170=v1.7.0"
         ]
     },
+    "eos-multiversion-beta-tests":
+    {
+        "pipeline-branch": "protocol-features-sync-nodes",
+        "configuration":
+        [
+            "170=v1.7.0"
+        ]
+    },
     "eosio-sync-tests":
     {
         "pipeline-branch": "protocol-features-sync-nodes",

From ca5cd6a74c783d346f2cb3870eaf9fb014fd4a92 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 29 Apr 2019 20:10:53 -0400
Subject: [PATCH 0227/1648] Pipeline config points to correct multiversion
 pipeline branch

---
 .pipelinebranch | 1 -
 pipeline.jsonc  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 .pipelinebranch

diff --git a/.pipelinebranch b/.pipelinebranch
deleted file mode 100644
index e763e7d7fdc..00000000000
--- a/.pipelinebranch
+++ /dev/null
@@ -1 +0,0 @@
-protocol-features-sync-nodes
diff --git a/pipeline.jsonc b/pipeline.jsonc
index 546e27ff7a0..fb048d07359 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -40,7 +40,7 @@
     },
     "eos-multiversion-beta-tests":
     {
-        "pipeline-branch": "protocol-features-sync-nodes",
+        "pipeline-branch": "zach-pipeline-config-pfsn",
         "configuration":
         [
             "170=v1.7.0"

From c6dd8c8094925fab689756e0c0fcac369c2d14dd Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 29 Apr 2019 20:41:28 -0400
Subject: [PATCH 0228/1648] fixed issue

---
 .../include/eosio/chain/webassembly/eos-vm.hpp      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index f6d12ca7406..e195f9822bc 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -32,16 +32,17 @@ namespace eosio { namespace wasm_backend {
    						  std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
                       !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
       size_t i = std::tuple_size<Args>::value-1;
-      auto* ptr = (*((std::remove_reference_t<S>*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui)));
+      using ptr_ty = typename S::type;
+      auto* ptr = (ptr_ty*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui);
       if constexpr (std::tuple_size<Args>::value > I) {
-         const auto& len = std::get<to_wasm_t<typename std::tuple_element<I, Args>::type>>(op.get_back(i-I));
+         const auto& len = std::get<to_wasm_t<typename std::tuple_element<I, Args>::type>>(op.get_back(i-I)).data.ui;
          if ((uintptr_t)ptr % alignof(S) != 0) {
             align_ptr_triple apt;
             apt.s = sizeof(S)*len;
-            std::vector<std::remove_const_t<T>> cpy(len > 0 ? len : 1);
-            apt.o = ptr;
-            S* ptr = &cpy[0];
-            apt.n = ptr;
+            std::vector<typename std::remove_const_t<S>::type> cpy(len > 0 ? len : 1);
+            apt.o = (void*)ptr;
+	    ptr = &cpy[0];
+            apt.n = (void*)ptr;
             memcpy(apt.n, apt.o, apt.s);
             cleanups.emplace_back(std::move(apt));
          }

From 231798f1f2f6cdb2aff432829650ab453a537b01 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 29 Apr 2019 20:54:08 -0400
Subject: [PATCH 0229/1648] Pipeline configuration file now only has eos stuff

---
 pipeline.jsonc          | 30 +-----------------------------
 tests/multiversion.conf |  2 --
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 tests/multiversion.conf

diff --git a/pipeline.jsonc b/pipeline.jsonc
index fb048d07359..cda5a7ae4d8 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,33 +1,9 @@
 {
     "eosio":
-    {
-        "pipeline-branch": "legacy-os",
-        "environment":
-        {
-            "DEBUG": "false",
-            "PIPELINE_BRANCH" : "legacy-os",
-            "BUILDKITE_LABEL" : "Ubuntu 18.04 Unit Tests"
-        }
-    },
-    "eosio-dot-cdt":
     {
         "pipeline-branch": "master",
-        "dependencies": // dependencies to pull for cdt integration tests, by branch, tag, or commit hash
-        {
-            "eosio": "release/1.7.x"
-        },
         "environment":
         {
-        
-        }
-    },
-    "eosio-dot-contracts":
-    {
-        "pipeline-branch": "master",
-        "dependencies": // dependencies to pull for a build of contracts, by branch, tag, or commit hash
-        {
-            "eosio": "9dfd8e2e1b2ab9acc9087b5c6a0bb878b4ad1d0f",
-            "eosio.cdt": "release/1.6.x"
         }
     },
     "eos-multiversion-tests":
@@ -48,10 +24,6 @@
     },
     "eosio-sync-tests":
     {
-        "pipeline-branch": "protocol-features-sync-nodes",
-        "environment":
-        {
-            "DEBUG": "false"
-        }
+        "pipeline-branch": "protocol-features-sync-nodes"
     }
 }
\ No newline at end of file
diff --git a/tests/multiversion.conf b/tests/multiversion.conf
deleted file mode 100644
index 544263173a9..00000000000
--- a/tests/multiversion.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[eosio]
-170=v1.7.0

From 1d3f79fada3d6aedabf4e52cb6d49d14c89a79ec Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 30 Apr 2019 02:39:33 -0400
Subject: [PATCH 0230/1648] still working on it

---
 .../include/eosio/chain/webassembly/wabt.hpp  | 25 +++++++++++++++++++
 .../include/eosio/chain/webassembly/wavm.hpp  | 25 +++++++++++++++++++
 libraries/chain/wasm_interface.cpp            |  1 +
 libraries/chain/webassembly/eos-vm.cpp        |  3 ++-
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index 31456dc1dda..040505b014b 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -686,23 +686,48 @@ struct intrinsic_function_invoker<void, MethodSig, Cls, Params...> {
 template<typename>
 struct intrinsic_function_invoker_wrapper;
 
+template<typename T>
+struct void_ret_wrapper {
+   using type = T;
+};
+
+template<>
+struct void_ret_wrapper<void> {
+   using type = char;
+};
+
+template<typename T>
+using void_ret_wrapper_t = typename void_ret_wrapper<T>::type;
+
 template<typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<Ret (Cls::*)(Params...)> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+		  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<Ret, Ret (Cls::*)(Params...), Cls, Params...>;
 };
 
 template<typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<Ret (Cls::*)(Params...) const> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+		  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<Ret, Ret (Cls::*)(Params...) const, Cls, Params...>;
 };
 
 template<typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<Ret (Cls::*)(Params...) volatile> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+		  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<Ret, Ret (Cls::*)(Params...) volatile, Cls, Params...>;
 };
 
 template<typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<Ret (Cls::*)(Params...) const volatile> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+		  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<Ret, Ret (Cls::*)(Params...) const volatile, Cls, Params...>;
 };
 
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 5bce9db8b40..04c36e8f153 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -675,26 +675,51 @@ struct intrinsic_function_invoker<WasmSig, void, MethodSig, Cls, Params...> {
    }
 };
 
+template<typename T>
+struct void_ret_wrapper {
+   using type = T;
+};
+
+template<>
+struct void_ret_wrapper<void> {
+   using type = char;
+};
+
+template<typename T>
+using void_ret_wrapper_t = typename void_ret_wrapper<T>::type;
+
 template<typename, typename>
 struct intrinsic_function_invoker_wrapper;
 
 template<typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...)> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+		  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...), Cls, Params...>;
 };
 
 template<typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) const> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+		  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) const, Cls, Params...>;
 };
 
 template<typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) volatile> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+		  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) volatile, Cls, Params...>;
 };
 
 template<typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) const volatile> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+		  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) const volatile, Cls, Params...>;
 };
 
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index ba616952216..3b7fda46a5a 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -1010,6 +1010,7 @@ class action_api : public context_aware_api {
       }
 
       int action_data_size() {
+	 std::cout << "ADS " << context.get_action().data.size() << "\n";
          return context.get_action().data.size();
       }
 
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 8693aaf4931..1b2deb1bff5 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -23,7 +23,8 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          _instantiated_module->set_wasm_allocator( wasm_interface::get_wasm_allocator() );
          //if (!(const auto& res = _instantiated_module->run_start()))
          //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
-         
+        
+	 std::cout << "CTX " << &context << "\n"; 
          const auto& res = _instantiated_module->call(&context, "env", "apply",
                                           (uint64_t)context.get_receiver(),
                                           (uint64_t)context.get_action().account,

From fe508006931aa48ac5547845ea72c62fc315845b Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Tue, 30 Apr 2019 18:12:50 +0800
Subject: [PATCH 0231/1648] add signal tests

---
 unittests/signal_tests.cpp | 409 +++++++++++++++++++++++++++++++++++++
 1 file changed, 409 insertions(+)
 create mode 100644 unittests/signal_tests.cpp

diff --git a/unittests/signal_tests.cpp b/unittests/signal_tests.cpp
new file mode 100644
index 00000000000..cd078638be1
--- /dev/null
+++ b/unittests/signal_tests.cpp
@@ -0,0 +1,409 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#include <eosio/chain/asset.hpp>
+#include <eosio/chain/authority.hpp>
+#include <eosio/chain/authority_checker.hpp>
+#include <eosio/chain/chain_config.hpp>
+#include <eosio/chain/types.hpp>
+#include <eosio/chain/thread_utils.hpp>
+#include <eosio/testing/tester.hpp>
+
+#include <fc/io/json.hpp>
+#include <fc/log/logger_config.hpp>
+#include <appbase/execution_priority_queue.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include "fork_test_utilities.hpp"
+
+#include <eosio/chain/snapshot.hpp>
+
+#define TESTER tester
+
+using namespace eosio::chain;
+using namespace eosio::testing;
+
+class signal_tester : public base_tester {
+public:
+   void init(const controller::config &config) {
+      cfg = config;
+      control.reset( new controller(cfg, make_protocol_feature_set()) );
+      control->add_indices();
+   }
+   
+   void startup() {
+      control->startup( []() { return false; }, nullptr);
+      chain_transactions.clear();
+      control->accepted_block.connect([this]( const block_state_ptr& block_state ){
+        FC_ASSERT( block_state->block );
+          for( const auto& receipt : block_state->block->transactions ) {
+              if( receipt.trx.contains<packed_transaction>() ) {
+                  auto &pt = receipt.trx.get<packed_transaction>();
+                  chain_transactions[pt.get_transaction().id()] = receipt;
+              } else {
+                  auto& id = receipt.trx.get<transaction_id_type>();
+                  chain_transactions[id] = receipt;
+              }
+          }
+      });
+   }
+
+   signal_tester(controller::config config, int ordinal) {
+      FC_ASSERT(config.blocks_dir.filename().generic_string() != "."
+         && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config");
+
+      controller::config copied_config = config;
+      copied_config.blocks_dir =
+              config.blocks_dir.parent_path() / std::to_string(ordinal).append(config.blocks_dir.filename().generic_string());
+      copied_config.state_dir =
+              config.state_dir.parent_path() / std::to_string(ordinal).append(config.state_dir.filename().generic_string());
+
+      init(copied_config);
+   }
+
+   signal_tester(controller::config config, int ordinal, int copy_block_log_from_ordinal) {
+      FC_ASSERT(config.blocks_dir.filename().generic_string() != "."
+         && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config");
+
+      controller::config copied_config = config;
+      copied_config.blocks_dir =
+              config.blocks_dir.parent_path() / std::to_string(ordinal).append(config.blocks_dir.filename().generic_string());
+      copied_config.state_dir =
+              config.state_dir.parent_path() / std::to_string(ordinal).append(config.state_dir.filename().generic_string());
+
+      // create a copy of the desired block log and reversible
+      auto block_log_path = config.blocks_dir.parent_path() / std::to_string(copy_block_log_from_ordinal).append(config.blocks_dir.filename().generic_string());
+      fc::create_directories(copied_config.blocks_dir);
+      fc::copy(block_log_path / "blocks.log", copied_config.blocks_dir / "blocks.log");
+      fc::copy(block_log_path / config::reversible_blocks_dir_name, copied_config.blocks_dir / config::reversible_blocks_dir_name );
+
+      init(copied_config);
+   }
+
+   signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
+      return _produce_block(skip_time, false);
+   }
+
+   signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
+      control->abort_block();
+      return _produce_block(skip_time, true);
+   }
+
+   signed_block_ptr finish_block()override {
+      return _finish_block();
+   }
+
+   bool validate() { return true; }
+};
+
+
+BOOST_AUTO_TEST_SUITE(signal_tests)
+
+BOOST_AUTO_TEST_CASE(no_signal)
+{
+    TESTER test;
+    test.produce_block();
+}
+
+BOOST_AUTO_TEST_CASE(signal_basic_replay)
+{
+   controller::config conf;
+
+   {
+      TESTER c;
+      conf = c.get_config();
+   }
+
+   signal_tester test(conf, 1);
+   test.startup();
+
+   test.produce_block();
+
+   {
+      int irr_count = 0;
+      uint32_t last_irr_blocknum = 0;
+
+      int pre_acc_blk_count = 0;
+      uint32_t last_pre_acc_num = 0;
+
+      int acc_blk_hdr_count = 0;
+      uint32_t last_acc_blk_hdr_num = 0;
+
+      int acc_blk_count = 0;
+      uint32_t last_acc_blk_num = 0;
+
+      int acc_txn_count = 0;
+      transaction_id_type last_acc_txn_id;
+
+      int app_txn_count = 0;
+      transaction_id_type last_app_txn_id;
+      transaction_trace_ptr last_signal_trace;
+
+      test.control->irreversible_block.connect([&](const block_state_ptr& bsp) {
+         ++irr_count;
+         if (last_irr_blocknum) {
+            BOOST_CHECK_EQUAL(bsp->block_num, last_irr_blocknum + 1);
+         }
+         last_irr_blocknum = bsp->block_num;
+      });
+
+      test.control->pre_accepted_block.connect([&](const signed_block_ptr& sbp) { // <- never invoked
+         ++pre_acc_blk_count;
+         last_pre_acc_num = sbp->block_num();
+      });
+
+      test.control->accepted_block_header.connect([&](const block_state_ptr& sbp) {
+         ++acc_blk_hdr_count;
+         last_acc_blk_hdr_num = sbp->block_num;
+         BOOST_CHECK_EQUAL(acc_blk_hdr_count, acc_blk_count + 1); // ensure ordering
+      });
+
+      test.control->accepted_block.connect([&](const block_state_ptr& sbp) {
+         ++acc_blk_count;
+         last_acc_blk_num = sbp->block_num;
+      });
+
+      test.control->accepted_transaction.connect([&](const transaction_metadata_ptr& ptr) {
+         ++acc_txn_count;
+         last_acc_txn_id = ptr->id;
+      });
+
+      test.control->applied_transaction.connect([&](std::tuple<const transaction_trace_ptr&, const signed_transaction&> t) {
+         ++app_txn_count;
+         last_app_txn_id = std::get<0>(t)->id;
+         last_signal_trace = std::get<0>(t);
+      });
+
+      auto trace = test.create_account(N(abc), N(eosio));
+      BOOST_CHECK_EQUAL(trace, last_signal_trace);
+      BOOST_CHECK_EQUAL(acc_txn_count, 1);
+      BOOST_CHECK_EQUAL(app_txn_count, 1);
+
+      test.produce_block();
+      BOOST_CHECK_EQUAL(irr_count, 1);
+      BOOST_CHECK_EQUAL(last_irr_blocknum, test.control->last_irreversible_block_num());
+      BOOST_CHECK_EQUAL(pre_acc_blk_count, 0); // <-- no pre accepted signal if blocks are produced
+      BOOST_CHECK_EQUAL(acc_blk_hdr_count, 1);
+      BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, test.control->head_block_num());
+      BOOST_CHECK_EQUAL(acc_blk_count, 1);
+      BOOST_CHECK_EQUAL(last_acc_blk_num, test.control->head_block_num());
+
+      test.produce_block();
+      BOOST_CHECK_EQUAL(irr_count, 2);
+      BOOST_CHECK_EQUAL(last_irr_blocknum, test.control->last_irreversible_block_num());
+      BOOST_CHECK_EQUAL(pre_acc_blk_count, 0); // <-- no pre accepted signal if blocks are produced
+      BOOST_CHECK_EQUAL(acc_blk_hdr_count, 2);
+      BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, test.control->head_block_num());
+      BOOST_CHECK_EQUAL(acc_blk_count, 2);
+      BOOST_CHECK_EQUAL(last_acc_blk_num, test.control->head_block_num());
+   }
+
+   signal_tester replaychain(conf, 2, 1);
+
+   // test replay
+   {
+      int irr_count = 0;
+      uint32_t last_irr_blocknum = 0;
+
+      int pre_acc_blk_count = 0;
+      uint32_t last_pre_acc_num = 0;
+
+      int acc_blk_hdr_count = 0;
+      uint32_t last_acc_blk_hdr_num = 0;
+
+      int acc_blk_count = 0;
+      uint32_t last_acc_blk_num = 0;
+
+      int acc_txn_count = 0;
+      transaction_id_type last_acc_txn_id;
+
+      int app_txn_count = 0;
+      transaction_id_type last_app_txn_id;
+      transaction_trace_ptr last_signal_trace;
+
+      replaychain.control->irreversible_block.connect([&](const block_state_ptr& bsp) {
+         ++irr_count;
+         if (last_irr_blocknum) {
+            BOOST_CHECK_EQUAL(bsp->block_num, last_irr_blocknum + 1);
+         }
+         last_irr_blocknum = bsp->block_num;
+      });
+
+      replaychain.control->pre_accepted_block.connect([&](const signed_block_ptr& sbp) {
+         ++pre_acc_blk_count;
+         last_pre_acc_num = sbp->block_num();
+         BOOST_CHECK_EQUAL(pre_acc_blk_count, acc_blk_hdr_count + 1); // ensure ordering
+      });
+
+      replaychain.control->accepted_block_header.connect([&](const block_state_ptr& sbp) {
+         ++acc_blk_hdr_count;
+         last_acc_blk_hdr_num = sbp->block_num;
+         BOOST_CHECK_EQUAL(acc_blk_hdr_count, acc_blk_count + 1); // ensure ordering
+      });
+
+      replaychain.control->accepted_block.connect([&](const block_state_ptr& sbp) {
+         ++acc_blk_count;
+         last_acc_blk_num = sbp->block_num;
+      });
+
+      replaychain.control->accepted_transaction.connect([&](const transaction_metadata_ptr& ptr) {
+         ++acc_txn_count;
+         last_acc_txn_id = ptr->id;
+      });
+
+      replaychain.control->applied_transaction.connect([&](std::tuple<const transaction_trace_ptr&, const signed_transaction&> t) {
+         ++app_txn_count;
+         last_app_txn_id = std::get<0>(t)->id;
+         last_signal_trace = std::get<0>(t);
+      });
+
+      replaychain.startup();
+
+      BOOST_CHECK_EQUAL(acc_txn_count, 3);
+      BOOST_CHECK_EQUAL(app_txn_count, 3);
+
+      BOOST_CHECK_EQUAL(irr_count, 2);
+      BOOST_CHECK_EQUAL(last_irr_blocknum, replaychain.control->last_irreversible_block_num());
+      BOOST_CHECK_EQUAL(pre_acc_blk_count, 2); // replay has pre_acc signal
+      BOOST_CHECK_EQUAL(last_pre_acc_num, replaychain.control->head_block_num());
+      BOOST_CHECK_EQUAL(acc_blk_hdr_count, 2);
+      BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, replaychain.control->head_block_num());
+      BOOST_CHECK_EQUAL(acc_blk_count, 2);
+      BOOST_CHECK_EQUAL(last_acc_blk_num, replaychain.control->head_block_num());
+   }
+}
+
+BOOST_AUTO_TEST_CASE(irreversible_block_multi_producers)
+{
+   int irr_count = 0;
+   uint32_t last_irr_blocknum = 0;
+   TESTER test;
+   test.produce_block();
+   test.control->irreversible_block.connect([&](const block_state_ptr& bsp) {
+      ++irr_count;
+      if (last_irr_blocknum) {
+         BOOST_CHECK_EQUAL(bsp->block_num, last_irr_blocknum + 1);
+      }
+      last_irr_blocknum = bsp->block_num;
+   });
+   test.produce_block();
+   BOOST_CHECK_EQUAL(irr_count, 1);
+
+   test.create_accounts( {N(dan),N(sam),N(pam),N(scott)} );
+   test.set_producers( {N(dan),N(sam),N(pam),N(scott)} );
+   test.produce_blocks(100);
+
+   BOOST_CHECK_EQUAL(irr_count, 57);
+   BOOST_CHECK_EQUAL(last_irr_blocknum, test.control->last_irreversible_block_num());
+}
+
+BOOST_AUTO_TEST_CASE(signal_fork)
+{
+   int irr_count = 0;
+   uint32_t last_irr_blocknum = 0;
+
+   int pre_acc_blk_count = 0;
+   uint32_t last_pre_acc_num = 0;
+
+   int acc_blk_hdr_count = 0;
+   uint32_t last_acc_blk_hdr_num = 0;
+
+   int acc_blk_count = 0;
+   uint32_t last_acc_blk_num = 0;
+   
+   TESTER c;
+   c.produce_block();
+   c.control->irreversible_block.connect([&](const block_state_ptr& bsp) {
+      ++irr_count;
+      if (last_irr_blocknum) {
+         BOOST_CHECK_EQUAL(bsp->block_num, last_irr_blocknum + 1);
+      }
+      last_irr_blocknum = bsp->block_num;
+   });
+
+   c.control->pre_accepted_block.connect([&](const signed_block_ptr& sbp) {
+      ++pre_acc_blk_count;
+      last_pre_acc_num = sbp->block_num();
+   });
+
+   c.control->accepted_block_header.connect([&](const block_state_ptr& sbp) {
+      ++acc_blk_hdr_count;
+      last_acc_blk_hdr_num = sbp->block_num;
+      BOOST_CHECK_EQUAL(acc_blk_hdr_count, acc_blk_count + 1); // ensure ordering
+   });
+
+   c.control->accepted_block.connect([&](const block_state_ptr& sbp) {
+      ++acc_blk_count;
+      last_acc_blk_num = sbp->block_num;
+   });
+
+   c.produce_block();
+   BOOST_CHECK_EQUAL(irr_count, 1);
+
+   c.create_accounts( {N(dan),N(sam),N(pam),N(scott)} );
+   c.set_producers( {N(dan),N(sam),N(pam),N(scott)} );
+   c.produce_blocks(100);
+
+   BOOST_CHECK_EQUAL(irr_count, 57);
+   BOOST_CHECK_EQUAL(last_irr_blocknum, c.control->last_irreversible_block_num());
+
+   BOOST_CHECK_EQUAL(pre_acc_blk_count, 0);
+   //BOOST_CHECK_EQUAL(last_pre_acc_num, c.control->head_block_num());
+   BOOST_CHECK_EQUAL(acc_blk_hdr_count, 101);
+   BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, c.control->head_block_num());
+   BOOST_CHECK_EQUAL(acc_blk_count, 101);
+   BOOST_CHECK_EQUAL(last_acc_blk_num, c.control->head_block_num());
+
+   TESTER c2;
+   push_blocks(c, c2);   
+
+   BOOST_REQUIRE_EQUAL(c.control->head_block_num(), c2.control->head_block_num());
+
+   uint32_t fork_num = c.control->head_block_num();
+
+   auto nextproducer = [](TESTER &c, int skip_interval) ->account_name {
+      auto head_time = c.control->head_block_time();
+      auto next_time = head_time + fc::milliseconds(config::block_interval_ms * skip_interval);
+      return c.control->head_block_state()->get_scheduled_producer(next_time).producer_name;
+   };
+
+   // fork c: 1 producers: dan
+   // fork c2: 3 producer: sam, pam, scott
+   int skip1 = 1, skip2 = 1;
+   for (int i = 0; i < 200; ++i) {
+      account_name next1 = nextproducer(c, skip1);
+      if (next1 == N(dan)) {
+         c.produce_block(fc::milliseconds(config::block_interval_ms * skip1)); skip1 = 1;
+      }
+      else ++skip1;
+      account_name next2 = nextproducer(c2, skip2);
+      if (next2 == N(sam) || next2 == N(pam) || next2 == N(scott)) {
+         c2.produce_block(fc::milliseconds(config::block_interval_ms * skip2)); skip2 = 1;
+      }
+      else ++skip2;
+   }
+   BOOST_CHECK_EQUAL(last_irr_blocknum, c.control->last_irreversible_block_num());
+   BOOST_REQUIRE_EQUAL(last_irr_blocknum <= fork_num, true);
+   BOOST_CHECK_EQUAL(pre_acc_blk_count, 0);
+   //BOOST_CHECK_EQUAL(last_pre_acc_num, c.control->head_block_num());
+   BOOST_CHECK_EQUAL(acc_blk_hdr_count, 152);
+   BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, c.control->head_block_num());
+   BOOST_CHECK_EQUAL(acc_blk_count, 152);
+   BOOST_CHECK_EQUAL(last_acc_blk_num, c.control->head_block_num());
+
+   // push fork from c2 => c
+   size_t p = fork_num;
+   size_t count = 0;
+   while ( p < c2.control->head_block_num()) {
+      signed_block_ptr fb = c2.control->fetch_block_by_number(++p);
+      c.push_block(fb);
+      BOOST_CHECK_EQUAL(pre_acc_blk_count, ++count);
+      BOOST_CHECK_EQUAL(last_pre_acc_num, fb->block_num());
+   }
+
+   BOOST_CHECK_EQUAL(last_irr_blocknum, c.control->last_irreversible_block_num());
+   BOOST_REQUIRE_EQUAL(last_irr_blocknum > fork_num, true);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From 06d083e83e3edf3166512c5d44b0e4f60431242b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 30 Apr 2019 12:38:05 -0400
Subject: [PATCH 0232/1648] Removed debugging code

---
 pipeline.jsonc | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index cda5a7ae4d8..80edbf13da2 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,10 +1,7 @@
 {
     "eosio":
     {
-        "pipeline-branch": "master",
-        "environment":
-        {
-        }
+        "pipeline-branch": "master"
     },
     "eos-multiversion-tests":
     {
@@ -14,14 +11,6 @@
             "170=v1.7.0"
         ]
     },
-    "eos-multiversion-beta-tests":
-    {
-        "pipeline-branch": "zach-pipeline-config-pfsn",
-        "configuration":
-        [
-            "170=v1.7.0"
-        ]
-    },
     "eosio-sync-tests":
     {
         "pipeline-branch": "protocol-features-sync-nodes"

From f29e60076f18fac48419f4016f2e388b08152f07 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 30 Apr 2019 12:42:30 -0400
Subject: [PATCH 0233/1648] eos pipeline is not centralized yet

---
 pipeline.jsonc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 80edbf13da2..ba7e16d68d2 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,8 +1,4 @@
 {
-    "eosio":
-    {
-        "pipeline-branch": "master"
-    },
     "eos-multiversion-tests":
     {
         "pipeline-branch": "protocol-features-sync-nodes",

From 5c3a5709211892fc0d02971b78c891566379a64b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 30 Apr 2019 14:19:20 -0400
Subject: [PATCH 0234/1648] Added eosio-build-unpinned pipeline

---
 pipeline.jsonc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index ba7e16d68d2..cf98935463b 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,4 +1,8 @@
 {
+    "eosio-build-unpinned":
+    {
+        "pipeline-branch": "protocol-features-sync-nodes"
+    },
     "eos-multiversion-tests":
     {
         "pipeline-branch": "protocol-features-sync-nodes",

From 2fc682fd89681975f7ce59956659750457ed5668 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 1 May 2019 12:05:03 -0500
Subject: [PATCH 0235/1648] Change default log level from debug to info.

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index b06f25475a3..a6f94bae0b2 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit b06f25475a3bb327bfd94b17ea25c2b1864d89e0
+Subproject commit a6f94bae0b2b4a0b68dc1db2677331cafa4716a5

From 37a86e964e4d5d96d01d46f634f2ad0d7750edf9 Mon Sep 17 00:00:00 2001
From: Ben Rush <ben.rush@block.one>
Date: Wed, 1 May 2019 14:35:56 -0400
Subject: [PATCH 0236/1648] Pass env to build script installs

---
 scripts/eosio_build_amazon.sh | 4 ++--
 scripts/eosio_build_ubuntu.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/eosio_build_amazon.sh b/scripts/eosio_build_amazon.sh
index c379e3ed96a..d5ffb7f2c83 100755
--- a/scripts/eosio_build_amazon.sh
+++ b/scripts/eosio_build_amazon.sh
@@ -46,7 +46,7 @@ printf "Yum installation found at ${YUM}.\\n"
 if [ $ANSWER != 1 ]; then read -p "Do you wish to update YUM repositories? (y/n) " ANSWER; fi
 case $ANSWER in
 	1 | [Yy]* )
-		if ! sudo $YUM -y update; then
+		if ! sudo -E $YUM -y update; then
 			printf " - YUM update failed.\\n"
 			exit 1;
 		else
@@ -76,7 +76,7 @@ if [ "${COUNT}" -gt 1 ]; then
 	if [ $ANSWER != 1 ]; then read -p "Do you wish to install these dependencies? (y/n) " ANSWER; fi
 	case $ANSWER in
 		1 | [Yy]* )
-			if ! sudo $YUM -y install ${DEP}; then
+			if ! sudo -E $YUM -y install ${DEP}; then
 				printf " - YUM dependency installation failed!\\n"
 				exit 1;
 			else
diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index a5b1563af8d..3a3d26e8366 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -81,7 +81,7 @@ fi
 if [ $ANSWER != 1 ]; then read -p "Do you wish to update repositories with apt-get update? (y/n) " ANSWER; fi
 case $ANSWER in
 	1 | [Yy]* )
-		if ! sudo apt-get update; then
+		if ! sudo -E apt-get update; then
 			printf " - APT update failed.\\n"
 			exit 1;
 		else
@@ -111,7 +111,7 @@ if [ "${COUNT}" -gt 1 ]; then
 	if [ $ANSWER != 1 ]; then read -p "Do you wish to install these packages? (y/n) " ANSWER; fi
 	case $ANSWER in
 		1 | [Yy]* )
-			if ! sudo apt-get -y install ${DEP}; then
+			if ! sudo -E apt-get -y install ${DEP}; then
 				printf " - APT dependency failed.\\n"
 				exit 1
 			else

From 12bc5232a76d2828c97cb523679f624093fb5482 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 1 May 2019 15:10:01 -0500
Subject: [PATCH 0237/1648] Add configurable logging to http_plugin

---
 plugins/http_plugin/http_plugin.cpp           | 90 +++++++++++--------
 .../include/eosio/http_plugin/http_plugin.hpp |  1 +
 2 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index 1fe6bd2fac3..ff9c895c711 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -27,6 +27,13 @@
 #include <memory>
 #include <regex>
 
+namespace fc {
+   extern std::unordered_map<std::string,logger>& get_logger_map();
+}
+
+const fc::string logger_name("http_plugin");
+fc::logger logger;
+
 namespace eosio {
 
    static appbase::abstract_plugin& _http_plugin = app().register_plugin<http_plugin>();
@@ -208,9 +215,9 @@ namespace eosio {
                   "!DHE:!RSA:!AES128:!RC4:!DES:!3DES:!DSS:!SRP:!PSK:!EXP:!MD5:!LOW:!aNULL:!eNULL") != 1)
                   EOS_THROW(chain::http_exception, "Failed to set HTTPS cipher list");
             } catch (const fc::exception& e) {
-               elog("https server initialization error: ${w}", ("w", e.to_detail_string()));
+               fc_elog( logger, "https server initialization error: ${w}", ("w", e.to_detail_string()) );
             } catch(std::exception& e) {
-               elog("https server initialization error: ${w}", ("w", e.what()));
+               fc_elog( logger, "https server initialization error: ${w}", ("w", e.what()) );
             }
 
             return ctx;
@@ -225,13 +232,13 @@ namespace eosio {
                   throw;
                } catch (const fc::exception& e) {
                   err += e.to_detail_string();
-                  elog( "${e}", ("e", err));
+                  fc_elog( logger, "${e}", ("e", err) );
                   error_results results{websocketpp::http::status_code::internal_server_error,
                                         "Internal Service Error", error_results::error_info(e, verbose_http_errors )};
                   con->set_body( fc::json::to_string( results ));
                } catch (const std::exception& e) {
                   err += e.what();
-                  elog( "${e}", ("e", err));
+                  fc_elog( logger, "${e}", ("e", err) );
                   error_results results{websocketpp::http::status_code::internal_server_error,
                                         "Internal Service Error", error_results::error_info(fc::exception( FC_LOG_MESSAGE( error, e.what())), verbose_http_errors )};
                   con->set_body( fc::json::to_string( results ));
@@ -244,7 +251,7 @@ namespace eosio {
                }
             } catch (...) {
                con->set_body( R"xxx({"message": "Internal Server Error"})xxx" );
-               std::cerr << "Exception attempting to handle exception: " << err << std::endl;
+               fc_elog( logger, "Exception attempting to handle exception: ${e}", ("e", err) );
             }
          }
 
@@ -291,7 +298,7 @@ namespace eosio {
                con->append_header( "Content-type", "application/json" );
 
                if( bytes_in_flight > max_bytes_in_flight ) {
-                  dlog( "503 - too many bytes in flight: ${bytes}", ("bytes", bytes_in_flight.load()) );
+                  fc_dlog( logger, "503 - too many bytes in flight: ${bytes}", ("bytes", bytes_in_flight.load()) );
                   error_results results{websocketpp::http::status_code::too_many_requests, "Busy", error_results::error_info()};
                   con->set_body( fc::json::to_string( results ));
                   con->set_status( websocketpp::http::status_code::too_many_requests );
@@ -329,7 +336,7 @@ namespace eosio {
                   } );
 
                } else {
-                  dlog( "404 - not found: ${ep}", ("ep", resource));
+                  fc_dlog( logger, "404 - not found: ${ep}", ("ep", resource) );
                   error_results results{websocketpp::http::status_code::not_found,
                                         "Not Found", error_results::error_info(fc::exception( FC_LOG_MESSAGE( error, "Unknown Endpoint" )), verbose_http_errors )};
                   con->set_body( fc::json::to_string( results ));
@@ -352,11 +359,11 @@ namespace eosio {
                   handle_http_request<detail::asio_with_stub_log<T>>(ws.get_con_from_hdl(hdl));
                });
             } catch ( const fc::exception& e ){
-               elog( "http: ${e}", ("e",e.to_detail_string()));
+               fc_elog( logger, "http: ${e}", ("e", e.to_detail_string()) );
             } catch ( const std::exception& e ){
-               elog( "http: ${e}", ("e",e.what()));
+               fc_elog( logger, "http: ${e}", ("e", e.what()) );
             } catch (...) {
-               elog("error thrown from http io service");
+               fc_elog( logger, "error thrown from http io service" );
             }
          }
 
@@ -409,26 +416,29 @@ namespace eosio {
 
             ("access-control-allow-origin", bpo::value<string>()->notifier([this](const string& v) {
                 my->access_control_allow_origin = v;
-                ilog("configured http with Access-Control-Allow-Origin: ${o}", ("o", my->access_control_allow_origin));
+                fc_ilog( logger, "configured http with Access-Control-Allow-Origin: ${o}",
+                         ("o", my->access_control_allow_origin) );
              }),
              "Specify the Access-Control-Allow-Origin to be returned on each request.")
 
             ("access-control-allow-headers", bpo::value<string>()->notifier([this](const string& v) {
                 my->access_control_allow_headers = v;
-                ilog("configured http with Access-Control-Allow-Headers : ${o}", ("o", my->access_control_allow_headers));
+                fc_ilog( logger, "configured http with Access-Control-Allow-Headers : ${o}",
+                         ("o", my->access_control_allow_headers) );
              }),
              "Specify the Access-Control-Allow-Headers to be returned on each request.")
 
             ("access-control-max-age", bpo::value<string>()->notifier([this](const string& v) {
                 my->access_control_max_age = v;
-                ilog("configured http with Access-Control-Max-Age : ${o}", ("o", my->access_control_max_age));
+                fc_ilog( logger, "configured http with Access-Control-Max-Age : ${o}",
+                         ("o", my->access_control_max_age) );
              }),
              "Specify the Access-Control-Max-Age to be returned on each request.")
 
             ("access-control-allow-credentials",
              bpo::bool_switch()->notifier([this](bool v) {
                 my->access_control_allow_credentials = v;
-                if (v) ilog("configured http with Access-Control-Allow-Credentials: true");
+                if( v ) fc_ilog( logger, "configured http with Access-Control-Allow-Credentials: true" );
              })->default_value(false),
              "Specify if Access-Control-Allow-Credentials: true should be returned on each request.")
             ("max-body-size", bpo::value<uint32_t>()->default_value(1024*1024),
@@ -529,23 +539,25 @@ namespace eosio {
 
    void http_plugin::plugin_startup() {
 
+      handle_sighup(); // setup logging
+
       my->thread_pool.emplace( "http", my->thread_pool_size );
 
       if(my->listen_endpoint) {
          try {
             my->create_server_for_endpoint(*my->listen_endpoint, my->server);
 
-            ilog("start listening for http requests");
+            fc_ilog( logger, "start listening for http requests" );
             my->server.listen(*my->listen_endpoint);
             my->server.start_accept();
          } catch ( const fc::exception& e ){
-            elog( "http service failed to start: ${e}", ("e",e.to_detail_string()));
+            fc_elog( logger, "http service failed to start: ${e}", ("e", e.to_detail_string()) );
             throw;
          } catch ( const std::exception& e ){
-            elog( "http service failed to start: ${e}", ("e",e.what()));
+            fc_elog( logger, "http service failed to start: ${e}", ("e", e.what()) );
             throw;
          } catch (...) {
-            elog("error thrown from http io service");
+            fc_elog( logger, "error thrown from http io service" );
             throw;
          }
       }
@@ -561,13 +573,13 @@ namespace eosio {
             });
             my->unix_server.start_accept();
          } catch ( const fc::exception& e ){
-            elog( "unix socket service failed to start: ${e}", ("e",e.to_detail_string()));
+            fc_elog( logger, "unix socket service failed to start: ${e}", ("e", e.to_detail_string()) );
             throw;
          } catch ( const std::exception& e ){
-            elog( "unix socket service failed to start: ${e}", ("e",e.what()));
+            fc_elog( logger, "unix socket service failed to start: ${e}", ("e", e.what()) );
             throw;
          } catch (...) {
-            elog("error thrown from unix socket io service");
+            fc_elog( logger, "error thrown from unix socket io service" );
             throw;
          }
       }
@@ -579,17 +591,17 @@ namespace eosio {
                return my->on_tls_init(hdl);
             });
 
-            ilog("start listening for https requests");
+            fc_ilog( logger, "start listening for https requests" );
             my->https_server.listen(*my->https_listen_endpoint);
             my->https_server.start_accept();
          } catch ( const fc::exception& e ){
-            elog( "https service failed to start: ${e}", ("e",e.to_detail_string()));
+            fc_elog( logger, "https service failed to start: ${e}", ("e", e.to_detail_string()) );
             throw;
          } catch ( const std::exception& e ){
-            elog( "https service failed to start: ${e}", ("e",e.what()));
+            fc_elog( logger, "https service failed to start: ${e}", ("e", e.what()) );
             throw;
          } catch (...) {
-            elog("error thrown from https io service");
+            fc_elog( logger, "error thrown from https io service" );
             throw;
          }
       }
@@ -608,6 +620,12 @@ namespace eosio {
       }});
    }
 
+   void http_plugin::handle_sighup() {
+      if( fc::get_logger_map().find( logger_name ) != fc::get_logger_map().end() ) {
+         logger = fc::get_logger_map()[logger_name];
+      }
+   }
+
    void http_plugin::plugin_shutdown() {
       if(my->server.is_listening())
          my->server.stop_listening();
@@ -622,7 +640,7 @@ namespace eosio {
    }
 
    void http_plugin::add_handler(const string& url, const url_handler& handler) {
-      ilog( "add api url: ${c}", ("c",url) );
+      fc_ilog( logger, "add api url: ${c}", ("c", url) );
       my->url_handlers.insert(std::make_pair(url,handler));
    }
 
@@ -642,28 +660,28 @@ namespace eosio {
          } catch (fc::eof_exception& e) {
             error_results results{422, "Unprocessable Entity", error_results::error_info(e, verbose_http_errors)};
             cb( 422, fc::variant( results ));
-            elog( "Unable to parse arguments to ${api}.${call}", ("api", api_name)( "call", call_name ));
-            dlog("Bad arguments: ${args}", ("args", body));
+            fc_elog( logger, "Unable to parse arguments to ${api}.${call}", ("api", api_name)( "call", call_name ) );
+            fc_dlog( logger, "Bad arguments: ${args}", ("args", body) );
          } catch (fc::exception& e) {
             error_results results{500, "Internal Service Error", error_results::error_info(e, verbose_http_errors)};
             cb( 500, fc::variant( results ));
             if (e.code() != chain::greylist_net_usage_exceeded::code_value && e.code() != chain::greylist_cpu_usage_exceeded::code_value) {
-               elog( "FC Exception encountered while processing ${api}.${call}",
-                     ("api", api_name)( "call", call_name ));
-               dlog( "Exception Details: ${e}", ("e", e.to_detail_string()));
+               fc_elog( logger, "FC Exception encountered while processing ${api}.${call}",
+                        ("api", api_name)( "call", call_name ) );
+               fc_dlog( logger, "Exception Details: ${e}", ("e", e.to_detail_string()) );
             }
          } catch (std::exception& e) {
             error_results results{500, "Internal Service Error", error_results::error_info(fc::exception( FC_LOG_MESSAGE( error, e.what())), verbose_http_errors)};
             cb( 500, fc::variant( results ));
-            elog( "STD Exception encountered while processing ${api}.${call}",
-                  ("api", api_name)( "call", call_name ));
-            dlog( "Exception Details: ${e}", ("e", e.what()));
+            fc_elog( logger, "STD Exception encountered while processing ${api}.${call}",
+                     ("api", api_name)( "call", call_name ) );
+            fc_dlog( logger, "Exception Details: ${e}", ("e", e.what()) );
          } catch (...) {
             error_results results{500, "Internal Service Error",
                error_results::error_info(fc::exception( FC_LOG_MESSAGE( error, "Unknown Exception" )), verbose_http_errors)};
             cb( 500, fc::variant( results ));
-            elog( "Unknown Exception encountered while processing ${api}.${call}",
-                  ("api", api_name)( "call", call_name ));
+            fc_elog( logger, "Unknown Exception encountered while processing ${api}.${call}",
+                     ("api", api_name)( "call", call_name ) );
          }
       } catch (...) {
          std::cerr << "Exception attempting to handle exception for " << api_name << "." << call_name << std::endl;
diff --git a/plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp b/plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp
index eaa132ce0e4..5b84a18f3ac 100644
--- a/plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp
+++ b/plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp
@@ -79,6 +79,7 @@ namespace eosio {
         void plugin_initialize(const variables_map& options);
         void plugin_startup();
         void plugin_shutdown();
+        void handle_sighup() override;
 
         void add_handler(const string& url, const url_handler&);
         void add_api(const api_description& api) {

From 73708ffe3a5905397c16e5ed9dc52735ec1ffff4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 1 May 2019 15:11:04 -0500
Subject: [PATCH 0238/1648] Add http_plugin and transaction_tracing options

---
 programs/nodeos/logging.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/programs/nodeos/logging.json b/programs/nodeos/logging.json
index 07771457d72..54947425291 100644
--- a/programs/nodeos/logging.json
+++ b/programs/nodeos/logging.json
@@ -64,6 +64,15 @@
         "stderr",
         "net"
       ]
+    },{
+      "name": "http_plugin",
+      "level": "debug",
+      "enabled": true,
+      "additivity": false,
+      "appenders": [
+        "stderr",
+        "net"
+      ]
     },{
       "name": "producer_plugin",
       "level": "debug",
@@ -73,6 +82,15 @@
         "stderr",
         "net"
       ]
+    },{
+      "name": "transaction_tracing",
+      "level": "info",
+      "enabled": true,
+      "additivity": false,
+      "appenders": [
+        "stderr",
+        "net"
+      ]
     }
   ]
 }

From fff7bf9508a61b15ea503f0960b6cbbe642af6cf Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@objectcomputing.com>
Date: Wed, 1 May 2019 15:38:55 -0500
Subject: [PATCH 0239/1648] wabt: reduce redundant memset

---
 libraries/chain/webassembly/wabt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/webassembly/wabt.cpp b/libraries/chain/webassembly/wabt.cpp
index a23919e0ec6..23feff65ee5 100644
--- a/libraries/chain/webassembly/wabt.cpp
+++ b/libraries/chain/webassembly/wabt.cpp
@@ -46,8 +46,8 @@ class wabt_instantiated_module : public wasm_instantiated_module_interface {
             Memory* memory = this_run_vars.memory = _env->GetMemory(0);
             memory->page_limits = _initial_memory_configuration;
             memory->data.resize(_initial_memory_configuration.initial * WABT_PAGE_SIZE);
-            memset(memory->data.data(), 0, memory->data.size());
             memcpy(memory->data.data(), _initial_memory.data(), _initial_memory.size());
+            memset(memory->data.data() + _initial_memory.size(), 0, memory->data.size() - _initial_memory.size());
          }
 
          _params[0].set_i64(uint64_t(context.get_receiver()));

From 77d99d5295b978b49f6014fd98cc9bf9f819c9c2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 1 May 2019 16:11:23 -0500
Subject: [PATCH 0240/1648] Add scope lock instead of explicit unlock

---
 plugins/net_plugin/net_plugin.cpp | 38 ++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 431f89875db..c0a5d043608 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -902,25 +902,25 @@ namespace eosio {
       self->consecutive_rejected_blocks = 0;
       ++self->consecutive_immediate_connection_close;
       self->last_close = fc::time_point::now();
-      std::unique_lock<std::mutex> g_conn( self->conn_mtx );
-      bool has_last_req = !!self->last_req;
-      g_conn.unlock();
+      bool has_last_req = false;
+      {
+         std::lock_guard<std::mutex> g_conn( self->conn_mtx );
+         has_last_req = !!self->last_req;
+         self->last_handshake_recv = handshake_message();
+         self->last_handshake_sent = handshake_message();
+      }
       if( has_last_req ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
       self->peer_requested.reset();
       self->sent_handshake_count = 0;
-      g_conn.lock();
-      self->last_handshake_recv = handshake_message();
-      self->last_handshake_sent = handshake_message();
-      g_conn.unlock();
       my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
       fc_dlog( logger, "closed, canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();
-
-      std::unique_lock<std::mutex> g( self->read_delay_timer_mtx );
-      self->read_delay_timer.cancel();
-      g.unlock();
+      {
+         std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
+         self->read_delay_timer.cancel();
+      }
 
       if( reconnect ) {
          my_impl->start_conn_timer( std::chrono::milliseconds( 100 ), connection_wptr() );
@@ -1583,10 +1583,11 @@ namespace eosio {
       }
       g.unlock();
       if( req.req_blocks.mode == catch_up ) {
-         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
-         c->fork_head = id;
-         c->fork_head_num = num;
-         g_conn.unlock();
+         {
+            std::lock_guard<std::mutex> g_conn( c->conn_mtx );
+            c->fork_head = id;
+            c->fork_head_num = num;
+         }
          std::lock_guard<std::mutex> g( sync_mtx );
          fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} "
                           "target LIB = ${lib} next_expected = ${ne}",
@@ -1621,9 +1622,10 @@ namespace eosio {
             verify_catchup(c, msg.known_blocks.pending, msg.known_blocks.ids.back());
          }
       } else if (msg.known_blocks.mode == last_irr_catch_up) {
-         std::unique_lock<std::mutex> g_conn( c->conn_mtx );
-         c->last_handshake_recv.last_irreversible_block_num = msg.known_trx.pending;
-         g_conn.unlock();
+         {
+            std::lock_guard<std::mutex> g_conn( c->conn_mtx );
+            c->last_handshake_recv.last_irreversible_block_num = msg.known_trx.pending;
+         }
          sync_reset_lib_num(c);
          start_sync(c, msg.known_trx.pending);
       }

From 6755a94ad0cf9f7c4c08d7147ad01ea29ae295cb Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Thu, 2 May 2019 18:24:30 +0800
Subject: [PATCH 0241/1648] add test case for replay with/without optimizations

---
 unittests/signal_tests.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/unittests/signal_tests.cpp b/unittests/signal_tests.cpp
index cd078638be1..81bffaffebc 100644
--- a/unittests/signal_tests.cpp
+++ b/unittests/signal_tests.cpp
@@ -120,6 +120,8 @@ BOOST_AUTO_TEST_CASE(signal_basic_replay)
 
    test.produce_block();
 
+   transaction_id_type txn_id_to_verify;
+
    {
       int irr_count = 0;
       uint32_t last_irr_blocknum = 0;
@@ -176,6 +178,8 @@ BOOST_AUTO_TEST_CASE(signal_basic_replay)
       });
 
       auto trace = test.create_account(N(abc), N(eosio));
+      txn_id_to_verify = last_app_txn_id;
+      BOOST_CHECK_EQUAL(last_app_txn_id != transaction_id_type(), true);
       BOOST_CHECK_EQUAL(trace, last_signal_trace);
       BOOST_CHECK_EQUAL(acc_txn_count, 1);
       BOOST_CHECK_EQUAL(app_txn_count, 1);
@@ -199,10 +203,13 @@ BOOST_AUTO_TEST_CASE(signal_basic_replay)
       BOOST_CHECK_EQUAL(last_acc_blk_num, test.control->head_block_num());
    }
 
-   signal_tester replaychain(conf, 2, 1);
+   // test replay with/without optimizations
+   for (int i = 0; i < 2; ++i) {
+      if (i == 1) {
+         conf.disable_replay_opts = !conf.disable_replay_opts;
+      }
+      signal_tester replaychain(conf, 2 + i, 1);
 
-   // test replay
-   {
       int irr_count = 0;
       uint32_t last_irr_blocknum = 0;
 
@@ -262,6 +269,7 @@ BOOST_AUTO_TEST_CASE(signal_basic_replay)
 
       BOOST_CHECK_EQUAL(acc_txn_count, 3);
       BOOST_CHECK_EQUAL(app_txn_count, 3);
+      BOOST_CHECK_EQUAL(last_app_txn_id, txn_id_to_verify);
 
       BOOST_CHECK_EQUAL(irr_count, 2);
       BOOST_CHECK_EQUAL(last_irr_blocknum, replaychain.control->last_irreversible_block_num());

From 806188dc694c9a65052c2b50cbd8f5ee09738cf2 Mon Sep 17 00:00:00 2001
From: Steven Strand <steven.strand@block.one>
Date: Mon, 11 Mar 2019 17:35:27 -0400
Subject: [PATCH 0242/1648] add new functions to eosio-blocklog program #6884

---
 .../chain/include/eosio/chain/exceptions.hpp  |   4 +-
 programs/eosio-blocklog/main.cpp              | 191 +++++++++++++++++-
 unittests/misc_tests.cpp                      |   9 +
 3 files changed, 202 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 590c0e879b6..927675a9585 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -531,8 +531,10 @@ namespace eosio { namespace chain {
                                     3190003, "block log can not be found" )
       FC_DECLARE_DERIVED_EXCEPTION( block_log_backup_dir_exist, block_log_exception,
                                     3190004, "block log backup dir already exists" )
+      FC_DECLARE_DERIVED_EXCEPTION( block_index_not_found, block_log_exception,
+                                    3190005, "block index can not be found"  )
 
-   FC_DECLARE_DERIVED_EXCEPTION( http_exception, chain_exception,
+      FC_DECLARE_DERIVED_EXCEPTION( http_exception, chain_exception,
                                  3200000, "http exception" )
       FC_DECLARE_DERIVED_EXCEPTION( invalid_http_client_root_cert,    http_exception,
                                     3200001, "invalid http client root certificate" )
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 31db5b25c70..f90cb44218a 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -10,6 +10,7 @@
 #include <fc/io/json.hpp>
 #include <fc/filesystem.hpp>
 #include <fc/variant.hpp>
+#include <fc/bitutil.hpp>
 
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/program_options.hpp>
@@ -36,6 +37,8 @@ struct blocklog {
    uint32_t                         last_block;
    bool                             no_pretty_print;
    bool                             as_json_array;
+   bool                             make_index;
+   uint32_t                         trim_block;
 };
 
 void blocklog::read_log() {
@@ -44,6 +47,7 @@ void blocklog::read_log() {
    EOS_ASSERT( end, block_log_exception, "No blocks found in block log" );
    EOS_ASSERT( end->block_num() > 1, block_log_exception, "Only one block found in block log" );
 
+   //fix message below, first block might not be 1, first_block_num is not set yet
    ilog( "existing block log contains block num 1 through block num ${n}", ("n",end->block_num()) );
 
    optional<chainbase::database> reversible_blocks;
@@ -145,9 +149,12 @@ void blocklog::set_program_options(options_description& cli)
           "Do not pretty print the output.  Useful if piping to jq to improve performance.")
          ("as-json-array", bpo::bool_switch(&as_json_array)->default_value(false),
           "Print out json blocks wrapped in json array (otherwise the output is free-standing json objects).")
+         ("make-index", bpo::bool_switch(&make_index)->default_value(false),
+          "Create blocks.index from blocks.log. Must give 'blocks-dir'. Give 'output-file' relative to blocks-dir (default is blocks.index).")
+         ("trim-block-log", bpo::bool_switch(&make_index)->default_value(false),
+          "Trim blocks.log and blocks.index in place. Must give 'blocks-dir' and 'last' (else nothing is done).")
          ("help", "Print this help message and exit.")
          ;
-
 }
 
 void blocklog::initialize(const variables_map& options) {
@@ -169,6 +176,176 @@ void blocklog::initialize(const variables_map& options) {
 
 }
 
+//struct used by truncBlockLog() and makeIndex() to read first 18 bytes of a block from blocks.log
+struct __attribute__((packed)) BlockStart {    //first 18 bytes of each block
+   block_timestamp_type timestamp;
+   account_name         prodname;
+   uint16_t             confirmed;
+   uint32_t             blknum;     //low 32 bits of previous blockid, is big endian block number of previous block
+} blkStart;
+
+int truncBlockLog(bfs::path blockDir, uint32_t n) {          //n is last block to keep
+   using namespace std;
+   cout << "Will truncate blocks.log and blocks.index after block " << n << '\n';
+
+   //read blocks.log to see if version 1 or 2 and get first block number
+   filebuf fin0;
+   string blockFileName= (blockDir/"blocks.log").generic_string();
+   fin0.open(blockFileName.c_str(), ios::in|ios::binary);
+   EOS_ASSERT( fin0.is_open(), block_log_not_found, "cannot read blocks.log" );
+   uint32_t version=0, firstBlock;
+   fin0.sgetn((char*)&version,sizeof(version));
+   EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "unsupported version of block log" );
+   if (version == 1)
+      firstBlock= 1;
+   else
+      fin0.sgetn((char*)&firstBlock,sizeof(firstBlock));
+   cout << "version= " << version << "\nfirst block= " << firstBlock << '\n';
+   if (n <= firstBlock) {
+      cout << n << " is before first block so nothing to do\n";
+      return 2;
+   }
+
+   //open blocks.index and get blocks.log position for block 'n'
+   filebuf fin1;
+   string indexFileName= (blockDir/"blocks.index").generic_string();
+   fin1.open(indexFileName.c_str(),ios::in|ios::binary);
+   EOS_ASSERT( fin1.is_open(), block_index_not_found, "cannot read blocks.index" );
+   uint64_t indexPos= 8*(n-firstBlock);
+   uint64_t pos= fin1.pubseekoff(indexPos,ios::beg,ios::in);
+   EOS_ASSERT( pos==indexPos, block_log_exception, "cannot read blocks.index entry for trim-after-block" );
+   uint64_t fpos0, fpos1;                                   //filepos of block n and block n+1, will read from blocks.index
+   fin1.sgetn((char*)&fpos0,sizeof(fpos0));
+   fin1.sgetn((char*)&fpos1,sizeof(fpos1));
+   fin1.close();
+   cout << "According to blocks.index:\n";
+   cout << "    block " << n << " starts at position " << fpos0 << '\n';
+   cout << "    block " << n+1 << " starts at position " << fpos1 << '\n';
+
+   //read blocks.log and verify block number n is found at file position fpos0
+   fin0.pubseekoff(fpos0,ios::beg,ios::in);
+   fin0.sgetn((char*)&blkStart,sizeof(blkStart));
+   fin0.close();
+   uint32_t bnum= endian_reverse_u32(blkStart.blknum)+1;    //convert from big endian to little endian, add 1 since prior block
+   EOS_ASSERT( bnum==n, block_log_exception, "blocks.index does not agree with blocks.log" );
+   cout << "In blocks.log at position " << fpos0 << " find block " << bnum << " as expected\n";
+   EOS_ASSERT( truncate(blockFileName.c_str(),fpos1)==0, block_log_exception, "truncate blocks.log fails");
+   indexPos+= sizeof(uint64_t);                             //advance to after record for block n
+   EOS_ASSERT( truncate(indexFileName.c_str(),indexPos)==0, block_log_exception, "truncate blocks.index fails");
+   cout << "blocks.log has been truncated to " << fpos1 << " bytes\n";
+   cout << "blocks.index has been truncated to " << indexPos << " bytes\n";
+   return 0;
+}
+
+int makeIndex(bfs::path blockDir, string outFile) {
+   //this code makes blocks.index much faster than nodeos (in recent test 80 seconds vs. 90 minutes)
+   using namespace std;
+   cout << "Will make blocks.index from blocks.log\n";
+   string blockFileName= (blockDir / "blocks.log").generic_string();
+   string outFileName=   (blockDir / outFile     ).generic_string();
+   int fin = open(blockFileName.c_str(), O_RDONLY);
+   EOS_ASSERT( fin>0, block_log_not_found, "cannot read blocks.log" );
+
+   //will read big chunks of blocks.log into buf, will fill fposList with file positions before write to blocks.index
+   constexpr uint32_t bufLen{1U<<24};                       //bufLen must be power of 2 >= largest possible block == one MByte
+   char* buf= new char[bufLen+8];                           //first 8 bytes of prior buf are put past end of current buf
+   constexpr uint64_t fposListLen{1U<<22};                  //length of fposList[] in bytes
+   uint64_t* fposList= new uint64_t[fposListLen>>3];
+
+   //read blocks.log to see if version 1 or 2 and get firstblocknum (implicit 1 if version 1)
+   uint32_t version=0, firstBlock;
+   read(fin,(char*)&version,sizeof(version));
+   EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "unsupported version of block log" );
+   if (version == 1)
+      firstBlock= 1;
+   else
+      read(fin,(char*)&firstBlock,sizeof(firstBlock));
+   cout << "block log version= " << version << '\n';
+   cout << "first block= " << firstBlock << '\n';
+
+   uint64_t pos= lseek(fin,0,ios::end);                     //get blocks.log file length
+   uint64_t lastBufLen= pos & ((uint64_t)bufLen-1);         //bufLen is a power of 2 so -1 creates low bits all 1
+   if (!lastBufLen)                                         //will read integral number of bufLen and one time read lastBufLen
+      lastBufLen= bufLen;
+   pos= lseek(fin,-(uint64_t)lastBufLen,ios::end);
+   uint64_t didread= read(fin,buf,lastBufLen);              //read tail of file into buf
+   EOS_ASSERT( didread==lastBufLen, block_log_exception, "blocks.log read fails" );
+
+   uint32_t indexStart;                                     //buf index for block start
+   uint32_t indexEnd;                                       //buf index for block end == buf index for block start file position
+   uint64_t filePos;                                        //file pos of block start
+   BlockStart* bst;                                         //pointer to BlockStart
+
+   indexStart= lastBufLen;                                  //pretend a block starts just past end of buf then read prior block
+   indexEnd= indexStart-8;                                  //index in buf where block ends and block file position starts
+   filePos= *(uint64_t*)(buf+indexEnd);                     //file pos of block start
+   indexStart= filePos - pos;                               //buf index for block start
+   bst= (BlockStart*)(buf+indexStart);                      //pointer to BlockStart
+   uint32_t lastBlock= endian_reverse_u32(bst->blknum);     //convert from big endian to little endian
+   uint32_t bnum= ++lastBlock;                              //add 1 since took block number from prior block id
+   cout << "last block=  " << lastBlock << '\n';
+   cout << '\n';
+   cout << "block " << setw(10) << bnum << "    filePos " << setw(14) << filePos << '\n';  //first progress indicator
+
+   //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
+   mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;     //if create file permissions will be 644
+   int fout = open(outFileName.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode); //create if no exists, truncate if does exist
+   EOS_ASSERT( fout>0, block_index_not_found, "cannot write blocks.index" );
+
+   uint64_t indFileLen= bnum<<3;                            //index file holds 8 bytes per block in blocks.log
+   uint64_t lastIndBufLen= indFileLen & (fposListLen-1);    //fposListLen is a power of 2 so -1 creates low bits all 1
+   if (!lastIndBufLen)                                      //will write integral number of bufLen and lastIndBufLen one time to index file
+      lastIndBufLen= bufLen;
+   uint64_t indPos= lseek(fout,indFileLen-lastIndBufLen,ios::beg);
+   uint64_t blkBase= (indPos>>3) + firstBlock;              //first entry in fposList is for block blkBase
+   //cout << "indPos= " << indPos << "  blkBase= " << blkBase << '\n';
+   fposList[bnum-blkBase]= filePos;                         //write filepos for block bnum
+
+   for (;;) {
+      if (bnum==blkBase) {                                  //if fposList is full
+         write(fout,(char*)fposList,lastIndBufLen); //write fposList to index file
+         if (indPos==0) {                                   //if done writing index file
+            cout << "block " << setw(10) << bnum << "    filePos " << setw(14) << filePos << '\n';  //last progress indicator
+            EOS_ASSERT( bnum == firstBlock, block_log_exception, "blocks.log does not contain consecutive block numbers" );
+            break;
+         }
+         indPos-= fposListLen;
+         blkBase-= fposListLen>>3;
+         didread= lseek(fout,indPos,ios::beg);
+         EOS_ASSERT( didread==indPos, block_log_exception, "blocks.log seek fails" );
+         lastIndBufLen= fposListLen;                        //from now on all writes to index file write a full fposList[]
+      }
+      if (indexStart < 8) {                                 //if block start is split across buf boundary
+         memcpy(buf+bufLen,buf,8);                          //copy portion at start of buf to past end of buf
+         pos-= bufLen;                                      //file position of buf
+         lseek(fin,pos,ios::beg);
+         didread= read(fin,buf,bufLen);                     //read next buf
+         EOS_ASSERT( didread==bufLen, block_log_exception, "blocks.log read fails" );
+         indexStart+= bufLen;
+      }
+      indexEnd= indexStart-8;                               //index in buf where block ends and block file position starts
+      filePos= *(uint64_t*)(buf+indexEnd);                  //file pos of block start
+      if (filePos < pos) {                                  //if block start is in prior buf
+         pos-= bufLen;                                      //file position of buf
+         lseek(fin,pos,ios::beg);
+         didread= read(fin,buf,bufLen);                     //read next buf
+         EOS_ASSERT( didread==bufLen, block_log_exception, "blocks.log read fails" );
+         indexEnd+= bufLen;
+      }
+      indexStart= filePos - pos;                            //buf index for block start
+      --bnum;
+      fposList[bnum-blkBase]= filePos;                      //write filepos for block bnum
+      if ((bnum & 0xfffff) == 0)                            //periodically print a progress indicator
+         cout << "block " << setw(10) << bnum << "    filePos " << setw(14) << filePos << '\n';
+   }
+
+   close(fout);
+   close(fin);
+   delete[] buf;
+   delete[] fposList;
+   cout << "\nwrote " << lastBlock << " file positions to " << outFileName << '\n';
+   return 0;
+}
 
 int main(int argc, char** argv)
 {
@@ -184,6 +361,18 @@ int main(int argc, char** argv)
         cli.print(std::cerr);
         return 0;
       }
+      if (vmap.at("trim-block-log").as<bool>()) {
+         uint32_t last= vmap.at("last").as<uint32_t>();
+         if (last == std::numeric_limits<uint32_t>::max()) {   //if 'last' was not given on command line
+            std::cout << "'trim-block-log' does nothing unless specify 'last' block.";
+            return -1;
+         }
+         return truncBlockLog(vmap.at("blocks-dir").as<bfs::path>(), last);
+      }
+      if (vmap.at("make-index").as<bool>()) {
+         string outFile{vmap.count("output-file")==0? string("blocks.index"): vmap.at("output-file").as<bfs::path>().generic_string()};
+         return makeIndex(vmap.at("blocks-dir").as<bfs::path>(), outFile);
+      }
       blog.initialize(vmap);
       blog.read_log();
    } catch( const fc::exception& e ) {
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 611d9f1f40e..47e101b40f7 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -13,6 +13,7 @@
 #include <fc/io/json.hpp>
 #include <fc/log/logger_config.hpp>
 #include <appbase/execution_priority_queue.hpp>
+#include <fc/bitutil.hpp>
 
 #include <boost/test/unit_test.hpp>
 
@@ -119,6 +120,14 @@ static constexpr uint64_t name_suffix( uint64_t n ) {
 
 BOOST_AUTO_TEST_SUITE(misc_tests)
 
+BOOST_AUTO_TEST_CASE(reverse_endian_tests)
+{
+    BOOST_CHECK_EQUAL( endian_reverse_u64(0x0123456789abcdef), 0xefcdab8967452301 );
+    BOOST_CHECK_EQUAL( endian_reverse_u64(0x0102030405060708), 0x0807060504030201 );
+    BOOST_CHECK_EQUAL( endian_reverse_u32(0x01234567), 0x67452301 );
+    BOOST_CHECK_EQUAL( endian_reverse_u32(0x01020304), 0x04030201 );
+}
+
 BOOST_AUTO_TEST_CASE(name_suffix_tests)
 {
    BOOST_CHECK_EQUAL( name{name_suffix(0)}, name{0} );

From 44b524a32168e7712e23a908f00de946feaad71a Mon Sep 17 00:00:00 2001
From: Steven Strand <steven.strand@block.one>
Date: Tue, 12 Mar 2019 18:36:35 -0400
Subject: [PATCH 0243/1648] add suggested changes #6884

---
 .../chain/include/eosio/chain/exceptions.hpp  |   2 +-
 programs/eosio-blocklog/main.cpp              | 275 ++++++++++--------
 2 files changed, 148 insertions(+), 129 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 927675a9585..fa92cf984d8 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -534,7 +534,7 @@ namespace eosio { namespace chain {
       FC_DECLARE_DERIVED_EXCEPTION( block_index_not_found, block_log_exception,
                                     3190005, "block index can not be found"  )
 
-      FC_DECLARE_DERIVED_EXCEPTION( http_exception, chain_exception,
+   FC_DECLARE_DERIVED_EXCEPTION( http_exception, chain_exception,
                                  3200000, "http exception" )
       FC_DECLARE_DERIVED_EXCEPTION( invalid_http_client_root_cert,    http_exception,
                                     3200001, "invalid http client root certificate" )
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index f90cb44218a..642417a4ddb 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -2,6 +2,7 @@
  *  @file
  *  @copyright defined in eosio/LICENSE.txt
  */
+#include <memory>
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/chain/block_log.hpp>
 #include <eosio/chain/config.hpp>
@@ -140,10 +141,10 @@ void blocklog::set_program_options(options_description& cli)
          ("blocks-dir", bpo::value<bfs::path>()->default_value("blocks"),
           "the location of the blocks directory (absolute path or relative to the current directory)")
          ("output-file,o", bpo::value<bfs::path>(),
-          "the file to write the block log output to (absolute or relative path).  If not specified then output is to stdout.")
-         ("first", bpo::value<uint32_t>(&first_block)->default_value(1),
+          "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
+         ("first,f", bpo::value<uint32_t>(&first_block)->default_value(1),
           "the first block number to log")
-         ("last", bpo::value<uint32_t>(&last_block)->default_value(std::numeric_limits<uint32_t>::max()),
+         ("last,l", bpo::value<uint32_t>(&last_block)->default_value(std::numeric_limits<uint32_t>::max()),
           "the last block number (inclusive) to log")
          ("no-pretty-print", bpo::bool_switch(&no_pretty_print)->default_value(false),
           "Do not pretty print the output.  Useful if piping to jq to improve performance.")
@@ -151,9 +152,9 @@ void blocklog::set_program_options(options_description& cli)
           "Print out json blocks wrapped in json array (otherwise the output is free-standing json objects).")
          ("make-index", bpo::bool_switch(&make_index)->default_value(false),
           "Create blocks.index from blocks.log. Must give 'blocks-dir'. Give 'output-file' relative to blocks-dir (default is blocks.index).")
-         ("trim-block-log", bpo::bool_switch(&make_index)->default_value(false),
+         ("trim-blocklog", bpo::bool_switch(&make_index)->default_value(false),
           "Trim blocks.log and blocks.index in place. Must give 'blocks-dir' and 'last' (else nothing is done).")
-         ("help", "Print this help message and exit.")
+         ("help,h", "Print this help message and exit.")
          ;
 }
 
@@ -176,174 +177,192 @@ void blocklog::initialize(const variables_map& options) {
 
 }
 
-//struct used by truncBlockLog() and makeIndex() to read first 18 bytes of a block from blocks.log
-struct __attribute__((packed)) BlockStart {    //first 18 bytes of each block
+//struct used by trunc_blocklog() and make_index() to read first 18 bytes of a block from blocks.log
+struct __attribute__((packed)) Block_Start {    //first 18 bytes of each block (must match block_header)
    block_timestamp_type timestamp;
    account_name         prodname;
    uint16_t             confirmed;
    uint32_t             blknum;     //low 32 bits of previous blockid, is big endian block number of previous block
-} blkStart;
+} blk_start;
+static_assert( sizeof(Block_Start) == 18, "Update block_start if block_header changes");
 
-int truncBlockLog(bfs::path blockDir, uint32_t n) {          //n is last block to keep
+int trunc_blocklog(bfs::path block_dir, uint32_t n) {       //n is last block to keep
    using namespace std;
-   cout << "Will truncate blocks.log and blocks.index after block " << n << '\n';
-
    //read blocks.log to see if version 1 or 2 and get first block number
-   filebuf fin0;
-   string blockFileName= (blockDir/"blocks.log").generic_string();
-   fin0.open(blockFileName.c_str(), ios::in|ios::binary);
-   EOS_ASSERT( fin0.is_open(), block_log_not_found, "cannot read blocks.log" );
-   uint32_t version=0, firstBlock;
-   fin0.sgetn((char*)&version,sizeof(version));
-   EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "unsupported version of block log" );
+   filebuf fin_blocks;
+   cout << "In directory " << block_dir << " will truncate blocks.log and blocks.index after block " << n << '\n';
+   string block_file_name= (block_dir/"blocks.log").generic_string();
+   fin_blocks.open(block_file_name, ios::in|ios::binary);
+   EOS_ASSERT( fin_blocks.is_open(), block_log_not_found, "cannot read ${file}", ("file",block_file_name) );
+   uint32_t version=0, first_block;
+   fin_blocks.sgetn((char*)&version,sizeof(version));
+   cout << "block log version= " << version << '\n';
+   EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
    if (version == 1)
-      firstBlock= 1;
+      first_block= 1;
    else
-      fin0.sgetn((char*)&firstBlock,sizeof(firstBlock));
-   cout << "version= " << version << "\nfirst block= " << firstBlock << '\n';
-   if (n <= firstBlock) {
-      cout << n << " is before first block so nothing to do\n";
+      fin_blocks.sgetn((char*)&first_block,sizeof(first_block));
+   cout << "first block= " << first_block << '\n';
+   if (n <= first_block) {
+      cerr << n << " is before first block so nothing to do\n";
       return 2;
    }
 
-   //open blocks.index and get blocks.log position for block 'n'
-   filebuf fin1;
-   string indexFileName= (blockDir/"blocks.index").generic_string();
-   fin1.open(indexFileName.c_str(),ios::in|ios::binary);
-   EOS_ASSERT( fin1.is_open(), block_index_not_found, "cannot read blocks.index" );
-   uint64_t indexPos= 8*(n-firstBlock);
-   uint64_t pos= fin1.pubseekoff(indexPos,ios::beg,ios::in);
-   EOS_ASSERT( pos==indexPos, block_log_exception, "cannot read blocks.index entry for trim-after-block" );
+   //open blocks.index, get last_block and blocks.log position for block 'n'
+   filebuf fin_index;
+   string index_file_name= (block_dir/"blocks.index").generic_string();
+   fin_index.open(index_file_name,ios::in|ios::binary);
+   EOS_ASSERT( fin_index.is_open(), block_index_not_found, "cannot read ${file}", ("file",index_file_name) );
+   uint64_t file_end= fin_index.pubseekoff(0,ios::end,ios::in);
+   uint32_t last_block= file_end/sizeof(uint64_t);
+   cout << "last block=  " << last_block << '\n';
+   if (n >= last_block) {
+      cerr << n << " is not before last block so nothing to do\n";
+      return 2;
+   }
+   uint64_t index_pos= sizeof(uint64_t)*(n-first_block);
+   uint64_t pos= fin_index.pubseekoff(index_pos,ios::beg,ios::in);
+   EOS_ASSERT( pos==index_pos, block_log_exception, "cannot read blocks.index entry for block ${b}", ("b",n) );
    uint64_t fpos0, fpos1;                                   //filepos of block n and block n+1, will read from blocks.index
-   fin1.sgetn((char*)&fpos0,sizeof(fpos0));
-   fin1.sgetn((char*)&fpos1,sizeof(fpos1));
-   fin1.close();
+   fin_index.sgetn((char*)&fpos0,sizeof(fpos0));
+   fin_index.sgetn((char*)&fpos1,sizeof(fpos1));
+   fin_index.close();
    cout << "According to blocks.index:\n";
    cout << "    block " << n << " starts at position " << fpos0 << '\n';
    cout << "    block " << n+1 << " starts at position " << fpos1 << '\n';
 
    //read blocks.log and verify block number n is found at file position fpos0
-   fin0.pubseekoff(fpos0,ios::beg,ios::in);
-   fin0.sgetn((char*)&blkStart,sizeof(blkStart));
-   fin0.close();
-   uint32_t bnum= endian_reverse_u32(blkStart.blknum)+1;    //convert from big endian to little endian, add 1 since prior block
+   fin_blocks.pubseekoff(fpos0,ios::beg,ios::in);
+   fin_blocks.sgetn((char*)&blk_start,sizeof(blk_start));   //read first 18 bytes of block
+   fin_blocks.close();
+   uint32_t bnum= endian_reverse_u32(blk_start.blknum)+1;   //convert from big endian to little endian, add 1 since prior block
+   cout << "At position " << fpos0 << " in blocks.log find block " << bnum << (bnum==n? " as expected\n": " - not good!\n");
    EOS_ASSERT( bnum==n, block_log_exception, "blocks.index does not agree with blocks.log" );
-   cout << "In blocks.log at position " << fpos0 << " find block " << bnum << " as expected\n";
-   EOS_ASSERT( truncate(blockFileName.c_str(),fpos1)==0, block_log_exception, "truncate blocks.log fails");
-   indexPos+= sizeof(uint64_t);                             //advance to after record for block n
-   EOS_ASSERT( truncate(indexFileName.c_str(),indexPos)==0, block_log_exception, "truncate blocks.index fails");
+   EOS_ASSERT( truncate(block_file_name.c_str(),fpos1)==0, block_log_exception, "truncate blocks.log fails");
+   index_pos+= sizeof(uint64_t);                            //advance to after record for block n
+   EOS_ASSERT( truncate(index_file_name.c_str(),index_pos)==0, block_log_exception, "truncate blocks.index fails");
    cout << "blocks.log has been truncated to " << fpos1 << " bytes\n";
-   cout << "blocks.index has been truncated to " << indexPos << " bytes\n";
+   cout << "blocks.index has been truncated to " << index_pos << " bytes\n";
    return 0;
 }
 
-int makeIndex(bfs::path blockDir, string outFile) {
+int make_index(bfs::path block_dir, string out_file) {
    //this code makes blocks.index much faster than nodeos (in recent test 80 seconds vs. 90 minutes)
    using namespace std;
-   cout << "Will make blocks.index from blocks.log\n";
-   string blockFileName= (blockDir / "blocks.log").generic_string();
-   string outFileName=   (blockDir / outFile     ).generic_string();
-   int fin = open(blockFileName.c_str(), O_RDONLY);
-   EOS_ASSERT( fin>0, block_log_not_found, "cannot read blocks.log" );
-
-   //will read big chunks of blocks.log into buf, will fill fposList with file positions before write to blocks.index
+   string block_file_name= (block_dir / "blocks.log").generic_string();
+   string out_file_name=   (block_dir / out_file     ).generic_string();
+   cout << "Will read blocks.log file " << block_file_name << '\n';
+   cout << "Will write blocks.index file " << out_file_name << '\n';
+   int fin = open(block_file_name.c_str(), O_RDONLY);
+   EOS_ASSERT( fin>0, block_log_not_found, "cannot read block file ${file}", ("file",block_file_name) );
+
+   //will read big chunks of blocks.log into buf, will fill fpos_list with file positions before write to blocks.index
    constexpr uint32_t bufLen{1U<<24};                       //bufLen must be power of 2 >= largest possible block == one MByte
-   char* buf= new char[bufLen+8];                           //first 8 bytes of prior buf are put past end of current buf
-   constexpr uint64_t fposListLen{1U<<22};                  //length of fposList[] in bytes
-   uint64_t* fposList= new uint64_t[fposListLen>>3];
-
-   //read blocks.log to see if version 1 or 2 and get firstblocknum (implicit 1 if version 1)
-   uint32_t version=0, firstBlock;
+   auto buffer= make_unique<char[]>(bufLen+8);              //first 8 bytes of prior buf are put past end of current buf
+   char* buf= buffer.get();
+   constexpr uint64_t fpos_list_len{1U<<22};                //length of fpos_list[] in bytes
+   auto fpos_buffer= make_unique<uint64_t[]>(fpos_list_len>>3);
+   uint64_t* fpos_list= fpos_buffer.get();
+
+   //read blocks.log to see if version 1 or 2 and get first_blocknum (implicit 1 if version 1)
+   uint32_t version=0, first_block;
    read(fin,(char*)&version,sizeof(version));
-   EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "unsupported version of block log" );
+   cout << "block log version= " << version << '\n';
+   EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
    if (version == 1)
-      firstBlock= 1;
+      first_block= 1;
    else
-      read(fin,(char*)&firstBlock,sizeof(firstBlock));
-   cout << "block log version= " << version << '\n';
-   cout << "first block= " << firstBlock << '\n';
-
-   uint64_t pos= lseek(fin,0,ios::end);                     //get blocks.log file length
-   uint64_t lastBufLen= pos & ((uint64_t)bufLen-1);         //bufLen is a power of 2 so -1 creates low bits all 1
-   if (!lastBufLen)                                         //will read integral number of bufLen and one time read lastBufLen
-      lastBufLen= bufLen;
-   pos= lseek(fin,-(uint64_t)lastBufLen,ios::end);
-   uint64_t didread= read(fin,buf,lastBufLen);              //read tail of file into buf
-   EOS_ASSERT( didread==lastBufLen, block_log_exception, "blocks.log read fails" );
-
-   uint32_t indexStart;                                     //buf index for block start
-   uint32_t indexEnd;                                       //buf index for block end == buf index for block start file position
-   uint64_t filePos;                                        //file pos of block start
-   BlockStart* bst;                                         //pointer to BlockStart
-
-   indexStart= lastBufLen;                                  //pretend a block starts just past end of buf then read prior block
-   indexEnd= indexStart-8;                                  //index in buf where block ends and block file position starts
-   filePos= *(uint64_t*)(buf+indexEnd);                     //file pos of block start
-   indexStart= filePos - pos;                               //buf index for block start
-   bst= (BlockStart*)(buf+indexStart);                      //pointer to BlockStart
-   uint32_t lastBlock= endian_reverse_u32(bst->blknum);     //convert from big endian to little endian
-   uint32_t bnum= ++lastBlock;                              //add 1 since took block number from prior block id
-   cout << "last block=  " << lastBlock << '\n';
+      read(fin,(char*)&first_block,sizeof(first_block));
+   cout << "first block= " << first_block << '\n';
+
+   uint64_t pos= lseek(fin,0,SEEK_END);                     //get blocks.log file length
+   uint64_t last_buf_len= pos & ((uint64_t)bufLen-1);       //bufLen is a power of 2 so -1 creates low bits all 1
+   if (!last_buf_len)                                       //will read integral number of bufLen and one time read last_buf_len
+      last_buf_len= bufLen;
+   pos= lseek(fin,-(uint64_t)last_buf_len,SEEK_END);
+   uint64_t did_read= read(fin,buf,last_buf_len);           //read tail of file into buf
+   EOS_ASSERT( did_read==last_buf_len, block_log_exception, "blocks.log read fails" );
+
+   uint32_t index_start;                                    //buf index for block start
+   uint32_t index_end;                                      //buf index for block end == buf index for block start file position
+   uint64_t file_pos;                                       //file pos of block start
+   uint64_t last_file_pos;                                  //used to check that file_pos is strictly decreasing
+   Block_Start* bst;                                        //pointer to Block_Start
+
+   index_start= last_buf_len;                               //pretend a block starts just past end of buf then read prior block
+   index_end= index_start-8;                                //index in buf where block ends and block file position starts
+   last_file_pos= file_pos= *(uint64_t*)(buf+index_end);    //file pos of block start
+   index_start= file_pos - pos;                             //buf index for block start
+   bst= (Block_Start*)(buf+index_start);                    //pointer to Block_Start
+   uint32_t last_block= endian_reverse_u32(bst->blknum);    //convert from big endian to little endian
+   uint32_t bnum= ++last_block;                             //add 1 since took block number from prior block id
+   cout << "last block=  " << last_block << '\n';
    cout << '\n';
-   cout << "block " << setw(10) << bnum << "    filePos " << setw(14) << filePos << '\n';  //first progress indicator
+   cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';  //first progress indicator
 
    //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
    mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;     //if create file permissions will be 644
-   int fout = open(outFileName.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode); //create if no exists, truncate if does exist
+   int fout = open(out_file_name.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode); //create if no exists, truncate if does exist
    EOS_ASSERT( fout>0, block_index_not_found, "cannot write blocks.index" );
 
-   uint64_t indFileLen= bnum<<3;                            //index file holds 8 bytes per block in blocks.log
-   uint64_t lastIndBufLen= indFileLen & (fposListLen-1);    //fposListLen is a power of 2 so -1 creates low bits all 1
-   if (!lastIndBufLen)                                      //will write integral number of bufLen and lastIndBufLen one time to index file
-      lastIndBufLen= bufLen;
-   uint64_t indPos= lseek(fout,indFileLen-lastIndBufLen,ios::beg);
-   uint64_t blkBase= (indPos>>3) + firstBlock;              //first entry in fposList is for block blkBase
-   //cout << "indPos= " << indPos << "  blkBase= " << blkBase << '\n';
-   fposList[bnum-blkBase]= filePos;                         //write filepos for block bnum
+   uint64_t ind_file_len= bnum<<3;                          //index file holds 8 bytes per block in blocks.log
+   uint64_t last_ind_buf_len= ind_file_len & (fpos_list_len-1);    //fpos_list_len is a power of 2 so -1 creates low bits all 1
+   if (!last_ind_buf_len)                                   //will write integral number of bufLen and last_ind_buf_len one time to index file
+      last_ind_buf_len= bufLen;
+   uint64_t ind_pos= lseek(fout,ind_file_len-last_ind_buf_len,SEEK_SET);
+   uint64_t blk_base= (ind_pos>>3) + first_block;           //first entry in fpos_list is for block blk_base
+   //cout << "ind_pos= " << ind_pos << "  blk_base= " << blk_base << '\n';
+   fpos_list[bnum-blk_base]= file_pos;                      //write filepos for block bnum
 
    for (;;) {
-      if (bnum==blkBase) {                                  //if fposList is full
-         write(fout,(char*)fposList,lastIndBufLen); //write fposList to index file
-         if (indPos==0) {                                   //if done writing index file
-            cout << "block " << setw(10) << bnum << "    filePos " << setw(14) << filePos << '\n';  //last progress indicator
-            EOS_ASSERT( bnum == firstBlock, block_log_exception, "blocks.log does not contain consecutive block numbers" );
+      if (bnum==blk_base) {                                 //if fpos_list is full
+         write(fout,(char*)fpos_list,last_ind_buf_len);     //write fpos_list to index file
+         if (ind_pos==0) {                                  //if done writing index file
+            cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';  //last progress indicator
+            EOS_ASSERT( bnum == first_block, block_log_exception, "blocks.log does not contain consecutive block numbers" );
             break;
          }
-         indPos-= fposListLen;
-         blkBase-= fposListLen>>3;
-         didread= lseek(fout,indPos,ios::beg);
-         EOS_ASSERT( didread==indPos, block_log_exception, "blocks.log seek fails" );
-         lastIndBufLen= fposListLen;                        //from now on all writes to index file write a full fposList[]
+         ind_pos-= fpos_list_len;
+         blk_base-= fpos_list_len>>3;
+         did_read= lseek(fout,ind_pos,SEEK_SET);
+         EOS_ASSERT( did_read==ind_pos, block_log_exception, "blocks.log seek fails" );
+         last_ind_buf_len= fpos_list_len;                   //from now on all writes to index file write a full fpos_list[]
       }
-      if (indexStart < 8) {                                 //if block start is split across buf boundary
+      if (index_start < 8) {                                //if block start is split across buf boundary
          memcpy(buf+bufLen,buf,8);                          //copy portion at start of buf to past end of buf
          pos-= bufLen;                                      //file position of buf
-         lseek(fin,pos,ios::beg);
-         didread= read(fin,buf,bufLen);                     //read next buf
-         EOS_ASSERT( didread==bufLen, block_log_exception, "blocks.log read fails" );
-         indexStart+= bufLen;
+         lseek(fin,pos,SEEK_SET);
+         did_read= read(fin,buf,bufLen);                    //read next buf
+         EOS_ASSERT( did_read==bufLen, block_log_exception, "blocks.log read fails" );
+         index_start+= bufLen;
+      }
+      --bnum;                                               //now move index_start and index_end to prior block
+      index_end= index_start-8;                             //index in buf where block ends and block file position starts
+      file_pos= *(uint64_t*)(buf+index_end);                //file pos of block start
+      if (file_pos >= last_file_pos) {                      //file_pos will decrease if linked list is not corrupt
+         cout << '\n';
+         cout << "file pos for block " << bnum+1 << " is " << last_file_pos << '\n';
+         cout << "file pos for block " << bnum   << " is " <<      file_pos << '\n';
+         cout << "The linked list of blocks in blocks.log should run from last block to first block in reverse order\n";
+         EOS_ASSERT( file_pos<last_file_pos, block_log_exception, "blocks.log linked list of blocks is corrupt" );
       }
-      indexEnd= indexStart-8;                               //index in buf where block ends and block file position starts
-      filePos= *(uint64_t*)(buf+indexEnd);                  //file pos of block start
-      if (filePos < pos) {                                  //if block start is in prior buf
+      last_file_pos= file_pos;
+      if (file_pos < pos) {                                 //if block start is in prior buf
          pos-= bufLen;                                      //file position of buf
-         lseek(fin,pos,ios::beg);
-         didread= read(fin,buf,bufLen);                     //read next buf
-         EOS_ASSERT( didread==bufLen, block_log_exception, "blocks.log read fails" );
-         indexEnd+= bufLen;
+         lseek(fin,pos,SEEK_SET);
+         did_read= read(fin,buf,bufLen);                    //read next buf
+         EOS_ASSERT( did_read==bufLen, block_log_exception, "blocks.log read fails" );
+         index_end+= bufLen;
       }
-      indexStart= filePos - pos;                            //buf index for block start
-      --bnum;
-      fposList[bnum-blkBase]= filePos;                      //write filepos for block bnum
+      index_start= file_pos - pos;                          //buf index for block start
+       fpos_list[bnum-blk_base]= file_pos;                  //write filepos for block bnum
       if ((bnum & 0xfffff) == 0)                            //periodically print a progress indicator
-         cout << "block " << setw(10) << bnum << "    filePos " << setw(14) << filePos << '\n';
+         cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';
    }
 
    close(fout);
    close(fin);
-   delete[] buf;
-   delete[] fposList;
-   cout << "\nwrote " << lastBlock << " file positions to " << outFileName << '\n';
+   cout << "\nwrote " << last_block << " file positions to " << out_file_name << '\n';
    return 0;
 }
 
@@ -361,17 +380,17 @@ int main(int argc, char** argv)
         cli.print(std::cerr);
         return 0;
       }
-      if (vmap.at("trim-block-log").as<bool>()) {
+      if (vmap.at("trim-blocklog").as<bool>()) {
          uint32_t last= vmap.at("last").as<uint32_t>();
          if (last == std::numeric_limits<uint32_t>::max()) {   //if 'last' was not given on command line
-            std::cout << "'trim-block-log' does nothing unless specify 'last' block.";
+            std::cout << "'trim-block-blocklog' does nothing unless specify 'last' block.";
             return -1;
          }
-         return truncBlockLog(vmap.at("blocks-dir").as<bfs::path>(), last);
+         return trunc_blocklog(vmap.at("blocks-dir").as<bfs::path>(), last);
       }
       if (vmap.at("make-index").as<bool>()) {
-         string outFile{vmap.count("output-file")==0? string("blocks.index"): vmap.at("output-file").as<bfs::path>().generic_string()};
-         return makeIndex(vmap.at("blocks-dir").as<bfs::path>(), outFile);
+         string out_file{vmap.count("output-file")==0? string("blocks.index"): vmap.at("output-file").as<bfs::path>().generic_string()};
+         return make_index(vmap.at("blocks-dir").as<bfs::path>(), out_file);
       }
       blog.initialize(vmap);
       blog.read_log();

From 3ed180cac5e948b5dd127b3a260809e658634bc9 Mon Sep 17 00:00:00 2001
From: Steven Strand <steven.strand@block.one>
Date: Tue, 12 Mar 2019 19:07:02 -0400
Subject: [PATCH 0244/1648] changed packed attribute

---
 programs/eosio-blocklog/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 642417a4ddb..060a75c6e01 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -178,7 +178,7 @@ void blocklog::initialize(const variables_map& options) {
 }
 
 //struct used by trunc_blocklog() and make_index() to read first 18 bytes of a block from blocks.log
-struct __attribute__((packed)) Block_Start {    //first 18 bytes of each block (must match block_header)
+struct __attribute__((__packed__)) Block_Start {    //first 18 bytes of each block (must match block_header)
    block_timestamp_type timestamp;
    account_name         prodname;
    uint16_t             confirmed;

From 98f156a39eb8a5d3bbcf09e6d023e47ed4ad4ddc Mon Sep 17 00:00:00 2001
From: Brian Johnson <johnsonb@objectcomputing.com>
Date: Fri, 29 Mar 2019 00:03:42 -0500
Subject: [PATCH 0245/1648] Remaining changes from Steve's branch. GH #6884

---
 programs/eosio-blocklog/main.cpp | 437 +++++++++++++++++++++++--------
 1 file changed, 332 insertions(+), 105 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 060a75c6e01..5be91a32651 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -39,7 +39,9 @@ struct blocklog {
    bool                             no_pretty_print;
    bool                             as_json_array;
    bool                             make_index;
-   uint32_t                         trim_block;
+   bool                             trim_log;
+   bool                             smoke_test;
+   bool                             help;
 };
 
 void blocklog::read_log() {
@@ -142,19 +144,21 @@ void blocklog::set_program_options(options_description& cli)
           "the location of the blocks directory (absolute path or relative to the current directory)")
          ("output-file,o", bpo::value<bfs::path>(),
           "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
-         ("first,f", bpo::value<uint32_t>(&first_block)->default_value(1),
-          "the first block number to log")
+         ("first,f", bpo::value<uint32_t>(&first_block)->default_value(0),
+          "the first block number to log or the first to keep if trim-blocklog")
          ("last,l", bpo::value<uint32_t>(&last_block)->default_value(std::numeric_limits<uint32_t>::max()),
-          "the last block number (inclusive) to log")
+          "the last block number to log or the last to keep if trim-blocklog")
          ("no-pretty-print", bpo::bool_switch(&no_pretty_print)->default_value(false),
           "Do not pretty print the output.  Useful if piping to jq to improve performance.")
          ("as-json-array", bpo::bool_switch(&as_json_array)->default_value(false),
           "Print out json blocks wrapped in json array (otherwise the output is free-standing json objects).")
          ("make-index", bpo::bool_switch(&make_index)->default_value(false),
           "Create blocks.index from blocks.log. Must give 'blocks-dir'. Give 'output-file' relative to blocks-dir (default is blocks.index).")
-         ("trim-blocklog", bpo::bool_switch(&make_index)->default_value(false),
-          "Trim blocks.log and blocks.index in place. Must give 'blocks-dir' and 'last' (else nothing is done).")
-         ("help,h", "Print this help message and exit.")
+         ("trim-blocklog", bpo::bool_switch(&trim_log)->default_value(false),
+          "Trim blocks.log and blocks.index. Must give 'blocks-dir' and 'first and/or 'last'.")
+         ("smoke-test", bpo::bool_switch(&smoke_test)->default_value(false),
+          "Quick test that blocks.log and blocks.index are well formed and agree with each other.")
+         ("help,h", bpo::bool_switch(&help)->default_value(false), "Print this help message and exit.")
          ;
 }
 
@@ -177,95 +181,280 @@ void blocklog::initialize(const variables_map& options) {
 
 }
 
-//struct used by trunc_blocklog() and make_index() to read first 18 bytes of a block from blocks.log
-struct __attribute__((__packed__)) Block_Start {    //first 18 bytes of each block (must match block_header)
-   block_timestamp_type timestamp;
-   account_name         prodname;
-   uint16_t             confirmed;
-   uint32_t             blknum;     //low 32 bits of previous blockid, is big endian block number of previous block
-} blk_start;
-static_assert( sizeof(Block_Start) == 18, "Update block_start if block_header changes");
+constexpr int blknum_offset{14};                      //offset from start of block to 4 byte block number
+//this offset is valid for version 1 and 2 blocklogs, version is checked before using blknum_offset
 
-int trunc_blocklog(bfs::path block_dir, uint32_t n) {       //n is last block to keep
+//to derive blknum_offset==14 see block_header.hpp and note on disk struct is packed
+//   block_timestamp_type timestamp;                  //bytes 0:3
+//   account_name         producer;                   //bytes 4:11
+//   uint16_t             confirmed;                  //bytes 12:13
+//   block_id_type        previous;                   //bytes 14:45, low 4 bytes is big endian block number of previous block
+
+struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end(), and smoke_test()
+   trim_data(bfs::path block_dir);
+   ~trim_data() {
+      close(blk_in);
+      close(ind_in);
+   }
+   void find_block_pos(uint32_t n);
+   std::string block_file_name, index_file_name;      //full pathname for blocks.log and blocks.index
+   uint32_t version;                                  //blocklog version (1 or 2)
+   uint32_t first_block, last_block;                  //first and last block in blocks.log
+   int blk_in, ind_in;                                //C style file descriptors for reading blocks.log and blocks.index
+   //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
+   uint64_t index_pos;                                //filepos in blocks.index for block n, +8 for block n+1
+   uint64_t fpos0, fpos1;                             //filepos in blocks.log for block n and block n+1
+};
+
+
+trim_data::trim_data(bfs::path block_dir) {
    using namespace std;
-   //read blocks.log to see if version 1 or 2 and get first block number
-   filebuf fin_blocks;
-   cout << "In directory " << block_dir << " will truncate blocks.log and blocks.index after block " << n << '\n';
-   string block_file_name= (block_dir/"blocks.log").generic_string();
-   fin_blocks.open(block_file_name, ios::in|ios::binary);
-   EOS_ASSERT( fin_blocks.is_open(), block_log_not_found, "cannot read ${file}", ("file",block_file_name) );
-   uint32_t version=0, first_block;
-   fin_blocks.sgetn((char*)&version,sizeof(version));
+   block_file_name= (block_dir/"blocks.log").generic_string();
+   index_file_name= (block_dir/"blocks.index").generic_string();
+   blk_in = open(block_file_name.c_str(), O_RDONLY);
+   EOS_ASSERT( blk_in>0, block_log_not_found, "cannot read file ${file}", ("file",block_file_name) );
+   ind_in = open(index_file_name.c_str(), O_RDONLY);
+   EOS_ASSERT( ind_in>0, block_log_not_found, "cannot read file ${file}", ("file",index_file_name) );
+   read(blk_in,(char*)&version,sizeof(version));
    cout << "block log version= " << version << '\n';
    EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
    if (version == 1)
       first_block= 1;
    else
-      fin_blocks.sgetn((char*)&first_block,sizeof(first_block));
+      read(blk_in,(char*)&first_block,sizeof(first_block));
    cout << "first block= " << first_block << '\n';
-   if (n <= first_block) {
-      cerr << n << " is before first block so nothing to do\n";
-      return 2;
-   }
-
-   //open blocks.index, get last_block and blocks.log position for block 'n'
-   filebuf fin_index;
-   string index_file_name= (block_dir/"blocks.index").generic_string();
-   fin_index.open(index_file_name,ios::in|ios::binary);
-   EOS_ASSERT( fin_index.is_open(), block_index_not_found, "cannot read ${file}", ("file",index_file_name) );
-   uint64_t file_end= fin_index.pubseekoff(0,ios::end,ios::in);
-   uint32_t last_block= file_end/sizeof(uint64_t);
+   uint64_t file_end= lseek(ind_in,0,SEEK_END);                //get length of blocks.index (gives number of blocks)
+   last_block= first_block + file_end/sizeof(uint64_t) - 1;
    cout << "last block=  " << last_block << '\n';
-   if (n >= last_block) {
-      cerr << n << " is not before last block so nothing to do\n";
-      return 2;
-   }
-   uint64_t index_pos= sizeof(uint64_t)*(n-first_block);
-   uint64_t pos= fin_index.pubseekoff(index_pos,ios::beg,ios::in);
-   EOS_ASSERT( pos==index_pos, block_log_exception, "cannot read blocks.index entry for block ${b}", ("b",n) );
-   uint64_t fpos0, fpos1;                                   //filepos of block n and block n+1, will read from blocks.index
-   fin_index.sgetn((char*)&fpos0,sizeof(fpos0));
-   fin_index.sgetn((char*)&fpos1,sizeof(fpos1));
-   fin_index.close();
+}
+
+void trim_data::find_block_pos(uint32_t n) {
+   //get file position of block n from blocks.index then confirm block n is found in blocks.log at that position
+   //sets fpos0 and fpos1, throws exception if block at fpos0 is not block n
+   using namespace std;
+   index_pos= sizeof(uint64_t)*(n-first_block);
+   uint64_t pos= lseek(ind_in,index_pos,SEEK_SET);
+   EOS_ASSERT( pos==index_pos, block_log_exception, "cannot seek to blocks.index entry for block ${b}", ("b",n) );
+   read(ind_in,(char*)&fpos0,sizeof(fpos0));                   //filepos of block n
+   read(ind_in,(char*)&fpos1,sizeof(fpos1));                   //filepos of block n+1
    cout << "According to blocks.index:\n";
    cout << "    block " << n << " starts at position " << fpos0 << '\n';
-   cout << "    block " << n+1 << " starts at position " << fpos1 << '\n';
-
+   cout << "    block " << n+1;
+   if (n!=last_block)
+      cout << " starts at position " << fpos1 << '\n';
+   else
+      cout << " is past end\n";
    //read blocks.log and verify block number n is found at file position fpos0
-   fin_blocks.pubseekoff(fpos0,ios::beg,ios::in);
-   fin_blocks.sgetn((char*)&blk_start,sizeof(blk_start));   //read first 18 bytes of block
-   fin_blocks.close();
-   uint32_t bnum= endian_reverse_u32(blk_start.blknum)+1;   //convert from big endian to little endian, add 1 since prior block
+   lseek(blk_in,fpos0+blknum_offset,SEEK_SET);
+   uint32_t prior_blknum;
+   read(blk_in,(char*)&prior_blknum,sizeof(prior_blknum));     //read bigendian block number of prior block
+   uint32_t bnum= endian_reverse_u32(prior_blknum)+1;          //convert to little endian, add 1 since prior block
    cout << "At position " << fpos0 << " in blocks.log find block " << bnum << (bnum==n? " as expected\n": " - not good!\n");
    EOS_ASSERT( bnum==n, block_log_exception, "blocks.index does not agree with blocks.log" );
-   EOS_ASSERT( truncate(block_file_name.c_str(),fpos1)==0, block_log_exception, "truncate blocks.log fails");
-   index_pos+= sizeof(uint64_t);                            //advance to after record for block n
-   EOS_ASSERT( truncate(index_file_name.c_str(),index_pos)==0, block_log_exception, "truncate blocks.index fails");
-   cout << "blocks.log has been truncated to " << fpos1 << " bytes\n";
-   cout << "blocks.index has been truncated to " << index_pos << " bytes\n";
+}
+
+int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block to keep (remove later blocks)
+   using namespace std;
+   cout << "\nIn directory " << block_dir << " will trim all blocks after block " << n << " from blocks.log and blocks.index.\n";
+   trim_data td(block_dir);
+   if (n < td.first_block) {
+      cerr << "All blocks are after block " << n << " so do nothing (trim_end would delete entire blocks.log)\n";
+      return 1;
+   }
+   if (n >= td.last_block) {
+      cerr << "There are no blocks after block " << n << " so do nothing\n";
+      return 2;
+   }
+   td.find_block_pos(n);
+   EOS_ASSERT( truncate(td.block_file_name.c_str(),td.fpos1)==0, block_log_exception, "truncate blocks.log fails");
+   uint64_t index_end= td.index_pos+sizeof(uint64_t);             //advance past record for block n
+   EOS_ASSERT( truncate(td.index_file_name.c_str(),index_end)==0, block_log_exception, "truncate blocks.index fails");
+   cout << "blocks.log has been trimmed to " << td.fpos1 << " bytes\n";
+   cout << "blocks.index has been trimmed to " << index_end << " bytes\n";
+   return 0;
+}
+
+int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first block to keep (remove prior blocks)
+   using namespace std;
+   cout << "\nIn directory " << block_dir << " will trim all blocks before block " << n << " from blocks.log and blocks.index.\n";
+   trim_data td(block_dir);
+   if (n <= td.first_block) {
+      cerr << "There are no blocks before block " << n << " so do nothing\n";
+      return 1;
+   }
+   if (n > td.last_block) {
+      cerr << "All blocks are before block " << n << " so do nothing (trim_front would delete entire blocks.log)\n";
+      return 2;
+   }
+   td.find_block_pos(n);
+
+   constexpr uint32_t buf_len{1U<<24};                            //buf_len must be a power of 2
+   auto buffer=  make_unique<char[]>(buf_len);                    //read big chunks of old blocks.log into this buffer
+   char* buf=  buffer.get();
+
+   string block_out_filename= (block_dir/"blocks.out").generic_string();
+   mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;           //if create file the permissions will be 644
+   int blk_out = open(block_out_filename.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode);
+   EOS_ASSERT( blk_out>0, block_log_not_found, "cannot write ${file}", ("file",block_out_filename) );
+
+   //in version 1 file: version number, no first block number, rest of header length 0x6e, at 0x72 first block
+   //in version 2 file: version number, first block number,    rest of header length 0x6e, at 0x76 totem,  at 0x7e first block
+   *(uint32_t*)buf= 2;
+   write(blk_out,buf,sizeof(uint32_t));                           //write version number 2
+   write(blk_out,(char*)&n,sizeof(n));                            //write first block number
+
+   lseek(td.blk_in,td.version==1? 4: 8,SEEK_SET) ;                //position past version number and maybe block number
+   read(td.blk_in,buf,0x6e);                                      //copy rest of header length 0x6e
+   memset(buf+0x6e,0xff,8);                                       //totem is 8 bytes of 0xff
+   write(blk_out,buf,0x6e + 8);                                   //write header and totem
+
+   //pos_delta is the amount to subtract from every file position record in blocks.log because the blocks < n are removed
+   uint64_t pos_delta= td.fpos0 - 0x7e;                           //bytes removed from the blocklog
+   //bytes removed is file position of block n minus file position 'where file header ends'
+   //even if version 1 blocklog 'where file header ends' is where the new version 2 file header of length 0x7e ends
+
+   //read big chunks of blocks.log into buf, update the file position records, then write to blk_out
+   uint64_t pos= lseek(td.blk_in,0,SEEK_END);                     //get blocks.log file length
+   uint32_t last_buf_len= (pos-td.fpos0 >= buf_len)? buf_len: pos-td.fpos0; //bytes to read from blk_in
+   pos= lseek(td.blk_in,-(uint64_t)last_buf_len,SEEK_END);        //pos is where read last buf from blk_in
+   uint64_t did_read= read(td.blk_in,buf,last_buf_len);           //read tail of blocks.log file into buf
+   cout << "seek blocks.log to " << pos << " read " << last_buf_len << " bytes\n";//debug
+   EOS_ASSERT( did_read==last_buf_len, block_log_exception, "blocks.log read fails" );
+
+   //prepare to write index_out_filename
+   uint64_t total_fpos_len= (td.last_block+1-n)*sizeof(uint64_t);
+   auto fpos_buffer= make_unique<uint64_t[]>(buf_len);
+   uint64_t* fpos_list= fpos_buffer.get();                        //list of file positions, periodically write to blocks.index
+   string index_out_filename= (block_dir/"index.out" ).generic_string();
+   int ind_out = open(index_out_filename.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode);
+   EOS_ASSERT( ind_out>0, block_log_not_found, "cannot write ${file}", ("file",index_out_filename) );
+   uint64_t last_fpos_len= total_fpos_len & ((uint64_t)buf_len-1);//buf_len is a power of 2 so -1 creates low bits all 1
+   if (!last_fpos_len)                                            //will write integral number of buf_len and one time write last_fpos_len
+      last_fpos_len= buf_len;
+   uint32_t blk_base= td.last_block + 1 - (last_fpos_len>>3);     //first entry in fpos_list is for block blk_base
+   cout << "******filling index buf blk_base " << blk_base << " last_fpos_len " << last_fpos_len << '\n';//debug
+
+   //as we traverse linked list of blocks in buf (from end toward start), for each block we know this:
+   int32_t index_start;                                           //buf index for block start
+   int32_t index_end;                                             //buf index for block end == buf index for block start file position
+   uint64_t file_pos;                                             //file position of block start
+   uint32_t bnum;                                                 //block number
+
+   //some code here is repeated in the loop below but we do it twice so can print a status message before the loop starts
+   index_end= last_buf_len-8;                                     //buf index where last block ends and the block file position starts
+   file_pos= *(uint64_t*)(buf+index_end);                         //file pos of block start
+   index_start= file_pos - pos;                                   //buf index for block start
+   bnum= *(uint32_t*)(buf + index_start + blknum_offset);         //block number of previous block (is big endian)
+   bnum= endian_reverse_u32(bnum)+1;                              //convert from big endian to little endian and add 1
+   EOS_ASSERT( bnum==td.last_block, block_log_exception, "last block from blocks.index ${ind} != last block from blocks.log ${log}", ("ind", td.last_block) ("log", bnum) );
+
+   cout << '\n';                                                  //print header for periodic update messages
+   cout << setw(10) << "block" << setw(16) << "old file pos" << setw(16) << "new file pos" << '\n';
+   cout << setw(10) << bnum << setw(16) << file_pos << setw(16) << file_pos-pos_delta << '\n';
+   uint64_t last_file_pos= file_pos+1;                            //used to check that file_pos is strictly decreasing
+   constexpr uint32_t fk{4096};                                   //buffer shift that keeps buf disk block aligned
+
+   for (;;) {        //invariant: at top of loop index_end and bnum are set and index_end is >= 0
+      file_pos = *(uint64_t *) (buf + index_end);                 //get file pos of block start
+      if (file_pos >= last_file_pos) {                            //check that file_pos decreases
+         cout << '\n';
+         cout << "file pos for block " << bnum + 1 << " is " << last_file_pos << '\n';
+         cout << "file pos for block " << bnum << " is " << file_pos << '\n';
+         EOS_ASSERT(file_pos < last_file_pos, block_log_exception, "blocks.log linked list of blocks is corrupt");
+      }
+      last_file_pos = file_pos;
+      *(uint64_t *) (buf + index_end) = file_pos - pos_delta;     //update file position in buf
+      fpos_list[bnum - blk_base] = file_pos - pos_delta;          //save updated file position for new index file
+      index_start = file_pos - pos;                               //will go negative when pass first block in buf
+
+      if ((bnum & 0xfffff) == 0)                                  //periodic progress indicator
+         cout << setw(10) << bnum << setw(16) << file_pos << setw(16) << file_pos-pos_delta << '\n';
+
+      if (bnum == blk_base) {                                     //if fpos_list is full write it to file
+         cout << "****** bnum=" << bnum << " blk_base= " << blk_base << " so write index buf seek to " << (blk_base - n) * sizeof(uint64_t) << " write len " << last_fpos_len << '\n';//debug
+         lseek(ind_out, (blk_base - n) * sizeof(uint64_t), SEEK_SET);
+         write(ind_out, (char *) fpos_list, last_fpos_len);       //write fpos_list to index file
+         last_fpos_len = buf_len;
+         if (bnum == n) {                                         //if done with all blocks >= block n
+            cout << setw(10) << bnum << setw(16) << file_pos << setw(16) << file_pos-pos_delta << '\n';
+            EOS_ASSERT( index_start==0, block_log_exception, "block ${n} found with unexpected index_start ${s}", ("n",n) ("s",index_start));
+            EOS_ASSERT( pos==td.fpos0, block_log_exception, "block ${n} found at unexpected file position ${p}", ("n",n) ("p",file_pos));
+            lseek(blk_out, pos-pos_delta, SEEK_SET);
+            write(blk_out, buf, last_buf_len);
+            break;
+         } else {
+            blk_base -= (buf_len>>3);
+            cout << "******filling index buf blk_base " << blk_base << " fpos_len " << buf_len << '\n';//debug
+         }
+      }
+
+      if (index_start <= 0) {                                     //if buf is ready to write (all file pos are updated)
+         //cout << "index_start = " << index_start << " so write buf len " << last_buf_len << " bnum= " << bnum << '\n';//debug
+         EOS_ASSERT(file_pos>td.fpos0, block_log_exception, "reverse scan of blocks.log did not halt at block ${n}",("n",n));
+         lseek(blk_out, pos-pos_delta, SEEK_SET);
+         write(blk_out, buf, last_buf_len);
+         last_buf_len= (pos-td.fpos0 > buf_len)? buf_len: pos-td.fpos0;
+         pos -= last_buf_len;
+         index_start += last_buf_len;
+         //cout << "seek blocks to " << pos << " read " << last_buf_len << " bytes\n";//debug
+         lseek(td.blk_in, pos, SEEK_SET);
+         did_read = read(td.blk_in, buf, last_buf_len);           //read next buf from blocklog
+         EOS_ASSERT(did_read == last_buf_len, block_log_exception, "blocks.log read fails");
+      }
+
+      index_end = index_start - sizeof(uint64_t);                 //move to prior block in buf
+      --bnum;
+
+      if (index_end < 0) {                                        //the file pos record straddles buf boundary
+         cout << "****  index_end= " << index_end << " so save buf-4K len= " << last_buf_len-fk << " bnum= " << bnum << '\n';//debug
+         lseek(blk_out, pos-pos_delta+fk, SEEK_SET);
+         write(blk_out, buf + fk, last_buf_len - fk);             //skip first 4K of buf write out the rest
+         last_buf_len= (pos-td.fpos0 >= buf_len-fk)? buf_len-fk: pos-td.fpos0;   //bytes to read from blk_in
+         memcpy(buf + last_buf_len, buf, fk);                     //move first 4K of buf after zone will read
+         pos-= last_buf_len;
+         index_end += last_buf_len;cout << "seek blocks to " << pos << " read " << last_buf_len << " bytes before saved 4k\n";//debug
+         lseek(td.blk_in, pos, SEEK_SET);
+         did_read = read(td.blk_in, buf, last_buf_len);
+         EOS_ASSERT(did_read == last_buf_len, block_log_exception, "blocks.log read fails");
+         last_buf_len+= fk;                                       //bytes in buf will eventually write to disk
+      }
+   }
+
+   close(blk_out);
+   close(ind_out);
+   string old_log= (block_dir/"old.log").generic_string();
+   string old_ind= (block_dir/"old.index").generic_string();
+   rename(td.block_file_name,old_log);
+   rename(td.index_file_name,old_ind);
+   rename(block_out_filename,td.block_file_name);
+   rename(index_out_filename,td.index_file_name);
+   cout << "The new blocks.log and blocks.index files contain blocks " << n << " through " << td.last_block << '\n';
+   cout << "The original (before trim front) files have been renamed to old.log and old.index.\n";
    return 0;
 }
 
+
 int make_index(bfs::path block_dir, string out_file) {
    //this code makes blocks.index much faster than nodeos (in recent test 80 seconds vs. 90 minutes)
    using namespace std;
    string block_file_name= (block_dir / "blocks.log").generic_string();
    string out_file_name=   (block_dir / out_file     ).generic_string();
-   cout << "Will read blocks.log file " << block_file_name << '\n';
-   cout << "Will write blocks.index file " << out_file_name << '\n';
+   cout << '\n';
+   cout << "Will read existing blocks.log file " << block_file_name << '\n';
+   cout << "Will write new blocks.index file " << out_file_name << '\n';
    int fin = open(block_file_name.c_str(), O_RDONLY);
    EOS_ASSERT( fin>0, block_log_not_found, "cannot read block file ${file}", ("file",block_file_name) );
 
    //will read big chunks of blocks.log into buf, will fill fpos_list with file positions before write to blocks.index
-   constexpr uint32_t bufLen{1U<<24};                       //bufLen must be power of 2 >= largest possible block == one MByte
-   auto buffer= make_unique<char[]>(bufLen+8);              //first 8 bytes of prior buf are put past end of current buf
+   constexpr uint32_t buf_len{1U<<24};                      //buf_len must be power of 2 >= largest possible block == one MByte
+   auto buffer= make_unique<char[]>(buf_len+8);             //can write up to 8 bytes past end of buf
    char* buf= buffer.get();
    constexpr uint64_t fpos_list_len{1U<<22};                //length of fpos_list[] in bytes
    auto fpos_buffer= make_unique<uint64_t[]>(fpos_list_len>>3);
    uint64_t* fpos_list= fpos_buffer.get();
 
    //read blocks.log to see if version 1 or 2 and get first_blocknum (implicit 1 if version 1)
-   uint32_t version=0, first_block;
+   uint32_t version=0, first_block=0;
    read(fin,(char*)&version,sizeof(version));
    cout << "block log version= " << version << '\n';
    EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
@@ -276,39 +465,39 @@ int make_index(bfs::path block_dir, string out_file) {
    cout << "first block= " << first_block << '\n';
 
    uint64_t pos= lseek(fin,0,SEEK_END);                     //get blocks.log file length
-   uint64_t last_buf_len= pos & ((uint64_t)bufLen-1);       //bufLen is a power of 2 so -1 creates low bits all 1
-   if (!last_buf_len)                                       //will read integral number of bufLen and one time read last_buf_len
-      last_buf_len= bufLen;
-   pos= lseek(fin,-(uint64_t)last_buf_len,SEEK_END);
-   uint64_t did_read= read(fin,buf,last_buf_len);           //read tail of file into buf
+   uint64_t last_buf_len= pos & ((uint64_t)buf_len-1);      //buf_len is a power of 2 so -1 creates low bits all 1
+   if (!last_buf_len)                                       //will read integral number of buf_len and one time read last_buf_len
+      last_buf_len= buf_len;
+   pos= lseek(fin,-(uint64_t)last_buf_len,SEEK_END);        //one time read last_buf_len
+   uint64_t did_read= read(fin,buf,last_buf_len);           //read tail of blocks.log file into buf
    EOS_ASSERT( did_read==last_buf_len, block_log_exception, "blocks.log read fails" );
 
+   //we traverse linked list of blocks in buf (from end to start), for each block we know this:
    uint32_t index_start;                                    //buf index for block start
    uint32_t index_end;                                      //buf index for block end == buf index for block start file position
    uint64_t file_pos;                                       //file pos of block start
-   uint64_t last_file_pos;                                  //used to check that file_pos is strictly decreasing
-   Block_Start* bst;                                        //pointer to Block_Start
+   uint32_t bnum;                                           //block number
 
-   index_start= last_buf_len;                               //pretend a block starts just past end of buf then read prior block
-   index_end= index_start-8;                                //index in buf where block ends and block file position starts
-   last_file_pos= file_pos= *(uint64_t*)(buf+index_end);    //file pos of block start
+   index_end= last_buf_len-8;                               //index in buf where last block ends and block file position starts
+   file_pos= *(uint64_t*)(buf+index_end);                   //file pos of block start
    index_start= file_pos - pos;                             //buf index for block start
-   bst= (Block_Start*)(buf+index_start);                    //pointer to Block_Start
-   uint32_t last_block= endian_reverse_u32(bst->blknum);    //convert from big endian to little endian
-   uint32_t bnum= ++last_block;                             //add 1 since took block number from prior block id
-   cout << "last block=  " << last_block << '\n';
+   bnum= *(uint32_t*)(buf + index_start + blknum_offset);   //block number of previous block (is big endian)
+   bnum= endian_reverse_u32(bnum)+1;                        //convert from big endian to little endian and add 1
+   cout << "last block=  " << bnum << '\n';
    cout << '\n';
    cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';  //first progress indicator
+   uint64_t last_file_pos= file_pos;                        //used to check that file_pos is strictly decreasing
+   uint32_t end_block{bnum};                                //save for message at end
 
    //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
    mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;     //if create file permissions will be 644
-   int fout = open(out_file_name.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode); //create if no exists, truncate if does exist
+   int fout = open(out_file_name.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode);
    EOS_ASSERT( fout>0, block_index_not_found, "cannot write blocks.index" );
 
-   uint64_t ind_file_len= bnum<<3;                          //index file holds 8 bytes per block in blocks.log
+   uint64_t ind_file_len= (bnum+1-first_block)<<3;                 //index file holds 8 bytes for each block in blocks.log
    uint64_t last_ind_buf_len= ind_file_len & (fpos_list_len-1);    //fpos_list_len is a power of 2 so -1 creates low bits all 1
-   if (!last_ind_buf_len)                                   //will write integral number of bufLen and last_ind_buf_len one time to index file
-      last_ind_buf_len= bufLen;
+   if (!last_ind_buf_len)                                   //will write integral number of buf_len and last_ind_buf_len one time to index file
+      last_ind_buf_len= buf_len;
    uint64_t ind_pos= lseek(fout,ind_file_len-last_ind_buf_len,SEEK_SET);
    uint64_t blk_base= (ind_pos>>3) + first_block;           //first entry in fpos_list is for block blk_base
    //cout << "ind_pos= " << ind_pos << "  blk_base= " << blk_base << '\n';
@@ -323,18 +512,18 @@ int make_index(bfs::path block_dir, string out_file) {
             break;
          }
          ind_pos-= fpos_list_len;
-         blk_base-= fpos_list_len>>3;
+         blk_base-= (fpos_list_len>>3);
          did_read= lseek(fout,ind_pos,SEEK_SET);
          EOS_ASSERT( did_read==ind_pos, block_log_exception, "blocks.log seek fails" );
          last_ind_buf_len= fpos_list_len;                   //from now on all writes to index file write a full fpos_list[]
       }
       if (index_start < 8) {                                //if block start is split across buf boundary
-         memcpy(buf+bufLen,buf,8);                          //copy portion at start of buf to past end of buf
-         pos-= bufLen;                                      //file position of buf
+         memcpy(buf+buf_len,buf,8);                         //copy portion at start of buf to past end of buf
+         pos-= buf_len;                                     //file position of buf
          lseek(fin,pos,SEEK_SET);
-         did_read= read(fin,buf,bufLen);                    //read next buf
-         EOS_ASSERT( did_read==bufLen, block_log_exception, "blocks.log read fails" );
-         index_start+= bufLen;
+         did_read= read(fin,buf,buf_len);                   //read next buf
+         EOS_ASSERT( did_read==buf_len, block_log_exception, "blocks.log read fails" );
+         index_start+= buf_len;
       }
       --bnum;                                               //now move index_start and index_end to prior block
       index_end= index_start-8;                             //index in buf where block ends and block file position starts
@@ -348,26 +537,52 @@ int make_index(bfs::path block_dir, string out_file) {
       }
       last_file_pos= file_pos;
       if (file_pos < pos) {                                 //if block start is in prior buf
-         pos-= bufLen;                                      //file position of buf
+         pos-= buf_len;                                     //file position of buf
          lseek(fin,pos,SEEK_SET);
-         did_read= read(fin,buf,bufLen);                    //read next buf
-         EOS_ASSERT( did_read==bufLen, block_log_exception, "blocks.log read fails" );
-         index_end+= bufLen;
+         did_read= read(fin,buf,buf_len);                   //read next buf
+         EOS_ASSERT( did_read==buf_len, block_log_exception, "blocks.log read fails" );
+         index_end+= buf_len;
       }
       index_start= file_pos - pos;                          //buf index for block start
-       fpos_list[bnum-blk_base]= file_pos;                  //write filepos for block bnum
+      fpos_list[bnum-blk_base]= file_pos;                   //write filepos for block bnum
       if ((bnum & 0xfffff) == 0)                            //periodically print a progress indicator
          cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';
    }
 
    close(fout);
    close(fin);
-   cout << "\nwrote " << last_block << " file positions to " << out_file_name << '\n';
+   cout << "\nwrote " << (end_block+1-first_block) << " file positions to " << out_file_name << '\n';
    return 0;
 }
 
-int main(int argc, char** argv)
-{
+void smoke_test(bfs::path block_dir) {
+   using namespace std;
+   cout << "\nSmoke test of blocks.log and blocks.index in directory " << block_dir << '\n';
+   trim_data td(block_dir);
+   lseek(td.blk_in,-sizeof(uint64_t),SEEK_END);             //get last_block from blocks.log, compare to from blocks.index
+   uint64_t file_pos;
+   read(td.blk_in,&file_pos,sizeof(uint64_t));
+   lseek(td.blk_in,file_pos+blknum_offset,SEEK_SET);
+   uint32_t bnum;
+   read(td.blk_in,&bnum,sizeof(uint32_t));
+   bnum= endian_reverse_u32(bnum)+1;                        //convert from big endian to little endian and add 1
+   EOS_ASSERT( td.last_block==bnum, block_log_exception, "blocks.log says last block is ${lb} which disagrees with blocks.index", ("lb",bnum) );
+   cout << "blocks.log and blocks.index agree on number of blocks\n";
+   uint32_t delta= (td.last_block+8-td.first_block)>>3;
+   if (delta<1)
+      delta= 1;
+   for (uint32_t n= td.first_block; ; n+= delta) {
+      if (n>td.last_block)
+         n= td.last_block;
+      cout << '\n';
+      td.find_block_pos(n);                                 //check block 'n' is where blocks.index says
+      if (n==td.last_block)
+         break;
+   }
+   cout << "\nno problems found\n";                         //if get here there were no exceptions
+}
+
+int main(int argc, char** argv) {
    std::ios::sync_with_stdio(false); // for potential performance boost for large block log files
    options_description cli ("eosio-blocklog command line options");
    try {
@@ -376,22 +591,34 @@ int main(int argc, char** argv)
       variables_map vmap;
       bpo::store(bpo::parse_command_line(argc, argv, cli), vmap);
       bpo::notify(vmap);
-      if (vmap.count("help") > 0) {
-        cli.print(std::cerr);
-        return 0;
+      if (blog.help) {
+         cli.print(std::cerr);
+         return 0;
+      }
+      if (blog.smoke_test) {
+         smoke_test(vmap.at("blocks-dir").as<bfs::path>());
+         return 0;
       }
-      if (vmap.at("trim-blocklog").as<bool>()) {
-         uint32_t last= vmap.at("last").as<uint32_t>();
-         if (last == std::numeric_limits<uint32_t>::max()) {   //if 'last' was not given on command line
-            std::cout << "'trim-block-blocklog' does nothing unless specify 'last' block.";
+      if (blog.trim_log) {
+         if (blog.first_block==0 && blog.last_block==std::numeric_limits<uint32_t>::max()) {
+            std::cerr << "trim-blocklog does nothing unless specify first and/or last block.";
             return -1;
          }
-         return trunc_blocklog(vmap.at("blocks-dir").as<bfs::path>(), last);
+         if (blog.last_block != std::numeric_limits<uint32_t>::max()) {
+            if (trim_blocklog_end(vmap.at("blocks-dir").as<bfs::path>(), blog.last_block) != 0)
+               return -1;
+         }
+         if (blog.first_block != 0) {
+            if (trim_blocklog_front(vmap.at("blocks-dir").as<bfs::path>(), blog.first_block) != 0)
+               return -1;
+         }
+         return 0;
       }
-      if (vmap.at("make-index").as<bool>()) {
+      if (blog.make_index) {
          string out_file{vmap.count("output-file")==0? string("blocks.index"): vmap.at("output-file").as<bfs::path>().generic_string()};
          return make_index(vmap.at("blocks-dir").as<bfs::path>(), out_file);
       }
+      //else print blocks.log as JSON
       blog.initialize(vmap);
       blog.read_log();
    } catch( const fc::exception& e ) {

From dea42ccb4b8f4e0ea6e63e03f5533ed9a7f4363e Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 25 Apr 2019 15:34:45 -0500
Subject: [PATCH 0246/1648] Added class to report how long each task takes.

---
 programs/eosio-blocklog/main.cpp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 5be91a32651..8232ff9059d 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -18,6 +18,8 @@
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/path.hpp>
 
+#include <chrono>
+
 using namespace eosio::chain;
 namespace bfs = boost::filesystem;
 namespace bpo = boost::program_options;
@@ -44,7 +46,21 @@ struct blocklog {
    bool                             help;
 };
 
+struct report_time {
+    report_time()
+    : _start(std::chrono::high_resolution_clock::now()) {
+    }
+
+    void report() {
+        const auto duration = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - _start).count() / 1000;
+        ilog("blocklog action took ${t} msec", ("t",duration));
+    }
+
+    const std::chrono::high_resolution_clock::time_point _start;
+};
+
 void blocklog::read_log() {
+   report_time rt;
    block_log block_logger(blocks_dir);
    const auto end = block_logger.read_head();
    EOS_ASSERT( end, block_log_exception, "No blocks found in block log" );
@@ -135,6 +151,7 @@ void blocklog::read_log() {
    }
    if (as_json_array)
       *out << "]";
+   rt.report();
 }
 
 void blocklog::set_program_options(options_description& cli)
@@ -208,6 +225,7 @@ struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end
 
 
 trim_data::trim_data(bfs::path block_dir) {
+   report_time rt;
    using namespace std;
    block_file_name= (block_dir/"blocks.log").generic_string();
    index_file_name= (block_dir/"blocks.index").generic_string();
@@ -226,11 +244,13 @@ trim_data::trim_data(bfs::path block_dir) {
    uint64_t file_end= lseek(ind_in,0,SEEK_END);                //get length of blocks.index (gives number of blocks)
    last_block= first_block + file_end/sizeof(uint64_t) - 1;
    cout << "last block=  " << last_block << '\n';
+   rt.report();
 }
 
 void trim_data::find_block_pos(uint32_t n) {
    //get file position of block n from blocks.index then confirm block n is found in blocks.log at that position
    //sets fpos0 and fpos1, throws exception if block at fpos0 is not block n
+   report_time rt;
    using namespace std;
    index_pos= sizeof(uint64_t)*(n-first_block);
    uint64_t pos= lseek(ind_in,index_pos,SEEK_SET);
@@ -251,9 +271,11 @@ void trim_data::find_block_pos(uint32_t n) {
    uint32_t bnum= endian_reverse_u32(prior_blknum)+1;          //convert to little endian, add 1 since prior block
    cout << "At position " << fpos0 << " in blocks.log find block " << bnum << (bnum==n? " as expected\n": " - not good!\n");
    EOS_ASSERT( bnum==n, block_log_exception, "blocks.index does not agree with blocks.log" );
+   rt.report();
 }
 
 int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block to keep (remove later blocks)
+   report_time rt;
    using namespace std;
    cout << "\nIn directory " << block_dir << " will trim all blocks after block " << n << " from blocks.log and blocks.index.\n";
    trim_data td(block_dir);
@@ -271,10 +293,12 @@ int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block
    EOS_ASSERT( truncate(td.index_file_name.c_str(),index_end)==0, block_log_exception, "truncate blocks.index fails");
    cout << "blocks.log has been trimmed to " << td.fpos1 << " bytes\n";
    cout << "blocks.index has been trimmed to " << index_end << " bytes\n";
+   rt.report();
    return 0;
 }
 
 int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first block to keep (remove prior blocks)
+   report_time rt;
    using namespace std;
    cout << "\nIn directory " << block_dir << " will trim all blocks before block " << n << " from blocks.log and blocks.index.\n";
    trim_data td(block_dir);
@@ -430,11 +454,13 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
    rename(index_out_filename,td.index_file_name);
    cout << "The new blocks.log and blocks.index files contain blocks " << n << " through " << td.last_block << '\n';
    cout << "The original (before trim front) files have been renamed to old.log and old.index.\n";
+   rt.report();
    return 0;
 }
 
 
 int make_index(bfs::path block_dir, string out_file) {
+   report_time rt;
    //this code makes blocks.index much faster than nodeos (in recent test 80 seconds vs. 90 minutes)
    using namespace std;
    string block_file_name= (block_dir / "blocks.log").generic_string();
@@ -552,6 +578,7 @@ int make_index(bfs::path block_dir, string out_file) {
    close(fout);
    close(fin);
    cout << "\nwrote " << (end_block+1-first_block) << " file positions to " << out_file_name << '\n';
+   rt.report();
    return 0;
 }
 

From 367876c2b90282bd1130a23b133a9ec0dd342889 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 25 Apr 2019 21:53:41 -0500
Subject: [PATCH 0247/1648] Converted from posix methods to standard C API
 methods.

---
 programs/eosio-blocklog/main.cpp | 429 ++++++++++++++++++-------------
 1 file changed, 245 insertions(+), 184 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 8232ff9059d..7d645485ed8 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -210,14 +210,15 @@ constexpr int blknum_offset{14};                      //offset from start of blo
 struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end(), and smoke_test()
    trim_data(bfs::path block_dir);
    ~trim_data() {
-      close(blk_in);
-      close(ind_in);
+      fclose(blk_in);
+      fclose(ind_in);
    }
    void find_block_pos(uint32_t n);
-   std::string block_file_name, index_file_name;      //full pathname for blocks.log and blocks.index
+   bfs::path block_file_name, index_file_name;        //full pathname for blocks.log and blocks.index
    uint32_t version;                                  //blocklog version (1 or 2)
    uint32_t first_block, last_block;                  //first and last block in blocks.log
-   int blk_in, ind_in;                                //C style file descriptors for reading blocks.log and blocks.index
+   FILE* blk_in;                                      //C style files for reading blocks.log and blocks.index
+   FILE* ind_in;                                      //C style files for reading blocks.log and blocks.index
    //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
    uint64_t index_pos;                                //filepos in blocks.index for block n, +8 for block n+1
    uint64_t fpos0, fpos1;                             //filepos in blocks.log for block n and block n+1
@@ -227,22 +228,27 @@ struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end
 trim_data::trim_data(bfs::path block_dir) {
    report_time rt;
    using namespace std;
-   block_file_name= (block_dir/"blocks.log").generic_string();
-   index_file_name= (block_dir/"blocks.index").generic_string();
-   blk_in = open(block_file_name.c_str(), O_RDONLY);
-   EOS_ASSERT( blk_in>0, block_log_not_found, "cannot read file ${file}", ("file",block_file_name) );
-   ind_in = open(index_file_name.c_str(), O_RDONLY);
-   EOS_ASSERT( ind_in>0, block_log_not_found, "cannot read file ${file}", ("file",index_file_name) );
-   read(blk_in,(char*)&version,sizeof(version));
+   block_file_name = block_dir / "blocks.log";
+   blk_in = fopen(block_file_name.c_str(), "r");
+   EOS_ASSERT( blk_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",block_file_name.string()) );
+   ind_in = fopen(index_file_name.c_str(), "r");
+   EOS_ASSERT( ind_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",index_file_name.string()) );
+   auto size = fread((void*)&version,sizeof(version), 1, blk_in);
+   EOS_ASSERT( size == 1, block_log_unsupported_version, "invalid format for file ${file}", ("file",block_file_name.string()));
    cout << "block log version= " << version << '\n';
-   EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
+   EOS_ASSERT( version == 1 || version == 2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
    if (version == 1)
-      first_block= 1;
-   else
-      read(blk_in,(char*)&first_block,sizeof(first_block));
+      first_block = 1;
+   else {
+      size = fread((void *) &first_block, sizeof(first_block), 1, blk_in);
+      EOS_ASSERT(size == 1, block_log_exception, "invalid format for file ${file}",
+                 ("file", block_file_name.string()));
+   }
    cout << "first block= " << first_block << '\n';
-   uint64_t file_end= lseek(ind_in,0,SEEK_END);                //get length of blocks.index (gives number of blocks)
-   last_block= first_block + file_end/sizeof(uint64_t) - 1;
+   const auto status = fseek(ind_in, 0, SEEK_END);                //get length of blocks.index (gives number of blocks)
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} end", ("file", index_file_name.string()) );
+   const uint64_t file_end = ftell(ind_in);                //get length of blocks.index (gives number of blocks)
+   last_block = first_block + file_end/sizeof(uint64_t) - 1;
    cout << "last block=  " << last_block << '\n';
    rt.report();
 }
@@ -252,33 +258,44 @@ void trim_data::find_block_pos(uint32_t n) {
    //sets fpos0 and fpos1, throws exception if block at fpos0 is not block n
    report_time rt;
    using namespace std;
-   index_pos= sizeof(uint64_t)*(n-first_block);
-   uint64_t pos= lseek(ind_in,index_pos,SEEK_SET);
-   EOS_ASSERT( pos==index_pos, block_log_exception, "cannot seek to blocks.index entry for block ${b}", ("b",n) );
-   read(ind_in,(char*)&fpos0,sizeof(fpos0));                   //filepos of block n
-   read(ind_in,(char*)&fpos1,sizeof(fpos1));                   //filepos of block n+1
+   index_pos = sizeof(uint64_t) * (n - first_block);
+   auto status = fseek(ind_in, index_pos, SEEK_SET);
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file for block ${b}", ("file", index_file_name.string())("pos", index_pos)("b",n) );
+   const uint64_t pos = ftell(ind_in);
+   EOS_ASSERT( pos == index_pos, block_log_exception, "cannot seek to ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
+   auto size = fread((void*)&fpos0, sizeof(fpos0), 1, ind_in);                   //filepos of block n
+   EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
+   size = fread((void*)&fpos1,sizeof(fpos1), 1, ind_in);                   //filepos of block n+1
+   EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}", ("file", index_file_name.string())("b",n + 1) );
+
    cout << "According to blocks.index:\n";
    cout << "    block " << n << " starts at position " << fpos0 << '\n';
-   cout << "    block " << n+1;
+   cout << "    block " << n + 1;
+
    if (n!=last_block)
       cout << " starts at position " << fpos1 << '\n';
    else
       cout << " is past end\n";
+
    //read blocks.log and verify block number n is found at file position fpos0
-   lseek(blk_in,fpos0+blknum_offset,SEEK_SET);
+   status = fseek(blk_in, fpos0 + blknum_offset, SEEK_SET);
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", fpos0 + blknum_offset) );
+   const uint64_t block_offset_pos = ftell(blk_in);
+   EOS_ASSERT( block_offset_pos == fpos0 + blknum_offset, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", fpos0 + blknum_offset) );
    uint32_t prior_blknum;
-   read(blk_in,(char*)&prior_blknum,sizeof(prior_blknum));     //read bigendian block number of prior block
-   uint32_t bnum= endian_reverse_u32(prior_blknum)+1;          //convert to little endian, add 1 since prior block
-   cout << "At position " << fpos0 << " in blocks.log find block " << bnum << (bnum==n? " as expected\n": " - not good!\n");
-   EOS_ASSERT( bnum==n, block_log_exception, "blocks.index does not agree with blocks.log" );
+   size = fread((void*)&prior_blknum, sizeof(prior_blknum), 1, blk_in);     //read bigendian block number of prior block
+   EOS_ASSERT( size == 1, block_log_exception, "cannot read prior block");
+   const uint32_t bnum = endian_reverse_u32(prior_blknum) + 1;          //convert to little endian, add 1 since prior block
+   cout << "At position " << fpos0 << " in " << index_file_name << " find block " << bnum << (bnum == n ? " as expected\n": " - not good!\n");
+   EOS_ASSERT( bnum == n, block_log_exception, "${index} does not agree with ${blocks}", ("index", index_file_name.string())("blocks", block_file_name.string()) );
    rt.report();
 }
 
 int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block to keep (remove later blocks)
    report_time rt;
    using namespace std;
-   cout << "\nIn directory " << block_dir << " will trim all blocks after block " << n << " from blocks.log and blocks.index.\n";
    trim_data td(block_dir);
+   cout << "\nIn directory " << block_dir << " will trim all blocks after block " << n << " from " << td.block_file_name << " and " << td.index_file_name << ".\n";
    if (n < td.first_block) {
       cerr << "All blocks are after block " << n << " so do nothing (trim_end would delete entire blocks.log)\n";
       return 1;
@@ -288,10 +305,9 @@ int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block
       return 2;
    }
    td.find_block_pos(n);
-   EOS_ASSERT( truncate(td.block_file_name.c_str(),td.fpos1)==0, block_log_exception, "truncate blocks.log fails");
-   uint64_t index_end= td.index_pos+sizeof(uint64_t);             //advance past record for block n
-   EOS_ASSERT( truncate(td.index_file_name.c_str(),index_end)==0, block_log_exception, "truncate blocks.index fails");
-   cout << "blocks.log has been trimmed to " << td.fpos1 << " bytes\n";
+   bfs::resize_file(td.block_file_name, td.fpos1);
+   uint64_t index_end= td.index_pos + sizeof(uint64_t);             //advance past record for block n
+   bfs::resize_file(td.index_file_name, index_end);
    cout << "blocks.index has been trimmed to " << index_end << " bytes\n";
    rt.report();
    return 0;
@@ -313,49 +329,61 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
    td.find_block_pos(n);
 
    constexpr uint32_t buf_len{1U<<24};                            //buf_len must be a power of 2
-   auto buffer=  make_unique<char[]>(buf_len);                    //read big chunks of old blocks.log into this buffer
-   char* buf=  buffer.get();
+   auto buffer =  make_unique<char[]>(buf_len);                   //read big chunks of old blocks.log into this buffer
+   char* buf =  buffer.get();
 
-   string block_out_filename= (block_dir/"blocks.out").generic_string();
-   mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;           //if create file the permissions will be 644
-   int blk_out = open(block_out_filename.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode);
-   EOS_ASSERT( blk_out>0, block_log_not_found, "cannot write ${file}", ("file",block_out_filename) );
+   bfs::path block_out_filename = block_dir / "blocks.out";
+   FILE* blk_out = fopen(block_out_filename.c_str(), "w");
+   EOS_ASSERT( blk_out != nullptr, block_log_not_found, "cannot write ${file}", ("file", block_out_filename.string()) );
 
    //in version 1 file: version number, no first block number, rest of header length 0x6e, at 0x72 first block
    //in version 2 file: version number, first block number,    rest of header length 0x6e, at 0x76 totem,  at 0x7e first block
-   *(uint32_t*)buf= 2;
-   write(blk_out,buf,sizeof(uint32_t));                           //write version number 2
-   write(blk_out,(char*)&n,sizeof(n));                            //write first block number
-
-   lseek(td.blk_in,td.version==1? 4: 8,SEEK_SET) ;                //position past version number and maybe block number
-   read(td.blk_in,buf,0x6e);                                      //copy rest of header length 0x6e
-   memset(buf+0x6e,0xff,8);                                       //totem is 8 bytes of 0xff
-   write(blk_out,buf,0x6e + 8);                                   //write header and totem
+   *(uint32_t*)buf = 2;
+   auto size = fwrite((void*)buf, sizeof(uint32_t), 1, blk_out);                           //write version number 2
+   EOS_ASSERT( size == 1, block_log_exception, "blocks.out write fails" );
+   size = fwrite((void*)&n, sizeof(n), 1, blk_out);                            //write first block number
+   EOS_ASSERT( size == 1, block_log_exception, "blocks.out write fails" );
+
+   const auto past_version_offset = (td.version == 1) ? 4 : 8;
+   auto status = fseek(td.blk_in, past_version_offset, SEEK_SET) ;                //position past version number and maybe block number
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", td.block_file_name.string())("pos", past_version_offset) );
+   const auto header_len = 0x6e;
+   size = fread((void*)buf, header_len, 1, td.blk_in);
+   EOS_ASSERT( size == 1, block_log_exception, "blocks.log read fails" );
+   const auto totem_len = 8; //copy rest of header length 0x6e
+   memset(buf + header_len, 0xff, totem_len);                                       //totem is 8 bytes of 0xff
+   size = fwrite(buf, header_len + totem_len, 1, blk_out);                          //write header and totem
+   EOS_ASSERT( size == 1, block_log_exception, "blocks.out write fails" );
 
    //pos_delta is the amount to subtract from every file position record in blocks.log because the blocks < n are removed
-   uint64_t pos_delta= td.fpos0 - 0x7e;                           //bytes removed from the blocklog
+   uint64_t pos_delta = td.fpos0 - 0x7e;                           //bytes removed from the blocklog
    //bytes removed is file position of block n minus file position 'where file header ends'
    //even if version 1 blocklog 'where file header ends' is where the new version 2 file header of length 0x7e ends
 
    //read big chunks of blocks.log into buf, update the file position records, then write to blk_out
-   uint64_t pos= lseek(td.blk_in,0,SEEK_END);                     //get blocks.log file length
-   uint32_t last_buf_len= (pos-td.fpos0 >= buf_len)? buf_len: pos-td.fpos0; //bytes to read from blk_in
-   pos= lseek(td.blk_in,-(uint64_t)last_buf_len,SEEK_END);        //pos is where read last buf from blk_in
-   uint64_t did_read= read(td.blk_in,buf,last_buf_len);           //read tail of blocks.log file into buf
-   cout << "seek blocks.log to " << pos << " read " << last_buf_len << " bytes\n";//debug
-   EOS_ASSERT( did_read==last_buf_len, block_log_exception, "blocks.log read fails" );
+   status = fseek(td.blk_in, 0, SEEK_END);                     //get blocks.log file length
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", 0) );
+   const uint64_t end = ftell(td.blk_in);
+   uint32_t last_buf_len = (end - td.fpos0 >= buf_len)? buf_len : end - td.fpos0; //bytes to read from blk_in
+   status = fseek(td.blk_in, -(uint64_t)last_buf_len, SEEK_END);        //pos is where read last buf from blk_in
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", last_buf_len) );
+   uint64_t pos = ftell(td.blk_in);
+   EOS_ASSERT( pos == end - last_buf_len, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", last_buf_len) );
+   uint64_t did_read = fread((void*)buf, last_buf_len, 1, td.blk_in);           //read tail of blocks.log file into buf
+   cout << "seek " << td.block_file_name << " to " << pos << " read " << last_buf_len << " bytes\n";//debug
+   EOS_ASSERT( did_read == 1, block_log_exception, "${file} read fails", ("file", td.block_file_name.string()) );
 
    //prepare to write index_out_filename
-   uint64_t total_fpos_len= (td.last_block+1-n)*sizeof(uint64_t);
-   auto fpos_buffer= make_unique<uint64_t[]>(buf_len);
-   uint64_t* fpos_list= fpos_buffer.get();                        //list of file positions, periodically write to blocks.index
-   string index_out_filename= (block_dir/"index.out" ).generic_string();
-   int ind_out = open(index_out_filename.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode);
-   EOS_ASSERT( ind_out>0, block_log_not_found, "cannot write ${file}", ("file",index_out_filename) );
-   uint64_t last_fpos_len= total_fpos_len & ((uint64_t)buf_len-1);//buf_len is a power of 2 so -1 creates low bits all 1
+   uint64_t total_fpos_len = (td.last_block + 1 - n) * sizeof(uint64_t);
+   auto fpos_buffer = make_unique<uint64_t[]>(buf_len);
+   uint64_t* fpos_list = fpos_buffer.get();                        //list of file positions, periodically write to blocks.index
+   bfs::path index_out_filename = block_dir / "index.out";
+   FILE* ind_out = fopen(index_out_filename.c_str(), "w");
+   EOS_ASSERT( ind_out != nullptr, block_log_not_found, "cannot write ${file}", ("file",index_out_filename.string()) );
+   uint64_t last_fpos_len = total_fpos_len & ((uint64_t)buf_len - 1);//buf_len is a power of 2 so -1 creates low bits all 1
    if (!last_fpos_len)                                            //will write integral number of buf_len and one time write last_fpos_len
-      last_fpos_len= buf_len;
-   uint32_t blk_base= td.last_block + 1 - (last_fpos_len>>3);     //first entry in fpos_list is for block blk_base
+      last_fpos_len = buf_len;
+   uint32_t blk_base = td.last_block + 1 - (last_fpos_len >> 3);     //first entry in fpos_list is for block blk_base
    cout << "******filling index buf blk_base " << blk_base << " last_fpos_len " << last_fpos_len << '\n';//debug
 
    //as we traverse linked list of blocks in buf (from end toward start), for each block we know this:
@@ -365,17 +393,17 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
    uint32_t bnum;                                                 //block number
 
    //some code here is repeated in the loop below but we do it twice so can print a status message before the loop starts
-   index_end= last_buf_len-8;                                     //buf index where last block ends and the block file position starts
-   file_pos= *(uint64_t*)(buf+index_end);                         //file pos of block start
-   index_start= file_pos - pos;                                   //buf index for block start
-   bnum= *(uint32_t*)(buf + index_start + blknum_offset);         //block number of previous block (is big endian)
-   bnum= endian_reverse_u32(bnum)+1;                              //convert from big endian to little endian and add 1
-   EOS_ASSERT( bnum==td.last_block, block_log_exception, "last block from blocks.index ${ind} != last block from blocks.log ${log}", ("ind", td.last_block) ("log", bnum) );
+   index_end = last_buf_len - 8;                                     //buf index where last block ends and the block file position starts
+   file_pos = *(uint64_t*)(buf + index_end);                         //file pos of block start
+   index_start = file_pos - pos;                                   //buf index for block start
+   bnum = *(uint32_t*)(buf + index_start + blknum_offset);         //block number of previous block (is big endian)
+   bnum = endian_reverse_u32(bnum) + 1;                              //convert from big endian to little endian and add 1
+   EOS_ASSERT( bnum == td.last_block, block_log_exception, "last block from ${index} ${ind} != last block from ${block} ${log}", ("index", td.index_file_name.string())("ind", td.last_block)("block", td.block_file_name.string())("log", bnum) );
 
    cout << '\n';                                                  //print header for periodic update messages
    cout << setw(10) << "block" << setw(16) << "old file pos" << setw(16) << "new file pos" << '\n';
    cout << setw(10) << bnum << setw(16) << file_pos << setw(16) << file_pos-pos_delta << '\n';
-   uint64_t last_file_pos= file_pos+1;                            //used to check that file_pos is strictly decreasing
+   uint64_t last_file_pos = file_pos + 1;                            //used to check that file_pos is strictly decreasing
    constexpr uint32_t fk{4096};                                   //buffer shift that keeps buf disk block aligned
 
    for (;;) {        //invariant: at top of loop index_end and bnum are set and index_end is >= 0
@@ -384,7 +412,7 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
          cout << '\n';
          cout << "file pos for block " << bnum + 1 << " is " << last_file_pos << '\n';
          cout << "file pos for block " << bnum << " is " << file_pos << '\n';
-         EOS_ASSERT(file_pos < last_file_pos, block_log_exception, "blocks.log linked list of blocks is corrupt");
+         EOS_ASSERT(file_pos < last_file_pos, block_log_exception, "${file} linked list of blocks is corrupt", ("file", td.index_file_name.string()) );
       }
       last_file_pos = file_pos;
       *(uint64_t *) (buf + index_end) = file_pos - pos_delta;     //update file position in buf
@@ -396,15 +424,19 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
 
       if (bnum == blk_base) {                                     //if fpos_list is full write it to file
          cout << "****** bnum=" << bnum << " blk_base= " << blk_base << " so write index buf seek to " << (blk_base - n) * sizeof(uint64_t) << " write len " << last_fpos_len << '\n';//debug
-         lseek(ind_out, (blk_base - n) * sizeof(uint64_t), SEEK_SET);
-         write(ind_out, (char *) fpos_list, last_fpos_len);       //write fpos_list to index file
+         status = fseek(ind_out, (blk_base - n) * sizeof(uint64_t), SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", index_out_filename.string())("pos", last_buf_len) );
+         size = fwrite((void *) fpos_list, last_fpos_len, 1, ind_out);       //write fpos_list to index file
+         EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", index_out_filename.string()) );
          last_fpos_len = buf_len;
          if (bnum == n) {                                         //if done with all blocks >= block n
             cout << setw(10) << bnum << setw(16) << file_pos << setw(16) << file_pos-pos_delta << '\n';
             EOS_ASSERT( index_start==0, block_log_exception, "block ${n} found with unexpected index_start ${s}", ("n",n) ("s",index_start));
             EOS_ASSERT( pos==td.fpos0, block_log_exception, "block ${n} found at unexpected file position ${p}", ("n",n) ("p",file_pos));
-            lseek(blk_out, pos-pos_delta, SEEK_SET);
-            write(blk_out, buf, last_buf_len);
+            status = fseek(blk_out, pos - pos_delta, SEEK_SET);
+            EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", index_out_filename.string())("pos", pos - pos_delta) );
+            size = fwrite((void*)buf, last_buf_len, 1, blk_out);
+            EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", block_out_filename.string()) );
             break;
          } else {
             blk_base -= (buf_len>>3);
@@ -414,16 +446,19 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
 
       if (index_start <= 0) {                                     //if buf is ready to write (all file pos are updated)
          //cout << "index_start = " << index_start << " so write buf len " << last_buf_len << " bnum= " << bnum << '\n';//debug
-         EOS_ASSERT(file_pos>td.fpos0, block_log_exception, "reverse scan of blocks.log did not halt at block ${n}",("n",n));
-         lseek(blk_out, pos-pos_delta, SEEK_SET);
-         write(blk_out, buf, last_buf_len);
-         last_buf_len= (pos-td.fpos0 > buf_len)? buf_len: pos-td.fpos0;
+         EOS_ASSERT(file_pos > td.fpos0, block_log_exception, "reverse scan of ${file} did not halt at block ${n}", ("file", td.block_file_name.string())("n",n));
+         status = fseek(blk_out, pos - pos_delta, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", block_out_filename.string())("pos", pos - pos_delta) );
+         size = fwrite((void*)buf, last_buf_len, 1, blk_out);
+         EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", block_out_filename.string()) );
+         last_buf_len = (pos - td.fpos0 > buf_len) ? buf_len : pos - td.fpos0;
          pos -= last_buf_len;
          index_start += last_buf_len;
          //cout << "seek blocks to " << pos << " read " << last_buf_len << " bytes\n";//debug
-         lseek(td.blk_in, pos, SEEK_SET);
-         did_read = read(td.blk_in, buf, last_buf_len);           //read next buf from blocklog
-         EOS_ASSERT(did_read == last_buf_len, block_log_exception, "blocks.log read fails");
+         status = fseek(td.blk_in, pos, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", pos) );
+         did_read = fread((void*)buf, last_buf_len, 1, td.blk_in);           //read next buf from blocklog
+         EOS_ASSERT(did_read == 1, block_log_exception, "${file} read fails", ("file", td.index_file_name.string()));
       }
 
       index_end = index_start - sizeof(uint64_t);                 //move to prior block in buf
@@ -431,72 +466,83 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
 
       if (index_end < 0) {                                        //the file pos record straddles buf boundary
          cout << "****  index_end= " << index_end << " so save buf-4K len= " << last_buf_len-fk << " bnum= " << bnum << '\n';//debug
-         lseek(blk_out, pos-pos_delta+fk, SEEK_SET);
-         write(blk_out, buf + fk, last_buf_len - fk);             //skip first 4K of buf write out the rest
-         last_buf_len= (pos-td.fpos0 >= buf_len-fk)? buf_len-fk: pos-td.fpos0;   //bytes to read from blk_in
+         status = fseek(blk_out, pos - pos_delta + fk, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", index_out_filename.string())("pos", pos - pos_delta + fk) );
+         size = fwrite((void*)(buf + fk), last_buf_len - fk, 1, blk_out);             //skip first 4K of buf write out the rest
+         EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", index_out_filename.string()) );
+         last_buf_len = (pos - td.fpos0 >= buf_len - fk) ? buf_len - fk : pos - td.fpos0;   //bytes to read from blk_in
          memcpy(buf + last_buf_len, buf, fk);                     //move first 4K of buf after zone will read
          pos-= last_buf_len;
-         index_end += last_buf_len;cout << "seek blocks to " << pos << " read " << last_buf_len << " bytes before saved 4k\n";//debug
-         lseek(td.blk_in, pos, SEEK_SET);
-         did_read = read(td.blk_in, buf, last_buf_len);
-         EOS_ASSERT(did_read == last_buf_len, block_log_exception, "blocks.log read fails");
-         last_buf_len+= fk;                                       //bytes in buf will eventually write to disk
+         index_end += last_buf_len;
+         cout << "seek blocks to " << pos << " read " << last_buf_len << " bytes before saved 4k\n";//debug
+         status = fseek(td.blk_in, pos, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", pos) );
+         did_read = fread(buf, last_buf_len, 1, td.blk_in);
+         EOS_ASSERT(did_read == 1, block_log_exception, "${file} read fails", ("file", td.block_file_name.string()) );
+         last_buf_len += fk;                                       //bytes in buf will eventually write to disk
       }
    }
 
-   close(blk_out);
-   close(ind_out);
-   string old_log= (block_dir/"old.log").generic_string();
-   string old_ind= (block_dir/"old.index").generic_string();
-   rename(td.block_file_name,old_log);
-   rename(td.index_file_name,old_ind);
-   rename(block_out_filename,td.block_file_name);
-   rename(index_out_filename,td.index_file_name);
-   cout << "The new blocks.log and blocks.index files contain blocks " << n << " through " << td.last_block << '\n';
-   cout << "The original (before trim front) files have been renamed to old.log and old.index.\n";
+   fclose(blk_out);
+   fclose(ind_out);
+   bfs::path old_log = block_dir / "old.log";
+   bfs::path old_ind = block_dir / "old.index";
+   rename(td.block_file_name.c_str(), old_log.c_str());
+   rename(td.index_file_name.c_str(), old_ind.c_str());
+   rename(block_out_filename.c_str(), td.block_file_name.c_str());
+   rename(index_out_filename.c_str(), td.index_file_name.c_str());
+   cout << "The new " << td.block_file_name << " and " << td.index_file_name << " files contain blocks " << n << " through " << td.last_block << '\n';
+   cout << "The original (before trim front) files have been renamed to " << old_log << " and " << old_ind << ".\n";
    rt.report();
    return 0;
 }
 
 
-int make_index(bfs::path block_dir, string out_file) {
+int make_index(const bfs::path& block_dir, const bfs::path& out_file) {
    report_time rt;
    //this code makes blocks.index much faster than nodeos (in recent test 80 seconds vs. 90 minutes)
    using namespace std;
-   string block_file_name= (block_dir / "blocks.log").generic_string();
-   string out_file_name=   (block_dir / out_file     ).generic_string();
+   bfs::path block_file_name = block_dir / "blocks.log";
+   bfs::path out_file_name = block_dir / out_file;
    cout << '\n';
    cout << "Will read existing blocks.log file " << block_file_name << '\n';
    cout << "Will write new blocks.index file " << out_file_name << '\n';
-   int fin = open(block_file_name.c_str(), O_RDONLY);
-   EOS_ASSERT( fin>0, block_log_not_found, "cannot read block file ${file}", ("file",block_file_name) );
+   FILE* fin = fopen(block_file_name.c_str(), "r");
+   EOS_ASSERT( fin != nullptr, block_log_not_found, "cannot read block file ${file}", ("file", block_file_name.string()) );
 
    //will read big chunks of blocks.log into buf, will fill fpos_list with file positions before write to blocks.index
-   constexpr uint32_t buf_len{1U<<24};                      //buf_len must be power of 2 >= largest possible block == one MByte
-   auto buffer= make_unique<char[]>(buf_len+8);             //can write up to 8 bytes past end of buf
-   char* buf= buffer.get();
-   constexpr uint64_t fpos_list_len{1U<<22};                //length of fpos_list[] in bytes
-   auto fpos_buffer= make_unique<uint64_t[]>(fpos_list_len>>3);
-   uint64_t* fpos_list= fpos_buffer.get();
+   constexpr uint32_t buf_len{1U << 24};                      //buf_len must be power of 2 >= largest possible block == one MByte
+   auto buffer = make_unique<char[]>(buf_len + 8);            //can write up to 8 bytes past end of buf
+   char* buf = buffer.get();
+   constexpr uint64_t fpos_list_len{1U << 22};                //length of fpos_list[] in bytes
+   auto fpos_buffer = make_unique<uint64_t[]>(fpos_list_len >> 3);
+   uint64_t* fpos_list = fpos_buffer.get();
 
    //read blocks.log to see if version 1 or 2 and get first_blocknum (implicit 1 if version 1)
-   uint32_t version=0, first_block=0;
-   read(fin,(char*)&version,sizeof(version));
+   uint32_t version = 0, first_block = 0;
+   auto size = fread((char*)&version, sizeof(version), 1, fin);
+   EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", block_file_name.string()) );
    cout << "block log version= " << version << '\n';
-   EOS_ASSERT( version==1 || version==2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
+   EOS_ASSERT( version == 1 || version == 2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
    if (version == 1)
-      first_block= 1;
-   else
-      read(fin,(char*)&first_block,sizeof(first_block));
+      first_block = 1;
+   else {
+      size = fread((void*)&first_block, sizeof(first_block), 1, fin);
+      EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", block_file_name.string()) );
+   }
    cout << "first block= " << first_block << '\n';
 
-   uint64_t pos= lseek(fin,0,SEEK_END);                     //get blocks.log file length
-   uint64_t last_buf_len= pos & ((uint64_t)buf_len-1);      //buf_len is a power of 2 so -1 creates low bits all 1
+   auto status = fseek(fin, 0, SEEK_END);                    //get blocks.log file length
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", block_file_name.string())("pos", 0) );
+   uint64_t pos = ftell(fin);
+   uint64_t last_buf_len = pos & ((uint64_t)buf_len-1);     //buf_len is a power of 2 so -1 creates low bits all 1
    if (!last_buf_len)                                       //will read integral number of buf_len and one time read last_buf_len
-      last_buf_len= buf_len;
-   pos= lseek(fin,-(uint64_t)last_buf_len,SEEK_END);        //one time read last_buf_len
-   uint64_t did_read= read(fin,buf,last_buf_len);           //read tail of blocks.log file into buf
-   EOS_ASSERT( did_read==last_buf_len, block_log_exception, "blocks.log read fails" );
+      last_buf_len = buf_len;
+   status = fseek(fin, -(uint64_t)last_buf_len, SEEK_END);     //one time read last_buf_len
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", block_file_name.string())("pos", last_buf_len) );
+   pos = ftell(fin);
+   uint64_t did_read = fread((void*)buf, last_buf_len, 1, fin);//read tail of blocks.log file into buf
+   EOS_ASSERT( did_read == 1, block_log_exception, "blocks.log read fails" );
 
    //we traverse linked list of blocks in buf (from end to start), for each block we know this:
    uint32_t index_start;                                    //buf index for block start
@@ -504,79 +550,88 @@ int make_index(bfs::path block_dir, string out_file) {
    uint64_t file_pos;                                       //file pos of block start
    uint32_t bnum;                                           //block number
 
-   index_end= last_buf_len-8;                               //index in buf where last block ends and block file position starts
-   file_pos= *(uint64_t*)(buf+index_end);                   //file pos of block start
-   index_start= file_pos - pos;                             //buf index for block start
-   bnum= *(uint32_t*)(buf + index_start + blknum_offset);   //block number of previous block (is big endian)
-   bnum= endian_reverse_u32(bnum)+1;                        //convert from big endian to little endian and add 1
+   index_end = last_buf_len - 8;                            //index in buf where last block ends and block file position starts
+   cout << "last_buf_len=" << last_buf_len << " index_end=" << index_end <<  '\n';
+   file_pos = *(uint64_t*)(buf + index_end);                //file pos of block start
+   cout << "file_pos=" << file_pos << " buf=" << (uint64_t)buf <<  '\n';
+   index_start = file_pos - pos;                            //buf index for block start
+   bnum = *(uint32_t*)(buf + index_start + blknum_offset);  //block number of previous block (is big endian)
+   bnum = endian_reverse_u32(bnum) + 1;                     //convert from big endian to little endian and add 1
    cout << "last block=  " << bnum << '\n';
    cout << '\n';
    cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';  //first progress indicator
-   uint64_t last_file_pos= file_pos;                        //used to check that file_pos is strictly decreasing
+   uint64_t last_file_pos = file_pos;                       //used to check that file_pos is strictly decreasing
    uint32_t end_block{bnum};                                //save for message at end
 
    //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
-   mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;     //if create file permissions will be 644
-   int fout = open(out_file_name.c_str(), O_WRONLY|O_CREAT|O_TRUNC, mode);
-   EOS_ASSERT( fout>0, block_index_not_found, "cannot write blocks.index" );
-
-   uint64_t ind_file_len= (bnum+1-first_block)<<3;                 //index file holds 8 bytes for each block in blocks.log
-   uint64_t last_ind_buf_len= ind_file_len & (fpos_list_len-1);    //fpos_list_len is a power of 2 so -1 creates low bits all 1
-   if (!last_ind_buf_len)                                   //will write integral number of buf_len and last_ind_buf_len one time to index file
-      last_ind_buf_len= buf_len;
-   uint64_t ind_pos= lseek(fout,ind_file_len-last_ind_buf_len,SEEK_SET);
-   uint64_t blk_base= (ind_pos>>3) + first_block;           //first entry in fpos_list is for block blk_base
-   //cout << "ind_pos= " << ind_pos << "  blk_base= " << blk_base << '\n';
-   fpos_list[bnum-blk_base]= file_pos;                      //write filepos for block bnum
+   FILE* fout = fopen(out_file_name.c_str(), "w");
+   EOS_ASSERT( fout != nullptr, block_index_not_found, "cannot write blocks.index" );
+
+   uint64_t ind_file_len = (bnum + 1 - first_block)<<3;            //index file holds 8 bytes for each block in blocks.log
+   uint64_t last_ind_buf_len = ind_file_len & (fpos_list_len - 1); //fpos_list_len is a power of 2 so -1 creates low bits all 1
+   if (!last_ind_buf_len)                                          //will write integral number of buf_len and last_ind_buf_len one time to index file
+      last_ind_buf_len = buf_len;
+   status = fseek(fout, ind_file_len - last_ind_buf_len, SEEK_SET);
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", out_file_name.string())("pos", ind_file_len - last_ind_buf_len) );
+   uint64_t ind_pos = ftell(fout);
+   EOS_ASSERT( ind_pos == ind_file_len - last_ind_buf_len, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", out_file_name.string())("pos", ind_file_len - last_ind_buf_len) );
+   uint64_t blk_base = (ind_pos >> 3) + first_block;              //first entry in fpos_list is for block blk_base
+   cout << "ind_pos= " << ind_pos << "  blk_base= " << blk_base << '\n';
+   fpos_list[bnum - blk_base] = file_pos;                         //write filepos for block bnum
 
    for (;;) {
-      if (bnum==blk_base) {                                 //if fpos_list is full
-         write(fout,(char*)fpos_list,last_ind_buf_len);     //write fpos_list to index file
-         if (ind_pos==0) {                                  //if done writing index file
+      if (bnum == blk_base) {                                        //if fpos_list is full
+         size = fwrite((void*)fpos_list, last_ind_buf_len, 1, fout); //write fpos_list to index file
+         EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", out_file_name.string()) );
+         if (ind_pos == 0) {                                         //if done writing index file
             cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';  //last progress indicator
             EOS_ASSERT( bnum == first_block, block_log_exception, "blocks.log does not contain consecutive block numbers" );
             break;
          }
-         ind_pos-= fpos_list_len;
-         blk_base-= (fpos_list_len>>3);
-         did_read= lseek(fout,ind_pos,SEEK_SET);
-         EOS_ASSERT( did_read==ind_pos, block_log_exception, "blocks.log seek fails" );
-         last_ind_buf_len= fpos_list_len;                   //from now on all writes to index file write a full fpos_list[]
+         ind_pos -= fpos_list_len;
+         blk_base -= (fpos_list_len>>3);
+         status = fseek(fout, ind_pos, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", out_file_name.string())("pos", ind_pos) );
+         did_read = ftell(fout);
+         EOS_ASSERT( did_read == ind_pos, block_log_exception, "${file} seek fails", ("file", out_file_name.string()) );
+         last_ind_buf_len = fpos_list_len;                           //from now on all writes to index file write a full fpos_list[]
       }
       if (index_start < 8) {                                //if block start is split across buf boundary
-         memcpy(buf+buf_len,buf,8);                         //copy portion at start of buf to past end of buf
-         pos-= buf_len;                                     //file position of buf
-         lseek(fin,pos,SEEK_SET);
-         did_read= read(fin,buf,buf_len);                   //read next buf
-         EOS_ASSERT( did_read==buf_len, block_log_exception, "blocks.log read fails" );
-         index_start+= buf_len;
+         memcpy(buf + buf_len, buf, 8);                     //copy portion at start of buf to past end of buf
+         pos -= buf_len;                                    //file position of buf
+         status = fseek(fin, pos, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", pos) );
+         did_read = fread((void*)buf, buf_len, 1, fin);     //read next buf
+         EOS_ASSERT( did_read == 1, block_log_exception, "blocks.log read fails" );
+         index_start += buf_len;
       }
       --bnum;                                               //now move index_start and index_end to prior block
-      index_end= index_start-8;                             //index in buf where block ends and block file position starts
-      file_pos= *(uint64_t*)(buf+index_end);                //file pos of block start
+      index_end = index_start - 8;                          //index in buf where block ends and block file position starts
+      file_pos = *(uint64_t*)(buf + index_end);             //file pos of block start
       if (file_pos >= last_file_pos) {                      //file_pos will decrease if linked list is not corrupt
          cout << '\n';
          cout << "file pos for block " << bnum+1 << " is " << last_file_pos << '\n';
          cout << "file pos for block " << bnum   << " is " <<      file_pos << '\n';
          cout << "The linked list of blocks in blocks.log should run from last block to first block in reverse order\n";
-         EOS_ASSERT( file_pos<last_file_pos, block_log_exception, "blocks.log linked list of blocks is corrupt" );
+         EOS_ASSERT( file_pos < last_file_pos, block_log_exception, "blocks.log linked list of blocks is corrupt" );
       }
-      last_file_pos= file_pos;
+      last_file_pos = file_pos;
       if (file_pos < pos) {                                 //if block start is in prior buf
-         pos-= buf_len;                                     //file position of buf
-         lseek(fin,pos,SEEK_SET);
-         did_read= read(fin,buf,buf_len);                   //read next buf
-         EOS_ASSERT( did_read==buf_len, block_log_exception, "blocks.log read fails" );
-         index_end+= buf_len;
+         pos -= buf_len;                                    //file position of buf
+         status = fseek(fin, pos, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", pos) );
+         did_read = fread(buf, buf_len, 1, fin);            //read next buf
+         EOS_ASSERT( did_read == 1, block_log_exception, "blocks.log read fails" );
+         index_end += buf_len;
       }
-      index_start= file_pos - pos;                          //buf index for block start
-      fpos_list[bnum-blk_base]= file_pos;                   //write filepos for block bnum
-      if ((bnum & 0xfffff) == 0)                            //periodically print a progress indicator
+      index_start = file_pos - pos;                          //buf index for block start
+      fpos_list[bnum - blk_base]= file_pos;                  //write filepos for block bnum
+      if ((bnum & 0xfffff) == 0)                             //periodically print a progress indicator
          cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';
    }
 
-   close(fout);
-   close(fin);
+   fclose(fout);
+   fclose(fin);
    cout << "\nwrote " << (end_block+1-first_block) << " file positions to " << out_file_name << '\n';
    rt.report();
    return 0;
@@ -586,24 +641,28 @@ void smoke_test(bfs::path block_dir) {
    using namespace std;
    cout << "\nSmoke test of blocks.log and blocks.index in directory " << block_dir << '\n';
    trim_data td(block_dir);
-   lseek(td.blk_in,-sizeof(uint64_t),SEEK_END);             //get last_block from blocks.log, compare to from blocks.index
+   auto status = fseek(td.blk_in, -sizeof(uint64_t), SEEK_END);             //get last_block from blocks.log, compare to from blocks.index
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", td.block_file_name.string())("pos", sizeof(uint64_t)) );
    uint64_t file_pos;
-   read(td.blk_in,&file_pos,sizeof(uint64_t));
-   lseek(td.blk_in,file_pos+blknum_offset,SEEK_SET);
+   auto size = fread((void*)&file_pos, sizeof(uint64_t), 1, td.blk_in);
+   EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", td.block_file_name.string()) );
+   status = fseek(td.blk_in, file_pos + blknum_offset, SEEK_SET);
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", td.block_file_name.string())("pos", file_pos + blknum_offset) );
    uint32_t bnum;
-   read(td.blk_in,&bnum,sizeof(uint32_t));
-   bnum= endian_reverse_u32(bnum)+1;                        //convert from big endian to little endian and add 1
-   EOS_ASSERT( td.last_block==bnum, block_log_exception, "blocks.log says last block is ${lb} which disagrees with blocks.index", ("lb",bnum) );
+   size = fread((void*)&bnum, sizeof(uint32_t), 1, td.blk_in);
+   EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", td.block_file_name.string()) );
+   bnum = endian_reverse_u32(bnum) + 1;                       //convert from big endian to little endian and add 1
+   EOS_ASSERT( td.last_block == bnum, block_log_exception, "blocks.log says last block is ${lb} which disagrees with blocks.index", ("lb", bnum) );
    cout << "blocks.log and blocks.index agree on number of blocks\n";
-   uint32_t delta= (td.last_block+8-td.first_block)>>3;
-   if (delta<1)
-      delta= 1;
-   for (uint32_t n= td.first_block; ; n+= delta) {
-      if (n>td.last_block)
-         n= td.last_block;
+   uint32_t delta = (td.last_block + 8 - td.first_block) >> 3;
+   if (delta < 1)
+      delta = 1;
+   for (uint32_t n = td.first_block; ; n += delta) {
+      if (n > td.last_block)
+         n = td.last_block;
       cout << '\n';
       td.find_block_pos(n);                                 //check block 'n' is where blocks.index says
-      if (n==td.last_block)
+      if (n == td.last_block)
          break;
    }
    cout << "\nno problems found\n";                         //if get here there were no exceptions
@@ -627,7 +686,7 @@ int main(int argc, char** argv) {
          return 0;
       }
       if (blog.trim_log) {
-         if (blog.first_block==0 && blog.last_block==std::numeric_limits<uint32_t>::max()) {
+         if (blog.first_block == 0 && blog.last_block == std::numeric_limits<uint32_t>::max()) {
             std::cerr << "trim-blocklog does nothing unless specify first and/or last block.";
             return -1;
          }
@@ -642,7 +701,9 @@ int main(int argc, char** argv) {
          return 0;
       }
       if (blog.make_index) {
-         string out_file{vmap.count("output-file")==0? string("blocks.index"): vmap.at("output-file").as<bfs::path>().generic_string()};
+         bfs::path out_file = "blocks.index";
+         if (vmap.count("output-file") == 0)
+             out_file = vmap.at("output-file").as<bfs::path>();
          return make_index(vmap.at("blocks-dir").as<bfs::path>(), out_file);
       }
       //else print blocks.log as JSON

From c2c8e997dd04bb5d063b2c5655fd1cd2c805f9d5 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Sat, 27 Apr 2019 15:38:07 -0500
Subject: [PATCH 0248/1648] Minor cleanup.

---
 programs/eosio-blocklog/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 7d645485ed8..2df6495aef2 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -439,7 +439,7 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
             EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", block_out_filename.string()) );
             break;
          } else {
-            blk_base -= (buf_len>>3);
+            blk_base -= (buf_len >> 3);
             cout << "******filling index buf blk_base " << blk_base << " fpos_len " << buf_len << '\n';//debug
          }
       }
@@ -567,7 +567,7 @@ int make_index(const bfs::path& block_dir, const bfs::path& out_file) {
    FILE* fout = fopen(out_file_name.c_str(), "w");
    EOS_ASSERT( fout != nullptr, block_index_not_found, "cannot write blocks.index" );
 
-   uint64_t ind_file_len = (bnum + 1 - first_block)<<3;            //index file holds 8 bytes for each block in blocks.log
+   uint64_t ind_file_len = (bnum + 1 - first_block) << 3;            //index file holds 8 bytes for each block in blocks.log
    uint64_t last_ind_buf_len = ind_file_len & (fpos_list_len - 1); //fpos_list_len is a power of 2 so -1 creates low bits all 1
    if (!last_ind_buf_len)                                          //will write integral number of buf_len and last_ind_buf_len one time to index file
       last_ind_buf_len = buf_len;
@@ -589,7 +589,7 @@ int make_index(const bfs::path& block_dir, const bfs::path& out_file) {
             break;
          }
          ind_pos -= fpos_list_len;
-         blk_base -= (fpos_list_len>>3);
+         blk_base -= (fpos_list_len >> 3);
          status = fseek(fout, ind_pos, SEEK_SET);
          EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", out_file_name.string())("pos", ind_pos) );
          did_read = ftell(fout);

From 38812455f4e66d6d66bfe06caadd462c99bbe38c Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 30 Apr 2019 17:48:49 -0500
Subject: [PATCH 0249/1648] Initializing variables for PR comment.

---
 programs/eosio-blocklog/main.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 2df6495aef2..df9b0d984c9 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -36,14 +36,14 @@ struct blocklog {
 
    bfs::path                        blocks_dir;
    bfs::path                        output_file;
-   uint32_t                         first_block;
-   uint32_t                         last_block;
-   bool                             no_pretty_print;
-   bool                             as_json_array;
-   bool                             make_index;
-   bool                             trim_log;
-   bool                             smoke_test;
-   bool                             help;
+   uint32_t                         first_block = 0;
+   uint32_t                         last_block = std::numeric_limits<uint32_t>::max();
+   bool                             no_pretty_print = false;
+   bool                             as_json_array = false;
+   bool                             make_index = false;
+   bool                             trim_log = false;
+   bool                             smoke_test = false;
+   bool                             help = false;
 };
 
 struct report_time {
@@ -215,13 +215,15 @@ struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end
    }
    void find_block_pos(uint32_t n);
    bfs::path block_file_name, index_file_name;        //full pathname for blocks.log and blocks.index
-   uint32_t version;                                  //blocklog version (1 or 2)
-   uint32_t first_block, last_block;                  //first and last block in blocks.log
-   FILE* blk_in;                                      //C style files for reading blocks.log and blocks.index
-   FILE* ind_in;                                      //C style files for reading blocks.log and blocks.index
+   uint32_t version = 0;                              //blocklog version (1 or 2)
+   uint32_t first_block = 0;                          //first block in blocks.log
+   uint32_t last_block = 0;                          //last block in blocks.log
+   FILE* blk_in = nullptr;                            //C style files for reading blocks.log and blocks.index
+   FILE* ind_in = nullptr;                            //C style files for reading blocks.log and blocks.index
    //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
-   uint64_t index_pos;                                //filepos in blocks.index for block n, +8 for block n+1
-   uint64_t fpos0, fpos1;                             //filepos in blocks.log for block n and block n+1
+   uint64_t index_pos = 0;                            //filepos in blocks.index for block n, +8 for block n+1
+   uint64_t fpos0 = 0;                                //filepos in blocks.log for block n and block n+1
+   uint64_t fpos1 = 0;                                //filepos in blocks.log for block n and block n+1
 };
 
 

From 1d3bd09e48e1499e690eebd11bed02d19253d1d5 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 30 Apr 2019 17:49:46 -0500
Subject: [PATCH 0250/1648] Added description to report_time struct.

---
 programs/eosio-blocklog/main.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index df9b0d984c9..0c36cb32a94 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -47,20 +47,22 @@ struct blocklog {
 };
 
 struct report_time {
-    report_time()
-    : _start(std::chrono::high_resolution_clock::now()) {
+    report_time(std::string& desc)
+    : _start(std::chrono::high_resolution_clock::now())
+    , _desc(desc) {
     }
 
     void report() {
         const auto duration = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - _start).count() / 1000;
-        ilog("blocklog action took ${t} msec", ("t",duration));
+        ilog("eosio-blocklog - ${desc} took ${t} msec", ("desc", _desc)("t", duration));
     }
 
     const std::chrono::high_resolution_clock::time_point _start;
+    const std::string                                    _desc;
 };
 
 void blocklog::read_log() {
-   report_time rt;
+   report_time rt("reading log");
    block_log block_logger(blocks_dir);
    const auto end = block_logger.read_head();
    EOS_ASSERT( end, block_log_exception, "No blocks found in block log" );
@@ -228,7 +230,7 @@ struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end
 
 
 trim_data::trim_data(bfs::path block_dir) {
-   report_time rt;
+   report_time rt("trimming log");
    using namespace std;
    block_file_name = block_dir / "blocks.log";
    blk_in = fopen(block_file_name.c_str(), "r");
@@ -239,8 +241,9 @@ trim_data::trim_data(bfs::path block_dir) {
    EOS_ASSERT( size == 1, block_log_unsupported_version, "invalid format for file ${file}", ("file",block_file_name.string()));
    cout << "block log version= " << version << '\n';
    EOS_ASSERT( version == 1 || version == 2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
-   if (version == 1)
+   if (version == 1) {
       first_block = 1;
+   }
    else {
       size = fread((void *) &first_block, sizeof(first_block), 1, blk_in);
       EOS_ASSERT(size == 1, block_log_exception, "invalid format for file ${file}",
@@ -258,7 +261,7 @@ trim_data::trim_data(bfs::path block_dir) {
 void trim_data::find_block_pos(uint32_t n) {
    //get file position of block n from blocks.index then confirm block n is found in blocks.log at that position
    //sets fpos0 and fpos1, throws exception if block at fpos0 is not block n
-   report_time rt;
+   report_time rt("finding block position");
    using namespace std;
    index_pos = sizeof(uint64_t) * (n - first_block);
    auto status = fseek(ind_in, index_pos, SEEK_SET);
@@ -294,7 +297,7 @@ void trim_data::find_block_pos(uint32_t n) {
 }
 
 int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block to keep (remove later blocks)
-   report_time rt;
+   report_time rt("trimming blocklog end");
    using namespace std;
    trim_data td(block_dir);
    cout << "\nIn directory " << block_dir << " will trim all blocks after block " << n << " from " << td.block_file_name << " and " << td.index_file_name << ".\n";
@@ -316,7 +319,7 @@ int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block
 }
 
 int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first block to keep (remove prior blocks)
-   report_time rt;
+   report_time rt("trimming blocklog start");
    using namespace std;
    cout << "\nIn directory " << block_dir << " will trim all blocks before block " << n << " from blocks.log and blocks.index.\n";
    trim_data td(block_dir);
@@ -501,7 +504,7 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
 
 
 int make_index(const bfs::path& block_dir, const bfs::path& out_file) {
-   report_time rt;
+   report_time rt("making index");
    //this code makes blocks.index much faster than nodeos (in recent test 80 seconds vs. 90 minutes)
    using namespace std;
    bfs::path block_file_name = block_dir / "blocks.log";
@@ -662,7 +665,6 @@ void smoke_test(bfs::path block_dir) {
    for (uint32_t n = td.first_block; ; n += delta) {
       if (n > td.last_block)
          n = td.last_block;
-      cout << '\n';
       td.find_block_pos(n);                                 //check block 'n' is where blocks.index says
       if (n == td.last_block)
          break;

From 0c1551556c8ecbc816e1723710446d290bdc3d19 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 30 Apr 2019 18:06:06 -0500
Subject: [PATCH 0251/1648] Fixed compile error.

---
 programs/eosio-blocklog/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 0c36cb32a94..d7139dffc72 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -47,7 +47,7 @@ struct blocklog {
 };
 
 struct report_time {
-    report_time(std::string& desc)
+    report_time(std::string desc)
     : _start(std::chrono::high_resolution_clock::now())
     , _desc(desc) {
     }

From 34c2ea033d178cf2c7b408ad2b165051e9291d06 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 2 May 2019 09:20:11 -0500
Subject: [PATCH 0252/1648] Use shared_mutex now that C++17 is available

---
 plugins/net_plugin/net_plugin.cpp | 36 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c0a5d043608..3cc221af4c1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -247,7 +247,7 @@ namespace eosio {
       bool                                  use_socket_read_watermark = false;
       /** @} */
 
-      mutable std::shared_timed_mutex       connections_mtx; // switch to std::shared_mutex in C++17
+      mutable std::shared_mutex             connections_mtx;
       std::set< connection_ptr >            connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
 
       std::mutex                            connector_check_timer_mtx;
@@ -1359,7 +1359,7 @@ namespace eosio {
       if (conn && conn->current() ) {
          sync_source = conn;
       } else {
-         std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+         std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
          if( my_impl->connections.size() == 0 ) {
             sync_source.reset();
          } else if( my_impl->connections.size() == 1 ) {
@@ -1432,7 +1432,7 @@ namespace eosio {
 
    // static, thread safe
    void sync_manager::send_handshakes() {
-      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
       for( auto& ci : my_impl->connections ) {
          if( ci->current() ) {
             ci->send_handshake();
@@ -1573,7 +1573,7 @@ namespace eosio {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
-      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
       for (const auto& cc : my_impl->connections) {
          std::lock_guard<std::mutex> g_conn( cc->conn_mtx );
          if( cc->fork_head_num > num || cc->fork_head == id ) {
@@ -1678,7 +1678,7 @@ namespace eosio {
 
          block_id_type null_id;
          bool set_state_to_head_catchup = false;
-         std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+         std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
          for( const auto& cp : my_impl->connections ) {
             std::unique_lock<std::mutex> g_cp_conn( cp->conn_mtx );
             uint32_t fork_head_num = cp->fork_head_num;
@@ -1823,7 +1823,7 @@ namespace eosio {
 
       if( my_impl->sync_master->syncing_with_peer() ) return;
       bool have_connection = false;
-      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
 
          peer_dlog( cp, "socket_is_open ${s}, connecting ${c}, syncing ${ss}",
@@ -1892,7 +1892,7 @@ namespace eosio {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
-      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
       for( auto& cp : my_impl->connections ) {
          if( !cp->current() ) {
             continue;
@@ -1992,7 +1992,7 @@ namespace eosio {
          return;
       }
       g_c_conn.unlock();
-      std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
       for( auto& conn : my_impl->connections ) {
          if( conn == c ) continue;
 
@@ -2116,7 +2116,7 @@ namespace eosio {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
             } else {
                paddr_str = paddr_add.to_string();
-               std::shared_lock<std::shared_timed_mutex> g( my_impl->connections_mtx );
+               std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
                for( auto& conn : connections ) {
                   if( conn->socket_is_open() ) {
                      if( conn->peer_address().empty() ) {
@@ -2130,7 +2130,7 @@ namespace eosio {
                g.unlock();
                if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
                   if( new_connection->start_session() ) {
-                     std::unique_lock<std::shared_timed_mutex> g_unique( connections_mtx );
+                     std::unique_lock<std::shared_mutex> g_unique( connections_mtx );
                      connections.insert( new_connection );
                      g_unique.unlock();
                   }
@@ -2431,7 +2431,7 @@ namespace eosio {
          if( peer_address().empty() || last_handshake_recv.node_id == fc::sha256()) {
             g_conn.unlock();
             fc_dlog(logger, "checking for duplicate" );
-            std::shared_lock<std::shared_timed_mutex> g_cnts( my_impl->connections_mtx );
+            std::shared_lock<std::shared_mutex> g_cnts( my_impl->connections_mtx );
             for(const auto& check : my_impl->connections) {
                if(check.get() == this)
                   continue;
@@ -2865,7 +2865,7 @@ namespace eosio {
                if( my->in_shutdown ) return;
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
-            std::shared_lock<std::shared_timed_mutex> g( my->connections_mtx );
+            std::shared_lock<std::shared_mutex> g( my->connections_mtx );
             for( auto& c : my->connections ) {
                if( c->socket_is_open() ) {
                   c->strand.post( [c]() {
@@ -2905,7 +2905,7 @@ namespace eosio {
       auto max_time = fc::time_point::now();
       max_time += fc::milliseconds(max_cleanup_time_ms);
       auto from = from_connection.lock();
-      std::unique_lock<std::shared_timed_mutex> g( connections_mtx );
+      std::unique_lock<std::shared_mutex> g( connections_mtx );
       auto it = (from ? connections.find(from) : connections.begin());
       if (it == connections.end()) it = connections.begin();
       size_t num_rm = 0;
@@ -3315,7 +3315,7 @@ namespace eosio {
 
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
-            std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
+            std::unique_lock<std::shared_mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
                con->close( false );
@@ -3336,7 +3336,7 @@ namespace eosio {
     *  Used to trigger a new connection from RPC API
     */
    string net_plugin::connect( const string& host ) {
-      std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
+      std::unique_lock<std::shared_mutex> g( my->connections_mtx );
       if( my->find_connection( host ) )
          return "already connected";
 
@@ -3350,7 +3350,7 @@ namespace eosio {
    }
 
    string net_plugin::disconnect( const string& host ) {
-      std::unique_lock<std::shared_timed_mutex> g( my->connections_mtx );
+      std::unique_lock<std::shared_mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
          if( (*itr)->peer_address() == host ) {
             fc_ilog( logger, "disconnecting: ${p}", ("p", (*itr)->peer_name()) );
@@ -3363,7 +3363,7 @@ namespace eosio {
    }
 
    optional<connection_status> net_plugin::status( const string& host )const {
-      std::shared_lock<std::shared_timed_mutex> g( my->connections_mtx );
+      std::shared_lock<std::shared_mutex> g( my->connections_mtx );
       auto con = my->find_connection( host );
       if( con )
          return con->get_status();
@@ -3372,7 +3372,7 @@ namespace eosio {
 
    vector<connection_status> net_plugin::connections()const {
       vector<connection_status> result;
-      std::shared_lock<std::shared_timed_mutex> g( my->connections_mtx );
+      std::shared_lock<std::shared_mutex> g( my->connections_mtx );
       result.reserve( my->connections.size() );
       for( const auto& c : my->connections ) {
          result.push_back( c->get_status() );

From aa8ca1646a66aac44d3607c75d6e5c5ea501ab39 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 2 May 2019 13:10:15 -0500
Subject: [PATCH 0253/1648] Add for_each_connection method to simplify some use
 cases

---
 plugins/net_plugin/net_plugin.cpp | 142 +++++++++++++++---------------
 1 file changed, 70 insertions(+), 72 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3cc221af4c1..4f85e730bfd 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -250,6 +250,14 @@ namespace eosio {
       mutable std::shared_mutex             connections_mtx;
       std::set< connection_ptr >            connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
 
+      template<typename Function>
+      void for_each_connection( Function f ) {
+         std::shared_lock<std::shared_mutex> g( connections_mtx );
+         for( auto& c : connections ) {
+            if ( !f( c ) ) return;
+         }
+      }
+
       std::mutex                            connector_check_timer_mtx;
       unique_ptr<boost::asio::steady_timer> connector_check_timer;
       int                                   connector_checks_in_flight{0};
@@ -1432,12 +1440,12 @@ namespace eosio {
 
    // static, thread safe
    void sync_manager::send_handshakes() {
-      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
-      for( auto& ci : my_impl->connections ) {
+      my_impl->for_each_connection( []( auto& ci ) {
          if( ci->current() ) {
             ci->send_handshake();
          }
-      }
+         return true;
+      } );
    }
 
    bool sync_manager::is_sync_required( uint32_t fork_head_block_num ) {
@@ -1573,15 +1581,14 @@ namespace eosio {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
-      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
-      for (const auto& cc : my_impl->connections) {
+      my_impl->for_each_connection( [num, &id, &req]( const auto& cc ) {
          std::lock_guard<std::mutex> g_conn( cc->conn_mtx );
          if( cc->fork_head_num > num || cc->fork_head == id ) {
             req.req_blocks.mode = none;
-            break;
+            return false;
          }
-      }
-      g.unlock();
+         return true;
+      } );
       if( req.req_blocks.mode == catch_up ) {
          {
             std::lock_guard<std::mutex> g_conn( c->conn_mtx );
@@ -1678,24 +1685,22 @@ namespace eosio {
 
          block_id_type null_id;
          bool set_state_to_head_catchup = false;
-         std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
-         for( const auto& cp : my_impl->connections ) {
+         my_impl->for_each_connection( [&null_id, blk_num, &blk_id, &c, &set_state_to_head_catchup]( const auto& cp ) {
             std::unique_lock<std::mutex> g_cp_conn( cp->conn_mtx );
             uint32_t fork_head_num = cp->fork_head_num;
             block_id_type fork_head_id = cp->fork_head;
             g_cp_conn.unlock();
             if( fork_head_id == null_id ) {
-               continue;
-            }
-            if( fork_head_num < blk_num || fork_head_id == blk_id ) {
+               // continue
+            } else if( fork_head_num < blk_num || fork_head_id == blk_id ) {
                std::lock_guard<std::mutex> g_conn( c->conn_mtx );
                c->fork_head = null_id;
                c->fork_head_num = 0;
             } else {
                set_state_to_head_catchup = true;
             }
-         }
-         g.unlock();
+            return true;
+         } );
 
          if( set_state_to_head_catchup ) {
             g_sync.lock();
@@ -1823,27 +1828,23 @@ namespace eosio {
 
       if( my_impl->sync_master->syncing_with_peer() ) return;
       bool have_connection = false;
-      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
-      for( auto& cp : my_impl->connections ) {
-
+      my_impl->for_each_connection( [&have_connection]( auto& cp ) {
          peer_dlog( cp, "socket_is_open ${s}, connecting ${c}, syncing ${ss}",
                     ("s", cp->socket_is_open())("c", cp->connecting.load())("ss", cp->syncing.load()) );
 
          if( !cp->current() ) {
-            continue;
+            return true;
          }
          have_connection = true;
-         break;
-      }
-      g.unlock();
+         return false;
+      } );
 
       if( !have_connection ) return;
       std::shared_ptr<std::vector<char>> send_buffer = create_send_buffer( bs->block );
 
-      g.lock();
-      for( auto& cp : my_impl->connections ) {
+      my_impl->for_each_connection( [this, bs, send_buffer]( auto& cp ) {
          if( !cp->current() ) {
-            continue;
+            return true;
          }
          cp->strand.post( [this, cp, bs, send_buffer]() {
             uint32_t bnum = bs->block_num;
@@ -1859,7 +1860,8 @@ namespace eosio {
                cp->enqueue_buffer( send_buffer, true, priority::medium, no_reason );
             }
          });
-      }
+         return true;
+      } );
    }
 
    // called from connection strand
@@ -1892,14 +1894,13 @@ namespace eosio {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
-      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
-      for( auto& cp : my_impl->connections ) {
+      my_impl->for_each_connection( [this, &trx, &nts, &send_buffer]( auto& cp ) {
          if( !cp->current() ) {
-            continue;
+            return true;
          }
          nts.connection_id = cp->connection_id;
          if( !add_peer_txn(nts) ) {
-            continue;
+            return true;
          }
          if( !send_buffer ) {
             send_buffer = create_send_buffer( trx );
@@ -1909,7 +1910,8 @@ namespace eosio {
             fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_name()) );
             cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
          } );
-      }
+         return true;
+      } );
    }
 
    void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_metadata_ptr& txn) {
@@ -1978,51 +1980,49 @@ namespace eosio {
 
    void dispatch_manager::retry_fetch(const connection_ptr& c) {
       fc_dlog( logger, "retry fetch" );
-      std::unique_lock<std::mutex> g_c_conn( c->conn_mtx );
-      if( !c->last_req ) {
-         return;
-      }
-      fc_wlog( logger, "failed to fetch from ${p}", ("p", c->peer_address()) );
+      request_message last_req;
       block_id_type bid;
-      if( c->last_req->req_blocks.mode == normal && !c->last_req->req_blocks.ids.empty() ) {
-         bid = c->last_req->req_blocks.ids.back();
-      } else {
-         fc_wlog( logger, "no retry, block mpde = ${b} trx mode = ${t}",
-                  ("b", modes_str( c->last_req->req_blocks.mode ))( "t", modes_str( c->last_req->req_trx.mode ) ) );
-         return;
+      {
+         std::lock_guard<std::mutex> g_c_conn( c->conn_mtx );
+         if( !c->last_req ) {
+            return;
+         }
+         fc_wlog( logger, "failed to fetch from ${p}", ("p", c->peer_address()) );
+         if( c->last_req->req_blocks.mode == normal && !c->last_req->req_blocks.ids.empty() ) {
+            bid = c->last_req->req_blocks.ids.back();
+         } else {
+            fc_wlog( logger, "no retry, block mpde = ${b} trx mode = ${t}",
+                     ("b", modes_str( c->last_req->req_blocks.mode ))( "t", modes_str( c->last_req->req_trx.mode ) ) );
+            return;
+         }
+         last_req = *c->last_req;
       }
-      g_c_conn.unlock();
-      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
-      for( auto& conn : my_impl->connections ) {
-         if( conn == c ) continue;
-
-         std::unique_lock<std::mutex> g_conn_conn( conn->conn_mtx );
-         if( conn->last_req ) {
-            continue;
+      my_impl->for_each_connection( [this, &c, &last_req, &bid]( auto& conn ) {
+         if( conn == c )
+            return true;
+         {
+            std::lock_guard<std::mutex> guard( conn->conn_mtx );
+            if( conn->last_req ) {
+               return true;
+            }
          }
-         g_conn_conn.unlock();
+
          bool sendit = peer_has_block( bid, conn->connection_id );
          if( sendit ) {
-            g.unlock();
-            g_c_conn.lock();
-            auto last_req = *c->last_req;
-            g_c_conn.unlock();
             conn->strand.post( [conn, last_req{std::move(last_req)}]() {
                conn->enqueue( last_req );
                conn->fetch_wait();
                std::lock_guard<std::mutex> g_conn_conn( conn->conn_mtx );
                conn->last_req = last_req;
             } );
-            return;
+            return false;
          }
-      }
+         return true;
+      } );
 
       // at this point no other peer has it, re-request or do nothing?
       fc_wlog( logger, "no peer has last_req" );
       if( c->connected() ) {
-         g_c_conn.lock();
-         auto last_req = *c->last_req;
-         g_c_conn.unlock();
          c->enqueue( last_req );
          c->fetch_wait();
       }
@@ -2116,8 +2116,7 @@ namespace eosio {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
             } else {
                paddr_str = paddr_add.to_string();
-               std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
-               for( auto& conn : connections ) {
+               my_impl->for_each_connection( [&visitors, &from_addr, &paddr_str]( auto& conn ) {
                   if( conn->socket_is_open() ) {
                      if( conn->peer_address().empty() ) {
                         ++visitors;
@@ -2126,13 +2125,12 @@ namespace eosio {
                         }
                      }
                   }
-               }
-               g.unlock();
+                  return true;
+               } );
                if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
                   if( new_connection->start_session() ) {
-                     std::unique_lock<std::shared_mutex> g_unique( connections_mtx );
+                     std::lock_guard<std::shared_mutex> g_unique( connections_mtx );
                      connections.insert( new_connection );
-                     g_unique.unlock();
                   }
 
                } else {
@@ -2865,14 +2863,14 @@ namespace eosio {
                if( my->in_shutdown ) return;
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
-            std::shared_lock<std::shared_mutex> g( my->connections_mtx );
-            for( auto& c : my->connections ) {
+            my->for_each_connection( []( auto& c ) {
                if( c->socket_is_open() ) {
                   c->strand.post( [c]() {
                      c->send_time();
                   } );
                }
-            }
+               return true;
+            } );
          } );
    }
 
@@ -3315,7 +3313,7 @@ namespace eosio {
 
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
-            std::unique_lock<std::shared_mutex> g( my->connections_mtx );
+            std::lock_guard<std::shared_mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
                con->close( false );
@@ -3336,7 +3334,7 @@ namespace eosio {
     *  Used to trigger a new connection from RPC API
     */
    string net_plugin::connect( const string& host ) {
-      std::unique_lock<std::shared_mutex> g( my->connections_mtx );
+      std::lock_guard<std::shared_mutex> g( my->connections_mtx );
       if( my->find_connection( host ) )
          return "already connected";
 
@@ -3350,7 +3348,7 @@ namespace eosio {
    }
 
    string net_plugin::disconnect( const string& host ) {
-      std::unique_lock<std::shared_mutex> g( my->connections_mtx );
+      std::lock_guard<std::shared_mutex> g( my->connections_mtx );
       for( auto itr = my->connections.begin(); itr != my->connections.end(); ++itr ) {
          if( (*itr)->peer_address() == host ) {
             fc_ilog( logger, "disconnecting: ${p}", ("p", (*itr)->peer_name()) );

From e9c1e5eb0360985449f80079ff84ce1de3ba76cf Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 2 May 2019 16:40:29 -0400
Subject: [PATCH 0254/1648] Removed commented-out code

---
 .buildkite/pipeline.yml | 83 +----------------------------------------
 1 file changed, 1 insertion(+), 82 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index bf0db2dc12e..81432fe58f6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,46 +1,4 @@
-# env:
-#   ANKA_WORKDIR: "/data/job"
-#   ANKA_MOJAVE_TEMPLATE: "10.14.4_6C_14G_40G"
-#   ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew"
-#   CHECKSUMABLE: "scripts/eosio_build*"
-#   MAC_TAG: "eosio_2-3"
-
 steps:
-
-  # - trigger: "mac-anka-fleet"
-  #   label: ":anka: Ensure Mojave Anka Template Tag Exists"
-  #   branches: "*"
-  #   async: false
-  #   build:
-  #     branch: "master"
-  #     env:
-  #       REPO: "${BUILDKITE_REPO}"
-  #       REPO_BRANCH: "${BUILDKITE_BRANCH}"
-  #       CHECKSUMABLE: "${CHECKSUMABLE}"
-  #       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
-  #       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-  #       TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.sh -y -P -f" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
-  #       PROJECT_TAG: "${MAC_TAG}"
-
-  # - wait
-
-  # - label: ":darwin: [Darwin] Mojave Build"
-  #   command:
-  #     - "./scripts/eosio_build.sh -y -P"
-  #     - "tar -pczf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz build"
-  #   plugins:
-  #     chef/anka#v0.4.3:
-  #       vm-name: $ANKA_MOJAVE_TEMPLATE
-  #       vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-  #       workdir: $ANKA_WORKDIR
-  #       always-pull: true
-  #       debug: true
-  #       wait-network: true
-  #   agents:
-  #     - "queue=mac-anka-node-fleet"
-  #   timeout: 120
-
-
   - command: | # macOS Mojave Build
       echo "--- Creating symbolic link to job directory :file_folder:"
       sleep 5
@@ -324,44 +282,6 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # - label: ":darwin: [Darwin] Mojave Tests"
-  #   command:
-  #     - "./scripts/parallel-test.sh /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
-  #   artifact_paths:
-  #     - "build/mongod.log"
-  #     - "build/genesis.json"
-  #     - "build/config.ini"
-  #   agents:
-  #     - "queue=mac-anka-node-fleet"
-  #   plugins:
-  #     chef/anka#v0.4.3:
-  #       vm-name: $ANKA_MOJAVE_TEMPLATE
-  #       vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-  #       workdir: $ANKA_WORKDIR
-  #       always-pull: true
-  #       debug: true
-  #       wait-network: true
-  #   timeout: 120
-
-  # - label: ":darwin: [Darwin] Mojave Tests"
-  #   command:
-  #     - "./scripts/serial-test.sh /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
-  #   artifact_paths:
-  #     - "build/mongod.log"
-  #     - "build/genesis.json"
-  #     - "build/config.ini"
-  #   agents:
-  #     - "queue=mac-anka-node-fleet"
-  #   plugins:
-  #     chef/anka#v0.4.3:
-  #       vm-name: $ANKA_MOJAVE_TEMPLATE
-  #       vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-  #       workdir: $ANKA_WORKDIR
-  #       always-pull: true
-  #       debug: true
-  #       wait-network: true
-  #   timeout: 120
-
   # Mojave Tests
   - command: |
         echo "--- :arrow_down: Downloading Build Directory"
@@ -386,7 +306,6 @@ steps:
       - "os=mojave"
     timeout: 60
 
-
   - wait
 
   - command: | # CentOS 7 Package Builder
@@ -515,4 +434,4 @@ steps:
     label: "Git Submodule Regression Check"
     agents:
       queue: "automation-large-builder-fleet"
-    timeout: 5
+    timeout: 5
\ No newline at end of file

From df6b4c99d4205a8beb6e18535915daf507d2a5f2 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 2 May 2019 16:52:49 -0400
Subject: [PATCH 0255/1648] Added test metrics step to Buildkite

---
 .buildkite/pipeline.yml                       |   11 +
 .../node_modules/node-fetch/CHANGELOG.md      |  260 +++
 .../node_modules/node-fetch/LICENSE.md        |   22 +
 .../metrics/node_modules/node-fetch/README.md |  538 ++++++
 .../node_modules/node-fetch/browser.js        |   23 +
 .../node_modules/node-fetch/lib/index.es.js   | 1631 ++++++++++++++++
 .../node_modules/node-fetch/lib/index.js      | 1640 +++++++++++++++++
 .../node_modules/node-fetch/lib/index.mjs     | 1629 ++++++++++++++++
 .../node_modules/node-fetch/package.json      |   94 +
 scripts/metrics/node_modules/sax/LICENSE      |   41 +
 scripts/metrics/node_modules/sax/README.md    |  225 +++
 scripts/metrics/node_modules/sax/lib/sax.js   | 1565 ++++++++++++++++
 scripts/metrics/node_modules/sax/package.json |   61 +
 scripts/metrics/node_modules/xml2js/LICENSE   |   19 +
 scripts/metrics/node_modules/xml2js/README.md |  406 ++++
 .../metrics/node_modules/xml2js/lib/bom.js    |   12 +
 .../node_modules/xml2js/lib/builder.js        |  127 ++
 .../node_modules/xml2js/lib/defaults.js       |   72 +
 .../metrics/node_modules/xml2js/lib/parser.js |  357 ++++
 .../node_modules/xml2js/lib/processors.js     |   34 +
 .../metrics/node_modules/xml2js/lib/xml2js.js |   37 +
 .../metrics/node_modules/xml2js/package.json  |  280 +++
 .../node_modules/xmlbuilder/.npmignore        |    5 +
 .../node_modules/xmlbuilder/CHANGELOG.md      |  423 +++++
 .../metrics/node_modules/xmlbuilder/LICENSE   |   21 +
 .../metrics/node_modules/xmlbuilder/README.md |   85 +
 .../node_modules/xmlbuilder/lib/Utility.js    |   73 +
 .../xmlbuilder/lib/XMLAttribute.js            |   31 +
 .../node_modules/xmlbuilder/lib/XMLCData.js   |   32 +
 .../node_modules/xmlbuilder/lib/XMLComment.js |   32 +
 .../xmlbuilder/lib/XMLDTDAttList.js           |   50 +
 .../xmlbuilder/lib/XMLDTDElement.js           |   35 +
 .../xmlbuilder/lib/XMLDTDEntity.js            |   56 +
 .../xmlbuilder/lib/XMLDTDNotation.js          |   37 +
 .../xmlbuilder/lib/XMLDeclaration.js          |   40 +
 .../node_modules/xmlbuilder/lib/XMLDocType.js |  107 ++
 .../xmlbuilder/lib/XMLDocument.js             |   48 +
 .../xmlbuilder/lib/XMLDocumentCB.js           |  402 ++++
 .../node_modules/xmlbuilder/lib/XMLElement.js |  111 ++
 .../node_modules/xmlbuilder/lib/XMLNode.js    |  432 +++++
 .../lib/XMLProcessingInstruction.js           |   35 +
 .../node_modules/xmlbuilder/lib/XMLRaw.js     |   32 +
 .../xmlbuilder/lib/XMLStreamWriter.js         |  279 +++
 .../xmlbuilder/lib/XMLStringWriter.js         |  334 ++++
 .../xmlbuilder/lib/XMLStringifier.js          |  163 ++
 .../node_modules/xmlbuilder/lib/XMLText.js    |   32 +
 .../xmlbuilder/lib/XMLWriterBase.js           |   90 +
 .../node_modules/xmlbuilder/lib/index.js      |   53 +
 .../node_modules/xmlbuilder/package.json      |   65 +
 scripts/metrics/package-lock.json             |   30 +
 scripts/metrics/test-metrics.js               |  415 +++++
 51 files changed, 12632 insertions(+)
 create mode 100644 scripts/metrics/node_modules/node-fetch/CHANGELOG.md
 create mode 100644 scripts/metrics/node_modules/node-fetch/LICENSE.md
 create mode 100644 scripts/metrics/node_modules/node-fetch/README.md
 create mode 100644 scripts/metrics/node_modules/node-fetch/browser.js
 create mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.es.js
 create mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.js
 create mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.mjs
 create mode 100644 scripts/metrics/node_modules/node-fetch/package.json
 create mode 100644 scripts/metrics/node_modules/sax/LICENSE
 create mode 100644 scripts/metrics/node_modules/sax/README.md
 create mode 100644 scripts/metrics/node_modules/sax/lib/sax.js
 create mode 100644 scripts/metrics/node_modules/sax/package.json
 create mode 100644 scripts/metrics/node_modules/xml2js/LICENSE
 create mode 100644 scripts/metrics/node_modules/xml2js/README.md
 create mode 100644 scripts/metrics/node_modules/xml2js/lib/bom.js
 create mode 100644 scripts/metrics/node_modules/xml2js/lib/builder.js
 create mode 100644 scripts/metrics/node_modules/xml2js/lib/defaults.js
 create mode 100644 scripts/metrics/node_modules/xml2js/lib/parser.js
 create mode 100644 scripts/metrics/node_modules/xml2js/lib/processors.js
 create mode 100644 scripts/metrics/node_modules/xml2js/lib/xml2js.js
 create mode 100644 scripts/metrics/node_modules/xml2js/package.json
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/.npmignore
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/LICENSE
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/README.md
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/index.js
 create mode 100644 scripts/metrics/node_modules/xmlbuilder/package.json
 create mode 100644 scripts/metrics/package-lock.json
 create mode 100755 scripts/metrics/test-metrics.js

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 81432fe58f6..379d02015cb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -306,6 +306,17 @@ steps:
       - "os=mojave"
     timeout: 60
 
+  - wait:
+    continue_on_failure: true
+
+  - command: |
+        cd scripts/metrics
+        node --max-old-space-size=4096 test-metrics.js
+    label: ":bar_chart: Test Metrics"
+    agents:
+      queue: "automation-apps-builder-fleet"
+    timeout: 10
+
   - wait
 
   - command: | # CentOS 7 Package Builder
diff --git a/scripts/metrics/node_modules/node-fetch/CHANGELOG.md b/scripts/metrics/node_modules/node-fetch/CHANGELOG.md
new file mode 100644
index 00000000000..941b6a8d8b7
--- /dev/null
+++ b/scripts/metrics/node_modules/node-fetch/CHANGELOG.md
@@ -0,0 +1,260 @@
+
+Changelog
+=========
+
+
+# 2.x release
+
+## v2.5.0
+
+- Enhance: `Response` object now includes `redirected` property.
+- Enhance: `fetch()` now accepts third-party `Blob` implementation as body.
+- Other: disable `package-lock.json` generation as we never commit them.
+- Other: dev dependency update.
+- Other: readme update.
+
+## v2.4.1
+
+- Fix: `Blob` import rule for node < 10, as `Readable` isn't a named export.
+
+## v2.4.0
+
+- Enhance: added `Brotli` compression support (using node's zlib).
+- Enhance: updated `Blob` implementation per spec.
+- Fix: set content type automatically for `URLSearchParams`.
+- Fix: `Headers` now reject empty header names.
+- Fix: test cases, as node 12+ no longer accepts invalid header response.
+
+## v2.3.0
+
+- Enhance: added `AbortSignal` support, with README example.
+- Enhance: handle invalid `Location` header during redirect by rejecting them explicitly with `FetchError`.
+- Fix: update `browser.js` to support react-native environment, where `self` isn't available globally.
+
+## v2.2.1
+
+- Fix: `compress` flag shouldn't overwrite existing `Accept-Encoding` header.
+- Fix: multiple `import` rules, where `PassThrough` etc. doesn't have a named export when using node <10 and `--exerimental-modules` flag.
+- Other: Better README.
+
+## v2.2.0
+
+- Enhance: Support all `ArrayBuffer` view types
+- Enhance: Support Web Workers
+- Enhance: Support Node.js' `--experimental-modules` mode; deprecate `.es.js` file
+- Fix: Add `__esModule` property to the exports object
+- Other: Better example in README for writing response to a file
+- Other: More tests for Agent
+
+## v2.1.2
+
+- Fix: allow `Body` methods to work on `ArrayBuffer`-backed `Body` objects
+- Fix: reject promise returned by `Body` methods when the accumulated `Buffer` exceeds the maximum size
+- Fix: support custom `Host` headers with any casing
+- Fix: support importing `fetch()` from TypeScript in `browser.js`
+- Fix: handle the redirect response body properly
+
+## v2.1.1
+
+Fix packaging errors in v2.1.0.
+
+## v2.1.0
+
+- Enhance: allow using ArrayBuffer as the `body` of a `fetch()` or `Request`
+- Fix: store HTTP headers of a `Headers` object internally with the given case, for compatibility with older servers that incorrectly treated header names in a case-sensitive manner
+- Fix: silently ignore invalid HTTP headers
+- Fix: handle HTTP redirect responses without a `Location` header just like non-redirect responses
+- Fix: include bodies when following a redirection when appropriate
+
+## v2.0.0
+
+This is a major release. Check [our upgrade guide](https://github.com/bitinn/node-fetch/blob/master/UPGRADE-GUIDE.md) for an overview on some key differences between v1 and v2.
+
+### General changes
+
+- Major: Node.js 0.10.x and 0.12.x support is dropped
+- Major: `require('node-fetch/lib/response')` etc. is now unsupported; use `require('node-fetch').Response` or ES6 module imports
+- Enhance: start testing on Node.js v4.x, v6.x, v8.x LTS, as well as v9.x stable
+- Enhance: use Rollup to produce a distributed bundle (less memory overhead and faster startup)
+- Enhance: make `Object.prototype.toString()` on Headers, Requests, and Responses return correct class strings
+- Other: rewrite in ES2015 using Babel
+- Other: use Codecov for code coverage tracking
+- Other: update package.json script for npm 5
+- Other: `encoding` module is now optional (alpha.7)
+- Other: expose browser.js through package.json, avoid bundling mishaps (alpha.9)
+- Other: allow TypeScript to `import` node-fetch by exposing default (alpha.9)
+
+### HTTP requests
+
+- Major: overwrite user's `Content-Length` if we can be sure our information is correct (per spec)
+- Fix: errors in a response are caught before the body is accessed
+- Fix: support WHATWG URL objects, created by `whatwg-url` package or `require('url').URL` in Node.js 7+
+
+### Response and Request classes
+
+- Major: `response.text()` no longer attempts to detect encoding, instead always opting for UTF-8 (per spec); use `response.textConverted()` for the v1 behavior
+- Major: make `response.json()` throw error instead of returning an empty object on 204 no-content respose (per spec; reverts behavior changed in v1.6.2)
+- Major: internal methods are no longer exposed
+- Major: throw error when a `GET` or `HEAD` Request is constructed with a non-null body (per spec)
+- Enhance: add `response.arrayBuffer()` (also applies to Requests)
+- Enhance: add experimental `response.blob()` (also applies to Requests)
+- Enhance: `URLSearchParams` is now accepted as a body
+- Enhance: wrap `response.json()` json parsing error as `FetchError`
+- Fix: fix Request and Response with `null` body
+
+### Headers class
+
+- Major: remove `headers.getAll()`; make `get()` return all headers delimited by commas (per spec)
+- Enhance: make Headers iterable
+- Enhance: make Headers constructor accept an array of tuples
+- Enhance: make sure header names and values are valid in HTTP
+- Fix: coerce Headers prototype function parameters to strings, where applicable
+
+### Documentation
+
+- Enhance: more comprehensive API docs
+- Enhance: add a list of default headers in README
+
+
+# 1.x release
+
+## backport releases (v1.7.0 and beyond)
+
+See [changelog on 1.x branch](https://github.com/bitinn/node-fetch/blob/1.x/CHANGELOG.md) for details.
+
+## v1.6.3
+
+- Enhance: error handling document to explain `FetchError` design
+- Fix: support `form-data` 2.x releases (requires `form-data` >= 2.1.0)
+
+## v1.6.2
+
+- Enhance: minor document update
+- Fix: response.json() returns empty object on 204 no-content response instead of throwing a syntax error
+
+## v1.6.1
+
+- Fix: if `res.body` is a non-stream non-formdata object, we will call `body.toString` and send it as a string
+- Fix: `counter` value is incorrectly set to `follow` value when wrapping Request instance
+- Fix: documentation update
+
+## v1.6.0
+
+- Enhance: added `res.buffer()` api for convenience, it returns body as a Node.js buffer
+- Enhance: better old server support by handling raw deflate response
+- Enhance: skip encoding detection for non-HTML/XML response
+- Enhance: minor document update
+- Fix: HEAD request doesn't need decompression, as body is empty
+- Fix: `req.body` now accepts a Node.js buffer
+
+## v1.5.3
+
+- Fix: handle 204 and 304 responses when body is empty but content-encoding is gzip/deflate
+- Fix: allow resolving response and cloned response in any order
+- Fix: avoid setting `content-length` when `form-data` body use streams
+- Fix: send DELETE request with content-length when body is present
+- Fix: allow any url when calling new Request, but still reject non-http(s) url in fetch
+
+## v1.5.2
+
+- Fix: allow node.js core to handle keep-alive connection pool when passing a custom agent
+
+## v1.5.1
+
+- Fix: redirect mode `manual` should work even when there is no redirection or broken redirection
+
+## v1.5.0
+
+- Enhance: rejected promise now use custom `Error` (thx to @pekeler)
+- Enhance: `FetchError` contains `err.type` and `err.code`, allows for better error handling (thx to @pekeler)
+- Enhance: basic support for redirect mode `manual` and `error`, allows for location header extraction (thx to @jimmywarting for the initial PR)
+
+## v1.4.1
+
+- Fix: wrapping Request instance with FormData body again should preserve the body as-is
+
+## v1.4.0
+
+- Enhance: Request and Response now have `clone` method (thx to @kirill-konshin for the initial PR)
+- Enhance: Request and Response now have proper string and buffer body support (thx to @kirill-konshin)
+- Enhance: Body constructor has been refactored out (thx to @kirill-konshin)
+- Enhance: Headers now has `forEach` method (thx to @tricoder42)
+- Enhance: back to 100% code coverage
+- Fix: better form-data support (thx to @item4)
+- Fix: better character encoding detection under chunked encoding (thx to @dsuket for the initial PR)
+
+## v1.3.3
+
+- Fix: make sure `Content-Length` header is set when body is string for POST/PUT/PATCH requests
+- Fix: handle body stream error, for cases such as incorrect `Content-Encoding` header
+- Fix: when following certain redirects, use `GET` on subsequent request per Fetch Spec
+- Fix: `Request` and `Response` constructors now parse headers input using `Headers`
+
+## v1.3.2
+
+- Enhance: allow auto detect of form-data input (no `FormData` spec on node.js, this is form-data specific feature)
+
+## v1.3.1
+
+- Enhance: allow custom host header to be set (server-side only feature, as it's a forbidden header on client-side)
+
+## v1.3.0
+
+- Enhance: now `fetch.Request` is exposed as well
+
+## v1.2.1
+
+- Enhance: `Headers` now normalized `Number` value to `String`, prevent common mistakes
+
+## v1.2.0
+
+- Enhance: now fetch.Headers and fetch.Response are exposed, making testing easier
+
+## v1.1.2
+
+- Fix: `Headers` should only support `String` and `Array` properties, and ignore others
+
+## v1.1.1
+
+- Enhance: now req.headers accept both plain object and `Headers` instance
+
+## v1.1.0
+
+- Enhance: timeout now also applies to response body (in case of slow response)
+- Fix: timeout is now cleared properly when fetch is done/has failed
+
+## v1.0.6
+
+- Fix: less greedy content-type charset matching
+
+## v1.0.5
+
+- Fix: when `follow = 0`, fetch should not follow redirect
+- Enhance: update tests for better coverage
+- Enhance: code formatting
+- Enhance: clean up doc
+
+## v1.0.4
+
+- Enhance: test iojs support
+- Enhance: timeout attached to socket event only fire once per redirect
+
+## v1.0.3
+
+- Fix: response size limit should reject large chunk
+- Enhance: added character encoding detection for xml, such as rss/atom feed (encoding in DTD)
+
+## v1.0.2
+
+- Fix: added res.ok per spec change
+
+## v1.0.0
+
+- Enhance: better test coverage and doc
+
+
+# 0.x release
+
+## v0.1
+
+- Major: initial public release
diff --git a/scripts/metrics/node_modules/node-fetch/LICENSE.md b/scripts/metrics/node_modules/node-fetch/LICENSE.md
new file mode 100644
index 00000000000..660ffecb58b
--- /dev/null
+++ b/scripts/metrics/node_modules/node-fetch/LICENSE.md
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 David Frank
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/scripts/metrics/node_modules/node-fetch/README.md b/scripts/metrics/node_modules/node-fetch/README.md
new file mode 100644
index 00000000000..48f4215e4e7
--- /dev/null
+++ b/scripts/metrics/node_modules/node-fetch/README.md
@@ -0,0 +1,538 @@
+node-fetch
+==========
+
+[![npm version][npm-image]][npm-url]
+[![build status][travis-image]][travis-url]
+[![coverage status][codecov-image]][codecov-url]
+[![install size][install-size-image]][install-size-url]
+
+A light-weight module that brings `window.fetch` to Node.js
+
+(We are looking for [v2 maintainers and collaborators](https://github.com/bitinn/node-fetch/issues/567))
+
+<!-- TOC -->
+
+- [Motivation](#motivation)
+- [Features](#features)
+- [Difference from client-side fetch](#difference-from-client-side-fetch)
+- [Installation](#installation)
+- [Loading and configuring the module](#loading-and-configuring-the-module)
+- [Common Usage](#common-usage)
+    - [Plain text or HTML](#plain-text-or-html)
+    - [JSON](#json)
+    - [Simple Post](#simple-post)
+    - [Post with JSON](#post-with-json)
+    - [Post with form parameters](#post-with-form-parameters)
+    - [Handling exceptions](#handling-exceptions)
+    - [Handling client and server errors](#handling-client-and-server-errors)
+- [Advanced Usage](#advanced-usage)
+    - [Streams](#streams)
+    - [Buffer](#buffer)
+    - [Accessing Headers and other Meta data](#accessing-headers-and-other-meta-data)
+    - [Post data using a file stream](#post-data-using-a-file-stream)
+    - [Post with form-data (detect multipart)](#post-with-form-data-detect-multipart)
+    - [Request cancellation with AbortSignal](#request-cancellation-with-abortsignal)
+- [API](#api)
+    - [fetch(url[, options])](#fetchurl-options)
+    - [Options](#options)
+    - [Class: Request](#class-request)
+    - [Class: Response](#class-response)
+    - [Class: Headers](#class-headers)
+    - [Interface: Body](#interface-body)
+    - [Class: FetchError](#class-fetcherror)
+- [License](#license)
+- [Acknowledgement](#acknowledgement)
+
+<!-- /TOC -->
+
+## Motivation
+
+Instead of implementing `XMLHttpRequest` in Node.js to run browser-specific [Fetch polyfill](https://github.com/github/fetch), why not go from native `http` to `fetch` API directly? Hence `node-fetch`, minimal code for a `window.fetch` compatible API on Node.js runtime.
+
+See Matt Andrews' [isomorphic-fetch](https://github.com/matthew-andrews/isomorphic-fetch) or Leonardo Quixada's [cross-fetch](https://github.com/lquixada/cross-fetch) for isomorphic usage (exports `node-fetch` for server-side, `whatwg-fetch` for client-side).
+
+## Features
+
+- Stay consistent with `window.fetch` API.
+- Make conscious trade-off when following [WHATWG fetch spec][whatwg-fetch] and [stream spec](https://streams.spec.whatwg.org/) implementation details, document known differences.
+- Use native promise, but allow substituting it with [insert your favorite promise library].
+- Use native Node streams for body, on both request and response.
+- Decode content encoding (gzip/deflate) properly, and convert string output (such as `res.text()` and `res.json()`) to UTF-8 automatically.
+- Useful extensions such as timeout, redirect limit, response size limit, [explicit errors](ERROR-HANDLING.md) for troubleshooting.
+
+## Difference from client-side fetch
+
+- See [Known Differences](LIMITS.md) for details.
+- If you happen to use a missing feature that `window.fetch` offers, feel free to open an issue.
+- Pull requests are welcomed too!
+
+## Installation
+
+Current stable release (`2.x`)
+
+```sh
+$ npm install node-fetch --save
+```
+
+## Loading and configuring the module
+We suggest you load the module via `require`, pending the stabalizing of es modules in node:
+```js
+const fetch = require('node-fetch');
+```
+
+If you are using a Promise library other than native, set it through fetch.Promise:
+```js
+const Bluebird = require('bluebird');
+
+fetch.Promise = Bluebird;
+```
+
+## Common Usage
+
+NOTE: The documentation below is up-to-date with `2.x` releases, [see `1.x` readme](https://github.com/bitinn/node-fetch/blob/1.x/README.md), [changelog](https://github.com/bitinn/node-fetch/blob/1.x/CHANGELOG.md) and [2.x upgrade guide](UPGRADE-GUIDE.md) for the differences.
+
+#### Plain text or HTML
+```js
+fetch('https://github.com/')
+    .then(res => res.text())
+    .then(body => console.log(body));
+```
+
+#### JSON
+
+```js
+
+fetch('https://api.github.com/users/github')
+    .then(res => res.json())
+    .then(json => console.log(json));
+```
+
+#### Simple Post
+```js
+fetch('https://httpbin.org/post', { method: 'POST', body: 'a=1' })
+    .then(res => res.json()) // expecting a json response
+    .then(json => console.log(json));
+```
+
+#### Post with JSON
+
+```js
+const body = { a: 1 };
+
+fetch('https://httpbin.org/post', {
+        method: 'post',
+        body:    JSON.stringify(body),
+        headers: { 'Content-Type': 'application/json' },
+    })
+    .then(res => res.json())
+    .then(json => console.log(json));
+```
+
+#### Post with form parameters
+`URLSearchParams` is available in Node.js as of v7.5.0. See [official documentation](https://nodejs.org/api/url.html#url_class_urlsearchparams) for more usage methods.
+
+NOTE: The `Content-Type` header is only set automatically to `x-www-form-urlencoded` when an instance of `URLSearchParams` is given as such:
+
+```js
+const { URLSearchParams } = require('url');
+
+const params = new URLSearchParams();
+params.append('a', 1);
+
+fetch('https://httpbin.org/post', { method: 'POST', body: params })
+    .then(res => res.json())
+    .then(json => console.log(json));
+```
+
+#### Handling exceptions
+NOTE: 3xx-5xx responses are *NOT* exceptions, and should be handled in `then()`, see the next section.
+
+Adding a catch to the fetch promise chain will catch *all* exceptions, such as errors originating from node core libraries, like network errors, and operational errors which are instances of FetchError. See the [error handling document](ERROR-HANDLING.md)  for more details.
+
+```js
+fetch('https://domain.invalid/')
+    .catch(err => console.error(err));
+```
+
+#### Handling client and server errors
+It is common to create a helper function to check that the response contains no client (4xx) or server (5xx) error responses:
+
+```js
+function checkStatus(res) {
+    if (res.ok) { // res.status >= 200 && res.status < 300
+        return res;
+    } else {
+        throw MyCustomError(res.statusText);
+    }
+}
+
+fetch('https://httpbin.org/status/400')
+    .then(checkStatus)
+    .then(res => console.log('will not get here...'))
+```
+
+## Advanced Usage
+
+#### Streams
+The "Node.js way" is to use streams when possible:
+
+```js
+fetch('https://assets-cdn.github.com/images/modules/logos_page/Octocat.png')
+    .then(res => {
+        const dest = fs.createWriteStream('./octocat.png');
+        res.body.pipe(dest);
+    });
+```
+
+#### Buffer
+If you prefer to cache binary data in full, use buffer(). (NOTE: buffer() is a `node-fetch` only API)
+
+```js
+const fileType = require('file-type');
+
+fetch('https://assets-cdn.github.com/images/modules/logos_page/Octocat.png')
+    .then(res => res.buffer())
+    .then(buffer => fileType(buffer))
+    .then(type => { /* ... */ });
+```
+
+#### Accessing Headers and other Meta data
+```js
+fetch('https://github.com/')
+    .then(res => {
+        console.log(res.ok);
+        console.log(res.status);
+        console.log(res.statusText);
+        console.log(res.headers.raw());
+        console.log(res.headers.get('content-type'));
+    });
+```
+
+#### Post data using a file stream
+
+```js
+const { createReadStream } = require('fs');
+
+const stream = createReadStream('input.txt');
+
+fetch('https://httpbin.org/post', { method: 'POST', body: stream })
+    .then(res => res.json())
+    .then(json => console.log(json));
+```
+
+#### Post with form-data (detect multipart)
+
+```js
+const FormData = require('form-data');
+
+const form = new FormData();
+form.append('a', 1);
+
+fetch('https://httpbin.org/post', { method: 'POST', body: form })
+    .then(res => res.json())
+    .then(json => console.log(json));
+
+// OR, using custom headers
+// NOTE: getHeaders() is non-standard API
+
+const form = new FormData();
+form.append('a', 1);
+
+const options = {
+    method: 'POST',
+    body: form,
+    headers: form.getHeaders()
+}
+
+fetch('https://httpbin.org/post', options)
+    .then(res => res.json())
+    .then(json => console.log(json));
+```
+
+#### Request cancellation with AbortSignal
+
+> NOTE: You may only cancel streamed requests on Node >= v8.0.0
+
+You may cancel requests with `AbortController`. A suggested implementation is [`abort-controller`](https://www.npmjs.com/package/abort-controller).
+
+An example of timing out a request after 150ms could be achieved as follows:
+
+```js
+import AbortController from 'abort-controller';
+
+const controller = new AbortController();
+const timeout = setTimeout(
+  () => { controller.abort(); },
+  150,
+);
+
+fetch(url, { signal: controller.signal })
+  .then(res => res.json())
+  .then(
+    data => {
+      useData(data)
+    },
+    err => {
+      if (err.name === 'AbortError') {
+        // request was aborted
+      }
+    },
+  )
+  .finally(() => {
+    clearTimeout(timeout);
+  });
+```
+
+See [test cases](https://github.com/bitinn/node-fetch/blob/master/test/test.js) for more examples.
+
+
+## API
+
+### fetch(url[, options])
+
+- `url` A string representing the URL for fetching
+- `options` [Options](#fetch-options) for the HTTP(S) request
+- Returns: <code>Promise&lt;[Response](#class-response)&gt;</code>
+
+Perform an HTTP(S) fetch.
+
+`url` should be an absolute url, such as `https://example.com/`. A path-relative URL (`/file/under/root`) or protocol-relative URL (`//can-be-http-or-https.com/`) will result in a rejected promise.
+
+<a id="fetch-options"></a>
+### Options
+
+The default values are shown after each option key.
+
+```js
+{
+    // These properties are part of the Fetch Standard
+    method: 'GET',
+    headers: {},        // request headers. format is the identical to that accepted by the Headers constructor (see below)
+    body: null,         // request body. can be null, a string, a Buffer, a Blob, or a Node.js Readable stream
+    redirect: 'follow', // set to `manual` to extract redirect headers, `error` to reject redirect
+    signal: null,       // pass an instance of AbortSignal to optionally abort requests
+
+    // The following properties are node-fetch extensions
+    follow: 20,         // maximum redirect count. 0 to not follow redirect
+    timeout: 0,         // req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies). Signal is recommended instead.
+    compress: true,     // support gzip/deflate content encoding. false to disable
+    size: 0,            // maximum response body size in bytes. 0 to disable
+    agent: null         // http(s).Agent instance, allows custom proxy, certificate, dns lookup etc.
+}
+```
+
+##### Default Headers
+
+If no values are set, the following request headers will be sent automatically:
+
+Header              | Value
+------------------- | --------------------------------------------------------
+`Accept-Encoding`   | `gzip,deflate` _(when `options.compress === true`)_
+`Accept`            | `*/*`
+`Connection`        | `close` _(when no `options.agent` is present)_
+`Content-Length`    | _(automatically calculated, if possible)_
+`Transfer-Encoding` | `chunked` _(when `req.body` is a stream)_
+`User-Agent`        | `node-fetch/1.0 (+https://github.com/bitinn/node-fetch)`
+
+<a id="class-request"></a>
+### Class: Request
+
+An HTTP(S) request containing information about URL, method, headers, and the body. This class implements the [Body](#iface-body) interface.
+
+Due to the nature of Node.js, the following properties are not implemented at this moment:
+
+- `type`
+- `destination`
+- `referrer`
+- `referrerPolicy`
+- `mode`
+- `credentials`
+- `cache`
+- `integrity`
+- `keepalive`
+
+The following node-fetch extension properties are provided:
+
+- `follow`
+- `compress`
+- `counter`
+- `agent`
+
+See [options](#fetch-options) for exact meaning of these extensions.
+
+#### new Request(input[, options])
+
+<small>*(spec-compliant)*</small>
+
+- `input` A string representing a URL, or another `Request` (which will be cloned)
+- `options` [Options][#fetch-options] for the HTTP(S) request
+
+Constructs a new `Request` object. The constructor is identical to that in the [browser](https://developer.mozilla.org/en-US/docs/Web/API/Request/Request).
+
+In most cases, directly `fetch(url, options)` is simpler than creating a `Request` object.
+
+<a id="class-response"></a>
+### Class: Response
+
+An HTTP(S) response. This class implements the [Body](#iface-body) interface.
+
+The following properties are not implemented in node-fetch at this moment:
+
+- `Response.error()`
+- `Response.redirect()`
+- `type`
+- `trailer`
+
+#### new Response([body[, options]])
+
+<small>*(spec-compliant)*</small>
+
+- `body` A string or [Readable stream][node-readable]
+- `options` A [`ResponseInit`][response-init] options dictionary
+
+Constructs a new `Response` object. The constructor is identical to that in the [browser](https://developer.mozilla.org/en-US/docs/Web/API/Response/Response).
+
+Because Node.js does not implement service workers (for which this class was designed), one rarely has to construct a `Response` directly.
+
+#### response.ok
+
+<small>*(spec-compliant)*</small>
+
+Convenience property representing if the request ended normally. Will evaluate to true if the response status was greater than or equal to 200 but smaller than 300.
+
+#### response.redirected
+
+<small>*(spec-compliant)*</small>
+
+Convenience property representing if the request has been redirected at least once. Will evaluate to true if the internal redirect counter is greater than 0.
+
+<a id="class-headers"></a>
+### Class: Headers
+
+This class allows manipulating and iterating over a set of HTTP headers. All methods specified in the [Fetch Standard][whatwg-fetch] are implemented.
+
+#### new Headers([init])
+
+<small>*(spec-compliant)*</small>
+
+- `init` Optional argument to pre-fill the `Headers` object
+
+Construct a new `Headers` object. `init` can be either `null`, a `Headers` object, an key-value map object, or any iterable object.
+
+```js
+// Example adapted from https://fetch.spec.whatwg.org/#example-headers-class
+
+const meta = {
+  'Content-Type': 'text/xml',
+  'Breaking-Bad': '<3'
+};
+const headers = new Headers(meta);
+
+// The above is equivalent to
+const meta = [
+  [ 'Content-Type', 'text/xml' ],
+  [ 'Breaking-Bad', '<3' ]
+];
+const headers = new Headers(meta);
+
+// You can in fact use any iterable objects, like a Map or even another Headers
+const meta = new Map();
+meta.set('Content-Type', 'text/xml');
+meta.set('Breaking-Bad', '<3');
+const headers = new Headers(meta);
+const copyOfHeaders = new Headers(headers);
+```
+
+<a id="iface-body"></a>
+### Interface: Body
+
+`Body` is an abstract interface with methods that are applicable to both `Request` and `Response` classes.
+
+The following methods are not yet implemented in node-fetch at this moment:
+
+- `formData()`
+
+#### body.body
+
+<small>*(deviation from spec)*</small>
+
+* Node.js [`Readable` stream][node-readable]
+
+The data encapsulated in the `Body` object. Note that while the [Fetch Standard][whatwg-fetch] requires the property to always be a WHATWG `ReadableStream`, in node-fetch it is a Node.js [`Readable` stream][node-readable].
+
+#### body.bodyUsed
+
+<small>*(spec-compliant)*</small>
+
+* `Boolean`
+
+A boolean property for if this body has been consumed. Per spec, a consumed body cannot be used again.
+
+#### body.arrayBuffer()
+#### body.blob()
+#### body.json()
+#### body.text()
+
+<small>*(spec-compliant)*</small>
+
+* Returns: <code>Promise</code>
+
+Consume the body and return a promise that will resolve to one of these formats.
+
+#### body.buffer()
+
+<small>*(node-fetch extension)*</small>
+
+* Returns: <code>Promise&lt;Buffer&gt;</code>
+
+Consume the body and return a promise that will resolve to a Buffer.
+
+#### body.textConverted()
+
+<small>*(node-fetch extension)*</small>
+
+* Returns: <code>Promise&lt;String&gt;</code>
+
+Identical to `body.text()`, except instead of always converting to UTF-8, encoding sniffing will be performed and text converted to UTF-8, if possible.
+
+(This API requires an optional dependency on npm package [encoding](https://www.npmjs.com/package/encoding), which you need to install manually. `webpack` users may see [a warning message](https://github.com/bitinn/node-fetch/issues/412#issuecomment-379007792) due to this optional dependency.)
+
+<a id="class-fetcherror"></a>
+### Class: FetchError
+
+<small>*(node-fetch extension)*</small>
+
+An operational error in the fetching process. See [ERROR-HANDLING.md][] for more info.
+
+<a id="class-aborterror"></a>
+### Class: AbortError
+
+<small>*(node-fetch extension)*</small>
+
+An Error thrown when the request is aborted in response to an `AbortSignal`'s `abort` event. It has a `name` property of `AbortError`. See [ERROR-HANDLING.MD][] for more info.
+
+## Acknowledgement
+
+Thanks to [github/fetch](https://github.com/github/fetch) for providing a solid implementation reference.
+
+`node-fetch` v1 was maintained by [@bitinn](https://github.com/bitinn); v2 was maintained by [@TimothyGu](https://github.com/timothygu), [@bitinn](https://github.com/bitinn) and [@jimmywarting](https://github.com/jimmywarting); v2 readme is written by [@jkantr](https://github.com/jkantr).
+
+## License
+
+MIT
+
+[npm-image]: https://flat.badgen.net/npm/v/node-fetch
+[npm-url]: https://www.npmjs.com/package/node-fetch
+[travis-image]: https://flat.badgen.net/travis/bitinn/node-fetch
+[travis-url]: https://travis-ci.org/bitinn/node-fetch
+[codecov-image]: https://flat.badgen.net/codecov/c/github/bitinn/node-fetch/master
+[codecov-url]: https://codecov.io/gh/bitinn/node-fetch
+[install-size-image]: https://flat.badgen.net/packagephobia/install/node-fetch
+[install-size-url]: https://packagephobia.now.sh/result?p=node-fetch
+[whatwg-fetch]: https://fetch.spec.whatwg.org/
+[response-init]: https://fetch.spec.whatwg.org/#responseinit
+[node-readable]: https://nodejs.org/api/stream.html#stream_readable_streams
+[mdn-headers]: https://developer.mozilla.org/en-US/docs/Web/API/Headers
+[LIMITS.md]: https://github.com/bitinn/node-fetch/blob/master/LIMITS.md
+[ERROR-HANDLING.md]: https://github.com/bitinn/node-fetch/blob/master/ERROR-HANDLING.md
+[UPGRADE-GUIDE.md]: https://github.com/bitinn/node-fetch/blob/master/UPGRADE-GUIDE.md
diff --git a/scripts/metrics/node_modules/node-fetch/browser.js b/scripts/metrics/node_modules/node-fetch/browser.js
new file mode 100644
index 00000000000..0ad5de004c4
--- /dev/null
+++ b/scripts/metrics/node_modules/node-fetch/browser.js
@@ -0,0 +1,23 @@
+"use strict";
+
+// ref: https://github.com/tc39/proposal-global
+var getGlobal = function () {
+	// the only reliable means to get the global object is
+	// `Function('return this')()`
+	// However, this causes CSP violations in Chrome apps.
+	if (typeof self !== 'undefined') { return self; }
+	if (typeof window !== 'undefined') { return window; }
+	if (typeof global !== 'undefined') { return global; }
+	throw new Error('unable to locate global object');
+}
+
+var global = getGlobal();
+
+module.exports = exports = global.fetch;
+
+// Needed for TypeScript and Webpack.
+exports.default = global.fetch.bind(global);
+
+exports.Headers = global.Headers;
+exports.Request = global.Request;
+exports.Response = global.Response;
\ No newline at end of file
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.es.js b/scripts/metrics/node_modules/node-fetch/lib/index.es.js
new file mode 100644
index 00000000000..20ab807872f
--- /dev/null
+++ b/scripts/metrics/node_modules/node-fetch/lib/index.es.js
@@ -0,0 +1,1631 @@
+process.emitWarning("The .es.js file is deprecated. Use .mjs instead.");
+
+import Stream from 'stream';
+import http from 'http';
+import Url from 'url';
+import https from 'https';
+import zlib from 'zlib';
+
+// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
+
+// fix for "Readable" isn't a named export issue
+const Readable = Stream.Readable;
+
+const BUFFER = Symbol('buffer');
+const TYPE = Symbol('type');
+
+class Blob {
+	constructor() {
+		this[TYPE] = '';
+
+		const blobParts = arguments[0];
+		const options = arguments[1];
+
+		const buffers = [];
+		let size = 0;
+
+		if (blobParts) {
+			const a = blobParts;
+			const length = Number(a.length);
+			for (let i = 0; i < length; i++) {
+				const element = a[i];
+				let buffer;
+				if (element instanceof Buffer) {
+					buffer = element;
+				} else if (ArrayBuffer.isView(element)) {
+					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
+				} else if (element instanceof ArrayBuffer) {
+					buffer = Buffer.from(element);
+				} else if (element instanceof Blob) {
+					buffer = element[BUFFER];
+				} else {
+					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
+				}
+				size += buffer.length;
+				buffers.push(buffer);
+			}
+		}
+
+		this[BUFFER] = Buffer.concat(buffers);
+
+		let type = options && options.type !== undefined && String(options.type).toLowerCase();
+		if (type && !/[^\u0020-\u007E]/.test(type)) {
+			this[TYPE] = type;
+		}
+	}
+	get size() {
+		return this[BUFFER].length;
+	}
+	get type() {
+		return this[TYPE];
+	}
+	text() {
+		return Promise.resolve(this[BUFFER].toString());
+	}
+	arrayBuffer() {
+		const buf = this[BUFFER];
+		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+		return Promise.resolve(ab);
+	}
+	stream() {
+		const readable = new Readable();
+		readable._read = function () {};
+		readable.push(this[BUFFER]);
+		readable.push(null);
+		return readable;
+	}
+	toString() {
+		return '[object Blob]';
+	}
+	slice() {
+		const size = this.size;
+
+		const start = arguments[0];
+		const end = arguments[1];
+		let relativeStart, relativeEnd;
+		if (start === undefined) {
+			relativeStart = 0;
+		} else if (start < 0) {
+			relativeStart = Math.max(size + start, 0);
+		} else {
+			relativeStart = Math.min(start, size);
+		}
+		if (end === undefined) {
+			relativeEnd = size;
+		} else if (end < 0) {
+			relativeEnd = Math.max(size + end, 0);
+		} else {
+			relativeEnd = Math.min(end, size);
+		}
+		const span = Math.max(relativeEnd - relativeStart, 0);
+
+		const buffer = this[BUFFER];
+		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
+		const blob = new Blob([], { type: arguments[2] });
+		blob[BUFFER] = slicedBuffer;
+		return blob;
+	}
+}
+
+Object.defineProperties(Blob.prototype, {
+	size: { enumerable: true },
+	type: { enumerable: true },
+	slice: { enumerable: true }
+});
+
+Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
+	value: 'Blob',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+/**
+ * fetch-error.js
+ *
+ * FetchError interface for operational errors
+ */
+
+/**
+ * Create FetchError instance
+ *
+ * @param   String      message      Error message for human
+ * @param   String      type         Error type for machine
+ * @param   String      systemError  For Node.js system error
+ * @return  FetchError
+ */
+function FetchError(message, type, systemError) {
+  Error.call(this, message);
+
+  this.message = message;
+  this.type = type;
+
+  // when err.type is `system`, err.code contains system error code
+  if (systemError) {
+    this.code = this.errno = systemError.code;
+  }
+
+  // hide custom error implementation details from end-users
+  Error.captureStackTrace(this, this.constructor);
+}
+
+FetchError.prototype = Object.create(Error.prototype);
+FetchError.prototype.constructor = FetchError;
+FetchError.prototype.name = 'FetchError';
+
+let convert;
+try {
+	convert = require('encoding').convert;
+} catch (e) {}
+
+const INTERNALS = Symbol('Body internals');
+
+// fix an issue where "PassThrough" isn't a named export for node <10
+const PassThrough = Stream.PassThrough;
+
+/**
+ * Body mixin
+ *
+ * Ref: https://fetch.spec.whatwg.org/#body
+ *
+ * @param   Stream  body  Readable stream
+ * @param   Object  opts  Response options
+ * @return  Void
+ */
+function Body(body) {
+	var _this = this;
+
+	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+	    _ref$size = _ref.size;
+
+	let size = _ref$size === undefined ? 0 : _ref$size;
+	var _ref$timeout = _ref.timeout;
+	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
+
+	if (body == null) {
+		// body is undefined or null
+		body = null;
+	} else if (isURLSearchParams(body)) {
+		// body is a URLSearchParams
+		body = Buffer.from(body.toString());
+	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
+		// body is ArrayBuffer
+		body = Buffer.from(body);
+	} else if (ArrayBuffer.isView(body)) {
+		// body is ArrayBufferView
+		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
+	} else if (body instanceof Stream) ; else {
+		// none of the above
+		// coerce to string then buffer
+		body = Buffer.from(String(body));
+	}
+	this[INTERNALS] = {
+		body,
+		disturbed: false,
+		error: null
+	};
+	this.size = size;
+	this.timeout = timeout;
+
+	if (body instanceof Stream) {
+		body.on('error', function (err) {
+			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
+			_this[INTERNALS].error = error;
+		});
+	}
+}
+
+Body.prototype = {
+	get body() {
+		return this[INTERNALS].body;
+	},
+
+	get bodyUsed() {
+		return this[INTERNALS].disturbed;
+	},
+
+	/**
+  * Decode response as ArrayBuffer
+  *
+  * @return  Promise
+  */
+	arrayBuffer() {
+		return consumeBody.call(this).then(function (buf) {
+			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+		});
+	},
+
+	/**
+  * Return raw response as Blob
+  *
+  * @return Promise
+  */
+	blob() {
+		let ct = this.headers && this.headers.get('content-type') || '';
+		return consumeBody.call(this).then(function (buf) {
+			return Object.assign(
+			// Prevent copying
+			new Blob([], {
+				type: ct.toLowerCase()
+			}), {
+				[BUFFER]: buf
+			});
+		});
+	},
+
+	/**
+  * Decode response as json
+  *
+  * @return  Promise
+  */
+	json() {
+		var _this2 = this;
+
+		return consumeBody.call(this).then(function (buffer) {
+			try {
+				return JSON.parse(buffer.toString());
+			} catch (err) {
+				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
+			}
+		});
+	},
+
+	/**
+  * Decode response as text
+  *
+  * @return  Promise
+  */
+	text() {
+		return consumeBody.call(this).then(function (buffer) {
+			return buffer.toString();
+		});
+	},
+
+	/**
+  * Decode response as buffer (non-spec api)
+  *
+  * @return  Promise
+  */
+	buffer() {
+		return consumeBody.call(this);
+	},
+
+	/**
+  * Decode response as text, while automatically detecting the encoding and
+  * trying to decode to UTF-8 (non-spec api)
+  *
+  * @return  Promise
+  */
+	textConverted() {
+		var _this3 = this;
+
+		return consumeBody.call(this).then(function (buffer) {
+			return convertBody(buffer, _this3.headers);
+		});
+	}
+};
+
+// In browsers, all properties are enumerable.
+Object.defineProperties(Body.prototype, {
+	body: { enumerable: true },
+	bodyUsed: { enumerable: true },
+	arrayBuffer: { enumerable: true },
+	blob: { enumerable: true },
+	json: { enumerable: true },
+	text: { enumerable: true }
+});
+
+Body.mixIn = function (proto) {
+	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
+		// istanbul ignore else: future proof
+		if (!(name in proto)) {
+			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
+			Object.defineProperty(proto, name, desc);
+		}
+	}
+};
+
+/**
+ * Consume and convert an entire Body to a Buffer.
+ *
+ * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
+ *
+ * @return  Promise
+ */
+function consumeBody() {
+	var _this4 = this;
+
+	if (this[INTERNALS].disturbed) {
+		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
+	}
+
+	this[INTERNALS].disturbed = true;
+
+	if (this[INTERNALS].error) {
+		return Body.Promise.reject(this[INTERNALS].error);
+	}
+
+	let body = this.body;
+
+	// body is null
+	if (body === null) {
+		return Body.Promise.resolve(Buffer.alloc(0));
+	}
+
+	// body is blob
+	if (isBlob(body)) {
+		body = body.stream();
+	}
+
+	// body is buffer
+	if (Buffer.isBuffer(body)) {
+		return Body.Promise.resolve(body);
+	}
+
+	// istanbul ignore if: should never happen
+	if (!(body instanceof Stream)) {
+		return Body.Promise.resolve(Buffer.alloc(0));
+	}
+
+	// body is stream
+	// get ready to actually consume the body
+	let accum = [];
+	let accumBytes = 0;
+	let abort = false;
+
+	return new Body.Promise(function (resolve, reject) {
+		let resTimeout;
+
+		// allow timeout on slow response body
+		if (_this4.timeout) {
+			resTimeout = setTimeout(function () {
+				abort = true;
+				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
+			}, _this4.timeout);
+		}
+
+		// handle stream errors
+		body.on('error', function (err) {
+			if (err.name === 'AbortError') {
+				// if the request was aborted, reject with this Error
+				abort = true;
+				reject(err);
+			} else {
+				// other errors, such as incorrect content-encoding
+				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
+			}
+		});
+
+		body.on('data', function (chunk) {
+			if (abort || chunk === null) {
+				return;
+			}
+
+			if (_this4.size && accumBytes + chunk.length > _this4.size) {
+				abort = true;
+				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
+				return;
+			}
+
+			accumBytes += chunk.length;
+			accum.push(chunk);
+		});
+
+		body.on('end', function () {
+			if (abort) {
+				return;
+			}
+
+			clearTimeout(resTimeout);
+
+			try {
+				resolve(Buffer.concat(accum, accumBytes));
+			} catch (err) {
+				// handle streams that have accumulated too much data (issue #414)
+				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
+			}
+		});
+	});
+}
+
+/**
+ * Detect buffer encoding and convert to target encoding
+ * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
+ *
+ * @param   Buffer  buffer    Incoming buffer
+ * @param   String  encoding  Target encoding
+ * @return  String
+ */
+function convertBody(buffer, headers) {
+	if (typeof convert !== 'function') {
+		throw new Error('The package `encoding` must be installed to use the textConverted() function');
+	}
+
+	const ct = headers.get('content-type');
+	let charset = 'utf-8';
+	let res, str;
+
+	// header
+	if (ct) {
+		res = /charset=([^;]*)/i.exec(ct);
+	}
+
+	// no charset in content type, peek at response body for at most 1024 bytes
+	str = buffer.slice(0, 1024).toString();
+
+	// html5
+	if (!res && str) {
+		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
+	}
+
+	// html4
+	if (!res && str) {
+		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
+
+		if (res) {
+			res = /charset=(.*)/i.exec(res.pop());
+		}
+	}
+
+	// xml
+	if (!res && str) {
+		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
+	}
+
+	// found charset
+	if (res) {
+		charset = res.pop();
+
+		// prevent decode issues when sites use incorrect encoding
+		// ref: https://hsivonen.fi/encoding-menu/
+		if (charset === 'gb2312' || charset === 'gbk') {
+			charset = 'gb18030';
+		}
+	}
+
+	// turn raw buffers into a single utf-8 buffer
+	return convert(buffer, 'UTF-8', charset).toString();
+}
+
+/**
+ * Detect a URLSearchParams object
+ * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
+ *
+ * @param   Object  obj     Object to detect by type or brand
+ * @return  String
+ */
+function isURLSearchParams(obj) {
+	// Duck-typing as a necessary condition.
+	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
+		return false;
+	}
+
+	// Brand-checking and more duck-typing as optional condition.
+	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
+}
+
+/**
+ * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
+ * @param  {*} obj
+ * @return {boolean}
+ */
+function isBlob(obj) {
+	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
+}
+
+/**
+ * Clone body given Res/Req instance
+ *
+ * @param   Mixed  instance  Response or Request instance
+ * @return  Mixed
+ */
+function clone(instance) {
+	let p1, p2;
+	let body = instance.body;
+
+	// don't allow cloning a used body
+	if (instance.bodyUsed) {
+		throw new Error('cannot clone body after it is used');
+	}
+
+	// check that body is a stream and not form-data object
+	// note: we can't clone the form-data object without having it as a dependency
+	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
+		// tee instance body
+		p1 = new PassThrough();
+		p2 = new PassThrough();
+		body.pipe(p1);
+		body.pipe(p2);
+		// set instance body to teed body and return the other teed body
+		instance[INTERNALS].body = p1;
+		body = p2;
+	}
+
+	return body;
+}
+
+/**
+ * Performs the operation "extract a `Content-Type` value from |object|" as
+ * specified in the specification:
+ * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
+ *
+ * This function assumes that instance.body is present.
+ *
+ * @param   Mixed  instance  Response or Request instance
+ */
+function extractContentType(body) {
+	// istanbul ignore if: Currently, because of a guard in Request, body
+	// can never be null. Included here for completeness.
+	if (body === null) {
+		// body is null
+		return null;
+	} else if (typeof body === 'string') {
+		// body is string
+		return 'text/plain;charset=UTF-8';
+	} else if (isURLSearchParams(body)) {
+		// body is a URLSearchParams
+		return 'application/x-www-form-urlencoded;charset=UTF-8';
+	} else if (isBlob(body)) {
+		// body is blob
+		return body.type || null;
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		return null;
+	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
+		// body is ArrayBuffer
+		return null;
+	} else if (ArrayBuffer.isView(body)) {
+		// body is ArrayBufferView
+		return null;
+	} else if (typeof body.getBoundary === 'function') {
+		// detect form data input from form-data module
+		return `multipart/form-data;boundary=${body.getBoundary()}`;
+	} else if (body instanceof Stream) {
+		// body is stream
+		// can't really do much about this
+		return null;
+	} else {
+		// Body constructor defaults other things to string
+		return 'text/plain;charset=UTF-8';
+	}
+}
+
+/**
+ * The Fetch Standard treats this as if "total bytes" is a property on the body.
+ * For us, we have to explicitly get it with a function.
+ *
+ * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
+ *
+ * @param   Body    instance   Instance of Body
+ * @return  Number?            Number of bytes, or null if not possible
+ */
+function getTotalBytes(instance) {
+	const body = instance.body;
+
+	// istanbul ignore if: included for completion
+
+	if (body === null) {
+		// body is null
+		return 0;
+	} else if (isBlob(body)) {
+		return body.size;
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		return body.length;
+	} else if (body && typeof body.getLengthSync === 'function') {
+		// detect form data input from form-data module
+		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
+		body.hasKnownLength && body.hasKnownLength()) {
+			// 2.x
+			return body.getLengthSync();
+		}
+		return null;
+	} else {
+		// body is stream
+		return instance.size || null;
+	}
+}
+
+/**
+ * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
+ *
+ * @param   Body    instance   Instance of Body
+ * @return  Void
+ */
+function writeToStream(dest, instance) {
+	const body = instance.body;
+
+
+	if (body === null) {
+		// body is null
+		dest.end();
+	} else if (isBlob(body)) {
+		body.stream().pipe(dest);
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		dest.write(body);
+		dest.end();
+	} else {
+		// body is stream
+		body.pipe(dest);
+	}
+}
+
+// expose Promise
+Body.Promise = global.Promise;
+
+/**
+ * headers.js
+ *
+ * Headers class offers convenient helpers
+ */
+
+const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
+const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
+
+function validateName(name) {
+	name = `${name}`;
+	if (invalidTokenRegex.test(name) || name === '') {
+		throw new TypeError(`${name} is not a legal HTTP header name`);
+	}
+}
+
+function validateValue(value) {
+	value = `${value}`;
+	if (invalidHeaderCharRegex.test(value)) {
+		throw new TypeError(`${value} is not a legal HTTP header value`);
+	}
+}
+
+/**
+ * Find the key in the map object given a header name.
+ *
+ * Returns undefined if not found.
+ *
+ * @param   String  name  Header name
+ * @return  String|Undefined
+ */
+function find(map, name) {
+	name = name.toLowerCase();
+	for (const key in map) {
+		if (key.toLowerCase() === name) {
+			return key;
+		}
+	}
+	return undefined;
+}
+
+const MAP = Symbol('map');
+class Headers {
+	/**
+  * Headers class
+  *
+  * @param   Object  headers  Response headers
+  * @return  Void
+  */
+	constructor() {
+		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
+
+		this[MAP] = Object.create(null);
+
+		if (init instanceof Headers) {
+			const rawHeaders = init.raw();
+			const headerNames = Object.keys(rawHeaders);
+
+			for (const headerName of headerNames) {
+				for (const value of rawHeaders[headerName]) {
+					this.append(headerName, value);
+				}
+			}
+
+			return;
+		}
+
+		// We don't worry about converting prop to ByteString here as append()
+		// will handle it.
+		if (init == null) ; else if (typeof init === 'object') {
+			const method = init[Symbol.iterator];
+			if (method != null) {
+				if (typeof method !== 'function') {
+					throw new TypeError('Header pairs must be iterable');
+				}
+
+				// sequence<sequence<ByteString>>
+				// Note: per spec we have to first exhaust the lists then process them
+				const pairs = [];
+				for (const pair of init) {
+					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
+						throw new TypeError('Each header pair must be iterable');
+					}
+					pairs.push(Array.from(pair));
+				}
+
+				for (const pair of pairs) {
+					if (pair.length !== 2) {
+						throw new TypeError('Each header pair must be a name/value tuple');
+					}
+					this.append(pair[0], pair[1]);
+				}
+			} else {
+				// record<ByteString, ByteString>
+				for (const key of Object.keys(init)) {
+					const value = init[key];
+					this.append(key, value);
+				}
+			}
+		} else {
+			throw new TypeError('Provided initializer must be an object');
+		}
+	}
+
+	/**
+  * Return combined header value given name
+  *
+  * @param   String  name  Header name
+  * @return  Mixed
+  */
+	get(name) {
+		name = `${name}`;
+		validateName(name);
+		const key = find(this[MAP], name);
+		if (key === undefined) {
+			return null;
+		}
+
+		return this[MAP][key].join(', ');
+	}
+
+	/**
+  * Iterate over all headers
+  *
+  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
+  * @param   Boolean   thisArg   `this` context for callback function
+  * @return  Void
+  */
+	forEach(callback) {
+		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+
+		let pairs = getHeaders(this);
+		let i = 0;
+		while (i < pairs.length) {
+			var _pairs$i = pairs[i];
+			const name = _pairs$i[0],
+			      value = _pairs$i[1];
+
+			callback.call(thisArg, value, name, this);
+			pairs = getHeaders(this);
+			i++;
+		}
+	}
+
+	/**
+  * Overwrite header values given name
+  *
+  * @param   String  name   Header name
+  * @param   String  value  Header value
+  * @return  Void
+  */
+	set(name, value) {
+		name = `${name}`;
+		value = `${value}`;
+		validateName(name);
+		validateValue(value);
+		const key = find(this[MAP], name);
+		this[MAP][key !== undefined ? key : name] = [value];
+	}
+
+	/**
+  * Append a value onto existing header
+  *
+  * @param   String  name   Header name
+  * @param   String  value  Header value
+  * @return  Void
+  */
+	append(name, value) {
+		name = `${name}`;
+		value = `${value}`;
+		validateName(name);
+		validateValue(value);
+		const key = find(this[MAP], name);
+		if (key !== undefined) {
+			this[MAP][key].push(value);
+		} else {
+			this[MAP][name] = [value];
+		}
+	}
+
+	/**
+  * Check for header name existence
+  *
+  * @param   String   name  Header name
+  * @return  Boolean
+  */
+	has(name) {
+		name = `${name}`;
+		validateName(name);
+		return find(this[MAP], name) !== undefined;
+	}
+
+	/**
+  * Delete all header values given name
+  *
+  * @param   String  name  Header name
+  * @return  Void
+  */
+	delete(name) {
+		name = `${name}`;
+		validateName(name);
+		const key = find(this[MAP], name);
+		if (key !== undefined) {
+			delete this[MAP][key];
+		}
+	}
+
+	/**
+  * Return raw headers (non-spec api)
+  *
+  * @return  Object
+  */
+	raw() {
+		return this[MAP];
+	}
+
+	/**
+  * Get an iterator on keys.
+  *
+  * @return  Iterator
+  */
+	keys() {
+		return createHeadersIterator(this, 'key');
+	}
+
+	/**
+  * Get an iterator on values.
+  *
+  * @return  Iterator
+  */
+	values() {
+		return createHeadersIterator(this, 'value');
+	}
+
+	/**
+  * Get an iterator on entries.
+  *
+  * This is the default iterator of the Headers object.
+  *
+  * @return  Iterator
+  */
+	[Symbol.iterator]() {
+		return createHeadersIterator(this, 'key+value');
+	}
+}
+Headers.prototype.entries = Headers.prototype[Symbol.iterator];
+
+Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
+	value: 'Headers',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+Object.defineProperties(Headers.prototype, {
+	get: { enumerable: true },
+	forEach: { enumerable: true },
+	set: { enumerable: true },
+	append: { enumerable: true },
+	has: { enumerable: true },
+	delete: { enumerable: true },
+	keys: { enumerable: true },
+	values: { enumerable: true },
+	entries: { enumerable: true }
+});
+
+function getHeaders(headers) {
+	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
+
+	const keys = Object.keys(headers[MAP]).sort();
+	return keys.map(kind === 'key' ? function (k) {
+		return k.toLowerCase();
+	} : kind === 'value' ? function (k) {
+		return headers[MAP][k].join(', ');
+	} : function (k) {
+		return [k.toLowerCase(), headers[MAP][k].join(', ')];
+	});
+}
+
+const INTERNAL = Symbol('internal');
+
+function createHeadersIterator(target, kind) {
+	const iterator = Object.create(HeadersIteratorPrototype);
+	iterator[INTERNAL] = {
+		target,
+		kind,
+		index: 0
+	};
+	return iterator;
+}
+
+const HeadersIteratorPrototype = Object.setPrototypeOf({
+	next() {
+		// istanbul ignore if
+		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
+			throw new TypeError('Value of `this` is not a HeadersIterator');
+		}
+
+		var _INTERNAL = this[INTERNAL];
+		const target = _INTERNAL.target,
+		      kind = _INTERNAL.kind,
+		      index = _INTERNAL.index;
+
+		const values = getHeaders(target, kind);
+		const len = values.length;
+		if (index >= len) {
+			return {
+				value: undefined,
+				done: true
+			};
+		}
+
+		this[INTERNAL].index = index + 1;
+
+		return {
+			value: values[index],
+			done: false
+		};
+	}
+}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
+
+Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
+	value: 'HeadersIterator',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+/**
+ * Export the Headers object in a form that Node.js can consume.
+ *
+ * @param   Headers  headers
+ * @return  Object
+ */
+function exportNodeCompatibleHeaders(headers) {
+	const obj = Object.assign({ __proto__: null }, headers[MAP]);
+
+	// http.request() only supports string as Host header. This hack makes
+	// specifying custom Host header possible.
+	const hostHeaderKey = find(headers[MAP], 'Host');
+	if (hostHeaderKey !== undefined) {
+		obj[hostHeaderKey] = obj[hostHeaderKey][0];
+	}
+
+	return obj;
+}
+
+/**
+ * Create a Headers object from an object of headers, ignoring those that do
+ * not conform to HTTP grammar productions.
+ *
+ * @param   Object  obj  Object of headers
+ * @return  Headers
+ */
+function createHeadersLenient(obj) {
+	const headers = new Headers();
+	for (const name of Object.keys(obj)) {
+		if (invalidTokenRegex.test(name)) {
+			continue;
+		}
+		if (Array.isArray(obj[name])) {
+			for (const val of obj[name]) {
+				if (invalidHeaderCharRegex.test(val)) {
+					continue;
+				}
+				if (headers[MAP][name] === undefined) {
+					headers[MAP][name] = [val];
+				} else {
+					headers[MAP][name].push(val);
+				}
+			}
+		} else if (!invalidHeaderCharRegex.test(obj[name])) {
+			headers[MAP][name] = [obj[name]];
+		}
+	}
+	return headers;
+}
+
+const INTERNALS$1 = Symbol('Response internals');
+
+// fix an issue where "STATUS_CODES" aren't a named export for node <10
+const STATUS_CODES = http.STATUS_CODES;
+
+/**
+ * Response class
+ *
+ * @param   Stream  body  Readable stream
+ * @param   Object  opts  Response options
+ * @return  Void
+ */
+class Response {
+	constructor() {
+		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+		Body.call(this, body, opts);
+
+		const status = opts.status || 200;
+		const headers = new Headers(opts.headers);
+
+		if (body != null && !headers.has('Content-Type')) {
+			const contentType = extractContentType(body);
+			if (contentType) {
+				headers.append('Content-Type', contentType);
+			}
+		}
+
+		this[INTERNALS$1] = {
+			url: opts.url,
+			status,
+			statusText: opts.statusText || STATUS_CODES[status],
+			headers,
+			counter: opts.counter
+		};
+	}
+
+	get url() {
+		return this[INTERNALS$1].url;
+	}
+
+	get status() {
+		return this[INTERNALS$1].status;
+	}
+
+	/**
+  * Convenience property representing if the request ended normally
+  */
+	get ok() {
+		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
+	}
+
+	get redirected() {
+		return this[INTERNALS$1].counter > 0;
+	}
+
+	get statusText() {
+		return this[INTERNALS$1].statusText;
+	}
+
+	get headers() {
+		return this[INTERNALS$1].headers;
+	}
+
+	/**
+  * Clone this response
+  *
+  * @return  Response
+  */
+	clone() {
+		return new Response(clone(this), {
+			url: this.url,
+			status: this.status,
+			statusText: this.statusText,
+			headers: this.headers,
+			ok: this.ok,
+			redirected: this.redirected
+		});
+	}
+}
+
+Body.mixIn(Response.prototype);
+
+Object.defineProperties(Response.prototype, {
+	url: { enumerable: true },
+	status: { enumerable: true },
+	ok: { enumerable: true },
+	redirected: { enumerable: true },
+	statusText: { enumerable: true },
+	headers: { enumerable: true },
+	clone: { enumerable: true }
+});
+
+Object.defineProperty(Response.prototype, Symbol.toStringTag, {
+	value: 'Response',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+const INTERNALS$2 = Symbol('Request internals');
+
+// fix an issue where "format", "parse" aren't a named export for node <10
+const parse_url = Url.parse;
+const format_url = Url.format;
+
+const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
+
+/**
+ * Check if a value is an instance of Request.
+ *
+ * @param   Mixed   input
+ * @return  Boolean
+ */
+function isRequest(input) {
+	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
+}
+
+function isAbortSignal(signal) {
+	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
+	return !!(proto && proto.constructor.name === 'AbortSignal');
+}
+
+/**
+ * Request class
+ *
+ * @param   Mixed   input  Url or Request instance
+ * @param   Object  init   Custom options
+ * @return  Void
+ */
+class Request {
+	constructor(input) {
+		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+		let parsedURL;
+
+		// normalize input
+		if (!isRequest(input)) {
+			if (input && input.href) {
+				// in order to support Node.js' Url objects; though WHATWG's URL objects
+				// will fall into this branch also (since their `toString()` will return
+				// `href` property anyway)
+				parsedURL = parse_url(input.href);
+			} else {
+				// coerce input to a string before attempting to parse
+				parsedURL = parse_url(`${input}`);
+			}
+			input = {};
+		} else {
+			parsedURL = parse_url(input.url);
+		}
+
+		let method = init.method || input.method || 'GET';
+		method = method.toUpperCase();
+
+		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
+			throw new TypeError('Request with GET/HEAD method cannot have body');
+		}
+
+		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
+
+		Body.call(this, inputBody, {
+			timeout: init.timeout || input.timeout || 0,
+			size: init.size || input.size || 0
+		});
+
+		const headers = new Headers(init.headers || input.headers || {});
+
+		if (inputBody != null && !headers.has('Content-Type')) {
+			const contentType = extractContentType(inputBody);
+			if (contentType) {
+				headers.append('Content-Type', contentType);
+			}
+		}
+
+		let signal = isRequest(input) ? input.signal : null;
+		if ('signal' in init) signal = init.signal;
+
+		if (signal != null && !isAbortSignal(signal)) {
+			throw new TypeError('Expected signal to be an instanceof AbortSignal');
+		}
+
+		this[INTERNALS$2] = {
+			method,
+			redirect: init.redirect || input.redirect || 'follow',
+			headers,
+			parsedURL,
+			signal
+		};
+
+		// node-fetch-only options
+		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
+		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
+		this.counter = init.counter || input.counter || 0;
+		this.agent = init.agent || input.agent;
+	}
+
+	get method() {
+		return this[INTERNALS$2].method;
+	}
+
+	get url() {
+		return format_url(this[INTERNALS$2].parsedURL);
+	}
+
+	get headers() {
+		return this[INTERNALS$2].headers;
+	}
+
+	get redirect() {
+		return this[INTERNALS$2].redirect;
+	}
+
+	get signal() {
+		return this[INTERNALS$2].signal;
+	}
+
+	/**
+  * Clone this request
+  *
+  * @return  Request
+  */
+	clone() {
+		return new Request(this);
+	}
+}
+
+Body.mixIn(Request.prototype);
+
+Object.defineProperty(Request.prototype, Symbol.toStringTag, {
+	value: 'Request',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+Object.defineProperties(Request.prototype, {
+	method: { enumerable: true },
+	url: { enumerable: true },
+	headers: { enumerable: true },
+	redirect: { enumerable: true },
+	clone: { enumerable: true },
+	signal: { enumerable: true }
+});
+
+/**
+ * Convert a Request to Node.js http request options.
+ *
+ * @param   Request  A Request instance
+ * @return  Object   The options object to be passed to http.request
+ */
+function getNodeRequestOptions(request) {
+	const parsedURL = request[INTERNALS$2].parsedURL;
+	const headers = new Headers(request[INTERNALS$2].headers);
+
+	// fetch step 1.3
+	if (!headers.has('Accept')) {
+		headers.set('Accept', '*/*');
+	}
+
+	// Basic fetch
+	if (!parsedURL.protocol || !parsedURL.hostname) {
+		throw new TypeError('Only absolute URLs are supported');
+	}
+
+	if (!/^https?:$/.test(parsedURL.protocol)) {
+		throw new TypeError('Only HTTP(S) protocols are supported');
+	}
+
+	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
+		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
+	}
+
+	// HTTP-network-or-cache fetch steps 2.4-2.7
+	let contentLengthValue = null;
+	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
+		contentLengthValue = '0';
+	}
+	if (request.body != null) {
+		const totalBytes = getTotalBytes(request);
+		if (typeof totalBytes === 'number') {
+			contentLengthValue = String(totalBytes);
+		}
+	}
+	if (contentLengthValue) {
+		headers.set('Content-Length', contentLengthValue);
+	}
+
+	// HTTP-network-or-cache fetch step 2.11
+	if (!headers.has('User-Agent')) {
+		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
+	}
+
+	// HTTP-network-or-cache fetch step 2.15
+	if (request.compress && !headers.has('Accept-Encoding')) {
+		headers.set('Accept-Encoding', 'gzip,deflate');
+	}
+
+	if (!headers.has('Connection') && !request.agent) {
+		headers.set('Connection', 'close');
+	}
+
+	// HTTP-network fetch step 4.2
+	// chunked encoding is handled by Node.js
+
+	return Object.assign({}, parsedURL, {
+		method: request.method,
+		headers: exportNodeCompatibleHeaders(headers),
+		agent: request.agent
+	});
+}
+
+/**
+ * abort-error.js
+ *
+ * AbortError interface for cancelled requests
+ */
+
+/**
+ * Create AbortError instance
+ *
+ * @param   String      message      Error message for human
+ * @return  AbortError
+ */
+function AbortError(message) {
+  Error.call(this, message);
+
+  this.type = 'aborted';
+  this.message = message;
+
+  // hide custom error implementation details from end-users
+  Error.captureStackTrace(this, this.constructor);
+}
+
+AbortError.prototype = Object.create(Error.prototype);
+AbortError.prototype.constructor = AbortError;
+AbortError.prototype.name = 'AbortError';
+
+// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
+const PassThrough$1 = Stream.PassThrough;
+const resolve_url = Url.resolve;
+
+/**
+ * Fetch function
+ *
+ * @param   Mixed    url   Absolute url or Request instance
+ * @param   Object   opts  Fetch options
+ * @return  Promise
+ */
+function fetch(url, opts) {
+
+	// allow custom promise
+	if (!fetch.Promise) {
+		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
+	}
+
+	Body.Promise = fetch.Promise;
+
+	// wrap http.request into fetch
+	return new fetch.Promise(function (resolve, reject) {
+		// build request object
+		const request = new Request(url, opts);
+		const options = getNodeRequestOptions(request);
+
+		const send = (options.protocol === 'https:' ? https : http).request;
+		const signal = request.signal;
+
+		let response = null;
+
+		const abort = function abort() {
+			let error = new AbortError('The user aborted a request.');
+			reject(error);
+			if (request.body && request.body instanceof Stream.Readable) {
+				request.body.destroy(error);
+			}
+			if (!response || !response.body) return;
+			response.body.emit('error', error);
+		};
+
+		if (signal && signal.aborted) {
+			abort();
+			return;
+		}
+
+		const abortAndFinalize = function abortAndFinalize() {
+			abort();
+			finalize();
+		};
+
+		// send request
+		const req = send(options);
+		let reqTimeout;
+
+		if (signal) {
+			signal.addEventListener('abort', abortAndFinalize);
+		}
+
+		function finalize() {
+			req.abort();
+			if (signal) signal.removeEventListener('abort', abortAndFinalize);
+			clearTimeout(reqTimeout);
+		}
+
+		if (request.timeout) {
+			req.once('socket', function (socket) {
+				reqTimeout = setTimeout(function () {
+					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
+					finalize();
+				}, request.timeout);
+			});
+		}
+
+		req.on('error', function (err) {
+			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
+			finalize();
+		});
+
+		req.on('response', function (res) {
+			clearTimeout(reqTimeout);
+
+			const headers = createHeadersLenient(res.headers);
+
+			// HTTP fetch step 5
+			if (fetch.isRedirect(res.statusCode)) {
+				// HTTP fetch step 5.2
+				const location = headers.get('Location');
+
+				// HTTP fetch step 5.3
+				const locationURL = location === null ? null : resolve_url(request.url, location);
+
+				// HTTP fetch step 5.5
+				switch (request.redirect) {
+					case 'error':
+						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
+						finalize();
+						return;
+					case 'manual':
+						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
+						if (locationURL !== null) {
+							// handle corrupted header
+							try {
+								headers.set('Location', locationURL);
+							} catch (err) {
+								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
+								reject(err);
+							}
+						}
+						break;
+					case 'follow':
+						// HTTP-redirect fetch step 2
+						if (locationURL === null) {
+							break;
+						}
+
+						// HTTP-redirect fetch step 5
+						if (request.counter >= request.follow) {
+							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
+							finalize();
+							return;
+						}
+
+						// HTTP-redirect fetch step 6 (counter increment)
+						// Create a new Request object.
+						const requestOpts = {
+							headers: new Headers(request.headers),
+							follow: request.follow,
+							counter: request.counter + 1,
+							agent: request.agent,
+							compress: request.compress,
+							method: request.method,
+							body: request.body,
+							signal: request.signal,
+							timeout: request.timeout
+						};
+
+						// HTTP-redirect fetch step 9
+						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
+							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
+							finalize();
+							return;
+						}
+
+						// HTTP-redirect fetch step 11
+						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
+							requestOpts.method = 'GET';
+							requestOpts.body = undefined;
+							requestOpts.headers.delete('content-length');
+						}
+
+						// HTTP-redirect fetch step 15
+						resolve(fetch(new Request(locationURL, requestOpts)));
+						finalize();
+						return;
+				}
+			}
+
+			// prepare response
+			res.once('end', function () {
+				if (signal) signal.removeEventListener('abort', abortAndFinalize);
+			});
+			let body = res.pipe(new PassThrough$1());
+
+			const response_options = {
+				url: request.url,
+				status: res.statusCode,
+				statusText: res.statusMessage,
+				headers: headers,
+				size: request.size,
+				timeout: request.timeout,
+				counter: request.counter
+			};
+
+			// HTTP-network fetch step 12.1.1.3
+			const codings = headers.get('Content-Encoding');
+
+			// HTTP-network fetch step 12.1.1.4: handle content codings
+
+			// in following scenarios we ignore compression support
+			// 1. compression support is disabled
+			// 2. HEAD request
+			// 3. no Content-Encoding header
+			// 4. no content response (204)
+			// 5. content not modified response (304)
+			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// For Node v6+
+			// Be less strict when decoding compressed responses, since sometimes
+			// servers send slightly invalid responses that are still accepted
+			// by common browsers.
+			// Always using Z_SYNC_FLUSH is what cURL does.
+			const zlibOptions = {
+				flush: zlib.Z_SYNC_FLUSH,
+				finishFlush: zlib.Z_SYNC_FLUSH
+			};
+
+			// for gzip
+			if (codings == 'gzip' || codings == 'x-gzip') {
+				body = body.pipe(zlib.createGunzip(zlibOptions));
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// for deflate
+			if (codings == 'deflate' || codings == 'x-deflate') {
+				// handle the infamous raw deflate response from old servers
+				// a hack for old IIS and Apache servers
+				const raw = res.pipe(new PassThrough$1());
+				raw.once('data', function (chunk) {
+					// see http://stackoverflow.com/questions/37519828
+					if ((chunk[0] & 0x0F) === 0x08) {
+						body = body.pipe(zlib.createInflate());
+					} else {
+						body = body.pipe(zlib.createInflateRaw());
+					}
+					response = new Response(body, response_options);
+					resolve(response);
+				});
+				return;
+			}
+
+			// for br
+			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
+				body = body.pipe(zlib.createBrotliDecompress());
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// otherwise, use response as-is
+			response = new Response(body, response_options);
+			resolve(response);
+		});
+
+		writeToStream(req, request);
+	});
+}
+/**
+ * Redirect code matching
+ *
+ * @param   Number   code  Status code
+ * @return  Boolean
+ */
+fetch.isRedirect = function (code) {
+	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
+};
+
+// expose Promise
+fetch.Promise = global.Promise;
+
+export default fetch;
+export { Headers, Request, Response, FetchError };
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.js b/scripts/metrics/node_modules/node-fetch/lib/index.js
new file mode 100644
index 00000000000..86c7c031229
--- /dev/null
+++ b/scripts/metrics/node_modules/node-fetch/lib/index.js
@@ -0,0 +1,1640 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var Stream = _interopDefault(require('stream'));
+var http = _interopDefault(require('http'));
+var Url = _interopDefault(require('url'));
+var https = _interopDefault(require('https'));
+var zlib = _interopDefault(require('zlib'));
+
+// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
+
+// fix for "Readable" isn't a named export issue
+const Readable = Stream.Readable;
+
+const BUFFER = Symbol('buffer');
+const TYPE = Symbol('type');
+
+class Blob {
+	constructor() {
+		this[TYPE] = '';
+
+		const blobParts = arguments[0];
+		const options = arguments[1];
+
+		const buffers = [];
+		let size = 0;
+
+		if (blobParts) {
+			const a = blobParts;
+			const length = Number(a.length);
+			for (let i = 0; i < length; i++) {
+				const element = a[i];
+				let buffer;
+				if (element instanceof Buffer) {
+					buffer = element;
+				} else if (ArrayBuffer.isView(element)) {
+					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
+				} else if (element instanceof ArrayBuffer) {
+					buffer = Buffer.from(element);
+				} else if (element instanceof Blob) {
+					buffer = element[BUFFER];
+				} else {
+					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
+				}
+				size += buffer.length;
+				buffers.push(buffer);
+			}
+		}
+
+		this[BUFFER] = Buffer.concat(buffers);
+
+		let type = options && options.type !== undefined && String(options.type).toLowerCase();
+		if (type && !/[^\u0020-\u007E]/.test(type)) {
+			this[TYPE] = type;
+		}
+	}
+	get size() {
+		return this[BUFFER].length;
+	}
+	get type() {
+		return this[TYPE];
+	}
+	text() {
+		return Promise.resolve(this[BUFFER].toString());
+	}
+	arrayBuffer() {
+		const buf = this[BUFFER];
+		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+		return Promise.resolve(ab);
+	}
+	stream() {
+		const readable = new Readable();
+		readable._read = function () {};
+		readable.push(this[BUFFER]);
+		readable.push(null);
+		return readable;
+	}
+	toString() {
+		return '[object Blob]';
+	}
+	slice() {
+		const size = this.size;
+
+		const start = arguments[0];
+		const end = arguments[1];
+		let relativeStart, relativeEnd;
+		if (start === undefined) {
+			relativeStart = 0;
+		} else if (start < 0) {
+			relativeStart = Math.max(size + start, 0);
+		} else {
+			relativeStart = Math.min(start, size);
+		}
+		if (end === undefined) {
+			relativeEnd = size;
+		} else if (end < 0) {
+			relativeEnd = Math.max(size + end, 0);
+		} else {
+			relativeEnd = Math.min(end, size);
+		}
+		const span = Math.max(relativeEnd - relativeStart, 0);
+
+		const buffer = this[BUFFER];
+		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
+		const blob = new Blob([], { type: arguments[2] });
+		blob[BUFFER] = slicedBuffer;
+		return blob;
+	}
+}
+
+Object.defineProperties(Blob.prototype, {
+	size: { enumerable: true },
+	type: { enumerable: true },
+	slice: { enumerable: true }
+});
+
+Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
+	value: 'Blob',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+/**
+ * fetch-error.js
+ *
+ * FetchError interface for operational errors
+ */
+
+/**
+ * Create FetchError instance
+ *
+ * @param   String      message      Error message for human
+ * @param   String      type         Error type for machine
+ * @param   String      systemError  For Node.js system error
+ * @return  FetchError
+ */
+function FetchError(message, type, systemError) {
+  Error.call(this, message);
+
+  this.message = message;
+  this.type = type;
+
+  // when err.type is `system`, err.code contains system error code
+  if (systemError) {
+    this.code = this.errno = systemError.code;
+  }
+
+  // hide custom error implementation details from end-users
+  Error.captureStackTrace(this, this.constructor);
+}
+
+FetchError.prototype = Object.create(Error.prototype);
+FetchError.prototype.constructor = FetchError;
+FetchError.prototype.name = 'FetchError';
+
+let convert;
+try {
+	convert = require('encoding').convert;
+} catch (e) {}
+
+const INTERNALS = Symbol('Body internals');
+
+// fix an issue where "PassThrough" isn't a named export for node <10
+const PassThrough = Stream.PassThrough;
+
+/**
+ * Body mixin
+ *
+ * Ref: https://fetch.spec.whatwg.org/#body
+ *
+ * @param   Stream  body  Readable stream
+ * @param   Object  opts  Response options
+ * @return  Void
+ */
+function Body(body) {
+	var _this = this;
+
+	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+	    _ref$size = _ref.size;
+
+	let size = _ref$size === undefined ? 0 : _ref$size;
+	var _ref$timeout = _ref.timeout;
+	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
+
+	if (body == null) {
+		// body is undefined or null
+		body = null;
+	} else if (isURLSearchParams(body)) {
+		// body is a URLSearchParams
+		body = Buffer.from(body.toString());
+	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
+		// body is ArrayBuffer
+		body = Buffer.from(body);
+	} else if (ArrayBuffer.isView(body)) {
+		// body is ArrayBufferView
+		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
+	} else if (body instanceof Stream) ; else {
+		// none of the above
+		// coerce to string then buffer
+		body = Buffer.from(String(body));
+	}
+	this[INTERNALS] = {
+		body,
+		disturbed: false,
+		error: null
+	};
+	this.size = size;
+	this.timeout = timeout;
+
+	if (body instanceof Stream) {
+		body.on('error', function (err) {
+			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
+			_this[INTERNALS].error = error;
+		});
+	}
+}
+
+Body.prototype = {
+	get body() {
+		return this[INTERNALS].body;
+	},
+
+	get bodyUsed() {
+		return this[INTERNALS].disturbed;
+	},
+
+	/**
+  * Decode response as ArrayBuffer
+  *
+  * @return  Promise
+  */
+	arrayBuffer() {
+		return consumeBody.call(this).then(function (buf) {
+			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+		});
+	},
+
+	/**
+  * Return raw response as Blob
+  *
+  * @return Promise
+  */
+	blob() {
+		let ct = this.headers && this.headers.get('content-type') || '';
+		return consumeBody.call(this).then(function (buf) {
+			return Object.assign(
+			// Prevent copying
+			new Blob([], {
+				type: ct.toLowerCase()
+			}), {
+				[BUFFER]: buf
+			});
+		});
+	},
+
+	/**
+  * Decode response as json
+  *
+  * @return  Promise
+  */
+	json() {
+		var _this2 = this;
+
+		return consumeBody.call(this).then(function (buffer) {
+			try {
+				return JSON.parse(buffer.toString());
+			} catch (err) {
+				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
+			}
+		});
+	},
+
+	/**
+  * Decode response as text
+  *
+  * @return  Promise
+  */
+	text() {
+		return consumeBody.call(this).then(function (buffer) {
+			return buffer.toString();
+		});
+	},
+
+	/**
+  * Decode response as buffer (non-spec api)
+  *
+  * @return  Promise
+  */
+	buffer() {
+		return consumeBody.call(this);
+	},
+
+	/**
+  * Decode response as text, while automatically detecting the encoding and
+  * trying to decode to UTF-8 (non-spec api)
+  *
+  * @return  Promise
+  */
+	textConverted() {
+		var _this3 = this;
+
+		return consumeBody.call(this).then(function (buffer) {
+			return convertBody(buffer, _this3.headers);
+		});
+	}
+};
+
+// In browsers, all properties are enumerable.
+Object.defineProperties(Body.prototype, {
+	body: { enumerable: true },
+	bodyUsed: { enumerable: true },
+	arrayBuffer: { enumerable: true },
+	blob: { enumerable: true },
+	json: { enumerable: true },
+	text: { enumerable: true }
+});
+
+Body.mixIn = function (proto) {
+	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
+		// istanbul ignore else: future proof
+		if (!(name in proto)) {
+			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
+			Object.defineProperty(proto, name, desc);
+		}
+	}
+};
+
+/**
+ * Consume and convert an entire Body to a Buffer.
+ *
+ * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
+ *
+ * @return  Promise
+ */
+function consumeBody() {
+	var _this4 = this;
+
+	if (this[INTERNALS].disturbed) {
+		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
+	}
+
+	this[INTERNALS].disturbed = true;
+
+	if (this[INTERNALS].error) {
+		return Body.Promise.reject(this[INTERNALS].error);
+	}
+
+	let body = this.body;
+
+	// body is null
+	if (body === null) {
+		return Body.Promise.resolve(Buffer.alloc(0));
+	}
+
+	// body is blob
+	if (isBlob(body)) {
+		body = body.stream();
+	}
+
+	// body is buffer
+	if (Buffer.isBuffer(body)) {
+		return Body.Promise.resolve(body);
+	}
+
+	// istanbul ignore if: should never happen
+	if (!(body instanceof Stream)) {
+		return Body.Promise.resolve(Buffer.alloc(0));
+	}
+
+	// body is stream
+	// get ready to actually consume the body
+	let accum = [];
+	let accumBytes = 0;
+	let abort = false;
+
+	return new Body.Promise(function (resolve, reject) {
+		let resTimeout;
+
+		// allow timeout on slow response body
+		if (_this4.timeout) {
+			resTimeout = setTimeout(function () {
+				abort = true;
+				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
+			}, _this4.timeout);
+		}
+
+		// handle stream errors
+		body.on('error', function (err) {
+			if (err.name === 'AbortError') {
+				// if the request was aborted, reject with this Error
+				abort = true;
+				reject(err);
+			} else {
+				// other errors, such as incorrect content-encoding
+				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
+			}
+		});
+
+		body.on('data', function (chunk) {
+			if (abort || chunk === null) {
+				return;
+			}
+
+			if (_this4.size && accumBytes + chunk.length > _this4.size) {
+				abort = true;
+				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
+				return;
+			}
+
+			accumBytes += chunk.length;
+			accum.push(chunk);
+		});
+
+		body.on('end', function () {
+			if (abort) {
+				return;
+			}
+
+			clearTimeout(resTimeout);
+
+			try {
+				resolve(Buffer.concat(accum, accumBytes));
+			} catch (err) {
+				// handle streams that have accumulated too much data (issue #414)
+				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
+			}
+		});
+	});
+}
+
+/**
+ * Detect buffer encoding and convert to target encoding
+ * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
+ *
+ * @param   Buffer  buffer    Incoming buffer
+ * @param   String  encoding  Target encoding
+ * @return  String
+ */
+function convertBody(buffer, headers) {
+	if (typeof convert !== 'function') {
+		throw new Error('The package `encoding` must be installed to use the textConverted() function');
+	}
+
+	const ct = headers.get('content-type');
+	let charset = 'utf-8';
+	let res, str;
+
+	// header
+	if (ct) {
+		res = /charset=([^;]*)/i.exec(ct);
+	}
+
+	// no charset in content type, peek at response body for at most 1024 bytes
+	str = buffer.slice(0, 1024).toString();
+
+	// html5
+	if (!res && str) {
+		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
+	}
+
+	// html4
+	if (!res && str) {
+		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
+
+		if (res) {
+			res = /charset=(.*)/i.exec(res.pop());
+		}
+	}
+
+	// xml
+	if (!res && str) {
+		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
+	}
+
+	// found charset
+	if (res) {
+		charset = res.pop();
+
+		// prevent decode issues when sites use incorrect encoding
+		// ref: https://hsivonen.fi/encoding-menu/
+		if (charset === 'gb2312' || charset === 'gbk') {
+			charset = 'gb18030';
+		}
+	}
+
+	// turn raw buffers into a single utf-8 buffer
+	return convert(buffer, 'UTF-8', charset).toString();
+}
+
+/**
+ * Detect a URLSearchParams object
+ * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
+ *
+ * @param   Object  obj     Object to detect by type or brand
+ * @return  String
+ */
+function isURLSearchParams(obj) {
+	// Duck-typing as a necessary condition.
+	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
+		return false;
+	}
+
+	// Brand-checking and more duck-typing as optional condition.
+	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
+}
+
+/**
+ * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
+ * @param  {*} obj
+ * @return {boolean}
+ */
+function isBlob(obj) {
+	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
+}
+
+/**
+ * Clone body given Res/Req instance
+ *
+ * @param   Mixed  instance  Response or Request instance
+ * @return  Mixed
+ */
+function clone(instance) {
+	let p1, p2;
+	let body = instance.body;
+
+	// don't allow cloning a used body
+	if (instance.bodyUsed) {
+		throw new Error('cannot clone body after it is used');
+	}
+
+	// check that body is a stream and not form-data object
+	// note: we can't clone the form-data object without having it as a dependency
+	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
+		// tee instance body
+		p1 = new PassThrough();
+		p2 = new PassThrough();
+		body.pipe(p1);
+		body.pipe(p2);
+		// set instance body to teed body and return the other teed body
+		instance[INTERNALS].body = p1;
+		body = p2;
+	}
+
+	return body;
+}
+
+/**
+ * Performs the operation "extract a `Content-Type` value from |object|" as
+ * specified in the specification:
+ * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
+ *
+ * This function assumes that instance.body is present.
+ *
+ * @param   Mixed  instance  Response or Request instance
+ */
+function extractContentType(body) {
+	// istanbul ignore if: Currently, because of a guard in Request, body
+	// can never be null. Included here for completeness.
+	if (body === null) {
+		// body is null
+		return null;
+	} else if (typeof body === 'string') {
+		// body is string
+		return 'text/plain;charset=UTF-8';
+	} else if (isURLSearchParams(body)) {
+		// body is a URLSearchParams
+		return 'application/x-www-form-urlencoded;charset=UTF-8';
+	} else if (isBlob(body)) {
+		// body is blob
+		return body.type || null;
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		return null;
+	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
+		// body is ArrayBuffer
+		return null;
+	} else if (ArrayBuffer.isView(body)) {
+		// body is ArrayBufferView
+		return null;
+	} else if (typeof body.getBoundary === 'function') {
+		// detect form data input from form-data module
+		return `multipart/form-data;boundary=${body.getBoundary()}`;
+	} else if (body instanceof Stream) {
+		// body is stream
+		// can't really do much about this
+		return null;
+	} else {
+		// Body constructor defaults other things to string
+		return 'text/plain;charset=UTF-8';
+	}
+}
+
+/**
+ * The Fetch Standard treats this as if "total bytes" is a property on the body.
+ * For us, we have to explicitly get it with a function.
+ *
+ * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
+ *
+ * @param   Body    instance   Instance of Body
+ * @return  Number?            Number of bytes, or null if not possible
+ */
+function getTotalBytes(instance) {
+	const body = instance.body;
+
+	// istanbul ignore if: included for completion
+
+	if (body === null) {
+		// body is null
+		return 0;
+	} else if (isBlob(body)) {
+		return body.size;
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		return body.length;
+	} else if (body && typeof body.getLengthSync === 'function') {
+		// detect form data input from form-data module
+		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
+		body.hasKnownLength && body.hasKnownLength()) {
+			// 2.x
+			return body.getLengthSync();
+		}
+		return null;
+	} else {
+		// body is stream
+		return instance.size || null;
+	}
+}
+
+/**
+ * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
+ *
+ * @param   Body    instance   Instance of Body
+ * @return  Void
+ */
+function writeToStream(dest, instance) {
+	const body = instance.body;
+
+
+	if (body === null) {
+		// body is null
+		dest.end();
+	} else if (isBlob(body)) {
+		body.stream().pipe(dest);
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		dest.write(body);
+		dest.end();
+	} else {
+		// body is stream
+		body.pipe(dest);
+	}
+}
+
+// expose Promise
+Body.Promise = global.Promise;
+
+/**
+ * headers.js
+ *
+ * Headers class offers convenient helpers
+ */
+
+const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
+const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
+
+function validateName(name) {
+	name = `${name}`;
+	if (invalidTokenRegex.test(name) || name === '') {
+		throw new TypeError(`${name} is not a legal HTTP header name`);
+	}
+}
+
+function validateValue(value) {
+	value = `${value}`;
+	if (invalidHeaderCharRegex.test(value)) {
+		throw new TypeError(`${value} is not a legal HTTP header value`);
+	}
+}
+
+/**
+ * Find the key in the map object given a header name.
+ *
+ * Returns undefined if not found.
+ *
+ * @param   String  name  Header name
+ * @return  String|Undefined
+ */
+function find(map, name) {
+	name = name.toLowerCase();
+	for (const key in map) {
+		if (key.toLowerCase() === name) {
+			return key;
+		}
+	}
+	return undefined;
+}
+
+const MAP = Symbol('map');
+class Headers {
+	/**
+  * Headers class
+  *
+  * @param   Object  headers  Response headers
+  * @return  Void
+  */
+	constructor() {
+		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
+
+		this[MAP] = Object.create(null);
+
+		if (init instanceof Headers) {
+			const rawHeaders = init.raw();
+			const headerNames = Object.keys(rawHeaders);
+
+			for (const headerName of headerNames) {
+				for (const value of rawHeaders[headerName]) {
+					this.append(headerName, value);
+				}
+			}
+
+			return;
+		}
+
+		// We don't worry about converting prop to ByteString here as append()
+		// will handle it.
+		if (init == null) ; else if (typeof init === 'object') {
+			const method = init[Symbol.iterator];
+			if (method != null) {
+				if (typeof method !== 'function') {
+					throw new TypeError('Header pairs must be iterable');
+				}
+
+				// sequence<sequence<ByteString>>
+				// Note: per spec we have to first exhaust the lists then process them
+				const pairs = [];
+				for (const pair of init) {
+					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
+						throw new TypeError('Each header pair must be iterable');
+					}
+					pairs.push(Array.from(pair));
+				}
+
+				for (const pair of pairs) {
+					if (pair.length !== 2) {
+						throw new TypeError('Each header pair must be a name/value tuple');
+					}
+					this.append(pair[0], pair[1]);
+				}
+			} else {
+				// record<ByteString, ByteString>
+				for (const key of Object.keys(init)) {
+					const value = init[key];
+					this.append(key, value);
+				}
+			}
+		} else {
+			throw new TypeError('Provided initializer must be an object');
+		}
+	}
+
+	/**
+  * Return combined header value given name
+  *
+  * @param   String  name  Header name
+  * @return  Mixed
+  */
+	get(name) {
+		name = `${name}`;
+		validateName(name);
+		const key = find(this[MAP], name);
+		if (key === undefined) {
+			return null;
+		}
+
+		return this[MAP][key].join(', ');
+	}
+
+	/**
+  * Iterate over all headers
+  *
+  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
+  * @param   Boolean   thisArg   `this` context for callback function
+  * @return  Void
+  */
+	forEach(callback) {
+		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+
+		let pairs = getHeaders(this);
+		let i = 0;
+		while (i < pairs.length) {
+			var _pairs$i = pairs[i];
+			const name = _pairs$i[0],
+			      value = _pairs$i[1];
+
+			callback.call(thisArg, value, name, this);
+			pairs = getHeaders(this);
+			i++;
+		}
+	}
+
+	/**
+  * Overwrite header values given name
+  *
+  * @param   String  name   Header name
+  * @param   String  value  Header value
+  * @return  Void
+  */
+	set(name, value) {
+		name = `${name}`;
+		value = `${value}`;
+		validateName(name);
+		validateValue(value);
+		const key = find(this[MAP], name);
+		this[MAP][key !== undefined ? key : name] = [value];
+	}
+
+	/**
+  * Append a value onto existing header
+  *
+  * @param   String  name   Header name
+  * @param   String  value  Header value
+  * @return  Void
+  */
+	append(name, value) {
+		name = `${name}`;
+		value = `${value}`;
+		validateName(name);
+		validateValue(value);
+		const key = find(this[MAP], name);
+		if (key !== undefined) {
+			this[MAP][key].push(value);
+		} else {
+			this[MAP][name] = [value];
+		}
+	}
+
+	/**
+  * Check for header name existence
+  *
+  * @param   String   name  Header name
+  * @return  Boolean
+  */
+	has(name) {
+		name = `${name}`;
+		validateName(name);
+		return find(this[MAP], name) !== undefined;
+	}
+
+	/**
+  * Delete all header values given name
+  *
+  * @param   String  name  Header name
+  * @return  Void
+  */
+	delete(name) {
+		name = `${name}`;
+		validateName(name);
+		const key = find(this[MAP], name);
+		if (key !== undefined) {
+			delete this[MAP][key];
+		}
+	}
+
+	/**
+  * Return raw headers (non-spec api)
+  *
+  * @return  Object
+  */
+	raw() {
+		return this[MAP];
+	}
+
+	/**
+  * Get an iterator on keys.
+  *
+  * @return  Iterator
+  */
+	keys() {
+		return createHeadersIterator(this, 'key');
+	}
+
+	/**
+  * Get an iterator on values.
+  *
+  * @return  Iterator
+  */
+	values() {
+		return createHeadersIterator(this, 'value');
+	}
+
+	/**
+  * Get an iterator on entries.
+  *
+  * This is the default iterator of the Headers object.
+  *
+  * @return  Iterator
+  */
+	[Symbol.iterator]() {
+		return createHeadersIterator(this, 'key+value');
+	}
+}
+Headers.prototype.entries = Headers.prototype[Symbol.iterator];
+
+Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
+	value: 'Headers',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+Object.defineProperties(Headers.prototype, {
+	get: { enumerable: true },
+	forEach: { enumerable: true },
+	set: { enumerable: true },
+	append: { enumerable: true },
+	has: { enumerable: true },
+	delete: { enumerable: true },
+	keys: { enumerable: true },
+	values: { enumerable: true },
+	entries: { enumerable: true }
+});
+
+function getHeaders(headers) {
+	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
+
+	const keys = Object.keys(headers[MAP]).sort();
+	return keys.map(kind === 'key' ? function (k) {
+		return k.toLowerCase();
+	} : kind === 'value' ? function (k) {
+		return headers[MAP][k].join(', ');
+	} : function (k) {
+		return [k.toLowerCase(), headers[MAP][k].join(', ')];
+	});
+}
+
+const INTERNAL = Symbol('internal');
+
+function createHeadersIterator(target, kind) {
+	const iterator = Object.create(HeadersIteratorPrototype);
+	iterator[INTERNAL] = {
+		target,
+		kind,
+		index: 0
+	};
+	return iterator;
+}
+
+const HeadersIteratorPrototype = Object.setPrototypeOf({
+	next() {
+		// istanbul ignore if
+		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
+			throw new TypeError('Value of `this` is not a HeadersIterator');
+		}
+
+		var _INTERNAL = this[INTERNAL];
+		const target = _INTERNAL.target,
+		      kind = _INTERNAL.kind,
+		      index = _INTERNAL.index;
+
+		const values = getHeaders(target, kind);
+		const len = values.length;
+		if (index >= len) {
+			return {
+				value: undefined,
+				done: true
+			};
+		}
+
+		this[INTERNAL].index = index + 1;
+
+		return {
+			value: values[index],
+			done: false
+		};
+	}
+}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
+
+Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
+	value: 'HeadersIterator',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+/**
+ * Export the Headers object in a form that Node.js can consume.
+ *
+ * @param   Headers  headers
+ * @return  Object
+ */
+function exportNodeCompatibleHeaders(headers) {
+	const obj = Object.assign({ __proto__: null }, headers[MAP]);
+
+	// http.request() only supports string as Host header. This hack makes
+	// specifying custom Host header possible.
+	const hostHeaderKey = find(headers[MAP], 'Host');
+	if (hostHeaderKey !== undefined) {
+		obj[hostHeaderKey] = obj[hostHeaderKey][0];
+	}
+
+	return obj;
+}
+
+/**
+ * Create a Headers object from an object of headers, ignoring those that do
+ * not conform to HTTP grammar productions.
+ *
+ * @param   Object  obj  Object of headers
+ * @return  Headers
+ */
+function createHeadersLenient(obj) {
+	const headers = new Headers();
+	for (const name of Object.keys(obj)) {
+		if (invalidTokenRegex.test(name)) {
+			continue;
+		}
+		if (Array.isArray(obj[name])) {
+			for (const val of obj[name]) {
+				if (invalidHeaderCharRegex.test(val)) {
+					continue;
+				}
+				if (headers[MAP][name] === undefined) {
+					headers[MAP][name] = [val];
+				} else {
+					headers[MAP][name].push(val);
+				}
+			}
+		} else if (!invalidHeaderCharRegex.test(obj[name])) {
+			headers[MAP][name] = [obj[name]];
+		}
+	}
+	return headers;
+}
+
+const INTERNALS$1 = Symbol('Response internals');
+
+// fix an issue where "STATUS_CODES" aren't a named export for node <10
+const STATUS_CODES = http.STATUS_CODES;
+
+/**
+ * Response class
+ *
+ * @param   Stream  body  Readable stream
+ * @param   Object  opts  Response options
+ * @return  Void
+ */
+class Response {
+	constructor() {
+		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+		Body.call(this, body, opts);
+
+		const status = opts.status || 200;
+		const headers = new Headers(opts.headers);
+
+		if (body != null && !headers.has('Content-Type')) {
+			const contentType = extractContentType(body);
+			if (contentType) {
+				headers.append('Content-Type', contentType);
+			}
+		}
+
+		this[INTERNALS$1] = {
+			url: opts.url,
+			status,
+			statusText: opts.statusText || STATUS_CODES[status],
+			headers,
+			counter: opts.counter
+		};
+	}
+
+	get url() {
+		return this[INTERNALS$1].url;
+	}
+
+	get status() {
+		return this[INTERNALS$1].status;
+	}
+
+	/**
+  * Convenience property representing if the request ended normally
+  */
+	get ok() {
+		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
+	}
+
+	get redirected() {
+		return this[INTERNALS$1].counter > 0;
+	}
+
+	get statusText() {
+		return this[INTERNALS$1].statusText;
+	}
+
+	get headers() {
+		return this[INTERNALS$1].headers;
+	}
+
+	/**
+  * Clone this response
+  *
+  * @return  Response
+  */
+	clone() {
+		return new Response(clone(this), {
+			url: this.url,
+			status: this.status,
+			statusText: this.statusText,
+			headers: this.headers,
+			ok: this.ok,
+			redirected: this.redirected
+		});
+	}
+}
+
+Body.mixIn(Response.prototype);
+
+Object.defineProperties(Response.prototype, {
+	url: { enumerable: true },
+	status: { enumerable: true },
+	ok: { enumerable: true },
+	redirected: { enumerable: true },
+	statusText: { enumerable: true },
+	headers: { enumerable: true },
+	clone: { enumerable: true }
+});
+
+Object.defineProperty(Response.prototype, Symbol.toStringTag, {
+	value: 'Response',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+const INTERNALS$2 = Symbol('Request internals');
+
+// fix an issue where "format", "parse" aren't a named export for node <10
+const parse_url = Url.parse;
+const format_url = Url.format;
+
+const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
+
+/**
+ * Check if a value is an instance of Request.
+ *
+ * @param   Mixed   input
+ * @return  Boolean
+ */
+function isRequest(input) {
+	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
+}
+
+function isAbortSignal(signal) {
+	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
+	return !!(proto && proto.constructor.name === 'AbortSignal');
+}
+
+/**
+ * Request class
+ *
+ * @param   Mixed   input  Url or Request instance
+ * @param   Object  init   Custom options
+ * @return  Void
+ */
+class Request {
+	constructor(input) {
+		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+		let parsedURL;
+
+		// normalize input
+		if (!isRequest(input)) {
+			if (input && input.href) {
+				// in order to support Node.js' Url objects; though WHATWG's URL objects
+				// will fall into this branch also (since their `toString()` will return
+				// `href` property anyway)
+				parsedURL = parse_url(input.href);
+			} else {
+				// coerce input to a string before attempting to parse
+				parsedURL = parse_url(`${input}`);
+			}
+			input = {};
+		} else {
+			parsedURL = parse_url(input.url);
+		}
+
+		let method = init.method || input.method || 'GET';
+		method = method.toUpperCase();
+
+		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
+			throw new TypeError('Request with GET/HEAD method cannot have body');
+		}
+
+		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
+
+		Body.call(this, inputBody, {
+			timeout: init.timeout || input.timeout || 0,
+			size: init.size || input.size || 0
+		});
+
+		const headers = new Headers(init.headers || input.headers || {});
+
+		if (inputBody != null && !headers.has('Content-Type')) {
+			const contentType = extractContentType(inputBody);
+			if (contentType) {
+				headers.append('Content-Type', contentType);
+			}
+		}
+
+		let signal = isRequest(input) ? input.signal : null;
+		if ('signal' in init) signal = init.signal;
+
+		if (signal != null && !isAbortSignal(signal)) {
+			throw new TypeError('Expected signal to be an instanceof AbortSignal');
+		}
+
+		this[INTERNALS$2] = {
+			method,
+			redirect: init.redirect || input.redirect || 'follow',
+			headers,
+			parsedURL,
+			signal
+		};
+
+		// node-fetch-only options
+		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
+		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
+		this.counter = init.counter || input.counter || 0;
+		this.agent = init.agent || input.agent;
+	}
+
+	get method() {
+		return this[INTERNALS$2].method;
+	}
+
+	get url() {
+		return format_url(this[INTERNALS$2].parsedURL);
+	}
+
+	get headers() {
+		return this[INTERNALS$2].headers;
+	}
+
+	get redirect() {
+		return this[INTERNALS$2].redirect;
+	}
+
+	get signal() {
+		return this[INTERNALS$2].signal;
+	}
+
+	/**
+  * Clone this request
+  *
+  * @return  Request
+  */
+	clone() {
+		return new Request(this);
+	}
+}
+
+Body.mixIn(Request.prototype);
+
+Object.defineProperty(Request.prototype, Symbol.toStringTag, {
+	value: 'Request',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+Object.defineProperties(Request.prototype, {
+	method: { enumerable: true },
+	url: { enumerable: true },
+	headers: { enumerable: true },
+	redirect: { enumerable: true },
+	clone: { enumerable: true },
+	signal: { enumerable: true }
+});
+
+/**
+ * Convert a Request to Node.js http request options.
+ *
+ * @param   Request  A Request instance
+ * @return  Object   The options object to be passed to http.request
+ */
+function getNodeRequestOptions(request) {
+	const parsedURL = request[INTERNALS$2].parsedURL;
+	const headers = new Headers(request[INTERNALS$2].headers);
+
+	// fetch step 1.3
+	if (!headers.has('Accept')) {
+		headers.set('Accept', '*/*');
+	}
+
+	// Basic fetch
+	if (!parsedURL.protocol || !parsedURL.hostname) {
+		throw new TypeError('Only absolute URLs are supported');
+	}
+
+	if (!/^https?:$/.test(parsedURL.protocol)) {
+		throw new TypeError('Only HTTP(S) protocols are supported');
+	}
+
+	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
+		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
+	}
+
+	// HTTP-network-or-cache fetch steps 2.4-2.7
+	let contentLengthValue = null;
+	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
+		contentLengthValue = '0';
+	}
+	if (request.body != null) {
+		const totalBytes = getTotalBytes(request);
+		if (typeof totalBytes === 'number') {
+			contentLengthValue = String(totalBytes);
+		}
+	}
+	if (contentLengthValue) {
+		headers.set('Content-Length', contentLengthValue);
+	}
+
+	// HTTP-network-or-cache fetch step 2.11
+	if (!headers.has('User-Agent')) {
+		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
+	}
+
+	// HTTP-network-or-cache fetch step 2.15
+	if (request.compress && !headers.has('Accept-Encoding')) {
+		headers.set('Accept-Encoding', 'gzip,deflate');
+	}
+
+	if (!headers.has('Connection') && !request.agent) {
+		headers.set('Connection', 'close');
+	}
+
+	// HTTP-network fetch step 4.2
+	// chunked encoding is handled by Node.js
+
+	return Object.assign({}, parsedURL, {
+		method: request.method,
+		headers: exportNodeCompatibleHeaders(headers),
+		agent: request.agent
+	});
+}
+
+/**
+ * abort-error.js
+ *
+ * AbortError interface for cancelled requests
+ */
+
+/**
+ * Create AbortError instance
+ *
+ * @param   String      message      Error message for human
+ * @return  AbortError
+ */
+function AbortError(message) {
+  Error.call(this, message);
+
+  this.type = 'aborted';
+  this.message = message;
+
+  // hide custom error implementation details from end-users
+  Error.captureStackTrace(this, this.constructor);
+}
+
+AbortError.prototype = Object.create(Error.prototype);
+AbortError.prototype.constructor = AbortError;
+AbortError.prototype.name = 'AbortError';
+
+// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
+const PassThrough$1 = Stream.PassThrough;
+const resolve_url = Url.resolve;
+
+/**
+ * Fetch function
+ *
+ * @param   Mixed    url   Absolute url or Request instance
+ * @param   Object   opts  Fetch options
+ * @return  Promise
+ */
+function fetch(url, opts) {
+
+	// allow custom promise
+	if (!fetch.Promise) {
+		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
+	}
+
+	Body.Promise = fetch.Promise;
+
+	// wrap http.request into fetch
+	return new fetch.Promise(function (resolve, reject) {
+		// build request object
+		const request = new Request(url, opts);
+		const options = getNodeRequestOptions(request);
+
+		const send = (options.protocol === 'https:' ? https : http).request;
+		const signal = request.signal;
+
+		let response = null;
+
+		const abort = function abort() {
+			let error = new AbortError('The user aborted a request.');
+			reject(error);
+			if (request.body && request.body instanceof Stream.Readable) {
+				request.body.destroy(error);
+			}
+			if (!response || !response.body) return;
+			response.body.emit('error', error);
+		};
+
+		if (signal && signal.aborted) {
+			abort();
+			return;
+		}
+
+		const abortAndFinalize = function abortAndFinalize() {
+			abort();
+			finalize();
+		};
+
+		// send request
+		const req = send(options);
+		let reqTimeout;
+
+		if (signal) {
+			signal.addEventListener('abort', abortAndFinalize);
+		}
+
+		function finalize() {
+			req.abort();
+			if (signal) signal.removeEventListener('abort', abortAndFinalize);
+			clearTimeout(reqTimeout);
+		}
+
+		if (request.timeout) {
+			req.once('socket', function (socket) {
+				reqTimeout = setTimeout(function () {
+					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
+					finalize();
+				}, request.timeout);
+			});
+		}
+
+		req.on('error', function (err) {
+			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
+			finalize();
+		});
+
+		req.on('response', function (res) {
+			clearTimeout(reqTimeout);
+
+			const headers = createHeadersLenient(res.headers);
+
+			// HTTP fetch step 5
+			if (fetch.isRedirect(res.statusCode)) {
+				// HTTP fetch step 5.2
+				const location = headers.get('Location');
+
+				// HTTP fetch step 5.3
+				const locationURL = location === null ? null : resolve_url(request.url, location);
+
+				// HTTP fetch step 5.5
+				switch (request.redirect) {
+					case 'error':
+						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
+						finalize();
+						return;
+					case 'manual':
+						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
+						if (locationURL !== null) {
+							// handle corrupted header
+							try {
+								headers.set('Location', locationURL);
+							} catch (err) {
+								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
+								reject(err);
+							}
+						}
+						break;
+					case 'follow':
+						// HTTP-redirect fetch step 2
+						if (locationURL === null) {
+							break;
+						}
+
+						// HTTP-redirect fetch step 5
+						if (request.counter >= request.follow) {
+							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
+							finalize();
+							return;
+						}
+
+						// HTTP-redirect fetch step 6 (counter increment)
+						// Create a new Request object.
+						const requestOpts = {
+							headers: new Headers(request.headers),
+							follow: request.follow,
+							counter: request.counter + 1,
+							agent: request.agent,
+							compress: request.compress,
+							method: request.method,
+							body: request.body,
+							signal: request.signal,
+							timeout: request.timeout
+						};
+
+						// HTTP-redirect fetch step 9
+						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
+							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
+							finalize();
+							return;
+						}
+
+						// HTTP-redirect fetch step 11
+						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
+							requestOpts.method = 'GET';
+							requestOpts.body = undefined;
+							requestOpts.headers.delete('content-length');
+						}
+
+						// HTTP-redirect fetch step 15
+						resolve(fetch(new Request(locationURL, requestOpts)));
+						finalize();
+						return;
+				}
+			}
+
+			// prepare response
+			res.once('end', function () {
+				if (signal) signal.removeEventListener('abort', abortAndFinalize);
+			});
+			let body = res.pipe(new PassThrough$1());
+
+			const response_options = {
+				url: request.url,
+				status: res.statusCode,
+				statusText: res.statusMessage,
+				headers: headers,
+				size: request.size,
+				timeout: request.timeout,
+				counter: request.counter
+			};
+
+			// HTTP-network fetch step 12.1.1.3
+			const codings = headers.get('Content-Encoding');
+
+			// HTTP-network fetch step 12.1.1.4: handle content codings
+
+			// in following scenarios we ignore compression support
+			// 1. compression support is disabled
+			// 2. HEAD request
+			// 3. no Content-Encoding header
+			// 4. no content response (204)
+			// 5. content not modified response (304)
+			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// For Node v6+
+			// Be less strict when decoding compressed responses, since sometimes
+			// servers send slightly invalid responses that are still accepted
+			// by common browsers.
+			// Always using Z_SYNC_FLUSH is what cURL does.
+			const zlibOptions = {
+				flush: zlib.Z_SYNC_FLUSH,
+				finishFlush: zlib.Z_SYNC_FLUSH
+			};
+
+			// for gzip
+			if (codings == 'gzip' || codings == 'x-gzip') {
+				body = body.pipe(zlib.createGunzip(zlibOptions));
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// for deflate
+			if (codings == 'deflate' || codings == 'x-deflate') {
+				// handle the infamous raw deflate response from old servers
+				// a hack for old IIS and Apache servers
+				const raw = res.pipe(new PassThrough$1());
+				raw.once('data', function (chunk) {
+					// see http://stackoverflow.com/questions/37519828
+					if ((chunk[0] & 0x0F) === 0x08) {
+						body = body.pipe(zlib.createInflate());
+					} else {
+						body = body.pipe(zlib.createInflateRaw());
+					}
+					response = new Response(body, response_options);
+					resolve(response);
+				});
+				return;
+			}
+
+			// for br
+			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
+				body = body.pipe(zlib.createBrotliDecompress());
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// otherwise, use response as-is
+			response = new Response(body, response_options);
+			resolve(response);
+		});
+
+		writeToStream(req, request);
+	});
+}
+/**
+ * Redirect code matching
+ *
+ * @param   Number   code  Status code
+ * @return  Boolean
+ */
+fetch.isRedirect = function (code) {
+	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
+};
+
+// expose Promise
+fetch.Promise = global.Promise;
+
+module.exports = exports = fetch;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = exports;
+exports.Headers = Headers;
+exports.Request = Request;
+exports.Response = Response;
+exports.FetchError = FetchError;
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.mjs b/scripts/metrics/node_modules/node-fetch/lib/index.mjs
new file mode 100644
index 00000000000..dca525658b4
--- /dev/null
+++ b/scripts/metrics/node_modules/node-fetch/lib/index.mjs
@@ -0,0 +1,1629 @@
+import Stream from 'stream';
+import http from 'http';
+import Url from 'url';
+import https from 'https';
+import zlib from 'zlib';
+
+// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
+
+// fix for "Readable" isn't a named export issue
+const Readable = Stream.Readable;
+
+const BUFFER = Symbol('buffer');
+const TYPE = Symbol('type');
+
+class Blob {
+	constructor() {
+		this[TYPE] = '';
+
+		const blobParts = arguments[0];
+		const options = arguments[1];
+
+		const buffers = [];
+		let size = 0;
+
+		if (blobParts) {
+			const a = blobParts;
+			const length = Number(a.length);
+			for (let i = 0; i < length; i++) {
+				const element = a[i];
+				let buffer;
+				if (element instanceof Buffer) {
+					buffer = element;
+				} else if (ArrayBuffer.isView(element)) {
+					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
+				} else if (element instanceof ArrayBuffer) {
+					buffer = Buffer.from(element);
+				} else if (element instanceof Blob) {
+					buffer = element[BUFFER];
+				} else {
+					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
+				}
+				size += buffer.length;
+				buffers.push(buffer);
+			}
+		}
+
+		this[BUFFER] = Buffer.concat(buffers);
+
+		let type = options && options.type !== undefined && String(options.type).toLowerCase();
+		if (type && !/[^\u0020-\u007E]/.test(type)) {
+			this[TYPE] = type;
+		}
+	}
+	get size() {
+		return this[BUFFER].length;
+	}
+	get type() {
+		return this[TYPE];
+	}
+	text() {
+		return Promise.resolve(this[BUFFER].toString());
+	}
+	arrayBuffer() {
+		const buf = this[BUFFER];
+		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+		return Promise.resolve(ab);
+	}
+	stream() {
+		const readable = new Readable();
+		readable._read = function () {};
+		readable.push(this[BUFFER]);
+		readable.push(null);
+		return readable;
+	}
+	toString() {
+		return '[object Blob]';
+	}
+	slice() {
+		const size = this.size;
+
+		const start = arguments[0];
+		const end = arguments[1];
+		let relativeStart, relativeEnd;
+		if (start === undefined) {
+			relativeStart = 0;
+		} else if (start < 0) {
+			relativeStart = Math.max(size + start, 0);
+		} else {
+			relativeStart = Math.min(start, size);
+		}
+		if (end === undefined) {
+			relativeEnd = size;
+		} else if (end < 0) {
+			relativeEnd = Math.max(size + end, 0);
+		} else {
+			relativeEnd = Math.min(end, size);
+		}
+		const span = Math.max(relativeEnd - relativeStart, 0);
+
+		const buffer = this[BUFFER];
+		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
+		const blob = new Blob([], { type: arguments[2] });
+		blob[BUFFER] = slicedBuffer;
+		return blob;
+	}
+}
+
+Object.defineProperties(Blob.prototype, {
+	size: { enumerable: true },
+	type: { enumerable: true },
+	slice: { enumerable: true }
+});
+
+Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
+	value: 'Blob',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+/**
+ * fetch-error.js
+ *
+ * FetchError interface for operational errors
+ */
+
+/**
+ * Create FetchError instance
+ *
+ * @param   String      message      Error message for human
+ * @param   String      type         Error type for machine
+ * @param   String      systemError  For Node.js system error
+ * @return  FetchError
+ */
+function FetchError(message, type, systemError) {
+  Error.call(this, message);
+
+  this.message = message;
+  this.type = type;
+
+  // when err.type is `system`, err.code contains system error code
+  if (systemError) {
+    this.code = this.errno = systemError.code;
+  }
+
+  // hide custom error implementation details from end-users
+  Error.captureStackTrace(this, this.constructor);
+}
+
+FetchError.prototype = Object.create(Error.prototype);
+FetchError.prototype.constructor = FetchError;
+FetchError.prototype.name = 'FetchError';
+
+let convert;
+try {
+	convert = require('encoding').convert;
+} catch (e) {}
+
+const INTERNALS = Symbol('Body internals');
+
+// fix an issue where "PassThrough" isn't a named export for node <10
+const PassThrough = Stream.PassThrough;
+
+/**
+ * Body mixin
+ *
+ * Ref: https://fetch.spec.whatwg.org/#body
+ *
+ * @param   Stream  body  Readable stream
+ * @param   Object  opts  Response options
+ * @return  Void
+ */
+function Body(body) {
+	var _this = this;
+
+	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+	    _ref$size = _ref.size;
+
+	let size = _ref$size === undefined ? 0 : _ref$size;
+	var _ref$timeout = _ref.timeout;
+	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
+
+	if (body == null) {
+		// body is undefined or null
+		body = null;
+	} else if (isURLSearchParams(body)) {
+		// body is a URLSearchParams
+		body = Buffer.from(body.toString());
+	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
+		// body is ArrayBuffer
+		body = Buffer.from(body);
+	} else if (ArrayBuffer.isView(body)) {
+		// body is ArrayBufferView
+		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
+	} else if (body instanceof Stream) ; else {
+		// none of the above
+		// coerce to string then buffer
+		body = Buffer.from(String(body));
+	}
+	this[INTERNALS] = {
+		body,
+		disturbed: false,
+		error: null
+	};
+	this.size = size;
+	this.timeout = timeout;
+
+	if (body instanceof Stream) {
+		body.on('error', function (err) {
+			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
+			_this[INTERNALS].error = error;
+		});
+	}
+}
+
+Body.prototype = {
+	get body() {
+		return this[INTERNALS].body;
+	},
+
+	get bodyUsed() {
+		return this[INTERNALS].disturbed;
+	},
+
+	/**
+  * Decode response as ArrayBuffer
+  *
+  * @return  Promise
+  */
+	arrayBuffer() {
+		return consumeBody.call(this).then(function (buf) {
+			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+		});
+	},
+
+	/**
+  * Return raw response as Blob
+  *
+  * @return Promise
+  */
+	blob() {
+		let ct = this.headers && this.headers.get('content-type') || '';
+		return consumeBody.call(this).then(function (buf) {
+			return Object.assign(
+			// Prevent copying
+			new Blob([], {
+				type: ct.toLowerCase()
+			}), {
+				[BUFFER]: buf
+			});
+		});
+	},
+
+	/**
+  * Decode response as json
+  *
+  * @return  Promise
+  */
+	json() {
+		var _this2 = this;
+
+		return consumeBody.call(this).then(function (buffer) {
+			try {
+				return JSON.parse(buffer.toString());
+			} catch (err) {
+				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
+			}
+		});
+	},
+
+	/**
+  * Decode response as text
+  *
+  * @return  Promise
+  */
+	text() {
+		return consumeBody.call(this).then(function (buffer) {
+			return buffer.toString();
+		});
+	},
+
+	/**
+  * Decode response as buffer (non-spec api)
+  *
+  * @return  Promise
+  */
+	buffer() {
+		return consumeBody.call(this);
+	},
+
+	/**
+  * Decode response as text, while automatically detecting the encoding and
+  * trying to decode to UTF-8 (non-spec api)
+  *
+  * @return  Promise
+  */
+	textConverted() {
+		var _this3 = this;
+
+		return consumeBody.call(this).then(function (buffer) {
+			return convertBody(buffer, _this3.headers);
+		});
+	}
+};
+
+// In browsers, all properties are enumerable.
+Object.defineProperties(Body.prototype, {
+	body: { enumerable: true },
+	bodyUsed: { enumerable: true },
+	arrayBuffer: { enumerable: true },
+	blob: { enumerable: true },
+	json: { enumerable: true },
+	text: { enumerable: true }
+});
+
+Body.mixIn = function (proto) {
+	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
+		// istanbul ignore else: future proof
+		if (!(name in proto)) {
+			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
+			Object.defineProperty(proto, name, desc);
+		}
+	}
+};
+
+/**
+ * Consume and convert an entire Body to a Buffer.
+ *
+ * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
+ *
+ * @return  Promise
+ */
+function consumeBody() {
+	var _this4 = this;
+
+	if (this[INTERNALS].disturbed) {
+		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
+	}
+
+	this[INTERNALS].disturbed = true;
+
+	if (this[INTERNALS].error) {
+		return Body.Promise.reject(this[INTERNALS].error);
+	}
+
+	let body = this.body;
+
+	// body is null
+	if (body === null) {
+		return Body.Promise.resolve(Buffer.alloc(0));
+	}
+
+	// body is blob
+	if (isBlob(body)) {
+		body = body.stream();
+	}
+
+	// body is buffer
+	if (Buffer.isBuffer(body)) {
+		return Body.Promise.resolve(body);
+	}
+
+	// istanbul ignore if: should never happen
+	if (!(body instanceof Stream)) {
+		return Body.Promise.resolve(Buffer.alloc(0));
+	}
+
+	// body is stream
+	// get ready to actually consume the body
+	let accum = [];
+	let accumBytes = 0;
+	let abort = false;
+
+	return new Body.Promise(function (resolve, reject) {
+		let resTimeout;
+
+		// allow timeout on slow response body
+		if (_this4.timeout) {
+			resTimeout = setTimeout(function () {
+				abort = true;
+				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
+			}, _this4.timeout);
+		}
+
+		// handle stream errors
+		body.on('error', function (err) {
+			if (err.name === 'AbortError') {
+				// if the request was aborted, reject with this Error
+				abort = true;
+				reject(err);
+			} else {
+				// other errors, such as incorrect content-encoding
+				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
+			}
+		});
+
+		body.on('data', function (chunk) {
+			if (abort || chunk === null) {
+				return;
+			}
+
+			if (_this4.size && accumBytes + chunk.length > _this4.size) {
+				abort = true;
+				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
+				return;
+			}
+
+			accumBytes += chunk.length;
+			accum.push(chunk);
+		});
+
+		body.on('end', function () {
+			if (abort) {
+				return;
+			}
+
+			clearTimeout(resTimeout);
+
+			try {
+				resolve(Buffer.concat(accum, accumBytes));
+			} catch (err) {
+				// handle streams that have accumulated too much data (issue #414)
+				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
+			}
+		});
+	});
+}
+
+/**
+ * Detect buffer encoding and convert to target encoding
+ * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
+ *
+ * @param   Buffer  buffer    Incoming buffer
+ * @param   String  encoding  Target encoding
+ * @return  String
+ */
+function convertBody(buffer, headers) {
+	if (typeof convert !== 'function') {
+		throw new Error('The package `encoding` must be installed to use the textConverted() function');
+	}
+
+	const ct = headers.get('content-type');
+	let charset = 'utf-8';
+	let res, str;
+
+	// header
+	if (ct) {
+		res = /charset=([^;]*)/i.exec(ct);
+	}
+
+	// no charset in content type, peek at response body for at most 1024 bytes
+	str = buffer.slice(0, 1024).toString();
+
+	// html5
+	if (!res && str) {
+		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
+	}
+
+	// html4
+	if (!res && str) {
+		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
+
+		if (res) {
+			res = /charset=(.*)/i.exec(res.pop());
+		}
+	}
+
+	// xml
+	if (!res && str) {
+		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
+	}
+
+	// found charset
+	if (res) {
+		charset = res.pop();
+
+		// prevent decode issues when sites use incorrect encoding
+		// ref: https://hsivonen.fi/encoding-menu/
+		if (charset === 'gb2312' || charset === 'gbk') {
+			charset = 'gb18030';
+		}
+	}
+
+	// turn raw buffers into a single utf-8 buffer
+	return convert(buffer, 'UTF-8', charset).toString();
+}
+
+/**
+ * Detect a URLSearchParams object
+ * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
+ *
+ * @param   Object  obj     Object to detect by type or brand
+ * @return  String
+ */
+function isURLSearchParams(obj) {
+	// Duck-typing as a necessary condition.
+	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
+		return false;
+	}
+
+	// Brand-checking and more duck-typing as optional condition.
+	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
+}
+
+/**
+ * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
+ * @param  {*} obj
+ * @return {boolean}
+ */
+function isBlob(obj) {
+	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
+}
+
+/**
+ * Clone body given Res/Req instance
+ *
+ * @param   Mixed  instance  Response or Request instance
+ * @return  Mixed
+ */
+function clone(instance) {
+	let p1, p2;
+	let body = instance.body;
+
+	// don't allow cloning a used body
+	if (instance.bodyUsed) {
+		throw new Error('cannot clone body after it is used');
+	}
+
+	// check that body is a stream and not form-data object
+	// note: we can't clone the form-data object without having it as a dependency
+	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
+		// tee instance body
+		p1 = new PassThrough();
+		p2 = new PassThrough();
+		body.pipe(p1);
+		body.pipe(p2);
+		// set instance body to teed body and return the other teed body
+		instance[INTERNALS].body = p1;
+		body = p2;
+	}
+
+	return body;
+}
+
+/**
+ * Performs the operation "extract a `Content-Type` value from |object|" as
+ * specified in the specification:
+ * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
+ *
+ * This function assumes that instance.body is present.
+ *
+ * @param   Mixed  instance  Response or Request instance
+ */
+function extractContentType(body) {
+	// istanbul ignore if: Currently, because of a guard in Request, body
+	// can never be null. Included here for completeness.
+	if (body === null) {
+		// body is null
+		return null;
+	} else if (typeof body === 'string') {
+		// body is string
+		return 'text/plain;charset=UTF-8';
+	} else if (isURLSearchParams(body)) {
+		// body is a URLSearchParams
+		return 'application/x-www-form-urlencoded;charset=UTF-8';
+	} else if (isBlob(body)) {
+		// body is blob
+		return body.type || null;
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		return null;
+	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
+		// body is ArrayBuffer
+		return null;
+	} else if (ArrayBuffer.isView(body)) {
+		// body is ArrayBufferView
+		return null;
+	} else if (typeof body.getBoundary === 'function') {
+		// detect form data input from form-data module
+		return `multipart/form-data;boundary=${body.getBoundary()}`;
+	} else if (body instanceof Stream) {
+		// body is stream
+		// can't really do much about this
+		return null;
+	} else {
+		// Body constructor defaults other things to string
+		return 'text/plain;charset=UTF-8';
+	}
+}
+
+/**
+ * The Fetch Standard treats this as if "total bytes" is a property on the body.
+ * For us, we have to explicitly get it with a function.
+ *
+ * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
+ *
+ * @param   Body    instance   Instance of Body
+ * @return  Number?            Number of bytes, or null if not possible
+ */
+function getTotalBytes(instance) {
+	const body = instance.body;
+
+	// istanbul ignore if: included for completion
+
+	if (body === null) {
+		// body is null
+		return 0;
+	} else if (isBlob(body)) {
+		return body.size;
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		return body.length;
+	} else if (body && typeof body.getLengthSync === 'function') {
+		// detect form data input from form-data module
+		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
+		body.hasKnownLength && body.hasKnownLength()) {
+			// 2.x
+			return body.getLengthSync();
+		}
+		return null;
+	} else {
+		// body is stream
+		return instance.size || null;
+	}
+}
+
+/**
+ * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
+ *
+ * @param   Body    instance   Instance of Body
+ * @return  Void
+ */
+function writeToStream(dest, instance) {
+	const body = instance.body;
+
+
+	if (body === null) {
+		// body is null
+		dest.end();
+	} else if (isBlob(body)) {
+		body.stream().pipe(dest);
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		dest.write(body);
+		dest.end();
+	} else {
+		// body is stream
+		body.pipe(dest);
+	}
+}
+
+// expose Promise
+Body.Promise = global.Promise;
+
+/**
+ * headers.js
+ *
+ * Headers class offers convenient helpers
+ */
+
+const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
+const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
+
+function validateName(name) {
+	name = `${name}`;
+	if (invalidTokenRegex.test(name) || name === '') {
+		throw new TypeError(`${name} is not a legal HTTP header name`);
+	}
+}
+
+function validateValue(value) {
+	value = `${value}`;
+	if (invalidHeaderCharRegex.test(value)) {
+		throw new TypeError(`${value} is not a legal HTTP header value`);
+	}
+}
+
+/**
+ * Find the key in the map object given a header name.
+ *
+ * Returns undefined if not found.
+ *
+ * @param   String  name  Header name
+ * @return  String|Undefined
+ */
+function find(map, name) {
+	name = name.toLowerCase();
+	for (const key in map) {
+		if (key.toLowerCase() === name) {
+			return key;
+		}
+	}
+	return undefined;
+}
+
+const MAP = Symbol('map');
+class Headers {
+	/**
+  * Headers class
+  *
+  * @param   Object  headers  Response headers
+  * @return  Void
+  */
+	constructor() {
+		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
+
+		this[MAP] = Object.create(null);
+
+		if (init instanceof Headers) {
+			const rawHeaders = init.raw();
+			const headerNames = Object.keys(rawHeaders);
+
+			for (const headerName of headerNames) {
+				for (const value of rawHeaders[headerName]) {
+					this.append(headerName, value);
+				}
+			}
+
+			return;
+		}
+
+		// We don't worry about converting prop to ByteString here as append()
+		// will handle it.
+		if (init == null) ; else if (typeof init === 'object') {
+			const method = init[Symbol.iterator];
+			if (method != null) {
+				if (typeof method !== 'function') {
+					throw new TypeError('Header pairs must be iterable');
+				}
+
+				// sequence<sequence<ByteString>>
+				// Note: per spec we have to first exhaust the lists then process them
+				const pairs = [];
+				for (const pair of init) {
+					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
+						throw new TypeError('Each header pair must be iterable');
+					}
+					pairs.push(Array.from(pair));
+				}
+
+				for (const pair of pairs) {
+					if (pair.length !== 2) {
+						throw new TypeError('Each header pair must be a name/value tuple');
+					}
+					this.append(pair[0], pair[1]);
+				}
+			} else {
+				// record<ByteString, ByteString>
+				for (const key of Object.keys(init)) {
+					const value = init[key];
+					this.append(key, value);
+				}
+			}
+		} else {
+			throw new TypeError('Provided initializer must be an object');
+		}
+	}
+
+	/**
+  * Return combined header value given name
+  *
+  * @param   String  name  Header name
+  * @return  Mixed
+  */
+	get(name) {
+		name = `${name}`;
+		validateName(name);
+		const key = find(this[MAP], name);
+		if (key === undefined) {
+			return null;
+		}
+
+		return this[MAP][key].join(', ');
+	}
+
+	/**
+  * Iterate over all headers
+  *
+  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
+  * @param   Boolean   thisArg   `this` context for callback function
+  * @return  Void
+  */
+	forEach(callback) {
+		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+
+		let pairs = getHeaders(this);
+		let i = 0;
+		while (i < pairs.length) {
+			var _pairs$i = pairs[i];
+			const name = _pairs$i[0],
+			      value = _pairs$i[1];
+
+			callback.call(thisArg, value, name, this);
+			pairs = getHeaders(this);
+			i++;
+		}
+	}
+
+	/**
+  * Overwrite header values given name
+  *
+  * @param   String  name   Header name
+  * @param   String  value  Header value
+  * @return  Void
+  */
+	set(name, value) {
+		name = `${name}`;
+		value = `${value}`;
+		validateName(name);
+		validateValue(value);
+		const key = find(this[MAP], name);
+		this[MAP][key !== undefined ? key : name] = [value];
+	}
+
+	/**
+  * Append a value onto existing header
+  *
+  * @param   String  name   Header name
+  * @param   String  value  Header value
+  * @return  Void
+  */
+	append(name, value) {
+		name = `${name}`;
+		value = `${value}`;
+		validateName(name);
+		validateValue(value);
+		const key = find(this[MAP], name);
+		if (key !== undefined) {
+			this[MAP][key].push(value);
+		} else {
+			this[MAP][name] = [value];
+		}
+	}
+
+	/**
+  * Check for header name existence
+  *
+  * @param   String   name  Header name
+  * @return  Boolean
+  */
+	has(name) {
+		name = `${name}`;
+		validateName(name);
+		return find(this[MAP], name) !== undefined;
+	}
+
+	/**
+  * Delete all header values given name
+  *
+  * @param   String  name  Header name
+  * @return  Void
+  */
+	delete(name) {
+		name = `${name}`;
+		validateName(name);
+		const key = find(this[MAP], name);
+		if (key !== undefined) {
+			delete this[MAP][key];
+		}
+	}
+
+	/**
+  * Return raw headers (non-spec api)
+  *
+  * @return  Object
+  */
+	raw() {
+		return this[MAP];
+	}
+
+	/**
+  * Get an iterator on keys.
+  *
+  * @return  Iterator
+  */
+	keys() {
+		return createHeadersIterator(this, 'key');
+	}
+
+	/**
+  * Get an iterator on values.
+  *
+  * @return  Iterator
+  */
+	values() {
+		return createHeadersIterator(this, 'value');
+	}
+
+	/**
+  * Get an iterator on entries.
+  *
+  * This is the default iterator of the Headers object.
+  *
+  * @return  Iterator
+  */
+	[Symbol.iterator]() {
+		return createHeadersIterator(this, 'key+value');
+	}
+}
+Headers.prototype.entries = Headers.prototype[Symbol.iterator];
+
+Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
+	value: 'Headers',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+Object.defineProperties(Headers.prototype, {
+	get: { enumerable: true },
+	forEach: { enumerable: true },
+	set: { enumerable: true },
+	append: { enumerable: true },
+	has: { enumerable: true },
+	delete: { enumerable: true },
+	keys: { enumerable: true },
+	values: { enumerable: true },
+	entries: { enumerable: true }
+});
+
+function getHeaders(headers) {
+	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
+
+	const keys = Object.keys(headers[MAP]).sort();
+	return keys.map(kind === 'key' ? function (k) {
+		return k.toLowerCase();
+	} : kind === 'value' ? function (k) {
+		return headers[MAP][k].join(', ');
+	} : function (k) {
+		return [k.toLowerCase(), headers[MAP][k].join(', ')];
+	});
+}
+
+const INTERNAL = Symbol('internal');
+
+function createHeadersIterator(target, kind) {
+	const iterator = Object.create(HeadersIteratorPrototype);
+	iterator[INTERNAL] = {
+		target,
+		kind,
+		index: 0
+	};
+	return iterator;
+}
+
+const HeadersIteratorPrototype = Object.setPrototypeOf({
+	next() {
+		// istanbul ignore if
+		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
+			throw new TypeError('Value of `this` is not a HeadersIterator');
+		}
+
+		var _INTERNAL = this[INTERNAL];
+		const target = _INTERNAL.target,
+		      kind = _INTERNAL.kind,
+		      index = _INTERNAL.index;
+
+		const values = getHeaders(target, kind);
+		const len = values.length;
+		if (index >= len) {
+			return {
+				value: undefined,
+				done: true
+			};
+		}
+
+		this[INTERNAL].index = index + 1;
+
+		return {
+			value: values[index],
+			done: false
+		};
+	}
+}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
+
+Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
+	value: 'HeadersIterator',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+/**
+ * Export the Headers object in a form that Node.js can consume.
+ *
+ * @param   Headers  headers
+ * @return  Object
+ */
+function exportNodeCompatibleHeaders(headers) {
+	const obj = Object.assign({ __proto__: null }, headers[MAP]);
+
+	// http.request() only supports string as Host header. This hack makes
+	// specifying custom Host header possible.
+	const hostHeaderKey = find(headers[MAP], 'Host');
+	if (hostHeaderKey !== undefined) {
+		obj[hostHeaderKey] = obj[hostHeaderKey][0];
+	}
+
+	return obj;
+}
+
+/**
+ * Create a Headers object from an object of headers, ignoring those that do
+ * not conform to HTTP grammar productions.
+ *
+ * @param   Object  obj  Object of headers
+ * @return  Headers
+ */
+function createHeadersLenient(obj) {
+	const headers = new Headers();
+	for (const name of Object.keys(obj)) {
+		if (invalidTokenRegex.test(name)) {
+			continue;
+		}
+		if (Array.isArray(obj[name])) {
+			for (const val of obj[name]) {
+				if (invalidHeaderCharRegex.test(val)) {
+					continue;
+				}
+				if (headers[MAP][name] === undefined) {
+					headers[MAP][name] = [val];
+				} else {
+					headers[MAP][name].push(val);
+				}
+			}
+		} else if (!invalidHeaderCharRegex.test(obj[name])) {
+			headers[MAP][name] = [obj[name]];
+		}
+	}
+	return headers;
+}
+
+const INTERNALS$1 = Symbol('Response internals');
+
+// fix an issue where "STATUS_CODES" aren't a named export for node <10
+const STATUS_CODES = http.STATUS_CODES;
+
+/**
+ * Response class
+ *
+ * @param   Stream  body  Readable stream
+ * @param   Object  opts  Response options
+ * @return  Void
+ */
+class Response {
+	constructor() {
+		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+		Body.call(this, body, opts);
+
+		const status = opts.status || 200;
+		const headers = new Headers(opts.headers);
+
+		if (body != null && !headers.has('Content-Type')) {
+			const contentType = extractContentType(body);
+			if (contentType) {
+				headers.append('Content-Type', contentType);
+			}
+		}
+
+		this[INTERNALS$1] = {
+			url: opts.url,
+			status,
+			statusText: opts.statusText || STATUS_CODES[status],
+			headers,
+			counter: opts.counter
+		};
+	}
+
+	get url() {
+		return this[INTERNALS$1].url;
+	}
+
+	get status() {
+		return this[INTERNALS$1].status;
+	}
+
+	/**
+  * Convenience property representing if the request ended normally
+  */
+	get ok() {
+		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
+	}
+
+	get redirected() {
+		return this[INTERNALS$1].counter > 0;
+	}
+
+	get statusText() {
+		return this[INTERNALS$1].statusText;
+	}
+
+	get headers() {
+		return this[INTERNALS$1].headers;
+	}
+
+	/**
+  * Clone this response
+  *
+  * @return  Response
+  */
+	clone() {
+		return new Response(clone(this), {
+			url: this.url,
+			status: this.status,
+			statusText: this.statusText,
+			headers: this.headers,
+			ok: this.ok,
+			redirected: this.redirected
+		});
+	}
+}
+
+Body.mixIn(Response.prototype);
+
+Object.defineProperties(Response.prototype, {
+	url: { enumerable: true },
+	status: { enumerable: true },
+	ok: { enumerable: true },
+	redirected: { enumerable: true },
+	statusText: { enumerable: true },
+	headers: { enumerable: true },
+	clone: { enumerable: true }
+});
+
+Object.defineProperty(Response.prototype, Symbol.toStringTag, {
+	value: 'Response',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+const INTERNALS$2 = Symbol('Request internals');
+
+// fix an issue where "format", "parse" aren't a named export for node <10
+const parse_url = Url.parse;
+const format_url = Url.format;
+
+const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
+
+/**
+ * Check if a value is an instance of Request.
+ *
+ * @param   Mixed   input
+ * @return  Boolean
+ */
+function isRequest(input) {
+	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
+}
+
+function isAbortSignal(signal) {
+	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
+	return !!(proto && proto.constructor.name === 'AbortSignal');
+}
+
+/**
+ * Request class
+ *
+ * @param   Mixed   input  Url or Request instance
+ * @param   Object  init   Custom options
+ * @return  Void
+ */
+class Request {
+	constructor(input) {
+		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+		let parsedURL;
+
+		// normalize input
+		if (!isRequest(input)) {
+			if (input && input.href) {
+				// in order to support Node.js' Url objects; though WHATWG's URL objects
+				// will fall into this branch also (since their `toString()` will return
+				// `href` property anyway)
+				parsedURL = parse_url(input.href);
+			} else {
+				// coerce input to a string before attempting to parse
+				parsedURL = parse_url(`${input}`);
+			}
+			input = {};
+		} else {
+			parsedURL = parse_url(input.url);
+		}
+
+		let method = init.method || input.method || 'GET';
+		method = method.toUpperCase();
+
+		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
+			throw new TypeError('Request with GET/HEAD method cannot have body');
+		}
+
+		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
+
+		Body.call(this, inputBody, {
+			timeout: init.timeout || input.timeout || 0,
+			size: init.size || input.size || 0
+		});
+
+		const headers = new Headers(init.headers || input.headers || {});
+
+		if (inputBody != null && !headers.has('Content-Type')) {
+			const contentType = extractContentType(inputBody);
+			if (contentType) {
+				headers.append('Content-Type', contentType);
+			}
+		}
+
+		let signal = isRequest(input) ? input.signal : null;
+		if ('signal' in init) signal = init.signal;
+
+		if (signal != null && !isAbortSignal(signal)) {
+			throw new TypeError('Expected signal to be an instanceof AbortSignal');
+		}
+
+		this[INTERNALS$2] = {
+			method,
+			redirect: init.redirect || input.redirect || 'follow',
+			headers,
+			parsedURL,
+			signal
+		};
+
+		// node-fetch-only options
+		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
+		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
+		this.counter = init.counter || input.counter || 0;
+		this.agent = init.agent || input.agent;
+	}
+
+	get method() {
+		return this[INTERNALS$2].method;
+	}
+
+	get url() {
+		return format_url(this[INTERNALS$2].parsedURL);
+	}
+
+	get headers() {
+		return this[INTERNALS$2].headers;
+	}
+
+	get redirect() {
+		return this[INTERNALS$2].redirect;
+	}
+
+	get signal() {
+		return this[INTERNALS$2].signal;
+	}
+
+	/**
+  * Clone this request
+  *
+  * @return  Request
+  */
+	clone() {
+		return new Request(this);
+	}
+}
+
+Body.mixIn(Request.prototype);
+
+Object.defineProperty(Request.prototype, Symbol.toStringTag, {
+	value: 'Request',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+Object.defineProperties(Request.prototype, {
+	method: { enumerable: true },
+	url: { enumerable: true },
+	headers: { enumerable: true },
+	redirect: { enumerable: true },
+	clone: { enumerable: true },
+	signal: { enumerable: true }
+});
+
+/**
+ * Convert a Request to Node.js http request options.
+ *
+ * @param   Request  A Request instance
+ * @return  Object   The options object to be passed to http.request
+ */
+function getNodeRequestOptions(request) {
+	const parsedURL = request[INTERNALS$2].parsedURL;
+	const headers = new Headers(request[INTERNALS$2].headers);
+
+	// fetch step 1.3
+	if (!headers.has('Accept')) {
+		headers.set('Accept', '*/*');
+	}
+
+	// Basic fetch
+	if (!parsedURL.protocol || !parsedURL.hostname) {
+		throw new TypeError('Only absolute URLs are supported');
+	}
+
+	if (!/^https?:$/.test(parsedURL.protocol)) {
+		throw new TypeError('Only HTTP(S) protocols are supported');
+	}
+
+	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
+		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
+	}
+
+	// HTTP-network-or-cache fetch steps 2.4-2.7
+	let contentLengthValue = null;
+	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
+		contentLengthValue = '0';
+	}
+	if (request.body != null) {
+		const totalBytes = getTotalBytes(request);
+		if (typeof totalBytes === 'number') {
+			contentLengthValue = String(totalBytes);
+		}
+	}
+	if (contentLengthValue) {
+		headers.set('Content-Length', contentLengthValue);
+	}
+
+	// HTTP-network-or-cache fetch step 2.11
+	if (!headers.has('User-Agent')) {
+		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
+	}
+
+	// HTTP-network-or-cache fetch step 2.15
+	if (request.compress && !headers.has('Accept-Encoding')) {
+		headers.set('Accept-Encoding', 'gzip,deflate');
+	}
+
+	if (!headers.has('Connection') && !request.agent) {
+		headers.set('Connection', 'close');
+	}
+
+	// HTTP-network fetch step 4.2
+	// chunked encoding is handled by Node.js
+
+	return Object.assign({}, parsedURL, {
+		method: request.method,
+		headers: exportNodeCompatibleHeaders(headers),
+		agent: request.agent
+	});
+}
+
+/**
+ * abort-error.js
+ *
+ * AbortError interface for cancelled requests
+ */
+
+/**
+ * Create AbortError instance
+ *
+ * @param   String      message      Error message for human
+ * @return  AbortError
+ */
+function AbortError(message) {
+  Error.call(this, message);
+
+  this.type = 'aborted';
+  this.message = message;
+
+  // hide custom error implementation details from end-users
+  Error.captureStackTrace(this, this.constructor);
+}
+
+AbortError.prototype = Object.create(Error.prototype);
+AbortError.prototype.constructor = AbortError;
+AbortError.prototype.name = 'AbortError';
+
+// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
+const PassThrough$1 = Stream.PassThrough;
+const resolve_url = Url.resolve;
+
+/**
+ * Fetch function
+ *
+ * @param   Mixed    url   Absolute url or Request instance
+ * @param   Object   opts  Fetch options
+ * @return  Promise
+ */
+function fetch(url, opts) {
+
+	// allow custom promise
+	if (!fetch.Promise) {
+		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
+	}
+
+	Body.Promise = fetch.Promise;
+
+	// wrap http.request into fetch
+	return new fetch.Promise(function (resolve, reject) {
+		// build request object
+		const request = new Request(url, opts);
+		const options = getNodeRequestOptions(request);
+
+		const send = (options.protocol === 'https:' ? https : http).request;
+		const signal = request.signal;
+
+		let response = null;
+
+		const abort = function abort() {
+			let error = new AbortError('The user aborted a request.');
+			reject(error);
+			if (request.body && request.body instanceof Stream.Readable) {
+				request.body.destroy(error);
+			}
+			if (!response || !response.body) return;
+			response.body.emit('error', error);
+		};
+
+		if (signal && signal.aborted) {
+			abort();
+			return;
+		}
+
+		const abortAndFinalize = function abortAndFinalize() {
+			abort();
+			finalize();
+		};
+
+		// send request
+		const req = send(options);
+		let reqTimeout;
+
+		if (signal) {
+			signal.addEventListener('abort', abortAndFinalize);
+		}
+
+		function finalize() {
+			req.abort();
+			if (signal) signal.removeEventListener('abort', abortAndFinalize);
+			clearTimeout(reqTimeout);
+		}
+
+		if (request.timeout) {
+			req.once('socket', function (socket) {
+				reqTimeout = setTimeout(function () {
+					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
+					finalize();
+				}, request.timeout);
+			});
+		}
+
+		req.on('error', function (err) {
+			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
+			finalize();
+		});
+
+		req.on('response', function (res) {
+			clearTimeout(reqTimeout);
+
+			const headers = createHeadersLenient(res.headers);
+
+			// HTTP fetch step 5
+			if (fetch.isRedirect(res.statusCode)) {
+				// HTTP fetch step 5.2
+				const location = headers.get('Location');
+
+				// HTTP fetch step 5.3
+				const locationURL = location === null ? null : resolve_url(request.url, location);
+
+				// HTTP fetch step 5.5
+				switch (request.redirect) {
+					case 'error':
+						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
+						finalize();
+						return;
+					case 'manual':
+						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
+						if (locationURL !== null) {
+							// handle corrupted header
+							try {
+								headers.set('Location', locationURL);
+							} catch (err) {
+								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
+								reject(err);
+							}
+						}
+						break;
+					case 'follow':
+						// HTTP-redirect fetch step 2
+						if (locationURL === null) {
+							break;
+						}
+
+						// HTTP-redirect fetch step 5
+						if (request.counter >= request.follow) {
+							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
+							finalize();
+							return;
+						}
+
+						// HTTP-redirect fetch step 6 (counter increment)
+						// Create a new Request object.
+						const requestOpts = {
+							headers: new Headers(request.headers),
+							follow: request.follow,
+							counter: request.counter + 1,
+							agent: request.agent,
+							compress: request.compress,
+							method: request.method,
+							body: request.body,
+							signal: request.signal,
+							timeout: request.timeout
+						};
+
+						// HTTP-redirect fetch step 9
+						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
+							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
+							finalize();
+							return;
+						}
+
+						// HTTP-redirect fetch step 11
+						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
+							requestOpts.method = 'GET';
+							requestOpts.body = undefined;
+							requestOpts.headers.delete('content-length');
+						}
+
+						// HTTP-redirect fetch step 15
+						resolve(fetch(new Request(locationURL, requestOpts)));
+						finalize();
+						return;
+				}
+			}
+
+			// prepare response
+			res.once('end', function () {
+				if (signal) signal.removeEventListener('abort', abortAndFinalize);
+			});
+			let body = res.pipe(new PassThrough$1());
+
+			const response_options = {
+				url: request.url,
+				status: res.statusCode,
+				statusText: res.statusMessage,
+				headers: headers,
+				size: request.size,
+				timeout: request.timeout,
+				counter: request.counter
+			};
+
+			// HTTP-network fetch step 12.1.1.3
+			const codings = headers.get('Content-Encoding');
+
+			// HTTP-network fetch step 12.1.1.4: handle content codings
+
+			// in following scenarios we ignore compression support
+			// 1. compression support is disabled
+			// 2. HEAD request
+			// 3. no Content-Encoding header
+			// 4. no content response (204)
+			// 5. content not modified response (304)
+			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// For Node v6+
+			// Be less strict when decoding compressed responses, since sometimes
+			// servers send slightly invalid responses that are still accepted
+			// by common browsers.
+			// Always using Z_SYNC_FLUSH is what cURL does.
+			const zlibOptions = {
+				flush: zlib.Z_SYNC_FLUSH,
+				finishFlush: zlib.Z_SYNC_FLUSH
+			};
+
+			// for gzip
+			if (codings == 'gzip' || codings == 'x-gzip') {
+				body = body.pipe(zlib.createGunzip(zlibOptions));
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// for deflate
+			if (codings == 'deflate' || codings == 'x-deflate') {
+				// handle the infamous raw deflate response from old servers
+				// a hack for old IIS and Apache servers
+				const raw = res.pipe(new PassThrough$1());
+				raw.once('data', function (chunk) {
+					// see http://stackoverflow.com/questions/37519828
+					if ((chunk[0] & 0x0F) === 0x08) {
+						body = body.pipe(zlib.createInflate());
+					} else {
+						body = body.pipe(zlib.createInflateRaw());
+					}
+					response = new Response(body, response_options);
+					resolve(response);
+				});
+				return;
+			}
+
+			// for br
+			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
+				body = body.pipe(zlib.createBrotliDecompress());
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// otherwise, use response as-is
+			response = new Response(body, response_options);
+			resolve(response);
+		});
+
+		writeToStream(req, request);
+	});
+}
+/**
+ * Redirect code matching
+ *
+ * @param   Number   code  Status code
+ * @return  Boolean
+ */
+fetch.isRedirect = function (code) {
+	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
+};
+
+// expose Promise
+fetch.Promise = global.Promise;
+
+export default fetch;
+export { Headers, Request, Response, FetchError };
diff --git a/scripts/metrics/node_modules/node-fetch/package.json b/scripts/metrics/node_modules/node-fetch/package.json
new file mode 100644
index 00000000000..e93129c801f
--- /dev/null
+++ b/scripts/metrics/node_modules/node-fetch/package.json
@@ -0,0 +1,94 @@
+{
+  "_from": "node-fetch",
+  "_id": "node-fetch@2.5.0",
+  "_inBundle": false,
+  "_integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw==",
+  "_location": "/node-fetch",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "node-fetch",
+    "name": "node-fetch",
+    "escapedName": "node-fetch",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz",
+  "_shasum": "8028c49fc1191bba56a07adc6e2a954644a48501",
+  "_spec": "node-fetch",
+  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics",
+  "author": {
+    "name": "David Frank"
+  },
+  "browser": "./browser.js",
+  "bugs": {
+    "url": "https://github.com/bitinn/node-fetch/issues"
+  },
+  "bundleDependencies": false,
+  "dependencies": {},
+  "deprecated": false,
+  "description": "A light-weight module that brings window.fetch to node.js",
+  "devDependencies": {
+    "@ungap/url-search-params": "^0.1.2",
+    "abort-controller": "^1.1.0",
+    "abortcontroller-polyfill": "^1.3.0",
+    "babel-core": "^6.26.3",
+    "babel-plugin-istanbul": "^4.1.6",
+    "babel-preset-env": "^1.6.1",
+    "babel-register": "^6.16.3",
+    "chai": "^3.5.0",
+    "chai-as-promised": "^7.1.1",
+    "chai-iterator": "^1.1.1",
+    "chai-string": "~1.3.0",
+    "codecov": "^3.3.0",
+    "cross-env": "^5.2.0",
+    "form-data": "^2.3.3",
+    "is-builtin-module": "^1.0.0",
+    "mocha": "^5.0.0",
+    "nyc": "11.9.0",
+    "parted": "^0.1.1",
+    "promise": "^8.0.3",
+    "resumer": "0.0.0",
+    "rollup": "^0.63.4",
+    "rollup-plugin-babel": "^3.0.7",
+    "string-to-arraybuffer": "^1.0.2",
+    "whatwg-url": "^5.0.0"
+  },
+  "engines": {
+    "node": "4.x || >=6.0.0"
+  },
+  "files": [
+    "lib/index.js",
+    "lib/index.mjs",
+    "lib/index.es.js",
+    "browser.js"
+  ],
+  "homepage": "https://github.com/bitinn/node-fetch",
+  "keywords": [
+    "fetch",
+    "http",
+    "promise"
+  ],
+  "license": "MIT",
+  "main": "lib/index",
+  "module": "lib/index.mjs",
+  "name": "node-fetch",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bitinn/node-fetch.git"
+  },
+  "scripts": {
+    "build": "cross-env BABEL_ENV=rollup rollup -c",
+    "coverage": "cross-env BABEL_ENV=coverage nyc --reporter json --reporter text mocha -R spec test/test.js && codecov -f coverage/coverage-final.json",
+    "prepare": "npm run build",
+    "report": "cross-env BABEL_ENV=coverage nyc --reporter lcov --reporter text mocha -R spec test/test.js",
+    "test": "cross-env BABEL_ENV=test mocha --require babel-register --throw-deprecation test/test.js"
+  },
+  "version": "2.5.0"
+}
diff --git a/scripts/metrics/node_modules/sax/LICENSE b/scripts/metrics/node_modules/sax/LICENSE
new file mode 100644
index 00000000000..ccffa082c99
--- /dev/null
+++ b/scripts/metrics/node_modules/sax/LICENSE
@@ -0,0 +1,41 @@
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+====
+
+`String.fromCodePoint` by Mathias Bynens used according to terms of MIT
+License, as follows:
+
+    Copyright Mathias Bynens <https://mathiasbynens.be/>
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/sax/README.md b/scripts/metrics/node_modules/sax/README.md
new file mode 100644
index 00000000000..afcd3f3dd65
--- /dev/null
+++ b/scripts/metrics/node_modules/sax/README.md
@@ -0,0 +1,225 @@
+# sax js
+
+A sax-style parser for XML and HTML.
+
+Designed with [node](http://nodejs.org/) in mind, but should work fine in
+the browser or other CommonJS implementations.
+
+## What This Is
+
+* A very simple tool to parse through an XML string.
+* A stepping stone to a streaming HTML parser.
+* A handy way to deal with RSS and other mostly-ok-but-kinda-broken XML
+  docs.
+
+## What This Is (probably) Not
+
+* An HTML Parser - That's a fine goal, but this isn't it.  It's just
+  XML.
+* A DOM Builder - You can use it to build an object model out of XML,
+  but it doesn't do that out of the box.
+* XSLT - No DOM = no querying.
+* 100% Compliant with (some other SAX implementation) - Most SAX
+  implementations are in Java and do a lot more than this does.
+* An XML Validator - It does a little validation when in strict mode, but
+  not much.
+* A Schema-Aware XSD Thing - Schemas are an exercise in fetishistic
+  masochism.
+* A DTD-aware Thing - Fetching DTDs is a much bigger job.
+
+## Regarding `<!DOCTYPE`s and `<!ENTITY`s
+
+The parser will handle the basic XML entities in text nodes and attribute
+values: `&amp; &lt; &gt; &apos; &quot;`. It's possible to define additional
+entities in XML by putting them in the DTD. This parser doesn't do anything
+with that. If you want to listen to the `ondoctype` event, and then fetch
+the doctypes, and read the entities and add them to `parser.ENTITIES`, then
+be my guest.
+
+Unknown entities will fail in strict mode, and in loose mode, will pass
+through unmolested.
+
+## Usage
+
+```javascript
+var sax = require("./lib/sax"),
+  strict = true, // set to false for html-mode
+  parser = sax.parser(strict);
+
+parser.onerror = function (e) {
+  // an error happened.
+};
+parser.ontext = function (t) {
+  // got some text.  t is the string of text.
+};
+parser.onopentag = function (node) {
+  // opened a tag.  node has "name" and "attributes"
+};
+parser.onattribute = function (attr) {
+  // an attribute.  attr has "name" and "value"
+};
+parser.onend = function () {
+  // parser stream is done, and ready to have more stuff written to it.
+};
+
+parser.write('<xml>Hello, <who name="world">world</who>!</xml>').close();
+
+// stream usage
+// takes the same options as the parser
+var saxStream = require("sax").createStream(strict, options)
+saxStream.on("error", function (e) {
+  // unhandled errors will throw, since this is a proper node
+  // event emitter.
+  console.error("error!", e)
+  // clear the error
+  this._parser.error = null
+  this._parser.resume()
+})
+saxStream.on("opentag", function (node) {
+  // same object as above
+})
+// pipe is supported, and it's readable/writable
+// same chunks coming in also go out.
+fs.createReadStream("file.xml")
+  .pipe(saxStream)
+  .pipe(fs.createWriteStream("file-copy.xml"))
+```
+
+
+## Arguments
+
+Pass the following arguments to the parser function.  All are optional.
+
+`strict` - Boolean. Whether or not to be a jerk. Default: `false`.
+
+`opt` - Object bag of settings regarding string formatting.  All default to `false`.
+
+Settings supported:
+
+* `trim` - Boolean. Whether or not to trim text and comment nodes.
+* `normalize` - Boolean. If true, then turn any whitespace into a single
+  space.
+* `lowercase` - Boolean. If true, then lowercase tag names and attribute names
+  in loose mode, rather than uppercasing them.
+* `xmlns` - Boolean. If true, then namespaces are supported.
+* `position` - Boolean. If false, then don't track line/col/position.
+* `strictEntities` - Boolean. If true, only parse [predefined XML
+  entities](http://www.w3.org/TR/REC-xml/#sec-predefined-ent)
+  (`&amp;`, `&apos;`, `&gt;`, `&lt;`, and `&quot;`)
+
+## Methods
+
+`write` - Write bytes onto the stream. You don't have to do this all at
+once. You can keep writing as much as you want.
+
+`close` - Close the stream. Once closed, no more data may be written until
+it is done processing the buffer, which is signaled by the `end` event.
+
+`resume` - To gracefully handle errors, assign a listener to the `error`
+event. Then, when the error is taken care of, you can call `resume` to
+continue parsing. Otherwise, the parser will not continue while in an error
+state.
+
+## Members
+
+At all times, the parser object will have the following members:
+
+`line`, `column`, `position` - Indications of the position in the XML
+document where the parser currently is looking.
+
+`startTagPosition` - Indicates the position where the current tag starts.
+
+`closed` - Boolean indicating whether or not the parser can be written to.
+If it's `true`, then wait for the `ready` event to write again.
+
+`strict` - Boolean indicating whether or not the parser is a jerk.
+
+`opt` - Any options passed into the constructor.
+
+`tag` - The current tag being dealt with.
+
+And a bunch of other stuff that you probably shouldn't touch.
+
+## Events
+
+All events emit with a single argument. To listen to an event, assign a
+function to `on<eventname>`. Functions get executed in the this-context of
+the parser object. The list of supported events are also in the exported
+`EVENTS` array.
+
+When using the stream interface, assign handlers using the EventEmitter
+`on` function in the normal fashion.
+
+`error` - Indication that something bad happened. The error will be hanging
+out on `parser.error`, and must be deleted before parsing can continue. By
+listening to this event, you can keep an eye on that kind of stuff. Note:
+this happens *much* more in strict mode. Argument: instance of `Error`.
+
+`text` - Text node. Argument: string of text.
+
+`doctype` - The `<!DOCTYPE` declaration. Argument: doctype string.
+
+`processinginstruction` - Stuff like `<?xml foo="blerg" ?>`. Argument:
+object with `name` and `body` members. Attributes are not parsed, as
+processing instructions have implementation dependent semantics.
+
+`sgmldeclaration` - Random SGML declarations. Stuff like `<!ENTITY p>`
+would trigger this kind of event. This is a weird thing to support, so it
+might go away at some point. SAX isn't intended to be used to parse SGML,
+after all.
+
+`opentagstart` - Emitted immediately when the tag name is available,
+but before any attributes are encountered.  Argument: object with a
+`name` field and an empty `attributes` set.  Note that this is the
+same object that will later be emitted in the `opentag` event.
+
+`opentag` - An opening tag. Argument: object with `name` and `attributes`.
+In non-strict mode, tag names are uppercased, unless the `lowercase`
+option is set.  If the `xmlns` option is set, then it will contain
+namespace binding information on the `ns` member, and will have a
+`local`, `prefix`, and `uri` member.
+
+`closetag` - A closing tag. In loose mode, tags are auto-closed if their
+parent closes. In strict mode, well-formedness is enforced. Note that
+self-closing tags will have `closeTag` emitted immediately after `openTag`.
+Argument: tag name.
+
+`attribute` - An attribute node.  Argument: object with `name` and `value`.
+In non-strict mode, attribute names are uppercased, unless the `lowercase`
+option is set.  If the `xmlns` option is set, it will also contains namespace
+information.
+
+`comment` - A comment node.  Argument: the string of the comment.
+
+`opencdata` - The opening tag of a `<![CDATA[` block.
+
+`cdata` - The text of a `<![CDATA[` block. Since `<![CDATA[` blocks can get
+quite large, this event may fire multiple times for a single block, if it
+is broken up into multiple `write()`s. Argument: the string of random
+character data.
+
+`closecdata` - The closing tag (`]]>`) of a `<![CDATA[` block.
+
+`opennamespace` - If the `xmlns` option is set, then this event will
+signal the start of a new namespace binding.
+
+`closenamespace` - If the `xmlns` option is set, then this event will
+signal the end of a namespace binding.
+
+`end` - Indication that the closed stream has ended.
+
+`ready` - Indication that the stream has reset, and is ready to be written
+to.
+
+`noscript` - In non-strict mode, `<script>` tags trigger a `"script"`
+event, and their contents are not checked for special xml characters.
+If you pass `noscript: true`, then this behavior is suppressed.
+
+## Reporting Problems
+
+It's best to write a failing test if you find an issue.  I will always
+accept pull requests with failing tests if they demonstrate intended
+behavior, but it is very hard to figure out what issue you're describing
+without a test.  Writing a test is also the best way for you yourself
+to figure out if you really understand the issue you think you have with
+sax-js.
diff --git a/scripts/metrics/node_modules/sax/lib/sax.js b/scripts/metrics/node_modules/sax/lib/sax.js
new file mode 100644
index 00000000000..795d607ef63
--- /dev/null
+++ b/scripts/metrics/node_modules/sax/lib/sax.js
@@ -0,0 +1,1565 @@
+;(function (sax) { // wrapper for non-node envs
+  sax.parser = function (strict, opt) { return new SAXParser(strict, opt) }
+  sax.SAXParser = SAXParser
+  sax.SAXStream = SAXStream
+  sax.createStream = createStream
+
+  // When we pass the MAX_BUFFER_LENGTH position, start checking for buffer overruns.
+  // When we check, schedule the next check for MAX_BUFFER_LENGTH - (max(buffer lengths)),
+  // since that's the earliest that a buffer overrun could occur.  This way, checks are
+  // as rare as required, but as often as necessary to ensure never crossing this bound.
+  // Furthermore, buffers are only tested at most once per write(), so passing a very
+  // large string into write() might have undesirable effects, but this is manageable by
+  // the caller, so it is assumed to be safe.  Thus, a call to write() may, in the extreme
+  // edge case, result in creating at most one complete copy of the string passed in.
+  // Set to Infinity to have unlimited buffers.
+  sax.MAX_BUFFER_LENGTH = 64 * 1024
+
+  var buffers = [
+    'comment', 'sgmlDecl', 'textNode', 'tagName', 'doctype',
+    'procInstName', 'procInstBody', 'entity', 'attribName',
+    'attribValue', 'cdata', 'script'
+  ]
+
+  sax.EVENTS = [
+    'text',
+    'processinginstruction',
+    'sgmldeclaration',
+    'doctype',
+    'comment',
+    'opentagstart',
+    'attribute',
+    'opentag',
+    'closetag',
+    'opencdata',
+    'cdata',
+    'closecdata',
+    'error',
+    'end',
+    'ready',
+    'script',
+    'opennamespace',
+    'closenamespace'
+  ]
+
+  function SAXParser (strict, opt) {
+    if (!(this instanceof SAXParser)) {
+      return new SAXParser(strict, opt)
+    }
+
+    var parser = this
+    clearBuffers(parser)
+    parser.q = parser.c = ''
+    parser.bufferCheckPosition = sax.MAX_BUFFER_LENGTH
+    parser.opt = opt || {}
+    parser.opt.lowercase = parser.opt.lowercase || parser.opt.lowercasetags
+    parser.looseCase = parser.opt.lowercase ? 'toLowerCase' : 'toUpperCase'
+    parser.tags = []
+    parser.closed = parser.closedRoot = parser.sawRoot = false
+    parser.tag = parser.error = null
+    parser.strict = !!strict
+    parser.noscript = !!(strict || parser.opt.noscript)
+    parser.state = S.BEGIN
+    parser.strictEntities = parser.opt.strictEntities
+    parser.ENTITIES = parser.strictEntities ? Object.create(sax.XML_ENTITIES) : Object.create(sax.ENTITIES)
+    parser.attribList = []
+
+    // namespaces form a prototype chain.
+    // it always points at the current tag,
+    // which protos to its parent tag.
+    if (parser.opt.xmlns) {
+      parser.ns = Object.create(rootNS)
+    }
+
+    // mostly just for error reporting
+    parser.trackPosition = parser.opt.position !== false
+    if (parser.trackPosition) {
+      parser.position = parser.line = parser.column = 0
+    }
+    emit(parser, 'onready')
+  }
+
+  if (!Object.create) {
+    Object.create = function (o) {
+      function F () {}
+      F.prototype = o
+      var newf = new F()
+      return newf
+    }
+  }
+
+  if (!Object.keys) {
+    Object.keys = function (o) {
+      var a = []
+      for (var i in o) if (o.hasOwnProperty(i)) a.push(i)
+      return a
+    }
+  }
+
+  function checkBufferLength (parser) {
+    var maxAllowed = Math.max(sax.MAX_BUFFER_LENGTH, 10)
+    var maxActual = 0
+    for (var i = 0, l = buffers.length; i < l; i++) {
+      var len = parser[buffers[i]].length
+      if (len > maxAllowed) {
+        // Text/cdata nodes can get big, and since they're buffered,
+        // we can get here under normal conditions.
+        // Avoid issues by emitting the text node now,
+        // so at least it won't get any bigger.
+        switch (buffers[i]) {
+          case 'textNode':
+            closeText(parser)
+            break
+
+          case 'cdata':
+            emitNode(parser, 'oncdata', parser.cdata)
+            parser.cdata = ''
+            break
+
+          case 'script':
+            emitNode(parser, 'onscript', parser.script)
+            parser.script = ''
+            break
+
+          default:
+            error(parser, 'Max buffer length exceeded: ' + buffers[i])
+        }
+      }
+      maxActual = Math.max(maxActual, len)
+    }
+    // schedule the next check for the earliest possible buffer overrun.
+    var m = sax.MAX_BUFFER_LENGTH - maxActual
+    parser.bufferCheckPosition = m + parser.position
+  }
+
+  function clearBuffers (parser) {
+    for (var i = 0, l = buffers.length; i < l; i++) {
+      parser[buffers[i]] = ''
+    }
+  }
+
+  function flushBuffers (parser) {
+    closeText(parser)
+    if (parser.cdata !== '') {
+      emitNode(parser, 'oncdata', parser.cdata)
+      parser.cdata = ''
+    }
+    if (parser.script !== '') {
+      emitNode(parser, 'onscript', parser.script)
+      parser.script = ''
+    }
+  }
+
+  SAXParser.prototype = {
+    end: function () { end(this) },
+    write: write,
+    resume: function () { this.error = null; return this },
+    close: function () { return this.write(null) },
+    flush: function () { flushBuffers(this) }
+  }
+
+  var Stream
+  try {
+    Stream = require('stream').Stream
+  } catch (ex) {
+    Stream = function () {}
+  }
+
+  var streamWraps = sax.EVENTS.filter(function (ev) {
+    return ev !== 'error' && ev !== 'end'
+  })
+
+  function createStream (strict, opt) {
+    return new SAXStream(strict, opt)
+  }
+
+  function SAXStream (strict, opt) {
+    if (!(this instanceof SAXStream)) {
+      return new SAXStream(strict, opt)
+    }
+
+    Stream.apply(this)
+
+    this._parser = new SAXParser(strict, opt)
+    this.writable = true
+    this.readable = true
+
+    var me = this
+
+    this._parser.onend = function () {
+      me.emit('end')
+    }
+
+    this._parser.onerror = function (er) {
+      me.emit('error', er)
+
+      // if didn't throw, then means error was handled.
+      // go ahead and clear error, so we can write again.
+      me._parser.error = null
+    }
+
+    this._decoder = null
+
+    streamWraps.forEach(function (ev) {
+      Object.defineProperty(me, 'on' + ev, {
+        get: function () {
+          return me._parser['on' + ev]
+        },
+        set: function (h) {
+          if (!h) {
+            me.removeAllListeners(ev)
+            me._parser['on' + ev] = h
+            return h
+          }
+          me.on(ev, h)
+        },
+        enumerable: true,
+        configurable: false
+      })
+    })
+  }
+
+  SAXStream.prototype = Object.create(Stream.prototype, {
+    constructor: {
+      value: SAXStream
+    }
+  })
+
+  SAXStream.prototype.write = function (data) {
+    if (typeof Buffer === 'function' &&
+      typeof Buffer.isBuffer === 'function' &&
+      Buffer.isBuffer(data)) {
+      if (!this._decoder) {
+        var SD = require('string_decoder').StringDecoder
+        this._decoder = new SD('utf8')
+      }
+      data = this._decoder.write(data)
+    }
+
+    this._parser.write(data.toString())
+    this.emit('data', data)
+    return true
+  }
+
+  SAXStream.prototype.end = function (chunk) {
+    if (chunk && chunk.length) {
+      this.write(chunk)
+    }
+    this._parser.end()
+    return true
+  }
+
+  SAXStream.prototype.on = function (ev, handler) {
+    var me = this
+    if (!me._parser['on' + ev] && streamWraps.indexOf(ev) !== -1) {
+      me._parser['on' + ev] = function () {
+        var args = arguments.length === 1 ? [arguments[0]] : Array.apply(null, arguments)
+        args.splice(0, 0, ev)
+        me.emit.apply(me, args)
+      }
+    }
+
+    return Stream.prototype.on.call(me, ev, handler)
+  }
+
+  // this really needs to be replaced with character classes.
+  // XML allows all manner of ridiculous numbers and digits.
+  var CDATA = '[CDATA['
+  var DOCTYPE = 'DOCTYPE'
+  var XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace'
+  var XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/'
+  var rootNS = { xml: XML_NAMESPACE, xmlns: XMLNS_NAMESPACE }
+
+  // http://www.w3.org/TR/REC-xml/#NT-NameStartChar
+  // This implementation works on strings, a single character at a time
+  // as such, it cannot ever support astral-plane characters (10000-EFFFF)
+  // without a significant breaking change to either this  parser, or the
+  // JavaScript language.  Implementation of an emoji-capable xml parser
+  // is left as an exercise for the reader.
+  var nameStart = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/
+
+  var nameBody = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/
+
+  var entityStart = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/
+  var entityBody = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/
+
+  function isWhitespace (c) {
+    return c === ' ' || c === '\n' || c === '\r' || c === '\t'
+  }
+
+  function isQuote (c) {
+    return c === '"' || c === '\''
+  }
+
+  function isAttribEnd (c) {
+    return c === '>' || isWhitespace(c)
+  }
+
+  function isMatch (regex, c) {
+    return regex.test(c)
+  }
+
+  function notMatch (regex, c) {
+    return !isMatch(regex, c)
+  }
+
+  var S = 0
+  sax.STATE = {
+    BEGIN: S++, // leading byte order mark or whitespace
+    BEGIN_WHITESPACE: S++, // leading whitespace
+    TEXT: S++, // general stuff
+    TEXT_ENTITY: S++, // &amp and such.
+    OPEN_WAKA: S++, // <
+    SGML_DECL: S++, // <!BLARG
+    SGML_DECL_QUOTED: S++, // <!BLARG foo "bar
+    DOCTYPE: S++, // <!DOCTYPE
+    DOCTYPE_QUOTED: S++, // <!DOCTYPE "//blah
+    DOCTYPE_DTD: S++, // <!DOCTYPE "//blah" [ ...
+    DOCTYPE_DTD_QUOTED: S++, // <!DOCTYPE "//blah" [ "foo
+    COMMENT_STARTING: S++, // <!-
+    COMMENT: S++, // <!--
+    COMMENT_ENDING: S++, // <!-- blah -
+    COMMENT_ENDED: S++, // <!-- blah --
+    CDATA: S++, // <![CDATA[ something
+    CDATA_ENDING: S++, // ]
+    CDATA_ENDING_2: S++, // ]]
+    PROC_INST: S++, // <?hi
+    PROC_INST_BODY: S++, // <?hi there
+    PROC_INST_ENDING: S++, // <?hi "there" ?
+    OPEN_TAG: S++, // <strong
+    OPEN_TAG_SLASH: S++, // <strong /
+    ATTRIB: S++, // <a
+    ATTRIB_NAME: S++, // <a foo
+    ATTRIB_NAME_SAW_WHITE: S++, // <a foo _
+    ATTRIB_VALUE: S++, // <a foo=
+    ATTRIB_VALUE_QUOTED: S++, // <a foo="bar
+    ATTRIB_VALUE_CLOSED: S++, // <a foo="bar"
+    ATTRIB_VALUE_UNQUOTED: S++, // <a foo=bar
+    ATTRIB_VALUE_ENTITY_Q: S++, // <foo bar="&quot;"
+    ATTRIB_VALUE_ENTITY_U: S++, // <foo bar=&quot
+    CLOSE_TAG: S++, // </a
+    CLOSE_TAG_SAW_WHITE: S++, // </a   >
+    SCRIPT: S++, // <script> ...
+    SCRIPT_ENDING: S++ // <script> ... <
+  }
+
+  sax.XML_ENTITIES = {
+    'amp': '&',
+    'gt': '>',
+    'lt': '<',
+    'quot': '"',
+    'apos': "'"
+  }
+
+  sax.ENTITIES = {
+    'amp': '&',
+    'gt': '>',
+    'lt': '<',
+    'quot': '"',
+    'apos': "'",
+    'AElig': 198,
+    'Aacute': 193,
+    'Acirc': 194,
+    'Agrave': 192,
+    'Aring': 197,
+    'Atilde': 195,
+    'Auml': 196,
+    'Ccedil': 199,
+    'ETH': 208,
+    'Eacute': 201,
+    'Ecirc': 202,
+    'Egrave': 200,
+    'Euml': 203,
+    'Iacute': 205,
+    'Icirc': 206,
+    'Igrave': 204,
+    'Iuml': 207,
+    'Ntilde': 209,
+    'Oacute': 211,
+    'Ocirc': 212,
+    'Ograve': 210,
+    'Oslash': 216,
+    'Otilde': 213,
+    'Ouml': 214,
+    'THORN': 222,
+    'Uacute': 218,
+    'Ucirc': 219,
+    'Ugrave': 217,
+    'Uuml': 220,
+    'Yacute': 221,
+    'aacute': 225,
+    'acirc': 226,
+    'aelig': 230,
+    'agrave': 224,
+    'aring': 229,
+    'atilde': 227,
+    'auml': 228,
+    'ccedil': 231,
+    'eacute': 233,
+    'ecirc': 234,
+    'egrave': 232,
+    'eth': 240,
+    'euml': 235,
+    'iacute': 237,
+    'icirc': 238,
+    'igrave': 236,
+    'iuml': 239,
+    'ntilde': 241,
+    'oacute': 243,
+    'ocirc': 244,
+    'ograve': 242,
+    'oslash': 248,
+    'otilde': 245,
+    'ouml': 246,
+    'szlig': 223,
+    'thorn': 254,
+    'uacute': 250,
+    'ucirc': 251,
+    'ugrave': 249,
+    'uuml': 252,
+    'yacute': 253,
+    'yuml': 255,
+    'copy': 169,
+    'reg': 174,
+    'nbsp': 160,
+    'iexcl': 161,
+    'cent': 162,
+    'pound': 163,
+    'curren': 164,
+    'yen': 165,
+    'brvbar': 166,
+    'sect': 167,
+    'uml': 168,
+    'ordf': 170,
+    'laquo': 171,
+    'not': 172,
+    'shy': 173,
+    'macr': 175,
+    'deg': 176,
+    'plusmn': 177,
+    'sup1': 185,
+    'sup2': 178,
+    'sup3': 179,
+    'acute': 180,
+    'micro': 181,
+    'para': 182,
+    'middot': 183,
+    'cedil': 184,
+    'ordm': 186,
+    'raquo': 187,
+    'frac14': 188,
+    'frac12': 189,
+    'frac34': 190,
+    'iquest': 191,
+    'times': 215,
+    'divide': 247,
+    'OElig': 338,
+    'oelig': 339,
+    'Scaron': 352,
+    'scaron': 353,
+    'Yuml': 376,
+    'fnof': 402,
+    'circ': 710,
+    'tilde': 732,
+    'Alpha': 913,
+    'Beta': 914,
+    'Gamma': 915,
+    'Delta': 916,
+    'Epsilon': 917,
+    'Zeta': 918,
+    'Eta': 919,
+    'Theta': 920,
+    'Iota': 921,
+    'Kappa': 922,
+    'Lambda': 923,
+    'Mu': 924,
+    'Nu': 925,
+    'Xi': 926,
+    'Omicron': 927,
+    'Pi': 928,
+    'Rho': 929,
+    'Sigma': 931,
+    'Tau': 932,
+    'Upsilon': 933,
+    'Phi': 934,
+    'Chi': 935,
+    'Psi': 936,
+    'Omega': 937,
+    'alpha': 945,
+    'beta': 946,
+    'gamma': 947,
+    'delta': 948,
+    'epsilon': 949,
+    'zeta': 950,
+    'eta': 951,
+    'theta': 952,
+    'iota': 953,
+    'kappa': 954,
+    'lambda': 955,
+    'mu': 956,
+    'nu': 957,
+    'xi': 958,
+    'omicron': 959,
+    'pi': 960,
+    'rho': 961,
+    'sigmaf': 962,
+    'sigma': 963,
+    'tau': 964,
+    'upsilon': 965,
+    'phi': 966,
+    'chi': 967,
+    'psi': 968,
+    'omega': 969,
+    'thetasym': 977,
+    'upsih': 978,
+    'piv': 982,
+    'ensp': 8194,
+    'emsp': 8195,
+    'thinsp': 8201,
+    'zwnj': 8204,
+    'zwj': 8205,
+    'lrm': 8206,
+    'rlm': 8207,
+    'ndash': 8211,
+    'mdash': 8212,
+    'lsquo': 8216,
+    'rsquo': 8217,
+    'sbquo': 8218,
+    'ldquo': 8220,
+    'rdquo': 8221,
+    'bdquo': 8222,
+    'dagger': 8224,
+    'Dagger': 8225,
+    'bull': 8226,
+    'hellip': 8230,
+    'permil': 8240,
+    'prime': 8242,
+    'Prime': 8243,
+    'lsaquo': 8249,
+    'rsaquo': 8250,
+    'oline': 8254,
+    'frasl': 8260,
+    'euro': 8364,
+    'image': 8465,
+    'weierp': 8472,
+    'real': 8476,
+    'trade': 8482,
+    'alefsym': 8501,
+    'larr': 8592,
+    'uarr': 8593,
+    'rarr': 8594,
+    'darr': 8595,
+    'harr': 8596,
+    'crarr': 8629,
+    'lArr': 8656,
+    'uArr': 8657,
+    'rArr': 8658,
+    'dArr': 8659,
+    'hArr': 8660,
+    'forall': 8704,
+    'part': 8706,
+    'exist': 8707,
+    'empty': 8709,
+    'nabla': 8711,
+    'isin': 8712,
+    'notin': 8713,
+    'ni': 8715,
+    'prod': 8719,
+    'sum': 8721,
+    'minus': 8722,
+    'lowast': 8727,
+    'radic': 8730,
+    'prop': 8733,
+    'infin': 8734,
+    'ang': 8736,
+    'and': 8743,
+    'or': 8744,
+    'cap': 8745,
+    'cup': 8746,
+    'int': 8747,
+    'there4': 8756,
+    'sim': 8764,
+    'cong': 8773,
+    'asymp': 8776,
+    'ne': 8800,
+    'equiv': 8801,
+    'le': 8804,
+    'ge': 8805,
+    'sub': 8834,
+    'sup': 8835,
+    'nsub': 8836,
+    'sube': 8838,
+    'supe': 8839,
+    'oplus': 8853,
+    'otimes': 8855,
+    'perp': 8869,
+    'sdot': 8901,
+    'lceil': 8968,
+    'rceil': 8969,
+    'lfloor': 8970,
+    'rfloor': 8971,
+    'lang': 9001,
+    'rang': 9002,
+    'loz': 9674,
+    'spades': 9824,
+    'clubs': 9827,
+    'hearts': 9829,
+    'diams': 9830
+  }
+
+  Object.keys(sax.ENTITIES).forEach(function (key) {
+    var e = sax.ENTITIES[key]
+    var s = typeof e === 'number' ? String.fromCharCode(e) : e
+    sax.ENTITIES[key] = s
+  })
+
+  for (var s in sax.STATE) {
+    sax.STATE[sax.STATE[s]] = s
+  }
+
+  // shorthand
+  S = sax.STATE
+
+  function emit (parser, event, data) {
+    parser[event] && parser[event](data)
+  }
+
+  function emitNode (parser, nodeType, data) {
+    if (parser.textNode) closeText(parser)
+    emit(parser, nodeType, data)
+  }
+
+  function closeText (parser) {
+    parser.textNode = textopts(parser.opt, parser.textNode)
+    if (parser.textNode) emit(parser, 'ontext', parser.textNode)
+    parser.textNode = ''
+  }
+
+  function textopts (opt, text) {
+    if (opt.trim) text = text.trim()
+    if (opt.normalize) text = text.replace(/\s+/g, ' ')
+    return text
+  }
+
+  function error (parser, er) {
+    closeText(parser)
+    if (parser.trackPosition) {
+      er += '\nLine: ' + parser.line +
+        '\nColumn: ' + parser.column +
+        '\nChar: ' + parser.c
+    }
+    er = new Error(er)
+    parser.error = er
+    emit(parser, 'onerror', er)
+    return parser
+  }
+
+  function end (parser) {
+    if (parser.sawRoot && !parser.closedRoot) strictFail(parser, 'Unclosed root tag')
+    if ((parser.state !== S.BEGIN) &&
+      (parser.state !== S.BEGIN_WHITESPACE) &&
+      (parser.state !== S.TEXT)) {
+      error(parser, 'Unexpected end')
+    }
+    closeText(parser)
+    parser.c = ''
+    parser.closed = true
+    emit(parser, 'onend')
+    SAXParser.call(parser, parser.strict, parser.opt)
+    return parser
+  }
+
+  function strictFail (parser, message) {
+    if (typeof parser !== 'object' || !(parser instanceof SAXParser)) {
+      throw new Error('bad call to strictFail')
+    }
+    if (parser.strict) {
+      error(parser, message)
+    }
+  }
+
+  function newTag (parser) {
+    if (!parser.strict) parser.tagName = parser.tagName[parser.looseCase]()
+    var parent = parser.tags[parser.tags.length - 1] || parser
+    var tag = parser.tag = { name: parser.tagName, attributes: {} }
+
+    // will be overridden if tag contails an xmlns="foo" or xmlns:foo="bar"
+    if (parser.opt.xmlns) {
+      tag.ns = parent.ns
+    }
+    parser.attribList.length = 0
+    emitNode(parser, 'onopentagstart', tag)
+  }
+
+  function qname (name, attribute) {
+    var i = name.indexOf(':')
+    var qualName = i < 0 ? [ '', name ] : name.split(':')
+    var prefix = qualName[0]
+    var local = qualName[1]
+
+    // <x "xmlns"="http://foo">
+    if (attribute && name === 'xmlns') {
+      prefix = 'xmlns'
+      local = ''
+    }
+
+    return { prefix: prefix, local: local }
+  }
+
+  function attrib (parser) {
+    if (!parser.strict) {
+      parser.attribName = parser.attribName[parser.looseCase]()
+    }
+
+    if (parser.attribList.indexOf(parser.attribName) !== -1 ||
+      parser.tag.attributes.hasOwnProperty(parser.attribName)) {
+      parser.attribName = parser.attribValue = ''
+      return
+    }
+
+    if (parser.opt.xmlns) {
+      var qn = qname(parser.attribName, true)
+      var prefix = qn.prefix
+      var local = qn.local
+
+      if (prefix === 'xmlns') {
+        // namespace binding attribute. push the binding into scope
+        if (local === 'xml' && parser.attribValue !== XML_NAMESPACE) {
+          strictFail(parser,
+            'xml: prefix must be bound to ' + XML_NAMESPACE + '\n' +
+            'Actual: ' + parser.attribValue)
+        } else if (local === 'xmlns' && parser.attribValue !== XMLNS_NAMESPACE) {
+          strictFail(parser,
+            'xmlns: prefix must be bound to ' + XMLNS_NAMESPACE + '\n' +
+            'Actual: ' + parser.attribValue)
+        } else {
+          var tag = parser.tag
+          var parent = parser.tags[parser.tags.length - 1] || parser
+          if (tag.ns === parent.ns) {
+            tag.ns = Object.create(parent.ns)
+          }
+          tag.ns[local] = parser.attribValue
+        }
+      }
+
+      // defer onattribute events until all attributes have been seen
+      // so any new bindings can take effect. preserve attribute order
+      // so deferred events can be emitted in document order
+      parser.attribList.push([parser.attribName, parser.attribValue])
+    } else {
+      // in non-xmlns mode, we can emit the event right away
+      parser.tag.attributes[parser.attribName] = parser.attribValue
+      emitNode(parser, 'onattribute', {
+        name: parser.attribName,
+        value: parser.attribValue
+      })
+    }
+
+    parser.attribName = parser.attribValue = ''
+  }
+
+  function openTag (parser, selfClosing) {
+    if (parser.opt.xmlns) {
+      // emit namespace binding events
+      var tag = parser.tag
+
+      // add namespace info to tag
+      var qn = qname(parser.tagName)
+      tag.prefix = qn.prefix
+      tag.local = qn.local
+      tag.uri = tag.ns[qn.prefix] || ''
+
+      if (tag.prefix && !tag.uri) {
+        strictFail(parser, 'Unbound namespace prefix: ' +
+          JSON.stringify(parser.tagName))
+        tag.uri = qn.prefix
+      }
+
+      var parent = parser.tags[parser.tags.length - 1] || parser
+      if (tag.ns && parent.ns !== tag.ns) {
+        Object.keys(tag.ns).forEach(function (p) {
+          emitNode(parser, 'onopennamespace', {
+            prefix: p,
+            uri: tag.ns[p]
+          })
+        })
+      }
+
+      // handle deferred onattribute events
+      // Note: do not apply default ns to attributes:
+      //   http://www.w3.org/TR/REC-xml-names/#defaulting
+      for (var i = 0, l = parser.attribList.length; i < l; i++) {
+        var nv = parser.attribList[i]
+        var name = nv[0]
+        var value = nv[1]
+        var qualName = qname(name, true)
+        var prefix = qualName.prefix
+        var local = qualName.local
+        var uri = prefix === '' ? '' : (tag.ns[prefix] || '')
+        var a = {
+          name: name,
+          value: value,
+          prefix: prefix,
+          local: local,
+          uri: uri
+        }
+
+        // if there's any attributes with an undefined namespace,
+        // then fail on them now.
+        if (prefix && prefix !== 'xmlns' && !uri) {
+          strictFail(parser, 'Unbound namespace prefix: ' +
+            JSON.stringify(prefix))
+          a.uri = prefix
+        }
+        parser.tag.attributes[name] = a
+        emitNode(parser, 'onattribute', a)
+      }
+      parser.attribList.length = 0
+    }
+
+    parser.tag.isSelfClosing = !!selfClosing
+
+    // process the tag
+    parser.sawRoot = true
+    parser.tags.push(parser.tag)
+    emitNode(parser, 'onopentag', parser.tag)
+    if (!selfClosing) {
+      // special case for <script> in non-strict mode.
+      if (!parser.noscript && parser.tagName.toLowerCase() === 'script') {
+        parser.state = S.SCRIPT
+      } else {
+        parser.state = S.TEXT
+      }
+      parser.tag = null
+      parser.tagName = ''
+    }
+    parser.attribName = parser.attribValue = ''
+    parser.attribList.length = 0
+  }
+
+  function closeTag (parser) {
+    if (!parser.tagName) {
+      strictFail(parser, 'Weird empty close tag.')
+      parser.textNode += '</>'
+      parser.state = S.TEXT
+      return
+    }
+
+    if (parser.script) {
+      if (parser.tagName !== 'script') {
+        parser.script += '</' + parser.tagName + '>'
+        parser.tagName = ''
+        parser.state = S.SCRIPT
+        return
+      }
+      emitNode(parser, 'onscript', parser.script)
+      parser.script = ''
+    }
+
+    // first make sure that the closing tag actually exists.
+    // <a><b></c></b></a> will close everything, otherwise.
+    var t = parser.tags.length
+    var tagName = parser.tagName
+    if (!parser.strict) {
+      tagName = tagName[parser.looseCase]()
+    }
+    var closeTo = tagName
+    while (t--) {
+      var close = parser.tags[t]
+      if (close.name !== closeTo) {
+        // fail the first time in strict mode
+        strictFail(parser, 'Unexpected close tag')
+      } else {
+        break
+      }
+    }
+
+    // didn't find it.  we already failed for strict, so just abort.
+    if (t < 0) {
+      strictFail(parser, 'Unmatched closing tag: ' + parser.tagName)
+      parser.textNode += '</' + parser.tagName + '>'
+      parser.state = S.TEXT
+      return
+    }
+    parser.tagName = tagName
+    var s = parser.tags.length
+    while (s-- > t) {
+      var tag = parser.tag = parser.tags.pop()
+      parser.tagName = parser.tag.name
+      emitNode(parser, 'onclosetag', parser.tagName)
+
+      var x = {}
+      for (var i in tag.ns) {
+        x[i] = tag.ns[i]
+      }
+
+      var parent = parser.tags[parser.tags.length - 1] || parser
+      if (parser.opt.xmlns && tag.ns !== parent.ns) {
+        // remove namespace bindings introduced by tag
+        Object.keys(tag.ns).forEach(function (p) {
+          var n = tag.ns[p]
+          emitNode(parser, 'onclosenamespace', { prefix: p, uri: n })
+        })
+      }
+    }
+    if (t === 0) parser.closedRoot = true
+    parser.tagName = parser.attribValue = parser.attribName = ''
+    parser.attribList.length = 0
+    parser.state = S.TEXT
+  }
+
+  function parseEntity (parser) {
+    var entity = parser.entity
+    var entityLC = entity.toLowerCase()
+    var num
+    var numStr = ''
+
+    if (parser.ENTITIES[entity]) {
+      return parser.ENTITIES[entity]
+    }
+    if (parser.ENTITIES[entityLC]) {
+      return parser.ENTITIES[entityLC]
+    }
+    entity = entityLC
+    if (entity.charAt(0) === '#') {
+      if (entity.charAt(1) === 'x') {
+        entity = entity.slice(2)
+        num = parseInt(entity, 16)
+        numStr = num.toString(16)
+      } else {
+        entity = entity.slice(1)
+        num = parseInt(entity, 10)
+        numStr = num.toString(10)
+      }
+    }
+    entity = entity.replace(/^0+/, '')
+    if (isNaN(num) || numStr.toLowerCase() !== entity) {
+      strictFail(parser, 'Invalid character entity')
+      return '&' + parser.entity + ';'
+    }
+
+    return String.fromCodePoint(num)
+  }
+
+  function beginWhiteSpace (parser, c) {
+    if (c === '<') {
+      parser.state = S.OPEN_WAKA
+      parser.startTagPosition = parser.position
+    } else if (!isWhitespace(c)) {
+      // have to process this as a text node.
+      // weird, but happens.
+      strictFail(parser, 'Non-whitespace before first tag.')
+      parser.textNode = c
+      parser.state = S.TEXT
+    }
+  }
+
+  function charAt (chunk, i) {
+    var result = ''
+    if (i < chunk.length) {
+      result = chunk.charAt(i)
+    }
+    return result
+  }
+
+  function write (chunk) {
+    var parser = this
+    if (this.error) {
+      throw this.error
+    }
+    if (parser.closed) {
+      return error(parser,
+        'Cannot write after close. Assign an onready handler.')
+    }
+    if (chunk === null) {
+      return end(parser)
+    }
+    if (typeof chunk === 'object') {
+      chunk = chunk.toString()
+    }
+    var i = 0
+    var c = ''
+    while (true) {
+      c = charAt(chunk, i++)
+      parser.c = c
+
+      if (!c) {
+        break
+      }
+
+      if (parser.trackPosition) {
+        parser.position++
+        if (c === '\n') {
+          parser.line++
+          parser.column = 0
+        } else {
+          parser.column++
+        }
+      }
+
+      switch (parser.state) {
+        case S.BEGIN:
+          parser.state = S.BEGIN_WHITESPACE
+          if (c === '\uFEFF') {
+            continue
+          }
+          beginWhiteSpace(parser, c)
+          continue
+
+        case S.BEGIN_WHITESPACE:
+          beginWhiteSpace(parser, c)
+          continue
+
+        case S.TEXT:
+          if (parser.sawRoot && !parser.closedRoot) {
+            var starti = i - 1
+            while (c && c !== '<' && c !== '&') {
+              c = charAt(chunk, i++)
+              if (c && parser.trackPosition) {
+                parser.position++
+                if (c === '\n') {
+                  parser.line++
+                  parser.column = 0
+                } else {
+                  parser.column++
+                }
+              }
+            }
+            parser.textNode += chunk.substring(starti, i - 1)
+          }
+          if (c === '<' && !(parser.sawRoot && parser.closedRoot && !parser.strict)) {
+            parser.state = S.OPEN_WAKA
+            parser.startTagPosition = parser.position
+          } else {
+            if (!isWhitespace(c) && (!parser.sawRoot || parser.closedRoot)) {
+              strictFail(parser, 'Text data outside of root node.')
+            }
+            if (c === '&') {
+              parser.state = S.TEXT_ENTITY
+            } else {
+              parser.textNode += c
+            }
+          }
+          continue
+
+        case S.SCRIPT:
+          // only non-strict
+          if (c === '<') {
+            parser.state = S.SCRIPT_ENDING
+          } else {
+            parser.script += c
+          }
+          continue
+
+        case S.SCRIPT_ENDING:
+          if (c === '/') {
+            parser.state = S.CLOSE_TAG
+          } else {
+            parser.script += '<' + c
+            parser.state = S.SCRIPT
+          }
+          continue
+
+        case S.OPEN_WAKA:
+          // either a /, ?, !, or text is coming next.
+          if (c === '!') {
+            parser.state = S.SGML_DECL
+            parser.sgmlDecl = ''
+          } else if (isWhitespace(c)) {
+            // wait for it...
+          } else if (isMatch(nameStart, c)) {
+            parser.state = S.OPEN_TAG
+            parser.tagName = c
+          } else if (c === '/') {
+            parser.state = S.CLOSE_TAG
+            parser.tagName = ''
+          } else if (c === '?') {
+            parser.state = S.PROC_INST
+            parser.procInstName = parser.procInstBody = ''
+          } else {
+            strictFail(parser, 'Unencoded <')
+            // if there was some whitespace, then add that in.
+            if (parser.startTagPosition + 1 < parser.position) {
+              var pad = parser.position - parser.startTagPosition
+              c = new Array(pad).join(' ') + c
+            }
+            parser.textNode += '<' + c
+            parser.state = S.TEXT
+          }
+          continue
+
+        case S.SGML_DECL:
+          if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
+            emitNode(parser, 'onopencdata')
+            parser.state = S.CDATA
+            parser.sgmlDecl = ''
+            parser.cdata = ''
+          } else if (parser.sgmlDecl + c === '--') {
+            parser.state = S.COMMENT
+            parser.comment = ''
+            parser.sgmlDecl = ''
+          } else if ((parser.sgmlDecl + c).toUpperCase() === DOCTYPE) {
+            parser.state = S.DOCTYPE
+            if (parser.doctype || parser.sawRoot) {
+              strictFail(parser,
+                'Inappropriately located doctype declaration')
+            }
+            parser.doctype = ''
+            parser.sgmlDecl = ''
+          } else if (c === '>') {
+            emitNode(parser, 'onsgmldeclaration', parser.sgmlDecl)
+            parser.sgmlDecl = ''
+            parser.state = S.TEXT
+          } else if (isQuote(c)) {
+            parser.state = S.SGML_DECL_QUOTED
+            parser.sgmlDecl += c
+          } else {
+            parser.sgmlDecl += c
+          }
+          continue
+
+        case S.SGML_DECL_QUOTED:
+          if (c === parser.q) {
+            parser.state = S.SGML_DECL
+            parser.q = ''
+          }
+          parser.sgmlDecl += c
+          continue
+
+        case S.DOCTYPE:
+          if (c === '>') {
+            parser.state = S.TEXT
+            emitNode(parser, 'ondoctype', parser.doctype)
+            parser.doctype = true // just remember that we saw it.
+          } else {
+            parser.doctype += c
+            if (c === '[') {
+              parser.state = S.DOCTYPE_DTD
+            } else if (isQuote(c)) {
+              parser.state = S.DOCTYPE_QUOTED
+              parser.q = c
+            }
+          }
+          continue
+
+        case S.DOCTYPE_QUOTED:
+          parser.doctype += c
+          if (c === parser.q) {
+            parser.q = ''
+            parser.state = S.DOCTYPE
+          }
+          continue
+
+        case S.DOCTYPE_DTD:
+          parser.doctype += c
+          if (c === ']') {
+            parser.state = S.DOCTYPE
+          } else if (isQuote(c)) {
+            parser.state = S.DOCTYPE_DTD_QUOTED
+            parser.q = c
+          }
+          continue
+
+        case S.DOCTYPE_DTD_QUOTED:
+          parser.doctype += c
+          if (c === parser.q) {
+            parser.state = S.DOCTYPE_DTD
+            parser.q = ''
+          }
+          continue
+
+        case S.COMMENT:
+          if (c === '-') {
+            parser.state = S.COMMENT_ENDING
+          } else {
+            parser.comment += c
+          }
+          continue
+
+        case S.COMMENT_ENDING:
+          if (c === '-') {
+            parser.state = S.COMMENT_ENDED
+            parser.comment = textopts(parser.opt, parser.comment)
+            if (parser.comment) {
+              emitNode(parser, 'oncomment', parser.comment)
+            }
+            parser.comment = ''
+          } else {
+            parser.comment += '-' + c
+            parser.state = S.COMMENT
+          }
+          continue
+
+        case S.COMMENT_ENDED:
+          if (c !== '>') {
+            strictFail(parser, 'Malformed comment')
+            // allow <!-- blah -- bloo --> in non-strict mode,
+            // which is a comment of " blah -- bloo "
+            parser.comment += '--' + c
+            parser.state = S.COMMENT
+          } else {
+            parser.state = S.TEXT
+          }
+          continue
+
+        case S.CDATA:
+          if (c === ']') {
+            parser.state = S.CDATA_ENDING
+          } else {
+            parser.cdata += c
+          }
+          continue
+
+        case S.CDATA_ENDING:
+          if (c === ']') {
+            parser.state = S.CDATA_ENDING_2
+          } else {
+            parser.cdata += ']' + c
+            parser.state = S.CDATA
+          }
+          continue
+
+        case S.CDATA_ENDING_2:
+          if (c === '>') {
+            if (parser.cdata) {
+              emitNode(parser, 'oncdata', parser.cdata)
+            }
+            emitNode(parser, 'onclosecdata')
+            parser.cdata = ''
+            parser.state = S.TEXT
+          } else if (c === ']') {
+            parser.cdata += ']'
+          } else {
+            parser.cdata += ']]' + c
+            parser.state = S.CDATA
+          }
+          continue
+
+        case S.PROC_INST:
+          if (c === '?') {
+            parser.state = S.PROC_INST_ENDING
+          } else if (isWhitespace(c)) {
+            parser.state = S.PROC_INST_BODY
+          } else {
+            parser.procInstName += c
+          }
+          continue
+
+        case S.PROC_INST_BODY:
+          if (!parser.procInstBody && isWhitespace(c)) {
+            continue
+          } else if (c === '?') {
+            parser.state = S.PROC_INST_ENDING
+          } else {
+            parser.procInstBody += c
+          }
+          continue
+
+        case S.PROC_INST_ENDING:
+          if (c === '>') {
+            emitNode(parser, 'onprocessinginstruction', {
+              name: parser.procInstName,
+              body: parser.procInstBody
+            })
+            parser.procInstName = parser.procInstBody = ''
+            parser.state = S.TEXT
+          } else {
+            parser.procInstBody += '?' + c
+            parser.state = S.PROC_INST_BODY
+          }
+          continue
+
+        case S.OPEN_TAG:
+          if (isMatch(nameBody, c)) {
+            parser.tagName += c
+          } else {
+            newTag(parser)
+            if (c === '>') {
+              openTag(parser)
+            } else if (c === '/') {
+              parser.state = S.OPEN_TAG_SLASH
+            } else {
+              if (!isWhitespace(c)) {
+                strictFail(parser, 'Invalid character in tag name')
+              }
+              parser.state = S.ATTRIB
+            }
+          }
+          continue
+
+        case S.OPEN_TAG_SLASH:
+          if (c === '>') {
+            openTag(parser, true)
+            closeTag(parser)
+          } else {
+            strictFail(parser, 'Forward-slash in opening tag not followed by >')
+            parser.state = S.ATTRIB
+          }
+          continue
+
+        case S.ATTRIB:
+          // haven't read the attribute name yet.
+          if (isWhitespace(c)) {
+            continue
+          } else if (c === '>') {
+            openTag(parser)
+          } else if (c === '/') {
+            parser.state = S.OPEN_TAG_SLASH
+          } else if (isMatch(nameStart, c)) {
+            parser.attribName = c
+            parser.attribValue = ''
+            parser.state = S.ATTRIB_NAME
+          } else {
+            strictFail(parser, 'Invalid attribute name')
+          }
+          continue
+
+        case S.ATTRIB_NAME:
+          if (c === '=') {
+            parser.state = S.ATTRIB_VALUE
+          } else if (c === '>') {
+            strictFail(parser, 'Attribute without value')
+            parser.attribValue = parser.attribName
+            attrib(parser)
+            openTag(parser)
+          } else if (isWhitespace(c)) {
+            parser.state = S.ATTRIB_NAME_SAW_WHITE
+          } else if (isMatch(nameBody, c)) {
+            parser.attribName += c
+          } else {
+            strictFail(parser, 'Invalid attribute name')
+          }
+          continue
+
+        case S.ATTRIB_NAME_SAW_WHITE:
+          if (c === '=') {
+            parser.state = S.ATTRIB_VALUE
+          } else if (isWhitespace(c)) {
+            continue
+          } else {
+            strictFail(parser, 'Attribute without value')
+            parser.tag.attributes[parser.attribName] = ''
+            parser.attribValue = ''
+            emitNode(parser, 'onattribute', {
+              name: parser.attribName,
+              value: ''
+            })
+            parser.attribName = ''
+            if (c === '>') {
+              openTag(parser)
+            } else if (isMatch(nameStart, c)) {
+              parser.attribName = c
+              parser.state = S.ATTRIB_NAME
+            } else {
+              strictFail(parser, 'Invalid attribute name')
+              parser.state = S.ATTRIB
+            }
+          }
+          continue
+
+        case S.ATTRIB_VALUE:
+          if (isWhitespace(c)) {
+            continue
+          } else if (isQuote(c)) {
+            parser.q = c
+            parser.state = S.ATTRIB_VALUE_QUOTED
+          } else {
+            strictFail(parser, 'Unquoted attribute value')
+            parser.state = S.ATTRIB_VALUE_UNQUOTED
+            parser.attribValue = c
+          }
+          continue
+
+        case S.ATTRIB_VALUE_QUOTED:
+          if (c !== parser.q) {
+            if (c === '&') {
+              parser.state = S.ATTRIB_VALUE_ENTITY_Q
+            } else {
+              parser.attribValue += c
+            }
+            continue
+          }
+          attrib(parser)
+          parser.q = ''
+          parser.state = S.ATTRIB_VALUE_CLOSED
+          continue
+
+        case S.ATTRIB_VALUE_CLOSED:
+          if (isWhitespace(c)) {
+            parser.state = S.ATTRIB
+          } else if (c === '>') {
+            openTag(parser)
+          } else if (c === '/') {
+            parser.state = S.OPEN_TAG_SLASH
+          } else if (isMatch(nameStart, c)) {
+            strictFail(parser, 'No whitespace between attributes')
+            parser.attribName = c
+            parser.attribValue = ''
+            parser.state = S.ATTRIB_NAME
+          } else {
+            strictFail(parser, 'Invalid attribute name')
+          }
+          continue
+
+        case S.ATTRIB_VALUE_UNQUOTED:
+          if (!isAttribEnd(c)) {
+            if (c === '&') {
+              parser.state = S.ATTRIB_VALUE_ENTITY_U
+            } else {
+              parser.attribValue += c
+            }
+            continue
+          }
+          attrib(parser)
+          if (c === '>') {
+            openTag(parser)
+          } else {
+            parser.state = S.ATTRIB
+          }
+          continue
+
+        case S.CLOSE_TAG:
+          if (!parser.tagName) {
+            if (isWhitespace(c)) {
+              continue
+            } else if (notMatch(nameStart, c)) {
+              if (parser.script) {
+                parser.script += '</' + c
+                parser.state = S.SCRIPT
+              } else {
+                strictFail(parser, 'Invalid tagname in closing tag.')
+              }
+            } else {
+              parser.tagName = c
+            }
+          } else if (c === '>') {
+            closeTag(parser)
+          } else if (isMatch(nameBody, c)) {
+            parser.tagName += c
+          } else if (parser.script) {
+            parser.script += '</' + parser.tagName
+            parser.tagName = ''
+            parser.state = S.SCRIPT
+          } else {
+            if (!isWhitespace(c)) {
+              strictFail(parser, 'Invalid tagname in closing tag')
+            }
+            parser.state = S.CLOSE_TAG_SAW_WHITE
+          }
+          continue
+
+        case S.CLOSE_TAG_SAW_WHITE:
+          if (isWhitespace(c)) {
+            continue
+          }
+          if (c === '>') {
+            closeTag(parser)
+          } else {
+            strictFail(parser, 'Invalid characters in closing tag')
+          }
+          continue
+
+        case S.TEXT_ENTITY:
+        case S.ATTRIB_VALUE_ENTITY_Q:
+        case S.ATTRIB_VALUE_ENTITY_U:
+          var returnState
+          var buffer
+          switch (parser.state) {
+            case S.TEXT_ENTITY:
+              returnState = S.TEXT
+              buffer = 'textNode'
+              break
+
+            case S.ATTRIB_VALUE_ENTITY_Q:
+              returnState = S.ATTRIB_VALUE_QUOTED
+              buffer = 'attribValue'
+              break
+
+            case S.ATTRIB_VALUE_ENTITY_U:
+              returnState = S.ATTRIB_VALUE_UNQUOTED
+              buffer = 'attribValue'
+              break
+          }
+
+          if (c === ';') {
+            parser[buffer] += parseEntity(parser)
+            parser.entity = ''
+            parser.state = returnState
+          } else if (isMatch(parser.entity.length ? entityBody : entityStart, c)) {
+            parser.entity += c
+          } else {
+            strictFail(parser, 'Invalid character in entity name')
+            parser[buffer] += '&' + parser.entity + c
+            parser.entity = ''
+            parser.state = returnState
+          }
+
+          continue
+
+        default:
+          throw new Error(parser, 'Unknown state: ' + parser.state)
+      }
+    } // while
+
+    if (parser.position >= parser.bufferCheckPosition) {
+      checkBufferLength(parser)
+    }
+    return parser
+  }
+
+  /*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
+  /* istanbul ignore next */
+  if (!String.fromCodePoint) {
+    (function () {
+      var stringFromCharCode = String.fromCharCode
+      var floor = Math.floor
+      var fromCodePoint = function () {
+        var MAX_SIZE = 0x4000
+        var codeUnits = []
+        var highSurrogate
+        var lowSurrogate
+        var index = -1
+        var length = arguments.length
+        if (!length) {
+          return ''
+        }
+        var result = ''
+        while (++index < length) {
+          var codePoint = Number(arguments[index])
+          if (
+            !isFinite(codePoint) || // `NaN`, `+Infinity`, or `-Infinity`
+            codePoint < 0 || // not a valid Unicode code point
+            codePoint > 0x10FFFF || // not a valid Unicode code point
+            floor(codePoint) !== codePoint // not an integer
+          ) {
+            throw RangeError('Invalid code point: ' + codePoint)
+          }
+          if (codePoint <= 0xFFFF) { // BMP code point
+            codeUnits.push(codePoint)
+          } else { // Astral code point; split in surrogate halves
+            // http://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+            codePoint -= 0x10000
+            highSurrogate = (codePoint >> 10) + 0xD800
+            lowSurrogate = (codePoint % 0x400) + 0xDC00
+            codeUnits.push(highSurrogate, lowSurrogate)
+          }
+          if (index + 1 === length || codeUnits.length > MAX_SIZE) {
+            result += stringFromCharCode.apply(null, codeUnits)
+            codeUnits.length = 0
+          }
+        }
+        return result
+      }
+      /* istanbul ignore next */
+      if (Object.defineProperty) {
+        Object.defineProperty(String, 'fromCodePoint', {
+          value: fromCodePoint,
+          configurable: true,
+          writable: true
+        })
+      } else {
+        String.fromCodePoint = fromCodePoint
+      }
+    }())
+  }
+})(typeof exports === 'undefined' ? this.sax = {} : exports)
diff --git a/scripts/metrics/node_modules/sax/package.json b/scripts/metrics/node_modules/sax/package.json
new file mode 100644
index 00000000000..a65b8fc7e23
--- /dev/null
+++ b/scripts/metrics/node_modules/sax/package.json
@@ -0,0 +1,61 @@
+{
+  "_from": "sax@>=0.6.0",
+  "_id": "sax@1.2.4",
+  "_inBundle": false,
+  "_integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+  "_location": "/sax",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "sax@>=0.6.0",
+    "name": "sax",
+    "escapedName": "sax",
+    "rawSpec": ">=0.6.0",
+    "saveSpec": null,
+    "fetchSpec": ">=0.6.0"
+  },
+  "_requiredBy": [
+    "/xml2js"
+  ],
+  "_resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+  "_shasum": "2816234e2378bddc4e5354fab5caa895df7100d9",
+  "_spec": "sax@>=0.6.0",
+  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics/node_modules/xml2js",
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/isaacs/sax-js/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "An evented streaming XML parser in JavaScript",
+  "devDependencies": {
+    "standard": "^8.6.0",
+    "tap": "^10.5.1"
+  },
+  "files": [
+    "lib/sax.js",
+    "LICENSE",
+    "README.md"
+  ],
+  "homepage": "https://github.com/isaacs/sax-js#readme",
+  "license": "ISC",
+  "main": "lib/sax.js",
+  "name": "sax",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/sax-js.git"
+  },
+  "scripts": {
+    "postpublish": "git push origin --all; git push origin --tags",
+    "posttest": "standard -F test/*.js lib/*.js",
+    "postversion": "npm publish",
+    "preversion": "npm test",
+    "test": "tap test/*.js --cov -j4"
+  },
+  "version": "1.2.4"
+}
diff --git a/scripts/metrics/node_modules/xml2js/LICENSE b/scripts/metrics/node_modules/xml2js/LICENSE
new file mode 100644
index 00000000000..e3b4222a66a
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/LICENSE
@@ -0,0 +1,19 @@
+Copyright 2010, 2011, 2012, 2013. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/xml2js/README.md b/scripts/metrics/node_modules/xml2js/README.md
new file mode 100644
index 00000000000..9c69d6fbf1a
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/README.md
@@ -0,0 +1,406 @@
+node-xml2js
+===========
+
+Ever had the urge to parse XML? And wanted to access the data in some sane,
+easy way? Don't want to compile a C parser, for whatever reason? Then xml2js is
+what you're looking for!
+
+Description
+===========
+
+Simple XML to JavaScript object converter. It supports bi-directional conversion.
+Uses [sax-js](https://github.com/isaacs/sax-js/) and
+[xmlbuilder-js](https://github.com/oozcitak/xmlbuilder-js/).
+
+Note: If you're looking for a full DOM parser, you probably want
+[JSDom](https://github.com/tmpvar/jsdom).
+
+Installation
+============
+
+Simplest way to install `xml2js` is to use [npm](http://npmjs.org), just `npm
+install xml2js` which will download xml2js and all dependencies.
+
+xml2js is also available via [Bower](http://bower.io/), just `bower install
+xml2js` which will download xml2js and all dependencies.
+
+Usage
+=====
+
+No extensive tutorials required because you are a smart developer! The task of
+parsing XML should be an easy one, so let's make it so! Here's some examples.
+
+Shoot-and-forget usage
+----------------------
+
+You want to parse XML as simple and easy as possible? It's dangerous to go
+alone, take this:
+
+```javascript
+var parseString = require('xml2js').parseString;
+var xml = "<root>Hello xml2js!</root>"
+parseString(xml, function (err, result) {
+    console.dir(result);
+});
+```
+
+Can't get easier than this, right? This works starting with `xml2js` 0.2.3.
+With CoffeeScript it looks like this:
+
+```coffeescript
+{parseString} = require 'xml2js'
+xml = "<root>Hello xml2js!</root>"
+parseString xml, (err, result) ->
+    console.dir result
+```
+
+If you need some special options, fear not, `xml2js` supports a number of
+options (see below), you can specify these as second argument:
+
+```javascript
+parseString(xml, {trim: true}, function (err, result) {
+});
+```
+
+Simple as pie usage
+-------------------
+
+That's right, if you have been using xml-simple or a home-grown
+wrapper, this was added in 0.1.11 just for you:
+
+```javascript
+var fs = require('fs'),
+    xml2js = require('xml2js');
+
+var parser = new xml2js.Parser();
+fs.readFile(__dirname + '/foo.xml', function(err, data) {
+    parser.parseString(data, function (err, result) {
+        console.dir(result);
+        console.log('Done');
+    });
+});
+```
+
+Look ma, no event listeners!
+
+You can also use `xml2js` from
+[CoffeeScript](https://github.com/jashkenas/coffeescript), further reducing
+the clutter:
+
+```coffeescript
+fs = require 'fs',
+xml2js = require 'xml2js'
+
+parser = new xml2js.Parser()
+fs.readFile __dirname + '/foo.xml', (err, data) ->
+  parser.parseString data, (err, result) ->
+    console.dir result
+    console.log 'Done.'
+```
+
+But what happens if you forget the `new` keyword to create a new `Parser`? In
+the middle of a nightly coding session, it might get lost, after all. Worry
+not, we got you covered! Starting with 0.2.8 you can also leave it out, in
+which case `xml2js` will helpfully add it for you, no bad surprises and
+inexplicable bugs!
+
+Parsing multiple files
+----------------------
+
+If you want to parse multiple files, you have multiple possibilities:
+
+  * You can create one `xml2js.Parser` per file. That's the recommended one
+    and is promised to always *just work*.
+  * You can call `reset()` on your parser object.
+  * You can hope everything goes well anyway. This behaviour is not
+    guaranteed work always, if ever. Use option #1 if possible. Thanks!
+
+So you wanna some JSON?
+-----------------------
+
+Just wrap the `result` object in a call to `JSON.stringify` like this
+`JSON.stringify(result)`. You get a string containing the JSON representation
+of the parsed object that you can feed to JSON-hungry consumers.
+
+Displaying results
+------------------
+
+You might wonder why, using `console.dir` or `console.log` the output at some
+level is only `[Object]`. Don't worry, this is not because `xml2js` got lazy.
+That's because Node uses `util.inspect` to convert the object into strings and
+that function stops after `depth=2` which is a bit low for most XML.
+
+To display the whole deal, you can use `console.log(util.inspect(result, false,
+null))`, which displays the whole result.
+
+So much for that, but what if you use
+[eyes](https://github.com/cloudhead/eyes.js) for nice colored output and it
+truncates the output with `…`? Don't fear, there's also a solution for that,
+you just need to increase the `maxLength` limit by creating a custom inspector
+`var inspect = require('eyes').inspector({maxLength: false})` and then you can
+easily `inspect(result)`.
+
+XML builder usage
+-----------------
+
+Since 0.4.0, objects can be also be used to build XML:
+
+```javascript
+var fs = require('fs'),
+    xml2js = require('xml2js');
+
+var obj = {name: "Super", Surname: "Man", age: 23};
+
+var builder = new xml2js.Builder();
+var xml = builder.buildObject(obj);
+```
+
+At the moment, a one to one bi-directional conversion is guaranteed only for
+default configuration, except for `attrkey`, `charkey` and `explicitArray` options
+you can redefine to your taste. Writing CDATA is supported via setting the `cdata`
+option to `true`.
+
+Processing attribute, tag names and values
+------------------------------------------
+
+Since 0.4.1 you can optionally provide the parser with attribute name and tag name processors as well as element value processors (Since 0.4.14, you can also optionally provide the parser with attribute value processors):
+
+```javascript
+
+function nameToUpperCase(name){
+    return name.toUpperCase();
+}
+
+//transform all attribute and tag names and values to uppercase
+parseString(xml, {
+  tagNameProcessors: [nameToUpperCase],
+  attrNameProcessors: [nameToUpperCase],
+  valueProcessors: [nameToUpperCase],
+  attrValueProcessors: [nameToUpperCase]},
+  function (err, result) {
+    // processed data
+});
+```
+
+The `tagNameProcessors` and `attrNameProcessors` options
+accept an `Array` of functions with the following signature:
+
+```javascript
+function (name){
+  //do something with `name`
+  return name
+}
+```
+
+The `attrValueProcessors` and `valueProcessors` options
+accept an `Array` of functions with the following signature:
+
+```javascript
+function (value, name) {
+  //`name` will be the node name or attribute name
+  //do something with `value`, (optionally) dependent on the node/attr name
+  return value
+}
+```
+
+Some processors are provided out-of-the-box and can be found in `lib/processors.js`:
+
+- `normalize`: transforms the name to lowercase.
+(Automatically used when `options.normalize` is set to `true`)
+
+- `firstCharLowerCase`: transforms the first character to lower case.
+E.g. 'MyTagName' becomes 'myTagName'
+
+- `stripPrefix`: strips the xml namespace prefix. E.g `<foo:Bar/>` will become 'Bar'.
+(N.B.: the `xmlns` prefix is NOT stripped.)
+
+- `parseNumbers`: parses integer-like strings as integers and float-like strings as floats
+E.g. "0" becomes 0 and "15.56" becomes 15.56
+
+- `parseBooleans`: parses boolean-like strings to booleans
+E.g. "true" becomes true and "False" becomes false
+
+Options
+=======
+
+Apart from the default settings, there are a number of options that can be
+specified for the parser. Options are specified by ``new Parser({optionName:
+value})``. Possible options are:
+
+  * `attrkey` (default: `$`): Prefix that is used to access the attributes.
+    Version 0.1 default was `@`.
+  * `charkey` (default: `_`): Prefix that is used to access the character
+    content. Version 0.1 default was `#`.
+  * `explicitCharkey` (default: `false`)
+  * `trim` (default: `false`): Trim the whitespace at the beginning and end of
+    text nodes.
+  * `normalizeTags` (default: `false`): Normalize all tag names to lowercase.
+  * `normalize` (default: `false`): Trim whitespaces inside text nodes.
+  * `explicitRoot` (default: `true`): Set this if you want to get the root
+    node in the resulting object.
+  * `emptyTag` (default: `''`): what will the value of empty nodes be.
+  * `explicitArray` (default: `true`): Always put child nodes in an array if
+    true; otherwise an array is created only if there is more than one.
+  * `ignoreAttrs` (default: `false`): Ignore all XML attributes and only create
+    text nodes.
+  * `mergeAttrs` (default: `false`): Merge attributes and child elements as
+    properties of the parent, instead of keying attributes off a child
+    attribute object. This option is ignored if `ignoreAttrs` is `false`.
+  * `validator` (default `null`): You can specify a callable that validates
+    the resulting structure somehow, however you want. See unit tests
+    for an example.
+  * `xmlns` (default `false`): Give each element a field usually called '$ns'
+    (the first character is the same as attrkey) that contains its local name
+    and namespace URI.
+  * `explicitChildren` (default `false`): Put child elements to separate
+    property. Doesn't work with `mergeAttrs = true`. If element has no children
+    then "children" won't be created. Added in 0.2.5.
+  * `childkey` (default `$$`): Prefix that is used to access child elements if
+    `explicitChildren` is set to `true`. Added in 0.2.5.
+  * `preserveChildrenOrder` (default `false`): Modifies the behavior of
+    `explicitChildren` so that the value of the "children" property becomes an
+    ordered array. When this is `true`, every node will also get a `#name` field
+    whose value will correspond to the XML nodeName, so that you may iterate
+    the "children" array and still be able to determine node names. The named
+    (and potentially unordered) properties are also retained in this
+    configuration at the same level as the ordered "children" array. Added in
+    0.4.9.
+  * `charsAsChildren` (default `false`): Determines whether chars should be
+    considered children if `explicitChildren` is on. Added in 0.2.5.
+  * `includeWhiteChars` (default `false`): Determines whether whitespace-only
+     text nodes should be included. Added in 0.4.17.
+  * `async` (default `false`): Should the callbacks be async? This *might* be
+    an incompatible change if your code depends on sync execution of callbacks.
+    Future versions of `xml2js` might change this default, so the recommendation
+    is to not depend on sync execution anyway. Added in 0.2.6.
+  * `strict` (default `true`): Set sax-js to strict or non-strict parsing mode.
+    Defaults to `true` which is *highly* recommended, since parsing HTML which
+    is not well-formed XML might yield just about anything. Added in 0.2.7.
+  * `attrNameProcessors` (default: `null`): Allows the addition of attribute
+    name processing functions. Accepts an `Array` of functions with following
+    signature:
+    ```javascript
+    function (name){
+        //do something with `name`
+        return name
+    }
+    ```
+    Added in 0.4.14
+  * `attrValueProcessors` (default: `null`): Allows the addition of attribute
+    value processing functions. Accepts an `Array` of functions with following
+    signature:
+    ```javascript
+    function (name){
+      //do something with `name`
+      return name
+    }
+    ```
+    Added in 0.4.1
+  * `tagNameProcessors` (default: `null`): Allows the addition of tag name
+    processing functions. Accepts an `Array` of functions with following
+    signature:
+    ```javascript
+    function (name){
+      //do something with `name`
+      return name
+    }
+    ```
+    Added in 0.4.1
+  * `valueProcessors` (default: `null`): Allows the addition of element value
+    processing functions. Accepts an `Array` of functions with following
+    signature:
+    ```javascript
+    function (name){
+      //do something with `name`
+      return name
+    }
+    ```
+    Added in 0.4.6
+
+Options for the `Builder` class
+-------------------------------
+These options are specified by ``new Builder({optionName: value})``.
+Possible options are:
+
+  * `rootName` (default `root` or the root key name): root element name to be used in case
+     `explicitRoot` is `false` or to override the root element name.
+  * `renderOpts` (default `{ 'pretty': true, 'indent': '  ', 'newline': '\n' }`):
+    Rendering options for xmlbuilder-js.
+    * pretty: prettify generated XML
+    * indent: whitespace for indentation (only when pretty)
+    * newline: newline char (only when pretty)
+  * `xmldec` (default `{ 'version': '1.0', 'encoding': 'UTF-8', 'standalone': true }`:
+    XML declaration attributes.
+    * `xmldec.version` A version number string, e.g. 1.0
+    * `xmldec.encoding` Encoding declaration, e.g. UTF-8
+    * `xmldec.standalone` standalone document declaration: true or false
+  * `doctype` (default `null`): optional DTD. Eg. `{'ext': 'hello.dtd'}`
+  * `headless` (default: `false`): omit the XML header. Added in 0.4.3.
+  * `allowSurrogateChars` (default: `false`): allows using characters from the Unicode
+    surrogate blocks.
+  * `cdata` (default: `false`): wrap text nodes in `<![CDATA[ ... ]]>` instead of
+    escaping when necessary. Does not add `<![CDATA[ ... ]]>` if it is not required.
+    Added in 0.4.5.
+
+`renderOpts`, `xmldec`,`doctype` and `headless` pass through to
+[xmlbuilder-js](https://github.com/oozcitak/xmlbuilder-js).
+
+Updating to new version
+=======================
+
+Version 0.2 changed the default parsing settings, but version 0.1.14 introduced
+the default settings for version 0.2, so these settings can be tried before the
+migration.
+
+```javascript
+var xml2js = require('xml2js');
+var parser = new xml2js.Parser(xml2js.defaults["0.2"]);
+```
+
+To get the 0.1 defaults in version 0.2 you can just use
+`xml2js.defaults["0.1"]` in the same place. This provides you with enough time
+to migrate to the saner way of parsing in `xml2js` 0.2. We try to make the
+migration as simple and gentle as possible, but some breakage cannot be
+avoided.
+
+So, what exactly did change and why? In 0.2 we changed some defaults to parse
+the XML in a more universal and sane way. So we disabled `normalize` and `trim`
+so `xml2js` does not cut out any text content. You can reenable this at will of
+course. A more important change is that we return the root tag in the resulting
+JavaScript structure via the `explicitRoot` setting, so you need to access the
+first element. This is useful for anybody who wants to know what the root node
+is and preserves more information. The last major change was to enable
+`explicitArray`, so everytime it is possible that one might embed more than one
+sub-tag into a tag, xml2js >= 0.2 returns an array even if the array just
+includes one element. This is useful when dealing with APIs that return
+variable amounts of subtags.
+
+Running tests, development
+==========================
+
+[![Build Status](https://travis-ci.org/Leonidas-from-XIV/node-xml2js.svg?branch=master)](https://travis-ci.org/Leonidas-from-XIV/node-xml2js)
+[![Coverage Status](https://coveralls.io/repos/Leonidas-from-XIV/node-xml2js/badge.svg?branch=)](https://coveralls.io/r/Leonidas-from-XIV/node-xml2js?branch=master)
+[![Dependency Status](https://david-dm.org/Leonidas-from-XIV/node-xml2js.svg)](https://david-dm.org/Leonidas-from-XIV/node-xml2js)
+
+The development requirements are handled by npm, you just need to install them.
+We also have a number of unit tests, they can be run using `npm test` directly
+from the project root. This runs zap to discover all the tests and execute
+them.
+
+If you like to contribute, keep in mind that `xml2js` is written in
+CoffeeScript, so don't develop on the JavaScript files that are checked into
+the repository for convenience reasons. Also, please write some unit test to
+check your behaviour and if it is some user-facing thing, add some
+documentation to this README, so people will know it exists. Thanks in advance!
+
+Getting support
+===============
+
+Please, if you have a problem with the library, first make sure you read this
+README. If you read this far, thanks, you're good. Then, please make sure your
+problem really is with `xml2js`. It is? Okay, then I'll look at it. Send me a
+mail and we can talk. Please don't open issues, as I don't think that is the
+proper forum for support problems. Some problems might as well really be bugs
+in `xml2js`, if so I'll let you know to open an issue instead :)
+
+But if you know you really found a bug, feel free to open an issue instead.
diff --git a/scripts/metrics/node_modules/xml2js/lib/bom.js b/scripts/metrics/node_modules/xml2js/lib/bom.js
new file mode 100644
index 00000000000..7b8fb27b118
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/lib/bom.js
@@ -0,0 +1,12 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  "use strict";
+  exports.stripBOM = function(str) {
+    if (str[0] === '\uFEFF') {
+      return str.substring(1);
+    } else {
+      return str;
+    }
+  };
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/builder.js b/scripts/metrics/node_modules/xml2js/lib/builder.js
new file mode 100644
index 00000000000..58f36384891
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/lib/builder.js
@@ -0,0 +1,127 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  "use strict";
+  var builder, defaults, escapeCDATA, requiresCDATA, wrapCDATA,
+    hasProp = {}.hasOwnProperty;
+
+  builder = require('xmlbuilder');
+
+  defaults = require('./defaults').defaults;
+
+  requiresCDATA = function(entry) {
+    return typeof entry === "string" && (entry.indexOf('&') >= 0 || entry.indexOf('>') >= 0 || entry.indexOf('<') >= 0);
+  };
+
+  wrapCDATA = function(entry) {
+    return "<![CDATA[" + (escapeCDATA(entry)) + "]]>";
+  };
+
+  escapeCDATA = function(entry) {
+    return entry.replace(']]>', ']]]]><![CDATA[>');
+  };
+
+  exports.Builder = (function() {
+    function Builder(opts) {
+      var key, ref, value;
+      this.options = {};
+      ref = defaults["0.2"];
+      for (key in ref) {
+        if (!hasProp.call(ref, key)) continue;
+        value = ref[key];
+        this.options[key] = value;
+      }
+      for (key in opts) {
+        if (!hasProp.call(opts, key)) continue;
+        value = opts[key];
+        this.options[key] = value;
+      }
+    }
+
+    Builder.prototype.buildObject = function(rootObj) {
+      var attrkey, charkey, render, rootElement, rootName;
+      attrkey = this.options.attrkey;
+      charkey = this.options.charkey;
+      if ((Object.keys(rootObj).length === 1) && (this.options.rootName === defaults['0.2'].rootName)) {
+        rootName = Object.keys(rootObj)[0];
+        rootObj = rootObj[rootName];
+      } else {
+        rootName = this.options.rootName;
+      }
+      render = (function(_this) {
+        return function(element, obj) {
+          var attr, child, entry, index, key, value;
+          if (typeof obj !== 'object') {
+            if (_this.options.cdata && requiresCDATA(obj)) {
+              element.raw(wrapCDATA(obj));
+            } else {
+              element.txt(obj);
+            }
+          } else if (Array.isArray(obj)) {
+            for (index in obj) {
+              if (!hasProp.call(obj, index)) continue;
+              child = obj[index];
+              for (key in child) {
+                entry = child[key];
+                element = render(element.ele(key), entry).up();
+              }
+            }
+          } else {
+            for (key in obj) {
+              if (!hasProp.call(obj, key)) continue;
+              child = obj[key];
+              if (key === attrkey) {
+                if (typeof child === "object") {
+                  for (attr in child) {
+                    value = child[attr];
+                    element = element.att(attr, value);
+                  }
+                }
+              } else if (key === charkey) {
+                if (_this.options.cdata && requiresCDATA(child)) {
+                  element = element.raw(wrapCDATA(child));
+                } else {
+                  element = element.txt(child);
+                }
+              } else if (Array.isArray(child)) {
+                for (index in child) {
+                  if (!hasProp.call(child, index)) continue;
+                  entry = child[index];
+                  if (typeof entry === 'string') {
+                    if (_this.options.cdata && requiresCDATA(entry)) {
+                      element = element.ele(key).raw(wrapCDATA(entry)).up();
+                    } else {
+                      element = element.ele(key, entry).up();
+                    }
+                  } else {
+                    element = render(element.ele(key), entry).up();
+                  }
+                }
+              } else if (typeof child === "object") {
+                element = render(element.ele(key), child).up();
+              } else {
+                if (typeof child === 'string' && _this.options.cdata && requiresCDATA(child)) {
+                  element = element.ele(key).raw(wrapCDATA(child)).up();
+                } else {
+                  if (child == null) {
+                    child = '';
+                  }
+                  element = element.ele(key, child.toString()).up();
+                }
+              }
+            }
+          }
+          return element;
+        };
+      })(this);
+      rootElement = builder.create(rootName, this.options.xmldec, this.options.doctype, {
+        headless: this.options.headless,
+        allowSurrogateChars: this.options.allowSurrogateChars
+      });
+      return render(rootElement, rootObj).end(this.options.renderOpts);
+    };
+
+    return Builder;
+
+  })();
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/defaults.js b/scripts/metrics/node_modules/xml2js/lib/defaults.js
new file mode 100644
index 00000000000..0a21da0a2fc
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/lib/defaults.js
@@ -0,0 +1,72 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  exports.defaults = {
+    "0.1": {
+      explicitCharkey: false,
+      trim: true,
+      normalize: true,
+      normalizeTags: false,
+      attrkey: "@",
+      charkey: "#",
+      explicitArray: false,
+      ignoreAttrs: false,
+      mergeAttrs: false,
+      explicitRoot: false,
+      validator: null,
+      xmlns: false,
+      explicitChildren: false,
+      childkey: '@@',
+      charsAsChildren: false,
+      includeWhiteChars: false,
+      async: false,
+      strict: true,
+      attrNameProcessors: null,
+      attrValueProcessors: null,
+      tagNameProcessors: null,
+      valueProcessors: null,
+      emptyTag: ''
+    },
+    "0.2": {
+      explicitCharkey: false,
+      trim: false,
+      normalize: false,
+      normalizeTags: false,
+      attrkey: "$",
+      charkey: "_",
+      explicitArray: true,
+      ignoreAttrs: false,
+      mergeAttrs: false,
+      explicitRoot: true,
+      validator: null,
+      xmlns: false,
+      explicitChildren: false,
+      preserveChildrenOrder: false,
+      childkey: '$$',
+      charsAsChildren: false,
+      includeWhiteChars: false,
+      async: false,
+      strict: true,
+      attrNameProcessors: null,
+      attrValueProcessors: null,
+      tagNameProcessors: null,
+      valueProcessors: null,
+      rootName: 'root',
+      xmldec: {
+        'version': '1.0',
+        'encoding': 'UTF-8',
+        'standalone': true
+      },
+      doctype: null,
+      renderOpts: {
+        'pretty': true,
+        'indent': '  ',
+        'newline': '\n'
+      },
+      headless: false,
+      chunkSize: 10000,
+      emptyTag: '',
+      cdata: false
+    }
+  };
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/parser.js b/scripts/metrics/node_modules/xml2js/lib/parser.js
new file mode 100644
index 00000000000..9e8261ebf5d
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/lib/parser.js
@@ -0,0 +1,357 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  "use strict";
+  var bom, defaults, events, isEmpty, processItem, processors, sax, setImmediate,
+    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  sax = require('sax');
+
+  events = require('events');
+
+  bom = require('./bom');
+
+  processors = require('./processors');
+
+  setImmediate = require('timers').setImmediate;
+
+  defaults = require('./defaults').defaults;
+
+  isEmpty = function(thing) {
+    return typeof thing === "object" && (thing != null) && Object.keys(thing).length === 0;
+  };
+
+  processItem = function(processors, item, key) {
+    var i, len, process;
+    for (i = 0, len = processors.length; i < len; i++) {
+      process = processors[i];
+      item = process(item, key);
+    }
+    return item;
+  };
+
+  exports.Parser = (function(superClass) {
+    extend(Parser, superClass);
+
+    function Parser(opts) {
+      this.parseString = bind(this.parseString, this);
+      this.reset = bind(this.reset, this);
+      this.assignOrPush = bind(this.assignOrPush, this);
+      this.processAsync = bind(this.processAsync, this);
+      var key, ref, value;
+      if (!(this instanceof exports.Parser)) {
+        return new exports.Parser(opts);
+      }
+      this.options = {};
+      ref = defaults["0.2"];
+      for (key in ref) {
+        if (!hasProp.call(ref, key)) continue;
+        value = ref[key];
+        this.options[key] = value;
+      }
+      for (key in opts) {
+        if (!hasProp.call(opts, key)) continue;
+        value = opts[key];
+        this.options[key] = value;
+      }
+      if (this.options.xmlns) {
+        this.options.xmlnskey = this.options.attrkey + "ns";
+      }
+      if (this.options.normalizeTags) {
+        if (!this.options.tagNameProcessors) {
+          this.options.tagNameProcessors = [];
+        }
+        this.options.tagNameProcessors.unshift(processors.normalize);
+      }
+      this.reset();
+    }
+
+    Parser.prototype.processAsync = function() {
+      var chunk, err;
+      try {
+        if (this.remaining.length <= this.options.chunkSize) {
+          chunk = this.remaining;
+          this.remaining = '';
+          this.saxParser = this.saxParser.write(chunk);
+          return this.saxParser.close();
+        } else {
+          chunk = this.remaining.substr(0, this.options.chunkSize);
+          this.remaining = this.remaining.substr(this.options.chunkSize, this.remaining.length);
+          this.saxParser = this.saxParser.write(chunk);
+          return setImmediate(this.processAsync);
+        }
+      } catch (error1) {
+        err = error1;
+        if (!this.saxParser.errThrown) {
+          this.saxParser.errThrown = true;
+          return this.emit(err);
+        }
+      }
+    };
+
+    Parser.prototype.assignOrPush = function(obj, key, newValue) {
+      if (!(key in obj)) {
+        if (!this.options.explicitArray) {
+          return obj[key] = newValue;
+        } else {
+          return obj[key] = [newValue];
+        }
+      } else {
+        if (!(obj[key] instanceof Array)) {
+          obj[key] = [obj[key]];
+        }
+        return obj[key].push(newValue);
+      }
+    };
+
+    Parser.prototype.reset = function() {
+      var attrkey, charkey, ontext, stack;
+      this.removeAllListeners();
+      this.saxParser = sax.parser(this.options.strict, {
+        trim: false,
+        normalize: false,
+        xmlns: this.options.xmlns
+      });
+      this.saxParser.errThrown = false;
+      this.saxParser.onerror = (function(_this) {
+        return function(error) {
+          _this.saxParser.resume();
+          if (!_this.saxParser.errThrown) {
+            _this.saxParser.errThrown = true;
+            return _this.emit("error", error);
+          }
+        };
+      })(this);
+      this.saxParser.onend = (function(_this) {
+        return function() {
+          if (!_this.saxParser.ended) {
+            _this.saxParser.ended = true;
+            return _this.emit("end", _this.resultObject);
+          }
+        };
+      })(this);
+      this.saxParser.ended = false;
+      this.EXPLICIT_CHARKEY = this.options.explicitCharkey;
+      this.resultObject = null;
+      stack = [];
+      attrkey = this.options.attrkey;
+      charkey = this.options.charkey;
+      this.saxParser.onopentag = (function(_this) {
+        return function(node) {
+          var key, newValue, obj, processedKey, ref;
+          obj = {};
+          obj[charkey] = "";
+          if (!_this.options.ignoreAttrs) {
+            ref = node.attributes;
+            for (key in ref) {
+              if (!hasProp.call(ref, key)) continue;
+              if (!(attrkey in obj) && !_this.options.mergeAttrs) {
+                obj[attrkey] = {};
+              }
+              newValue = _this.options.attrValueProcessors ? processItem(_this.options.attrValueProcessors, node.attributes[key], key) : node.attributes[key];
+              processedKey = _this.options.attrNameProcessors ? processItem(_this.options.attrNameProcessors, key) : key;
+              if (_this.options.mergeAttrs) {
+                _this.assignOrPush(obj, processedKey, newValue);
+              } else {
+                obj[attrkey][processedKey] = newValue;
+              }
+            }
+          }
+          obj["#name"] = _this.options.tagNameProcessors ? processItem(_this.options.tagNameProcessors, node.name) : node.name;
+          if (_this.options.xmlns) {
+            obj[_this.options.xmlnskey] = {
+              uri: node.uri,
+              local: node.local
+            };
+          }
+          return stack.push(obj);
+        };
+      })(this);
+      this.saxParser.onclosetag = (function(_this) {
+        return function() {
+          var cdata, emptyStr, key, node, nodeName, obj, objClone, old, s, xpath;
+          obj = stack.pop();
+          nodeName = obj["#name"];
+          if (!_this.options.explicitChildren || !_this.options.preserveChildrenOrder) {
+            delete obj["#name"];
+          }
+          if (obj.cdata === true) {
+            cdata = obj.cdata;
+            delete obj.cdata;
+          }
+          s = stack[stack.length - 1];
+          if (obj[charkey].match(/^\s*$/) && !cdata) {
+            emptyStr = obj[charkey];
+            delete obj[charkey];
+          } else {
+            if (_this.options.trim) {
+              obj[charkey] = obj[charkey].trim();
+            }
+            if (_this.options.normalize) {
+              obj[charkey] = obj[charkey].replace(/\s{2,}/g, " ").trim();
+            }
+            obj[charkey] = _this.options.valueProcessors ? processItem(_this.options.valueProcessors, obj[charkey], nodeName) : obj[charkey];
+            if (Object.keys(obj).length === 1 && charkey in obj && !_this.EXPLICIT_CHARKEY) {
+              obj = obj[charkey];
+            }
+          }
+          if (isEmpty(obj)) {
+            obj = _this.options.emptyTag !== '' ? _this.options.emptyTag : emptyStr;
+          }
+          if (_this.options.validator != null) {
+            xpath = "/" + ((function() {
+              var i, len, results;
+              results = [];
+              for (i = 0, len = stack.length; i < len; i++) {
+                node = stack[i];
+                results.push(node["#name"]);
+              }
+              return results;
+            })()).concat(nodeName).join("/");
+            (function() {
+              var err;
+              try {
+                return obj = _this.options.validator(xpath, s && s[nodeName], obj);
+              } catch (error1) {
+                err = error1;
+                return _this.emit("error", err);
+              }
+            })();
+          }
+          if (_this.options.explicitChildren && !_this.options.mergeAttrs && typeof obj === 'object') {
+            if (!_this.options.preserveChildrenOrder) {
+              node = {};
+              if (_this.options.attrkey in obj) {
+                node[_this.options.attrkey] = obj[_this.options.attrkey];
+                delete obj[_this.options.attrkey];
+              }
+              if (!_this.options.charsAsChildren && _this.options.charkey in obj) {
+                node[_this.options.charkey] = obj[_this.options.charkey];
+                delete obj[_this.options.charkey];
+              }
+              if (Object.getOwnPropertyNames(obj).length > 0) {
+                node[_this.options.childkey] = obj;
+              }
+              obj = node;
+            } else if (s) {
+              s[_this.options.childkey] = s[_this.options.childkey] || [];
+              objClone = {};
+              for (key in obj) {
+                if (!hasProp.call(obj, key)) continue;
+                objClone[key] = obj[key];
+              }
+              s[_this.options.childkey].push(objClone);
+              delete obj["#name"];
+              if (Object.keys(obj).length === 1 && charkey in obj && !_this.EXPLICIT_CHARKEY) {
+                obj = obj[charkey];
+              }
+            }
+          }
+          if (stack.length > 0) {
+            return _this.assignOrPush(s, nodeName, obj);
+          } else {
+            if (_this.options.explicitRoot) {
+              old = obj;
+              obj = {};
+              obj[nodeName] = old;
+            }
+            _this.resultObject = obj;
+            _this.saxParser.ended = true;
+            return _this.emit("end", _this.resultObject);
+          }
+        };
+      })(this);
+      ontext = (function(_this) {
+        return function(text) {
+          var charChild, s;
+          s = stack[stack.length - 1];
+          if (s) {
+            s[charkey] += text;
+            if (_this.options.explicitChildren && _this.options.preserveChildrenOrder && _this.options.charsAsChildren && (_this.options.includeWhiteChars || text.replace(/\\n/g, '').trim() !== '')) {
+              s[_this.options.childkey] = s[_this.options.childkey] || [];
+              charChild = {
+                '#name': '__text__'
+              };
+              charChild[charkey] = text;
+              if (_this.options.normalize) {
+                charChild[charkey] = charChild[charkey].replace(/\s{2,}/g, " ").trim();
+              }
+              s[_this.options.childkey].push(charChild);
+            }
+            return s;
+          }
+        };
+      })(this);
+      this.saxParser.ontext = ontext;
+      return this.saxParser.oncdata = (function(_this) {
+        return function(text) {
+          var s;
+          s = ontext(text);
+          if (s) {
+            return s.cdata = true;
+          }
+        };
+      })(this);
+    };
+
+    Parser.prototype.parseString = function(str, cb) {
+      var err;
+      if ((cb != null) && typeof cb === "function") {
+        this.on("end", function(result) {
+          this.reset();
+          return cb(null, result);
+        });
+        this.on("error", function(err) {
+          this.reset();
+          return cb(err);
+        });
+      }
+      try {
+        str = str.toString();
+        if (str.trim() === '') {
+          this.emit("end", null);
+          return true;
+        }
+        str = bom.stripBOM(str);
+        if (this.options.async) {
+          this.remaining = str;
+          setImmediate(this.processAsync);
+          return this.saxParser;
+        }
+        return this.saxParser.write(str).close();
+      } catch (error1) {
+        err = error1;
+        if (!(this.saxParser.errThrown || this.saxParser.ended)) {
+          this.emit('error', err);
+          return this.saxParser.errThrown = true;
+        } else if (this.saxParser.ended) {
+          throw err;
+        }
+      }
+    };
+
+    return Parser;
+
+  })(events.EventEmitter);
+
+  exports.parseString = function(str, a, b) {
+    var cb, options, parser;
+    if (b != null) {
+      if (typeof b === 'function') {
+        cb = b;
+      }
+      if (typeof a === 'object') {
+        options = a;
+      }
+    } else {
+      if (typeof a === 'function') {
+        cb = a;
+      }
+      options = {};
+    }
+    parser = new exports.Parser(options);
+    return parser.parseString(str, cb);
+  };
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/processors.js b/scripts/metrics/node_modules/xml2js/lib/processors.js
new file mode 100644
index 00000000000..89aa85f22cf
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/lib/processors.js
@@ -0,0 +1,34 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  "use strict";
+  var prefixMatch;
+
+  prefixMatch = new RegExp(/(?!xmlns)^.*:/);
+
+  exports.normalize = function(str) {
+    return str.toLowerCase();
+  };
+
+  exports.firstCharLowerCase = function(str) {
+    return str.charAt(0).toLowerCase() + str.slice(1);
+  };
+
+  exports.stripPrefix = function(str) {
+    return str.replace(prefixMatch, '');
+  };
+
+  exports.parseNumbers = function(str) {
+    if (!isNaN(str)) {
+      str = str % 1 === 0 ? parseInt(str, 10) : parseFloat(str);
+    }
+    return str;
+  };
+
+  exports.parseBooleans = function(str) {
+    if (/^(?:true|false)$/i.test(str)) {
+      str = str.toLowerCase() === 'true';
+    }
+    return str;
+  };
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/xml2js.js b/scripts/metrics/node_modules/xml2js/lib/xml2js.js
new file mode 100644
index 00000000000..599d3dd2b67
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/lib/xml2js.js
@@ -0,0 +1,37 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  "use strict";
+  var builder, defaults, parser, processors,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  defaults = require('./defaults');
+
+  builder = require('./builder');
+
+  parser = require('./parser');
+
+  processors = require('./processors');
+
+  exports.defaults = defaults.defaults;
+
+  exports.processors = processors;
+
+  exports.ValidationError = (function(superClass) {
+    extend(ValidationError, superClass);
+
+    function ValidationError(message) {
+      this.message = message;
+    }
+
+    return ValidationError;
+
+  })(Error);
+
+  exports.Builder = builder.Builder;
+
+  exports.Parser = parser.Parser;
+
+  exports.parseString = parser.parseString;
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/package.json b/scripts/metrics/node_modules/xml2js/package.json
new file mode 100644
index 00000000000..94629c201c1
--- /dev/null
+++ b/scripts/metrics/node_modules/xml2js/package.json
@@ -0,0 +1,280 @@
+{
+  "_from": "xml2js",
+  "_id": "xml2js@0.4.19",
+  "_inBundle": false,
+  "_integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+  "_location": "/xml2js",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "xml2js",
+    "name": "xml2js",
+    "escapedName": "xml2js",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+  "_shasum": "686c20f213209e94abf0d1bcf1efaa291c7827a7",
+  "_spec": "xml2js",
+  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics",
+  "author": {
+    "name": "Marek Kubica",
+    "email": "marek@xivilization.net",
+    "url": "https://xivilization.net"
+  },
+  "bugs": {
+    "url": "https://github.com/Leonidas-from-XIV/node-xml2js/issues"
+  },
+  "bundleDependencies": false,
+  "contributors": [
+    {
+      "name": "maqr",
+      "email": "maqr.lollerskates@gmail.com",
+      "url": "https://github.com/maqr"
+    },
+    {
+      "name": "Ben Weaver",
+      "url": "http://benweaver.com/"
+    },
+    {
+      "name": "Jae Kwon",
+      "url": "https://github.com/jaekwon"
+    },
+    {
+      "name": "Jim Robert"
+    },
+    {
+      "name": "Ștefan Rusu",
+      "url": "http://www.saltwaterc.eu/"
+    },
+    {
+      "name": "Carter Cole",
+      "email": "carter.cole@cartercole.com",
+      "url": "http://cartercole.com/"
+    },
+    {
+      "name": "Kurt Raschke",
+      "email": "kurt@kurtraschke.com",
+      "url": "http://www.kurtraschke.com/"
+    },
+    {
+      "name": "Contra",
+      "email": "contra@australia.edu",
+      "url": "https://github.com/Contra"
+    },
+    {
+      "name": "Marcelo Diniz",
+      "email": "marudiniz@gmail.com",
+      "url": "https://github.com/mdiniz"
+    },
+    {
+      "name": "Michael Hart",
+      "url": "https://github.com/mhart"
+    },
+    {
+      "name": "Zachary Scott",
+      "email": "zachary@zacharyscott.net",
+      "url": "http://zacharyscott.net/"
+    },
+    {
+      "name": "Raoul Millais",
+      "url": "https://github.com/raoulmillais"
+    },
+    {
+      "name": "Salsita Software",
+      "url": "http://www.salsitasoft.com/"
+    },
+    {
+      "name": "Mike Schilling",
+      "email": "mike@emotive.com",
+      "url": "http://www.emotive.com/"
+    },
+    {
+      "name": "Jackson Tian",
+      "email": "shyvo1987@gmail.com",
+      "url": "http://weibo.com/shyvo"
+    },
+    {
+      "name": "Mikhail Zyatin",
+      "email": "mikhail.zyatin@gmail.com",
+      "url": "https://github.com/Sitin"
+    },
+    {
+      "name": "Chris Tavares",
+      "email": "ctavares@microsoft.com",
+      "url": "https://github.com/christav"
+    },
+    {
+      "name": "Frank Xu",
+      "email": "yyfrankyy@gmail.com",
+      "url": "http://f2e.us/"
+    },
+    {
+      "name": "Guido D'Albore",
+      "email": "guido@bitstorm.it",
+      "url": "http://www.bitstorm.it/"
+    },
+    {
+      "name": "Jack Senechal",
+      "url": "http://jacksenechal.com/"
+    },
+    {
+      "name": "Matthias Hölzl",
+      "email": "tc@xantira.com",
+      "url": "https://github.com/hoelzl"
+    },
+    {
+      "name": "Camille Reynders",
+      "email": "info@creynders.be",
+      "url": "http://www.creynders.be/"
+    },
+    {
+      "name": "Taylor Gautier",
+      "url": "https://github.com/tsgautier"
+    },
+    {
+      "name": "Todd Bryan",
+      "url": "https://github.com/toddrbryan"
+    },
+    {
+      "name": "Leore Avidar",
+      "email": "leore.avidar@gmail.com",
+      "url": "http://leoreavidar.com/"
+    },
+    {
+      "name": "Dave Aitken",
+      "email": "dave.aitken@gmail.com",
+      "url": "http://www.actionshrimp.com/"
+    },
+    {
+      "name": "Shaney Orrowe",
+      "email": "shaney.orrowe@practiceweb.co.uk"
+    },
+    {
+      "name": "Candle",
+      "email": "candle@candle.me.uk"
+    },
+    {
+      "name": "Jess Telford",
+      "email": "hi@jes.st",
+      "url": "http://jes.st"
+    },
+    {
+      "name": "Tom Hughes",
+      "email": "<tom@compton.nu",
+      "url": "http://compton.nu/"
+    },
+    {
+      "name": "Piotr Rochala",
+      "url": "http://rocha.la/"
+    },
+    {
+      "name": "Michael Avila",
+      "url": "https://github.com/michaelavila"
+    },
+    {
+      "name": "Ryan Gahl",
+      "url": "https://github.com/ryedin"
+    },
+    {
+      "name": "Eric Laberge",
+      "email": "e.laberge@gmail.com",
+      "url": "https://github.com/elaberge"
+    },
+    {
+      "name": "Benjamin E. Coe",
+      "email": "ben@npmjs.com",
+      "url": "https://twitter.com/benjamincoe"
+    },
+    {
+      "name": "Stephen Cresswell",
+      "url": "https://github.com/cressie176"
+    },
+    {
+      "name": "Pascal Ehlert",
+      "email": "pascal@hacksrus.net",
+      "url": "http://www.hacksrus.net/"
+    },
+    {
+      "name": "Tom Spencer",
+      "email": "fiznool@gmail.com",
+      "url": "http://fiznool.com/"
+    },
+    {
+      "name": "Tristian Flanagan",
+      "email": "tflanagan@datacollaborative.com",
+      "url": "https://github.com/tflanagan"
+    },
+    {
+      "name": "Tim Johns",
+      "email": "timjohns@yahoo.com",
+      "url": "https://github.com/TimJohns"
+    },
+    {
+      "name": "Bogdan Chadkin",
+      "email": "trysound@yandex.ru",
+      "url": "https://github.com/TrySound"
+    },
+    {
+      "name": "David Wood",
+      "email": "david.p.wood@gmail.com",
+      "url": "http://codesleuth.co.uk/"
+    },
+    {
+      "name": "Nicolas Maquet",
+      "url": "https://github.com/nmaquet"
+    },
+    {
+      "name": "Lovell Fuller",
+      "url": "http://lovell.info/"
+    },
+    {
+      "name": "d3adc0d3",
+      "url": "https://github.com/d3adc0d3"
+    }
+  ],
+  "dependencies": {
+    "sax": ">=0.6.0",
+    "xmlbuilder": "~9.0.1"
+  },
+  "deprecated": false,
+  "description": "Simple XML to JavaScript object converter.",
+  "devDependencies": {
+    "coffee-script": ">=1.10.0",
+    "coveralls": "^2.11.2",
+    "diff": ">=1.0.8",
+    "docco": ">=0.6.2",
+    "nyc": ">=2.2.1",
+    "zap": ">=0.2.9"
+  },
+  "directories": {
+    "lib": "./lib"
+  },
+  "files": [
+    "lib"
+  ],
+  "homepage": "https://github.com/Leonidas-from-XIV/node-xml2js",
+  "keywords": [
+    "xml",
+    "json"
+  ],
+  "license": "MIT",
+  "main": "./lib/xml2js",
+  "name": "xml2js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Leonidas-from-XIV/node-xml2js.git"
+  },
+  "scripts": {
+    "coverage": "nyc npm test && nyc report",
+    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
+    "test": "zap"
+  },
+  "version": "0.4.19"
+}
diff --git a/scripts/metrics/node_modules/xmlbuilder/.npmignore b/scripts/metrics/node_modules/xmlbuilder/.npmignore
new file mode 100644
index 00000000000..b6ad1f6d9b3
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/.npmignore
@@ -0,0 +1,5 @@
+.travis.yml
+src
+test
+perf
+coverage
diff --git a/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md b/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
new file mode 100644
index 00000000000..6264283378a
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
@@ -0,0 +1,423 @@
+# Change Log
+
+All notable changes to this project are documented in this file. This project adheres to [Semantic Versioning](http://semver.org/#semantic-versioning-200).
+
+## [9.0.4] - 2017-08-16
+- `spacebeforeslash` writer option accepts `true` as well as space char(s).
+
+## [9.0.3] - 2017-08-15
+- `spacebeforeslash` writer option can now be used with XML fragments.
+
+## [9.0.2] - 2017-08-15
+- Added the `spacebeforeslash` writer option to add a space character before closing tags of empty elements. See
+[#157](https://github.com/oozcitak/xmlbuilder-js/issues/157).
+
+## [9.0.1] - 2017-06-19
+- Fixed character validity checks to work with node.js 4.0 and 5.0. See
+[#161](https://github.com/oozcitak/xmlbuilder-js/issues/161).
+
+## [9.0.0] - 2017-05-05
+- Removed case conversion options.
+- Removed support for node.js 4.0 and 5.0. Minimum required version is now 6.0.
+- Fixed valid char filter to use XML 1.1 instead of 1.0. See
+[#147](https://github.com/oozcitak/xmlbuilder-js/issues/147).
+- Added options for negative indentation and suppressing pretty printing of text
+nodes. See
+[#145](https://github.com/oozcitak/xmlbuilder-js/issues/145).
+
+## [8.2.2] - 2016-04-08
+- Falsy values can now be used as a text node in callback mode.
+
+## [8.2.1] - 2016-04-07
+- Falsy values can now be used as a text node. See 
+[#117](https://github.com/oozcitak/xmlbuilder-js/issues/117).
+
+## [8.2.0] - 2016-04-01
+- Removed lodash dependency to keep the library small and simple. See
+[#114](https://github.com/oozcitak/xmlbuilder-js/issues/114),
+[#53](https://github.com/oozcitak/xmlbuilder-js/issues/53),
+and [#43](https://github.com/oozcitak/xmlbuilder-js/issues/43).
+- Added title case to name conversion options.
+
+## [8.1.0] - 2016-03-29
+- Added the callback option to the `begin` export function. When used with a
+callback function, the XML document will be generated in chunks and each chunk
+will be passed to the supplied function. In this mode, `begin` uses a different
+code path and the builder should use much less memory since the entire XML tree
+is not kept. There are a few drawbacks though. For example, traversing the document
+tree or adding attributes to a node after it is written is not possible. It is
+also not possible to remove nodes or attributes.
+
+``` js
+var result = '';
+
+builder.begin(function(chunk) { result += chunk; })
+  .dec()
+  .ele('root')
+    .ele('xmlbuilder').up()
+  .end();
+```
+
+- Replaced native `Object.assign` with `lodash.assign` to support old JS engines.  See [#111](https://github.com/oozcitak/xmlbuilder-js/issues/111).
+
+## [8.0.0] - 2016-03-25
+- Added the `begin` export function. See the wiki for details.
+- Added the ability to add comments and processing instructions before and after the root element. Added `commentBefore`, `commentAfter`, `instructionBefore` and `instructionAfter` functions for this purpose.
+- Dropped support for old node.js releases. Minimum required node.js version is now 4.0.
+
+## [7.0.0] - 2016-03-21
+- Processing instructions are now created as regular nodes. This is a major breaking change if you are using processing instructions. Previously processing instructions were inserted before their parent node. After this change processing instructions are appended to the children of the parent node. Note that it is not currently possible to insert processing instructions before or after the root element.
+```js
+root.ele('node').ins('pi');
+// pre-v7
+<?pi?><node/>
+// v7
+<node><?pi?></node>
+```
+
+## [6.0.0] - 2016-03-20
+- Added custom XML writers. The default string conversion functions are now collected under the `XMLStringWriter` class which can be accessed by the `stringWriter(options)` function exported by the module. An `XMLStreamWriter` is also added which outputs the XML document to a writable stream. A stream writer can be created by calling the `streamWriter(stream, options)` function exported by the module. Both classes are heavily customizable and the details are added to the wiki. It is also possible to write an XML writer from scratch and use it when calling `end()` on the XML document.
+
+## [5.0.1] - 2016-03-08
+- Moved require statements for text case conversion to the top of files to reduce lazy requires.
+
+## [5.0.0] - 2016-03-05
+- Added text case option for element names and attribute names. Valid cases are `lower`, `upper`, `camel`, `kebab` and `snake`.
+- Attribute and element values are escaped according to the [Canonical XML 1.0 specification](http://www.w3.org/TR/2000/WD-xml-c14n-20000119.html#charescaping). See [#54](https://github.com/oozcitak/xmlbuilder-js/issues/54) and [#86](https://github.com/oozcitak/xmlbuilder-js/issues/86).
+- Added the `allowEmpty` option to `end()`. When this option is set, empty elements are not self-closed.
+- Added support for [nested CDATA](https://en.wikipedia.org/wiki/CDATA#Nesting). The triad `]]>` in CDATA is now automatically replaced with `]]]]><![CDATA[>`.
+
+## [4.2.1] - 2016-01-15
+- Updated lodash dependency to 4.0.0.
+
+## [4.2.0] - 2015-12-16
+- Added the `noDoubleEncoding` option to `create()` to control whether existing html entities are encoded.
+
+## [4.1.0] - 2015-11-11
+- Added the `separateArrayItems` option to `create()` to control how arrays are handled when converting from objects. e.g.
+
+```js
+root.ele({ number: [ "one", "two"  ]});
+// with separateArrayItems: true
+<number>
+  <one/>
+  <two/>
+</number>
+// with separateArrayItems: false
+<number>one</number>
+<number>two</number>
+```
+
+## [4.0.0] - 2015-11-01
+- Removed the `#list` decorator. Array items are now created as child nodes by default.
+- Fixed a bug where the XML encoding string was checked partially.
+
+## [3.1.0] - 2015-09-19
+- `#list` decorator ignores empty arrays.
+
+## [3.0.0] - 2015-09-10
+- Allow `\r`, `\n` and `\t` in attribute values without escaping. See [#86](https://github.com/oozcitak/xmlbuilder-js/issues/86).
+
+## [2.6.5] - 2015-09-09
+- Use native `isArray` instead of lodash.
+- Indentation of processing instructions are set to the parent element's.
+
+## [2.6.4] - 2015-05-27
+- Updated lodash dependency to 3.5.0.
+
+## [2.6.3] - 2015-05-27
+- Bumped version because previous release was not published on npm.
+
+## [2.6.2] - 2015-03-10
+- Updated lodash dependency to 3.5.0.
+
+## [2.6.1] - 2015-02-20
+- Updated lodash dependency to 3.3.0.
+
+## [2.6.0] - 2015-02-20
+- Fixed a bug where the `XMLNode` constructor overwrote the super class parent.
+- Removed document property from cloned nodes.
+- Switched to mocha.js for testing.
+
+## [2.5.2] - 2015-02-16
+- Updated lodash dependency to 3.2.0.
+
+## [2.5.1] - 2015-02-09
+- Updated lodash dependency to 3.1.0.
+- Support all node >= 0.8.
+
+## [2.5.0] - 2015-00-03
+- Updated lodash dependency to 3.0.0.
+
+## [2.4.6] - 2015-01-26
+-	Show more information from attribute creation with null values.
+-	Added iojs as an engine.
+-	Self close elements with empty text.
+
+## [2.4.5] - 2014-11-15
+- Fixed prepublish script to run on windows.
+- Fixed  bug in XMLStringifier where an undefined value was used while reporting an invalid encoding value.
+- Moved require statements to the top of files to reduce lazy requires. See [#62](https://github.com/oozcitak/xmlbuilder-js/issues/62).
+
+## [2.4.4] - 2014-09-08
+- Added the `offset` option to `toString()` for use in XML fragments.
+
+## [2.4.3] - 2014-08-13
+- Corrected license in package description.
+
+## [2.4.2] - 2014-08-13
+- Dropped performance test and memwatch dependency.
+
+## [2.4.1] - 2014-08-12
+- Fixed a bug where empty indent string was omitted when pretty printing. See [#59](https://github.com/oozcitak/xmlbuilder-js/issues/59).
+
+## [2.4.0] - 2014-08-04
+- Correct cases of pubID and sysID.
+- Use single lodash instead of separate npm modules. See [#53](https://github.com/oozcitak/xmlbuilder-js/issues/53).
+- Escape according to Canonical XML 1.0. See [#54](https://github.com/oozcitak/xmlbuilder-js/issues/54).
+
+## [2.3.0] - 2014-07-17
+- Convert objects to JS primitives while sanitizing user input.
+- Object builder preserves items with null values. See [#44](https://github.com/oozcitak/xmlbuilder-js/issues/44).
+- Use modularized lodash functions to cut down dependencies.
+- Process empty objects when converting from objects so that we don't throw on empty child objects.
+
+## [2.2.1] - 2014-04-04
+- Bumped version because previous release was not published on npm.
+
+## [2.2.0] - 2014-04-04
+- Switch to lodash from underscore.
+- Removed legacy `ext` option from `create()`.
+- Drop old node versions: 0.4, 0.5, 0.6. 0.8 is the minimum requirement from now on.
+
+## [2.1.0] - 2013-12-30
+- Removed duplicate null checks from constructors.
+- Fixed node count in performance test.
+- Added option for skipping null attribute values. See [#26](https://github.com/oozcitak/xmlbuilder-js/issues/26).
+- Allow multiple values in `att()` and `ins()`.
+- Added ability to run individual performance tests.
+- Added flag for ignoring decorator strings.
+
+## [2.0.1] - 2013-12-24
+- Removed performance tests from npm package.
+
+## [2.0.0] - 2013-12-24
+- Combined loops for speed up.
+- Added support for the DTD and XML declaration.
+- `clone` includes attributes.
+- Added performance tests.
+- Evaluate attribute value if function.
+- Evaluate instruction value if function.
+
+## [1.1.2] - 2013-12-11
+- 	Changed processing instruction decorator to `?`.
+
+## [1.1.1] - 2013-12-11
+- 	Added processing instructions to JS object conversion.
+
+## [1.1.0] - 2013-12-10
+- Added license to package.
+- `create()` and `element()` accept JS object to fully build the document.
+- Added `nod()` and `n()` aliases for `node()`.
+- Renamed `convertAttChar` decorator to `convertAttKey`.
+- Ignore empty decorator strings when converting JS objects.
+
+## [1.0.2] - 2013-11-27
+- Removed temp file which was accidentally included in the package.
+
+## [1.0.1] - 2013-11-27
+- Custom stringify functions affect current instance only.
+
+## [1.0.0] - 2013-11-27
+- Added processing instructions.
+- Added stringify functions to sanitize and convert input values.
+- Added option for headless XML documents.
+- Added vows tests.
+- Removed Makefile. Using npm publish scripts instead.
+- Removed the `begin()` function. `create()` begins the document by creating the root node.
+
+## [0.4.3] - 2013-11-08
+- Added option to include surrogate pairs in XML content. See [#29](https://github.com/oozcitak/xmlbuilder-js/issues/29).
+- Fixed empty value string representation in pretty mode.
+- Added pre and postpublish scripts to package.json.
+- Filtered out prototype properties when appending attributes. See [#31](https://github.com/oozcitak/xmlbuilder-js/issues/31).
+
+## [0.4.2] - 2012-09-14
+- Removed README.md from `.npmignore`.
+
+## [0.4.1] - 2012-08-31
+- Removed `begin()` calls in favor of `XMLBuilder` constructor.
+- Added the `end()` function. `end()` is a convenience over `doc().toString()`.
+
+## [0.4.0] - 2012-08-31
+- Added arguments to `XMLBuilder` constructor to allow the name of the root element and XML prolog to be defined in one line.
+- Soft deprecated `begin()`.
+
+## [0.3.11] - 2012-08-13
+- Package keywords are fixed to be an array of values.
+
+## [0.3.10] - 2012-08-13
+- Brought back npm package contents which were lost due to incorrect configuration of `package.json` in previous releases.
+
+## [0.3.3] - 2012-07-27
+- Implemented `importXMLBuilder()`.
+
+## [0.3.2] - 2012-07-20
+- Fixed a duplicated escaping problem on `element()`.
+- Fixed a problem with text node creation from empty string.
+- Calling `root()` on the document element returns the root element.
+- `XMLBuilder` no longer extends `XMLFragment`.
+
+## [0.3.1] - 2011-11-28
+- Added guards for document element so that nodes cannot be inserted at document level.
+
+## [0.3.0] - 2011-11-28
+- Added `doc()` to return the document element.
+
+## [0.2.2] - 2011-11-28
+- Prevent code relying on `up()`'s older behavior to break.
+
+## [0.2.1] - 2011-11-28
+- Added the `root()` function.
+
+## [0.2.0] - 2011-11-21
+- Added Travis-CI integration.
+- Added coffee-script dependency.
+- Added insert, traversal and delete functions.
+
+## [0.1.7] - 2011-10-25
+- No changes. Accidental release.
+
+## [0.1.6] - 2011-10-25
+- Corrected `package.json` bugs link to `url` from `web`.
+
+## [0.1.5] - 2011-08-08
+- Added missing npm package contents.
+
+## [0.1.4] - 2011-07-29
+- Text-only nodes are no longer indented.
+- Added documentation for multiple instances.
+
+## [0.1.3] - 2011-07-27
+- Exported the `create()` function to return a new instance. This allows multiple builder instances to be constructed.
+- Fixed `u()` function so that it now correctly calls `up()`.
+- Fixed typo in `element()` so that `attributes` and `text` can be passed interchangeably.
+
+## [0.1.2] - 2011-06-03
+- `ele()` accepts element text.
+- `attributes()` now overrides existing attributes if passed the same attribute name.
+
+## [0.1.1] - 2011-05-19
+- Added the raw output option.
+- Removed most validity checks.
+
+## [0.1.0] - 2011-04-27
+- `text()` and `cdata()` now return parent element.
+- Attribute values are escaped.
+
+## [0.0.7] - 2011-04-23
+-	Coerced text values to string.
+
+## [0.0.6] - 2011-02-23
+- Added support for XML comments.
+- Text nodes are checked against CharData.
+
+## [0.0.5] - 2010-12-31
+- Corrected the name of the main npm module in `package.json`.
+
+## [0.0.4] - 2010-12-28
+- Added `.npmignore`.
+
+## [0.0.3] - 2010-12-27
+- root element is now constructed in `begin()`.
+- moved prolog to `begin()`.
+- Added the ability to have CDATA in element text.
+- Removed unused prolog aliases.
+- Removed `builder()` function from main module.
+- Added the name of the main npm module in `package.json`.
+
+## [0.0.2] - 2010-11-03
+- `element()` expands nested arrays.
+- Added pretty printing.
+- Added the `up()`, `build()` and `prolog()` functions.
+- Added readme.
+
+## 0.0.1 - 2010-11-02
+- Initial release
+
+[9.0.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.3...v9.0.4
+[9.0.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.2...v9.0.3
+[9.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.1...v9.0.2
+[9.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.0...v9.0.1
+[9.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.2...v9.0.0
+[8.2.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.1...v8.2.2
+[8.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.0...v8.2.1
+[8.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.1.0...v8.2.0
+[8.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.0.0...v8.1.0
+[8.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v7.0.0...v8.0.0
+[7.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v6.0.0...v7.0.0
+[6.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v5.0.1...v6.0.0
+[5.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v5.0.0...v5.0.1
+[5.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.2.1...v5.0.0
+[4.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.2.0...v4.2.1
+[4.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.1.0...v4.2.0
+[4.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.0.0...v4.1.0
+[4.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v3.1.0...v4.0.0
+[3.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v3.0.0...v3.1.0
+[3.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.5...v3.0.0
+[2.6.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.4...v2.6.5
+[2.6.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.3...v2.6.4
+[2.6.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.2...v2.6.3
+[2.6.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.1...v2.6.2
+[2.6.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.0...v2.6.1
+[2.6.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.2...v2.6.0
+[2.5.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.1...v2.5.2
+[2.5.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.0...v2.5.1
+[2.5.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.6...v2.5.0
+[2.4.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.5...v2.4.6
+[2.4.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.4...v2.4.5
+[2.4.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.3...v2.4.4
+[2.4.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.2...v2.4.3
+[2.4.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.1...v2.4.2
+[2.4.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.0...v2.4.1
+[2.4.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.3.0...v2.4.0
+[2.3.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.2.1...v2.3.0
+[2.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.2.0...v2.2.1
+[2.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.1.0...v2.2.0
+[2.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.0.1...v2.1.0
+[2.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.2...v2.0.0
+[1.1.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.1...v1.1.2
+[1.1.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.2...v1.1.0
+[1.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.3...v1.0.0
+[0.4.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.2...v0.4.3
+[0.4.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.1...v0.4.2
+[0.4.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.0...v0.4.1
+[0.4.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.11...v0.4.0
+[0.3.11]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.10...v0.3.11
+[0.3.10]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.3...v0.3.10
+[0.3.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.2...v0.3.3
+[0.3.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.1...v0.3.2
+[0.3.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.0...v0.3.1
+[0.3.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.2...v0.3.0
+[0.2.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.7...v0.2.0
+[0.1.7]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.6...v0.1.7
+[0.1.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.5...v0.1.6
+[0.1.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.4...v0.1.5
+[0.1.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.3...v0.1.4
+[0.1.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.0...v0.1.1
+[0.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.7...v0.1.0
+[0.0.7]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.6...v0.0.7
+[0.0.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.5...v0.0.6
+[0.0.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.4...v0.0.5
+[0.0.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.3...v0.0.4
+[0.0.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.2...v0.0.3
+[0.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.1...v0.0.2
+
diff --git a/scripts/metrics/node_modules/xmlbuilder/LICENSE b/scripts/metrics/node_modules/xmlbuilder/LICENSE
new file mode 100644
index 00000000000..e7cbac9a801
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Ozgur Ozcitak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/xmlbuilder/README.md b/scripts/metrics/node_modules/xmlbuilder/README.md
new file mode 100644
index 00000000000..785c4dd6369
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/README.md
@@ -0,0 +1,85 @@
+# xmlbuilder-js
+
+An XML builder for [node.js](https://nodejs.org/) similar to
+[java-xmlbuilder](https://github.com/jmurty/java-xmlbuilder).
+
+[![License](http://img.shields.io/npm/l/xmlbuilder.svg?style=flat-square)](http://opensource.org/licenses/MIT)
+[![NPM Version](http://img.shields.io/npm/v/xmlbuilder.svg?style=flat-square)](https://npmjs.com/package/xmlbuilder)
+[![NPM Downloads](https://img.shields.io/npm/dm/xmlbuilder.svg?style=flat-square)](https://npmjs.com/package/xmlbuilder)
+
+[![Build Status](http://img.shields.io/travis/oozcitak/xmlbuilder-js.svg?style=flat-square)](http://travis-ci.org/oozcitak/xmlbuilder-js)
+[![Dev Dependency Status](http://img.shields.io/david/dev/oozcitak/xmlbuilder-js.svg?style=flat-square)](https://david-dm.org/oozcitak/xmlbuilder-js)
+[![Code Coverage](https://img.shields.io/coveralls/oozcitak/xmlbuilder-js.svg?style=flat-square)](https://coveralls.io/github/oozcitak/xmlbuilder-js)
+
+### Installation:
+
+``` sh
+npm install xmlbuilder
+```
+
+### Usage:
+
+``` js
+var builder = require('xmlbuilder');
+var xml = builder.create('root')
+  .ele('xmlbuilder')
+    .ele('repo', {'type': 'git'}, 'git://github.com/oozcitak/xmlbuilder-js.git')
+  .end({ pretty: true});
+
+console.log(xml);
+```
+
+will result in:
+
+``` xml
+<?xml version="1.0"?>
+<root>
+  <xmlbuilder>
+    <repo type="git">git://github.com/oozcitak/xmlbuilder-js.git</repo>
+  </xmlbuilder>
+</root>
+```
+
+It is also possible to convert objects into nodes:
+
+``` js
+builder.create({
+  root: {
+    xmlbuilder: {
+      repo: {
+        '@type': 'git', // attributes start with @
+        '#text': 'git://github.com/oozcitak/xmlbuilder-js.git' // text node
+      }
+    }
+  }
+});
+```
+
+If you need to do some processing:
+
+``` js
+var root = builder.create('squares');
+root.com('f(x) = x^2');
+for(var i = 1; i <= 5; i++)
+{
+  var item = root.ele('data');
+  item.att('x', i);
+  item.att('y', i * i);
+}
+```
+
+This will result in:
+
+``` xml
+<?xml version="1.0"?>
+<squares>
+  <!-- f(x) = x^2 -->
+  <data x="1" y="1"/>
+  <data x="2" y="4"/>
+  <data x="3" y="9"/>
+  <data x="4" y="16"/>
+  <data x="5" y="25"/>
+</squares>
+```
+
+See the [wiki](https://github.com/oozcitak/xmlbuilder-js/wiki) for details and [examples](https://github.com/oozcitak/xmlbuilder-js/wiki/Examples) for more complex examples.
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js b/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
new file mode 100644
index 00000000000..908f8a8a537
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
@@ -0,0 +1,73 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var assign, isArray, isEmpty, isFunction, isObject, isPlainObject,
+    slice = [].slice,
+    hasProp = {}.hasOwnProperty;
+
+  assign = function() {
+    var i, key, len, source, sources, target;
+    target = arguments[0], sources = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+    if (isFunction(Object.assign)) {
+      Object.assign.apply(null, arguments);
+    } else {
+      for (i = 0, len = sources.length; i < len; i++) {
+        source = sources[i];
+        if (source != null) {
+          for (key in source) {
+            if (!hasProp.call(source, key)) continue;
+            target[key] = source[key];
+          }
+        }
+      }
+    }
+    return target;
+  };
+
+  isFunction = function(val) {
+    return !!val && Object.prototype.toString.call(val) === '[object Function]';
+  };
+
+  isObject = function(val) {
+    var ref;
+    return !!val && ((ref = typeof val) === 'function' || ref === 'object');
+  };
+
+  isArray = function(val) {
+    if (isFunction(Array.isArray)) {
+      return Array.isArray(val);
+    } else {
+      return Object.prototype.toString.call(val) === '[object Array]';
+    }
+  };
+
+  isEmpty = function(val) {
+    var key;
+    if (isArray(val)) {
+      return !val.length;
+    } else {
+      for (key in val) {
+        if (!hasProp.call(val, key)) continue;
+        return false;
+      }
+      return true;
+    }
+  };
+
+  isPlainObject = function(val) {
+    var ctor, proto;
+    return isObject(val) && (proto = Object.getPrototypeOf(val)) && (ctor = proto.constructor) && (typeof ctor === 'function') && (ctor instanceof ctor) && (Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object));
+  };
+
+  module.exports.assign = assign;
+
+  module.exports.isFunction = isFunction;
+
+  module.exports.isObject = isObject;
+
+  module.exports.isArray = isArray;
+
+  module.exports.isEmpty = isEmpty;
+
+  module.exports.isPlainObject = isPlainObject;
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
new file mode 100644
index 00000000000..67cc0bcbdd8
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
@@ -0,0 +1,31 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLAttribute;
+
+  module.exports = XMLAttribute = (function() {
+    function XMLAttribute(parent, name, value) {
+      this.options = parent.options;
+      this.stringify = parent.stringify;
+      if (name == null) {
+        throw new Error("Missing attribute name of element " + parent.name);
+      }
+      if (value == null) {
+        throw new Error("Missing attribute value for attribute " + name + " of element " + parent.name);
+      }
+      this.name = this.stringify.attName(name);
+      this.value = this.stringify.attValue(value);
+    }
+
+    XMLAttribute.prototype.clone = function() {
+      return Object.create(this);
+    };
+
+    XMLAttribute.prototype.toString = function(options) {
+      return this.options.writer.set(options).attribute(this);
+    };
+
+    return XMLAttribute;
+
+  })();
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
new file mode 100644
index 00000000000..670e860889d
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
@@ -0,0 +1,32 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLCData, XMLNode,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLCData = (function(superClass) {
+    extend(XMLCData, superClass);
+
+    function XMLCData(parent, text) {
+      XMLCData.__super__.constructor.call(this, parent);
+      if (text == null) {
+        throw new Error("Missing CDATA text");
+      }
+      this.text = this.stringify.cdata(text);
+    }
+
+    XMLCData.prototype.clone = function() {
+      return Object.create(this);
+    };
+
+    XMLCData.prototype.toString = function(options) {
+      return this.options.writer.set(options).cdata(this);
+    };
+
+    return XMLCData;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
new file mode 100644
index 00000000000..c189714abb3
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
@@ -0,0 +1,32 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLComment, XMLNode,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLComment = (function(superClass) {
+    extend(XMLComment, superClass);
+
+    function XMLComment(parent, text) {
+      XMLComment.__super__.constructor.call(this, parent);
+      if (text == null) {
+        throw new Error("Missing comment text");
+      }
+      this.text = this.stringify.comment(text);
+    }
+
+    XMLComment.prototype.clone = function() {
+      return Object.create(this);
+    };
+
+    XMLComment.prototype.toString = function(options) {
+      return this.options.writer.set(options).comment(this);
+    };
+
+    return XMLComment;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
new file mode 100644
index 00000000000..8f911c257dd
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
@@ -0,0 +1,50 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLDTDAttList, XMLNode,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLDTDAttList = (function(superClass) {
+    extend(XMLDTDAttList, superClass);
+
+    function XMLDTDAttList(parent, elementName, attributeName, attributeType, defaultValueType, defaultValue) {
+      XMLDTDAttList.__super__.constructor.call(this, parent);
+      if (elementName == null) {
+        throw new Error("Missing DTD element name");
+      }
+      if (attributeName == null) {
+        throw new Error("Missing DTD attribute name");
+      }
+      if (!attributeType) {
+        throw new Error("Missing DTD attribute type");
+      }
+      if (!defaultValueType) {
+        throw new Error("Missing DTD attribute default");
+      }
+      if (defaultValueType.indexOf('#') !== 0) {
+        defaultValueType = '#' + defaultValueType;
+      }
+      if (!defaultValueType.match(/^(#REQUIRED|#IMPLIED|#FIXED|#DEFAULT)$/)) {
+        throw new Error("Invalid default value type; expected: #REQUIRED, #IMPLIED, #FIXED or #DEFAULT");
+      }
+      if (defaultValue && !defaultValueType.match(/^(#FIXED|#DEFAULT)$/)) {
+        throw new Error("Default value only applies to #FIXED or #DEFAULT");
+      }
+      this.elementName = this.stringify.eleName(elementName);
+      this.attributeName = this.stringify.attName(attributeName);
+      this.attributeType = this.stringify.dtdAttType(attributeType);
+      this.defaultValue = this.stringify.dtdAttDefault(defaultValue);
+      this.defaultValueType = defaultValueType;
+    }
+
+    XMLDTDAttList.prototype.toString = function(options) {
+      return this.options.writer.set(options).dtdAttList(this);
+    };
+
+    return XMLDTDAttList;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
new file mode 100644
index 00000000000..43f5d05ec2b
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
@@ -0,0 +1,35 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLDTDElement, XMLNode,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLDTDElement = (function(superClass) {
+    extend(XMLDTDElement, superClass);
+
+    function XMLDTDElement(parent, name, value) {
+      XMLDTDElement.__super__.constructor.call(this, parent);
+      if (name == null) {
+        throw new Error("Missing DTD element name");
+      }
+      if (!value) {
+        value = '(#PCDATA)';
+      }
+      if (Array.isArray(value)) {
+        value = '(' + value.join(',') + ')';
+      }
+      this.name = this.stringify.eleName(name);
+      this.value = this.stringify.dtdElementValue(value);
+    }
+
+    XMLDTDElement.prototype.toString = function(options) {
+      return this.options.writer.set(options).dtdElement(this);
+    };
+
+    return XMLDTDElement;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
new file mode 100644
index 00000000000..943f312d50b
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
@@ -0,0 +1,56 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLDTDEntity, XMLNode, isObject,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  isObject = require('./Utility').isObject;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLDTDEntity = (function(superClass) {
+    extend(XMLDTDEntity, superClass);
+
+    function XMLDTDEntity(parent, pe, name, value) {
+      XMLDTDEntity.__super__.constructor.call(this, parent);
+      if (name == null) {
+        throw new Error("Missing entity name");
+      }
+      if (value == null) {
+        throw new Error("Missing entity value");
+      }
+      this.pe = !!pe;
+      this.name = this.stringify.eleName(name);
+      if (!isObject(value)) {
+        this.value = this.stringify.dtdEntityValue(value);
+      } else {
+        if (!value.pubID && !value.sysID) {
+          throw new Error("Public and/or system identifiers are required for an external entity");
+        }
+        if (value.pubID && !value.sysID) {
+          throw new Error("System identifier is required for a public external entity");
+        }
+        if (value.pubID != null) {
+          this.pubID = this.stringify.dtdPubID(value.pubID);
+        }
+        if (value.sysID != null) {
+          this.sysID = this.stringify.dtdSysID(value.sysID);
+        }
+        if (value.nData != null) {
+          this.nData = this.stringify.dtdNData(value.nData);
+        }
+        if (this.pe && this.nData) {
+          throw new Error("Notation declaration is not allowed in a parameter entity");
+        }
+      }
+    }
+
+    XMLDTDEntity.prototype.toString = function(options) {
+      return this.options.writer.set(options).dtdEntity(this);
+    };
+
+    return XMLDTDEntity;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
new file mode 100644
index 00000000000..2c0c69820b8
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
@@ -0,0 +1,37 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLDTDNotation, XMLNode,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLDTDNotation = (function(superClass) {
+    extend(XMLDTDNotation, superClass);
+
+    function XMLDTDNotation(parent, name, value) {
+      XMLDTDNotation.__super__.constructor.call(this, parent);
+      if (name == null) {
+        throw new Error("Missing notation name");
+      }
+      if (!value.pubID && !value.sysID) {
+        throw new Error("Public or system identifiers are required for an external entity");
+      }
+      this.name = this.stringify.eleName(name);
+      if (value.pubID != null) {
+        this.pubID = this.stringify.dtdPubID(value.pubID);
+      }
+      if (value.sysID != null) {
+        this.sysID = this.stringify.dtdSysID(value.sysID);
+      }
+    }
+
+    XMLDTDNotation.prototype.toString = function(options) {
+      return this.options.writer.set(options).dtdNotation(this);
+    };
+
+    return XMLDTDNotation;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
new file mode 100644
index 00000000000..3251f289ff7
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
@@ -0,0 +1,40 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLDeclaration, XMLNode, isObject,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  isObject = require('./Utility').isObject;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLDeclaration = (function(superClass) {
+    extend(XMLDeclaration, superClass);
+
+    function XMLDeclaration(parent, version, encoding, standalone) {
+      var ref;
+      XMLDeclaration.__super__.constructor.call(this, parent);
+      if (isObject(version)) {
+        ref = version, version = ref.version, encoding = ref.encoding, standalone = ref.standalone;
+      }
+      if (!version) {
+        version = '1.0';
+      }
+      this.version = this.stringify.xmlVersion(version);
+      if (encoding != null) {
+        this.encoding = this.stringify.xmlEncoding(encoding);
+      }
+      if (standalone != null) {
+        this.standalone = this.stringify.xmlStandalone(standalone);
+      }
+    }
+
+    XMLDeclaration.prototype.toString = function(options) {
+      return this.options.writer.set(options).declaration(this);
+    };
+
+    return XMLDeclaration;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
new file mode 100644
index 00000000000..1bb0429ac50
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
@@ -0,0 +1,107 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDocType, XMLNode, isObject,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  isObject = require('./Utility').isObject;
+
+  XMLNode = require('./XMLNode');
+
+  XMLDTDAttList = require('./XMLDTDAttList');
+
+  XMLDTDEntity = require('./XMLDTDEntity');
+
+  XMLDTDElement = require('./XMLDTDElement');
+
+  XMLDTDNotation = require('./XMLDTDNotation');
+
+  module.exports = XMLDocType = (function(superClass) {
+    extend(XMLDocType, superClass);
+
+    function XMLDocType(parent, pubID, sysID) {
+      var ref, ref1;
+      XMLDocType.__super__.constructor.call(this, parent);
+      this.documentObject = parent;
+      if (isObject(pubID)) {
+        ref = pubID, pubID = ref.pubID, sysID = ref.sysID;
+      }
+      if (sysID == null) {
+        ref1 = [pubID, sysID], sysID = ref1[0], pubID = ref1[1];
+      }
+      if (pubID != null) {
+        this.pubID = this.stringify.dtdPubID(pubID);
+      }
+      if (sysID != null) {
+        this.sysID = this.stringify.dtdSysID(sysID);
+      }
+    }
+
+    XMLDocType.prototype.element = function(name, value) {
+      var child;
+      child = new XMLDTDElement(this, name, value);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLDocType.prototype.attList = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
+      var child;
+      child = new XMLDTDAttList(this, elementName, attributeName, attributeType, defaultValueType, defaultValue);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLDocType.prototype.entity = function(name, value) {
+      var child;
+      child = new XMLDTDEntity(this, false, name, value);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLDocType.prototype.pEntity = function(name, value) {
+      var child;
+      child = new XMLDTDEntity(this, true, name, value);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLDocType.prototype.notation = function(name, value) {
+      var child;
+      child = new XMLDTDNotation(this, name, value);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLDocType.prototype.toString = function(options) {
+      return this.options.writer.set(options).docType(this);
+    };
+
+    XMLDocType.prototype.ele = function(name, value) {
+      return this.element(name, value);
+    };
+
+    XMLDocType.prototype.att = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
+      return this.attList(elementName, attributeName, attributeType, defaultValueType, defaultValue);
+    };
+
+    XMLDocType.prototype.ent = function(name, value) {
+      return this.entity(name, value);
+    };
+
+    XMLDocType.prototype.pent = function(name, value) {
+      return this.pEntity(name, value);
+    };
+
+    XMLDocType.prototype.not = function(name, value) {
+      return this.notation(name, value);
+    };
+
+    XMLDocType.prototype.up = function() {
+      return this.root() || this.documentObject;
+    };
+
+    return XMLDocType;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
new file mode 100644
index 00000000000..38743ee3f4b
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
@@ -0,0 +1,48 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLDocument, XMLNode, XMLStringWriter, XMLStringifier, isPlainObject,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  isPlainObject = require('./Utility').isPlainObject;
+
+  XMLNode = require('./XMLNode');
+
+  XMLStringifier = require('./XMLStringifier');
+
+  XMLStringWriter = require('./XMLStringWriter');
+
+  module.exports = XMLDocument = (function(superClass) {
+    extend(XMLDocument, superClass);
+
+    function XMLDocument(options) {
+      XMLDocument.__super__.constructor.call(this, null);
+      options || (options = {});
+      if (!options.writer) {
+        options.writer = new XMLStringWriter();
+      }
+      this.options = options;
+      this.stringify = new XMLStringifier(options);
+      this.isDocument = true;
+    }
+
+    XMLDocument.prototype.end = function(writer) {
+      var writerOptions;
+      if (!writer) {
+        writer = this.options.writer;
+      } else if (isPlainObject(writer)) {
+        writerOptions = writer;
+        writer = this.options.writer.set(writerOptions);
+      }
+      return writer.document(this);
+    };
+
+    XMLDocument.prototype.toString = function(options) {
+      return this.options.writer.set(options).document(this);
+    };
+
+    return XMLDocument;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
new file mode 100644
index 00000000000..00da8dcd2ab
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
@@ -0,0 +1,402 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLAttribute, XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLDocumentCB, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStringWriter, XMLStringifier, XMLText, isFunction, isObject, isPlainObject, ref,
+    hasProp = {}.hasOwnProperty;
+
+  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction, isPlainObject = ref.isPlainObject;
+
+  XMLElement = require('./XMLElement');
+
+  XMLCData = require('./XMLCData');
+
+  XMLComment = require('./XMLComment');
+
+  XMLRaw = require('./XMLRaw');
+
+  XMLText = require('./XMLText');
+
+  XMLProcessingInstruction = require('./XMLProcessingInstruction');
+
+  XMLDeclaration = require('./XMLDeclaration');
+
+  XMLDocType = require('./XMLDocType');
+
+  XMLDTDAttList = require('./XMLDTDAttList');
+
+  XMLDTDEntity = require('./XMLDTDEntity');
+
+  XMLDTDElement = require('./XMLDTDElement');
+
+  XMLDTDNotation = require('./XMLDTDNotation');
+
+  XMLAttribute = require('./XMLAttribute');
+
+  XMLStringifier = require('./XMLStringifier');
+
+  XMLStringWriter = require('./XMLStringWriter');
+
+  module.exports = XMLDocumentCB = (function() {
+    function XMLDocumentCB(options, onData, onEnd) {
+      var writerOptions;
+      options || (options = {});
+      if (!options.writer) {
+        options.writer = new XMLStringWriter(options);
+      } else if (isPlainObject(options.writer)) {
+        writerOptions = options.writer;
+        options.writer = new XMLStringWriter(writerOptions);
+      }
+      this.options = options;
+      this.writer = options.writer;
+      this.stringify = new XMLStringifier(options);
+      this.onDataCallback = onData || function() {};
+      this.onEndCallback = onEnd || function() {};
+      this.currentNode = null;
+      this.currentLevel = -1;
+      this.openTags = {};
+      this.documentStarted = false;
+      this.documentCompleted = false;
+      this.root = null;
+    }
+
+    XMLDocumentCB.prototype.node = function(name, attributes, text) {
+      var ref1;
+      if (name == null) {
+        throw new Error("Missing node name");
+      }
+      if (this.root && this.currentLevel === -1) {
+        throw new Error("Document can only have one root node");
+      }
+      this.openCurrent();
+      name = name.valueOf();
+      if (attributes == null) {
+        attributes = {};
+      }
+      attributes = attributes.valueOf();
+      if (!isObject(attributes)) {
+        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
+      }
+      this.currentNode = new XMLElement(this, name, attributes);
+      this.currentNode.children = false;
+      this.currentLevel++;
+      this.openTags[this.currentLevel] = this.currentNode;
+      if (text != null) {
+        this.text(text);
+      }
+      return this;
+    };
+
+    XMLDocumentCB.prototype.element = function(name, attributes, text) {
+      if (this.currentNode && this.currentNode instanceof XMLDocType) {
+        return this.dtdElement.apply(this, arguments);
+      } else {
+        return this.node(name, attributes, text);
+      }
+    };
+
+    XMLDocumentCB.prototype.attribute = function(name, value) {
+      var attName, attValue;
+      if (!this.currentNode || this.currentNode.children) {
+        throw new Error("att() can only be used immediately after an ele() call in callback mode");
+      }
+      if (name != null) {
+        name = name.valueOf();
+      }
+      if (isObject(name)) {
+        for (attName in name) {
+          if (!hasProp.call(name, attName)) continue;
+          attValue = name[attName];
+          this.attribute(attName, attValue);
+        }
+      } else {
+        if (isFunction(value)) {
+          value = value.apply();
+        }
+        if (!this.options.skipNullAttributes || (value != null)) {
+          this.currentNode.attributes[name] = new XMLAttribute(this, name, value);
+        }
+      }
+      return this;
+    };
+
+    XMLDocumentCB.prototype.text = function(value) {
+      var node;
+      this.openCurrent();
+      node = new XMLText(this, value);
+      this.onData(this.writer.text(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.cdata = function(value) {
+      var node;
+      this.openCurrent();
+      node = new XMLCData(this, value);
+      this.onData(this.writer.cdata(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.comment = function(value) {
+      var node;
+      this.openCurrent();
+      node = new XMLComment(this, value);
+      this.onData(this.writer.comment(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.raw = function(value) {
+      var node;
+      this.openCurrent();
+      node = new XMLRaw(this, value);
+      this.onData(this.writer.raw(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.instruction = function(target, value) {
+      var i, insTarget, insValue, len, node;
+      this.openCurrent();
+      if (target != null) {
+        target = target.valueOf();
+      }
+      if (value != null) {
+        value = value.valueOf();
+      }
+      if (Array.isArray(target)) {
+        for (i = 0, len = target.length; i < len; i++) {
+          insTarget = target[i];
+          this.instruction(insTarget);
+        }
+      } else if (isObject(target)) {
+        for (insTarget in target) {
+          if (!hasProp.call(target, insTarget)) continue;
+          insValue = target[insTarget];
+          this.instruction(insTarget, insValue);
+        }
+      } else {
+        if (isFunction(value)) {
+          value = value.apply();
+        }
+        node = new XMLProcessingInstruction(this, target, value);
+        this.onData(this.writer.processingInstruction(node, this.currentLevel + 1));
+      }
+      return this;
+    };
+
+    XMLDocumentCB.prototype.declaration = function(version, encoding, standalone) {
+      var node;
+      this.openCurrent();
+      if (this.documentStarted) {
+        throw new Error("declaration() must be the first node");
+      }
+      node = new XMLDeclaration(this, version, encoding, standalone);
+      this.onData(this.writer.declaration(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.doctype = function(root, pubID, sysID) {
+      this.openCurrent();
+      if (root == null) {
+        throw new Error("Missing root node name");
+      }
+      if (this.root) {
+        throw new Error("dtd() must come before the root node");
+      }
+      this.currentNode = new XMLDocType(this, pubID, sysID);
+      this.currentNode.rootNodeName = root;
+      this.currentNode.children = false;
+      this.currentLevel++;
+      this.openTags[this.currentLevel] = this.currentNode;
+      return this;
+    };
+
+    XMLDocumentCB.prototype.dtdElement = function(name, value) {
+      var node;
+      this.openCurrent();
+      node = new XMLDTDElement(this, name, value);
+      this.onData(this.writer.dtdElement(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.attList = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
+      var node;
+      this.openCurrent();
+      node = new XMLDTDAttList(this, elementName, attributeName, attributeType, defaultValueType, defaultValue);
+      this.onData(this.writer.dtdAttList(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.entity = function(name, value) {
+      var node;
+      this.openCurrent();
+      node = new XMLDTDEntity(this, false, name, value);
+      this.onData(this.writer.dtdEntity(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.pEntity = function(name, value) {
+      var node;
+      this.openCurrent();
+      node = new XMLDTDEntity(this, true, name, value);
+      this.onData(this.writer.dtdEntity(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.notation = function(name, value) {
+      var node;
+      this.openCurrent();
+      node = new XMLDTDNotation(this, name, value);
+      this.onData(this.writer.dtdNotation(node, this.currentLevel + 1));
+      return this;
+    };
+
+    XMLDocumentCB.prototype.up = function() {
+      if (this.currentLevel < 0) {
+        throw new Error("The document node has no parent");
+      }
+      if (this.currentNode) {
+        if (this.currentNode.children) {
+          this.closeNode(this.currentNode);
+        } else {
+          this.openNode(this.currentNode);
+        }
+        this.currentNode = null;
+      } else {
+        this.closeNode(this.openTags[this.currentLevel]);
+      }
+      delete this.openTags[this.currentLevel];
+      this.currentLevel--;
+      return this;
+    };
+
+    XMLDocumentCB.prototype.end = function() {
+      while (this.currentLevel >= 0) {
+        this.up();
+      }
+      return this.onEnd();
+    };
+
+    XMLDocumentCB.prototype.openCurrent = function() {
+      if (this.currentNode) {
+        this.currentNode.children = true;
+        return this.openNode(this.currentNode);
+      }
+    };
+
+    XMLDocumentCB.prototype.openNode = function(node) {
+      if (!node.isOpen) {
+        if (!this.root && this.currentLevel === 0 && node instanceof XMLElement) {
+          this.root = node;
+        }
+        this.onData(this.writer.openNode(node, this.currentLevel));
+        return node.isOpen = true;
+      }
+    };
+
+    XMLDocumentCB.prototype.closeNode = function(node) {
+      if (!node.isClosed) {
+        this.onData(this.writer.closeNode(node, this.currentLevel));
+        return node.isClosed = true;
+      }
+    };
+
+    XMLDocumentCB.prototype.onData = function(chunk) {
+      this.documentStarted = true;
+      return this.onDataCallback(chunk);
+    };
+
+    XMLDocumentCB.prototype.onEnd = function() {
+      this.documentCompleted = true;
+      return this.onEndCallback();
+    };
+
+    XMLDocumentCB.prototype.ele = function() {
+      return this.element.apply(this, arguments);
+    };
+
+    XMLDocumentCB.prototype.nod = function(name, attributes, text) {
+      return this.node(name, attributes, text);
+    };
+
+    XMLDocumentCB.prototype.txt = function(value) {
+      return this.text(value);
+    };
+
+    XMLDocumentCB.prototype.dat = function(value) {
+      return this.cdata(value);
+    };
+
+    XMLDocumentCB.prototype.com = function(value) {
+      return this.comment(value);
+    };
+
+    XMLDocumentCB.prototype.ins = function(target, value) {
+      return this.instruction(target, value);
+    };
+
+    XMLDocumentCB.prototype.dec = function(version, encoding, standalone) {
+      return this.declaration(version, encoding, standalone);
+    };
+
+    XMLDocumentCB.prototype.dtd = function(root, pubID, sysID) {
+      return this.doctype(root, pubID, sysID);
+    };
+
+    XMLDocumentCB.prototype.e = function(name, attributes, text) {
+      return this.element(name, attributes, text);
+    };
+
+    XMLDocumentCB.prototype.n = function(name, attributes, text) {
+      return this.node(name, attributes, text);
+    };
+
+    XMLDocumentCB.prototype.t = function(value) {
+      return this.text(value);
+    };
+
+    XMLDocumentCB.prototype.d = function(value) {
+      return this.cdata(value);
+    };
+
+    XMLDocumentCB.prototype.c = function(value) {
+      return this.comment(value);
+    };
+
+    XMLDocumentCB.prototype.r = function(value) {
+      return this.raw(value);
+    };
+
+    XMLDocumentCB.prototype.i = function(target, value) {
+      return this.instruction(target, value);
+    };
+
+    XMLDocumentCB.prototype.att = function() {
+      if (this.currentNode && this.currentNode instanceof XMLDocType) {
+        return this.attList.apply(this, arguments);
+      } else {
+        return this.attribute.apply(this, arguments);
+      }
+    };
+
+    XMLDocumentCB.prototype.a = function() {
+      if (this.currentNode && this.currentNode instanceof XMLDocType) {
+        return this.attList.apply(this, arguments);
+      } else {
+        return this.attribute.apply(this, arguments);
+      }
+    };
+
+    XMLDocumentCB.prototype.ent = function(name, value) {
+      return this.entity(name, value);
+    };
+
+    XMLDocumentCB.prototype.pent = function(name, value) {
+      return this.pEntity(name, value);
+    };
+
+    XMLDocumentCB.prototype.not = function(name, value) {
+      return this.notation(name, value);
+    };
+
+    return XMLDocumentCB;
+
+  })();
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
new file mode 100644
index 00000000000..bd1f46c9039
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
@@ -0,0 +1,111 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLAttribute, XMLElement, XMLNode, isFunction, isObject, ref,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction;
+
+  XMLNode = require('./XMLNode');
+
+  XMLAttribute = require('./XMLAttribute');
+
+  module.exports = XMLElement = (function(superClass) {
+    extend(XMLElement, superClass);
+
+    function XMLElement(parent, name, attributes) {
+      XMLElement.__super__.constructor.call(this, parent);
+      if (name == null) {
+        throw new Error("Missing element name");
+      }
+      this.name = this.stringify.eleName(name);
+      this.attributes = {};
+      if (attributes != null) {
+        this.attribute(attributes);
+      }
+      if (parent.isDocument) {
+        this.isRoot = true;
+        this.documentObject = parent;
+        parent.rootObject = this;
+      }
+    }
+
+    XMLElement.prototype.clone = function() {
+      var att, attName, clonedSelf, ref1;
+      clonedSelf = Object.create(this);
+      if (clonedSelf.isRoot) {
+        clonedSelf.documentObject = null;
+      }
+      clonedSelf.attributes = {};
+      ref1 = this.attributes;
+      for (attName in ref1) {
+        if (!hasProp.call(ref1, attName)) continue;
+        att = ref1[attName];
+        clonedSelf.attributes[attName] = att.clone();
+      }
+      clonedSelf.children = [];
+      this.children.forEach(function(child) {
+        var clonedChild;
+        clonedChild = child.clone();
+        clonedChild.parent = clonedSelf;
+        return clonedSelf.children.push(clonedChild);
+      });
+      return clonedSelf;
+    };
+
+    XMLElement.prototype.attribute = function(name, value) {
+      var attName, attValue;
+      if (name != null) {
+        name = name.valueOf();
+      }
+      if (isObject(name)) {
+        for (attName in name) {
+          if (!hasProp.call(name, attName)) continue;
+          attValue = name[attName];
+          this.attribute(attName, attValue);
+        }
+      } else {
+        if (isFunction(value)) {
+          value = value.apply();
+        }
+        if (!this.options.skipNullAttributes || (value != null)) {
+          this.attributes[name] = new XMLAttribute(this, name, value);
+        }
+      }
+      return this;
+    };
+
+    XMLElement.prototype.removeAttribute = function(name) {
+      var attName, i, len;
+      if (name == null) {
+        throw new Error("Missing attribute name");
+      }
+      name = name.valueOf();
+      if (Array.isArray(name)) {
+        for (i = 0, len = name.length; i < len; i++) {
+          attName = name[i];
+          delete this.attributes[attName];
+        }
+      } else {
+        delete this.attributes[name];
+      }
+      return this;
+    };
+
+    XMLElement.prototype.toString = function(options) {
+      return this.options.writer.set(options).element(this);
+    };
+
+    XMLElement.prototype.att = function(name, value) {
+      return this.attribute(name, value);
+    };
+
+    XMLElement.prototype.a = function(name, value) {
+      return this.attribute(name, value);
+    };
+
+    return XMLElement;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
new file mode 100644
index 00000000000..00ab37d7fd5
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
@@ -0,0 +1,432 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLCData, XMLComment, XMLDeclaration, XMLDocType, XMLElement, XMLNode, XMLProcessingInstruction, XMLRaw, XMLText, isEmpty, isFunction, isObject, ref,
+    hasProp = {}.hasOwnProperty;
+
+  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction, isEmpty = ref.isEmpty;
+
+  XMLElement = null;
+
+  XMLCData = null;
+
+  XMLComment = null;
+
+  XMLDeclaration = null;
+
+  XMLDocType = null;
+
+  XMLRaw = null;
+
+  XMLText = null;
+
+  XMLProcessingInstruction = null;
+
+  module.exports = XMLNode = (function() {
+    function XMLNode(parent) {
+      this.parent = parent;
+      if (this.parent) {
+        this.options = this.parent.options;
+        this.stringify = this.parent.stringify;
+      }
+      this.children = [];
+      if (!XMLElement) {
+        XMLElement = require('./XMLElement');
+        XMLCData = require('./XMLCData');
+        XMLComment = require('./XMLComment');
+        XMLDeclaration = require('./XMLDeclaration');
+        XMLDocType = require('./XMLDocType');
+        XMLRaw = require('./XMLRaw');
+        XMLText = require('./XMLText');
+        XMLProcessingInstruction = require('./XMLProcessingInstruction');
+      }
+    }
+
+    XMLNode.prototype.element = function(name, attributes, text) {
+      var childNode, item, j, k, key, lastChild, len, len1, ref1, val;
+      lastChild = null;
+      if (attributes == null) {
+        attributes = {};
+      }
+      attributes = attributes.valueOf();
+      if (!isObject(attributes)) {
+        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
+      }
+      if (name != null) {
+        name = name.valueOf();
+      }
+      if (Array.isArray(name)) {
+        for (j = 0, len = name.length; j < len; j++) {
+          item = name[j];
+          lastChild = this.element(item);
+        }
+      } else if (isFunction(name)) {
+        lastChild = this.element(name.apply());
+      } else if (isObject(name)) {
+        for (key in name) {
+          if (!hasProp.call(name, key)) continue;
+          val = name[key];
+          if (isFunction(val)) {
+            val = val.apply();
+          }
+          if ((isObject(val)) && (isEmpty(val))) {
+            val = null;
+          }
+          if (!this.options.ignoreDecorators && this.stringify.convertAttKey && key.indexOf(this.stringify.convertAttKey) === 0) {
+            lastChild = this.attribute(key.substr(this.stringify.convertAttKey.length), val);
+          } else if (!this.options.separateArrayItems && Array.isArray(val)) {
+            for (k = 0, len1 = val.length; k < len1; k++) {
+              item = val[k];
+              childNode = {};
+              childNode[key] = item;
+              lastChild = this.element(childNode);
+            }
+          } else if (isObject(val)) {
+            lastChild = this.element(key);
+            lastChild.element(val);
+          } else {
+            lastChild = this.element(key, val);
+          }
+        }
+      } else {
+        if (!this.options.ignoreDecorators && this.stringify.convertTextKey && name.indexOf(this.stringify.convertTextKey) === 0) {
+          lastChild = this.text(text);
+        } else if (!this.options.ignoreDecorators && this.stringify.convertCDataKey && name.indexOf(this.stringify.convertCDataKey) === 0) {
+          lastChild = this.cdata(text);
+        } else if (!this.options.ignoreDecorators && this.stringify.convertCommentKey && name.indexOf(this.stringify.convertCommentKey) === 0) {
+          lastChild = this.comment(text);
+        } else if (!this.options.ignoreDecorators && this.stringify.convertRawKey && name.indexOf(this.stringify.convertRawKey) === 0) {
+          lastChild = this.raw(text);
+        } else if (!this.options.ignoreDecorators && this.stringify.convertPIKey && name.indexOf(this.stringify.convertPIKey) === 0) {
+          lastChild = this.instruction(name.substr(this.stringify.convertPIKey.length), text);
+        } else {
+          lastChild = this.node(name, attributes, text);
+        }
+      }
+      if (lastChild == null) {
+        throw new Error("Could not create any elements with: " + name);
+      }
+      return lastChild;
+    };
+
+    XMLNode.prototype.insertBefore = function(name, attributes, text) {
+      var child, i, removed;
+      if (this.isRoot) {
+        throw new Error("Cannot insert elements at root level");
+      }
+      i = this.parent.children.indexOf(this);
+      removed = this.parent.children.splice(i);
+      child = this.parent.element(name, attributes, text);
+      Array.prototype.push.apply(this.parent.children, removed);
+      return child;
+    };
+
+    XMLNode.prototype.insertAfter = function(name, attributes, text) {
+      var child, i, removed;
+      if (this.isRoot) {
+        throw new Error("Cannot insert elements at root level");
+      }
+      i = this.parent.children.indexOf(this);
+      removed = this.parent.children.splice(i + 1);
+      child = this.parent.element(name, attributes, text);
+      Array.prototype.push.apply(this.parent.children, removed);
+      return child;
+    };
+
+    XMLNode.prototype.remove = function() {
+      var i, ref1;
+      if (this.isRoot) {
+        throw new Error("Cannot remove the root element");
+      }
+      i = this.parent.children.indexOf(this);
+      [].splice.apply(this.parent.children, [i, i - i + 1].concat(ref1 = [])), ref1;
+      return this.parent;
+    };
+
+    XMLNode.prototype.node = function(name, attributes, text) {
+      var child, ref1;
+      if (name != null) {
+        name = name.valueOf();
+      }
+      attributes || (attributes = {});
+      attributes = attributes.valueOf();
+      if (!isObject(attributes)) {
+        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
+      }
+      child = new XMLElement(this, name, attributes);
+      if (text != null) {
+        child.text(text);
+      }
+      this.children.push(child);
+      return child;
+    };
+
+    XMLNode.prototype.text = function(value) {
+      var child;
+      child = new XMLText(this, value);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLNode.prototype.cdata = function(value) {
+      var child;
+      child = new XMLCData(this, value);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLNode.prototype.comment = function(value) {
+      var child;
+      child = new XMLComment(this, value);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLNode.prototype.commentBefore = function(value) {
+      var child, i, removed;
+      i = this.parent.children.indexOf(this);
+      removed = this.parent.children.splice(i);
+      child = this.parent.comment(value);
+      Array.prototype.push.apply(this.parent.children, removed);
+      return this;
+    };
+
+    XMLNode.prototype.commentAfter = function(value) {
+      var child, i, removed;
+      i = this.parent.children.indexOf(this);
+      removed = this.parent.children.splice(i + 1);
+      child = this.parent.comment(value);
+      Array.prototype.push.apply(this.parent.children, removed);
+      return this;
+    };
+
+    XMLNode.prototype.raw = function(value) {
+      var child;
+      child = new XMLRaw(this, value);
+      this.children.push(child);
+      return this;
+    };
+
+    XMLNode.prototype.instruction = function(target, value) {
+      var insTarget, insValue, instruction, j, len;
+      if (target != null) {
+        target = target.valueOf();
+      }
+      if (value != null) {
+        value = value.valueOf();
+      }
+      if (Array.isArray(target)) {
+        for (j = 0, len = target.length; j < len; j++) {
+          insTarget = target[j];
+          this.instruction(insTarget);
+        }
+      } else if (isObject(target)) {
+        for (insTarget in target) {
+          if (!hasProp.call(target, insTarget)) continue;
+          insValue = target[insTarget];
+          this.instruction(insTarget, insValue);
+        }
+      } else {
+        if (isFunction(value)) {
+          value = value.apply();
+        }
+        instruction = new XMLProcessingInstruction(this, target, value);
+        this.children.push(instruction);
+      }
+      return this;
+    };
+
+    XMLNode.prototype.instructionBefore = function(target, value) {
+      var child, i, removed;
+      i = this.parent.children.indexOf(this);
+      removed = this.parent.children.splice(i);
+      child = this.parent.instruction(target, value);
+      Array.prototype.push.apply(this.parent.children, removed);
+      return this;
+    };
+
+    XMLNode.prototype.instructionAfter = function(target, value) {
+      var child, i, removed;
+      i = this.parent.children.indexOf(this);
+      removed = this.parent.children.splice(i + 1);
+      child = this.parent.instruction(target, value);
+      Array.prototype.push.apply(this.parent.children, removed);
+      return this;
+    };
+
+    XMLNode.prototype.declaration = function(version, encoding, standalone) {
+      var doc, xmldec;
+      doc = this.document();
+      xmldec = new XMLDeclaration(doc, version, encoding, standalone);
+      if (doc.children[0] instanceof XMLDeclaration) {
+        doc.children[0] = xmldec;
+      } else {
+        doc.children.unshift(xmldec);
+      }
+      return doc.root() || doc;
+    };
+
+    XMLNode.prototype.doctype = function(pubID, sysID) {
+      var child, doc, doctype, i, j, k, len, len1, ref1, ref2;
+      doc = this.document();
+      doctype = new XMLDocType(doc, pubID, sysID);
+      ref1 = doc.children;
+      for (i = j = 0, len = ref1.length; j < len; i = ++j) {
+        child = ref1[i];
+        if (child instanceof XMLDocType) {
+          doc.children[i] = doctype;
+          return doctype;
+        }
+      }
+      ref2 = doc.children;
+      for (i = k = 0, len1 = ref2.length; k < len1; i = ++k) {
+        child = ref2[i];
+        if (child.isRoot) {
+          doc.children.splice(i, 0, doctype);
+          return doctype;
+        }
+      }
+      doc.children.push(doctype);
+      return doctype;
+    };
+
+    XMLNode.prototype.up = function() {
+      if (this.isRoot) {
+        throw new Error("The root node has no parent. Use doc() if you need to get the document object.");
+      }
+      return this.parent;
+    };
+
+    XMLNode.prototype.root = function() {
+      var node;
+      node = this;
+      while (node) {
+        if (node.isDocument) {
+          return node.rootObject;
+        } else if (node.isRoot) {
+          return node;
+        } else {
+          node = node.parent;
+        }
+      }
+    };
+
+    XMLNode.prototype.document = function() {
+      var node;
+      node = this;
+      while (node) {
+        if (node.isDocument) {
+          return node;
+        } else {
+          node = node.parent;
+        }
+      }
+    };
+
+    XMLNode.prototype.end = function(options) {
+      return this.document().end(options);
+    };
+
+    XMLNode.prototype.prev = function() {
+      var i;
+      i = this.parent.children.indexOf(this);
+      if (i < 1) {
+        throw new Error("Already at the first node");
+      }
+      return this.parent.children[i - 1];
+    };
+
+    XMLNode.prototype.next = function() {
+      var i;
+      i = this.parent.children.indexOf(this);
+      if (i === -1 || i === this.parent.children.length - 1) {
+        throw new Error("Already at the last node");
+      }
+      return this.parent.children[i + 1];
+    };
+
+    XMLNode.prototype.importDocument = function(doc) {
+      var clonedRoot;
+      clonedRoot = doc.root().clone();
+      clonedRoot.parent = this;
+      clonedRoot.isRoot = false;
+      this.children.push(clonedRoot);
+      return this;
+    };
+
+    XMLNode.prototype.ele = function(name, attributes, text) {
+      return this.element(name, attributes, text);
+    };
+
+    XMLNode.prototype.nod = function(name, attributes, text) {
+      return this.node(name, attributes, text);
+    };
+
+    XMLNode.prototype.txt = function(value) {
+      return this.text(value);
+    };
+
+    XMLNode.prototype.dat = function(value) {
+      return this.cdata(value);
+    };
+
+    XMLNode.prototype.com = function(value) {
+      return this.comment(value);
+    };
+
+    XMLNode.prototype.ins = function(target, value) {
+      return this.instruction(target, value);
+    };
+
+    XMLNode.prototype.doc = function() {
+      return this.document();
+    };
+
+    XMLNode.prototype.dec = function(version, encoding, standalone) {
+      return this.declaration(version, encoding, standalone);
+    };
+
+    XMLNode.prototype.dtd = function(pubID, sysID) {
+      return this.doctype(pubID, sysID);
+    };
+
+    XMLNode.prototype.e = function(name, attributes, text) {
+      return this.element(name, attributes, text);
+    };
+
+    XMLNode.prototype.n = function(name, attributes, text) {
+      return this.node(name, attributes, text);
+    };
+
+    XMLNode.prototype.t = function(value) {
+      return this.text(value);
+    };
+
+    XMLNode.prototype.d = function(value) {
+      return this.cdata(value);
+    };
+
+    XMLNode.prototype.c = function(value) {
+      return this.comment(value);
+    };
+
+    XMLNode.prototype.r = function(value) {
+      return this.raw(value);
+    };
+
+    XMLNode.prototype.i = function(target, value) {
+      return this.instruction(target, value);
+    };
+
+    XMLNode.prototype.u = function() {
+      return this.up();
+    };
+
+    XMLNode.prototype.importXMLBuilder = function(doc) {
+      return this.importDocument(doc);
+    };
+
+    return XMLNode;
+
+  })();
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
new file mode 100644
index 00000000000..e6f71d15311
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
@@ -0,0 +1,35 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLNode, XMLProcessingInstruction,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLProcessingInstruction = (function(superClass) {
+    extend(XMLProcessingInstruction, superClass);
+
+    function XMLProcessingInstruction(parent, target, value) {
+      XMLProcessingInstruction.__super__.constructor.call(this, parent);
+      if (target == null) {
+        throw new Error("Missing instruction target");
+      }
+      this.target = this.stringify.insTarget(target);
+      if (value) {
+        this.value = this.stringify.insValue(value);
+      }
+    }
+
+    XMLProcessingInstruction.prototype.clone = function() {
+      return Object.create(this);
+    };
+
+    XMLProcessingInstruction.prototype.toString = function(options) {
+      return this.options.writer.set(options).processingInstruction(this);
+    };
+
+    return XMLProcessingInstruction;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
new file mode 100644
index 00000000000..dbe7fdcd42a
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
@@ -0,0 +1,32 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLNode, XMLRaw,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLRaw = (function(superClass) {
+    extend(XMLRaw, superClass);
+
+    function XMLRaw(parent, text) {
+      XMLRaw.__super__.constructor.call(this, parent);
+      if (text == null) {
+        throw new Error("Missing raw text");
+      }
+      this.value = this.stringify.raw(text);
+    }
+
+    XMLRaw.prototype.clone = function() {
+      return Object.create(this);
+    };
+
+    XMLRaw.prototype.toString = function(options) {
+      return this.options.writer.set(options).raw(this);
+    };
+
+    return XMLRaw;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
new file mode 100644
index 00000000000..20d98eed6f7
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
@@ -0,0 +1,279 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStreamWriter, XMLText, XMLWriterBase,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLDeclaration = require('./XMLDeclaration');
+
+  XMLDocType = require('./XMLDocType');
+
+  XMLCData = require('./XMLCData');
+
+  XMLComment = require('./XMLComment');
+
+  XMLElement = require('./XMLElement');
+
+  XMLRaw = require('./XMLRaw');
+
+  XMLText = require('./XMLText');
+
+  XMLProcessingInstruction = require('./XMLProcessingInstruction');
+
+  XMLDTDAttList = require('./XMLDTDAttList');
+
+  XMLDTDElement = require('./XMLDTDElement');
+
+  XMLDTDEntity = require('./XMLDTDEntity');
+
+  XMLDTDNotation = require('./XMLDTDNotation');
+
+  XMLWriterBase = require('./XMLWriterBase');
+
+  module.exports = XMLStreamWriter = (function(superClass) {
+    extend(XMLStreamWriter, superClass);
+
+    function XMLStreamWriter(stream, options) {
+      XMLStreamWriter.__super__.constructor.call(this, options);
+      this.stream = stream;
+    }
+
+    XMLStreamWriter.prototype.document = function(doc) {
+      var child, i, j, len, len1, ref, ref1, results;
+      ref = doc.children;
+      for (i = 0, len = ref.length; i < len; i++) {
+        child = ref[i];
+        child.isLastRootNode = false;
+      }
+      doc.children[doc.children.length - 1].isLastRootNode = true;
+      ref1 = doc.children;
+      results = [];
+      for (j = 0, len1 = ref1.length; j < len1; j++) {
+        child = ref1[j];
+        switch (false) {
+          case !(child instanceof XMLDeclaration):
+            results.push(this.declaration(child));
+            break;
+          case !(child instanceof XMLDocType):
+            results.push(this.docType(child));
+            break;
+          case !(child instanceof XMLComment):
+            results.push(this.comment(child));
+            break;
+          case !(child instanceof XMLProcessingInstruction):
+            results.push(this.processingInstruction(child));
+            break;
+          default:
+            results.push(this.element(child));
+        }
+      }
+      return results;
+    };
+
+    XMLStreamWriter.prototype.attribute = function(att) {
+      return this.stream.write(' ' + att.name + '="' + att.value + '"');
+    };
+
+    XMLStreamWriter.prototype.cdata = function(node, level) {
+      return this.stream.write(this.space(level) + '<![CDATA[' + node.text + ']]>' + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.comment = function(node, level) {
+      return this.stream.write(this.space(level) + '<!-- ' + node.text + ' -->' + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.declaration = function(node, level) {
+      this.stream.write(this.space(level));
+      this.stream.write('<?xml version="' + node.version + '"');
+      if (node.encoding != null) {
+        this.stream.write(' encoding="' + node.encoding + '"');
+      }
+      if (node.standalone != null) {
+        this.stream.write(' standalone="' + node.standalone + '"');
+      }
+      this.stream.write(this.spacebeforeslash + '?>');
+      return this.stream.write(this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.docType = function(node, level) {
+      var child, i, len, ref;
+      level || (level = 0);
+      this.stream.write(this.space(level));
+      this.stream.write('<!DOCTYPE ' + node.root().name);
+      if (node.pubID && node.sysID) {
+        this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
+      } else if (node.sysID) {
+        this.stream.write(' SYSTEM "' + node.sysID + '"');
+      }
+      if (node.children.length > 0) {
+        this.stream.write(' [');
+        this.stream.write(this.endline(node));
+        ref = node.children;
+        for (i = 0, len = ref.length; i < len; i++) {
+          child = ref[i];
+          switch (false) {
+            case !(child instanceof XMLDTDAttList):
+              this.dtdAttList(child, level + 1);
+              break;
+            case !(child instanceof XMLDTDElement):
+              this.dtdElement(child, level + 1);
+              break;
+            case !(child instanceof XMLDTDEntity):
+              this.dtdEntity(child, level + 1);
+              break;
+            case !(child instanceof XMLDTDNotation):
+              this.dtdNotation(child, level + 1);
+              break;
+            case !(child instanceof XMLCData):
+              this.cdata(child, level + 1);
+              break;
+            case !(child instanceof XMLComment):
+              this.comment(child, level + 1);
+              break;
+            case !(child instanceof XMLProcessingInstruction):
+              this.processingInstruction(child, level + 1);
+              break;
+            default:
+              throw new Error("Unknown DTD node type: " + child.constructor.name);
+          }
+        }
+        this.stream.write(']');
+      }
+      this.stream.write(this.spacebeforeslash + '>');
+      return this.stream.write(this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.element = function(node, level) {
+      var att, child, i, len, name, ref, ref1, space;
+      level || (level = 0);
+      space = this.space(level);
+      this.stream.write(space + '<' + node.name);
+      ref = node.attributes;
+      for (name in ref) {
+        if (!hasProp.call(ref, name)) continue;
+        att = ref[name];
+        this.attribute(att);
+      }
+      if (node.children.length === 0 || node.children.every(function(e) {
+        return e.value === '';
+      })) {
+        if (this.allowEmpty) {
+          this.stream.write('></' + node.name + '>');
+        } else {
+          this.stream.write(this.spacebeforeslash + '/>');
+        }
+      } else if (this.pretty && node.children.length === 1 && (node.children[0].value != null)) {
+        this.stream.write('>');
+        this.stream.write(node.children[0].value);
+        this.stream.write('</' + node.name + '>');
+      } else {
+        this.stream.write('>' + this.newline);
+        ref1 = node.children;
+        for (i = 0, len = ref1.length; i < len; i++) {
+          child = ref1[i];
+          switch (false) {
+            case !(child instanceof XMLCData):
+              this.cdata(child, level + 1);
+              break;
+            case !(child instanceof XMLComment):
+              this.comment(child, level + 1);
+              break;
+            case !(child instanceof XMLElement):
+              this.element(child, level + 1);
+              break;
+            case !(child instanceof XMLRaw):
+              this.raw(child, level + 1);
+              break;
+            case !(child instanceof XMLText):
+              this.text(child, level + 1);
+              break;
+            case !(child instanceof XMLProcessingInstruction):
+              this.processingInstruction(child, level + 1);
+              break;
+            default:
+              throw new Error("Unknown XML node type: " + child.constructor.name);
+          }
+        }
+        this.stream.write(space + '</' + node.name + '>');
+      }
+      return this.stream.write(this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.processingInstruction = function(node, level) {
+      this.stream.write(this.space(level) + '<?' + node.target);
+      if (node.value) {
+        this.stream.write(' ' + node.value);
+      }
+      return this.stream.write(this.spacebeforeslash + '?>' + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.raw = function(node, level) {
+      return this.stream.write(this.space(level) + node.value + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.text = function(node, level) {
+      return this.stream.write(this.space(level) + node.value + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.dtdAttList = function(node, level) {
+      this.stream.write(this.space(level) + '<!ATTLIST ' + node.elementName + ' ' + node.attributeName + ' ' + node.attributeType);
+      if (node.defaultValueType !== '#DEFAULT') {
+        this.stream.write(' ' + node.defaultValueType);
+      }
+      if (node.defaultValue) {
+        this.stream.write(' "' + node.defaultValue + '"');
+      }
+      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.dtdElement = function(node, level) {
+      this.stream.write(this.space(level) + '<!ELEMENT ' + node.name + ' ' + node.value);
+      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.dtdEntity = function(node, level) {
+      this.stream.write(this.space(level) + '<!ENTITY');
+      if (node.pe) {
+        this.stream.write(' %');
+      }
+      this.stream.write(' ' + node.name);
+      if (node.value) {
+        this.stream.write(' "' + node.value + '"');
+      } else {
+        if (node.pubID && node.sysID) {
+          this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
+        } else if (node.sysID) {
+          this.stream.write(' SYSTEM "' + node.sysID + '"');
+        }
+        if (node.nData) {
+          this.stream.write(' NDATA ' + node.nData);
+        }
+      }
+      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.dtdNotation = function(node, level) {
+      this.stream.write(this.space(level) + '<!NOTATION ' + node.name);
+      if (node.pubID && node.sysID) {
+        this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
+      } else if (node.pubID) {
+        this.stream.write(' PUBLIC "' + node.pubID + '"');
+      } else if (node.sysID) {
+        this.stream.write(' SYSTEM "' + node.sysID + '"');
+      }
+      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
+    };
+
+    XMLStreamWriter.prototype.endline = function(node) {
+      if (!node.isLastRootNode) {
+        return this.newline;
+      } else {
+        return '';
+      }
+    };
+
+    return XMLStreamWriter;
+
+  })(XMLWriterBase);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
new file mode 100644
index 00000000000..49da759b409
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
@@ -0,0 +1,334 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStringWriter, XMLText, XMLWriterBase,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLDeclaration = require('./XMLDeclaration');
+
+  XMLDocType = require('./XMLDocType');
+
+  XMLCData = require('./XMLCData');
+
+  XMLComment = require('./XMLComment');
+
+  XMLElement = require('./XMLElement');
+
+  XMLRaw = require('./XMLRaw');
+
+  XMLText = require('./XMLText');
+
+  XMLProcessingInstruction = require('./XMLProcessingInstruction');
+
+  XMLDTDAttList = require('./XMLDTDAttList');
+
+  XMLDTDElement = require('./XMLDTDElement');
+
+  XMLDTDEntity = require('./XMLDTDEntity');
+
+  XMLDTDNotation = require('./XMLDTDNotation');
+
+  XMLWriterBase = require('./XMLWriterBase');
+
+  module.exports = XMLStringWriter = (function(superClass) {
+    extend(XMLStringWriter, superClass);
+
+    function XMLStringWriter(options) {
+      XMLStringWriter.__super__.constructor.call(this, options);
+    }
+
+    XMLStringWriter.prototype.document = function(doc) {
+      var child, i, len, r, ref;
+      this.textispresent = false;
+      r = '';
+      ref = doc.children;
+      for (i = 0, len = ref.length; i < len; i++) {
+        child = ref[i];
+        r += (function() {
+          switch (false) {
+            case !(child instanceof XMLDeclaration):
+              return this.declaration(child);
+            case !(child instanceof XMLDocType):
+              return this.docType(child);
+            case !(child instanceof XMLComment):
+              return this.comment(child);
+            case !(child instanceof XMLProcessingInstruction):
+              return this.processingInstruction(child);
+            default:
+              return this.element(child, 0);
+          }
+        }).call(this);
+      }
+      if (this.pretty && r.slice(-this.newline.length) === this.newline) {
+        r = r.slice(0, -this.newline.length);
+      }
+      return r;
+    };
+
+    XMLStringWriter.prototype.attribute = function(att) {
+      return ' ' + att.name + '="' + att.value + '"';
+    };
+
+    XMLStringWriter.prototype.cdata = function(node, level) {
+      return this.space(level) + '<![CDATA[' + node.text + ']]>' + this.newline;
+    };
+
+    XMLStringWriter.prototype.comment = function(node, level) {
+      return this.space(level) + '<!-- ' + node.text + ' -->' + this.newline;
+    };
+
+    XMLStringWriter.prototype.declaration = function(node, level) {
+      var r;
+      r = this.space(level);
+      r += '<?xml version="' + node.version + '"';
+      if (node.encoding != null) {
+        r += ' encoding="' + node.encoding + '"';
+      }
+      if (node.standalone != null) {
+        r += ' standalone="' + node.standalone + '"';
+      }
+      r += this.spacebeforeslash + '?>';
+      r += this.newline;
+      return r;
+    };
+
+    XMLStringWriter.prototype.docType = function(node, level) {
+      var child, i, len, r, ref;
+      level || (level = 0);
+      r = this.space(level);
+      r += '<!DOCTYPE ' + node.root().name;
+      if (node.pubID && node.sysID) {
+        r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
+      } else if (node.sysID) {
+        r += ' SYSTEM "' + node.sysID + '"';
+      }
+      if (node.children.length > 0) {
+        r += ' [';
+        r += this.newline;
+        ref = node.children;
+        for (i = 0, len = ref.length; i < len; i++) {
+          child = ref[i];
+          r += (function() {
+            switch (false) {
+              case !(child instanceof XMLDTDAttList):
+                return this.dtdAttList(child, level + 1);
+              case !(child instanceof XMLDTDElement):
+                return this.dtdElement(child, level + 1);
+              case !(child instanceof XMLDTDEntity):
+                return this.dtdEntity(child, level + 1);
+              case !(child instanceof XMLDTDNotation):
+                return this.dtdNotation(child, level + 1);
+              case !(child instanceof XMLCData):
+                return this.cdata(child, level + 1);
+              case !(child instanceof XMLComment):
+                return this.comment(child, level + 1);
+              case !(child instanceof XMLProcessingInstruction):
+                return this.processingInstruction(child, level + 1);
+              default:
+                throw new Error("Unknown DTD node type: " + child.constructor.name);
+            }
+          }).call(this);
+        }
+        r += ']';
+      }
+      r += this.spacebeforeslash + '>';
+      r += this.newline;
+      return r;
+    };
+
+    XMLStringWriter.prototype.element = function(node, level) {
+      var att, child, i, j, len, len1, name, r, ref, ref1, ref2, space, textispresentwasset;
+      level || (level = 0);
+      textispresentwasset = false;
+      if (this.textispresent) {
+        this.newline = '';
+        this.pretty = false;
+      } else {
+        this.newline = this.newlinedefault;
+        this.pretty = this.prettydefault;
+      }
+      space = this.space(level);
+      r = '';
+      r += space + '<' + node.name;
+      ref = node.attributes;
+      for (name in ref) {
+        if (!hasProp.call(ref, name)) continue;
+        att = ref[name];
+        r += this.attribute(att);
+      }
+      if (node.children.length === 0 || node.children.every(function(e) {
+        return e.value === '';
+      })) {
+        if (this.allowEmpty) {
+          r += '></' + node.name + '>' + this.newline;
+        } else {
+          r += this.spacebeforeslash + '/>' + this.newline;
+        }
+      } else if (this.pretty && node.children.length === 1 && (node.children[0].value != null)) {
+        r += '>';
+        r += node.children[0].value;
+        r += '</' + node.name + '>' + this.newline;
+      } else {
+        if (this.dontprettytextnodes) {
+          ref1 = node.children;
+          for (i = 0, len = ref1.length; i < len; i++) {
+            child = ref1[i];
+            if (child.value != null) {
+              this.textispresent++;
+              textispresentwasset = true;
+              break;
+            }
+          }
+        }
+        if (this.textispresent) {
+          this.newline = '';
+          this.pretty = false;
+          space = this.space(level);
+        }
+        r += '>' + this.newline;
+        ref2 = node.children;
+        for (j = 0, len1 = ref2.length; j < len1; j++) {
+          child = ref2[j];
+          r += (function() {
+            switch (false) {
+              case !(child instanceof XMLCData):
+                return this.cdata(child, level + 1);
+              case !(child instanceof XMLComment):
+                return this.comment(child, level + 1);
+              case !(child instanceof XMLElement):
+                return this.element(child, level + 1);
+              case !(child instanceof XMLRaw):
+                return this.raw(child, level + 1);
+              case !(child instanceof XMLText):
+                return this.text(child, level + 1);
+              case !(child instanceof XMLProcessingInstruction):
+                return this.processingInstruction(child, level + 1);
+              default:
+                throw new Error("Unknown XML node type: " + child.constructor.name);
+            }
+          }).call(this);
+        }
+        if (textispresentwasset) {
+          this.textispresent--;
+        }
+        if (!this.textispresent) {
+          this.newline = this.newlinedefault;
+          this.pretty = this.prettydefault;
+        }
+        r += space + '</' + node.name + '>' + this.newline;
+      }
+      return r;
+    };
+
+    XMLStringWriter.prototype.processingInstruction = function(node, level) {
+      var r;
+      r = this.space(level) + '<?' + node.target;
+      if (node.value) {
+        r += ' ' + node.value;
+      }
+      r += this.spacebeforeslash + '?>' + this.newline;
+      return r;
+    };
+
+    XMLStringWriter.prototype.raw = function(node, level) {
+      return this.space(level) + node.value + this.newline;
+    };
+
+    XMLStringWriter.prototype.text = function(node, level) {
+      return this.space(level) + node.value + this.newline;
+    };
+
+    XMLStringWriter.prototype.dtdAttList = function(node, level) {
+      var r;
+      r = this.space(level) + '<!ATTLIST ' + node.elementName + ' ' + node.attributeName + ' ' + node.attributeType;
+      if (node.defaultValueType !== '#DEFAULT') {
+        r += ' ' + node.defaultValueType;
+      }
+      if (node.defaultValue) {
+        r += ' "' + node.defaultValue + '"';
+      }
+      r += this.spacebeforeslash + '>' + this.newline;
+      return r;
+    };
+
+    XMLStringWriter.prototype.dtdElement = function(node, level) {
+      return this.space(level) + '<!ELEMENT ' + node.name + ' ' + node.value + this.spacebeforeslash + '>' + this.newline;
+    };
+
+    XMLStringWriter.prototype.dtdEntity = function(node, level) {
+      var r;
+      r = this.space(level) + '<!ENTITY';
+      if (node.pe) {
+        r += ' %';
+      }
+      r += ' ' + node.name;
+      if (node.value) {
+        r += ' "' + node.value + '"';
+      } else {
+        if (node.pubID && node.sysID) {
+          r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
+        } else if (node.sysID) {
+          r += ' SYSTEM "' + node.sysID + '"';
+        }
+        if (node.nData) {
+          r += ' NDATA ' + node.nData;
+        }
+      }
+      r += this.spacebeforeslash + '>' + this.newline;
+      return r;
+    };
+
+    XMLStringWriter.prototype.dtdNotation = function(node, level) {
+      var r;
+      r = this.space(level) + '<!NOTATION ' + node.name;
+      if (node.pubID && node.sysID) {
+        r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
+      } else if (node.pubID) {
+        r += ' PUBLIC "' + node.pubID + '"';
+      } else if (node.sysID) {
+        r += ' SYSTEM "' + node.sysID + '"';
+      }
+      r += this.spacebeforeslash + '>' + this.newline;
+      return r;
+    };
+
+    XMLStringWriter.prototype.openNode = function(node, level) {
+      var att, name, r, ref;
+      level || (level = 0);
+      if (node instanceof XMLElement) {
+        r = this.space(level) + '<' + node.name;
+        ref = node.attributes;
+        for (name in ref) {
+          if (!hasProp.call(ref, name)) continue;
+          att = ref[name];
+          r += this.attribute(att);
+        }
+        r += (node.children ? '>' : '/>') + this.newline;
+        return r;
+      } else {
+        r = this.space(level) + '<!DOCTYPE ' + node.rootNodeName;
+        if (node.pubID && node.sysID) {
+          r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
+        } else if (node.sysID) {
+          r += ' SYSTEM "' + node.sysID + '"';
+        }
+        r += (node.children ? ' [' : '>') + this.newline;
+        return r;
+      }
+    };
+
+    XMLStringWriter.prototype.closeNode = function(node, level) {
+      level || (level = 0);
+      switch (false) {
+        case !(node instanceof XMLElement):
+          return this.space(level) + '</' + node.name + '>' + this.newline;
+        case !(node instanceof XMLDocType):
+          return this.space(level) + ']>' + this.newline;
+      }
+    };
+
+    return XMLStringWriter;
+
+  })(XMLWriterBase);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
new file mode 100644
index 00000000000..c1844fb291d
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
@@ -0,0 +1,163 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLStringifier,
+    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+    hasProp = {}.hasOwnProperty;
+
+  module.exports = XMLStringifier = (function() {
+    function XMLStringifier(options) {
+      this.assertLegalChar = bind(this.assertLegalChar, this);
+      var key, ref, value;
+      options || (options = {});
+      this.noDoubleEncoding = options.noDoubleEncoding;
+      ref = options.stringify || {};
+      for (key in ref) {
+        if (!hasProp.call(ref, key)) continue;
+        value = ref[key];
+        this[key] = value;
+      }
+    }
+
+    XMLStringifier.prototype.eleName = function(val) {
+      val = '' + val || '';
+      return this.assertLegalChar(val);
+    };
+
+    XMLStringifier.prototype.eleText = function(val) {
+      val = '' + val || '';
+      return this.assertLegalChar(this.elEscape(val));
+    };
+
+    XMLStringifier.prototype.cdata = function(val) {
+      val = '' + val || '';
+      val = val.replace(']]>', ']]]]><![CDATA[>');
+      return this.assertLegalChar(val);
+    };
+
+    XMLStringifier.prototype.comment = function(val) {
+      val = '' + val || '';
+      if (val.match(/--/)) {
+        throw new Error("Comment text cannot contain double-hypen: " + val);
+      }
+      return this.assertLegalChar(val);
+    };
+
+    XMLStringifier.prototype.raw = function(val) {
+      return '' + val || '';
+    };
+
+    XMLStringifier.prototype.attName = function(val) {
+      return val = '' + val || '';
+    };
+
+    XMLStringifier.prototype.attValue = function(val) {
+      val = '' + val || '';
+      return this.attEscape(val);
+    };
+
+    XMLStringifier.prototype.insTarget = function(val) {
+      return '' + val || '';
+    };
+
+    XMLStringifier.prototype.insValue = function(val) {
+      val = '' + val || '';
+      if (val.match(/\?>/)) {
+        throw new Error("Invalid processing instruction value: " + val);
+      }
+      return val;
+    };
+
+    XMLStringifier.prototype.xmlVersion = function(val) {
+      val = '' + val || '';
+      if (!val.match(/1\.[0-9]+/)) {
+        throw new Error("Invalid version number: " + val);
+      }
+      return val;
+    };
+
+    XMLStringifier.prototype.xmlEncoding = function(val) {
+      val = '' + val || '';
+      if (!val.match(/^[A-Za-z](?:[A-Za-z0-9._-])*$/)) {
+        throw new Error("Invalid encoding: " + val);
+      }
+      return val;
+    };
+
+    XMLStringifier.prototype.xmlStandalone = function(val) {
+      if (val) {
+        return "yes";
+      } else {
+        return "no";
+      }
+    };
+
+    XMLStringifier.prototype.dtdPubID = function(val) {
+      return '' + val || '';
+    };
+
+    XMLStringifier.prototype.dtdSysID = function(val) {
+      return '' + val || '';
+    };
+
+    XMLStringifier.prototype.dtdElementValue = function(val) {
+      return '' + val || '';
+    };
+
+    XMLStringifier.prototype.dtdAttType = function(val) {
+      return '' + val || '';
+    };
+
+    XMLStringifier.prototype.dtdAttDefault = function(val) {
+      if (val != null) {
+        return '' + val || '';
+      } else {
+        return val;
+      }
+    };
+
+    XMLStringifier.prototype.dtdEntityValue = function(val) {
+      return '' + val || '';
+    };
+
+    XMLStringifier.prototype.dtdNData = function(val) {
+      return '' + val || '';
+    };
+
+    XMLStringifier.prototype.convertAttKey = '@';
+
+    XMLStringifier.prototype.convertPIKey = '?';
+
+    XMLStringifier.prototype.convertTextKey = '#text';
+
+    XMLStringifier.prototype.convertCDataKey = '#cdata';
+
+    XMLStringifier.prototype.convertCommentKey = '#comment';
+
+    XMLStringifier.prototype.convertRawKey = '#raw';
+
+    XMLStringifier.prototype.assertLegalChar = function(str) {
+      var res;
+      res = str.match(/[\0\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/);
+      if (res) {
+        throw new Error("Invalid character in string: " + str + " at index " + res.index);
+      }
+      return str;
+    };
+
+    XMLStringifier.prototype.elEscape = function(str) {
+      var ampregex;
+      ampregex = this.noDoubleEncoding ? /(?!&\S+;)&/g : /&/g;
+      return str.replace(ampregex, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\r/g, '&#xD;');
+    };
+
+    XMLStringifier.prototype.attEscape = function(str) {
+      var ampregex;
+      ampregex = this.noDoubleEncoding ? /(?!&\S+;)&/g : /&/g;
+      return str.replace(ampregex, '&amp;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/\t/g, '&#x9;').replace(/\n/g, '&#xA;').replace(/\r/g, '&#xD;');
+    };
+
+    return XMLStringifier;
+
+  })();
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
new file mode 100644
index 00000000000..0ecceb36c6e
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
@@ -0,0 +1,32 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLNode, XMLText,
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty;
+
+  XMLNode = require('./XMLNode');
+
+  module.exports = XMLText = (function(superClass) {
+    extend(XMLText, superClass);
+
+    function XMLText(parent, text) {
+      XMLText.__super__.constructor.call(this, parent);
+      if (text == null) {
+        throw new Error("Missing element text");
+      }
+      this.value = this.stringify.eleText(text);
+    }
+
+    XMLText.prototype.clone = function() {
+      return Object.create(this);
+    };
+
+    XMLText.prototype.toString = function(options) {
+      return this.options.writer.set(options).text(this);
+    };
+
+    return XMLText;
+
+  })(XMLNode);
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
new file mode 100644
index 00000000000..dfa51d8efb3
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
@@ -0,0 +1,90 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLWriterBase,
+    hasProp = {}.hasOwnProperty;
+
+  module.exports = XMLWriterBase = (function() {
+    function XMLWriterBase(options) {
+      var key, ref, ref1, ref2, ref3, ref4, ref5, ref6, value;
+      options || (options = {});
+      this.pretty = options.pretty || false;
+      this.allowEmpty = (ref = options.allowEmpty) != null ? ref : false;
+      if (this.pretty) {
+        this.indent = (ref1 = options.indent) != null ? ref1 : '  ';
+        this.newline = (ref2 = options.newline) != null ? ref2 : '\n';
+        this.offset = (ref3 = options.offset) != null ? ref3 : 0;
+        this.dontprettytextnodes = (ref4 = options.dontprettytextnodes) != null ? ref4 : 0;
+      } else {
+        this.indent = '';
+        this.newline = '';
+        this.offset = 0;
+        this.dontprettytextnodes = 0;
+      }
+      this.spacebeforeslash = (ref5 = options.spacebeforeslash) != null ? ref5 : '';
+      if (this.spacebeforeslash === true) {
+        this.spacebeforeslash = ' ';
+      }
+      this.newlinedefault = this.newline;
+      this.prettydefault = this.pretty;
+      ref6 = options.writer || {};
+      for (key in ref6) {
+        if (!hasProp.call(ref6, key)) continue;
+        value = ref6[key];
+        this[key] = value;
+      }
+    }
+
+    XMLWriterBase.prototype.set = function(options) {
+      var key, ref, value;
+      options || (options = {});
+      if ("pretty" in options) {
+        this.pretty = options.pretty;
+      }
+      if ("allowEmpty" in options) {
+        this.allowEmpty = options.allowEmpty;
+      }
+      if (this.pretty) {
+        this.indent = "indent" in options ? options.indent : '  ';
+        this.newline = "newline" in options ? options.newline : '\n';
+        this.offset = "offset" in options ? options.offset : 0;
+        this.dontprettytextnodes = "dontprettytextnodes" in options ? options.dontprettytextnodes : 0;
+      } else {
+        this.indent = '';
+        this.newline = '';
+        this.offset = 0;
+        this.dontprettytextnodes = 0;
+      }
+      this.spacebeforeslash = "spacebeforeslash" in options ? options.spacebeforeslash : '';
+      if (this.spacebeforeslash === true) {
+        this.spacebeforeslash = ' ';
+      }
+      this.newlinedefault = this.newline;
+      this.prettydefault = this.pretty;
+      ref = options.writer || {};
+      for (key in ref) {
+        if (!hasProp.call(ref, key)) continue;
+        value = ref[key];
+        this[key] = value;
+      }
+      return this;
+    };
+
+    XMLWriterBase.prototype.space = function(level) {
+      var indent;
+      if (this.pretty) {
+        indent = (level || 0) + this.offset + 1;
+        if (indent > 0) {
+          return new Array(indent).join(this.indent);
+        } else {
+          return '';
+        }
+      } else {
+        return '';
+      }
+    };
+
+    return XMLWriterBase;
+
+  })();
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/index.js b/scripts/metrics/node_modules/xmlbuilder/lib/index.js
new file mode 100644
index 00000000000..d2a1dc16fd1
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/lib/index.js
@@ -0,0 +1,53 @@
+// Generated by CoffeeScript 1.12.7
+(function() {
+  var XMLDocument, XMLDocumentCB, XMLStreamWriter, XMLStringWriter, assign, isFunction, ref;
+
+  ref = require('./Utility'), assign = ref.assign, isFunction = ref.isFunction;
+
+  XMLDocument = require('./XMLDocument');
+
+  XMLDocumentCB = require('./XMLDocumentCB');
+
+  XMLStringWriter = require('./XMLStringWriter');
+
+  XMLStreamWriter = require('./XMLStreamWriter');
+
+  module.exports.create = function(name, xmldec, doctype, options) {
+    var doc, root;
+    if (name == null) {
+      throw new Error("Root element needs a name");
+    }
+    options = assign({}, xmldec, doctype, options);
+    doc = new XMLDocument(options);
+    root = doc.element(name);
+    if (!options.headless) {
+      doc.declaration(options);
+      if ((options.pubID != null) || (options.sysID != null)) {
+        doc.doctype(options);
+      }
+    }
+    return root;
+  };
+
+  module.exports.begin = function(options, onData, onEnd) {
+    var ref1;
+    if (isFunction(options)) {
+      ref1 = [options, onData], onData = ref1[0], onEnd = ref1[1];
+      options = {};
+    }
+    if (onData) {
+      return new XMLDocumentCB(options, onData, onEnd);
+    } else {
+      return new XMLDocument(options);
+    }
+  };
+
+  module.exports.stringWriter = function(options) {
+    return new XMLStringWriter(options);
+  };
+
+  module.exports.streamWriter = function(stream, options) {
+    return new XMLStreamWriter(stream, options);
+  };
+
+}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/package.json b/scripts/metrics/node_modules/xmlbuilder/package.json
new file mode 100644
index 00000000000..d4fca7ded0c
--- /dev/null
+++ b/scripts/metrics/node_modules/xmlbuilder/package.json
@@ -0,0 +1,65 @@
+{
+  "_from": "xmlbuilder@~9.0.1",
+  "_id": "xmlbuilder@9.0.7",
+  "_inBundle": false,
+  "_integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+  "_location": "/xmlbuilder",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "xmlbuilder@~9.0.1",
+    "name": "xmlbuilder",
+    "escapedName": "xmlbuilder",
+    "rawSpec": "~9.0.1",
+    "saveSpec": null,
+    "fetchSpec": "~9.0.1"
+  },
+  "_requiredBy": [
+    "/xml2js"
+  ],
+  "_resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+  "_shasum": "132ee63d2ec5565c557e20f4c22df9aca686b10d",
+  "_spec": "xmlbuilder@~9.0.1",
+  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics/node_modules/xml2js",
+  "author": {
+    "name": "Ozgur Ozcitak",
+    "email": "oozcitak@gmail.com"
+  },
+  "bugs": {
+    "url": "http://github.com/oozcitak/xmlbuilder-js/issues"
+  },
+  "bundleDependencies": false,
+  "contributors": [],
+  "dependencies": {},
+  "deprecated": false,
+  "description": "An XML builder for node.js",
+  "devDependencies": {
+    "coffee-coverage": "2.*",
+    "coffeescript": "1.*",
+    "coveralls": "*",
+    "istanbul": "*",
+    "mocha": "*"
+  },
+  "engines": {
+    "node": ">=4.0"
+  },
+  "homepage": "http://github.com/oozcitak/xmlbuilder-js",
+  "keywords": [
+    "xml",
+    "xmlbuilder"
+  ],
+  "license": "MIT",
+  "main": "./lib/index",
+  "name": "xmlbuilder",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/oozcitak/xmlbuilder-js.git"
+  },
+  "scripts": {
+    "postpublish": "rm -rf lib",
+    "prepublish": "coffee -co lib src",
+    "test": "mocha \"test/**/*.coffee\" && istanbul report text lcov"
+  },
+  "version": "9.0.7"
+}
diff --git a/scripts/metrics/package-lock.json b/scripts/metrics/package-lock.json
new file mode 100644
index 00000000000..6b58b61ebe9
--- /dev/null
+++ b/scripts/metrics/package-lock.json
@@ -0,0 +1,30 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "node-fetch": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz",
+      "integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw=="
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "xml2js": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "requires": {
+        "sax": "1.2.4",
+        "xmlbuilder": "9.0.7"
+      }
+    },
+    "xmlbuilder": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+    }
+  }
+}
diff --git a/scripts/metrics/test-metrics.js b/scripts/metrics/test-metrics.js
new file mode 100755
index 00000000000..7073e8a692a
--- /dev/null
+++ b/scripts/metrics/test-metrics.js
@@ -0,0 +1,415 @@
+#!/usr/bin/env node
+/* includes */
+const execSync = require('child_process').execSync; // run shell commands
+const fetch = require('node-fetch'); // downloading
+const fs = require('fs'); // file stream
+const XML = require('xml2js'); // parse xml
+
+/* globals */
+const buildkiteAccessToken = `?access_token=${process.env.BUILDKITE_API_KEY}`; // import buildkite access token from environment
+const debug = (process.env.DEBUG === 'true') ? true : false;
+let errorCount = 0; // count number of jobs which caused an error
+const inBuildkite = (process.env.BUILDKITE === 'true') ? true : false;
+const outputFile = 'test-metrics.json';
+const pipelineWhitelist = // the pipelines for which we run diagnostics
+[
+    'eosio',
+    'eosio-lrt'
+];
+
+/* functions */
+// given a url string, download a text document
+async function download(url)
+{
+    if (debug) console.log(`download(${url.replace(buildkiteAccessToken, '')})`); // DEBUG
+    const httpResponse = await fetch(url);
+    const body = await httpResponse.text();
+    if (isNullOrEmpty(body))
+    {
+        console.log(`ERROR: URL returned nothing! URL: ${url.replace(buildkiteAccessToken, '')}`);
+        const error =
+        {
+            http: { body, response: httpResponse, url},
+            message: 'http body is null or empty',
+            origin: 'download()',
+        }
+        throw error;
+    }
+    if (debug) console.log('Download complete.'); // DEBUG
+    return body;
+}
+
+// given a pipeline and a build number, get a build object
+async function getBuild(pipeline, buildNumber)
+{
+    if (debug) console.log(`getBuild(${pipeline}, ${buildNumber})`); // DEBUG
+    const httpResponse = await fetch(`https://api.buildkite.com/v2/organizations/EOSIO/pipelines/${pipeline}/builds/${buildNumber}${buildkiteAccessToken}`);
+    return httpResponse.json();
+}
+
+// given a buildkite job, return the environmental variables
+async function getEnvironment(job)
+{
+    if (debug) console.log('getEnvironment()'); // DEBUG
+    const httpResponse = await fetch(`${job.build_url}/jobs/${job.id}/env${buildkiteAccessToken}`);
+    const environment = await httpResponse.json();
+    return environment.env;
+}
+
+// given a string to search, a key as regex or a string, and optionally a start index, return the lowest line number containing the key
+function getLineNumber(text, key, startIndex)
+{
+    if (debug) console.log('getLineNumber()'); // DEBUG
+    const begin = (isNullOrEmpty(startIndex) || !Number.isInteger(startIndex) || startIndex < 1) ? 0 : startIndex;
+    let found = false;
+    let lineNumber = 0;
+    const regex = (key instanceof RegExp);
+    text.split('\n').some((line) =>
+    {
+        if (lineNumber >= begin && ((regex && key.test(line)) || (!regex && line.includes(key))))
+        {
+            found = true;
+            return true; // c-style break
+        }
+        lineNumber += 1;
+        return false; // for the linter, plz delete when linter is fixed
+    });
+    return (found) ? lineNumber : -1;
+}
+
+// given a buildkite job, return a sanitized log file
+async function getLog(job)
+{
+    if (debug) console.log(`getLog(${job.raw_log_url})`); // DEBUG
+    const logText = await download(job.raw_log_url + buildkiteAccessToken);
+    // returns log lowercase, with single spaces and '\n' only, and only ascii-printable characters
+    return sanitize(logText); // made this a separate function for unit testing purposes
+}
+
+// given a Buildkite environment, return the operating system used
+function getOS(environment)
+{
+    if (debug) console.log(`getOS(${environment.BUILDKITE_LABEL})`); // DEBUG
+    if (isNullOrEmpty(environment) || isNullOrEmpty(environment.BUILDKITE_LABEL))
+    {
+        console.log('ERROR: getOS() called with empty environment.BUILDKITE_LABEL!');
+        console.log(JSON.stringify(environment));
+        return null;
+    }
+    const label = environment.BUILDKITE_LABEL.toLowerCase();
+    if ((/aws(?!.*[23])/.test(label) || /amazon(?!.*[23])/.test(label)))
+        return 'Amazon Linux 1';
+    if (/aws.*2/.test(label) || /amazon.*2/.test(label))
+        return 'Amazon Linux 2';
+    if (/centos(?!.*[89])/.test(label))
+        return 'CentOS 7';
+    if (/fedora(?!.*2[89])/.test(label) && /fedora(?!.*3\d)/.test(label))
+        return 'Fedora 27';
+    if (/high.*sierra/.test(label))
+        return 'High Sierra';
+    if (/mojave/.test(label))
+        return 'Mojave';
+    if (/ubuntu.*16.*04/.test(label) || /ubuntu.*16(?!.*10)/.test(label))
+        return 'Ubuntu 16.04';
+    if (/ubuntu.*18.*04/.test(label) || /ubuntu.*18(?!.*10)/.test(label))
+        return 'Ubuntu 18.04';
+    if (/docker/.test(label))
+        return 'Docker';
+    return 'Unknown';
+}
+
+// given a Buildkite job, return the test-results.xml file as JSON
+async function getXML(job)
+{
+    if (debug) console.log('getXML()'); // DEBUG
+    const xmlFilename = 'test-results.xml';
+    const artifacts = await download(job.artifacts_url + buildkiteAccessToken);
+    const testResultsArtifact = JSON.parse(artifacts).filter(artifact => artifact.filename === xmlFilename);
+    if (isNullOrEmpty(testResultsArtifact))
+    {
+        console.log(`WARNING: No ${xmlFilename} found! Link: ${job.web_url}`);
+        return null;
+    }
+    const urlBuildkite = testResultsArtifact[0].download_url;
+    const rawXML = await download(urlBuildkite + buildkiteAccessToken);
+    const xmlOptions =
+    {
+        attrNameProcessors: [function lower(name) { return name.toLowerCase(); }],
+        explicitArray: false, // do not put single strings in single-element arrays
+        mergeAttrs: true, // make attributes children of their node
+        normalizeTags: true, // convert all tag names to lowercase
+    };
+    let xmlError, xmlTestResults;
+    await XML.parseString(rawXML, xmlOptions, (err, result) => {xmlTestResults = result; xmlError = err;});
+    if (isNullOrEmpty(xmlError))
+        return xmlTestResults;
+    console.log(`WARNING: Failed to parse xml for job! Link: ${job.web_url}`);
+    console.log(JSON.stringify(xmlError));
+    return null;
+}
+
+// test if variable is empty
+function isNullOrEmpty(str)
+{
+    return (str === null || str === undefined || str.length === 0 || /^\s*$/.test(str));
+}
+
+// return array of test results from a buildkite job log
+function parseLog(logText)
+{
+    if (debug) console.log('parseLog()'); // DEBUG
+    const lines = logText.split('\n');
+    const resultLines = lines.filter(line => /test\s+#\d+/.test(line)); // 'grep' for the test result lines
+    // parse the strings and make test records
+    return resultLines.map((line) =>
+    {
+        const y = line.trim().split(/test\s+#\d+/).pop(); // remove everything before the test declaration
+        const parts = y.split(/\s+/).slice(1, -1); // split the line and remove the test number and time unit
+        const testName = parts[0];
+        const testTime = parts[(parts.length - 1)];
+        const rawResult = parts.slice(1, -1).join();
+        let testResult;
+        if (rawResult.includes('failed'))
+            testResult = 'Failed';
+        else if (rawResult.includes('passed'))
+            testResult = 'Passed';
+        else
+            testResult = 'Exception';
+        return { testName, testResult, testTime }; // create a test record
+    });
+}
+
+// return array of test results from an xUnit-formatted JSON object
+function parseXunit(xUnit)
+{
+    if (debug) console.log('parseXunit()'); // DEBUG
+    if (isNullOrEmpty(xUnit))
+    {
+        console.log('WARNING: xUnit is empty!');
+        return null;
+    }
+    return xUnit.site.testing.test.map((test) =>
+    {
+        const testName = test.name;
+        const testTime = test.results.namedmeasurement.filter(x => /execution\s+time/.test(x.name.toLowerCase()))[0].value;
+        let testResult;
+        if (test.status.includes('failed'))
+            testResult = 'Failed';
+        else if (test.status.includes('passed'))
+            testResult = 'Passed';
+        else
+            testResult = 'Exception';
+        return { testName, testResult, testTime };
+    });
+}
+
+// returns text lowercase, with single spaces and '\n' only, and only ascii-printable characters
+function sanitize(text)
+{
+    if (debug) console.log(`sanitize(text) where text.length = ${text.length} bytes`); // DEBUG
+    const chunkSize = 131072; // process text in 128 kB chunks
+    if (text.length > chunkSize)
+        return sanitize(text.slice(0, chunkSize)).concat(sanitize(text.slice(chunkSize)));
+    return text
+        .replace(/(?!\n)\r(?!\n)/g, '\n').replace(/\r/g, '') // convert all line endings to '\n'
+        .replace(/[^\S\n]+/g, ' ') // convert all whitespace to ' '
+        .replace(/[^ -~\n]+/g, '') // remove non-printable characters
+        .toLowerCase();
+}
+
+// input is array of whole lines containing "test #" and ("failed" or "exception")
+function testDiagnostics(test, logText)
+{
+    if (debug)
+    {
+        console.log(`testDiagnostics(test, logText) where logText.length = ${logText.length} bytes and`); // DEBUG
+        console.log(JSON.stringify({test}));
+    }
+    // get basic information
+    const testResultLine = new RegExp(`test\\s+#\\d+.*${test.testName}`, 'g'); // regex defining "test #" line
+    const startIndex = getLineNumber(logText, testResultLine);
+    const output = { errorMsg: null, lineNumber: startIndex + 1, stackTrace: null }; // default output
+    // filter tests
+    if (test.testResult.toLowerCase() === 'passed')
+        return output;
+    output.errorMsg = 'test diangostics are not enabled for this pipeline';
+    if (!pipelineWhitelist.includes(test.pipeline))
+        return output;
+    // diagnostics
+    if (debug) console.log('Running diagnostics...'); // DEBUG
+    output.errorMsg = 'uncategorized';
+    const testLog = logText.split(testResultLine)[1].split(/test\s*#/)[0].split('\n'); // get log output from this test only, as array of lines
+    let errorLine = testLog[0]; // first line, from "test ## name" to '\n' exclusive
+    if (/\.+ *\** *not run\s+0+\.0+ sec$/.test(errorLine)) // not run
+        output.errorMsg = 'test not run';
+    else if (/\.+ *\** *time *out\s+\d+\.\d+ sec$/.test(errorLine)) // timeout
+        output.errorMsg = 'test timeout';
+    else if (/exception/.test(errorLine)) // test exception
+        output.errorMsg = errorLine.split('exception')[1].replace(/[: \d.]/g, '').replace(/sec$/, ''); // isolate the error message after exception
+    else if (/fc::.*exception/.test(testLog.filter(line => !isNullOrEmpty(line))[1])) // fc exception
+    {
+        [, errorLine] = testLog.filter(line => !isNullOrEmpty(line)); // get first line
+        output.errorMsg = `fc::${errorLine.split('::')[1].replace(/['",]/g, '').split(' ')[0]}`; // isolate fx exception body
+    }
+    else if (testLog.join('\n').includes('ctest:')) // ctest exception
+    {
+        [errorLine] = testLog.filter(line => line.includes('ctest:'));
+        output.errorMsg = `ctest:${errorLine.split('ctest:')[1]}`;
+    }
+    else if (!isNullOrEmpty(testLog.filter(line => /boost.+exception/.test(line)))) // boost exception
+    {
+        [errorLine] = testLog.filter(line => /boost.+exception/.test(line));
+        output.errorMsg = `boost: ${errorLine.replace(/[()]/g, '').split(/: (.+)/)[1]}`; // capturing parenthesis, split only at first ' :'
+        output.stackTrace = testLog.filter(line => /thread-\d+/.test(line))[0].split('thread-')[1].replace(/^\d+/, '').trim().replace(/[[]\d+m$/, ''); // get the bottom of the stack trace
+    }
+    else if (/unit[-_. ]+test/.test(test.testName) || /plugin[-_. ]+test/.test(test.testName)) // unit test, application exception
+    {
+        if (!isNullOrEmpty(testLog.filter(line => line.includes('exception: '))))
+        {
+            [errorLine] = testLog.filter(line => line.includes('exception: '));
+            [, output.errorMsg] = errorLine.replace(/[()]/g, '').split(/: (.+)/); // capturing parenthesis, split only at first ' :'
+            output.stackTrace = testLog.filter(line => /thread-\d+/.test(line))[0].split('thread-')[1].replace(/^\d+/, '').trim().replace(/[[]\d+m$/, ''); // get the bottom of the stack trace
+        }
+        // else uncategorized unit test
+    }
+    // else integration test, add cross-referencing code here (or uncategorized)
+    if (errorLine !== testLog[0]) // get real line number from log file
+        output.lineNumber = getLineNumber(logText, errorLine, startIndex) + 1;
+    return output;
+}
+
+// return test metrics given a buildkite job or build
+async function testMetrics(buildkiteObject)
+{
+    if (!isNullOrEmpty(buildkiteObject.type)) // input is a Buildkite job object
+    {
+        const job = buildkiteObject;
+        console.log(`Processing test metrics for "${job.name}" at ${job.web_url}...`);
+        // get test results
+        const logText = await getLog(job);
+        let testResults;
+        let xUnit;
+        try
+        {
+            xUnit = await getXML(job);
+            testResults = parseXunit(xUnit);
+        }
+        catch (error)
+        {
+            console.log(`XML processing failed! Link: ${job.web_url}`);
+            console.log(JSON.stringify(error));
+            testResults = null;
+        }
+        finally
+        {
+            if (isNullOrEmpty(testResults))
+                testResults = parseLog(logText);
+        }
+        // get test metrics
+        const env = await getEnvironment(job);
+        const metrics = [];
+        testResults.forEach((result) =>
+        {
+            // add test properties
+            const test =
+            {
+                ...result, // add testName, testResult, testTime
+                agentName: env.BUILDKITE_AGENT_NAME,
+                agentRole: env.BUILDKITE_AGENT_META_DATA_QUEUE || env.BUILDKITE_AGENT_META_DATA_ROLE,
+                branch: env.BUILDKITE_BRANCH,
+                buildNumber: env.BUILDKITE_BUILD_NUMBER,
+                commit: env.BUILDKITE_COMMIT,
+                job: env.BUILDKITE_LABEL,
+                os: getOS(env),
+                pipeline: env.BUILDKITE_PIPELINE_SLUG,
+                repo: env.BUILDKITE_REPO.replace(new RegExp('^git@github.com:(EOSIO/)?'), '').replace(new RegExp('.git$'), ''),
+                testTime: parseFloat(result.testTime),
+                url: job.web_url,
+            };
+            metrics.push({ ...test, ...testDiagnostics(test, logText) });
+        });
+        return metrics;
+    }
+    else if (!isNullOrEmpty(buildkiteObject.number)) // input is a Buildkite build object
+    {
+        const build = buildkiteObject;
+        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number} at ${build.web_url}...`);
+        let metrics = [], promises = [];
+        // process test metrics
+        build.jobs.filter(job => job.type === 'script' && /test/.test(job.name.toLowerCase()) ).forEach((job) =>
+        {
+            promises.push(
+                testMetrics(job)
+                    .then((moreMetrics) => {
+                        metrics = metrics.concat(moreMetrics);
+                    }).catch((error) => {
+                        console.log(`ERROR: Failed to process test metrics for ${job.name}! Link: ${job.web_url}`);
+                        console.log(JSON.stringify(error));
+                        errorCount++;
+                    })
+            );
+        });
+        await Promise.all(promises);
+        return metrics;
+    }
+    else // something else
+    {
+        console.log('ERROR: Buildkite object not recognized or not a test step!');
+        console.log(JSON.stringify({buildkiteObject}));
+        return null;
+    }
+}
+
+/* main */
+async function main()
+{
+    if (debug) console.log(`$ ${process.argv.join(' ')}`);
+    let build, metrics = null;
+    console.log(`${(inBuildkite) ? '+++ :evergreen_tree: ' : ''}Getting information from enviroment...`);
+    const buildNumber = process.env.BUILDKITE_BUILD_NUMBER || process.argv[2];
+    const pipeline = process.env.BUILDKITE_PIPELINE_SLUG || process.argv[3];
+    if (debug)
+    {
+        console.log(`BUILDKITE=${process.env.BUILDKITE}`);
+        console.log(`BUILDKITE_BUILD_NUMBER=${process.env.BUILDKITE_BUILD_NUMBER}`);
+        console.log(`BUILDKITE_PIPELINE_SLUG=${process.env.BUILDKITE_PIPELINE_SLUG}`);
+        console.log('    State:')
+        console.log(`inBuildkite = "${inBuildkite}"`);
+        console.log(`buildNumber = "${buildNumber}"`);
+        console.log(`pipeline    = "${pipeline}"`);
+    }
+    if (!isNullOrEmpty(buildNumber) && !isNullOrEmpty(pipeline) && !isNullOrEmpty(process.env.BUILDKITE_API_KEY))
+    {
+        console.log(`${(inBuildkite) ? '+++ :bar_chart: ' : ''}Processing test metrics...`);
+        build = await getBuild(pipeline, buildNumber);
+        metrics = await testMetrics(build);
+        console.log('Done processing test metrics.');
+    }
+    else
+    {
+        console.log(`${(inBuildkite) ? ':no_entry: ' : ''}ERROR: Missing required inputs!`);
+        if (isNullOrEmpty(process.env.BUILDKITE_API_KEY)) console.log('- Buildkite API key, as BUILDKITE_API_KEY environment variable');
+        if (isNullOrEmpty(buildNumber)) console.log('- Build Number, as BUILDKITE_BUILD_NUMBER or argument 1');
+        if (isNullOrEmpty(pipeline)) console.log('- Pipeline Slug, as BUILDKITE_PIPELINE_SLUG or argument 2');
+        errorCount = -1;
+    }
+    console.log(`${(inBuildkite) ? '+++ :pencil: ' : ''}Writing to file...`);
+    fs.writeFileSync(outputFile, JSON.stringify({ metrics }));
+    console.log(`Saved metrics to "${outputFile}" in "${process.cwd()}".`);
+    if (inBuildkite)
+    {
+        console.log('+++ :arrow_up: Uploading artifact...');
+        execSync(`buildkite-agent artifact upload ${outputFile}`);
+    }
+    if (errorCount === 0)
+        console.log(`${(inBuildkite) ? ':white_check_mark: ' : ''}Done!`);
+    else
+    {
+        console.log(`${(inBuildkite) ? ':warning: ' : ''}Finished with errors.`);
+        console.log(`Please send automation a link to this job${(isNullOrEmpty(build)) ? '.' : `: ${build.web_url}`}`);
+        console.log('@kj4ezj or @zreyn on Telegram');
+    }
+    return process.exit(errorCount);
+};
+
+main();
\ No newline at end of file

From 22bfe316e5bea781415ce576f2508c46d154fcc8 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 2 May 2019 18:13:11 -0400
Subject: [PATCH 0256/1648] "Test Metrics" job matches filters, don't run on
 yourself!

---
 scripts/metrics/test-metrics.js | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/metrics/test-metrics.js b/scripts/metrics/test-metrics.js
index 7073e8a692a..752a6821587 100755
--- a/scripts/metrics/test-metrics.js
+++ b/scripts/metrics/test-metrics.js
@@ -127,7 +127,7 @@ async function getXML(job)
     const testResultsArtifact = JSON.parse(artifacts).filter(artifact => artifact.filename === xmlFilename);
     if (isNullOrEmpty(testResultsArtifact))
     {
-        console.log(`WARNING: No ${xmlFilename} found! Link: ${job.web_url}`);
+        console.log(`WARNING: No ${xmlFilename} found for "${job.name}"! Link: ${job.web_url}`);
         return null;
     }
     const urlBuildkite = testResultsArtifact[0].download_url;
@@ -143,7 +143,7 @@ async function getXML(job)
     await XML.parseString(rawXML, xmlOptions, (err, result) => {xmlTestResults = result; xmlError = err;});
     if (isNullOrEmpty(xmlError))
         return xmlTestResults;
-    console.log(`WARNING: Failed to parse xml for job! Link: ${job.web_url}`);
+    console.log(`WARNING: Failed to parse xml for "${job.name}" job! Link: ${job.web_url}`);
     console.log(JSON.stringify(xmlError));
     return null;
 }
@@ -222,8 +222,8 @@ function testDiagnostics(test, logText)
 {
     if (debug)
     {
-        console.log(`testDiagnostics(test, logText) where logText.length = ${logText.length} bytes and`); // DEBUG
-        console.log(JSON.stringify({test}));
+        console.log(`testDiagnostics(test, logText) where logText.length = ${logText.length} bytes and test is`); // DEBUG
+        console.log(JSON.stringify(test));
     }
     // get basic information
     const testResultLine = new RegExp(`test\\s+#\\d+.*${test.testName}`, 'g'); // regex defining "test #" line
@@ -284,7 +284,7 @@ async function testMetrics(buildkiteObject)
     if (!isNullOrEmpty(buildkiteObject.type)) // input is a Buildkite job object
     {
         const job = buildkiteObject;
-        console.log(`Processing test metrics for "${job.name}" at ${job.web_url}...`);
+        console.log(`Processing test metrics for "${job.name}"${(inBuildkite) ? ` at ${job.web_url}` : ''}...`);
         // get test results
         const logText = await getLog(job);
         let testResults;
@@ -296,7 +296,7 @@ async function testMetrics(buildkiteObject)
         }
         catch (error)
         {
-            console.log(`XML processing failed! Link: ${job.web_url}`);
+            console.log(`XML processing failed for "${job.name}"! Link: ${job.web_url}`);
             console.log(JSON.stringify(error));
             testResults = null;
         }
@@ -333,17 +333,17 @@ async function testMetrics(buildkiteObject)
     else if (!isNullOrEmpty(buildkiteObject.number)) // input is a Buildkite build object
     {
         const build = buildkiteObject;
-        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number} at ${build.web_url}...`);
+        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number}${(inBuildkite) ? ` at ${build.web_url}` : ''}...`);
         let metrics = [], promises = [];
         // process test metrics
-        build.jobs.filter(job => job.type === 'script' && /test/.test(job.name.toLowerCase()) ).forEach((job) =>
+        build.jobs.filter(job => job.type === 'script' && /test/.test(job.name.toLowerCase()) && ! /test metrics/.test(job.name.toLowerCase())).forEach((job) =>
         {
             promises.push(
                 testMetrics(job)
                     .then((moreMetrics) => {
                         metrics = metrics.concat(moreMetrics);
                     }).catch((error) => {
-                        console.log(`ERROR: Failed to process test metrics for ${job.name}! Link: ${job.web_url}`);
+                        console.log(`ERROR: Failed to process test metrics for "${job.name}"! Link: ${job.web_url}`);
                         console.log(JSON.stringify(error));
                         errorCount++;
                     })
@@ -378,14 +378,7 @@ async function main()
         console.log(`buildNumber = "${buildNumber}"`);
         console.log(`pipeline    = "${pipeline}"`);
     }
-    if (!isNullOrEmpty(buildNumber) && !isNullOrEmpty(pipeline) && !isNullOrEmpty(process.env.BUILDKITE_API_KEY))
-    {
-        console.log(`${(inBuildkite) ? '+++ :bar_chart: ' : ''}Processing test metrics...`);
-        build = await getBuild(pipeline, buildNumber);
-        metrics = await testMetrics(build);
-        console.log('Done processing test metrics.');
-    }
-    else
+    if (isNullOrEmpty(buildNumber) || isNullOrEmpty(pipeline) || isNullOrEmpty(process.env.BUILDKITE_API_KEY))
     {
         console.log(`${(inBuildkite) ? ':no_entry: ' : ''}ERROR: Missing required inputs!`);
         if (isNullOrEmpty(process.env.BUILDKITE_API_KEY)) console.log('- Buildkite API key, as BUILDKITE_API_KEY environment variable');
@@ -393,6 +386,13 @@ async function main()
         if (isNullOrEmpty(pipeline)) console.log('- Pipeline Slug, as BUILDKITE_PIPELINE_SLUG or argument 2');
         errorCount = -1;
     }
+    else
+    {
+        console.log(`${(inBuildkite) ? '+++ :bar_chart: ' : ''}Processing test metrics...`);
+        build = await getBuild(pipeline, buildNumber);
+        metrics = await testMetrics(build);
+        console.log('Done processing test metrics.');
+    }
     console.log(`${(inBuildkite) ? '+++ :pencil: ' : ''}Writing to file...`);
     fs.writeFileSync(outputFile, JSON.stringify({ metrics }));
     console.log(`Saved metrics to "${outputFile}" in "${process.cwd()}".`);

From 631bca4944d3e02459e1f316d9d26e1b95b67351 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 2 May 2019 21:04:35 -0400
Subject: [PATCH 0257/1648] Ternary operator logic reversed

---
 scripts/metrics/test-metrics.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/metrics/test-metrics.js b/scripts/metrics/test-metrics.js
index 752a6821587..b61671f6379 100755
--- a/scripts/metrics/test-metrics.js
+++ b/scripts/metrics/test-metrics.js
@@ -284,7 +284,7 @@ async function testMetrics(buildkiteObject)
     if (!isNullOrEmpty(buildkiteObject.type)) // input is a Buildkite job object
     {
         const job = buildkiteObject;
-        console.log(`Processing test metrics for "${job.name}"${(inBuildkite) ? ` at ${job.web_url}` : ''}...`);
+        console.log(`Processing test metrics for "${job.name}"${(inBuildkite) ? '' : ` at ${job.web_url}`}...`);
         // get test results
         const logText = await getLog(job);
         let testResults;
@@ -333,7 +333,7 @@ async function testMetrics(buildkiteObject)
     else if (!isNullOrEmpty(buildkiteObject.number)) // input is a Buildkite build object
     {
         const build = buildkiteObject;
-        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number}${(inBuildkite) ? ` at ${build.web_url}` : ''}...`);
+        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number}${(inBuildkite) ? '' : ` at ${job.web_url}`}...`);
         let metrics = [], promises = [];
         // process test metrics
         build.jobs.filter(job => job.type === 'script' && /test/.test(job.name.toLowerCase()) && ! /test metrics/.test(job.name.toLowerCase())).forEach((job) =>

From f023ffea768fffb069bbb2a3c5bb58f030387db0 Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Fri, 3 May 2019 14:07:53 +0800
Subject: [PATCH 0258/1648] add transaction signal test for fork case

---
 unittests/signal_tests.cpp | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/unittests/signal_tests.cpp b/unittests/signal_tests.cpp
index 81bffaffebc..e09d2b6a48b 100644
--- a/unittests/signal_tests.cpp
+++ b/unittests/signal_tests.cpp
@@ -319,6 +319,13 @@ BOOST_AUTO_TEST_CASE(signal_fork)
 
    int acc_blk_count = 0;
    uint32_t last_acc_blk_num = 0;
+
+   int acc_txn_count = 0;
+   transaction_id_type last_acc_txn_id;
+
+   int app_txn_count = 0;
+   transaction_id_type last_app_txn_id;
+   transaction_trace_ptr last_signal_trace;
    
    TESTER c;
    c.produce_block();
@@ -376,6 +383,9 @@ BOOST_AUTO_TEST_CASE(signal_fork)
       return c.control->head_block_state()->get_scheduled_producer(next_time).producer_name;
    };
 
+   transaction_trace_ptr create_acc_trace;
+   bool txn_verified = false;
+
    // fork c: 1 producers: dan
    // fork c2: 3 producer: sam, pam, scott
    int skip1 = 1, skip2 = 1;
@@ -387,6 +397,9 @@ BOOST_AUTO_TEST_CASE(signal_fork)
       else ++skip1;
       account_name next2 = nextproducer(c2, skip2);
       if (next2 == N(sam) || next2 == N(pam) || next2 == N(scott)) {
+         if (!create_acc_trace) {
+            create_acc_trace = c2.create_account(N(apple), N(eosio));
+         }
          c2.produce_block(fc::milliseconds(config::block_interval_ms * skip2)); skip2 = 1;
       }
       else ++skip2;
@@ -400,7 +413,21 @@ BOOST_AUTO_TEST_CASE(signal_fork)
    BOOST_CHECK_EQUAL(acc_blk_count, 152);
    BOOST_CHECK_EQUAL(last_acc_blk_num, c.control->head_block_num());
 
-   // push fork from c2 => c
+   c.control->accepted_transaction.connect([&](const transaction_metadata_ptr& ptr) {
+      ++acc_txn_count;
+      last_acc_txn_id = ptr->id;
+   });
+
+   c.control->applied_transaction.connect([&](std::tuple<const transaction_trace_ptr&, const signed_transaction&> t) {
+      ++app_txn_count;
+      last_app_txn_id = std::get<0>(t)->id;
+      last_signal_trace = std::get<0>(t);
+      if (last_app_txn_id == create_acc_trace->id) {
+         txn_verified = true;
+      }
+   });
+
+   // push fork from c2 => c, got verify txn signal
    size_t p = fork_num;
    size_t count = 0;
    while ( p < c2.control->head_block_num()) {
@@ -412,6 +439,8 @@ BOOST_AUTO_TEST_CASE(signal_fork)
 
    BOOST_CHECK_EQUAL(last_irr_blocknum, c.control->last_irreversible_block_num());
    BOOST_REQUIRE_EQUAL(last_irr_blocknum > fork_num, true);
+
+   BOOST_REQUIRE_EQUAL(txn_verified, true);
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 4999b0b72ef496533b22834a3620c25536d87b5c Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 May 2019 10:06:59 -0400
Subject: [PATCH 0259/1648] Do not fail build due to metrics

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 379d02015cb..000b6fd9c0d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -316,6 +316,7 @@ steps:
     agents:
       queue: "automation-apps-builder-fleet"
     timeout: 10
+    soft_fail: true
 
   - wait
 

From 86a4217e8dadd9e876e49fcfc83c4e73b19b4054 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 May 2019 10:08:03 -0400
Subject: [PATCH 0260/1648] Added check for skipped jobs

---
 scripts/metrics/test-metrics.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/metrics/test-metrics.js b/scripts/metrics/test-metrics.js
index b61671f6379..00c03fbfc85 100755
--- a/scripts/metrics/test-metrics.js
+++ b/scripts/metrics/test-metrics.js
@@ -285,6 +285,11 @@ async function testMetrics(buildkiteObject)
     {
         const job = buildkiteObject;
         console.log(`Processing test metrics for "${job.name}"${(inBuildkite) ? '' : ` at ${job.web_url}`}...`);
+        if (isNullOrEmpty(job.exit_status))
+        {
+            console.log(`${(inBuildkite) ? '+++ :warning: ' : ''}WARNING: "${job.name}" was skipped!`);
+            return null;
+        }
         // get test results
         const logText = await getLog(job);
         let testResults;
@@ -333,7 +338,7 @@ async function testMetrics(buildkiteObject)
     else if (!isNullOrEmpty(buildkiteObject.number)) // input is a Buildkite build object
     {
         const build = buildkiteObject;
-        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number}${(inBuildkite) ? '' : ` at ${job.web_url}`}...`);
+        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number}${(inBuildkite) ? '' : ` at ${build.web_url}`}...`);
         let metrics = [], promises = [];
         // process test metrics
         build.jobs.filter(job => job.type === 'script' && /test/.test(job.name.toLowerCase()) && ! /test metrics/.test(job.name.toLowerCase())).forEach((job) =>
@@ -343,7 +348,7 @@ async function testMetrics(buildkiteObject)
                     .then((moreMetrics) => {
                         metrics = metrics.concat(moreMetrics);
                     }).catch((error) => {
-                        console.log(`ERROR: Failed to process test metrics for "${job.name}"! Link: ${job.web_url}`);
+                        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Failed to process test metrics for "${job.name}"! Link: ${job.web_url}`);
                         console.log(JSON.stringify(error));
                         errorCount++;
                     })
@@ -354,7 +359,7 @@ async function testMetrics(buildkiteObject)
     }
     else // something else
     {
-        console.log('ERROR: Buildkite object not recognized or not a test step!');
+        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Buildkite object not recognized or not a test step!`);
         console.log(JSON.stringify({buildkiteObject}));
         return null;
     }
@@ -380,7 +385,7 @@ async function main()
     }
     if (isNullOrEmpty(buildNumber) || isNullOrEmpty(pipeline) || isNullOrEmpty(process.env.BUILDKITE_API_KEY))
     {
-        console.log(`${(inBuildkite) ? ':no_entry: ' : ''}ERROR: Missing required inputs!`);
+        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Missing required inputs!`);
         if (isNullOrEmpty(process.env.BUILDKITE_API_KEY)) console.log('- Buildkite API key, as BUILDKITE_API_KEY environment variable');
         if (isNullOrEmpty(buildNumber)) console.log('- Build Number, as BUILDKITE_BUILD_NUMBER or argument 1');
         if (isNullOrEmpty(pipeline)) console.log('- Pipeline Slug, as BUILDKITE_PIPELINE_SLUG or argument 2');
@@ -402,10 +407,10 @@ async function main()
         execSync(`buildkite-agent artifact upload ${outputFile}`);
     }
     if (errorCount === 0)
-        console.log(`${(inBuildkite) ? ':white_check_mark: ' : ''}Done!`);
+        console.log(`${(inBuildkite) ? '+++ :white_check_mark: ' : ''}Done!`);
     else
     {
-        console.log(`${(inBuildkite) ? ':warning: ' : ''}Finished with errors.`);
+        console.log(`${(inBuildkite) ? '+++ :warning: ' : ''}Finished with errors.`);
         console.log(`Please send automation a link to this job${(isNullOrEmpty(build)) ? '.' : `: ${build.web_url}`}`);
         console.log('@kj4ezj or @zreyn on Telegram');
     }

From c0e8b7d77d53633464ba746a62ae458fa20b958b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 3 May 2019 09:18:47 -0500
Subject: [PATCH 0261/1648] Use fork_db_pending_head instead of fork_db_head so
 irreversible mode works

---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4f85e730bfd..cd9523a4969 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2360,8 +2360,8 @@ namespace eosio {
       chain_lib_id = cc.last_irreversible_block_id();
       chain_head_blk_num = cc.head_block_num();
       chain_head_blk_id = cc.head_block_id();
-      chain_fork_head_blk_num = cc.fork_db_head_block_num();
-      chain_fork_head_blk_id = cc.fork_db_head_block_id();
+      chain_fork_head_blk_num = cc.fork_db_pending_head_block_num();
+      chain_fork_head_blk_id = cc.fork_db_pending_head_block_id();
       fc_dlog( logger, "updating chain info lib ${lib}, head ${head}, fork ${fork}",
                ("lib", chain_lib_num)("head", chain_head_blk_num)("fork", chain_fork_head_blk_num) );
    }

From 786c1d2fe6fada677df44e824dfd5477d6ddc446 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 May 2019 10:59:43 -0400
Subject: [PATCH 0262/1648] Return exit success in Buildkite so we don't
 prevent PRs from being merged

---
 scripts/metrics/test-metrics.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/metrics/test-metrics.js b/scripts/metrics/test-metrics.js
index 00c03fbfc85..823a2e10b49 100755
--- a/scripts/metrics/test-metrics.js
+++ b/scripts/metrics/test-metrics.js
@@ -9,6 +9,7 @@ const XML = require('xml2js'); // parse xml
 const buildkiteAccessToken = `?access_token=${process.env.BUILDKITE_API_KEY}`; // import buildkite access token from environment
 const debug = (process.env.DEBUG === 'true') ? true : false;
 let errorCount = 0; // count number of jobs which caused an error
+const EXIT_SUCCESS = 0;
 const inBuildkite = (process.env.BUILDKITE === 'true') ? true : false;
 const outputFile = 'test-metrics.json';
 const pipelineWhitelist = // the pipelines for which we run diagnostics
@@ -414,7 +415,7 @@ async function main()
         console.log(`Please send automation a link to this job${(isNullOrEmpty(build)) ? '.' : `: ${build.web_url}`}`);
         console.log('@kj4ezj or @zreyn on Telegram');
     }
-    return process.exit(errorCount);
+    return (inBuildkite) ? process.exit(EXIT_SUCCESS) : process.exit(errorCount);
 };
 
 main();
\ No newline at end of file

From 3c40a4086bd39271fb009228f25254b837eb2d59 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 3 May 2019 10:46:02 -0500
Subject: [PATCH 0263/1648] Increase timeout for
 nodeos_under_min_avail_ram_lr_test because macs are too slow

---
 tests/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 26d5929de4b..730697d8e4b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -104,6 +104,7 @@ add_test(NAME nodeos_voting_lr_test COMMAND tests/nodeos_voting_test.py -v --wal
 set_property(TEST nodeos_voting_lr_test PROPERTY LABELS long_running_tests)
 
 add_test(NAME nodeos_under_min_avail_ram_lr_test COMMAND tests/nodeos_under_min_avail_ram.py -v --wallet-port 9904 --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_tests_properties(nodeos_under_min_avail_ram_lr_test PROPERTIES TIMEOUT 3000)
 set_property(TEST nodeos_under_min_avail_ram_lr_test PROPERTY LABELS long_running_tests)
 
 add_test(NAME nodeos_irreversible_mode_lr_test COMMAND tests/nodeos_irreversible_mode_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})

From 01ec9b41604c478772ca2390762d99969a07ff54 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 3 May 2019 22:32:20 -0400
Subject: [PATCH 0264/1648] use protocol-features-sync-nodes branch for LRT
 pipeline

---
 pipeline.jsonc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index cf98935463b..e4430559f0e 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -3,6 +3,10 @@
     {
         "pipeline-branch": "protocol-features-sync-nodes"
     },
+    "eosio-lrt":
+    {
+        "pipeline-branch": "protocol-features-sync-nodes"
+    },
     "eos-multiversion-tests":
     {
         "pipeline-branch": "protocol-features-sync-nodes",
@@ -15,4 +19,4 @@
     {
         "pipeline-branch": "protocol-features-sync-nodes"
     }
-}
\ No newline at end of file
+}

From 86a8a07b5bd20edd2ed94c7adf8c28fe4b8d978c Mon Sep 17 00:00:00 2001
From: UMU618 <umu618@hotmail.com>
Date: Mon, 6 May 2019 12:07:41 +0800
Subject: [PATCH 0265/1648] + use bson_oid_is_valid()

---
 plugins/mongo_db_plugin/CMakeLists.txt                       | 5 ++++-
 .../mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/mongo_db_plugin/CMakeLists.txt b/plugins/mongo_db_plugin/CMakeLists.txt
index dc76525f3a2..e061871f98a 100644
--- a/plugins/mongo_db_plugin/CMakeLists.txt
+++ b/plugins/mongo_db_plugin/CMakeLists.txt
@@ -15,6 +15,9 @@ if(BUILD_MONGO_DB_PLUGIN)
       # link step for all executables using this archive must include the
       # mongo-cxx-driver libraries libmongocxx and libbsoncxx.
 
+      find_package(libbson-1.0 1.13.0 REQUIRED)
+      message(STATUS "Found bson headers: ${BSON_INCLUDE_DIRS}")
+
       find_package(libbsoncxx-static REQUIRED)
       message(STATUS "Found bsoncxx headers: ${LIBBSONCXX_STATIC_INCLUDE_DIRS}")
 
@@ -54,7 +57,7 @@ if(BUILD_MONGO_DB_PLUGIN)
                ${HEADERS} )
 
   target_include_directories(mongo_db_plugin
-          PRIVATE ${LIBMONGOCXX_STATIC_INCLUDE_DIRS} ${LIBBSONCXX_STATIC_INCLUDE_DIRS}
+          PRIVATE ${LIBMONGOCXX_STATIC_INCLUDE_DIRS} ${LIBBSONCXX_STATIC_INCLUDE_DIRS} ${BSON_INCLUDE_DIRS}
           PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
           )
 
diff --git a/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp b/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp
index 37e21d332b4..4eb21748fb2 100644
--- a/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp
+++ b/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp
@@ -14,6 +14,8 @@
 
 #include <fc/variant.hpp>
 
+#include <bson/bson.h>
+
 namespace eosio {
 void to_bson(const fc::variant_object& o, bsoncxx::builder::core& c);
 void to_bson(const fc::variants& v, bsoncxx::builder::core& c);
@@ -90,7 +92,7 @@ void to_bson(const fc::variant& v, bsoncxx::builder::core& c)
             const auto value = o.begin()->value();
             if (o.begin()->key().compare("$oid") == 0) {
                if (value.get_type() == fc::variant::string_type
-                  && value.as_string().size() == 12 * 2) {
+                  && bson_oid_is_valid(value.as_string().data(), value.as_string().size())) {
                   bsoncxx::oid oid(value.as_string());
                   c.append(oid);
                   break;

From cbc2a28dde16d0afa6edcd58316eb66ad120b60f Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 6 May 2019 02:48:49 -0400
Subject: [PATCH 0266/1648] close to ready for replay

---
 libraries/CMakeLists.txt                      |  6 +++-
 .../eosio/chain/webassembly/eos-vm.hpp        | 35 ++++++++++---------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 292e7021f46..9727f511f19 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -14,7 +14,11 @@ set(RUN_RE2C OFF CACHE BOOL "Run re2c")
 set(WITH_EXCEPTIONS ON CACHE BOOL "Build with exceptions enabled" FORCE)
 add_subdirectory( wabt )
 
-set(USE_EXISTING_SOFTFLOAT 1)
+set(USE_EXISTING_SOFTFLOAT ON)
+set(ENABLE_TESTS OFF)
+set(ENABLE_ADDRESS_SANITIZER OFF)
+set(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER OFF)
+set(ENABLE_PROFILE OFF)
 add_subdirectory( eos-vm )
 
 set(ENABLE_STATIC ON)
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index e195f9822bc..d64f36aa741 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -16,24 +16,26 @@ namespace eosio { namespace wasm_backend {
       typedef uint64_t type;
    };
 
-   template <typename S, typename Args, size_t I, typename T, typename Backend, typename Cleanups>
-   constexpr auto get_value(eosio::wasm_backend::operand_stack<Backend>& op, Cleanups&, Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i64_const_t, T> && 
-                                                          std::is_same_v<chain::name, std::decay_t<S>>, S> {
+   template <typename S, typename Args, size_t I, typename T, typename WAlloc, typename Cleanups>
+   constexpr auto get_value(operand_stack& op, Cleanups&, WAlloc*, T&& val) 
+   	-> std::enable_if_t<std::is_same_v<i64_const_t, T> && std::is_same_v<chain::name, std::decay_t<S>>, S> {
       return {(uint64_t)val.data.ui};
    } 
+
    // we can clean these up if we go with custom vms
    template <typename T>
    struct reduce_type<eosio::chain::array_ptr<T>> {
       typedef uint32_t type;
    };
    
-   template <typename S, typename Args, size_t I, typename T, typename Backend, typename Cleanups>
-   constexpr auto get_value(eosio::wasm_backend::operand_stack<Backend>& op, Cleanups& cleanups, Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
-   						  std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
-                      !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
+   template <typename S, typename Args, size_t I, typename T, typename WAlloc, typename Cleanups>
+   constexpr auto get_value(operand_stack& op, Cleanups& cleanups, WAlloc* walloc, T&& val) 
+   	-> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
+	   std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
+           !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
       size_t i = std::tuple_size<Args>::value-1;
       using ptr_ty = typename S::type;
-      auto* ptr = (ptr_ty*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui);
+      auto* ptr = (ptr_ty*)(walloc->template get_base_ptr<uint8_t>()+val.data.ui);
       if constexpr (std::tuple_size<Args>::value > I) {
          const auto& len = std::get<to_wasm_t<typename std::tuple_element<I, Args>::type>>(op.get_back(i-I)).data.ui;
          if ((uintptr_t)ptr % alignof(S) != 0) {
@@ -41,9 +43,9 @@ namespace eosio { namespace wasm_backend {
             apt.s = sizeof(S)*len;
             std::vector<typename std::remove_const_t<S>::type> cpy(len > 0 ? len : 1);
             apt.o = (void*)ptr;
-	    ptr = &cpy[0];
+	    ptr = &cpy;
             apt.n = (void*)ptr;
-            memcpy(apt.n, apt.o, apt.s);
+            bytes_copy(apt.n, apt.o, apt.s);
             cleanups.emplace_back(std::move(apt));
          }
       }
@@ -55,11 +57,12 @@ namespace eosio { namespace wasm_backend {
       typedef uint32_t type;
    };
    
-   template <typename S, typename Args, size_t I, typename T, typename Backend, typename Cleanups>
-   constexpr auto get_value(eosio::wasm_backend::operand_stack<Backend>& op, Cleanups&, Backend& backend, T&& val) -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
-                    std::is_same_v< eosio::chain::null_terminated_ptr, S> &&
-						 !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
-      return eosio::chain::null_terminated_ptr((char*)(backend.get_wasm_allocator()->template get_base_ptr<uint8_t>()+val.data.ui));
+   template <typename S, typename Args, size_t I, typename T, typename WAlloc, typename Cleanups>
+   constexpr auto get_value(operand_stack& op, Cleanups&, WAlloc* walloc, T&& val) 
+   	-> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
+           std::is_same_v< eosio::chain::null_terminated_ptr, S> &&
+           !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
+      return eosio::chain::null_terminated_ptr((char*)(walloc->template get_base_ptr<uint8_t>()+val.data.ui));
    }
 
 }} // ns eosio::wasm_backend
@@ -87,6 +90,6 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
 #define _EOS_VM_INTRINSIC_NAME(LBL, SUF) __INTRINSIC_NAME(LBL, SUF)
 
 #define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG) \
-   eosio::wasm_backend::registered_function<eosio::chain::apply_context, CLS, &CLS::METHOD, eosio::wasm_backend::backend<eosio::chain::apply_context>> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__)(std::string(MOD), std::string(NAME));
+   eosio::wasm_backend::registered_function<eosio::chain::apply_context, CLS, &CLS::METHOD> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__)(std::string(MOD), std::string(NAME));
 
 

From 59c904c94e2dc5e9a59ba74c162025728de35a61 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 6 May 2019 03:57:06 -0400
Subject: [PATCH 0267/1648] need to change a bit for alignment

---
 .../include/eosio/chain/webassembly/eos-vm.hpp     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index d64f36aa741..4c158284c43 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -37,13 +37,19 @@ namespace eosio { namespace wasm_backend {
       using ptr_ty = typename S::type;
       auto* ptr = (ptr_ty*)(walloc->template get_base_ptr<uint8_t>()+val.data.ui);
       if constexpr (std::tuple_size<Args>::value > I) {
-         const auto& len = std::get<to_wasm_t<typename std::tuple_element<I, Args>::type>>(op.get_back(i-I)).data.ui;
+         const auto& next_arg = std::get<to_wasm_t<typename std::tuple_element<I, Args>::type>>(op.get_back(i-I)).data.ui;
+	 if constexpr ( (std::tuple_size<Args>::value > I+1) 
+			 && std::is_same_v<decltype(next_arg), eosio::chain::array_ptr<typename S::type>>) {
+            sz = std::get<to_wasm_t<typename std::tuple_element<I+1, Args>::type>>(op.get_back(i-(I+1))).data.ui;
+         } else {
+            sz = next_arg;
+	 }
          if ((uintptr_t)ptr % alignof(S) != 0) {
             align_ptr_triple apt;
-            apt.s = sizeof(S)*len;
-            std::vector<typename std::remove_const_t<S>::type> cpy(len > 0 ? len : 1);
+            apt.s = sizeof(S)*sz;
+            std::vector<typename std::remove_const_t<S>::type> cpy(sz > 0 ? sz : 1);
             apt.o = (void*)ptr;
-	    ptr = &cpy;
+            ptr = (decltype(ptr))cpy.data();
             apt.n = (void*)ptr;
             bytes_copy(apt.n, apt.o, apt.s);
             cleanups.emplace_back(std::move(apt));

From afd997aff35b23dbf808f16da890589690397a5d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifner_k@ociweb.com>
Date: Mon, 6 May 2019 08:21:12 -0500
Subject: [PATCH 0268/1648] Remove explicit version specification

---
 plugins/mongo_db_plugin/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mongo_db_plugin/CMakeLists.txt b/plugins/mongo_db_plugin/CMakeLists.txt
index b0a016f75da..81bf1fc76ca 100644
--- a/plugins/mongo_db_plugin/CMakeLists.txt
+++ b/plugins/mongo_db_plugin/CMakeLists.txt
@@ -4,7 +4,7 @@ if(BUILD_MONGO_DB_PLUGIN)
 
   if (libmongoc-1.0_FOUND)
 
-      find_package(libbson-1.0 1.13.0 REQUIRED)
+      find_package(libbson-1.0 REQUIRED)
       message(STATUS "Found bson headers: ${BSON_INCLUDE_DIRS}")
 
       find_package(libbsoncxx-static REQUIRED)

From e4da1725a0bfe451227f69f8e33e93fce21f3857 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 6 May 2019 11:45:27 -0500
Subject: [PATCH 0269/1648] Stop spamming connection when never able to
 connect. Also protect last_close and consecutive_immediate_connection_close
 since they can be accessed from multiple threads

---
 plugins/net_plugin/net_plugin.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index cd9523a4969..f6dab5c3dd6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -582,8 +582,7 @@ namespace eosio {
       std::atomic<bool>       syncing{false};
       uint16_t                protocol_version = 0;
       uint16_t                consecutive_rejected_blocks = 0;
-      uint16_t                consecutive_immediate_connection_close = 0;
-      fc::time_point          last_close;
+      std::atomic<uint16_t>   consecutive_immediate_connection_close = 0;
 
       std::mutex                            response_expected_timer_mtx;
       boost::asio::steady_timer             response_expected_timer;
@@ -593,12 +592,13 @@ namespace eosio {
 
       std::atomic<go_away_reason>           no_retry{no_reason};
 
-      mutable std::mutex          conn_mtx; // mtx for last_req, last_handshake_recv, last_handshake_sent, fork_head, fork_head_num
+      mutable std::mutex          conn_mtx; //< mtx for last_req, last_handshake_recv, last_handshake_sent, fork_head, fork_head_num, last_close
       optional<request_message>   last_req;
       handshake_message           last_handshake_recv;
       handshake_message           last_handshake_sent;
       block_id_type               fork_head;
       uint32_t                    fork_head_num{0};
+      fc::time_point              last_close;
 
       connection_status get_status()const;
 
@@ -909,13 +909,13 @@ namespace eosio {
       self->syncing = false;
       self->consecutive_rejected_blocks = 0;
       ++self->consecutive_immediate_connection_close;
-      self->last_close = fc::time_point::now();
       bool has_last_req = false;
       {
          std::lock_guard<std::mutex> g_conn( self->conn_mtx );
          has_last_req = !!self->last_req;
          self->last_handshake_recv = handshake_message();
          self->last_handshake_sent = handshake_message();
+         self->last_close = fc::time_point::now();
       }
       if( has_last_req ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
@@ -2043,9 +2043,12 @@ namespace eosio {
          return false;
       }
 
+      connection_ptr c = shared_from_this();
+
       if( consecutive_immediate_connection_close > def_max_consecutive_immediate_connection_close ) {
          auto connector_period_us = std::chrono::duration_cast<std::chrono::microseconds>( my_impl->connector_period );
-         if( last_close > fc::time_point::now() - fc::microseconds( connector_period_us.count() ) ) {
+         std::lock_guard<std::mutex> g( c->conn_mtx );
+         if( last_close == fc::time_point() || last_close > fc::time_point::now() - fc::microseconds( connector_period_us.count() ) ) {
             return true; // true so doesn't remove from valid connections
          }
       }
@@ -2054,10 +2057,10 @@ namespace eosio {
       string port = peer_address().substr( colon + 1);
       idump((host)(port));
       tcp::resolver::query query( tcp::v4(), host, port );
-      connection_wptr weak_conn = shared_from_this();
       // Note: need to add support for IPv6 too
 
       auto resolver = std::make_shared<tcp::resolver>( my_impl->thread_pool->get_executor() );
+      connection_wptr weak_conn = c;
       resolver->async_resolve( query, boost::asio::bind_executor( strand,
             [resolver, weak_conn]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
                auto c = weak_conn.lock();

From 82c4c3821de9ee20795ca31db76a73403d7e6793 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 6 May 2019 13:00:35 -0400
Subject: [PATCH 0270/1648] remove win32 from CMakeLists.txt

win32 builds haven't been possible for at least a handful of releases. Remove the win32 declarations from CMakeLists.txt to remove dead weight that probably doesn't work right any more. Also remove a duplicate -fcolor-diagnostics thing that was handled further above anyways
---
 CMakeLists.txt | 86 +++++++++++---------------------------------------
 1 file changed, 19 insertions(+), 67 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd7896c6154..1572e2943fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,11 +95,6 @@ else()
 endif()
 
 SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
-IF( WIN32 )
-  SET(BOOST_ROOT $ENV{BOOST_ROOT})
-  set(Boost_USE_MULTITHREADED ON)
-  set(BOOST_ALL_DYN_LINK OFF) # force dynamic linking for all libraries
-ENDIF(WIN32)
 FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS
     date_time
     filesystem
@@ -116,71 +111,28 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads)
 link_libraries(Threads::Threads)
 
-if( WIN32 )
-
-    message( STATUS "Configuring EOSIO on WIN32")
-    set( DB_VERSION 60 )
-    set( BDB_STATIC_LIBS 1 )
-
-    set( ZLIB_LIBRARIES "" )
-    SET( DEFAULT_EXECUTABLE_INSTALL_DIR bin/ )
-
-    set(CRYPTO_LIB)
-
-    #looks like this flag can have different default on some machines.
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
-
-    # Probably cmake has a bug and vcxproj generated for executable in Debug conf. has disabled debug info
-    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")
-
-    # On windows tcl should be installed to the directory pointed by setenv.bat script
-    SET(TCL_INCLUDE_PATH $ENV{TCL_ROOT}/include)
-    MESSAGE(STATUS "tcl INCLUDE PATH: ${TCL_INCLUDE_PATH}")
-
-    FIND_PACKAGE(TCL)
-    MESSAGE(STATUS "tcl_library: ${TCL_LIBRARY}")
-
-    SET(TCL_LIBS "optimized;${TCL_LIBRARY};debug;")
-    get_filename_component(TCL_LIB_PATH "${TCL_LIBRARY}" PATH)
-    get_filename_component(TCL_LIB_NAME "${TCL_LIBRARY}" NAME_WE)
-    get_filename_component(TCL_LIB_EXT "${TCL_LIBRARY}" EXT)
-
-    SET(TCL_LIBS "${TCL_LIBS}${TCL_LIB_PATH}/${TCL_LIB_NAME}g${TCL_LIB_EXT}")
-    SET(TCL_LIBRARY ${TCL_LIBS})
-
-else( WIN32 ) # Apple AND Linux
-
-    if( APPLE )
-        # Apple Specific Options Here
-        message( STATUS "Configuring EOSIO on OS X" )
-        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations" )
-    else( APPLE )
-        # Linux Specific Options Here
-        message( STATUS "Configuring EOSIO on Linux" )
-        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall" )
-        if ( FULL_STATIC_BUILD )
-          set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
-        endif ( FULL_STATIC_BUILD )
-
-        if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
-            if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 )
-                set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" )
-            endif()
-        endif()
-    endif( APPLE )
-
-    if( "${CMAKE_GENERATOR}" STREQUAL "Ninja" )
-        if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
-            set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics" )
+if( APPLE AND UNIX )
+# Apple Specific Options Here
+    message( STATUS "Configuring EOSIO on macOS" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations" )
+else()
+    # Linux Specific Options Here
+    message( STATUS "Configuring EOSIO on Linux" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall" )
+    if ( FULL_STATIC_BUILD )
+      set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
+    endif ( FULL_STATIC_BUILD )
+
+    if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
+        if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 )
+            set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" )
         endif()
     endif()
+endif()
 
-    # based on http://www.delorie.com/gnu/docs/gdb/gdb_70.html
-    # uncomment this line to tell GDB about macros (slows compile times)
-    # set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gdwarf-2 -g3" )
-
-endif( WIN32 )
+# based on http://www.delorie.com/gnu/docs/gdb/gdb_70.html
+# uncomment this line to tell GDB about macros (slows compile times)
+# set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gdwarf-2 -g3" )
 
 set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build EOSIO for code coverage analysis")
 

From 867c92e3369af670e1cf17b8d8234e180b356e7d Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 6 May 2019 13:06:51 -0400
Subject: [PATCH 0271/1648] correct net_plugin's win32 check

building on windows doesn't have to be done via MSVC, change the macro to _WIN32
---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 9dcb9ef5b6b..546fa36c069 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2842,7 +2842,7 @@ namespace eosio {
       hello.os = "osx";
 #elif defined( __linux__ )
       hello.os = "linux";
-#elif defined( _MSC_VER )
+#elif defined( _WIN32 )
       hello.os = "win32";
 #else
       hello.os = "other";

From 5faee3b29e7a3e5acf3bad1390e3876c164c2a22 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 6 May 2019 13:23:57 -0400
Subject: [PATCH 0272/1648] simplify openssl setup in cmakelists

Much of the openssl setup in the cmakelists is redundant or wrong. OPENSSL_INCLUDE_DIR is an output variable so we shouldn't be setting that. The openssl finding logic built in to cmake already looks at the OPENSSL_ROOT_DIR environment variable on its own so don't need to try to pass that. And on any unix it will already search for a pkgconfig file for openssl so don't really need to do anything on linux.

We do still need to keep something here for macOS as for whatever reason homebrew doesn't link in openssl's pkgconfig file (maybe due to concern of conflict?)
---
 CMakeLists.txt | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd7896c6154..3c08e79beec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,19 +66,8 @@ set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make")
 set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin")
 
 # add defaults for openssl
-if ("${OPENSSL_ROOT_DIR}" STREQUAL "")
-   if (NOT "$ENV{OPENSSL_ROOT_DIR}" STREQUAL "")
-      set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
-      set(OPENSSL_INCLUDE_DIR ${OPENSSL_ROOT_DIR}/include)
-   elseif (APPLE)
-      set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
-      set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include")
-   elseif(UNIX AND NOT APPLE)
-      set(OPENSSL_ROOT_DIR "/usr/include/openssl")
-      set(OPENSSL_INCLUDE_DIR "/usr/include/openssl/include")
-   else()
-      message(FATAL_ERROR "openssl not found and don't know where to look, please specify OPENSSL_ROOT_DIR")
-   endif()
+if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "")
+   set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
 endif()
 
 if(UNIX)

From 062c6e71573b0626596fbb53fcc526eb9e15ee35 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 6 May 2019 13:50:06 -0400
Subject: [PATCH 0273/1648] build unittests in c++17, not c++14

Remove the CMAKE_CXX_STANDARD override here. Also I got a bit lucky because <boost/range/alogrithm.hpp> will not compile in c++17 mode due to the removal of std::random_shuffle. However, we didn't need that include anyways at the moment since a bunch of stuff in that file is #if 0ed
---
 tests/CMakeLists.txt                  | 2 --
 unittests/CMakeLists.txt              | 2 --
 unittests/producer_schedule_tests.cpp | 1 -
 3 files changed, 5 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ba87969bb80..7e770d7c24d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,8 +9,6 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-set( CMAKE_CXX_STANDARD 14 )
-
 include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")
 
 file(GLOB UNIT_TESTS "*.cpp")
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index b0a08280336..82e723e5563 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -33,8 +33,6 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-set( CMAKE_CXX_STANDARD 14 )
-
 add_subdirectory(contracts)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contracts.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/contracts.hpp ESCAPE_QUOTES)
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index 2a91f06a7c1..bec63376ff5 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -5,7 +5,6 @@
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/testing/tester.hpp>
 
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "fork_test_utilities.hpp"

From 935630679385eafce803169c4d41c34f17f33d67 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 6 May 2019 12:06:26 -0500
Subject: [PATCH 0274/1648] Fix cleos REX help

---
 programs/cleos/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 7e21aae62b7..59fc67679e6 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -1747,8 +1747,8 @@ struct unstaketorex_subcommand {
       auto unstaketorex = actionRoot->add_subcommand("unstaketorex", localized("Buy REX using staked tokens"));
       unstaketorex->add_option("owner",    owner_str,    localized("Account buying REX tokens"))->required();
       unstaketorex->add_option("receiver", receiver_str, localized("Account that tokens have been staked to"))->required();
-      unstaketorex->add_option("from_net", from_net_str, localized("Amount to be unstaked from CPU resources and used in REX purchase"))->required();
-      unstaketorex->add_option("from_cpu", from_cpu_str, localized("Amount to be unstaked from Net resources and used in REX purchase"))->required();
+      unstaketorex->add_option("from_net", from_net_str, localized("Amount to be unstaked from Net resources and used in REX purchase"))->required();
+      unstaketorex->add_option("from_cpu", from_cpu_str, localized("Amount to be unstaked from CPU resources and used in REX purchase"))->required();
       add_standard_transaction_options(unstaketorex, "owner@active");
       unstaketorex->set_callback([this] {
          fc::variant act_payload = fc::mutable_variant_object()

From 5f07c0da0b76eb3aad2f1cc9538dfd95a684ff46 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 6 May 2019 14:38:48 -0400
Subject: [PATCH 0275/1648] pipeline file and quick fix

---
 .buildkite/pipeline.yml       | 293 ++++++++++++++++++----------------
 scripts/eosio_build_ubuntu.sh |   2 +-
 2 files changed, 159 insertions(+), 136 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 000b6fd9c0d..63dfd41d92e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,28 +1,55 @@
+env:
+  ANKA_MOJAVE_TEMPLATE: "10.14.4_6C_14G_40G"
+  ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
+  CHECKSUMABLE: "scripts/eosio_build*"
+  MAC_TAG: "eosio_2-3"
+
 steps:
-  - command: | # macOS Mojave Build
-      echo "--- Creating symbolic link to job directory :file_folder:"
-      sleep 5
-      ln -s "$(pwd)" /data/job
-      cd /data/job
-      echo "+++ Building :hammer:"
-      ./scripts/eosio_build.sh -y -P -m
-      echo "--- Compressing build directory :compression:"
-      tar -pczf build.tar.gz build
-      if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
-    label: ":darwin: Mojave Build"
+
+  - trigger: "mac-anka-fleet"
+    label: ":anka: Ensure Mojave Anka Template Tag Exists"
+    branches: "*"
+    async: false
+    build:
+      branch: "master"
+      env:
+        REPO: "${BUILDKITE_REPO}"
+        REPO_BRANCH: "${BUILDKITE_BRANCH}"
+        CHECKSUMABLE: "${CHECKSUMABLE}"
+        TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
+        TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
+        TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
+        PROJECT_TAG: "${MAC_TAG}"
+
+  - wait
+
+  ############################
+  # BUILDING #################
+  ############################
+
+  - label: ":darwin: [Darwin] Mojave Build"
+    command:
+      - "git clone git@github.com:EOSIO/eos.git -b ${BUILDKITE_BRANCH} eos && cd eos && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
+      - "tar -pczf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz eos"
+    plugins:
+      chef/anka#v0.4.4:
+        no-volume: true
+        inherit-environment-vars: true
+        vm-name: $ANKA_MOJAVE_TEMPLATE
+        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+        modify-cpu: 12
+        modify-ram: 24
+        always-pull: true
+        debug: true
+        wait-network: true
     agents:
-      - "role=builder-v2-2"
-      - "os=mojave"
-    artifact_paths: "build.tar.gz"
+      - "queue=mac-anka-large-node-fleet"
     timeout: 120
 
-  - command: | # Amazon Linux 2 Build
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y -P -m
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build
-        if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
-    label: ":aws: Amazon Linux 2 Build"
+  - label: ":aws: Amazon Linux 2 Build"
+    command:
+      - "./scripts/eosio_build.sh -y -P -m"
+      - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -39,13 +66,10 @@ steps:
         workdir: /data/job
     timeout: 120
 
-  - command: | # CentOS 7 Build
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y -P -m
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build
-        if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
-    label: ":centos: CentOS 7 Build"
+  - label: ":centos: CentOS 7 Build"
+    command:
+        - "./scripts/eosio_build.sh -y -P -m"
+        - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -62,12 +86,10 @@ steps:
         workdir: /data/job
     timeout: 120
 
-  - command: | # Ubuntu 16.04 Build
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y -P -m
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build
-        if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
+  - label: ":ubuntu: Ubuntu 16.04 Build"
+    command:
+      - "./scripts/eosio_build.sh -y -P -m"
+      - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -85,13 +107,10 @@ steps:
         workdir: /data/job
     timeout: 120
 
-  - command: | # Ubuntu 18.04 Build
-        echo "+++ :hammer: Building"
-        ./scripts/eosio_build.sh -y -P -m
-        echo "--- :compression: Compressing build directory"
-        tar -pczf build.tar.gz build
-        if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
-    label: ":ubuntu: Ubuntu 18.04 Build"
+  - label: ":ubuntu: Ubuntu 18.04 Build"
+    command:
+      - "./scripts/eosio_build.sh -y -P -m"
+      - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -110,13 +129,52 @@ steps:
 
   - wait
 
-  # Amazon Linux 2 Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: Amazon Linux 2 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/parallel-test.sh
-    label: ":aws: Amazon Linux 2 Tests"
+  ################################
+  # TESTS ########################
+  ################################
+
+  # MOJAVE #
+  - label: ":darwin: [Darwin] Mojave Tests"
+    command:
+      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
+      - "cd eos && ./scripts/parallel-test.sh"
+    agents:
+      - "queue=mac-anka-node-fleet"
+    plugins:
+      chef/anka#v0.4.4:
+        no-volume: true
+        inherit-environment-vars: true
+        bash-interactive: true
+        vm-name: $ANKA_MOJAVE_TEMPLATE
+        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+        always-pull: true
+        debug: true
+        wait-network: true
+    timeout: 120
+
+  - label: ":darwin: [Darwin] Mojave NP Tests"
+    command:
+      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
+      - "cd eos && ./scripts/serial-test.sh"
+    agents:
+      - "queue=mac-anka-node-fleet"
+    plugins:
+      chef/anka#v0.4.4:
+        no-volume: true
+        inherit-environment-vars: true
+        bash-interactive: true
+        vm-name: $ANKA_MOJAVE_TEMPLATE
+        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+        always-pull: true
+        debug: true
+        wait-network: true
+    timeout: 120
+
+  # AmazonLinux #
+  - label: ":aws: Amazon Linux 2 Tests"
+    command:
+      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
+      - "./scripts/parallel-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -132,11 +190,10 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: Amazon Linux 2 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/serial-test.sh
+  - label: ":aws: Amazon Linux 2 NP Tests"
+    command:
+      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
+      - "./scripts/serial-test.sh"
     label: ":aws: Amazon Linux 2 NP Tests"
     agents:
       queue: "automation-large-builder-fleet"
@@ -153,13 +210,11 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # centOS 7 Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/parallel-test.sh
-    label: ":centos: CentOS 7 Tests"
+  # CentOS #
+  - label: ":centos: CentOS 7 Tests"
+    command:
+      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
+      - "./scripts/parallel-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -175,12 +230,10 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/serial-test.sh
-    label: ":centos: CentOS 7 NP Tests"
+  - label: ":centos: CentOS 7 NP Tests"
+    command:
+      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
+      - "./scripts/serial-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -196,13 +249,11 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # Ubuntu 16.04 Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 16.04 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/parallel-test.sh
-    label: ":ubuntu: Ubuntu 16.04 Tests"
+  # Ubuntu #
+  - label: ":ubuntu: Ubuntu 16.04 Tests"
+    command:
+      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
+      - "./scripts/parallel-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -218,12 +269,10 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 16.04 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/serial-test.sh
-    label: ":ubuntu: Ubuntu 16.04 NP Tests"
+  - label: ":ubuntu: Ubuntu 16.04 NP Tests"
+    command:
+      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
+      - "./scripts/serial-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -239,13 +288,10 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # Ubuntu 18.04 Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 18.04 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/parallel-test.sh
-    label: ":ubuntu: Ubuntu 18.04 Tests"
+  - label: ":ubuntu: Ubuntu 18.04 Tests"
+    command:
+      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
+      - "./scripts/parallel-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -261,12 +307,10 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 18.04 Build"
-        echo "+++ :microscope: Running Tests"
-        ./scripts/serial-test.sh
-    label: ":ubuntu: Ubuntu 18.04 NP Tests"
+  - label: ":ubuntu: Ubuntu 18.04 NP Tests"
+    command:
+      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
+      - "./scripts/serial-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -282,30 +326,6 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # Mojave Tests
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
-        echo "+++ :microscope: Running Tests"
-        ln -s "$(pwd)" /data/job
-        ./scripts/parallel-test.sh
-    label: ":darwin: Mojave Tests"
-    agents:
-      - "role=tester-v2-2"
-      - "os=mojave"
-    timeout: 60
-  - command: |
-        echo "--- :arrow_down: Downloading Build Directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
-        echo "+++ :microscope: Running Tests"
-        ln -s "$(pwd)" /data/job
-        ./scripts/serial-test.sh
-    label: ":darwin: Mojave NP Tests"
-    agents:
-      - "role=tester-v2-1"
-      - "os=mojave"
-    timeout: 60
-
   - wait:
     continue_on_failure: true
 
@@ -320,7 +340,8 @@ steps:
 
   - wait
 
-  - command: | # CentOS 7 Package Builder
+  - label: ":centos: CentOS 7 Package Builder"
+    command: |
         echo "--- :arrow_down: Downloading build directory"
         buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
         tar -zxf build.tar.gz
@@ -334,7 +355,6 @@ steps:
         mkdir -p /root/rpmbuild/SRPMS
         cd /data/job/build/packages
         bash generate_package.sh rpm
-    label: ":centos: CentOS 7 Package Builder"
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths:
@@ -411,22 +431,25 @@ steps:
       PKGTYPE: "deb"
     timeout: 60
 
-  - command: | # macOS Mojave Package Builder
-        echo "--- :arrow_down: Downloading build directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        ln -s "$(pwd)" /data/job
-        cd /data/job/build/packages
-        bash generate_package.sh brew
-    label: ":darwin: Mojave Package Builder"
+  - label: ":darwin: Mojave Package Builder"
+    command:
+      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
+      - "cd eos/build/packages && bash generate_package.sh brew"
+      - "cd eos && buildkite-agent artifact upload build/packages/*.tar.gz"
+      - "cd eos && buildkite-agent artifact upload build/packages/*.rb"
     agents:
-      - "role=builder-v2-2"
-      - "os=mojave"
-    artifact_paths:
-      - "build/packages/*.tar.gz"
-      - "build/packages/*.rb"
-    timeout: 60
+      - "queue=mac-anka-node-fleet"
+    plugins:
+      chef/anka#v0.4.4:
+        no-volume: true
+        inherit-environment-vars: true
+        bash-interactive: true
+        vm-name: $ANKA_MOJAVE_TEMPLATE
+        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+        always-pull: true
+        debug: true
+        wait-network: true
+    timeout: 120
 
   - wait
 
@@ -439,11 +462,11 @@ steps:
     artifact_paths:
       - "build/packages/eosio.rb"
     timeout: 5
-
   - command: | # Git Submodule Regression Check
         echo "+++ :microscope: Running git submodule regression check" && \
         ./scripts/submodule_check.sh
     label: "Git Submodule Regression Check"
     agents:
       queue: "automation-large-builder-fleet"
-    timeout: 5
\ No newline at end of file
+    timeout: 5
+
diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 3a3d26e8366..125da3a56c1 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -219,7 +219,7 @@ if [ "$BUILD_CLANG8" = "true" ]; then
 
    cd $SRC_LOCATION
    printf "Checking zlib library installation...\\n"
-   if [ ! -d $OPT_LOCATION/zlib || $FORCE_BUILD ]; then
+   if [ ! -d $OPT_LOCATION/zlib ] || $FORCE_BUILD; then
       printf "Installing zlib...\\n"
       curl -LO https://www.zlib.net/zlib-1.2.11.tar.gz && tar -xf zlib-1.2.11.tar.gz \
       && cd zlib-1.2.11 && mkdir build && cd build \

From eb85f9c5ce2b98734a1634cb025274721ffa3966 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 6 May 2019 14:49:16 -0400
Subject: [PATCH 0276/1648] version bump for images

---
 .buildkite/pipeline.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 63dfd41d92e..97939ff938b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,7 +2,7 @@ env:
   ANKA_MOJAVE_TEMPLATE: "10.14.4_6C_14G_40G"
   ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
   CHECKSUMABLE: "scripts/eosio_build*"
-  MAC_TAG: "eosio_2-3"
+  MAC_TAG: "eosio_2-4"
 
 steps:
 
@@ -61,7 +61,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 120
@@ -81,7 +81,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 120
@@ -102,7 +102,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 120
@@ -122,7 +122,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 120
@@ -185,7 +185,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -205,7 +205,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -225,7 +225,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -244,7 +244,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -264,7 +264,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -283,7 +283,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -302,7 +302,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -321,7 +321,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-2"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -367,7 +367,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
         workdir: /data/job
     env:
@@ -395,7 +395,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
         workdir: /data/job
     env:
@@ -423,7 +423,7 @@ steps:
         region: "us-west-2"
       docker#v2.1.0:
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-3"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
         workdir: /data/job
     env:

From b768bef9f8c36a49ee674e878747058365348cd6 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 6 May 2019 15:02:00 -0400
Subject: [PATCH 0277/1648] remove boost asio string_view workaround

Now that we are compiling in c++17 we don't need this workaround for boost 1.67 (and maybe 1.68)
---
 CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd7896c6154..fdcf1850c38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,8 +109,6 @@ FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS
     unit_test_framework
     iostreams)
 
-add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
-
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads)

From 94672f59d98fa7aac5e383f0624c684b49a3e2c5 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 3 May 2019 21:22:53 -0400
Subject: [PATCH 0278/1648] Change how replace existing deferred transaction is
 implemented to not violate the new (and now explicitly stated) requirements
 imposed on chainbase objects that should be respected in this code base.
 Following those new requirements will automatically satisfy the critical
 preconditions on the chainbase modify function.

Add new unit test, api_tests/more_deferred_transaction_tests, to check that certain deferred transaction replacement schemes do not cause chainbase failure any more.
Modified the deferred_test test contract to support the new unit test.
---
 libraries/chain/apply_context.cpp             |  15 +-
 libraries/chain/eosio_contract.cpp            |   1 -
 .../include/eosio/chain/account_object.hpp    |   6 +-
 .../chain/include/eosio/chain/code_object.hpp |   6 +-
 .../eosio/chain/contract_table_objects.hpp    |  16 +-
 .../chain/generated_transaction_object.hpp    |   6 +-
 .../eosio/chain/permission_link_object.hpp    |   4 +-
 .../include/eosio/chain/permission_object.hpp |   4 +-
 .../include/eosio/chain/producer_object.hpp   |  49 -----
 .../eosio/chain/resource_limits_private.hpp   |   6 +-
 .../eosio/chain/reversible_block_object.hpp   |   2 +-
 .../eosio/chain/transaction_object.hpp        |   2 +-
 libraries/chain/include/eosio/chain/types.hpp |  50 ++++-
 libraries/chainbase                           |   2 +-
 plugins/chain_plugin/chain_plugin.cpp         |   1 -
 plugins/producer_plugin/producer_plugin.cpp   |   1 -
 unittests/api_tests.cpp                       | 185 +++++++++++++++++-
 unittests/auth_tests.cpp                      |   1 -
 unittests/delay_tests.cpp                     |   3 +-
 .../deferred_test/deferred_test.abi           |  45 +++++
 .../deferred_test/deferred_test.cpp           |  20 ++
 .../deferred_test/deferred_test.hpp           |   7 +
 .../deferred_test/deferred_test.wasm          | Bin 10152 -> 11274 bytes
 23 files changed, 342 insertions(+), 90 deletions(-)
 delete mode 100644 libraries/chain/include/eosio/chain/producer_object.hpp

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index 37ad5a3762f..dc7687cf05c 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -480,10 +480,17 @@ void apply_context::schedule_deferred_transaction( const uint128_t& sender_id, a
          control.add_to_ram_correction( ptr->payer, orig_trx_ram_bytes );
       }
 
-      db.modify<generated_transaction_object>( *ptr, [&]( auto& gtx ) {
-         if( replace_deferred_activated ) {
-            gtx.trx_id = trx.id();
-         }
+      transaction_id_type trx_id_for_new_obj;
+      if( replace_deferred_activated ) {
+         trx_id_for_new_obj = trx.id();
+      } else {
+         trx_id_for_new_obj = ptr->trx_id;
+      }
+
+      // Use remove and create rather than modify because mutating the trx_id field in a modifier is unsafe.
+      db.remove( *ptr );
+      db.create<generated_transaction_object>( [&]( auto& gtx ) {
+         gtx.trx_id      = trx_id_for_new_obj;
          gtx.sender      = receiver;
          gtx.sender_id   = sender_id;
          gtx.payer       = payer;
diff --git a/libraries/chain/eosio_contract.cpp b/libraries/chain/eosio_contract.cpp
index 4a18406ee02..9bd9a022f22 100644
--- a/libraries/chain/eosio_contract.cpp
+++ b/libraries/chain/eosio_contract.cpp
@@ -17,7 +17,6 @@
 #include <eosio/chain/permission_link_object.hpp>
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/contract_types.hpp>
-#include <eosio/chain/producer_object.hpp>
 
 #include <eosio/chain/wasm_interface.hpp>
 #include <eosio/chain/abi_serializer.hpp>
diff --git a/libraries/chain/include/eosio/chain/account_object.hpp b/libraries/chain/include/eosio/chain/account_object.hpp
index 28b899ba238..235c3b91284 100644
--- a/libraries/chain/include/eosio/chain/account_object.hpp
+++ b/libraries/chain/include/eosio/chain/account_object.hpp
@@ -17,7 +17,7 @@ namespace eosio { namespace chain {
       OBJECT_CTOR(account_object,(abi))
 
       id_type              id;
-      account_name         name;
+      account_name         name; //< name should not be changed within a chainbase modifier lambda
       block_timestamp_type creation_date;
       shared_blob          abi;
 
@@ -56,7 +56,7 @@ namespace eosio { namespace chain {
       };
 
       id_type               id;
-      account_name          name;
+      account_name          name; //< name should not be changed within a chainbase modifier lambda
       uint64_t              recv_sequence = 0;
       uint64_t              auth_sequence = 0;
       uint64_t              code_sequence = 0;
@@ -88,7 +88,7 @@ namespace eosio { namespace chain {
       OBJECT_CTOR(account_ram_correction_object);
 
       id_type      id;
-      account_name name;
+      account_name name; //< name should not be changed within a chainbase modifier lambda
       uint64_t     ram_correction = 0;
    };
 
diff --git a/libraries/chain/include/eosio/chain/code_object.hpp b/libraries/chain/include/eosio/chain/code_object.hpp
index e8789c1612b..3309704a335 100644
--- a/libraries/chain/include/eosio/chain/code_object.hpp
+++ b/libraries/chain/include/eosio/chain/code_object.hpp
@@ -14,12 +14,12 @@ namespace eosio { namespace chain {
       OBJECT_CTOR(code_object, (code))
 
       id_type      id;
-      digest_type  code_hash;
+      digest_type  code_hash; //< code_hash should not be changed within a chainbase modifier lambda
       shared_blob  code;
       uint64_t     code_ref_count;
       uint32_t     first_block_used;
-      uint8_t      vm_type = 0;
-      uint8_t      vm_version = 0;
+      uint8_t      vm_type = 0; //< vm_type should not be changed within a chainbase modifier lambda
+      uint8_t      vm_version = 0; //< vm_version should not be changed within a chainbase modifier lambda
    };
 
    struct by_code_hash;
diff --git a/libraries/chain/include/eosio/chain/contract_table_objects.hpp b/libraries/chain/include/eosio/chain/contract_table_objects.hpp
index dc6b25b0501..bc58cb3e6d9 100644
--- a/libraries/chain/include/eosio/chain/contract_table_objects.hpp
+++ b/libraries/chain/include/eosio/chain/contract_table_objects.hpp
@@ -20,9 +20,9 @@ namespace eosio { namespace chain {
       OBJECT_CTOR(table_id_object)
 
       id_type        id;
-      account_name   code;
-      scope_name     scope;
-      table_name     table;
+      account_name   code;  //< code should not be changed within a chainbase modifier lambda
+      scope_name     scope; //< scope should not be changed within a chainbase modifier lambda
+      table_name     table; //< table should not be changed within a chainbase modifier lambda
       account_name   payer;
       uint32_t       count = 0; /// the number of elements in the table
    };
@@ -59,8 +59,8 @@ namespace eosio { namespace chain {
       static const int number_of_keys = 1;
 
       id_type               id;
-      table_id              t_id;
-      uint64_t              primary_key;
+      table_id              t_id; //< t_id should not be changed within a chainbase modifier lambda
+      uint64_t              primary_key; //< primary_key should not be changed within a chainbase modifier lambda
       account_name          payer = 0;
       shared_blob           value;
    };
@@ -90,10 +90,10 @@ namespace eosio { namespace chain {
          typedef SecondaryKey secondary_key_type;
 
          typename chainbase::object<ObjectTypeId,index_object>::id_type       id;
-         table_id      t_id;
-         uint64_t      primary_key;
+         table_id      t_id; //< t_id should not be changed within a chainbase modifier lambda
+         uint64_t      primary_key; //< primary_key should not be changed within a chainbase modifier lambda
          account_name  payer = 0;
-         SecondaryKey  secondary_key;
+         SecondaryKey  secondary_key; //< secondary_key should not be changed within a chainbase modifier lambda
       };
 
 
diff --git a/libraries/chain/include/eosio/chain/generated_transaction_object.hpp b/libraries/chain/include/eosio/chain/generated_transaction_object.hpp
index 7c3da995e65..74e07a4d9e9 100644
--- a/libraries/chain/include/eosio/chain/generated_transaction_object.hpp
+++ b/libraries/chain/include/eosio/chain/generated_transaction_object.hpp
@@ -28,9 +28,9 @@ namespace eosio { namespace chain {
          OBJECT_CTOR(generated_transaction_object, (packed_trx) )
 
          id_type                       id;
-         transaction_id_type           trx_id;
-         account_name                  sender;
-         uint128_t                     sender_id = 0; /// ID given this transaction by the sender
+         transaction_id_type           trx_id; //< trx_id should not be changed within a chainbase modifier lambda
+         account_name                  sender; //< sender should not be changed within a chainbase modifier lambda
+         uint128_t                     sender_id = 0; /// ID given this transaction by the sender (should not be changed within a chainbase modifier lambda)
          account_name                  payer;
          time_point                    delay_until; /// this generated transaction will not be applied until the specified time
          time_point                    expiration; /// this generated transaction will not be applied after this time
diff --git a/libraries/chain/include/eosio/chain/permission_link_object.hpp b/libraries/chain/include/eosio/chain/permission_link_object.hpp
index b7b4ea76f57..ee5b1287b18 100644
--- a/libraries/chain/include/eosio/chain/permission_link_object.hpp
+++ b/libraries/chain/include/eosio/chain/permission_link_object.hpp
@@ -39,6 +39,7 @@ namespace eosio { namespace chain {
       /// May be empty; if so, it sets a default @ref required_permission for all messages to @ref code
       action_name       message_type;
       /// The permission level which @ref account requires for the specified message types
+      /// all of the above fields should not be changed within a chainbase modifier lambda
       permission_name required_permission;
    };
 
@@ -61,8 +62,7 @@ namespace eosio { namespace chain {
             composite_key<permission_link_object,
                BOOST_MULTI_INDEX_MEMBER(permission_link_object, account_name, account),
                BOOST_MULTI_INDEX_MEMBER(permission_link_object, permission_name, required_permission),
-               BOOST_MULTI_INDEX_MEMBER(permission_link_object, account_name, code),
-               BOOST_MULTI_INDEX_MEMBER(permission_link_object, action_name, message_type)
+               BOOST_MULTI_INDEX_MEMBER(permission_link_object, permission_link_object::id_type, id)
             >
          >
       >
diff --git a/libraries/chain/include/eosio/chain/permission_object.hpp b/libraries/chain/include/eosio/chain/permission_object.hpp
index 7db580b74d8..335ce754907 100644
--- a/libraries/chain/include/eosio/chain/permission_object.hpp
+++ b/libraries/chain/include/eosio/chain/permission_object.hpp
@@ -32,8 +32,8 @@ namespace eosio { namespace chain {
       id_type                           id;
       permission_usage_object::id_type  usage_id;
       id_type                           parent; ///< parent permission
-      account_name                      owner; ///< the account this permission belongs to
-      permission_name                   name; ///< human-readable name for the permission
+      account_name                      owner; ///< the account this permission belongs to (should not be changed within a chainbase modifier lambda)
+      permission_name                   name; ///< human-readable name for the permission (should not be changed within a chainbase modifier lambda)
       time_point                        last_updated; ///< the last time this authority was updated
       shared_authority                  auth; ///< authority required to execute this permission
 
diff --git a/libraries/chain/include/eosio/chain/producer_object.hpp b/libraries/chain/include/eosio/chain/producer_object.hpp
deleted file mode 100644
index 61d23870280..00000000000
--- a/libraries/chain/include/eosio/chain/producer_object.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-#pragma once
-#include <eosio/chain/types.hpp>
-#include <eosio/chain/chain_config.hpp>
-
-#include "multi_index_includes.hpp"
-
-namespace eosio { namespace chain {
-class producer_object : public chainbase::object<producer_object_type, producer_object> {
-   OBJECT_CTOR(producer_object)
-
-   id_type            id;
-   account_name       owner;
-   uint64_t           last_aslot = 0;
-   public_key_type    signing_key;
-   int64_t            total_missed = 0;
-   uint32_t           last_confirmed_block_num = 0;
-
-
-   /// The blockchain configuration values this producer recommends
-   chain_config       configuration;
-};
-
-struct by_key;
-struct by_owner;
-using producer_multi_index = chainbase::shared_multi_index_container<
-   producer_object,
-   indexed_by<
-      ordered_unique<tag<by_id>, member<producer_object, producer_object::id_type, &producer_object::id>>,
-      ordered_unique<tag<by_owner>, member<producer_object, account_name, &producer_object::owner>>,
-      ordered_unique<tag<by_key>,
-         composite_key<producer_object,
-            member<producer_object, public_key_type, &producer_object::signing_key>,
-            member<producer_object, producer_object::id_type, &producer_object::id>
-         >
-      >
-   >
->;
-
-} } // eosio::chain
-
-CHAINBASE_SET_INDEX_TYPE(eosio::chain::producer_object, eosio::chain::producer_multi_index)
-
-FC_REFLECT(eosio::chain::producer_object::id_type, (_id))
-FC_REFLECT(eosio::chain::producer_object, (id)(owner)(last_aslot)(signing_key)(total_missed)(last_confirmed_block_num)
-           (configuration))
diff --git a/libraries/chain/include/eosio/chain/resource_limits_private.hpp b/libraries/chain/include/eosio/chain/resource_limits_private.hpp
index dc5b26008bd..e3ac7346263 100644
--- a/libraries/chain/include/eosio/chain/resource_limits_private.hpp
+++ b/libraries/chain/include/eosio/chain/resource_limits_private.hpp
@@ -133,8 +133,8 @@ namespace eosio { namespace chain { namespace resource_limits {
       OBJECT_CTOR(resource_limits_object)
 
       id_type id;
-      account_name owner;
-      bool pending = false;
+      account_name owner; //< owner should not be changed within a chainbase modifier lambda
+      bool pending = false; //< pending should not be changed within a chainbase modifier lambda
 
       int64_t net_weight = -1;
       int64_t cpu_weight = -1;
@@ -162,7 +162,7 @@ namespace eosio { namespace chain { namespace resource_limits {
       OBJECT_CTOR(resource_usage_object)
 
       id_type id;
-      account_name owner;
+      account_name owner; //< owner should not be changed within a chainbase modifier lambda
 
       usage_accumulator        net_usage;
       usage_accumulator        cpu_usage;
diff --git a/libraries/chain/include/eosio/chain/reversible_block_object.hpp b/libraries/chain/include/eosio/chain/reversible_block_object.hpp
index daaac00a71b..c493a4915e2 100644
--- a/libraries/chain/include/eosio/chain/reversible_block_object.hpp
+++ b/libraries/chain/include/eosio/chain/reversible_block_object.hpp
@@ -17,7 +17,7 @@ namespace eosio { namespace chain {
       OBJECT_CTOR(reversible_block_object,(packedblock) )
 
       id_type        id;
-      uint32_t       blocknum = 0;
+      uint32_t       blocknum = 0; //< blocknum should not be changed within a chainbase modifier lambda
       shared_string  packedblock;
 
       void set_block( const signed_block_ptr& b ) {
diff --git a/libraries/chain/include/eosio/chain/transaction_object.hpp b/libraries/chain/include/eosio/chain/transaction_object.hpp
index 50a7eb62cdd..cf87e11b5e9 100644
--- a/libraries/chain/include/eosio/chain/transaction_object.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_object.hpp
@@ -27,7 +27,7 @@ namespace eosio { namespace chain {
 
          id_type             id;
          time_point_sec      expiration;
-         transaction_id_type trx_id;
+         transaction_id_type trx_id; //< trx_id should not be changed within a chainbase modifier lambda
    };
 
    struct by_expiration;
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index e701e92c4fb..d6323fbd23d 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -169,7 +169,7 @@ namespace eosio { namespace chain {
       block_summary_object_type,
       transaction_object_type,
       generated_transaction_object_type,
-      producer_object_type,
+      UNUSED_producer_object_type,
       UNUSED_chain_property_object_type,
       account_control_history_object_type,     ///< Defined by history_plugin
       UNUSED_account_transaction_history_object_type,
@@ -195,8 +195,54 @@ namespace eosio { namespace chain {
       OBJECT_TYPE_COUNT ///< Sentry value which contains the number of different object types
    };
 
+   /**
+    *  Important notes on using chainbase objects in EOSIO code:
+    *
+    *  There are several constraints that need to be followed when using chainbase objects.
+    *  Some of these constraints are due to the requirements imposed by the chainbase library,
+    *  others are due to requirements to ensure determinism in the EOSIO chain library.
+    *
+    *  Before listing the constraints, the "restricted field set" must be defined.
+    *
+    *  Every chainbase object includes a field called id which has the type id_type.
+    *  The id field is always included in the restricted field set.
+    *
+    *  A field of a chainbase object is considered to be in the restricted field set if it is involved in the
+    *  derivation of the key used for one of the indices in the chainbase multi-index unless its only involvement
+    *  is through being included in composite_keys that end with the id field.
+    *
+    *  So if the multi-index includes an index like the following
+    *  ```
+    *    ordered_unique< tag<by_sender_id>,
+    *       composite_key< generated_transaction_object,
+    *          BOOST_MULTI_INDEX_MEMBER( generated_transaction_object, account_name, sender),
+    *          BOOST_MULTI_INDEX_MEMBER( generated_transaction_object, uint128_t, sender_id)
+    *       >
+    *    >
+    *  ```
+    *  both `sender` and `sender_id` fields are part of the restricted field set.
+    *
+    *  On the other hand, an index like the following
+    *  ```
+    *    ordered_unique< tag<by_expiration>,
+    *       composite_key< generated_transaction_object,
+    *          BOOST_MULTI_INDEX_MEMBER( generated_transaction_object, time_point, expiration),
+    *          BOOST_MULTI_INDEX_MEMBER( generated_transaction_object, generated_transaction_object::id_type, id)
+    *       >
+    *    >
+    *  ```
+    *  would not by itself require the `expiration` field to be part of the restricted field set.
+    *
+    *  The restrictions on usage of the chainbase objects within this code base are:
+    *     + The chainbase object includes the id field discussed above.
+    *     + The multi-index must include an ordered_unique index tagged with by_id that is based on the id field as the sole key.
+    *     + No other types of indices other than ordered_unique are allowed.
+    *       If an index is desired that does not enforce uniqueness, then use a composite key that ends with the id field.
+    *     + When creating a chainbase object, the constructor lambda should never mutate the id field.
+    *     + When modifying a chainbase object, the modifier lambda should never mutate any fields in the restricted field set.
+    */
+
    class account_object;
-   class producer_object;
 
    using block_id_type       = fc::sha256;
    using checksum_type       = fc::sha256;
diff --git a/libraries/chainbase b/libraries/chainbase
index 118c513436e..b769749d533 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit 118c513436e1310d8e1395303c964430f26b0bb4
+Subproject commit b769749d53303ec1a037d483c631d02268cbf012
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 4c0ef6acdb0..6b0247afd0d 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -7,7 +7,6 @@
 #include <eosio/chain/block_log.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/chain/authorization_manager.hpp>
-#include <eosio/chain/producer_object.hpp>
 #include <eosio/chain/code_object.hpp>
 #include <eosio/chain/config.hpp>
 #include <eosio/chain/wasm_interface.hpp>
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index e2586db8fb7..044caa2757e 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -3,7 +3,6 @@
  *  @copyright defined in eos/LICENSE
  */
 #include <eosio/producer_plugin/producer_plugin.hpp>
-#include <eosio/chain/producer_object.hpp>
 #include <eosio/chain/plugin_interface.hpp>
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 206d3878ff2..e3b45d07718 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -24,6 +24,7 @@
 #include <eosio/chain/contract_table_objects.hpp>
 #include <eosio/chain/block_summary_object.hpp>
 #include <eosio/chain/global_property_object.hpp>
+#include <eosio/chain/generated_transaction_object.hpp>
 #include <eosio/chain/wasm_interface.hpp>
 #include <eosio/chain/resource_limits.hpp>
 
@@ -1090,7 +1091,7 @@ BOOST_FIXTURE_TEST_CASE(transaction_tests, TESTER) { try {
       transaction_trace_ptr trace;
       auto c = control->applied_transaction.connect([&](std::tuple<const transaction_trace_ptr&, const signed_transaction&> x) {
          auto& t = std::get<0>(x);
-         if (t && t->receipt && t->receipt->status != transaction_receipt::executed) { trace = t; } 
+         if (t && t->receipt && t->receipt->status != transaction_receipt::executed) { trace = t; }
       } );
 
       // test error handling on deferred transaction failure
@@ -1139,7 +1140,7 @@ BOOST_FIXTURE_TEST_CASE(deferred_transaction_tests, TESTER) { try {
       transaction_trace_ptr trace;
       auto c = control->applied_transaction.connect([&](std::tuple<const transaction_trace_ptr&, const signed_transaction&> x) {
          auto& t = std::get<0>(x);
-         if (t->scheduled) { trace = t; } 
+         if (t->scheduled) { trace = t; }
       } );
       CALL_TEST_FUNCTION(*this, "test_transaction", "send_deferred_transaction", {} );
       BOOST_CHECK(!trace);
@@ -1317,6 +1318,186 @@ BOOST_FIXTURE_TEST_CASE(deferred_transaction_tests, TESTER) { try {
    BOOST_REQUIRE_EQUAL( validate(), true );
 } FC_LOG_AND_RETHROW() }
 
+BOOST_AUTO_TEST_CASE(more_deferred_transaction_tests) { try {
+   auto cfg = validating_tester::default_config();
+   cfg.contracts_console = true;
+   validating_tester chain( cfg );
+   chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = chain.control->get_protocol_feature_manager();
+   auto d = pfm.get_builtin_digest( builtin_protocol_feature_t::replace_deferred );
+   BOOST_REQUIRE( d );
+
+   chain.preactivate_protocol_features( {*d} );
+   chain.produce_block();
+
+   const auto& index = chain.control->db().get_index<generated_transaction_multi_index,by_id>();
+
+   auto print_deferred = [&index]() {
+      for( const auto& gto : index ) {
+         wlog("id = ${id}, trx_id = ${trx_id}", ("id", gto.id)("trx_id", gto.trx_id));
+      }
+   };
+
+   const auto& contract_account = account_name("tester");
+   const auto& test_account = account_name("alice");
+
+   chain.create_accounts( {contract_account, test_account} );
+   chain.set_code( contract_account, contracts::deferred_test_wasm() );
+   chain.set_abi( contract_account, contracts::deferred_test_abi().data() );
+   chain.produce_block();
+
+   BOOST_REQUIRE_EQUAL(0, index.size());
+
+   chain.push_action( contract_account, N(delayedcall), test_account, fc::mutable_variant_object()
+      ("payer",     test_account)
+      ("sender_id", 0)
+      ("contract",  contract_account)
+      ("payload",   42)
+      ("delay_sec", 1000)
+      ("replace_existing", false)
+   );
+
+   BOOST_REQUIRE_EQUAL(1, index.size());
+   print_deferred();
+
+   signed_transaction trx;
+   trx.actions.emplace_back(
+      chain.get_action( contract_account, N(delayedcall),
+                  vector<permission_level>{{test_account, config::active_name}},
+                  fc::mutable_variant_object()
+                     ("payer",     test_account)
+                     ("sender_id", 0)
+                     ("contract",  contract_account)
+                     ("payload",   13)
+                     ("delay_sec", 1000)
+                     ("replace_existing", true)
+      )
+   );
+   trx.actions.emplace_back(
+      chain.get_action( contract_account, N(delayedcall),
+                  vector<permission_level>{{test_account, config::active_name}},
+                  fc::mutable_variant_object()
+                     ("payer",     test_account)
+                     ("sender_id", 1)
+                     ("contract",  contract_account)
+                     ("payload",   42)
+                     ("delay_sec", 1000)
+                     ("replace_existing", false)
+      )
+   );
+   trx.actions.emplace_back(
+      chain.get_action( contract_account, N(fail),
+                  vector<permission_level>{},
+                  fc::mutable_variant_object()
+      )
+   );
+   chain.set_transaction_headers(trx);
+   trx.sign( chain.get_private_key( test_account, "active" ), chain.control->get_chain_id() );
+   BOOST_REQUIRE_EXCEPTION(
+      chain.push_transaction( trx ),
+      eosio_assert_message_exception,
+      eosio_assert_message_is("fail")
+   );
+
+   BOOST_REQUIRE_EQUAL(1, index.size());
+   print_deferred();
+
+   chain.produce_blocks(2);
+
+   chain.push_action( contract_account, N(delayedcall), test_account, fc::mutable_variant_object()
+      ("payer",     test_account)
+      ("sender_id", 1)
+      ("contract",  contract_account)
+      ("payload",   101)
+      ("delay_sec", 1000)
+      ("replace_existing", false)
+   );
+
+   chain.push_action( contract_account, N(delayedcall), test_account, fc::mutable_variant_object()
+      ("payer",     test_account)
+      ("sender_id", 2)
+      ("contract",  contract_account)
+      ("payload",   102)
+      ("delay_sec", 1000)
+      ("replace_existing", false)
+   );
+
+   BOOST_REQUIRE_EQUAL(3, index.size());
+   print_deferred();
+
+   BOOST_REQUIRE_THROW(
+      chain.push_action( contract_account, N(delayedcall), test_account, fc::mutable_variant_object()
+         ("payer",     test_account)
+         ("sender_id", 2)
+         ("contract",  contract_account)
+         ("payload",   101)
+         ("delay_sec", 1000)
+         ("replace_existing", true)
+      ),
+      fc::exception
+   );
+
+   BOOST_REQUIRE_EQUAL(3, index.size());
+   print_deferred();
+
+   signed_transaction trx2;
+   trx2.actions.emplace_back(
+      chain.get_action( contract_account, N(delayedcall),
+                  vector<permission_level>{{test_account, config::active_name}},
+                  fc::mutable_variant_object()
+                     ("payer",     test_account)
+                     ("sender_id", 1)
+                     ("contract",  contract_account)
+                     ("payload",   100)
+                     ("delay_sec", 1000)
+                     ("replace_existing", true)
+      )
+   );
+   trx2.actions.emplace_back(
+      chain.get_action( contract_account, N(delayedcall),
+                  vector<permission_level>{{test_account, config::active_name}},
+                  fc::mutable_variant_object()
+                     ("payer",     test_account)
+                     ("sender_id", 2)
+                     ("contract",  contract_account)
+                     ("payload",   101)
+                     ("delay_sec", 1000)
+                     ("replace_existing", true)
+      )
+   );
+   trx2.actions.emplace_back(
+      chain.get_action( contract_account, N(delayedcall),
+                  vector<permission_level>{{test_account, config::active_name}},
+                  fc::mutable_variant_object()
+                     ("payer",     test_account)
+                     ("sender_id", 1)
+                     ("contract",  contract_account)
+                     ("payload",   102)
+                     ("delay_sec", 1000)
+                     ("replace_existing", true)
+      )
+   );
+   trx2.actions.emplace_back(
+      chain.get_action( contract_account, N(fail),
+                  vector<permission_level>{},
+                  fc::mutable_variant_object()
+      )
+   );
+   chain.set_transaction_headers(trx2);
+   trx2.sign( chain.get_private_key( test_account, "active" ), chain.control->get_chain_id() );
+   BOOST_REQUIRE_EXCEPTION(
+      chain.push_transaction( trx2 ),
+      eosio_assert_message_exception,
+      eosio_assert_message_is("fail")
+   );
+
+   BOOST_REQUIRE_EQUAL(3, index.size());
+   print_deferred();
+
+   BOOST_REQUIRE_EQUAL( chain.validate(), true );
+} FC_LOG_AND_RETHROW() }
+
 template <uint64_t NAME>
 struct setprod_act {
    static account_name get_account() {
diff --git a/unittests/auth_tests.cpp b/unittests/auth_tests.cpp
index 0422487aae8..b944b532423 100644
--- a/unittests/auth_tests.cpp
+++ b/unittests/auth_tests.cpp
@@ -8,7 +8,6 @@
 #include <eosio/chain/resource_limits_private.hpp>
 
 #include <eosio/testing/tester_network.hpp>
-#include <eosio/chain/producer_object.hpp>
 
 #ifdef NON_VALIDATING_TEST
 #define TESTER tester
diff --git a/unittests/delay_tests.cpp b/unittests/delay_tests.cpp
index 913f3395e8e..2d6f77c7ee9 100644
--- a/unittests/delay_tests.cpp
+++ b/unittests/delay_tests.cpp
@@ -4,7 +4,6 @@
  */
 #include <eosio/chain/generated_transaction_object.hpp>
 #include <eosio/chain/global_property_object.hpp>
-#include <eosio/chain/producer_object.hpp>
 #include <eosio/testing/tester_network.hpp>
 
 #include <boost/test/unit_test.hpp>
@@ -261,7 +260,7 @@ BOOST_AUTO_TEST_CASE(delete_auth_test) { try {
       expect_assert_message(e, "permission_query_exception: Permission Query Exception\nFailed to retrieve permission");
       return true;
    });
-   
+
    // update auth
    chain.push_action(config::system_account_name, updateauth::get_name(), tester_account, fc::mutable_variant_object()
            ("account", "tester")
diff --git a/unittests/test-contracts/deferred_test/deferred_test.abi b/unittests/test-contracts/deferred_test/deferred_test.abi
index 37c9eff9492..857e725efec 100644
--- a/unittests/test-contracts/deferred_test/deferred_test.abi
+++ b/unittests/test-contracts/deferred_test/deferred_test.abi
@@ -35,6 +35,41 @@
                 }
             ]
         },
+        {
+            "name": "delayedcall",
+            "base": "",
+            "fields": [
+                {
+                    "name": "payer",
+                    "type": "name"
+                },
+                {
+                    "name": "sender_id",
+                    "type": "uint64"
+                },
+                {
+                    "name": "contract",
+                    "type": "name"
+                },
+                {
+                    "name": "payload",
+                    "type": "uint64"
+                },
+                {
+                    "name": "delay_sec",
+                    "type": "uint32"
+                },
+                {
+                    "name": "replace_existing",
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "fail",
+            "base": "",
+            "fields": []
+        },
         {
             "name": "inlinecall",
             "base": "",
@@ -65,6 +100,16 @@
             "type": "deferfunc",
             "ricardian_contract": ""
         },
+        {
+            "name": "delayedcall",
+            "type": "delayedcall",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "fail",
+            "type": "fail",
+            "ricardian_contract": ""
+        },
         {
             "name": "inlinecall",
             "type": "inlinecall",
diff --git a/unittests/test-contracts/deferred_test/deferred_test.cpp b/unittests/test-contracts/deferred_test/deferred_test.cpp
index b24096de146..1ff307d8426 100644
--- a/unittests/test-contracts/deferred_test/deferred_test.cpp
+++ b/unittests/test-contracts/deferred_test/deferred_test.cpp
@@ -40,6 +40,22 @@ void deferred_test::defercall( name payer, uint64_t sender_id, name contract, ui
    trx.send( (static_cast<uint128_t>(payer.value) << 64) | sender_id, payer, replace_existing );
 }
 
+void deferred_test::delayedcall( name payer, uint64_t sender_id, name contract,
+                                 uint64_t payload, uint32_t delay_sec, bool replace_existing )
+{
+   print( "delayedcall called on ", get_self(), "\n" );
+   require_auth( payer );
+
+   print( "deferred send of deferfunc action (with delay of ", delay_sec, " sec) to ", contract, " by ", payer,
+          " with sender id ", sender_id, " and payload ", payload );
+   transaction trx;
+   trx.delay_sec = delay_sec;
+   deferfunc_action a( contract, {get_self(), "active"_n} );
+   trx.actions.emplace_back( a.to_action( payload ) );
+
+   trx.send( sender_id, payer, replace_existing );
+}
+
 void deferred_test::deferfunc( uint64_t payload ) {
    print( "deferfunc called on ", get_self(), " with payload = ", payload, "\n" );
    check( payload != 13, "value 13 not allowed in payload" );
@@ -50,6 +66,10 @@ void deferred_test::inlinecall( name contract, name authorizer, uint64_t payload
    a.send( payload );
 }
 
+void deferred_test::fail() {
+   check( false, "fail" );
+}
+
 void deferred_test::on_error( uint128_t sender_id, ignore<std::vector<char>> sent_trx ) {
    print( "onerror called on ", get_self(), "\n" );
 }
diff --git a/unittests/test-contracts/deferred_test/deferred_test.hpp b/unittests/test-contracts/deferred_test/deferred_test.hpp
index 1e5aa22681b..ba7b5c26730 100644
--- a/unittests/test-contracts/deferred_test/deferred_test.hpp
+++ b/unittests/test-contracts/deferred_test/deferred_test.hpp
@@ -14,6 +14,10 @@ class [[eosio::contract]] deferred_test : public eosio::contract {
    [[eosio::action]]
    void defercall( eosio::name payer, uint64_t sender_id, eosio::name contract, uint64_t payload );
 
+   [[eosio::action]]
+   void delayedcall( eosio::name payer, uint64_t sender_id, eosio::name contract,
+                     uint64_t payload, uint32_t delay_sec, bool replace_existing );
+
    [[eosio::action]]
    void deferfunc( uint64_t payload );
    using deferfunc_action = eosio::action_wrapper<"deferfunc"_n, &deferred_test::deferfunc>;
@@ -21,6 +25,9 @@ class [[eosio::contract]] deferred_test : public eosio::contract {
    [[eosio::action]]
    void inlinecall( eosio::name contract, eosio::name authorizer, uint64_t payload );
 
+   [[eosio::action]]
+   void fail();
+
    [[eosio::on_notify("eosio::onerror")]]
    void on_error( uint128_t sender_id, eosio::ignore<std::vector<char>> sent_trx );
 };
diff --git a/unittests/test-contracts/deferred_test/deferred_test.wasm b/unittests/test-contracts/deferred_test/deferred_test.wasm
index 588e38fadf2ed8f3d8a7952114113f3bc43ebd61..416dad9fd5f79c5fea5d29361ffa0eceaffc40d2 100755
GIT binary patch
delta 1488
zcmY*YUuc_E6u*DIKUu$a-m$JWX|kU0OWG#2vN$w}(ssF>TU+fcf{Z<=7@KtKXKeaU
zwxTRSR_OL1)eFiP3}nK5nK0*km_GC$Oax_p7$OYcRK$u3`drUV+Sq*$zjN-n=imLE
z^L;vc=~N@h&Av$qA+$mdyzflgcKJMh<(u<!j6K$^{$!Ek`wgqP`dRoHCY_>`nw%19
zweT{Pm1W|TiM+H{7xo@%=BB2K^8_01pXfG-h&mf;ltb$gbD*-mvGT#sS2n&Sz+N=6
zK!A#@n&K^oBwki-ezA1>&fov+x*X7E{jGoh<1X`2b(P1|GLO?|Z~ewQ19a<_XxyS&
z>=h0@rrhAGbW2r&BeY+A7c8OP7aBR;9|8*u8TUP7u!%U1t}m0mIPMz2r0`<|4CfkW
zv`o)OiCm&@csAN>Fw%UH0!eV<2ITSz5flP~$#<(76<q#M)yx~hkQY}~f1s@_)v9(g
zgdvic-j?4GUxGhC(i}6&zeruJP+yW1(^eEOY4Hp>1-5p5ttQT44`zzJtXmmazR*{`
zE_?kH8^SYB^JJ|vE`{jwOl=`h-X`w$SC<c`c>t3peS9I92;O$JULR_j&Yi(r+6iHi
z`r=8Hn*>kdDV7C0&cdE~tV#C>m_&DLiiA_U5<6GT|6dI|wa&3Ju-cQ606b8zM5Y#(
z*@?qO>M5}TI*O-5s4P(&iMkQ`7pHiwZ2_m42oE97gu4SnIJ&Se2Gu9wakj9g8Y6Kn
zQju;gUayJwBCqVZ&Z$|(Y2H(xg-2V5u(ToV=bMNma$$`K%K?rRRdWQ=_46{eYRZ7H
zL%{VIGS&5PO$@fAz}?v$oKe$}wsJidDclZa$dzkV3%)Zg;h``FhVSC6WRH(24PA-J
z*p7SbAzv;7+KE=%d7K1rop^l=99W9A!cmTFV2Tc03j!QynhO-zdjOp=o+tQ_hOCB+
zh9vMf>p?cipy)-Xd+L|SOmzDlCg!TWKfwd8B|oliGr^_*a#g*3Fv#w%st*q?YObNZ
zM~fHQqgu?i&(l8jN4wiKLOJs8F_*Kf2zv&u56f2Bs2IbzN``P<)=1S);a~&u`72hi
zfGY>i?Az6Zz*oynbpejx;Md_f#7Epd#1rl$;@7UW*xqTxl6OU8M@q@)In?e%lXOu1
z9{mXQzR)4{dCWuYe(ZA9tBClZBZauXGs_?Fed=WAO8cYvLNPaA$dBcUMbJ>lLunES
z(Z9HJSl#XPPR7qp%$<R%Bb3JV-NjYnG{9_OECF*RZNQ)3*$cVJJWS>0i=|v%8<9ij
zK)x_um>GX-a_r&k$m$baEt=Kgu8t<;!ZF8l6Ge>LRHd#UY@x+EJ2Np?KoipAm@|c3
M9(CdvOD-Y*0o;*UGXMYp

delta 586
zcmYk3KWGzC9LL|gd$~q0kymsuN0Yw0TymF0NEbVqHWynhB1#3pp|J#7wIQ)dEygT1
z2&R&$`a>j&1i?Xy2&Hy$5EGnq5^?F|Bo2ZI&EisjFD`w<=lkXN-tQl;b>-DXofK}B
zDItX3KK3wB-CD0IitE5%C9E;+C>{`MSiI~JeT{fhh7M6*p;9T;i8$Ok<1oUb`U}Xb
zB0b^DH5!el{r=|XPedrQEGvkhd{TzD-frx?`?Gf-oP}N0e#GL`+jdyoPutrU0{c|T
z5w6o5%!jVhHoOm=ry0<VW%P4y8a9ovoiT(anCBKPb~Z?KU3T%tiu|<6gyQj{O$39D
zkv=9i!}l>U5Sc+<jwJol_;RGkr(ivDP3iRDcf^$v8cj->{x8+hJk-qcM5jl%rVAey
z_46S^s0r0?YTkz~;ZzW=c;5z2<IKA!ostz=E_f+OJmUT6f@M9BMPFMdr0iNzDf?EP
zo`QPR^tC8uYjD>*38tMIKG2I}FRuxCdlH9!Zl6Q`v@^(f>?ZPYOh&%Pt|MpS&m<G$
zU^sWsfip&@;G^>d{hT|CeB-tUFG|Rr#5nR-BCCE?0+3F2p`1Ey;1c?<s4cDD5S2o`
sv|Lya89@dcbW$<egfFR(XyeCgwUwpSMZCdTb>GTjVF5kSnQIdA4;_Z6*#H0l


From 55b7e79f8737410c61f32ee03709f8f3d4c46460 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 6 May 2019 11:35:01 -0400
Subject: [PATCH 0279/1648] restrict range of error codes that contracts are
 allowed to emit; reserves a high range for system level errors

---
 .../chain/include/eosio/chain/exceptions.hpp      |  6 ++++++
 libraries/chain/wasm_interface.cpp                |  4 +++-
 unittests/api_tests.cpp                           | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index fa92cf984d8..cf883f3505e 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -106,6 +106,12 @@
 
 namespace eosio { namespace chain {
 
+   enum class system_error_code : uint64_t {
+      default_system_error = 10000000000000000000ULL,
+      contract_restricted_error_code, //< contract used an error code reserved for system usage
+   };
+
+
    FC_DECLARE_EXCEPTION( chain_exception,
                          3000000, "blockchain exception" )
    /**
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 079983c89e9..44799fec1e4 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -979,7 +979,9 @@ class context_free_system_api :  public context_aware_api {
                                                         "assertion failure with error code: ${error_code}",
                                                         ("error_code", error_code)
                                                       ) );
-         e.error_code = error_code;
+         e.error_code = ( error_code >= static_cast<uint64_t>(system_error_code::default_system_error) )
+                           ? static_cast<uint64_t>(system_error_code::contract_restricted_error_code)
+                           : error_code;
          throw e;
       }
    }
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 206d3878ff2..87e5e3c87b2 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -2094,6 +2094,21 @@ BOOST_FIXTURE_TEST_CASE(eosio_assert_code_tests, TESTER) { try {
 
    produce_block();
 
+   auto trace2 = CALL_TEST_FUNCTION_NO_THROW(
+                  *this, "test_action", "test_assert_code",
+                  fc::raw::pack( static_cast<uint64_t>(system_error_code::default_system_error) )
+   );
+   BOOST_REQUIRE( trace2 );
+   BOOST_REQUIRE( trace2->except );
+   BOOST_REQUIRE( trace2->error_code );
+   BOOST_REQUIRE_EQUAL( *trace2->error_code, static_cast<uint64_t>(system_error_code::contract_restricted_error_code) );
+   BOOST_REQUIRE_EQUAL( trace2->action_traces.size(), 1 );
+   BOOST_REQUIRE( trace2->action_traces[0].except );
+   BOOST_REQUIRE( trace2->action_traces[0].error_code );
+   BOOST_REQUIRE_EQUAL( *trace2->action_traces[0].error_code, static_cast<uint64_t>(system_error_code::contract_restricted_error_code) );
+
+   produce_block();
+
    BOOST_REQUIRE_EQUAL( validate(), true );
 } FC_LOG_AND_RETHROW() }
 

From d9446f760e3585bfde4c2503bab97b6f2f0e75d9 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 6 May 2019 14:28:53 -0400
Subject: [PATCH 0280/1648] use generic_system_error error code for any chain
 exceptions that don't have a more specific error code defined

---
 libraries/chain/controller.cpp                |  4 ++-
 .../chain/include/eosio/chain/exceptions.hpp  | 10 +++++---
 libraries/chain/wasm_interface.cpp            | 25 +++++++++++++------
 unittests/api_tests.cpp                       |  2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 09e5e9068d3..3b211d8bd9e 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -3030,10 +3030,12 @@ bool controller::all_subjective_mitigations_disabled()const {
 }
 
 fc::optional<uint64_t> controller::convert_exception_to_error_code( const fc::exception& e ) {
-   const eosio_assert_code_exception* e_ptr = dynamic_cast<const eosio_assert_code_exception*>( &e );
+   const chain_exception* e_ptr = dynamic_cast<const chain_exception*>( &e );
 
    if( e_ptr == nullptr ) return {};
 
+   if( !e_ptr->error_code ) return static_cast<uint64_t>(system_error_code::generic_system_error);
+
    return e_ptr->error_code;
 }
 
diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index cf883f3505e..28ff33b21db 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -107,13 +107,13 @@
 namespace eosio { namespace chain {
 
    enum class system_error_code : uint64_t {
-      default_system_error = 10000000000000000000ULL,
+      generic_system_error = 10000000000000000000ULL,
       contract_restricted_error_code, //< contract used an error code reserved for system usage
    };
 
 
-   FC_DECLARE_EXCEPTION( chain_exception,
-                         3000000, "blockchain exception" )
+   FC_DECLARE_DERIVED_EXCEPTION_WITH_ERROR_CODE( chain_exception, fc::exception,
+                                                 3000000, "blockchain exception" )
    /**
     *  chain_exception
     *   |- chain_type_exception
@@ -255,7 +255,7 @@ namespace eosio { namespace chain {
                                     3050002, "Invalid Action Arguments" )
       FC_DECLARE_DERIVED_EXCEPTION( eosio_assert_message_exception, action_validate_exception,
                                     3050003, "eosio_assert_message assertion failure" )
-      FC_DECLARE_DERIVED_EXCEPTION_WITH_ERROR_CODE( eosio_assert_code_exception, action_validate_exception,
+      FC_DECLARE_DERIVED_EXCEPTION( eosio_assert_code_exception, action_validate_exception,
                                     3050004, "eosio_assert_code assertion failure" )
       FC_DECLARE_DERIVED_EXCEPTION( action_not_found_exception, action_validate_exception,
                                     3050005, "Action can not be found" )
@@ -269,6 +269,8 @@ namespace eosio { namespace chain {
                                     3050009, "Inline Action exceeds maximum size limit" )
       FC_DECLARE_DERIVED_EXCEPTION( unauthorized_ram_usage_increase, action_validate_exception,
                                     3050010, "Action attempts to increase RAM usage of account without authorization" )
+      FC_DECLARE_DERIVED_EXCEPTION( restricted_error_code_exception, action_validate_exception,
+                                    3050011, "eosio_assert_code assertion failure uses restricted error code value" )
 
    FC_DECLARE_DERIVED_EXCEPTION( database_exception, chain_exception,
                                  3060000, "Database exception" )
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 44799fec1e4..6ad6a9cb131 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -975,14 +975,23 @@ class context_free_system_api :  public context_aware_api {
 
    void eosio_assert_code( bool condition, uint64_t error_code ) {
       if( BOOST_UNLIKELY( !condition ) ) {
-         eosio_assert_code_exception e( FC_LOG_MESSAGE( error,
-                                                        "assertion failure with error code: ${error_code}",
-                                                        ("error_code", error_code)
-                                                      ) );
-         e.error_code = ( error_code >= static_cast<uint64_t>(system_error_code::default_system_error) )
-                           ? static_cast<uint64_t>(system_error_code::contract_restricted_error_code)
-                           : error_code;
-         throw e;
+         if( error_code >= static_cast<uint64_t>(system_error_code::generic_system_error) ) {
+            restricted_error_code_exception e( FC_LOG_MESSAGE(
+                                                   error,
+                                                   "eosio_assert_code called with reserved error code: ${error_code}",
+                                                   ("error_code", error_code)
+            ) );
+            e.error_code = static_cast<uint64_t>(system_error_code::contract_restricted_error_code);
+            throw e;
+         } else {
+            eosio_assert_code_exception e( FC_LOG_MESSAGE(
+                                             error,
+                                             "assertion failure with error code: ${error_code}",
+                                             ("error_code", error_code)
+            ) );
+            e.error_code = error_code;
+            throw e;
+         }
       }
    }
 
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 87e5e3c87b2..694344478dd 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -2096,7 +2096,7 @@ BOOST_FIXTURE_TEST_CASE(eosio_assert_code_tests, TESTER) { try {
 
    auto trace2 = CALL_TEST_FUNCTION_NO_THROW(
                   *this, "test_action", "test_assert_code",
-                  fc::raw::pack( static_cast<uint64_t>(system_error_code::default_system_error) )
+                  fc::raw::pack( static_cast<uint64_t>(system_error_code::generic_system_error) )
    );
    BOOST_REQUIRE( trace2 );
    BOOST_REQUIRE( trace2->except );

From 7de4479bd37554122e2ce5de23f43f8c5044846c Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 6 May 2019 17:10:34 -0400
Subject: [PATCH 0281/1648] Fixes for pipeline + docker plugin upgrade [skip
 ci]

---
 .buildkite/pipeline.yml | 46 +++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 97939ff938b..8c9c86248f7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -3,6 +3,7 @@ env:
   ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
   CHECKSUMABLE: "scripts/eosio_build*"
   MAC_TAG: "eosio_2-4"
+  BASH_COMMAND: ["/bin/bash", "-i", "-e", "-c"]
 
 steps:
 
@@ -59,7 +60,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.1.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
@@ -79,7 +81,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
@@ -100,7 +103,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
@@ -120,7 +124,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
@@ -183,7 +188,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
@@ -203,7 +209,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
@@ -223,7 +230,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
@@ -242,7 +250,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
@@ -262,7 +271,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
@@ -281,7 +291,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
@@ -300,7 +311,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
@@ -319,7 +331,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
@@ -365,7 +378,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
@@ -393,7 +407,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
@@ -421,7 +436,8 @@ steps:
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v2.1.0:
+      docker#v3.2.0:
+        shell:  $BASH_COMMAND
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true

From 8d17ad4a2216fdb3b719d18d2b795f1754cda0bd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 6 May 2019 16:56:02 -0500
Subject: [PATCH 0282/1648] Update for boost-1-70-0

---
 .../include/eosio/http_plugin/local_endpoint.hpp            | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/http_plugin/include/eosio/http_plugin/local_endpoint.hpp b/plugins/http_plugin/include/eosio/http_plugin/local_endpoint.hpp
index 4664d1d378a..3f646237e9f 100644
--- a/plugins/http_plugin/include/eosio/http_plugin/local_endpoint.hpp
+++ b/plugins/http_plugin/include/eosio/http_plugin/local_endpoint.hpp
@@ -82,8 +82,7 @@ class local_connection : public lib::enable_shared_from_this<local_connection> {
             return socket::make_error_code(socket::error::invalid_state);
         }
 
-        m_socket = lib::make_shared<lib::asio::local::stream_protocol::socket>(
-            lib::ref(*service));
+        m_socket = lib::make_shared<lib::asio::local::stream_protocol::socket>(*service);
 
         m_state = READY;
 
@@ -266,8 +265,7 @@ class local_endpoint : public config::socket_type {
         m_alog->write(log::alevel::devel,"asio::init_asio");
 
         m_io_service = ptr;
-        m_acceptor = lib::make_shared<lib::asio::local::stream_protocol::acceptor>(
-            lib::ref(*m_io_service));
+        m_acceptor = lib::make_shared<lib::asio::local::stream_protocol::acceptor>(*m_io_service);
 
         m_state = READY;
         ec = lib::error_code();

From a99cda46efc709e1f16ef91c92afb462867daac3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 6 May 2019 16:56:18 -0500
Subject: [PATCH 0283/1648] Update to fc with boost 1.7.0 fixes

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index a6f94bae0b2..fcc952b616e 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit a6f94bae0b2b4a0b68dc1db2677331cafa4716a5
+Subproject commit fcc952b616e5968a5b0898e051e3f56fe3a43245

From 60c4a014fe884b1d760babf02c1e70f5e158799c Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Mon, 6 May 2019 19:34:24 -0400
Subject: [PATCH 0284/1648] working on a solution

---
 CMakeLists.txt                                | 16 ++++++++-
 .../eosio/chain/wasm_interface_private.hpp    |  4 +--
 .../eosio/chain/webassembly/common.hpp        | 10 +++---
 .../eosio/chain/webassembly/eos-vm.hpp        | 36 +++++++++++--------
 libraries/chain/wasm_interface.cpp            | 12 +++++--
 libraries/chain/webassembly/eos-vm.cpp        | 10 +++---
 6 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d708ac5d44..7dfb68f1f73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,18 @@ else()
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 endif()
 
+find_program(CCACHE_PROGRAM ccache)
+find_program(SCCACHE_PROGRAM ccache)
+if (SCCACHE_PROGRAM)
+   message(STATUS "EOSIO found sccache")
+   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${SCCACHE_PROGRAM}")
+   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${SCCACHE_PROGRAM}")
+elseif (CCACHE_PROGRAM)
+   message(STATUS "EOSIO found ccache")
+   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}")
+endif()
+
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )
 set( KEY_STORE_EXECUTABLE_NAME keosd )
@@ -63,6 +75,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}
        add_compile_options(-fcolor-diagnostics)
     endif()
 endif()
+       add_compile_options(-fno-strict-aliasing)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
 set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make")
@@ -157,7 +170,8 @@ else( WIN32 ) # Apple AND Linux
     if( APPLE )
         # Apple Specific Options Here
         message( STATUS "Configuring EOSIO on OS X" )
-        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations" )
+        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations -fsanitize=undefined -fno-omit-frame-pointer" )
+        set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
     else( APPLE )
         # Linux Specific Options Here
         message( STATUS "Configuring EOSIO on Linux" )
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index cf8df0afa9e..85a3c7f34ae 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -62,8 +62,8 @@ namespace eosio { namespace chain {
       }
 
       static wasm_allocator* get_wasm_allocator() {
-         thread_local wasm_allocator walloc;
-	 return &walloc;
+         static wasm_allocator walloc;
+         return &walloc;
       }
 
       std::vector<uint8_t> parse_initial_memory(const Module& module) {
diff --git a/libraries/chain/include/eosio/chain/webassembly/common.hpp b/libraries/chain/include/eosio/chain/webassembly/common.hpp
index 542d3c5b37e..e12017437fd 100644
--- a/libraries/chain/include/eosio/chain/webassembly/common.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/common.hpp
@@ -70,9 +70,8 @@ namespace eosio { namespace chain {
          return value;
       }
 
-      template<typename U>
-      operator U *() const {
-         return static_cast<U *>(value);
+      operator T *() const {
+         return value;
       }
 
       T *value;
@@ -93,9 +92,8 @@ namespace eosio { namespace chain {
          return value;
       }
 
-      template<typename U>
-      operator U *() const {
-         return static_cast<U *>(value);
+      operator char *() const {
+         return value;
       }
 
       char *value;
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 4c158284c43..d17db22a9f0 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -32,30 +32,40 @@ namespace eosio { namespace wasm_backend {
    constexpr auto get_value(operand_stack& op, Cleanups& cleanups, WAlloc* walloc, T&& val) 
    	-> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
 	   std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
-           !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
-      size_t i = std::tuple_size<Args>::value-1;
+      !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
+      //size_t i = std::tuple_size<Args>::value-1;
       using ptr_ty = typename S::type;
-      auto* ptr = (ptr_ty*)(walloc->template get_base_ptr<uint8_t>()+val.data.ui);
+      using under_ty = std::remove_pointer_t<ptr_ty>;
+      std::cout << (int*)walloc->template get_base_ptr<char>() << "val.data " << val.data.ui << "\n"; 
+      auto* ptr = (ptr_ty*)((walloc->template get_base_ptr<char>())+val.data.ui);
+      /*
       if constexpr (std::tuple_size<Args>::value > I) {
          const auto& next_arg = std::get<to_wasm_t<typename std::tuple_element<I, Args>::type>>(op.get_back(i-I)).data.ui;
-	 if constexpr ( (std::tuple_size<Args>::value > I+1) 
-			 && std::is_same_v<decltype(next_arg), eosio::chain::array_ptr<typename S::type>>) {
+         size_t sz = 0;
+         if constexpr ( (std::tuple_size<Args>::value > I+1) 
+			   && std::is_same_v<decltype(next_arg), eosio::chain::array_ptr<under_ty>>) {
             sz = std::get<to_wasm_t<typename std::tuple_element<I+1, Args>::type>>(op.get_back(i-(I+1))).data.ui;
+            std::cout << "sz0 " << sz << "\n";
          } else {
             sz = next_arg;
-	 }
-         if ((uintptr_t)ptr % alignof(S) != 0) {
+            std::cout << "sz1 " << sz << " sizeof " << sizeof(under_ty) << " alignof " << alignof(under_ty) << "\n";
+         }
+         if ((uintptr_t)ptr % 16 != 0) {
+            std::cout << "aligning\n";
             align_ptr_triple apt;
-            apt.s = sizeof(S)*sz;
-            std::vector<typename std::remove_const_t<S>::type> cpy(sz > 0 ? sz : 1);
+            apt.s = sizeof(under_ty)*sz;
+            std::vector<std::remove_const_t<under_ty>> cpy(sz > 0 ? sz : 1);
             apt.o = (void*)ptr;
             ptr = (decltype(ptr))cpy.data();
             apt.n = (void*)ptr;
-            bytes_copy(apt.n, apt.o, apt.s);
-            cleanups.emplace_back(std::move(apt));
+            //memcpy((std::remove_const_t<under_ty>*)apt.n, (const under_ty*)apt.o, apt.s);
+            memmove( static_cast<char*>(apt.n), static_cast<const char*>(apt.o), apt.s);
+            if constexpr (!std::is_const_v<under_ty>)
+               cleanups.emplace_back(std::move(apt));
          }
       }
-      return eosio::chain::array_ptr<typename S::type>(ptr);
+      */
+      return eosio::chain::array_ptr<under_ty>(ptr);
    }
 
    template <>
@@ -97,5 +107,3 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
 
 #define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG) \
    eosio::wasm_backend::registered_function<eosio::chain::apply_context, CLS, &CLS::METHOD> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__)(std::string(MOD), std::string(NAME));
-
-
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 3b7fda46a5a..1629334e113 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -31,7 +31,9 @@ namespace eosio { namespace chain {
    using namespace webassembly;
    using namespace webassembly::common;
 
-   wasm_interface::wasm_interface(vm_type vm, const chainbase::database& d) : my( new wasm_interface_impl(vm, d) ) {}
+   wasm_interface::wasm_interface(vm_type vm, const chainbase::database& d) : my( new wasm_interface_impl(vm, d) ) {
+      (void)get_wasm_allocator();
+   }
 
    wasm_interface::~wasm_interface() {}
 
@@ -1004,13 +1006,15 @@ class action_api : public context_aware_api {
          if( buffer_size == 0 ) return s;
 
          auto copy_size = std::min( buffer_size, s );
-         memcpy( memory, context.get_action().data.data(), copy_size );
+         const char* d = context.get_action().data.data();
+         memcpy( (char*)memory.value, context.get_action().data.data(), copy_size );
 
          return copy_size;
       }
 
       int action_data_size() {
-	 std::cout << "ADS " << context.get_action().data.size() << "\n";
+         std::cout << "THIS " << this << "\n";
+         std::cout << "ADS " << context.get_action().data.size() << "\n";
          return context.get_action().data.size();
       }
 
@@ -1965,6 +1969,8 @@ std::istream& operator>>(std::istream& in, wasm_interface::vm_type& runtime) {
       runtime = eosio::chain::wasm_interface::vm_type::wavm;
    else if (s == "wabt")
       runtime = eosio::chain::wasm_interface::vm_type::wabt;
+   else if (s == "eos-vm")
+      runtime = eosio::chain::wasm_interface::vm_type::eos_vm;
    else
       in.setstate(std::ios_base::failbit);
    return in;
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 1b2deb1bff5..81b5c40dad8 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -24,7 +24,7 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          //if (!(const auto& res = _instantiated_module->run_start()))
          //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
         
-	 std::cout << "CTX " << &context << "\n"; 
+         std::cout << "CTX " << &context << "\n"; 
          const auto& res = _instantiated_module->call(&context, "env", "apply",
                                           (uint64_t)context.get_receiver(),
                                           (uint64_t)context.get_action().account,
@@ -39,10 +39,10 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
 eos_vm_runtime::eos_vm_runtime() {}
 
 std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
-   //std::vector<uint8_t> cb((uint8_t*)code_bytes, (uint8_t*)code_bytes+code_size);
-   std::vector<uint8_t> cb;
-   cb.resize(code_size);
-   memcpy(cb.data(), code_bytes, code_size);
+   std::vector<uint8_t> cb((uint8_t*)code_bytes, (uint8_t*)code_bytes+code_size);
+   //std::vector<uint8_t> cb;
+   //cb.resize(code_size);
+   //memcpy(cb.data(), code_bytes, code_size);
    std::ofstream mf("temp.wasm");
    mf.write((char*)cb.data(), cb.size());
    mf.close();

From 54cf59eb89b63549424d6e618ff27a45a2f72033 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 6 May 2019 21:07:25 -0400
Subject: [PATCH 0285/1648] fixed pipeline

---
 .buildkite/pipeline.yml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8c9c86248f7..2d6f427c5a0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -3,7 +3,6 @@ env:
   ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
   CHECKSUMABLE: "scripts/eosio_build*"
   MAC_TAG: "eosio_2-4"
-  BASH_COMMAND: ["/bin/bash", "-i", "-e", "-c"]
 
 steps:
 
@@ -61,7 +60,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.1.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
@@ -82,7 +81,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
@@ -104,7 +103,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
@@ -125,7 +124,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
@@ -189,7 +188,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
@@ -210,7 +209,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
         propagate-environment: true
@@ -231,7 +230,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
@@ -251,7 +250,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
@@ -272,7 +271,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
@@ -292,7 +291,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
@@ -312,7 +311,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
@@ -332,7 +331,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true
@@ -379,7 +378,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
         propagate-environment: true
@@ -408,7 +407,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
         propagate-environment: true
@@ -437,7 +436,7 @@ steps:
         no-include-email: true
         region: "us-west-2"
       docker#v3.2.0:
-        shell:  $BASH_COMMAND
+        shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
         propagate-environment: true

From 961866dba75750cb6851417f8a5c4400394d6eb4 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Sat, 4 May 2019 13:36:43 -0500
Subject: [PATCH 0286/1648] Fixed logic error where find_block_pos read past
 end of file for nth block.

---
 programs/eosio-blocklog/main.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index d7139dffc72..61d9f7c86ed 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -233,6 +233,7 @@ trim_data::trim_data(bfs::path block_dir) {
    report_time rt("trimming log");
    using namespace std;
    block_file_name = block_dir / "blocks.log";
+   index_file_name = block_dir / "blocks.index";
    blk_in = fopen(block_file_name.c_str(), "r");
    EOS_ASSERT( blk_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",block_file_name.string()) );
    ind_in = fopen(index_file_name.c_str(), "r");
@@ -270,14 +271,15 @@ void trim_data::find_block_pos(uint32_t n) {
    EOS_ASSERT( pos == index_pos, block_log_exception, "cannot seek to ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
    auto size = fread((void*)&fpos0, sizeof(fpos0), 1, ind_in);                   //filepos of block n
    EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
-   size = fread((void*)&fpos1,sizeof(fpos1), 1, ind_in);                   //filepos of block n+1
-   EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}", ("file", index_file_name.string())("b",n + 1) );
+   size = fread((void*)&fpos1, sizeof(fpos1), 1, ind_in);                   //filepos of block n+1
+   if (n != last_block)
+      EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}, size=${size}", ("file", index_file_name.string())("b",n + 1)("size",size) );
 
    cout << "According to blocks.index:\n";
    cout << "    block " << n << " starts at position " << fpos0 << '\n';
    cout << "    block " << n + 1;
 
-   if (n!=last_block)
+   if (n != last_block)
       cout << " starts at position " << fpos1 << '\n';
    else
       cout << " is past end\n";
@@ -706,7 +708,7 @@ int main(int argc, char** argv) {
       }
       if (blog.make_index) {
          bfs::path out_file = "blocks.index";
-         if (vmap.count("output-file") == 0)
+         if (vmap.count("output-file") > 0)
              out_file = vmap.at("output-file").as<bfs::path>();
          return make_index(vmap.at("blocks-dir").as<bfs::path>(), out_file);
       }

From cb09d21ac910ba20c8e2ecde5d79610d34ec321e Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 6 May 2019 22:07:52 -0500
Subject: [PATCH 0287/1648] Added script support for trim, make-index, and
 smoke-test.

---
 tests/Cluster.py   |  5 +--
 tests/Node.py      |  7 +---
 tests/testUtils.py | 82 ++++++++++++++++++++++++++++++++++++----------
 3 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/tests/Cluster.py b/tests/Cluster.py
index 3ed13404e27..fd71e34b19b 100644
--- a/tests/Cluster.py
+++ b/tests/Cluster.py
@@ -15,6 +15,7 @@
 from core_symbol import CORE_SYMBOL
 from testUtils import Utils
 from testUtils import Account
+from testUtils import BlockLogAction
 from Node import BlockType
 from Node import Node
 from WalletMgr import WalletMgr
@@ -1599,9 +1600,9 @@ def printBlockLogIfNeeded(self):
 
         self.printBlockLog()
 
-    def getBlockLog(self, nodeExtension):
+    def getBlockLog(self, nodeExtension, blockLogAction=BlockLogAction.return_blocks, outputFile=None, first=None, last=None, throwException=False, silentErrors=False, exitOnError=False):
         blockLogDir=Utils.getNodeDataDir(nodeExtension, "blocks")
-        return Utils.getBlockLog(blockLogDir, exitOnError=False)
+        return Utils.getBlockLog(blockLogDir, blockLogAction=blockLogAction, outputFile=outputFile, first=first, last=last,  throwException=throwException, silentErrors=silentErrors, exitOnError=exitOnError)
 
     def printBlockLog(self):
         blockLogBios=self.getBlockLog("bios")
diff --git a/tests/Node.py b/tests/Node.py
index 6f9bcab3c4c..3f995377a09 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -14,12 +14,7 @@
 from testUtils import EnumType
 from testUtils import addEnum
 from testUtils import unhandledEnumType
-
-class ReturnType(EnumType):
-    pass
-
-addEnum(ReturnType, "raw")
-addEnum(ReturnType, "json")
+from testUtils import ReturnType
 
 class BlockType(EnumType):
     pass
diff --git a/tests/testUtils.py b/tests/testUtils.py
index 9c19a8e5f9e..4235e725ba5 100755
--- a/tests/testUtils.py
+++ b/tests/testUtils.py
@@ -14,6 +14,39 @@
 from sys import exit
 import traceback
 
+###########################################################################################
+
+def addEnum(enumClassType, type):
+    setattr(enumClassType, type, enumClassType(type))
+
+def unhandledEnumType(type):
+    raise RuntimeError("No case defined for type=%s" % (type.type))
+
+class EnumType:
+
+    def __init__(self, type):
+        self.type=type
+
+    def __str__(self):
+        return self.type
+
+
+class ReturnType(EnumType):
+    pass
+
+addEnum(ReturnType, "raw")
+addEnum(ReturnType, "json")
+
+###########################################################################################
+
+class BlockLogAction(EnumType):
+    pass
+
+addEnum(BlockLogAction, "make_index")
+addEnum(BlockLogAction, "trim")
+addEnum(BlockLogAction, "smoke_test")
+addEnum(BlockLogAction, "return_blocks")
+
 ###########################################################################################
 class Utils:
     Debug=False
@@ -216,6 +249,11 @@ def runCmdArrReturnJson(cmdArr, trace=False, silentErrors=True):
     @staticmethod
     def runCmdReturnStr(cmd, trace=False):
         cmdArr=shlex.split(cmd)
+        return Utils.runCmdArrReturnStr(cmdArr)
+
+
+    @staticmethod
+    def runCmdArrReturnStr(cmdArr, trace=False):
         retStr=Utils.checkOutput(cmdArr)
         if trace: Utils.Print ("RAW > %s" % (retStr))
         return retStr
@@ -269,14 +307,37 @@ def pgrepCmd(serverName):
         return "pgrep %s %s" % (pgrepOpts, serverName)
 
     @staticmethod
-    def getBlockLog(blockLogLocation, silentErrors=False, exitOnError=False):
+    def getBlockLog(blockLogLocation, blockLogAction=BlockLogAction.return_blocks, outputFile=None, first=None, last=None, throwException=False, silentErrors=False, exitOnError=False):
         assert(isinstance(blockLogLocation, str))
-        cmd="%s --blocks-dir %s --as-json-array" % (Utils.EosBlockLogPath, blockLogLocation)
+        outputFileStr=" --output-file %s " % (outputFile) if outputFile is not None else ""
+        firstStr=" --first %s " % (first) if first is not None else ""
+        lastStr=" --last %s " % (last) if last is not None else ""
+
+        blockLogActionStr=None
+        returnType=ReturnType.raw
+        if blockLogAction==BlockLogAction.return_blocks:
+            blockLogActionStr=""
+            returnType=ReturnType.json
+        elif blockLogAction==BlockLogAction.make_index:
+            blockLogActionStr=" --make-index "
+        elif blockLogAction==BlockLogAction.trim:
+            blockLogActionStr=" --trim "
+        elif blockLogAction==BlockLogAction.smoke_test:
+            blockLogActionStr=" --smoke-test "
+        else:
+            unhandledEnumType(blockLogAction)
+
+        cmd="%s --blocks-dir %s --as-json-array %s%s%s%s" % (Utils.EosBlockLogPath, blockLogLocation, outputFileStr, firstStr, lastStr, blockLogActionStr)
         if Utils.Debug: Utils.Print("cmd: %s" % (cmd))
         rtn=None
         try:
-            rtn=Utils.runCmdReturnJson(cmd, silentErrors=silentErrors)
+            if returnType==ReturnType.json:
+                rtn=Utils.runCmdReturnJson(cmd, silentErrors=silentErrors)
+            else:
+                rtn=Utils.runCmdReturnStr(cmd)
         except subprocess.CalledProcessError as ex:
+            if throwException:
+                raise
             if not silentErrors:
                 msg=ex.output.decode("utf-8")
                 errorMsg="Exception during \"%s\". %s" % (cmd, msg)
@@ -371,18 +432,3 @@ def __init__(self, name):
     def __str__(self):
         return "Name: %s" % (self.name)
 
-###########################################################################################
-
-def addEnum(enumClassType, type):
-    setattr(enumClassType, type, enumClassType(type))
-
-def unhandledEnumType(type):
-    raise RuntimeError("No case defined for type=%s" % (type.type))
-
-class EnumType:
-
-    def __init__(self, type):
-        self.type=type
-
-    def __str__(self):
-        return self.type

From b5340fd5d8b3033eca08d415c327cf2327b38cb4 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 6 May 2019 22:08:56 -0500
Subject: [PATCH 0288/1648] Added integration test for blockLogUtil.

---
 tests/CMakeLists.txt         |   3 +
 tests/block_log_util_test.py | 141 +++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100755 tests/block_log_util_test.py

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7e770d7c24d..1d4776ce75d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,6 +29,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Cluster.py ${CMAKE_CURRENT_BINARY_DIR
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TestHelper.py ${CMAKE_CURRENT_BINARY_DIR}/TestHelper.py COPYONLY)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/p2p_tests/dawn_515/test.sh ${CMAKE_CURRENT_BINARY_DIR}/p2p_tests/dawn_515/test.sh COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/block_log_util_test.py ${CMAKE_CURRENT_BINARY_DIR}/block_log_util_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/distributed-transactions-test.py ${CMAKE_CURRENT_BINARY_DIR}/distributed-transactions-test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/distributed-transactions-remote-test.py ${CMAKE_CURRENT_BINARY_DIR}/distributed-transactions-remote-test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sample-cluster-map.json ${CMAKE_CURRENT_BINARY_DIR}/sample-cluster-map.json COPYONLY)
@@ -55,6 +56,8 @@ add_test(NAME nodeos_sanity_test COMMAND tests/nodeos_run_test.py -v --sanity-te
 set_property(TEST nodeos_sanity_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME nodeos_run_test COMMAND tests/nodeos_run_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_run_test PROPERTY LABELS nonparallelizable_tests)
+add_test(NAME block_log_util_test COMMAND tests/block_log_util_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST block_log_util_test PROPERTY LABELS nonparallelizable_tests)
 
 add_test(NAME p2p_dawn515_test COMMAND tests/p2p_tests/dawn_515/test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST p2p_dawn515_test PROPERTY LABELS nonparallelizable_tests)
diff --git a/tests/block_log_util_test.py b/tests/block_log_util_test.py
new file mode 100755
index 00000000000..a08c8c75f22
--- /dev/null
+++ b/tests/block_log_util_test.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python3
+
+from testUtils import Utils
+from testUtils import BlockLogAction
+import time
+from Cluster import Cluster
+from WalletMgr import WalletMgr
+from Node import BlockType
+import os
+import signal
+import subprocess
+from TestHelper import AppArgs
+from TestHelper import TestHelper
+
+###############################################################
+# block_log_util_test
+#  Test verifies that the blockLogUtil is still compatible with nodeos
+###############################################################
+
+Print=Utils.Print
+errorExit=Utils.errorExit
+
+from core_symbol import CORE_SYMBOL
+
+appArgs=AppArgs()
+args = TestHelper.parse_args({"--dump-error-details","--keep-logs","-v","--leave-running","--clean-run"})
+Utils.Debug=args.v
+pnodes=2
+cluster=Cluster(walletd=True)
+dumpErrorDetails=args.dump_error_details
+keepLogs=args.keep_logs
+dontKill=args.leave_running
+prodCount=2
+killAll=args.clean_run
+p2pPlugin="net"
+walletPort=TestHelper.DEFAULT_WALLET_PORT
+totalNodes=pnodes
+
+walletMgr=WalletMgr(True, port=walletPort)
+testSuccessful=False
+killEosInstances=not dontKill
+killWallet=not dontKill
+
+WalletdName=Utils.EosWalletName
+ClientName="cleos"
+
+try:
+    TestHelper.printSystemInfo("BEGIN")
+    cluster.setWalletMgr(walletMgr)
+
+    cluster.killall(allInstances=killAll)
+    cluster.cleanup()
+    Print("Stand up cluster")
+    if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, p2pPlugin=p2pPlugin,
+                      useBiosBootFile=False) is False:
+        Utils.errorExit("Failed to stand up eos cluster.")
+
+    Print("Validating system accounts after bootstrap")
+    cluster.validateAccounts(None)
+
+    biosNode=cluster.biosNode
+    node0=cluster.getNode(0)
+    node1=cluster.getNode(1)
+
+    blockNum=100
+    Print("Wait till we at least get to block %d" % (blockNum))
+    node0.waitForBlock(blockNum, blockType=BlockType.lib)
+    info=node0.getInfo(exitOnError=True)
+    headBlockNum=info["head_block_num"]
+    lib=info["last_irreversible_block_num"]
+
+    Print("Kill the node we want to verify its block log")
+    node0.kill(signal.SIGTERM)
+
+    Print("Wait for node0's head block to become irreversible")
+    node1.waitForBlock(headBlockNum, blockType=BlockType.lib)
+    infoAfter=node1.getInfo(exitOnError=True)
+    headBlockNumAfter=infoAfter["head_block_num"]
+
+    def checkBlockLog(blockLog, blockNumsToFind, firstBlockNum=1):
+        foundBlockNums=[]
+        nextBlockNum=firstBlockNum
+        previous=0
+        nextIndex=0
+        for block in blockLog:
+            blockNum=block["block_num"]
+            if nextBlockNum!=blockNum:
+                Utils.errorExit("BlockLog should progress to the next block number, expected block number %d but got %d" % (nextBlockNum, blockNum))
+            if nextIndex<len(blockNumsToFind) and blockNum==blockNumsToFind[nextIndex]:
+                foundBlockNums.append(True)
+                nextIndex+=1
+            nextBlockNum+=1
+        while nextIndex<len(blockNumsToFind):
+            foundBlockNums.append(False)
+            if nextIndex<len(blockNumsToFind)-1:
+                assert blockNumsToFind[nextIndex+1] > blockNumsToFind[nextIndex], "expects passed in array, blockNumsToFind to increase from smallest to largest, %d is less than or equal to %d" % (next, previous)
+            nextIndex+=1
+
+        return foundBlockNums
+
+    Print("Retrieve the whole blocklog for node 0")
+    blockLog=cluster.getBlockLog(0)
+    foundBlockNums=checkBlockLog(blockLog, [headBlockNum, headBlockNumAfter])
+    assert foundBlockNums[0], "Couldn't find \"%d\" in blocklog:\n\"%s\"\n" % (foundBlockNums[0], output)
+    assert not foundBlockNums[1], "Should not find \"%d\" in blocklog:\n\"%s\"\n" % (foundBlockNums[1], blockLog)
+
+    output=cluster.getBlockLog(0, blockLogAction=BlockLogAction.smoke_test)
+    expectedStr="no problems found"
+    assert output.find(expectedStr) != -1, "Couldn't find \"%s\" in:\n\"%s\"\n" % (expectedStr, output)
+
+    duplicateIndexFileName="duplicate.index"
+    output=cluster.getBlockLog(0, blockLogAction=BlockLogAction.make_index, outputFile=duplicateIndexFileName)
+    assert output is not None, "Couldn't make new index file \"%s\"\n" % (duplicateIndexFileName)
+
+    blockLogDir=Utils.getNodeDataDir(0, "blocks")
+    blockIndexFileName=os.path.join(blockLogDir, "blocks.index")
+    blockIndexFile=open(blockIndexFileName,"rb")
+    duplicateIndexFileName=os.path.join(blockLogDir, duplicateIndexFileName)
+    duplicateIndexFile=open(duplicateIndexFileName,"rb")
+    blockIndexStr=blockIndexFile.read()
+    duplicateIndexStr=duplicateIndexFile.read()
+    assert blockIndexStr==duplicateIndexStr, "Generated file \%%s\" didn't match original \"%s\"" % (duplicateIndexFileName, blockIndexFileName)
+
+    try:
+        Print("Head block num %d will not be in block log (it will be in reversible DB), so --trim will throw an exception" % (headBlockNum))
+        output=cluster.getBlockLog(0, blockLogAction=BlockLogAction.trim, last=headBlockNum, throwException=True)
+        Utils.errorExit("BlockLogUtil --trim should have indicated error for last value set to lib (%d) " +
+                        "which should not do anything since only trimming blocklog and not irreversible blocks" % (lib))
+    except subprocess.CalledProcessError as ex:
+        pass
+
+    beforeEndOfBlockLog=lib-20
+    Print("Block num %d will definitely be at least one block behind the most recent entry in block log, so --trim will work" % (beforeEndOfBlockLog))
+    output=cluster.getBlockLog(0, blockLogAction=BlockLogAction.trim, last=beforeEndOfBlockLog, throwException=True)
+
+    testSuccessful=True
+
+finally:
+    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, killEosInstances=killEosInstances, killWallet=killWallet, keepLogs=keepLogs, cleanRun=killAll, dumpErrorDetails=dumpErrorDetails)
+
+exit(0)

From 8856a3669732347d240fa1cd6398b0d8b5e8d06f Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 6 May 2019 22:11:12 -0500
Subject: [PATCH 0289/1648] Added blockLogUtil to bin. GH #7253.

---
 programs/eosio-blocklog/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/programs/eosio-blocklog/CMakeLists.txt b/programs/eosio-blocklog/CMakeLists.txt
index b883e493f85..2bc891064c5 100644
--- a/programs/eosio-blocklog/CMakeLists.txt
+++ b/programs/eosio-blocklog/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries( eosio-blocklog
         PRIVATE appbase
         PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 
+copy_bin( eosio-blocklog )
 install( TARGETS
    eosio-blocklog
 

From f4ba2d8848b9e6648357a517315748a92ff46c73 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 7 May 2019 01:51:23 -0400
Subject: [PATCH 0290/1648] still sse3 issues

---
 .../chain/include/eosio/chain/webassembly/eos-vm.hpp   | 10 ++++++++++
 libraries/chain/wasm_interface.cpp                     |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index d17db22a9f0..a6a1407e5a4 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -68,6 +68,16 @@ namespace eosio { namespace wasm_backend {
       return eosio::chain::array_ptr<under_ty>(ptr);
    }
 
+   template <typename Ctx>
+   struct construct_derived<eosio::chain::transaction_context, Ctx> {
+      static auto &value(Ctx& ctx) { return ctx.trx_context; }
+   };
+   
+   template <>
+   struct construct_derived<eosio::chain::apply_context, eosio::chain::apply_context> {
+      static auto &value(eosio::chain::apply_context& ctx) { return ctx; }
+   };
+
    template <>
    struct reduce_type<eosio::chain::null_terminated_ptr> {
       typedef uint32_t type;
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 1629334e113..376b4beec06 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -1001,13 +1001,15 @@ class action_api : public context_aware_api {
    action_api( apply_context& ctx )
       :context_aware_api(ctx,true){}
 
-      int read_action_data(array_ptr<char> memory, size_t buffer_size) {
+      int read_action_data(array_ptr<char> memory, size_t buffer_size) __attribute__((target("no-sse"))) {
          auto s = context.get_action().data.size();
          if( buffer_size == 0 ) return s;
 
          auto copy_size = std::min( buffer_size, s );
          const char* d = context.get_action().data.data();
-         memcpy( (char*)memory.value, context.get_action().data.data(), copy_size );
+	 for (int i=0; i < copy_size; i++)
+            ((char*)memory.value)[i] = (context.get_action().data.data())[i];
+         //memcpy( (char*)memory.value, context.get_action().data.data(), copy_size );
 
          return copy_size;
       }

From 56ffaef404afc1db4a02858e2e320afa79ba8dde Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Tue, 7 May 2019 14:12:04 +0800
Subject: [PATCH 0291/1648] add DB guard check for
 tests/nodeos_under_min_avail_ram.py

---
 tests/nodeos_under_min_avail_ram.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index 57f51beafe4..cb0176cde3c 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -170,8 +170,8 @@ def setName(self, num):
                        Print("Failed to push create action to eosio contract for %d consecutive times, looks like nodeos already exited." % (timeOutCount))
                        keepProcessing=False
                        break
-                    Print("Failed to push create action to eosio contract. sleep for 60 seconds")
-                    time.sleep(60)
+                    Print("Failed to push create action to eosio contract. sleep for 5 seconds")
+                    time.sleep(5)
                 else:
                     timeOutCount=0
                 time.sleep(1)
@@ -201,9 +201,17 @@ def setName(self, num):
             Utils.cmdError("All Nodes should have died")
             errorExit("Failure - All Nodes should have died")
 
+    numNodes=len(nodes)
+    for i in range(numNodes):
+        f = open(Utils.getNodeDataDir(i) + "/stderr.txt")
+        contents = f.read()
+        if contents.find("3060101 database_guard_exception") == -1:
+            errorExit("Node%d is expected to exit because of database_guard_exception, but was not." % (i))
+
+    Print("all nodes exited with expected reason database_guard_exception")
+
     Print("relaunch nodes with new capacity")
     addOrSwapFlags={}
-    numNodes=len(nodes)
     maxRAMValue+=2
     currentMinimumMaxRAM=maxRAMValue
     enabledStaleProduction=False

From 6d6c7827d75c7173840ffd2ac3be12b8f8df84ff Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Tue, 7 May 2019 14:14:16 +0800
Subject: [PATCH 0292/1648] delete irrelavant signal_tests.cpp

---
 unittests/signal_tests.cpp | 446 -------------------------------------
 1 file changed, 446 deletions(-)
 delete mode 100644 unittests/signal_tests.cpp

diff --git a/unittests/signal_tests.cpp b/unittests/signal_tests.cpp
deleted file mode 100644
index e09d2b6a48b..00000000000
--- a/unittests/signal_tests.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-#include <eosio/chain/asset.hpp>
-#include <eosio/chain/authority.hpp>
-#include <eosio/chain/authority_checker.hpp>
-#include <eosio/chain/chain_config.hpp>
-#include <eosio/chain/types.hpp>
-#include <eosio/chain/thread_utils.hpp>
-#include <eosio/testing/tester.hpp>
-
-#include <fc/io/json.hpp>
-#include <fc/log/logger_config.hpp>
-#include <appbase/execution_priority_queue.hpp>
-
-#include <boost/test/unit_test.hpp>
-#include "fork_test_utilities.hpp"
-
-#include <eosio/chain/snapshot.hpp>
-
-#define TESTER tester
-
-using namespace eosio::chain;
-using namespace eosio::testing;
-
-class signal_tester : public base_tester {
-public:
-   void init(const controller::config &config) {
-      cfg = config;
-      control.reset( new controller(cfg, make_protocol_feature_set()) );
-      control->add_indices();
-   }
-   
-   void startup() {
-      control->startup( []() { return false; }, nullptr);
-      chain_transactions.clear();
-      control->accepted_block.connect([this]( const block_state_ptr& block_state ){
-        FC_ASSERT( block_state->block );
-          for( const auto& receipt : block_state->block->transactions ) {
-              if( receipt.trx.contains<packed_transaction>() ) {
-                  auto &pt = receipt.trx.get<packed_transaction>();
-                  chain_transactions[pt.get_transaction().id()] = receipt;
-              } else {
-                  auto& id = receipt.trx.get<transaction_id_type>();
-                  chain_transactions[id] = receipt;
-              }
-          }
-      });
-   }
-
-   signal_tester(controller::config config, int ordinal) {
-      FC_ASSERT(config.blocks_dir.filename().generic_string() != "."
-         && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config");
-
-      controller::config copied_config = config;
-      copied_config.blocks_dir =
-              config.blocks_dir.parent_path() / std::to_string(ordinal).append(config.blocks_dir.filename().generic_string());
-      copied_config.state_dir =
-              config.state_dir.parent_path() / std::to_string(ordinal).append(config.state_dir.filename().generic_string());
-
-      init(copied_config);
-   }
-
-   signal_tester(controller::config config, int ordinal, int copy_block_log_from_ordinal) {
-      FC_ASSERT(config.blocks_dir.filename().generic_string() != "."
-         && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config");
-
-      controller::config copied_config = config;
-      copied_config.blocks_dir =
-              config.blocks_dir.parent_path() / std::to_string(ordinal).append(config.blocks_dir.filename().generic_string());
-      copied_config.state_dir =
-              config.state_dir.parent_path() / std::to_string(ordinal).append(config.state_dir.filename().generic_string());
-
-      // create a copy of the desired block log and reversible
-      auto block_log_path = config.blocks_dir.parent_path() / std::to_string(copy_block_log_from_ordinal).append(config.blocks_dir.filename().generic_string());
-      fc::create_directories(copied_config.blocks_dir);
-      fc::copy(block_log_path / "blocks.log", copied_config.blocks_dir / "blocks.log");
-      fc::copy(block_log_path / config::reversible_blocks_dir_name, copied_config.blocks_dir / config::reversible_blocks_dir_name );
-
-      init(copied_config);
-   }
-
-   signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-      return _produce_block(skip_time, false);
-   }
-
-   signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-      control->abort_block();
-      return _produce_block(skip_time, true);
-   }
-
-   signed_block_ptr finish_block()override {
-      return _finish_block();
-   }
-
-   bool validate() { return true; }
-};
-
-
-BOOST_AUTO_TEST_SUITE(signal_tests)
-
-BOOST_AUTO_TEST_CASE(no_signal)
-{
-    TESTER test;
-    test.produce_block();
-}
-
-BOOST_AUTO_TEST_CASE(signal_basic_replay)
-{
-   controller::config conf;
-
-   {
-      TESTER c;
-      conf = c.get_config();
-   }
-
-   signal_tester test(conf, 1);
-   test.startup();
-
-   test.produce_block();
-
-   transaction_id_type txn_id_to_verify;
-
-   {
-      int irr_count = 0;
-      uint32_t last_irr_blocknum = 0;
-
-      int pre_acc_blk_count = 0;
-      uint32_t last_pre_acc_num = 0;
-
-      int acc_blk_hdr_count = 0;
-      uint32_t last_acc_blk_hdr_num = 0;
-
-      int acc_blk_count = 0;
-      uint32_t last_acc_blk_num = 0;
-
-      int acc_txn_count = 0;
-      transaction_id_type last_acc_txn_id;
-
-      int app_txn_count = 0;
-      transaction_id_type last_app_txn_id;
-      transaction_trace_ptr last_signal_trace;
-
-      test.control->irreversible_block.connect([&](const block_state_ptr& bsp) {
-         ++irr_count;
-         if (last_irr_blocknum) {
-            BOOST_CHECK_EQUAL(bsp->block_num, last_irr_blocknum + 1);
-         }
-         last_irr_blocknum = bsp->block_num;
-      });
-
-      test.control->pre_accepted_block.connect([&](const signed_block_ptr& sbp) { // <- never invoked
-         ++pre_acc_blk_count;
-         last_pre_acc_num = sbp->block_num();
-      });
-
-      test.control->accepted_block_header.connect([&](const block_state_ptr& sbp) {
-         ++acc_blk_hdr_count;
-         last_acc_blk_hdr_num = sbp->block_num;
-         BOOST_CHECK_EQUAL(acc_blk_hdr_count, acc_blk_count + 1); // ensure ordering
-      });
-
-      test.control->accepted_block.connect([&](const block_state_ptr& sbp) {
-         ++acc_blk_count;
-         last_acc_blk_num = sbp->block_num;
-      });
-
-      test.control->accepted_transaction.connect([&](const transaction_metadata_ptr& ptr) {
-         ++acc_txn_count;
-         last_acc_txn_id = ptr->id;
-      });
-
-      test.control->applied_transaction.connect([&](std::tuple<const transaction_trace_ptr&, const signed_transaction&> t) {
-         ++app_txn_count;
-         last_app_txn_id = std::get<0>(t)->id;
-         last_signal_trace = std::get<0>(t);
-      });
-
-      auto trace = test.create_account(N(abc), N(eosio));
-      txn_id_to_verify = last_app_txn_id;
-      BOOST_CHECK_EQUAL(last_app_txn_id != transaction_id_type(), true);
-      BOOST_CHECK_EQUAL(trace, last_signal_trace);
-      BOOST_CHECK_EQUAL(acc_txn_count, 1);
-      BOOST_CHECK_EQUAL(app_txn_count, 1);
-
-      test.produce_block();
-      BOOST_CHECK_EQUAL(irr_count, 1);
-      BOOST_CHECK_EQUAL(last_irr_blocknum, test.control->last_irreversible_block_num());
-      BOOST_CHECK_EQUAL(pre_acc_blk_count, 0); // <-- no pre accepted signal if blocks are produced
-      BOOST_CHECK_EQUAL(acc_blk_hdr_count, 1);
-      BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, test.control->head_block_num());
-      BOOST_CHECK_EQUAL(acc_blk_count, 1);
-      BOOST_CHECK_EQUAL(last_acc_blk_num, test.control->head_block_num());
-
-      test.produce_block();
-      BOOST_CHECK_EQUAL(irr_count, 2);
-      BOOST_CHECK_EQUAL(last_irr_blocknum, test.control->last_irreversible_block_num());
-      BOOST_CHECK_EQUAL(pre_acc_blk_count, 0); // <-- no pre accepted signal if blocks are produced
-      BOOST_CHECK_EQUAL(acc_blk_hdr_count, 2);
-      BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, test.control->head_block_num());
-      BOOST_CHECK_EQUAL(acc_blk_count, 2);
-      BOOST_CHECK_EQUAL(last_acc_blk_num, test.control->head_block_num());
-   }
-
-   // test replay with/without optimizations
-   for (int i = 0; i < 2; ++i) {
-      if (i == 1) {
-         conf.disable_replay_opts = !conf.disable_replay_opts;
-      }
-      signal_tester replaychain(conf, 2 + i, 1);
-
-      int irr_count = 0;
-      uint32_t last_irr_blocknum = 0;
-
-      int pre_acc_blk_count = 0;
-      uint32_t last_pre_acc_num = 0;
-
-      int acc_blk_hdr_count = 0;
-      uint32_t last_acc_blk_hdr_num = 0;
-
-      int acc_blk_count = 0;
-      uint32_t last_acc_blk_num = 0;
-
-      int acc_txn_count = 0;
-      transaction_id_type last_acc_txn_id;
-
-      int app_txn_count = 0;
-      transaction_id_type last_app_txn_id;
-      transaction_trace_ptr last_signal_trace;
-
-      replaychain.control->irreversible_block.connect([&](const block_state_ptr& bsp) {
-         ++irr_count;
-         if (last_irr_blocknum) {
-            BOOST_CHECK_EQUAL(bsp->block_num, last_irr_blocknum + 1);
-         }
-         last_irr_blocknum = bsp->block_num;
-      });
-
-      replaychain.control->pre_accepted_block.connect([&](const signed_block_ptr& sbp) {
-         ++pre_acc_blk_count;
-         last_pre_acc_num = sbp->block_num();
-         BOOST_CHECK_EQUAL(pre_acc_blk_count, acc_blk_hdr_count + 1); // ensure ordering
-      });
-
-      replaychain.control->accepted_block_header.connect([&](const block_state_ptr& sbp) {
-         ++acc_blk_hdr_count;
-         last_acc_blk_hdr_num = sbp->block_num;
-         BOOST_CHECK_EQUAL(acc_blk_hdr_count, acc_blk_count + 1); // ensure ordering
-      });
-
-      replaychain.control->accepted_block.connect([&](const block_state_ptr& sbp) {
-         ++acc_blk_count;
-         last_acc_blk_num = sbp->block_num;
-      });
-
-      replaychain.control->accepted_transaction.connect([&](const transaction_metadata_ptr& ptr) {
-         ++acc_txn_count;
-         last_acc_txn_id = ptr->id;
-      });
-
-      replaychain.control->applied_transaction.connect([&](std::tuple<const transaction_trace_ptr&, const signed_transaction&> t) {
-         ++app_txn_count;
-         last_app_txn_id = std::get<0>(t)->id;
-         last_signal_trace = std::get<0>(t);
-      });
-
-      replaychain.startup();
-
-      BOOST_CHECK_EQUAL(acc_txn_count, 3);
-      BOOST_CHECK_EQUAL(app_txn_count, 3);
-      BOOST_CHECK_EQUAL(last_app_txn_id, txn_id_to_verify);
-
-      BOOST_CHECK_EQUAL(irr_count, 2);
-      BOOST_CHECK_EQUAL(last_irr_blocknum, replaychain.control->last_irreversible_block_num());
-      BOOST_CHECK_EQUAL(pre_acc_blk_count, 2); // replay has pre_acc signal
-      BOOST_CHECK_EQUAL(last_pre_acc_num, replaychain.control->head_block_num());
-      BOOST_CHECK_EQUAL(acc_blk_hdr_count, 2);
-      BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, replaychain.control->head_block_num());
-      BOOST_CHECK_EQUAL(acc_blk_count, 2);
-      BOOST_CHECK_EQUAL(last_acc_blk_num, replaychain.control->head_block_num());
-   }
-}
-
-BOOST_AUTO_TEST_CASE(irreversible_block_multi_producers)
-{
-   int irr_count = 0;
-   uint32_t last_irr_blocknum = 0;
-   TESTER test;
-   test.produce_block();
-   test.control->irreversible_block.connect([&](const block_state_ptr& bsp) {
-      ++irr_count;
-      if (last_irr_blocknum) {
-         BOOST_CHECK_EQUAL(bsp->block_num, last_irr_blocknum + 1);
-      }
-      last_irr_blocknum = bsp->block_num;
-   });
-   test.produce_block();
-   BOOST_CHECK_EQUAL(irr_count, 1);
-
-   test.create_accounts( {N(dan),N(sam),N(pam),N(scott)} );
-   test.set_producers( {N(dan),N(sam),N(pam),N(scott)} );
-   test.produce_blocks(100);
-
-   BOOST_CHECK_EQUAL(irr_count, 57);
-   BOOST_CHECK_EQUAL(last_irr_blocknum, test.control->last_irreversible_block_num());
-}
-
-BOOST_AUTO_TEST_CASE(signal_fork)
-{
-   int irr_count = 0;
-   uint32_t last_irr_blocknum = 0;
-
-   int pre_acc_blk_count = 0;
-   uint32_t last_pre_acc_num = 0;
-
-   int acc_blk_hdr_count = 0;
-   uint32_t last_acc_blk_hdr_num = 0;
-
-   int acc_blk_count = 0;
-   uint32_t last_acc_blk_num = 0;
-
-   int acc_txn_count = 0;
-   transaction_id_type last_acc_txn_id;
-
-   int app_txn_count = 0;
-   transaction_id_type last_app_txn_id;
-   transaction_trace_ptr last_signal_trace;
-   
-   TESTER c;
-   c.produce_block();
-   c.control->irreversible_block.connect([&](const block_state_ptr& bsp) {
-      ++irr_count;
-      if (last_irr_blocknum) {
-         BOOST_CHECK_EQUAL(bsp->block_num, last_irr_blocknum + 1);
-      }
-      last_irr_blocknum = bsp->block_num;
-   });
-
-   c.control->pre_accepted_block.connect([&](const signed_block_ptr& sbp) {
-      ++pre_acc_blk_count;
-      last_pre_acc_num = sbp->block_num();
-   });
-
-   c.control->accepted_block_header.connect([&](const block_state_ptr& sbp) {
-      ++acc_blk_hdr_count;
-      last_acc_blk_hdr_num = sbp->block_num;
-      BOOST_CHECK_EQUAL(acc_blk_hdr_count, acc_blk_count + 1); // ensure ordering
-   });
-
-   c.control->accepted_block.connect([&](const block_state_ptr& sbp) {
-      ++acc_blk_count;
-      last_acc_blk_num = sbp->block_num;
-   });
-
-   c.produce_block();
-   BOOST_CHECK_EQUAL(irr_count, 1);
-
-   c.create_accounts( {N(dan),N(sam),N(pam),N(scott)} );
-   c.set_producers( {N(dan),N(sam),N(pam),N(scott)} );
-   c.produce_blocks(100);
-
-   BOOST_CHECK_EQUAL(irr_count, 57);
-   BOOST_CHECK_EQUAL(last_irr_blocknum, c.control->last_irreversible_block_num());
-
-   BOOST_CHECK_EQUAL(pre_acc_blk_count, 0);
-   //BOOST_CHECK_EQUAL(last_pre_acc_num, c.control->head_block_num());
-   BOOST_CHECK_EQUAL(acc_blk_hdr_count, 101);
-   BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, c.control->head_block_num());
-   BOOST_CHECK_EQUAL(acc_blk_count, 101);
-   BOOST_CHECK_EQUAL(last_acc_blk_num, c.control->head_block_num());
-
-   TESTER c2;
-   push_blocks(c, c2);   
-
-   BOOST_REQUIRE_EQUAL(c.control->head_block_num(), c2.control->head_block_num());
-
-   uint32_t fork_num = c.control->head_block_num();
-
-   auto nextproducer = [](TESTER &c, int skip_interval) ->account_name {
-      auto head_time = c.control->head_block_time();
-      auto next_time = head_time + fc::milliseconds(config::block_interval_ms * skip_interval);
-      return c.control->head_block_state()->get_scheduled_producer(next_time).producer_name;
-   };
-
-   transaction_trace_ptr create_acc_trace;
-   bool txn_verified = false;
-
-   // fork c: 1 producers: dan
-   // fork c2: 3 producer: sam, pam, scott
-   int skip1 = 1, skip2 = 1;
-   for (int i = 0; i < 200; ++i) {
-      account_name next1 = nextproducer(c, skip1);
-      if (next1 == N(dan)) {
-         c.produce_block(fc::milliseconds(config::block_interval_ms * skip1)); skip1 = 1;
-      }
-      else ++skip1;
-      account_name next2 = nextproducer(c2, skip2);
-      if (next2 == N(sam) || next2 == N(pam) || next2 == N(scott)) {
-         if (!create_acc_trace) {
-            create_acc_trace = c2.create_account(N(apple), N(eosio));
-         }
-         c2.produce_block(fc::milliseconds(config::block_interval_ms * skip2)); skip2 = 1;
-      }
-      else ++skip2;
-   }
-   BOOST_CHECK_EQUAL(last_irr_blocknum, c.control->last_irreversible_block_num());
-   BOOST_REQUIRE_EQUAL(last_irr_blocknum <= fork_num, true);
-   BOOST_CHECK_EQUAL(pre_acc_blk_count, 0);
-   //BOOST_CHECK_EQUAL(last_pre_acc_num, c.control->head_block_num());
-   BOOST_CHECK_EQUAL(acc_blk_hdr_count, 152);
-   BOOST_CHECK_EQUAL(last_acc_blk_hdr_num, c.control->head_block_num());
-   BOOST_CHECK_EQUAL(acc_blk_count, 152);
-   BOOST_CHECK_EQUAL(last_acc_blk_num, c.control->head_block_num());
-
-   c.control->accepted_transaction.connect([&](const transaction_metadata_ptr& ptr) {
-      ++acc_txn_count;
-      last_acc_txn_id = ptr->id;
-   });
-
-   c.control->applied_transaction.connect([&](std::tuple<const transaction_trace_ptr&, const signed_transaction&> t) {
-      ++app_txn_count;
-      last_app_txn_id = std::get<0>(t)->id;
-      last_signal_trace = std::get<0>(t);
-      if (last_app_txn_id == create_acc_trace->id) {
-         txn_verified = true;
-      }
-   });
-
-   // push fork from c2 => c, got verify txn signal
-   size_t p = fork_num;
-   size_t count = 0;
-   while ( p < c2.control->head_block_num()) {
-      signed_block_ptr fb = c2.control->fetch_block_by_number(++p);
-      c.push_block(fb);
-      BOOST_CHECK_EQUAL(pre_acc_blk_count, ++count);
-      BOOST_CHECK_EQUAL(last_pre_acc_num, fb->block_num());
-   }
-
-   BOOST_CHECK_EQUAL(last_irr_blocknum, c.control->last_irreversible_block_num());
-   BOOST_REQUIRE_EQUAL(last_irr_blocknum > fork_num, true);
-
-   BOOST_REQUIRE_EQUAL(txn_verified, true);
-}
-
-BOOST_AUTO_TEST_SUITE_END()

From 7f59d58b6ba2b683aa93501931640170e7e376d8 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 08:34:28 -0400
Subject: [PATCH 0293/1648] new test scripts

---
 scripts/parallel-test.sh | 40 +++++++++--------------------------
 scripts/serial-test.sh   | 45 ++++++++++++++--------------------------
 2 files changed, 25 insertions(+), 60 deletions(-)

diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index cf555637437..016873f2e1e 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -1,35 +1,15 @@
 #!/bin/bash
-set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
-# prepare environment
-PATH=$PATH:~/opt/mongodb/bin
-echo "Extracting build directory..."
-[[ -z "${1}" ]] && tar -zxf build.tar.gz || tar -xzf $1
-cd /data/job/build
-# run tests
-echo "Running tests..."
-CPU_CORES=$(getconf _NPROCESSORS_ONLN)
-echo "$CPU_CORES cpu cores detected."
-TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+set -eo pipefail
+[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
+cd ./build
+echo "[Running tests]"
 set +e # defer ctest error handling to end
-echo "$ ctest -j $CPU_CORES -LE _tests --output-on-failure -T Test"
-ctest -j $CPU_CORES -LE _tests --output-on-failure -T Test
+ctest -j $(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test
 EXIT_STATUS=$?
 [[ "$EXIT_STATUS" == 0 ]] && set -e
-echo "Done running parallelizable tests."
-# upload artifacts
-echo "Uploading artifacts..."
-XML_FILENAME="test-results.xml"
-mv $(pwd)/Testing/$(ls $(pwd)/Testing/ | grep '20' | tail -n 1)/Test.xml $XML_FILENAME
-buildkite-agent artifact upload config.ini
-buildkite-agent artifact upload genesis.json
-cd ..
-cd build
-buildkite-agent artifact upload $XML_FILENAME
-echo "Done uploading artifacts."
+# Prepare tests for artifact upload
+echo "[Uploading artifacts]"
+mv ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
+buildkite-agent artifact upload test-results.xml
 # ctest error handling
-if [[ "$EXIT_STATUS" != 0 ]]; then
-    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
-    echo '    ^^^ scroll up for more information ^^^'
-    exit $EXIT_STATUS
-fi
+[[ $EXIT_STATUS != 0 ]] && echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"; exit $EXIT_STATUS
\ No newline at end of file
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index 4e2b935e09c..fdff7baaeb2 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -1,36 +1,21 @@
 #!/bin/bash
-set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
-# prepare environment
+set -eo pipefail
+[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
+cd ./build
+echo "[Killing old MongoDB]"
+$(pgrep mongod | xargs kill -9) || true
+echo "[Starting MongoDB]"
 PATH=$PATH:~/opt/mongodb/bin
-echo "Extracting build directory..."
-[[ -z "${1}" ]] && tar -zxf build.tar.gz || tar -xzf $1
-echo "Starting MongoDB..."
-mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log
-cd /data/job/build
-# run tests
-echo "Running tests..."
-TEST_COUNT=$(ctest -N -L nonparallelizable_tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath ~/var/log/mongodb/mongod.log
+echo "[Running tests]"
 set +e # defer ctest error handling to end
-echo "$ ctest -L nonparallelizable_tests --output-on-failure -T Test"
 ctest -L nonparallelizable_tests --output-on-failure -T Test
 EXIT_STATUS=$?
-[[ "$EXIT_STATUS" == 0 ]] && set -e
-echo "Done running non-parallelizable tests."
-# upload artifacts
-echo "Uploading artifacts..."
-XML_FILENAME="test-results.xml"
-mv $(pwd)/Testing/$(ls $(pwd)/Testing/ | grep '20' | tail -n 1)/Test.xml $XML_FILENAME
-buildkite-agent artifact upload config.ini
-buildkite-agent artifact upload genesis.json
-cd ..
+[[ $EXIT_STATUS == 0 ]] && set -e
+echo "[Uploading artifacts]"
+mv ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
+buildkite-agent artifact upload test-results.xml
+mv ~/var/log/mongodb/mongod.log mongod.log
 buildkite-agent artifact upload mongod.log
-cd build
-buildkite-agent artifact upload $XML_FILENAME
-echo "Done uploading artifacts."
-# ctest error handling
-if [[ "$EXIT_STATUS" != 0 ]]; then
-    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
-    echo '    ^^^ scroll up for more information ^^^'
-    exit $EXIT_STATUS
-fi
+# Throw proper exit code
+[[ $EXIT_STATUS != 0 ]] && echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"; exit $EXIT_STATUS
\ No newline at end of file

From 0a60ef5776f2559ef8a4d12b99ddfd71bf6fcbd1 Mon Sep 17 00:00:00 2001
From: Brian Johnson <johnsonb@objectcomputing.com>
Date: Tue, 7 May 2019 07:53:21 -0500
Subject: [PATCH 0294/1648] Removed old p2pPlugin launch parameter to allow
 test to run.

---
 tests/block_log_util_test.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/block_log_util_test.py b/tests/block_log_util_test.py
index a08c8c75f22..073347c4b79 100755
--- a/tests/block_log_util_test.py
+++ b/tests/block_log_util_test.py
@@ -32,7 +32,6 @@
 dontKill=args.leave_running
 prodCount=2
 killAll=args.clean_run
-p2pPlugin="net"
 walletPort=TestHelper.DEFAULT_WALLET_PORT
 totalNodes=pnodes
 
@@ -51,8 +50,7 @@
     cluster.killall(allInstances=killAll)
     cluster.cleanup()
     Print("Stand up cluster")
-    if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, p2pPlugin=p2pPlugin,
-                      useBiosBootFile=False) is False:
+    if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=pnodes, totalNodes=totalNodes, totalProducers=pnodes*prodCount, useBiosBootFile=False) is False:
         Utils.errorExit("Failed to stand up eos cluster.")
 
     Print("Validating system accounts after bootstrap")

From 2f3b8158ce14466d2224d7da74d4b79708e9ef56 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Mon, 6 May 2019 14:29:20 -0400
Subject: [PATCH 0295/1648] Update EosioTester.cmake.in

---
 CMakeModules/EosioTester.cmake.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index c915de69127..34a9873fe8d 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -24,7 +24,7 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-set( CMAKE_CXX_STANDARD 14 )
+set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON )
 
@@ -32,7 +32,6 @@ if ( APPLE )
    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" )
 else ( APPLE )
    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-   set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
 endif ( APPLE )
 
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )

From a1ce09a4b7496e4082c71fb8905ee928202e0896 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Mon, 6 May 2019 14:32:22 -0400
Subject: [PATCH 0296/1648] further updates

---
 CMakeModules/EosioTester.cmake.in      | 4 ++--
 CMakeModules/EosioTesterBuild.cmake.in | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index 34a9873fe8d..4dfc2f60451 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -29,9 +29,9 @@ set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON )
 
 if ( APPLE )
-   set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" )
+   set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations" )
 else ( APPLE )
-   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+   set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall")
 endif ( APPLE )
 
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index 0644fdfc221..119aa23a4d4 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -22,15 +22,14 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-set( CMAKE_CXX_STANDARD 14 )
+set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON )
 
 if ( APPLE )
-   set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" )
+   set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations" )
 else ( APPLE )
-   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-   set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
+   set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall")
 endif ( APPLE )
 
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )

From 32b8cecce8a7130a835e51012092a44a3e78b336 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 12:39:40 -0400
Subject: [PATCH 0297/1648] quick fix for mongo log location [skip ci]

---
 libraries/chainbase      | 2 +-
 libraries/fc             | 2 +-
 scripts/parallel-test.sh | 2 +-
 scripts/serial-test.sh   | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libraries/chainbase b/libraries/chainbase
index 118c513436e..b769749d533 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit 118c513436e1310d8e1395303c964430f26b0bb4
+Subproject commit b769749d53303ec1a037d483c631d02268cbf012
diff --git a/libraries/fc b/libraries/fc
index a6f94bae0b2..4e30824aba2 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit a6f94bae0b2b4a0b68dc1db2677331cafa4716a5
+Subproject commit 4e30824aba228c96dae57dfea84b489b81df9537
diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index 016873f2e1e..423a5a8e1ee 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -9,7 +9,7 @@ EXIT_STATUS=$?
 [[ "$EXIT_STATUS" == 0 ]] && set -e
 # Prepare tests for artifact upload
 echo "[Uploading artifacts]"
-mv ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
+mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
 buildkite-agent artifact upload test-results.xml
 # ctest error handling
 [[ $EXIT_STATUS != 0 ]] && echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"; exit $EXIT_STATUS
\ No newline at end of file
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index fdff7baaeb2..0653d93cb1d 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -6,16 +6,15 @@ echo "[Killing old MongoDB]"
 $(pgrep mongod | xargs kill -9) || true
 echo "[Starting MongoDB]"
 PATH=$PATH:~/opt/mongodb/bin
-mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath ~/var/log/mongodb/mongod.log
+mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath ./mongod.log
 echo "[Running tests]"
 set +e # defer ctest error handling to end
 ctest -L nonparallelizable_tests --output-on-failure -T Test
 EXIT_STATUS=$?
 [[ $EXIT_STATUS == 0 ]] && set -e
 echo "[Uploading artifacts]"
-mv ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
+mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
 buildkite-agent artifact upload test-results.xml
-mv ~/var/log/mongodb/mongod.log mongod.log
 buildkite-agent artifact upload mongod.log
 # Throw proper exit code
 [[ $EXIT_STATUS != 0 ]] && echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"; exit $EXIT_STATUS
\ No newline at end of file

From f47bcd88d9590aaaac20231de7c38adf6a84e833 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 12:46:57 -0400
Subject: [PATCH 0298/1648] [skip ci] consistency

---
 scripts/eosio_build_ubuntu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 125da3a56c1..9228ed7d862 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -219,7 +219,7 @@ if [ "$BUILD_CLANG8" = "true" ]; then
 
    cd $SRC_LOCATION
    printf "Checking zlib library installation...\\n"
-   if [ ! -d $OPT_LOCATION/zlib ] || $FORCE_BUILD; then
+   if [ ! -d $OPT_LOCATION/zlib ] || [ $FORCE_BUILD ]; then
       printf "Installing zlib...\\n"
       curl -LO https://www.zlib.net/zlib-1.2.11.tar.gz && tar -xf zlib-1.2.11.tar.gz \
       && cd zlib-1.2.11 && mkdir build && cd build \

From 9e4c7088a06e311f8ac58e4bcdf6ba78cd4f5d35 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 7 May 2019 12:01:57 -0500
Subject: [PATCH 0299/1648] Fix corner case of transitioning into in_sync

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f6dab5c3dd6..9150faa6b10 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1600,7 +1600,7 @@ namespace eosio {
                           "target LIB = ${lib} next_expected = ${ne}",
                   ("s", stage_str( sync_state ))( "fhn", num )( "lib", sync_known_lib_num )
                   ("ne", sync_next_expected_num ) );
-         if( sync_state == lib_catchup )
+         if( sync_state == lib_catchup || sync_state == head_catchup )
             return;
          set_state( head_catchup );
       } else {

From f50f06a8e92108e3d9bacb8b4d8aadb0ad49227b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 13:10:08 -0400
Subject: [PATCH 0300/1648] adding back config.ini and genesis

---
 scripts/parallel-test.sh | 7 ++++++-
 scripts/serial-test.sh   | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index 423a5a8e1ee..8b76fe3bf72 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -12,4 +12,9 @@ echo "[Uploading artifacts]"
 mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
 buildkite-agent artifact upload test-results.xml
 # ctest error handling
-[[ $EXIT_STATUS != 0 ]] && echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"; exit $EXIT_STATUS
\ No newline at end of file
+if [[ $EXIT_STATUS != 0 ]]; then
+    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
+    buildkite-agent artifact upload config.ini
+    buildkite-agent artifact upload genesis.json
+    exit $EXIT_STATUS
+fi
\ No newline at end of file
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index 0653d93cb1d..4485f2795ca 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -16,5 +16,10 @@ echo "[Uploading artifacts]"
 mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
 buildkite-agent artifact upload test-results.xml
 buildkite-agent artifact upload mongod.log
-# Throw proper exit code
-[[ $EXIT_STATUS != 0 ]] && echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"; exit $EXIT_STATUS
\ No newline at end of file
+# ctest error handling
+if [[ $EXIT_STATUS != 0 ]]; then
+    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
+    buildkite-agent artifact upload config.ini
+    buildkite-agent artifact upload genesis.json
+    exit $EXIT_STATUS
+fi
\ No newline at end of file

From 5b17c9a016a48ee715fb2cff7499867801ab0123 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 14:13:23 -0400
Subject: [PATCH 0301/1648] fixes for Zach

---
 scripts/parallel-test.sh | 14 ++++++++++----
 scripts/serial-test.sh   | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index 8b76fe3bf72..71911d1fbcd 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
 set -eo pipefail
+echo "+++ Extracting build directory"
 [[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-cd ./build
-echo "[Running tests]"
+cd build
+echo "+++ Running tests"
+# Counting tests available and if they get disabled for some reason, throw a failure
+TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
+[[ $TEST_COUNT > 0 ]] && echo " - $TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
 set +e # defer ctest error handling to end
-ctest -j $(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test
+CORES=$(getconf _NPROCESSORS_ONLN)
+echo "ctest -j $CORES -LE _tests --output-on-failure -T Test"
+ctest -j $CORES -LE _tests --output-on-failure -T Test
 EXIT_STATUS=$?
 [[ "$EXIT_STATUS" == 0 ]] && set -e
 # Prepare tests for artifact upload
-echo "[Uploading artifacts]"
+echo "+++ Uploading artifacts"
 mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
 buildkite-agent artifact upload test-results.xml
 # ctest error handling
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index 4485f2795ca..c1edcc9e228 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -1,18 +1,23 @@
 #!/bin/bash
 set -eo pipefail
+echo "+++ Extracting build directory"
 [[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-cd ./build
-echo "[Killing old MongoDB]"
+cd build
+echo "+++ Killing old MongoDB"
 $(pgrep mongod | xargs kill -9) || true
-echo "[Starting MongoDB]"
+echo "+++ Starting MongoDB"
 PATH=$PATH:~/opt/mongodb/bin
 mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath ./mongod.log
-echo "[Running tests]"
+echo "+++ Running tests"
+# Counting tests available and if they get disabled for some reason, throw a failure
+TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
+[[ $TEST_COUNT > 0 ]] && echo " - $TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
 set +e # defer ctest error handling to end
+echo "ctest -L nonparallelizable_tests --output-on-failure -T Test"
 ctest -L nonparallelizable_tests --output-on-failure -T Test
 EXIT_STATUS=$?
 [[ $EXIT_STATUS == 0 ]] && set -e
-echo "[Uploading artifacts]"
+echo "+++ Uploading artifacts"
 mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
 buildkite-agent artifact upload test-results.xml
 buildkite-agent artifact upload mongod.log

From 541ae81373e1f37627b0b7892c50c5f34e645042 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 14:20:11 -0400
Subject: [PATCH 0302/1648] final fixes for Zach

---
 .buildkite/pipeline.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2d6f427c5a0..f9af6b070e0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -177,7 +177,7 @@ steps:
   # AmazonLinux #
   - label: ":aws: Amazon Linux 2 Tests"
     command:
-      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
+      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
       - "./scripts/parallel-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
@@ -197,7 +197,7 @@ steps:
 
   - label: ":aws: Amazon Linux 2 NP Tests"
     command:
-      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
+      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
       - "./scripts/serial-test.sh"
     label: ":aws: Amazon Linux 2 NP Tests"
     agents:
@@ -219,7 +219,7 @@ steps:
   # CentOS #
   - label: ":centos: CentOS 7 Tests"
     command:
-      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
+      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
       - "./scripts/parallel-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
@@ -239,7 +239,7 @@ steps:
 
   - label: ":centos: CentOS 7 NP Tests"
     command:
-      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
+      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
       - "./scripts/serial-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
@@ -260,7 +260,7 @@ steps:
   # Ubuntu #
   - label: ":ubuntu: Ubuntu 16.04 Tests"
     command:
-      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
+      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
       - "./scripts/parallel-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
@@ -280,7 +280,7 @@ steps:
 
   - label: ":ubuntu: Ubuntu 16.04 NP Tests"
     command:
-      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
+      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
       - "./scripts/serial-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
@@ -300,7 +300,7 @@ steps:
 
   - label: ":ubuntu: Ubuntu 18.04 Tests"
     command:
-      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
+      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
       - "./scripts/parallel-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
@@ -320,7 +320,7 @@ steps:
 
   - label: ":ubuntu: Ubuntu 18.04 NP Tests"
     command:
-      - "buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
+      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
       - "./scripts/serial-test.sh"
     agents:
       queue: "automation-large-builder-fleet"
@@ -355,7 +355,7 @@ steps:
   - label: ":centos: CentOS 7 Package Builder"
     command: |
         echo "--- :arrow_down: Downloading build directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
+        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
         tar -zxf build.tar.gz
         echo "+++ :microscope: Starting package build"
         yum install -y rpm-build
@@ -390,7 +390,7 @@ steps:
 
   - command: | # Ubuntu 16.04 Package Builder
         echo "--- :arrow_down: Downloading build directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 16.04 Build"
+        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 16.04 Build"
         tar -zxf build.tar.gz
         echo "+++ :microscope: Starting package build"
         cd /data/job/build/packages
@@ -419,7 +419,7 @@ steps:
 
   - command: | # Ubuntu 18.04 Package Builder
         echo "--- :arrow_down: Downloading build directory"
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 18.04 Build"
+        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 18.04 Build"
         tar -zxf build.tar.gz
         echo "+++ :microscope: Starting package build"
         cd /data/job/build/packages
@@ -470,7 +470,7 @@ steps:
 
   - command: | # Brew Updater
         echo "--- :arrow_down: Downloading brew files"
-        buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
+        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
     label: ":darwin: Brew Updater"
     agents:
       queue: "automation-large-builder-fleet"

From 835c93759457e8a4b109a2311c63ec3163dcbc1f Mon Sep 17 00:00:00 2001
From: Zane Reynolds <zane.reynolds@gmail.com>
Date: Tue, 7 May 2019 14:46:59 -0400
Subject: [PATCH 0303/1648] set variable for docker pipeline

---
 pipeline.jsonc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index e4430559f0e..8b9a9e7f9fe 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -15,6 +15,13 @@
             "170=v1.7.0"
         ]
     },
+    "eosio-docker-builds":
+    {
+        "environment":
+        {
+            "BUILDER_TAG": "v1.8.0"
+        }
+    },
     "eosio-sync-tests":
     {
         "pipeline-branch": "protocol-features-sync-nodes"

From 2a947bb572c4e500b614d66ba963f5e131546be0 Mon Sep 17 00:00:00 2001
From: Zane Reynolds <zane.reynolds@gmail.com>
Date: Tue, 7 May 2019 14:56:35 -0400
Subject: [PATCH 0304/1648] set variable for sync test pipeline

---
 pipeline.jsonc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 8b9a9e7f9fe..7fda37a185c 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -24,6 +24,10 @@
     },
     "eosio-sync-tests":
     {
-        "pipeline-branch": "protocol-features-sync-nodes"
+        "environment":
+        {
+            "SKIP_PRE_V180": "true",
+            "SKIP_V180": "false"
+        }
     }
 }

From d06ae667ca1fce8fe382345bd62edc6a659e6427 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 15:54:20 -0400
Subject: [PATCH 0305/1648] added ls after extraction to confirm it's there
 (and show timestamp, permissions, etc)

---
 scripts/parallel-test.sh | 2 +-
 scripts/serial-test.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index 71911d1fbcd..d1a1ef6dcd0 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
+[[ -f build.tar.gz ]] && tar -xzf build.tar.gz && ls -l build
 cd build
 echo "+++ Running tests"
 # Counting tests available and if they get disabled for some reason, throw a failure
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index c1edcc9e228..0342a1d8ed9 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
+[[ -f build.tar.gz ]] && tar -xzf build.tar.gz && ls -l build
 cd build
 echo "+++ Killing old MongoDB"
 $(pgrep mongod | xargs kill -9) || true

From 495cb8e07fc0e57affb73de9dc82752bb03b105f Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 15:54:58 -0400
Subject: [PATCH 0306/1648] removed dash cause it's ugly

---
 scripts/parallel-test.sh | 2 +-
 scripts/serial-test.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index d1a1ef6dcd0..3ac12eeb981 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -6,7 +6,7 @@ cd build
 echo "+++ Running tests"
 # Counting tests available and if they get disabled for some reason, throw a failure
 TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo " - $TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
 set +e # defer ctest error handling to end
 CORES=$(getconf _NPROCESSORS_ONLN)
 echo "ctest -j $CORES -LE _tests --output-on-failure -T Test"
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index 0342a1d8ed9..6490e989a3a 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -11,7 +11,7 @@ mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath ./mongod.lo
 echo "+++ Running tests"
 # Counting tests available and if they get disabled for some reason, throw a failure
 TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo " - $TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
 set +e # defer ctest error handling to end
 echo "ctest -L nonparallelizable_tests --output-on-failure -T Test"
 ctest -L nonparallelizable_tests --output-on-failure -T Test

From 77e5ee24733aa5a2c64ac8bb1c158a820b88984e Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 May 2019 16:43:38 -0400
Subject: [PATCH 0307/1648] Better way of doing the ls to support mac (which
 doesn't do a tar -xzf)

---
 scripts/parallel-test.sh | 4 ++--
 scripts/serial-test.sh   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index 3ac12eeb981..6adf623707e 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -eo pipefail
 echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz && ls -l build
-cd build
+[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
+ls -l build && cd build
 echo "+++ Running tests"
 # Counting tests available and if they get disabled for some reason, throw a failure
 TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index 6490e989a3a..9d280765334 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -eo pipefail
 echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz && ls -l build
-cd build
+[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
+ls -l build && cd build
 echo "+++ Killing old MongoDB"
 $(pgrep mongod | xargs kill -9) || true
 echo "+++ Starting MongoDB"

From 46c884ec32d8171e97b24b0692e1925ea8ff0c20 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Tue, 7 May 2019 19:24:51 -0400
Subject: [PATCH 0308/1648] Fixes for eosvm integration

---
 CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dfb68f1f73..9fb920049c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}
        add_compile_options(-fcolor-diagnostics)
     endif()
 endif()
-       add_compile_options(-fno-strict-aliasing)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
 set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make")
@@ -170,8 +169,8 @@ else( WIN32 ) # Apple AND Linux
     if( APPLE )
         # Apple Specific Options Here
         message( STATUS "Configuring EOSIO on OS X" )
-        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations -fsanitize=undefined -fno-omit-frame-pointer" )
-        set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
+        set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations" )
+        set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
     else( APPLE )
         # Linux Specific Options Here
         message( STATUS "Configuring EOSIO on Linux" )

From cb8086469c02ff6569c036f8b81d29e5e7bece6b Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Wed, 8 May 2019 18:18:17 +0800
Subject: [PATCH 0309/1648] enable test case nodeos_under_min_avail_ram.py in
 build process

---
 tests/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ba87969bb80..18e91b17101 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -103,7 +103,7 @@ add_test(NAME nodeos_voting_lr_test COMMAND tests/nodeos_voting_test.py -v --wal
 set_property(TEST nodeos_voting_lr_test PROPERTY LABELS long_running_tests)
 
 add_test(NAME nodeos_under_min_avail_ram_lr_test COMMAND tests/nodeos_under_min_avail_ram.py -v --wallet-port 9904 --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST nodeos_under_min_avail_ram_lr_test PROPERTY LABELS long_running_tests)
+set_property(TEST nodeos_under_min_avail_ram_lr_test PROPERTY LABELS nonparallelizable_tests)
 
 add_test(NAME nodeos_irreversible_mode_lr_test COMMAND tests/nodeos_irreversible_mode_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_irreversible_mode_lr_test PROPERTY LABELS long_running_tests)

From 72f43c07bad6c50da9f7a3aca5dd05fc72761211 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Apr 2019 12:17:32 -0500
Subject: [PATCH 0310/1648] Provide thread safety to transaction_metadata

---
 libraries/chain/controller.cpp                | 16 +++----
 .../eosio/chain/transaction_metadata.hpp      | 46 ++++++++++---------
 libraries/chain/transaction_metadata.cpp      | 38 ++++++++-------
 plugins/mongo_db_plugin/mongo_db_plugin.cpp   | 18 +++-----
 plugins/net_plugin/net_plugin.cpp             | 16 +++----
 plugins/producer_plugin/producer_plugin.cpp   | 22 ++++-----
 unittests/misc_tests.cpp                      | 10 +---
 7 files changed, 82 insertions(+), 84 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index a80ffe4397c..0a08c8f789d 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -255,7 +255,7 @@ struct controller_impl {
       if ( read_mode == db_read_mode::SPECULATIVE ) {
          EOS_ASSERT( head->block, block_validate_exception, "attempting to pop a block that was sparsely loaded from a snapshot");
          for( const auto& t : head->trxs )
-            unapplied_transactions[t->signed_id] = t;
+            unapplied_transactions[t->signed_id()] = t;
       }
 
       head = prev;
@@ -1270,8 +1270,8 @@ struct controller_impl {
             }
          }
 
-         const signed_transaction& trn = trx->packed_trx->get_signed_transaction();
-         transaction_context trx_context(self, trn, trx->id, start);
+         const signed_transaction& trn = trx->packed_trx()->get_signed_transaction();
+         transaction_context trx_context(self, trn, trx->id(), start);
          if ((bool)subjective_cpu_leeway && pending->_block_status == controller::block_status::incomplete) {
             trx_context.leeway = *subjective_cpu_leeway;
          }
@@ -1285,8 +1285,8 @@ struct controller_impl {
                trx_context.enforce_whiteblacklist = false;
             } else {
                bool skip_recording = replay_head_time && (time_point(trn.expiration) <= *replay_head_time);
-               trx_context.init_for_input_trx( trx->packed_trx->get_unprunable_size(),
-                                               trx->packed_trx->get_prunable_size(),
+               trx_context.init_for_input_trx( trx->packed_trx()->get_unprunable_size(),
+                                               trx->packed_trx()->get_prunable_size(),
                                                skip_recording);
             }
 
@@ -1311,7 +1311,7 @@ struct controller_impl {
                transaction_receipt::status_enum s = (trx_context.delay == fc::seconds(0))
                                                     ? transaction_receipt::executed
                                                     : transaction_receipt::delayed;
-               trace->receipt = push_receipt(*trx->packed_trx, s, trx_context.billed_cpu_time_us, trace->net_usage);
+               trace->receipt = push_receipt(*trx->packed_trx(), s, trx_context.billed_cpu_time_us, trace->net_usage);
                pending->_block_stage.get<building_block>()._pending_trx_metas.emplace_back(trx);
             } else {
                transaction_receipt_header r;
@@ -1341,7 +1341,7 @@ struct controller_impl {
             }
 
             if (!trx->implicit) {
-               unapplied_transactions.erase( trx->signed_id );
+               unapplied_transactions.erase( trx->signed_id() );
             }
             return trace;
          } catch( const disallowed_transaction_extensions_bad_block_exception& ) {
@@ -1355,7 +1355,7 @@ struct controller_impl {
          }
 
          if (!failure_is_subjective(*trace->except)) {
-            unapplied_transactions.erase( trx->signed_id );
+            unapplied_transactions.erase( trx->signed_id() );
          }
 
          emit( self.accepted_transaction, trx );
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 5482c6a69a5..1b6888d3e6f 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -24,14 +24,17 @@ using recovery_keys_type = std::pair<fc::microseconds, const flat_set<public_key
  *  packed/unpacked/compressed and recovered keys
  */
 class transaction_metadata {
+   private:
+      const packed_transaction_ptr                               _packed_trx;
+      const transaction_id_type                                  _id;
+      const transaction_id_type                                  _signed_id;
+      mutable std::mutex                                         _signing_keys_future_mtx;
+      mutable signing_keys_future_type                           _signing_keys_future;
+
    public:
-      transaction_id_type                                        id;
-      transaction_id_type                                        signed_id;
-      packed_transaction_ptr                                     packed_trx;
-      signing_keys_future_type                                   signing_keys_future;
-      bool                                                       accepted = false;
-      bool                                                       implicit = false;
-      bool                                                       scheduled = false;
+      bool                                                       accepted = false;  // not thread safe
+      bool                                                       implicit = false;  // not thread safe
+      bool                                                       scheduled = false; // not thread safe
 
       transaction_metadata() = delete;
       transaction_metadata(const transaction_metadata&) = delete;
@@ -40,28 +43,29 @@ class transaction_metadata {
       transaction_metadata operator=(transaction_metadata&&) = delete;
 
       explicit transaction_metadata( const signed_transaction& t, packed_transaction::compression_type c = packed_transaction::none )
-      :id(t.id()), packed_trx(std::make_shared<packed_transaction>(t, c)) {
-         //raw_packed = fc::raw::pack( static_cast<const transaction&>(trx) );
-         signed_id = digest_type::hash(*packed_trx);
+            : _packed_trx( std::make_shared<packed_transaction>( t, c ) )
+            , _id( t.id() )
+            , _signed_id( digest_type::hash( *_packed_trx ) ) {
       }
 
       explicit transaction_metadata( const packed_transaction_ptr& ptrx )
-      :id(ptrx->id()), packed_trx(ptrx) {
-         //raw_packed = fc::raw::pack( static_cast<const transaction&>(trx) );
-         signed_id = digest_type::hash(*packed_trx);
+            : _packed_trx( ptrx )
+            , _id( ptrx->id() )
+            , _signed_id( digest_type::hash( *_packed_trx ) ) {
       }
 
-      // must be called from main application thread. signing_keys_future must be accessed only from main application thread.
-      // next() should only be called on main application thread after future is valid, to avoid dependency on appbase,
-      // it is up to the caller to have next() post to the application thread which makes sure future is only accessed from
-      // application thread and that assignment to future in this method has completed.
-      static signing_keys_future_type
-      start_recover_keys( const transaction_metadata_ptr& mtrx, boost::asio::io_context& thread_pool,
+      const packed_transaction_ptr& packed_trx()const { return _packed_trx; }
+      const transaction_id_type& id()const { return _id; }
+      const transaction_id_type& signed_id()const { return _signed_id; }
+
+      // can be called from any thread. It is recommended that next() immediately post to application thread for
+      // future processing since next() will be called from the thread_pool.
+      static void start_recover_keys( const transaction_metadata_ptr& mtrx, boost::asio::io_context& thread_pool,
                           const chain_id_type& chain_id, fc::microseconds time_limit,
                           std::function<void()> next = std::function<void()>() );
 
-      // start_recover_keys must be called first
-      recovery_keys_type recover_keys( const chain_id_type& chain_id );
+      // start_recover_keys can be called first to begin key recovery
+      recovery_keys_type recover_keys( const chain_id_type& chain_id ) const;
 };
 
 } } // eosio::chain
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index 537346ca25e..fc451201f19 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -4,49 +4,53 @@
 
 namespace eosio { namespace chain {
 
-recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chain_id ) {
+recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chain_id ) const {
    // Unlikely for more than one chain_id to be used in one nodeos instance
-   if( signing_keys_future.valid() ) {
-      const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = signing_keys_future.get();
+   std::unique_lock<std::mutex> g( _signing_keys_future_mtx );
+   if( _signing_keys_future.valid() ) {
+      const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = _signing_keys_future.get();
       if( std::get<0>( sig_keys ) == chain_id ) {
          return std::make_pair( std::get<1>( sig_keys ), std::cref( std::get<2>( sig_keys ) ) );
       }
    }
 
+   g.unlock();
    // shared_keys_future not created or different chain_id
-   std::promise<signing_keys_future_value_type> p;
    flat_set<public_key_type> recovered_pub_keys;
-   const signed_transaction& trn = packed_trx->get_signed_transaction();
+   const signed_transaction& trn = _packed_trx->get_signed_transaction();
    fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, fc::time_point::maximum(), recovered_pub_keys );
+
+   g.lock();
+   std::promise<signing_keys_future_value_type> p;
    p.set_value( std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ) ) );
-   signing_keys_future = p.get_future().share();
+   _signing_keys_future = p.get_future().share();
 
-   const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = signing_keys_future.get();
+   const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = _signing_keys_future.get();
    return std::make_pair( std::get<1>( sig_keys ), std::cref( std::get<2>( sig_keys ) ) );
 }
 
-signing_keys_future_type transaction_metadata::start_recover_keys( const transaction_metadata_ptr& mtrx,
-                                                                   boost::asio::io_context& thread_pool,
-                                                                   const chain_id_type& chain_id,
-                                                                   fc::microseconds time_limit,
-                                                                   std::function<void()> next )
+void transaction_metadata::start_recover_keys( const transaction_metadata_ptr& mtrx,
+                                               boost::asio::io_context& thread_pool,
+                                               const chain_id_type& chain_id,
+                                               fc::microseconds time_limit,
+                                               std::function<void()> next )
 {
-   if( mtrx->signing_keys_future.valid() && std::get<0>( mtrx->signing_keys_future.get() ) == chain_id ) { // already created
+   std::unique_lock<std::mutex> g( mtrx->_signing_keys_future_mtx );
+   if( mtrx->_signing_keys_future.valid() && std::get<0>( mtrx->_signing_keys_future.get() ) == chain_id ) { // already created
+      g.unlock();
       if( next ) next();
-      return mtrx->signing_keys_future;
    }
 
-   mtrx->signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx, next{std::move(next)}]() {
+   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx, next{std::move(next)}]() {
       fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
                                 fc::time_point::maximum() : fc::time_point::now() + time_limit;
       flat_set<public_key_type> recovered_pub_keys;
-      const signed_transaction& trn = mtrx->packed_trx->get_signed_transaction();
+      const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
       fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
       if( next ) next();
       return std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ));
    } );
 
-   return mtrx->signing_keys_future;
 }
 
 
diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index 865ad8809a8..a1b4295a9e0 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -746,7 +746,7 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
    using bsoncxx::builder::basic::make_array;
    namespace bbb = bsoncxx::builder::basic;
 
-   const signed_transaction& trx = t->packed_trx->get_signed_transaction();
+   const signed_transaction& trx = t->packed_trx()->get_signed_transaction();
 
    if( !filter_include( trx ) ) return;
 
@@ -755,7 +755,7 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
    auto now = std::chrono::duration_cast<std::chrono::milliseconds>(
          std::chrono::microseconds{fc::time_point::now().time_since_epoch().count()} );
 
-   const auto& trx_id = t->id;
+   const auto& trx_id = t->id();
    const auto trx_id_str = trx_id.str();
 
    trans_doc.append( kvp( "trx_id", trx_id_str ) );
@@ -770,15 +770,11 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
       elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
    }
 
-   fc::variant signing_keys;
-   if( t->signing_keys_future.valid() ) {
-      signing_keys = std::get<2>( t->signing_keys_future.get() );
-   } else {
-      flat_set<public_key_type> keys;
-      trx.get_signature_keys( *chain_id, fc::time_point::maximum(), keys, false );
-      if( !keys.empty() ) {
-         signing_keys = keys;
-      }
+   string signing_keys_json;
+   flat_set<public_key_type> keys;
+   std::tie( std::ignore, keys ) = t->recover_keys( *chain_id );
+   if( !keys.empty() ) {
+      signing_keys_json = fc::json::to_string( keys );
    }
 
    if( signing_keys.get_type() == fc::variant::array_type && signing_keys.get_array().size() > 0) {
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index bc53f9f4bfd..00e68767fdc 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1888,8 +1888,8 @@ namespace eosio {
    }
 
    void dispatch_manager::bcast_transaction(const transaction_metadata_ptr& ptrx) {
-      const auto& id = ptrx->id;
-      const packed_transaction& trx = *ptrx->packed_trx;
+      const auto& id = ptrx->id();
+      const packed_transaction& trx = *ptrx->packed_trx();
       time_point_sec trx_expiration = trx.expiration();
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
@@ -1915,7 +1915,7 @@ namespace eosio {
    }
 
    void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_metadata_ptr& txn) {
-      node_transaction_state nts = {txn->id, txn->packed_trx->expiration(), 0, c->connection_id};
+      node_transaction_state nts = {txn->id(), txn->packed_trx()->expiration(), 0, c->connection_id};
       add_peer_txn( nts );
    }
 
@@ -2699,7 +2699,7 @@ namespace eosio {
       }
 
       auto ptrx = std::make_shared<transaction_metadata>( trx );
-      const auto& tid = ptrx->id;
+      const auto& tid = ptrx->id();
       peer_dlog( this, "received packed_transaction ${id}", ("id", tid) );
 
       bool have_trx = my_impl->dispatcher->have_txn( tid );
@@ -2709,14 +2709,14 @@ namespace eosio {
          return;
       }
 
-      trx_in_progress_size += calc_trx_size( ptrx->packed_trx );
+      trx_in_progress_size += calc_trx_size( ptrx->packed_trx() );
       connection_wptr weak = shared_from_this();
       my_impl->chain_plug->accept_transaction( ptrx,
             [weak{std::move(weak)}, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          connection_ptr conn = weak.lock();
          if( conn ) {
-            conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx );
+            conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx() );
          }
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2740,7 +2740,7 @@ namespace eosio {
             if( accepted ) {
                my_impl->dispatcher->bcast_transaction( ptrx );
             } else {
-               my_impl->dispatcher->rejected_transaction( ptrx->id, head_blk_num );
+               my_impl->dispatcher->rejected_transaction( ptrx->id(), head_blk_num );
             }
          });
       });
@@ -2956,7 +2956,7 @@ namespace eosio {
 
    // called from application thread
    void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
-      const auto& id = results.second->id;
+      const auto& id = results.second->id();
       if (results.first) {
          fc_dlog( logger, "signaled NACK, trx-id = ${id} : ${why}", ("id", id)( "why", results.first->to_detail_string() ) );
 
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 08405ddd295..652629692a4 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -470,7 +470,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                         ("why",response.get<fc::exception_ptr>()->what()));
                } else {
                   fc_dlog(_trx_trace_log, "[TRX_TRACE] Speculative execution is REJECTING tx: ${txid} : ${why} ",
-                          ("txid", trx->id)
+                          ("txid", trx->id())
                           ("why",response.get<fc::exception_ptr>()->what()));
                }
             } else {
@@ -482,17 +482,17 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                           ("txid", trx->id));
                } else {
                   fc_dlog(_trx_trace_log, "[TRX_TRACE] Speculative execution is ACCEPTING tx: ${txid}",
-                          ("txid", trx->id));
+                          ("txid", trx->id()));
                }
             }
          };
 
-         const auto& id = trx->id;
-         if( fc::time_point(trx->packed_trx->expiration()) < block_time ) {
+         const auto& id = trx->id();
+         if( fc::time_point(trx->packed_trx()->expiration()) < block_time ) {
             send_response(std::static_pointer_cast<fc::exception>(
                   std::make_shared<expired_tx_exception>(
                         FC_LOG_MESSAGE(error, "expired transaction ${id}, expiration ${e}, block time ${bt}",
-                                       ("id", id)("e", trx->packed_trx->expiration())("bt", block_time)) )));
+                                       ("id", id)("e", trx->packed_trx()->expiration())("bt", block_time)) )));
             return;
          }
 
@@ -521,7 +521,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                              ("txid", trx->id));
                   } else {
                      fc_dlog(_trx_trace_log, "[TRX_TRACE] Speculative execution COULD NOT FIT tx: ${txid} RETRYING",
-                             ("txid", trx->id));
+                             ("txid", trx->id()));
                   }
                } else {
                   auto e_ptr = trace->except->dynamic_copy_exception();
@@ -531,7 +531,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                if (persist_until_expired) {
                   // if this trx didnt fail/soft-fail and the persist flag is set, store its ID so that we can
                   // ensure its applied to all future speculative blocks as well.
-                  _persistent_transactions.insert(transaction_id_with_expiry{trx->id, trx->packed_trx->expiration()});
+                  _persistent_transactions.insert(transaction_id_with_expiry{trx->id(), trx->packed_trx()->expiration()});
                }
                send_response(trace);
             }
@@ -1485,9 +1485,9 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                int num_failed = 0;
                int num_processed = 0;
                auto calculate_transaction_category = [&](const transaction_metadata_ptr& trx) {
-                  if (trx->packed_trx->expiration() < pending_block_time) {
+                  if (trx->packed_trx()->expiration() < pending_block_time) {
                      return tx_category::EXPIRED;
-                  } else if (persisted_by_id.find(trx->id) != persisted_by_id.end()) {
+                  } else if (persisted_by_id.find(trx->id()) != persisted_by_id.end()) {
                      return tx_category::PERSISTED;
                   } else {
                      return tx_category::UNEXPIRED_UNPERSISTED;
@@ -1508,7 +1508,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                   {
                      if (!_producers.empty()) {
                         fc_dlog(_trx_trace_log, "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
-                               ("txid", trx->id));
+                               ("txid", trx->id()));
                      }
                      itr = unapplied_trxs.erase( itr ); // unapplied_trxs map has not been modified, so simply erase and continue
                      continue;
@@ -1533,7 +1533,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                            } else {
                               // this failed our configured maximum transaction time, we don't want to replay it
                               // chain.plus_transactions can modify unapplied_trxs, so erase by id
-                              unapplied_trxs.erase( trx->signed_id );
+                              unapplied_trxs.erase( trx->signed_id() );
                               ++num_failed;
                            }
                         } else {
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 47e101b40f7..bf439c2f6a5 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -836,20 +836,14 @@ BOOST_AUTO_TEST_CASE(transaction_metadata_test) { try {
 
       BOOST_CHECK_EQUAL(trx.id(), pkt.id());
       BOOST_CHECK_EQUAL(trx.id(), pkt2.id());
-      BOOST_CHECK_EQUAL(trx.id(), mtrx->id);
-      BOOST_CHECK_EQUAL(trx.id(), mtrx2->id);
+      BOOST_CHECK_EQUAL(trx.id(), mtrx->id());
+      BOOST_CHECK_EQUAL(trx.id(), mtrx2->id());
 
       named_thread_pool thread_pool( "misc", 5 );
 
-      BOOST_CHECK( !mtrx->signing_keys_future.valid() );
-      BOOST_CHECK( !mtrx2->signing_keys_future.valid() );
-
       transaction_metadata::start_recover_keys( mtrx, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
       transaction_metadata::start_recover_keys( mtrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
 
-      BOOST_CHECK( mtrx->signing_keys_future.valid() );
-      BOOST_CHECK( mtrx2->signing_keys_future.valid() );
-
       // no-op
       transaction_metadata::start_recover_keys( mtrx, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
       transaction_metadata::start_recover_keys( mtrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );

From 27c50c4883727909549c7bb9c1e79c729716b336 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Apr 2019 12:21:29 -0500
Subject: [PATCH 0311/1648] Post to application thread no longer needed

---
 plugins/producer_plugin/producer_plugin.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 652629692a4..ada00ea17f9 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -442,11 +442,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                   });
                };
 
-         app().post(priority::low, [trx, &chain, max_trx_cpu_usage, after_sig_recovery{std::move(after_sig_recovery)}]() mutable {
-            // use chain thread pool for sig recovery
-            transaction_metadata::start_recover_keys( trx, chain.get_thread_pool(), chain.get_chain_id(),
+         transaction_metadata::start_recover_keys( trx, chain.get_thread_pool(), chain.get_chain_id(),
                   max_trx_cpu_usage, std::move( after_sig_recovery ) );
-         });
       }
 
       void process_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {

From cee057c7d2ffdfd250689b13e311c87198054466 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 8 May 2019 08:14:59 -0500
Subject: [PATCH 0312/1648] Fix merge issues

---
 libraries/chain/controller.cpp              | 7 +------
 plugins/producer_plugin/producer_plugin.cpp | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 0a08c8f789d..757b53ab622 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1944,18 +1944,13 @@ struct controller_impl {
       if( pending ) {
          if ( read_mode == db_read_mode::SPECULATIVE ) {
             for( const auto& t : pending->get_trx_metas() )
-               unapplied_transactions[t->signed_id] = t;
+               unapplied_transactions[t->signed_id()] = t;
          }
          pending.reset();
          protocol_features.popped_blocks_to( head->block_num );
       }
    }
 
-
-   bool should_enforce_runtime_limits()const {
-      return false;
-   }
-
    checksum256_type calculate_action_merkle() {
       vector<digest_type> action_digests;
       const auto& actions = pending->_block_stage.get<building_block>()._actions;
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index ada00ea17f9..0d40ba5cdd8 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -463,7 +463,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                   fc_dlog(_trx_trace_log, "[TRX_TRACE] Block ${block_num} for producer ${prod} is REJECTING tx: ${txid} : ${why} ",
                         ("block_num", chain.head_block_num() + 1)
                         ("prod", chain.pending_block_producer())
-                        ("txid", trx->id)
+                        ("txid", trx->id())
                         ("why",response.get<fc::exception_ptr>()->what()));
                } else {
                   fc_dlog(_trx_trace_log, "[TRX_TRACE] Speculative execution is REJECTING tx: ${txid} : ${why} ",
@@ -476,7 +476,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                   fc_dlog(_trx_trace_log, "[TRX_TRACE] Block ${block_num} for producer ${prod} is ACCEPTING tx: ${txid}",
                           ("block_num", chain.head_block_num() + 1)
                           ("prod", chain.pending_block_producer())
-                          ("txid", trx->id));
+                          ("txid", trx->id()));
                } else {
                   fc_dlog(_trx_trace_log, "[TRX_TRACE] Speculative execution is ACCEPTING tx: ${txid}",
                           ("txid", trx->id()));
@@ -515,7 +515,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                      fc_dlog(_trx_trace_log, "[TRX_TRACE] Block ${block_num} for producer ${prod} COULD NOT FIT, tx: ${txid} RETRYING ",
                              ("block_num", chain.head_block_num() + 1)
                              ("prod", chain.pending_block_producer())
-                             ("txid", trx->id));
+                             ("txid", trx->id()));
                   } else {
                      fc_dlog(_trx_trace_log, "[TRX_TRACE] Speculative execution COULD NOT FIT tx: ${txid} RETRYING",
                              ("txid", trx->id()));

From 59bb614dacd53e11937fd966ac621914f51ca792 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 09:51:52 -0400
Subject: [PATCH 0313/1648] testing moving ensure_tag.bash into eosio

---
 .buildkite/pipeline.yml | 45 ++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f9af6b070e0..c5a9130339d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,20 +6,37 @@ env:
 
 steps:
 
-  - trigger: "mac-anka-fleet"
-    label: ":anka: Ensure Mojave Anka Template Tag Exists"
-    branches: "*"
-    async: false
-    build:
-      branch: "master"
-      env:
-        REPO: "${BUILDKITE_REPO}"
-        REPO_BRANCH: "${BUILDKITE_BRANCH}"
-        CHECKSUMABLE: "${CHECKSUMABLE}"
-        TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
-        TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-        TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
-        PROJECT_TAG: "${MAC_TAG}"
+
+  - label: ":darwin: Testing"
+    command:
+      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
+      - "cd mac-anka-fleet && . ./ensure_tag.bash"
+    agents:
+      - "queue=mac-anka-templater-fleet"
+    env:
+      REPO: "${BUILDKITE_REPO}"
+      REPO_BRANCH: "${BUILDKITE_BRANCH}"
+      CHECKSUMABLE: "${CHECKSUMABLE}"
+      TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
+      TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
+      TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
+      PROJECT_TAG: "${MAC_TAG}"
+    timeout: 60
+
+  # - trigger: "mac-anka-fleet"
+  #   label: ":anka: Ensure Mojave Anka Template Tag Exists"
+  #   branches: "*"
+  #   async: false
+  #   build:
+  #     branch: "master"
+  #     env:
+  #       REPO: "${BUILDKITE_REPO}"
+  #       REPO_BRANCH: "${BUILDKITE_BRANCH}"
+  #       CHECKSUMABLE: "${CHECKSUMABLE}"
+  #       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
+  #       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
+  #       TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
+  #       PROJECT_TAG: "${MAC_TAG}"
 
   - wait
 

From a6d156d7d17d068e299843105e393b916c6cb21e Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 09:52:35 -0400
Subject: [PATCH 0314/1648] testing moving ensure_tag.bash into eosio

---
 .buildkite/pipeline.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c5a9130339d..3fc4c1a2d7a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,7 +6,6 @@ env:
 
 steps:
 
-
   - label: ":darwin: Testing"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"

From ef24f9d15df3396d664135a11a1e522d35088ad6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 8 May 2019 08:55:49 -0500
Subject: [PATCH 0315/1648] Fix merge issue

---
 plugins/mongo_db_plugin/mongo_db_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index a1b4295a9e0..0af0cf5784a 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -770,11 +770,11 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
       elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
    }
 
-   string signing_keys_json;
+   fc::variant signing_keys;
    flat_set<public_key_type> keys;
    std::tie( std::ignore, keys ) = t->recover_keys( *chain_id );
    if( !keys.empty() ) {
-      signing_keys_json = fc::json::to_string( keys );
+      signing_keys = keys;
    }
 
    if( signing_keys.get_type() == fc::variant::array_type && signing_keys.get_array().size() > 0) {

From bb3c219e19dc6043935f45f4d89a58c2f4691808 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 09:57:27 -0400
Subject: [PATCH 0316/1648] better title

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3fc4c1a2d7a..a9ae55418e7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,7 +6,7 @@ env:
 
 steps:
 
-  - label: ":darwin: Testing"
+  - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
       - "cd mac-anka-fleet && . ./ensure_tag.bash"

From 0e0b9a7a1be317d75acb61745e58e5e2f9d353e1 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 8 May 2019 10:41:54 -0400
Subject: [PATCH 0317/1648] when unable to find mongo driver stop cmake

Previously the mongo plugin cmake would simply print a message that it couldn't find a mongo c driver and carry on. But this means compilation of nodeos will fail because BUILD_MONGO_DB_PLUGIN is still set to ON so nodeos cmake will try to link against the plugin that is not built.

Can't just set BUILD_MONGO_DB_PLUGIN to OFF here because of cmake scoping rules

Might as well just error out; I don't think many people will set this to ON and then want the build to plow ahead anyways
---
 plugins/mongo_db_plugin/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mongo_db_plugin/CMakeLists.txt b/plugins/mongo_db_plugin/CMakeLists.txt
index 81bf1fc76ca..eb63e00ac08 100644
--- a/plugins/mongo_db_plugin/CMakeLists.txt
+++ b/plugins/mongo_db_plugin/CMakeLists.txt
@@ -13,7 +13,7 @@ if(BUILD_MONGO_DB_PLUGIN)
       find_package(libbson-static-1.0 REQUIRED)
 
   else()
-      message("Could NOT find MongoDB. mongo_db_plugin with MongoDB support will not be included.")
+      message(FATAL_ERROR "Could NOT find MongoDB. mongo_db_plugin with MongoDB support will not be included.")
       return()
   endif()
 

From db1685d6c275fc39ee9d78579583855889fe9ca5 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 8 May 2019 10:51:32 -0400
Subject: [PATCH 0318/1648] print a more appropriate message for mongo driver
 not being found now that we error out

---
 plugins/mongo_db_plugin/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mongo_db_plugin/CMakeLists.txt b/plugins/mongo_db_plugin/CMakeLists.txt
index eb63e00ac08..3fd67671616 100644
--- a/plugins/mongo_db_plugin/CMakeLists.txt
+++ b/plugins/mongo_db_plugin/CMakeLists.txt
@@ -13,7 +13,7 @@ if(BUILD_MONGO_DB_PLUGIN)
       find_package(libbson-static-1.0 REQUIRED)
 
   else()
-      message(FATAL_ERROR "Could NOT find MongoDB. mongo_db_plugin with MongoDB support will not be included.")
+      message(FATAL_ERROR "Could NOT find mongo-c-driver. Disable mongo support or ensure mongo-c-driver and mongo-cxx-driver is built and installed")
       return()
   endif()
 

From 760d3d55d045ec8642e2a2a37648f33e4795ef68 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 11:09:43 -0400
Subject: [PATCH 0319/1648] added specific branch

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index a9ae55418e7..f921dd3e749 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -8,7 +8,7 @@ steps:
 
   - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
-      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
+      - "git clone git@github.com:EOSIO/mac-anka-fleet.git -b master"
       - "cd mac-anka-fleet && . ./ensure_tag.bash"
     agents:
       - "queue=mac-anka-templater-fleet"

From ae50f904374c62b0ecba740a19dc193e40d4c46c Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 11:18:13 -0400
Subject: [PATCH 0320/1648] using BUILDKITE_PULL_REQUEST_BASE_BRANCH instead of
 BUILDKITE_BRANCH to support community PRs git push

---
 .buildkite/pipeline.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f921dd3e749..9a6602a72b1 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -8,13 +8,13 @@ steps:
 
   - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
-      - "git clone git@github.com:EOSIO/mac-anka-fleet.git -b master"
+      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
       - "cd mac-anka-fleet && . ./ensure_tag.bash"
     agents:
       - "queue=mac-anka-templater-fleet"
     env:
       REPO: "${BUILDKITE_REPO}"
-      REPO_BRANCH: "${BUILDKITE_BRANCH}"
+      REPO_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
       CHECKSUMABLE: "${CHECKSUMABLE}"
       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
@@ -30,7 +30,7 @@ steps:
   #     branch: "master"
   #     env:
   #       REPO: "${BUILDKITE_REPO}"
-  #       REPO_BRANCH: "${BUILDKITE_BRANCH}"
+  #       REPO_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
   #       CHECKSUMABLE: "${CHECKSUMABLE}"
   #       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
   #       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
@@ -45,7 +45,7 @@ steps:
 
   - label: ":darwin: [Darwin] Mojave Build"
     command:
-      - "git clone git@github.com:EOSIO/eos.git -b ${BUILDKITE_BRANCH} eos && cd eos && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
+      - "git clone git@github.com:EOSIO/eos.git -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} eos && cd eos && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
       - "tar -pczf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz eos"
     plugins:
       chef/anka#v0.4.4:

From e26d63a13dc2dc0789cae2b7af59d4540561e287 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 11:22:05 -0400
Subject: [PATCH 0321/1648] testing default to $BUILDKITE_BRANCH

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 9a6602a72b1..12d3ae5b995 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -14,7 +14,7 @@ steps:
       - "queue=mac-anka-templater-fleet"
     env:
       REPO: "${BUILDKITE_REPO}"
-      REPO_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+      REPO_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}"
       CHECKSUMABLE: "${CHECKSUMABLE}"
       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
@@ -30,7 +30,7 @@ steps:
   #     branch: "master"
   #     env:
   #       REPO: "${BUILDKITE_REPO}"
-  #       REPO_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+  #       REPO_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}"
   #       CHECKSUMABLE: "${CHECKSUMABLE}"
   #       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
   #       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
@@ -45,7 +45,7 @@ steps:
 
   - label: ":darwin: [Darwin] Mojave Build"
     command:
-      - "git clone git@github.com:EOSIO/eos.git -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} eos && cd eos && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
+      - "git clone git@github.com:EOSIO/eos.git -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH} eos && cd eos && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
       - "tar -pczf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz eos"
     plugins:
       chef/anka#v0.4.4:

From 0e52c6f9506cc80268516b88a0c0c306de6ebc11 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 18 Feb 2019 12:49:25 -0600
Subject: [PATCH 0322/1648] explicit name constructor

---
 .../include/eosio/chain/contract_types.hpp    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/contract_types.hpp b/libraries/chain/include/eosio/chain/contract_types.hpp
index ab65c445475..05b75ecc71b 100644
--- a/libraries/chain/include/eosio/chain/contract_types.hpp
+++ b/libraries/chain/include/eosio/chain/contract_types.hpp
@@ -16,11 +16,11 @@ struct newaccount {
    authority                        active;
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(newaccount);
+      return action_name( N(newaccount) );
    }
 };
 
@@ -31,11 +31,11 @@ struct setcode {
    bytes                            code;
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(setcode);
+      return action_name( N(setcode) );
    }
 };
 
@@ -44,11 +44,11 @@ struct setabi {
    bytes                            abi;
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(setabi);
+      return action_name( N(setabi) );
    }
 };
 
@@ -60,11 +60,11 @@ struct updateauth {
    authority                         auth;
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(updateauth);
+      return action_name( N(updateauth) );
    }
 };
 
@@ -78,11 +78,11 @@ struct deleteauth {
    permission_name                   permission;
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(deleteauth);
+      return action_name( N(deleteauth) );
    }
 };
 
@@ -98,11 +98,11 @@ struct linkauth {
    permission_name                   requirement;
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(linkauth);
+      return action_name( N(linkauth) );
    }
 };
 
@@ -117,11 +117,11 @@ struct unlinkauth {
    action_name                       type;
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(unlinkauth);
+      return action_name( N(unlinkauth) );
    }
 };
 
@@ -130,11 +130,11 @@ struct canceldelay {
    transaction_id_type   trx_id;
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(canceldelay);
+      return action_name( N(canceldelay) );
    }
 };
 
@@ -146,11 +146,11 @@ struct onerror {
    :sender_id(sid),sent_trx(data,data+len){}
 
    static account_name get_account() {
-      return config::system_account_name;
+      return account_name( config::system_account_name );
    }
 
    static action_name get_name() {
-      return N(onerror);
+      return action_name( N(onerror) );
    }
 };
 

From 7e2d60fbc5c87fc4e869a06a86a4ad1ee34ad9c1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 18 Feb 2019 13:18:48 -0600
Subject: [PATCH 0323/1648] Explicit name constructor

---
 libraries/chain/apply_context.cpp             | 12 +++++-----
 .../include/eosio/chain/apply_context.hpp     | 12 +++++-----
 .../chain/include/eosio/chain/config.hpp      | 22 ++++++++---------
 .../include/eosio/chain/contract_types.hpp    | 18 +++++++-------
 libraries/chain/wasm_interface.cpp            | 24 +++++++++----------
 5 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index dc7687cf05c..b364c8bac68 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -648,11 +648,11 @@ int apply_context::get_context_free_data( uint32_t index, char* buffer, size_t b
    return copy_size;
 }
 
-int apply_context::db_store_i64( uint64_t scope, uint64_t table, const account_name& payer, uint64_t id, const char* buffer, size_t buffer_size ) {
+int apply_context::db_store_i64( name scope, name table, const account_name& payer, uint64_t id, const char* buffer, size_t buffer_size ) {
    return db_store_i64( receiver, scope, table, payer, id, buffer, buffer_size);
 }
 
-int apply_context::db_store_i64( uint64_t code, uint64_t scope, uint64_t table, const account_name& payer, uint64_t id, const char* buffer, size_t buffer_size ) {
+int apply_context::db_store_i64( name code, name scope, name table, const account_name& payer, uint64_t id, const char* buffer, size_t buffer_size ) {
 //   require_write_lock( scope );
    const auto& tab = find_or_create_table( code, scope, table, payer );
    auto tableid = tab.id;
@@ -788,7 +788,7 @@ int apply_context::db_previous_i64( int iterator, uint64_t& primary ) {
    return keyval_cache.add(*itr);
 }
 
-int apply_context::db_find_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id ) {
+int apply_context::db_find_i64( name code, name scope, name table, uint64_t id ) {
    //require_read_lock( code, scope ); // redundant?
 
    const auto* tab = find_table( code, scope, table );
@@ -802,7 +802,7 @@ int apply_context::db_find_i64( uint64_t code, uint64_t scope, uint64_t table, u
    return keyval_cache.add( *obj );
 }
 
-int apply_context::db_lowerbound_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id ) {
+int apply_context::db_lowerbound_i64( name code, name scope, name table, uint64_t id ) {
    //require_read_lock( code, scope ); // redundant?
 
    const auto* tab = find_table( code, scope, table );
@@ -818,7 +818,7 @@ int apply_context::db_lowerbound_i64( uint64_t code, uint64_t scope, uint64_t ta
    return keyval_cache.add( *itr );
 }
 
-int apply_context::db_upperbound_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id ) {
+int apply_context::db_upperbound_i64( name code, name scope, name table, uint64_t id ) {
    //require_read_lock( code, scope ); // redundant?
 
    const auto* tab = find_table( code, scope, table );
@@ -834,7 +834,7 @@ int apply_context::db_upperbound_i64( uint64_t code, uint64_t scope, uint64_t ta
    return keyval_cache.add( *itr );
 }
 
-int apply_context::db_end_i64( uint64_t code, uint64_t scope, uint64_t table ) {
+int apply_context::db_end_i64( name code, name scope, name table ) {
    //require_read_lock( code, scope ); // redundant?
 
    const auto* tab = find_table( code, scope, table );
diff --git a/libraries/chain/include/eosio/chain/apply_context.hpp b/libraries/chain/include/eosio/chain/apply_context.hpp
index ce7ae2bdae7..6173dbcd07a 100644
--- a/libraries/chain/include/eosio/chain/apply_context.hpp
+++ b/libraries/chain/include/eosio/chain/apply_context.hpp
@@ -514,16 +514,16 @@ class apply_context {
 
       void update_db_usage( const account_name& payer, int64_t delta );
 
-      int  db_store_i64( uint64_t scope, uint64_t table, const account_name& payer, uint64_t id, const char* buffer, size_t buffer_size );
+      int  db_store_i64( name scope, name table, const account_name& payer, uint64_t id, const char* buffer, size_t buffer_size );
       void db_update_i64( int iterator, account_name payer, const char* buffer, size_t buffer_size );
       void db_remove_i64( int iterator );
       int  db_get_i64( int iterator, char* buffer, size_t buffer_size );
       int  db_next_i64( int iterator, uint64_t& primary );
       int  db_previous_i64( int iterator, uint64_t& primary );
-      int  db_find_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id );
-      int  db_lowerbound_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id );
-      int  db_upperbound_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id );
-      int  db_end_i64( uint64_t code, uint64_t scope, uint64_t table );
+      int  db_find_i64( name code, name scope, name table, uint64_t id );
+      int  db_lowerbound_i64( name code, name scope, name table, uint64_t id );
+      int  db_upperbound_i64( name code, name scope, name table, uint64_t id );
+      int  db_end_i64( name code, name scope, name table );
 
    private:
 
@@ -531,7 +531,7 @@ class apply_context {
       const table_id_object& find_or_create_table( name code, name scope, name table, const account_name &payer );
       void                   remove_table( const table_id_object& tid );
 
-      int  db_store_i64( uint64_t code, uint64_t scope, uint64_t table, const account_name& payer, uint64_t id, const char* buffer, size_t buffer_size );
+      int  db_store_i64( name code, name scope, name table, const account_name& payer, uint64_t id, const char* buffer, size_t buffer_size );
 
 
    /// Misc methods:
diff --git a/libraries/chain/include/eosio/chain/config.hpp b/libraries/chain/include/eosio/chain/config.hpp
index a780cf42832..5e52c07c78c 100644
--- a/libraries/chain/include/eosio/chain/config.hpp
+++ b/libraries/chain/include/eosio/chain/config.hpp
@@ -23,21 +23,21 @@ const static auto default_state_size            = 1*1024*1024*1024ll;
 const static auto default_state_guard_size      =    128*1024*1024ll;
 
 
-const static uint64_t system_account_name    = N(eosio);
-const static uint64_t null_account_name      = N(eosio.null);
-const static uint64_t producers_account_name = N(eosio.prods);
+const static name system_account_name    { N(eosio) };
+const static name null_account_name      { N(eosio.null) };
+const static name producers_account_name { N(eosio.prods) };
 
 // Active permission of producers account requires greater than 2/3 of the producers to authorize
-const static uint64_t majority_producers_permission_name = N(prod.major); // greater than 1/2 of producers needed to authorize
-const static uint64_t minority_producers_permission_name = N(prod.minor); // greater than 1/3 of producers needed to authorize0
+const static name majority_producers_permission_name { N(prod.major) }; // greater than 1/2 of producers needed to authorize
+const static name minority_producers_permission_name { N(prod.minor) }; // greater than 1/3 of producers needed to authorize0
 
-const static uint64_t eosio_auth_scope       = N(eosio.auth);
-const static uint64_t eosio_all_scope        = N(eosio.all);
+const static name eosio_auth_scope       { N(eosio.auth) };
+const static name eosio_all_scope        { N(eosio.all) };
 
-const static uint64_t active_name = N(active);
-const static uint64_t owner_name  = N(owner);
-const static uint64_t eosio_any_name = N(eosio.any);
-const static uint64_t eosio_code_name = N(eosio.code);
+const static name active_name     { N(active) };
+const static name owner_name      { N(owner) };
+const static name eosio_any_name  { N(eosio.any) };
+const static name eosio_code_name { N(eosio.code) };
 
 const static int      block_interval_ms = 500;
 const static int      block_interval_us = block_interval_ms*1000;
diff --git a/libraries/chain/include/eosio/chain/contract_types.hpp b/libraries/chain/include/eosio/chain/contract_types.hpp
index 05b75ecc71b..adb3391db2d 100644
--- a/libraries/chain/include/eosio/chain/contract_types.hpp
+++ b/libraries/chain/include/eosio/chain/contract_types.hpp
@@ -16,7 +16,7 @@ struct newaccount {
    authority                        active;
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
@@ -31,7 +31,7 @@ struct setcode {
    bytes                            code;
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
@@ -44,7 +44,7 @@ struct setabi {
    bytes                            abi;
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
@@ -60,7 +60,7 @@ struct updateauth {
    authority                         auth;
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
@@ -78,7 +78,7 @@ struct deleteauth {
    permission_name                   permission;
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
@@ -98,7 +98,7 @@ struct linkauth {
    permission_name                   requirement;
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
@@ -117,7 +117,7 @@ struct unlinkauth {
    action_name                       type;
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
@@ -130,7 +130,7 @@ struct canceldelay {
    transaction_id_type   trx_id;
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
@@ -146,7 +146,7 @@ struct onerror {
    :sender_id(sid),sent_trx(data,data+len){}
 
    static account_name get_account() {
-      return account_name( config::system_account_name );
+      return config::system_account_name;
    }
 
    static action_name get_name() {
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 6ad6a9cb131..7b087af3d6c 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -1163,7 +1163,7 @@ class console_api : public context_aware_api {
 
 #define DB_API_METHOD_WRAPPERS_SIMPLE_SECONDARY(IDX, TYPE)\
       int db_##IDX##_store( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, const TYPE& secondary ) {\
-         return context.IDX.store( scope, table, payer, id, secondary );\
+         return context.IDX.store( name(scope), name(table,) name(payer), id, secondary );\
       }\
       void db_##IDX##_update( int iterator, uint64_t payer, const TYPE& secondary ) {\
          return context.IDX.update( iterator, payer, secondary );\
@@ -1172,19 +1172,19 @@ class console_api : public context_aware_api {
          return context.IDX.remove( iterator );\
       }\
       int db_##IDX##_find_secondary( uint64_t code, uint64_t scope, uint64_t table, const TYPE& secondary, uint64_t& primary ) {\
-         return context.IDX.find_secondary(code, scope, table, secondary, primary);\
+         return context.IDX.find_secondary(name(code), name(scope), name(table), secondary, primary);\
       }\
       int db_##IDX##_find_primary( uint64_t code, uint64_t scope, uint64_t table, TYPE& secondary, uint64_t primary ) {\
-         return context.IDX.find_primary(code, scope, table, secondary, primary);\
+         return context.IDX.find_primary(name(code), name(scope), name(table), secondary, primary);\
       }\
       int db_##IDX##_lowerbound( uint64_t code, uint64_t scope, uint64_t table,  TYPE& secondary, uint64_t& primary ) {\
-         return context.IDX.lowerbound_secondary(code, scope, table, secondary, primary);\
+         return context.IDX.lowerbound_secondary(name(code), name(scope), name(table), secondary, primary);\
       }\
       int db_##IDX##_upperbound( uint64_t code, uint64_t scope, uint64_t table,  TYPE& secondary, uint64_t& primary ) {\
-         return context.IDX.upperbound_secondary(code, scope, table, secondary, primary);\
+         return context.IDX.upperbound_secondary(name(code), name(scope), name(table), secondary, primary);\
       }\
       int db_##IDX##_end( uint64_t code, uint64_t scope, uint64_t table ) {\
-         return context.IDX.end_secondary(code, scope, table);\
+         return context.IDX.end_secondary(name(code), name(scope), name(table));\
       }\
       int db_##IDX##_next( int iterator, uint64_t& primary  ) {\
          return context.IDX.next_secondary(iterator, primary);\
@@ -1291,10 +1291,10 @@ class database_api : public context_aware_api {
       using context_aware_api::context_aware_api;
 
       int db_store_i64( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, array_ptr<const char> buffer, size_t buffer_size ) {
-         return context.db_store_i64( scope, table, payer, id, buffer, buffer_size );
+         return context.db_store_i64( name(scope), name(table), name(payer), id, buffer, buffer_size );
       }
       void db_update_i64( int itr, uint64_t payer, array_ptr<const char> buffer, size_t buffer_size ) {
-         context.db_update_i64( itr, payer, buffer, buffer_size );
+         context.db_update_i64( itr, name(payer), buffer, buffer_size );
       }
       void db_remove_i64( int itr ) {
          context.db_remove_i64( itr );
@@ -1309,16 +1309,16 @@ class database_api : public context_aware_api {
          return context.db_previous_i64(itr, primary);
       }
       int db_find_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id ) {
-         return context.db_find_i64( code, scope, table, id );
+         return context.db_find_i64( name(code), name(scope), name(table), id );
       }
       int db_lowerbound_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id ) {
-         return context.db_lowerbound_i64( code, scope, table, id );
+         return context.db_lowerbound_i64( name(code), name(scope), name(table), id );
       }
       int db_upperbound_i64( uint64_t code, uint64_t scope, uint64_t table, uint64_t id ) {
-         return context.db_upperbound_i64( code, scope, table, id );
+         return context.db_upperbound_i64( name(code), name(scope), name(table), id );
       }
       int db_end_i64( uint64_t code, uint64_t scope, uint64_t table ) {
-         return context.db_end_i64( code, scope, table );
+         return context.db_end_i64( name(code), name(scope), name(table) );
       }
 
       DB_API_METHOD_WRAPPERS_SIMPLE_SECONDARY(idx64,  uint64_t)

From 2aa62816ea2426eee2f5ddb75fb60dd510b062dc Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 7 May 2019 17:42:11 -0400
Subject: [PATCH 0324/1648] add debug_mode to ship

---
 .../state_history_serialization.hpp           | 117 +++++++++++++-----
 .../state_history_plugin.cpp                  |   9 +-
 2 files changed, 93 insertions(+), 33 deletions(-)

diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index e11b7e5f4f7..07b241aeec6 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -18,6 +18,8 @@
 #include <eosio/chain_plugin/chain_plugin.hpp>
 #include <eosio/state_history_plugin/state_history_plugin.hpp>
 
+#include <type_traits>
+
 template <typename T>
 struct history_serial_wrapper {
    const chainbase::database& db;
@@ -25,7 +27,7 @@ struct history_serial_wrapper {
 };
 
 template <typename T>
-history_serial_wrapper<T> make_history_serial_wrapper(const chainbase::database& db, const T& obj) {
+history_serial_wrapper<std::decay_t<T>> make_history_serial_wrapper(const chainbase::database& db, const T& obj) {
    return {db, obj};
 }
 
@@ -37,7 +39,8 @@ struct history_context_wrapper {
 };
 
 template <typename P, typename T>
-history_context_wrapper<P, T> make_history_context_wrapper(const chainbase::database& db, P& context, const T& obj) {
+history_context_wrapper<std::decay_t<P>, std::decay_t<T>>
+make_history_context_wrapper(const chainbase::database& db, const P& context, const T& obj) {
    return {db, context, obj};
 }
 
@@ -67,6 +70,16 @@ datastream<ST>& history_serialize_container(datastream<ST>& ds, const chainbase:
    return ds;
 }
 
+template <typename ST, typename P, typename T>
+datastream<ST>& history_context_serialize_container(datastream<ST>& ds, const chainbase::database& db, const P& context,
+                                                    const std::vector<T>& v) {
+   fc::raw::pack(ds, unsigned_int(v.size()));
+   for (const auto& x : v) {
+      ds << make_history_context_wrapper(db, context, x);
+   }
+   return ds;
+}
+
 template <typename ST, typename T>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_big_vector_wrapper<T>& obj) {
    FC_ASSERT(obj.obj.size() <= 1024 * 1024 * 1024);
@@ -96,6 +109,11 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<std:
    return history_serialize_container(ds, obj.db, obj.obj);
 }
 
+template <typename ST, typename P, typename T>
+datastream<ST>& operator<<(datastream<ST>& ds, const history_context_wrapper<P, std::vector<T>>& obj) {
+   return history_context_serialize_container(ds, obj.db, obj.context, obj.obj);
+}
+
 template <typename ST, typename First, typename Second>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<std::pair<First, Second>>& obj) {
    fc::raw::pack(ds, obj.obj.first);
@@ -151,8 +169,8 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
 
 template <typename ST>
 datastream<ST>&
-operator<<(datastream<ST>&                                                                                     ds,
-           const history_context_wrapper<const eosio::chain::table_id_object, eosio::chain::key_value_object>& obj) {
+operator<<(datastream<ST>&                                                                               ds,
+           const history_context_wrapper<eosio::chain::table_id_object, eosio::chain::key_value_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
    fc::raw::pack(ds, as_type<uint64_t>(obj.context.code.value));
    fc::raw::pack(ds, as_type<uint64_t>(obj.context.scope.value));
@@ -208,36 +226,36 @@ datastream<ST>& serialize_secondary_index(datastream<ST>& ds, const eosio::chain
 
 template <typename ST>
 datastream<ST>&
-operator<<(datastream<ST>&                                                                                   ds,
-           const history_context_wrapper<const eosio::chain::table_id_object, eosio::chain::index64_object>& obj) {
+operator<<(datastream<ST>&                                                                             ds,
+           const history_context_wrapper<eosio::chain::table_id_object, eosio::chain::index64_object>& obj) {
    return serialize_secondary_index(ds, obj.context, obj.obj);
 }
 
 template <typename ST>
 datastream<ST>&
-operator<<(datastream<ST>&                                                                                    ds,
-           const history_context_wrapper<const eosio::chain::table_id_object, eosio::chain::index128_object>& obj) {
+operator<<(datastream<ST>&                                                                              ds,
+           const history_context_wrapper<eosio::chain::table_id_object, eosio::chain::index128_object>& obj) {
    return serialize_secondary_index(ds, obj.context, obj.obj);
 }
 
 template <typename ST>
 datastream<ST>&
-operator<<(datastream<ST>&                                                                                    ds,
-           const history_context_wrapper<const eosio::chain::table_id_object, eosio::chain::index256_object>& obj) {
+operator<<(datastream<ST>&                                                                              ds,
+           const history_context_wrapper<eosio::chain::table_id_object, eosio::chain::index256_object>& obj) {
    return serialize_secondary_index(ds, obj.context, obj.obj);
 }
 
 template <typename ST>
 datastream<ST>&
-operator<<(datastream<ST>&                                                                                        ds,
-           const history_context_wrapper<const eosio::chain::table_id_object, eosio::chain::index_double_object>& obj) {
+operator<<(datastream<ST>&                                                                                  ds,
+           const history_context_wrapper<eosio::chain::table_id_object, eosio::chain::index_double_object>& obj) {
    return serialize_secondary_index(ds, obj.context, obj.obj);
 }
 
 template <typename ST>
 datastream<ST>& operator<<(
-    datastream<ST>&                                                                                             ds,
-    const history_context_wrapper<const eosio::chain::table_id_object, eosio::chain::index_long_double_object>& obj) {
+    datastream<ST>&                                                                                       ds,
+    const history_context_wrapper<eosio::chain::table_id_object, eosio::chain::index_long_double_object>& obj) {
    return serialize_secondary_index(ds, obj.context, obj.obj);
 }
 
@@ -516,8 +534,25 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
    return ds;
 }
 
+inline fc::optional<uint64_t> cap_error_code( const fc::optional<uint64_t>& error_code ) {
+   fc::optional<uint64_t> result;
+
+   if (!error_code) return result;
+
+   const uint64_t upper_limit = static_cast<uint64_t>(eosio::chain::system_error_code::generic_system_error);
+
+   if (*error_code >= upper_limit) {
+      result = upper_limit;
+      return result;
+   }
+
+   result = error_code;
+   return result;
+}
+
 template <typename ST>
-datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::action_trace>& obj) {
+datastream<ST>& operator<<(datastream<ST>& ds, const history_context_wrapper<bool, eosio::chain::action_trace>& obj) {
+   bool  debug_mode = obj.context;
    fc::raw::pack(ds, fc::unsigned_int(0));
    fc::raw::pack(ds, as_type<fc::unsigned_int>(obj.obj.action_ordinal));
    fc::raw::pack(ds, as_type<fc::unsigned_int>(obj.obj.creator_action_ordinal));
@@ -528,23 +563,33 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.receiver.value));
    fc::raw::pack(ds, make_history_serial_wrapper(obj.db, as_type<eosio::chain::action>(obj.obj.act)));
    fc::raw::pack(ds, as_type<bool>(obj.obj.context_free));
-   fc::raw::pack(ds, as_type<int64_t>(obj.obj.elapsed.count()));
-   fc::raw::pack(ds, as_type<std::string>(obj.obj.console));
+   fc::raw::pack(ds, as_type<int64_t>(debug_mode ? obj.obj.elapsed.count() : 0));
+   if (debug_mode)
+      fc::raw::pack(ds, as_type<std::string>(obj.obj.console));
+   else
+      fc::raw::pack(ds, std::string{});
    history_serialize_container(ds, obj.db, as_type<flat_set<eosio::chain::account_delta>>(obj.obj.account_ram_deltas));
 
    fc::optional<std::string> e;
-   if (obj.obj.except)
-      e = obj.obj.except->to_string();
+   if (obj.obj.except) {
+      if (debug_mode)
+         e = obj.obj.except->to_string();
+      else
+         e = "Y";
+   }
    fc::raw::pack(ds, as_type<fc::optional<std::string>>(e));
-   fc::raw::pack(ds, as_type<fc::optional<uint64_t>>(obj.obj.error_code));
+   fc::raw::pack(ds, as_type<fc::optional<uint64_t>>(debug_mode ? obj.obj.error_code
+                                                                : cap_error_code(obj.obj.error_code)));
 
    return ds;
 }
 
 template <typename ST>
-datastream<ST>& operator<<(datastream<ST>&                                                             ds,
-                           const history_context_wrapper<uint8_t, eosio::augmented_transaction_trace>& obj) {
+datastream<ST>& operator<<(datastream<ST>&                                                    ds,
+                           const history_context_wrapper<std::pair<uint8_t, bool>,
+                                                         eosio::augmented_transaction_trace>& obj) {
    auto& trace = *obj.obj.trace;
+   bool  debug_mode = obj.context.second;
    fc::raw::pack(ds, fc::unsigned_int(0));
    fc::raw::pack(ds, as_type<eosio::chain::transaction_id_type>(trace.id));
    if (trace.receipt) {
@@ -555,14 +600,15 @@ datastream<ST>& operator<<(datastream<ST>&
       fc::raw::pack(ds, as_type<uint32_t>(trace.receipt->cpu_usage_us));
       fc::raw::pack(ds, as_type<fc::unsigned_int>(trace.receipt->net_usage_words));
    } else {
-      fc::raw::pack(ds, uint8_t(obj.context));
+      fc::raw::pack(ds, uint8_t(obj.context.first));
       fc::raw::pack(ds, uint32_t(0));
       fc::raw::pack(ds, fc::unsigned_int(0));
    }
-   fc::raw::pack(ds, as_type<int64_t>(trace.elapsed.count()));
+   fc::raw::pack(ds, as_type<int64_t>(debug_mode ? trace.elapsed.count() : 0));
    fc::raw::pack(ds, as_type<uint64_t>(trace.net_usage));
    fc::raw::pack(ds, as_type<bool>(trace.scheduled));
-   history_serialize_container(ds, obj.db, as_type<std::vector<eosio::chain::action_trace>>(trace.action_traces));
+   history_context_serialize_container(ds, obj.db, debug_mode,
+                                       as_type<std::vector<eosio::chain::action_trace>>(trace.action_traces));
 
    fc::raw::pack(ds, bool(trace.account_ram_delta));
    if (trace.account_ram_delta) {
@@ -571,19 +617,25 @@ datastream<ST>& operator<<(datastream<ST>&
    }
 
    fc::optional<std::string> e;
-   if (trace.except)
-      e = trace.except->to_string();
+   if (trace.except) {
+      if (debug_mode)
+         e = trace.except->to_string();
+      else
+         e = "Y";
+   }
    fc::raw::pack(ds, as_type<fc::optional<std::string>>(e));
-   fc::raw::pack(ds, as_type<fc::optional<uint64_t>>(trace.error_code));
+   fc::raw::pack(ds, as_type<fc::optional<uint64_t>>(debug_mode ? trace.error_code
+                                                                : cap_error_code(trace.error_code)));
 
    fc::raw::pack(ds, bool(trace.failed_dtrx_trace));
    if (trace.failed_dtrx_trace) {
       uint8_t stat = eosio::chain::transaction_receipt_header::hard_fail;
       if (trace.receipt && trace.receipt->status.value == eosio::chain::transaction_receipt_header::soft_fail)
          stat = eosio::chain::transaction_receipt_header::soft_fail;
+      std::pair<uint8_t, bool> context = std::make_pair(stat, debug_mode);
       fc::raw::pack( //
           ds, make_history_context_wrapper(
-                  obj.db, stat, eosio::augmented_transaction_trace{trace.failed_dtrx_trace, obj.obj.partial}));
+                  obj.db, context, eosio::augmented_transaction_trace{trace.failed_dtrx_trace, obj.obj.partial}));
    }
 
    bool include_partial = obj.obj.partial && !trace.failed_dtrx_trace;
@@ -606,9 +658,10 @@ datastream<ST>& operator<<(datastream<ST>&
 }
 
 template <typename ST>
-datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::augmented_transaction_trace>& obj) {
-   uint8_t stat = eosio::chain::transaction_receipt_header::hard_fail;
-   ds << make_history_context_wrapper(obj.db, stat, obj.obj);
+datastream<ST>& operator<<(datastream<ST>&                                                           ds,
+                           const history_context_wrapper<bool, eosio::augmented_transaction_trace>&  obj) {
+   std::pair<uint8_t, bool> context = std::make_pair(eosio::chain::transaction_receipt_header::hard_fail, obj.context);
+   ds << make_history_context_wrapper(obj.db, context, obj.obj);
    return ds;
 }
 
diff --git a/plugins/state_history_plugin/state_history_plugin.cpp b/plugins/state_history_plugin/state_history_plugin.cpp
index f0579891dee..0d6d33fb34a 100644
--- a/plugins/state_history_plugin/state_history_plugin.cpp
+++ b/plugins/state_history_plugin/state_history_plugin.cpp
@@ -109,6 +109,7 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
    chain_plugin*                                              chain_plug = nullptr;
    fc::optional<state_history_log>                            trace_log;
    fc::optional<state_history_log>                            chain_state_log;
+   bool                                                       trace_debug_mode = false;
    bool                                                       stopping = false;
    fc::optional<scoped_connection>                            applied_transaction_connection;
    fc::optional<scoped_connection>                            accepted_block_connection;
@@ -441,7 +442,7 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
       onblock_trace.reset();
 
       auto& db         = chain_plug->chain().db();
-      auto  traces_bin = zlib_compress_bytes(fc::raw::pack(make_history_serial_wrapper(db, traces)));
+      auto  traces_bin = zlib_compress_bytes(fc::raw::pack(make_history_context_wrapper(db, trace_debug_mode, traces)));
       EOS_ASSERT(traces_bin.size() == (uint32_t)traces_bin.size(), plugin_exception, "traces is too big");
 
       state_history_log_header header{.magic        = ship_magic(ship_current_version),
@@ -570,6 +571,8 @@ void state_history_plugin::set_program_options(options_description& cli, options
    options("state-history-endpoint", bpo::value<string>()->default_value("127.0.0.1:8080"),
            "the endpoint upon which to listen for incoming connections. Caution: only expose this port to "
            "your internal network.");
+   options("trace-history-debug-mode", bpo::bool_switch()->default_value(false),
+           "enable debug mode for trace history");
 }
 
 void state_history_plugin::plugin_initialize(const variables_map& options) {
@@ -607,6 +610,10 @@ void state_history_plugin::plugin_initialize(const variables_map& options) {
       }
       boost::filesystem::create_directories(state_history_dir);
 
+      if (options.at("trace-history-debug-mode").as<bool>()) {
+         my->trace_debug_mode = true;
+      }
+
       if (options.at("trace-history").as<bool>())
          my->trace_log.emplace("trace_history", (state_history_dir / "trace_history.log").string(),
                                (state_history_dir / "trace_history.index").string());

From 8b2182232f330bb529bcb508b81dc7c098fbd4de Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 8 May 2019 10:19:52 -0400
Subject: [PATCH 0325/1648] avoid modifying resource_limits_config_object on
 each block if the values do not change

---
 .../include/eosio/chain/resource_limits.hpp     | 17 +++++++++++++++++
 libraries/chain/resource_limits.cpp             |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/libraries/chain/include/eosio/chain/resource_limits.hpp b/libraries/chain/include/eosio/chain/resource_limits.hpp
index 4b0c58beeb0..08d1d1f7c3b 100644
--- a/libraries/chain/include/eosio/chain/resource_limits.hpp
+++ b/libraries/chain/include/eosio/chain/resource_limits.hpp
@@ -12,6 +12,14 @@ namespace eosio { namespace chain { namespace resource_limits {
          static_assert(std::is_integral<T>::value, "ratios must have integral types");
          T numerator;
          T denominator;
+
+         friend inline bool operator ==( const ratio& lhs, const ratio& rhs ) {
+            return std::tie(lhs.numerator, lhs.denominator) == std::tie(rhs.numerator, rhs.denominator);
+         }
+
+         friend inline bool operator !=( const ratio& lhs, const ratio& rhs ) {
+            return !(lhs == rhs);
+         }
       };
    }
 
@@ -27,6 +35,15 @@ namespace eosio { namespace chain { namespace resource_limits {
       ratio    expand_rate;       // the rate at which an uncongested resource expands its limits
 
       void validate()const; // throws if the parameters do not satisfy basic sanity checks
+
+      friend inline bool operator ==( const elastic_limit_parameters& lhs, const elastic_limit_parameters& rhs ) {
+         return std::tie(lhs.target, lhs.max, lhs.periods, lhs.max_multiplier, lhs.contract_rate, lhs.expand_rate)
+                  == std::tie(rhs.target, rhs.max, rhs.periods, rhs.max_multiplier, rhs.contract_rate, rhs.expand_rate);
+      }
+
+      friend inline bool operator !=( const elastic_limit_parameters& lhs, const elastic_limit_parameters& rhs ) {
+         return !(lhs == rhs);
+      }
    };
 
    struct account_resource_limit {
diff --git a/libraries/chain/resource_limits.cpp b/libraries/chain/resource_limits.cpp
index 43ced268542..d98ca79fbc8 100644
--- a/libraries/chain/resource_limits.cpp
+++ b/libraries/chain/resource_limits.cpp
@@ -102,6 +102,8 @@ void resource_limits_manager::set_block_parameters(const elastic_limit_parameter
    cpu_limit_parameters.validate();
    net_limit_parameters.validate();
    const auto& config = _db.get<resource_limits_config_object>();
+   if( config.cpu_limit_parameters == cpu_limit_parameters && config.net_limit_parameters == net_limit_parameters )
+      return;
    _db.modify(config, [&](resource_limits_config_object& c){
       c.cpu_limit_parameters = cpu_limit_parameters;
       c.net_limit_parameters = net_limit_parameters;

From e190db92a275a0fd3ee8e647e24cdff491abdecd Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 12:00:38 -0400
Subject: [PATCH 0326/1648] Fixes for community PR/forked repo

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 12d3ae5b995..b51a7bfb81a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -14,7 +14,7 @@ steps:
       - "queue=mac-anka-templater-fleet"
     env:
       REPO: "${BUILDKITE_REPO}"
-      REPO_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}"
+      REPO_COMMIT: "${BUILDKITE_COMMIT}"
       CHECKSUMABLE: "${CHECKSUMABLE}"
       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
@@ -30,7 +30,7 @@ steps:
   #     branch: "master"
   #     env:
   #       REPO: "${BUILDKITE_REPO}"
-  #       REPO_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}"
+  #       REPO_COMMIT: "${BUILDKITE_COMMIT}"
   #       CHECKSUMABLE: "${CHECKSUMABLE}"
   #       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
   #       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
@@ -45,7 +45,7 @@ steps:
 
   - label: ":darwin: [Darwin] Mojave Build"
     command:
-      - "git clone git@github.com:EOSIO/eos.git -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH} eos && cd eos && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
       - "tar -pczf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz eos"
     plugins:
       chef/anka#v0.4.4:

From ade83d8500c906e76e68e4b4048b5f55e9e2bef2 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 12:03:54 -0400
Subject: [PATCH 0327/1648] quick fix

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b51a7bfb81a..09bc02dc801 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -13,7 +13,7 @@ steps:
     agents:
       - "queue=mac-anka-templater-fleet"
     env:
-      REPO: "${BUILDKITE_REPO}"
+      REPO: "${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}"
       REPO_COMMIT: "${BUILDKITE_COMMIT}"
       CHECKSUMABLE: "${CHECKSUMABLE}"
       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"

From 0c5231cb8ab3ed23ded273aa2555004f17487d5c Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 8 May 2019 12:32:20 -0400
Subject: [PATCH 0328/1648] final fixes

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 09bc02dc801..af1fc1044de 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -18,7 +18,7 @@ steps:
       CHECKSUMABLE: "${CHECKSUMABLE}"
       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-      TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
+      TAG_COMMANDS: "./scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
       PROJECT_TAG: "${MAC_TAG}"
     timeout: 60
 

From 74509255bd3544344405fe96e7abd62cf4b29224 Mon Sep 17 00:00:00 2001
From: DU Jiaen <37097018+taokayan@users.noreply.github.com>
Date: Thu, 9 May 2019 09:46:33 +0800
Subject: [PATCH 0329/1648] Update CMakeLists.txt

---
 tests/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 18e91b17101..ba87969bb80 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -103,7 +103,7 @@ add_test(NAME nodeos_voting_lr_test COMMAND tests/nodeos_voting_test.py -v --wal
 set_property(TEST nodeos_voting_lr_test PROPERTY LABELS long_running_tests)
 
 add_test(NAME nodeos_under_min_avail_ram_lr_test COMMAND tests/nodeos_under_min_avail_ram.py -v --wallet-port 9904 --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST nodeos_under_min_avail_ram_lr_test PROPERTY LABELS nonparallelizable_tests)
+set_property(TEST nodeos_under_min_avail_ram_lr_test PROPERTY LABELS long_running_tests)
 
 add_test(NAME nodeos_irreversible_mode_lr_test COMMAND tests/nodeos_irreversible_mode_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_irreversible_mode_lr_test PROPERTY LABELS long_running_tests)

From adddc6cac4a688c12a951f43a48a1d78e111e557 Mon Sep 17 00:00:00 2001
From: Jeeyong Um <conr2d@gmail.com>
Date: Thu, 9 May 2019 11:23:06 +0900
Subject: [PATCH 0330/1648] Add REX balance info to cleos get account command

---
 plugins/chain_plugin/chain_plugin.cpp                | 11 +++++++++++
 .../include/eosio/chain_plugin/chain_plugin.hpp      |  3 ++-
 programs/cleos/main.cpp                              | 12 ++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 6b0247afd0d..79f16e46e8c 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -2233,6 +2233,17 @@ read_only::get_account_results read_only::get_account( const get_account_params&
             result.voter_info = abis.binary_to_variant( "voter_info", data, abi_serializer_max_time, shorten_abi_errors );
          }
       }
+
+      t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple( config::system_account_name, config::system_account_name, N(rexbal) ));
+      if (t_id != nullptr) {
+         const auto &idx = d.get_index<key_value_index, by_scope_primary>();
+         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name ));
+         if( it != idx.end() ) {
+            vector<char> data;
+            copy_inline_row(*it, data);
+            result.rex_info = abis.binary_to_variant( "rex_balance", data, abi_serializer_max_time, shorten_abi_errors );
+         }
+      }
    }
    return result;
 }
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 6c85c354481..645bdd5aac0 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -155,6 +155,7 @@ class read_only {
       fc::variant                self_delegated_bandwidth;
       fc::variant                refund_request;
       fc::variant                voter_info;
+      fc::variant                rex_info;
    };
 
    struct get_account_params {
@@ -760,7 +761,7 @@ FC_REFLECT( eosio::chain_apis::read_only::get_scheduled_transactions_result, (tr
 FC_REFLECT( eosio::chain_apis::read_only::get_account_results,
             (account_name)(head_block_num)(head_block_time)(privileged)(last_code_update)(created)
             (core_liquid_balance)(ram_quota)(net_weight)(cpu_weight)(net_limit)(cpu_limit)(ram_usage)(permissions)
-            (total_resources)(self_delegated_bandwidth)(refund_request)(voter_info) )
+            (total_resources)(self_delegated_bandwidth)(refund_request)(voter_info)(rex_info) )
 // @swap code_hash
 FC_REFLECT( eosio::chain_apis::read_only::get_code_results, (account_name)(code_hash)(wast)(wasm)(abi) )
 FC_REFLECT( eosio::chain_apis::read_only::get_code_hash_results, (account_name)(code_hash) )
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 59fc67679e6..2711ba0f1c4 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -2288,6 +2288,18 @@ void get_account( const string& accountName, const string& coresym, bool json_fo
          std::cout << std::endl;
       }
 
+      if( res.rex_info.is_object() ) {
+         auto& obj = res.rex_info.get_object();
+         asset vote_stake = asset::from_string( obj["vote_stake"].as_string() );
+         asset rex_balance = asset::from_string( obj["rex_balance"].as_string() );
+         std::cout << rex_balance.get_symbol().name() << " balances: " << std::endl;
+         std::cout << indent << std::left << std::setw(11)
+                   << "balance:" << std::right << std::setw(18) << rex_balance << std::endl;
+         std::cout << indent << std::left << std::setw(11)
+                   << "staked:" << std::right << std::setw(18) << vote_stake << std::endl;
+         std::cout << std::endl;
+      }
+
       if ( res.voter_info.is_object() ) {
          auto& obj = res.voter_info.get_object();
          string proxy = obj["proxy"].as_string();

From b7641fde73ded3b18d6462aab49c7936b45d2ddb Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 9 May 2019 03:05:15 -0400
Subject: [PATCH 0331/1648] more fixes

---
 libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index a6a1407e5a4..e9f5e05fe49 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -36,7 +36,6 @@ namespace eosio { namespace wasm_backend {
       //size_t i = std::tuple_size<Args>::value-1;
       using ptr_ty = typename S::type;
       using under_ty = std::remove_pointer_t<ptr_ty>;
-      std::cout << (int*)walloc->template get_base_ptr<char>() << "val.data " << val.data.ui << "\n"; 
       auto* ptr = (ptr_ty*)((walloc->template get_base_ptr<char>())+val.data.ui);
       /*
       if constexpr (std::tuple_size<Args>::value > I) {

From 9f23c3efab65a84db5e4b25263643d3d5715c8a4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 09:30:51 -0500
Subject: [PATCH 0332/1648] Make name more explicit in both construction and
 conversion to string/uint64_t

---
 libraries/chain/include/eosio/chain/name.hpp | 118 +++++++++----------
 libraries/chain/name.cpp                     |  24 ++--
 2 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/name.hpp b/libraries/chain/include/eosio/chain/name.hpp
index 81c13145dde..80c41ef0d0e 100644
--- a/libraries/chain/include/eosio/chain/name.hpp
+++ b/libraries/chain/include/eosio/chain/name.hpp
@@ -3,9 +3,16 @@
 #include <fc/reflect/reflect.hpp>
 #include <iosfwd>
 
-namespace eosio { namespace chain {
-   using std::string;
+namespace eosio::chain {
+  struct name;
+}
+namespace fc {
+  class variant;
+  void to_variant(const eosio::chain::name& c, fc::variant& v);
+  void from_variant(const fc::variant& v, eosio::chain::name& check);
+} // fc
 
+namespace eosio::chain {
    static constexpr uint64_t char_to_symbol( char c ) {
       if( c >= 'a' && c <= 'z' )
          return (c - 'a') + 6;
@@ -14,84 +21,74 @@ namespace eosio { namespace chain {
       return 0;
    }
 
-   // Each char of the string is encoded into 5-bit chunk and left-shifted
-   // to its 5-bit slot starting with the highest slot for the first char.
-   // The 13th char, if str is long enough, is encoded into 4-bit chunk
-   // and placed in the lowest 4 bits. 64 = 12 * 5 + 4
-   static constexpr uint64_t string_to_name( const char* str )
-   {
-      uint64_t name = 0;
+   static constexpr uint64_t string_to_uint64_t( std::string_view str ) {
+      uint64_t n = 0;
       int i = 0;
       for ( ; str[i] && i < 12; ++i) {
-          // NOTE: char_to_symbol() returns char type, and without this explicit
-          // expansion to uint64 type, the compilation fails at the point of usage
-          // of string_to_name(), where the usage requires constant (compile time) expression.
-           name |= (char_to_symbol(str[i]) & 0x1f) << (64 - 5 * (i + 1));
-       }
+         // NOTE: char_to_symbol() returns char type, and without this explicit
+         // expansion to uint64 type, the compilation fails at the point of usage
+         // of string_to_name(), where the usage requires constant (compile time) expression.
+         n |= (char_to_symbol(str[i]) & 0x1f) << (64 - 5 * (i + 1));
+      }
 
       // The for-loop encoded up to 60 high bits into uint64 'name' variable,
       // if (strlen(str) > 12) then encode str[12] into the low (remaining)
       // 4 bits of 'name'
       if (i == 12)
-          name |= char_to_symbol(str[12]) & 0x0F;
-      return name;
+         n |= char_to_symbol(str[12]) & 0x0F;
+      return n;
    }
 
-#define N(X) eosio::chain::string_to_name(#X)
-
+   /// Immutable except for fc::from_variant.
    struct name {
+   private:
       uint64_t value = 0;
-      bool empty()const { return 0 == value; }
-      bool good()const  { return !empty();   }
-
-      name( const char* str )   { set(str);           } 
-      name( const string& str ) { set( str.c_str() ); }
 
-      void set( const char* str );
+      friend struct fc::reflector<name>;
+      friend void fc::from_variant(const fc::variant& v, eosio::chain::name& check);
 
-      template<typename T>
-      name( T v ):value(v){}
-      name(){}
+      void set( std::string_view str );
 
-      explicit operator string()const;
+   public:
+      constexpr bool empty()const { return 0 == value; }
+      constexpr bool good()const  { return !empty();   }
 
-      string to_string() const { return string(*this); }
+      explicit name( std::string_view str ) { set( str ); }
+      constexpr explicit name( uint64_t v ) : value(v) {}
+      constexpr name() = default;
 
-      name& operator=( uint64_t v ) {
-         value = v;
-         return *this;
-      }
-
-      name& operator=( const string& n ) {
-         value = name(n).value;
-         return *this;
-      }
-      name& operator=( const char* n ) {
-         value = name(n).value;
-         return *this;
-      }
+      std::string to_string()const;
+      constexpr uint64_t to_uint64_t()const { return value; }
 
       friend std::ostream& operator << ( std::ostream& out, const name& n ) {
-         return out << string(n);
+         return out << n.to_string();
       }
 
-      friend bool operator < ( const name& a, const name& b ) { return a.value < b.value; }
-      friend bool operator <= ( const name& a, const name& b ) { return a.value <= b.value; }
-      friend bool operator > ( const name& a, const name& b ) { return a.value > b.value; }
-      friend bool operator >=( const name& a, const name& b ) { return a.value >= b.value; }
-      friend bool operator == ( const name& a, const name& b ) { return a.value == b.value; }
+      friend constexpr bool operator < ( const name& a, const name& b ) { return a.value < b.value; }
+      friend constexpr bool operator > ( const name& a, const name& b ) { return a.value > b.value; }
+      friend constexpr bool operator <= ( const name& a, const name& b ) { return a.value <= b.value; }
+      friend constexpr bool operator >= ( const name& a, const name& b ) { return a.value >= b.value; }
+      friend constexpr bool operator == ( const name& a, const name& b ) { return a.value == b.value; }
+      friend constexpr bool operator != ( const name& a, const name& b ) { return a.value != b.value; }
 
-      friend bool operator == ( const name& a, uint64_t b ) { return a.value == b; }
-      friend bool operator != ( const name& a, uint64_t b ) { return a.value != b; }
+      friend constexpr bool operator == ( const name& a, uint64_t b ) { return a.value == b; }
+      friend constexpr bool operator != ( const name& a, uint64_t b ) { return a.value != b; }
 
-      friend bool operator != ( const name& a, const name& b ) { return a.value != b.value; }
-
-      operator bool()const            { return value; }
-      operator uint64_t()const        { return value; }
-      operator unsigned __int128()const       { return value; }
+      constexpr explicit operator bool()const { return value != 0; }
    };
 
-} } // eosio::chain
+   // Each char of the string is encoded into 5-bit chunk and left-shifted
+   // to its 5-bit slot starting with the highest slot for the first char.
+   // The 13th char, if str is long enough, is encoded into 4-bit chunk
+   // and placed in the lowest 4 bits. 64 = 12 * 5 + 4
+   static constexpr name string_to_name( std::string_view str )
+   {
+      return name( string_to_uint64_t( str ) );
+   }
+
+#define N(X) eosio::chain::string_to_name(#X)
+
+} // eosio::chain
 
 namespace std {
    template<> struct hash<eosio::chain::name> : private hash<uint64_t> {
@@ -99,16 +96,9 @@ namespace std {
       typedef typename hash<uint64_t>::result_type result_type;
       result_type operator()(const argument_type& name) const noexcept
       {
-         return hash<uint64_t>::operator()(name.value);
+         return hash<uint64_t>::operator()(name.to_uint64_t());
       }
    };
 };
 
-namespace fc {
-  class variant;
-  void to_variant(const eosio::chain::name& c, fc::variant& v);
-  void from_variant(const fc::variant& v, eosio::chain::name& check);
-} // fc
-
-
 FC_REFLECT( eosio::chain::name, (value) )
diff --git a/libraries/chain/name.cpp b/libraries/chain/name.cpp
index 7e0a7e4a621..79ffe1603d4 100644
--- a/libraries/chain/name.cpp
+++ b/libraries/chain/name.cpp
@@ -4,22 +4,22 @@
 #include <fc/exception/exception.hpp>
 #include <eosio/chain/exceptions.hpp>
 
-namespace eosio { namespace chain { 
+namespace eosio::chain {
 
-   void name::set( const char* str ) {
-      const auto len = strnlen(str, 14);
-      EOS_ASSERT(len <= 13, name_type_exception, "Name is longer than 13 characters (${name}) ", ("name", string(str)));
-      value = string_to_name(str);
-      EOS_ASSERT(to_string() == string(str), name_type_exception,
+   void name::set( std::string_view str ) {
+      const auto len = str.size();
+      EOS_ASSERT(len <= 13, name_type_exception, "Name is longer than 13 characters (${name}) ", ("name", std::string(str)));
+      value = string_to_uint64_t(str);
+      EOS_ASSERT(to_string() == str, name_type_exception,
                  "Name not properly normalized (name: ${name}, normalized: ${normalized}) ",
-                 ("name", string(str))("normalized", to_string()));
+                 ("name", std::string(str))("normalized", to_string()));
    }
 
    // keep in sync with name::to_string() in contract definition for name
-   name::operator string()const {
+   std::string name::to_string()const {
      static const char* charmap = ".12345abcdefghijklmnopqrstuvwxyz";
 
-      string str(13,'.');
+      std::string str(13,'.');
 
       uint64_t tmp = value;
       for( uint32_t i = 0; i <= 12; ++i ) {
@@ -32,9 +32,9 @@ namespace eosio { namespace chain {
       return str;
    }
 
-} } /// eosio::chain
+} // eosio::chain
 
 namespace fc {
-  void to_variant(const eosio::chain::name& c, fc::variant& v) { v = std::string(c); }
-  void from_variant(const fc::variant& v, eosio::chain::name& check) { check = v.get_string(); }
+  void to_variant(const eosio::chain::name& c, fc::variant& v) { v = c.to_string(); }
+  void from_variant(const fc::variant& v, eosio::chain::name& check) { check.set( v.get_string() ); }
 } // fc

From e1bc9f51f9cf039ae046ed977f8ebd2f47a12219 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 09:33:16 -0500
Subject: [PATCH 0333/1648] Changes for explicit name

---
 libraries/chain/apply_context.cpp             |  2 +-
 libraries/chain/authorization_manager.cpp     |  2 +-
 libraries/chain/controller.cpp                |  3 ++-
 libraries/chain/eosio_contract.cpp            |  2 +-
 .../include/eosio/chain/apply_context.hpp     | 16 ++++++------
 .../eosio/chain/contract_table_objects.hpp    |  4 +--
 .../include/eosio/chain/webassembly/wabt.hpp  |  2 +-
 .../include/eosio/chain/webassembly/wavm.hpp  |  2 +-
 libraries/chain/wasm_interface.cpp            | 26 +++++++++----------
 libraries/chain/webassembly/wabt.cpp          |  6 ++---
 libraries/chain/webassembly/wavm.cpp          |  6 ++---
 11 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index b364c8bac68..01c86764d1c 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -880,7 +880,7 @@ action_name apply_context::get_sender() const {
       const action_trace& creator_trace = trx_context.get_action_trace( trace.creator_action_ordinal );
       return creator_trace.receiver;
    }
-   return 0;
+   return action_name();
 }
 
 } } /// eosio::chain
diff --git a/libraries/chain/authorization_manager.cpp b/libraries/chain/authorization_manager.cpp
index 83988c16657..37eeba9dcc4 100644
--- a/libraries/chain/authorization_manager.cpp
+++ b/libraries/chain/authorization_manager.cpp
@@ -238,7 +238,7 @@ namespace eosio { namespace chain {
          auto link = _db.find<permission_link_object, by_action_name>(key);
          // If no specific link found, check for a contract-wide default
          if (link == nullptr) {
-            boost::get<2>(key) = "";
+            boost::get<2>(key) = {};
             link = _db.find<permission_link_object, by_action_name>(key);
          }
 
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index a80ffe4397c..ecc74372822 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -319,7 +319,8 @@ struct controller_impl {
 
 
 #define SET_APP_HANDLER( receiver, contract, action) \
-   set_apply_handler( #receiver, #contract, #action, &BOOST_PP_CAT(apply_, BOOST_PP_CAT(contract, BOOST_PP_CAT(_,action) ) ) )
+   set_apply_handler( account_name(#receiver), account_name(#contract), action_name(#action), \
+                      &BOOST_PP_CAT(apply_, BOOST_PP_CAT(contract, BOOST_PP_CAT(_,action) ) ) )
 
    SET_APP_HANDLER( eosio, eosio, newaccount );
    SET_APP_HANDLER( eosio, eosio, setcode );
diff --git a/libraries/chain/eosio_contract.cpp b/libraries/chain/eosio_contract.cpp
index 9bd9a022f22..887d00c9077 100644
--- a/libraries/chain/eosio_contract.cpp
+++ b/libraries/chain/eosio_contract.cpp
@@ -313,7 +313,7 @@ void apply_eosio_deleteauth(apply_context& context) {
       auto range = index.equal_range(boost::make_tuple(remove.account, remove.permission));
       EOS_ASSERT(range.first == range.second, action_validate_exception,
                  "Cannot delete a linked authority. Unlink the authority first. This authority is linked to ${code}::${type}.",
-                 ("code", string(range.first->code))("type", string(range.first->message_type)));
+                 ("code", range.first->code)("type", range.first->message_type));
    }
 
    const auto& permission = authorization.get_permission({remove.account, remove.permission});
diff --git a/libraries/chain/include/eosio/chain/apply_context.hpp b/libraries/chain/include/eosio/chain/apply_context.hpp
index 6173dbcd07a..d553de77b8b 100644
--- a/libraries/chain/include/eosio/chain/apply_context.hpp
+++ b/libraries/chain/include/eosio/chain/apply_context.hpp
@@ -184,7 +184,7 @@ class apply_context {
 
 //               context.require_write_lock( scope );
 
-               const auto& tab = context.find_or_create_table( context.receiver, scope, table, payer );
+               const auto& tab = context.find_or_create_table( context.receiver, name(scope), name(table), payer );
 
                const auto& obj = context.db.create<ObjectType>( [&]( auto& o ){
                   o.t_id          = tab.id;
@@ -248,7 +248,7 @@ class apply_context {
             }
 
             int find_secondary( uint64_t code, uint64_t scope, uint64_t table, secondary_key_proxy_const_type secondary, uint64_t& primary ) {
-               auto tab = context.find_table( code, scope, table );
+               auto tab = context.find_table( name(code), name(scope), name(table) );
                if( !tab ) return -1;
 
                auto table_end_itr = itr_cache.cache_table( *tab );
@@ -262,7 +262,7 @@ class apply_context {
             }
 
             int lowerbound_secondary( uint64_t code, uint64_t scope, uint64_t table, secondary_key_proxy_type secondary, uint64_t& primary ) {
-               auto tab = context.find_table( code, scope, table );
+               auto tab = context.find_table( name(code), name(scope), name(table) );
                if( !tab ) return -1;
 
                auto table_end_itr = itr_cache.cache_table( *tab );
@@ -279,7 +279,7 @@ class apply_context {
             }
 
             int upperbound_secondary( uint64_t code, uint64_t scope, uint64_t table, secondary_key_proxy_type secondary, uint64_t& primary ) {
-               auto tab = context.find_table( code, scope, table );
+               auto tab = context.find_table( name(code), name(scope), name(table) );
                if( !tab ) return -1;
 
                auto table_end_itr = itr_cache.cache_table( *tab );
@@ -296,7 +296,7 @@ class apply_context {
             }
 
             int end_secondary( uint64_t code, uint64_t scope, uint64_t table ) {
-               auto tab = context.find_table( code, scope, table );
+               auto tab = context.find_table( name(code), name(scope), name(table) );
                if( !tab ) return -1;
 
                return itr_cache.cache_table( *tab );
@@ -350,7 +350,7 @@ class apply_context {
             }
 
             int find_primary( uint64_t code, uint64_t scope, uint64_t table, secondary_key_proxy_type secondary, uint64_t primary ) {
-               auto tab = context.find_table( code, scope, table );
+               auto tab = context.find_table( name(code), name(scope), name(table) );
                if( !tab ) return -1;
 
                auto table_end_itr = itr_cache.cache_table( *tab );
@@ -363,7 +363,7 @@ class apply_context {
             }
 
             int lowerbound_primary( uint64_t code, uint64_t scope, uint64_t table, uint64_t primary ) {
-               auto tab = context.find_table( code, scope, table );
+               auto tab = context.find_table( name(code), name(scope), name(table) );
                if (!tab) return -1;
 
                auto table_end_itr = itr_cache.cache_table( *tab );
@@ -377,7 +377,7 @@ class apply_context {
             }
 
             int upperbound_primary( uint64_t code, uint64_t scope, uint64_t table, uint64_t primary ) {
-               auto tab = context.find_table( code, scope, table );
+               auto tab = context.find_table( name(code), name(scope), name(table) );
                if ( !tab ) return -1;
 
                auto table_end_itr = itr_cache.cache_table( *tab );
diff --git a/libraries/chain/include/eosio/chain/contract_table_objects.hpp b/libraries/chain/include/eosio/chain/contract_table_objects.hpp
index bc58cb3e6d9..fb02fb5e1e0 100644
--- a/libraries/chain/include/eosio/chain/contract_table_objects.hpp
+++ b/libraries/chain/include/eosio/chain/contract_table_objects.hpp
@@ -61,7 +61,7 @@ namespace eosio { namespace chain {
       id_type               id;
       table_id              t_id; //< t_id should not be changed within a chainbase modifier lambda
       uint64_t              primary_key; //< primary_key should not be changed within a chainbase modifier lambda
-      account_name          payer = 0;
+      account_name          payer;
       shared_blob           value;
    };
 
@@ -92,7 +92,7 @@ namespace eosio { namespace chain {
          typename chainbase::object<ObjectTypeId,index_object>::id_type       id;
          table_id      t_id; //< t_id should not be changed within a chainbase modifier lambda
          uint64_t      primary_key; //< primary_key should not be changed within a chainbase modifier lambda
-         account_name  payer = 0;
+         account_name  payer;
          SecondaryKey  secondary_key; //< secondary_key should not be changed within a chainbase modifier lambda
       };
 
diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index 31456dc1dda..556003c6251 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -188,7 +188,7 @@ inline auto convert_native_to_literal(const wabt_apply_instance_vars&, const dou
 
 inline auto convert_native_to_literal(const wabt_apply_instance_vars&, const name &val) {
    TypedValue tv(Type::I64);
-   tv.set_i64(val.value);
+   tv.set_i64(val.to_uint64_t());
    return tv;
 }
 
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 5bce9db8b40..a19c0b3662b 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -151,7 +151,7 @@ inline auto convert_native_to_wasm(const running_instance_context& ctx, T val) {
 }
 
 inline auto convert_native_to_wasm(const running_instance_context& ctx, const name &val) {
-   return native_to_wasm_t<const name &>(val.value);
+   return native_to_wasm_t<const name &>(val.to_uint64_t());
 }
 
 inline auto convert_native_to_wasm(const running_instance_context& ctx, const fc::time_point_sec& val) {
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 7b087af3d6c..e2a731ca972 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -1163,28 +1163,28 @@ class console_api : public context_aware_api {
 
 #define DB_API_METHOD_WRAPPERS_SIMPLE_SECONDARY(IDX, TYPE)\
       int db_##IDX##_store( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, const TYPE& secondary ) {\
-         return context.IDX.store( name(scope), name(table,) name(payer), id, secondary );\
+         return context.IDX.store( scope, table, account_name(payer), id, secondary );\
       }\
       void db_##IDX##_update( int iterator, uint64_t payer, const TYPE& secondary ) {\
-         return context.IDX.update( iterator, payer, secondary );\
+         return context.IDX.update( iterator, account_name(payer), secondary );\
       }\
       void db_##IDX##_remove( int iterator ) {\
          return context.IDX.remove( iterator );\
       }\
       int db_##IDX##_find_secondary( uint64_t code, uint64_t scope, uint64_t table, const TYPE& secondary, uint64_t& primary ) {\
-         return context.IDX.find_secondary(name(code), name(scope), name(table), secondary, primary);\
+         return context.IDX.find_secondary(code, scope, table, secondary, primary);\
       }\
       int db_##IDX##_find_primary( uint64_t code, uint64_t scope, uint64_t table, TYPE& secondary, uint64_t primary ) {\
-         return context.IDX.find_primary(name(code), name(scope), name(table), secondary, primary);\
+         return context.IDX.find_primary(code, scope, table, secondary, primary);\
       }\
       int db_##IDX##_lowerbound( uint64_t code, uint64_t scope, uint64_t table,  TYPE& secondary, uint64_t& primary ) {\
-         return context.IDX.lowerbound_secondary(name(code), name(scope), name(table), secondary, primary);\
+         return context.IDX.lowerbound_secondary(code, scope, table, secondary, primary);\
       }\
       int db_##IDX##_upperbound( uint64_t code, uint64_t scope, uint64_t table,  TYPE& secondary, uint64_t& primary ) {\
-         return context.IDX.upperbound_secondary(name(code), name(scope), name(table), secondary, primary);\
+         return context.IDX.upperbound_secondary(code, scope, table, secondary, primary);\
       }\
       int db_##IDX##_end( uint64_t code, uint64_t scope, uint64_t table ) {\
-         return context.IDX.end_secondary(name(code), name(scope), name(table));\
+         return context.IDX.end_secondary(code, scope, table);\
       }\
       int db_##IDX##_next( int iterator, uint64_t& primary  ) {\
          return context.IDX.next_secondary(iterator, primary);\
@@ -1199,14 +1199,14 @@ class console_api : public context_aware_api {
                     db_api_exception,\
                     "invalid size of secondary key array for " #IDX ": given ${given} bytes but expected ${expected} bytes",\
                     ("given",data_len)("expected",ARR_SIZE) );\
-         return context.IDX.store(scope, table, payer, id, data.value);\
+         return context.IDX.store(scope, table, account_name(payer), id, data.value);\
       }\
       void db_##IDX##_update( int iterator, uint64_t payer, array_ptr<const ARR_ELEMENT_TYPE> data, size_t data_len ) {\
          EOS_ASSERT( data_len == ARR_SIZE,\
                     db_api_exception,\
                     "invalid size of secondary key array for " #IDX ": given ${given} bytes but expected ${expected} bytes",\
                     ("given",data_len)("expected",ARR_SIZE) );\
-         return context.IDX.update(iterator, payer, data.value);\
+         return context.IDX.update(iterator, account_name(payer), data.value);\
       }\
       void db_##IDX##_remove( int iterator ) {\
          return context.IDX.remove(iterator);\
@@ -1252,11 +1252,11 @@ class console_api : public context_aware_api {
 #define DB_API_METHOD_WRAPPERS_FLOAT_SECONDARY(IDX, TYPE)\
       int db_##IDX##_store( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, const TYPE& secondary ) {\
          EOS_ASSERT( !softfloat_api::is_nan( secondary ), transaction_exception, "NaN is not an allowed value for a secondary key" );\
-         return context.IDX.store( scope, table, payer, id, secondary );\
+         return context.IDX.store( scope, table, account_name(payer), id, secondary );\
       }\
       void db_##IDX##_update( int iterator, uint64_t payer, const TYPE& secondary ) {\
          EOS_ASSERT( !softfloat_api::is_nan( secondary ), transaction_exception, "NaN is not an allowed value for a secondary key" );\
-         return context.IDX.update( iterator, payer, secondary );\
+         return context.IDX.update( iterator, account_name(payer), secondary );\
       }\
       void db_##IDX##_remove( int iterator ) {\
          return context.IDX.remove( iterator );\
@@ -1291,10 +1291,10 @@ class database_api : public context_aware_api {
       using context_aware_api::context_aware_api;
 
       int db_store_i64( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, array_ptr<const char> buffer, size_t buffer_size ) {
-         return context.db_store_i64( name(scope), name(table), name(payer), id, buffer, buffer_size );
+         return context.db_store_i64( name(scope), name(table), account_name(payer), id, buffer, buffer_size );
       }
       void db_update_i64( int itr, uint64_t payer, array_ptr<const char> buffer, size_t buffer_size ) {
-         context.db_update_i64( itr, name(payer), buffer, buffer_size );
+         context.db_update_i64( itr, account_name(payer), buffer, buffer_size );
       }
       void db_remove_i64( int itr ) {
          context.db_remove_i64( itr );
diff --git a/libraries/chain/webassembly/wabt.cpp b/libraries/chain/webassembly/wabt.cpp
index a23919e0ec6..bccdf9eed0b 100644
--- a/libraries/chain/webassembly/wabt.cpp
+++ b/libraries/chain/webassembly/wabt.cpp
@@ -50,9 +50,9 @@ class wabt_instantiated_module : public wasm_instantiated_module_interface {
             memcpy(memory->data.data(), _initial_memory.data(), _initial_memory.size());
          }
 
-         _params[0].set_i64(uint64_t(context.get_receiver()));
-         _params[1].set_i64(uint64_t(context.get_action().account));
-         _params[2].set_i64(uint64_t(context.get_action().name));
+         _params[0].set_i64(context.get_receiver().to_uint64_t());
+         _params[1].set_i64(context.get_action().account.to_uint64_t());
+         _params[2].set_i64(context.get_action().name.to_uint64_t());
 
          ExecResult res = _executor.RunStartFunction(_instatiated_module);
          EOS_ASSERT( res.result == interp::Result::Ok, wasm_execution_error, "wabt start function failure (${s})", ("s", ResultToString(res.result)) );
diff --git a/libraries/chain/webassembly/wavm.cpp b/libraries/chain/webassembly/wavm.cpp
index e006d237c5c..b84205b7882 100644
--- a/libraries/chain/webassembly/wavm.cpp
+++ b/libraries/chain/webassembly/wavm.cpp
@@ -74,9 +74,9 @@ class wavm_instantiated_module : public wasm_instantiated_module_interface {
       }
 
       void apply(apply_context& context) override {
-         vector<Value> args = {Value(uint64_t(context.get_receiver())),
-	                            Value(uint64_t(context.get_action().account)),
-                               Value(uint64_t(context.get_action().name))};
+         vector<Value> args = {Value(context.get_receiver().to_uint64_t()),
+	                            Value(context.get_action().account.to_uint64_t()),
+                               Value(context.get_action().name.to_uint64_t())};
 
          call("apply", args, context);
       }

From 28887090da86aefe3d74f430e0221c4f3d05fb46 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 09:34:01 -0500
Subject: [PATCH 0334/1648] Update for explicit name

---
 plugins/chain_plugin/chain_plugin.cpp         | 50 +++++++-------
 .../eosio/chain_plugin/chain_plugin.hpp       | 12 ++--
 plugins/history_plugin/history_plugin.cpp     | 36 +++++-----
 plugins/producer_plugin/producer_plugin.cpp   | 16 +++--
 .../state_history_log.hpp                     |  4 +-
 .../state_history_serialization.hpp           | 66 +++++++++----------
 .../state_history_plugin.cpp                  |  2 +-
 .../txn_test_gen_plugin.cpp                   | 20 +++---
 8 files changed, 105 insertions(+), 101 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 6b0247afd0d..2bb4d9514b3 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -308,10 +308,12 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
 
 }
 
-#define LOAD_VALUE_SET(options, name, container) \
-if( options.count(name) ) { \
-   const std::vector<std::string>& ops = options[name].as<std::vector<std::string>>(); \
-   std::copy(ops.begin(), ops.end(), std::inserter(container, container.end())); \
+#define LOAD_VALUE_SET(options, op_name, container) \
+if( options.count(op_name) ) { \
+   const std::vector<std::string>& ops = options[op_name].as<std::vector<std::string>>(); \
+   for( const auto& v : ops ) { \
+      container.emplace( eosio::chain::name( v ) ); \
+   } \
 }
 
 fc::time_point calculate_genesis_timestamp( string tstr ) {
@@ -582,7 +584,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             EOS_ASSERT( pos != std::string::npos, plugin_config_exception, "Invalid entry in action-blacklist: '${a}'", ("a", a));
             account_name code( a.substr( 0, pos ));
             action_name act( a.substr( pos + 2 ));
-            list.emplace( code.value, act.value );
+            list.emplace( code, act );
          }
       }
 
@@ -1371,7 +1373,7 @@ read_only::get_activated_protocol_features( const read_only::get_activated_proto
 uint64_t read_only::get_table_index_name(const read_only::get_table_rows_params& p, bool& primary) {
    using boost::algorithm::starts_with;
    // see multi_index packing of index name
-   const uint64_t table = p.table;
+   const uint64_t table = p.table.to_uint64_t();
    uint64_t index = table & 0xFFFFFFFFFFFFFFF0ULL;
    EOS_ASSERT( index == table, chain::contract_table_query_exception, "Unsupported table name: ${n}", ("n", p.table) );
 
@@ -1424,7 +1426,7 @@ uint64_t convert_to_type(const string& str, const string& desc) {
       auto trimmed_str = str;
       boost::trim(trimmed_str);
       name s(trimmed_str);
-      return s.value;
+      return s.to_uint64_t();
    } catch( ... ) { }
 
    if (str.find(',') != string::npos) { // fix #6274 only match formats like 4,EOS
@@ -1540,18 +1542,18 @@ read_only::get_table_by_scope_result read_only::get_table_by_scope( const read_o
    const auto& d = db.db();
 
    const auto& idx = d.get_index<chain::table_id_multi_index, chain::by_code_scope_table>();
-   auto lower_bound_lookup_tuple = std::make_tuple( p.code.value, std::numeric_limits<uint64_t>::lowest(), p.table.value );
-   auto upper_bound_lookup_tuple = std::make_tuple( p.code.value, std::numeric_limits<uint64_t>::max(),
-                                                    (p.table.empty() ? std::numeric_limits<uint64_t>::max() : p.table.value) );
+   auto lower_bound_lookup_tuple = std::make_tuple( p.code, name(std::numeric_limits<uint64_t>::lowest()), p.table );
+   auto upper_bound_lookup_tuple = std::make_tuple( p.code, name(std::numeric_limits<uint64_t>::max()),
+                                                    (p.table.empty() ? name(std::numeric_limits<uint64_t>::max()) : p.table) );
 
    if( p.lower_bound.size() ) {
       uint64_t scope = convert_to_type<uint64_t>(p.lower_bound, "lower_bound scope");
-      std::get<1>(lower_bound_lookup_tuple) = scope;
+      std::get<1>(lower_bound_lookup_tuple) = name(scope);
    }
 
    if( p.upper_bound.size() ) {
       uint64_t scope = convert_to_type<uint64_t>(p.upper_bound, "upper_bound scope");
-      std::get<1>(upper_bound_lookup_tuple) = scope;
+      std::get<1>(upper_bound_lookup_tuple) = name(scope);
    }
 
    if( upper_bound_lookup_tuple < lower_bound_lookup_tuple )
@@ -1568,7 +1570,7 @@ read_only::get_table_by_scope_result read_only::get_table_by_scope( const read_o
          ++count;
       }
       if( itr != end_itr ) {
-         result.more = string(itr->scope);
+         result.more = itr->scope.to_string();
       }
    };
 
@@ -1586,7 +1588,7 @@ read_only::get_table_by_scope_result read_only::get_table_by_scope( const read_o
 vector<asset> read_only::get_currency_balance( const read_only::get_currency_balance_params& p )const {
 
    const abi_def abi = eosio::chain_apis::get_abi( db, p.code );
-   (void)get_table_type( abi, "accounts" );
+   (void)get_table_type( abi, name("accounts") );
 
    vector<asset> results;
    walk_key_value_table(p.code, p.account, N(accounts), [&](const key_value_object& obj){
@@ -1613,11 +1615,11 @@ fc::variant read_only::get_currency_stats( const read_only::get_currency_stats_p
    fc::mutable_variant_object results;
 
    const abi_def abi = eosio::chain_apis::get_abi( db, p.code );
-   (void)get_table_type( abi, "stat" );
+   (void)get_table_type( abi, name("stat") );
 
    uint64_t scope = ( eosio::chain::string_to_symbol( 0, boost::algorithm::to_upper_copy(p.symbol).c_str() ) >> 8 );
 
-   walk_key_value_table(p.code, scope, N(stat), [&](const key_value_object& obj){
+   walk_key_value_table(p.code, name(scope), N(stat), [&](const key_value_object& obj){
       EOS_ASSERT( obj.value.size() >= sizeof(read_only::get_currency_stats_result), chain::asset_type_exception, "Invalid data on table");
 
       fc::datastream<const char *> ds(obj.value.data(), obj.value.size());
@@ -1642,7 +1644,7 @@ fc::variant get_global_row( const database& db, const abi_def& abi, const abi_se
    EOS_ASSERT(table_id, chain::contract_table_query_exception, "Missing table global");
 
    const auto& kv_index = db.get_index<key_value_index, by_scope_primary>();
-   const auto it = kv_index.find(boost::make_tuple(table_id->id, N(global)));
+   const auto it = kv_index.find(boost::make_tuple(table_id->id, N(global).to_uint64_t()));
    EOS_ASSERT(it != kv_index.end(), chain::contract_table_query_exception, "Missing row in table global");
 
    vector<char> data;
@@ -1663,7 +1665,7 @@ read_only::get_producers_result read_only::get_producers( const read_only::get_p
    const auto* const table_id = d.find<chain::table_id_object, chain::by_code_scope_table>(
            boost::make_tuple(config::system_account_name, config::system_account_name, N(producers)));
    const auto* const secondary_table_id = d.find<chain::table_id_object, chain::by_code_scope_table>(
-           boost::make_tuple(config::system_account_name, config::system_account_name, N(producers) | secondary_index_num));
+           boost::make_tuple(config::system_account_name, config::system_account_name, name(N(producers).to_uint64_t() | secondary_index_num)));
    EOS_ASSERT(table_id && secondary_table_id, chain::contract_table_query_exception, "Missing producers table");
 
    const auto& kv_index = d.get_index<key_value_index, by_scope_primary>();
@@ -1676,13 +1678,13 @@ read_only::get_producers_result read_only::get_producers( const read_only::get_p
    vector<char> data;
 
    auto it = [&]{
-      if(lower.value == 0)
+      if(lower.to_uint64_t() == 0)
          return secondary_index_by_secondary.lower_bound(
             boost::make_tuple(secondary_table_id->id, to_softfloat64(std::numeric_limits<double>::lowest()), 0));
       else
          return secondary_index.project<by_secondary>(
             secondary_index_by_primary.lower_bound(
-               boost::make_tuple(secondary_table_id->id, lower.value)));
+               boost::make_tuple(secondary_table_id->id, lower.to_uint64_t())));
    }();
 
    for( ; it != secondary_index_by_secondary.end() && it->t_id == secondary_table_id->id; ++it ) {
@@ -2193,7 +2195,7 @@ read_only::get_account_results read_only::get_account( const get_account_params&
       t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple( config::system_account_name, params.account_name, N(userres) ));
       if (t_id != nullptr) {
          const auto &idx = d.get_index<key_value_index, by_scope_primary>();
-         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name ));
+         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name.to_uint64_t() ));
          if ( it != idx.end() ) {
             vector<char> data;
             copy_inline_row(*it, data);
@@ -2204,7 +2206,7 @@ read_only::get_account_results read_only::get_account( const get_account_params&
       t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple( config::system_account_name, params.account_name, N(delband) ));
       if (t_id != nullptr) {
          const auto &idx = d.get_index<key_value_index, by_scope_primary>();
-         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name ));
+         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name.to_uint64_t() ));
          if ( it != idx.end() ) {
             vector<char> data;
             copy_inline_row(*it, data);
@@ -2215,7 +2217,7 @@ read_only::get_account_results read_only::get_account( const get_account_params&
       t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple( config::system_account_name, params.account_name, N(refunds) ));
       if (t_id != nullptr) {
          const auto &idx = d.get_index<key_value_index, by_scope_primary>();
-         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name ));
+         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name.to_uint64_t() ));
          if ( it != idx.end() ) {
             vector<char> data;
             copy_inline_row(*it, data);
@@ -2226,7 +2228,7 @@ read_only::get_account_results read_only::get_account( const get_account_params&
       t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple( config::system_account_name, config::system_account_name, N(voters) ));
       if (t_id != nullptr) {
          const auto &idx = d.get_index<key_value_index, by_scope_primary>();
-         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name ));
+         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name.to_uint64_t() ));
          if ( it != idx.end() ) {
             vector<char> data;
             copy_inline_row(*it, data);
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 6c85c354481..a76c58ce0c1 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -302,7 +302,7 @@ class read_only {
 
    struct get_table_by_scope_params {
       name        code; // mandatory
-      name        table = 0; // optional, act as filter
+      name        table; // optional, act as filter
       string      lower_bound; // lower bound of scope, optional
       string      upper_bound; // upper bound of scope, optional
       uint32_t    limit = 10;
@@ -413,14 +413,14 @@ class read_only {
       read_only::get_table_rows_result result;
       const auto& d = db.db();
 
-      uint64_t scope = convert_to_type<uint64_t>(p.scope, "scope");
+      name scope{ convert_to_type<uint64_t>(p.scope, "scope") };
 
       abi_serializer abis;
       abis.set_abi(abi, abi_serializer_max_time);
       bool primary = false;
       const uint64_t table_with_index = get_table_index_name(p, primary);
       const auto* t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple(p.code, scope, p.table));
-      const auto* index_t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple(p.code, scope, table_with_index));
+      const auto* index_t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple(p.code, scope, name(table_with_index)));
       if( t_id != nullptr && index_t_id != nullptr ) {
          using secondary_key_type = std::result_of_t<decltype(conv)(SecKeyType)>;
          static_assert( std::is_same<typename IndexType::value_type::secondary_key_type, secondary_key_type>::value, "Return type of conv does not match type of secondary key for IndexType" );
@@ -507,7 +507,7 @@ class read_only {
 
       abi_serializer abis;
       abis.set_abi(abi, abi_serializer_max_time);
-      const auto* t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple(p.code, scope, p.table));
+      const auto* t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple(p.code, name(scope), p.table));
       if( t_id != nullptr ) {
          const auto& idx = d.get_index<IndexType, chain::by_scope_primary>();
          auto lower_bound_lookup_tuple = std::make_tuple( t_id->id, std::numeric_limits<uint64_t>::lowest() );
@@ -516,7 +516,7 @@ class read_only {
          if( p.lower_bound.size() ) {
             if( p.key_type == "name" ) {
                name s(p.lower_bound);
-               std::get<1>(lower_bound_lookup_tuple) = s.value;
+               std::get<1>(lower_bound_lookup_tuple) = s.to_uint64_t();
             } else {
                auto lv = convert_to_type<typename IndexType::value_type::key_type>( p.lower_bound, "lower_bound" );
                std::get<1>(lower_bound_lookup_tuple) = lv;
@@ -526,7 +526,7 @@ class read_only {
          if( p.upper_bound.size() ) {
             if( p.key_type == "name" ) {
                name s(p.upper_bound);
-               std::get<1>(upper_bound_lookup_tuple) = s.value;
+               std::get<1>(upper_bound_lookup_tuple) = s.to_uint64_t();
             } else {
                auto uv = convert_to_type<typename IndexType::value_type::key_type>( p.upper_bound, "upper_bound" );
                std::get<1>(upper_bound_lookup_tuple) = uv;
diff --git a/plugins/history_plugin/history_plugin.cpp b/plugins/history_plugin/history_plugin.cpp
index 12cd3a5e731..4de5d99093e 100644
--- a/plugins/history_plugin/history_plugin.cpp
+++ b/plugins/history_plugin/history_plugin.cpp
@@ -148,14 +148,14 @@ namespace eosio {
             if (bypass_filter) {
               pass_on = true;
             }
-            if (filter_on.find({ act.receiver, 0, 0 }) != filter_on.end()) {
+            if (filter_on.find({ act.receiver, {}, {} }) != filter_on.end()) {
               pass_on = true;
             }
-            if (filter_on.find({ act.receiver, act.act.name, 0 }) != filter_on.end()) {
+            if (filter_on.find({ act.receiver, act.act.name, {} }) != filter_on.end()) {
               pass_on = true;
             }
             for (const auto& a : act.act.authorization) {
-              if (filter_on.find({ act.receiver, 0, a.actor }) != filter_on.end()) {
+              if (filter_on.find({ act.receiver, {}, a.actor }) != filter_on.end()) {
                 pass_on = true;
               }
               if (filter_on.find({ act.receiver, act.act.name, a.actor }) != filter_on.end()) {
@@ -165,14 +165,14 @@ namespace eosio {
 
             if (!pass_on) {  return false;  }
 
-            if (filter_out.find({ act.receiver, 0, 0 }) != filter_out.end()) {
+            if (filter_out.find({ act.receiver, {}, {} }) != filter_out.end()) {
               return false;
             }
-            if (filter_out.find({ act.receiver, act.act.name, 0 }) != filter_out.end()) {
+            if (filter_out.find({ act.receiver, act.act.name, {} }) != filter_out.end()) {
               return false;
             }
             for (const auto& a : act.act.authorization) {
-              if (filter_out.find({ act.receiver, 0, a.actor }) != filter_out.end()) {
+              if (filter_out.find({ act.receiver, {}, a.actor }) != filter_out.end()) {
                 return false;
               }
               if (filter_out.find({ act.receiver, act.act.name, a.actor }) != filter_out.end()) {
@@ -189,13 +189,13 @@ namespace eosio {
             result.insert( act.receiver );
             for( const auto& a : act.act.authorization ) {
                if( bypass_filter ||
-                   filter_on.find({ act.receiver, 0, 0}) != filter_on.end() ||
-                   filter_on.find({ act.receiver, 0, a.actor}) != filter_on.end() ||
-                   filter_on.find({ act.receiver, act.act.name, 0}) != filter_on.end() ||
+                   filter_on.find({ act.receiver, {}, {}}) != filter_on.end() ||
+                   filter_on.find({ act.receiver, {}, a.actor}) != filter_on.end() ||
+                   filter_on.find({ act.receiver, act.act.name, {}}) != filter_on.end() ||
                    filter_on.find({ act.receiver, act.act.name, a.actor }) != filter_on.end() ) {
-                 if ((filter_out.find({ act.receiver, 0, 0 }) == filter_out.end()) &&
-                     (filter_out.find({ act.receiver, 0, a.actor }) == filter_out.end()) &&
-                     (filter_out.find({ act.receiver, act.act.name, 0 }) == filter_out.end()) &&
+                 if ((filter_out.find({ act.receiver, {}, {} }) == filter_out.end()) &&
+                     (filter_out.find({ act.receiver, {}, a.actor }) == filter_out.end()) &&
+                     (filter_out.find({ act.receiver, act.act.name, {} }) == filter_out.end()) &&
                      (filter_out.find({ act.receiver, act.act.name, a.actor }) == filter_out.end())) {
                    result.insert( a.actor );
                  }
@@ -209,7 +209,7 @@ namespace eosio {
             chainbase::database& db = const_cast<chainbase::database&>( chain.db() ); // Override read-only access to state DB (highly unrecommended practice!)
 
             const auto& idx = db.get_index<account_history_index, by_account_action_seq>();
-            auto itr = idx.lower_bound( boost::make_tuple( name(n.value+1), 0 ) );
+            auto itr = idx.lower_bound( boost::make_tuple( name(n.to_uint64_t()+1), 0 ) );
 
             uint64_t asn = 0;
             if( itr != idx.begin() ) --itr;
@@ -320,8 +320,8 @@ namespace eosio {
                std::vector<std::string> v;
                boost::split( v, s, boost::is_any_of( ":" ));
                EOS_ASSERT( v.size() == 3, fc::invalid_arg_exception, "Invalid value ${s} for --filter-on", ("s", s));
-               filter_entry fe{v[0], v[1], v[2]};
-               EOS_ASSERT( fe.receiver.value, fc::invalid_arg_exception,
+               filter_entry fe{eosio::chain::name(v[0]), eosio::chain::name(v[1]), eosio::chain::name(v[2])};
+               EOS_ASSERT( fe.receiver.to_uint64_t(), fc::invalid_arg_exception,
                            "Invalid value ${s} for --filter-on", ("s", s));
                my->filter_on.insert( fe );
             }
@@ -332,8 +332,8 @@ namespace eosio {
                std::vector<std::string> v;
                boost::split( v, s, boost::is_any_of( ":" ));
                EOS_ASSERT( v.size() == 3, fc::invalid_arg_exception, "Invalid value ${s} for --filter-out", ("s", s));
-               filter_entry fe{v[0], v[1], v[2]};
-               EOS_ASSERT( fe.receiver.value, fc::invalid_arg_exception,
+               filter_entry fe{eosio::chain::name(v[0]), eosio::chain::name(v[1]), eosio::chain::name(v[2])};
+               EOS_ASSERT( fe.receiver.to_uint64_t(), fc::invalid_arg_exception,
                            "Invalid value ${s} for --filter-out", ("s", s));
                my->filter_out.insert( fe );
             }
@@ -383,7 +383,7 @@ namespace eosio {
         auto n = params.account_name;
         idump((pos));
         if( pos == -1 ) {
-            auto itr = idx.lower_bound( boost::make_tuple( name(n.value+1), 0 ) );
+            auto itr = idx.lower_bound( boost::make_tuple( name(n.to_uint64_t()+1), 0 ) );
             if( itr == idx.begin() ) {
                if( itr->account == n )
                   pos = itr->account_sequence_num+1;
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 08405ddd295..6b8c9d1e0ac 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -674,10 +674,12 @@ T dejsonify(const string& s) {
    return fc::json::from_string(s).as<T>();
 }
 
-#define LOAD_VALUE_SET(options, name, container, type) \
-if( options.count(name) ) { \
-   const std::vector<std::string>& ops = options[name].as<std::vector<std::string>>(); \
-   std::copy(ops.begin(), ops.end(), std::inserter(container, container.end())); \
+#define LOAD_VALUE_SET(options, op_name, container) \
+if( options.count(op_name) ) { \
+   const std::vector<std::string>& ops = options[op_name].as<std::vector<std::string>>(); \
+   for( const auto& v : ops ) { \
+      container.emplace( eosio::chain::name( v ) ); \
+   } \
 }
 
 static producer_plugin_impl::signature_provider_type
@@ -716,7 +718,7 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
    my->chain_plug = app().find_plugin<chain_plugin>();
    EOS_ASSERT( my->chain_plug, plugin_config_exception, "chain_plugin not found" );
    my->_options = &options;
-   LOAD_VALUE_SET(options, "producer-name", my->_producers, types::account_name)
+   LOAD_VALUE_SET(options, "producer-name", my->_producers)
 
    if( options.count("private-key") )
    {
@@ -1180,8 +1182,8 @@ producer_plugin::get_account_ram_corrections( const get_account_ram_corrections_
    const auto& db = my->chain_plug->chain().db();
 
    const auto& idx = db.get_index<chain::account_ram_correction_index, chain::by_name>();
-   account_name lower_bound_value = std::numeric_limits<uint64_t>::lowest();
-   account_name upper_bound_value = std::numeric_limits<uint64_t>::max();
+   account_name lower_bound_value{ std::numeric_limits<uint64_t>::lowest() };
+   account_name upper_bound_value{ std::numeric_limits<uint64_t>::max() };
 
    if( params.lower_bound ) {
       lower_bound_value = *params.lower_bound;
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
index 12d43d82139..8343ad8d36e 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
@@ -31,8 +31,8 @@ namespace eosio {
  *    payload
  */
 
-inline uint64_t       ship_magic(uint32_t version) { return N(ship) | version; }
-inline bool           is_ship(uint64_t magic) { return (magic & 0xffff'ffff'0000'0000) == N(ship); }
+inline uint64_t       ship_magic(uint32_t version) { return N(ship).to_uint64_t() | version; }
+inline bool           is_ship(uint64_t magic) { return (magic & 0xffff'ffff'0000'0000) == N(ship).to_uint64_t(); }
 inline uint32_t       get_ship_version(uint64_t magic) { return magic; }
 inline bool           is_ship_supported_version(uint64_t magic) { return get_ship_version(magic) == 0; }
 static const uint32_t ship_current_version = 0;
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index e11b7e5f4f7..668f89033bc 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -106,7 +106,7 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<std:
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::account_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.to_uint64_t()));
    fc::raw::pack(ds, as_type<eosio::chain::block_timestamp_type>(obj.obj.creation_date));
    fc::raw::pack(ds, as_type<eosio::chain::shared_string>(obj.obj.abi));
    return ds;
@@ -116,7 +116,7 @@ template <typename ST>
 datastream<ST>& operator<<(datastream<ST>&                                                      ds,
                            const history_serial_wrapper<eosio::chain::account_metadata_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.to_uint64_t()));
    fc::raw::pack(ds, as_type<bool>(obj.obj.is_privileged()));
    fc::raw::pack(ds, as_type<fc::time_point>(obj.obj.last_code_update));
    bool has_code = obj.obj.code_hash != eosio::chain::digest_type();
@@ -142,10 +142,10 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::table_id_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.code.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.scope.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.table.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.payer.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.code.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.scope.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.table.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.payer.to_uint64_t()));
    return ds;
 }
 
@@ -154,11 +154,11 @@ datastream<ST>&
 operator<<(datastream<ST>&                                                                                     ds,
            const history_context_wrapper<const eosio::chain::table_id_object, eosio::chain::key_value_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.context.code.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.context.scope.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.context.table.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.context.code.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.context.scope.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.context.table.to_uint64_t()));
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.primary_key));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.payer.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.payer.to_uint64_t()));
    fc::raw::pack(ds, as_type<eosio::chain::shared_string>(obj.obj.value));
    return ds;
 }
@@ -197,11 +197,11 @@ template <typename ST, typename T>
 datastream<ST>& serialize_secondary_index(datastream<ST>& ds, const eosio::chain::table_id_object& context,
                                           const T& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(context.code.value));
-   fc::raw::pack(ds, as_type<uint64_t>(context.scope.value));
-   fc::raw::pack(ds, as_type<uint64_t>(context.table.value));
+   fc::raw::pack(ds, as_type<uint64_t>(context.code.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(context.scope.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(context.table.to_uint64_t()));
    fc::raw::pack(ds, as_type<uint64_t>(obj.primary_key));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.payer.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.payer.to_uint64_t()));
    serialize_secondary_index_data(ds, obj.secondary_key);
    return ds;
 }
@@ -243,7 +243,7 @@ datastream<ST>& operator<<(
 
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::producer_key>& obj) {
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.producer_name.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.producer_name.to_uint64_t()));
    fc::raw::pack(ds, as_type<eosio::chain::public_key_type>(obj.obj.block_signing_key));
    return ds;
 }
@@ -296,9 +296,9 @@ template <typename ST>
 datastream<ST>& operator<<(datastream<ST>&                                                           ds,
                            const history_serial_wrapper<eosio::chain::generated_transaction_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.sender.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.sender.to_uint64_t()));
    fc::raw::pack(ds, as_type<__uint128_t>(obj.obj.sender_id));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.payer.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.payer.to_uint64_t()));
    fc::raw::pack(ds, as_type<eosio::chain::transaction_id_type>(obj.obj.trx_id));
    fc::raw::pack(ds, as_type<eosio::chain::shared_string>(obj.obj.packed_trx));
    return ds;
@@ -330,8 +330,8 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
 
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::permission_level>& obj) {
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.actor.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.permission.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.actor.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.permission.to_uint64_t()));
    return ds;
 }
 
@@ -362,8 +362,8 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::permission_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.owner.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.owner.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.to_uint64_t()));
    if (obj.obj.parent._id) {
       auto&       index  = obj.db.get_index<eosio::chain::permission_index>();
       const auto* parent = index.find(obj.obj.parent);
@@ -374,7 +374,7 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
                     "can not find parent of permission_object");
          parent = &it->second;
       }
-      fc::raw::pack(ds, as_type<uint64_t>(parent->name.value));
+      fc::raw::pack(ds, as_type<uint64_t>(parent->name.to_uint64_t()));
    } else {
       fc::raw::pack(ds, as_type<uint64_t>(0));
    }
@@ -387,10 +387,10 @@ template <typename ST>
 datastream<ST>& operator<<(datastream<ST>&                                                     ds,
                            const history_serial_wrapper<eosio::chain::permission_link_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.account.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.code.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.message_type.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.required_permission.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.account.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.code.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.message_type.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.required_permission.to_uint64_t()));
    return ds;
 }
 
@@ -400,7 +400,7 @@ datastream<ST>& operator<<(datastream<ST>&
    EOS_ASSERT(!obj.obj.pending, eosio::chain::plugin_exception,
               "accepted_block sent while resource_limits_object in pending state");
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.owner.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.owner.to_uint64_t()));
    fc::raw::pack(ds, as_type<int64_t>(obj.obj.net_weight));
    fc::raw::pack(ds, as_type<int64_t>(obj.obj.cpu_weight));
    fc::raw::pack(ds, as_type<int64_t>(obj.obj.ram_bytes));
@@ -421,7 +421,7 @@ template <typename ST>
 datastream<ST>& operator<<(datastream<ST>&                                                                     ds,
                            const history_serial_wrapper<eosio::chain::resource_limits::resource_usage_object>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.owner.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.owner.to_uint64_t()));
    fc::raw::pack(ds, make_history_serial_wrapper(
                          obj.db, as_type<eosio::chain::resource_limits::usage_accumulator>(obj.obj.net_usage)));
    fc::raw::pack(ds, make_history_serial_wrapper(
@@ -489,8 +489,8 @@ operator<<(datastream<ST>&
 
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::action>& obj) {
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.account.value));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.account.to_uint64_t()));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.to_uint64_t()));
    history_serialize_container(ds, obj.db, as_type<std::vector<eosio::chain::permission_level>>(obj.obj.authorization));
    fc::raw::pack(ds, as_type<eosio::bytes>(obj.obj.data));
    return ds;
@@ -499,7 +499,7 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::action_receipt>& obj) {
    fc::raw::pack(ds, fc::unsigned_int(0));
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.receiver.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.receiver.to_uint64_t()));
    fc::raw::pack(ds, as_type<eosio::chain::digest_type>(obj.obj.act_digest));
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.global_sequence));
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.recv_sequence));
@@ -511,7 +511,7 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
 
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::account_delta>& obj) {
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.account.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.account.to_uint64_t()));
    fc::raw::pack(ds, as_type<int64_t>(obj.obj.delta));
    return ds;
 }
@@ -525,7 +525,7 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
    if (obj.obj.receipt) {
       fc::raw::pack(ds, make_history_serial_wrapper(obj.db, as_type<eosio::chain::action_receipt>(*obj.obj.receipt)));
    }
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.receiver.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.receiver.to_uint64_t()));
    fc::raw::pack(ds, make_history_serial_wrapper(obj.db, as_type<eosio::chain::action>(obj.obj.act)));
    fc::raw::pack(ds, as_type<bool>(obj.obj.context_free));
    fc::raw::pack(ds, as_type<int64_t>(obj.obj.elapsed.count()));
diff --git a/plugins/state_history_plugin/state_history_plugin.cpp b/plugins/state_history_plugin/state_history_plugin.cpp
index f0579891dee..9225345ca26 100644
--- a/plugins/state_history_plugin/state_history_plugin.cpp
+++ b/plugins/state_history_plugin/state_history_plugin.cpp
@@ -89,7 +89,7 @@ bool include_delta(const eosio::chain::resource_limits::resource_limits_state_ob
 bool include_delta(const eosio::chain::account_metadata_object& old,
                    const eosio::chain::account_metadata_object& curr) {
    return                                               //
-       old.name.value != curr.name.value ||             //
+       old.name != curr.name ||                         //
        old.is_privileged() != curr.is_privileged() ||   //
        old.last_code_update != curr.last_code_update || //
        old.vm_type != curr.vm_type ||                   //
diff --git a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
index 670114ea85c..c17729b990b 100755
--- a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
+++ b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
@@ -166,21 +166,21 @@ struct txn_test_gen_plugin_impl {
             auto owner_auth   = eosio::chain::authority{1, {{txn_text_receiver_A_pub_key, 1}}, {}};
             auto active_auth  = eosio::chain::authority{1, {{txn_text_receiver_A_pub_key, 1}}, {}};
 
-            trx.actions.emplace_back(vector<chain::permission_level>{{creator,"active"}}, newaccount{creator, newaccountA, owner_auth, active_auth});
+            trx.actions.emplace_back(vector<chain::permission_level>{{creator,name("active")}}, newaccount{creator, newaccountA, owner_auth, active_auth});
             }
             //create "B" account
             {
             auto owner_auth   = eosio::chain::authority{1, {{txn_text_receiver_B_pub_key, 1}}, {}};
             auto active_auth  = eosio::chain::authority{1, {{txn_text_receiver_B_pub_key, 1}}, {}};
 
-            trx.actions.emplace_back(vector<chain::permission_level>{{creator,"active"}}, newaccount{creator, newaccountB, owner_auth, active_auth});
+            trx.actions.emplace_back(vector<chain::permission_level>{{creator,name("active")}}, newaccount{creator, newaccountB, owner_auth, active_auth});
             }
             //create "T" account
             {
             auto owner_auth   = eosio::chain::authority{1, {{txn_text_receiver_C_pub_key, 1}}, {}};
             auto active_auth  = eosio::chain::authority{1, {{txn_text_receiver_C_pub_key, 1}}, {}};
 
-            trx.actions.emplace_back(vector<chain::permission_level>{{creator,"active"}}, newaccount{creator, newaccountT, owner_auth, active_auth});
+            trx.actions.emplace_back(vector<chain::permission_level>{{creator,name("active")}}, newaccount{creator, newaccountT, owner_auth, active_auth});
             }
 
             trx.expiration = cc.head_block_time() + fc::seconds(180);
@@ -199,13 +199,13 @@ struct txn_test_gen_plugin_impl {
             handler.account = newaccountT;
             handler.code.assign(wasm.begin(), wasm.end());
 
-            trx.actions.emplace_back( vector<chain::permission_level>{{newaccountT,"active"}}, handler);
+            trx.actions.emplace_back( vector<chain::permission_level>{{newaccountT,name("active")}}, handler);
 
             {
                setabi handler;
                handler.account = newaccountT;
                handler.abi = fc::raw::pack(json::from_string(contracts::eosio_token_abi().data()).as<abi_def>());
-               trx.actions.emplace_back( vector<chain::permission_level>{{newaccountT,"active"}}, handler);
+               trx.actions.emplace_back( vector<chain::permission_level>{{newaccountT,name("active")}}, handler);
             }
 
             {
@@ -368,7 +368,7 @@ struct txn_test_gen_plugin_impl {
          {
          signed_transaction trx;
          trx.actions.push_back(act_a_to_b);
-         trx.context_free_actions.emplace_back(action({}, config::null_account_name, "nonce", fc::raw::pack( std::to_string(nonce_prefix)+std::to_string(nonce++) )));
+         trx.context_free_actions.emplace_back(action({}, config::null_account_name, name("nonce"), fc::raw::pack( std::to_string(nonce_prefix)+std::to_string(nonce++) )));
          trx.set_reference_block(reference_block_id);
          trx.expiration = cc.head_block_time() + fc::seconds(30);
          trx.max_net_usage_words = 100;
@@ -379,7 +379,7 @@ struct txn_test_gen_plugin_impl {
          {
          signed_transaction trx;
          trx.actions.push_back(act_b_to_a);
-         trx.context_free_actions.emplace_back(action({}, config::null_account_name, "nonce", fc::raw::pack( std::to_string(nonce_prefix)+std::to_string(nonce++) )));
+         trx.context_free_actions.emplace_back(action({}, config::null_account_name, name("nonce"), fc::raw::pack( std::to_string(nonce_prefix)+std::to_string(nonce++) )));
          trx.set_reference_block(reference_block_id);
          trx.expiration = cc.head_block_time() + fc::seconds(30);
          trx.max_net_usage_words = 100;
@@ -445,9 +445,9 @@ void txn_test_gen_plugin::plugin_initialize(const variables_map& options) {
       my->txn_reference_block_lag = options.at( "txn-reference-block-lag" ).as<int32_t>();
       my->thread_pool_size = options.at( "txn-test-gen-threads" ).as<uint16_t>();
       const std::string thread_pool_account_prefix = options.at( "txn-test-gen-account-prefix" ).as<std::string>();
-      my->newaccountA = thread_pool_account_prefix + "a";
-      my->newaccountB = thread_pool_account_prefix + "b";
-      my->newaccountT = thread_pool_account_prefix + "t";
+      my->newaccountA = eosio::chain::name(thread_pool_account_prefix + "a");
+      my->newaccountB = eosio::chain::name(thread_pool_account_prefix + "b");
+      my->newaccountT = eosio::chain::name(thread_pool_account_prefix + "t");
       EOS_ASSERT( my->thread_pool_size > 0, chain::plugin_config_exception,
                   "txn-test-gen-threads ${num} must be greater than 0", ("num", my->thread_pool_size) );
    } FC_LOG_AND_RETHROW()

From f98e61673dafd79b241c8e1598b0dc6ed3e991e7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 09:34:26 -0500
Subject: [PATCH 0335/1648] Updates for explicit name

---
 programs/cleos/main.cpp | 221 ++++++++++++++++++++--------------------
 1 file changed, 111 insertions(+), 110 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 59fc67679e6..644a0087c22 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -228,7 +228,7 @@ vector<chain::permission_level> get_account_permissions(const vector<string>& pe
       vector<string> pieces;
       split(pieces, p, boost::algorithm::is_any_of("@"));
       if( pieces.size() == 1 ) pieces.push_back( "active" );
-      return chain::permission_level{ .actor = pieces[0], .permission = pieces[1] };
+      return chain::permission_level{ .actor = name(pieces[0]), .permission = name(pieces[1]) };
    });
    vector<chain::permission_level> accountPermissions;
    boost::range::copy(fixedPermissions, back_inserter(accountPermissions));
@@ -276,7 +276,7 @@ string generate_nonce_string() {
 }
 
 chain::action generate_nonce_action() {
-   return chain::action( {}, config::null_account_name, "nonce", fc::raw::pack(fc::time_point::now().time_since_epoch().count()));
+   return chain::action( {}, config::null_account_name, name("nonce"), fc::raw::pack(fc::time_point::now().time_since_epoch().count()));
 }
 
 void prompt_for_wallet_password(string& pw, const string& name) {
@@ -522,7 +522,7 @@ void send_transaction( signed_transaction& trx, packed_transaction::compression_
 
 chain::permission_level to_permission_level(const std::string& s) {
    auto at_pos = s.find('@');
-   return permission_level { s.substr(0, at_pos), s.substr(at_pos + 1) };
+   return permission_level { name(s.substr(0, at_pos)), name(s.substr(at_pos + 1)) };
 }
 
 chain::action create_newaccount(const name& creator, const name& newaccount, auth_type owner, auth_type active) {
@@ -585,8 +585,8 @@ chain::action create_open(const string& contract, const name& owner, symbol sym,
       ("symbol", sym)
       ("ram_payer", ram_payer);
     return action {
-      get_account_permissions(tx_permission, {ram_payer,config::active_name}),
-      contract, "open", variant_to_bin( contract, N(open), open_ )
+      get_account_permissions(tx_permission, {ram_payer, config::active_name}),
+      name(contract), N(open), variant_to_bin( name(contract), N(open), open_ )
    };
 }
 
@@ -600,7 +600,7 @@ chain::action create_transfer(const string& contract, const name& sender, const
 
    return action {
       get_account_permissions(tx_permission, {sender,config::active_name}),
-      contract, "transfer", variant_to_bin( contract, N(transfer), transfer )
+      name(contract), N(transfer), variant_to_bin( name(contract), N(transfer), transfer )
    };
 }
 
@@ -700,10 +700,10 @@ inline asset to_asset( const string& s ) {
 }
 
 struct set_account_permission_subcommand {
-   name account;
-   name permission;
+   string account;
+   string permission;
    string authority_json_or_file;
-   name parent;
+   string parent;
    bool add_code;
    bool remove_code;
 
@@ -724,34 +724,34 @@ struct set_account_permission_subcommand {
 
          authority auth;
 
-         bool need_parent = parent.empty() && (permission != name("owner"));
+         bool need_parent = parent.empty() && (name(permission) != name("owner"));
          bool need_auth = add_code || remove_code;
 
          if ( !need_auth && boost::iequals(authority_json_or_file, "null") ) {
-            send_actions( { create_deleteauth(account, permission) } );
+            send_actions( { create_deleteauth(name(account), name(permission)) } );
             return;
          }
 
          if ( need_parent || need_auth ) {
-            fc::variant json = call(get_account_func, fc::mutable_variant_object("account_name", account.to_string()));
+            fc::variant json = call(get_account_func, fc::mutable_variant_object("account_name", account));
             auto res = json.as<eosio::chain_apis::read_only::get_account_results>();
             auto itr = std::find_if(res.permissions.begin(), res.permissions.end(), [&](const auto& perm) {
-               return perm.perm_name == permission;
+               return perm.perm_name == name(permission);
             });
 
             if ( need_parent ) {
                // see if we can auto-determine the proper parent
                if ( itr != res.permissions.end() ) {
-                  parent = (*itr).parent;
+                  parent = (*itr).parent.to_string();
                } else {
                   // if this is a new permission and there is no parent we default to "active"
-                  parent = name(config::active_name);
+                  parent = config::active_name.to_string();
                }
             }
 
             if ( need_auth ) {
-               auto actor = (authority_json_or_file.empty()) ? account : name(authority_json_or_file);
-               auto code_name = name(config::eosio_code_name);
+               auto actor = (authority_json_or_file.empty()) ? name(account) : name(authority_json_or_file);
+               auto code_name = config::eosio_code_name;
 
                if ( itr != res.permissions.end() ) {
                   // fetch existing authority
@@ -794,7 +794,7 @@ struct set_account_permission_subcommand {
                         // remove code permission, if authority becomes empty by the removal of code permission, delete permission
                         auth.accounts.erase( itr2 );
                         if ( auth.keys.empty() && auth.accounts.empty() && auth.waits.empty() ) {
-                           send_actions( { create_deleteauth(account, permission) } );
+                           send_actions( { create_deleteauth(name(account), name(permission)) } );
                            return;
                         }
                      } else {
@@ -825,7 +825,7 @@ struct set_account_permission_subcommand {
             auth = parse_json_authority_or_key(authority_json_or_file);
          }
 
-         send_actions( { create_updateauth(account, permission, parent, auth) } );
+         send_actions( { create_updateauth(name(account), name(permission), name(parent), auth) } );
       });
    }
 };
@@ -971,8 +971,8 @@ struct register_producer_subcommand {
             producer_key = public_key_type(producer_key_str);
          } EOS_RETHROW_EXCEPTIONS(public_key_type_exception, "Invalid producer public key: ${public_key}", ("public_key", producer_key_str))
 
-         auto regprod_var = regproducer_variant(producer_str, producer_key, url, loc );
-         auto accountPermissions = get_account_permissions(tx_permission, {producer_str,config::active_name});
+         auto regprod_var = regproducer_variant(name(producer_str), producer_key, url, loc );
+         auto accountPermissions = get_account_permissions(tx_permission, {name(producer_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(regproducer), regprod_var)});
       });
    }
@@ -1044,16 +1044,16 @@ struct create_account_subcommand {
                } EOS_RETHROW_EXCEPTIONS( public_key_type_exception, "Invalid active public key: ${public_key}", ("public_key", active_key_str) );
             }
 
-            auto create = create_newaccount(creator, account_name, owner, active);
+            auto create = create_newaccount(name(creator), name(account_name), owner, active);
             if (!simple) {
                EOSC_ASSERT( buy_ram_eos.size() || buy_ram_bytes_in_kbytes || buy_ram_bytes, "ERROR: One of --buy-ram, --buy-ram-kbytes or --buy-ram-bytes should have non-zero value" );
                EOSC_ASSERT( !buy_ram_bytes_in_kbytes || !buy_ram_bytes, "ERROR: --buy-ram-kbytes and --buy-ram-bytes cannot be set at the same time" );
-               action buyram = !buy_ram_eos.empty() ? create_buyram(creator, account_name, to_asset(buy_ram_eos))
-                  : create_buyrambytes(creator, account_name, (buy_ram_bytes_in_kbytes) ? (buy_ram_bytes_in_kbytes * 1024) : buy_ram_bytes);
+               action buyram = !buy_ram_eos.empty() ? create_buyram(name(creator), name(account_name), to_asset(buy_ram_eos))
+                  : create_buyrambytes(name(creator), name(account_name), (buy_ram_bytes_in_kbytes) ? (buy_ram_bytes_in_kbytes * 1024) : buy_ram_bytes);
                auto net = to_asset(stake_net);
                auto cpu = to_asset(stake_cpu);
                if ( net.get_amount() != 0 || cpu.get_amount() != 0 ) {
-                  action delegate = create_delegate( creator, account_name, net, cpu, transfer);
+                  action delegate = create_delegate( name(creator), name(account_name), net, cpu, transfer);
                   send_actions( { create, buyram, delegate } );
                } else {
                   send_actions( { create, buyram } );
@@ -1077,7 +1077,7 @@ struct unregister_producer_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
                   ("producer", producer_str);
 
-         auto accountPermissions = get_account_permissions(tx_permission, {producer_str,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(producer_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(unregprod), act_payload)});
       });
    }
@@ -1098,7 +1098,7 @@ struct vote_producer_proxy_subcommand {
                   ("voter", voter_str)
                   ("proxy", proxy_str)
                   ("producers", std::vector<account_name>{});
-         auto accountPermissions = get_account_permissions(tx_permission, {voter_str,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(voter_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(voteproducer), act_payload)});
       });
    }
@@ -1106,7 +1106,7 @@ struct vote_producer_proxy_subcommand {
 
 struct vote_producers_subcommand {
    string voter_str;
-   vector<eosio::name> producer_names;
+   vector<std::string> producer_names;
 
    vote_producers_subcommand(CLI::App* actionRoot) {
       auto vote_producers = actionRoot->add_subcommand("prods", localized("Vote for one or more producers"));
@@ -1122,15 +1122,15 @@ struct vote_producers_subcommand {
                   ("voter", voter_str)
                   ("proxy", "")
                   ("producers", producer_names);
-         auto accountPermissions = get_account_permissions(tx_permission, {voter_str,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(voter_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(voteproducer), act_payload)});
       });
    }
 };
 
 struct approve_producer_subcommand {
-   eosio::name voter;
-   eosio::name producer_name;
+   string voter;
+   string producer_name;
 
    approve_producer_subcommand(CLI::App* actionRoot) {
       auto approve_producer = actionRoot->add_subcommand("approve", localized("Add one producer to list of voted producers"));
@@ -1144,8 +1144,8 @@ struct approve_producer_subcommand {
                                ("scope", name(config::system_account_name).to_string())
                                ("table", "voters")
                                ("table_key", "owner")
-                               ("lower_bound", voter.value)
-                               ("upper_bound", voter.value + 1)
+                               ("lower_bound", name(voter).to_uint64_t())
+                               ("upper_bound", name(voter).to_uint64_t() + 1)
                                // Less than ideal upper_bound usage preserved so cleos can still work with old buggy nodeos versions
                                // Change to voter.value when cleos no longer needs to support nodeos versions older than 1.5.0
                                ("limit", 1)
@@ -1164,7 +1164,7 @@ struct approve_producer_subcommand {
             for ( auto& x : prod_vars ) {
                prods.push_back( name(x.as_string()) );
             }
-            prods.push_back( producer_name );
+            prods.push_back( name(producer_name) );
             std::sort( prods.begin(), prods.end() );
             auto it = std::unique( prods.begin(), prods.end() );
             if (it != prods.end() ) {
@@ -1175,15 +1175,15 @@ struct approve_producer_subcommand {
                ("voter", voter)
                ("proxy", "")
                ("producers", prods);
-            auto accountPermissions = get_account_permissions(tx_permission, {voter,config::active_name});
+            auto accountPermissions = get_account_permissions(tx_permission, {name(voter), config::active_name});
             send_actions({create_action(accountPermissions, config::system_account_name, N(voteproducer), act_payload)});
       });
    }
 };
 
 struct unapprove_producer_subcommand {
-   eosio::name voter;
-   eosio::name producer_name;
+   string voter;
+   string producer_name;
 
    unapprove_producer_subcommand(CLI::App* actionRoot) {
       auto approve_producer = actionRoot->add_subcommand("unapprove", localized("Remove one producer from list of voted producers"));
@@ -1197,8 +1197,8 @@ struct unapprove_producer_subcommand {
                                ("scope", name(config::system_account_name).to_string())
                                ("table", "voters")
                                ("table_key", "owner")
-                               ("lower_bound", voter.value)
-                               ("upper_bound", voter.value + 1)
+                               ("lower_bound", name(voter).to_uint64_t())
+                               ("upper_bound", name(voter).to_uint64_t() + 1)
                                // Less than ideal upper_bound usage preserved so cleos can still work with old buggy nodeos versions
                                // Change to voter.value when cleos no longer needs to support nodeos versions older than 1.5.0
                                ("limit", 1)
@@ -1217,7 +1217,7 @@ struct unapprove_producer_subcommand {
             for ( auto& x : prod_vars ) {
                prods.push_back( name(x.as_string()) );
             }
-            auto it = std::remove( prods.begin(), prods.end(), producer_name );
+            auto it = std::remove( prods.begin(), prods.end(), name(producer_name) );
             if (it == prods.end() ) {
                std::cerr << "Cannot remove: producer \"" << producer_name << "\" is not on the list." << std::endl;
                return;
@@ -1227,7 +1227,7 @@ struct unapprove_producer_subcommand {
                ("voter", voter)
                ("proxy", "")
                ("producers", prods);
-            auto accountPermissions = get_account_permissions(tx_permission, {voter,config::active_name});
+            auto accountPermissions = get_account_permissions(tx_permission, {name(voter), config::active_name});
             send_actions({create_action(accountPermissions, config::system_account_name, N(voteproducer), act_payload)});
       });
    }
@@ -1389,13 +1389,13 @@ struct delegate_bandwidth_subcommand {
                   ("stake_net_quantity", to_asset(stake_net_amount))
                   ("stake_cpu_quantity", to_asset(stake_cpu_amount))
                   ("transfer", transfer);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          std::vector<chain::action> acts{create_action(accountPermissions, config::system_account_name, N(delegatebw), act_payload)};
          EOSC_ASSERT( !(buy_ram_amount.size()) || !buy_ram_bytes, "ERROR: --buyram and --buy-ram-bytes cannot be set at the same time" );
          if (buy_ram_amount.size()) {
-            acts.push_back( create_buyram(from_str, receiver_str, to_asset(buy_ram_amount)) );
+            acts.push_back( create_buyram(name(from_str), name(receiver_str), to_asset(buy_ram_amount)) );
          } else if (buy_ram_bytes) {
-            acts.push_back( create_buyrambytes(from_str, receiver_str, buy_ram_bytes) );
+            acts.push_back( create_buyrambytes(name(from_str), name(receiver_str), buy_ram_bytes) );
          }
          send_actions(std::move(acts));
       });
@@ -1423,7 +1423,7 @@ struct undelegate_bandwidth_subcommand {
                   ("receiver", receiver_str)
                   ("unstake_net_quantity", to_asset(unstake_net_amount))
                   ("unstake_cpu_quantity", to_asset(unstake_cpu_amount));
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(undelegatebw), act_payload)});
       });
    }
@@ -1444,7 +1444,7 @@ struct bidname_subcommand {
                   ("bidder", bidder_str)
                   ("newname", newname_str)
                   ("bid", to_asset(bid_amount));
-         auto accountPermissions = get_account_permissions(tx_permission, {bidder_str,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(bidder_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(bidname), act_payload)});
       });
    }
@@ -1452,7 +1452,7 @@ struct bidname_subcommand {
 
 struct bidname_info_subcommand {
    bool print_json = false;
-   name newname;
+   string newname;
    bidname_info_subcommand(CLI::App* actionRoot) {
       auto list_producers = actionRoot->add_subcommand("bidnameinfo", localized("Get bidname info"));
       list_producers->add_flag("--json,-j", print_json, localized("Output in JSON format"));
@@ -1460,8 +1460,8 @@ struct bidname_info_subcommand {
       list_producers->set_callback([this] {
          auto rawResult = call(get_table_func, fc::mutable_variant_object("json", true)
                                ("code", "eosio")("scope", "eosio")("table", "namebids")
-                               ("lower_bound", newname.value)
-                               ("upper_bound", newname.value + 1)
+                               ("lower_bound", name(newname).to_uint64_t())
+                               ("upper_bound", name(newname).to_uint64_t() + 1)
                                // Less than ideal upper_bound usage preserved so cleos can still work with old buggy nodeos versions
                                // Change to newname.value when cleos no longer needs to support nodeos versions older than 1.5.0
                                ("limit", 1));
@@ -1471,7 +1471,7 @@ struct bidname_info_subcommand {
          }
          auto result = rawResult.as<eosio::chain_apis::read_only::get_table_rows_result>();
          // Condition in if statement below can simply be res.rows.empty() when cleos no longer needs to support nodeos versions older than 1.5.0
-         if( result.rows.empty() || result.rows[0].get_object()["newname"].as_string() != newname.to_string() ) {
+         if( result.rows.empty() || result.rows[0].get_object()["newname"].as_string() != name(newname).to_string() ) {
             std::cout << "No bidname record found" << std::endl;
             return;
          }
@@ -1492,7 +1492,7 @@ struct bidname_info_subcommand {
 };
 
 struct list_bw_subcommand {
-   eosio::name account;
+   string account;
    bool print_json = false;
 
    list_bw_subcommand(CLI::App* actionRoot) {
@@ -1504,7 +1504,7 @@ struct list_bw_subcommand {
             //get entire table in scope of user account
             auto result = call(get_table_func, fc::mutable_variant_object("json", true)
                                ("code", name(config::system_account_name).to_string())
-                               ("scope", account.to_string())
+                               ("scope", name(account).to_string())
                                ("table", "delband")
             );
             if (!print_json) {
@@ -1546,9 +1546,9 @@ struct buyram_subcommand {
       buyram->set_callback([this] {
          EOSC_ASSERT( !kbytes || !bytes, "ERROR: --kbytes and --bytes cannot be set at the same time" );
          if (kbytes || bytes) {
-            send_actions( { create_buyrambytes(from_str, receiver_str, fc::to_uint64(amount) * ((kbytes) ? 1024ull : 1ull)) } );
+            send_actions( { create_buyrambytes(name(from_str), name(receiver_str), fc::to_uint64(amount) * ((kbytes) ? 1024ull : 1ull)) } );
          } else {
-            send_actions( { create_buyram(from_str, receiver_str, to_asset(amount)) } );
+            send_actions( { create_buyram(name(from_str), name(receiver_str), to_asset(amount)) } );
          }
       });
    }
@@ -1569,7 +1569,7 @@ struct sellram_subcommand {
             fc::variant act_payload = fc::mutable_variant_object()
                ("account", receiver_str)
                ("bytes", amount);
-            auto accountPermissions = get_account_permissions(tx_permission, {receiver_str,config::active_name});
+            auto accountPermissions = get_account_permissions(tx_permission, {name(receiver_str), config::active_name});
             send_actions({create_action(accountPermissions, config::system_account_name, N(sellram), act_payload)});
          });
    }
@@ -1586,7 +1586,7 @@ struct claimrewards_subcommand {
       claim_rewards->set_callback([this] {
          fc::variant act_payload = fc::mutable_variant_object()
                   ("owner", owner);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(claimrewards), act_payload)});
       });
    }
@@ -1604,7 +1604,7 @@ struct regproxy_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
                   ("proxy", proxy)
                   ("isproxy", true);
-         auto accountPermissions = get_account_permissions(tx_permission, {proxy,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(proxy), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(regproxy), act_payload)});
       });
    }
@@ -1622,7 +1622,7 @@ struct unregproxy_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
                   ("proxy", proxy)
                   ("isproxy", false);
-         auto accountPermissions = get_account_permissions(tx_permission, {proxy,config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(proxy), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, N(regproxy), act_payload)});
       });
    }
@@ -1641,7 +1641,7 @@ struct canceldelay_subcommand {
       add_standard_transaction_options(cancel_delay, "canceling_account@canceling_permission");
 
       cancel_delay->set_callback([this] {
-         auto canceling_auth = permission_level{canceling_account, canceling_permission};
+         auto canceling_auth = permission_level{name(canceling_account), name(canceling_permission)};
          fc::variant act_payload = fc::mutable_variant_object()
                   ("canceling_auth", canceling_auth)
                   ("trx_id", trx_id);
@@ -1665,7 +1665,7 @@ struct deposit_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
             ("owner",  owner_str)
             ("amount", amount_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1685,7 +1685,7 @@ struct withdraw_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
             ("owner",  owner_str)
             ("amount", amount_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1705,7 +1705,7 @@ struct buyrex_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
             ("from",   from_str)
             ("amount", amount_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1729,7 +1729,7 @@ struct lendrex_subcommand {
          fc::variant act_payload2 = fc::mutable_variant_object()
             ("from",   from_str)
             ("amount", amount_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name1, act_payload1),
                        create_action(accountPermissions, config::system_account_name, act_name2, act_payload2)});
       });
@@ -1756,7 +1756,7 @@ struct unstaketorex_subcommand {
             ("receiver", receiver_str)
             ("from_net", from_net_str)
             ("from_cpu", from_cpu_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1776,7 +1776,7 @@ struct sellrex_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
             ("from", from_str)
             ("rex",  rex_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1792,7 +1792,7 @@ struct cancelrexorder_subcommand {
       add_standard_transaction_options(cancelrexorder, "owner@active");
       cancelrexorder->set_callback([this] {
          fc::variant act_payload = fc::mutable_variant_object()("owner", owner_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1818,7 +1818,7 @@ struct rentcpu_subcommand {
             ("receiver",     receiver_str)
             ("loan_payment", loan_payment_str)
             ("loan_fund",    loan_fund_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1844,7 +1844,7 @@ struct rentnet_subcommand {
             ("receiver",     receiver_str)
             ("loan_payment", loan_payment_str)
             ("loan_fund",    loan_fund_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1867,7 +1867,7 @@ struct fundcpuloan_subcommand {
             ("from",     from_str)
             ("loan_num", loan_num_str)
             ("payment",  payment_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1890,7 +1890,7 @@ struct fundnetloan_subcommand {
             ("from",     from_str)
             ("loan_num", loan_num_str)
             ("payment",  payment_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1913,7 +1913,7 @@ struct defcpuloan_subcommand {
             ("from",     from_str)
             ("loan_num", loan_num_str)
             ("amount",   amount_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1936,7 +1936,7 @@ struct defnetloan_subcommand {
             ("from",     from_str)
             ("loan_num", loan_num_str)
             ("amount",   amount_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {from_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(from_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1956,7 +1956,7 @@ struct mvtosavings_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
             ("owner", owner_str)
             ("rex",   rex_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1976,7 +1976,7 @@ struct mvfrsavings_subcommand {
          fc::variant act_payload = fc::mutable_variant_object()
             ("owner", owner_str)
             ("rex",   rex_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -1992,7 +1992,7 @@ struct updaterex_subcommand {
       add_standard_transaction_options(updaterex, "owner@active");
       updaterex->set_callback([this] {
          fc::variant act_payload = fc::mutable_variant_object()("owner", owner_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -2008,7 +2008,7 @@ struct consolidate_subcommand {
       add_standard_transaction_options(consolidate, "owner@active");
       consolidate->set_callback([this] {
          fc::variant act_payload = fc::mutable_variant_object()("owner", owner_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -2028,7 +2028,7 @@ struct rexexec_subcommand {
             fc::variant act_payload = fc::mutable_variant_object()
                ("user", user_str)
                ("max",  max_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {user_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(user_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -2044,7 +2044,7 @@ struct closerex_subcommand {
       add_standard_transaction_options(closerex, "owner@active");
       closerex->set_callback([this] {
          fc::variant act_payload = fc::mutable_variant_object()("owner", owner_str);
-         auto accountPermissions = get_account_permissions(tx_permission, {owner_str, config::active_name});
+         auto accountPermissions = get_account_permissions(tx_permission, {name(owner_str), config::active_name});
          send_actions({create_action(accountPermissions, config::system_account_name, act_name, act_payload)});
       });
    }
@@ -2099,7 +2099,7 @@ void get_account( const string& accountName, const string& coresym, bool json_fo
             sep = ", ";
          }
          for ( auto& acc : p.required_auth.accounts ) {
-            std::cout << sep << acc.weight << ' ' << string(acc.permission.actor) << '@' << string(acc.permission.permission);
+            std::cout << sep << acc.weight << ' ' << acc.permission.actor.to_string() << '@' << acc.permission.permission.to_string();
             sep = ", ";
          }
          std::cout << std::endl;
@@ -2455,7 +2455,7 @@ int main( int argc, char** argv ) {
       try {
          unpacked_action_data_json = json_from_file_or_string(unpacked_action_data_string);
       } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse unpacked action data JSON")
-      bytes packed_action_data_string = variant_to_bin(unpacked_action_data_account_string, unpacked_action_data_name_string, unpacked_action_data_json);
+      bytes packed_action_data_string = variant_to_bin(name(unpacked_action_data_account_string), name(unpacked_action_data_name_string), unpacked_action_data_json);
       std::cout << fc::to_hex(packed_action_data_string.data(), packed_action_data_string.size()) << std::endl;
    });
 
@@ -2471,7 +2471,7 @@ int main( int argc, char** argv ) {
       EOS_ASSERT( packed_action_data_string.size() >= 2, transaction_type_exception, "No packed_action_data found" );
       vector<char> packed_action_data_blob(packed_action_data_string.size()/2);
       fc::from_hex(packed_action_data_string, packed_action_data_blob.data(), packed_action_data_blob.size());
-      fc::variant unpacked_action_data_json = bin_to_variant(packed_action_data_account_string, packed_action_data_name_string, packed_action_data_blob);
+      fc::variant unpacked_action_data_json = bin_to_variant(name(packed_action_data_account_string), name(packed_action_data_name_string), packed_action_data_blob);
       std::cout << fc::json::to_pretty_string(unpacked_action_data_json) << std::endl;
    });
 
@@ -2971,7 +2971,7 @@ int main( int argc, char** argv ) {
       }
 
       if (!duplicate) {
-         actions.emplace_back( create_setcode(account, code_bytes ) );
+         actions.emplace_back( create_setcode(name(account), code_bytes ) );
          if ( shouldSend ) {
             std::cerr << localized("Setting Code...") << std::endl;
             send_actions(std::move(actions), packed_transaction::zlib);
@@ -3018,7 +3018,7 @@ int main( int argc, char** argv ) {
 
       if (!duplicate) {
          try {
-            actions.emplace_back( create_setabi(account, abi_bytes) );
+            actions.emplace_back( create_setabi(name(account), abi_bytes) );
          } EOS_RETHROW_EXCEPTIONS(abi_type_exception,  "Fail to parse ABI JSON")
          if ( shouldSend ) {
             std::cerr << localized("Setting ABI...") << std::endl;
@@ -3082,12 +3082,12 @@ int main( int argc, char** argv ) {
          tx_force_unique = false;
       }
 
-      auto transfer_amount = to_asset(con, amount);
-      auto transfer = create_transfer(con, sender, recipient, transfer_amount, memo);
+      auto transfer_amount = to_asset(name(con), amount);
+      auto transfer = create_transfer(con, name(sender), name(recipient), transfer_amount, memo);
       if (!pay_ram) {
          send_actions( { transfer });
       } else {
-         auto open_ = create_open(con, recipient, transfer_amount.get_symbol(), sender);
+         auto open_ = create_open(con, name(recipient), transfer_amount.get_symbol(), name(sender));
          send_actions( { open_, transfer } );
       }
    });
@@ -3354,7 +3354,8 @@ int main( int argc, char** argv ) {
       }
       auto accountPermissions = get_account_permissions(tx_permission);
 
-      send_actions({chain::action{accountPermissions, contract_account, action, variant_to_bin( contract_account, action, action_args_var ) }});
+      send_actions({chain::action{accountPermissions, name(contract_account), name(action),
+                                  variant_to_bin( name(contract_account), name(action), action_args_var ) }});
    });
 
    // push transaction
@@ -3441,7 +3442,7 @@ int main( int argc, char** argv ) {
          trx_var = json_from_file_or_string(proposed_transaction);
       } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse transaction JSON '${data}'", ("data",proposed_transaction))
       transaction proposed_trx = trx_var.as<transaction>();
-      bytes proposed_trx_serialized = variant_to_bin( proposed_contract, proposed_action, trx_var );
+      bytes proposed_trx_serialized = variant_to_bin( name(proposed_contract), name(proposed_action), trx_var );
 
       vector<permission_level> reqperm;
       try {
@@ -3456,7 +3457,7 @@ int main( int argc, char** argv ) {
       auto accountPermissions = get_account_permissions(tx_permission);
       if (accountPermissions.empty()) {
          if (!proposer.empty()) {
-            accountPermissions = vector<permission_level>{{proposer, config::active_name}};
+            accountPermissions = vector<permission_level>{{name(proposer), config::active_name}};
          } else {
             EOS_THROW(missing_auth_exception, "Authority is not provided (either by multisig parameter <proposer> or -p)");
          }
@@ -3483,7 +3484,7 @@ int main( int argc, char** argv ) {
          ("requested", requested_perm_var)
          ("trx", trx_var);
 
-      send_actions({chain::action{accountPermissions, "eosio.msig", "propose", variant_to_bin( N(eosio.msig), N(propose), args ) }});
+      send_actions({chain::action{accountPermissions, N(eosio.msig), N(propose), variant_to_bin( N(eosio.msig), N(propose), args ) }});
    });
 
    //multisig propose transaction
@@ -3508,7 +3509,7 @@ int main( int argc, char** argv ) {
       auto accountPermissions = get_account_permissions(tx_permission);
       if (accountPermissions.empty()) {
          if (!proposer.empty()) {
-            accountPermissions = vector<permission_level>{{proposer, config::active_name}};
+            accountPermissions = vector<permission_level>{{name(proposer), config::active_name}};
          } else {
             EOS_THROW(missing_auth_exception, "Authority is not provided (either by multisig parameter <proposer> or -p)");
          }
@@ -3523,7 +3524,7 @@ int main( int argc, char** argv ) {
          ("requested", requested_perm_var)
          ("trx", trx_var);
 
-      send_actions({chain::action{accountPermissions, "eosio.msig", "propose", variant_to_bin( N(eosio.msig), N(propose), args ) }});
+      send_actions({chain::action{accountPermissions, N(eosio.msig), N(propose), variant_to_bin( N(eosio.msig), N(propose), args ) }});
    });
 
 
@@ -3540,8 +3541,8 @@ int main( int argc, char** argv ) {
                                  ("scope", proposer)
                                  ("table", "proposal")
                                  ("table_key", "")
-                                 ("lower_bound", name(proposal_name).value)
-                                 ("upper_bound", name(proposal_name).value + 1)
+                                 ("lower_bound", name(proposal_name).to_uint64_t())
+                                 ("upper_bound", name(proposal_name).to_uint64_t() + 1)
                                  // Less than ideal upper_bound usage preserved so cleos can still work with old buggy nodeos versions
                                  // Change to name(proposal_name).value when cleos no longer needs to support nodeos versions older than 1.5.0
                                  ("limit", 1)
@@ -3576,8 +3577,8 @@ int main( int argc, char** argv ) {
                                        ("scope", proposer)
                                        ("table", "approvals2")
                                        ("table_key", "")
-                                       ("lower_bound", name(proposal_name).value)
-                                       ("upper_bound", name(proposal_name).value + 1)
+                                       ("lower_bound", name(proposal_name).to_uint64_t())
+                                       ("upper_bound", name(proposal_name).to_uint64_t() + 1)
                                        // Less than ideal upper_bound usage preserved so cleos can still work with old buggy nodeos versions
                                        // Change to name(proposal_name).value when cleos no longer needs to support nodeos versions older than 1.5.0
                                        ("limit", 1)
@@ -3608,8 +3609,8 @@ int main( int argc, char** argv ) {
                                        ("scope", proposer)
                                        ("table", "approvals")
                                        ("table_key", "")
-                                       ("lower_bound", name(proposal_name).value)
-                                       ("upper_bound", name(proposal_name).value + 1)
+                                       ("lower_bound", name(proposal_name).to_uint64_t())
+                                       ("upper_bound", name(proposal_name).to_uint64_t() + 1)
                                        // Less than ideal upper_bound usage preserved so cleos can still work with old buggy nodeos versions
                                        // Change to name(proposal_name).value when cleos no longer needs to support nodeos versions older than 1.5.0
                                        ("limit", 1)
@@ -3641,8 +3642,8 @@ int main( int argc, char** argv ) {
                                           ("scope", "eosio.msig")
                                           ("table", "invals")
                                           ("table_key", "")
-                                          ("lower_bound", a.first.value)
-                                          ("upper_bound", a.first.value + 1)
+                                          ("lower_bound", a.first.to_uint64_t())
+                                          ("upper_bound", a.first.to_uint64_t() + 1)
                                           // Less than ideal upper_bound usage preserved so cleos can still work with old buggy nodeos versions
                                           // Change to name(proposal_name).value when cleos no longer needs to support nodeos versions older than 1.5.0
                                           ("limit", 1)
@@ -3742,8 +3743,8 @@ int main( int argc, char** argv ) {
          args("proposal_hash", proposal_hash);
       }
 
-      auto accountPermissions = get_account_permissions(tx_permission, {proposer,config::active_name});
-      send_actions({chain::action{accountPermissions, "eosio.msig", action, variant_to_bin( N(eosio.msig), action, args ) }});
+      auto accountPermissions = get_account_permissions(tx_permission, {name(proposer), config::active_name});
+      send_actions({chain::action{accountPermissions, N(eosio.msig), name(action), variant_to_bin( N(eosio.msig), name(action), args ) }});
    };
 
    // multisig approve
@@ -3772,8 +3773,8 @@ int main( int argc, char** argv ) {
       auto args = fc::mutable_variant_object()
          ("account", invalidator);
 
-      auto accountPermissions = get_account_permissions(tx_permission, {invalidator,config::active_name});
-      send_actions({chain::action{accountPermissions, "eosio.msig", "invalidate", variant_to_bin( N(eosio.msig), "invalidate", args ) }});
+      auto accountPermissions = get_account_permissions(tx_permission, {name(invalidator), config::active_name});
+      send_actions({chain::action{accountPermissions, N(eosio.msig), N(invalidate), variant_to_bin( N(eosio.msig), N(invalidate), args ) }});
    });
 
    // multisig cancel
@@ -3787,7 +3788,7 @@ int main( int argc, char** argv ) {
       auto accountPermissions = get_account_permissions(tx_permission);
       if (accountPermissions.empty()) {
          if (!canceler.empty()) {
-            accountPermissions = vector<permission_level>{{canceler, config::active_name}};
+            accountPermissions = vector<permission_level>{{name(canceler), config::active_name}};
          } else {
             EOS_THROW(missing_auth_exception, "Authority is not provided (either by multisig parameter <canceler> or -p)");
          }
@@ -3800,7 +3801,7 @@ int main( int argc, char** argv ) {
          ("proposal_name", proposal_name)
          ("canceler", canceler);
 
-      send_actions({chain::action{accountPermissions, "eosio.msig", "cancel", variant_to_bin( N(eosio.msig), N(cancel), args ) }});
+      send_actions({chain::action{accountPermissions, N(eosio.msig), N(cancel), variant_to_bin( N(eosio.msig), N(cancel), args ) }});
       }
    );
 
@@ -3815,7 +3816,7 @@ int main( int argc, char** argv ) {
       auto accountPermissions = get_account_permissions(tx_permission);
       if (accountPermissions.empty()) {
          if (!executer.empty()) {
-            accountPermissions = vector<permission_level>{{executer, config::active_name}};
+            accountPermissions = vector<permission_level>{{name(executer), config::active_name}};
          } else {
             EOS_THROW(missing_auth_exception, "Authority is not provided (either by multisig parameter <executer> or -p)");
          }
@@ -3829,7 +3830,7 @@ int main( int argc, char** argv ) {
          ("proposal_name", proposal_name)
          ("executer", executer);
 
-      send_actions({chain::action{accountPermissions, "eosio.msig", "exec", variant_to_bin( N(eosio.msig), N(exec), args ) }});
+      send_actions({chain::action{accountPermissions, N(eosio.msig), N(exec), variant_to_bin( N(eosio.msig), N(exec), args ) }});
       }
    );
 
@@ -3855,14 +3856,14 @@ int main( int argc, char** argv ) {
 
       auto accountPermissions = get_account_permissions(tx_permission);
       if( accountPermissions.empty() ) {
-         accountPermissions = vector<permission_level>{{executer, config::active_name}, {wrap_con, config::active_name}};
+         accountPermissions = vector<permission_level>{{name(executer), config::active_name}, {name(wrap_con), config::active_name}};
       }
 
       auto args = fc::mutable_variant_object()
          ("executer", executer )
          ("trx", trx_var);
 
-      send_actions({chain::action{accountPermissions, wrap_con, "exec", variant_to_bin( wrap_con, N(exec), args ) }});
+      send_actions({chain::action{accountPermissions, name(wrap_con), N(exec), variant_to_bin( name(wrap_con), N(exec), args ) }});
    });
 
    // system subcommand

From 496a452904271991cf06b6801672c4155a418d35 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 09:35:24 -0500
Subject: [PATCH 0336/1648] Update tests for explicit name

---
 .../testing/include/eosio/testing/tester.hpp  |   8 +-
 libraries/testing/tester.cpp                  |  10 +-
 unittests/abi_tests.cpp                       |  68 ++---
 unittests/api_tests.cpp                       | 240 +++++++++---------
 unittests/auth_tests.cpp                      | 199 +++++++--------
 unittests/bootseq_tests.cpp                   |  44 ++--
 unittests/currency_tests.cpp                  |   4 +-
 unittests/database_tests.cpp                  |   6 +-
 unittests/eosio.token_tests.cpp               |   6 +-
 unittests/eosio_system_tester.hpp             |  24 +-
 unittests/fork_test_utilities.cpp             |   2 +-
 unittests/misc_tests.cpp                      |  61 ++---
 unittests/protocol_feature_tests.cpp          |   6 +-
 unittests/ram_tests.cpp                       |   2 +-
 unittests/special_accounts_tests.cpp          |   2 +-
 unittests/wasm_tests.cpp                      |  30 +--
 unittests/whitelist_blacklist_tests.cpp       |  12 +-
 17 files changed, 364 insertions(+), 360 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index cda857ff2c2..16dab638d31 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -172,8 +172,8 @@ namespace eosio { namespace testing {
          vector<producer_key>  get_producer_keys( const vector<account_name>& producer_names )const;
          transaction_trace_ptr set_producers(const vector<account_name>& producer_names);
 
-         void link_authority( account_name account, account_name code,  permission_name req, action_name type = "" );
-         void unlink_authority( account_name account, account_name code, action_name type = "" );
+         void link_authority( account_name account, account_name code,  permission_name req, action_name type = {} );
+         void unlink_authority( account_name account, account_name code, action_name type = {} );
          void set_authority( account_name account, permission_name perm, authority auth,
                                      permission_name parent, const vector<permission_level>& auths, const vector<private_key_type>& keys );
          void set_authority( account_name account, permission_name perm, authority auth,
@@ -212,7 +212,7 @@ namespace eosio { namespace testing {
 
          template< typename KeyType = fc::ecc::private_key_shim >
          static private_key_type get_private_key( name keyname, string role = "owner" ) {
-            return private_key_type::regenerate<KeyType>(fc::sha256::hash(string(keyname)+role));
+            return private_key_type::regenerate<KeyType>(fc::sha256::hash(keyname.to_string()+role));
          }
 
          template< typename KeyType = fc::ecc::private_key_shim >
@@ -231,7 +231,7 @@ namespace eosio { namespace testing {
                                                              const symbol&       asset_symbol,
                                                              const account_name& account ) const;
 
-         vector<char> get_row_by_account( uint64_t code, uint64_t scope, uint64_t table, const account_name& act ) const;
+         vector<char> get_row_by_account( name code, name scope, name table, const account_name& act ) const;
 
          map<account_name, block_id_type> get_last_produced_block_map()const { return last_produced_block; };
          void set_last_produced_block_map( const map<account_name, block_id_type>& lpb ) { last_produced_block = lpb; }
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index a9a442d8380..8173849b584 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -489,12 +489,12 @@ namespace eosio { namespace testing {
    typename base_tester::action_result base_tester::push_action(action&& act, uint64_t authorizer) {
       signed_transaction trx;
       if (authorizer) {
-         act.authorization = vector<permission_level>{{authorizer, config::active_name}};
+         act.authorization = vector<permission_level>{{account_name(authorizer), config::active_name}};
       }
       trx.actions.emplace_back(std::move(act));
       set_transaction_headers(trx);
       if (authorizer) {
-         trx.sign(get_private_key(authorizer, "active"), control->get_chain_id());
+         trx.sign(get_private_key(account_name(authorizer), "active"), control->get_chain_id());
       }
       try {
          push_transaction(trx);
@@ -863,7 +863,7 @@ namespace eosio { namespace testing {
    }
 
 
-   vector<char> base_tester::get_row_by_account( uint64_t code, uint64_t scope, uint64_t table, const account_name& act ) const {
+   vector<char> base_tester::get_row_by_account( name code, name scope, name table, const account_name& act ) const {
       vector<char> data;
       const auto& db = control->db();
       const auto* t_id = db.find<chain::table_id_object, chain::by_code_scope_table>( boost::make_tuple( code, scope, table ) );
@@ -874,8 +874,8 @@ namespace eosio { namespace testing {
 
       const auto& idx = db.get_index<chain::key_value_index, chain::by_scope_primary>();
 
-      auto itr = idx.lower_bound( boost::make_tuple( t_id->id, act ) );
-      if ( itr == idx.end() || itr->t_id != t_id->id || act.value != itr->primary_key ) {
+      auto itr = idx.lower_bound( boost::make_tuple( t_id->id, act.to_uint64_t() ) );
+      if ( itr == idx.end() || itr->t_id != t_id->id || act.to_uint64_t() != itr->primary_key ) {
          return data;
       }
 
diff --git a/unittests/abi_tests.cpp b/unittests/abi_tests.cpp
index 7e6c84fb6f2..439bbe5131f 100644
--- a/unittests/abi_tests.cpp
+++ b/unittests/abi_tests.cpp
@@ -818,10 +818,10 @@ BOOST_AUTO_TEST_CASE(linkauth_test)
    auto var = fc::json::from_string(test_data);
 
    auto lauth = var.as<linkauth>();
-   BOOST_TEST("lnkauth.acct" == lauth.account);
-   BOOST_TEST("lnkauth.code" == lauth.code);
-   BOOST_TEST("lnkauth.type" == lauth.type);
-   BOOST_TEST("lnkauth.rqm" == lauth.requirement);
+   BOOST_TEST(name("lnkauth.acct") == lauth.account);
+   BOOST_TEST(name("lnkauth.code") == lauth.code);
+   BOOST_TEST(name("lnkauth.type") == lauth.type);
+   BOOST_TEST(name("lnkauth.rqm") == lauth.requirement);
 
    auto var2 = verify_byte_round_trip_conversion( abis, "linkauth", var );
    auto linkauth2 = var2.as<linkauth>();
@@ -851,9 +851,9 @@ BOOST_AUTO_TEST_CASE(unlinkauth_test)
    auto var = fc::json::from_string(test_data);
 
    auto unlauth = var.as<unlinkauth>();
-   BOOST_TEST("lnkauth.acct" == unlauth.account);
-   BOOST_TEST("lnkauth.code" == unlauth.code);
-   BOOST_TEST("lnkauth.type" == unlauth.type);
+   BOOST_TEST(name("lnkauth.acct") == unlauth.account);
+   BOOST_TEST(name("lnkauth.code") == unlauth.code);
+   BOOST_TEST(name("lnkauth.type") == unlauth.type);
 
    auto var2 = verify_byte_round_trip_conversion( abis, "unlinkauth", var );
    auto unlinkauth2 = var2.as<unlinkauth>();
@@ -890,9 +890,9 @@ BOOST_AUTO_TEST_CASE(updateauth_test)
    auto var = fc::json::from_string(test_data);
 
    auto updauth = var.as<updateauth>();
-   BOOST_TEST("updauth.acct" == updauth.account);
-   BOOST_TEST("updauth.prm" == updauth.permission);
-   BOOST_TEST("updauth.prnt" == updauth.parent);
+   BOOST_TEST(name("updauth.acct") == updauth.account);
+   BOOST_TEST(name("updauth.prm") == updauth.permission);
+   BOOST_TEST(name("updauth.prnt") == updauth.parent);
    BOOST_TEST(2147483145u == updauth.auth.threshold);
 
    BOOST_TEST_REQUIRE(2u == updauth.auth.keys.size());
@@ -902,11 +902,11 @@ BOOST_AUTO_TEST_CASE(updateauth_test)
    BOOST_TEST(57605u == updauth.auth.keys[1].weight);
 
    BOOST_TEST_REQUIRE(2u == updauth.auth.accounts.size());
-   BOOST_TEST("prm.acct1" == updauth.auth.accounts[0].permission.actor);
-   BOOST_TEST("prm.prm1" == updauth.auth.accounts[0].permission.permission);
+   BOOST_TEST(name("prm.acct1") == updauth.auth.accounts[0].permission.actor);
+   BOOST_TEST(name("prm.prm1") == updauth.auth.accounts[0].permission.permission);
    BOOST_TEST(53005u == updauth.auth.accounts[0].weight);
-   BOOST_TEST("prm.acct2" == updauth.auth.accounts[1].permission.actor);
-   BOOST_TEST("prm.prm2" == updauth.auth.accounts[1].permission.permission);
+   BOOST_TEST(name("prm.acct2") == updauth.auth.accounts[1].permission.actor);
+   BOOST_TEST(name("prm.prm2") == updauth.auth.accounts[1].permission.permission);
    BOOST_TEST(53405u == updauth.auth.accounts[1].weight);
 
    auto var2 = verify_byte_round_trip_conversion( abis, "updateauth", var );
@@ -951,8 +951,8 @@ BOOST_AUTO_TEST_CASE(deleteauth_test)
    auto var = fc::json::from_string(test_data);
 
    auto delauth = var.as<deleteauth>();
-   BOOST_TEST("delauth.acct" == delauth.account);
-   BOOST_TEST("delauth.prm" == delauth.permission);
+   BOOST_TEST(name("delauth.acct") == delauth.account);
+   BOOST_TEST(name("delauth.prm") == delauth.permission);
 
    auto var2 = verify_byte_round_trip_conversion( abis, "deleteauth", var );
    auto deleteauth2 = var2.as<deleteauth>();
@@ -994,8 +994,8 @@ BOOST_AUTO_TEST_CASE(newaccount_test)
    auto var = fc::json::from_string(test_data);
 
    auto newacct = var.as<newaccount>();
-   BOOST_TEST("newacct.crtr" == newacct.creator);
-   BOOST_TEST("newacct.name" == newacct.name);
+   BOOST_TEST(name("newacct.crtr") == newacct.creator);
+   BOOST_TEST(name("newacct.name") == newacct.name);
 
    BOOST_TEST(2147483145u == newacct.owner.threshold);
 
@@ -1006,11 +1006,11 @@ BOOST_AUTO_TEST_CASE(newaccount_test)
    BOOST_TEST(57605u == newacct.owner.keys[1].weight);
 
    BOOST_TEST_REQUIRE(2u == newacct.owner.accounts.size());
-   BOOST_TEST("prm.acct1" == newacct.owner.accounts[0].permission.actor);
-   BOOST_TEST("prm.prm1" == newacct.owner.accounts[0].permission.permission);
+   BOOST_TEST(name("prm.acct1") == newacct.owner.accounts[0].permission.actor);
+   BOOST_TEST(name("prm.prm1") == newacct.owner.accounts[0].permission.permission);
    BOOST_TEST(53005u == newacct.owner.accounts[0].weight);
-   BOOST_TEST("prm.acct2" == newacct.owner.accounts[1].permission.actor);
-   BOOST_TEST("prm.prm2" == newacct.owner.accounts[1].permission.permission);
+   BOOST_TEST(name("prm.acct2") == newacct.owner.accounts[1].permission.actor);
+   BOOST_TEST(name("prm.prm2") == newacct.owner.accounts[1].permission.permission);
    BOOST_TEST(53405u == newacct.owner.accounts[1].weight);
 
    BOOST_TEST(2146483145u == newacct.active.threshold);
@@ -1022,11 +1022,11 @@ BOOST_AUTO_TEST_CASE(newaccount_test)
    BOOST_TEST(57605u == newacct.active.keys[1].weight);
 
    BOOST_TEST_REQUIRE(2u == newacct.active.accounts.size());
-   BOOST_TEST("prm.acct1" == newacct.active.accounts[0].permission.actor);
-   BOOST_TEST("prm.prm1" == newacct.active.accounts[0].permission.permission);
+   BOOST_TEST(name("prm.acct1") == newacct.active.accounts[0].permission.actor);
+   BOOST_TEST(name("prm.prm1") == newacct.active.accounts[0].permission.permission);
    BOOST_TEST(53005u == newacct.active.accounts[0].weight);
-   BOOST_TEST("prm.acct2" == newacct.active.accounts[1].permission.actor);
-   BOOST_TEST("prm.prm2" == newacct.active.accounts[1].permission.permission);
+   BOOST_TEST(name("prm.acct2") == newacct.active.accounts[1].permission.actor);
+   BOOST_TEST(name("prm.prm2") == newacct.active.accounts[1].permission.permission);
    BOOST_TEST(53405u == newacct.active.accounts[1].weight);
 
 
@@ -1090,7 +1090,7 @@ BOOST_AUTO_TEST_CASE(setcode_test)
    auto var = fc::json::from_string(test_data);
 
    auto set_code = var.as<setcode>();
-   BOOST_TEST("setcode.acc" == set_code.account);
+   BOOST_TEST(name("setcode.acc") == set_code.account);
    BOOST_TEST(0 == set_code.vmtype);
    BOOST_TEST(0 == set_code.vmversion);
    BOOST_TEST("0061736d0100000001390a60037e7e7f017f60047e7e7f7f017f60017e0060057e7e7e7f7f" == fc::to_hex(set_code.code.data(), set_code.code.size()));
@@ -1335,11 +1335,11 @@ BOOST_AUTO_TEST_CASE(setabi_test)
    BOOST_TEST("uint64" == abi.structs[2].fields[1].type);
 
    BOOST_TEST_REQUIRE(1u == abi.actions.size());
-   BOOST_TEST("transfer" == abi.actions[0].name);
+   BOOST_TEST(name("transfer") == abi.actions[0].name);
    BOOST_TEST("transfer" == abi.actions[0].type);
 
    BOOST_TEST_REQUIRE(1u == abi.tables.size());
-   BOOST_TEST("account" == abi.tables[0].name);
+   BOOST_TEST(name("account") == abi.tables[0].name);
    BOOST_TEST("account" == abi.tables[0].type);
    BOOST_TEST("i64" == abi.tables[0].index_type);
    BOOST_TEST_REQUIRE(1u == abi.tables[0].key_names.size());
@@ -1446,20 +1446,20 @@ struct action2 {
 template<typename T>
 void verify_action_equal(const chain::action& exp, const chain::action& act)
 {
-   BOOST_REQUIRE_EQUAL((std::string)exp.account, (std::string)act.account);
-   BOOST_REQUIRE_EQUAL((std::string)exp.name, (std::string)act.name);
+   BOOST_REQUIRE_EQUAL(exp.account.to_string(), act.account.to_string());
+   BOOST_REQUIRE_EQUAL(exp.name.to_string(), act.name.to_string());
    BOOST_REQUIRE_EQUAL(exp.authorization.size(), act.authorization.size());
    for(unsigned int i = 0; i < exp.authorization.size(); ++i)
    {
-      BOOST_REQUIRE_EQUAL((std::string)exp.authorization[i].actor, (std::string)act.authorization[i].actor);
-      BOOST_REQUIRE_EQUAL((std::string)exp.authorization[i].permission, (std::string)act.authorization[i].permission);
+      BOOST_REQUIRE_EQUAL(exp.authorization[i].actor.to_string(), act.authorization[i].actor.to_string());
+      BOOST_REQUIRE_EQUAL(exp.authorization[i].permission.to_string(), act.authorization[i].permission.to_string());
    }
    BOOST_REQUIRE_EQUAL(exp.data.size(), act.data.size());
    BOOST_REQUIRE(!memcmp(exp.data.data(), act.data.data(), exp.data.size()));
 }
 
 private_key_type get_private_key( name keyname, string role ) {
-   return private_key_type::regenerate<fc::ecc::private_key_shim>(fc::sha256::hash(string(keyname)+role));
+   return private_key_type::regenerate<fc::ecc::private_key_shim>(fc::sha256::hash(keyname.to_string()+role));
 }
 
 public_key_type  get_public_key( name keyname, string role ) {
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 8e2b9576506..27072862820 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -60,10 +60,10 @@ static constexpr unsigned long long WASM_TEST_ACTION(const char* cls, const char
 }
 
 struct dummy_action {
-   static uint64_t get_name() {
+   static eosio::chain::name get_name() {
       return N(dummyaction);
    }
-   static uint64_t get_account() {
+   static eosio::chain::name get_account() {
       return N(testapi);
    }
 
@@ -77,10 +77,10 @@ struct u128_action {
 };
 
 struct cf_action {
-   static uint64_t get_name() {
+   static eosio::chain::name get_name() {
       return N(cfaction);
    }
-   static uint64_t get_account() {
+   static eosio::chain::name get_account() {
       return N(testapi);
    }
 
@@ -94,13 +94,13 @@ struct dtt_action {
       return WASM_TEST_ACTION("test_transaction", "send_deferred_tx_with_dtt_action");
    }
    static uint64_t get_account() {
-      return N(testapi);
+      return N(testapi).to_uint64_t();
    }
 
-   uint64_t       payer = N(testapi);
-   uint64_t       deferred_account = N(testapi);
+   uint64_t       payer = N(testapi).to_uint64_t();
+   uint64_t       deferred_account = N(testapi).to_uint64_t();
    uint64_t       deferred_action = WASM_TEST_ACTION("test_transaction", "deferred_print");
-   uint64_t       permission_name = N(active);
+   uint64_t       permission_name = N(active).to_uint64_t();
    uint32_t       delay_sec = 2;
 };
 
@@ -604,15 +604,15 @@ BOOST_AUTO_TEST_CASE(ram_billing_in_notify_tests) { try {
    chain.produce_blocks(1);
 
    BOOST_CHECK_EXCEPTION( CALL_TEST_FUNCTION( chain, "test_action", "test_ram_billing_in_notify",
-                                              fc::raw::pack( ((unsigned __int128)N(testapi2) << 64) | N(testapi) ) ),
+                                              fc::raw::pack( ((unsigned __int128)N(testapi2).to_uint64_t() << 64) | N(testapi).to_uint64_t() ) ),
                           subjective_block_production_exception,
                           fc_exception_message_is("Cannot charge RAM to other accounts during notify.")
    );
 
 
-   CALL_TEST_FUNCTION( chain, "test_action", "test_ram_billing_in_notify", fc::raw::pack( ((unsigned __int128)N(testapi2) << 64) | 0 ) );
+   CALL_TEST_FUNCTION( chain, "test_action", "test_ram_billing_in_notify", fc::raw::pack( ((unsigned __int128)N(testapi2).to_uint64_t() << 64) | 0 ) );
 
-   CALL_TEST_FUNCTION( chain, "test_action", "test_ram_billing_in_notify", fc::raw::pack( ((unsigned __int128)N(testapi2) << 64) | N(testapi2) ) );
+   CALL_TEST_FUNCTION( chain, "test_action", "test_ram_billing_in_notify", fc::raw::pack( ((unsigned __int128)N(testapi2).to_uint64_t() << 64) | N(testapi2).to_uint64_t() ) );
 
    BOOST_REQUIRE_EQUAL( chain.validate(), true );
 } FC_LOG_AND_RETHROW() }
@@ -740,7 +740,7 @@ BOOST_FIXTURE_TEST_CASE(cfa_tx_signature, TESTER)  try {
    tx2.context_free_actions.push_back(cfa);
    set_transaction_headers(tx2);
 
-   const private_key_type& priv_key = get_private_key("dummy", "active");
+   const private_key_type& priv_key = get_private_key(name("dummy"), "active");
    BOOST_TEST((std::string)tx1.sign(priv_key, control->get_chain_id()) != (std::string)tx2.sign(priv_key, control->get_chain_id()));
 
    BOOST_REQUIRE_EQUAL( validate(), true );
@@ -1257,27 +1257,27 @@ BOOST_FIXTURE_TEST_CASE(deferred_transaction_tests, TESTER) { try {
       // Trigger a tx which in turn sends a deferred tx with payer != receiver
       // Payer is alice in this case, this tx should fail since we don't have the authorization of alice
       dtt_action dtt_act1;
-      dtt_act1.payer = N(alice);
+      dtt_act1.payer = N(alice).to_uint64_t();
       BOOST_CHECK_THROW(CALL_TEST_FUNCTION(*this, "test_transaction", "send_deferred_tx_with_dtt_action", fc::raw::pack(dtt_act1)), action_validate_exception);
 
       // Send a tx which in turn sends a deferred tx with the deferred tx's receiver != this tx receiver
       // This will include the authorization of the receiver, and impose any related delay associated with the authority
       // We set the authorization delay to be 10 sec here, and since the deferred tx delay is set to be 5 sec, so this tx should fail
       dtt_action dtt_act2;
-      dtt_act2.deferred_account = N(testapi2);
-      dtt_act2.permission_name = N(additional);
+      dtt_act2.deferred_account = N(testapi2).to_uint64_t();
+      dtt_act2.permission_name = N(additional).to_uint64_t();
       dtt_act2.delay_sec = 5;
 
-      auto auth = authority(get_public_key("testapi", name(dtt_act2.permission_name).to_string()), 10);
+      auto auth = authority(get_public_key(name("testapi"), name(dtt_act2.permission_name).to_string()), 10);
       auth.accounts.push_back( permission_level_weight{{N(testapi), config::eosio_code_name}, 1} );
 
-      push_action(config::system_account_name, updateauth::get_name(), "testapi", fc::mutable_variant_object()
+      push_action(config::system_account_name, updateauth::get_name(), name("testapi"), fc::mutable_variant_object()
               ("account", "testapi")
               ("permission", name(dtt_act2.permission_name))
               ("parent", "active")
               ("auth", auth)
       );
-      push_action(config::system_account_name, linkauth::get_name(), "testapi", fc::mutable_variant_object()
+      push_action(config::system_account_name, linkauth::get_name(), name("testapi"), fc::mutable_variant_object()
               ("account", "testapi")
               ("code", name(dtt_act2.deferred_account))
               ("type", name(dtt_act2.deferred_action))
@@ -1292,9 +1292,9 @@ BOOST_FIXTURE_TEST_CASE(deferred_transaction_tests, TESTER) { try {
       // But not anymore. With the RESTRICT_ACTION_TO_SELF protocol feature activated, it should now objectively
       // fail because testapi@additional permission is not unilaterally satisfied by testapi@eosio.code.
       dtt_action dtt_act3;
-      dtt_act3.deferred_account = N(testapi);
-      dtt_act3.permission_name = N(additional);
-      push_action(config::system_account_name, linkauth::get_name(), "testapi", fc::mutable_variant_object()
+      dtt_act3.deferred_account = N(testapi).to_uint64_t();
+      dtt_act3.permission_name = N(additional).to_uint64_t();
+      push_action(config::system_account_name, linkauth::get_name(), name("testapi"), fc::mutable_variant_object()
             ("account", "testapi")
             ("code", name(dtt_act3.deferred_account))
             ("type", name(dtt_act3.deferred_action))
@@ -2327,99 +2327,99 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_test, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[0].action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[0].creator_action_ordinal, 0);
    BOOST_REQUIRE_EQUAL((int)atrace[0].closest_unnotified_ancestor_action_ordinal, 0);
-   BOOST_REQUIRE_EQUAL(atrace[0].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[0].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[0].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[0].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[0].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[0].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[0].receipt.valid(), true);
    int start_gseq = atrace[0].receipt->global_sequence;
 
    BOOST_REQUIRE_EQUAL((int)atrace[1].action_ordinal,2);
    BOOST_REQUIRE_EQUAL((int)atrace[1].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[1].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[1].receiver.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[1].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[1].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[1].receiver, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[1].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[1].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[1].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[1].receipt->global_sequence, start_gseq + 1);
 
    BOOST_REQUIRE_EQUAL((int)atrace[2].action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[2].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[2].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[2].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[2].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[2].act.name.value, TEST_METHOD("test_action", "test_action_ordinal2"));
+   BOOST_REQUIRE_EQUAL(atrace[2].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[2].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[2].act.name, TEST_METHOD("test_action", "test_action_ordinal2"));
    BOOST_REQUIRE_EQUAL(atrace[2].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[2].receipt->global_sequence, start_gseq + 4);
 
    BOOST_REQUIRE_EQUAL((int)atrace[3].action_ordinal, 4);
    BOOST_REQUIRE_EQUAL((int)atrace[3].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[3].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[3].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[3].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[3].act.name.value, TEST_METHOD("test_action", "test_action_ordinal3"));
+   BOOST_REQUIRE_EQUAL(atrace[3].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[3].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[3].act.name, TEST_METHOD("test_action", "test_action_ordinal3"));
    BOOST_REQUIRE_EQUAL(atrace[3].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[3].receipt->global_sequence, start_gseq + 8);
 
    BOOST_REQUIRE_EQUAL((int)atrace[4].action_ordinal, 5);
    BOOST_REQUIRE_EQUAL((int)atrace[4].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[4].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[4].receiver.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[4].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[4].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[4].receiver, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[4].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[4].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[4].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[4].receipt->global_sequence, start_gseq + 2);
 
    BOOST_REQUIRE_EQUAL((int)atrace[5].action_ordinal, 6);
    BOOST_REQUIRE_EQUAL((int)atrace[5].creator_action_ordinal, 2);
    BOOST_REQUIRE_EQUAL((int)atrace[5].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[5].receiver.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[5].act.account.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[5].act.name.value, TEST_METHOD("test_action", "test_action_ordinal_foo"));
+   BOOST_REQUIRE_EQUAL(atrace[5].receiver, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[5].act.account, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[5].act.name, TEST_METHOD("test_action", "test_action_ordinal_foo"));
    BOOST_REQUIRE_EQUAL(atrace[5].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[5].receipt->global_sequence, start_gseq + 9);
 
    BOOST_REQUIRE_EQUAL((int)atrace[6].action_ordinal, 7);
    BOOST_REQUIRE_EQUAL((int)atrace[6].creator_action_ordinal,2);
    BOOST_REQUIRE_EQUAL((int)atrace[6].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[6].receiver.value, N(david));
-   BOOST_REQUIRE_EQUAL(atrace[6].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[6].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[6].receiver, N(david));
+   BOOST_REQUIRE_EQUAL(atrace[6].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[6].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[6].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[6].receipt->global_sequence, start_gseq + 3);
 
    BOOST_REQUIRE_EQUAL((int)atrace[7].action_ordinal, 8);
    BOOST_REQUIRE_EQUAL((int)atrace[7].creator_action_ordinal, 5);
    BOOST_REQUIRE_EQUAL((int)atrace[7].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[7].receiver.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[7].act.account.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[7].act.name.value, TEST_METHOD("test_action", "test_action_ordinal_bar"));
+   BOOST_REQUIRE_EQUAL(atrace[7].receiver, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[7].act.account, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[7].act.name, TEST_METHOD("test_action", "test_action_ordinal_bar"));
    BOOST_REQUIRE_EQUAL(atrace[7].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[7].receipt->global_sequence, start_gseq + 10);
 
    BOOST_REQUIRE_EQUAL((int)atrace[8].action_ordinal, 9);
    BOOST_REQUIRE_EQUAL((int)atrace[8].creator_action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[8].closest_unnotified_ancestor_action_ordinal, 3);
-   BOOST_REQUIRE_EQUAL(atrace[8].receiver.value, N(david));
-   BOOST_REQUIRE_EQUAL(atrace[8].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[8].act.name.value, TEST_METHOD("test_action", "test_action_ordinal2"));
+   BOOST_REQUIRE_EQUAL(atrace[8].receiver, N(david));
+   BOOST_REQUIRE_EQUAL(atrace[8].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[8].act.name, TEST_METHOD("test_action", "test_action_ordinal2"));
    BOOST_REQUIRE_EQUAL(atrace[8].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[8].receipt->global_sequence, start_gseq + 5);
 
    BOOST_REQUIRE_EQUAL((int)atrace[9].action_ordinal, 10);
    BOOST_REQUIRE_EQUAL((int)atrace[9].creator_action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[9].closest_unnotified_ancestor_action_ordinal, 3);
-   BOOST_REQUIRE_EQUAL(atrace[9].receiver.value, N(erin));
-   BOOST_REQUIRE_EQUAL(atrace[9].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[9].act.name.value, TEST_METHOD("test_action", "test_action_ordinal2"));
+   BOOST_REQUIRE_EQUAL(atrace[9].receiver, N(erin));
+   BOOST_REQUIRE_EQUAL(atrace[9].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[9].act.name, TEST_METHOD("test_action", "test_action_ordinal2"));
    BOOST_REQUIRE_EQUAL(atrace[9].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[9].receipt->global_sequence, start_gseq + 6);
 
    BOOST_REQUIRE_EQUAL((int)atrace[10].action_ordinal, 11);
    BOOST_REQUIRE_EQUAL((int)atrace[10].creator_action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[10].closest_unnotified_ancestor_action_ordinal, 3);
-   BOOST_REQUIRE_EQUAL(atrace[10].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[10].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[10].act.name.value, TEST_METHOD("test_action", "test_action_ordinal4"));
+   BOOST_REQUIRE_EQUAL(atrace[10].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[10].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[10].act.name, TEST_METHOD("test_action", "test_action_ordinal4"));
    BOOST_REQUIRE_EQUAL(atrace[10].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[10].receipt->global_sequence, start_gseq + 7);
 } FC_LOG_AND_RETHROW() }
@@ -2464,9 +2464,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest1, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[0].action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[0].creator_action_ordinal, 0);
    BOOST_REQUIRE_EQUAL((int)atrace[0].closest_unnotified_ancestor_action_ordinal, 0);
-   BOOST_REQUIRE_EQUAL(atrace[0].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[0].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[0].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[0].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[0].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[0].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[0].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[0].except.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[0].except->code(), 3050003);
@@ -2475,9 +2475,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest1, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[1].action_ordinal, 2);
    BOOST_REQUIRE_EQUAL((int)atrace[1].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[1].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[1].receiver.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[1].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[1].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[1].receiver, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[1].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[1].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[1].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[1].except.valid(), false);
 
@@ -2485,9 +2485,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest1, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[2].action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[2].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[2].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[2].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[2].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[2].act.name.value, TEST_METHOD("test_action", "test_action_ordinal2"));
+   BOOST_REQUIRE_EQUAL(atrace[2].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[2].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[2].act.name, TEST_METHOD("test_action", "test_action_ordinal2"));
    BOOST_REQUIRE_EQUAL(atrace[2].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[2].except.valid(), false);
 
@@ -2532,9 +2532,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest2, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[0].action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[0].creator_action_ordinal, 0);
    BOOST_REQUIRE_EQUAL((int)atrace[0].closest_unnotified_ancestor_action_ordinal, 0);
-   BOOST_REQUIRE_EQUAL(atrace[0].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[0].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[0].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[0].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[0].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[0].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[0].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[0].except.valid(), false);
    int start_gseq = atrace[0].receipt->global_sequence;
@@ -2543,9 +2543,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest2, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[1].action_ordinal,2);
    BOOST_REQUIRE_EQUAL((int)atrace[1].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[1].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[1].receiver.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[1].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[1].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[1].receiver, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[1].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[1].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[1].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[1].receipt->global_sequence, start_gseq + 1);
 
@@ -2553,9 +2553,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest2, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[2].action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[2].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[2].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[2].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[2].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[2].act.name.value, TEST_METHOD("test_action", "test_action_ordinal2"));
+   BOOST_REQUIRE_EQUAL(atrace[2].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[2].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[2].act.name, TEST_METHOD("test_action", "test_action_ordinal2"));
    BOOST_REQUIRE_EQUAL(atrace[2].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[2].except.valid(), false);
 
@@ -2563,9 +2563,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest2, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[3].action_ordinal, 4);
    BOOST_REQUIRE_EQUAL((int)atrace[3].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[3].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[3].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[3].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[3].act.name.value, TEST_METHOD("test_action", "test_action_ordinal3"));
+   BOOST_REQUIRE_EQUAL(atrace[3].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[3].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[3].act.name, TEST_METHOD("test_action", "test_action_ordinal3"));
    BOOST_REQUIRE_EQUAL(atrace[3].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[3].except.valid(), false);
 
@@ -2573,9 +2573,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest2, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[4].action_ordinal, 5);
    BOOST_REQUIRE_EQUAL((int)atrace[4].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[4].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[4].receiver.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[4].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[4].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[4].receiver, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[4].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[4].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[4].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[4].except.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[4].except->code(), 3050003);
@@ -2584,9 +2584,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest2, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[5].action_ordinal, 6);
    BOOST_REQUIRE_EQUAL((int)atrace[5].creator_action_ordinal, 2);
    BOOST_REQUIRE_EQUAL((int)atrace[5].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[5].receiver.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[5].act.account.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[5].act.name.value, TEST_METHOD("test_action", "test_action_ordinal_foo"));
+   BOOST_REQUIRE_EQUAL(atrace[5].receiver, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[5].act.account, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[5].act.name, TEST_METHOD("test_action", "test_action_ordinal_foo"));
    BOOST_REQUIRE_EQUAL(atrace[5].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[5].except.valid(), false);
 
@@ -2594,9 +2594,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest2, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[6].action_ordinal, 7);
    BOOST_REQUIRE_EQUAL((int)atrace[6].creator_action_ordinal,2);
    BOOST_REQUIRE_EQUAL((int)atrace[6].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[6].receiver.value, N(david));
-   BOOST_REQUIRE_EQUAL(atrace[6].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[6].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[6].receiver, N(david));
+   BOOST_REQUIRE_EQUAL(atrace[6].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[6].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[6].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[6].except.valid(), false);
 
@@ -2604,9 +2604,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest2, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[7].action_ordinal, 8);
    BOOST_REQUIRE_EQUAL((int)atrace[7].creator_action_ordinal, 5);
    BOOST_REQUIRE_EQUAL((int)atrace[7].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[7].receiver.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[7].act.account.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[7].act.name.value, TEST_METHOD("test_action", "test_action_ordinal_bar"));
+   BOOST_REQUIRE_EQUAL(atrace[7].receiver, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[7].act.account, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[7].act.name, TEST_METHOD("test_action", "test_action_ordinal_bar"));
    BOOST_REQUIRE_EQUAL(atrace[7].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[7].except.valid(), false);
 
@@ -2651,9 +2651,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[0].action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[0].creator_action_ordinal, 0);
    BOOST_REQUIRE_EQUAL((int)atrace[0].closest_unnotified_ancestor_action_ordinal, 0);
-   BOOST_REQUIRE_EQUAL(atrace[0].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[0].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[0].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[0].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[0].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[0].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[0].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[0].except.valid(), false);
    int start_gseq = atrace[0].receipt->global_sequence;
@@ -2662,9 +2662,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[1].action_ordinal,2);
    BOOST_REQUIRE_EQUAL((int)atrace[1].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[1].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[1].receiver.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[1].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[1].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[1].receiver, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[1].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[1].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[1].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[1].receipt->global_sequence, start_gseq + 1);
 
@@ -2672,9 +2672,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[2].action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[2].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[2].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[2].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[2].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[2].act.name.value, TEST_METHOD("test_action", "test_action_ordinal2"));
+   BOOST_REQUIRE_EQUAL(atrace[2].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[2].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[2].act.name, TEST_METHOD("test_action", "test_action_ordinal2"));
    BOOST_REQUIRE_EQUAL(atrace[2].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[2].receipt->global_sequence, start_gseq + 4);
 
@@ -2682,9 +2682,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[3].action_ordinal, 4);
    BOOST_REQUIRE_EQUAL((int)atrace[3].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[3].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[3].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[3].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[3].act.name.value, TEST_METHOD("test_action", "test_action_ordinal3"));
+   BOOST_REQUIRE_EQUAL(atrace[3].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[3].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[3].act.name, TEST_METHOD("test_action", "test_action_ordinal3"));
    BOOST_REQUIRE_EQUAL(atrace[3].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[3].except.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[3].except->code(), 3050003);
@@ -2693,9 +2693,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[4].action_ordinal, 5);
    BOOST_REQUIRE_EQUAL((int)atrace[4].creator_action_ordinal, 1);
    BOOST_REQUIRE_EQUAL((int)atrace[4].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[4].receiver.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[4].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[4].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[4].receiver, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[4].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[4].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[4].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[4].receipt->global_sequence, start_gseq + 2);
 
@@ -2703,9 +2703,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[5].action_ordinal, 6);
    BOOST_REQUIRE_EQUAL((int)atrace[5].creator_action_ordinal, 2);
    BOOST_REQUIRE_EQUAL((int)atrace[5].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[5].receiver.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[5].act.account.value, N(bob));
-   BOOST_REQUIRE_EQUAL(atrace[5].act.name.value, TEST_METHOD("test_action", "test_action_ordinal_foo"));
+   BOOST_REQUIRE_EQUAL(atrace[5].receiver, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[5].act.account, N(bob));
+   BOOST_REQUIRE_EQUAL(atrace[5].act.name, TEST_METHOD("test_action", "test_action_ordinal_foo"));
    BOOST_REQUIRE_EQUAL(atrace[5].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[5].except.valid(), false);
 
@@ -2713,9 +2713,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[6].action_ordinal, 7);
    BOOST_REQUIRE_EQUAL((int)atrace[6].creator_action_ordinal,2);
    BOOST_REQUIRE_EQUAL((int)atrace[6].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[6].receiver.value, N(david));
-   BOOST_REQUIRE_EQUAL(atrace[6].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[6].act.name.value, TEST_METHOD("test_action", "test_action_ordinal1"));
+   BOOST_REQUIRE_EQUAL(atrace[6].receiver, N(david));
+   BOOST_REQUIRE_EQUAL(atrace[6].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[6].act.name, TEST_METHOD("test_action", "test_action_ordinal1"));
    BOOST_REQUIRE_EQUAL(atrace[6].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[6].receipt->global_sequence, start_gseq + 3);
 
@@ -2723,9 +2723,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[7].action_ordinal, 8);
    BOOST_REQUIRE_EQUAL((int)atrace[7].creator_action_ordinal, 5);
    BOOST_REQUIRE_EQUAL((int)atrace[7].closest_unnotified_ancestor_action_ordinal, 1);
-   BOOST_REQUIRE_EQUAL(atrace[7].receiver.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[7].act.account.value, N(charlie));
-   BOOST_REQUIRE_EQUAL(atrace[7].act.name.value, TEST_METHOD("test_action", "test_action_ordinal_bar"));
+   BOOST_REQUIRE_EQUAL(atrace[7].receiver, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[7].act.account, N(charlie));
+   BOOST_REQUIRE_EQUAL(atrace[7].act.name, TEST_METHOD("test_action", "test_action_ordinal_bar"));
    BOOST_REQUIRE_EQUAL(atrace[7].receipt.valid(), false);
    BOOST_REQUIRE_EQUAL(atrace[7].except.valid(), false);
 
@@ -2733,9 +2733,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[8].action_ordinal, 9);
    BOOST_REQUIRE_EQUAL((int)atrace[8].creator_action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[8].closest_unnotified_ancestor_action_ordinal, 3);
-   BOOST_REQUIRE_EQUAL(atrace[8].receiver.value, N(david));
-   BOOST_REQUIRE_EQUAL(atrace[8].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[8].act.name.value, TEST_METHOD("test_action", "test_action_ordinal2"));
+   BOOST_REQUIRE_EQUAL(atrace[8].receiver, N(david));
+   BOOST_REQUIRE_EQUAL(atrace[8].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[8].act.name, TEST_METHOD("test_action", "test_action_ordinal2"));
    BOOST_REQUIRE_EQUAL(atrace[8].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[8].receipt->global_sequence, start_gseq + 5);
 
@@ -2743,9 +2743,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[9].action_ordinal, 10);
    BOOST_REQUIRE_EQUAL((int)atrace[9].creator_action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[9].closest_unnotified_ancestor_action_ordinal, 3);
-   BOOST_REQUIRE_EQUAL(atrace[9].receiver.value, N(erin));
-   BOOST_REQUIRE_EQUAL(atrace[9].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[9].act.name.value, TEST_METHOD("test_action", "test_action_ordinal2"));
+   BOOST_REQUIRE_EQUAL(atrace[9].receiver, N(erin));
+   BOOST_REQUIRE_EQUAL(atrace[9].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[9].act.name, TEST_METHOD("test_action", "test_action_ordinal2"));
    BOOST_REQUIRE_EQUAL(atrace[9].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[9].receipt->global_sequence, start_gseq + 6);
 
@@ -2753,9 +2753,9 @@ BOOST_FIXTURE_TEST_CASE(action_ordinal_failtest3, TESTER) { try {
    BOOST_REQUIRE_EQUAL((int)atrace[10].action_ordinal, 11);
    BOOST_REQUIRE_EQUAL((int)atrace[10].creator_action_ordinal, 3);
    BOOST_REQUIRE_EQUAL((int)atrace[10].closest_unnotified_ancestor_action_ordinal, 3);
-   BOOST_REQUIRE_EQUAL(atrace[10].receiver.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[10].act.account.value, N(testapi));
-   BOOST_REQUIRE_EQUAL(atrace[10].act.name.value, TEST_METHOD("test_action", "test_action_ordinal4"));
+   BOOST_REQUIRE_EQUAL(atrace[10].receiver, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[10].act.account, N(testapi));
+   BOOST_REQUIRE_EQUAL(atrace[10].act.name, TEST_METHOD("test_action", "test_action_ordinal4"));
    BOOST_REQUIRE_EQUAL(atrace[10].receipt.valid(), true);
    BOOST_REQUIRE_EQUAL(atrace[10].receipt->global_sequence, start_gseq + 7);
 
diff --git a/unittests/auth_tests.cpp b/unittests/auth_tests.cpp
index b944b532423..d5e26d96355 100644
--- a/unittests/auth_tests.cpp
+++ b/unittests/auth_tests.cpp
@@ -95,26 +95,26 @@ BOOST_FIXTURE_TEST_CASE( delegate_auth, TESTER ) { try {
 BOOST_AUTO_TEST_CASE(update_auths) {
 try {
    TESTER chain;
-   chain.create_account("alice");
-   chain.create_account("bob");
+   chain.create_account(name("alice"));
+   chain.create_account(name("bob"));
 
    // Deleting active or owner should fail
-   BOOST_CHECK_THROW(chain.delete_authority("alice", "active"), action_validate_exception);
-   BOOST_CHECK_THROW(chain.delete_authority("alice", "owner"), action_validate_exception);
+   BOOST_CHECK_THROW(chain.delete_authority(name("alice"), name("active")), action_validate_exception);
+   BOOST_CHECK_THROW(chain.delete_authority(name("alice"), name("owner")), action_validate_exception);
 
    // Change owner permission
-   const auto new_owner_priv_key = chain.get_private_key("alice", "new_owner");
+   const auto new_owner_priv_key = chain.get_private_key(name("alice"), "new_owner");
    const auto new_owner_pub_key = new_owner_priv_key.get_public_key();
-   chain.set_authority("alice", "owner", authority(new_owner_pub_key), "");
+   chain.set_authority(name("alice"), name("owner"), authority(new_owner_pub_key), {});
    chain.produce_blocks();
 
    // Ensure the permission is updated
    permission_object::id_type owner_id;
    {
-      auto obj = chain.find<permission_object, by_owner>(boost::make_tuple("alice", "owner"));
+      auto obj = chain.find<permission_object, by_owner>(boost::make_tuple(name("alice"), name("owner")));
       BOOST_TEST(obj != nullptr);
-      BOOST_TEST(obj->owner == "alice");
-      BOOST_TEST(obj->name == "owner");
+      BOOST_TEST(obj->owner == name("alice"));
+      BOOST_TEST(obj->name == name("owner"));
       BOOST_TEST(obj->parent == 0);
       owner_id = obj->id;
       auto auth = obj->auth.to_authority();
@@ -126,17 +126,17 @@ try {
    }
 
    // Change active permission, remember that the owner key has been changed
-   const auto new_active_priv_key = chain.get_private_key("alice", "new_active");
+   const auto new_active_priv_key = chain.get_private_key(name("alice"), "new_active");
    const auto new_active_pub_key = new_active_priv_key.get_public_key();
-   chain.set_authority("alice", "active", authority(new_active_pub_key), "owner",
-                       { permission_level{"alice", "active"} }, { chain.get_private_key("alice", "active") });
+   chain.set_authority(name("alice"), name("active"), authority(new_active_pub_key), name("owner"),
+                       { permission_level{name("alice"), name("active")} }, { chain.get_private_key(name("alice"), "active") });
    chain.produce_blocks();
 
    {
-      auto obj = chain.find<permission_object, by_owner>(boost::make_tuple("alice", "active"));
+      auto obj = chain.find<permission_object, by_owner>(boost::make_tuple(name("alice"), name("active")));
       BOOST_TEST(obj != nullptr);
-      BOOST_TEST(obj->owner == "alice");
-      BOOST_TEST(obj->name == "active");
+      BOOST_TEST(obj->owner == name("alice"));
+      BOOST_TEST(obj->name == name("active"));
       BOOST_TEST(obj->parent == owner_id);
       auto auth = obj->auth.to_authority();
       BOOST_TEST(auth.threshold == 1u);
@@ -146,221 +146,222 @@ try {
       BOOST_TEST(auth.keys[0].weight == 1u);
    }
 
-   auto spending_priv_key = chain.get_private_key("alice", "spending");
+   auto spending_priv_key = chain.get_private_key(name("alice"), "spending");
    auto spending_pub_key = spending_priv_key.get_public_key();
-   auto trading_priv_key = chain.get_private_key("alice", "trading");
+   auto trading_priv_key = chain.get_private_key(name("alice"), "trading");
    auto trading_pub_key = trading_priv_key.get_public_key();
 
    // Bob attempts to create new spending auth for Alice
-   BOOST_CHECK_THROW( chain.set_authority( "alice", "spending", authority(spending_pub_key), "active",
-                                           { permission_level{"bob", "active"} }, { chain.get_private_key("bob", "active") } ),
+   BOOST_CHECK_THROW( chain.set_authority( name("alice"), name("spending"), authority(spending_pub_key), name("active"),
+                                           { permission_level{name("bob"), name("active")} },
+                                           { chain.get_private_key(name("bob"), "active") } ),
                       irrelevant_auth_exception );
 
    // Create new spending auth
-   chain.set_authority("alice", "spending", authority(spending_pub_key), "active",
-                       { permission_level{"alice", "active"} }, { new_active_priv_key });
+   chain.set_authority(name("alice"), name("spending"), authority(spending_pub_key), name("active"),
+                       { permission_level{name("alice"), name("active")} }, { new_active_priv_key });
    chain.produce_blocks();
    {
-      auto obj = chain.find<permission_object, by_owner>(boost::make_tuple("alice", "spending"));
+      auto obj = chain.find<permission_object, by_owner>(boost::make_tuple(name("alice"), name("spending")));
       BOOST_TEST(obj != nullptr);
-      BOOST_TEST(obj->owner == "alice");
-      BOOST_TEST(obj->name == "spending");
-      BOOST_TEST(chain.get<permission_object>(obj->parent).owner == "alice");
-      BOOST_TEST(chain.get<permission_object>(obj->parent).name == "active");
+      BOOST_TEST(obj->owner == name("alice"));
+      BOOST_TEST(obj->name == name("spending"));
+      BOOST_TEST(chain.get<permission_object>(obj->parent).owner == name("alice"));
+      BOOST_TEST(chain.get<permission_object>(obj->parent).name == name("active"));
    }
 
    // Update spending auth parent to be its own, should fail
-   BOOST_CHECK_THROW(chain.set_authority("alice", "spending", spending_pub_key, "spending",
-                                         { permission_level{"alice", "spending"} }, { spending_priv_key }), action_validate_exception);
+   BOOST_CHECK_THROW(chain.set_authority(name("alice"), name("spending"), spending_pub_key, name("spending"),
+                                         { permission_level{name("alice"), name("spending")} }, { spending_priv_key }), action_validate_exception);
    // Update spending auth parent to be owner, should fail
-   BOOST_CHECK_THROW(chain.set_authority("alice", "spending", spending_pub_key, "owner",
-                                         { permission_level{"alice", "spending"} }, { spending_priv_key }), action_validate_exception);
+   BOOST_CHECK_THROW(chain.set_authority(name("alice"), name("spending"), spending_pub_key, name("owner"),
+                                         { permission_level{name("alice"), name("spending")} }, { spending_priv_key }), action_validate_exception);
 
    // Remove spending auth
-   chain.delete_authority("alice", "spending", { permission_level{"alice", "active"} }, { new_active_priv_key });
+   chain.delete_authority(name("alice"), name("spending"), { permission_level{name("alice"), name("active")} }, { new_active_priv_key });
    {
-      auto obj = chain.find<permission_object, by_owner>(boost::make_tuple("alice", "spending"));
+      auto obj = chain.find<permission_object, by_owner>(boost::make_tuple(name("alice"), name("spending")));
       BOOST_TEST(obj == nullptr);
    }
    chain.produce_blocks();
 
    // Create new trading auth
-   chain.set_authority("alice", "trading", trading_pub_key, "active",
-                       { permission_level{"alice", "active"} }, { new_active_priv_key });
+   chain.set_authority(name("alice"), name("trading"), trading_pub_key, name("active"),
+                       { permission_level{name("alice"), name("active")} }, { new_active_priv_key });
    // Recreate spending auth again, however this time, it's under trading instead of owner
-   chain.set_authority("alice", "spending", spending_pub_key, "trading",
-                       { permission_level{"alice", "trading"} }, { trading_priv_key });
+   chain.set_authority(name("alice"), name("spending"), spending_pub_key, name("trading"),
+                       { permission_level{name("alice"), name("trading")} }, { trading_priv_key });
    chain.produce_blocks();
 
    // Verify correctness of trading and spending
    {
-      const auto* trading = chain.find<permission_object, by_owner>(boost::make_tuple("alice", "trading"));
-      const auto* spending = chain.find<permission_object, by_owner>(boost::make_tuple("alice", "spending"));
+      const auto* trading = chain.find<permission_object, by_owner>(boost::make_tuple(name("alice"), name("trading")));
+      const auto* spending = chain.find<permission_object, by_owner>(boost::make_tuple(name("alice"), name("spending")));
       BOOST_TEST(trading != nullptr);
       BOOST_TEST(spending != nullptr);
-      BOOST_TEST(trading->owner == "alice");
-      BOOST_TEST(spending->owner == "alice");
-      BOOST_TEST(trading->name == "trading");
-      BOOST_TEST(spending->name == "spending");
+      BOOST_TEST(trading->owner == name("alice"));
+      BOOST_TEST(spending->owner == name("alice"));
+      BOOST_TEST(trading->name == name("trading"));
+      BOOST_TEST(spending->name == name("spending"));
       BOOST_TEST(spending->parent == trading->id);
-      BOOST_TEST(chain.get(trading->parent).owner == "alice");
-      BOOST_TEST(chain.get(trading->parent).name == "active");
+      BOOST_TEST(chain.get(trading->parent).owner == name("alice"));
+      BOOST_TEST(chain.get(trading->parent).name == name("active"));
 
    }
 
    // Delete trading, should fail since it has children (spending)
-   BOOST_CHECK_THROW(chain.delete_authority("alice", "trading",
-                                            { permission_level{"alice", "active"} }, { new_active_priv_key }), action_validate_exception);
+   BOOST_CHECK_THROW(chain.delete_authority(name("alice"), name("trading"),
+                                            { permission_level{name("alice"), name("active")} }, { new_active_priv_key }), action_validate_exception);
    // Update trading parent to be spending, should fail since changing parent authority is not supported
-   BOOST_CHECK_THROW(chain.set_authority("alice", "trading", trading_pub_key, "spending",
-                                         { permission_level{"alice", "trading"} }, { trading_priv_key }), action_validate_exception);
+   BOOST_CHECK_THROW(chain.set_authority(name("alice"), name("trading"), trading_pub_key, name("spending"),
+                                         { permission_level{name("alice"), name("trading")} }, { trading_priv_key }), action_validate_exception);
 
    // Delete spending auth
-   chain.delete_authority("alice", "spending", { permission_level{"alice", "active"} }, { new_active_priv_key });
-   BOOST_TEST((chain.find<permission_object, by_owner>(boost::make_tuple("alice", "spending"))) == nullptr);
+   chain.delete_authority(name("alice"), name("spending"), { permission_level{name("alice"), name("active")} }, { new_active_priv_key });
+   BOOST_TEST((chain.find<permission_object, by_owner>(boost::make_tuple(name("alice"), name("spending")))) == nullptr);
    // Delete trading auth, now it should succeed since it doesn't have any children anymore
-   chain.delete_authority("alice", "trading", { permission_level{"alice", "active"} }, { new_active_priv_key });
-   BOOST_TEST((chain.find<permission_object, by_owner>(boost::make_tuple("alice", "trading"))) == nullptr);
+   chain.delete_authority(name("alice"), name("trading"), { permission_level{name("alice"), name("active")} }, { new_active_priv_key });
+   BOOST_TEST((chain.find<permission_object, by_owner>(boost::make_tuple(name("alice"), name("trading")))) == nullptr);
 
 } FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_CASE(link_auths) { try {
    TESTER chain;
 
-   chain.create_accounts({"alice","bob"});
+   chain.create_accounts({name("alice"),name("bob")});
 
-   const auto spending_priv_key = chain.get_private_key("alice", "spending");
+   const auto spending_priv_key = chain.get_private_key(name("alice"), "spending");
    const auto spending_pub_key = spending_priv_key.get_public_key();
-   const auto scud_priv_key = chain.get_private_key("alice", "scud");
+   const auto scud_priv_key = chain.get_private_key(name("alice"), "scud");
    const auto scud_pub_key = scud_priv_key.get_public_key();
 
-   chain.set_authority("alice", "spending", spending_pub_key, "active");
-   chain.set_authority("alice", "scud", scud_pub_key, "spending");
+   chain.set_authority(name("alice"), name("spending"), spending_pub_key, name("active"));
+   chain.set_authority(name("alice"), name("scud"), scud_pub_key, name("spending"));
 
    // Send req auth action with alice's spending key, it should fail
-   BOOST_CHECK_THROW(chain.push_reqauth("alice", { permission_level{N(alice), "spending"} }, { spending_priv_key }), irrelevant_auth_exception);
+   BOOST_CHECK_THROW(chain.push_reqauth(name("alice"), { permission_level{N(alice), name("spending")} }, { spending_priv_key }), irrelevant_auth_exception);
    // Link authority for eosio reqauth action with alice's spending key
-   chain.link_authority("alice", "eosio", "spending",  "reqauth");
+   chain.link_authority(name("alice"), name("eosio"), name("spending"), name("reqauth"));
    // Now, req auth action with alice's spending key should succeed
-   chain.push_reqauth("alice", { permission_level{N(alice), "spending"} }, { spending_priv_key });
+   chain.push_reqauth(name("alice"), { permission_level{N(alice), name("spending")} }, { spending_priv_key });
 
    chain.produce_block();
 
    // Relink the same auth should fail
-   BOOST_CHECK_THROW( chain.link_authority("alice", "eosio", "spending",  "reqauth"), action_validate_exception);
+   BOOST_CHECK_THROW( chain.link_authority(name("alice"), name("eosio"), name("spending"), name("reqauth")), action_validate_exception);
 
    // Unlink alice with eosio reqauth
-   chain.unlink_authority("alice", "eosio", "reqauth");
+   chain.unlink_authority(name("alice"), name("eosio"), name("reqauth"));
    // Now, req auth action with alice's spending key should fail
-   BOOST_CHECK_THROW(chain.push_reqauth("alice", { permission_level{N(alice), "spending"} }, { spending_priv_key }), irrelevant_auth_exception);
+   BOOST_CHECK_THROW(chain.push_reqauth(name("alice"), { permission_level{N(alice), name("spending")} }, { spending_priv_key }), irrelevant_auth_exception);
 
    chain.produce_block();
 
    // Send req auth action with scud key, it should fail
-   BOOST_CHECK_THROW(chain.push_reqauth("alice", { permission_level{N(alice), "scud"} }, { scud_priv_key }), irrelevant_auth_exception);
+   BOOST_CHECK_THROW(chain.push_reqauth(name("alice"), { permission_level{N(alice), name("scud")} }, { scud_priv_key }), irrelevant_auth_exception);
    // Link authority for any eosio action with alice's scud key
-   chain.link_authority("alice", "eosio", "scud");
+   chain.link_authority(name("alice"), name("eosio"), name("scud"));
    // Now, req auth action with alice's scud key should succeed
-   chain.push_reqauth("alice", { permission_level{N(alice), "scud"} }, { scud_priv_key });
+   chain.push_reqauth(name("alice"), { permission_level{N(alice), name("scud")} }, { scud_priv_key });
    // req auth action with alice's spending key should also be fine, since it is the parent of alice's scud key
-   chain.push_reqauth("alice", { permission_level{N(alice), "spending"} }, { spending_priv_key });
+   chain.push_reqauth(name("alice"), { permission_level{N(alice), name("spending")} }, { spending_priv_key });
 
 } FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_CASE(link_then_update_auth) { try {
    TESTER chain;
 
-   chain.create_account("alice");
+   chain.create_account(name("alice"));
 
-   const auto first_priv_key = chain.get_private_key("alice", "first");
+   const auto first_priv_key = chain.get_private_key(name("alice"), "first");
    const auto first_pub_key = first_priv_key.get_public_key();
-   const auto second_priv_key = chain.get_private_key("alice", "second");
+   const auto second_priv_key = chain.get_private_key(name("alice"), "second");
    const auto second_pub_key = second_priv_key.get_public_key();
 
-   chain.set_authority("alice", "first", first_pub_key, "active");
+   chain.set_authority(name("alice"), name("first"), first_pub_key, name("active"));
 
-   chain.link_authority("alice", "eosio", "first",  "reqauth");
-   chain.push_reqauth("alice", { permission_level{N(alice), "first"} }, { first_priv_key });
+   chain.link_authority(name("alice"), name("eosio"), name("first"), name("reqauth"));
+   chain.push_reqauth(name("alice"), { permission_level{N(alice), name("first")} }, { first_priv_key });
 
    chain.produce_blocks(13); // Wait at least 6 seconds for first push_reqauth transaction to expire.
 
    // Update "first" auth public key
-   chain.set_authority("alice", "first", second_pub_key, "active");
+   chain.set_authority(name("alice"), name("first"), second_pub_key, name("active"));
    // Authority updated, using previous "first" auth should fail on linked auth
-   BOOST_CHECK_THROW(chain.push_reqauth("alice", { permission_level{N(alice), "first"} }, { first_priv_key }), unsatisfied_authorization);
+   BOOST_CHECK_THROW(chain.push_reqauth(name("alice"), { permission_level{N(alice), name("first")} }, { first_priv_key }), unsatisfied_authorization);
    // Using updated authority, should succeed
-   chain.push_reqauth("alice", { permission_level{N(alice), "first"} }, { second_priv_key });
+   chain.push_reqauth(name("alice"), { permission_level{N(alice), name("first")} }, { second_priv_key });
 
 } FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_CASE(create_account) {
 try {
    TESTER chain;
-   chain.create_account("joe");
+   chain.create_account(name("joe"));
    chain.produce_block();
 
    // Verify account created properly
-   const auto& joe_owner_authority = chain.get<permission_object, by_owner>(boost::make_tuple("joe", "owner"));
+   const auto& joe_owner_authority = chain.get<permission_object, by_owner>(boost::make_tuple(name("joe"), name("owner")));
    BOOST_TEST(joe_owner_authority.auth.threshold == 1u);
    BOOST_TEST(joe_owner_authority.auth.accounts.size() == 1u);
    BOOST_TEST(joe_owner_authority.auth.keys.size() == 1u);
-   BOOST_TEST(string(joe_owner_authority.auth.keys[0].key) == string(chain.get_public_key("joe", "owner")));
+   BOOST_TEST(string(joe_owner_authority.auth.keys[0].key) == string(chain.get_public_key(name("joe"), "owner")));
    BOOST_TEST(joe_owner_authority.auth.keys[0].weight == 1u);
 
-   const auto& joe_active_authority = chain.get<permission_object, by_owner>(boost::make_tuple("joe", "active"));
+   const auto& joe_active_authority = chain.get<permission_object, by_owner>(boost::make_tuple(name("joe"), name("active")));
    BOOST_TEST(joe_active_authority.auth.threshold == 1u);
    BOOST_TEST(joe_active_authority.auth.accounts.size() == 1u);
    BOOST_TEST(joe_active_authority.auth.keys.size() == 1u);
-   BOOST_TEST(string(joe_active_authority.auth.keys[0].key) == string(chain.get_public_key("joe", "active")));
+   BOOST_TEST(string(joe_active_authority.auth.keys[0].key) == string(chain.get_public_key(name("joe"), "active")));
    BOOST_TEST(joe_active_authority.auth.keys[0].weight == 1u);
 
    // Create duplicate name
-   BOOST_CHECK_EXCEPTION(chain.create_account("joe"), action_validate_exception,
+   BOOST_CHECK_EXCEPTION(chain.create_account(name("joe")), action_validate_exception,
                          fc_exception_message_is("Cannot create account named joe, as that name is already taken"));
 
    // Creating account with name more than 12 chars
-   BOOST_CHECK_EXCEPTION(chain.create_account("aaaaaaaaaaaaa"), action_validate_exception,
+   BOOST_CHECK_EXCEPTION(chain.create_account(name("aaaaaaaaaaaaa")), action_validate_exception,
                          fc_exception_message_is("account names can only be 12 chars long"));
 
 
    // Creating account with eosio. prefix with privileged account
-   chain.create_account("eosio.test1");
+   chain.create_account(name("eosio.test1"));
 
    // Creating account with eosio. prefix with non-privileged account, should fail
-   BOOST_CHECK_EXCEPTION(chain.create_account("eosio.test2", "joe"), action_validate_exception,
+   BOOST_CHECK_EXCEPTION(chain.create_account(name("eosio.test2"), name("joe")), action_validate_exception,
                          fc_exception_message_is("only privileged accounts can have names that start with 'eosio.'"));
 
 } FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_CASE( any_auth ) { try {
    TESTER chain;
-   chain.create_accounts( {"alice","bob"} );
+   chain.create_accounts( {name("alice"), name("bob")} );
    chain.produce_block();
 
-   const auto spending_priv_key = chain.get_private_key("alice", "spending");
+   const auto spending_priv_key = chain.get_private_key(name("alice"), "spending");
    const auto spending_pub_key = spending_priv_key.get_public_key();
-   const auto bob_spending_priv_key = chain.get_private_key("bob", "spending");
+   const auto bob_spending_priv_key = chain.get_private_key(name("bob"), "spending");
    const auto bob_spending_pub_key = spending_priv_key.get_public_key();
 
-   chain.set_authority("alice", "spending", spending_pub_key, "active");
-   chain.set_authority("bob", "spending", bob_spending_pub_key, "active");
+   chain.set_authority(name("alice"), name("spending"), spending_pub_key, name("active"));
+   chain.set_authority(name("bob"), name("spending"), bob_spending_pub_key, name("active"));
 
    /// this should fail because spending is not active which is default for reqauth
-   BOOST_REQUIRE_THROW( chain.push_reqauth("alice", { permission_level{N(alice), "spending"} }, { spending_priv_key }),
+   BOOST_REQUIRE_THROW( chain.push_reqauth(name("alice"), { permission_level{N(alice), name("spending")} }, { spending_priv_key }),
                         irrelevant_auth_exception );
 
    chain.produce_block();
 
    //test.push_reqauth( N(alice), { permission_level{N(alice),"spending"} }, { spending_priv_key });
 
-   chain.link_authority( "alice", "eosio", "eosio.any", "reqauth" );
-   chain.link_authority( "bob", "eosio", "eosio.any", "reqauth" );
+   chain.link_authority( name("alice"), name("eosio"), name("eosio.any"), name("reqauth") );
+   chain.link_authority( name("bob"), name("eosio"), name("eosio.any"), name("reqauth") );
 
    /// this should succeed because eosio::reqauth is linked to any permission
-   chain.push_reqauth("alice", { permission_level{N(alice), "spending"} }, { spending_priv_key });
+   chain.push_reqauth(name("alice"), { permission_level{N(alice), name("spending")} }, { spending_priv_key });
 
    /// this should fail because bob cannot authorize for alice, the permission given must be one-of alices
-   BOOST_REQUIRE_THROW( chain.push_reqauth("alice", { permission_level{N(bob), "spending"} }, { spending_priv_key }),
+   BOOST_REQUIRE_THROW( chain.push_reqauth(name("alice"), { permission_level{N(bob), name("spending")} }, { spending_priv_key }),
                         missing_auth_exception );
 
 
@@ -395,9 +396,9 @@ try {
 
       authority owner_auth =  authority( chain.get_public_key( a, "owner" ) );
 
-      vector<permission_level> pls = {{acc1, "active"}};
-      pls.push_back({acc1, "owner"}); // same account but different permission names
-      pls.push_back({acc1a, "owner"});
+      vector<permission_level> pls = {{acc1, name("active")}};
+      pls.push_back({acc1, name("owner")}); // same account but different permission names
+      pls.push_back({acc1a, name("owner")});
       trx.actions.emplace_back( pls,
                                 newaccount{
                                    .creator  = acc1,
@@ -449,7 +450,7 @@ try {
       authority invalid_auth = authority(threshold, {key_weight{chain.get_public_key( a, "owner" ), 1}}, {permission_level_weight{{creator, config::active_name}, 1}});
 
       vector<permission_level> pls;
-      pls.push_back({creator, "active"});
+      pls.push_back({creator, name("active")});
       trx.actions.emplace_back( pls,
                                 newaccount{
                                    .creator  = creator,
diff --git a/unittests/bootseq_tests.cpp b/unittests/bootseq_tests.cpp
index 561a04622cc..23e02c7a084 100644
--- a/unittests/bootseq_tests.cpp
+++ b/unittests/bootseq_tests.cpp
@@ -286,7 +286,7 @@ BOOST_FIXTURE_TEST_CASE( bootseq_test, bootseq_tester ) {
         produce_blocks_for_n_rounds(2); // 2 rounds since new producer schedule is set when the first block of next round is irreversible
         auto active_schedule = control->head_block_state()->active_schedule;
         BOOST_TEST(active_schedule.producers.size() == 1u);
-        BOOST_TEST(active_schedule.producers.front().producer_name == "eosio");
+        BOOST_TEST(active_schedule.producers.front().producer_name == name("eosio"));
 
         // Spend some time so the producer pay pool is filled by the inflation rate
         produce_min_num_of_blocks_to_spend_time_wo_inactive_prod(fc::seconds(30 * 24 * 3600)); // 30 days
@@ -301,27 +301,27 @@ BOOST_FIXTURE_TEST_CASE( bootseq_test, bootseq_tester ) {
         produce_blocks_for_n_rounds(2); // 2 rounds since new producer schedule is set when the first block of next round is irreversible
         active_schedule = control->head_block_state()->active_schedule;
         BOOST_REQUIRE(active_schedule.producers.size() == 21);
-        BOOST_TEST(active_schedule.producers.at(0).producer_name == "proda");
-        BOOST_TEST(active_schedule.producers.at(1).producer_name == "prodb");
-        BOOST_TEST(active_schedule.producers.at(2).producer_name == "prodc");
-        BOOST_TEST(active_schedule.producers.at(3).producer_name == "prodd");
-        BOOST_TEST(active_schedule.producers.at(4).producer_name == "prode");
-        BOOST_TEST(active_schedule.producers.at(5).producer_name == "prodf");
-        BOOST_TEST(active_schedule.producers.at(6).producer_name == "prodg");
-        BOOST_TEST(active_schedule.producers.at(7).producer_name == "prodh");
-        BOOST_TEST(active_schedule.producers.at(8).producer_name == "prodi");
-        BOOST_TEST(active_schedule.producers.at(9).producer_name == "prodj");
-        BOOST_TEST(active_schedule.producers.at(10).producer_name == "prodk");
-        BOOST_TEST(active_schedule.producers.at(11).producer_name == "prodl");
-        BOOST_TEST(active_schedule.producers.at(12).producer_name == "prodm");
-        BOOST_TEST(active_schedule.producers.at(13).producer_name == "prodn");
-        BOOST_TEST(active_schedule.producers.at(14).producer_name == "prodo");
-        BOOST_TEST(active_schedule.producers.at(15).producer_name == "prodp");
-        BOOST_TEST(active_schedule.producers.at(16).producer_name == "prodq");
-        BOOST_TEST(active_schedule.producers.at(17).producer_name == "prodr");
-        BOOST_TEST(active_schedule.producers.at(18).producer_name == "prods");
-        BOOST_TEST(active_schedule.producers.at(19).producer_name == "prodt");
-        BOOST_TEST(active_schedule.producers.at(20).producer_name == "produ");
+        BOOST_TEST(active_schedule.producers.at(0).producer_name == name("proda"));
+        BOOST_TEST(active_schedule.producers.at(1).producer_name == name("prodb"));
+        BOOST_TEST(active_schedule.producers.at(2).producer_name == name("prodc"));
+        BOOST_TEST(active_schedule.producers.at(3).producer_name == name("prodd"));
+        BOOST_TEST(active_schedule.producers.at(4).producer_name == name("prode"));
+        BOOST_TEST(active_schedule.producers.at(5).producer_name == name("prodf"));
+        BOOST_TEST(active_schedule.producers.at(6).producer_name == name("prodg"));
+        BOOST_TEST(active_schedule.producers.at(7).producer_name == name("prodh"));
+        BOOST_TEST(active_schedule.producers.at(8).producer_name == name("prodi"));
+        BOOST_TEST(active_schedule.producers.at(9).producer_name == name("prodj"));
+        BOOST_TEST(active_schedule.producers.at(10).producer_name == name("prodk"));
+        BOOST_TEST(active_schedule.producers.at(11).producer_name == name("prodl"));
+        BOOST_TEST(active_schedule.producers.at(12).producer_name == name("prodm"));
+        BOOST_TEST(active_schedule.producers.at(13).producer_name == name("prodn"));
+        BOOST_TEST(active_schedule.producers.at(14).producer_name == name("prodo"));
+        BOOST_TEST(active_schedule.producers.at(15).producer_name == name("prodp"));
+        BOOST_TEST(active_schedule.producers.at(16).producer_name == name("prodq"));
+        BOOST_TEST(active_schedule.producers.at(17).producer_name == name("prodr"));
+        BOOST_TEST(active_schedule.producers.at(18).producer_name == name("prods"));
+        BOOST_TEST(active_schedule.producers.at(19).producer_name == name("prodt"));
+        BOOST_TEST(active_schedule.producers.at(20).producer_name == name("produ"));
 
         // Spend some time so the producer pay pool is filled by the inflation rate
         produce_min_num_of_blocks_to_spend_time_wo_inactive_prod(fc::seconds(30 * 24 * 3600)); // 30 days
diff --git a/unittests/currency_tests.cpp b/unittests/currency_tests.cpp
index 0485d0a4681..e77d9830df9 100644
--- a/unittests/currency_tests.cpp
+++ b/unittests/currency_tests.cpp
@@ -99,10 +99,10 @@ class currency_tester : public TESTER {
       }
 
       abi_serializer abi_ser;
-      static const std::string eosio_token;
+      static const name eosio_token;
 };
 
-const std::string currency_tester::eosio_token = name(N(eosio.token)).to_string();
+const name currency_tester::eosio_token = N(eosio.token);
 
 BOOST_AUTO_TEST_SUITE(currency_tests)
 
diff --git a/unittests/database_tests.cpp b/unittests/database_tests.cpp
index bd00e7b60eb..b5edae97e10 100644
--- a/unittests/database_tests.cpp
+++ b/unittests/database_tests.cpp
@@ -33,18 +33,18 @@ BOOST_AUTO_TEST_SUITE(database_tests)
 
          // Create an account
          db.create<account_object>([](account_object &a) {
-            a.name = "billy";
+            a.name = name("billy");
          });
 
          // Make sure we can retrieve that account by name
-         auto ptr = db.find<account_object, by_name, std::string>("billy");
+         auto ptr = db.find<account_object, by_name>(name("billy"));
          BOOST_TEST(ptr != nullptr);
 
          // Undo creation of the account
          ses.undo();
 
          // Make sure we can no longer find the account
-         ptr = db.find<account_object, by_name, std::string>("billy");
+         ptr = db.find<account_object, by_name>(name("billy"));
          BOOST_TEST(ptr == nullptr);
       } FC_LOG_AND_RETHROW()
    }
diff --git a/unittests/eosio.token_tests.cpp b/unittests/eosio.token_tests.cpp
index 41185faae75..258720dd4bb 100644
--- a/unittests/eosio.token_tests.cpp
+++ b/unittests/eosio.token_tests.cpp
@@ -50,14 +50,14 @@ class eosio_token_tester : public tester {
       act.name    = name;
       act.data    = abi_ser.variant_to_binary( action_type_name, data, abi_serializer_max_time );
 
-      return base_tester::push_action( std::move(act), uint64_t(signer));
+      return base_tester::push_action( std::move(act), signer.to_uint64_t() );
    }
 
    fc::variant get_stats( const string& symbolname )
    {
       auto symb = eosio::chain::symbol::from_string(symbolname);
       auto symbol_code = symb.to_symbol_code().value;
-      vector<char> data = get_row_by_account( N(eosio.token), symbol_code, N(stat), symbol_code );
+      vector<char> data = get_row_by_account( N(eosio.token), name(symbol_code), N(stat), name(symbol_code) );
       return data.empty() ? fc::variant() : abi_ser.binary_to_variant( "currency_stats", data, abi_serializer_max_time );
    }
 
@@ -65,7 +65,7 @@ class eosio_token_tester : public tester {
    {
       auto symb = eosio::chain::symbol::from_string(symbolname);
       auto symbol_code = symb.to_symbol_code().value;
-      vector<char> data = get_row_by_account( N(eosio.token), acc, N(accounts), symbol_code );
+      vector<char> data = get_row_by_account( N(eosio.token), acc, N(accounts), name(symbol_code) );
       return data.empty() ? fc::variant() : abi_ser.binary_to_variant( "account", data, abi_serializer_max_time );
    }
 
diff --git a/unittests/eosio_system_tester.hpp b/unittests/eosio_system_tester.hpp
index 8c06f187910..7958318ac07 100644
--- a/unittests/eosio_system_tester.hpp
+++ b/unittests/eosio_system_tester.hpp
@@ -56,7 +56,7 @@ class eosio_system_tester : public TESTER {
 
       create_currency( N(eosio.token), config::system_account_name, core_from_string("10000000000.0000") );
       issue(config::system_account_name,      core_from_string("1000000000.0000"));
-      BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance( "eosio" ) );
+      BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance( name("eosio") ) );
 
       set_code( config::system_account_name, contracts::eosio_system_wasm() );
       set_abi( config::system_account_name, contracts::eosio_system_abi().data() );
@@ -79,7 +79,8 @@ class eosio_system_tester : public TESTER {
       create_account_with_resources( N(bob111111111), config::system_account_name, core_from_string("0.4500"), false );
       create_account_with_resources( N(carol1111111), config::system_account_name, core_from_string("1.0000"), false );
 
-      BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"), get_balance("eosio")  + get_balance("eosio.ramfee") + get_balance("eosio.stake") + get_balance("eosio.ram") );
+      BOOST_REQUIRE_EQUAL( core_from_string("1000000000.0000"),
+            get_balance(name("eosio")) + get_balance(name("eosio.ramfee")) + get_balance(name("eosio.stake")) + get_balance(name("eosio.ram")) );
    }
 
    action_result open( account_name  owner,
@@ -237,7 +238,8 @@ class eosio_system_tester : public TESTER {
          act.name = name;
          act.data = abi_ser.variant_to_binary( action_type_name, data, abi_serializer_max_time );
 
-         return base_tester::push_action( std::move(act), auth ? uint64_t(signer) : signer == N(bob111111111) ? N(alice1111111) : N(bob111111111) );
+         return base_tester::push_action( std::move(act), auth ? signer.to_uint64_t() :
+                                                signer == N(bob111111111) ? N(alice1111111).to_uint64_t() : N(bob111111111).to_uint64_t() );
    }
 
    action_result stake( const account_name& from, const account_name& to, const asset& net, const asset& cpu ) {
@@ -335,7 +337,7 @@ class eosio_system_tester : public TESTER {
    }
 
    asset get_balance( const account_name& act ) {
-      vector<char> data = get_row_by_account( N(eosio.token), act, N(accounts), symbol(CORE_SYMBOL).to_symbol_code().value );
+      vector<char> data = get_row_by_account( N(eosio.token), act, N(accounts), name(symbol(CORE_SYMBOL).to_symbol_code().value) );
       return data.empty() ? asset(0, symbol(CORE_SYMBOL)) : token_abi_ser.binary_to_variant("account", data, abi_serializer_max_time)["balance"].as<asset>();
    }
 
@@ -390,7 +392,7 @@ class eosio_system_tester : public TESTER {
    fc::variant get_stats( const string& symbolname ) {
       auto symb = eosio::chain::symbol::from_string(symbolname);
       auto symbol_code = symb.to_symbol_code().value;
-      vector<char> data = get_row_by_account( N(eosio.token), symbol_code, N(stat), symbol_code );
+      vector<char> data = get_row_by_account( N(eosio.token), name(symbol_code), N(stat), name(symbol_code) );
       return data.empty() ? fc::variant() : token_abi_ser.binary_to_variant( "currency_stats", data, abi_serializer_max_time );
    }
 
@@ -414,7 +416,7 @@ class eosio_system_tester : public TESTER {
       abi_serializer msig_abi_ser;
       {
          create_account_with_resources( N(eosio.msig), config::system_account_name );
-         BOOST_REQUIRE_EQUAL( success(), buyram( "eosio", "eosio.msig", core_from_string("5000.0000") ) );
+         BOOST_REQUIRE_EQUAL( success(), buyram( name("eosio"), name("eosio.msig"), core_from_string("5000.0000") ) );
          produce_block();
 
          auto trace = base_tester::push_action(config::system_account_name, N(setpriv),
@@ -437,8 +439,8 @@ class eosio_system_tester : public TESTER {
 
    vector<name> active_and_vote_producers() {
       //stake more than 15% of total EOS supply to activate chain
-      transfer( "eosio", "alice1111111", core_from_string("650000000.0000"), "eosio" );
-      BOOST_REQUIRE_EQUAL( success(), stake( "alice1111111", "alice1111111", core_from_string("300000000.0000"), core_from_string("300000000.0000") ) );
+      transfer( name("eosio"), name("alice1111111"), core_from_string("650000000.0000"), name("eosio") );
+      BOOST_REQUIRE_EQUAL( success(), stake( name("alice1111111"), name("alice1111111"), core_from_string("300000000.0000"), core_from_string("300000000.0000") ) );
 
       // create accounts {defproducera, defproducerb, ..., defproducerz} and register as producers
       std::vector<account_name> producer_names;
@@ -470,9 +472,9 @@ class eosio_system_tester : public TESTER {
 
       //vote for producers
       {
-         transfer( config::system_account_name, "alice1111111", core_from_string("100000000.0000"), config::system_account_name );
-         BOOST_REQUIRE_EQUAL(success(), stake( "alice1111111", core_from_string("30000000.0000"), core_from_string("30000000.0000") ) );
-         BOOST_REQUIRE_EQUAL(success(), buyram( "alice1111111", "alice1111111", core_from_string("30000000.0000") ) );
+         transfer( config::system_account_name, name("alice1111111"), core_from_string("100000000.0000"), config::system_account_name );
+         BOOST_REQUIRE_EQUAL(success(), stake( name("alice1111111"), core_from_string("30000000.0000"), core_from_string("30000000.0000") ) );
+         BOOST_REQUIRE_EQUAL(success(), buyram( name("alice1111111"), name("alice1111111"), core_from_string("30000000.0000") ) );
          BOOST_REQUIRE_EQUAL(success(), push_action(N(alice1111111), N(voteproducer), mvo()
                                                     ("voter",  "alice1111111")
                                                     ("proxy", name(0).to_string())
diff --git a/unittests/fork_test_utilities.cpp b/unittests/fork_test_utilities.cpp
index a8caaeeb233..d63404de983 100644
--- a/unittests/fork_test_utilities.cpp
+++ b/unittests/fork_test_utilities.cpp
@@ -5,7 +5,7 @@
 #include "fork_test_utilities.hpp"
 
 private_key_type get_private_key( name keyname, string role ) {
-   return private_key_type::regenerate<fc::ecc::private_key_shim>(fc::sha256::hash(string(keyname)+role));
+   return private_key_type::regenerate<fc::ecc::private_key_shim>(fc::sha256::hash(keyname.to_string()+role));
 }
 
 public_key_type  get_public_key( name keyname, string role ){
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 47e101b40f7..817280c78e3 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -88,7 +88,8 @@ namespace eosio
 using namespace chain;
 using namespace std;
 
-static constexpr uint64_t name_suffix( uint64_t n ) {
+static constexpr uint64_t name_suffix( name nv ) {
+   uint64_t n = nv.to_uint64_t();
    uint32_t remaining_bits_after_last_actual_dot = 0;
    uint32_t tmp = 0;
    for( int32_t remaining_bits = 59; remaining_bits >= 4; remaining_bits -= 5 ) { // Note: remaining_bits must remain signed integer
@@ -130,7 +131,7 @@ BOOST_AUTO_TEST_CASE(reverse_endian_tests)
 
 BOOST_AUTO_TEST_CASE(name_suffix_tests)
 {
-   BOOST_CHECK_EQUAL( name{name_suffix(0)}, name{0} );
+   BOOST_CHECK_EQUAL( name{name_suffix(name(0))}, name{0} );
    BOOST_CHECK_EQUAL( name{name_suffix(N(abcdehijklmn))}, name{N(abcdehijklmn)} );
    BOOST_CHECK_EQUAL( name{name_suffix(N(abcdehijklmn1))}, name{N(abcdehijklmn1)} );
    BOOST_CHECK_EQUAL( name{name_suffix(N(abc.def))}, name{N(def)} );
@@ -326,9 +327,9 @@ struct permission_visitor {
 BOOST_AUTO_TEST_CASE(authority_checker)
 { try {
    testing::TESTER test;
-   auto a = test.get_public_key("a", "active");
-   auto b = test.get_public_key("b", "active");
-   auto c = test.get_public_key("c", "active");
+   auto a = test.get_public_key(name("a"), "active");
+   auto b = test.get_public_key(name("b"), "active");
+   auto c = test.get_public_key(name("c"), "active");
 
    auto GetNullAuthority = [](auto){abort(); return authority();};
 
@@ -384,7 +385,7 @@ BOOST_AUTO_TEST_CASE(authority_checker)
       return authority(1, {key_weight{c, 1}});
    };
 
-   A = authority(2, {key_weight{a, 2}, key_weight{b, 1}}, {permission_level_weight{{"hello",  "world"}, 1}});
+   A = authority(2, {key_weight{a, 2}, key_weight{b, 1}}, {permission_level_weight{{name("hello"), name("world")}, 1}});
    {
       auto checker = make_auth_checker(GetCAuthority, 2, {a});
       BOOST_TEST(checker.satisfied(A));
@@ -424,7 +425,7 @@ BOOST_AUTO_TEST_CASE(authority_checker)
       BOOST_TEST(checker.unused_keys().count(c) == 1u);
    }
 
-   A = authority(3, {key_weight{a, 2}, key_weight{b, 1}}, {permission_level_weight{{"hello",  "world"}, 3}});
+   A = authority(3, {key_weight{a, 2}, key_weight{b, 1}}, {permission_level_weight{{name("hello"), name("world")}, 3}});
    {
       auto checker = make_auth_checker(GetCAuthority, 2, {a, b});
       BOOST_TEST(checker.satisfied(A));
@@ -441,7 +442,7 @@ BOOST_AUTO_TEST_CASE(authority_checker)
       BOOST_TEST(checker.unused_keys().count(b) == 1u);
    }
 
-   A = authority(2, {key_weight{a, 1}, key_weight{b, 1}}, {permission_level_weight{{"hello",  "world"}, 1}});
+   A = authority(2, {key_weight{a, 1}, key_weight{b, 1}}, {permission_level_weight{{name("hello"), name("world")}, 1}});
    BOOST_TEST(!make_auth_checker(GetCAuthority, 2, {a}).satisfied(A));
    BOOST_TEST(!make_auth_checker(GetCAuthority, 2, {b}).satisfied(A));
    BOOST_TEST(!make_auth_checker(GetCAuthority, 2, {c}).satisfied(A));
@@ -457,7 +458,7 @@ BOOST_AUTO_TEST_CASE(authority_checker)
       BOOST_TEST(checker.unused_keys().count(c) == 1u);
    }
 
-   A = authority(2, {key_weight{a, 1}, key_weight{b, 1}}, {permission_level_weight{{"hello",  "world"}, 2}});
+   A = authority(2, {key_weight{a, 1}, key_weight{b, 1}}, {permission_level_weight{{name("hello"), name("world")}, 2}});
    BOOST_TEST(make_auth_checker(GetCAuthority, 2, {a, b}).satisfied(A));
    BOOST_TEST(make_auth_checker(GetCAuthority, 2, {c}).satisfied(A));
    BOOST_TEST(!make_auth_checker(GetCAuthority, 2, {a}).satisfied(A));
@@ -471,16 +472,16 @@ BOOST_AUTO_TEST_CASE(authority_checker)
       BOOST_TEST(checker.used_keys().count(c) == 1u);
    }
 
-   auto d = test.get_public_key("d", "active");
-   auto e = test.get_public_key("e", "active");
+   auto d = test.get_public_key(name("d"), "active");
+   auto e = test.get_public_key(name("e"), "active");
 
    auto GetAuthority = [d, e] (const permission_level& perm) {
-      if (perm.actor == "top")
-         return authority(2, {key_weight{d, 1}}, {permission_level_weight{{"bottom",  "bottom"}, 1}});
+      if (perm.actor == name("top"))
+         return authority(2, {key_weight{d, 1}}, {permission_level_weight{{name("bottom"), name("bottom")}, 1}});
       return authority{1, {{e, 1}}, {}};
    };
 
-   A = authority(5, {key_weight{a, 2}, key_weight{b, 2}, key_weight{c, 2}}, {permission_level_weight{{"top",  "top"}, 5}});
+   A = authority(5, {key_weight{a, 2}, key_weight{b, 2}, key_weight{c, 2}}, {permission_level_weight{{name("top"), name("top")}, 5}});
    {
       auto checker = make_auth_checker(GetAuthority, 2, {d, e});
       BOOST_TEST(checker.satisfied(A));
@@ -547,38 +548,38 @@ BOOST_AUTO_TEST_CASE(authority_checker)
    }
    {
       auto A2 = authority(4, {key_weight{b, 1}, key_weight{a, 1}, key_weight{c, 1}},
-                          { permission_level_weight{{"a",  "world"},     1},
-                            permission_level_weight{{"hello",  "world"}, 1},
-                            permission_level_weight{{"hi",  "world"},    1}
+                          { permission_level_weight{{name("a"), name("world")},     1},
+                            permission_level_weight{{name("hello"), name("world")}, 1},
+                            permission_level_weight{{name("hi"), name("world")},    1}
                           });
       auto B2 = authority(4, {key_weight{b, 1}, key_weight{a, 1}, key_weight{c, 1}},
-                          {permission_level_weight{{"hello",  "world"}, 1}
+                          {permission_level_weight{{name("hello"), name("world")}, 1}
                           });
       auto C2 = authority(4, {key_weight{b, 1}, key_weight{a, 1}, key_weight{c, 1}},
-                          { permission_level_weight{{"hello",  "there"}, 1},
-                            permission_level_weight{{"hello",  "world"}, 1}
+                          { permission_level_weight{{name("hello"), name("there")}, 1},
+                            permission_level_weight{{name("hello"), name("world")}, 1}
                           });
       // invalid: duplicate
       auto D2 = authority(4, {key_weight{b, 1}, key_weight{a, 1}, key_weight{c, 1}},
-                          { permission_level_weight{{"hello",  "world"}, 1},
-                            permission_level_weight{{"hello",  "world"}, 2}
+                          { permission_level_weight{{name("hello"), name("world")}, 1},
+                            permission_level_weight{{name("hello"), name("world")}, 2}
                           });
       // invalid: wrong order
       auto E2 = authority(4, {key_weight{b, 1}, key_weight{a, 1}, key_weight{c, 1}},
-                          { permission_level_weight{{"hello",  "world"}, 2},
-                            permission_level_weight{{"hello",  "there"}, 1}
+                          { permission_level_weight{{name("hello"), name("world")}, 2},
+                            permission_level_weight{{name("hello"), name("there")}, 1}
                           });
       // invalid: wrong order
       auto F2 = authority(4, {key_weight{b, 1}, key_weight{a, 1}, key_weight{c, 1}},
-                          { permission_level_weight{{"hi",  "world"}, 2},
-                            permission_level_weight{{"hello",  "world"}, 1}
+                          { permission_level_weight{{name("hi"), name("world")}, 2},
+                            permission_level_weight{{name("hello"), name("world")}, 1}
                           });
 
       // invalid: insufficient weight
       auto G2 = authority(7, {key_weight{b, 1}, key_weight{a, 1}, key_weight{c, 1}},
-                             { permission_level_weight{{"a",  "world"},     1},
-                               permission_level_weight{{"hello",  "world"}, 1},
-                               permission_level_weight{{"hi",  "world"},    1}
+                             { permission_level_weight{{name("a"), name("world")},     1},
+                               permission_level_weight{{name("hello"), name("world")}, 1},
+                               permission_level_weight{{name("hi"), name("world")},    1}
                              });
 
       BOOST_TEST(validate(A2));
@@ -623,7 +624,7 @@ BOOST_AUTO_TEST_CASE(alphabetic_sort)
   vector<uint64_t> uwords;
   for(const auto w: words) {
     auto n = name(w.c_str());
-    uwords.push_back(n.value);
+    uwords.push_back(n.to_uint64_t());
   }
 
   std::sort(uwords.begin(), uwords.end(), std::less<uint64_t>());
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index cd20e6cd74f..db1c3a19ec1 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE( only_link_to_existing_permission_test ) try {
       ("account", "alice")
       ("permission", "test")
       ("parent", "active")
-      ("auth", authority(get_public_key("testapi", "test")))
+      ("auth", authority(get_public_key(name("testapi"), "test")))
    );
 
    c.produce_block();
@@ -660,7 +660,7 @@ BOOST_AUTO_TEST_CASE( no_duplicate_deferred_id_test ) try {
 
    check_generation_context( index.begin()->packed_trx,
                              trace2->id,
-                             ((static_cast<unsigned __int128>(N(alice)) << 64) | 1),
+                             ((static_cast<unsigned __int128>(N(alice).to_uint64_t()) << 64) | 1),
                              N(test) );
 
    c.produce_block();
@@ -678,7 +678,7 @@ BOOST_AUTO_TEST_CASE( no_duplicate_deferred_id_test ) try {
 
    check_generation_context( index.begin()->packed_trx,
                              trace3->id,
-                             ((static_cast<unsigned __int128>(N(alice)) << 64) | 1),
+                             ((static_cast<unsigned __int128>(N(alice).to_uint64_t()) << 64) | 1),
                              N(test) );
 
    c.produce_block();
diff --git a/unittests/ram_tests.cpp b/unittests/ram_tests.cpp
index e73eb979339..ce4c4ab416a 100644
--- a/unittests/ram_tests.cpp
+++ b/unittests/ram_tests.cpp
@@ -36,7 +36,7 @@ BOOST_FIXTURE_TEST_CASE(ram_tests, eosio_system::eosio_system_tester) { try {
    create_account_with_resources(N(testram11111),config::system_account_name, init_request_bytes + 40);
    create_account_with_resources(N(testram22222),config::system_account_name, init_request_bytes + 1190);
    produce_blocks(10);
-   BOOST_REQUIRE_EQUAL( success(), stake( "eosio.stake", "testram11111", core_from_string("10.0000"), core_from_string("5.0000") ) );
+   BOOST_REQUIRE_EQUAL( success(), stake( name("eosio.stake"), name("testram11111"), core_from_string("10.0000"), core_from_string("5.0000") ) );
    produce_blocks(10);
 
    for (auto i = 0; i < 10; ++i) {
diff --git a/unittests/special_accounts_tests.cpp b/unittests/special_accounts_tests.cpp
index aa769bcacaa..2d7c142daaf 100644
--- a/unittests/special_accounts_tests.cpp
+++ b/unittests/special_accounts_tests.cpp
@@ -65,7 +65,7 @@ BOOST_FIXTURE_TEST_CASE(accounts_exists, tester)
       for (size_t i = 0; i < std::max(active_auth.size(), active_producers.producers.size()); ++i) {
          account_name n1 = i < active_auth.size() ? active_auth[i] : (account_name)0;
          account_name n2 = i < active_producers.producers.size() ? active_producers.producers[i].producer_name : (account_name)0;
-         if (n1 != n2) diff.push_back((uint64_t)n2 - (uint64_t)n1);
+         if (n1 != n2) diff.push_back(name(n2.to_uint64_t() - n1.to_uint64_t()));
       }
 
       BOOST_CHECK_EQUAL(diff.size(), 0);
diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index c29ec8da8c4..4ff0ee2bd75 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -383,23 +383,23 @@ BOOST_FIXTURE_TEST_CASE( f32_f64_overflow_tests, tester ) try {
    int count = 0;
    auto check = [&](const char *wast_template, const char *op, const char *param) -> bool {
       count+=16;
-      create_accounts( {N(f_tests)+count} );
+      create_accounts( {name(N(f_tests).to_uint64_t()+count)} );
       produce_blocks(1);
       std::vector<char> wast;
       wast.resize(strlen(wast_template) + 128);
       sprintf(&(wast[0]), wast_template, op, param);
-      set_code(N(f_tests)+count, &(wast[0]));
+      set_code(name(N(f_tests).to_uint64_t()+count), &(wast[0]));
       produce_blocks(10);
 
       signed_transaction trx;
       action act;
-      act.account = N(f_tests)+count;
+      act.account = name(N(f_tests).to_uint64_t()+count);
       act.name = N();
-      act.authorization = vector<permission_level>{{N(f_tests)+count,config::active_name}};
+      act.authorization = vector<permission_level>{{name(N(f_tests).to_uint64_t()+count),config::active_name}};
       trx.actions.push_back(act);
 
       set_transaction_headers(trx);
-      trx.sign(get_private_key( N(f_tests)+count, "active" ), control->get_chain_id());
+      trx.sign(get_private_key( name(N(f_tests).to_uint64_t()+count), "active" ), control->get_chain_id());
 
       try {
          push_transaction(trx);
@@ -608,7 +608,7 @@ BOOST_FIXTURE_TEST_CASE( check_global_reset, TESTER ) try {
    {
    action act;
    act.account = N(globalreset);
-   act.name = 1ULL;
+   act.name = name(1ULL);
    act.authorization = vector<permission_level>{{N(globalreset),config::active_name}};
    trx.actions.push_back(act);
    }
@@ -1087,7 +1087,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = 555ULL<<32 | 0ULL;       //top 32 is what we assert against, bottom 32 is indirect call index
+   act.name = name(555ULL<<32 | 0ULL);       //top 32 is what we assert against, bottom 32 is indirect call index
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
@@ -1101,7 +1101,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = 555ULL<<32 | 1022ULL;       //top 32 is what we assert against, bottom 32 is indirect call index
+   act.name = name(555ULL<<32 | 1022ULL);       //top 32 is what we assert against, bottom 32 is indirect call index
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
@@ -1115,7 +1115,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = 7777ULL<<32 | 1023ULL;       //top 32 is what we assert against, bottom 32 is indirect call index
+   act.name = name(7777ULL<<32 | 1023ULL);       //top 32 is what we assert against, bottom 32 is indirect call index
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
@@ -1129,7 +1129,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = 7778ULL<<32 | 1023ULL;       //top 32 is what we assert against, bottom 32 is indirect call index
+   act.name = name(7778ULL<<32 | 1023ULL);       //top 32 is what we assert against, bottom 32 is indirect call index
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
@@ -1145,7 +1145,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = 133ULL<<32 | 5ULL;       //top 32 is what we assert against, bottom 32 is indirect call index
+   act.name = name(133ULL<<32 | 5ULL);       //top 32 is what we assert against, bottom 32 is indirect call index
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
@@ -1161,7 +1161,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = eosio::chain::wasm_constraints::maximum_table_elements+54334;
+   act.name = name(eosio::chain::wasm_constraints::maximum_table_elements+54334);
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
@@ -1181,7 +1181,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = 555ULL<<32 | 1022ULL;       //top 32 is what we assert against, bottom 32 is indirect call index
+   act.name = name(555ULL<<32 | 1022ULL);       //top 32 is what we assert against, bottom 32 is indirect call index
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
@@ -1194,7 +1194,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = 7777ULL<<32 | 1023ULL;       //top 32 is what we assert against, bottom 32 is indirect call index
+   act.name = name(7777ULL<<32 | 1023ULL);       //top 32 is what we assert against, bottom 32 is indirect call index
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
@@ -1208,7 +1208,7 @@ BOOST_FIXTURE_TEST_CASE( check_table_maximum, TESTER ) try {
    {
    signed_transaction trx;
    action act;
-   act.name = 888ULL;
+   act.name = name(888ULL);
    act.account = N(tbl);
    act.authorization = vector<permission_level>{{N(tbl),config::active_name}};
    trx.actions.push_back(act);
diff --git a/unittests/whitelist_blacklist_tests.cpp b/unittests/whitelist_blacklist_tests.cpp
index 4a372000082..2fbf0864d2b 100644
--- a/unittests/whitelist_blacklist_tests.cpp
+++ b/unittests/whitelist_blacklist_tests.cpp
@@ -452,7 +452,7 @@ BOOST_AUTO_TEST_CASE( actor_blacklist_inline_deferred ) { try {
    tester1.chain->set_abi( N(charlie),  contracts::deferred_test_abi().data() );
    tester1.chain->produce_blocks();
 
-   auto auth = authority(eosio::testing::base_tester::get_public_key("alice", "active"));
+   auto auth = authority(eosio::testing::base_tester::get_public_key(name("alice"), "active"));
    auth.accounts.push_back( permission_level_weight{{N(alice), config::eosio_code_name}, 1} );
 
    tester1.chain->push_action( N(eosio), N(updateauth), N(alice), mvo()
@@ -462,7 +462,7 @@ BOOST_AUTO_TEST_CASE( actor_blacklist_inline_deferred ) { try {
       ( "auth", auth )
    );
 
-   auth = authority(eosio::testing::base_tester::get_public_key("bob", "active"));
+   auth = authority(eosio::testing::base_tester::get_public_key(name("bob"), "active"));
    auth.accounts.push_back( permission_level_weight{{N(alice), config::eosio_code_name}, 1} );
    auth.accounts.push_back( permission_level_weight{{N(bob), config::eosio_code_name}, 1} );
 
@@ -473,7 +473,7 @@ BOOST_AUTO_TEST_CASE( actor_blacklist_inline_deferred ) { try {
       ( "auth", auth )
    );
 
-   auth = authority(eosio::testing::base_tester::get_public_key("charlie", "active"));
+   auth = authority(eosio::testing::base_tester::get_public_key(name("charlie"), "active"));
    auth.accounts.push_back( permission_level_weight{{N(charlie), config::eosio_code_name}, 1} );
 
    tester1.chain->push_action( N(eosio), N(updateauth), N(charlie), mvo()
@@ -596,7 +596,7 @@ BOOST_AUTO_TEST_CASE( blacklist_sender_bypass ) { try {
    tester1.chain->set_abi( N(charlie),  contracts::deferred_test_abi().data() );
    tester1.chain->produce_blocks();
 
-   auto auth = authority(eosio::testing::base_tester::get_public_key("alice", "active"));
+   auto auth = authority(eosio::testing::base_tester::get_public_key(name("alice"), "active"));
    auth.accounts.push_back( permission_level_weight{{N(alice), config::eosio_code_name}, 1} );
 
    tester1.chain->push_action( N(eosio), N(updateauth), N(alice), mvo()
@@ -606,7 +606,7 @@ BOOST_AUTO_TEST_CASE( blacklist_sender_bypass ) { try {
       ( "auth", auth )
    );
 
-   auth = authority(eosio::testing::base_tester::get_public_key("bob", "active"));
+   auth = authority(eosio::testing::base_tester::get_public_key(name("bob"), "active"));
    auth.accounts.push_back( permission_level_weight{{N(bob), config::eosio_code_name}, 1} );
 
    tester1.chain->push_action( N(eosio), N(updateauth), N(bob), mvo()
@@ -616,7 +616,7 @@ BOOST_AUTO_TEST_CASE( blacklist_sender_bypass ) { try {
       ( "auth", auth )
    );
 
-   auth = authority(eosio::testing::base_tester::get_public_key("charlie", "active"));
+   auth = authority(eosio::testing::base_tester::get_public_key(name("charlie"), "active"));
    auth.accounts.push_back( permission_level_weight{{N(charlie), config::eosio_code_name}, 1} );
 
    tester1.chain->push_action( N(eosio), N(updateauth), N(charlie), mvo()

From 581139157bba558751de2913c3e04dcc880f43ce Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 09:43:23 -0500
Subject: [PATCH 0337/1648] Revert unneeded explicit wrap of account_name
 constructor

---
 .../include/eosio/chain/contract_types.hpp     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/contract_types.hpp b/libraries/chain/include/eosio/chain/contract_types.hpp
index adb3391db2d..ab65c445475 100644
--- a/libraries/chain/include/eosio/chain/contract_types.hpp
+++ b/libraries/chain/include/eosio/chain/contract_types.hpp
@@ -20,7 +20,7 @@ struct newaccount {
    }
 
    static action_name get_name() {
-      return action_name( N(newaccount) );
+      return N(newaccount);
    }
 };
 
@@ -35,7 +35,7 @@ struct setcode {
    }
 
    static action_name get_name() {
-      return action_name( N(setcode) );
+      return N(setcode);
    }
 };
 
@@ -48,7 +48,7 @@ struct setabi {
    }
 
    static action_name get_name() {
-      return action_name( N(setabi) );
+      return N(setabi);
    }
 };
 
@@ -64,7 +64,7 @@ struct updateauth {
    }
 
    static action_name get_name() {
-      return action_name( N(updateauth) );
+      return N(updateauth);
    }
 };
 
@@ -82,7 +82,7 @@ struct deleteauth {
    }
 
    static action_name get_name() {
-      return action_name( N(deleteauth) );
+      return N(deleteauth);
    }
 };
 
@@ -102,7 +102,7 @@ struct linkauth {
    }
 
    static action_name get_name() {
-      return action_name( N(linkauth) );
+      return N(linkauth);
    }
 };
 
@@ -121,7 +121,7 @@ struct unlinkauth {
    }
 
    static action_name get_name() {
-      return action_name( N(unlinkauth) );
+      return N(unlinkauth);
    }
 };
 
@@ -134,7 +134,7 @@ struct canceldelay {
    }
 
    static action_name get_name() {
-      return action_name( N(canceldelay) );
+      return N(canceldelay);
    }
 };
 
@@ -150,7 +150,7 @@ struct onerror {
    }
 
    static action_name get_name() {
-      return action_name( N(onerror) );
+      return N(onerror);
    }
 };
 

From 6cc09b29882f1f09dc4d2caa52bec263bd3528a2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 09:57:46 -0500
Subject: [PATCH 0338/1648] Update for explicit name

---
 plugins/mongo_db_plugin/mongo_db_plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index 865ad8809a8..590700d2dcb 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -58,9 +58,9 @@ struct filter_entry {
 
    //            receiver          action       actor
    bool match( const name& rr, const name& an, const name& ar ) const {
-      return (receiver.value == 0 || receiver == rr) &&
-             (action.value == 0 || action == an) &&
-             (actor.value == 0 || actor == ar);
+      return (receiver.to_uint64_t() == 0 || receiver == rr) &&
+             (action.to_uint64_t() == 0 || action == an) &&
+             (actor.to_uint64_t() == 0 || actor == ar);
    }
 };
 
@@ -229,7 +229,7 @@ bool mongo_db_plugin_impl::filter_include( const account_name& receiver, const a
       include = true;
    } else {
       auto itr = std::find_if( filter_on.cbegin(), filter_on.cend(), [&receiver, &act_name]( const auto& filter ) {
-         return filter.match( receiver, act_name, 0 );
+         return filter.match( receiver, act_name, {} );
       } );
       if( itr != filter_on.cend() ) {
          include = true;
@@ -250,7 +250,7 @@ bool mongo_db_plugin_impl::filter_include( const account_name& receiver, const a
    if( filter_out.empty() ) { return true; }
 
    auto itr = std::find_if( filter_out.cbegin(), filter_out.cend(), [&receiver, &act_name]( const auto& filter ) {
-      return filter.match( receiver, act_name, 0 );
+      return filter.match( receiver, act_name, {} );
    } );
    if( itr != filter_out.cend() ) { return false; }
 
@@ -1598,7 +1598,7 @@ void mongo_db_plugin::plugin_initialize(const variables_map& options)
                std::vector<std::string> v;
                boost::split( v, s, boost::is_any_of( ":" ));
                EOS_ASSERT( v.size() == 3, fc::invalid_arg_exception, "Invalid value ${s} for --mongodb-filter-on", ("s", s));
-               filter_entry fe{v[0], v[1], v[2]};
+               filter_entry fe{eosio::chain::name(v[0]), eosio::chain::name(v[1]), eosio::chain::name(v[2])};
                my->filter_on.insert( fe );
             }
          } else {
@@ -1610,7 +1610,7 @@ void mongo_db_plugin::plugin_initialize(const variables_map& options)
                std::vector<std::string> v;
                boost::split( v, s, boost::is_any_of( ":" ));
                EOS_ASSERT( v.size() == 3, fc::invalid_arg_exception, "Invalid value ${s} for --mongodb-filter-out", ("s", s));
-               filter_entry fe{v[0], v[1], v[2]};
+               filter_entry fe{eosio::chain::name(v[0]), eosio::chain::name(v[1]), eosio::chain::name(v[2])};
                my->filter_out.insert( fe );
             }
          }

From 3e7ca88883d5e99fca25b23a994c2aebdd943703 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 12:03:30 -0500
Subject: [PATCH 0339/1648] Fix issue with lifetime of reference of
 flat_set<public_key_type>

---
 libraries/chain/controller.cpp                | 10 ++++++----
 .../eosio/chain/transaction_metadata.hpp      |  5 +++--
 libraries/chain/transaction_metadata.cpp      | 17 ++++++++--------
 plugins/mongo_db_plugin/mongo_db_plugin.cpp   |  6 +++---
 unittests/misc_tests.cpp                      | 20 +++++++++----------
 5 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 757b53ab622..4f8603c5f42 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1258,8 +1258,10 @@ struct controller_impl {
          auto start = fc::time_point::now();
          const bool check_auth = !self.skip_auth_check() && !trx->implicit;
          // call recover keys so that trx->sig_cpu_usage is set correctly
-         const fc::microseconds sig_cpu_usage = check_auth ? std::get<0>( trx->recover_keys( chain_id ) ) : fc::microseconds();
-         const flat_set<public_key_type>& recovered_keys = check_auth ? std::get<1>( trx->recover_keys( chain_id ) ) : flat_set<public_key_type>();
+         const fc::microseconds sig_cpu_usage =
+               check_auth ? std::get<0>( trx->recover_keys( chain_id ) ) : fc::microseconds();
+         const std::shared_ptr<flat_set<public_key_type>> recovered_keys =
+               check_auth ? std::get<1>( trx->recover_keys( chain_id ) ) : nullptr;
          if( !explicit_billed_cpu_time ) {
             fc::microseconds already_consumed_time( EOS_PERCENT(sig_cpu_usage.count(), conf.sig_cpu_bill_pct) );
 
@@ -1292,10 +1294,10 @@ struct controller_impl {
 
             trx_context.delay = fc::seconds(trn.delay_sec);
 
-            if( check_auth ) {
+            if( check_auth && recovered_keys ) {
                authorization.check_authorization(
                        trn.actions,
-                       recovered_keys,
+                       *recovered_keys,
                        {},
                        trx_context.delay,
                        [&trx_context](){ trx_context.checktime(); },
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 1b6888d3e6f..1a574c3d15c 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -15,9 +15,9 @@ namespace eosio { namespace chain {
 
 class transaction_metadata;
 using transaction_metadata_ptr = std::shared_ptr<transaction_metadata>;
-using signing_keys_future_value_type = std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>;
+using signing_keys_future_value_type = std::tuple<chain_id_type, fc::microseconds, std::shared_ptr<flat_set<public_key_type>>>;
 using signing_keys_future_type = std::shared_future<signing_keys_future_value_type>;
-using recovery_keys_type = std::pair<fc::microseconds, const flat_set<public_key_type>&>;
+using recovery_keys_type = std::pair<fc::microseconds, std::shared_ptr<flat_set<public_key_type>>>;
 
 /**
  *  This data structure should store context-free cached data about a transaction such as
@@ -65,6 +65,7 @@ class transaction_metadata {
                           std::function<void()> next = std::function<void()>() );
 
       // start_recover_keys can be called first to begin key recovery
+      // if time_limit of start_recover_keys exceeded (or any other exception) then this can throw
       recovery_keys_type recover_keys( const chain_id_type& chain_id ) const;
 };
 
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index fc451201f19..f72b35a2545 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -8,25 +8,25 @@ recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chai
    // Unlikely for more than one chain_id to be used in one nodeos instance
    std::unique_lock<std::mutex> g( _signing_keys_future_mtx );
    if( _signing_keys_future.valid() ) {
-      const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = _signing_keys_future.get();
+      const signing_keys_future_value_type& sig_keys = _signing_keys_future.get();
       if( std::get<0>( sig_keys ) == chain_id ) {
-         return std::make_pair( std::get<1>( sig_keys ), std::cref( std::get<2>( sig_keys ) ) );
+         return std::make_pair( std::get<1>( sig_keys ), std::get<2>( sig_keys ) );
       }
    }
 
    g.unlock();
    // shared_keys_future not created or different chain_id
-   flat_set<public_key_type> recovered_pub_keys;
+   auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
    const signed_transaction& trn = _packed_trx->get_signed_transaction();
-   fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, fc::time_point::maximum(), recovered_pub_keys );
+   fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, fc::time_point::maximum(), *recovered_pub_keys );
 
    g.lock();
    std::promise<signing_keys_future_value_type> p;
    p.set_value( std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ) ) );
    _signing_keys_future = p.get_future().share();
 
-   const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = _signing_keys_future.get();
-   return std::make_pair( std::get<1>( sig_keys ), std::cref( std::get<2>( sig_keys ) ) );
+   const signing_keys_future_value_type& sig_keys = _signing_keys_future.get();
+   return std::make_pair( std::get<1>( sig_keys ), std::get<2>( sig_keys ) );
 }
 
 void transaction_metadata::start_recover_keys( const transaction_metadata_ptr& mtrx,
@@ -44,9 +44,10 @@ void transaction_metadata::start_recover_keys( const transaction_metadata_ptr& m
    mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx, next{std::move(next)}]() {
       fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
                                 fc::time_point::maximum() : fc::time_point::now() + time_limit;
-      flat_set<public_key_type> recovered_pub_keys;
+
+      auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
       const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
-      fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
+      fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, deadline, *recovered_pub_keys );
       if( next ) next();
       return std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ));
    } );
diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index 0af0cf5784a..d12da18e712 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -771,10 +771,10 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
    }
 
    fc::variant signing_keys;
-   flat_set<public_key_type> keys;
+   std::shared_ptr<flat_set<public_key_type>> keys;
    std::tie( std::ignore, keys ) = t->recover_keys( *chain_id );
-   if( !keys.empty() ) {
-      signing_keys = keys;
+   if( !keys->empty() ) {
+      signing_keys = *keys;
    }
 
    if( signing_keys.get_type() == fc::variant::array_type && signing_keys.get_array().size() > 0) {
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index bf439c2f6a5..dbcb9fc76b9 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -849,29 +849,29 @@ BOOST_AUTO_TEST_CASE(transaction_metadata_test) { try {
       transaction_metadata::start_recover_keys( mtrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
 
       auto keys = mtrx->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys.second.begin());
+      BOOST_CHECK_EQUAL(1u, keys.second->size());
+      BOOST_CHECK_EQUAL(public_key, *keys.second->begin());
 
       // again
       auto keys2 = mtrx->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys2.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys2.second.begin());
+      BOOST_CHECK_EQUAL(1u, keys2.second->size());
+      BOOST_CHECK_EQUAL(public_key, *keys2.second->begin());
 
       auto keys3 = mtrx2->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys3.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys3.second.begin());
+      BOOST_CHECK_EQUAL(1u, keys3.second->size());
+      BOOST_CHECK_EQUAL(public_key, *keys3.second->begin());
 
       // recover keys without first calling start_recover_keys
       transaction_metadata_ptr mtrx4 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::none) );
       transaction_metadata_ptr mtrx5 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::zlib) );
 
       auto keys4 = mtrx4->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys4.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys4.second.begin());
+      BOOST_CHECK_EQUAL(1u, keys4.second->size());
+      BOOST_CHECK_EQUAL(public_key, *keys4.second->begin());
 
       auto keys5 = mtrx5->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys5.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys5.second.begin());
+      BOOST_CHECK_EQUAL(1u, keys5.second->size());
+      BOOST_CHECK_EQUAL(public_key, *keys5.second->begin());
 
       thread_pool.stop();
 

From 2a26f5ef47ac142c9b156644e2e3a58954340e88 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 May 2019 14:45:43 -0500
Subject: [PATCH 0340/1648] EOS_ASSERT instead of check for null recovered_keys

---
 libraries/chain/controller.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 4f8603c5f42..7efbde8a38e 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1294,7 +1294,8 @@ struct controller_impl {
 
             trx_context.delay = fc::seconds(trn.delay_sec);
 
-            if( check_auth && recovered_keys ) {
+            if( check_auth ) {
+               EOS_ASSERT( recovered_keys, missing_auth_exception, "recovered_keys should never be null" );
                authorization.check_authorization(
                        trn.actions,
                        *recovered_keys,

From 5a9bf2c68e3ffd95587f1d04e47f64c32cd50f65 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Thu, 9 May 2019 18:43:14 -0400
Subject: [PATCH 0341/1648] further fixes for eos-vm integration

---
 .../eosio/chain/webassembly/eos-vm.hpp        |  58 ++----
 libraries/chain/wasm_interface.cpp            | 196 +++++++++---------
 libraries/chain/webassembly/eos-vm.cpp        |   1 -
 3 files changed, 111 insertions(+), 144 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index e9f5e05fe49..539448ad138 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -16,9 +16,9 @@ namespace eosio { namespace wasm_backend {
       typedef uint64_t type;
    };
 
-   template <typename S, typename Args, size_t I, typename T, typename WAlloc, typename Cleanups>
-   constexpr auto get_value(operand_stack& op, Cleanups&, WAlloc*, T&& val) 
-   	-> std::enable_if_t<std::is_same_v<i64_const_t, T> && std::is_same_v<chain::name, std::decay_t<S>>, S> {
+   template <typename S, typename Args, typename T, typename WAlloc>
+   constexpr auto get_value(WAlloc*, T&& val) 
+         -> std::enable_if_t<std::is_same_v<i64_const_t, T> && std::is_same_v<chain::name, std::decay_t<S>>, S> {
       return {(uint64_t)val.data.ui};
    } 
 
@@ -28,43 +28,13 @@ namespace eosio { namespace wasm_backend {
       typedef uint32_t type;
    };
    
-   template <typename S, typename Args, size_t I, typename T, typename WAlloc, typename Cleanups>
-   constexpr auto get_value(operand_stack& op, Cleanups& cleanups, WAlloc* walloc, T&& val) 
-   	-> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
-	   std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
-      !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
-      //size_t i = std::tuple_size<Args>::value-1;
+   template <typename S, typename Args, typename T, typename WAlloc>
+   constexpr auto get_value(WAlloc* walloc, T&& val) 
+         -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
+         std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
+         !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
       using ptr_ty = typename S::type;
-      using under_ty = std::remove_pointer_t<ptr_ty>;
-      auto* ptr = (ptr_ty*)((walloc->template get_base_ptr<char>())+val.data.ui);
-      /*
-      if constexpr (std::tuple_size<Args>::value > I) {
-         const auto& next_arg = std::get<to_wasm_t<typename std::tuple_element<I, Args>::type>>(op.get_back(i-I)).data.ui;
-         size_t sz = 0;
-         if constexpr ( (std::tuple_size<Args>::value > I+1) 
-			   && std::is_same_v<decltype(next_arg), eosio::chain::array_ptr<under_ty>>) {
-            sz = std::get<to_wasm_t<typename std::tuple_element<I+1, Args>::type>>(op.get_back(i-(I+1))).data.ui;
-            std::cout << "sz0 " << sz << "\n";
-         } else {
-            sz = next_arg;
-            std::cout << "sz1 " << sz << " sizeof " << sizeof(under_ty) << " alignof " << alignof(under_ty) << "\n";
-         }
-         if ((uintptr_t)ptr % 16 != 0) {
-            std::cout << "aligning\n";
-            align_ptr_triple apt;
-            apt.s = sizeof(under_ty)*sz;
-            std::vector<std::remove_const_t<under_ty>> cpy(sz > 0 ? sz : 1);
-            apt.o = (void*)ptr;
-            ptr = (decltype(ptr))cpy.data();
-            apt.n = (void*)ptr;
-            //memcpy((std::remove_const_t<under_ty>*)apt.n, (const under_ty*)apt.o, apt.s);
-            memmove( static_cast<char*>(apt.n), static_cast<const char*>(apt.o), apt.s);
-            if constexpr (!std::is_const_v<under_ty>)
-               cleanups.emplace_back(std::move(apt));
-         }
-      }
-      */
-      return eosio::chain::array_ptr<under_ty>(ptr);
+      return eosio::chain::array_ptr<ptr_ty>((ptr_ty*)((walloc->template get_base_ptr<char>())+val.data.ui));
    }
 
    template <typename Ctx>
@@ -82,11 +52,11 @@ namespace eosio { namespace wasm_backend {
       typedef uint32_t type;
    };
    
-   template <typename S, typename Args, size_t I, typename T, typename WAlloc, typename Cleanups>
-   constexpr auto get_value(operand_stack& op, Cleanups&, WAlloc* walloc, T&& val) 
-   	-> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
-           std::is_same_v< eosio::chain::null_terminated_ptr, S> &&
-           !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
+   template <typename S, typename Args, typename T, typename WAlloc>
+   constexpr auto get_value(WAlloc* walloc, T&& val) 
+         -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
+         std::is_same_v< eosio::chain::null_terminated_ptr, S> &&
+         !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
       return eosio::chain::null_terminated_ptr((char*)(walloc->template get_base_ptr<uint8_t>()+val.data.ui));
    }
 
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 376b4beec06..8bc9c327919 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -904,16 +904,16 @@ class authorization_api : public context_aware_api {
    public:
       using context_aware_api::context_aware_api;
 
-   void require_authorization( const account_name& account ) {
+   void require_auth( account_name account ) {
       context.require_authorization( account );
    }
 
-   bool has_authorization( const account_name& account )const {
+   bool has_auth( account_name account )const {
       return context.has_authorization( account );
    }
 
-   void require_authorization2(const account_name& account,
-			       const permission_name& permission) {
+   void require_auth2( account_name account,
+			              permission_name permission) {
       context.require_authorization( account, permission );
    }
 
@@ -921,7 +921,7 @@ class authorization_api : public context_aware_api {
       context.require_recipient( recipient );
    }
 
-   bool is_account( const account_name& account )const {
+   bool is_account( account_name account )const {
       return context.is_account( account );
    }
 
@@ -1015,8 +1015,6 @@ class action_api : public context_aware_api {
       }
 
       int action_data_size() {
-         std::cout << "THIS " << this << "\n";
-         std::cout << "ADS " << context.get_action().data.size() << "\n";
          return context.get_action().data.size();
       }
 
@@ -1698,53 +1696,53 @@ class call_depth_api : public context_aware_api {
 };
 
 REGISTER_INJECTED_INTRINSICS(call_depth_api,
-   (call_depth_assert,  void()               )
+   (call_depth_assert,  void() )
 );
 
 REGISTER_INTRINSICS(compiler_builtins,
-   (__ashlti3,     void(int, int64_t, int64_t, int)               )
-   (__ashrti3,     void(int, int64_t, int64_t, int)               )
-   (__lshlti3,     void(int, int64_t, int64_t, int)               )
-   (__lshrti3,     void(int, int64_t, int64_t, int)               )
-   (__divti3,      void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__udivti3,     void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__modti3,      void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__umodti3,     void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__multi3,      void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__addtf3,      void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__subtf3,      void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__multf3,      void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__divtf3,      void(int, int64_t, int64_t, int64_t, int64_t)  )
-   (__eqtf2,       int(int64_t, int64_t, int64_t, int64_t)        )
-   (__netf2,       int(int64_t, int64_t, int64_t, int64_t)        )
-   (__getf2,       int(int64_t, int64_t, int64_t, int64_t)        )
-   (__gttf2,       int(int64_t, int64_t, int64_t, int64_t)        )
-   (__lttf2,       int(int64_t, int64_t, int64_t, int64_t)        )
-   (__letf2,       int(int64_t, int64_t, int64_t, int64_t)        )
-   (__cmptf2,      int(int64_t, int64_t, int64_t, int64_t)        )
-   (__unordtf2,    int(int64_t, int64_t, int64_t, int64_t)        )
-   (__negtf2,      void (int, int64_t, int64_t)                   )
-   (__floatsitf,   void (int, int)                                )
-   (__floatunsitf, void (int, int)                                )
-   (__floatditf,   void (int, int64_t)                            )
-   (__floatunditf, void (int, int64_t)                            )
-   (__floattidf,   double (int64_t, int64_t)                      )
-   (__floatuntidf, double (int64_t, int64_t)                      )
-   (__floatsidf,   double(int)                                    )
-   (__extendsftf2, void(int, float)                               )
-   (__extenddftf2, void(int, double)                              )
-   (__fixtfti,     void(int, int64_t, int64_t)                    )
-   (__fixtfdi,     int64_t(int64_t, int64_t)                      )
-   (__fixtfsi,     int(int64_t, int64_t)                          )
-   (__fixunstfti,  void(int, int64_t, int64_t)                    )
-   (__fixunstfdi,  int64_t(int64_t, int64_t)                      )
-   (__fixunstfsi,  int(int64_t, int64_t)                          )
-   (__fixsfti,     void(int, float)                               )
-   (__fixdfti,     void(int, double)                              )
-   (__fixunssfti,  void(int, float)                               )
-   (__fixunsdfti,  void(int, double)                              )
-   (__trunctfdf2,  double(int64_t, int64_t)                       )
-   (__trunctfsf2,  float(int64_t, int64_t)                        )
+   (__ashlti3,     void(int, int64_t, int64_t, int)              )
+   (__ashrti3,     void(int, int64_t, int64_t, int)              )
+   (__lshlti3,     void(int, int64_t, int64_t, int)              )
+   (__lshrti3,     void(int, int64_t, int64_t, int)              )
+   (__divti3,      void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__udivti3,     void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__modti3,      void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__umodti3,     void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__multi3,      void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__addtf3,      void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__subtf3,      void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__multf3,      void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__divtf3,      void(int, int64_t, int64_t, int64_t, int64_t) )
+   (__eqtf2,       int(int64_t, int64_t, int64_t, int64_t)       )
+   (__netf2,       int(int64_t, int64_t, int64_t, int64_t)       )
+   (__getf2,       int(int64_t, int64_t, int64_t, int64_t)       )
+   (__gttf2,       int(int64_t, int64_t, int64_t, int64_t)       )
+   (__lttf2,       int(int64_t, int64_t, int64_t, int64_t)       )
+   (__letf2,       int(int64_t, int64_t, int64_t, int64_t)       )
+   (__cmptf2,      int(int64_t, int64_t, int64_t, int64_t)       )
+   (__unordtf2,    int(int64_t, int64_t, int64_t, int64_t)       )
+   (__negtf2,      void (int, int64_t, int64_t)                  )
+   (__floatsitf,   void (int, int)                               )
+   (__floatunsitf, void (int, int)                               )
+   (__floatditf,   void (int, int64_t)                           )
+   (__floatunditf, void (int, int64_t)                           )
+   (__floattidf,   double (int64_t, int64_t)                     )
+   (__floatuntidf, double (int64_t, int64_t)                     )
+   (__floatsidf,   double(int)                                   )
+   (__extendsftf2, void(int, float)                              )
+   (__extenddftf2, void(int, double)                             )
+   (__fixtfti,     void(int, int64_t, int64_t)                   )
+   (__fixtfdi,     int64_t(int64_t, int64_t)                     )
+   (__fixtfsi,     int(int64_t, int64_t)                         )
+   (__fixunstfti,  void(int, int64_t, int64_t)                   )
+   (__fixunstfdi,  int64_t(int64_t, int64_t)                     )
+   (__fixunstfsi,  int(int64_t, int64_t)                         )
+   (__fixsfti,     void(int, float)                              )
+   (__fixdfti,     void(int, double)                             )
+   (__fixunssfti,  void(int, float)                              )
+   (__fixunsdfti,  void(int, double)                             )
+   (__trunctfdf2,  double(int64_t, int64_t)                      )
+   (__trunctfsf2,  float(int64_t, int64_t)                       )
 );
 
 REGISTER_INTRINSICS(privileged_api,
@@ -1761,7 +1759,7 @@ REGISTER_INTRINSICS(privileged_api,
 );
 
 REGISTER_INJECTED_INTRINSICS(transaction_context,
-   (checktime,      void())
+   (checktime,      void() )
 );
 
 REGISTER_INTRINSICS(producer_api,
@@ -1769,40 +1767,40 @@ REGISTER_INTRINSICS(producer_api,
 );
 
 #define DB_SECONDARY_INDEX_METHODS_SIMPLE(IDX) \
-   (db_##IDX##_store,          int(int64_t,int64_t,int64_t,int64_t,int))\
-   (db_##IDX##_remove,         void(int))\
-   (db_##IDX##_update,         void(int,int64_t,int))\
-   (db_##IDX##_find_primary,   int(int64_t,int64_t,int64_t,int,int64_t))\
-   (db_##IDX##_find_secondary, int(int64_t,int64_t,int64_t,int,int))\
-   (db_##IDX##_lowerbound,     int(int64_t,int64_t,int64_t,int,int))\
-   (db_##IDX##_upperbound,     int(int64_t,int64_t,int64_t,int,int))\
-   (db_##IDX##_end,            int(int64_t,int64_t,int64_t))\
-   (db_##IDX##_next,           int(int, int))\
-   (db_##IDX##_previous,       int(int, int))
+   (db_##IDX##_store,          int(int64_t,int64_t,int64_t,int64_t,int) )\
+   (db_##IDX##_remove,         void(int)                                )\
+   (db_##IDX##_update,         void(int,int64_t,int)                    )\
+   (db_##IDX##_find_primary,   int(int64_t,int64_t,int64_t,int,int64_t) )\
+   (db_##IDX##_find_secondary, int(int64_t,int64_t,int64_t,int,int)     )\
+   (db_##IDX##_lowerbound,     int(int64_t,int64_t,int64_t,int,int)     )\
+   (db_##IDX##_upperbound,     int(int64_t,int64_t,int64_t,int,int)     )\
+   (db_##IDX##_end,            int(int64_t,int64_t,int64_t)             )\
+   (db_##IDX##_next,           int(int, int)                            )\
+   (db_##IDX##_previous,       int(int, int)                            )
 
 #define DB_SECONDARY_INDEX_METHODS_ARRAY(IDX) \
-      (db_##IDX##_store,          int(int64_t,int64_t,int64_t,int64_t,int,int))\
-      (db_##IDX##_remove,         void(int))\
-      (db_##IDX##_update,         void(int,int64_t,int,int))\
-      (db_##IDX##_find_primary,   int(int64_t,int64_t,int64_t,int,int,int64_t))\
-      (db_##IDX##_find_secondary, int(int64_t,int64_t,int64_t,int,int,int))\
-      (db_##IDX##_lowerbound,     int(int64_t,int64_t,int64_t,int,int,int))\
-      (db_##IDX##_upperbound,     int(int64_t,int64_t,int64_t,int,int,int))\
-      (db_##IDX##_end,            int(int64_t,int64_t,int64_t))\
-      (db_##IDX##_next,           int(int, int))\
-      (db_##IDX##_previous,       int(int, int))
+      (db_##IDX##_store,          int(int64_t,int64_t,int64_t,int64_t,int,int) )\
+      (db_##IDX##_remove,         void(int)                                    )\
+      (db_##IDX##_update,         void(int,int64_t,int,int)                    )\
+      (db_##IDX##_find_primary,   int(int64_t,int64_t,int64_t,int,int,int64_t) )\
+      (db_##IDX##_find_secondary, int(int64_t,int64_t,int64_t,int,int,int)     )\
+      (db_##IDX##_lowerbound,     int(int64_t,int64_t,int64_t,int,int,int)     )\
+      (db_##IDX##_upperbound,     int(int64_t,int64_t,int64_t,int,int,int)     )\
+      (db_##IDX##_end,            int(int64_t,int64_t,int64_t)                 )\
+      (db_##IDX##_next,           int(int, int)                                )\
+      (db_##IDX##_previous,       int(int, int)                                )
 
 REGISTER_INTRINSICS( database_api,
-   (db_store_i64,        int(int64_t,int64_t,int64_t,int64_t,int,int))
-   (db_update_i64,       void(int,int64_t,int,int))
-   (db_remove_i64,       void(int))
-   (db_get_i64,          int(int, int, int))
-   (db_next_i64,         int(int, int))
-   (db_previous_i64,     int(int, int))
-   (db_find_i64,         int(int64_t,int64_t,int64_t,int64_t))
-   (db_lowerbound_i64,   int(int64_t,int64_t,int64_t,int64_t))
-   (db_upperbound_i64,   int(int64_t,int64_t,int64_t,int64_t))
-   (db_end_i64,          int(int64_t,int64_t,int64_t))
+   (db_store_i64,        int(int64_t,int64_t,int64_t,int64_t,int,int) )
+   (db_update_i64,       void(int,int64_t,int,int)                    )
+   (db_remove_i64,       void(int)                                    )
+   (db_get_i64,          int(int, int, int)                           )
+   (db_next_i64,         int(int, int)                                )
+   (db_previous_i64,     int(int, int)                                )
+   (db_find_i64,         int(int64_t,int64_t,int64_t,int64_t)         )
+   (db_lowerbound_i64,   int(int64_t,int64_t,int64_t,int64_t)         )
+   (db_upperbound_i64,   int(int64_t,int64_t,int64_t,int64_t)         )
+   (db_end_i64,          int(int64_t,int64_t,int64_t)                 )
 
    DB_SECONDARY_INDEX_METHODS_SIMPLE(idx64)
    DB_SECONDARY_INDEX_METHODS_SIMPLE(idx128)
@@ -1828,8 +1826,8 @@ REGISTER_INTRINSICS(crypto_api,
 REGISTER_INTRINSICS(permission_api,
    (check_transaction_authorization, int(int, int, int, int, int, int)                  )
    (check_permission_authorization,  int(int64_t, int64_t, int, int, int, int, int64_t) )
-   (get_permission_last_used,        int64_t(int64_t, int64_t) )
-   (get_account_creation_time,       int64_t(int64_t) )
+   (get_permission_last_used,        int64_t(int64_t, int64_t)                          )
+   (get_account_creation_time,       int64_t(int64_t)                                   )
 );
 
 
@@ -1851,15 +1849,15 @@ REGISTER_INTRINSICS(context_free_system_api,
 REGISTER_INTRINSICS(action_api,
    (read_action_data,       int(int, int)  )
    (action_data_size,       int()          )
-   (current_receiver,   int64_t()          )
+   (current_receiver,       int64_t()      )
 );
 
 REGISTER_INTRINSICS(authorization_api,
-   (require_recipient,     void(int64_t)          )
-   (require_authorization, void(int64_t), "require_auth", void(authorization_api::*)(const account_name&) )
-   (require_authorization2, void(int64_t, int64_t), "require_auth2", void(authorization_api::*)(const account_name&, const permission_name& permission) )
-   (has_authorization,     int(int64_t), "has_auth", bool(authorization_api::*)(const account_name&)const )
-   (is_account,            int(int64_t)           )
+   (require_recipient, void(int64_t)          )
+   (require_auth,      void(int64_t)          )
+   (require_auth2,     void(int64_t, int64_t) )
+   (has_auth,          int(int64_t)           )
+   (is_account,        int(int64_t)           )
 );
 
 REGISTER_INTRINSICS(console_api,
@@ -1877,19 +1875,19 @@ REGISTER_INTRINSICS(console_api,
 );
 
 REGISTER_INTRINSICS(context_free_transaction_api,
-   (read_transaction,       int(int, int)            )
-   (transaction_size,       int()                    )
-   (expiration,             int()                    )
-   (tapos_block_prefix,     int()                    )
-   (tapos_block_num,        int()                    )
-   (get_action,             int (int, int, int, int) )
+   (read_transaction,       int(int, int)           )
+   (transaction_size,       int()                   )
+   (expiration,             int()                   )
+   (tapos_block_prefix,     int()                   )
+   (tapos_block_num,        int()                   )
+   (get_action,             int(int, int, int, int) )
 );
 
 REGISTER_INTRINSICS(transaction_api,
-   (send_inline,               void(int, int)               )
-   (send_context_free_inline,  void(int, int)               )
+   (send_inline,               void(int, int)                        )
+   (send_context_free_inline,  void(int, int)                        )
    (send_deferred,             void(int, int64_t, int, int, int32_t) )
-   (cancel_deferred,           int(int)                     )
+   (cancel_deferred,           int(int)                              )
 );
 
 REGISTER_INTRINSICS(context_free_api,
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 81b5c40dad8..6af6dba2e43 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -24,7 +24,6 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          //if (!(const auto& res = _instantiated_module->run_start()))
          //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
         
-         std::cout << "CTX " << &context << "\n"; 
          const auto& res = _instantiated_module->call(&context, "env", "apply",
                                           (uint64_t)context.get_receiver(),
                                           (uint64_t)context.get_action().account,

From 3efece19f40cdf7541196bacde791273d8d0e0cb Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@ii5.com>
Date: Fri, 10 May 2019 17:48:56 +0800
Subject: [PATCH 0342/1648] Add test for various chainbase objects which
 contain fields that require dynamic allocation

---
 tests/CMakeLists.txt                      |   4 +
 tests/Node.py                             |   5 +
 tests/nodeos_chainbase_allocation_test.py | 109 ++++++++++++++++++++++
 tests/nodeos_irreversible_mode_test.py    |   7 +-
 tests/nodeos_protocol_feature_test.py     |   1 -
 5 files changed, 119 insertions(+), 7 deletions(-)
 create mode 100755 tests/nodeos_chainbase_allocation_test.py

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cf7a9e85c76..98ad307a718 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -42,6 +42,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_run_remote_test.py ${CMAKE_CUR
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_under_min_avail_ram.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_under_min_avail_ram.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_voting_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_voting_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_irreversible_mode_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_irreversible_mode_test.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_chainbase_allocation_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_chainbase_allocation_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_protocol_feature_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_protocol_feature_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_multiple_version_protocol_feature_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_multiple_version_protocol_feature_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/consensus-validation-malicious-producers.py ${CMAKE_CURRENT_BINARY_DIR}/consensus-validation-malicious-producers.py COPYONLY)
@@ -111,6 +112,9 @@ set_property(TEST nodeos_under_min_avail_ram_lr_test PROPERTY LABELS long_runnin
 add_test(NAME nodeos_irreversible_mode_lr_test COMMAND tests/nodeos_irreversible_mode_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_irreversible_mode_lr_test PROPERTY LABELS long_running_tests)
 
+add_test(NAME nodeos_chainbase_allocation_lr_test COMMAND tests/nodeos_chainbase_allocation_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST nodeos_chainbase_allocation_lr_test PROPERTY LABELS long_running_tests)
+
 add_test(NAME nodeos_startup_catchup_lr_test COMMAND tests/nodeos_startup_catchup.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_tests_properties(nodeos_startup_catchup_lr_test PROPERTIES TIMEOUT 3000)
 set_property(TEST nodeos_startup_catchup_lr_test PROPERTY LABELS long_running_tests)
diff --git a/tests/Node.py b/tests/Node.py
index 5bd75a61359..cc1b3956002 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1570,3 +1570,8 @@ def modifyBuiltinPFSubjRestrictions(self, nodeId, featureCodename, subjectiveRes
         protocolFeatureJson["subjective_restrictions"].update(subjectiveRestriction)
         with open(jsonPath, "w") as f:
             json.dump(protocolFeatureJson, f, indent=2)
+
+    # Require producer_api_plugin
+    def createSnapshot(self, featureDigests=[]):
+        param = { }
+        return self.processCurlCmd("producer", "create_snapshot", json.dumps(param))
diff --git a/tests/nodeos_chainbase_allocation_test.py b/tests/nodeos_chainbase_allocation_test.py
new file mode 100755
index 00000000000..84d69d88b0f
--- /dev/null
+++ b/tests/nodeos_chainbase_allocation_test.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+
+from testUtils import Utils, Account
+from Cluster import Cluster
+from TestHelper import TestHelper
+from WalletMgr import WalletMgr
+from Node import Node
+
+import signal
+import json
+import time
+import os
+import filecmp
+
+# Parse command line arguments
+args = TestHelper.parse_args({"-v","--clean-run","--dump-error-details","--leave-running","--keep-logs"})
+Utils.Debug = args.v
+killAll=args.clean_run
+dumpErrorDetails=args.dump_error_details
+dontKill=args.leave_running
+killEosInstances=not dontKill
+killWallet=not dontKill
+keepLogs=args.keep_logs
+
+walletMgr=WalletMgr(True)
+cluster=Cluster(walletd=True)
+cluster.setWalletMgr(walletMgr)
+
+testSuccessful = False
+try:
+    TestHelper.printSystemInfo("BEGIN")
+    cluster.killall(allInstances=killAll)
+    cluster.cleanup()
+
+    # The following is the list of chainbase objects that need to be verified:
+    # - account_object (bootstrap)
+    # - code_object (bootstrap)
+    # - generated_transaction_object
+    # - global_property_object
+    # - key_value_object (bootstrap)
+    # - protocol_state_object (bootstrap)
+    # - permission_object (bootstrap)
+    # The bootstrap process has created account_object and code_object (by uploading the bios contract),
+    # key_value_object (token creation), protocol_state_object (preactivation feature), and permission_object
+    # (automatically taken care by the automatically generated eosio account)
+    assert cluster.launch(
+        pnodes=1,
+        prodCount=1,
+        totalProducers=1,
+        totalNodes=2,
+        useBiosBootFile=False,
+        loadSystemContract=False,
+        specificExtraNodeosArgs={
+            1:"--read-mode irreversible --plugin eosio::producer_api_plugin"})
+
+    producerNodeId = 0
+    irrNodeId = 1
+    producerNode = cluster.getNode(producerNodeId)
+    irrNode = cluster.getNode(irrNodeId)
+
+    # Create delayed transaction to create "generated_transaction_object"
+    cmd = "create account -j eosio sample EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV\
+         EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV --delay-sec 600 -p eosio"
+    trans = producerNode.processCleosCmd(cmd, cmd, silentErrors=False)
+    assert trans
+
+    # Schedule a new producer to trigger new producer schedule for "global_property_object"
+    newProducerAcc = Account("newprod")
+    newProducerAcc.ownerPublicKey = "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
+    newProducerAcc.activePublicKey = "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"
+    producerNode.createAccount(newProducerAcc, cluster.eosioAccount)
+
+    setProdsStr = '{"schedule": ['
+    setProdsStr += '{"producer_name":' + newProducerAcc.name + ',"block_signing_key":' + newProducerAcc.activePublicKey + '}'
+    setProdsStr += ']}'
+    cmd="push action -j eosio setprods '{}' -p eosio".format(setProdsStr)
+    trans = producerNode.processCleosCmd(cmd, cmd, silentErrors=False)
+    assert trans
+    setProdsBlockNum = int(trans["processed"]["block_num"])
+
+    # Wait until the block where set prods is executed become irreversible so the producer schedule
+    def isSetProdsBlockNumIrr():
+            return producerNode.getIrreversibleBlockNum() >= setProdsBlockNum
+    Utils.waitForBool(isSetProdsBlockNumIrr, timeout=30, sleepTime=0.1)
+    # Once it is irreversible, immediately pause the producer so the promoted producer schedule is not cleared
+    producerNode.processCurlCmd("producer", "pause", "")
+
+    producerNode.kill(signal.SIGTERM)
+
+    # Create the snapshot and rename it to avoid name conflict later on
+    res = irrNode.createSnapshot()
+    beforeShutdownSnapshotPath = res["snapshot_name"]
+    snapshotPathWithoutExt, snapshotExt = os.path.splitext(beforeShutdownSnapshotPath)
+    os.rename(beforeShutdownSnapshotPath, snapshotPathWithoutExt + "_before_shutdown" + snapshotExt)
+
+    # Restart irr node and ensure the snapshot is still identical
+    irrNode.kill(signal.SIGTERM)
+    isRelaunchSuccess = irrNode.relaunch(irrNodeId, "", timeout=5, cachePopen=True)
+    assert isRelaunchSuccess, "Fail to relaunch"
+    res = irrNode.createSnapshot()
+    afterShutdownSnapshotPath = res["snapshot_name"]
+    assert filecmp.cmp(beforeShutdownSnapshotPath, afterShutdownSnapshotPath), "snapshot is not identical"
+
+    testSuccessful = True
+finally:
+    TestHelper.shutdown(cluster, walletMgr, testSuccessful, killEosInstances, killWallet, keepLogs, killAll, dumpErrorDetails)
+
+exitCode = 0 if testSuccessful else 1
+exit(exitCode)
diff --git a/tests/nodeos_irreversible_mode_test.py b/tests/nodeos_irreversible_mode_test.py
index dd7c836e98f..d6316360c70 100755
--- a/tests/nodeos_irreversible_mode_test.py
+++ b/tests/nodeos_irreversible_mode_test.py
@@ -8,7 +8,6 @@
 from TestHelper import TestHelper
 from testUtils import Account
 
-import urllib.request
 import re
 import os
 import time
@@ -46,10 +45,6 @@
 cluster=Cluster(walletd=True)
 cluster.setWalletMgr(walletMgr)
 
-def makeSnapshot(nodeId):
-  req = urllib.request.Request("http://127.0.0.1:{}/v1/producer/create_snapshot".format(8888 + int(nodeId)))
-  urllib.request.urlopen(req)
-
 def backupBlksDir(nodeId):
    dataDir = Utils.getNodeDataDir(nodeId)
    sourceDir = os.path.join(dataDir, "blocks")
@@ -353,7 +348,7 @@ def switchToSpecModeWithIrrModeSnapshot(nodeIdOfNodeToTest, nodeToTest):
          # Relaunch in irreversible mode and create the snapshot
          relaunchNode(nodeToTest, nodeIdOfNodeToTest, chainArg=" --read-mode irreversible")
          confirmHeadLibAndForkDbHeadOfIrrMode(nodeToTest)
-         makeSnapshot(nodeIdOfNodeToTest)
+         nodeToTest.createSnapshot()
          nodeToTest.kill(signal.SIGTERM)
 
          # Start from clean data dir, recover back up blocks, and then relaunch with irreversible snapshot
diff --git a/tests/nodeos_protocol_feature_test.py b/tests/nodeos_protocol_feature_test.py
index e42f934b2f4..98acc405d6b 100755
--- a/tests/nodeos_protocol_feature_test.py
+++ b/tests/nodeos_protocol_feature_test.py
@@ -33,7 +33,6 @@ def restartNode(node: Node, nodeId, chainArg=None, addOrSwapFlags=None):
 cluster=Cluster(walletd=True)
 cluster.setWalletMgr(walletMgr)
 
-# List to contain the test result message
 testSuccessful = False
 try:
     TestHelper.printSystemInfo("BEGIN")

From a38db0e23281ce0e6a6b736d15750077e6ebdd49 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@ii5.com>
Date: Fri, 10 May 2019 17:54:40 +0800
Subject: [PATCH 0343/1648] Only call init if system contract is loaded

---
 tests/Cluster.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/Cluster.py b/tests/Cluster.py
index fd71e34b19b..1ba4b64d749 100644
--- a/tests/Cluster.py
+++ b/tests/Cluster.py
@@ -1287,10 +1287,14 @@ def bootstrap(self, biosNode, totalNodes, prodCount, totalProducers, pfSetupPoli
         if not biosNode.waitForTransInBlock(transId):
             Utils.Print("ERROR: Failed to validate transaction %s got rolled into a block on server port %d." % (transId, biosNode.port))
             return None
-        action="init"
-        data="{\"version\":0,\"core\":\"4,%s\"}" % (CORE_SYMBOL)
-        opts="--permission %s@active" % (eosioAccount.name)
-        trans=biosNode.pushMessage(eosioAccount.name, action, data, opts)
+
+        # Only call init if the system contract is loaded
+        if loadSystemContract:
+            action="init"
+            data="{\"version\":0,\"core\":\"4,%s\"}" % (CORE_SYMBOL)
+            opts="--permission %s@active" % (eosioAccount.name)
+            trans=biosNode.pushMessage(eosioAccount.name, action, data, opts)
+
         Utils.Print("Cluster bootstrap done.")
 
         return biosNode

From ba847b84274e7da81f917604f059cdb0f2e581d2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 10 May 2019 08:49:20 -0500
Subject: [PATCH 0344/1648] Add specific log message for use by
 tests/nodeos_under_min_avail_ram.py

---
 plugins/chain_plugin/chain_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 79f16e46e8c..3d0bac826b9 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1254,6 +1254,7 @@ void chain_plugin::log_guard_exception(const chain::guard_exception&e ) const {
 void chain_plugin::handle_guard_exception(const chain::guard_exception& e) const {
    log_guard_exception(e);
 
+   elog("database chain::guard_exception, quiting..."); // log string searched for in: tests/nodeos_under_min_avail_ram.py
    // quit the app
    app().quit();
 }

From 8ffaa15d3e767efcdc4f06e82f6ecb9f272cfe2f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 10 May 2019 08:50:08 -0500
Subject: [PATCH 0345/1648] Modify log message searched for since debug output
 is no longer the default and exception #s can change

---
 tests/nodeos_under_min_avail_ram.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index cb0176cde3c..2c4b79b4e1b 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -205,8 +205,8 @@ def setName(self, num):
     for i in range(numNodes):
         f = open(Utils.getNodeDataDir(i) + "/stderr.txt")
         contents = f.read()
-        if contents.find("3060101 database_guard_exception") == -1:
-            errorExit("Node%d is expected to exit because of database_guard_exception, but was not." % (i))
+        if contents.find("database chain::guard_exception") == -1:
+            errorExit("Node%d is expected to exit because of database guard_exception, but was not." % (i))
 
     Print("all nodes exited with expected reason database_guard_exception")
 

From 43bb2207fd1ac568b8dfd005e864a80376a1a6d5 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 10 May 2019 16:50:36 -0400
Subject: [PATCH 0346/1648] more interim commits converting to extension

---
 libraries/chain/block_header.cpp              |   2 +-
 libraries/chain/block_header_state.cpp        | 114 +++++++--
 libraries/chain/block_state.cpp               |   9 +-
 libraries/chain/controller.cpp                |  50 ++--
 .../include/eosio/chain/block_header.hpp      |  18 +-
 .../eosio/chain/block_header_state.hpp        |  24 +-
 .../chain/include/eosio/chain/block_state.hpp |   3 +
 .../chain/include/eosio/chain/controller.hpp  |   8 +-
 .../eosio/chain/global_property_object.hpp    |   8 +-
 .../include/eosio/chain/producer_schedule.hpp | 231 ++++++++++++++----
 .../eosio/chain/protocol_feature_manager.hpp  |   3 +-
 libraries/chain/include/eosio/chain/types.hpp |   4 +-
 libraries/chain/wasm_interface.cpp            |  33 ++-
 libraries/fc                                  |   2 +-
 libraries/testing/tester.cpp                  |   2 +-
 plugins/chain_plugin/chain_plugin.cpp         |   2 +-
 .../state_history_serialization.hpp           |  14 +-
 .../state_history_plugin_abi.cpp              |  25 +-
 unittests/forked_tests.cpp                    |   2 +-
 unittests/producer_schedule_tests.cpp         |  64 ++---
 20 files changed, 442 insertions(+), 176 deletions(-)

diff --git a/libraries/chain/block_header.cpp b/libraries/chain/block_header.cpp
index 692089dc9e6..04b41456f77 100644
--- a/libraries/chain/block_header.cpp
+++ b/libraries/chain/block_header.cpp
@@ -28,7 +28,7 @@ namespace eosio { namespace chain {
       return result;
    }
 
-   vector<block_header_extensions> block_header::validate_and_extract_header_extensions()const {
+   flat_multimap<uint16_t, block_header_extensions> block_header::validate_and_extract_header_extensions()const {
       using block_header_extensions_t = block_header_extension_types::block_header_extensions_t;
       using decompose_t = block_header_extension_types::decompose_t;
 
diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index f7dd7aba656..29ac9d9e665 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -9,7 +9,7 @@ namespace eosio { namespace chain {
       return producer_to_last_produced.find(n) != producer_to_last_produced.end();
    }
 
-   producer_key block_header_state::get_scheduled_producer( block_timestamp_type t )const {
+   producer_keys block_header_state::get_scheduled_producer( block_timestamp_type t )const {
       auto index = t.slot % (active_schedule.producers.size() * config::producer_repetitions);
       index /= config::producer_repetitions;
       return active_schedule.producers[index];
@@ -57,7 +57,7 @@ namespace eosio { namespace chain {
       result.active_schedule_version                         = active_schedule.version;
       result.prev_activated_protocol_features                = activated_protocol_features;
 
-      result.block_signing_key                               = prokey.block_signing_key;
+      result.valid_block_signing_keys                        = prokey.block_signing_keys;
       result.producer                                        = prokey.producer_name;
 
       result.blockroot_merkle = blockroot_merkle;
@@ -167,8 +167,9 @@ namespace eosio { namespace chain {
    signed_block_header pending_block_header_state::make_block_header(
                                                       const checksum256_type& transaction_mroot,
                                                       const checksum256_type& action_mroot,
-                                                      optional<producer_schedule_type>&& new_producers,
-                                                      vector<digest_type>&& new_protocol_feature_activations
+                                                      std::optional<producer_authority_schedule>&& new_producers,
+                                                      vector<digest_type>&& new_protocol_feature_activations,
+                                                      const protocol_feature_set& pfs
    )const
    {
       signed_block_header h;
@@ -180,23 +181,48 @@ namespace eosio { namespace chain {
       h.transaction_mroot = transaction_mroot;
       h.action_mroot      = action_mroot;
       h.schedule_version  = active_schedule_version;
-      h.new_producers     = std::move(new_producers);
 
       if( new_protocol_feature_activations.size() > 0 ) {
          h.header_extensions.emplace_back(
-            protocol_feature_activation::extension_id(),
-            fc::raw::pack( protocol_feature_activation{ std::move(new_protocol_feature_activations) } )
+               protocol_feature_activation::extension_id(),
+               fc::raw::pack( protocol_feature_activation{ std::move(new_protocol_feature_activations) } )
          );
       }
 
+      if (new_producers) {
+         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
+         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+
+         if ( wtmsig_enabled ) {
+            // add the header extension to update the block schedule
+            h.header_extensions.emplace_back(
+                  producer_schedule_change_extension::extension_id(),
+                  fc::raw::pack( producer_schedule_change_extension( std::move(*new_producers) ) )
+            );
+         } else {
+            legacy::producer_schedule_type downgraded_producers;
+            downgraded_producers.version = new_producers->version;
+            for (const auto &p : new_producers->producers) {
+               p.visit([&downgraded_producers](const auto& auth){
+                  EOS_ASSERT(auth.keys.size() == 1 && auth.keys.front().weight == auth.threshold, producer_schedule_exception, "multisig block signing present before enabled!");
+                  downgraded_producers.producers.emplace_back(legacy::producer_key{auth.producer_name, auth.keys.front().key});
+               });
+            }
+            h.new_producers = downgraded_producers;
+         }
+      }
+
       return h;
    }
 
    block_header_state pending_block_header_state::_finish_next(
                                  const signed_block_header& h,
+                                 const protocol_feature_set& pfs,
                                  const std::function<void( block_timestamp_type,
                                                            const flat_set<digest_type>&,
                                                            const vector<digest_type>& )>& validator
+
    )&&
    {
       EOS_ASSERT( h.timestamp == timestamp, block_validate_exception, "timestamp mismatch" );
@@ -205,19 +231,48 @@ namespace eosio { namespace chain {
       EOS_ASSERT( h.producer == producer, wrong_producer, "wrong producer specified" );
       EOS_ASSERT( h.schedule_version == active_schedule_version, producer_schedule_exception, "schedule_version in signed block is corrupted" );
 
+      auto exts = h.validate_and_extract_header_extensions();
+
+      std::optional<producer_authority_schedule> maybe_new_producer_schedule;
+
       if( h.new_producers ) {
+         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
+         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+
+         EOS_ASSERT(!wtmsig_enabled, producer_schedule_exception, "Block header contains legacy producer schedule outdated by activation of WTMsig Block Signatures" );
+
          EOS_ASSERT( !was_pending_promoted, producer_schedule_exception, "cannot set pending producer schedule in the same block in which pending was promoted to active" );
-         EOS_ASSERT( h.new_producers->version == active_schedule.version + 1, producer_schedule_exception, "wrong producer schedule version specified" );
-         EOS_ASSERT( prev_pending_schedule.schedule.producers.size() == 0, producer_schedule_exception,
+
+         const auto& new_producers = *h.new_producers;
+         EOS_ASSERT( new_producers.version == active_schedule.version + 1, producer_schedule_exception, "wrong producer schedule version specified" );
+         EOS_ASSERT( prev_pending_schedule.schedule.producers.empty(), producer_schedule_exception,
                     "cannot set new pending producers until last pending is confirmed" );
+
+         maybe_new_producer_schedule.emplace(new_producers);
       }
 
-      protocol_feature_activation_set_ptr new_activated_protocol_features;
+      if ( exts.count(producer_schedule_change_extension::extension_id()) > 0 ) {
+         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
+         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
 
-      auto exts = h.validate_and_extract_header_extensions();
-      {
-         if( exts.size() > 0 ) {
-            const auto& new_protocol_features = exts.front().get<protocol_feature_activation>().protocol_features;
+         EOS_ASSERT(wtmsig_enabled, producer_schedule_exception, "Block header producer_schedule_change_extension before activation of WTMsig Block Signatures" );
+         EOS_ASSERT( !was_pending_promoted, producer_schedule_exception, "cannot set pending producer schedule in the same block in which pending was promoted to active" );
+
+         const auto& new_producer_schedule = exts.lower_bound(producer_schedule_change_extension::extension_id())->second.get<producer_schedule_change_extension>();
+
+         EOS_ASSERT( new_producer_schedule.version == active_schedule.version + 1, producer_schedule_exception, "wrong producer schedule version specified" );
+         EOS_ASSERT( prev_pending_schedule.schedule.producers.empty(), producer_schedule_exception,
+                     "cannot set new pending producers until last pending is confirmed" );
+
+         maybe_new_producer_schedule.emplace(new_producer_schedule);
+      }
+
+      protocol_feature_activation_set_ptr new_activated_protocol_features;
+      { // handle protocol_feature_activation
+         if( exts.count(protocol_feature_activation::extension_id() > 0) ) {
+            const auto& new_protocol_features = exts.lower_bound(protocol_feature_activation::extension_id())->second.get<protocol_feature_activation>().protocol_features;
             validator( timestamp, prev_activated_protocol_features->protocol_features, new_protocol_features );
 
             new_activated_protocol_features =   std::make_shared<protocol_feature_activation_set>(
@@ -238,9 +293,9 @@ namespace eosio { namespace chain {
 
       result.header_exts = std::move(exts);
 
-      if( h.new_producers ) {
-         result.pending_schedule.schedule            = *h.new_producers;
-         result.pending_schedule.schedule_hash       = digest_type::hash( *h.new_producers );
+      if( maybe_new_producer_schedule ) {
+         result.pending_schedule.schedule = std::move(*maybe_new_producer_schedule);
+         result.pending_schedule.schedule_hash = digest_type::hash(result.pending_schedule.schedule);
          result.pending_schedule.schedule_lib_num    = block_number;
       } else {
          if( was_pending_promoted ) {
@@ -259,17 +314,18 @@ namespace eosio { namespace chain {
 
    block_header_state pending_block_header_state::finish_next(
                                  const signed_block_header& h,
+                                 const protocol_feature_set& pfs,
                                  const std::function<void( block_timestamp_type,
                                                            const flat_set<digest_type>&,
                                                            const vector<digest_type>& )>& validator,
                                  bool skip_validate_signee
    )&&
    {
-      auto result = std::move(*this)._finish_next( h, validator );
+      auto result = std::move(*this)._finish_next( h, pfs, validator );
 
       // ASSUMPTION FROM controller_impl::apply_block = all untrusted blocks will have their signatures pre-validated here
       if( !skip_validate_signee ) {
-        result.verify_signee( result.signee() );
+        result.verify_signee( );
       }
 
       return result;
@@ -277,13 +333,14 @@ namespace eosio { namespace chain {
 
    block_header_state pending_block_header_state::finish_next(
                                  signed_block_header& h,
+                                 const protocol_feature_set& pfs,
                                  const std::function<void( block_timestamp_type,
                                                            const flat_set<digest_type>&,
                                                            const vector<digest_type>& )>& validator,
                                  const std::function<signature_type(const digest_type&)>& signer
    )&&
    {
-      auto result = std::move(*this)._finish_next( h, validator );
+      auto result = std::move(*this)._finish_next( h, pfs, validator );
       result.sign( signer );
       h.producer_signature = result.header.producer_signature;
       return result;
@@ -299,12 +356,13 @@ namespace eosio { namespace chain {
     */
    block_header_state block_header_state::next(
                         const signed_block_header& h,
+                        const protocol_feature_set& pfs,
                         const std::function<void( block_timestamp_type,
                                                   const flat_set<digest_type>&,
                                                   const vector<digest_type>& )>& validator,
                         bool skip_validate_signee )const
    {
-      return next( h.timestamp, h.confirmed ).finish_next( h, validator, skip_validate_signee );
+      return next( h.timestamp, h.confirmed ).finish_next( h, pfs, validator, skip_validate_signee );
    }
 
    digest_type   block_header_state::sig_digest()const {
@@ -315,7 +373,8 @@ namespace eosio { namespace chain {
    void block_header_state::sign( const std::function<signature_type(const digest_type&)>& signer ) {
       auto d = sig_digest();
       header.producer_signature = signer( d );
-      EOS_ASSERT( block_signing_key == fc::crypto::public_key( header.producer_signature, d ),
+
+      EOS_ASSERT( valid_block_signing_keys.find(signee()) != valid_block_signing_keys.end(),
                   wrong_signing_key, "block is signed with unexpected key" );
    }
 
@@ -323,10 +382,11 @@ namespace eosio { namespace chain {
       return fc::crypto::public_key( header.producer_signature, sig_digest(), true );
    }
 
-   void block_header_state::verify_signee( const public_key_type& signee )const {
-      EOS_ASSERT( block_signing_key == signee, wrong_signing_key,
+   void block_header_state::verify_signee( )const {
+      auto signing_key = signee();
+      EOS_ASSERT( valid_block_signing_keys.find(signing_key) != valid_block_signing_keys.end(), wrong_signing_key,
                   "block not signed by expected key",
-                  ("block_signing_key", block_signing_key)( "signee", signee ) );
+                  ("signing_key", signing_key)( "valid_keys", valid_block_signing_keys ) );
    }
 
    /**
@@ -335,10 +395,10 @@ namespace eosio { namespace chain {
    const vector<digest_type>& block_header_state::get_new_protocol_feature_activations()const {
       static const vector<digest_type> no_activations{};
 
-      if( header_exts.size() == 0 || !header_exts.front().contains<protocol_feature_activation>() )
+      if( header_exts.count(protocol_feature_activation::extension_id()) == 0 )
          return no_activations;
 
-      return header_exts.front().get<protocol_feature_activation>().protocol_features;
+      return header_exts.lower_bound(protocol_feature_activation::extension_id())->second.get<protocol_feature_activation>().protocol_features;
    }
 
 } } /// namespace eosio::chain
diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index 3a246038149..2c368a4b54e 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -5,24 +5,26 @@ namespace eosio { namespace chain {
 
    block_state::block_state( const block_header_state& prev,
                              signed_block_ptr b,
+                             const protocol_feature_set& pfs,
                              const std::function<void( block_timestamp_type,
                                                        const flat_set<digest_type>&,
                                                        const vector<digest_type>& )>& validator,
                              bool skip_validate_signee
                            )
-   :block_header_state( prev.next( *b, validator, skip_validate_signee ) )
+   :block_header_state( prev.next( *b, pfs, validator, skip_validate_signee ) )
    ,block( std::move(b) )
    {}
 
    block_state::block_state( pending_block_header_state&& cur,
                              signed_block_ptr&& b,
                              vector<transaction_metadata_ptr>&& trx_metas,
+                             const protocol_feature_set& pfs,
                              const std::function<void( block_timestamp_type,
                                                        const flat_set<digest_type>&,
                                                        const vector<digest_type>& )>& validator,
                              const std::function<signature_type(const digest_type&)>& signer
                            )
-   :block_header_state( std::move(cur).finish_next( *b, validator, signer ) )
+   :block_header_state( std::move(cur).finish_next( *b, pfs, validator, signer ) )
    ,block( std::move(b) )
    ,trxs( std::move(trx_metas) )
    {}
@@ -31,12 +33,13 @@ namespace eosio { namespace chain {
    block_state::block_state( pending_block_header_state&& cur,
                              const signed_block_ptr& b,
                              vector<transaction_metadata_ptr>&& trx_metas,
+                             const protocol_feature_set& pfs,
                              const std::function<void( block_timestamp_type,
                                                        const flat_set<digest_type>&,
                                                        const vector<digest_type>& )>& validator,
                              bool skip_validate_signee
                            )
-   :block_header_state( std::move(cur).finish_next( *b, validator, skip_validate_signee ) )
+   :block_header_state( std::move(cur).finish_next( *b, pfs, validator, skip_validate_signee ) )
    ,block( b )
    ,trxs( std::move(trx_metas) )
    {}
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 3b211d8bd9e..22c31ad18a7 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -111,13 +111,13 @@ struct building_block {
    ,_new_protocol_feature_activations( new_protocol_feature_activations )
    {}
 
-   pending_block_header_state         _pending_block_header_state;
-   optional<producer_schedule_type>   _new_pending_producer_schedule;
-   vector<digest_type>                _new_protocol_feature_activations;
-   size_t                             _num_new_protocol_features_that_have_activated = 0;
-   vector<transaction_metadata_ptr>   _pending_trx_metas;
-   vector<transaction_receipt>        _pending_trx_receipts;
-   vector<action_receipt>             _actions;
+   pending_block_header_state            _pending_block_header_state;
+   optional<producer_authority_schedule> _new_pending_producer_schedule;
+   vector<digest_type>                   _new_protocol_feature_activations;
+   size_t                                _num_new_protocol_features_that_have_activated = 0;
+   vector<transaction_metadata_ptr>      _pending_trx_metas;
+   vector<transaction_receipt>           _pending_trx_receipts;
+   vector<action_receipt>                _actions;
 };
 
 struct assembled_block {
@@ -427,7 +427,7 @@ struct controller_impl {
     */
    void initialize_blockchain_state() {
       wlog( "Initializing new blockchain with genesis state" );
-      producer_schedule_type initial_schedule{ 0, {{config::system_account_name, conf.genesis.initial_key}} };
+      producer_authority_schedule initial_schedule{ 0, {producer_authority_v0{config::system_account_name, 1, {{conf.genesis.initial_key, 1}} } } };
 
       block_header_state genheader;
       genheader.active_schedule                = initial_schedule;
@@ -1474,7 +1474,7 @@ struct controller_impl {
                ilog( "promoting proposed schedule (set in block ${proposed_num}) to pending; current block: ${n} lib: ${lib} schedule: ${schedule} ",
                      ("proposed_num", *gpo.proposed_schedule_block_num)("n", pbhs.block_num)
                      ("lib", pbhs.dpos_irreversible_blocknum)
-                     ("schedule", static_cast<producer_schedule_type>(gpo.proposed_schedule) ) );
+                     ("schedule", static_cast<producer_authority_schedule>(gpo.proposed_schedule) ) );
             }
 
             EOS_ASSERT( gpo.proposed_schedule.version == pbhs.active_schedule_version + 1,
@@ -2602,13 +2602,13 @@ account_name controller::pending_block_producer()const {
    return my->pending->get_pending_block_header_state().producer;
 }
 
-public_key_type controller::pending_block_signing_key()const {
+flat_set<public_key_type> controller::pending_block_signing_keys()const {
    EOS_ASSERT( my->pending, block_validate_exception, "no pending block" );
 
    if( my->pending->_block_stage.contains<completed_block>() )
-      return my->pending->_block_stage.get<completed_block>()._block_state->block_signing_key;
+      return my->pending->_block_stage.get<completed_block>()._block_state->block_signing_keys;
 
-   return my->pending->get_pending_block_header_state().block_signing_key;
+   return my->pending->get_pending_block_header_state().block_signing_keys;
 }
 
 optional<block_id_type> controller::pending_producer_block_id()const {
@@ -2724,7 +2724,7 @@ void controller::pop_block() {
    my->pop_block();
 }
 
-int64_t controller::set_proposed_producers( vector<producer_key> producers ) {
+int64_t controller::set_proposed_producers( vector<producer_authority> producers ) {
    const auto& gpo = get_global_properties();
    auto cur_block_num = head_block_num() + 1;
 
@@ -2741,7 +2741,7 @@ int64_t controller::set_proposed_producers( vector<producer_key> producers ) {
          return -1; // the proposed producer schedule does not change
    }
 
-   producer_schedule_type sch;
+   producer_authority_schedule sch;
 
    decltype(sch.producers.cend()) end;
    decltype(end)                  begin;
@@ -2775,7 +2775,7 @@ int64_t controller::set_proposed_producers( vector<producer_key> producers ) {
    return version;
 }
 
-const producer_schedule_type&    controller::active_producers()const {
+const producer_authority_schedule&    controller::active_producers()const {
    if( !(my->pending) )
       return  my->head->active_schedule;
 
@@ -2785,7 +2785,7 @@ const producer_schedule_type&    controller::active_producers()const {
    return my->pending->get_pending_block_header_state().active_schedule;
 }
 
-const producer_schedule_type&    controller::pending_producers()const {
+const producer_authority_schedule&    controller::pending_producers()const {
    if( !(my->pending) )
       return  my->head->pending_schedule.schedule;
 
@@ -2793,9 +2793,15 @@ const producer_schedule_type&    controller::pending_producers()const {
       return my->pending->_block_stage.get<completed_block>()._block_state->pending_schedule.schedule;
 
    if( my->pending->_block_stage.contains<assembled_block>() ) {
-      const auto& np = my->pending->_block_stage.get<assembled_block>()._unsigned_block->new_producers;
-      if( np )
-         return *np;
+      if (is_builtin_activated(builtin_protocol_feature_t::wtmsig_block_signatures)) {
+         auto exts = my->pending->_block_stage.get<assembled_block>()._unsigned_block->validate_and_extract_header_extensions();
+         if (exts.count(producer_schedule_change_extension::extension_id()))
+            return exts.lower_bound(producer_schedule_change_extension::extension_id())->second.get<producer_schedule_change_extension>();
+      } else {
+         const auto& np = my->pending->_block_stage.get<assembled_block>()._unsigned_block->new_producers;
+         if( np )
+            return *np;
+      }
    }
 
    const auto& bb = my->pending->_block_stage.get<building_block>();
@@ -2806,12 +2812,12 @@ const producer_schedule_type&    controller::pending_producers()const {
    return bb._pending_block_header_state.prev_pending_schedule.schedule;
 }
 
-optional<producer_schedule_type> controller::proposed_producers()const {
+optional<producer_authority_schedule> controller::proposed_producers()const {
    const auto& gpo = get_global_properties();
    if( !gpo.proposed_schedule_block_num.valid() )
-      return optional<producer_schedule_type>();
+      return optional<producer_authority_schedule>();
 
-   return gpo.proposed_schedule;
+   return (producer_authority_schedule)gpo.proposed_schedule;
 }
 
 bool controller::light_validation_allowed(bool replay_opts_disabled_by_policy) const {
diff --git a/libraries/chain/include/eosio/chain/block_header.hpp b/libraries/chain/include/eosio/chain/block_header.hpp
index fc751826d95..bc622b38fb6 100644
--- a/libraries/chain/include/eosio/chain/block_header.hpp
+++ b/libraries/chain/include/eosio/chain/block_header.hpp
@@ -16,7 +16,8 @@ namespace eosio { namespace chain {
    }
 
    using block_header_extension_types = detail::block_header_extension_types<
-      protocol_feature_activation
+      protocol_feature_activation,
+      producer_schedule_change_extension
    >;
 
    using block_header_extensions = block_header_extension_types::block_header_extensions_t;
@@ -42,13 +43,20 @@ namespace eosio { namespace chain {
       checksum256_type                 transaction_mroot; /// mroot of cycles_summary
       checksum256_type                 action_mroot; /// mroot of all delivered action receipts
 
-
-      /** The producer schedule version that should validate this block, this is used to
+      /**
+       * LEGACY SUPPORT - After enabling the wtmsig-blocks extension this field is deprecated and must be empty
+       *
+       * Prior to that activation this carries:
+       *
+       * The producer schedule version that should validate this block, this is used to
        * indicate that the prior block which included new_producers->version has been marked
        * irreversible and that it the new producer schedule takes effect this block.
        */
+
+      using new_producers_type = optional<legacy::producer_schedule_type>;
+
       uint32_t                          schedule_version = 0;
-      optional<producer_schedule_type>  new_producers;
+      new_producers_type                new_producers;
       extensions_type                   header_extensions;
 
 
@@ -59,7 +67,7 @@ namespace eosio { namespace chain {
       uint32_t          block_num() const { return num_from_id(previous) + 1; }
       static uint32_t   num_from_id(const block_id_type& id);
 
-      vector<block_header_extensions> validate_and_extract_header_extensions()const;
+      flat_multimap<uint16_t, block_header_extensions> validate_and_extract_header_extensions()const;
    };
 
 
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 41e19253138..8a6eb08d653 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <eosio/chain/block_header.hpp>
 #include <eosio/chain/incremental_merkle.hpp>
+#include <eosio/chain/protocol_feature_manager.hpp>
 #include <future>
 
 namespace eosio { namespace chain {
@@ -12,18 +13,18 @@ namespace detail {
       uint32_t                          block_num = 0;
       uint32_t                          dpos_proposed_irreversible_blocknum = 0;
       uint32_t                          dpos_irreversible_blocknum = 0;
-      producer_schedule_type            active_schedule;
+      producer_authority_schedule       active_schedule;
       incremental_merkle                blockroot_merkle;
       flat_map<account_name,uint32_t>   producer_to_last_produced;
       flat_map<account_name,uint32_t>   producer_to_last_implied_irb;
-      public_key_type                   block_signing_key;
+      flat_set<public_key_type>         valid_block_signing_keys;
       vector<uint8_t>                   confirm_count;
    };
 
    struct schedule_info {
       uint32_t                          schedule_lib_num = 0; /// last irr block num
       digest_type                       schedule_hash;
-      producer_schedule_type            schedule;
+      producer_authority_schedule       schedule;
    };
 }
 
@@ -39,16 +40,19 @@ struct pending_block_header_state : public detail::block_header_state_common {
 
    signed_block_header make_block_header( const checksum256_type& transaction_mroot,
                                           const checksum256_type& action_mroot,
-                                          optional<producer_schedule_type>&& new_producers,
-                                          vector<digest_type>&& new_protocol_feature_activations )const;
+                                          std::optional<producer_authority_schedule>&& new_producers,
+                                          vector<digest_type>&& new_protocol_feature_activations,
+                                          const protocol_feature_set& pfs)const;
 
    block_header_state  finish_next( const signed_block_header& h,
+                                    const protocol_feature_set& pfs,
                                     const std::function<void( block_timestamp_type,
                                                               const flat_set<digest_type>&,
                                                               const vector<digest_type>& )>& validator,
                                     bool skip_validate_signee = false )&&;
 
    block_header_state  finish_next( signed_block_header& h,
+                                    const protocol_feature_set& pfs,
                                     const std::function<void( block_timestamp_type,
                                                               const flat_set<digest_type>&,
                                                               const vector<digest_type>& )>& validator,
@@ -56,6 +60,7 @@ struct pending_block_header_state : public detail::block_header_state_common {
 
 protected:
    block_header_state  _finish_next( const signed_block_header& h,
+                                     const protocol_feature_set& pfs,
                                      const std::function<void( block_timestamp_type,
                                                                const flat_set<digest_type>&,
                                                                const vector<digest_type>& )>& validator )&&;
@@ -74,7 +79,7 @@ struct block_header_state : public detail::block_header_state_common {
 
    /// this data is redundant with the data stored in header, but it acts as a cache that avoids
    /// duplication of work
-   vector<block_header_extensions>      header_exts;
+   flat_multimap<uint16_t, block_header_extensions> header_exts;
 
    block_header_state() = default;
 
@@ -85,6 +90,7 @@ struct block_header_state : public detail::block_header_state_common {
    pending_block_header_state  next( block_timestamp_type when, uint16_t num_prev_blocks_to_confirm )const;
 
    block_header_state   next( const signed_block_header& h,
+                              const protocol_feature_set& pfs,
                               const std::function<void( block_timestamp_type,
                                                         const flat_set<digest_type>&,
                                                         const vector<digest_type>& )>& validator,
@@ -94,12 +100,12 @@ struct block_header_state : public detail::block_header_state_common {
    uint32_t             calc_dpos_last_irreversible( account_name producer_of_next_block )const;
    bool                 is_active_producer( account_name n )const;
 
-   producer_key         get_scheduled_producer( block_timestamp_type t )const;
+   producer_authority   get_scheduled_producer( block_timestamp_type t )const;
    const block_id_type& prev()const { return header.previous; }
    digest_type          sig_digest()const;
    void                 sign( const std::function<signature_type(const digest_type&)>& signer );
    public_key_type      signee()const;
-   void                 verify_signee(const public_key_type& signee)const;
+   void                 verify_signee()const;
 
    const vector<digest_type>& get_new_protocol_feature_activations()const;
 };
@@ -116,7 +122,7 @@ FC_REFLECT( eosio::chain::detail::block_header_state_common,
             (blockroot_merkle)
             (producer_to_last_produced)
             (producer_to_last_implied_irb)
-            (block_signing_key)
+            (valid_block_signing_keys)
             (confirm_count)
 )
 
diff --git a/libraries/chain/include/eosio/chain/block_state.hpp b/libraries/chain/include/eosio/chain/block_state.hpp
index e91161cf716..e31337d42ec 100644
--- a/libraries/chain/include/eosio/chain/block_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_state.hpp
@@ -14,6 +14,7 @@ namespace eosio { namespace chain {
    struct block_state : public block_header_state {
       block_state( const block_header_state& prev,
                    signed_block_ptr b,
+                   const protocol_feature_set& pfs,
                    const std::function<void( block_timestamp_type,
                                              const flat_set<digest_type>&,
                                              const vector<digest_type>& )>& validator,
@@ -23,6 +24,7 @@ namespace eosio { namespace chain {
       block_state( pending_block_header_state&& cur,
                    signed_block_ptr&& b, // unsigned block
                    vector<transaction_metadata_ptr>&& trx_metas,
+                   const protocol_feature_set& pfs,
                    const std::function<void( block_timestamp_type,
                                              const flat_set<digest_type>&,
                                              const vector<digest_type>& )>& validator,
@@ -32,6 +34,7 @@ namespace eosio { namespace chain {
       block_state( pending_block_header_state&& cur,
                    const signed_block_ptr& b, // signed block
                    vector<transaction_metadata_ptr>&& trx_metas,
+                   const protocol_feature_set& pfs,
                    const std::function<void( block_timestamp_type,
                                              const flat_set<digest_type>&,
                                              const vector<digest_type>& )>& validator,
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index c7702d09414..daa8be2c313 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -212,9 +212,9 @@ namespace eosio { namespace chain {
 
          const vector<transaction_receipt>& get_pending_trx_receipts()const;
 
-         const producer_schedule_type&    active_producers()const;
-         const producer_schedule_type&    pending_producers()const;
-         optional<producer_schedule_type> proposed_producers()const;
+         const producer_authority_schedule&    active_producers()const;
+         const producer_authority_schedule&    pending_producers()const;
+         optional<producer_authority_schedule> proposed_producers()const;
 
          uint32_t last_irreversible_block_num() const;
          block_id_type last_irreversible_block_id() const;
@@ -255,7 +255,7 @@ namespace eosio { namespace chain {
 
          bool is_known_unexpired_transaction( const transaction_id_type& id) const;
 
-         int64_t set_proposed_producers( vector<producer_key> producers );
+         int64_t set_proposed_producers( vector<producer_keys> producers );
 
          bool light_validation_allowed(bool replay_opts_disabled_by_policy) const;
          bool skip_auth_check()const;
diff --git a/libraries/chain/include/eosio/chain/global_property_object.hpp b/libraries/chain/include/eosio/chain/global_property_object.hpp
index 14ed594c0bd..a8d0bac9cb1 100644
--- a/libraries/chain/include/eosio/chain/global_property_object.hpp
+++ b/libraries/chain/include/eosio/chain/global_property_object.hpp
@@ -27,10 +27,10 @@ namespace eosio { namespace chain {
       OBJECT_CTOR(global_property_object, (proposed_schedule))
 
    public:
-      id_type                        id;
-      optional<block_num_type>       proposed_schedule_block_num;
-      shared_producer_schedule_type  proposed_schedule;
-      chain_config                   configuration;
+      id_type                             id;
+      optional<block_num_type>            proposed_schedule_block_num;
+      shared_producer_authority_schedule  proposed_schedule;
+      chain_config                        configuration;
    };
 
 
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index 09528d7b809..d22a0e657e1 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -5,54 +5,203 @@
 
 namespace eosio { namespace chain {
 
-   /**
-    *  Used as part of the producer_schedule_type, mapps the producer name to their key.
-    */
-   struct producer_key {
-      account_name      producer_name;
-      public_key_type   block_signing_key;
+   namespace legacy {
+      /**
+       *  Used as part of the producer_schedule_type, maps the producer name to their key.
+       */
+      struct producer_key {
+         account_name      producer_name;
+         public_key_type   block_signing_key;
+
+         friend bool operator == ( const producer_key& lhs, const producer_key& rhs ) {
+            return tie( lhs.producer_name, lhs.block_signing_key ) == tie( rhs.producer_name, rhs.block_signing_key );
+         }
+         friend bool operator != ( const producer_key& lhs, const producer_key& rhs ) {
+            return tie( lhs.producer_name, lhs.block_signing_key ) != tie( rhs.producer_name, rhs.block_signing_key );
+         }
+      };
+
+      /**
+       *  Defines both the order, account name, and signing keys of the active set of producers.
+       */
+      struct producer_schedule_type {
+         uint32_t                                       version = 0; ///< sequentially incrementing version number
+         vector<producer_key>                           producers;
+
+         friend bool operator == ( const producer_schedule_type& a, const producer_schedule_type& b )
+         {
+            if( a.version != b.version ) return false;
+            if ( a.producers.size() != b.producers.size() ) return false;
+            for( uint32_t i = 0; i < a.producers.size(); ++i )
+               if( a.producers[i] != b.producers[i] ) return false;
+            return true;
+         }
+
+         friend bool operator != ( const producer_schedule_type& a, const producer_schedule_type& b )
+         {
+            return !(a==b);
+         }
+      };
+   }
+
+   struct producer_authority_v0 {
+      account_name                producer_name;
+      uint32_t                    threshold;
+      vector<key_weight>          keys;
+
+      friend bool operator == ( const producer_authority_v0& lhs, const producer_authority_v0& rhs ) {
+         return tie( lhs.producer_name, lhs.keys ) == tie( rhs.producer_name, rhs.keys );
+      }
+      friend bool operator != ( const producer_authority_v0& lhs, const producer_authority_v0& rhs ) {
+         return tie( lhs.producer_name, lhs.keys ) != tie( rhs.producer_name, rhs.keys );
+      }
+   };
+
+   using producer_authority = static_variant<producer_authority_v0>;
+
+   struct shared_producer_authority_v0 {
+      shared_producer_authority_v0( chainbase::allocator<char> alloc )
+      :keys(alloc){}
+
+      account_name                producer_name;
+      uint32_t                    threshold;
+      shared_vector<key_weight>   keys;
+
+      friend bool operator == ( const shared_producer_authority_v0& lhs, const shared_producer_authority_v0& rhs ) {
+         return tie( lhs.producer_name, lhs.keys ) == tie( rhs.producer_name, rhs.keys );
+      }
+      friend bool operator != ( const shared_producer_authority_v0& lhs, const shared_producer_authority_v0& rhs ) {
+         return tie( lhs.producer_name, lhs.keys ) != tie( rhs.producer_name, rhs.keys );
+      }
+   };
+
+   namespace detail {
+      template<typename T>
+      struct shared_converter;
+
+      template<>
+      struct shared_converter<producer_authority_v0> {
+         static shared_producer_authority_v0 convert (chainbase::allocator<char> alloc, const producer_authority_v0& src) {
+            shared_producer_authority_v0 result(alloc);
+            result.producer_name = src.producer_name;
+            result.threshold = src.threshold;
+            result.keys.clear();
+            result.keys.reserve(src.keys.size());
+            for (const auto& k: src.keys) {
+               result.keys.push_back(k);
+            }
+
+            return result;
+         }
+      };
+
+      template<>
+      struct shared_converter<shared_producer_authority_v0> {
+         static producer_authority_v0 convert (const shared_producer_authority_v0& src) {
+            producer_authority_v0 result;
+            result.producer_name = src.producer_name;
+            result.threshold = src.threshold;
+            result.keys.reserve(src.keys.size());
+            for (const auto& k: src.keys) {
+               result.keys.push_back(k);
+            }
+
+            return result;
+         }
+      };
 
-      friend bool operator == ( const producer_key& lhs, const producer_key& rhs ) {
-         return tie( lhs.producer_name, lhs.block_signing_key ) == tie( rhs.producer_name, rhs.block_signing_key );
+      template<typename T>
+      auto shared_convert( chainbase::allocator<char> alloc, const T& src ) {
+         return shared_converter<std::decay_t<decltype(src)>>::convert(alloc, src);
       }
-      friend bool operator != ( const producer_key& lhs, const producer_key& rhs ) {
-         return tie( lhs.producer_name, lhs.block_signing_key ) != tie( rhs.producer_name, rhs.block_signing_key );
+
+      template<typename T>
+      auto shared_convert( const T& src ) {
+         return shared_converter<std::decay_t<decltype(src)>>::convert(src);
+      }
+   }
+
+   using shared_producer_authority = static_variant<shared_producer_authority_v0>;
+
+   struct producer_authority_schedule {
+      producer_authority_schedule() = default;
+
+      /**
+       * Up-convert a legacy producer schedule
+       */
+      explicit producer_authority_schedule( const legacy::producer_schedule_type& old )
+      :version(old.version)
+      {
+         producers.reserve( old.producers.size() );
+         for( const auto& p : old.producers )
+            producers.emplace_back(producer_authority_v0{ p.producer_name, 1, {{p.block_signing_key, 1}}});
+      }
+
+      uint32_t                                       version = 0; ///< sequentially incrementing version number
+      vector<producer_authority>                     producers;
+
+      friend bool operator == ( const producer_authority_schedule& a, const producer_authority_schedule& b )
+      {
+         if( a.version != b.version ) return false;
+         if ( a.producers.size() != b.producers.size() ) return false;
+         for( uint32_t i = 0; i < a.producers.size(); ++i )
+            if( ! (a.producers[i] == b.producers[i]) ) return false;
+         return true;
+      }
+
+      friend bool operator != ( const producer_authority_schedule& a, const producer_authority_schedule& b )
+      {
+         return !(a==b);
       }
    };
+
    /**
-    *  Defines both the order, account name, and signing keys of the active set of producers.
+    * Block Header Extension Compatibility
     */
-   struct producer_schedule_type {
-      uint32_t                                       version = 0; ///< sequentially incrementing version number
-      vector<producer_key>                           producers;
+   struct producer_schedule_change_extension : producer_authority_schedule, fc::reflect_init {
 
-      public_key_type get_producer_key( account_name p )const {
-         for( const auto& i : producers )
-            if( i.producer_name == p ) 
-               return i.block_signing_key;
-         return public_key_type();
+      static constexpr uint16_t extension_id() { return 1; }
+      static constexpr bool     enforce_unique() { return true; }
+      void reflector_init() {
+         static_assert( fc::raw::has_feature_reflector_init_on_unpacked_reflected_types, "producer_schedule_extension expects FC to support reflector_init" );
       }
+
+      producer_schedule_change_extension() = default;
+      producer_schedule_change_extension(const producer_schedule_change_extension&) = default;
+      producer_schedule_change_extension( producer_schedule_change_extension&& ) = default;
+
+      producer_schedule_change_extension( producer_authority_schedule&& sched )
+      :producer_authority_schedule(sched) {}
    };
 
-   struct shared_producer_schedule_type {
-      shared_producer_schedule_type( chainbase::allocator<char> alloc )
+
+
+   struct shared_producer_authority_schedule {
+      shared_producer_authority_schedule( chainbase::allocator<char> alloc )
       :producers(alloc){}
 
-      shared_producer_schedule_type& operator=( const producer_schedule_type& a ) {
+      shared_producer_authority_schedule& operator=( const producer_authority_schedule& a ) {
          version = a.version;
          producers.clear();
          producers.reserve( a.producers.size() );
-         for( const auto& p : a.producers )
-            producers.push_back(p);
+         for( const auto& p : a.producers ) {
+            p.visit([this](const auto& src){
+               producers.emplace_back(detail::shared_convert(producers.get_allocator(), src));
+            });
+         }
          return *this;
       }
 
-      operator producer_schedule_type()const {
-         producer_schedule_type result;
+      explicit operator producer_authority_schedule()const {
+         producer_authority_schedule result;
          result.version = version;
          result.producers.reserve(producers.size());
-         for( const auto& p : producers )
-            result.producers.push_back(p);
+         for( const auto& p : producers ) {
+            p.visit([&result](const auto& src){
+               result.producers.emplace_back(detail::shared_convert(src));
+            });
+         }
+
          return result;
       }
 
@@ -62,26 +211,16 @@ namespace eosio { namespace chain {
       }
 
       uint32_t                                       version = 0; ///< sequentially incrementing version number
-      shared_vector<producer_key>                    producers;
+      shared_vector<shared_producer_authority>       producers;
    };
 
 
-   inline bool operator == ( const producer_schedule_type& a, const producer_schedule_type& b )
-   {
-      if( a.version != b.version ) return false;
-      if ( a.producers.size() != b.producers.size() ) return false;
-      for( uint32_t i = 0; i < a.producers.size(); ++i )
-         if( a.producers[i] != b.producers[i] ) return false;
-      return true;
-   }
-   inline bool operator != ( const producer_schedule_type& a, const producer_schedule_type& b )
-   {
-      return !(a==b);
-   }
-
-
 } } /// eosio::chain
 
-FC_REFLECT( eosio::chain::producer_key, (producer_name)(block_signing_key) )
-FC_REFLECT( eosio::chain::producer_schedule_type, (version)(producers) )
-FC_REFLECT( eosio::chain::shared_producer_schedule_type, (version)(producers) )
+FC_REFLECT( eosio::chain::legacy::producer_key, (producer_name)(block_signing_key) )
+FC_REFLECT( eosio::chain::legacy::producer_schedule_type, (version)(producers) )
+FC_REFLECT( eosio::chain::producer_authority_v0, (producer_name)(threshold)(keys) )
+FC_REFLECT( eosio::chain::producer_authority_schedule, (version)(producers) )
+FC_REFLECT_DERIVED( eosio::chain::producer_schedule_change_extension, (eosio::chain::producer_authority_schedule), )
+FC_REFLECT( eosio::chain::shared_producer_authority_schedule, (version)(producers) )
+
diff --git a/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp b/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
index c2f0140433f..36189fcaa8e 100644
--- a/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
+++ b/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
@@ -24,7 +24,8 @@ enum class builtin_protocol_feature_t : uint32_t {
    only_bill_first_authorizer,
    forward_setcode,
    get_sender,
-   ram_restrictions
+   ram_restrictions,
+   wtmsig_block_signatures,
 };
 
 struct protocol_feature_subjective_restrictions {
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index d6323fbd23d..2063e7ce3e0 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -77,6 +77,7 @@ namespace eosio { namespace chain {
    using                               fc::time_point;
    using                               fc::safe;
    using                               fc::flat_map;
+   using                               fc::flat_multimap;
    using                               fc::flat_set;
    using                               fc::static_variant;
    using                               fc::ecc::range_proof_type;
@@ -87,8 +88,6 @@ namespace eosio { namespace chain {
    using private_key_type = fc::crypto::private_key;
    using signature_type   = fc::crypto::signature;
 
-   struct void_t{};
-
    using chainbase::allocator;
    using shared_string = boost::interprocess::basic_string<char, std::char_traits<char>, allocator<char>>;
    template<typename T>
@@ -374,4 +373,3 @@ namespace eosio { namespace chain {
 
 } }  // eosio::chain
 
-FC_REFLECT( eosio::chain::void_t, )
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 6ad6a9cb131..48b33764f8e 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -177,24 +177,43 @@ class privileged_api : public context_aware_api {
 
       int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, size_t datalen) {
          datastream<const char*> ds( packed_producer_schedule, datalen );
-         vector<producer_key> producers;
-         fc::raw::unpack(ds, producers);
+         vector<producer_keys> producers;
+
+         if ( context.control.is_builtin_activated( builtin_protocol_feature_t::one_of_n_block_signatures )) {
+            fc::raw::unpack(ds, producers);
+
+         } else {
+            vector<producer_key> old_version;
+            fc::raw::unpack(ds, old_version);
+
+            /*
+             * Up-convert the producers
+             */
+            for ( const auto& p: old_version ) {
+               producers.emplace_back(producer_keys{ p.producer_name, {p.block_signing_key}});
+            }
+         }
+
+         EOS_ASSERT(producers.size() <= config::max_producers, wasm_execution_error, "Producer schedule exceeds the maximum producer count for this chain");
          EOS_ASSERT( producers.size() > 0
-                        || !context.control.is_builtin_activated(
-                              builtin_protocol_feature_t::disallow_empty_producer_schedule
-                           ),
+                     || !context.control.is_builtin_activated( builtin_protocol_feature_t::disallow_empty_producer_schedule ),
                      wasm_execution_error,
                      "Producer schedule cannot be empty"
          );
-         EOS_ASSERT(producers.size() <= config::max_producers, wasm_execution_error, "Producer schedule exceeds the maximum producer count for this chain");
+
          // check that producers are unique
          std::set<account_name> unique_producers;
          for (const auto& p: producers) {
             EOS_ASSERT( context.is_account(p.producer_name), wasm_execution_error, "producer schedule includes a nonexisting account" );
-            EOS_ASSERT( p.block_signing_key.valid(), wasm_execution_error, "producer schedule includes an invalid key" );
+
+            for (const auto& k: p.block_signing_keys) {
+               EOS_ASSERT( k.valid(), wasm_execution_error, "producer schedule includes an invalid key" );
+            }
+
             unique_producers.insert(p.producer_name);
          }
          EOS_ASSERT( producers.size() == unique_producers.size(), wasm_execution_error, "duplicate producer name in producer schedule" );
+
          return context.control.set_proposed_producers( std::move(producers) );
       }
 
diff --git a/libraries/fc b/libraries/fc
index fcc952b616e..9a008f71c05 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit fcc952b616e5968a5b0898e051e3f56fe3a43245
+Subproject commit 9a008f71c05b6f4105fb6340f13a8344d1335a5d
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index a9a442d8380..7bc83662dc3 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -310,7 +310,7 @@ namespace eosio { namespace testing {
       auto producer = control->head_block_state()->get_scheduled_producer( control->pending_block_time() );
       private_key_type priv_key;
       // Check if signing private key exist in the list
-      auto private_key_itr = block_signing_private_keys.find( producer.block_signing_key );
+      auto private_key_itr = block_signing_private_keys.find( *producer.block_signing_keys.begin() );
       if( private_key_itr == block_signing_private_keys.end() ) {
          // If it's not found, default to active k1 key
          priv_key = get_private_key( producer.producer_name, "active" );
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 6b0247afd0d..c093124ef90 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1705,7 +1705,7 @@ read_only::get_producers_result read_only::get_producers( const read_only::get_p
    for (auto p : db.active_producers().producers) {
       fc::variant row = fc::mutable_variant_object()
          ("owner", p.producer_name)
-         ("producer_key", p.block_signing_key)
+         ("producer_key", p.block_signing_keys)
          ("url", "")
          ("total_votes", 0.0f);
 
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index e11b7e5f4f7..40b287e77af 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -242,18 +242,20 @@ datastream<ST>& operator<<(
 }
 
 template <typename ST>
-datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::producer_key>& obj) {
+datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::shared_producer_authority_v0>& obj) {
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.producer_name.value));
-   fc::raw::pack(ds, as_type<eosio::chain::public_key_type>(obj.obj.block_signing_key));
+   fc::raw::pack(ds, as_type<uint32_t>(obj.obj.threshold));
+   history_serialize_container(ds, obj.db,
+                               as_type<eosio::chain::shared_vector<eosio::chain::key_weight>>(obj.obj.keys));
    return ds;
 }
 
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>&                                                            ds,
-                           const history_serial_wrapper<eosio::chain::shared_producer_schedule_type>& obj) {
+                           const history_serial_wrapper<eosio::chain::shared_producer_authority_schedule>& obj) {
    fc::raw::pack(ds, as_type<uint32_t>(obj.obj.version));
    history_serialize_container(ds, obj.db,
-                               as_type<eosio::chain::shared_vector<eosio::chain::producer_key>>(obj.obj.producers));
+                               as_type<eosio::chain::shared_vector<eosio::chain::shared_producer_authority>>(obj.obj.producers));
    return ds;
 }
 
@@ -283,10 +285,10 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>&                                                     ds,
                            const history_serial_wrapper<eosio::chain::global_property_object>& obj) {
-   fc::raw::pack(ds, fc::unsigned_int(0));
+   fc::raw::pack(ds, fc::unsigned_int(1));
    fc::raw::pack(ds, as_type<optional<eosio::chain::block_num_type>>(obj.obj.proposed_schedule_block_num));
    fc::raw::pack(ds, make_history_serial_wrapper(
-                         obj.db, as_type<eosio::chain::shared_producer_schedule_type>(obj.obj.proposed_schedule)));
+                         obj.db, as_type<eosio::chain::shared_producer_authority_schedule>(obj.obj.proposed_schedule)));
    fc::raw::pack(ds, make_history_serial_wrapper(obj.db, as_type<eosio::chain::chain_config>(obj.obj.configuration)));
 
    return ds;
diff --git a/plugins/state_history_plugin/state_history_plugin_abi.cpp b/plugins/state_history_plugin/state_history_plugin_abi.cpp
index 9d5324b0bbf..ff6eec427bb 100644
--- a/plugins/state_history_plugin/state_history_plugin_abi.cpp
+++ b/plugins/state_history_plugin/state_history_plugin_abi.cpp
@@ -311,6 +311,19 @@ extern const char* const state_history_plugin_abi = R"({
                 { "type": "producer_key[]", "name": "producers" }
             ]
         },
+        {
+            "name": "producer_authority_v0", "fields": [
+                { "type": "name", "name": "producer_name" },
+                { "type": "uint32", "name": "weight" }
+                { "type": "key_weight[]", "name": "keys" }
+            ]
+        },
+        {
+            "name": "producer_authority_schedule", "fields": [
+                { "type": "uint32", "name": "version" },
+                { "type": "producer_authority[]", "name": "producers" }
+            ]
+        },
         {
             "name": "chain_config_v0", "fields": [
                 { "type": "uint64", "name": "max_block_net_usage" },
@@ -339,6 +352,13 @@ extern const char* const state_history_plugin_abi = R"({
                 { "type": "chain_config", "name": "configuration" }
             ]
         },
+        {
+            "name": "global_property_v1", "fields": [
+                { "type": "uint32?", "name": "proposed_schedule_block_num" },
+                { "type": "producer_authority_schedule", "name": "proposed_schedule" },
+                { "type": "chain_config", "name": "configuration" }
+            ]
+        },
         {
             "name": "generated_transaction_v0", "fields": [
                 { "type": "name", "name": "sender" },
@@ -492,7 +512,7 @@ extern const char* const state_history_plugin_abi = R"({
         { "name": "contract_index_double", "types": ["contract_index_double_v0"] },
         { "name": "contract_index_long_double", "types": ["contract_index_long_double_v0"] },
         { "name": "chain_config", "types": ["chain_config_v0"] },
-        { "name": "global_property", "types": ["global_property_v0"] },
+        { "name": "global_property", "types": ["global_property_v0", "global_property_v1"] },
         { "name": "generated_transaction", "types": ["generated_transaction_v0"] },
         { "name": "activated_protocol_feature", "types": ["activated_protocol_feature_v0"] },
         { "name": "protocol_state", "types": ["protocol_state_v0"] },
@@ -504,7 +524,8 @@ extern const char* const state_history_plugin_abi = R"({
         { "name": "resource_limits_state", "types": ["resource_limits_state_v0"] },
         { "name": "resource_limits_ratio", "types": ["resource_limits_ratio_v0"] },
         { "name": "elastic_limit_parameters", "types": ["elastic_limit_parameters_v0"] },
-        { "name": "resource_limits_config", "types": ["resource_limits_config_v0"] }
+        { "name": "resource_limits_config", "types": ["resource_limits_config_v0"] },
+        { "name": "producer_authority", "types": ["producer_authority_v0"] },
     ],
     "tables": [
         { "name": "account", "type": "account", "key_names": ["name"] },
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 6f8f1f29c84..5f466d5ebe9 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -371,7 +371,7 @@ BOOST_AUTO_TEST_CASE( validator_accepts_valid_blocks ) try {
    BOOST_CHECK_EQUAL( n2.control->head_block_id(), id );
 
    BOOST_REQUIRE( first_block );
-   first_block->verify_signee( first_block->signee() );
+   first_block->verify_signee();
    BOOST_CHECK_EQUAL( first_block->header.id(), first_block->block->id() );
    BOOST_CHECK( first_block->header.producer_signature == first_block->block->producer_signature );
 
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index bec63376ff5..b31003b9e2d 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -209,14 +209,14 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_promotion_test, TESTER ) try {
       produce_block();
    }
 
-   auto compare_schedules = [&]( const vector<producer_key>& a, const producer_schedule_type& b ) {
+   auto compare_schedules = [&]( const vector<producer_authority>& a, const producer_authority_schedule& b ) {
       return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
    };
 
    auto res = set_producers( {N(alice),N(bob)} );
-   vector<producer_key> sch1 = {
-                                 {N(alice), get_public_key(N(alice), "active")},
-                                 {N(bob),   get_public_key(N(bob),   "active")}
+   vector<producer_authority> sch1 = {
+                                 producer_authority_v0{N(alice), 1, {{get_public_key(N(alice), "active"), 1}}},
+                                 producer_authority_v0{N(bob),   1, {{get_public_key(N(bob),   "active"), 1}}}
                                };
    //wdump((fc::json::to_pretty_string(res)));
    wlog("set producer schedule to [alice,bob]");
@@ -234,10 +234,10 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_promotion_test, TESTER ) try {
    produce_blocks(6);
 
    res = set_producers( {N(alice),N(bob),N(carol)} );
-   vector<producer_key> sch2 = {
-                                 {N(alice), get_public_key(N(alice), "active")},
-                                 {N(bob),   get_public_key(N(bob),   "active")},
-                                 {N(carol), get_public_key(N(carol), "active")}
+   vector<producer_authority> sch2 = {
+                                 producer_authority_v0{N(alice), 1, {{get_public_key(N(alice), "active"),1}}},
+                                 producer_authority_v0{N(bob),   1, {{get_public_key(N(bob),   "active"),1}}},
+                                 producer_authority_v0{N(carol), 1, {{get_public_key(N(carol), "active"),1}}}
                                };
    wlog("set producer schedule to [alice,bob,carol]");
    BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
@@ -274,15 +274,15 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_reduction, tester ) try {
       produce_block();
    }
 
-   auto compare_schedules = [&]( const vector<producer_key>& a, const producer_schedule_type& b ) {
+   auto compare_schedules = [&]( const vector<producer_authority>& a, const producer_authority_schedule& b ) {
       return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
    };
 
    auto res = set_producers( {N(alice),N(bob),N(carol)} );
-   vector<producer_key> sch1 = {
-                                 {N(alice), get_public_key(N(alice), "active")},
-                                 {N(bob),   get_public_key(N(bob),   "active")},
-                                 {N(carol),   get_public_key(N(carol),   "active")}
+   vector<producer_authority> sch1 = {
+                                 producer_authority_v0{N(alice), 1, {{get_public_key(N(alice), "active"),1}}},
+                                 producer_authority_v0{N(bob),   1, {{get_public_key(N(bob),   "active"),1}}},
+                                 producer_authority_v0{N(carol), 1, {{get_public_key(N(carol), "active"),1}}}
                                };
    wlog("set producer schedule to [alice,bob,carol]");
    BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
@@ -299,9 +299,9 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_reduction, tester ) try {
    produce_blocks(6);
 
    res = set_producers( {N(alice),N(bob)} );
-   vector<producer_key> sch2 = {
-                                 {N(alice), get_public_key(N(alice), "active")},
-                                 {N(bob),   get_public_key(N(bob),   "active")}
+   vector<producer_authority> sch2 = {
+                                 producer_authority_v0{N(alice), 1, {{ get_public_key(N(alice), "active"),1}}},
+                                 producer_authority_v0{N(bob),   1, {{ get_public_key(N(bob),   "active"),1}}}
                                };
    wlog("set producer schedule to [alice,bob]");
    BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
@@ -336,14 +336,14 @@ BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
       c.produce_block();
    }
 
-   auto compare_schedules = [&]( const vector<producer_key>& a, const producer_schedule_type& b ) {
+   auto compare_schedules = [&]( const vector<producer_authority>& a, const producer_authority_schedule& b ) {
       return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
    };
 
    auto res = c.set_producers( {N(alice),N(bob)} );
-   vector<producer_key> sch1 = {
-                                 {N(alice), get_public_key(N(alice), "active")},
-                                 {N(bob),   get_public_key(N(bob),   "active")}
+   vector<producer_authority> sch1 = {
+                                 producer_authority_v0{N(alice), 1, {{ get_public_key(N(alice), "active"),1}}},
+                                 producer_authority_v0{N(bob),   1, {{ get_public_key(N(bob),   "active"),1}}}
                                };
    wlog("set producer schedule to [alice,bob]");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
@@ -383,10 +383,10 @@ BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
 
    // Setting a new producer schedule should still use version 2
    res = c.set_producers( {N(alice),N(bob),N(carol)} );
-   vector<producer_key> sch2 = {
-                                 {N(alice), get_public_key(N(alice), "active")},
-                                 {N(bob),   get_public_key(N(bob),   "active")},
-                                 {N(carol), get_public_key(N(carol), "active")}
+   vector<producer_authority> sch2 = {
+                                 producer_authority_v0{N(alice), 1, {{get_public_key(N(alice), "active"),1}}},
+                                 producer_authority_v0{N(bob),   1, {{get_public_key(N(bob),   "active"),1}}},
+                                 producer_authority_v0{N(carol), 1, {{get_public_key(N(carol), "active"),1}}}
                                };
    wlog("set producer schedule to [alice,bob,carol]");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
@@ -413,15 +413,15 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
    c.create_accounts( {N(alice),N(bob),N(carol)} );
    c.produce_block();
 
-   auto compare_schedules = [&]( const vector<producer_key>& a, const producer_schedule_type& b ) {
+   auto compare_schedules = [&]( const vector<producer_authority>& a, const producer_authority_schedule& b ) {
       return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
    };
 
    auto res = c.set_producers( {N(alice),N(bob),N(carol)} );
-   vector<producer_key> sch1 = {
-                                 {N(alice), c.get_public_key(N(alice), "active")},
-                                 {N(bob),   c.get_public_key(N(bob),   "active")},
-                                 {N(carol), c.get_public_key(N(carol), "active")}
+   vector<producer_authority> sch1 = {
+                                 producer_authority_v0{N(alice), 1, {{c.get_public_key(N(alice), "active"),1}}},
+                                 producer_authority_v0{N(bob),   1, {{c.get_public_key(N(bob),   "active"),1}}},
+                                 producer_authority_v0{N(carol), 1, {{c.get_public_key(N(carol), "active"),1}}}
                                };
    wlog("set producer schedule to [alice,bob,carol]");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
@@ -441,9 +441,9 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
    produce_empty_blocks_until( c, N(carol), N(alice) );
 
    res = c.set_producers( {N(alice),N(bob)} );
-   vector<producer_key> sch2 = {
-                                 {N(alice), c.get_public_key(N(alice), "active")},
-                                 {N(bob),   c.get_public_key(N(bob),   "active")}
+   vector<producer_authority> sch2 = {
+                                 producer_authority_v0{N(alice), 1, {{c.get_public_key(N(alice), "active"),1}}},
+                                 producer_authority_v0{N(bob),   1, {{c.get_public_key(N(bob),   "active"),1}}}
                                };
    wlog("set producer schedule to [alice,bob]");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );

From 78b348af5066230a47b491dfac45c59dbf92515e Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 10 May 2019 17:50:28 -0400
Subject: [PATCH 0347/1648] extracted producer name in producer authorities to
 outside the versioned authority structure, still fixing bugs and compile
 errors

---
 libraries/chain/block_header.cpp              |  10 +-
 libraries/chain/block_header_state.cpp        |  60 ++++----
 .../eosio/chain/block_header_state.hpp        |   4 +-
 .../include/eosio/chain/producer_schedule.hpp | 129 ++++++++++++------
 .../state_history_serialization.hpp           |  11 +-
 .../state_history_plugin_abi.cpp              |  11 +-
 .../test_control_plugin.cpp                   |   3 +-
 7 files changed, 151 insertions(+), 77 deletions(-)

diff --git a/libraries/chain/block_header.cpp b/libraries/chain/block_header.cpp
index 04b41456f77..36cb86004b8 100644
--- a/libraries/chain/block_header.cpp
+++ b/libraries/chain/block_header.cpp
@@ -35,7 +35,7 @@ namespace eosio { namespace chain {
       static_assert( std::is_same<block_header_extensions_t, block_header_extensions>::value,
                      "block_header_extensions is not setup as expected" );
 
-      vector<block_header_extensions_t> results;
+      flat_multimap<uint16_t, block_header_extensions> results;
 
       uint16_t id_type_lower_bound = 0;
 
@@ -47,9 +47,12 @@ namespace eosio { namespace chain {
                      "Block header extensions are not in the correct order (ascending id types required)"
          );
 
-         results.emplace_back();
+         auto iter = results.emplace(std::piecewise_construct,
+            std::forward_as_tuple(id),
+            std::forward_as_tuple()
+         );
 
-         auto match = decompose_t::extract<block_header_extensions_t>( id, e.second, results.back() );
+         auto match = decompose_t::extract<block_header_extensions_t>( id, e.second, iter->second );
          EOS_ASSERT( match, invalid_block_header_extension,
                      "Block header extension with id type ${id} is not supported",
                      ("id", id)
@@ -62,6 +65,7 @@ namespace eosio { namespace chain {
             );
          }
 
+
          id_type_lower_bound = id;
       }
 
diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index 29ac9d9e665..70e89954257 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -9,7 +9,7 @@ namespace eosio { namespace chain {
       return producer_to_last_produced.find(n) != producer_to_last_produced.end();
    }
 
-   producer_keys block_header_state::get_scheduled_producer( block_timestamp_type t )const {
+   producer_authority block_header_state::get_scheduled_producer( block_timestamp_type t )const {
       auto index = t.slot % (active_schedule.producers.size() * config::producer_repetitions);
       index /= config::producer_repetitions;
       return active_schedule.producers[index];
@@ -40,13 +40,13 @@ namespace eosio { namespace chain {
         (when = header.timestamp).slot++;
       }
 
-      auto prokey = get_scheduled_producer(when);
+      auto proauth = get_scheduled_producer(when);
 
-      auto itr = producer_to_last_produced.find( prokey.producer_name );
+      auto itr = producer_to_last_produced.find( proauth.name );
       if( itr != producer_to_last_produced.end() ) {
         EOS_ASSERT( itr->second < (block_num+1) - num_prev_blocks_to_confirm, producer_double_confirm,
                     "producer ${prod} double-confirming known range",
-                    ("prod", prokey.producer_name)("num", block_num+1)
+                    ("prod", proauth.name)("num", block_num+1)
                     ("confirmed", num_prev_blocks_to_confirm)("last_produced", itr->second) );
       }
 
@@ -57,8 +57,8 @@ namespace eosio { namespace chain {
       result.active_schedule_version                         = active_schedule.version;
       result.prev_activated_protocol_features                = activated_protocol_features;
 
-      result.valid_block_signing_keys                        = prokey.block_signing_keys;
-      result.producer                                        = prokey.producer_name;
+      result.valid_block_signing_authority                   = proauth.authority;
+      result.producer                                        = proauth.name;
 
       result.blockroot_merkle = blockroot_merkle;
       result.blockroot_merkle.append( id );
@@ -108,7 +108,7 @@ namespace eosio { namespace chain {
       }
 
       result.dpos_proposed_irreversible_blocknum   = new_dpos_proposed_irreversible_blocknum;
-      result.dpos_irreversible_blocknum            = calc_dpos_last_irreversible( prokey.producer_name );
+      result.dpos_irreversible_blocknum            = calc_dpos_last_irreversible( proauth.name );
 
       result.prev_pending_schedule                 = pending_schedule;
 
@@ -120,32 +120,32 @@ namespace eosio { namespace chain {
          flat_map<account_name,uint32_t> new_producer_to_last_produced;
 
          for( const auto& pro : result.active_schedule.producers ) {
-            if( pro.producer_name == prokey.producer_name ) {
-               new_producer_to_last_produced[pro.producer_name] = result.block_num;
+            if( pro.name == proauth.name ) {
+               new_producer_to_last_produced[pro.name] = result.block_num;
             } else {
-               auto existing = producer_to_last_produced.find( pro.producer_name );
+               auto existing = producer_to_last_produced.find( pro.name );
                if( existing != producer_to_last_produced.end() ) {
-                  new_producer_to_last_produced[pro.producer_name] = existing->second;
+                  new_producer_to_last_produced[pro.name] = existing->second;
                } else {
-                  new_producer_to_last_produced[pro.producer_name] = result.dpos_irreversible_blocknum;
+                  new_producer_to_last_produced[pro.name] = result.dpos_irreversible_blocknum;
                }
             }
          }
-         new_producer_to_last_produced[prokey.producer_name] = result.block_num;
+         new_producer_to_last_produced[proauth.name] = result.block_num;
 
          result.producer_to_last_produced = std::move( new_producer_to_last_produced );
 
          flat_map<account_name,uint32_t> new_producer_to_last_implied_irb;
 
          for( const auto& pro : result.active_schedule.producers ) {
-            if( pro.producer_name == prokey.producer_name ) {
-               new_producer_to_last_implied_irb[pro.producer_name] = dpos_proposed_irreversible_blocknum;
+            if( pro.name == proauth.name ) {
+               new_producer_to_last_implied_irb[pro.name] = dpos_proposed_irreversible_blocknum;
             } else {
-               auto existing = producer_to_last_implied_irb.find( pro.producer_name );
+               auto existing = producer_to_last_implied_irb.find( pro.name );
                if( existing != producer_to_last_implied_irb.end() ) {
-                  new_producer_to_last_implied_irb[pro.producer_name] = existing->second;
+                  new_producer_to_last_implied_irb[pro.name] = existing->second;
                } else {
-                  new_producer_to_last_implied_irb[pro.producer_name] = result.dpos_irreversible_blocknum;
+                  new_producer_to_last_implied_irb[pro.name] = result.dpos_irreversible_blocknum;
                }
             }
          }
@@ -156,9 +156,9 @@ namespace eosio { namespace chain {
       } else {
          result.active_schedule                  = active_schedule;
          result.producer_to_last_produced        = producer_to_last_produced;
-         result.producer_to_last_produced[prokey.producer_name] = block_num;
+         result.producer_to_last_produced[proauth.name] = block_num;
          result.producer_to_last_implied_irb     = producer_to_last_implied_irb;
-         result.producer_to_last_implied_irb[prokey.producer_name] = dpos_proposed_irreversible_blocknum;
+         result.producer_to_last_implied_irb[proauth.name] = dpos_proposed_irreversible_blocknum;
       }
 
       return result;
@@ -204,9 +204,9 @@ namespace eosio { namespace chain {
             legacy::producer_schedule_type downgraded_producers;
             downgraded_producers.version = new_producers->version;
             for (const auto &p : new_producers->producers) {
-               p.visit([&downgraded_producers](const auto& auth){
+               p.authority.visit([&downgraded_producers, &p](const auto& auth){
                   EOS_ASSERT(auth.keys.size() == 1 && auth.keys.front().weight == auth.threshold, producer_schedule_exception, "multisig block signing present before enabled!");
-                  downgraded_producers.producers.emplace_back(legacy::producer_key{auth.producer_name, auth.keys.front().key});
+                  downgraded_producers.producers.emplace_back(legacy::producer_key{p.name, auth.keys.front().key});
                });
             }
             h.new_producers = downgraded_producers;
@@ -370,12 +370,19 @@ namespace eosio { namespace chain {
       return digest_type::hash( std::make_pair(header_bmroot, pending_schedule.schedule_hash) );
    }
 
+   static bool key_is_relevant( const block_signing_authority& authority, const public_key_type& key ) {
+      return authority.visit([&key](const auto &a) {
+         return std::find_if(a.keys.begin(), a.keys.end(), [&key](const auto& k ){
+            return k.key == key;
+         }) != a.keys.end();
+      });
+   }
+
    void block_header_state::sign( const std::function<signature_type(const digest_type&)>& signer ) {
       auto d = sig_digest();
       header.producer_signature = signer( d );
 
-      EOS_ASSERT( valid_block_signing_keys.find(signee()) != valid_block_signing_keys.end(),
-                  wrong_signing_key, "block is signed with unexpected key" );
+      EOS_ASSERT( key_is_relevant(valid_block_signing_authority, signee()), wrong_signing_key, "block is signed with unexpected key" );
    }
 
    public_key_type block_header_state::signee()const {
@@ -384,9 +391,10 @@ namespace eosio { namespace chain {
 
    void block_header_state::verify_signee( )const {
       auto signing_key = signee();
-      EOS_ASSERT( valid_block_signing_keys.find(signing_key) != valid_block_signing_keys.end(), wrong_signing_key,
+
+      EOS_ASSERT( key_is_relevant(valid_block_signing_authority, signing_key), wrong_signing_key,
                   "block not signed by expected key",
-                  ("signing_key", signing_key)( "valid_keys", valid_block_signing_keys ) );
+                  ("signing_key", signing_key)( "valid_keys", valid_block_signing_authority ) );
    }
 
    /**
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 8a6eb08d653..46e8145bf57 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -17,7 +17,7 @@ namespace detail {
       incremental_merkle                blockroot_merkle;
       flat_map<account_name,uint32_t>   producer_to_last_produced;
       flat_map<account_name,uint32_t>   producer_to_last_implied_irb;
-      flat_set<public_key_type>         valid_block_signing_keys;
+      block_signing_authority           valid_block_signing_authority;
       vector<uint8_t>                   confirm_count;
    };
 
@@ -122,7 +122,7 @@ FC_REFLECT( eosio::chain::detail::block_header_state_common,
             (blockroot_merkle)
             (producer_to_last_produced)
             (producer_to_last_implied_irb)
-            (valid_block_signing_keys)
+            (valid_block_signing_authority)
             (confirm_count)
 )
 
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index d22a0e657e1..d79bd127b69 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -2,6 +2,7 @@
 #include <eosio/chain/config.hpp>
 #include <eosio/chain/types.hpp>
 #include <chainbase/chainbase.hpp>
+#include <eosio/chain/authority.hpp>
 
 namespace eosio { namespace chain {
 
@@ -44,34 +45,62 @@ namespace eosio { namespace chain {
       };
    }
 
-   struct producer_authority_v0 {
-      account_name                producer_name;
+   /**
+    * block signing authority version 0
+    * this authority allows for a weighted threshold multi-sig per-producer
+    */
+   struct block_signing_authority_v0 {
       uint32_t                    threshold;
       vector<key_weight>          keys;
 
-      friend bool operator == ( const producer_authority_v0& lhs, const producer_authority_v0& rhs ) {
-         return tie( lhs.producer_name, lhs.keys ) == tie( rhs.producer_name, rhs.keys );
+      friend bool operator == ( const block_signing_authority_v0& lhs, const block_signing_authority_v0& rhs ) {
+         return tie( lhs.threshold, lhs.keys ) == tie( rhs.threshold, rhs.keys );
       }
-      friend bool operator != ( const producer_authority_v0& lhs, const producer_authority_v0& rhs ) {
-         return tie( lhs.producer_name, lhs.keys ) != tie( rhs.producer_name, rhs.keys );
+      friend bool operator != ( const block_signing_authority_v0& lhs, const block_signing_authority_v0& rhs ) {
+         return tie( lhs.threshold, lhs.keys ) != tie( rhs.threshold, rhs.keys );
       }
    };
 
-   using producer_authority = static_variant<producer_authority_v0>;
+   using block_signing_authority = static_variant<block_signing_authority_v0>;
+
+   struct producer_authority {
+      name                    name;
+      block_signing_authority authority;
+
+      friend bool operator == ( const producer_authority& lhs, const producer_authority& rhs ) {
+         return tie( lhs.name, lhs.authority ) == tie( rhs.name, rhs.authority );
+      }
+      friend bool operator != ( const producer_authority& lhs, const producer_authority& rhs ) {
+         return tie( lhs.name, lhs.authority ) != tie( rhs.name, rhs.authority );
+      }
+   };
 
-   struct shared_producer_authority_v0 {
-      shared_producer_authority_v0( chainbase::allocator<char> alloc )
+   struct shared_block_signing_authority_v0 {
+      shared_block_signing_authority_v0( chainbase::allocator<char> alloc )
       :keys(alloc){}
 
-      account_name                producer_name;
       uint32_t                    threshold;
       shared_vector<key_weight>   keys;
 
-      friend bool operator == ( const shared_producer_authority_v0& lhs, const shared_producer_authority_v0& rhs ) {
-         return tie( lhs.producer_name, lhs.keys ) == tie( rhs.producer_name, rhs.keys );
+      friend bool operator == ( const shared_block_signing_authority_v0& lhs, const shared_block_signing_authority_v0& rhs ) {
+         return tie( lhs.threshold, lhs.keys ) == tie( rhs.threshold, rhs.keys );
+      }
+      friend bool operator != ( const shared_block_signing_authority_v0& lhs, const shared_block_signing_authority_v0& rhs ) {
+         return tie( lhs.threshold, lhs.keys ) != tie( rhs.threshold, rhs.keys );
+      }
+   };
+
+   using shared_block_signing_authority = static_variant<shared_block_signing_authority_v0>;
+
+   struct shared_producer_authority {
+      name                           name;
+      shared_block_signing_authority authority;
+
+      friend bool operator == ( const shared_producer_authority& lhs, const shared_producer_authority& rhs ) {
+         return tie( lhs.name, lhs.authority ) == tie( rhs.name, rhs.authority );
       }
-      friend bool operator != ( const shared_producer_authority_v0& lhs, const shared_producer_authority_v0& rhs ) {
-         return tie( lhs.producer_name, lhs.keys ) != tie( rhs.producer_name, rhs.keys );
+      friend bool operator != ( const shared_producer_authority& lhs, const shared_producer_authority& rhs ) {
+         return tie( lhs.name, lhs.authority ) != tie( rhs.name, rhs.authority );
       }
    };
 
@@ -79,11 +108,20 @@ namespace eosio { namespace chain {
       template<typename T>
       struct shared_converter;
 
+      template<typename T>
+      auto shared_convert( chainbase::allocator<char> alloc, const T& src ) {
+         return shared_converter<std::decay_t<decltype(src)>>::convert(alloc, src);
+      }
+
+      template<typename T>
+      auto shared_convert( const T& src ) {
+         return shared_converter<std::decay_t<decltype(src)>>::convert(src);
+      }
+
       template<>
-      struct shared_converter<producer_authority_v0> {
-         static shared_producer_authority_v0 convert (chainbase::allocator<char> alloc, const producer_authority_v0& src) {
-            shared_producer_authority_v0 result(alloc);
-            result.producer_name = src.producer_name;
+      struct shared_converter<block_signing_authority_v0> {
+         static shared_block_signing_authority_v0 convert (chainbase::allocator<char> alloc, const block_signing_authority_v0& src) {
+            shared_block_signing_authority_v0 result(alloc);
             result.threshold = src.threshold;
             result.keys.clear();
             result.keys.reserve(src.keys.size());
@@ -96,10 +134,9 @@ namespace eosio { namespace chain {
       };
 
       template<>
-      struct shared_converter<shared_producer_authority_v0> {
-         static producer_authority_v0 convert (const shared_producer_authority_v0& src) {
-            producer_authority_v0 result;
-            result.producer_name = src.producer_name;
+      struct shared_converter<shared_block_signing_authority_v0> {
+         static block_signing_authority_v0 convert (const shared_block_signing_authority_v0& src) {
+            block_signing_authority_v0 result;
             result.threshold = src.threshold;
             result.keys.reserve(src.keys.size());
             for (const auto& k: src.keys) {
@@ -110,18 +147,33 @@ namespace eosio { namespace chain {
          }
       };
 
-      template<typename T>
-      auto shared_convert( chainbase::allocator<char> alloc, const T& src ) {
-         return shared_converter<std::decay_t<decltype(src)>>::convert(alloc, src);
-      }
+      template<>
+      struct shared_converter<producer_authority> {
+         static shared_producer_authority convert (chainbase::allocator<char> alloc, const producer_authority& src) {
+            shared_producer_authority result;
+            result.name = src.name;
+            result.authority = src.authority.visit([&result, &alloc](const auto& a) {
+                return shared_convert(alloc, a);
+            });
 
-      template<typename T>
-      auto shared_convert( const T& src ) {
-         return shared_converter<std::decay_t<decltype(src)>>::convert(src);
-      }
-   }
+            return result;
+         }
 
-   using shared_producer_authority = static_variant<shared_producer_authority_v0>;
+      };
+
+      template<>
+      struct shared_converter<shared_producer_authority> {
+         static producer_authority convert (const shared_producer_authority& src) {
+            producer_authority result;
+            result.name = src.name;
+            result.authority = src.authority.visit([&result](const auto& a) {
+               return shared_convert(a);
+            });
+
+            return result;
+         }
+      };
+   }
 
    struct producer_authority_schedule {
       producer_authority_schedule() = default;
@@ -134,7 +186,7 @@ namespace eosio { namespace chain {
       {
          producers.reserve( old.producers.size() );
          for( const auto& p : old.producers )
-            producers.emplace_back(producer_authority_v0{ p.producer_name, 1, {{p.block_signing_key, 1}}});
+            producers.emplace_back(producer_authority{ p.producer_name, block_signing_authority_v0{ 1, {{p.block_signing_key, 1}} } });
       }
 
       uint32_t                                       version = 0; ///< sequentially incrementing version number
@@ -185,9 +237,7 @@ namespace eosio { namespace chain {
          producers.clear();
          producers.reserve( a.producers.size() );
          for( const auto& p : a.producers ) {
-            p.visit([this](const auto& src){
-               producers.emplace_back(detail::shared_convert(producers.get_allocator(), src));
-            });
+            producers.emplace_back(detail::shared_convert(producers.get_allocator(), p));
          }
          return *this;
       }
@@ -197,9 +247,7 @@ namespace eosio { namespace chain {
          result.version = version;
          result.producers.reserve(producers.size());
          for( const auto& p : producers ) {
-            p.visit([&result](const auto& src){
-               result.producers.emplace_back(detail::shared_convert(src));
-            });
+            result.producers.emplace_back(detail::shared_convert(p));
          }
 
          return result;
@@ -219,7 +267,8 @@ namespace eosio { namespace chain {
 
 FC_REFLECT( eosio::chain::legacy::producer_key, (producer_name)(block_signing_key) )
 FC_REFLECT( eosio::chain::legacy::producer_schedule_type, (version)(producers) )
-FC_REFLECT( eosio::chain::producer_authority_v0, (producer_name)(threshold)(keys) )
+FC_REFLECT( eosio::chain::block_signing_authority_v0, (threshold)(keys))
+FC_REFLECT( eosio::chain::producer_authority, (name)(authority) )
 FC_REFLECT( eosio::chain::producer_authority_schedule, (version)(producers) )
 FC_REFLECT_DERIVED( eosio::chain::producer_schedule_change_extension, (eosio::chain::producer_authority_schedule), )
 FC_REFLECT( eosio::chain::shared_producer_authority_schedule, (version)(producers) )
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index 40b287e77af..bdbd36276a0 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -242,11 +242,18 @@ datastream<ST>& operator<<(
 }
 
 template <typename ST>
-datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::shared_producer_authority_v0>& obj) {
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.producer_name.value));
+datastream<ST>& operator<<(datastream<ST>& ds,
+                           const history_serial_wrapper<eosio::chain::shared_block_signing_authority_v0>& obj) {
    fc::raw::pack(ds, as_type<uint32_t>(obj.obj.threshold));
    history_serialize_container(ds, obj.db,
                                as_type<eosio::chain::shared_vector<eosio::chain::key_weight>>(obj.obj.keys));
+
+}
+
+template <typename ST>
+datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::shared_producer_authority>& obj) {
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.value));
+   fc::raw::pack(ds, as_type<eosio::chain::shared_block_signing_authority>(obj.obj.authority));
    return ds;
 }
 
diff --git a/plugins/state_history_plugin/state_history_plugin_abi.cpp b/plugins/state_history_plugin/state_history_plugin_abi.cpp
index ff6eec427bb..a18d15968bd 100644
--- a/plugins/state_history_plugin/state_history_plugin_abi.cpp
+++ b/plugins/state_history_plugin/state_history_plugin_abi.cpp
@@ -312,12 +312,17 @@ extern const char* const state_history_plugin_abi = R"({
             ]
         },
         {
-            "name": "producer_authority_v0", "fields": [
-                { "type": "name", "name": "producer_name" },
+            "name": "block_signing_authority_v0", "fields": [
                 { "type": "uint32", "name": "weight" }
                 { "type": "key_weight[]", "name": "keys" }
             ]
         },
+        {
+            "name": "producer_authority", "fields": [
+                { "type": "name", "name": "name" },
+                { "type": "block_signing_authority", "name": "authority" }
+            ]
+        },
         {
             "name": "producer_authority_schedule", "fields": [
                 { "type": "uint32", "name": "version" },
@@ -525,7 +530,7 @@ extern const char* const state_history_plugin_abi = R"({
         { "name": "resource_limits_ratio", "types": ["resource_limits_ratio_v0"] },
         { "name": "elastic_limit_parameters", "types": ["elastic_limit_parameters_v0"] },
         { "name": "resource_limits_config", "types": ["resource_limits_config_v0"] },
-        { "name": "producer_authority", "types": ["producer_authority_v0"] },
+        { "name": "block_signing_authority", "types": ["block_signing_authority_v0"] },
     ],
     "tables": [
         { "name": "account", "type": "account", "key_names": ["name"] },
diff --git a/plugins/test_control_plugin/test_control_plugin.cpp b/plugins/test_control_plugin/test_control_plugin.cpp
index dbde59853ef..3c26344c8e5 100644
--- a/plugins/test_control_plugin/test_control_plugin.cpp
+++ b/plugins/test_control_plugin/test_control_plugin.cpp
@@ -64,7 +64,8 @@ void test_control_plugin_impl::accepted_block(const chain::block_state_ptr& bsp)
 
 void test_control_plugin_impl::process_next_block_state(const chain::block_state_ptr& bsp) {
    const auto block_time = _chain.head_block_time() + fc::microseconds(chain::config::block_interval_us);
-   const auto producer_name = bsp->get_scheduled_producer(block_time).producer_name;
+   const auto& producer_authority = bsp->get_scheduled_producer(block_time);
+   const auto producer_name = producer_authority.visit([](const auto& a){ return a.producer_name; });
    if (_producer != account_name())
       ilog("producer ${cprod}, looking for ${lprod}", ("cprod", producer_name.to_string())("lprod", _producer.to_string()));
 

From 98abd10c61804a281f4cc25b852c23be1fe702f5 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 10 May 2019 18:15:28 -0400
Subject: [PATCH 0348/1648] more fixing up stuff: wasm interface

---
 libraries/chain/apply_context.cpp             |  2 +-
 .../chain/include/eosio/chain/controller.hpp  |  2 +-
 libraries/chain/wasm_interface.cpp            | 30 +++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index dc7687cf05c..79022ca1dec 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -583,7 +583,7 @@ vector<account_name> apply_context::get_active_producers() const {
    vector<account_name> accounts; accounts.reserve( ap.producers.size() );
 
    for(const auto& producer : ap.producers )
-      accounts.push_back(producer.producer_name);
+      accounts.push_back(producer.name);
 
    return accounts;
 }
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index daa8be2c313..d9606e5dd0b 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -255,7 +255,7 @@ namespace eosio { namespace chain {
 
          bool is_known_unexpired_transaction( const transaction_id_type& id) const;
 
-         int64_t set_proposed_producers( vector<producer_keys> producers );
+         int64_t set_proposed_producers( vector<producer_authority> producers );
 
          bool light_validation_allowed(bool replay_opts_disabled_by_policy) const;
          bool skip_auth_check()const;
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 48b33764f8e..292845128b6 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -177,20 +177,20 @@ class privileged_api : public context_aware_api {
 
       int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, size_t datalen) {
          datastream<const char*> ds( packed_producer_schedule, datalen );
-         vector<producer_keys> producers;
+         vector<producer_authority> producers;
 
-         if ( context.control.is_builtin_activated( builtin_protocol_feature_t::one_of_n_block_signatures )) {
+         if ( context.control.is_builtin_activated( builtin_protocol_feature_t::wtmsig_block_signatures )) {
             fc::raw::unpack(ds, producers);
 
          } else {
-            vector<producer_key> old_version;
+            vector<legacy::producer_key> old_version;
             fc::raw::unpack(ds, old_version);
 
             /*
              * Up-convert the producers
              */
             for ( const auto& p: old_version ) {
-               producers.emplace_back(producer_keys{ p.producer_name, {p.block_signing_key}});
+               producers.emplace_back(producer_authority{ p.producer_name, block_signing_authority_v0{ 1, {{p.block_signing_key, 1}} } } );
             }
          }
 
@@ -204,13 +204,25 @@ class privileged_api : public context_aware_api {
          // check that producers are unique
          std::set<account_name> unique_producers;
          for (const auto& p: producers) {
-            EOS_ASSERT( context.is_account(p.producer_name), wasm_execution_error, "producer schedule includes a nonexisting account" );
+            EOS_ASSERT( context.is_account(p.name), wasm_execution_error, "producer schedule includes a nonexisting account" );
+
+            p.authority.visit([](const auto& a) {
+               uint32_t sum_weights = 0;
+               for (const auto& kw: a.keys ) {
+                  EOS_ASSERT( kw.key.valid(), wasm_execution_error, "producer schedule includes an invalid key" );
+
+                  if (std::numeric_limits<uint32_t>::max() - sum_weights <= kw.weight) {
+                     sum_weights = std::numeric_limits<uint32_t>::max();
+                  } else {
+                     sum_weights += kw.weight;
+                  }
+               }
+
+               EOS_ASSERT( sum_weights >= a.threshold, wasm_execution_error, "producer schedule includes an unsatisfiable authority" );
+            });
 
-            for (const auto& k: p.block_signing_keys) {
-               EOS_ASSERT( k.valid(), wasm_execution_error, "producer schedule includes an invalid key" );
-            }
 
-            unique_producers.insert(p.producer_name);
+            unique_producers.insert(p.name);
          }
          EOS_ASSERT( producers.size() == unique_producers.size(), wasm_execution_error, "duplicate producer name in producer schedule" );
 

From ff2d35281fc580a31ae6a1c198c1d99d7a8d6738 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 10 May 2019 21:32:54 -0400
Subject: [PATCH 0349/1648] Look in both lib and lib64 for CMake modules when
 building EOSIO Tester

---
 CMakeModules/EosioTester.cmake.in | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index 4dfc2f60451..e938378ed93 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -43,28 +43,28 @@ find_package(Boost 1.67 REQUIRED COMPONENTS
    iostreams
    unit_test_framework)
 
-find_library(libtester eosio_testing @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libchain eosio_chain @CMAKE_INSTALL_FULL_LIBDIR@)
+find_library(libtester eosio_testing @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libchain eosio_chain @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
 if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
-   find_library(libfc fc_debug @CMAKE_INSTALL_FULL_LIBDIR@)
-   find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_FULL_LIBDIR@)
+   find_library(libfc fc_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+   find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
 else()
-   find_library(libfc fc @CMAKE_INSTALL_FULL_LIBDIR@)
-   find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_FULL_LIBDIR@)  
+   find_library(libfc fc @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+   find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)  
 endif()
 
-find_library(libwasm WASM @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libwast WAST @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libwabt wabt @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libir IR     @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libplatform Platform @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(liblogging Logging @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libruntime Runtime @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libsoftfloat softfloat @CMAKE_INSTALL_FULL_LIBDIR@)
+find_library(libwasm WASM @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libwast WAST @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libwabt wabt @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libir IR     @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
 find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
 find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
-find_library(libchainbase chainbase @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libbuiltins builtins @CMAKE_INSTALL_FULL_LIBDIR@)
+find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
 find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
     HINTS ENV GMP_LIB_DIR
           ENV GMP_DIR

From c1a2ad668061228d1fe835352a314a6bc7e7b4fd Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 10 May 2019 21:54:43 -0400
Subject: [PATCH 0350/1648] fix bug in fork_database::close which serialized
 blocks to disk in wrong order (caused linking issues when opening the file)

Also adds forked_tests/reopen_forkdb unit test.
---
 libraries/chain/fork_database.cpp |  2 +-
 unittests/forked_tests.cpp        | 54 +++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
index 1fe7459dfae..749ec6404d5 100644
--- a/libraries/chain/fork_database.cpp
+++ b/libraries/chain/fork_database.cpp
@@ -200,7 +200,7 @@ namespace eosio { namespace chain {
          auto itr = (validated_remaining ? validated_itr : unvalidated_itr);
 
          if( unvalidated_remaining && validated_remaining ) {
-            if( first_preferred( **unvalidated_itr, **validated_itr ) ) {
+            if( first_preferred( **validated_itr, **unvalidated_itr ) ) {
                itr = unvalidated_itr;
                ++unvalidated_itr;
             } else {
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 6f8f1f29c84..920d759e951 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -523,4 +523,58 @@ BOOST_AUTO_TEST_CASE( irreversible_mode ) try {
 
 } FC_LOG_AND_RETHROW()
 
+BOOST_AUTO_TEST_CASE( reopen_forkdb ) try {
+   tester c1;
+
+   c1.create_accounts( {N(alice),N(bob),N(carol)} );
+   c1.produce_block();
+
+   auto res = c1.set_producers( {N(alice),N(bob),N(carol)} );
+
+   c1.produce_blocks(2);
+
+   BOOST_REQUIRE_EQUAL( c1.control->active_producers().version, 1u );
+
+   produce_empty_blocks_until( c1, N(carol), N(alice) );
+   c1.produce_block();
+   produce_empty_blocks_until( c1, N(carol), N(alice) );
+
+   tester c2;
+
+   push_blocks( c1, c2 );
+
+   auto fork1_lib_before = c1.control->last_irreversible_block_num();
+
+   // alice produces a block on fork 1 causing LIB to advance
+   c1.produce_block();
+
+   auto fork1_head_block_id = c1.control->head_block_id();
+
+   auto fork1_lib_after = c1.control->last_irreversible_block_num();
+   BOOST_REQUIRE( fork1_lib_after > fork1_lib_before );
+
+   auto fork2_lib_before = c2.control->last_irreversible_block_num();
+   BOOST_REQUIRE_EQUAL( fork1_lib_before, fork2_lib_before );
+
+   // carol produces a block on fork 2 skipping over the slots of alice and bob
+   c2.produce_block( fc::milliseconds(config::block_interval_ms * 25) );
+   auto fork2_start_block = c2.control->head_block_num();
+   c2.produce_block();
+
+   auto fork2_lib_after = c2.control->last_irreversible_block_num();
+   BOOST_REQUIRE_EQUAL( fork2_lib_before, fork2_lib_after );
+
+   for( uint32_t block_num = fork2_start_block; block_num < c2.control->head_block_num(); ++block_num ) {
+      auto fb = c2.control->fetch_block_by_number( block_num );
+      c1.push_block( fb );
+   }
+
+   BOOST_REQUIRE( fork1_head_block_id == c1.control->head_block_id() ); // new blocks should not cause fork switch
+
+   c1.close();
+
+   c1.open( nullptr );
+
+} FC_LOG_AND_RETHROW()
+
 BOOST_AUTO_TEST_SUITE_END()

From b2663112fb412a2d168efd4c578b61e2d262e3fd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Sat, 11 May 2019 09:30:11 -0500
Subject: [PATCH 0351/1648] Use debug level logging when --verbose output
 requested

---
 unittests/main.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/unittests/main.cpp b/unittests/main.cpp
index 00fe71891a1..cb26aeb625b 100644
--- a/unittests/main.cpp
+++ b/unittests/main.cpp
@@ -30,7 +30,11 @@ boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
          break;
       }
    }
-   if(!is_verbose) fc::logger::get(DEFAULT_LOGGER).set_log_level(fc::log_level::off);
+   if(is_verbose) {
+      fc::logger::get(DEFAULT_LOGGER).set_log_level(fc::log_level::debug);
+   } else {
+      fc::logger::get(DEFAULT_LOGGER).set_log_level(fc::log_level::off);
+   }
 
    // Register fc::exception translator
    boost::unit_test::unit_test_monitor.register_exception_translator<fc::exception>(&translate_fc_exception);

From 92df30168a400b3bfb846bc826a0b3895167d3e6 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 12 May 2019 20:27:12 -0400
Subject: [PATCH 0352/1648] correct signed mismatch warning

---
 plugins/http_plugin/http_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index ff9c895c711..a79da78dde4 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -153,7 +153,7 @@ namespace eosio {
 
          uint16_t                                    thread_pool_size = 2;
          optional<eosio::chain::named_thread_pool>   thread_pool;
-         std::atomic<int64_t>                        bytes_in_flight{0};
+         std::atomic<size_t>                         bytes_in_flight{0};
          size_t                                      max_bytes_in_flight = 0;
 
          optional<tcp::endpoint>  https_listen_endpoint;

From 229d69d9de8addd651a6b546961f09d503a7bc18 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 10:53:48 -0400
Subject: [PATCH 0353/1648] Removed commented-out code

---
 .buildkite/pipeline.yml | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index af1fc1044de..a124699ecc5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,7 +5,6 @@ env:
   MAC_TAG: "eosio_2-4"
 
 steps:
-
   - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
@@ -22,27 +21,8 @@ steps:
       PROJECT_TAG: "${MAC_TAG}"
     timeout: 60
 
-  # - trigger: "mac-anka-fleet"
-  #   label: ":anka: Ensure Mojave Anka Template Tag Exists"
-  #   branches: "*"
-  #   async: false
-  #   build:
-  #     branch: "master"
-  #     env:
-  #       REPO: "${BUILDKITE_REPO}"
-  #       REPO_COMMIT: "${BUILDKITE_COMMIT}"
-  #       CHECKSUMABLE: "${CHECKSUMABLE}"
-  #       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
-  #       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-  #       TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
-  #       PROJECT_TAG: "${MAC_TAG}"
-
   - wait
 
-  ############################
-  # BUILDING #################
-  ############################
-
   - label: ":darwin: [Darwin] Mojave Build"
     command:
       - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
@@ -149,11 +129,7 @@ steps:
 
   - wait
 
-  ################################
-  # TESTS ########################
-  ################################
-
-  # MOJAVE #
+  # MacOS Mojave
   - label: ":darwin: [Darwin] Mojave Tests"
     command:
       - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
@@ -190,7 +166,7 @@ steps:
         wait-network: true
     timeout: 120
 
-  # AmazonLinux #
+  # Amazon Linux 2
   - label: ":aws: Amazon Linux 2 Tests"
     command:
       - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
@@ -232,7 +208,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # CentOS #
+  # CentOS
   - label: ":centos: CentOS 7 Tests"
     command:
       - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
@@ -273,7 +249,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  # Ubuntu #
+  # Ubuntu 16.04
   - label: ":ubuntu: Ubuntu 16.04 Tests"
     command:
       - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
@@ -314,6 +290,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
+  # Ubuntu 18.04
   - label: ":ubuntu: Ubuntu 18.04 Tests"
     command:
       - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
@@ -354,7 +331,7 @@ steps:
         workdir: /data/job
     timeout: 60
 
-  - wait:
+  - wait: # Test Metrics
     continue_on_failure: true
 
   - command: |
@@ -493,11 +470,11 @@ steps:
     artifact_paths:
       - "build/packages/eosio.rb"
     timeout: 5
+
   - command: | # Git Submodule Regression Check
         echo "+++ :microscope: Running git submodule regression check" && \
         ./scripts/submodule_check.sh
     label: "Git Submodule Regression Check"
     agents:
       queue: "automation-large-builder-fleet"
-    timeout: 5
-
+    timeout: 5
\ No newline at end of file

From b47ea7e09c637aabc3ad36bd8203496896c19fbd Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 10:59:46 -0400
Subject: [PATCH 0354/1648] Disable pipeline steps not relevant to package
 builder

---
 .buildkite/pipeline.yml | 446 ++++++++++++++++++++--------------------
 1 file changed, 223 insertions(+), 223 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index a124699ecc5..24d8c96dd87 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -42,26 +42,26 @@ steps:
       - "queue=mac-anka-large-node-fleet"
     timeout: 120
 
-  - label: ":aws: Amazon Linux 2 Build"
-    command:
-      - "./scripts/eosio_build.sh -y -P -m"
-      - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.1.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 120
+  # - label: ":aws: Amazon Linux 2 Build"
+  #   command:
+  #     - "./scripts/eosio_build.sh -y -P -m"
+  #     - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   artifact_paths: "build.tar.gz"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.1.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 120
 
   - label: ":centos: CentOS 7 Build"
     command:
@@ -127,221 +127,221 @@ steps:
         workdir: /data/job
     timeout: 120
 
-  - wait
+  # - wait
 
-  # MacOS Mojave
-  - label: ":darwin: [Darwin] Mojave Tests"
-    command:
-      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
-      - "cd eos && ./scripts/parallel-test.sh"
-    agents:
-      - "queue=mac-anka-node-fleet"
-    plugins:
-      chef/anka#v0.4.4:
-        no-volume: true
-        inherit-environment-vars: true
-        bash-interactive: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        always-pull: true
-        debug: true
-        wait-network: true
-    timeout: 120
+  # # MacOS Mojave
+  # - label: ":darwin: [Darwin] Mojave Tests"
+  #   command:
+  #     - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
+  #     - "cd eos && ./scripts/parallel-test.sh"
+  #   agents:
+  #     - "queue=mac-anka-node-fleet"
+  #   plugins:
+  #     chef/anka#v0.4.4:
+  #       no-volume: true
+  #       inherit-environment-vars: true
+  #       bash-interactive: true
+  #       vm-name: $ANKA_MOJAVE_TEMPLATE
+  #       vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+  #       always-pull: true
+  #       debug: true
+  #       wait-network: true
+  #   timeout: 120
 
-  - label: ":darwin: [Darwin] Mojave NP Tests"
-    command:
-      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
-      - "cd eos && ./scripts/serial-test.sh"
-    agents:
-      - "queue=mac-anka-node-fleet"
-    plugins:
-      chef/anka#v0.4.4:
-        no-volume: true
-        inherit-environment-vars: true
-        bash-interactive: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        always-pull: true
-        debug: true
-        wait-network: true
-    timeout: 120
+  # - label: ":darwin: [Darwin] Mojave NP Tests"
+  #   command:
+  #     - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
+  #     - "cd eos && ./scripts/serial-test.sh"
+  #   agents:
+  #     - "queue=mac-anka-node-fleet"
+  #   plugins:
+  #     chef/anka#v0.4.4:
+  #       no-volume: true
+  #       inherit-environment-vars: true
+  #       bash-interactive: true
+  #       vm-name: $ANKA_MOJAVE_TEMPLATE
+  #       vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+  #       always-pull: true
+  #       debug: true
+  #       wait-network: true
+  #   timeout: 120
 
-  # Amazon Linux 2
-  - label: ":aws: Amazon Linux 2 Tests"
-    command:
-      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
-      - "./scripts/parallel-test.sh"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
+  # # Amazon Linux 2
+  # - label: ":aws: Amazon Linux 2 Tests"
+  #   command:
+  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
+  #     - "./scripts/parallel-test.sh"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
 
-  - label: ":aws: Amazon Linux 2 NP Tests"
-    command:
-      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
-      - "./scripts/serial-test.sh"
-    label: ":aws: Amazon Linux 2 NP Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
+  # - label: ":aws: Amazon Linux 2 NP Tests"
+  #   command:
+  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
+  #     - "./scripts/serial-test.sh"
+  #   label: ":aws: Amazon Linux 2 NP Tests"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
 
-  # CentOS
-  - label: ":centos: CentOS 7 Tests"
-    command:
-      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
-      - "./scripts/parallel-test.sh"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
+  # # CentOS
+  # - label: ":centos: CentOS 7 Tests"
+  #   command:
+  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
+  #     - "./scripts/parallel-test.sh"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
 
-  - label: ":centos: CentOS 7 NP Tests"
-    command:
-      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
-      - "./scripts/serial-test.sh"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
+  # - label: ":centos: CentOS 7 NP Tests"
+  #   command:
+  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
+  #     - "./scripts/serial-test.sh"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
 
-  # Ubuntu 16.04
-  - label: ":ubuntu: Ubuntu 16.04 Tests"
-    command:
-      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
-      - "./scripts/parallel-test.sh"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
+  # # Ubuntu 16.04
+  # - label: ":ubuntu: Ubuntu 16.04 Tests"
+  #   command:
+  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
+  #     - "./scripts/parallel-test.sh"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
 
-  - label: ":ubuntu: Ubuntu 16.04 NP Tests"
-    command:
-      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
-      - "./scripts/serial-test.sh"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
+  # - label: ":ubuntu: Ubuntu 16.04 NP Tests"
+  #   command:
+  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
+  #     - "./scripts/serial-test.sh"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
 
-  # Ubuntu 18.04
-  - label: ":ubuntu: Ubuntu 18.04 Tests"
-    command:
-      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
-      - "./scripts/parallel-test.sh"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
+  # # Ubuntu 18.04
+  # - label: ":ubuntu: Ubuntu 18.04 Tests"
+  #   command:
+  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
+  #     - "./scripts/parallel-test.sh"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
 
-  - label: ":ubuntu: Ubuntu 18.04 NP Tests"
-    command:
-      - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
-      - "./scripts/serial-test.sh"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
+  # - label: ":ubuntu: Ubuntu 18.04 NP Tests"
+  #   command:
+  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
+  #     - "./scripts/serial-test.sh"
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
 
-  - wait: # Test Metrics
-    continue_on_failure: true
+  # - wait: # Test Metrics
+  #   continue_on_failure: true
 
-  - command: |
-        cd scripts/metrics
-        node --max-old-space-size=4096 test-metrics.js
-    label: ":bar_chart: Test Metrics"
-    agents:
-      queue: "automation-apps-builder-fleet"
-    timeout: 10
-    soft_fail: true
+  # - command: |
+  #       cd scripts/metrics
+  #       node --max-old-space-size=4096 test-metrics.js
+  #   label: ":bar_chart: Test Metrics"
+  #   agents:
+  #     queue: "automation-apps-builder-fleet"
+  #   timeout: 10
+  #   soft_fail: true
 
   - wait
 

From e85348c70d17ccf6ba123fb77465f87f9898e632 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 13 May 2019 13:01:15 -0400
Subject: [PATCH 0355/1648] Update to appbase with max priority on main thread

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index b6b55f5ff99..26e2a723e50 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit b6b55f5ff993f4be954d2aa556538636fbdaabb4
+Subproject commit 26e2a723e50eb67aa06f1cd88d092f84b00e69d2

From 27ad2ef4cfaeebf6053f67e15bf1625408b9d0e7 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 13 May 2019 13:43:29 -0400
Subject: [PATCH 0356/1648] reverting to using buildkite artifacts instead of
 NAS

---
 .buildkite/pipeline.yml  | 18 +++++++++++-------
 scripts/parallel-test.sh |  2 +-
 scripts/serial-test.sh   |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index af1fc1044de..67f8fbc070a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -3,6 +3,7 @@ env:
   ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
   CHECKSUMABLE: "scripts/eosio_build*"
   MAC_TAG: "eosio_2-4"
+  WORKDIR: "/data/job"
 
 steps:
 
@@ -20,7 +21,7 @@ steps:
       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
       TAG_COMMANDS: "./scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
       PROJECT_TAG: "${MAC_TAG}"
-    timeout: 60
+    timeout: 320
 
   # - trigger: "mac-anka-fleet"
   #   label: ":anka: Ensure Mojave Anka Template Tag Exists"
@@ -45,11 +46,12 @@ steps:
 
   - label: ":darwin: [Darwin] Mojave Build"
     command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
-      - "tar -pczf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz eos"
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m && tar -pczf build.tar.gz build"
+    artifact_paths: "build.tar.gz"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
+        workdir: $WORKDIR
         inherit-environment-vars: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
         vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
@@ -156,13 +158,14 @@ steps:
   # MOJAVE #
   - label: ":darwin: [Darwin] Mojave Tests"
     command:
-      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\""
       - "cd eos && ./scripts/parallel-test.sh"
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
+        workdir: $WORKDIR
         inherit-environment-vars: true
         bash-interactive: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
@@ -174,13 +177,14 @@ steps:
 
   - label: ":darwin: [Darwin] Mojave NP Tests"
     command:
-      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\""
       - "cd eos && ./scripts/serial-test.sh"
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
+        workdir: $WORKDIR
         inherit-environment-vars: true
         bash-interactive: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
@@ -189,7 +193,6 @@ steps:
         debug: true
         wait-network: true
     timeout: 120
-
   # AmazonLinux #
   - label: ":aws: Amazon Linux 2 Tests"
     command:
@@ -464,7 +467,7 @@ steps:
 
   - label: ":darwin: Mojave Package Builder"
     command:
-      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\" && tar -xzf build.tar.gz"
       - "cd eos/build/packages && bash generate_package.sh brew"
       - "cd eos && buildkite-agent artifact upload build/packages/*.tar.gz"
       - "cd eos && buildkite-agent artifact upload build/packages/*.rb"
@@ -473,6 +476,7 @@ steps:
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
+        workdir: $WORKDIR
         inherit-environment-vars: true
         bash-interactive: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index 6adf623707e..34bdc5e4cca 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 echo "+++ Extracting build directory"
 [[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-ls -l build && cd build
+[[ $(uname) == "Darwin" ]] && cd /data/job/eos/build || cd /data/job/build
 echo "+++ Running tests"
 # Counting tests available and if they get disabled for some reason, throw a failure
 TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index 9d280765334..eaf38aa5776 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 echo "+++ Extracting build directory"
 [[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-ls -l build && cd build
+[[ $(uname) == "Darwin" ]] && cd /data/job/eos/build || cd /data/job/build
 echo "+++ Killing old MongoDB"
 $(pgrep mongod | xargs kill -9) || true
 echo "+++ Starting MongoDB"

From 3192d681972d6c9c73348f32bf79d58b0f9d2067 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 14:46:46 -0400
Subject: [PATCH 0357/1648] Moved package builder steps into script

---
 .buildkite/pipeline.yml    | 58 +++++++++++---------------------------
 scripts/package-builder.sh | 49 ++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 41 deletions(-)
 create mode 100755 scripts/package-builder.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 24d8c96dd87..4aed6c7c46f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -24,9 +24,14 @@ steps:
   - wait
 
   - label: ":darwin: [Darwin] Mojave Build"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m"
-      - "tar -pczf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz eos"
+    command: |
+      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+      cd eos
+      git checkout ${BUILDKITE_COMMIT}
+      git submodule update --init --recursive
+      ./scripts/eosio_build.sh -y -P -m
+      tar -pczf build.tar.gz build
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!' && exit 1)
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
@@ -347,23 +352,9 @@ steps:
 
   - label: ":centos: CentOS 7 Package Builder"
     command: |
-        echo "--- :arrow_down: Downloading build directory"
-        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        yum install -y rpm-build
-        mkdir -p /root/rpmbuild/BUILD
-        mkdir -p /root/rpmbuild/BUILDROOT
-        mkdir -p /root/rpmbuild/RPMS
-        mkdir -p /root/rpmbuild/SOURCES
-        mkdir -p /root/rpmbuild/SPECS
-        mkdir -p /root/rpmbuild/SRPMS
-        cd /data/job/build/packages
-        bash generate_package.sh rpm
+      ./scripts/package-builder.sh ':centos: CentOS 7 Build'
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "build/packages/*.rpm"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -382,17 +373,10 @@ steps:
     timeout: 60
 
   - command: | # Ubuntu 16.04 Package Builder
-        echo "--- :arrow_down: Downloading build directory"
-        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 16.04 Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        cd /data/job/build/packages
-        bash generate_package.sh deb
+      ./scripts/package-builder.sh ':ubuntu: Ubuntu 16.04 Build'
     label: ":ubuntu: Ubuntu 16.04 Package Builder"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "build/packages/*.deb"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -411,17 +395,10 @@ steps:
     timeout: 60
 
   - command: | # Ubuntu 18.04 Package Builder
-        echo "--- :arrow_down: Downloading build directory"
-        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 18.04 Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        cd /data/job/build/packages
-        bash generate_package.sh deb
+      ./scripts/package-builder.sh ':ubuntu: Ubuntu 18.04 Build'
     label: ":ubuntu: Ubuntu 18.04 Package Builder"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "build/packages/*.deb"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -440,11 +417,10 @@ steps:
     timeout: 60
 
   - label: ":darwin: Mojave Package Builder"
-    command:
-      - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
-      - "cd eos/build/packages && bash generate_package.sh brew"
-      - "cd eos && buildkite-agent artifact upload build/packages/*.tar.gz"
-      - "cd eos && buildkite-agent artifact upload build/packages/*.rb"
+    command: |
+      [[ -d eos ]] && cd eos
+      ln -s "$(pwd)" /data/job
+      ./scripts/package-builder.sh ':darwin: [Darwin] Mojave Build'
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
@@ -457,13 +433,13 @@ steps:
         always-pull: true
         debug: true
         wait-network: true
-    timeout: 120
+    timeout: 60
 
   - wait
 
   - command: | # Brew Updater
         echo "--- :arrow_down: Downloading brew files"
-        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
+        buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
     label: ":darwin: Brew Updater"
     agents:
       queue: "automation-large-builder-fleet"
diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
new file mode 100755
index 00000000000..eb3d141d795
--- /dev/null
+++ b/scripts/package-builder.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
+echo '+++ :evergreen_tree: Configuring Environment'
+[[ "$BUILD_STEP" == '' ]] && BUILD_STEP="$1"
+[[ "$BUILD_STEP" == '' ]] && (echo '+++ :no_entry: ERROR: Build step name must be given as BUILD_STEP or argument 1!' && exit 1)
+if [[ "$(uname)" == 'Darwin' ]]; then
+    echo 'Darwin family detected, building for brew.'
+    ARTIFACT='build/packages/*.rb;build/packages/*.tar.gz'
+    PACKAGE_TYPE='brew'
+else
+    . /etc/os-release
+    if [[ "$ID_LIKE" == 'rhel fedora' ]]; then
+        echo 'Fedora family detected, building for RPM.'
+        ARTIFACT='build/packages/*.rpm'
+        PACKAGE_TYPE='brew'
+        mkdir -p /root/rpmbuild/BUILD
+        mkdir -p /root/rpmbuild/BUILDROOT
+        mkdir -p /root/rpmbuild/RPMS
+        mkdir -p /root/rpmbuild/SOURCES
+        mkdir -p /root/rpmbuild/SPECS
+        mkdir -p /root/rpmbuild/SRPMS
+        yum install -y rpm-build
+    elif [[ "$ID_LIKE" == 'debian' ]]; then
+        echo 'Debian family detected, building for dpkg.'
+        ARTIFACT='build/packages/*.deb'
+        PACKAGE_TYPE='deb'
+    else
+        echo '+++ :no_entry: ERROR: Could not determine which operating system this script is running on!'
+        echo '$ uname'
+        uname
+        echo '$ echo $ID_LIKE'
+        echo $ID_LIKE
+        echo '$ cat /etc/os-release'
+        cat /etc/os-release
+        echo 'Exiting...'
+        exit 1
+    fi
+fi
+cd /data/job/build/packages
+echo "+++ :arrow_down: Downloading Build Directory"
+buildkite-agent artifact download build.tar.gz . --step "$BUILD_STEP"
+echo "+++ :compression: Extracting Build Directory"
+tar -zxf build.tar.gz
+echo "+++ :package: Starting Package Build"
+generate_package.sh "$PACKAGE_TYPE"
+echo '+++ :arrow_up: Uploading Artifacts'
+cd /data/job
+buildkite-agent artifact upload \"$ARTIFACT\"
+echo "+++ :white_check_mark: Done."
\ No newline at end of file

From 97baab52f5e3bc5e11963a7c6f07f21f33f369a4 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 12 May 2019 20:08:59 -0400
Subject: [PATCH 0358/1648] (softfloat sync) clean up strict-aliasing rules
 warnings

this causes a lot of warnings on gcc7
---
 libraries/softfloat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/softfloat b/libraries/softfloat
index 203b6df7ded..94dac6e56c9 160000
--- a/libraries/softfloat
+++ b/libraries/softfloat
@@ -1 +1 @@
-Subproject commit 203b6df7dedc5bae1b2a7b1b23562335a6344578
+Subproject commit 94dac6e56c980a99e3e38bdff89a94600de0066d

From eade2bad34385a4d086e6c601132f35e44e70eab Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 14:54:45 -0400
Subject: [PATCH 0359/1648] Added environment variable that skips mac steps

---
 .buildkite/pipeline.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4aed6c7c46f..7e4397a6431 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,6 +5,8 @@ env:
   MAC_TAG: "eosio_2-4"
 
 steps:
+  - wait
+
   - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
@@ -20,6 +22,7 @@ steps:
       TAG_COMMANDS: "./scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
       PROJECT_TAG: "${MAC_TAG}"
     timeout: 60
+    skip: $SKIP_MOJAVE
 
   - wait
 
@@ -46,6 +49,7 @@ steps:
     agents:
       - "queue=mac-anka-large-node-fleet"
     timeout: 120
+    skip: $SKIP_MOJAVE
 
   # - label: ":aws: Amazon Linux 2 Build"
   #   command:
@@ -152,6 +156,7 @@ steps:
   #       debug: true
   #       wait-network: true
   #   timeout: 120
+  #   skip: $SKIP_MOJAVE
 
   # - label: ":darwin: [Darwin] Mojave NP Tests"
   #   command:
@@ -170,6 +175,7 @@ steps:
   #       debug: true
   #       wait-network: true
   #   timeout: 120
+  #   skip: $SKIP_MOJAVE
 
   # # Amazon Linux 2
   # - label: ":aws: Amazon Linux 2 Tests"
@@ -434,6 +440,7 @@ steps:
         debug: true
         wait-network: true
     timeout: 60
+    skip: $SKIP_MOJAVE
 
   - wait
 
@@ -446,6 +453,7 @@ steps:
     artifact_paths:
       - "build/packages/eosio.rb"
     timeout: 5
+    skip: $SKIP_MOJAVE
 
   - command: | # Git Submodule Regression Check
         echo "+++ :microscope: Running git submodule regression check" && \

From 4cd9879a1285083e21ef631130f8f8da6d6dec93 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 13 May 2019 15:09:59 -0400
Subject: [PATCH 0360/1648] 12 cores for ensure

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 67f8fbc070a..12dba25d49f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -10,7 +10,7 @@ steps:
   - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash"
+      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G"
     agents:
       - "queue=mac-anka-templater-fleet"
     env:

From ec9d074edda944cae5bd9b918b2af565b1e0b0ec Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 13 May 2019 15:15:36 -0400
Subject: [PATCH 0361/1648] fix for script

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 12dba25d49f..e6f4b8fe720 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -10,7 +10,7 @@ steps:
   - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G"
+      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a \"-n\""
     agents:
       - "queue=mac-anka-templater-fleet"
     env:
@@ -19,7 +19,7 @@ steps:
       CHECKSUMABLE: "${CHECKSUMABLE}"
       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-      TAG_COMMANDS: "./scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -f -m && cd .. && rm -rf eos" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
       PROJECT_TAG: "${MAC_TAG}"
     timeout: 320
 

From 27791efa3b02691a6a042be500f915097f75b451 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 15:20:51 -0400
Subject: [PATCH 0362/1648] Fix path error

---
 scripts/package-builder.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index eb3d141d795..f59bff51630 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -36,14 +36,15 @@ else
         exit 1
     fi
 fi
-cd /data/job/build/packages
 echo "+++ :arrow_down: Downloading Build Directory"
 buildkite-agent artifact download build.tar.gz . --step "$BUILD_STEP"
 echo "+++ :compression: Extracting Build Directory"
+[[ -d build ]] && rm -rf build
 tar -zxf build.tar.gz
 echo "+++ :package: Starting Package Build"
+cd build/packages
 generate_package.sh "$PACKAGE_TYPE"
 echo '+++ :arrow_up: Uploading Artifacts'
-cd /data/job
+cd ../..
 buildkite-agent artifact upload \"$ARTIFACT\"
 echo "+++ :white_check_mark: Done."
\ No newline at end of file

From 6dd7a9afb6771b5e2eaa836da1c8aa858d57de85 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 15:35:56 -0400
Subject: [PATCH 0363/1648] Fix relative path to generate_package.sh

---
 scripts/package-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index f59bff51630..5a83b9d4b9b 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -43,7 +43,7 @@ echo "+++ :compression: Extracting Build Directory"
 tar -zxf build.tar.gz
 echo "+++ :package: Starting Package Build"
 cd build/packages
-generate_package.sh "$PACKAGE_TYPE"
+./generate_package.sh "$PACKAGE_TYPE"
 echo '+++ :arrow_up: Uploading Artifacts'
 cd ../..
 buildkite-agent artifact upload \"$ARTIFACT\"

From fee83de0be43eaf4240c48decba6c60996695100 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 16:11:01 -0400
Subject: [PATCH 0364/1648] Fix permissions issue

---
 scripts/package-builder.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 5a83b9d4b9b..13f40aef2f7 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -43,6 +43,7 @@ echo "+++ :compression: Extracting Build Directory"
 tar -zxf build.tar.gz
 echo "+++ :package: Starting Package Build"
 cd build/packages
+chmod 755 ./*.sh
 ./generate_package.sh "$PACKAGE_TYPE"
 echo '+++ :arrow_up: Uploading Artifacts'
 cd ../..

From c35b9449cf34b2d3e372ff20e3cdfcb4dfe6fb37 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 13 May 2019 17:45:37 -0400
Subject: [PATCH 0365/1648] more fixes, into tester.  need to go back and add
 new intrinsic

---
 libraries/chain/block_header_state.cpp        |  4 +-
 libraries/chain/controller.cpp                | 34 +++++++----
 libraries/chain/fork_database.cpp             |  4 +-
 .../eosio/chain/block_header_state.hpp        |  2 +-
 .../chain/include/eosio/chain/controller.hpp  |  8 +--
 .../eosio/chain/global_property_object.hpp    | 29 +++++++++
 .../include/eosio/chain/producer_schedule.hpp | 60 ++++++++++++++++---
 libraries/chain/include/eosio/chain/types.hpp |  3 +
 .../testing/include/eosio/testing/tester.hpp  |  5 +-
 libraries/testing/tester.cpp                  |  9 ++-
 10 files changed, 122 insertions(+), 36 deletions(-)

diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index 70e89954257..b1626f657c0 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -167,7 +167,7 @@ namespace eosio { namespace chain {
    signed_block_header pending_block_header_state::make_block_header(
                                                       const checksum256_type& transaction_mroot,
                                                       const checksum256_type& action_mroot,
-                                                      std::optional<producer_authority_schedule>&& new_producers,
+                                                      const optional<producer_authority_schedule>& new_producers,
                                                       vector<digest_type>&& new_protocol_feature_activations,
                                                       const protocol_feature_set& pfs
    )const
@@ -198,7 +198,7 @@ namespace eosio { namespace chain {
             // add the header extension to update the block schedule
             h.header_extensions.emplace_back(
                   producer_schedule_change_extension::extension_id(),
-                  fc::raw::pack( producer_schedule_change_extension( std::move(*new_producers) ) )
+                  fc::raw::pack( producer_schedule_change_extension( *new_producers ) )
             );
          } else {
             legacy::producer_schedule_type downgraded_producers;
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 22c31ad18a7..c1e3df7e50f 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -125,6 +125,9 @@ struct assembled_block {
    pending_block_header_state        _pending_block_header_state;
    vector<transaction_metadata_ptr>  _trx_metas;
    signed_block_ptr                  _unsigned_block;
+
+   // if the _unsigned_block pre-dates block-signing authorities this may be present.
+   optional<producer_authority_schedule> _new_producer_authority_cache;
 };
 
 struct completed_block {
@@ -427,7 +430,7 @@ struct controller_impl {
     */
    void initialize_blockchain_state() {
       wlog( "Initializing new blockchain with genesis state" );
-      producer_authority_schedule initial_schedule{ 0, {producer_authority_v0{config::system_account_name, 1, {{conf.genesis.initial_key, 1}} } } };
+      producer_authority_schedule initial_schedule = { 0, { producer_authority{config::system_account_name, block_signing_authority_v0{ 1, {{conf.genesis.initial_key, 1}} } } } };
 
       block_header_state genheader;
       genheader.active_schedule                = initial_schedule;
@@ -1537,8 +1540,9 @@ struct controller_impl {
       auto block_ptr = std::make_shared<signed_block>( pbhs.make_block_header(
          calculate_trx_merkle(),
          calculate_action_merkle(),
-         std::move( bb._new_pending_producer_schedule ),
-         std::move( bb._new_protocol_feature_activations )
+         bb._new_pending_producer_schedule,
+         std::move( bb._new_protocol_feature_activations ),
+         protocol_features.get_protocol_feature_set()
       ) );
 
       block_ptr->transactions = std::move( bb._pending_trx_receipts );
@@ -1566,7 +1570,8 @@ struct controller_impl {
                                  id,
                                  std::move( bb._pending_block_header_state ),
                                  std::move( bb._pending_trx_metas ),
-                                 std::move( block_ptr )
+                                 std::move( block_ptr ),
+                                 std::move( bb._new_pending_producer_schedule )
                               };
    } FC_CAPTURE_AND_RETHROW() } /// finalize_block
 
@@ -1746,6 +1751,7 @@ struct controller_impl {
                         std::move( ab._pending_block_header_state ),
                         b,
                         std::move( ab._trx_metas ),
+                        protocol_features.get_protocol_feature_set(),
                         []( block_timestamp_type timestamp,
                             const flat_set<digest_type>& cur_features,
                             const vector<digest_type>& new_features )
@@ -1782,6 +1788,7 @@ struct controller_impl {
          return std::make_shared<block_state>(
                         *prev,
                         move( b ),
+                        control->protocol_features.get_protocol_feature_set(),
                         [control]( block_timestamp_type timestamp,
                                    const flat_set<digest_type>& cur_features,
                                    const vector<digest_type>& new_features )
@@ -1837,6 +1844,7 @@ struct controller_impl {
          auto bsp = std::make_shared<block_state>(
                         *head,
                         b,
+                        protocol_features.get_protocol_feature_set(),
                         [this]( block_timestamp_type timestamp,
                                 const flat_set<digest_type>& cur_features,
                                 const vector<digest_type>& new_features )
@@ -1982,7 +1990,7 @@ struct controller_impl {
       auto update_permission = [&]( auto& permission, auto threshold ) {
          auto auth = authority( threshold, {}, {});
          for( auto& p : producers ) {
-            auth.accounts.push_back({{p.producer_name, config::active_name}, 1});
+            auth.accounts.push_back({{p.name, config::active_name}, 1});
          }
 
          if( static_cast<authority>(permission.auth) != auth ) { // TODO: use a more efficient way to check that authority has not changed
@@ -2442,6 +2450,7 @@ block_state_ptr controller::finalize_block( const std::function<signature_type(
                   std::move( ab._pending_block_header_state ),
                   std::move( ab._unsigned_block ),
                   std::move( ab._trx_metas ),
+                  my->protocol_features.get_protocol_feature_set(),
                   []( block_timestamp_type timestamp,
                       const flat_set<digest_type>& cur_features,
                       const vector<digest_type>& new_features )
@@ -2602,13 +2611,13 @@ account_name controller::pending_block_producer()const {
    return my->pending->get_pending_block_header_state().producer;
 }
 
-flat_set<public_key_type> controller::pending_block_signing_keys()const {
+const block_signing_authority& controller::pending_block_signing_authority()const {
    EOS_ASSERT( my->pending, block_validate_exception, "no pending block" );
 
    if( my->pending->_block_stage.contains<completed_block>() )
-      return my->pending->_block_stage.get<completed_block>()._block_state->block_signing_keys;
+      return my->pending->_block_stage.get<completed_block>()._block_state->valid_block_signing_authority;
 
-   return my->pending->get_pending_block_header_state().block_signing_keys;
+   return my->pending->get_pending_block_header_state().valid_block_signing_authority;
 }
 
 optional<block_id_type> controller::pending_producer_block_id()const {
@@ -2785,7 +2794,7 @@ const producer_authority_schedule&    controller::active_producers()const {
    return my->pending->get_pending_block_header_state().active_schedule;
 }
 
-const producer_authority_schedule&    controller::pending_producers()const {
+const producer_authority_schedule& controller::pending_producers()const {
    if( !(my->pending) )
       return  my->head->pending_schedule.schedule;
 
@@ -2798,9 +2807,10 @@ const producer_authority_schedule&    controller::pending_producers()const {
          if (exts.count(producer_schedule_change_extension::extension_id()))
             return exts.lower_bound(producer_schedule_change_extension::extension_id())->second.get<producer_schedule_change_extension>();
       } else {
-         const auto& np = my->pending->_block_stage.get<assembled_block>()._unsigned_block->new_producers;
-         if( np )
-            return *np;
+         const auto& new_prods_cache = my->pending->_block_stage.get<assembled_block>()._new_producer_authority_cache;
+         if( new_prods_cache ) {
+            return *new_prods_cache;
+         }
       }
    }
 
diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
index 1fe7459dfae..611a46732e4 100644
--- a/libraries/chain/fork_database.cpp
+++ b/libraries/chain/fork_database.cpp
@@ -314,8 +314,8 @@ namespace eosio { namespace chain {
          try {
             const auto& exts = n->header_exts;
 
-            if( exts.size() > 0 ) {
-               const auto& new_protocol_features = exts.front().get<protocol_feature_activation>().protocol_features;
+            if( exts.count(protocol_feature_activation::extension_id()) > 0 ) {
+               const auto& new_protocol_features = exts.lower_bound(protocol_feature_activation::extension_id())->second.get<protocol_feature_activation>().protocol_features;
                validator( n->header.timestamp, prev_bh->activated_protocol_features->protocol_features, new_protocol_features );
             }
          } EOS_RETHROW_EXCEPTIONS( fork_database_exception, "serialized fork database is incompatible with configured protocol features"  )
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 46e8145bf57..02de9adad44 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -40,7 +40,7 @@ struct pending_block_header_state : public detail::block_header_state_common {
 
    signed_block_header make_block_header( const checksum256_type& transaction_mroot,
                                           const checksum256_type& action_mroot,
-                                          std::optional<producer_authority_schedule>&& new_producers,
+                                          const optional<producer_authority_schedule>& new_producers,
                                           vector<digest_type>&& new_protocol_feature_activations,
                                           const protocol_feature_set& pfs)const;
 
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index d9606e5dd0b..7611a91d261 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -205,10 +205,10 @@ namespace eosio { namespace chain {
          time_point           fork_db_pending_head_block_time()const;
          account_name         fork_db_pending_head_block_producer()const;
 
-         time_point              pending_block_time()const;
-         account_name            pending_block_producer()const;
-         public_key_type         pending_block_signing_key()const;
-         optional<block_id_type> pending_producer_block_id()const;
+         time_point                     pending_block_time()const;
+         account_name                   pending_block_producer()const;
+         const block_signing_authority& pending_block_signing_authority()const;
+         optional<block_id_type>        pending_producer_block_id()const;
 
          const vector<transaction_receipt>& get_pending_trx_receipts()const;
 
diff --git a/libraries/chain/include/eosio/chain/global_property_object.hpp b/libraries/chain/include/eosio/chain/global_property_object.hpp
index a8d0bac9cb1..56281da86c3 100644
--- a/libraries/chain/include/eosio/chain/global_property_object.hpp
+++ b/libraries/chain/include/eosio/chain/global_property_object.hpp
@@ -11,6 +11,7 @@
 #include <eosio/chain/chain_config.hpp>
 #include <eosio/chain/producer_schedule.hpp>
 #include <eosio/chain/incremental_merkle.hpp>
+#include <eosio/chain/snapshot.hpp>
 #include <chainbase/chainbase.hpp>
 #include "multi_index_includes.hpp"
 
@@ -43,6 +44,30 @@ namespace eosio { namespace chain {
       >
    >;
 
+   struct snapshot_global_property_object {
+      optional<block_num_type>            proposed_schedule_block_num;
+      producer_authority_schedule         proposed_schedule;
+      chain_config                        configuration;
+   };
+
+   namespace detail {
+      template<>
+      struct snapshot_row_traits<global_property_object> {
+         using value_type = global_property_object;
+         using snapshot_type = snapshot_global_property_object;
+
+         static snapshot_global_property_object to_snapshot_row( const global_property_object& value, const chainbase::database& ) {
+            return {value.proposed_schedule_block_num, (producer_authority_schedule)value.proposed_schedule, value.configuration};
+         }
+
+         static void from_snapshot_row( snapshot_global_property_object&& row, global_property_object& value, chainbase::database& ) {
+            value.proposed_schedule_block_num = row.proposed_schedule_block_num;
+            value.proposed_schedule = row.proposed_schedule;
+            value.configuration = row.configuration;
+         }
+      };
+   }
+
    /**
     * @class dynamic_global_property_object
     * @brief Maintains global state information that frequently change
@@ -76,6 +101,10 @@ FC_REFLECT(eosio::chain::global_property_object,
             (proposed_schedule_block_num)(proposed_schedule)(configuration)
           )
 
+FC_REFLECT(eosio::chain::snapshot_global_property_object,
+            (proposed_schedule_block_num)(proposed_schedule)(configuration)
+          )
+
 FC_REFLECT(eosio::chain::dynamic_global_property_object,
             (global_action_sequence)
           )
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index d79bd127b69..46801564099 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -3,6 +3,7 @@
 #include <eosio/chain/types.hpp>
 #include <chainbase/chainbase.hpp>
 #include <eosio/chain/authority.hpp>
+#include <eosio/chain/snapshot.hpp>
 
 namespace eosio { namespace chain {
 
@@ -76,6 +77,11 @@ namespace eosio { namespace chain {
    };
 
    struct shared_block_signing_authority_v0 {
+      shared_block_signing_authority_v0( const shared_block_signing_authority_v0& ) = default;
+      shared_block_signing_authority_v0( shared_block_signing_authority_v0&& ) = default;
+      shared_block_signing_authority_v0& operator= ( shared_block_signing_authority_v0 && ) = default;
+      shared_block_signing_authority_v0& operator= ( const shared_block_signing_authority_v0 & ) = default;
+
       shared_block_signing_authority_v0( chainbase::allocator<char> alloc )
       :keys(alloc){}
 
@@ -93,8 +99,19 @@ namespace eosio { namespace chain {
    using shared_block_signing_authority = static_variant<shared_block_signing_authority_v0>;
 
    struct shared_producer_authority {
-      name                           name;
-      shared_block_signing_authority authority;
+      shared_producer_authority() = default;
+      shared_producer_authority( const shared_producer_authority& ) = default;
+      shared_producer_authority( shared_producer_authority&& ) = default;
+      shared_producer_authority& operator= ( shared_producer_authority && ) = default;
+      shared_producer_authority& operator= ( const shared_producer_authority & ) = default;
+
+      shared_producer_authority( const name& name, shared_block_signing_authority&& authority )
+      :name(name)
+      ,authority(std::forward<shared_block_signing_authority>(authority))
+      {}
+
+      name                                     name;
+      shared_block_signing_authority           authority;
 
       friend bool operator == ( const shared_producer_authority& lhs, const shared_producer_authority& rhs ) {
          return tie( lhs.name, lhs.authority ) == tie( rhs.name, rhs.authority );
@@ -150,13 +167,11 @@ namespace eosio { namespace chain {
       template<>
       struct shared_converter<producer_authority> {
          static shared_producer_authority convert (chainbase::allocator<char> alloc, const producer_authority& src) {
-            shared_producer_authority result;
-            result.name = src.name;
-            result.authority = src.authority.visit([&result, &alloc](const auto& a) {
+            auto authority = src.authority.visit([&alloc](const auto& a) {
                 return shared_convert(alloc, a);
             });
 
-            return result;
+            return shared_producer_authority(src.name, std::move(authority));
          }
 
       };
@@ -166,7 +181,7 @@ namespace eosio { namespace chain {
          static producer_authority convert (const shared_producer_authority& src) {
             producer_authority result;
             result.name = src.name;
-            result.authority = src.authority.visit([&result](const auto& a) {
+            result.authority = src.authority.visit([](const auto& a) {
                return shared_convert(a);
             });
 
@@ -189,6 +204,11 @@ namespace eosio { namespace chain {
             producers.emplace_back(producer_authority{ p.producer_name, block_signing_authority_v0{ 1, {{p.block_signing_key, 1}} } });
       }
 
+      producer_authority_schedule( uint32_t version,  std::initializer_list<producer_authority> producers )
+      :version(version)
+      ,producers(producers)
+      {}
+
       uint32_t                                       version = 0; ///< sequentially incrementing version number
       vector<producer_authority>                     producers;
 
@@ -222,7 +242,7 @@ namespace eosio { namespace chain {
       producer_schedule_change_extension(const producer_schedule_change_extension&) = default;
       producer_schedule_change_extension( producer_schedule_change_extension&& ) = default;
 
-      producer_schedule_change_extension( producer_authority_schedule&& sched )
+      producer_schedule_change_extension( const producer_authority_schedule& sched )
       :producer_authority_schedule(sched) {}
    };
 
@@ -232,6 +252,12 @@ namespace eosio { namespace chain {
       shared_producer_authority_schedule( chainbase::allocator<char> alloc )
       :producers(alloc){}
 
+      shared_producer_authority_schedule( const shared_producer_authority_schedule& ) = default;
+      shared_producer_authority_schedule( shared_producer_authority_schedule&& ) = default;
+      shared_producer_authority_schedule& operator= ( shared_producer_authority_schedule && ) = default;
+      shared_producer_authority_schedule& operator= ( const shared_producer_authority_schedule & ) = default;
+
+
       shared_producer_authority_schedule& operator=( const producer_authority_schedule& a ) {
          version = a.version;
          producers.clear();
@@ -262,6 +288,21 @@ namespace eosio { namespace chain {
       shared_vector<shared_producer_authority>       producers;
    };
 
+   inline bool operator == ( const producer_authority& pa, const shared_producer_authority& pb )
+   {
+      if(pa.name != pb.name) return false;
+      if(pa.authority.which() != pb.authority.which()) return false;
+
+      bool authority_matches = pa.authority.visit([&pb]( const auto& lhs ){
+         return pb.authority.visit( [&lhs](const auto& rhs ) {
+            if (lhs.threshold != rhs.threshold) return false;
+            return std::equal(lhs.keys.cbegin(), lhs.keys.cend(), rhs.keys.cbegin(), rhs.keys.cend());
+         });
+      });
+
+      if (!authority_matches) return false;
+      return true;
+   }
 
 } } /// eosio::chain
 
@@ -271,5 +312,8 @@ FC_REFLECT( eosio::chain::block_signing_authority_v0, (threshold)(keys))
 FC_REFLECT( eosio::chain::producer_authority, (name)(authority) )
 FC_REFLECT( eosio::chain::producer_authority_schedule, (version)(producers) )
 FC_REFLECT_DERIVED( eosio::chain::producer_schedule_change_extension, (eosio::chain::producer_authority_schedule), )
+
+FC_REFLECT( eosio::chain::shared_block_signing_authority_v0, (threshold)(keys))
+FC_REFLECT( eosio::chain::shared_producer_authority, (name)(authority) )
 FC_REFLECT( eosio::chain::shared_producer_authority_schedule, (version)(producers) )
 
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index 2063e7ce3e0..bb1cf10d843 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -88,6 +88,8 @@ namespace eosio { namespace chain {
    using private_key_type = fc::crypto::private_key;
    using signature_type   = fc::crypto::signature;
 
+   struct void_t{};
+
    using chainbase::allocator;
    using shared_string = boost::interprocess::basic_string<char, std::char_traits<char>, allocator<char>>;
    template<typename T>
@@ -373,3 +375,4 @@ namespace eosio { namespace chain {
 
 } }  // eosio::chain
 
+FC_REFLECT_EMPTY( eosio::chain::void_t )
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index cda857ff2c2..fef4d5e2042 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -169,8 +169,9 @@ namespace eosio { namespace testing {
 
          void                  set_before_preactivate_bios_contract();
          void                  set_bios_contract();
-         vector<producer_key>  get_producer_keys( const vector<account_name>& producer_names )const;
-         transaction_trace_ptr set_producers(const vector<account_name>& producer_names);
+
+         vector<producer_authority>  get_producer_authorities( const vector<account_name>& producer_names )const;
+         transaction_trace_ptr       set_producers(const vector<account_name>& producer_names);
 
          void link_authority( account_name account, account_name code,  permission_name req, action_name type = "" );
          void unlink_authority( account_name account, account_name code, action_name type = "" );
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 7bc83662dc3..3281059360d 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -951,18 +951,17 @@ namespace eosio { namespace testing {
    }
 
 
-   vector<producer_key> base_tester::get_producer_keys( const vector<account_name>& producer_names )const {
+   vector<producer_authority> base_tester::get_producer_authorities( const vector<account_name>& producer_names )const {
        // Create producer schedule
-       vector<producer_key> schedule;
+       vector<producer_authority> schedule;
        for (auto& producer_name: producer_names) {
-           producer_key pk = { producer_name, get_public_key( producer_name, "active" )};
-           schedule.emplace_back(pk);
+          schedule.emplace_back(producer_authority{ producer_name, block_signing_authority_v0{1, {{ get_public_key( producer_name, "active" ), 1}} } });
        }
        return schedule;
    }
 
    transaction_trace_ptr base_tester::set_producers(const vector<account_name>& producer_names) {
-      auto schedule = get_producer_keys( producer_names );
+      auto schedule = get_producer_authorities( producer_names );
 
       return push_action( config::system_account_name, N(setprods), config::system_account_name,
                           fc::mutable_variant_object()("schedule", schedule));

From 90dae79b1cbdb3f0887882affed4392fa4524df7 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 17:52:16 -0400
Subject: [PATCH 0366/1648] Fixed copy-pasta error where Fedora-like operating
 systems built for brew instead of RPM

---
 scripts/package-builder.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 13f40aef2f7..ff4e936b48c 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -12,7 +12,7 @@ else
     if [[ "$ID_LIKE" == 'rhel fedora' ]]; then
         echo 'Fedora family detected, building for RPM.'
         ARTIFACT='build/packages/*.rpm'
-        PACKAGE_TYPE='brew'
+        PACKAGE_TYPE='rpm'
         mkdir -p /root/rpmbuild/BUILD
         mkdir -p /root/rpmbuild/BUILDROOT
         mkdir -p /root/rpmbuild/RPMS
@@ -28,8 +28,7 @@ else
         echo '+++ :no_entry: ERROR: Could not determine which operating system this script is running on!'
         echo '$ uname'
         uname
-        echo '$ echo $ID_LIKE'
-        echo $ID_LIKE
+        echo "ID_LIKE=\"$ID_LIKE\""
         echo '$ cat /etc/os-release'
         cat /etc/os-release
         echo 'Exiting...'

From a4eab234456fb14e4e7483cd93dc43327f0c6ceb Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 18:05:16 -0400
Subject: [PATCH 0367/1648] Added Nodeos "Version Label" Integration Test

---
 .buildkite/pipeline.yml | 203 ++++++++++++++++++++--------------------
 tests/CMakeLists.txt    |   2 +
 tests/version-label.sh  |  69 ++++++++++++++
 3 files changed, 175 insertions(+), 99 deletions(-)
 create mode 100755 tests/version-label.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 7e4397a6431..02ed1cef3b9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -138,25 +138,26 @@ steps:
 
   # - wait
 
-  # # MacOS Mojave
-  # - label: ":darwin: [Darwin] Mojave Tests"
-  #   command:
-  #     - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
-  #     - "cd eos && ./scripts/parallel-test.sh"
-  #   agents:
-  #     - "queue=mac-anka-node-fleet"
-  #   plugins:
-  #     chef/anka#v0.4.4:
-  #       no-volume: true
-  #       inherit-environment-vars: true
-  #       bash-interactive: true
-  #       vm-name: $ANKA_MOJAVE_TEMPLATE
-  #       vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-  #       always-pull: true
-  #       debug: true
-  #       wait-network: true
-  #   timeout: 120
-  #   skip: $SKIP_MOJAVE
+  # MacOS Mojave
+  - label: ":darwin: [Darwin] Mojave Tests"
+    command: |
+      cd eos
+      buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
+      ./scripts/parallel-test.sh
+    agents:
+      - "queue=mac-anka-node-fleet"
+    plugins:
+      chef/anka#v0.4.4:
+        no-volume: true
+        inherit-environment-vars: true
+        bash-interactive: true
+        vm-name: $ANKA_MOJAVE_TEMPLATE
+        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+        always-pull: true
+        debug: true
+        wait-network: true
+    timeout: 120
+    skip: $SKIP_MOJAVE
 
   # - label: ":darwin: [Darwin] Mojave NP Tests"
   #   command:
@@ -177,26 +178,27 @@ steps:
   #   timeout: 120
   #   skip: $SKIP_MOJAVE
 
-  # # Amazon Linux 2
-  # - label: ":aws: Amazon Linux 2 Tests"
-  #   command:
-  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
-  #     - "./scripts/parallel-test.sh"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
+  # Amazon Linux 2
+  - label: ":aws: Amazon Linux 2 Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
+      ./scripts/parallel-test.sh
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
 
   # - label: ":aws: Amazon Linux 2 NP Tests"
   #   command:
@@ -219,26 +221,27 @@ steps:
   #       workdir: /data/job
   #   timeout: 60
 
-  # # CentOS
-  # - label: ":centos: CentOS 7 Tests"
-  #   command:
-  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
-  #     - "./scripts/parallel-test.sh"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
+  # CentOS
+  - label: ":centos: CentOS 7 Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
+      ./scripts/parallel-test.sh
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
 
   # - label: ":centos: CentOS 7 NP Tests"
   #   command:
@@ -260,26 +263,27 @@ steps:
   #       workdir: /data/job
   #   timeout: 60
 
-  # # Ubuntu 16.04
-  # - label: ":ubuntu: Ubuntu 16.04 Tests"
-  #   command:
-  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
-  #     - "./scripts/parallel-test.sh"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
+  # Ubuntu 16.04
+  - label: ":ubuntu: Ubuntu 16.04 Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
+      ./scripts/parallel-test.sh
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
 
   # - label: ":ubuntu: Ubuntu 16.04 NP Tests"
   #   command:
@@ -301,26 +305,27 @@ steps:
   #       workdir: /data/job
   #   timeout: 60
 
-  # # Ubuntu 18.04
-  # - label: ":ubuntu: Ubuntu 18.04 Tests"
-  #   command:
-  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
-  #     - "./scripts/parallel-test.sh"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
+  # Ubuntu 18.04
+  - label: ":ubuntu: Ubuntu 18.04 Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
+      ./scripts/parallel-test.sh
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
 
   # - label: ":ubuntu: Ubuntu 18.04 NP Tests"
   #   command:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cf7a9e85c76..0d6b8f78045 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -49,6 +49,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/validate-dirty-db.py ${CMAKE_CURRENT_
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/launcher_test.py ${CMAKE_CURRENT_BINARY_DIR}/launcher_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.sh ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/prod_preactivation_test.py ${CMAKE_CURRENT_BINARY_DIR}/prod_preactivation_test.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-label.sh ${CMAKE_CURRENT_BINARY_DIR}/version-label.sh COPYONLY)
 
 #To run plugin_test with all log from blockchain displayed, put --verbose after --, i.e. plugin_test -- --verbose
 add_test(NAME plugin_test COMMAND plugin_test --report_level=detailed --color_output)
@@ -86,6 +87,7 @@ set_property(TEST validate_dirty_db_test PROPERTY LABELS nonparallelizable_tests
 add_test(NAME launcher_test COMMAND tests/launcher_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST launcher_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME version-label-test COMMAND tests/version-label.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # Long running tests
 add_test(NAME nodeos_sanity_lr_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
diff --git a/tests/version-label.sh b/tests/version-label.sh
new file mode 100755
index 00000000000..366de2e4305
--- /dev/null
+++ b/tests/version-label.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
+# The purpose of this test is to ensure that the output of the "nodeos --version" command matches the 
+# If the environment variable BUILDKITE_TAG is empty or unset, this test will echo success
+echo '##### Nodeos Version Label Test #####'
+if [[ "$BUILDKITE_TAG" == '' || "$BUILDKITE" != 'true' ]]; then
+    echo 'This test is only run in Buildkite against tagged builds.'
+    [[ "$BUILDKITE" != 'true' ]] && echo 'This is not Buildkite.'
+    [[ "$BUILDKITE_TAG" == '' ]] && echo 'This is not a tagged build.'
+    echo 'Exiting...'
+    exit 0
+fi
+echo 'Tagged build detected, running test.'
+# orient ourselves
+[[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/eos/')
+[[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/EOSIO/eosio/')
+[[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/build/' | sed 's,/build/,,')
+# determine expected value
+CMAKE_CACHE="$EOSIO_ROOT/build/CMakeCache.txt"
+CMAKE_LISTS="$EOSIO_ROOT/CMakeLists.txt"
+if [[ -f "$CMAKE_CACHE" && $(cat "$CMAKE_CACHE" | grep -c 'DOXY_EOS_VERSION') > 0 ]]; then
+    EXPECTED=$(cat "$CMAKE_CACHE" | grep 'DOXY_EOS_VERSION' | cut -d '=' -f 2)
+elif [[ -f "$CMAKE_LISTS" ]]; then
+    export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_MAJOR' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
+    export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_MINOR' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
+    export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_PATCH' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
+    if [[ $(cat $CMAKE_LISTS | grep -ice 'set *( *VERSION_SUFFIX') > 0 ]]; then
+        export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
+        export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL.*VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | envsubst | tr -d '"')
+    else
+        export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL' | grep -ive 'VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | envsubst | tr -d '"')
+    fi
+    EXPECTED="v$VERSION_FULL"
+fi
+# fail if no expected value was found
+if [[ "$EXPECTED" == '' ]]; then
+    echo 'ERROR: Could not determine expected value for version label!'
+    set +e
+    echo "EOSIO_ROOT=\"$EOSIO_ROOT\""
+    echo "CMAKE_CACHE=\"$CMAKE_CACHE\""
+    echo "CMAKE_LISTS=\"$CMAKE_LISTS\""
+    echo ''
+    echo "VERSION_MAJOR=\"$VERSION_MAJOR\""
+    echo "VERSION_MINOR=\"$VERSION_MINOR\""
+    echo "VERSION_PATCH=\"$VERSION_PATCH\""
+    echo "VERSION_SUFFIX=\"$VERSION_SUFFIX\""
+    echo "VERSION_FULL=\"$VERSION_FULL\""
+    echo ''
+    echo '$ cat "$CMAKE_CACHE" | grep "DOXY_EOS_VERSION"'
+    cat "$CMAKE_CACHE" | grep "DOXY_EOS_VERSION"
+    echo '$ pwd'
+    pwd
+    echo '$ ls "$EOSIO_ROOT"'
+    ls "$EOSIO_ROOT"
+    echo '$ ls "$EOSIO_ROOT/build"'
+    ls "$EOSIO_ROOT/build"
+    exit 1
+fi
+# test nodeos version
+ACTUAL=$($EOSIO_ROOT/build/bin/nodeos --version) || : # nodeos currently returns -1 for --version
+# check
+echo "Expecting \"$EXPECTED\"..."
+if [[ "$EXPECTED" == "$ACTUAL" ]]; then
+    echo 'Passed with \"$ACTUAL\".'
+    exit 0
+fi
+echo 'Failed!'
+echo "\"$EXPECTED\" != \"$ACTUAL\""
+exit 1
\ No newline at end of file

From e764701ae9d0ea28f47fa58ceb8f5967efd84f79 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 18:12:35 -0400
Subject: [PATCH 0368/1648] It's really hard to override BUILDKITE_TAG

---
 .buildkite/pipeline.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 02ed1cef3b9..1928f06ccff 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -136,13 +136,14 @@ steps:
         workdir: /data/job
     timeout: 120
 
-  # - wait
+  - wait
 
   # MacOS Mojave
   - label: ":darwin: [Darwin] Mojave Tests"
     command: |
       cd eos
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -183,6 +184,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -226,6 +228,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -268,6 +271,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -310,6 +314,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"

From 5feb4b94da288e192dc0b114a749c2b23f8ca4e1 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 18:24:25 -0400
Subject: [PATCH 0369/1648] Added debug code

---
 scripts/package-builder.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index ff4e936b48c..72abccdf3a1 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -43,8 +43,11 @@ tar -zxf build.tar.gz
 echo "+++ :package: Starting Package Build"
 cd build/packages
 chmod 755 ./*.sh
+[[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 ./generate_package.sh "$PACKAGE_TYPE"
+[[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 echo '+++ :arrow_up: Uploading Artifacts'
 cd ../..
+[[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 buildkite-agent artifact upload \"$ARTIFACT\"
 echo "+++ :white_check_mark: Done."
\ No newline at end of file

From 436296399b7a51a05a5cfa74888acc79b51bd393 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 13 May 2019 18:42:43 -0400
Subject: [PATCH 0370/1648] fixes

---
 .buildkite/pipeline.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e6f4b8fe720..3f2be7954b1 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -10,7 +10,7 @@ steps:
   - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a \"-n\""
+      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
     agents:
       - "queue=mac-anka-templater-fleet"
     env:
@@ -46,8 +46,7 @@ steps:
 
   - label: ":darwin: [Darwin] Mojave Build"
     command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m && tar -pczf build.tar.gz build"
-    artifact_paths: "build.tar.gz"
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -m && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true

From fb2e605b20b54633d033f76ac2a5d5e2e951a48a Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 18:59:06 -0400
Subject: [PATCH 0371/1648] Added ability to skip tests, for testing purposes

---
 .buildkite/pipeline.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1928f06ccff..2198740fbbd 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -137,6 +137,7 @@ steps:
     timeout: 120
 
   - wait
+    skip: $SKIP_TESTS
 
   # MacOS Mojave
   - label: ":darwin: [Darwin] Mojave Tests"
@@ -158,7 +159,7 @@ steps:
         debug: true
         wait-network: true
     timeout: 120
-    skip: $SKIP_MOJAVE
+    skip: $SKIP_MOJAVE$SKIP_TESTS
 
   # - label: ":darwin: [Darwin] Mojave NP Tests"
   #   command:
@@ -201,6 +202,7 @@ steps:
         propagate-environment: true
         workdir: /data/job
     timeout: 60
+    skip: $SKIP_TESTS
 
   # - label: ":aws: Amazon Linux 2 NP Tests"
   #   command:
@@ -245,6 +247,7 @@ steps:
         propagate-environment: true
         workdir: /data/job
     timeout: 60
+    skip: $SKIP_TESTS
 
   # - label: ":centos: CentOS 7 NP Tests"
   #   command:
@@ -288,6 +291,7 @@ steps:
         propagate-environment: true
         workdir: /data/job
     timeout: 60
+    skip: $SKIP_TESTS
 
   # - label: ":ubuntu: Ubuntu 16.04 NP Tests"
   #   command:
@@ -331,6 +335,7 @@ steps:
         propagate-environment: true
         workdir: /data/job
     timeout: 60
+    skip: $SKIP_TESTS
 
   # - label: ":ubuntu: Ubuntu 18.04 NP Tests"
   #   command:

From 63ef4ab229de10efa5d71701e6e1d9fddad5460c Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 18:59:49 -0400
Subject: [PATCH 0372/1648] Reorganized print statements for more effective
 debugging

---
 tests/version-label.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/version-label.sh b/tests/version-label.sh
index 366de2e4305..7b9d56e2203 100755
--- a/tests/version-label.sh
+++ b/tests/version-label.sh
@@ -15,6 +15,7 @@ echo 'Tagged build detected, running test.'
 [[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/eos/')
 [[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/EOSIO/eosio/')
 [[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/build/' | sed 's,/build/,,')
+echo "Using EOSIO_ROOT=\"$EOSIO_ROOT\"."
 # determine expected value
 CMAKE_CACHE="$EOSIO_ROOT/build/CMakeCache.txt"
 CMAKE_LISTS="$EOSIO_ROOT/CMakeLists.txt"
@@ -56,10 +57,10 @@ if [[ "$EXPECTED" == '' ]]; then
     ls "$EOSIO_ROOT/build"
     exit 1
 fi
+echo "Expecting \"$EXPECTED\"..."
 # test nodeos version
 ACTUAL=$($EOSIO_ROOT/build/bin/nodeos --version) || : # nodeos currently returns -1 for --version
 # check
-echo "Expecting \"$EXPECTED\"..."
 if [[ "$EXPECTED" == "$ACTUAL" ]]; then
     echo 'Passed with \"$ACTUAL\".'
     exit 0

From 817afd4463d9c2fa2e2dda92010dcf2139ef5472 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 19:00:25 -0400
Subject: [PATCH 0373/1648] Package builder fails if artifacts are not found

---
 scripts/package-builder.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 72abccdf3a1..593258a1abc 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -50,4 +50,14 @@ echo '+++ :arrow_up: Uploading Artifacts'
 cd ../..
 [[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 buildkite-agent artifact upload \"$ARTIFACT\"
+for A in $(echo $ARTIFACT | tr ';' ' '); do
+    if [[ $(ls $A | grep -c '') ]]; then
+        echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!"
+        echo '$ pwd'
+        pwd
+        echo '$ ls'
+        ls
+        exit 1
+    fi
+done
 echo "+++ :white_check_mark: Done."
\ No newline at end of file

From 1b4561305af0c41f5bb5c6254239a93f1daa372a Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 19:02:50 -0400
Subject: [PATCH 0374/1648] Can't skip wait steps

---
 .buildkite/pipeline.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2198740fbbd..caa88592787 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -137,7 +137,6 @@ steps:
     timeout: 120
 
   - wait
-    skip: $SKIP_TESTS
 
   # MacOS Mojave
   - label: ":darwin: [Darwin] Mojave Tests"

From 26c0eea1bd1755336bdfb3a9f15ca59bdede5912 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 19:31:19 -0400
Subject: [PATCH 0375/1648] Bug fixes

---
 scripts/package-builder.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 593258a1abc..ad865336f00 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -5,13 +5,13 @@ echo '+++ :evergreen_tree: Configuring Environment'
 [[ "$BUILD_STEP" == '' ]] && (echo '+++ :no_entry: ERROR: Build step name must be given as BUILD_STEP or argument 1!' && exit 1)
 if [[ "$(uname)" == 'Darwin' ]]; then
     echo 'Darwin family detected, building for brew.'
-    ARTIFACT='build/packages/*.rb;build/packages/*.tar.gz'
+    ARTIFACT='"build/packages/*.rb;build/packages/*.tar.gz"'
     PACKAGE_TYPE='brew'
 else
     . /etc/os-release
     if [[ "$ID_LIKE" == 'rhel fedora' ]]; then
         echo 'Fedora family detected, building for RPM.'
-        ARTIFACT='build/packages/*.rpm'
+        ARTIFACT='"build/packages/*.rpm"'
         PACKAGE_TYPE='rpm'
         mkdir -p /root/rpmbuild/BUILD
         mkdir -p /root/rpmbuild/BUILDROOT
@@ -22,7 +22,7 @@ else
         yum install -y rpm-build
     elif [[ "$ID_LIKE" == 'debian' ]]; then
         echo 'Debian family detected, building for dpkg.'
-        ARTIFACT='build/packages/*.deb'
+        ARTIFACT='"build/packages/*.deb"'
         PACKAGE_TYPE='deb'
     else
         echo '+++ :no_entry: ERROR: Could not determine which operating system this script is running on!'
@@ -47,11 +47,10 @@ chmod 755 ./*.sh
 ./generate_package.sh "$PACKAGE_TYPE"
 [[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 echo '+++ :arrow_up: Uploading Artifacts'
-cd ../..
 [[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
-buildkite-agent artifact upload \"$ARTIFACT\"
+buildkite-agent artifact upload $ARTIFACT
 for A in $(echo $ARTIFACT | tr ';' ' '); do
-    if [[ $(ls $A | grep -c '') ]]; then
+    if [[ $(ls $A | grep -c '') == 0 ]]; then
         echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!"
         echo '$ pwd'
         pwd

From 76ae9cdd30ffd080304ec098ae8640065486d138 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 19:54:54 -0400
Subject: [PATCH 0376/1648] Fixes to bug fixes

---
 scripts/package-builder.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index ad865336f00..50bccb8b638 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -47,6 +47,7 @@ chmod 755 ./*.sh
 ./generate_package.sh "$PACKAGE_TYPE"
 [[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 echo '+++ :arrow_up: Uploading Artifacts'
+cd ../..
 [[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 buildkite-agent artifact upload $ARTIFACT
 for A in $(echo $ARTIFACT | tr ';' ' '); do

From 4f3014c1943edd407692ecd7cfb680cbe97175f8 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 20:03:08 -0400
Subject: [PATCH 0377/1648] Removed "set -e", added print statements

---
 tests/version-label.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/version-label.sh b/tests/version-label.sh
index 7b9d56e2203..848b206d867 100755
--- a/tests/version-label.sh
+++ b/tests/version-label.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
 # The purpose of this test is to ensure that the output of the "nodeos --version" command matches the 
 # If the environment variable BUILDKITE_TAG is empty or unset, this test will echo success
 echo '##### Nodeos Version Label Test #####'
@@ -20,15 +19,19 @@ echo "Using EOSIO_ROOT=\"$EOSIO_ROOT\"."
 CMAKE_CACHE="$EOSIO_ROOT/build/CMakeCache.txt"
 CMAKE_LISTS="$EOSIO_ROOT/CMakeLists.txt"
 if [[ -f "$CMAKE_CACHE" && $(cat "$CMAKE_CACHE" | grep -c 'DOXY_EOS_VERSION') > 0 ]]; then
+    echo "Parsing \"$CMAKE_CACHE\"..."
     EXPECTED=$(cat "$CMAKE_CACHE" | grep 'DOXY_EOS_VERSION' | cut -d '=' -f 2)
 elif [[ -f "$CMAKE_LISTS" ]]; then
+    echo "Parsing \"$CMAKE_LISTS\"..."
     export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_MAJOR' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
     export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_MINOR' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
     export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_PATCH' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
     if [[ $(cat $CMAKE_LISTS | grep -ice 'set *( *VERSION_SUFFIX') > 0 ]]; then
+        echo 'Using version suffix...'
         export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
         export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL.*VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | envsubst | tr -d '"')
     else
+        echo 'No version suffix found.'
         export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL' | grep -ive 'VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | envsubst | tr -d '"')
     fi
     EXPECTED="v$VERSION_FULL"

From e648bb892a52a87a5d2011a98cdb6d1e7b4d00ab Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 20:35:00 -0400
Subject: [PATCH 0378/1648] Changed artifact paths

---
 .buildkite/pipeline.yml    | 44 +++++++++++++++++++-------------------
 scripts/package-builder.sh | 10 +++------
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index caa88592787..6951dfc3c17 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -180,28 +180,28 @@ steps:
   #   skip: $SKIP_MOJAVE
 
   # Amazon Linux 2
-  - label: ":aws: Amazon Linux 2 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      export BUILDKITE_TAG='not-empty'
-      ./scripts/parallel-test.sh
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-    skip: $SKIP_TESTS
+  # - label: ":aws: Amazon Linux 2 Tests"
+  #   command: |
+  #     echo "--- :arrow_down: Downloading Build Directory"
+  #     buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
+  #     export BUILDKITE_TAG='not-empty'
+  #     ./scripts/parallel-test.sh
+  #   agents:
+  #     queue: "automation-large-builder-fleet"
+  #   plugins:
+  #     ecr#v1.1.4:
+  #       login: true
+  #       account_ids: "436617320021"
+  #       no-include-email: true
+  #       region: "us-west-2"
+  #     docker#v3.2.0:
+  #       shell: ["/bin/bash", "-i", "-e", "-c"]
+  #       debug: true
+  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+  #       propagate-environment: true
+  #       workdir: /data/job
+  #   timeout: 60
+  #   skip: $SKIP_TESTS
 
   # - label: ":aws: Amazon Linux 2 NP Tests"
   #   command:
diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 50bccb8b638..5172e53ed29 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -5,13 +5,13 @@ echo '+++ :evergreen_tree: Configuring Environment'
 [[ "$BUILD_STEP" == '' ]] && (echo '+++ :no_entry: ERROR: Build step name must be given as BUILD_STEP or argument 1!' && exit 1)
 if [[ "$(uname)" == 'Darwin' ]]; then
     echo 'Darwin family detected, building for brew.'
-    ARTIFACT='"build/packages/*.rb;build/packages/*.tar.gz"'
+    ARTIFACT='"*.rb;*.tar.gz"'
     PACKAGE_TYPE='brew'
 else
     . /etc/os-release
     if [[ "$ID_LIKE" == 'rhel fedora' ]]; then
         echo 'Fedora family detected, building for RPM.'
-        ARTIFACT='"build/packages/*.rpm"'
+        ARTIFACT='"*.rpm"'
         PACKAGE_TYPE='rpm'
         mkdir -p /root/rpmbuild/BUILD
         mkdir -p /root/rpmbuild/BUILDROOT
@@ -22,7 +22,7 @@ else
         yum install -y rpm-build
     elif [[ "$ID_LIKE" == 'debian' ]]; then
         echo 'Debian family detected, building for dpkg.'
-        ARTIFACT='"build/packages/*.deb"'
+        ARTIFACT='"*.deb"'
         PACKAGE_TYPE='deb'
     else
         echo '+++ :no_entry: ERROR: Could not determine which operating system this script is running on!'
@@ -43,12 +43,8 @@ tar -zxf build.tar.gz
 echo "+++ :package: Starting Package Build"
 cd build/packages
 chmod 755 ./*.sh
-[[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 ./generate_package.sh "$PACKAGE_TYPE"
-[[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 echo '+++ :arrow_up: Uploading Artifacts'
-cd ../..
-[[ "$DEBUG" == 'true' ]] && (echo '$ pwd'; pwd; echo '$ ls'; ls)
 buildkite-agent artifact upload $ARTIFACT
 for A in $(echo $ARTIFACT | tr ';' ' '); do
     if [[ $(ls $A | grep -c '') == 0 ]]; then

From 2e67ce580353127b9b84ea2c2744fc9ced9ce7a9 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 20:39:52 -0400
Subject: [PATCH 0379/1648] Move quotes out of ARTIFACT

---
 scripts/package-builder.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 5172e53ed29..95f6af57156 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -5,13 +5,13 @@ echo '+++ :evergreen_tree: Configuring Environment'
 [[ "$BUILD_STEP" == '' ]] && (echo '+++ :no_entry: ERROR: Build step name must be given as BUILD_STEP or argument 1!' && exit 1)
 if [[ "$(uname)" == 'Darwin' ]]; then
     echo 'Darwin family detected, building for brew.'
-    ARTIFACT='"*.rb;*.tar.gz"'
+    ARTIFACT='*.rb;*.tar.gz'
     PACKAGE_TYPE='brew'
 else
     . /etc/os-release
     if [[ "$ID_LIKE" == 'rhel fedora' ]]; then
         echo 'Fedora family detected, building for RPM.'
-        ARTIFACT='"*.rpm"'
+        ARTIFACT='*.rpm'
         PACKAGE_TYPE='rpm'
         mkdir -p /root/rpmbuild/BUILD
         mkdir -p /root/rpmbuild/BUILDROOT
@@ -22,7 +22,7 @@ else
         yum install -y rpm-build
     elif [[ "$ID_LIKE" == 'debian' ]]; then
         echo 'Debian family detected, building for dpkg.'
-        ARTIFACT='"*.deb"'
+        ARTIFACT='*.deb'
         PACKAGE_TYPE='deb'
     else
         echo '+++ :no_entry: ERROR: Could not determine which operating system this script is running on!'
@@ -45,7 +45,7 @@ cd build/packages
 chmod 755 ./*.sh
 ./generate_package.sh "$PACKAGE_TYPE"
 echo '+++ :arrow_up: Uploading Artifacts'
-buildkite-agent artifact upload $ARTIFACT
+buildkite-agent artifact upload \"$ARTIFACT\"
 for A in $(echo $ARTIFACT | tr ';' ' '); do
     if [[ $(ls $A | grep -c '') == 0 ]]; then
         echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!"

From f5e4439ee2f0eebf74789a5800f9c482f7970730 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@ii5.com>
Date: Tue, 14 May 2019 09:20:35 +0800
Subject: [PATCH 0380/1648] Remove unneeded parameter

---
 tests/Node.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Node.py b/tests/Node.py
index cc1b3956002..f8167663c28 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1572,6 +1572,6 @@ def modifyBuiltinPFSubjRestrictions(self, nodeId, featureCodename, subjectiveRes
             json.dump(protocolFeatureJson, f, indent=2)
 
     # Require producer_api_plugin
-    def createSnapshot(self, featureDigests=[]):
+    def createSnapshot(self):
         param = { }
         return self.processCurlCmd("producer", "create_snapshot", json.dumps(param))

From e38b93debb88d1646cd4f846611e1a9dd6a51844 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 21:31:22 -0400
Subject: [PATCH 0381/1648] Try relative path for artifact upload

---
 scripts/package-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 95f6af57156..361823f010e 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -45,7 +45,7 @@ cd build/packages
 chmod 755 ./*.sh
 ./generate_package.sh "$PACKAGE_TYPE"
 echo '+++ :arrow_up: Uploading Artifacts'
-buildkite-agent artifact upload \"$ARTIFACT\"
+buildkite-agent artifact upload "./$ARTIFACT"
 for A in $(echo $ARTIFACT | tr ';' ' '); do
     if [[ $(ls $A | grep -c '') == 0 ]]; then
         echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!"

From f6f06120f00fe31d236e3d9e3b0121b9e2ce67af Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 21:32:10 -0400
Subject: [PATCH 0382/1648] Allow artifact paths to be specified outside the
 script

---
 scripts/package-builder.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 361823f010e..07ebebb4c7a 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -5,13 +5,13 @@ echo '+++ :evergreen_tree: Configuring Environment'
 [[ "$BUILD_STEP" == '' ]] && (echo '+++ :no_entry: ERROR: Build step name must be given as BUILD_STEP or argument 1!' && exit 1)
 if [[ "$(uname)" == 'Darwin' ]]; then
     echo 'Darwin family detected, building for brew.'
-    ARTIFACT='*.rb;*.tar.gz'
+    [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.rb;*.tar.gz'
     PACKAGE_TYPE='brew'
 else
     . /etc/os-release
     if [[ "$ID_LIKE" == 'rhel fedora' ]]; then
         echo 'Fedora family detected, building for RPM.'
-        ARTIFACT='*.rpm'
+        [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.rpm'
         PACKAGE_TYPE='rpm'
         mkdir -p /root/rpmbuild/BUILD
         mkdir -p /root/rpmbuild/BUILDROOT
@@ -22,7 +22,7 @@ else
         yum install -y rpm-build
     elif [[ "$ID_LIKE" == 'debian' ]]; then
         echo 'Debian family detected, building for dpkg.'
-        ARTIFACT='*.deb'
+        [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.deb'
         PACKAGE_TYPE='deb'
     else
         echo '+++ :no_entry: ERROR: Could not determine which operating system this script is running on!'

From 3e5715adad30f739fb8ad08946df0710bcdaded3 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 22:09:50 -0400
Subject: [PATCH 0383/1648] Remove dependence on envsubst

---
 tests/version-label.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/version-label.sh b/tests/version-label.sh
index 848b206d867..e68a720f2cf 100755
--- a/tests/version-label.sh
+++ b/tests/version-label.sh
@@ -20,7 +20,7 @@ CMAKE_CACHE="$EOSIO_ROOT/build/CMakeCache.txt"
 CMAKE_LISTS="$EOSIO_ROOT/CMakeLists.txt"
 if [[ -f "$CMAKE_CACHE" && $(cat "$CMAKE_CACHE" | grep -c 'DOXY_EOS_VERSION') > 0 ]]; then
     echo "Parsing \"$CMAKE_CACHE\"..."
-    EXPECTED=$(cat "$CMAKE_CACHE" | grep 'DOXY_EOS_VERSION' | cut -d '=' -f 2)
+    EXPECTED="v$(cat "$CMAKE_CACHE" | grep 'DOXY_EOS_VERSION' | cut -d '=' -f 2)"
 elif [[ -f "$CMAKE_LISTS" ]]; then
     echo "Parsing \"$CMAKE_LISTS\"..."
     export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_MAJOR' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
@@ -29,10 +29,10 @@ elif [[ -f "$CMAKE_LISTS" ]]; then
     if [[ $(cat $CMAKE_LISTS | grep -ice 'set *( *VERSION_SUFFIX') > 0 ]]; then
         echo 'Using version suffix...'
         export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')
-        export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL.*VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | envsubst | tr -d '"')
+        export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL.*VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | sed "s/VERSION_MAJOR/$VERSION_MAJOR/" | sed "s/VERSION_MINOR/$VERSION_MINOR/" | sed "s/VERSION_PATCH/$VERSION_PATCH/" | sed "s/VERSION_SUFFIX/$VERSION_SUFFIX/" | tr -d '"{}$')
     else
         echo 'No version suffix found.'
-        export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL' | grep -ive 'VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | envsubst | tr -d '"')
+        export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL' | grep -ive 'VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | sed "s/VERSION_MAJOR/$VERSION_MAJOR/" | sed "s/VERSION_MINOR/$VERSION_MINOR/" | sed "s/VERSION_PATCH/$VERSION_PATCH/" | tr -d '"{}$')
     fi
     EXPECTED="v$VERSION_FULL"
 fi
@@ -61,9 +61,9 @@ if [[ "$EXPECTED" == '' ]]; then
     exit 1
 fi
 echo "Expecting \"$EXPECTED\"..."
-# test nodeos version
+# get nodeos version
 ACTUAL=$($EOSIO_ROOT/build/bin/nodeos --version) || : # nodeos currently returns -1 for --version
-# check
+# test
 if [[ "$EXPECTED" == "$ACTUAL" ]]; then
     echo 'Passed with \"$ACTUAL\".'
     exit 0

From caa6244c8038c417fa235cdf47668ed63877c0d6 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 22:25:27 -0400
Subject: [PATCH 0384/1648] Merged in Nathan's Anka updates

---
 .buildkite/pipeline.yml | 54 +++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6951dfc3c17..932c413f602 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -3,6 +3,7 @@ env:
   ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
   CHECKSUMABLE: "scripts/eosio_build*"
   MAC_TAG: "eosio_2-4"
+  WORKDIR: "/data/job"
 
 steps:
   - wait
@@ -10,7 +11,7 @@ steps:
   - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash"
+      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
     agents:
       - "queue=mac-anka-templater-fleet"
     env:
@@ -19,25 +20,26 @@ steps:
       CHECKSUMABLE: "${CHECKSUMABLE}"
       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-      TAG_COMMANDS: "./scripts/eosio_build.sh -y -P -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -f -m && cd .. && rm -rf eos" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
       PROJECT_TAG: "${MAC_TAG}"
-    timeout: 60
+    timeout: 320
     skip: $SKIP_MOJAVE
 
   - wait
 
   - label: ":darwin: [Darwin] Mojave Build"
     command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-      cd eos
+      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       git submodule update --init --recursive
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
       [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!' && exit 1)
+      buildkite-agent artifact upload build.tar.gz
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
+        workdir: $WORKDIR
         inherit-environment-vars: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
         vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
@@ -141,7 +143,8 @@ steps:
   # MacOS Mojave
   - label: ":darwin: [Darwin] Mojave Tests"
     command: |
-      cd eos
+      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
+      git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
       export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
@@ -150,6 +153,7 @@ steps:
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
+        workdir: $WORKDIR
         inherit-environment-vars: true
         bash-interactive: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
@@ -161,22 +165,23 @@ steps:
     skip: $SKIP_MOJAVE$SKIP_TESTS
 
   # - label: ":darwin: [Darwin] Mojave NP Tests"
-  #   command:
-  #     - "tar -xzf /Network/NAS/MAC_FLEET/BUILDKITE/artifacts/${ANKA_MOJAVE_TEMPLATE}-${BUILDKITE_PIPELINE_SLUG}-${BUILDKITE_BUILD_ID}.tar.gz"
-  #     - "cd eos && ./scripts/serial-test.sh"
-  #   agents:
-  #     - "queue=mac-anka-node-fleet"
-  #   plugins:
-  #     chef/anka#v0.4.4:
-  #       no-volume: true
-  #       inherit-environment-vars: true
-  #       bash-interactive: true
-  #       vm-name: $ANKA_MOJAVE_TEMPLATE
-  #       vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-  #       always-pull: true
-  #       debug: true
-  #       wait-network: true
-  #   timeout: 120
+    # command:
+    #   - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\""
+    #   - "cd eos && ./scripts/serial-test.sh"
+    # agents:
+    #   - "queue=mac-anka-node-fleet"
+    # plugins:
+    #   chef/anka#v0.4.4:
+    #     no-volume: true
+    #     workdir: $WORKDIR
+    #     inherit-environment-vars: true
+    #     bash-interactive: true
+    #     vm-name: $ANKA_MOJAVE_TEMPLATE
+    #     vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+    #     always-pull: true
+    #     debug: true
+    #     wait-network: true
+    # timeout: 120
   #   skip: $SKIP_MOJAVE
 
   # Amazon Linux 2
@@ -438,14 +443,15 @@ steps:
 
   - label: ":darwin: Mojave Package Builder"
     command: |
-      [[ -d eos ]] && cd eos
-      ln -s "$(pwd)" /data/job
+      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
+      git checkout ${BUILDKITE_COMMIT}
       ./scripts/package-builder.sh ':darwin: [Darwin] Mojave Build'
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
+        workdir: $WORKDIR
         inherit-environment-vars: true
         bash-interactive: true
         vm-name: $ANKA_MOJAVE_TEMPLATE

From 7178b3206a68b1d0cc3d1256e5dae640c309c77d Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 22:32:30 -0400
Subject: [PATCH 0385/1648] Restored commented-out code

---
 .buildkite/pipeline.yml | 320 ++++++++++++++++++++--------------------
 1 file changed, 163 insertions(+), 157 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 932c413f602..daeb51f3ec0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -53,31 +53,31 @@ steps:
     timeout: 120
     skip: $SKIP_MOJAVE
 
-  # - label: ":aws: Amazon Linux 2 Build"
-  #   command:
-  #     - "./scripts/eosio_build.sh -y -P -m"
-  #     - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   artifact_paths: "build.tar.gz"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.1.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 120
+  - label: ":aws: Amazon Linux 2 Build"
+    command: |
+      ./scripts/eosio_build.sh -y -P -m
+      tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
+    agents:
+      queue: "automation-large-builder-fleet"
+    artifact_paths: "build.tar.gz"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.1.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 120
 
   - label: ":centos: CentOS 7 Build"
-    command:
-        - "./scripts/eosio_build.sh -y -P -m"
-        - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
+    command: |
+      ./scripts/eosio_build.sh -y -P -m
+      tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -96,9 +96,9 @@ steps:
     timeout: 120
 
   - label: ":ubuntu: Ubuntu 16.04 Build"
-    command:
-      - "./scripts/eosio_build.sh -y -P -m"
-      - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
+    command: |
+      ./scripts/eosio_build.sh -y -P -m
+      tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -118,9 +118,9 @@ steps:
     timeout: 120
 
   - label: ":ubuntu: Ubuntu 18.04 Build"
-    command:
-      - "./scripts/eosio_build.sh -y -P -m"
-      - "tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi"
+    command: |
+      ./scripts/eosio_build.sh -y -P -m
+      tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -164,70 +164,73 @@ steps:
     timeout: 120
     skip: $SKIP_MOJAVE$SKIP_TESTS
 
-  # - label: ":darwin: [Darwin] Mojave NP Tests"
-    # command:
-    #   - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\""
-    #   - "cd eos && ./scripts/serial-test.sh"
-    # agents:
-    #   - "queue=mac-anka-node-fleet"
-    # plugins:
-    #   chef/anka#v0.4.4:
-    #     no-volume: true
-    #     workdir: $WORKDIR
-    #     inherit-environment-vars: true
-    #     bash-interactive: true
-    #     vm-name: $ANKA_MOJAVE_TEMPLATE
-    #     vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-    #     always-pull: true
-    #     debug: true
-    #     wait-network: true
-    # timeout: 120
-  #   skip: $SKIP_MOJAVE
+  - label: ":darwin: [Darwin] Mojave NP Tests"
+    command: |
+      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
+      git checkout ${BUILDKITE_COMMIT}
+      buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
+      ./scripts/serial-test.sh
+    agents:
+      - "queue=mac-anka-node-fleet"
+    plugins:
+      chef/anka#v0.4.4:
+        no-volume: true
+        workdir: $WORKDIR
+        inherit-environment-vars: true
+        bash-interactive: true
+        vm-name: $ANKA_MOJAVE_TEMPLATE
+        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
+        always-pull: true
+        debug: true
+        wait-network: true
+    timeout: 120
+    skip: $SKIP_MOJAVE
 
   # Amazon Linux 2
-  # - label: ":aws: Amazon Linux 2 Tests"
-  #   command: |
-  #     echo "--- :arrow_down: Downloading Build Directory"
-  #     buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-  #     export BUILDKITE_TAG='not-empty'
-  #     ./scripts/parallel-test.sh
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
-  #   skip: $SKIP_TESTS
+  - label: ":aws: Amazon Linux 2 Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
+      export BUILDKITE_TAG='not-empty'
+      ./scripts/parallel-test.sh
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
+    skip: $SKIP_TESTS
 
-  # - label: ":aws: Amazon Linux 2 NP Tests"
-  #   command:
-  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
-  #     - "./scripts/serial-test.sh"
-  #   label: ":aws: Amazon Linux 2 NP Tests"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
+  - label: ":aws: Amazon Linux 2 NP Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
+      ./scripts/serial-test.sh
+    label: ":aws: Amazon Linux 2 NP Tests"
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
 
   # CentOS
   - label: ":centos: CentOS 7 Tests"
@@ -253,25 +256,26 @@ steps:
     timeout: 60
     skip: $SKIP_TESTS
 
-  # - label: ":centos: CentOS 7 NP Tests"
-  #   command:
-  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
-  #     - "./scripts/serial-test.sh"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
+  - label: ":centos: CentOS 7 NP Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
+      ./scripts/serial-test.sh
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
 
   # Ubuntu 16.04
   - label: ":ubuntu: Ubuntu 16.04 Tests"
@@ -297,25 +301,26 @@ steps:
     timeout: 60
     skip: $SKIP_TESTS
 
-  # - label: ":ubuntu: Ubuntu 16.04 NP Tests"
-  #   command:
-  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
-  #     - "./scripts/serial-test.sh"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
+  - label: ":ubuntu: Ubuntu 16.04 NP Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
+      ./scripts/serial-test.sh
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
 
   # Ubuntu 18.04
   - label: ":ubuntu: Ubuntu 18.04 Tests"
@@ -341,37 +346,38 @@ steps:
     timeout: 60
     skip: $SKIP_TESTS
 
-  # - label: ":ubuntu: Ubuntu 18.04 NP Tests"
-  #   command:
-  #     - "echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
-  #     - "./scripts/serial-test.sh"
-  #   agents:
-  #     queue: "automation-large-builder-fleet"
-  #   plugins:
-  #     ecr#v1.1.4:
-  #       login: true
-  #       account_ids: "436617320021"
-  #       no-include-email: true
-  #       region: "us-west-2"
-  #     docker#v3.2.0:
-  #       shell: ["/bin/bash", "-i", "-e", "-c"]
-  #       debug: true
-  #       image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
-  #       propagate-environment: true
-  #       workdir: /data/job
-  #   timeout: 60
+  - label: ":ubuntu: Ubuntu 18.04 NP Tests"
+    command: |
+      echo "--- :arrow_down: Downloading Build Directory"
+      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
+      ./scripts/serial-test.sh
+    agents:
+      queue: "automation-large-builder-fleet"
+    plugins:
+      ecr#v1.1.4:
+        login: true
+        account_ids: "436617320021"
+        no-include-email: true
+        region: "us-west-2"
+      docker#v3.2.0:
+        shell: ["/bin/bash", "-i", "-e", "-c"]
+        debug: true
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
+        propagate-environment: true
+        workdir: /data/job
+    timeout: 60
 
-  # - wait: # Test Metrics
-  #   continue_on_failure: true
+  - wait: # Test Metrics
+    continue_on_failure: true
 
-  # - command: |
-  #       cd scripts/metrics
-  #       node --max-old-space-size=4096 test-metrics.js
-  #   label: ":bar_chart: Test Metrics"
-  #   agents:
-  #     queue: "automation-apps-builder-fleet"
-  #   timeout: 10
-  #   soft_fail: true
+  - command: |
+        cd scripts/metrics
+        node --max-old-space-size=4096 test-metrics.js
+    label: ":bar_chart: Test Metrics"
+    agents:
+      queue: "automation-apps-builder-fleet"
+    timeout: 10
+    soft_fail: true
 
   - wait
 

From 9b60ae16834355b06f73f71d1956de3d69bd2766 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 13 May 2019 22:35:25 -0400
Subject: [PATCH 0386/1648] Removed BUILDKITE_TAG declarations

---
 .buildkite/pipeline.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index daeb51f3ec0..a465f710820 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -146,7 +146,6 @@ steps:
       git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -191,7 +190,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -237,7 +235,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -282,7 +279,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -327,7 +323,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"

From f7823ff17988e72b10427549ec6d14a5e2fba0a0 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 09:27:02 -0400
Subject: [PATCH 0387/1648] Fixed Mac Build Artifact Upload Duplication

---
 .buildkite/pipeline.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index a465f710820..2869dcdc97a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -34,8 +34,7 @@ steps:
       git submodule update --init --recursive
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!' && exit 1)
-      buildkite-agent artifact upload build.tar.gz
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
@@ -56,7 +55,7 @@ steps:
   - label: ":aws: Amazon Linux 2 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -77,7 +76,7 @@ steps:
   - label: ":centos: CentOS 7 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -98,7 +97,7 @@ steps:
   - label: ":ubuntu: Ubuntu 16.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -120,7 +119,7 @@ steps:
   - label: ":ubuntu: Ubuntu 18.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build; if [[ ! -f build.tar.gz ]]; then echo 'ERROR: No build.tar.gz artifact found!' && exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"

From 902c1140ab644046bbb60bf3d455e4cc211a21a5 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 09:30:00 -0400
Subject: [PATCH 0388/1648] BUILDKITE_TAG not empty

---
 .buildkite/pipeline.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2869dcdc97a..e4a217640b5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -145,6 +145,7 @@ steps:
       git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -189,6 +190,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -234,6 +236,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -278,6 +281,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -322,6 +326,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"

From aece0403507136e7a75e657300b0ef33703f2a76 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 14 May 2019 09:38:29 -0400
Subject: [PATCH 0389/1648] correct signed mismatch warning

---
 libraries/chain/controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 7efbde8a38e..8f2c2f2368d 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -515,7 +515,7 @@ struct controller_impl {
 
    void init(std::function<bool()> shutdown, const snapshot_reader_ptr& snapshot) {
       // Setup state if necessary (or in the default case stay with already loaded state):
-      auto lib_num = 1;
+      uint32_t lib_num = 1u;
       if( snapshot ) {
          snapshot->validate();
          if( blog.head() ) {

From 3433e4abcd981db14c4e57413a55d18dc7d72531 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 09:39:22 -0400
Subject: [PATCH 0390/1648] Switched ';' to '&&' between commands in
 parenthesis

---
 .buildkite/pipeline.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e4a217640b5..9e69bef551d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -34,7 +34,7 @@ steps:
       git submodule update --init --recursive
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
@@ -55,7 +55,7 @@ steps:
   - label: ":aws: Amazon Linux 2 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -76,7 +76,7 @@ steps:
   - label: ":centos: CentOS 7 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -97,7 +97,7 @@ steps:
   - label: ":ubuntu: Ubuntu 16.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -119,7 +119,7 @@ steps:
   - label: ":ubuntu: Ubuntu 18.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"

From 00f029da416d91de2ff01139239c9194469714b2 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 09:47:44 -0400
Subject: [PATCH 0391/1648] Shell does not support test syntactic sugar

---
 .buildkite/pipeline.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 9e69bef551d..c619f7de99a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -34,7 +34,7 @@ steps:
       git submodule update --init --recursive
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
+      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
@@ -55,7 +55,7 @@ steps:
   - label: ":aws: Amazon Linux 2 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
+      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -76,7 +76,7 @@ steps:
   - label: ":centos: CentOS 7 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
+      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -97,7 +97,7 @@ steps:
   - label: ":ubuntu: Ubuntu 16.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
+      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -119,7 +119,7 @@ steps:
   - label: ":ubuntu: Ubuntu 18.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!' && echo '$ ls' && ls && exit 1)
+      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"

From a3453fbfb460f42a918caa8337160898f6121f43 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 09:52:55 -0400
Subject: [PATCH 0392/1648] Debugging pipeline upload, changed print statement

---
 .buildkite/pipeline.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c619f7de99a..2bdf06a87be 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -34,7 +34,7 @@ steps:
       git submodule update --init --recursive
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
@@ -55,7 +55,7 @@ steps:
   - label: ":aws: Amazon Linux 2 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -76,7 +76,7 @@ steps:
   - label: ":centos: CentOS 7 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -97,7 +97,7 @@ steps:
   - label: ":ubuntu: Ubuntu 16.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -119,7 +119,7 @@ steps:
   - label: ":ubuntu: Ubuntu 18.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      if [[ -f build.tar.gz ]]; then buildkite-agent artifact upload build.tar.gz; else echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$ ls -la'; ls -la; exit 1; fi
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"

From 93817636447dd13187909fdfa9568188ef617c22 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 09:57:26 -0400
Subject: [PATCH 0393/1648] Escape dollar signs

---
 .buildkite/pipeline.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2bdf06a87be..e61d816c2e7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -34,7 +34,7 @@ steps:
       git submodule update --init --recursive
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
@@ -55,7 +55,7 @@ steps:
   - label: ":aws: Amazon Linux 2 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -76,7 +76,7 @@ steps:
   - label: ":centos: CentOS 7 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -97,7 +97,7 @@ steps:
   - label: ":ubuntu: Ubuntu 16.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -119,7 +119,7 @@ steps:
   - label: ":ubuntu: Ubuntu 18.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"

From 51f3742751c2bdce5dadb70d71562ff9d7d24c1e Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 10:02:57 -0400
Subject: [PATCH 0394/1648] Final Changes, Remove BUILDKITE_TAG Tampering

---
 .buildkite/pipeline.yml    | 15 +++++----------
 scripts/package-builder.sh |  4 ++--
 tests/version-label.sh     |  8 ++++----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e61d816c2e7..5d50a3bc8d9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -34,7 +34,7 @@ steps:
       git submodule update --init --recursive
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
@@ -55,7 +55,7 @@ steps:
   - label: ":aws: Amazon Linux 2 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -76,7 +76,7 @@ steps:
   - label: ":centos: CentOS 7 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -97,7 +97,7 @@ steps:
   - label: ":ubuntu: Ubuntu 16.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -119,7 +119,7 @@ steps:
   - label: ":ubuntu: Ubuntu 18.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls'; ls; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -145,7 +145,6 @@ steps:
       git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -190,7 +189,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -236,7 +234,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -281,7 +278,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -326,7 +322,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index 07ebebb4c7a..a30c75859f3 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -51,8 +51,8 @@ for A in $(echo $ARTIFACT | tr ';' ' '); do
         echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!"
         echo '$ pwd'
         pwd
-        echo '$ ls'
-        ls
+        echo '$ ls -la'
+        ls -la
         exit 1
     fi
 done
diff --git a/tests/version-label.sh b/tests/version-label.sh
index e68a720f2cf..463122cf405 100755
--- a/tests/version-label.sh
+++ b/tests/version-label.sh
@@ -54,10 +54,10 @@ if [[ "$EXPECTED" == '' ]]; then
     cat "$CMAKE_CACHE" | grep "DOXY_EOS_VERSION"
     echo '$ pwd'
     pwd
-    echo '$ ls "$EOSIO_ROOT"'
-    ls "$EOSIO_ROOT"
-    echo '$ ls "$EOSIO_ROOT/build"'
-    ls "$EOSIO_ROOT/build"
+    echo '$ ls -la "$EOSIO_ROOT"'
+    ls -la "$EOSIO_ROOT"
+    echo '$ ls -la "$EOSIO_ROOT/build"'
+    ls -la "$EOSIO_ROOT/build"
     exit 1
 fi
 echo "Expecting \"$EXPECTED\"..."

From 5d5f06a3f7606b6aa1a6f5ecc9ab63a178342f7f Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 10:20:58 -0400
Subject: [PATCH 0395/1648] Fixed artifact upload duplication on linux,
 restored BUILDKITE_TAG tampering

---
 .buildkite/pipeline.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 5d50a3bc8d9..07846c72532 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -55,7 +55,8 @@ steps:
   - label: ":aws: Amazon Linux 2 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
+      tar -pczf build.tar.gz build
+      [[ ! -f build.tar.gz ]] && (echo 'ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -76,7 +77,8 @@ steps:
   - label: ":centos: CentOS 7 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
+      tar -pczf build.tar.gz build
+      [[ ! -f build.tar.gz ]] && (echo 'ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -97,7 +99,8 @@ steps:
   - label: ":ubuntu: Ubuntu 16.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
+      tar -pczf build.tar.gz build
+      [[ ! -f build.tar.gz ]] && (echo 'ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1)
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -119,7 +122,8 @@ steps:
   - label: ":ubuntu: Ubuntu 18.04 Build"
     command: |
       ./scripts/eosio_build.sh -y -P -m
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
+      tar -pczf build.tar.gz build
+      [[ ! -f build.tar.gz ]] && (echo 'ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1)
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -145,6 +149,7 @@ steps:
       git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -189,6 +194,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -234,6 +240,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -278,6 +285,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -322,6 +330,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"

From a401d57b45db21e8696e3f3cbf075ae161cf0e32 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 10:53:11 -0400
Subject: [PATCH 0396/1648] Test syntax requires "or no-op"

---
 .buildkite/pipeline.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 07846c72532..ae6e6ca332e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -34,7 +34,7 @@ steps:
       git submodule update --init --recursive
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo 'ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
+      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
@@ -56,7 +56,7 @@ steps:
     command: |
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo 'ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1)
+      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -78,7 +78,7 @@ steps:
     command: |
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo 'ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1)
+      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -100,7 +100,7 @@ steps:
     command: |
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo 'ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1)
+      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
     label: ":ubuntu: Ubuntu 16.04 Build"
     agents:
       queue: "automation-large-builder-fleet"
@@ -123,7 +123,7 @@ steps:
     command: |
       ./scripts/eosio_build.sh -y -P -m
       tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo 'ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1)
+      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths: "build.tar.gz"
@@ -149,7 +149,7 @@ steps:
       git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      export BUILDKITE_TAG='not-empty'
+      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -194,7 +194,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      export BUILDKITE_TAG='not-empty'
+      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -240,7 +240,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      export BUILDKITE_TAG='not-empty'
+      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -285,7 +285,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      export BUILDKITE_TAG='not-empty'
+      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -330,7 +330,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      export BUILDKITE_TAG='not-empty'
+      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"

From cb250f20c7b62b28ba93c420cd35ef50a6139323 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 10:53:42 -0400
Subject: [PATCH 0397/1648] Package builder now prints commit hash

---
 scripts/package-builder.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index a30c75859f3..07f9d39dd42 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -41,6 +41,9 @@ echo "+++ :compression: Extracting Build Directory"
 [[ -d build ]] && rm -rf build
 tar -zxf build.tar.gz
 echo "+++ :package: Starting Package Build"
+BASE_COMMIT=$(cat build/programs/nodeos/config.hpp | grep 'version' | awk '{print $5}' | tr -d ';')
+BASE_COMMIT="${BASE_COMMIT:2:42}"
+echo "Found build against $BASE_COMMIT."
 cd build/packages
 chmod 755 ./*.sh
 ./generate_package.sh "$PACKAGE_TYPE"

From c3a915cc84adc9ab754259b9d23ff5d10ee1d120 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 10:59:52 -0400
Subject: [PATCH 0398/1648] Removed BUILDKITE_TAG Tampering

---
 .buildkite/pipeline.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ae6e6ca332e..510346d7d4f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -149,7 +149,6 @@ steps:
       git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -194,7 +193,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -240,7 +238,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -285,7 +282,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -330,7 +326,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      BUILDKITE_TAG='non-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"

From ff20e5ca72883118c8c0b05c6b91047ec18916dd Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 12:22:18 -0400
Subject: [PATCH 0399/1648] Fixed brew Updater step

---
 .buildkite/pipeline.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 510346d7d4f..28095b8f0a0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -149,6 +149,7 @@ steps:
       git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -193,6 +194,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -238,6 +240,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -282,6 +285,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -326,6 +330,7 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
+      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -469,18 +474,18 @@ steps:
   - wait
 
   - command: | # Brew Updater
-        echo "--- :arrow_down: Downloading brew files"
-        buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
+        echo "+++ :arrow_down: Downloading brew files"
+        buildkite-agent artifact download "eosio.rb" . --step ":darwin: Mojave Package Builder"
     label: ":darwin: Brew Updater"
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths:
-      - "build/packages/eosio.rb"
+      - "eosio.rb"
     timeout: 5
     skip: $SKIP_MOJAVE
 
   - command: | # Git Submodule Regression Check
-        echo "+++ :microscope: Running git submodule regression check" && \
+        echo "+++ :git: Running Git Submodule Regression Check"
         ./scripts/submodule_check.sh
     label: "Git Submodule Regression Check"
     agents:

From 6bb705174646420c3c2d3e3ca8222c9111167166 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 14 May 2019 12:23:43 -0400
Subject: [PATCH 0400/1648] Removed Herobrine

---
 .buildkite/pipeline.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 28095b8f0a0..6036fd8a9ce 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -149,7 +149,6 @@ steps:
       git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
       git checkout ${BUILDKITE_COMMIT}
       buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       - "queue=mac-anka-node-fleet"
@@ -194,7 +193,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -240,7 +238,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -285,7 +282,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"
@@ -330,7 +326,6 @@ steps:
     command: |
       echo "--- :arrow_down: Downloading Build Directory"
       buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      export BUILDKITE_TAG='not-empty'
       ./scripts/parallel-test.sh
     agents:
       queue: "automation-large-builder-fleet"

From abb1b5cea29790422b243c7948d741a56a27b39c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 14 May 2019 14:55:43 -0400
Subject: [PATCH 0401/1648] Remove undefined method

---
 plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
index 0fe35dd4277..2be1553543b 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
@@ -31,8 +31,6 @@ namespace eosio {
         void plugin_startup();
         void plugin_shutdown();
 
-        void   broadcast_block(const chain::signed_block &sb);
-
         string                       connect( const string& endpoint );
         string                       disconnect( const string& endpoint );
         optional<connection_status>  status( const string& endpoint )const;

From e74761aac2f3ac2263c3a3d3f1c34b912234a232 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 14 May 2019 15:01:03 -0400
Subject: [PATCH 0402/1648] Add blk and trx options to connection for
 transactions only and block only connections

---
 plugins/net_plugin/net_plugin.cpp | 105 ++++++++++++++++++++++--------
 1 file changed, 79 insertions(+), 26 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 00e68767fdc..dfb6c1f5090 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -250,14 +250,6 @@ namespace eosio {
       mutable std::shared_mutex             connections_mtx;
       std::set< connection_ptr >            connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
 
-      template<typename Function>
-      void for_each_connection( Function f ) {
-         std::shared_lock<std::shared_mutex> g( connections_mtx );
-         for( auto& c : connections ) {
-            if ( !f( c ) ) return;
-         }
-      }
-
       std::mutex                            connector_check_timer_mtx;
       unique_ptr<boost::asio::steady_timer> connector_check_timer;
       int                                   connector_checks_in_flight{0};
@@ -549,6 +541,10 @@ namespace eosio {
       // thread safe, not updated after start_session()
       const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; }
 
+      void set_connection_type( const string& peer_addr );
+      bool is_transactions_only_connection()const { return connection_type == transactions_only; }
+      bool is_blocks_only_connection()const { return connection_type == blocks_only; }
+
    private:
       static const string unknown;
 
@@ -564,6 +560,14 @@ namespace eosio {
       string                  local_endpoint_ip;      // not updated after start
       string                  local_endpoint_port;    // not updated after start
 
+      enum connection_types : char {
+         both,
+         transactions_only,
+         blocks_only
+      };
+
+      std::atomic<connection_types>             connection_type{both};
+
    public:
       boost::asio::io_context::strand           strand;
       tcp::socket                               socket; // only accessed through strand after construction
@@ -810,6 +814,23 @@ namespace eosio {
       }
    };
 
+   template<typename Function>
+   void for_each_connection( Function f ) {
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
+      for( auto& c : my_impl->connections ) {
+         if( !f( c ) ) return;
+      }
+   }
+
+   template<typename Function>
+   void for_each_block_connection( Function f ) {
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
+      for( auto& c : my_impl->connections ) {
+         if( c->is_transactions_only_connection() ) continue;
+         if( !f( c ) ) return;
+      }
+   }
+
    //---------------------------------------------------------------------------
 
    connection::connection( string endpoint )
@@ -822,7 +843,7 @@ namespace eosio {
         last_handshake_recv(),
         last_handshake_sent()
    {
-      fc_ilog( logger, "created connection to ${n}", ("n", endpoint) );
+      fc_ilog( logger, "creating connection to ${n}", ("n", endpoint) );
       node_id.data()[0] = 0;
    }
 
@@ -851,6 +872,24 @@ namespace eosio {
       local_endpoint_port = ec ? unknown : std::to_string(lep.port());
    }
 
+   void connection::set_connection_type( const string& peer_add ) {
+      string::size_type colon = peer_add.find(':');
+      string::size_type colon2 = peer_add.find(':', colon + 1);
+      string host = peer_add.substr( 0, colon );
+      string port = peer_add.substr( colon + 1, colon2 == string::npos ? string::npos : colon2 - (colon + 1));
+      string type = colon2 == string::npos ? "" : peer_add.substr( colon2 + 1 );
+
+      if( type.empty() ) {
+         connection_type = both;
+      } else if( type == "trx" ) {
+         connection_type = transactions_only;
+      } else if( type == "blk" ) {
+         connection_type = blocks_only;
+      } else {
+         fc_wlog( logger, "Unknown connection type: ${t}", ("t", type) );
+      }
+   }
+
    connection_status connection::get_status()const {
       connection_status stat;
       stat.peer = peer_addr;
@@ -1400,7 +1439,7 @@ namespace eosio {
                auto cstart_it = cptr;
                do {
                   //select the first one which is current and break out.
-                  if( (*cptr)->current() ) {
+                  if( !(*cptr)->is_transactions_only_connection() && (*cptr)->current() ) {
                      sync_source = *cptr;
                      break;
                   }
@@ -1413,7 +1452,7 @@ namespace eosio {
       }
 
       // verify there is an available source
-      if( !sync_source || !sync_source->current() ) {
+      if( !sync_source || !sync_source->current() || sync_source->is_transactions_only_connection() ) {
          fc_elog( logger, "Unable to continue syncing at this time");
          sync_known_lib_num = lib_block_num;
          sync_last_requested_num = 0;
@@ -1440,7 +1479,7 @@ namespace eosio {
 
    // static, thread safe
    void sync_manager::send_handshakes() {
-      my_impl->for_each_connection( []( auto& ci ) {
+      for_each_connection( []( auto& ci ) {
          if( ci->current() ) {
             ci->send_handshake();
          }
@@ -1499,11 +1538,13 @@ namespace eosio {
    }
 
    void sync_manager::recv_handshake( const connection_ptr& c, const handshake_message& msg ) {
+
+      if( c->is_transactions_only_connection() ) return;
+
       uint32_t lib_num = 0;
       uint32_t peer_lib = msg.last_irreversible_block_num;
       uint32_t head = 0;
       block_id_type head_id;
-
       std::tie( lib_num, std::ignore, head,
                 std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
 
@@ -1524,7 +1565,6 @@ namespace eosio {
       if (head_id == msg.head_id) {
          fc_dlog(logger, "sync check state 0");
          c->syncing = false;
-         // notify peer of our pending transactions
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
@@ -1581,7 +1621,7 @@ namespace eosio {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
-      my_impl->for_each_connection( [num, &id, &req]( const auto& cc ) {
+      for_each_block_connection( [num, &id, &req]( const auto& cc ) {
          std::lock_guard<std::mutex> g_conn( cc->conn_mtx );
          if( cc->fork_head_num > num || cc->fork_head == id ) {
             req.req_blocks.mode = none;
@@ -1685,7 +1725,7 @@ namespace eosio {
 
          block_id_type null_id;
          bool set_state_to_head_catchup = false;
-         my_impl->for_each_connection( [&null_id, blk_num, &blk_id, &c, &set_state_to_head_catchup]( const auto& cp ) {
+         for_each_block_connection( [&null_id, blk_num, &blk_id, &c, &set_state_to_head_catchup]( const auto& cp ) {
             std::unique_lock<std::mutex> g_cp_conn( cp->conn_mtx );
             uint32_t fork_head_num = cp->fork_head_num;
             block_id_type fork_head_id = cp->fork_head;
@@ -1828,7 +1868,7 @@ namespace eosio {
 
       if( my_impl->sync_master->syncing_with_peer() ) return;
       bool have_connection = false;
-      my_impl->for_each_connection( [&have_connection]( auto& cp ) {
+      for_each_block_connection( [&have_connection]( auto& cp ) {
          peer_dlog( cp, "socket_is_open ${s}, connecting ${c}, syncing ${ss}",
                     ("s", cp->socket_is_open())("c", cp->connecting.load())("ss", cp->syncing.load()) );
 
@@ -1842,7 +1882,7 @@ namespace eosio {
       if( !have_connection ) return;
       std::shared_ptr<std::vector<char>> send_buffer = create_send_buffer( bs->block );
 
-      my_impl->for_each_connection( [this, bs, send_buffer]( auto& cp ) {
+      for_each_block_connection( [this, bs, send_buffer]( auto& cp ) {
          if( !cp->current() ) {
             return true;
          }
@@ -1894,8 +1934,8 @@ namespace eosio {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
-      my_impl->for_each_connection( [this, &trx, &nts, &send_buffer]( auto& cp ) {
-         if( !cp->current() ) {
+      for_each_connection( [this, &trx, &nts, &send_buffer]( auto& cp ) {
+         if( cp->is_blocks_only_connection() || !cp->current() ) {
             return true;
          }
          nts.connection_id = cp->connection_id;
@@ -1997,7 +2037,7 @@ namespace eosio {
          }
          last_req = *c->last_req;
       }
-      my_impl->for_each_connection( [this, &c, &last_req, &bid]( auto& conn ) {
+      for_each_block_connection( [this, &c, &last_req, &bid]( auto& conn ) {
          if( conn == c )
             return true;
          {
@@ -2039,7 +2079,7 @@ namespace eosio {
 
       string::size_type colon = peer_address().find(':');
       if (colon == std::string::npos || colon == 0) {
-         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p", peer_address()) );
+         fc_elog( logger, "Invalid peer address. must be \"host:port[:<blk>|<trx>]\": ${p}", ("p", peer_address()) );
          return false;
       }
 
@@ -2053,9 +2093,11 @@ namespace eosio {
          }
       }
 
+      string::size_type colon2 = peer_address().find(':', colon + 1);
       string host = peer_address().substr( 0, colon );
-      string port = peer_address().substr( colon + 1);
+      string port = peer_address().substr( colon + 1, colon2 == string::npos ? string::npos : colon2 - (colon + 1));
       idump((host)(port));
+      set_connection_type( peer_address() );
       tcp::resolver::query query( tcp::v4(), host, port );
       // Note: need to add support for IPv6 too
 
@@ -2119,7 +2161,7 @@ namespace eosio {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
             } else {
                paddr_str = paddr_add.to_string();
-               my_impl->for_each_connection( [&visitors, &from_addr, &paddr_str]( auto& conn ) {
+               for_each_connection( [&visitors, &from_addr, &paddr_str]( auto& conn ) {
                   if( conn->socket_is_open() ) {
                      if( conn->peer_address().empty() ) {
                         ++visitors;
@@ -2428,6 +2470,10 @@ namespace eosio {
             return;
          }
 
+         if( peer_address().empty() ) {
+            set_connection_type( msg.p2p_address );
+         }
+
          std::unique_lock<std::mutex> g_conn( conn_mtx );
          if( peer_address().empty() || last_handshake_recv.node_id == fc::sha256()) {
             g_conn.unlock();
@@ -2866,7 +2912,7 @@ namespace eosio {
                if( my->in_shutdown ) return;
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
-            my->for_each_connection( []( auto& c ) {
+            for_each_connection( []( auto& c ) {
                if( c->socket_is_open() ) {
                   c->strand.post( [c]() {
                      c->send_time();
@@ -3084,7 +3130,14 @@ namespace eosio {
       cfg.add_options()
          ( "p2p-listen-endpoint", bpo::value<string>()->default_value( "0.0.0.0:9876" ), "The actual host:port used to listen for incoming p2p connections.")
          ( "p2p-server-address", bpo::value<string>(), "An externally accessible host:port for identifying this node. Defaults to p2p-listen-endpoint.")
-         ( "p2p-peer-address", bpo::value< vector<string> >()->composing(), "The public endpoint of a peer node to connect to. Use multiple p2p-peer-address options as needed to compose a network.")
+         ( "p2p-peer-address", bpo::value< vector<string> >()->composing(),
+           "The public endpoint of a peer node to connect to. Use multiple p2p-peer-address options as needed to compose a network.\n"
+           "  Syntax: host:port[:<trx>|<blk>]\n"
+           "  The optional 'trx' and 'blk' indicates to node that only transactions 'trx' or blocks 'blk' should be sent."
+           "  Examples:\n"
+           "    p2p.eos.io:9876\n"
+           "    p2p.trx.eos.io:9876:trx\n"
+           "    p2p.blk.eos.io:9876:blk\n")
          ( "p2p-max-nodes-per-host", bpo::value<int>()->default_value(def_max_nodes_per_host), "Maximum number of client nodes from any single IP address")
          ( "agent-name", bpo::value<string>()->default_value("\"EOS Test Agent\""), "The name supplied to identify this node amongst the peers.")
          ( "allowed-connection", bpo::value<vector<string>>()->multitoken()->default_value({"any"}, "any"), "Can be 'any' or 'producers' or 'specified' or 'none'. If 'specified', peer-key must be specified at least once. If only 'producers', peer-key is not required. 'producers' and 'specified' may be combined.")

From c8dd33ebe7579e396dfcaa2b673db644e3d3871f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 14 May 2019 15:59:08 -0400
Subject: [PATCH 0403/1648] Add log for connection settting

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index dfb6c1f5090..728f49452bf 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -879,6 +879,7 @@ namespace eosio {
       string port = peer_add.substr( colon + 1, colon2 == string::npos ? string::npos : colon2 - (colon + 1));
       string type = colon2 == string::npos ? "" : peer_add.substr( colon2 + 1 );
 
+      fc_ilog( "Setting connection type for: ${peer}", ("peer", peer_add) )
       if( type.empty() ) {
          connection_type = both;
       } else if( type == "trx" ) {

From 196406a3ba1c91e33914c0d44062e341c86a4d24 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Tue, 14 May 2019 16:07:26 -0400
Subject: [PATCH 0404/1648] Fixes for Boost 1.70

---
 CMakeLists.txt                         | 6 ++++--
 CMakeModules/EosioTester.cmake.in      | 2 ++
 CMakeModules/EosioTesterBuild.cmake.in | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d1b20bd230..625c481275d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,8 +83,10 @@ else()
   set(no_whole_archive_flag "--no-whole-archive")
 endif()
 
-SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
-FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS
+set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
+### Remove after Boost 1.70 CMake fixes are in place
+set( Boost_NO_BOOST_CMAKE ON CACHE STRING "ON or OFF" )
+find_package(Boost 1.67 REQUIRED COMPONENTS
     date_time
     filesystem
     system
diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index e938378ed93..a3cc2342bf9 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -34,6 +34,8 @@ else ( APPLE )
    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall")
 endif ( APPLE )
 
+### Remove after Boost 1.70 CMake fixes are in place
+set( Boost_NO_BOOST_CMAKE ON CACHE STRING "ON or OFF" )
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 find_package(Boost 1.67 REQUIRED COMPONENTS
    date_time
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index 119aa23a4d4..a1ea88182a9 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -32,6 +32,8 @@ else ( APPLE )
    set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -Wall")
 endif ( APPLE )
 
+### Remove after Boost 1.70 CMake fixes are in place
+set( Boost_NO_BOOST_CMAKE ON CACHE STRING "ON or OFF" )
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 find_package(Boost 1.67 REQUIRED COMPONENTS
    date_time

From 1dc11396db4b02cad8999357d806abd042e18dff Mon Sep 17 00:00:00 2001
From: Zach <34947245+kj4ezj@users.noreply.github.com>
Date: Tue, 14 May 2019 19:11:23 -0400
Subject: [PATCH 0405/1648] Finish test purpose comment

---
 tests/version-label.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/version-label.sh b/tests/version-label.sh
index 463122cf405..008c469d2b8 100755
--- a/tests/version-label.sh
+++ b/tests/version-label.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# The purpose of this test is to ensure that the output of the "nodeos --version" command matches the 
+# The purpose of this test is to ensure that the output of the "nodeos --version" command matches the version string defined by our CMake files
 # If the environment variable BUILDKITE_TAG is empty or unset, this test will echo success
 echo '##### Nodeos Version Label Test #####'
 if [[ "$BUILDKITE_TAG" == '' || "$BUILDKITE" != 'true' ]]; then
@@ -70,4 +70,4 @@ if [[ "$EXPECTED" == "$ACTUAL" ]]; then
 fi
 echo 'Failed!'
 echo "\"$EXPECTED\" != \"$ACTUAL\""
-exit 1
\ No newline at end of file
+exit 1

From 8f3a7745ed1ffa76b7d54b107e6eda97f63dcb2a Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Tue, 14 May 2019 19:11:24 -0400
Subject: [PATCH 0406/1648] update to use boost 1.70

---
 .buildkite/pipeline.yml | 2 +-
 scripts/eosio_build.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3f2be7954b1..eaee8315f4b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,7 +2,7 @@ env:
   ANKA_MOJAVE_TEMPLATE: "10.14.4_6C_14G_40G"
   ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
   CHECKSUMABLE: "scripts/eosio_build*"
-  MAC_TAG: "eosio_2-4"
+  MAC_TAG: "eosio_2-5"
   WORKDIR: "/data/job"
 
 steps:
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index f08a50dfa03..7f901635396 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -180,7 +180,7 @@ export MONGO_C_DRIVER_ROOT=${SRC_LOCATION}/mongo-c-driver-${MONGO_C_DRIVER_VERSI
 export MONGO_CXX_DRIVER_VERSION=3.4.0
 export MONGO_CXX_DRIVER_ROOT=${SRC_LOCATION}/mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}
 export BOOST_VERSION_MAJOR=1
-export BOOST_VERSION_MINOR=67
+export BOOST_VERSION_MINOR=70
 export BOOST_VERSION_PATCH=0
 export BOOST_VERSION=${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH}
 export BOOST_ROOT=${BOOST_ARG:-${SRC_LOCATION}/boost_${BOOST_VERSION}}

From 2f3101b652d4c2835bf7e0a14ea2c5ec6515b0ad Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 14 May 2019 23:37:58 +0000
Subject: [PATCH 0407/1648] update wasm_interface to use uint32_t instead of
 size_t

---
 CMakeLists.txt                                |   1 +
 .../include/eosio/chain/wasm_interface.hpp    |   4 +-
 .../eosio/chain/wasm_interface_private.hpp    |   4 +-
 .../eosio/chain/webassembly/eos-vm.hpp        |  10 +-
 .../include/eosio/chain/webassembly/wabt.hpp  |  12 +-
 .../include/eosio/chain/webassembly/wavm.hpp  |  12 +-
 libraries/chain/wasm_interface.cpp            | 106 +++++++++---------
 libraries/chain/webassembly/eos-vm.cpp        |   4 +-
 tests/CMakeLists.txt                          |   2 -
 unittests/CMakeLists.txt                      |   3 +-
 unittests/api_tests.cpp                       |   4 +-
 unittests/producer_schedule_tests.cpp         |   1 -
 12 files changed, 80 insertions(+), 83 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fb920049c4..8028e200af9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,7 @@ FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS
     unit_test_framework
     iostreams)
 
+add_definitions(-DBOOST_COMPUTE_USE_CPP11)
 add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index 7c2bfa9eb75..ee124f9bca4 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -3,7 +3,7 @@
 #include <eosio/chain/types.hpp>
 #include <eosio/chain/whitelisted_intrinsics.hpp>
 #include <eosio/chain/exceptions.hpp>
-#include <eosio/wasm_backend/allocator.hpp>
+#include <eosio/vm/allocator.hpp>
 #include "Runtime/Linker.h"
 #include "Runtime/Runtime.h"
 
@@ -88,7 +88,7 @@ namespace eosio { namespace chain {
          static void validate(const controller& control, const bytes& code);
 	 
 	 //get the wasm_allocator used for the linear memory for wasm
-	 static wasm_backend::wasm_allocator* get_wasm_allocator();
+	 static vm::wasm_allocator* get_wasm_allocator();
 
          //indicate that a particular code probably won't be used after given block_num
          void code_block_num_last_used(const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, const uint32_t& block_num);
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 85a3c7f34ae..225e44dd971 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -17,11 +17,11 @@
 #include "WAST/WAST.h"
 #include "IR/Validate.h"
 
-#include <eosio/wasm_backend/allocator.hpp>
+#include <eosio/vm/allocator.hpp>
 
 using namespace fc;
 using namespace eosio::chain::webassembly;
-using namespace eosio::wasm_backend;
+using namespace eosio::vm;
 using namespace IR;
 using namespace Runtime;
 
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 539448ad138..f6d9ca51a85 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -7,10 +7,10 @@
 #include <softfloat_types.h>
 
 //eos-vm includes
-#include <eosio/wasm_backend/backend.hpp>
+#include <eosio/vm/backend.hpp>
 
 // eosio specific specializations
-namespace eosio { namespace wasm_backend {
+namespace eosio { namespace vm {
    template <>
    struct reduce_type<chain::name> {
       typedef uint64_t type;
@@ -60,12 +60,12 @@ namespace eosio { namespace wasm_backend {
       return eosio::chain::null_terminated_ptr((char*)(walloc->template get_base_ptr<uint8_t>()+val.data.ui));
    }
 
-}} // ns eosio::wasm_backend
+}} // ns eosio::vm
 
 namespace eosio { namespace chain { namespace webassembly { namespace eos_vm_runtime {
 
 using namespace fc;
-using namespace eosio::wasm_backend;
+using namespace eosio::vm;
 using namespace eosio::chain::webassembly::common;
 
 class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
@@ -85,4 +85,4 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
 #define _EOS_VM_INTRINSIC_NAME(LBL, SUF) __INTRINSIC_NAME(LBL, SUF)
 
 #define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG) \
-   eosio::wasm_backend::registered_function<eosio::chain::apply_context, CLS, &CLS::METHOD> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__)(std::string(MOD), std::string(NAME));
+   eosio::vm::registered_function<eosio::chain::apply_context, CLS, &CLS::METHOD> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__)(std::string(MOD), std::string(NAME));
diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index 040505b014b..5dc3c0aeaa5 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -362,9 +362,9 @@ struct intrinsic_invoker_impl<Ret, std::tuple<Input, Inputs...>> {
  * @tparam Inputs - the remaining native parameters to transcribe
  */
 template<typename T, typename Ret, typename... Inputs>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, size_t, Inputs...>> {
+struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, uint32_t, Inputs...>> {
    using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>>;
-   using then_type = Ret(*)(wabt_apply_instance_vars&, array_ptr<T>, size_t, Inputs..., const TypedValues&, int);
+   using then_type = Ret(*)(wabt_apply_instance_vars&, array_ptr<T>, uint32_t, Inputs..., const TypedValues&, int);
 
    template<then_type Then, typename U=T>
    static auto translate_one(wabt_apply_instance_vars& vars, Inputs... rest, const TypedValues& args, int offset) -> std::enable_if_t<std::is_const<U>::value, Ret> {
@@ -442,9 +442,9 @@ struct intrinsic_invoker_impl<Ret, std::tuple<null_terminated_ptr, Inputs...>> {
  * @tparam Inputs - the remaining native parameters to transcribe
  */
 template<typename T, typename U, typename Ret, typename... Inputs>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, array_ptr<U>, size_t, Inputs...>> {
+struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, array_ptr<U>, uint32_t, Inputs...>> {
    using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>>;
-   using then_type = Ret(*)(wabt_apply_instance_vars&, array_ptr<T>, array_ptr<U>, size_t, Inputs..., const TypedValues&, int);
+   using then_type = Ret(*)(wabt_apply_instance_vars&, array_ptr<T>, array_ptr<U>, uint32_t, Inputs..., const TypedValues&, int);
 
    template<then_type Then>
    static Ret translate_one(wabt_apply_instance_vars& vars, Inputs... rest, const TypedValues& args, int offset) {
@@ -468,9 +468,9 @@ struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, array_ptr<U>, size_t
  * @tparam Inputs - the remaining native parameters to transcribe
  */
 template<typename Ret>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<char>, int, size_t>> {
+struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<char>, int, uint32_t>> {
    using next_step = intrinsic_invoker_impl<Ret, std::tuple<>>;
-   using then_type = Ret(*)(wabt_apply_instance_vars&, array_ptr<char>, int, size_t, const TypedValues&, int);
+   using then_type = Ret(*)(wabt_apply_instance_vars&, array_ptr<char>, int, uint32_t, const TypedValues&, int);
 
    template<then_type Then>
    static Ret translate_one(wabt_apply_instance_vars& vars, const TypedValues& args, int offset) {
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 04c36e8f153..1e91ed228f8 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -377,9 +377,9 @@ struct intrinsic_invoker_impl<Ret, std::tuple<Input, Inputs...>, std::tuple<Tran
  * @tparam Translated - the list of transcribed wasm parameters
  */
 template<typename T, typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, size_t, Inputs...>, std::tuple<Translated...>> {
+struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, uint32_t, Inputs...>, std::tuple<Translated...>> {
    using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32, I32>>;
-   using then_type = Ret(*)(running_instance_context&, array_ptr<T>, size_t, Inputs..., Translated...);
+   using then_type = Ret(*)(running_instance_context&, array_ptr<T>, uint32_t, Inputs..., Translated...);
 
    template<then_type Then, typename U=T>
    static auto translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr, I32 size) -> std::enable_if_t<std::is_const<U>::value, Ret> {
@@ -456,9 +456,9 @@ struct intrinsic_invoker_impl<Ret, std::tuple<null_terminated_ptr, Inputs...>, s
  * @tparam Translated - the list of transcribed wasm parameters
  */
 template<typename T, typename U, typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, array_ptr<U>, size_t, Inputs...>, std::tuple<Translated...>> {
+struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, array_ptr<U>, uint32_t, Inputs...>, std::tuple<Translated...>> {
    using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32, I32, I32>>;
-   using then_type = Ret(*)(running_instance_context&, array_ptr<T>, array_ptr<U>, size_t, Inputs..., Translated...);
+   using then_type = Ret(*)(running_instance_context&, array_ptr<T>, array_ptr<U>, uint32_t, Inputs..., Translated...);
 
    template<then_type Then>
    static Ret translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr_t, I32 ptr_u, I32 size) {
@@ -481,9 +481,9 @@ struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, array_ptr<U>, size_t
  * @tparam Translated - the list of transcribed wasm parameters
  */
 template<typename Ret>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<char>, int, size_t>, std::tuple<>> {
+struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<char>, int, uint32_t>, std::tuple<>> {
    using next_step = intrinsic_invoker_impl<Ret, std::tuple<>, std::tuple<I32, I32, I32>>;
-   using then_type = Ret(*)(running_instance_context&, array_ptr<char>, int, size_t);
+   using then_type = Ret(*)(running_instance_context&, array_ptr<char>, int, uint32_t);
 
    template<then_type Then>
    static Ret translate_one(running_instance_context& ctx, I32 ptr, I32 value, I32 size) {
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 8bc9c327919..39970c55754 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -25,7 +25,7 @@
 #include <fstream>
 #include <string.h>
 
-#include <eosio/wasm_backend/allocator.hpp>
+#include <eosio/vm/allocator.hpp>
 
 namespace eosio { namespace chain {
    using namespace webassembly;
@@ -116,7 +116,7 @@ class context_free_api : public context_aware_api {
          EOS_ASSERT( context.is_context_free(), unaccessible_api, "this API may only be called from context_free apply" );
       }
 
-      int get_context_free_data( uint32_t index, array_ptr<char> buffer, size_t buffer_size )const {
+      int get_context_free_data( uint32_t index, array_ptr<char> buffer, uint32_t buffer_size )const {
          return context.get_context_free_data( index, buffer, buffer_size );
       }
 };
@@ -181,7 +181,7 @@ class privileged_api : public context_aware_api {
          context.control.get_resource_limits_manager().get_account_limits( account, ram_bytes, net_weight, cpu_weight);
       }
 
-      int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, size_t datalen) {
+      int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, uint32_t datalen) {
          datastream<const char*> ds( packed_producer_schedule, datalen );
          vector<producer_key> producers;
          fc::raw::unpack(ds, producers);
@@ -204,7 +204,7 @@ class privileged_api : public context_aware_api {
          return context.control.set_proposed_producers( std::move(producers) );
       }
 
-      uint32_t get_blockchain_parameters_packed( array_ptr<char> packed_blockchain_parameters, size_t buffer_size) {
+      uint32_t get_blockchain_parameters_packed( array_ptr<char> packed_blockchain_parameters, uint32_t buffer_size) {
          auto& gpo = context.control.get_global_properties();
 
          auto s = fc::raw::pack_size( gpo.configuration );
@@ -218,7 +218,7 @@ class privileged_api : public context_aware_api {
          return 0;
       }
 
-      void set_blockchain_parameters_packed( array_ptr<char> packed_blockchain_parameters, size_t datalen) {
+      void set_blockchain_parameters_packed( array_ptr<char> packed_blockchain_parameters, uint32_t datalen) {
          datastream<const char*> ds( packed_blockchain_parameters, datalen );
          chain::chain_config cfg;
          fc::raw::unpack(ds, cfg);
@@ -707,14 +707,14 @@ class producer_api : public context_aware_api {
    public:
       using context_aware_api::context_aware_api;
 
-      int get_active_producers(array_ptr<chain::account_name> producers, size_t buffer_size) {
+      int get_active_producers(array_ptr<chain::account_name> producers, uint32_t buffer_size) {
          auto active_producers = context.get_active_producers();
 
          size_t len = active_producers.size();
          auto s = len * sizeof(chain::account_name);
          if( buffer_size == 0 ) return s;
 
-         auto copy_size = std::min( buffer_size, s );
+         auto copy_size = std::min( static_cast<size_t>(buffer_size), s );
          memcpy( producers, active_producers.data(), copy_size );
 
          return copy_size;
@@ -730,8 +730,8 @@ class crypto_api : public context_aware_api {
        * no possible side effects other than "passing".
        */
       void assert_recover_key( const fc::sha256& digest,
-                        array_ptr<char> sig, size_t siglen,
-                        array_ptr<char> pub, size_t publen ) {
+                        array_ptr<char> sig, uint32_t siglen,
+                        array_ptr<char> pub, uint32_t publen ) {
          fc::crypto::signature s;
          fc::crypto::public_key p;
          datastream<const char*> ds( sig, siglen );
@@ -745,8 +745,8 @@ class crypto_api : public context_aware_api {
       }
 
       int recover_key( const fc::sha256& digest,
-                        array_ptr<char> sig, size_t siglen,
-                        array_ptr<char> pub, size_t publen ) {
+                        array_ptr<char> sig, uint32_t siglen,
+                        array_ptr<char> pub, uint32_t publen ) {
          fc::crypto::signature s;
          datastream<const char*> ds( sig, siglen );
          datastream<char*> pubds( pub, publen );
@@ -756,7 +756,7 @@ class crypto_api : public context_aware_api {
          return pubds.tellp();
       }
 
-      template<class Encoder> auto encode(char* data, size_t datalen) {
+      template<class Encoder> auto encode(char* data, uint32_t datalen) {
          Encoder e;
          const size_t bs = eosio::chain::config::hashing_checktime_block_size;
          while ( datalen > bs ) {
@@ -769,39 +769,39 @@ class crypto_api : public context_aware_api {
          return e.result();
       }
 
-      void assert_sha256(array_ptr<char> data, size_t datalen, const fc::sha256& hash_val) {
+      void assert_sha256(array_ptr<char> data, uint32_t datalen, const fc::sha256& hash_val) {
          auto result = encode<fc::sha256::encoder>( data, datalen );
          EOS_ASSERT( result == hash_val, crypto_api_exception, "hash mismatch" );
       }
 
-      void assert_sha1(array_ptr<char> data, size_t datalen, const fc::sha1& hash_val) {
+      void assert_sha1(array_ptr<char> data, uint32_t datalen, const fc::sha1& hash_val) {
          auto result = encode<fc::sha1::encoder>( data, datalen );
          EOS_ASSERT( result == hash_val, crypto_api_exception, "hash mismatch" );
       }
 
-      void assert_sha512(array_ptr<char> data, size_t datalen, const fc::sha512& hash_val) {
+      void assert_sha512(array_ptr<char> data, uint32_t datalen, const fc::sha512& hash_val) {
          auto result = encode<fc::sha512::encoder>( data, datalen );
          EOS_ASSERT( result == hash_val, crypto_api_exception, "hash mismatch" );
       }
 
-      void assert_ripemd160(array_ptr<char> data, size_t datalen, const fc::ripemd160& hash_val) {
+      void assert_ripemd160(array_ptr<char> data, uint32_t datalen, const fc::ripemd160& hash_val) {
          auto result = encode<fc::ripemd160::encoder>( data, datalen );
          EOS_ASSERT( result == hash_val, crypto_api_exception, "hash mismatch" );
       }
 
-      void sha1(array_ptr<char> data, size_t datalen, fc::sha1& hash_val) {
+      void sha1(array_ptr<char> data, uint32_t datalen, fc::sha1& hash_val) {
          hash_val = encode<fc::sha1::encoder>( data, datalen );
       }
 
-      void sha256(array_ptr<char> data, size_t datalen, fc::sha256& hash_val) {
+      void sha256(array_ptr<char> data, uint32_t datalen, fc::sha256& hash_val) {
          hash_val = encode<fc::sha256::encoder>( data, datalen );
       }
 
-      void sha512(array_ptr<char> data, size_t datalen, fc::sha512& hash_val) {
+      void sha512(array_ptr<char> data, uint32_t datalen, fc::sha512& hash_val) {
          hash_val = encode<fc::sha512::encoder>( data, datalen );
       }
 
-      void ripemd160(array_ptr<char> data, size_t datalen, fc::ripemd160& hash_val) {
+      void ripemd160(array_ptr<char> data, uint32_t datalen, fc::ripemd160& hash_val) {
          hash_val = encode<fc::ripemd160::encoder>( data, datalen );
       }
 };
@@ -810,9 +810,9 @@ class permission_api : public context_aware_api {
    public:
       using context_aware_api::context_aware_api;
 
-      bool check_transaction_authorization( array_ptr<char> trx_data,     size_t trx_size,
-                                            array_ptr<char> pubkeys_data, size_t pubkeys_size,
-                                            array_ptr<char> perms_data,   size_t perms_size
+      bool check_transaction_authorization( array_ptr<char> trx_data,     uint32_t trx_size,
+                                            array_ptr<char> pubkeys_data, uint32_t pubkeys_size,
+                                            array_ptr<char> perms_data,   uint32_t perms_size
                                           )
       {
          transaction trx = fc::raw::unpack<transaction>( trx_data, trx_size );
@@ -840,8 +840,8 @@ class permission_api : public context_aware_api {
       }
 
       bool check_permission_authorization( account_name account, permission_name permission,
-                                           array_ptr<char> pubkeys_data, size_t pubkeys_size,
-                                           array_ptr<char> perms_data,   size_t perms_size,
+                                           array_ptr<char> pubkeys_data, uint32_t pubkeys_size,
+                                           array_ptr<char> perms_data,   uint32_t perms_size,
                                            uint64_t delay_us
                                          )
       {
@@ -884,14 +884,14 @@ class permission_api : public context_aware_api {
       }
 
    private:
-      void unpack_provided_keys( flat_set<public_key_type>& keys, const char* pubkeys_data, size_t pubkeys_size ) {
+      void unpack_provided_keys( flat_set<public_key_type>& keys, const char* pubkeys_data, uint32_t pubkeys_size ) {
          keys.clear();
          if( pubkeys_size == 0 ) return;
 
          keys = fc::raw::unpack<flat_set<public_key_type>>( pubkeys_data, pubkeys_size );
       }
 
-      void unpack_provided_permissions( flat_set<permission_level>& permissions, const char* perms_data, size_t perms_size ) {
+      void unpack_provided_permissions( flat_set<permission_level>& permissions, const char* perms_data, uint32_t perms_size ) {
          permissions.clear();
          if( perms_size == 0 ) return;
 
@@ -971,7 +971,7 @@ class context_free_system_api :  public context_aware_api {
       }
    }
 
-   void eosio_assert_message( bool condition, array_ptr<const char> msg, size_t msg_len ) {
+   void eosio_assert_message( bool condition, array_ptr<const char> msg, uint32_t msg_len ) {
       if( BOOST_UNLIKELY( !condition ) ) {
          const size_t sz = msg_len > max_assert_message ? max_assert_message : msg_len;
          std::string message( msg, sz );
@@ -1001,15 +1001,13 @@ class action_api : public context_aware_api {
    action_api( apply_context& ctx )
       :context_aware_api(ctx,true){}
 
-      int read_action_data(array_ptr<char> memory, size_t buffer_size) __attribute__((target("no-sse"))) {
+      int read_action_data(array_ptr<char> memory, uint32_t buffer_size) {
          auto s = context.get_action().data.size();
          if( buffer_size == 0 ) return s;
 
-         auto copy_size = std::min( buffer_size, s );
+         auto copy_size = std::min( static_cast<size_t>(buffer_size), s );
          const char* d = context.get_action().data.data();
-	 for (int i=0; i < copy_size; i++)
-            ((char*)memory.value)[i] = (context.get_action().data.data())[i];
-         //memcpy( (char*)memory.value, context.get_action().data.data(), copy_size );
+         memcpy( (char*)memory.value, context.get_action().data.data(), copy_size );
 
          return copy_size;
       }
@@ -1036,7 +1034,7 @@ class console_api : public context_aware_api {
          }
       }
 
-      void prints_l(array_ptr<const char> str, size_t str_len ) {
+      void prints_l(array_ptr<const char> str, uint32_t str_len ) {
          if ( !ignore ) {
             context.console_append(string(str, str_len));
          }
@@ -1149,7 +1147,7 @@ class console_api : public context_aware_api {
          }
       }
 
-      void printhex(array_ptr<const char> data, size_t data_len ) {
+      void printhex(array_ptr<const char> data, uint32_t data_len ) {
          if ( !ignore ) {
             context.console_append(fc::to_hex(data, data_len));
          }
@@ -1192,14 +1190,14 @@ class console_api : public context_aware_api {
       }
 
 #define DB_API_METHOD_WRAPPERS_ARRAY_SECONDARY(IDX, ARR_SIZE, ARR_ELEMENT_TYPE)\
-      int db_##IDX##_store( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, array_ptr<const ARR_ELEMENT_TYPE> data, size_t data_len) {\
+      int db_##IDX##_store( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, array_ptr<const ARR_ELEMENT_TYPE> data, uint32_t data_len) {\
          EOS_ASSERT( data_len == ARR_SIZE,\
                     db_api_exception,\
                     "invalid size of secondary key array for " #IDX ": given ${given} bytes but expected ${expected} bytes",\
                     ("given",data_len)("expected",ARR_SIZE) );\
          return context.IDX.store(scope, table, payer, id, data.value);\
       }\
-      void db_##IDX##_update( int iterator, uint64_t payer, array_ptr<const ARR_ELEMENT_TYPE> data, size_t data_len ) {\
+      void db_##IDX##_update( int iterator, uint64_t payer, array_ptr<const ARR_ELEMENT_TYPE> data, uint32_t data_len ) {\
          EOS_ASSERT( data_len == ARR_SIZE,\
                     db_api_exception,\
                     "invalid size of secondary key array for " #IDX ": given ${given} bytes but expected ${expected} bytes",\
@@ -1209,28 +1207,28 @@ class console_api : public context_aware_api {
       void db_##IDX##_remove( int iterator ) {\
          return context.IDX.remove(iterator);\
       }\
-      int db_##IDX##_find_secondary( uint64_t code, uint64_t scope, uint64_t table, array_ptr<const ARR_ELEMENT_TYPE> data, size_t data_len, uint64_t& primary ) {\
+      int db_##IDX##_find_secondary( uint64_t code, uint64_t scope, uint64_t table, array_ptr<const ARR_ELEMENT_TYPE> data, uint32_t data_len, uint64_t& primary ) {\
          EOS_ASSERT( data_len == ARR_SIZE,\
                     db_api_exception,\
                     "invalid size of secondary key array for " #IDX ": given ${given} bytes but expected ${expected} bytes",\
                     ("given",data_len)("expected",ARR_SIZE) );\
          return context.IDX.find_secondary(code, scope, table, data, primary);\
       }\
-      int db_##IDX##_find_primary( uint64_t code, uint64_t scope, uint64_t table, array_ptr<ARR_ELEMENT_TYPE> data, size_t data_len, uint64_t primary ) {\
+      int db_##IDX##_find_primary( uint64_t code, uint64_t scope, uint64_t table, array_ptr<ARR_ELEMENT_TYPE> data, uint32_t data_len, uint64_t primary ) {\
          EOS_ASSERT( data_len == ARR_SIZE,\
                     db_api_exception,\
                     "invalid size of secondary key array for " #IDX ": given ${given} bytes but expected ${expected} bytes",\
                     ("given",data_len)("expected",ARR_SIZE) );\
          return context.IDX.find_primary(code, scope, table, data.value, primary);\
       }\
-      int db_##IDX##_lowerbound( uint64_t code, uint64_t scope, uint64_t table, array_ptr<ARR_ELEMENT_TYPE> data, size_t data_len, uint64_t& primary ) {\
+      int db_##IDX##_lowerbound( uint64_t code, uint64_t scope, uint64_t table, array_ptr<ARR_ELEMENT_TYPE> data, uint32_t data_len, uint64_t& primary ) {\
          EOS_ASSERT( data_len == ARR_SIZE,\
                     db_api_exception,\
                     "invalid size of secondary key array for " #IDX ": given ${given} bytes but expected ${expected} bytes",\
                     ("given",data_len)("expected",ARR_SIZE) );\
          return context.IDX.lowerbound_secondary(code, scope, table, data.value, primary);\
       }\
-      int db_##IDX##_upperbound( uint64_t code, uint64_t scope, uint64_t table, array_ptr<ARR_ELEMENT_TYPE> data, size_t data_len, uint64_t& primary ) {\
+      int db_##IDX##_upperbound( uint64_t code, uint64_t scope, uint64_t table, array_ptr<ARR_ELEMENT_TYPE> data, uint32_t data_len, uint64_t& primary ) {\
          EOS_ASSERT( data_len == ARR_SIZE,\
                     db_api_exception,\
                     "invalid size of secondary key array for " #IDX ": given ${given} bytes but expected ${expected} bytes",\
@@ -1288,16 +1286,16 @@ class database_api : public context_aware_api {
    public:
       using context_aware_api::context_aware_api;
 
-      int db_store_i64( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, array_ptr<const char> buffer, size_t buffer_size ) {
+      int db_store_i64( uint64_t scope, uint64_t table, uint64_t payer, uint64_t id, array_ptr<const char> buffer, uint32_t buffer_size ) {
          return context.db_store_i64( scope, table, payer, id, buffer, buffer_size );
       }
-      void db_update_i64( int itr, uint64_t payer, array_ptr<const char> buffer, size_t buffer_size ) {
+      void db_update_i64( int itr, uint64_t payer, array_ptr<const char> buffer, uint32_t buffer_size ) {
          context.db_update_i64( itr, payer, buffer, buffer_size );
       }
       void db_remove_i64( int itr ) {
          context.db_remove_i64( itr );
       }
-      int db_get_i64( int itr, array_ptr<char> buffer, size_t buffer_size ) {
+      int db_get_i64( int itr, array_ptr<char> buffer, uint32_t buffer_size ) {
          return context.db_get_i64( itr, buffer, buffer_size );
       }
       int db_next_i64( int itr, uint64_t& primary ) {
@@ -1331,17 +1329,17 @@ class memory_api : public context_aware_api {
       memory_api( apply_context& ctx )
       :context_aware_api(ctx,true){}
 
-      char* memcpy( array_ptr<char> dest, array_ptr<const char> src, size_t length) {
+      char* memcpy( array_ptr<char> dest, array_ptr<const char> src, uint32_t length) {
          EOS_ASSERT((size_t)(std::abs((ptrdiff_t)dest.value - (ptrdiff_t)src.value)) >= length,
                overlapping_memory_error, "memcpy can only accept non-aliasing pointers");
          return (char *)::memcpy(dest, src, length);
       }
 
-      char* memmove( array_ptr<char> dest, array_ptr<const char> src, size_t length) {
+      char* memmove( array_ptr<char> dest, array_ptr<const char> src, uint32_t length) {
          return (char *)::memmove(dest, src, length);
       }
 
-      int memcmp( array_ptr<const char> dest, array_ptr<const char> src, size_t length) {
+      int memcmp( array_ptr<const char> dest, array_ptr<const char> src, uint32_t length) {
          int ret = ::memcmp(dest, src, length);
          if(ret < 0)
             return -1;
@@ -1350,7 +1348,7 @@ class memory_api : public context_aware_api {
          return 0;
       }
 
-      char* memset( array_ptr<char> dest, int value, size_t length ) {
+      char* memset( array_ptr<char> dest, int value, uint32_t length ) {
          return (char *)::memset( dest, value, length );
       }
 };
@@ -1359,7 +1357,7 @@ class transaction_api : public context_aware_api {
    public:
       using context_aware_api::context_aware_api;
 
-      void send_inline( array_ptr<char> data, size_t data_len ) {
+      void send_inline( array_ptr<char> data, uint32_t data_len ) {
          //TODO: Why is this limit even needed? And why is it not consistently checked on actions in input or deferred transactions
          EOS_ASSERT( data_len < context.control.get_global_properties().configuration.max_inline_action_size, inline_action_too_big,
                     "inline action too big" );
@@ -1369,7 +1367,7 @@ class transaction_api : public context_aware_api {
          context.execute_inline(std::move(act));
       }
 
-      void send_context_free_inline( array_ptr<char> data, size_t data_len ) {
+      void send_context_free_inline( array_ptr<char> data, uint32_t data_len ) {
          //TODO: Why is this limit even needed? And why is it not consistently checked on actions in input or deferred transactions
          EOS_ASSERT( data_len < context.control.get_global_properties().configuration.max_inline_action_size, inline_action_too_big,
                    "inline action too big" );
@@ -1379,7 +1377,7 @@ class transaction_api : public context_aware_api {
          context.execute_context_free_inline(std::move(act));
       }
 
-      void send_deferred( const uint128_t& sender_id, account_name payer, array_ptr<char> data, size_t data_len, uint32_t replace_existing) {
+      void send_deferred( const uint128_t& sender_id, account_name payer, array_ptr<char> data, uint32_t data_len, uint32_t replace_existing) {
          transaction trx;
          fc::raw::unpack<transaction>(data, data_len, trx);
          context.schedule_deferred_transaction(sender_id, payer, std::move(trx), replace_existing);
@@ -1397,13 +1395,13 @@ class context_free_transaction_api : public context_aware_api {
       context_free_transaction_api( apply_context& ctx )
       :context_aware_api(ctx,true){}
 
-      int read_transaction( array_ptr<char> data, size_t buffer_size ) {
+      int read_transaction( array_ptr<char> data, uint32_t buffer_size ) {
          bytes trx = context.get_packed_transaction();
 
          auto s = trx.size();
          if( buffer_size == 0) return s;
 
-         auto copy_size = std::min( buffer_size, s );
+         auto copy_size = std::min( static_cast<size_t>(buffer_size), s );
          memcpy( data, trx.data(), copy_size );
 
          return copy_size;
@@ -1424,7 +1422,7 @@ class context_free_transaction_api : public context_aware_api {
         return context.trx_context.trx.ref_block_prefix;
       }
 
-      int get_action( uint32_t type, uint32_t index, array_ptr<char> buffer, size_t buffer_size )const {
+      int get_action( uint32_t type, uint32_t index, array_ptr<char> buffer, uint32_t buffer_size )const {
          return context.get_action( type, index, buffer, buffer_size );
       }
 };
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 6af6dba2e43..c47c10b3c81 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -3,11 +3,11 @@
 #include <eosio/chain/wasm_eosio_constraints.hpp>
 #include <fstream>
 //eos-vm includes
-#include <eosio/wasm_backend/backend.hpp>
+#include <eosio/vm/backend.hpp>
 
 namespace eosio { namespace chain { namespace webassembly { namespace eos_vm_runtime {
 
-using namespace eosio::wasm_backend;
+using namespace eosio::vm;
 
 namespace wasm_constraints = eosio::chain::wasm_constraints;
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ba87969bb80..7e770d7c24d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,8 +9,6 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-set( CMAKE_CXX_STANDARD 14 )
-
 include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")
 
 file(GLOB UNIT_TESTS "*.cpp")
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index b0a08280336..3d4aacd5cdf 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -33,8 +33,7 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-set( CMAKE_CXX_STANDARD 14 )
-
+add_definitions(-DNON_VALIDATING_TEST)
 add_subdirectory(contracts)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contracts.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/contracts.hpp ESCAPE_QUOTES)
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 206d3878ff2..13d3ca28528 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -115,6 +115,7 @@ FC_REFLECT( u128_action, (values) )
 FC_REFLECT( cf_action, (payload)(cfd_idx) )
 FC_REFLECT( dtt_action, (payer)(deferred_account)(deferred_action)(permission_name)(delay_sec) )
 FC_REFLECT( invalid_access_action, (code)(val)(index)(store) )
+#define NON_VALIDATING_TEST 1
 
 #ifdef NON_VALIDATING_TEST
 #define TESTER tester
@@ -589,6 +590,7 @@ BOOST_FIXTURE_TEST_CASE(require_notice_tests, TESTER) { try {
 
    } FC_LOG_AND_RETHROW() }
 
+/*
 BOOST_AUTO_TEST_CASE(ram_billing_in_notify_tests) { try {
    validating_tester chain( validating_tester::default_config() );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
@@ -615,7 +617,7 @@ BOOST_AUTO_TEST_CASE(ram_billing_in_notify_tests) { try {
 
    BOOST_REQUIRE_EQUAL( chain.validate(), true );
 } FC_LOG_AND_RETHROW() }
-
+*/
 /*************************************************************************************
  * context free action tests
  *************************************************************************************/
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index 2a91f06a7c1..bec63376ff5 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -5,7 +5,6 @@
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/testing/tester.hpp>
 
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "fork_test_utilities.hpp"

From d03589ec1c99249f846180eb76d290d3f0d403c6 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <NorseGaud@users.noreply.github.com>
Date: Tue, 14 May 2019 21:00:31 -0400
Subject: [PATCH 0408/1648] Update pipeline.yml

---
 .buildkite/pipeline.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index eaee8315f4b..4eb6e3a8640 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -79,7 +79,7 @@ steps:
       docker#v3.1.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 120
@@ -100,7 +100,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 120
@@ -122,7 +122,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 120
@@ -143,7 +143,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 120
@@ -208,7 +208,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -229,7 +229,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -250,7 +250,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -270,7 +270,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -291,7 +291,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -311,7 +311,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -331,7 +331,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -351,7 +351,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
         propagate-environment: true
         workdir: /data/job
     timeout: 60
@@ -398,7 +398,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
         propagate-environment: true
         workdir: /data/job
     env:
@@ -427,7 +427,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
         propagate-environment: true
         workdir: /data/job
     env:
@@ -456,7 +456,7 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-4"
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
         propagate-environment: true
         workdir: /data/job
     env:

From d30880336ea047407b0250b88e3c8304be513416 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 16 May 2019 09:02:59 -0400
Subject: [PATCH 0409/1648] Update handshake message to indicate type of
 connection, trx or blk or both

---
 plugins/net_plugin/net_plugin.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 728f49452bf..33be9320e35 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -428,10 +428,6 @@ namespace eosio {
       time_point   start_time; ///< time request made or received
    };
 
-   struct handshake_initializer {
-      static void populate(handshake_message& hello);
-   };
-
    // thread safe
    class queued_buffer : boost::noncopyable {
    public:
@@ -624,6 +620,8 @@ namespace eosio {
       static void _close( connection* self, bool reconnect ); // for easy capture
    public:
 
+      void populate_handshake( handshake_message& hello );
+
       bool resolve_and_connect();
       void connect(const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
       void start_read_message();
@@ -873,13 +871,17 @@ namespace eosio {
    }
 
    void connection::set_connection_type( const string& peer_add ) {
+      // host:port:[<trx>|<blk>]
       string::size_type colon = peer_add.find(':');
       string::size_type colon2 = peer_add.find(':', colon + 1);
+      string::size_type end = colon2 == string::npos
+            ? string::npos : peer_add.find_first_of( " :+=.,<>!$%^&(*)|-#@\t", colon2 + 1 ); // future proof by including most symbols without using regex
       string host = peer_add.substr( 0, colon );
       string port = peer_add.substr( colon + 1, colon2 == string::npos ? string::npos : colon2 - (colon + 1));
-      string type = colon2 == string::npos ? "" : peer_add.substr( colon2 + 1 );
+      string type = colon2 == string::npos ? "" : end == string::npos ?
+            peer_add.substr( colon2 + 1 ) : peer_add.substr( colon2 + 1, end - (colon2 + 1) );
 
-      fc_ilog( "Setting connection type for: ${peer}", ("peer", peer_add) )
+      fc_ilog( logger, "Setting connection type for: ${peer}", ("peer", peer_add) );
       if( type.empty() ) {
          connection_type = both;
       } else if( type == "trx" ) {
@@ -1049,7 +1051,7 @@ namespace eosio {
    void connection::send_handshake() {
       strand.post( [c = shared_from_this()]() {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
-         handshake_initializer::populate( c->last_handshake_sent );
+         c->populate_handshake( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          auto last_handshake_sent = c->last_handshake_sent;
          g_conn.unlock();
@@ -3091,7 +3093,7 @@ namespace eosio {
    }
 
    // call from connection strand
-   void handshake_initializer::populate( handshake_message& hello ) {
+   void connection::populate_handshake( handshake_message& hello ) {
       hello.network_version = net_version_base + net_version;
       hello.chain_id = my_impl->chain_id;
       hello.node_id = my_impl->node_id;
@@ -3102,7 +3104,10 @@ namespace eosio {
       // If we couldn't sign, don't send a token.
       if(hello.sig == chain::signature_type())
          hello.token = sha256();
-      hello.p2p_address = my_impl->p2p_address + " - " + hello.node_id.str().substr(0,7);
+      hello.p2p_address = my_impl->p2p_address;
+      if( is_transactions_only_connection() ) hello.p2p_address += ":trx";
+      if( is_blocks_only_connection() ) hello.p2p_address += ":blk";
+      hello.p2p_address += " - " + hello.node_id.str().substr(0,7);
 #if defined( __APPLE__ )
       hello.os = "osx";
 #elif defined( __linux__ )

From 304fe31f7b0385cfc790067a3c547f7b9e278fb8 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 16 May 2019 11:36:38 -0400
Subject: [PATCH 0410/1648] So many fixes.  renamed `name` back to
 `producer_name`.  split intrinsic to solve ABI versioning and contract
 upgrade issues.  TODO: implement intrinsic changes, implement mult-sig signed
 blocks, fix tests etc

---
 libraries/chain/apply_context.cpp             |   2 +-
 libraries/chain/block_header_state.cpp        |  56 +-
 libraries/chain/block_state.cpp               |   2 +-
 libraries/chain/controller.cpp                |   4 +-
 .../eosio/chain/block_header_state.hpp        |   6 +-
 .../chain/include/eosio/chain/block_state.hpp |   2 +-
 .../chain/include/eosio/chain/controller.hpp  |   4 +-
 .../include/eosio/chain/producer_schedule.hpp |  42 +-
 libraries/chain/wasm_interface.cpp            |   4 +-
 libraries/fc                                  |   2 +-
 .../testing/include/eosio/testing/tester.hpp  |   3 +-
 libraries/testing/tester.cpp                  |  28 +-
 plugins/chain_plugin/chain_plugin.cpp         |   2 +-
 .../eosio/producer_plugin/producer_plugin.hpp |   1 -
 plugins/producer_plugin/producer_plugin.cpp   |  58 +-
 .../state_history_serialization.hpp           |   2 +-
 .../state_history_plugin_abi.cpp              |   2 +-
 .../test_control_plugin.cpp                   |   2 +-
 unittests/bootseq_tests.cpp                   |  20 +-
 unittests/contracts.hpp.in                    |   3 +-
 unittests/contracts/CMakeLists.txt            |   1 +
 unittests/contracts/eosio.bios/eosio.bios.abi |  56 +-
 .../contracts/eosio.bios/eosio.bios.wasm      | Bin 17777 -> 23359 bytes
 .../eosio.bios/eosio.bios.abi                 | 551 ++++++++++++++++++
 .../eosio.bios/eosio.bios.wasm                | Bin 0 -> 17777 bytes
 unittests/forked_tests.cpp                    |  10 +-
 unittests/producer_schedule_tests.cpp         |  44 +-
 unittests/protocol_feature_tests.cpp          |   2 +-
 28 files changed, 740 insertions(+), 169 deletions(-)
 create mode 100644 unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/eosio.bios.abi
 create mode 100755 unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/eosio.bios.wasm

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index 79022ca1dec..dc7687cf05c 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -583,7 +583,7 @@ vector<account_name> apply_context::get_active_producers() const {
    vector<account_name> accounts; accounts.reserve( ap.producers.size() );
 
    for(const auto& producer : ap.producers )
-      accounts.push_back(producer.name);
+      accounts.push_back(producer.producer_name);
 
    return accounts;
 }
diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index b1626f657c0..dd2e3b9fa07 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -42,11 +42,11 @@ namespace eosio { namespace chain {
 
       auto proauth = get_scheduled_producer(when);
 
-      auto itr = producer_to_last_produced.find( proauth.name );
+      auto itr = producer_to_last_produced.find( proauth.producer_name );
       if( itr != producer_to_last_produced.end() ) {
         EOS_ASSERT( itr->second < (block_num+1) - num_prev_blocks_to_confirm, producer_double_confirm,
                     "producer ${prod} double-confirming known range",
-                    ("prod", proauth.name)("num", block_num+1)
+                    ("prod", proauth.producer_name)("num", block_num+1)
                     ("confirmed", num_prev_blocks_to_confirm)("last_produced", itr->second) );
       }
 
@@ -58,7 +58,7 @@ namespace eosio { namespace chain {
       result.prev_activated_protocol_features                = activated_protocol_features;
 
       result.valid_block_signing_authority                   = proauth.authority;
-      result.producer                                        = proauth.name;
+      result.producer                                        = proauth.producer_name;
 
       result.blockroot_merkle = blockroot_merkle;
       result.blockroot_merkle.append( id );
@@ -108,7 +108,7 @@ namespace eosio { namespace chain {
       }
 
       result.dpos_proposed_irreversible_blocknum   = new_dpos_proposed_irreversible_blocknum;
-      result.dpos_irreversible_blocknum            = calc_dpos_last_irreversible( proauth.name );
+      result.dpos_irreversible_blocknum            = calc_dpos_last_irreversible( proauth.producer_name );
 
       result.prev_pending_schedule                 = pending_schedule;
 
@@ -120,32 +120,32 @@ namespace eosio { namespace chain {
          flat_map<account_name,uint32_t> new_producer_to_last_produced;
 
          for( const auto& pro : result.active_schedule.producers ) {
-            if( pro.name == proauth.name ) {
-               new_producer_to_last_produced[pro.name] = result.block_num;
+            if( pro.producer_name == proauth.producer_name ) {
+               new_producer_to_last_produced[pro.producer_name] = result.block_num;
             } else {
-               auto existing = producer_to_last_produced.find( pro.name );
+               auto existing = producer_to_last_produced.find( pro.producer_name );
                if( existing != producer_to_last_produced.end() ) {
-                  new_producer_to_last_produced[pro.name] = existing->second;
+                  new_producer_to_last_produced[pro.producer_name] = existing->second;
                } else {
-                  new_producer_to_last_produced[pro.name] = result.dpos_irreversible_blocknum;
+                  new_producer_to_last_produced[pro.producer_name] = result.dpos_irreversible_blocknum;
                }
             }
          }
-         new_producer_to_last_produced[proauth.name] = result.block_num;
+         new_producer_to_last_produced[proauth.producer_name] = result.block_num;
 
          result.producer_to_last_produced = std::move( new_producer_to_last_produced );
 
          flat_map<account_name,uint32_t> new_producer_to_last_implied_irb;
 
          for( const auto& pro : result.active_schedule.producers ) {
-            if( pro.name == proauth.name ) {
-               new_producer_to_last_implied_irb[pro.name] = dpos_proposed_irreversible_blocknum;
+            if( pro.producer_name == proauth.producer_name ) {
+               new_producer_to_last_implied_irb[pro.producer_name] = dpos_proposed_irreversible_blocknum;
             } else {
-               auto existing = producer_to_last_implied_irb.find( pro.name );
+               auto existing = producer_to_last_implied_irb.find( pro.producer_name );
                if( existing != producer_to_last_implied_irb.end() ) {
-                  new_producer_to_last_implied_irb[pro.name] = existing->second;
+                  new_producer_to_last_implied_irb[pro.producer_name] = existing->second;
                } else {
-                  new_producer_to_last_implied_irb[pro.name] = result.dpos_irreversible_blocknum;
+                  new_producer_to_last_implied_irb[pro.producer_name] = result.dpos_irreversible_blocknum;
                }
             }
          }
@@ -156,9 +156,9 @@ namespace eosio { namespace chain {
       } else {
          result.active_schedule                  = active_schedule;
          result.producer_to_last_produced        = producer_to_last_produced;
-         result.producer_to_last_produced[proauth.name] = block_num;
+         result.producer_to_last_produced[proauth.producer_name] = block_num;
          result.producer_to_last_implied_irb     = producer_to_last_implied_irb;
-         result.producer_to_last_implied_irb[proauth.name] = dpos_proposed_irreversible_blocknum;
+         result.producer_to_last_implied_irb[proauth.producer_name] = dpos_proposed_irreversible_blocknum;
       }
 
       return result;
@@ -206,7 +206,7 @@ namespace eosio { namespace chain {
             for (const auto &p : new_producers->producers) {
                p.authority.visit([&downgraded_producers, &p](const auto& auth){
                   EOS_ASSERT(auth.keys.size() == 1 && auth.keys.front().weight == auth.threshold, producer_schedule_exception, "multisig block signing present before enabled!");
-                  downgraded_producers.producers.emplace_back(legacy::producer_key{p.name, auth.keys.front().key});
+                  downgraded_producers.producers.emplace_back(legacy::producer_key{p.producer_name, auth.keys.front().key});
                });
             }
             h.new_producers = downgraded_producers;
@@ -337,7 +337,7 @@ namespace eosio { namespace chain {
                                  const std::function<void( block_timestamp_type,
                                                            const flat_set<digest_type>&,
                                                            const vector<digest_type>& )>& validator,
-                                 const std::function<signature_type(const digest_type&)>& signer
+                                 const signer_callback_type& signer
    )&&
    {
       auto result = std::move(*this)._finish_next( h, pfs, validator );
@@ -370,19 +370,13 @@ namespace eosio { namespace chain {
       return digest_type::hash( std::make_pair(header_bmroot, pending_schedule.schedule_hash) );
    }
 
-   static bool key_is_relevant( const block_signing_authority& authority, const public_key_type& key ) {
-      return authority.visit([&key](const auto &a) {
-         return std::find_if(a.keys.begin(), a.keys.end(), [&key](const auto& k ){
-            return k.key == key;
-         }) != a.keys.end();
-      });
-   }
-
-   void block_header_state::sign( const std::function<signature_type(const digest_type&)>& signer ) {
+   void block_header_state::sign( const signer_callback_type& signer ) {
       auto d = sig_digest();
-      header.producer_signature = signer( d );
+      // TODO: modify block to allow multiple sigs
+      auto sigs = signer( d );
+      header.producer_signature = sigs.front();
 
-      EOS_ASSERT( key_is_relevant(valid_block_signing_authority, signee()), wrong_signing_key, "block is signed with unexpected key" );
+      EOS_ASSERT( producer_authority::key_is_relevant(signee(), valid_block_signing_authority), wrong_signing_key, "block is signed with unexpected key" );
    }
 
    public_key_type block_header_state::signee()const {
@@ -392,7 +386,7 @@ namespace eosio { namespace chain {
    void block_header_state::verify_signee( )const {
       auto signing_key = signee();
 
-      EOS_ASSERT( key_is_relevant(valid_block_signing_authority, signing_key), wrong_signing_key,
+      EOS_ASSERT( producer_authority::key_is_relevant(signing_key, valid_block_signing_authority), wrong_signing_key,
                   "block not signed by expected key",
                   ("signing_key", signing_key)( "valid_keys", valid_block_signing_authority ) );
    }
diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index 2c368a4b54e..cb8c1a2e5d1 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -22,7 +22,7 @@ namespace eosio { namespace chain {
                              const std::function<void( block_timestamp_type,
                                                        const flat_set<digest_type>&,
                                                        const vector<digest_type>& )>& validator,
-                             const std::function<signature_type(const digest_type&)>& signer
+                             const signer_callback_type& signer
                            )
    :block_header_state( std::move(cur).finish_next( *b, pfs, validator, signer ) )
    ,block( std::move(b) )
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c1e3df7e50f..e43c7f11256 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1990,7 +1990,7 @@ struct controller_impl {
       auto update_permission = [&]( auto& permission, auto threshold ) {
          auto auth = authority( threshold, {}, {});
          for( auto& p : producers ) {
-            auth.accounts.push_back({{p.name, config::active_name}, 1});
+            auth.accounts.push_back({{p.producer_name, config::active_name}, 1});
          }
 
          if( static_cast<authority>(permission.auth) != auth ) { // TODO: use a more efficient way to check that authority has not changed
@@ -2439,7 +2439,7 @@ void controller::start_block( block_timestamp_type when,
                     block_status::incomplete, optional<block_id_type>() );
 }
 
-block_state_ptr controller::finalize_block( const std::function<signature_type( const digest_type& )>& signer_callback ) {
+block_state_ptr controller::finalize_block( const signer_callback_type& signer_callback ) {
    validate_db_available_size();
 
    my->finalize_block();
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 02de9adad44..6b3deca5dfe 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -6,6 +6,8 @@
 
 namespace eosio { namespace chain {
 
+using signer_callback_type = std::function<std::vector<signature_type>(const digest_type&)>;
+
 struct block_header_state;
 
 namespace detail {
@@ -56,7 +58,7 @@ struct pending_block_header_state : public detail::block_header_state_common {
                                     const std::function<void( block_timestamp_type,
                                                               const flat_set<digest_type>&,
                                                               const vector<digest_type>& )>& validator,
-                                    const std::function<signature_type(const digest_type&)>& signer )&&;
+                                    const signer_callback_type& signer )&&;
 
 protected:
    block_header_state  _finish_next( const signed_block_header& h,
@@ -103,7 +105,7 @@ struct block_header_state : public detail::block_header_state_common {
    producer_authority   get_scheduled_producer( block_timestamp_type t )const;
    const block_id_type& prev()const { return header.previous; }
    digest_type          sig_digest()const;
-   void                 sign( const std::function<signature_type(const digest_type&)>& signer );
+   void                 sign( const signer_callback_type& signer );
    public_key_type      signee()const;
    void                 verify_signee()const;
 
diff --git a/libraries/chain/include/eosio/chain/block_state.hpp b/libraries/chain/include/eosio/chain/block_state.hpp
index e31337d42ec..812176a5c14 100644
--- a/libraries/chain/include/eosio/chain/block_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_state.hpp
@@ -28,7 +28,7 @@ namespace eosio { namespace chain {
                    const std::function<void( block_timestamp_type,
                                              const flat_set<digest_type>&,
                                              const vector<digest_type>& )>& validator,
-                   const std::function<signature_type(const digest_type&)>& signer
+                   const signer_callback_type& signer
                 );
 
       block_state( pending_block_header_state&& cur,
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 7611a91d261..d06096888d8 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -151,8 +151,8 @@ namespace eosio { namespace chain {
           */
          transaction_trace_ptr push_scheduled_transaction( const transaction_id_type& scheduled, fc::time_point deadline, uint32_t billed_cpu_time_us = 0 );
 
-         block_state_ptr finalize_block( const std::function<signature_type( const digest_type& )>& signer_callback );
-         void sign_block( const std::function<signature_type( const digest_type& )>& signer_callback );
+         block_state_ptr finalize_block( const signer_callback_type& signer_callback );
+         void sign_block( const signer_callback_type& signer_callback );
          void commit_block();
          void pop_block();
 
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index 46801564099..ffe249e535c 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -54,6 +54,12 @@ namespace eosio { namespace chain {
       uint32_t                    threshold;
       vector<key_weight>          keys;
 
+      bool key_is_relevant( const public_key_type& key ) const {
+         return std::find_if(keys.begin(), keys.end(), [&key](const auto& kw){
+            return kw.key == key;
+         }) != keys.end();
+      }
+
       friend bool operator == ( const block_signing_authority_v0& lhs, const block_signing_authority_v0& rhs ) {
          return tie( lhs.threshold, lhs.keys ) == tie( rhs.threshold, rhs.keys );
       }
@@ -65,14 +71,24 @@ namespace eosio { namespace chain {
    using block_signing_authority = static_variant<block_signing_authority_v0>;
 
    struct producer_authority {
-      name                    name;
+      name                    producer_name;
       block_signing_authority authority;
 
+      static bool key_is_relevant( const public_key_type& key, const block_signing_authority& authority ) {
+         return authority.visit([&key](const auto &a){
+            return a.key_is_relevant(key);
+         });
+      }
+
+      bool key_is_relevant( const public_key_type& key ) const {
+         return key_is_relevant(key, authority);
+      }
+
       friend bool operator == ( const producer_authority& lhs, const producer_authority& rhs ) {
-         return tie( lhs.name, lhs.authority ) == tie( rhs.name, rhs.authority );
+         return tie( lhs.producer_name, lhs.authority ) == tie( rhs.producer_name, rhs.authority );
       }
       friend bool operator != ( const producer_authority& lhs, const producer_authority& rhs ) {
-         return tie( lhs.name, lhs.authority ) != tie( rhs.name, rhs.authority );
+         return tie( lhs.producer_name, lhs.authority ) != tie( rhs.producer_name, rhs.authority );
       }
    };
 
@@ -105,19 +121,19 @@ namespace eosio { namespace chain {
       shared_producer_authority& operator= ( shared_producer_authority && ) = default;
       shared_producer_authority& operator= ( const shared_producer_authority & ) = default;
 
-      shared_producer_authority( const name& name, shared_block_signing_authority&& authority )
-      :name(name)
+      shared_producer_authority( const name& producer_name, shared_block_signing_authority&& authority )
+      :producer_name(producer_name)
       ,authority(std::forward<shared_block_signing_authority>(authority))
       {}
 
-      name                                     name;
+      name                                     producer_name;
       shared_block_signing_authority           authority;
 
       friend bool operator == ( const shared_producer_authority& lhs, const shared_producer_authority& rhs ) {
-         return tie( lhs.name, lhs.authority ) == tie( rhs.name, rhs.authority );
+         return tie( lhs.producer_name, lhs.authority ) == tie( rhs.producer_name, rhs.authority );
       }
       friend bool operator != ( const shared_producer_authority& lhs, const shared_producer_authority& rhs ) {
-         return tie( lhs.name, lhs.authority ) != tie( rhs.name, rhs.authority );
+         return tie( lhs.producer_name, lhs.authority ) != tie( rhs.producer_name, rhs.authority );
       }
    };
 
@@ -171,7 +187,7 @@ namespace eosio { namespace chain {
                 return shared_convert(alloc, a);
             });
 
-            return shared_producer_authority(src.name, std::move(authority));
+            return shared_producer_authority(src.producer_name, std::move(authority));
          }
 
       };
@@ -180,7 +196,7 @@ namespace eosio { namespace chain {
       struct shared_converter<shared_producer_authority> {
          static producer_authority convert (const shared_producer_authority& src) {
             producer_authority result;
-            result.name = src.name;
+            result.producer_name = src.producer_name;
             result.authority = src.authority.visit([](const auto& a) {
                return shared_convert(a);
             });
@@ -290,7 +306,7 @@ namespace eosio { namespace chain {
 
    inline bool operator == ( const producer_authority& pa, const shared_producer_authority& pb )
    {
-      if(pa.name != pb.name) return false;
+      if(pa.producer_name != pb.producer_name) return false;
       if(pa.authority.which() != pb.authority.which()) return false;
 
       bool authority_matches = pa.authority.visit([&pb]( const auto& lhs ){
@@ -309,11 +325,11 @@ namespace eosio { namespace chain {
 FC_REFLECT( eosio::chain::legacy::producer_key, (producer_name)(block_signing_key) )
 FC_REFLECT( eosio::chain::legacy::producer_schedule_type, (version)(producers) )
 FC_REFLECT( eosio::chain::block_signing_authority_v0, (threshold)(keys))
-FC_REFLECT( eosio::chain::producer_authority, (name)(authority) )
+FC_REFLECT( eosio::chain::producer_authority, (producer_name)(authority) )
 FC_REFLECT( eosio::chain::producer_authority_schedule, (version)(producers) )
 FC_REFLECT_DERIVED( eosio::chain::producer_schedule_change_extension, (eosio::chain::producer_authority_schedule), )
 
 FC_REFLECT( eosio::chain::shared_block_signing_authority_v0, (threshold)(keys))
-FC_REFLECT( eosio::chain::shared_producer_authority, (name)(authority) )
+FC_REFLECT( eosio::chain::shared_producer_authority, (producer_name)(authority) )
 FC_REFLECT( eosio::chain::shared_producer_authority_schedule, (version)(producers) )
 
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 292845128b6..55981a533b0 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -204,7 +204,7 @@ class privileged_api : public context_aware_api {
          // check that producers are unique
          std::set<account_name> unique_producers;
          for (const auto& p: producers) {
-            EOS_ASSERT( context.is_account(p.name), wasm_execution_error, "producer schedule includes a nonexisting account" );
+            EOS_ASSERT( context.is_account(p.producer_name), wasm_execution_error, "producer schedule includes a nonexisting account" );
 
             p.authority.visit([](const auto& a) {
                uint32_t sum_weights = 0;
@@ -222,7 +222,7 @@ class privileged_api : public context_aware_api {
             });
 
 
-            unique_producers.insert(p.name);
+            unique_producers.insert(p.producer_name);
          }
          EOS_ASSERT( producers.size() == unique_producers.size(), wasm_execution_error, "duplicate producer name in producer schedule" );
 
diff --git a/libraries/fc b/libraries/fc
index 9a008f71c05..c83e208bce9 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 9a008f71c05b6f4105fb6340f13a8344d1335a5d
+Subproject commit c83e208bce9f86e92421056e82b92283145884e4
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index fef4d5e2042..9ade5bf9971 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -56,7 +56,7 @@ namespace boost { namespace test_tools { namespace tt_detail {
 } } }
 
 namespace eosio { namespace testing {
-  enum class setup_policy {
+   enum class setup_policy {
       none,
       old_bios_only,
       preactivate_feature_only,
@@ -168,6 +168,7 @@ namespace eosio { namespace testing {
          }
 
          void                  set_before_preactivate_bios_contract();
+         void                  set_before_producer_authority_bios_contract();
          void                  set_bios_contract();
 
          vector<producer_authority>  get_producer_authorities( const vector<account_name>& producer_names )const;
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 3281059360d..bbd3dd2fe1e 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -178,7 +178,7 @@ namespace eosio { namespace testing {
          case setup_policy::preactivate_feature_and_new_bios: {
             schedule_preactivate_protocol_feature();
             produce_block();
-            set_bios_contract();
+            set_before_producer_authority_bios_contract();
             break;
          }
          case setup_policy::full: {
@@ -308,18 +308,19 @@ namespace eosio { namespace testing {
       FC_ASSERT( control->is_building_block(), "must first start a block before it can be finished" );
 
       auto producer = control->head_block_state()->get_scheduled_producer( control->pending_block_time() );
-      private_key_type priv_key;
-      // Check if signing private key exist in the list
-      auto private_key_itr = block_signing_private_keys.find( *producer.block_signing_keys.begin() );
-      if( private_key_itr == block_signing_private_keys.end() ) {
-         // If it's not found, default to active k1 key
-         priv_key = get_private_key( producer.producer_name, "active" );
-      } else {
-         priv_key = private_key_itr->second;
-      }
+      private_key_type priv_key = producer.authority.visit([this, &producer](const block_signing_authority_v0& a){
+         for (const auto& k: a.keys) {
+            auto private_key_itr = block_signing_private_keys.find( k.key );
+            if (private_key_itr != block_signing_private_keys.end()) {
+               return private_key_itr->second;
+            }
+         }
+
+         return get_private_key( producer.producer_name, "active" );
+      });
 
       control->finalize_block( [&]( digest_type d ) {
-                    return priv_key.sign(d);
+                    return std::vector<signature_type>{priv_key.sign(d)};
       } );
 
       control->commit_block();
@@ -945,6 +946,11 @@ namespace eosio { namespace testing {
       set_abi(config::system_account_name, contracts::before_preactivate_eosio_bios_abi().data());
    }
 
+   void base_tester::set_before_producer_authority_bios_contract() {
+      set_code(config::system_account_name, contracts::before_producer_authority_eosio_bios_wasm());
+      set_abi(config::system_account_name, contracts::before_producer_authority_eosio_bios_abi().data());
+   }
+
    void base_tester::set_bios_contract() {
       set_code(config::system_account_name, contracts::eosio_bios_wasm());
       set_abi(config::system_account_name, contracts::eosio_bios_abi().data());
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index c093124ef90..4daac8f3ac2 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1705,7 +1705,7 @@ read_only::get_producers_result read_only::get_producers( const read_only::get_p
    for (auto p : db.active_producers().producers) {
       fc::variant row = fc::mutable_variant_object()
          ("owner", p.producer_name)
-         ("producer_key", p.block_signing_keys)
+         ("producer_authority", p.authority)
          ("url", "")
          ("total_votes", 0.0f);
 
diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
index 5d1335407ca..839de9ac01d 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
@@ -114,7 +114,6 @@ class producer_plugin : public appbase::plugin<producer_plugin> {
 
    get_account_ram_corrections_result  get_account_ram_corrections( const get_account_ram_corrections_params& params ) const;
 
-   signal<void(const chain::producer_confirmation&)> confirmed_block;
 private:
    std::shared_ptr<class producer_plugin_impl> my;
 };
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 044caa2757e..307dc13d9b8 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -264,28 +264,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             active_producers.insert(p.producer_name);
          }
 
-         std::set_intersection( _producers.begin(), _producers.end(),
-                                active_producers.begin(), active_producers.end(),
-                                boost::make_function_output_iterator( [&]( const chain::account_name& producer )
-         {
-            if( producer != bsp->header.producer ) {
-               auto itr = std::find_if( active_producer_to_signing_key.begin(), active_producer_to_signing_key.end(),
-                                        [&](const producer_key& k){ return k.producer_name == producer; } );
-               if( itr != active_producer_to_signing_key.end() ) {
-                  auto private_key_itr = _signature_providers.find( itr->block_signing_key );
-                  if( private_key_itr != _signature_providers.end() ) {
-                     auto d = bsp->sig_digest();
-                     auto sig = private_key_itr->second( d );
-                     _last_signed_block_time = bsp->header.timestamp;
-                     _last_signed_block_num  = bsp->block_num;
-
-   //                  ilog( "${n} confirmed", ("n",name(producer)) );
-                     _self->confirmed_block( { bsp->id, d, producer, sig } );
-                  }
-               }
-            }
-         } ) );
-
          // since the watermark has to be set before a block is created, we are looking into the future to
          // determine the new schedule to identify producers that have become active
          chain::controller& chain = chain_plug->chain();
@@ -1312,7 +1290,11 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
    // Not our turn
    const auto& scheduled_producer = hbs->get_scheduled_producer(block_time);
    auto currrent_watermark_itr = _producer_watermarks.find(scheduled_producer.producer_name);
-   auto signature_provider_itr = _signature_providers.find(scheduled_producer.block_signing_key);
+
+   auto num_relevant_signatures = std::count_if(_signature_providers.begin(), _signature_providers.end(), [&scheduled_producer](const auto& p){
+      return scheduled_producer.key_is_relevant(p.first);
+   });
+
    auto irreversible_block_age = get_irreversible_block_age();
 
    // If the next block production opportunity is in the present or future, we're synced.
@@ -1320,8 +1302,8 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
       _pending_block_mode = pending_block_mode::speculating;
    } else if( _producers.find(scheduled_producer.producer_name) == _producers.end()) {
       _pending_block_mode = pending_block_mode::speculating;
-   } else if (signature_provider_itr == _signature_providers.end()) {
-      elog("Not producing block because I don't have the private key for ${scheduled_key}", ("scheduled_key", scheduled_producer.block_signing_key));
+   } else if (num_relevant_signatures == 0) {
+      elog("Not producing block because I don't have any private keys relevant to authority: ${authority}", ("authority", scheduled_producer.authority));
       _pending_block_mode = pending_block_mode::speculating;
    } else if ( _pause_production ) {
       elog("Not producing block because production is explicitly paused");
@@ -1410,11 +1392,11 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
    if( chain.is_building_block() ) {
       auto pending_block_time = chain.pending_block_time();
-      auto pending_block_signing_key = chain.pending_block_signing_key();
+      auto pending_block_signing_authority = chain.pending_block_signing_authority();
       const fc::time_point preprocess_deadline = calculate_block_deadline(block_time);
 
-      if (_pending_block_mode == pending_block_mode::producing && pending_block_signing_key != scheduled_producer.block_signing_key) {
-         elog("Block Signing Key is not expected value, reverting to speculative mode! [expected: \"${expected}\", actual: \"${actual\"", ("expected", scheduled_producer.block_signing_key)("actual", pending_block_signing_key));
+      if (_pending_block_mode == pending_block_mode::producing && pending_block_signing_authority != scheduled_producer.authority) {
+         elog("Block Signing Key is not expected value, reverting to speculative mode! [expected: \"${expected}\", actual: \"${actual\"", ("expected", scheduled_producer.authority)("actual", pending_block_signing_authority));
          _pending_block_mode = pending_block_mode::speculating;
       }
 
@@ -1850,9 +1832,14 @@ void producer_plugin_impl::produce_block() {
    chain::controller& chain = chain_plug->chain();
    const auto& hbs = chain.head_block_state();
    EOS_ASSERT(chain.is_building_block(), missing_pending_block_state, "pending_block_state does not exist but it should, another plugin may have corrupted it");
-   auto signature_provider_itr = _signature_providers.find( chain.pending_block_signing_key() );
 
-   EOS_ASSERT(signature_provider_itr != _signature_providers.end(), producer_priv_key_not_found, "Attempting to produce a block for which we don't have the private key");
+
+   const auto& auth = chain.pending_block_signing_authority();
+   auto num_relevant_signatures = std::count_if(_signature_providers.begin(), _signature_providers.end(), [&auth](const auto& p){
+      return producer_authority::key_is_relevant(p.first, auth);
+   });
+
+   EOS_ASSERT(num_relevant_signatures > 0, producer_priv_key_not_found, "Attempting to produce a block for which we don't have any relevant private keys");
 
    if (_protocol_features_signaled) {
       _protocol_features_to_activate.clear(); // clear _protocol_features_to_activate as it is already set in pending_block
@@ -1862,7 +1849,16 @@ void producer_plugin_impl::produce_block() {
    //idump( (fc::time_point::now() - chain.pending_block_time()) );
    chain.finalize_block( [&]( const digest_type& d ) {
       auto debug_logger = maybe_make_debug_time_logger();
-      return signature_provider_itr->second(d);
+      vector<signature_type> sigs;
+      sigs.reserve(num_relevant_signatures);
+
+      // sign with all relevant public keys
+      for (const auto& p : _signature_providers) {
+         if (producer_authority::key_is_relevant(p.first, auth)) {
+            sigs.emplace_back(p.second(d));
+         }
+      }
+      return sigs;
    } );
 
    chain.commit_block();
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index bdbd36276a0..cb9ea2b601a 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -252,7 +252,7 @@ datastream<ST>& operator<<(datastream<ST>& ds,
 
 template <typename ST>
 datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::shared_producer_authority>& obj) {
-   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.value));
+   fc::raw::pack(ds, as_type<uint64_t>(obj.obj.producer_name.value));
    fc::raw::pack(ds, as_type<eosio::chain::shared_block_signing_authority>(obj.obj.authority));
    return ds;
 }
diff --git a/plugins/state_history_plugin/state_history_plugin_abi.cpp b/plugins/state_history_plugin/state_history_plugin_abi.cpp
index a18d15968bd..aa9c1fdc1be 100644
--- a/plugins/state_history_plugin/state_history_plugin_abi.cpp
+++ b/plugins/state_history_plugin/state_history_plugin_abi.cpp
@@ -319,7 +319,7 @@ extern const char* const state_history_plugin_abi = R"({
         },
         {
             "name": "producer_authority", "fields": [
-                { "type": "name", "name": "name" },
+                { "type": "name", "name": "producer_name" },
                 { "type": "block_signing_authority", "name": "authority" }
             ]
         },
diff --git a/plugins/test_control_plugin/test_control_plugin.cpp b/plugins/test_control_plugin/test_control_plugin.cpp
index 3c26344c8e5..16d2b7d7c8a 100644
--- a/plugins/test_control_plugin/test_control_plugin.cpp
+++ b/plugins/test_control_plugin/test_control_plugin.cpp
@@ -65,7 +65,7 @@ void test_control_plugin_impl::accepted_block(const chain::block_state_ptr& bsp)
 void test_control_plugin_impl::process_next_block_state(const chain::block_state_ptr& bsp) {
    const auto block_time = _chain.head_block_time() + fc::microseconds(chain::config::block_interval_us);
    const auto& producer_authority = bsp->get_scheduled_producer(block_time);
-   const auto producer_name = producer_authority.visit([](const auto& a){ return a.producer_name; });
+   const auto producer_name = producer_authority.producer_name;
    if (_producer != account_name())
       ilog("producer ${cprod}, looking for ${lprod}", ("cprod", producer_name.to_string())("lprod", _producer.to_string()));
 
diff --git a/unittests/bootseq_tests.cpp b/unittests/bootseq_tests.cpp
index 561a04622cc..58c9b59f754 100644
--- a/unittests/bootseq_tests.cpp
+++ b/unittests/bootseq_tests.cpp
@@ -301,16 +301,16 @@ BOOST_FIXTURE_TEST_CASE( bootseq_test, bootseq_tester ) {
         produce_blocks_for_n_rounds(2); // 2 rounds since new producer schedule is set when the first block of next round is irreversible
         active_schedule = control->head_block_state()->active_schedule;
         BOOST_REQUIRE(active_schedule.producers.size() == 21);
-        BOOST_TEST(active_schedule.producers.at(0).producer_name == "proda");
-        BOOST_TEST(active_schedule.producers.at(1).producer_name == "prodb");
-        BOOST_TEST(active_schedule.producers.at(2).producer_name == "prodc");
-        BOOST_TEST(active_schedule.producers.at(3).producer_name == "prodd");
-        BOOST_TEST(active_schedule.producers.at(4).producer_name == "prode");
-        BOOST_TEST(active_schedule.producers.at(5).producer_name == "prodf");
-        BOOST_TEST(active_schedule.producers.at(6).producer_name == "prodg");
-        BOOST_TEST(active_schedule.producers.at(7).producer_name == "prodh");
-        BOOST_TEST(active_schedule.producers.at(8).producer_name == "prodi");
-        BOOST_TEST(active_schedule.producers.at(9).producer_name == "prodj");
+        BOOST_TEST(active_schedule.producers.at( 0).producer_name == "proda");
+        BOOST_TEST(active_schedule.producers.at( 1).producer_name == "prodb");
+        BOOST_TEST(active_schedule.producers.at( 2).producer_name == "prodc");
+        BOOST_TEST(active_schedule.producers.at( 3).producer_name == "prodd");
+        BOOST_TEST(active_schedule.producers.at( 4).producer_name == "prode");
+        BOOST_TEST(active_schedule.producers.at( 5).producer_name == "prodf");
+        BOOST_TEST(active_schedule.producers.at( 6).producer_name == "prodg");
+        BOOST_TEST(active_schedule.producers.at( 7).producer_name == "prodh");
+        BOOST_TEST(active_schedule.producers.at( 8).producer_name == "prodi");
+        BOOST_TEST(active_schedule.producers.at( 9).producer_name == "prodj");
         BOOST_TEST(active_schedule.producers.at(10).producer_name == "prodk");
         BOOST_TEST(active_schedule.producers.at(11).producer_name == "prodl");
         BOOST_TEST(active_schedule.producers.at(12).producer_name == "prodm");
diff --git a/unittests/contracts.hpp.in b/unittests/contracts.hpp.in
index efafa1846c8..3611de0deec 100644
--- a/unittests/contracts.hpp.in
+++ b/unittests/contracts.hpp.in
@@ -36,7 +36,8 @@ namespace eosio {
          MAKE_READ_WASM_ABI(eosio_token,  eosio.token,  contracts)
          MAKE_READ_WASM_ABI(eosio_wrap,   eosio.wrap,   contracts)
 
-         MAKE_READ_WASM_ABI(before_preactivate_eosio_bios,   eosio.bios, contracts/old_versions/v1.6.0-rc3)
+         MAKE_READ_WASM_ABI(before_producer_authority_eosio_bios,   eosio.bios, contracts/old_versions/v1.7.0-develop-preactivate_feature)
+         MAKE_READ_WASM_ABI(before_preactivate_eosio_bios,          eosio.bios, contracts/old_versions/v1.6.0-rc3)
 
          // Contracts in `eos/unittests/unittests/test-contracts' directory
          MAKE_READ_WASM_ABI(asserter,              asserter,              test-contracts)
diff --git a/unittests/contracts/CMakeLists.txt b/unittests/contracts/CMakeLists.txt
index f64c79de062..1c1c3003901 100644
--- a/unittests/contracts/CMakeLists.txt
+++ b/unittests/contracts/CMakeLists.txt
@@ -8,3 +8,4 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/eosio.token/ DESTINATION ${CMAKE_CURRENT_B
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/eosio.wrap/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/eosio.wrap/)
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/old_versions/v1.6.0-rc3/eosio.bios/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/old_versions/v1.6.0-rc3/eosio.bios/)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/)
diff --git a/unittests/contracts/eosio.bios/eosio.bios.abi b/unittests/contracts/eosio.bios/eosio.bios.abi
index 01f62c976f5..0cf509deb60 100644
--- a/unittests/contracts/eosio.bios/eosio.bios.abi
+++ b/unittests/contracts/eosio.bios/eosio.bios.abi
@@ -1,7 +1,12 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
     "version": "eosio::abi/1.1",
-    "types": [],
+    "types": [
+        {
+            "new_type_name": "block_signing_authority",
+            "type": "variant_block_signing_authority_v0"
+        }
+    ],
     "structs": [
         {
             "name": "abi_hash",
@@ -252,7 +257,7 @@
             ]
         },
         {
-            "name": "producer_key",
+            "name": "producer_authority",
             "base": "",
             "fields": [
                 {
@@ -260,8 +265,8 @@
                     "type": "name"
                 },
                 {
-                    "name": "block_signing_key",
-                    "type": "public_key"
+                    "name": "block_signing_authority",
+                    "type": "block_signing_authority"
                 }
             ]
         },
@@ -391,7 +396,7 @@
             "fields": [
                 {
                     "name": "schedule",
-                    "type": "producer_key[]"
+                    "type": "producer_authority[]"
                 }
             ]
         },
@@ -454,87 +459,87 @@
         {
             "name": "activate",
             "type": "activate",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "canceldelay",
             "type": "canceldelay",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "deleteauth",
             "type": "deleteauth",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "linkauth",
             "type": "linkauth",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "newaccount",
             "type": "newaccount",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "onerror",
             "type": "onerror",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "reqactivated",
             "type": "reqactivated",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "reqauth",
             "type": "reqauth",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "setabi",
             "type": "setabi",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "setalimits",
             "type": "setalimits",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "setcode",
             "type": "setcode",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "setglimits",
             "type": "setglimits",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "setparams",
             "type": "setparams",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "setpriv",
             "type": "setpriv",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "setprods",
             "type": "setprods",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "unlinkauth",
             "type": "unlinkauth",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         },
         {
             "name": "updateauth",
             "type": "updateauth",
-            "ricardian_contract": ""
+            "ricardian_contract": "---\ntitle: TITLE\nsummary: SUMMARY\nicon: ICON\n---\n\nBODY"
         }
     ],
     "tables": [
@@ -547,5 +552,10 @@
         }
     ],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [
+        {
+            "name": "variant_block_signing_authority_v0",
+            "types": ["block_signing_authority_v0"]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/unittests/contracts/eosio.bios/eosio.bios.wasm b/unittests/contracts/eosio.bios/eosio.bios.wasm
index 968bd1529dc23933a35712bdabe2697d37553c99..e5950df279b25b8eedf41019ff7137c29347e55b 100755
GIT binary patch
literal 23359
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
LG|&FL=iL7VpOItP

delta 4559
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
Jv%Z~S?7zOel`H@N

diff --git a/unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/eosio.bios.abi b/unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/eosio.bios.abi
new file mode 100644
index 00000000000..01f62c976f5
--- /dev/null
+++ b/unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/eosio.bios.abi
@@ -0,0 +1,551 @@
+{
+    "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
+    "version": "eosio::abi/1.1",
+    "types": [],
+    "structs": [
+        {
+            "name": "abi_hash",
+            "base": "",
+            "fields": [
+                {
+                    "name": "owner",
+                    "type": "name"
+                },
+                {
+                    "name": "hash",
+                    "type": "checksum256"
+                }
+            ]
+        },
+        {
+            "name": "activate",
+            "base": "",
+            "fields": [
+                {
+                    "name": "feature_digest",
+                    "type": "checksum256"
+                }
+            ]
+        },
+        {
+            "name": "authority",
+            "base": "",
+            "fields": [
+                {
+                    "name": "threshold",
+                    "type": "uint32"
+                },
+                {
+                    "name": "keys",
+                    "type": "key_weight[]"
+                },
+                {
+                    "name": "accounts",
+                    "type": "permission_level_weight[]"
+                },
+                {
+                    "name": "waits",
+                    "type": "wait_weight[]"
+                }
+            ]
+        },
+        {
+            "name": "blockchain_parameters",
+            "base": "",
+            "fields": [
+                {
+                    "name": "max_block_net_usage",
+                    "type": "uint64"
+                },
+                {
+                    "name": "target_block_net_usage_pct",
+                    "type": "uint32"
+                },
+                {
+                    "name": "max_transaction_net_usage",
+                    "type": "uint32"
+                },
+                {
+                    "name": "base_per_transaction_net_usage",
+                    "type": "uint32"
+                },
+                {
+                    "name": "net_usage_leeway",
+                    "type": "uint32"
+                },
+                {
+                    "name": "context_free_discount_net_usage_num",
+                    "type": "uint32"
+                },
+                {
+                    "name": "context_free_discount_net_usage_den",
+                    "type": "uint32"
+                },
+                {
+                    "name": "max_block_cpu_usage",
+                    "type": "uint32"
+                },
+                {
+                    "name": "target_block_cpu_usage_pct",
+                    "type": "uint32"
+                },
+                {
+                    "name": "max_transaction_cpu_usage",
+                    "type": "uint32"
+                },
+                {
+                    "name": "min_transaction_cpu_usage",
+                    "type": "uint32"
+                },
+                {
+                    "name": "max_transaction_lifetime",
+                    "type": "uint32"
+                },
+                {
+                    "name": "deferred_trx_expiration_window",
+                    "type": "uint32"
+                },
+                {
+                    "name": "max_transaction_delay",
+                    "type": "uint32"
+                },
+                {
+                    "name": "max_inline_action_size",
+                    "type": "uint32"
+                },
+                {
+                    "name": "max_inline_action_depth",
+                    "type": "uint16"
+                },
+                {
+                    "name": "max_authority_depth",
+                    "type": "uint16"
+                }
+            ]
+        },
+        {
+            "name": "canceldelay",
+            "base": "",
+            "fields": [
+                {
+                    "name": "canceling_auth",
+                    "type": "permission_level"
+                },
+                {
+                    "name": "trx_id",
+                    "type": "checksum256"
+                }
+            ]
+        },
+        {
+            "name": "deleteauth",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "permission",
+                    "type": "name"
+                }
+            ]
+        },
+        {
+            "name": "key_weight",
+            "base": "",
+            "fields": [
+                {
+                    "name": "key",
+                    "type": "public_key"
+                },
+                {
+                    "name": "weight",
+                    "type": "uint16"
+                }
+            ]
+        },
+        {
+            "name": "linkauth",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "code",
+                    "type": "name"
+                },
+                {
+                    "name": "type",
+                    "type": "name"
+                },
+                {
+                    "name": "requirement",
+                    "type": "name"
+                }
+            ]
+        },
+        {
+            "name": "newaccount",
+            "base": "",
+            "fields": [
+                {
+                    "name": "creator",
+                    "type": "name"
+                },
+                {
+                    "name": "name",
+                    "type": "name"
+                },
+                {
+                    "name": "owner",
+                    "type": "authority"
+                },
+                {
+                    "name": "active",
+                    "type": "authority"
+                }
+            ]
+        },
+        {
+            "name": "onerror",
+            "base": "",
+            "fields": [
+                {
+                    "name": "sender_id",
+                    "type": "uint128"
+                },
+                {
+                    "name": "sent_trx",
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "permission_level",
+            "base": "",
+            "fields": [
+                {
+                    "name": "actor",
+                    "type": "name"
+                },
+                {
+                    "name": "permission",
+                    "type": "name"
+                }
+            ]
+        },
+        {
+            "name": "permission_level_weight",
+            "base": "",
+            "fields": [
+                {
+                    "name": "permission",
+                    "type": "permission_level"
+                },
+                {
+                    "name": "weight",
+                    "type": "uint16"
+                }
+            ]
+        },
+        {
+            "name": "producer_key",
+            "base": "",
+            "fields": [
+                {
+                    "name": "producer_name",
+                    "type": "name"
+                },
+                {
+                    "name": "block_signing_key",
+                    "type": "public_key"
+                }
+            ]
+        },
+        {
+            "name": "reqactivated",
+            "base": "",
+            "fields": [
+                {
+                    "name": "feature_digest",
+                    "type": "checksum256"
+                }
+            ]
+        },
+        {
+            "name": "reqauth",
+            "base": "",
+            "fields": [
+                {
+                    "name": "from",
+                    "type": "name"
+                }
+            ]
+        },
+        {
+            "name": "setabi",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "abi",
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "setalimits",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "ram_bytes",
+                    "type": "int64"
+                },
+                {
+                    "name": "net_weight",
+                    "type": "int64"
+                },
+                {
+                    "name": "cpu_weight",
+                    "type": "int64"
+                }
+            ]
+        },
+        {
+            "name": "setcode",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "vmtype",
+                    "type": "uint8"
+                },
+                {
+                    "name": "vmversion",
+                    "type": "uint8"
+                },
+                {
+                    "name": "code",
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "setglimits",
+            "base": "",
+            "fields": [
+                {
+                    "name": "ram",
+                    "type": "uint64"
+                },
+                {
+                    "name": "net",
+                    "type": "uint64"
+                },
+                {
+                    "name": "cpu",
+                    "type": "uint64"
+                }
+            ]
+        },
+        {
+            "name": "setparams",
+            "base": "",
+            "fields": [
+                {
+                    "name": "params",
+                    "type": "blockchain_parameters"
+                }
+            ]
+        },
+        {
+            "name": "setpriv",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "is_priv",
+                    "type": "uint8"
+                }
+            ]
+        },
+        {
+            "name": "setprods",
+            "base": "",
+            "fields": [
+                {
+                    "name": "schedule",
+                    "type": "producer_key[]"
+                }
+            ]
+        },
+        {
+            "name": "unlinkauth",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "code",
+                    "type": "name"
+                },
+                {
+                    "name": "type",
+                    "type": "name"
+                }
+            ]
+        },
+        {
+            "name": "updateauth",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "permission",
+                    "type": "name"
+                },
+                {
+                    "name": "parent",
+                    "type": "name"
+                },
+                {
+                    "name": "auth",
+                    "type": "authority"
+                }
+            ]
+        },
+        {
+            "name": "wait_weight",
+            "base": "",
+            "fields": [
+                {
+                    "name": "wait_sec",
+                    "type": "uint32"
+                },
+                {
+                    "name": "weight",
+                    "type": "uint16"
+                }
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "name": "activate",
+            "type": "activate",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "canceldelay",
+            "type": "canceldelay",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "deleteauth",
+            "type": "deleteauth",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "linkauth",
+            "type": "linkauth",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "newaccount",
+            "type": "newaccount",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "onerror",
+            "type": "onerror",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "reqactivated",
+            "type": "reqactivated",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "reqauth",
+            "type": "reqauth",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "setabi",
+            "type": "setabi",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "setalimits",
+            "type": "setalimits",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "setcode",
+            "type": "setcode",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "setglimits",
+            "type": "setglimits",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "setparams",
+            "type": "setparams",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "setpriv",
+            "type": "setpriv",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "setprods",
+            "type": "setprods",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "unlinkauth",
+            "type": "unlinkauth",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "updateauth",
+            "type": "updateauth",
+            "ricardian_contract": ""
+        }
+    ],
+    "tables": [
+        {
+            "name": "abihash",
+            "type": "abi_hash",
+            "index_type": "i64",
+            "key_names": [],
+            "key_types": []
+        }
+    ],
+    "ricardian_clauses": [],
+    "variants": []
+}
\ No newline at end of file
diff --git a/unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/eosio.bios.wasm b/unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/eosio.bios.wasm
new file mode 100755
index 0000000000000000000000000000000000000000..968bd1529dc23933a35712bdabe2697d37553c99
GIT binary patch
literal 17777
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

literal 0
HcmV?d00001

diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 5f466d5ebe9..61e389b0de3 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -28,11 +28,7 @@ BOOST_AUTO_TEST_CASE( irrblock ) try {
    c.produce_blocks(10);
    auto r = c.create_accounts( {N(dan),N(sam),N(pam),N(scott)} );
    auto res = c.set_producers( {N(dan),N(sam),N(pam),N(scott)} );
-   vector<producer_key> sch = { {N(dan),get_public_key(N(dan), "active")},
-                                {N(sam),get_public_key(N(sam), "active")},
-                                {N(scott),get_public_key(N(scott), "active")},
-                                {N(pam),get_public_key(N(pam), "active")}
-                              };
+
    wlog("set producer schedule to [dan,sam,pam]");
    c.produce_blocks(50);
 
@@ -143,9 +139,7 @@ BOOST_AUTO_TEST_CASE( forking ) try {
    wdump((fc::json::to_pretty_string(r)));
    c.produce_block();
    auto res = c.set_producers( {N(dan),N(sam),N(pam)} );
-   vector<producer_key> sch = { {N(dan),get_public_key(N(dan), "active")},
-                                {N(sam),get_public_key(N(sam), "active")},
-                                {N(pam),get_public_key(N(pam), "active")}};
+
    wdump((fc::json::to_pretty_string(res)));
    wlog("set producer schedule to [dan,sam,pam]");
    c.produce_blocks(30);
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index b31003b9e2d..4dbc28808a5 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -22,13 +22,13 @@ using mvo = fc::mutable_variant_object;
 BOOST_AUTO_TEST_SUITE(producer_schedule_tests)
 
    // Calculate expected producer given the schedule and slot number
-   account_name get_expected_producer(const vector<producer_key>& schedule, const uint64_t slot) {
+   account_name get_expected_producer(const vector<producer_authority>& schedule, const uint64_t slot) {
       const auto& index = (slot % (schedule.size() * config::producer_repetitions)) / config::producer_repetitions;
       return schedule.at(index).producer_name;
    };
 
    // Check if two schedule is equal
-   bool is_schedule_equal(const vector<producer_key>& first, const vector<producer_key>& second) {
+   bool is_schedule_equal(const vector<producer_authority>& first, const vector<producer_authority>& second) {
       bool is_equal = first.size() == second.size();
       for (uint32_t i = 0; i < first.size(); i++) {
          is_equal = is_equal && first.at(i) == second.at(i);
@@ -215,8 +215,8 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_promotion_test, TESTER ) try {
 
    auto res = set_producers( {N(alice),N(bob)} );
    vector<producer_authority> sch1 = {
-                                 producer_authority_v0{N(alice), 1, {{get_public_key(N(alice), "active"), 1}}},
-                                 producer_authority_v0{N(bob),   1, {{get_public_key(N(bob),   "active"), 1}}}
+                                 producer_authority{N(alice), block_signing_authority_v0{1, {{get_public_key(N(alice), "active"), 1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{1, {{get_public_key(N(bob),   "active"), 1}}}}
                                };
    //wdump((fc::json::to_pretty_string(res)));
    wlog("set producer schedule to [alice,bob]");
@@ -235,9 +235,9 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_promotion_test, TESTER ) try {
 
    res = set_producers( {N(alice),N(bob),N(carol)} );
    vector<producer_authority> sch2 = {
-                                 producer_authority_v0{N(alice), 1, {{get_public_key(N(alice), "active"),1}}},
-                                 producer_authority_v0{N(bob),   1, {{get_public_key(N(bob),   "active"),1}}},
-                                 producer_authority_v0{N(carol), 1, {{get_public_key(N(carol), "active"),1}}}
+                                 producer_authority{N(alice), block_signing_authority_v0{1, {{get_public_key(N(alice), "active"),1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{1, {{get_public_key(N(bob),   "active"),1}}}},
+                                 producer_authority{N(carol), block_signing_authority_v0{1, {{get_public_key(N(carol), "active"),1}}}}
                                };
    wlog("set producer schedule to [alice,bob,carol]");
    BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
@@ -280,9 +280,9 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_reduction, tester ) try {
 
    auto res = set_producers( {N(alice),N(bob),N(carol)} );
    vector<producer_authority> sch1 = {
-                                 producer_authority_v0{N(alice), 1, {{get_public_key(N(alice), "active"),1}}},
-                                 producer_authority_v0{N(bob),   1, {{get_public_key(N(bob),   "active"),1}}},
-                                 producer_authority_v0{N(carol), 1, {{get_public_key(N(carol), "active"),1}}}
+                                 producer_authority{N(alice), block_signing_authority_v0{ 1, {{get_public_key(N(alice), "active"),1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{ 1, {{get_public_key(N(bob),   "active"),1}}}},
+                                 producer_authority{N(carol), block_signing_authority_v0{ 1, {{get_public_key(N(carol), "active"),1}}}}
                                };
    wlog("set producer schedule to [alice,bob,carol]");
    BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
@@ -300,8 +300,8 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_reduction, tester ) try {
 
    res = set_producers( {N(alice),N(bob)} );
    vector<producer_authority> sch2 = {
-                                 producer_authority_v0{N(alice), 1, {{ get_public_key(N(alice), "active"),1}}},
-                                 producer_authority_v0{N(bob),   1, {{ get_public_key(N(bob),   "active"),1}}}
+                                 producer_authority{N(alice), block_signing_authority_v0{ 1, {{ get_public_key(N(alice), "active"),1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{ 1, {{ get_public_key(N(bob),   "active"),1}}}}
                                };
    wlog("set producer schedule to [alice,bob]");
    BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
@@ -342,8 +342,8 @@ BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
 
    auto res = c.set_producers( {N(alice),N(bob)} );
    vector<producer_authority> sch1 = {
-                                 producer_authority_v0{N(alice), 1, {{ get_public_key(N(alice), "active"),1}}},
-                                 producer_authority_v0{N(bob),   1, {{ get_public_key(N(bob),   "active"),1}}}
+                                 producer_authority{N(alice), block_signing_authority_v0{ 1, {{ get_public_key(N(alice), "active"),1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{ 1, {{ get_public_key(N(bob),   "active"),1}}}}
                                };
    wlog("set producer schedule to [alice,bob]");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
@@ -384,9 +384,9 @@ BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
    // Setting a new producer schedule should still use version 2
    res = c.set_producers( {N(alice),N(bob),N(carol)} );
    vector<producer_authority> sch2 = {
-                                 producer_authority_v0{N(alice), 1, {{get_public_key(N(alice), "active"),1}}},
-                                 producer_authority_v0{N(bob),   1, {{get_public_key(N(bob),   "active"),1}}},
-                                 producer_authority_v0{N(carol), 1, {{get_public_key(N(carol), "active"),1}}}
+                                 producer_authority{N(alice), block_signing_authority_v0{ 1, {{get_public_key(N(alice), "active"),1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{ 1, {{get_public_key(N(bob),   "active"),1}}}},
+                                 producer_authority{N(carol), block_signing_authority_v0{ 1, {{get_public_key(N(carol), "active"),1}}}}
                                };
    wlog("set producer schedule to [alice,bob,carol]");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
@@ -419,9 +419,9 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
 
    auto res = c.set_producers( {N(alice),N(bob),N(carol)} );
    vector<producer_authority> sch1 = {
-                                 producer_authority_v0{N(alice), 1, {{c.get_public_key(N(alice), "active"),1}}},
-                                 producer_authority_v0{N(bob),   1, {{c.get_public_key(N(bob),   "active"),1}}},
-                                 producer_authority_v0{N(carol), 1, {{c.get_public_key(N(carol), "active"),1}}}
+                                 producer_authority{N(alice), block_signing_authority_v0{ 1, {{c.get_public_key(N(alice), "active"),1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{ 1, {{c.get_public_key(N(bob),   "active"),1}}}},
+                                 producer_authority{N(carol), block_signing_authority_v0{ 1, {{c.get_public_key(N(carol), "active"),1}}}}
                                };
    wlog("set producer schedule to [alice,bob,carol]");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
@@ -442,8 +442,8 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
 
    res = c.set_producers( {N(alice),N(bob)} );
    vector<producer_authority> sch2 = {
-                                 producer_authority_v0{N(alice), 1, {{c.get_public_key(N(alice), "active"),1}}},
-                                 producer_authority_v0{N(bob),   1, {{c.get_public_key(N(bob),   "active"),1}}}
+                                 producer_authority{N(alice), block_signing_authority_v0{ 1, {{c.get_public_key(N(alice), "active"),1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{ 1, {{c.get_public_key(N(bob),   "active"),1}}}}
                                };
    wlog("set producer schedule to [alice,bob]");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index cd20e6cd74f..fae902ab157 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -777,7 +777,7 @@ BOOST_AUTO_TEST_CASE( disallow_empty_producer_schedule_test ) { try {
    c.create_accounts( producer_names );
    c.set_producers( producer_names );
    c.produce_blocks(2);
-   const auto& schedule = c.get_producer_keys( producer_names );
+   const auto& schedule = c.get_producer_authorities( producer_names );
    BOOST_CHECK( std::equal( schedule.begin(), schedule.end(), c.control->active_producers().producers.begin()) );
 
 } FC_LOG_AND_RETHROW() }

From 81a09d2308f3f6b56ec2642bf554a985359394af Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 16 May 2019 14:12:21 -0400
Subject: [PATCH 0411/1648] Add tx_resource_exhaustion exception

---
 libraries/chain/include/eosio/chain/exceptions.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 28ff33b21db..d73af1087a8 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -244,6 +244,8 @@ namespace eosio { namespace chain {
                                     3040016, "Transaction includes an ill-formed deferred transaction generation context extension" )
       FC_DECLARE_DERIVED_EXCEPTION( disallowed_transaction_extensions_bad_block_exception, transaction_exception,
                                     3250002, "Transaction includes disallowed extensions (invalid block)" )
+      FC_DECLARE_DERIVED_EXCEPTION( tx_resource_exhaustion, transaction_exception,
+                                    3040018, "Transaction exceeded transient resource limit" )
 
 
    FC_DECLARE_DERIVED_EXCEPTION( action_validate_exception, chain_exception,

From ed3246edddcc7837dc09f3571e01c8cdd27226fb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 16 May 2019 14:15:22 -0400
Subject: [PATCH 0412/1648] Add incoming-transaction-queue-size-mb limit for
 transactions in incoming transaction queue and throw tx_resource_exhaustion
 if exceeded.

---
 plugins/producer_plugin/producer_plugin.cpp | 130 +++++++++++++-------
 1 file changed, 84 insertions(+), 46 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 0d40ba5cdd8..07476a8e4f6 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -201,6 +201,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       std::atomic<int32_t>                                      _max_transaction_time_ms; // modified by app thread, read by net_plugin thread pool
       fc::microseconds                                          _max_irreversible_block_age_us;
+      static uint64_t                                           _max_incoming_transaction_queue_size;
       int32_t                                                   _produce_time_offset_us = 0;
       int32_t                                                   _last_block_time_offset_us = 0;
       int32_t                                                   _max_scheduled_transaction_time_per_block_ms;
@@ -428,7 +429,39 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          }
       }
 
-      std::deque<std::tuple<transaction_metadata_ptr, bool, next_function<transaction_trace_ptr>>> _pending_incoming_transactions;
+      class incoming_transactions {
+         uint64_t size_in_bytes = 0;
+         std::deque<std::tuple<transaction_metadata_ptr, bool, next_function<transaction_trace_ptr>>> _incoming_transactions;
+
+      private:
+         uint64_t calc_size( const transaction_metadata_ptr& trx ) {
+            return trx->packed_trx()->get_unprunable_size() + trx->packed_trx()->get_prunable_size() + sizeof( *trx );
+         }
+
+      public:
+         void add( const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next ) {
+            auto size = calc_size( trx );
+            EOS_ASSERT( size_in_bytes + size < _max_incoming_transaction_queue_size, tx_resource_exhaustion,
+                        "Transaction exceeded producer resource limit" );
+            size_in_bytes += size;
+            _incoming_transactions.emplace_back( trx, persist_until_expired, std::move( next ) );
+         }
+
+         auto pop_front() {
+            EOS_ASSERT( !_incoming_transactions.empty(), producer_exception, "logic error, front() called on empty incoming_transactions" );
+            auto intrx = _incoming_transactions.front();
+            _incoming_transactions.pop_front();
+            const transaction_metadata_ptr& trx = std::get<0>( intrx );
+            size_in_bytes -= calc_size( trx );
+            return intrx;
+         }
+
+         bool empty()const { return _incoming_transactions.empty(); }
+         size_t size()const { return _incoming_transactions.size(); }
+
+      };
+
+      incoming_transactions _pending_incoming_transactions;
 
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
@@ -448,12 +481,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       void process_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
-         if (!chain.is_building_block()) {
-            _pending_incoming_transactions.emplace_back(trx, persist_until_expired, next);
-            return;
-         }
-
-         auto block_time = chain.pending_block_time();
 
          auto send_response = [this, &trx, &chain, &next](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& response) {
             next(response);
@@ -484,53 +511,62 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             }
          };
 
-         const auto& id = trx->id();
-         if( fc::time_point(trx->packed_trx()->expiration()) < block_time ) {
-            send_response(std::static_pointer_cast<fc::exception>(
-                  std::make_shared<expired_tx_exception>(
-                        FC_LOG_MESSAGE(error, "expired transaction ${id}, expiration ${e}, block time ${bt}",
-                                       ("id", id)("e", trx->packed_trx()->expiration())("bt", block_time)) )));
-            return;
-         }
+         try {
+            if( !chain.is_building_block()) {
+               _pending_incoming_transactions.add( trx, persist_until_expired, next );
+               return;
+            }
 
-         if( chain.is_known_unexpired_transaction(id) ) {
-            send_response(std::static_pointer_cast<fc::exception>(std::make_shared<tx_duplicate>(FC_LOG_MESSAGE(error, "duplicate transaction ${id}", ("id", id)) )));
-            return;
-         }
+            auto block_time = chain.pending_block_time();
 
-         auto deadline = fc::time_point::now() + fc::milliseconds(_max_transaction_time_ms);
-         bool deadline_is_subjective = false;
-         const auto block_deadline = calculate_block_deadline(block_time);
-         if (_max_transaction_time_ms < 0 || (_pending_block_mode == pending_block_mode::producing && block_deadline < deadline) ) {
-            deadline_is_subjective = true;
-            deadline = block_deadline;
-         }
+            const auto& id = trx->id();
+            if( fc::time_point( trx->packed_trx()->expiration()) < block_time ) {
+               send_response( std::static_pointer_cast<fc::exception>(
+                     std::make_shared<expired_tx_exception>(
+                           FC_LOG_MESSAGE( error, "expired transaction ${id}, expiration ${e}, block time ${bt}",
+                                           ("id", id)("e", trx->packed_trx()->expiration())( "bt", block_time )))));
+               return;
+            }
 
-         try {
-            auto trace = chain.push_transaction(trx, deadline);
-            if (trace->except) {
-               if (failure_is_subjective(*trace->except, deadline_is_subjective)) {
-                  _pending_incoming_transactions.emplace_back(trx, persist_until_expired, next);
-                  if (_pending_block_mode == pending_block_mode::producing) {
-                     fc_dlog(_trx_trace_log, "[TRX_TRACE] Block ${block_num} for producer ${prod} COULD NOT FIT, tx: ${txid} RETRYING ",
-                             ("block_num", chain.head_block_num() + 1)
-                             ("prod", chain.pending_block_producer())
-                             ("txid", trx->id()));
+            if( chain.is_known_unexpired_transaction( id )) {
+               send_response( std::static_pointer_cast<fc::exception>( std::make_shared<tx_duplicate>(
+                     FC_LOG_MESSAGE( error, "duplicate transaction ${id}", ("id", id)))) );
+               return;
+            }
+
+            auto deadline = fc::time_point::now() + fc::milliseconds( _max_transaction_time_ms );
+            bool deadline_is_subjective = false;
+            const auto block_deadline = calculate_block_deadline( block_time );
+            if( _max_transaction_time_ms < 0 ||
+                (_pending_block_mode == pending_block_mode::producing && block_deadline < deadline)) {
+               deadline_is_subjective = true;
+               deadline = block_deadline;
+            }
+
+            auto trace = chain.push_transaction( trx, deadline );
+            if( trace->except ) {
+               if( failure_is_subjective( *trace->except, deadline_is_subjective )) {
+                  _pending_incoming_transactions.add( trx, persist_until_expired, next );
+                  if( _pending_block_mode == pending_block_mode::producing ) {
+                     fc_dlog( _trx_trace_log, "[TRX_TRACE] Block ${block_num} for producer ${prod} COULD NOT FIT, tx: ${txid} RETRYING ",
+                              ("block_num", chain.head_block_num() + 1)
+                              ("prod", chain.pending_block_producer())
+                              ("txid", trx->id()));
                   } else {
-                     fc_dlog(_trx_trace_log, "[TRX_TRACE] Speculative execution COULD NOT FIT tx: ${txid} RETRYING",
-                             ("txid", trx->id()));
+                     fc_dlog( _trx_trace_log, "[TRX_TRACE] Speculative execution COULD NOT FIT tx: ${txid} RETRYING",
+                              ("txid", trx->id()));
                   }
                } else {
                   auto e_ptr = trace->except->dynamic_copy_exception();
-                  send_response(e_ptr);
+                  send_response( e_ptr );
                }
             } else {
-               if (persist_until_expired) {
+               if( persist_until_expired ) {
                   // if this trx didnt fail/soft-fail and the persist flag is set, store its ID so that we can
                   // ensure its applied to all future speculative blocks as well.
-                  _persistent_transactions.insert(transaction_id_with_expiry{trx->id(), trx->packed_trx()->expiration()});
+                  _persistent_transactions.insert( transaction_id_with_expiry{trx->id(), trx->packed_trx()->expiration()} );
                }
-               send_response(trace);
+               send_response( trace );
             }
 
          } catch ( const guard_exception& e ) {
@@ -637,6 +673,8 @@ void producer_plugin::set_program_options(
           "Maximum wall-clock time, in milliseconds, spent retiring scheduled transactions in any block before returning to normal transaction processing.")
          ("incoming-defer-ratio", bpo::value<double>()->default_value(1.0),
           "ratio between incoming transations and deferred transactions when both are exhausted")
+         ("incoming-transaction-queue-size-mb", bpo::value<uint16_t>()->default_value( 1024 ),
+          "Maximum size (in MiB) of the incoming transaction queue. Exceeding this value will subjectively drop transaction with resource exhaustion.")
          ("producer-threads", bpo::value<uint16_t>()->default_value(config::default_controller_thread_pool_size),
           "Number of worker threads in producer thread pool")
          ("snapshots-dir", bpo::value<bfs::path>()->default_value("snapshots"),
@@ -771,6 +809,8 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
 
    my->_max_irreversible_block_age_us = fc::seconds(options.at("max-irreversible-block-age").as<int32_t>());
 
+   my->_max_incoming_transaction_queue_size = options.at("incoming-transaction-queue-size-mb").as<uint16_t>() * 1024*1024;
+
    my->_incoming_defer_ratio = options.at("incoming-defer-ratio").as<double>();
 
    auto thread_pool_size = options.at( "producer-threads" ).as<uint16_t>();
@@ -1616,8 +1656,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                while (_incoming_trx_weight >= 1.0 && orig_pending_txn_size && _pending_incoming_transactions.size()) {
                   if (scheduled_trx_deadline <= fc::time_point::now()) break;
 
-                  auto e = _pending_incoming_transactions.front();
-                  _pending_incoming_transactions.pop_front();
+                  auto e = _pending_incoming_transactions.pop_front();
                   --orig_pending_txn_size;
                   _incoming_trx_weight -= 1.0;
                   process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
@@ -1683,8 +1722,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                fc_dlog(_log, "Processing ${n} pending transactions", ("n", _pending_incoming_transactions.size()));
                while (orig_pending_txn_size && _pending_incoming_transactions.size()) {
                   if (preprocess_deadline <= fc::time_point::now()) return start_block_result::exhausted;
-                  auto e = _pending_incoming_transactions.front();
-                  _pending_incoming_transactions.pop_front();
+                  auto e = _pending_incoming_transactions.pop_front();
                   --orig_pending_txn_size;
                   process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
                }

From a8aafeb4e8ad1324b9e5ba445b726bc852ab98c5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 16 May 2019 14:20:13 -0400
Subject: [PATCH 0413/1648] Fix exception #

---
 libraries/chain/include/eosio/chain/exceptions.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 28ff33b21db..dd13819bcfe 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -243,7 +243,7 @@ namespace eosio { namespace chain {
       FC_DECLARE_DERIVED_EXCEPTION( ill_formed_deferred_transaction_generation_context, transaction_exception,
                                     3040016, "Transaction includes an ill-formed deferred transaction generation context extension" )
       FC_DECLARE_DERIVED_EXCEPTION( disallowed_transaction_extensions_bad_block_exception, transaction_exception,
-                                    3250002, "Transaction includes disallowed extensions (invalid block)" )
+                                    3040017, "Transaction includes disallowed extensions (invalid block)" )
 
 
    FC_DECLARE_DERIVED_EXCEPTION( action_validate_exception, chain_exception,
@@ -325,6 +325,7 @@ namespace eosio { namespace chain {
                                     3080007, "Transaction exceeded the current greylisted account network usage limit" )
       FC_DECLARE_DERIVED_EXCEPTION( greylist_cpu_usage_exceeded, resource_exhausted_exception,
                                     3080008, "Transaction exceeded the current greylisted account CPU usage limit" )
+
       FC_DECLARE_DERIVED_EXCEPTION( leeway_deadline_exception, deadline_exception,
                                     3081001, "Transaction reached the deadline set due to leeway on account CPU limits" )
 

From 32824b58327ec4e8587621bbd6a42beebf566294 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 16 May 2019 14:41:21 -0400
Subject: [PATCH 0414/1648] Add `boost/asio/io_context.hpp` header to
 `transaction_metadata.hpp`

---
 libraries/chain/include/eosio/chain/transaction_metadata.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 1a574c3d15c..9cb61f5a887 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -5,6 +5,7 @@
 #pragma once
 #include <eosio/chain/transaction.hpp>
 #include <eosio/chain/types.hpp>
+#include <boost/asio/io_context.hpp>
 #include <future>
 
 namespace boost { namespace asio {

From ca7c18dfdb285a695838aab1eb1a23e1388a9246 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 16 May 2019 14:59:58 -0400
Subject: [PATCH 0415/1648] Update to appbase with set_thread_priority_max
 method

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index 26e2a723e50..ac1b7ac3db2 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit 26e2a723e50eb67aa06f1cd88d092f84b00e69d2
+Subproject commit ac1b7ac3db2d5056ccc4a6274fc21381ae4f861b

From cf4a856a070730d4b1c4bcf8e54f41b987434c75 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 16 May 2019 15:01:30 -0400
Subject: [PATCH 0416/1648] Add call to set_thread_priority_max

---
 programs/nodeos/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 04c726ed8df..460dd47ad05 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -100,6 +100,7 @@ int main(int argc, char** argv)
       ilog("${name} using configuration file ${c}", ("name", nodeos::config::node_executable_name)("c", app().full_config_file_path().string()));
       ilog("${name} data directory is ${d}", ("name", nodeos::config::node_executable_name)("d", app().data_dir().string()));
       app().startup();
+      app().set_thread_priority_max();
       app().exec();
    } catch( const extract_genesis_state_exception& e ) {
       return EXTRACTED_GENESIS;

From 4dc31fe75b9e17bf312c6f1764f0e18fe64ed809 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 16 May 2019 15:45:45 -0400
Subject: [PATCH 0417/1648] Fix `-b` flag for `cleos get table` subcommand

---
 programs/cleos/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 2711ba0f1c4..5aa80885fca 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -2617,7 +2617,6 @@ int main( int argc, char** argv ) {
    getTable->add_option( "account", code, localized("The account who owns the table") )->required();
    getTable->add_option( "scope", scope, localized("The scope within the contract in which the table is found") )->required();
    getTable->add_option( "table", table, localized("The name of the table as specified by the contract abi") )->required();
-   getTable->add_option( "-b,--binary", binary, localized("Return the value as BINARY rather than using abi to interpret as JSON") );
    getTable->add_option( "-l,--limit", limit, localized("The maximum number of rows to return") );
    getTable->add_option( "-k,--key", table_key, localized("Deprecated") );
    getTable->add_option( "-L,--lower", lower, localized("JSON representation of lower bound value of key, defaults to first") );
@@ -2631,6 +2630,7 @@ int main( int argc, char** argv ) {
    getTable->add_option( "--encode-type", encode_type,
                          localized("The encoding type of key_type (i64 , i128 , float64, float128) only support decimal encoding e.g. 'dec'"
                                     "i256 - supports both 'dec' and 'hex', ripemd160 and sha256 is 'hex' only"));
+   getTable->add_flag("-b,--binary", binary, localized("Return the value as BINARY rather than using abi to interpret as JSON"));
    getTable->add_flag("-r,--reverse", reverse, localized("Iterate in reverse order"));
    getTable->add_flag("--show-payer", show_payer, localized("show RAM payer"));
 

From c02c89b562fc8405244c8d9e19a31a6dd7d95fd4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 16 May 2019 16:02:19 -0400
Subject: [PATCH 0418/1648] define _max_incoming_transaction_queue_size

---
 plugins/producer_plugin/producer_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 07476a8e4f6..56df861cb91 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -604,6 +604,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       void schedule_delayed_production_loop(const std::weak_ptr<producer_plugin_impl>& weak_this, const block_timestamp_type& current_block_time);
 };
 
+uint64_t producer_plugin_impl::_max_incoming_transaction_queue_size = 0;
+
 void new_chain_banner(const eosio::chain::controller& db)
 {
    std::cerr << "\n"

From 1dbfd9eacd7055c7b56e986bd525f63db2c4276d Mon Sep 17 00:00:00 2001
From: Zane Reynolds <zane.reynolds@gmail.com>
Date: Thu, 16 May 2019 16:02:27 -0400
Subject: [PATCH 0419/1648] Adds configuration for replay test pipeline

---
 pipeline.jsonc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 7fda37a185c..ed98e86690b 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -23,6 +23,14 @@
         }
     },
     "eosio-sync-tests":
+    {
+        "environment":
+        {
+            "SKIP_PRE_V180": "true",
+            "SKIP_V180": "false"
+        }
+    },
+    "eosio-replay-tests":
     {
         "environment":
         {

From a965f0dcb8c9f49b3be5699ca9ca7b878fd613cf Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 16 May 2019 16:49:08 -0400
Subject: [PATCH 0420/1648] add new intrinsic, restore old intrinsic

---
 libraries/chain/controller.cpp     |  9 +++++
 libraries/chain/wasm_interface.cpp | 55 +++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index e43c7f11256..84b5703b503 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -3089,6 +3089,15 @@ void controller_impl::on_activation<builtin_protocol_feature_t::replace_deferred
    }
 }
 
+template<>
+void controller_impl::on_activation<builtin_protocol_feature_t::wtmsig_block_signatures>() {
+   db.modify( db.get<protocol_state_object>(), [&]( auto& ps ) {
+      add_intrinsic_to_whitelist( ps.whitelisted_intrinsics, "set_proposed_producers_ex" );
+   } );
+}
+
+
+
 /// End of protocol feature activation handlers
 
 } } /// eosio::chain
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 55981a533b0..b426d5543a3 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -175,25 +175,7 @@ class privileged_api : public context_aware_api {
          context.control.get_resource_limits_manager().get_account_limits( account, ram_bytes, net_weight, cpu_weight);
       }
 
-      int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, size_t datalen) {
-         datastream<const char*> ds( packed_producer_schedule, datalen );
-         vector<producer_authority> producers;
-
-         if ( context.control.is_builtin_activated( builtin_protocol_feature_t::wtmsig_block_signatures )) {
-            fc::raw::unpack(ds, producers);
-
-         } else {
-            vector<legacy::producer_key> old_version;
-            fc::raw::unpack(ds, old_version);
-
-            /*
-             * Up-convert the producers
-             */
-            for ( const auto& p: old_version ) {
-               producers.emplace_back(producer_authority{ p.producer_name, block_signing_authority_v0{ 1, {{p.block_signing_key, 1}} } } );
-            }
-         }
-
+      int64_t set_proposed_producers_common( vector<producer_authority> && producers ) {
          EOS_ASSERT(producers.size() <= config::max_producers, wasm_execution_error, "Producer schedule exceeds the maximum producer count for this chain");
          EOS_ASSERT( producers.size() > 0
                      || !context.control.is_builtin_activated( builtin_protocol_feature_t::disallow_empty_producer_schedule ),
@@ -226,7 +208,39 @@ class privileged_api : public context_aware_api {
          }
          EOS_ASSERT( producers.size() == unique_producers.size(), wasm_execution_error, "duplicate producer name in producer schedule" );
 
-         return context.control.set_proposed_producers( std::move(producers) );
+         return context.control.set_proposed_producers( std::forward<vector<producer_authority>>(producers) );
+      }
+
+      int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, size_t datalen) {
+         datastream<const char*> ds( packed_producer_schedule, datalen );
+         vector<producer_authority> producers;
+
+//         if ( context.control.is_builtin_activated( builtin_protocol_feature_t::wtmsig_block_signatures )) {
+         vector<legacy::producer_key> old_version;
+         fc::raw::unpack(ds, old_version);
+
+         /*
+          * Up-convert the producers
+          */
+         for ( const auto& p: old_version ) {
+            producers.emplace_back(producer_authority{ p.producer_name, block_signing_authority_v0{ 1, {{p.block_signing_key, 1}} } } );
+         }
+
+         return set_proposed_producers_common(std::move(producers));
+      }
+
+      int64_t set_proposed_producers_ex( uint64_t packed_producer_format, array_ptr<char> packed_producer_schedule, size_t datalen) {
+         if (packed_producer_format == 0) {
+            return set_proposed_producers(packed_producer_schedule, datalen);
+         } else if (packed_producer_format == 1) {
+            datastream<const char*> ds( packed_producer_schedule, datalen );
+            vector<producer_authority> producers;
+
+            fc::raw::unpack(ds, producers);
+            return set_proposed_producers_common(std::move(producers));
+         } else {
+            EOS_THROW(wasm_execution_error, "Producer schedule is in an unknown format!");
+         }
       }
 
       uint32_t get_blockchain_parameters_packed( array_ptr<char> packed_blockchain_parameters, size_t buffer_size) {
@@ -1784,6 +1798,7 @@ REGISTER_INTRINSICS(privileged_api,
    (get_resource_limits,              void(int64_t,int,int,int)             )
    (set_resource_limits,              void(int64_t,int64_t,int64_t,int64_t) )
    (set_proposed_producers,           int64_t(int,int)                      )
+   (set_proposed_producers_ex,        int64_t(int64_t, int, int)            )
    (get_blockchain_parameters_packed, int(int, int)                         )
    (set_blockchain_parameters_packed, void(int,int)                         )
    (is_privileged,                    int(int64_t)                          )

From 131339219024cc228f59c652edf5bca16428d95f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 17 May 2019 08:35:15 -0400
Subject: [PATCH 0421/1648] Assert that incoming-transaction-queue-size-mb is
 greater than 0

---
 plugins/producer_plugin/producer_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 56df861cb91..1a0266473f1 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -812,6 +812,8 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
    my->_max_irreversible_block_age_us = fc::seconds(options.at("max-irreversible-block-age").as<int32_t>());
 
    my->_max_incoming_transaction_queue_size = options.at("incoming-transaction-queue-size-mb").as<uint16_t>() * 1024*1024;
+   EOS_ASSERT( my->_max_incoming_transaction_queue_size > 0, plugin_config_exception,
+               "incoming-transaction-queue-size-mb ${mb} must be greater than 0", ("mb", my->_max_incoming_transaction_queue_size) );
 
    my->_incoming_defer_ratio = options.at("incoming-defer-ratio").as<double>();
 

From 55cdeacea061152bc1862ac4ceabc61c6f69824d Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 17 May 2019 10:30:13 -0400
Subject: [PATCH 0422/1648] add additional plumbing to get protocol feature
 activating, fix full tester setup to use the interim bios until features are
 activated

---
 libraries/chain/controller.cpp               |  1 +
 libraries/chain/protocol_feature_manager.cpp | 23 ++++++++++++++++++++
 libraries/testing/tester.cpp                 |  3 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 84b5703b503..59f9fff2769 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -315,6 +315,7 @@ struct controller_impl {
       set_activation_handler<builtin_protocol_feature_t::preactivate_feature>();
       set_activation_handler<builtin_protocol_feature_t::replace_deferred>();
       set_activation_handler<builtin_protocol_feature_t::get_sender>();
+      set_activation_handler<builtin_protocol_feature_t::wtmsig_block_signatures>();
 
       self.irreversible_block.connect([this](const block_state_ptr& bsp) {
          wasmif.current_lib(bsp->block_num);
diff --git a/libraries/chain/protocol_feature_manager.cpp b/libraries/chain/protocol_feature_manager.cpp
index ca0457ce11d..f6befbbd2c8 100644
--- a/libraries/chain/protocol_feature_manager.cpp
+++ b/libraries/chain/protocol_feature_manager.cpp
@@ -154,6 +154,29 @@ is not allowed to schedule a deferred transaction in which the RAM costs are pai
 unless that account authorized the action;
 but is allowed to execute database operations that increase RAM usage of an account other than the receiver as long as
 either the account authorized the action or the action's net effect on RAM usage for the account is to not increase it.
+*/
+            {}
+         } )
+         (  builtin_protocol_feature_t::wtmsig_block_signatures, builtin_protocol_feature_spec{
+            "WTMSIG_BLOCK_SIGNATURES",
+            fc::variant("46d65101388a44ebdbbb152978ac1879e34785a2d57ad050196826734370b995").as<digest_type>(),
+            // SHA256 hash of the raw message below within the comment delimiters (do not modify message below).
+/*
+Builtin protocol feature: WTMSIG_BLOCK_SIGNATURES
+
+Allows producers to specify a subset of our auhority structures as the method for signing blocks.
+
+A valid block header:
+is no longer allowed to have a non-empty `new_producers` field;
+must announce new producer schedules using a block header extension with ID `1`
+
+A valid signed block:
+must continue to have exactly one signature in its `signatures` field;
+and may have additional signatures in a block extension with ID `2`
+
+Privileged Contracts:
+may continue to use `set_proposed_producers` as they have;
+may use a new `set_proposed_producers_ex` intrinsic to access extended features.
 */
             {}
          } )
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index bbd3dd2fe1e..6f44d718d3a 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -184,9 +184,10 @@ namespace eosio { namespace testing {
          case setup_policy::full: {
             schedule_preactivate_protocol_feature();
             produce_block();
-            set_bios_contract();
+            set_before_producer_authority_bios_contract();
             preactivate_all_builtin_protocol_features();
             produce_block();
+            set_bios_contract();
             break;
          }
          case setup_policy::none:

From 674b652649880d9192e4dafcd2a1ca9ff8eee1bf Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 17 May 2019 10:53:44 -0400
Subject: [PATCH 0423/1648] Allow aliases of variants in ABI

This resolves 7254

We had a redundant validation that attempted to prevent aliasing to an unknown type however, this was done before variants were loaded so, it would reject an alias of a variant.  `::validate` will perform this validation after all types are known so, this assert was not needed
---
 libraries/chain/abi_serializer.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/chain/abi_serializer.cpp b/libraries/chain/abi_serializer.cpp
index 2f453e0cf93..8b91b332392 100644
--- a/libraries/chain/abi_serializer.cpp
+++ b/libraries/chain/abi_serializer.cpp
@@ -119,7 +119,6 @@ namespace eosio { namespace chain {
          structs[st.name] = st;
 
       for( const auto& td : abi.types ) {
-         EOS_ASSERT(_is_type(td.type, ctx), invalid_type_inside_abi, "invalid type ${type}", ("type",td.type));
          EOS_ASSERT(!_is_type(td.new_type_name, ctx), duplicate_abi_type_def_exception, "type already exists", ("new_type_name",td.new_type_name));
          typedefs[td.new_type_name] = td.type;
       }

From fe480fc9ead3db0d1ead21f320f9b94a4d60418b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 17 May 2019 11:51:34 -0400
Subject: [PATCH 0424/1648] minor cleanup

---
 plugins/producer_plugin/producer_plugin.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 1a0266473f1..9f4e139e189 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -429,7 +429,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          }
       }
 
-      class incoming_transactions {
+      class incoming_transaction_queue {
          uint64_t size_in_bytes = 0;
          std::deque<std::tuple<transaction_metadata_ptr, bool, next_function<transaction_trace_ptr>>> _incoming_transactions;
 
@@ -441,8 +441,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       public:
          void add( const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next ) {
             auto size = calc_size( trx );
-            EOS_ASSERT( size_in_bytes + size < _max_incoming_transaction_queue_size, tx_resource_exhaustion,
-                        "Transaction exceeded producer resource limit" );
+            EOS_ASSERT( size_in_bytes + size < _max_incoming_transaction_queue_size, tx_resource_exhaustion, "Transaction exceeded producer resource limit" );
             size_in_bytes += size;
             _incoming_transactions.emplace_back( trx, persist_until_expired, std::move( next ) );
          }
@@ -461,7 +460,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       };
 
-      incoming_transactions _pending_incoming_transactions;
+      incoming_transaction_queue _pending_incoming_transactions;
 
       void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();

From 32b92969499ba48fd4f0f9141a0f518482fe2ab6 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 17 May 2019 16:35:33 -0400
Subject: [PATCH 0425/1648] update with new fc commits that fix variant
 comparisons

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index c83e208bce9..bb9ffe1b5cc 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit c83e208bce9f86e92421056e82b92283145884e4
+Subproject commit bb9ffe1b5cc7b14807f0e275f8bae024a8fb66d3

From bc244c8a8143b92522b2a0d05e7b672e8fea2a9a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 17 May 2019 18:03:25 -0400
Subject: [PATCH 0426/1648] Make sure next is called if get_signature_keys
 throws an exception

---
 libraries/chain/transaction_metadata.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index f72b35a2545..b3f7763f82b 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -16,6 +16,7 @@ recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chai
 
    g.unlock();
    // shared_keys_future not created or different chain_id
+   wlog( "recovering keys in recover_keys" );
    auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
    const signed_transaction& trn = _packed_trx->get_signed_transaction();
    fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, fc::time_point::maximum(), *recovered_pub_keys );
@@ -39,15 +40,22 @@ void transaction_metadata::start_recover_keys( const transaction_metadata_ptr& m
    if( mtrx->_signing_keys_future.valid() && std::get<0>( mtrx->_signing_keys_future.get() ) == chain_id ) { // already created
       g.unlock();
       if( next ) next();
+      return;
    }
 
    mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx, next{std::move(next)}]() {
-      fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
-                                fc::time_point::maximum() : fc::time_point::now() + time_limit;
-
       auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
-      const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
-      fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, deadline, *recovered_pub_keys );
+      fc::microseconds cpu_usage;
+      try {
+         fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
+                                   fc::time_point::maximum() : fc::time_point::now() + time_limit;
+
+         const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
+         cpu_usage = trn.get_signature_keys( chain_id, deadline, *recovered_pub_keys );
+      } catch( ... ) {
+         if( next ) next();
+         throw;
+      }
       if( next ) next();
       return std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ));
    } );

From 6a7abb43927110481befed4093394d1c7cd27a63 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 17 May 2019 18:04:26 -0400
Subject: [PATCH 0427/1648] Add billing_timer to reported exception string

---
 libraries/chain/transaction_context.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index fc90d155e58..d687df7bf96 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -471,28 +471,29 @@ namespace bacc = boost::accumulators;
       if( BOOST_UNLIKELY( now > _deadline ) ) {
          // edump((now-start)(now-pseudo_start));
          if( explicit_billed_cpu_time || deadline_exception_code == deadline_exception::code_value ) {
-            EOS_THROW( deadline_exception, "deadline exceeded", ("now", now)("deadline", _deadline)("start", start) );
+            EOS_THROW( deadline_exception, "deadline exceeded ${billing_timer}us",
+                       ("billing_timer", now - pseudo_start)("now", now)("deadline", _deadline)("start", start) );
          } else if( deadline_exception_code == block_cpu_usage_exceeded::code_value ) {
             EOS_THROW( block_cpu_usage_exceeded,
-                        "not enough time left in block to complete executing transaction",
+                        "not enough time left in block to complete executing transaction ${billing_timer}us",
                         ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
          } else if( deadline_exception_code == tx_cpu_usage_exceeded::code_value ) {
             if (cpu_limit_due_to_greylist) {
                EOS_THROW( greylist_cpu_usage_exceeded,
-                        "greylisted transaction was executing for too long",
+                        "greylisted transaction was executing for too long ${billing_timer}us",
                         ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
             } else {
                EOS_THROW( tx_cpu_usage_exceeded,
-                        "transaction was executing for too long",
+                        "transaction was executing for too long ${billing_timer}us",
                         ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
             }
          } else if( deadline_exception_code == leeway_deadline_exception::code_value ) {
             EOS_THROW( leeway_deadline_exception,
                         "the transaction was unable to complete by deadline, "
-                        "but it is possible it could have succeeded if it were allowed to run to completion",
+                        "but it is possible it could have succeeded if it were allowed to run to completion ${billing_timer}",
                         ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
          }
-         EOS_ASSERT( false,  transaction_exception, "unexpected deadline exception code" );
+         EOS_ASSERT( false,  transaction_exception, "unexpected deadline exception code ${code}", ("code", deadline_exception_code) );
       }
    }
 

From 7846d7b638261acb64d58f24ec9446fc65056724 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 17 May 2019 18:05:25 -0400
Subject: [PATCH 0428/1648] Add time to exception string

---
 libraries/chain/transaction.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index 1ebdfeccc01..1e07f803066 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -111,8 +111,8 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
    fc::microseconds sig_cpu_usage;
    for(const signature_type& sig : signatures) {
       auto now = fc::time_point::now();
-      EOS_ASSERT( now < deadline, tx_cpu_usage_exceeded, "transaction signature verification executed for too long",
-                  ("now", now)("deadline", deadline)("start", start) );
+      EOS_ASSERT( now < deadline, tx_cpu_usage_exceeded, "transaction signature verification executed for too long ${time}us",
+                  ("time", now - start)("now", now)("deadline", deadline)("start", start) );
       public_key_type recov;
       const auto& tid = id();
       lock.lock();

From da9d004b5dc637eeb8b8c8fd7ada5176d169d89e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 17 May 2019 18:06:58 -0400
Subject: [PATCH 0429/1648] Move CATCH_AND_CALL macro to exceptions.hpp and
 handle bad_alloc in EOS_RETHROW_EXCEPTIONS and EOS_CAPTURE_AND_RETHROW

---
 .../chain/include/eosio/chain/exceptions.hpp  | 32 +++++++++++++++++--
 plugins/chain_plugin/chain_plugin.cpp         | 20 ------------
 plugins/producer_plugin/producer_plugin.cpp   | 16 ----------
 3 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index dd13819bcfe..2885e0dfa15 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -23,7 +23,11 @@
  * This macro will rethrow the exception as the specified "exception_type"
  */
 #define EOS_RETHROW_EXCEPTIONS(exception_type, FORMAT, ... ) \
-   catch (eosio::chain::chain_exception& e) { \
+   catch( const std::bad_alloc& ) {\
+      throw;\
+   } catch( const boost::interprocess::bad_alloc& ) {\
+      throw;\
+   } catch (eosio::chain::chain_exception& e) { \
       FC_RETHROW_EXCEPTION( e, warn, FORMAT, __VA_ARGS__ ); \
    } catch (fc::exception& e) { \
       exception_type new_exception(FC_LOG_MESSAGE( warn, FORMAT, __VA_ARGS__ )); \
@@ -46,7 +50,11 @@
  * This macro will rethrow the exception as the specified "exception_type"
  */
 #define EOS_CAPTURE_AND_RETHROW( exception_type, ... ) \
-   catch (eosio::chain::chain_exception& e) { \
+   catch( const std::bad_alloc& ) {\
+      throw;\
+   } catch( const boost::interprocess::bad_alloc& ) {\
+      throw;\
+   } catch (eosio::chain::chain_exception& e) { \
       FC_RETHROW_EXCEPTION( e, warn, "", FC_FORMAT_ARG_PARAMS(__VA_ARGS__) ); \
    } catch (fc::exception& e) { \
       exception_type new_exception(e.get_log()); \
@@ -63,6 +71,26 @@
                 std::current_exception() ); \
    }
 
+/**
+ * Capture all exceptions and pass to NEXT function
+ */
+#define CATCH_AND_CALL(NEXT)\
+   catch ( const fc::exception& err ) {\
+      NEXT(err.dynamic_copy_exception());\
+   } catch ( const std::exception& e ) {\
+      fc::exception fce( \
+         FC_LOG_MESSAGE( warn, "rethrow ${what}: ", ("what",e.what())),\
+         fc::std_exception_code,\
+         BOOST_CORE_TYPEID(e).name(),\
+         e.what() ) ;\
+      NEXT(fce.dynamic_copy_exception());\
+   } catch( ... ) {\
+      fc::unhandled_exception e(\
+         FC_LOG_MESSAGE(warn, "rethrow"),\
+         std::current_exception());\
+      NEXT(e.dynamic_copy_exception());\
+   }
+
 #define EOS_RECODE_EXC( cause_type, effect_type ) \
    catch( const cause_type& e ) \
    { throw( effect_type( e.what(), e.get_log() ) ); }
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 3d0bac826b9..b41de029ca0 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -117,26 +117,6 @@ using fc::flat_map;
 
 using boost::signals2::scoped_connection;
 
-//using txn_msg_rate_limits = controller::txn_msg_rate_limits;
-
-#define CATCH_AND_CALL(NEXT)\
-   catch ( const fc::exception& err ) {\
-      NEXT(err.dynamic_copy_exception());\
-   } catch ( const std::exception& e ) {\
-      fc::exception fce( \
-         FC_LOG_MESSAGE( warn, "rethrow ${what}: ", ("what",e.what())),\
-         fc::std_exception_code,\
-         BOOST_CORE_TYPEID(e).name(),\
-         e.what() ) ;\
-      NEXT(fce.dynamic_copy_exception());\
-   } catch( ... ) {\
-      fc::unhandled_exception e(\
-         FC_LOG_MESSAGE(warn, "rethrow"),\
-         std::current_exception());\
-      NEXT(e.dynamic_copy_exception());\
-   }
-
-
 class chain_plugin_impl {
 public:
    chain_plugin_impl()
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 0d40ba5cdd8..e95f5092b53 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -155,22 +155,6 @@ enum class pending_block_mode {
    producing,
    speculating
 };
-#define CATCH_AND_CALL(NEXT)\
-   catch ( const fc::exception& err ) {\
-      NEXT(err.dynamic_copy_exception());\
-   } catch ( const std::exception& e ) {\
-      fc::exception fce( \
-         FC_LOG_MESSAGE( warn, "rethrow ${what}: ", ("what",e.what())),\
-         fc::std_exception_code,\
-         BOOST_CORE_TYPEID(e).name(),\
-         e.what() ) ;\
-      NEXT(fce.dynamic_copy_exception());\
-   } catch( ... ) {\
-      fc::unhandled_exception e(\
-         FC_LOG_MESSAGE(warn, "rethrow"),\
-         std::current_exception());\
-      NEXT(e.dynamic_copy_exception());\
-   }
 
 class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin_impl> {
    public:

From 8e28a4502fa5df436f5d7935ba6d371012187dc4 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 17 May 2019 19:02:33 -0400
Subject: [PATCH 0430/1648] create eosio::chain::intrinsic_debug_log

Add new suite of unit tests (intrinsic_debug_log_tests) to test the
intrinsic_debug_log. For now there is only one basic test.
---
 libraries/chain/CMakeLists.txt                |   1 +
 .../eosio/chain/intrinsic_debug_log.hpp       |  46 ++++
 libraries/chain/intrinsic_debug_log.cpp       | 232 ++++++++++++++++++
 unittests/intrinsic_debug_log_tests.cpp       |  58 +++++
 4 files changed, 337 insertions(+)
 create mode 100644 libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
 create mode 100644 libraries/chain/intrinsic_debug_log.cpp
 create mode 100644 unittests/intrinsic_debug_log_tests.cpp

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 254d462c5ed..75b5cb18dea 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -52,6 +52,7 @@ add_library( eosio_chain
              genesis_intrinsics.cpp
              whitelisted_intrinsics.cpp
              thread_utils.cpp
+             intrinsic_debug_log.cpp
              ${HEADERS}
              )
 
diff --git a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
new file mode 100644
index 00000000000..be49c063761
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
@@ -0,0 +1,46 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#pragma once
+
+#include <eosio/chain/types.hpp>
+
+namespace boost {
+   namespace filesystem {
+      class path;
+   }
+}
+
+namespace eosio { namespace chain {
+
+   namespace detail { class intrinsic_debug_log_impl; }
+
+   class intrinsic_debug_log {
+      public:
+         intrinsic_debug_log( const boost::filesystem::path& log_path );
+         intrinsic_debug_log( intrinsic_debug_log&& other );
+         ~intrinsic_debug_log();
+
+         enum class open_mode {
+            read_only,
+            create_new,
+            continue_existing
+         };
+
+         void open( open_mode mode = open_mode::continue_existing );
+         void close();
+         void flush();
+
+         void start_block( uint32_t block_num );
+         void start_transaction( const transaction_id_type& trx_id );
+         void start_action( uint64_t global_sequence_num );
+         void acknowledge_intrinsic_without_recording();
+         void record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash );
+         void finish_block();
+
+      private:
+         std::unique_ptr<detail::intrinsic_debug_log_impl> my;
+   };
+
+} }
diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
new file mode 100644
index 00000000000..2a08b92f83b
--- /dev/null
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -0,0 +1,232 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#include <eosio/chain/intrinsic_debug_log.hpp>
+#include <eosio/chain/exceptions.hpp>
+#include <fc/io/raw.hpp>
+#include <fstream>
+#include <boost/filesystem.hpp>
+
+namespace bfs = boost::filesystem;
+
+namespace eosio { namespace chain {
+
+   namespace detail {
+      class intrinsic_debug_log_impl {
+         public:
+            enum class state_t {
+               closed,
+               read_only,
+               waiting_to_start_block,
+               in_block,
+               in_transaction,
+               in_action
+            };
+
+            static const uint8_t block_tag       = 0;
+            static const uint8_t transaction_tag = 1;
+            static const uint8_t action_tag      = 2;
+            static const uint8_t intrinsic_tag   = 3;
+
+            std::fstream             log;
+            bfs::path                log_path;
+            state_t                  state = state_t::closed;
+            uint64_t                 last_commited_block_pos = 0;
+            uint64_t                 most_recent_block_pos = 0;
+            uint32_t                 most_recent_block_num = 0;
+            uint32_t                 intrinsic_counter = 0;
+            bool                     written_start_block = false;
+
+            void open( bool read_only, bool start_fresh );
+            void close();
+
+            void start_block( uint32_t block_num );
+            void ensure_block_start_written();
+            void finish_block();
+      };
+
+      void intrinsic_debug_log_impl::open( bool read_only, bool start_fresh ) {
+         FC_ASSERT( !log.is_open(), "cannot open when the log is already open" );
+         FC_ASSERT( state == state_t::closed, "state out of sync" );
+
+         std::ios_base::openmode open_mode = std::ios::in | std::ios::binary;
+
+         if( !read_only ) {
+            open_mode |= (std::ios::out | std::ios::app);
+         } else {
+            FC_ASSERT( !start_fresh, "start_fresh cannot be true in read-only mode" );
+         }
+
+         if( start_fresh ) {
+            open_mode |= std::ios::trunc;
+         }
+
+         log.open( log_path.generic_string().c_str(), open_mode );
+         state = state_t::waiting_to_start_block;
+
+         log.seekg( 0, std::ios::end );
+         auto file_size = log.tellg();
+         if( file_size > 0 ) {
+            log.seekg( -sizeof(last_commited_block_pos), std::ios::end );
+            log.read( (char*)&last_commited_block_pos, sizeof(last_commited_block_pos) );
+            FC_ASSERT( last_commited_block_pos < file_size, "corrupted log: invalid block pos" );
+            most_recent_block_pos = last_commited_block_pos;
+
+            log.seekg( last_commited_block_pos, std::ios::beg	);
+            uint8_t tag = 0;
+            log.read( (char*)&tag, sizeof(tag) );
+            FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
+
+            log.read( (char*)&most_recent_block_num, sizeof(most_recent_block_num) );
+         }
+         log.seekg( 0, std::ios::beg );
+      }
+
+      void intrinsic_debug_log_impl::close() {
+         if( !log.is_open() ) return;
+         FC_ASSERT( state != state_t::closed, "state out of sync" );
+
+         log.flush();
+         log.close();
+         if( state != state_t::waiting_to_start_block ) {
+            bfs::resize_file( log_path, last_commited_block_pos );
+         }
+         state = state_t::closed;
+         intrinsic_counter = 0;
+         written_start_block = false;
+      }
+
+      void intrinsic_debug_log_impl::start_block( uint32_t block_num  ) {
+         FC_ASSERT( state == state_t::waiting_to_start_block, "cannot start block while still processing a block" );
+         FC_ASSERT( most_recent_block_num < block_num,
+                    "must start a block with greater height than previously started blocks" );
+
+         state = state_t::in_block;
+         most_recent_block_pos = log.tellg();
+         most_recent_block_num = block_num;
+      }
+
+      void intrinsic_debug_log_impl::ensure_block_start_written() {
+         if( written_start_block ) return;
+         FC_ASSERT( state == state_t::in_block, "called while in invalid state" );
+         log.put( block_tag );
+         log.write( (char*)&most_recent_block_num, sizeof(most_recent_block_num) );
+         written_start_block = true;
+      }
+
+      void intrinsic_debug_log_impl::finish_block() {
+         if( written_start_block ) {
+            log.put( block_tag );
+            log.write( (char*)&most_recent_block_pos, sizeof(most_recent_block_pos) );
+         }
+         state = state_t::waiting_to_start_block;
+         intrinsic_counter = 0;
+         written_start_block = false;
+      }
+   }
+
+   intrinsic_debug_log::intrinsic_debug_log( const bfs::path& log_path )
+   :my( new detail::intrinsic_debug_log_impl() ) {
+      my->log_path = log_path;
+      my->log.exceptions( std::fstream::failbit | std::fstream::badbit );
+   }
+
+   intrinsic_debug_log::intrinsic_debug_log( intrinsic_debug_log&& other) {
+      my = std::move(other.my);
+   }
+
+   intrinsic_debug_log::~intrinsic_debug_log() {
+      if( my ) {
+         my->close();
+         my.reset();
+      }
+   }
+
+   void intrinsic_debug_log::open( open_mode mode ) {
+      bool read_only = (mode == open_mode::read_only);
+      my->open( read_only, ( read_only ? false : (mode == open_mode::create_new) ) );
+   }
+
+   void intrinsic_debug_log::close() {
+      my->close();
+   }
+
+   void intrinsic_debug_log::flush() {
+      my->log.flush();
+   }
+
+   void intrinsic_debug_log::start_block( uint32_t block_num ) {
+      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
+                 "invalid operation in read-only mode" );
+      my->start_block( block_num );
+   }
+
+   void intrinsic_debug_log::finish_block() {
+      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
+                 "invalid operation in read-only mode" );
+      my->finish_block();
+   }
+
+   void intrinsic_debug_log::start_transaction( const transaction_id_type& trx_id ) {
+      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
+                 "invalid operation in read-only mode" );
+      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::closed
+                 && my->state != detail::intrinsic_debug_log_impl::state_t::waiting_to_start_block,
+                 "cannot start transaction in the current state" );
+
+      char buffer[32];
+      fc::datastream<char*> ds( buffer, sizeof(buffer) );
+      fc::raw::pack(ds, trx_id);
+      FC_ASSERT( !ds.remaining(), "unexpected size for transaction id" );
+
+      my->ensure_block_start_written();
+      my->log.put( detail::intrinsic_debug_log_impl::transaction_tag );
+      my->log.write( buffer, sizeof(buffer) );
+
+      my->state = detail::intrinsic_debug_log_impl::state_t::in_transaction;
+      my->intrinsic_counter = 0;
+   }
+
+   void intrinsic_debug_log::start_action( uint64_t global_sequence_num ) {
+      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
+                 "invalid operation in read-only mode" );
+      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::in_transaction
+                 || my->state == detail::intrinsic_debug_log_impl::state_t::in_action,
+                 "cannot start action in the current state" );
+
+      my->log.put( detail::intrinsic_debug_log_impl::action_tag );
+      my->log.write( (char*)&global_sequence_num, sizeof(global_sequence_num) );
+
+      my->state = detail::intrinsic_debug_log_impl::state_t::in_action;
+      my->intrinsic_counter = 0;
+   }
+
+   void intrinsic_debug_log::acknowledge_intrinsic_without_recording() {
+      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
+                 "invalid operation in read-only mode" );
+      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::in_action,
+                 "can only acknowledge intrinsic within action state" );
+      ++(my->intrinsic_counter);
+   }
+
+   void intrinsic_debug_log::record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash ) {
+      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
+                 "invalid operation in read-only mode" );
+      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::in_action,
+                 "can only record intrinsic within action state" );
+
+      char buffer[64];
+      fc::datastream<char*> ds( buffer, sizeof(buffer) );
+      fc::raw::pack(ds, arguments_hash);
+      fc::raw::pack(ds, memory_hash);
+      FC_ASSERT( !ds.remaining(), "unexpected size for digest" );
+
+      my->log.put( detail::intrinsic_debug_log_impl::intrinsic_tag );
+      my->log.write( (char*)&my->intrinsic_counter, sizeof(my->intrinsic_counter) );
+      my->log.write( buffer, sizeof(buffer) );
+
+      ++(my->intrinsic_counter);
+   }
+
+} } /// eosio::chain
diff --git a/unittests/intrinsic_debug_log_tests.cpp b/unittests/intrinsic_debug_log_tests.cpp
new file mode 100644
index 00000000000..598bc1e0ca4
--- /dev/null
+++ b/unittests/intrinsic_debug_log_tests.cpp
@@ -0,0 +1,58 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#include <eosio/chain/intrinsic_debug_log.hpp>
+
+#include <fc/filesystem.hpp>
+#include <fstream>
+#include <boost/test/unit_test.hpp>
+
+using namespace eosio;
+using namespace chain;
+
+BOOST_AUTO_TEST_SUITE(intrinsic_debug_log_tests)
+
+BOOST_AUTO_TEST_CASE(basic_test) {
+   fc::temp_directory  tempdir;
+   auto log_path = tempdir.path() / "intrinsic.log";
+   {
+      intrinsic_debug_log log( log_path );
+      log.open();
+
+      log.start_block( 2u );
+      log.start_transaction( transaction_id_type() );
+      log.start_action( 1ull );
+      log.acknowledge_intrinsic_without_recording();
+
+      auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
+
+      log.record_intrinsic( digest, digest );
+      log.finish_block();
+      log.close();
+   }
+
+   std::fstream log_stream( log_path.generic_string().c_str(), std::ios::in | std::ios::binary );
+   log_stream.seekg( 0, std::ios::end );
+   std::size_t file_size = log_stream.tellg();
+   log_stream.seekg( 0, std::ios::beg );
+
+   vector<char> buffer( file_size );
+   log_stream.read( buffer.data(), file_size );
+   log_stream.close();
+
+   const char* expected =
+      "00" "02000000" // start of block 2
+      "01" "0000000000000000000000000000000000000000000000000000000000000000" // start of transaction
+      "02" "0100000000000000" // start of action with global sequence number of 1
+      "03"                                                            // recording an intrinsic with:
+      "01000000"                                                          // an ordinal of 1,
+      "0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20"  // this arguments hash,
+      "0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20"  // and this WASM lineary memory hash.
+      "00" "0000000000000000" // end of the block with pointer to position of the start of the block
+   ;
+
+   BOOST_CHECK_EQUAL( fc::to_hex( buffer ), expected );
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From bc1fe81b94465d496d7e17a311810c0c0a1b9e74 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 17 May 2019 22:42:10 -0400
Subject: [PATCH 0431/1648] add support for iterating through the blocks
 tracked by intrinsic_debug_log

---
 .../eosio/chain/intrinsic_debug_log.hpp       |  96 ++++++++-
 libraries/chain/intrinsic_debug_log.cpp       | 199 +++++++++++++++++-
 unittests/intrinsic_debug_log_tests.cpp       |  73 ++++++-
 3 files changed, 355 insertions(+), 13 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
index be49c063761..76c0f1ebf9c 100644
--- a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
+++ b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <eosio/chain/types.hpp>
+#include <iterator>
 
 namespace boost {
    namespace filesystem {
@@ -14,7 +15,10 @@ namespace boost {
 
 namespace eosio { namespace chain {
 
-   namespace detail { class intrinsic_debug_log_impl; }
+   namespace detail {
+      struct extended_block_data;
+      class intrinsic_debug_log_impl;
+   }
 
    class intrinsic_debug_log {
       public:
@@ -29,9 +33,11 @@ namespace eosio { namespace chain {
          };
 
          void open( open_mode mode = open_mode::continue_existing );
-         void close();
          void flush();
 
+         /** invalidates all block_iterators */
+         void close();
+
          void start_block( uint32_t block_num );
          void start_transaction( const transaction_id_type& trx_id );
          void start_action( uint64_t global_sequence_num );
@@ -39,8 +45,94 @@ namespace eosio { namespace chain {
          void record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash );
          void finish_block();
 
+         struct intrinsic_record {
+            uint32_t                        intrinsic_ordinal = 0;
+            digest_type                     arguments_hash;
+            digest_type                     memory_hash;
+         };
+
+         struct action_data {
+            uint64_t                        global_sequence_num = 0;
+            std::vector< intrinsic_record > recorded_intrinsics;
+         };
+
+         struct transaction_data {
+            transaction_id_type             trx_id;
+            std::vector< action_data >      actions;
+         };
+
+         struct block_data {
+            uint32_t                        block_num = 0;
+            std::vector< transaction_data > transactions;
+         };
+
+         class block_iterator : public std::iterator<std::bidirectional_iterator_tag, const block_data> {
+         protected:
+            detail::intrinsic_debug_log_impl*           _log = nullptr;
+            int64_t                                     _pos = -1;
+            mutable const detail::extended_block_data*  _cached_block_data = nullptr;
+
+         protected:
+            explicit block_iterator( detail::intrinsic_debug_log_impl* log, int64_t pos = -1 )
+            :_log(log)
+            ,_pos(pos)
+            {}
+
+            const block_data* get_pointer()const;
+
+            friend class intrinsic_debug_log;
+
+         public:
+            block_iterator() = default;
+
+            friend bool operator == ( const block_iterator& lhs, const block_iterator& rhs ) {
+               return std::tie( lhs._log, lhs._pos ) == std::tie( rhs._log, rhs._pos );
+            }
+
+            friend bool operator != ( const block_iterator& lhs, const block_iterator& rhs ) {
+               return !(lhs == rhs);
+            }
+
+            const block_data& operator*()const {
+               return *get_pointer();
+            }
+
+            const block_data* operator->()const {
+               return get_pointer();
+            }
+
+            block_iterator& operator++();
+
+            block_iterator& operator--();
+
+            block_iterator operator++(int) {
+               block_iterator result(*this);
+               ++(*this);
+               return result;
+            }
+
+            block_iterator operator--(int) {
+               block_iterator result(*this);
+               --(*this);
+               return result;
+            }
+         };
+
+         using block_reverse_iterator = std::reverse_iterator<block_iterator>;
+
+         // the four begin/end functions below can only be called in read-only mode
+         block_iterator begin_block()const;
+         block_iterator end_block()const;
+         block_reverse_iterator rbegin_block()const { return std::make_reverse_iterator( begin_block() ); }
+         block_reverse_iterator rend_blocks()const   { return std::make_reverse_iterator( end_block() ); }
+
       private:
          std::unique_ptr<detail::intrinsic_debug_log_impl> my;
    };
 
 } }
+
+FC_REFLECT( eosio::chain::intrinsic_debug_log::intrinsic_record, (intrinsic_ordinal)(arguments_hash)(memory_hash) )
+FC_REFLECT( eosio::chain::intrinsic_debug_log::action_data, (global_sequence_num)(recorded_intrinsics) )
+FC_REFLECT( eosio::chain::intrinsic_debug_log::transaction_data, (trx_id)(actions) )
+FC_REFLECT( eosio::chain::intrinsic_debug_log::block_data, (block_num)(transactions) )
diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
index 2a08b92f83b..158e6c51649 100644
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -6,6 +6,7 @@
 #include <eosio/chain/exceptions.hpp>
 #include <fc/io/raw.hpp>
 #include <fstream>
+#include <map>
 #include <boost/filesystem.hpp>
 
 namespace bfs = boost::filesystem;
@@ -13,6 +14,21 @@ namespace bfs = boost::filesystem;
 namespace eosio { namespace chain {
 
    namespace detail {
+      struct extended_block_data {
+         extended_block_data( intrinsic_debug_log::block_data&& block_data,
+                              int64_t pos, int64_t previous_pos, int64_t next_pos )
+         :block_data( std::move(block_data) )
+         ,pos( pos )
+         ,previous_pos( previous_pos )
+         ,next_pos( next_pos )
+         {}
+
+         intrinsic_debug_log::block_data block_data;
+         int64_t pos; //< pos should never be negative
+         int64_t previous_pos; //< if previous_pos is -1, then this is first block in the log
+         int64_t next_pos; //< if next_pos is -1, then this is the last block in the log
+      };
+
       class intrinsic_debug_log_impl {
          public:
             enum class state_t {
@@ -31,7 +47,9 @@ namespace eosio { namespace chain {
 
             std::fstream             log;
             bfs::path                log_path;
+            std::map<uint64_t, extended_block_data> block_data_cache;
             state_t                  state = state_t::closed;
+            int64_t                  file_size = -1;
             uint64_t                 last_commited_block_pos = 0;
             uint64_t                 most_recent_block_pos = 0;
             uint32_t                 most_recent_block_num = 0;
@@ -44,6 +62,9 @@ namespace eosio { namespace chain {
             void start_block( uint32_t block_num );
             void ensure_block_start_written();
             void finish_block();
+
+            int64_t get_position_of_previous_block( int64_t pos );
+            const extended_block_data& get_block_at_position( int64_t pos );
       };
 
       void intrinsic_debug_log_impl::open( bool read_only, bool start_fresh ) {
@@ -63,14 +84,14 @@ namespace eosio { namespace chain {
          }
 
          log.open( log_path.generic_string().c_str(), open_mode );
-         state = state_t::waiting_to_start_block;
+         state = (read_only ? state_t::read_only : state_t::waiting_to_start_block);
 
          log.seekg( 0, std::ios::end );
-         auto file_size = log.tellg();
+         file_size = log.tellg();
          if( file_size > 0 ) {
             log.seekg( -sizeof(last_commited_block_pos), std::ios::end );
             log.read( (char*)&last_commited_block_pos, sizeof(last_commited_block_pos) );
-            FC_ASSERT( last_commited_block_pos < file_size, "corrupted log: invalid block pos" );
+            FC_ASSERT( last_commited_block_pos < file_size, "corrupted log: invalid block position" );
             most_recent_block_pos = last_commited_block_pos;
 
             log.seekg( last_commited_block_pos, std::ios::beg	);
@@ -89,12 +110,15 @@ namespace eosio { namespace chain {
 
          log.flush();
          log.close();
-         if( state != state_t::waiting_to_start_block ) {
+         if( state != state_t::read_only && state != state_t::waiting_to_start_block ) {
             bfs::resize_file( log_path, last_commited_block_pos );
          }
          state = state_t::closed;
          intrinsic_counter = 0;
          written_start_block = false;
+         file_size = -1;
+
+         block_data_cache.clear();
       }
 
       void intrinsic_debug_log_impl::start_block( uint32_t block_num  ) {
@@ -124,6 +148,106 @@ namespace eosio { namespace chain {
          intrinsic_counter = 0;
          written_start_block = false;
       }
+
+      int64_t intrinsic_debug_log_impl::get_position_of_previous_block( int64_t pos ) {
+         int64_t previous_pos = -1;
+         if( pos > sizeof(last_commited_block_pos) ) {
+            decltype(last_commited_block_pos) read_pos{};
+            log.seekg( pos - sizeof(read_pos), std::ios::beg );
+            log.read( (char*)&read_pos, sizeof(read_pos) );
+            FC_ASSERT( read_pos < log.tellg(), "corrupted log: invalid block position" );
+            previous_pos = read_pos;
+         }
+         return previous_pos;
+      }
+
+      const extended_block_data& intrinsic_debug_log_impl::get_block_at_position( int64_t pos ) {
+         FC_ASSERT( state == state_t::read_only, "only allowed in read-only mode" );
+         FC_ASSERT( 0 <= pos && pos < file_size, "position is out of bounds" );
+
+         auto itr = block_data_cache.find( static_cast<uint64_t>(pos) );
+         if( itr != block_data_cache.end() ) return itr->second;
+
+         int64_t previous_pos = get_position_of_previous_block( pos );
+         log.seekg( pos, std::ios::beg );
+
+         intrinsic_debug_log::block_data block_data;
+
+         // Read all data for the current block.
+         {
+            uint8_t tag = 0;
+            log.read( (char*)&tag, sizeof(tag) );
+            FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
+            log.read( (char*)&block_data.block_num, sizeof(block_data.block_num) );
+
+            bool in_transaction = false;
+            bool in_action      = false;
+            uint64_t minimum_accepted_global_sequence_num = 0;
+
+            for(;;) {
+               log.read( (char*)&tag, sizeof(tag) );
+               if( tag == block_tag ) {
+                  decltype(last_commited_block_pos) read_pos{};
+                  log.read( (char*)&read_pos, sizeof(read_pos) );
+                  FC_ASSERT( read_pos == pos, "corrupted log: block position did not match" );
+                  break;
+               } else if( tag == transaction_tag ) {
+                  char buffer[32];
+                  log.read( buffer, sizeof(buffer) );
+                  fc::datastream<char*> ds( buffer, sizeof(buffer) );
+                  block_data.transactions.emplace_back();
+                  fc::raw::unpack( ds, block_data.transactions.back().trx_id );
+                  in_transaction = true;
+                  in_action      = false;
+               } else if( tag == action_tag ) {
+                  FC_ASSERT( in_transaction, "corrupted log: no start of transaction before encountering action tag");
+                  uint64_t global_sequence_num = 0;
+                  log.read( (char*)&global_sequence_num, sizeof(global_sequence_num) );
+                  FC_ASSERT( global_sequence_num >= minimum_accepted_global_sequence_num,
+                             "corrupted log: global sequence numbers of actions within a block are not monotonically increasing"
+                  );
+                  block_data.transactions.back().actions.emplace_back();
+                  auto& act = block_data.transactions.back().actions.back();
+                  act.global_sequence_num = global_sequence_num;
+                  in_action = true;
+                  minimum_accepted_global_sequence_num = global_sequence_num + 1;
+               } else if( tag == intrinsic_tag ) {
+                  FC_ASSERT( in_action, "corrupted log: no start of action before encountering intrinsic tag");
+                  auto& intrinsics = block_data.transactions.back().actions.back().recorded_intrinsics;
+                  uint32_t minimum_accepted_ordinal = 0;
+                  if( intrinsics.size() > 0 ) {
+                     minimum_accepted_ordinal = intrinsics.back().intrinsic_ordinal + 1;
+                  }
+                  uint32_t ordinal = 0;
+                  log.read( (char*)&ordinal, sizeof(ordinal) );
+                  FC_ASSERT( ordinal >= minimum_accepted_ordinal,
+                             "corrupted log: intrinsic ordinals within an action are not monotonically increasing" );
+                  char buffer[64];
+                  log.read( buffer, sizeof(buffer) );
+                  fc::datastream<char*> ds( buffer, sizeof(buffer) );
+                  intrinsics.emplace_back();
+                  auto& intrinsic = intrinsics.back();
+                  intrinsic.intrinsic_ordinal = ordinal;
+                  fc::raw::unpack( ds, intrinsic.arguments_hash );
+                  fc::raw::unpack( ds, intrinsic.memory_hash );
+               } else {
+                  FC_ASSERT( false, "corrupted log: unrecognized tag" );
+               }
+            }
+
+            FC_ASSERT( block_data.transactions.size() > 0, "corrupted log: empty block included" );
+         }
+
+         int64_t next_pos = -1;
+         if( log.tellg() < file_size ) next_pos = log.tellg();
+
+         auto res = block_data_cache.emplace(
+                        std::piecewise_construct,
+                        std::forward_as_tuple( static_cast<uint64_t>(pos) ),
+                        std::forward_as_tuple( std::move(block_data), pos, previous_pos, next_pos )
+         );
+         return res.first->second;
+      }
    }
 
    intrinsic_debug_log::intrinsic_debug_log( const bfs::path& log_path )
@@ -177,7 +301,7 @@ namespace eosio { namespace chain {
 
       char buffer[32];
       fc::datastream<char*> ds( buffer, sizeof(buffer) );
-      fc::raw::pack(ds, trx_id);
+      fc::raw::pack( ds, trx_id );
       FC_ASSERT( !ds.remaining(), "unexpected size for transaction id" );
 
       my->ensure_block_start_written();
@@ -218,8 +342,8 @@ namespace eosio { namespace chain {
 
       char buffer[64];
       fc::datastream<char*> ds( buffer, sizeof(buffer) );
-      fc::raw::pack(ds, arguments_hash);
-      fc::raw::pack(ds, memory_hash);
+      fc::raw::pack( ds, arguments_hash );
+      fc::raw::pack( ds, memory_hash );
       FC_ASSERT( !ds.remaining(), "unexpected size for digest" );
 
       my->log.put( detail::intrinsic_debug_log_impl::intrinsic_tag );
@@ -229,4 +353,65 @@ namespace eosio { namespace chain {
       ++(my->intrinsic_counter);
    }
 
+   intrinsic_debug_log::block_iterator intrinsic_debug_log::begin_block()const {
+      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::read_only,
+                 "block_begin is only allowed in read-only mode" );
+      return block_iterator( my.get(), (my->last_commited_block_pos == 0ull ? -1ll : 0ll) );
+   }
+
+   intrinsic_debug_log::block_iterator intrinsic_debug_log::end_block()const {
+      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::read_only,
+                 "block_end is only allowed in read-only mode" );
+      return block_iterator( my.get() );
+   }
+
+   const intrinsic_debug_log::block_data* intrinsic_debug_log::block_iterator::get_pointer()const {
+      FC_ASSERT( _log, "cannot dereference default constructed block iterator" );
+      FC_ASSERT( _pos >= 0, "cannot dereference an end block iterator" );
+
+      if( !_cached_block_data ) {
+         _cached_block_data = &_log->get_block_at_position( _pos );
+      }
+
+      return &(_cached_block_data->block_data);
+
+   }
+
+   intrinsic_debug_log::block_iterator& intrinsic_debug_log::block_iterator::operator++() {
+      FC_ASSERT( _log, "cannot increment default constructed block iterator" );
+      FC_ASSERT( _pos >= 0, "cannot increment end block iterator" );
+
+      if( !_cached_block_data ) {
+         _cached_block_data = &_log->get_block_at_position( _pos );
+      }
+
+      _pos = _cached_block_data->next_pos;
+      _cached_block_data = nullptr;
+
+      return *this;
+   }
+
+   intrinsic_debug_log::block_iterator& intrinsic_debug_log::block_iterator::operator--() {
+      FC_ASSERT( _log, "cannot decrement default constructed block iterator" );
+
+      if( _pos < 0 ) {
+         FC_ASSERT( !_cached_block_data, "invariant failure" );
+         FC_ASSERT( _log->file_size > 0, "cannot decrement end block iterator when the log contains no blocks" );
+         _pos = static_cast<int64_t>( _log->last_commited_block_pos );
+         return *this;
+      }
+
+      int64_t prev_pos = -1;
+      if( _cached_block_data ) {
+         prev_pos = _cached_block_data->previous_pos;
+      } else {
+         prev_pos = _log->get_position_of_previous_block( _pos );
+      }
+
+      FC_ASSERT( prev_pos >= 0, "cannot decrement begin block iterator" );
+      _pos = prev_pos;
+      _cached_block_data = nullptr;
+      return *this;
+   }
+
 } } /// eosio::chain
diff --git a/unittests/intrinsic_debug_log_tests.cpp b/unittests/intrinsic_debug_log_tests.cpp
index 598bc1e0ca4..fb935ae7455 100644
--- a/unittests/intrinsic_debug_log_tests.cpp
+++ b/unittests/intrinsic_debug_log_tests.cpp
@@ -5,6 +5,7 @@
 #include <eosio/chain/intrinsic_debug_log.hpp>
 
 #include <fc/filesystem.hpp>
+#include <fc/io/json.hpp>
 #include <fstream>
 #include <boost/test/unit_test.hpp>
 
@@ -17,16 +18,13 @@ BOOST_AUTO_TEST_CASE(basic_test) {
    fc::temp_directory  tempdir;
    auto log_path = tempdir.path() / "intrinsic.log";
    {
+      auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
       intrinsic_debug_log log( log_path );
       log.open();
-
       log.start_block( 2u );
       log.start_transaction( transaction_id_type() );
       log.start_action( 1ull );
       log.acknowledge_intrinsic_without_recording();
-
-      auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
-
       log.record_intrinsic( digest, digest );
       log.finish_block();
       log.close();
@@ -55,4 +53,71 @@ BOOST_AUTO_TEST_CASE(basic_test) {
    BOOST_CHECK_EQUAL( fc::to_hex( buffer ), expected );
 }
 
+BOOST_AUTO_TEST_CASE(iterate_test) {
+   fc::temp_directory  tempdir;
+   auto log_path = tempdir.path() / "intrinsic.log";
+   auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
+
+   intrinsic_debug_log log( log_path );
+   log.open();
+   log.start_block( 2u );
+   log.start_transaction( transaction_id_type() );
+   log.start_action( 1ull );
+   log.acknowledge_intrinsic_without_recording();
+   log.record_intrinsic( digest, digest );
+   log.finish_block();
+   log.start_block( 4u );
+   log.start_transaction( transaction_id_type() );
+   log.start_transaction( transaction_id_type() );
+   log.start_action( 2ull );
+   log.record_intrinsic( digest, digest );
+   log.record_intrinsic( digest, digest );
+   log.start_action( 3ull );
+   log.finish_block();
+   log.close();
+
+   log.open( intrinsic_debug_log::open_mode::read_only );
+   std::vector< std::pair< uint32_t, uint32_t > > expected_blocks = {
+      {2u, 1u},
+      {4u, 2u}
+   };
+
+   {
+      auto block_itr = log.begin_block();
+      const auto block_end_itr = log.end_block();
+      for( auto itr = expected_blocks.begin(); block_itr != block_end_itr; ++block_itr, ++itr ) {
+         BOOST_REQUIRE( itr != expected_blocks.end() );
+         BOOST_CHECK_EQUAL( block_itr->block_num, itr->first );
+         BOOST_CHECK_EQUAL( block_itr->transactions.size(), itr->second );
+         wdump( (fc::json::to_pretty_string(*block_itr)) );
+      }
+
+      for( auto itr = expected_blocks.rbegin(); itr != expected_blocks.rend(); ++itr ) {
+         --block_itr;
+         BOOST_CHECK_EQUAL( block_itr->block_num, itr->first );
+         BOOST_CHECK_EQUAL( block_itr->transactions.size(), itr->second );
+      }
+      log.close(); // invalidates block_itr;
+   }
+
+   log.open( intrinsic_debug_log::open_mode::read_only );
+   {
+      auto block_itr = log.end_block();
+      --block_itr;
+      auto itr = expected_blocks.rbegin();
+      for( ; itr != expected_blocks.rend() && itr->first > 3u; ++itr ) {
+         --block_itr;
+         // Avoid dereferencing block_itr to not read block and add to cache.
+      }
+
+      BOOST_REQUIRE( itr != expected_blocks.rend() );
+      BOOST_REQUIRE_EQUAL( itr->first, 2u ); // ensure we are at the expected block
+
+      // block_itr should also be point to a valid block (the same one with a block height of 2).
+      // However, it hasn't been cached yet since we have not yet dereferenced it.
+
+      BOOST_REQUIRE_EQUAL( block_itr->block_num, 2u );
+   }
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From dbabba6061bc5cce59962e85d1e489c03e83aeb8 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 17 May 2019 22:59:02 -0400
Subject: [PATCH 0432/1648] add receiver, first_receiver, and action_name to
 logged action_data

---
 .../eosio/chain/intrinsic_debug_log.hpp       |  9 +++++++--
 libraries/chain/intrinsic_debug_log.cpp       | 12 +++++++++--
 unittests/intrinsic_debug_log_tests.cpp       | 20 ++++++++++++++-----
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
index 76c0f1ebf9c..0d30c0b1f80 100644
--- a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
+++ b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
@@ -40,7 +40,8 @@ namespace eosio { namespace chain {
 
          void start_block( uint32_t block_num );
          void start_transaction( const transaction_id_type& trx_id );
-         void start_action( uint64_t global_sequence_num );
+         void start_action( uint64_t global_sequence_num,
+                            name receiver, name first_receiver, name action_name );
          void acknowledge_intrinsic_without_recording();
          void record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash );
          void finish_block();
@@ -53,6 +54,9 @@ namespace eosio { namespace chain {
 
          struct action_data {
             uint64_t                        global_sequence_num = 0;
+            name                            receiver{};
+            name                            first_receiver{};
+            name                            action_name{};
             std::vector< intrinsic_record > recorded_intrinsics;
          };
 
@@ -133,6 +137,7 @@ namespace eosio { namespace chain {
 } }
 
 FC_REFLECT( eosio::chain::intrinsic_debug_log::intrinsic_record, (intrinsic_ordinal)(arguments_hash)(memory_hash) )
-FC_REFLECT( eosio::chain::intrinsic_debug_log::action_data, (global_sequence_num)(recorded_intrinsics) )
+FC_REFLECT( eosio::chain::intrinsic_debug_log::action_data,
+            (global_sequence_num)(receiver)(first_receiver)(action_name)(recorded_intrinsics) )
 FC_REFLECT( eosio::chain::intrinsic_debug_log::transaction_data, (trx_id)(actions) )
 FC_REFLECT( eosio::chain::intrinsic_debug_log::block_data, (block_num)(transactions) )
diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
index 158e6c51649..56a427e600d 100644
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -209,6 +209,9 @@ namespace eosio { namespace chain {
                   block_data.transactions.back().actions.emplace_back();
                   auto& act = block_data.transactions.back().actions.back();
                   act.global_sequence_num = global_sequence_num;
+                  log.read( (char*)&act.receiver.value,        sizeof(act.receiver.value) );
+                  log.read( (char*)&act.first_receiver.value,  sizeof(act.first_receiver.value) );
+                  log.read( (char*)&act.action_name.value,     sizeof(act.action_name.value) );
                   in_action = true;
                   minimum_accepted_global_sequence_num = global_sequence_num + 1;
                } else if( tag == intrinsic_tag ) {
@@ -312,7 +315,9 @@ namespace eosio { namespace chain {
       my->intrinsic_counter = 0;
    }
 
-   void intrinsic_debug_log::start_action( uint64_t global_sequence_num ) {
+   void intrinsic_debug_log::start_action( uint64_t global_sequence_num,
+                                           name receiver, name first_receiver, name action_name )
+   {
       FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
                  "invalid operation in read-only mode" );
       FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::in_transaction
@@ -320,7 +325,10 @@ namespace eosio { namespace chain {
                  "cannot start action in the current state" );
 
       my->log.put( detail::intrinsic_debug_log_impl::action_tag );
-      my->log.write( (char*)&global_sequence_num, sizeof(global_sequence_num) );
+      my->log.write( (char*)&global_sequence_num,  sizeof(global_sequence_num) );
+      my->log.write( (char*)&receiver.value,       sizeof(receiver.value) );
+      my->log.write( (char*)&first_receiver.value, sizeof(first_receiver.value) );
+      my->log.write( (char*)&action_name.value,    sizeof(action_name.value) );
 
       my->state = detail::intrinsic_debug_log_impl::state_t::in_action;
       my->intrinsic_counter = 0;
diff --git a/unittests/intrinsic_debug_log_tests.cpp b/unittests/intrinsic_debug_log_tests.cpp
index fb935ae7455..9eb73b778d9 100644
--- a/unittests/intrinsic_debug_log_tests.cpp
+++ b/unittests/intrinsic_debug_log_tests.cpp
@@ -19,11 +19,13 @@ BOOST_AUTO_TEST_CASE(basic_test) {
    auto log_path = tempdir.path() / "intrinsic.log";
    {
       auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
+      name alice("alice");
+      name foo("foo");
       intrinsic_debug_log log( log_path );
       log.open();
       log.start_block( 2u );
       log.start_transaction( transaction_id_type() );
-      log.start_action( 1ull );
+      log.start_action( 1ull, alice, alice, foo );
       log.acknowledge_intrinsic_without_recording();
       log.record_intrinsic( digest, digest );
       log.finish_block();
@@ -42,7 +44,11 @@ BOOST_AUTO_TEST_CASE(basic_test) {
    const char* expected =
       "00" "02000000" // start of block 2
       "01" "0000000000000000000000000000000000000000000000000000000000000000" // start of transaction
-      "02" "0100000000000000" // start of action with global sequence number of 1
+      "02"            // start of action with:
+      "0100000000000000"  // global sequence number of 1,
+      "0000000000855c34"  // receiver "alice",
+      "0000000000855c34"  // first_receiver "alice",
+      "000000000000285d"  // and action_name "foo".
       "03"                                                            // recording an intrinsic with:
       "01000000"                                                          // an ordinal of 1,
       "0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20"  // this arguments hash,
@@ -57,22 +63,26 @@ BOOST_AUTO_TEST_CASE(iterate_test) {
    fc::temp_directory  tempdir;
    auto log_path = tempdir.path() / "intrinsic.log";
    auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
+   name alice("alice");
+   name bob("bob");
+   name foo("foo");
+   name bar("bar");
 
    intrinsic_debug_log log( log_path );
    log.open();
    log.start_block( 2u );
    log.start_transaction( transaction_id_type() );
-   log.start_action( 1ull );
+   log.start_action( 1ull, alice, alice, foo );
    log.acknowledge_intrinsic_without_recording();
    log.record_intrinsic( digest, digest );
    log.finish_block();
    log.start_block( 4u );
    log.start_transaction( transaction_id_type() );
    log.start_transaction( transaction_id_type() );
-   log.start_action( 2ull );
+   log.start_action( 2ull, alice, alice, bar );
    log.record_intrinsic( digest, digest );
    log.record_intrinsic( digest, digest );
-   log.start_action( 3ull );
+   log.start_action( 3ull, bob, alice, bar );
    log.finish_block();
    log.close();
 

From 2cebe4376a98063a461662fb8689f596ac800f7b Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Sat, 18 May 2019 00:44:38 -0400
Subject: [PATCH 0433/1648] add intrinsic_debug_log::find_first_difference

---
 .../eosio/chain/intrinsic_debug_log.hpp       |  38 +++++-
 libraries/chain/intrinsic_debug_log.cpp       | 118 ++++++++++++++++++
 unittests/intrinsic_debug_log_tests.cpp       |  63 ++++++++++
 3 files changed, 216 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
index 0d30c0b1f80..5ccdb486eac 100644
--- a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
+++ b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
@@ -50,6 +50,15 @@ namespace eosio { namespace chain {
             uint32_t                        intrinsic_ordinal = 0;
             digest_type                     arguments_hash;
             digest_type                     memory_hash;
+
+            friend bool operator == ( const intrinsic_record& lhs, const intrinsic_record& rhs ) {
+               return std::tie( lhs.intrinsic_ordinal, lhs.arguments_hash, lhs.memory_hash )
+                        == std::tie( rhs.intrinsic_ordinal, rhs.arguments_hash, rhs.memory_hash );
+            }
+
+            friend bool operator != ( const intrinsic_record& lhs, const intrinsic_record& rhs ) {
+               return !(lhs == rhs);
+            }
          };
 
          struct action_data {
@@ -57,7 +66,7 @@ namespace eosio { namespace chain {
             name                            receiver{};
             name                            first_receiver{};
             name                            action_name{};
-            std::vector< intrinsic_record > recorded_intrinsics;
+            std::vector<intrinsic_record>   recorded_intrinsics;
          };
 
          struct transaction_data {
@@ -67,7 +76,7 @@ namespace eosio { namespace chain {
 
          struct block_data {
             uint32_t                        block_num = 0;
-            std::vector< transaction_data > transactions;
+            std::vector<transaction_data>   transactions;
          };
 
          class block_iterator : public std::iterator<std::bidirectional_iterator_tag, const block_data> {
@@ -130,6 +139,24 @@ namespace eosio { namespace chain {
          block_reverse_iterator rbegin_block()const { return std::make_reverse_iterator( begin_block() ); }
          block_reverse_iterator rend_blocks()const   { return std::make_reverse_iterator( end_block() ); }
 
+         struct intrinsic_differences {
+            uint32_t                        block_num = 0;
+            transaction_id_type             trx_id;
+            uint64_t                        global_sequence_num = 0;
+            name                            receiver{};
+            name                            first_receiver{};
+            name                            action_name{};
+            std::vector<intrinsic_record>   lhs_recorded_intrinsics;
+            std::vector<intrinsic_record>   rhs_recorded_intrinsics;
+         };
+
+         /**
+          * @pre requires both lhs and rhs to both have the same blocks, transactions, and actions (otherwise it throws)
+          * @return empty optional if no difference; otherwise the intrinsic_differences for the first different action
+          */
+         static std::optional<intrinsic_differences>
+         find_first_difference( intrinsic_debug_log& lhs, intrinsic_debug_log& rhs );
+
       private:
          std::unique_ptr<detail::intrinsic_debug_log_impl> my;
    };
@@ -138,6 +165,11 @@ namespace eosio { namespace chain {
 
 FC_REFLECT( eosio::chain::intrinsic_debug_log::intrinsic_record, (intrinsic_ordinal)(arguments_hash)(memory_hash) )
 FC_REFLECT( eosio::chain::intrinsic_debug_log::action_data,
-            (global_sequence_num)(receiver)(first_receiver)(action_name)(recorded_intrinsics) )
+            (global_sequence_num)(receiver)(first_receiver)(action_name)(recorded_intrinsics)
+)
 FC_REFLECT( eosio::chain::intrinsic_debug_log::transaction_data, (trx_id)(actions) )
 FC_REFLECT( eosio::chain::intrinsic_debug_log::block_data, (block_num)(transactions) )
+FC_REFLECT( eosio::chain::intrinsic_debug_log::intrinsic_differences,
+            (block_num)(trx_id)(global_sequence_num)(receiver)(first_receiver)(action_name)
+            (lhs_recorded_intrinsics)(rhs_recorded_intrinsics)
+)
diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
index 56a427e600d..68a583157fe 100644
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -5,6 +5,7 @@
 #include <eosio/chain/intrinsic_debug_log.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <fc/io/raw.hpp>
+#include <fc/scoped_exit.hpp>
 #include <fstream>
 #include <map>
 #include <boost/filesystem.hpp>
@@ -422,4 +423,121 @@ namespace eosio { namespace chain {
       return *this;
    }
 
+   std::optional<intrinsic_debug_log::intrinsic_differences>
+   intrinsic_debug_log::find_first_difference( intrinsic_debug_log& lhs, intrinsic_debug_log& rhs ) {
+      lhs.close();
+      rhs.close();
+      lhs.open( intrinsic_debug_log::open_mode::read_only );
+      rhs.open( intrinsic_debug_log::open_mode::read_only );
+
+      auto close_logs = fc::make_scoped_exit([&lhs, &rhs] {
+         lhs.close();
+         rhs.close();
+      });
+
+      enum class mismatch_t {
+         equivalent,
+         lhs_ended_early,
+         rhs_ended_early,
+         mismatch
+      };
+
+      auto find_if_mismatched = []( auto&& lhs_begin, auto&& lhs_end,
+                                    auto&& rhs_begin, auto&& rhs_end,
+                                    auto&& compare_equivalent ) -> mismatch_t
+      {
+         for( ; lhs_begin != lhs_end && rhs_begin != rhs_end; ++lhs_begin, ++rhs_begin ) {
+            const auto& lhs_value = *lhs_begin;
+            const auto& rhs_value = *rhs_begin;
+            if( compare_equivalent( lhs_value, rhs_value ) ) continue;
+            return mismatch_t::mismatch;
+         }
+
+         bool lhs_empty = (lhs_begin == lhs_end);
+         bool rhs_empty = (rhs_begin == rhs_end);
+         // lhs_empty and rhs_empty cannot both be false at this point since we exited the for loop.
+
+         if( lhs_empty && !rhs_empty ) return mismatch_t::lhs_ended_early;
+         if( !lhs_empty && rhs_empty ) return mismatch_t::rhs_ended_early;
+         return mismatch_t::equivalent;
+      };
+
+      std::optional<intrinsic_differences> result;
+      const char* error_msg = nullptr;
+
+      auto status = find_if_mismatched(
+         lhs.begin_block(), rhs.end_block(),
+         rhs.begin_block(), rhs.end_block(),
+         [&find_if_mismatched, &result, &error_msg]
+         ( const block_data& block_lhs, const block_data& block_rhs ) {
+            if( block_lhs.block_num != block_rhs.block_num ) {
+               error_msg = "logs do not have the same blocks";
+               return false;
+            }
+            auto status2 = find_if_mismatched(
+               block_lhs.transactions.begin(), block_lhs.transactions.end(),
+               block_rhs.transactions.begin(), block_rhs.transactions.end(),
+               [&find_if_mismatched, &result, &error_msg, &block_lhs]
+               ( const transaction_data& trx_lhs, const transaction_data& trx_rhs ) {
+                  if( trx_lhs.trx_id != trx_rhs.trx_id ) {
+                     return false;
+                  }
+                  auto status3 = find_if_mismatched(
+                     trx_lhs.actions.begin(), trx_lhs.actions.end(),
+                     trx_rhs.actions.begin(), trx_rhs.actions.end(),
+                     [&result, &block_lhs, &trx_lhs]
+                     ( const action_data& act_lhs, const action_data& act_rhs ) {
+                        if( std::tie( act_lhs.global_sequence_num,
+                                      act_lhs.receiver,
+                                      act_lhs.first_receiver,
+                                      act_lhs.action_name )
+                              != std::tie( act_rhs.global_sequence_num,
+                                           act_rhs.receiver,
+                                           act_rhs.first_receiver,
+                                           act_rhs.action_name )
+                        ) {
+                           return false;
+                        }
+                        if( act_lhs.recorded_intrinsics != act_rhs.recorded_intrinsics ) {
+                           result.emplace( intrinsic_differences{
+                              .block_num               = block_lhs.block_num,
+                              .trx_id                  = trx_lhs.trx_id,
+                              .global_sequence_num     = act_lhs.global_sequence_num,
+                              .receiver                = act_lhs.receiver,
+                              .first_receiver          = act_lhs.first_receiver,
+                              .action_name             = act_lhs.action_name,
+                              .lhs_recorded_intrinsics = act_lhs.recorded_intrinsics,
+                              .rhs_recorded_intrinsics = act_rhs.recorded_intrinsics
+                           } );
+                           return false;
+                        }
+                        return true;
+                     }
+                  );
+                  if( status3 == mismatch_t::equivalent ) return true;
+                  if( error_msg == nullptr && !result ) {
+                     error_msg = "different actions within a particular transaction";
+                  }
+                  return false;
+               }
+            );
+            if( status2 == mismatch_t::equivalent ) return true;
+            if( error_msg == nullptr && !result ) {
+               error_msg = "different transactions in a particular block";
+            }
+            return false;
+         }
+      );
+
+      if( status == mismatch_t::mismatch ) {
+         if( error_msg != nullptr ) {
+            FC_THROW_EXCEPTION( fc::exception, error_msg );
+         }
+         return result;
+      }
+
+      FC_ASSERT( status == mismatch_t::equivalent, "logs do not have the same blocks" );
+      return {}; // the logs are equivalent
+   }
+
 } } /// eosio::chain
diff --git a/unittests/intrinsic_debug_log_tests.cpp b/unittests/intrinsic_debug_log_tests.cpp
index 9eb73b778d9..05e20b527c7 100644
--- a/unittests/intrinsic_debug_log_tests.cpp
+++ b/unittests/intrinsic_debug_log_tests.cpp
@@ -130,4 +130,67 @@ BOOST_AUTO_TEST_CASE(iterate_test) {
    }
 }
 
+BOOST_AUTO_TEST_CASE(difference_test) {
+   fc::temp_directory  tempdir;
+   auto log1_path = tempdir.path() / "intrinsic1.log";
+   auto log2_path = tempdir.path() / "intrinsic2.log";
+   auto trx_id = fc::variant("0102030405060708090a0b0c0d0e0f100102030405060708090a0b0c0d0e0f10").as<transaction_id_type>();
+   auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
+   name alice("alice");
+   name bob("bob");
+   name foo("foo");
+   name bar("bar");
+
+   intrinsic_debug_log log1( log1_path );
+   {
+      log1.open();
+      log1.start_block( 2u );
+      log1.start_transaction( transaction_id_type() );
+      log1.start_action( 1ull, alice, alice, foo );
+      log1.acknowledge_intrinsic_without_recording();
+      log1.record_intrinsic( digest, digest );
+      log1.finish_block();
+      log1.start_block( 4u );
+      log1.start_transaction( trx_id );
+      log1.start_action( 2ull, alice, alice, bar );
+      log1.record_intrinsic( digest, digest );
+      log1.record_intrinsic( digest, digest );
+      log1.start_action( 3ull, bob, alice, bar );
+      log1.finish_block();
+      log1.close();
+   }
+
+   intrinsic_debug_log log2( log2_path );
+   {
+      log2.open();
+      log2.start_block( 2u );
+      log2.start_transaction( transaction_id_type() );
+      log2.start_action( 1ull, alice, alice, foo );
+      log2.acknowledge_intrinsic_without_recording();
+      log2.record_intrinsic( digest, digest );
+      log2.finish_block();
+      log2.start_block( 4u );
+      log2.start_transaction( trx_id );
+      log2.start_action( 2ull, alice, alice, bar );
+      log2.record_intrinsic( digest, digest );
+      log2.start_action( 3ull, bob, alice, bar );
+      log2.finish_block();
+      log2.close();
+   }
+
+   auto result = intrinsic_debug_log::find_first_difference( log1, log2 );
+   BOOST_REQUIRE( result.has_value() );
+
+   wdump( (fc::json::to_pretty_string(*result)) );
+
+   BOOST_CHECK_EQUAL( result->block_num, 4u );
+   BOOST_CHECK_EQUAL( result->trx_id, trx_id );
+   BOOST_CHECK_EQUAL( result->global_sequence_num, 2ull );
+   BOOST_CHECK_EQUAL( result->receiver.to_string(), "alice" );
+   BOOST_CHECK_EQUAL( result->first_receiver.to_string(), "alice" );
+   BOOST_CHECK_EQUAL( result->action_name.to_string(), "bar" );
+   BOOST_CHECK_EQUAL( result->lhs_recorded_intrinsics.size(), 2 );
+   BOOST_CHECK_EQUAL( result->rhs_recorded_intrinsics.size(), 1 );
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 83b96c461b4527fd384dd06727c55ce329f7206d Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Sat, 18 May 2019 12:00:47 -0400
Subject: [PATCH 0434/1648] initial integration of intrinsic_debug_log into
 controller

Added debug-log-intrinsics option to chain_plugin which, when enabled,
will create a intrinsics.log file in the data directory that logs
information of replayed blocks only.

Currently, deferred transaction logging is not fully supported. Also no
intrinsics records are yet logged.
---
 libraries/chain/apply_context.cpp             |  6 ++
 libraries/chain/controller.cpp                | 58 +++++++++++++++++++
 .../include/eosio/chain/apply_context.hpp     |  7 ++-
 .../chain/include/eosio/chain/controller.hpp  |  3 +
 .../eosio/chain/intrinsic_debug_log.hpp       |  3 +
 libraries/chain/intrinsic_debug_log.cpp       | 14 ++++-
 plugins/chain_plugin/chain_plugin.cpp         |  6 ++
 7 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index dc7687cf05c..ae3d6a09097 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -34,6 +34,7 @@ apply_context::apply_context(controller& con, transaction_context& trx_ctx, uint
 :control(con)
 ,db(con.mutable_db())
 ,trx_context(trx_ctx)
+,intrinsic_log(con.get_intrinsic_debug_log())
 ,recurse_depth(depth)
 ,first_receiver_action_ordinal(action_ordinal)
 ,action_ordinal(action_ordinal)
@@ -53,6 +54,11 @@ void apply_context::exec_one()
 {
    auto start = fc::time_point::now();
 
+   if( intrinsic_log ) {
+      intrinsic_log->start_action( control.get_dynamic_global_properties().global_action_sequence + 1,
+                                   receiver, act->account, act->name );
+   }
+
    action_receipt r;
    r.receiver         = receiver;
    r.act_digest       = digest_type::hash(*act);
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 8f2c2f2368d..349ea16c43f 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -23,6 +23,7 @@
 #include <eosio/chain/resource_limits.hpp>
 #include <eosio/chain/chain_snapshot.hpp>
 #include <eosio/chain/thread_utils.hpp>
+#include <eosio/chain/intrinsic_debug_log.hpp>
 
 #include <chainbase/chainbase.hpp>
 #include <fc/io/json.hpp>
@@ -211,6 +212,7 @@ struct controller_impl {
    chainbase::database            db;
    chainbase::database            reversible_blocks; ///< a special database to persist blocks that have successfully been applied but are still reversible
    block_log                      blog;
+   optional<intrinsic_debug_log>  intrinsic_log;
    optional<pending_state>        pending;
    block_state_ptr                head;
    fork_database                  fork_db;
@@ -292,6 +294,7 @@ struct controller_impl {
         cfg.read_only ? database::read_only : database::read_write,
         cfg.reversible_cache_size, false, cfg.db_map_mode, cfg.db_hugepage_paths ),
     blog( cfg.blocks_dir ),
+    intrinsic_log( cfg.intrinsic_debug_log_path ? *cfg.intrinsic_debug_log_path : optional<intrinsic_debug_log>() ),
     fork_db( cfg.state_dir ),
     wasmif( cfg.wasm_runtime, db ),
     resource_limits( db ),
@@ -309,6 +312,10 @@ struct controller_impl {
                            { check_protocol_features( timestamp, cur_features, new_features ); }
       );
 
+      if( intrinsic_log ) {
+         intrinsic_log->open();
+      }
+
       set_activation_handler<builtin_protocol_feature_t::preactivate_feature>();
       set_activation_handler<builtin_protocol_feature_t::replace_deferred>();
       set_activation_handler<builtin_protocol_feature_t::get_sender>();
@@ -594,6 +601,15 @@ struct controller_impl {
          db.undo();
       }
 
+      if( intrinsic_log && intrinsic_log->last_block_num() > 0 && head->block_num != intrinsic_log->last_block_num() ) {
+         wlog( "head block num (${head}) does not match last block in intrinsic.log (${last}): replacing intrinsic.log",
+               ("head", head->block_num)("last", intrinsic_log->last_block_num())
+         );
+         intrinsic_log->close();
+         fc::remove( intrinsic_log->get_path() );
+         intrinsic_log->open();
+      }
+
       protocol_features.init( db );
 
       const auto& rbi = reversible_blocks.get_index<reversible_block_index,by_num>();
@@ -663,6 +679,22 @@ struct controller_impl {
          replay( shutdown ); // replay any irreversible and reversible blocks ahead of current head
       }
 
+      if( intrinsic_log ) {
+         intrinsic_log->close();
+
+         /*
+         // Print intrinsic_log in JSON form
+         intrinsic_log->open( intrinsic_debug_log::open_mode::read_only );
+         const auto end_itr = intrinsic_log->end_block();
+         for( auto itr = intrinsic_log->begin_block(); itr != end_itr; ++itr ) {
+            dlog( "\n${json}", ("json", fc::json::to_pretty_string(*itr)) );
+         }
+         intrinsic_log->close();
+         */
+
+         intrinsic_log.reset();
+      }
+
       if( shutdown() ) return;
 
       if( read_mode != db_read_mode::IRREVERSIBLE
@@ -1084,6 +1116,9 @@ struct controller_impl {
 
       transaction_trace_ptr trace;
       if( gtrx.expiration < self.pending_block_time() ) {
+         if( intrinsic_log ) {
+            intrinsic_log->start_transaction( gtrx.trx_id );
+         }
          trace = std::make_shared<transaction_trace>();
          trace->id = gtrx.trx_id;
          trace->block_num = self.head_block_num() + 1;
@@ -1105,6 +1140,9 @@ struct controller_impl {
 
       uint32_t cpu_time_to_bill_us = billed_cpu_time_us;
 
+      // TODO: Figure out how to handle deferred transactions.
+      // It seems like I need to augment intrinsic_debug_log to support transaction level rollback.
+
       transaction_context trx_context( self, dtrx, gtrx.trx_id );
       trx_context.leeway =  fc::microseconds(0); // avoid stealing cpu resource
       trx_context.deadline = deadline;
@@ -1194,6 +1232,10 @@ struct controller_impl {
       if ( !subjective ) {
          // hard failure logic
 
+         if( intrinsic_log ) {
+            intrinsic_log->start_transaction( gtrx.trx_id );
+         }
+
          if( !explicit_billed_cpu_time ) {
             auto& rl = self.get_mutable_resource_limits_manager();
             rl.update_account_usage( trx_context.bill_to_accounts, block_timestamp_type(self.pending_block_time()).slot );
@@ -1274,6 +1316,9 @@ struct controller_impl {
 
          const signed_transaction& trn = trx->packed_trx()->get_signed_transaction();
          transaction_context trx_context(self, trn, trx->id(), start);
+         if( intrinsic_log ) {
+            intrinsic_log->start_transaction( trx_context.id );
+         }
          if ((bool)subjective_cpu_leeway && pending->_block_status == controller::block_status::incomplete) {
             trx_context.leeway = *subjective_cpu_leeway;
          }
@@ -1390,6 +1435,10 @@ struct controller_impl {
          pending.emplace( maybe_session(), *head, when, confirm_block_count, new_protocol_feature_activations );
       }
 
+      if( intrinsic_log ) {
+         intrinsic_log->start_block( head->block_num + 1 );
+      }
+
       pending->_block_status = s;
       pending->_producer_block_id = producer_block_id;
 
@@ -1521,6 +1570,10 @@ struct controller_impl {
 
       try {
 
+      if( intrinsic_log ) {
+         intrinsic_log->finish_block();
+      }
+
       auto& pbhs = pending->get_pending_block_header_state();
 
       // Update resource limits:
@@ -2224,6 +2277,11 @@ const protocol_feature_manager& controller::get_protocol_feature_manager()const
    return my->protocol_features;
 }
 
+optional<intrinsic_debug_log>&  controller::get_intrinsic_debug_log()
+{
+   return my->intrinsic_log;
+}
+
 controller::controller( const controller::config& cfg )
 :my( new controller_impl( cfg, *this, protocol_feature_set{} ) )
 {
diff --git a/libraries/chain/include/eosio/chain/apply_context.hpp b/libraries/chain/include/eosio/chain/apply_context.hpp
index ce7ae2bdae7..87af8500f82 100644
--- a/libraries/chain/include/eosio/chain/apply_context.hpp
+++ b/libraries/chain/include/eosio/chain/apply_context.hpp
@@ -559,9 +559,10 @@ class apply_context {
    /// Fields:
    public:
 
-      controller&                   control;
-      chainbase::database&          db;  ///< database where state is stored
-      transaction_context&          trx_context; ///< transaction context in which the action is running
+      controller&                     control;
+      chainbase::database&            db;  ///< database where state is stored
+      transaction_context&            trx_context; ///< transaction context in which the action is running
+      optional<intrinsic_debug_log>&  intrinsic_log;
 
    private:
       const action*                 act = nullptr; ///< action being applied
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index c7702d09414..9b288c1d1f2 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -9,6 +9,7 @@
 #include <eosio/chain/account_object.hpp>
 #include <eosio/chain/snapshot.hpp>
 #include <eosio/chain/protocol_feature_manager.hpp>
+#include <eosio/chain/intrinsic_debug_log.hpp>
 
 namespace chainbase {
    class database;
@@ -77,6 +78,7 @@ namespace eosio { namespace chain {
             bool                     contracts_console      =  false;
             bool                     allow_ram_billing_in_notify = false;
             bool                     disable_all_subjective_mitigations = false; //< for testing purposes only
+            optional<path>           intrinsic_debug_log_path; //< for debugging purposes only
 
             genesis_state            genesis;
             wasm_interface::vm_type  wasm_runtime = chain::config::default_wasm_runtime;
@@ -173,6 +175,7 @@ namespace eosio { namespace chain {
          const authorization_manager&          get_authorization_manager()const;
          authorization_manager&                get_mutable_authorization_manager();
          const protocol_feature_manager&       get_protocol_feature_manager()const;
+         optional<intrinsic_debug_log>&        get_intrinsic_debug_log();
 
          const flat_set<account_name>&   get_actor_whitelist() const;
          const flat_set<account_name>&   get_actor_blacklist() const;
diff --git a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
index 5ccdb486eac..65a29a456db 100644
--- a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
+++ b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
@@ -139,6 +139,9 @@ namespace eosio { namespace chain {
          block_reverse_iterator rbegin_block()const { return std::make_reverse_iterator( begin_block() ); }
          block_reverse_iterator rend_blocks()const   { return std::make_reverse_iterator( end_block() ); }
 
+         const boost::filesystem::path& get_path()const;
+         uint32_t last_block_num()const;
+
          struct intrinsic_differences {
             uint32_t                        block_num = 0;
             transaction_id_type             trx_id;
diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
index 68a583157fe..2b10c4fd27d 100644
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -115,9 +115,12 @@ namespace eosio { namespace chain {
             bfs::resize_file( log_path, last_commited_block_pos );
          }
          state = state_t::closed;
+         file_size = -1;
+         last_commited_block_pos = 0;
+         most_recent_block_pos = 0;
+         most_recent_block_num = 0;
          intrinsic_counter = 0;
          written_start_block = false;
-         file_size = -1;
 
          block_data_cache.clear();
       }
@@ -362,6 +365,15 @@ namespace eosio { namespace chain {
       ++(my->intrinsic_counter);
    }
 
+   const boost::filesystem::path& intrinsic_debug_log::get_path()const {
+      return my->log_path;
+   }
+
+   uint32_t intrinsic_debug_log::last_block_num()const {
+      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::closed, "log is closed" );
+      return my->most_recent_block_num;
+   }
+
    intrinsic_debug_log::block_iterator intrinsic_debug_log::begin_block()const {
       FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::read_only,
                  "block_begin is only allowed in read-only mode" );
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 3d0bac826b9..f097d7adc66 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -266,6 +266,8 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
 #ifdef __linux__
          ("database-hugepage-path", bpo::value<vector<string>>()->composing(), "Optional path for database hugepages when in \"locked\" mode (may specify multiple times)")
 #endif
+         ("debug-log-intrinsics", bpo::bool_switch()->default_value(false),
+          "enable logging of intrinsics for debugging purposes")
          ;
 
 // TODO: rate limiting
@@ -602,6 +604,10 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             my->blocks_dir = bld;
       }
 
+      if( options.at( "debug-log-intrinsics" ).as<bool>() ) {
+         my->chain_config->intrinsic_debug_log_path = app().data_dir() / "intrinsics.log";
+      }
+
       protocol_feature_set pfs;
       {
          fc::path protocol_features_dir;

From 5f7298e099b5282f982ad146d6e804b4225ad7fb Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Sat, 18 May 2019 12:02:45 -0400
Subject: [PATCH 0435/1648] bug fixes in intrinsic_debug_log and new unit test

---
 libraries/chain/intrinsic_debug_log.cpp | 77 ++++++++++++++++++++-----
 unittests/intrinsic_debug_log_tests.cpp | 71 +++++++++++++++++++++++
 2 files changed, 132 insertions(+), 16 deletions(-)

diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
index 2b10c4fd27d..f56449f7a8e 100644
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -51,7 +51,7 @@ namespace eosio { namespace chain {
             std::map<uint64_t, extended_block_data> block_data_cache;
             state_t                  state = state_t::closed;
             int64_t                  file_size = -1;
-            uint64_t                 last_commited_block_pos = 0;
+            uint64_t                 last_committed_block_pos = 0;
             uint64_t                 most_recent_block_pos = 0;
             uint32_t                 most_recent_block_num = 0;
             uint32_t                 intrinsic_counter = 0;
@@ -60,6 +60,8 @@ namespace eosio { namespace chain {
             void open( bool read_only, bool start_fresh );
             void close();
 
+            void truncate_to( uint64_t pos );
+
             void start_block( uint32_t block_num );
             void ensure_block_start_written();
             void finish_block();
@@ -90,19 +92,24 @@ namespace eosio { namespace chain {
          log.seekg( 0, std::ios::end );
          file_size = log.tellg();
          if( file_size > 0 ) {
-            log.seekg( -sizeof(last_commited_block_pos), std::ios::end );
-            log.read( (char*)&last_commited_block_pos, sizeof(last_commited_block_pos) );
-            FC_ASSERT( last_commited_block_pos < file_size, "corrupted log: invalid block position" );
-            most_recent_block_pos = last_commited_block_pos;
+            log.seekg( -sizeof(last_committed_block_pos), std::ios::end );
+            log.read( (char*)&last_committed_block_pos, sizeof(last_committed_block_pos) );
+            FC_ASSERT( last_committed_block_pos < file_size, "corrupted log: invalid block position" );
+            most_recent_block_pos = last_committed_block_pos;
 
-            log.seekg( last_commited_block_pos, std::ios::beg	);
+            log.seekg( last_committed_block_pos, std::ios::beg	);
             uint8_t tag = 0;
             log.read( (char*)&tag, sizeof(tag) );
             FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
 
             log.read( (char*)&most_recent_block_num, sizeof(most_recent_block_num) );
          }
-         log.seekg( 0, std::ios::beg );
+
+         if( read_only ) {
+            log.seekg( 0, std::ios::beg );
+         } else {
+            log.seekp( 0, std::ios::end );
+         }
       }
 
       void intrinsic_debug_log_impl::close() {
@@ -112,11 +119,11 @@ namespace eosio { namespace chain {
          log.flush();
          log.close();
          if( state != state_t::read_only && state != state_t::waiting_to_start_block ) {
-            bfs::resize_file( log_path, last_commited_block_pos );
+            bfs::resize_file( log_path, most_recent_block_pos );
          }
          state = state_t::closed;
          file_size = -1;
-         last_commited_block_pos = 0;
+         last_committed_block_pos = 0;
          most_recent_block_pos = 0;
          most_recent_block_num = 0;
          intrinsic_counter = 0;
@@ -125,13 +132,34 @@ namespace eosio { namespace chain {
          block_data_cache.clear();
       }
 
+      void intrinsic_debug_log_impl::truncate_to( uint64_t pos ) {
+         FC_ASSERT( state != state_t::closed && state != state_t::read_only,  "called while in invalid state" );
+         FC_ASSERT( pos >= most_recent_block_pos, "truncation would violate invariants" );
+
+         log.seekp( 0, std::ios::end );
+         file_size = log.tellp();
+         FC_ASSERT( pos <= file_size, "position is out of bounds" );
+
+         log.flush();
+         if( pos == file_size ) return;
+
+         if( log.tellg() > pos ) {
+            log.seekg( pos );
+         }
+
+         bfs::resize_file( log_path, pos );
+
+         log.sync();
+      }
+
+
       void intrinsic_debug_log_impl::start_block( uint32_t block_num  ) {
          FC_ASSERT( state == state_t::waiting_to_start_block, "cannot start block while still processing a block" );
          FC_ASSERT( most_recent_block_num < block_num,
                     "must start a block with greater height than previously started blocks" );
 
          state = state_t::in_block;
-         most_recent_block_pos = log.tellg();
+         most_recent_block_pos = log.tellp();
          most_recent_block_num = block_num;
       }
 
@@ -147,6 +175,23 @@ namespace eosio { namespace chain {
          if( written_start_block ) {
             log.put( block_tag );
             log.write( (char*)&most_recent_block_pos, sizeof(most_recent_block_pos) );
+            file_size = log.tellp();
+            last_committed_block_pos = most_recent_block_pos;
+            log.flush();
+         } else {
+            most_recent_block_pos = last_committed_block_pos;
+            if( file_size > 0 ) {
+               auto old_pos = log.tellg();
+               log.seekg( most_recent_block_pos, std::ios::beg	);
+               uint8_t tag = 0;
+               log.read( (char*)&tag, sizeof(tag) );
+               FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
+
+               log.read( (char*)&most_recent_block_num, sizeof(most_recent_block_num) );
+               log.seekg( old_pos, std::ios::beg	);
+            } else {
+               most_recent_block_num = 0;
+            }
          }
          state = state_t::waiting_to_start_block;
          intrinsic_counter = 0;
@@ -155,8 +200,8 @@ namespace eosio { namespace chain {
 
       int64_t intrinsic_debug_log_impl::get_position_of_previous_block( int64_t pos ) {
          int64_t previous_pos = -1;
-         if( pos > sizeof(last_commited_block_pos) ) {
-            decltype(last_commited_block_pos) read_pos{};
+         if( pos > sizeof(last_committed_block_pos) ) {
+            decltype(last_committed_block_pos) read_pos{};
             log.seekg( pos - sizeof(read_pos), std::ios::beg );
             log.read( (char*)&read_pos, sizeof(read_pos) );
             FC_ASSERT( read_pos < log.tellg(), "corrupted log: invalid block position" );
@@ -191,7 +236,7 @@ namespace eosio { namespace chain {
             for(;;) {
                log.read( (char*)&tag, sizeof(tag) );
                if( tag == block_tag ) {
-                  decltype(last_commited_block_pos) read_pos{};
+                  decltype(last_committed_block_pos) read_pos{};
                   log.read( (char*)&read_pos, sizeof(read_pos) );
                   FC_ASSERT( read_pos == pos, "corrupted log: block position did not match" );
                   break;
@@ -377,7 +422,7 @@ namespace eosio { namespace chain {
    intrinsic_debug_log::block_iterator intrinsic_debug_log::begin_block()const {
       FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::read_only,
                  "block_begin is only allowed in read-only mode" );
-      return block_iterator( my.get(), (my->last_commited_block_pos == 0ull ? -1ll : 0ll) );
+      return block_iterator( my.get(), (my->file_size > 0 ? 0ll : -1ll) );
    }
 
    intrinsic_debug_log::block_iterator intrinsic_debug_log::end_block()const {
@@ -418,7 +463,7 @@ namespace eosio { namespace chain {
       if( _pos < 0 ) {
          FC_ASSERT( !_cached_block_data, "invariant failure" );
          FC_ASSERT( _log->file_size > 0, "cannot decrement end block iterator when the log contains no blocks" );
-         _pos = static_cast<int64_t>( _log->last_commited_block_pos );
+         _pos = static_cast<int64_t>( _log->last_committed_block_pos );
          return *this;
       }
 
@@ -478,7 +523,7 @@ namespace eosio { namespace chain {
       const char* error_msg = nullptr;
 
       auto status = find_if_mismatched(
-         lhs.begin_block(), rhs.end_block(),
+         lhs.begin_block(), lhs.end_block(),
          rhs.begin_block(), rhs.end_block(),
          [&find_if_mismatched, &result, &error_msg]
          ( const block_data& block_lhs, const block_data& block_rhs ) {
diff --git a/unittests/intrinsic_debug_log_tests.cpp b/unittests/intrinsic_debug_log_tests.cpp
index 05e20b527c7..bfe501a483a 100644
--- a/unittests/intrinsic_debug_log_tests.cpp
+++ b/unittests/intrinsic_debug_log_tests.cpp
@@ -69,6 +69,13 @@ BOOST_AUTO_TEST_CASE(iterate_test) {
    name bar("bar");
 
    intrinsic_debug_log log( log_path );
+   log.open();
+   log.close();
+
+   log.open( intrinsic_debug_log::open_mode::read_only );
+   BOOST_CHECK( log.begin_block() == log.end_block() );
+   log.close();
+
    log.open();
    log.start_block( 2u );
    log.start_transaction( transaction_id_type() );
@@ -76,6 +83,13 @@ BOOST_AUTO_TEST_CASE(iterate_test) {
    log.acknowledge_intrinsic_without_recording();
    log.record_intrinsic( digest, digest );
    log.finish_block();
+   log.close();
+
+   log.open( intrinsic_debug_log::open_mode::read_only );
+   BOOST_CHECK( log.begin_block() != log.end_block() );
+   log.close();
+
+   log.open();
    log.start_block( 4u );
    log.start_transaction( transaction_id_type() );
    log.start_transaction( transaction_id_type() );
@@ -193,4 +207,61 @@ BOOST_AUTO_TEST_CASE(difference_test) {
    BOOST_CHECK_EQUAL( result->rhs_recorded_intrinsics.size(), 1 );
 }
 
+BOOST_AUTO_TEST_CASE(equivalence_test) {
+   fc::temp_directory  tempdir;
+   auto log1_path = tempdir.path() / "intrinsic1.log";
+   auto log2_path = tempdir.path() / "intrinsic2.log";
+   auto trx_id = fc::variant("0102030405060708090a0b0c0d0e0f100102030405060708090a0b0c0d0e0f10").as<transaction_id_type>();
+   auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
+   name alice("alice");
+   name bob("bob");
+   name foo("foo");
+   name bar("bar");
+
+   intrinsic_debug_log log1( log1_path );
+   {
+      log1.open();
+      log1.start_block( 1u );
+      log1.finish_block();
+      log1.start_block( 2u );
+      log1.start_transaction( transaction_id_type() );
+      log1.start_action( 1ull, alice, alice, foo );
+      log1.acknowledge_intrinsic_without_recording();
+      log1.record_intrinsic( digest, digest );
+      log1.finish_block();
+      log1.start_block( 4u );
+      log1.start_transaction( trx_id );
+      log1.start_action( 2ull, alice, alice, bar );
+      log1.record_intrinsic( digest, digest );
+      log1.start_action( 3ull, bob, alice, bar );
+      log1.finish_block();
+      log1.start_block( 5u );
+      log1.close();
+   }
+
+   intrinsic_debug_log log2( log2_path );
+   {
+      log2.open();
+      log2.start_block( 2u );
+      log2.start_transaction( transaction_id_type() );
+      log2.start_action( 1ull, alice, alice, foo );
+      log2.acknowledge_intrinsic_without_recording();
+      log2.record_intrinsic( digest, digest );
+      log2.finish_block();
+      log2.start_block( 4u );
+      log2.start_transaction( trx_id );
+      log2.start_action( 2ull, alice, alice, bar );
+      log2.record_intrinsic( digest, digest );
+      log2.start_action( 3ull, bob, alice, bar );
+      log2.finish_block();
+      log2.close();
+   }
+
+   auto result = intrinsic_debug_log::find_first_difference( log1, log2 );
+   if( result ) {
+      wdump( (fc::json::to_pretty_string(*result)) );
+   }
+   BOOST_REQUIRE( !result );
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 43ae5f9ef8d476016f9b966a27f86f127262661c Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Sat, 18 May 2019 18:48:07 -0400
Subject: [PATCH 0436/1648] refactor intrinsic_debug_log, fix bugs, and add
 ability to abort pending block or transaction tracked by the log

---
 libraries/chain/controller.cpp                |   6 +-
 .../eosio/chain/intrinsic_debug_log.hpp       |   9 +-
 libraries/chain/intrinsic_debug_log.cpp       | 753 +++++++++++++-----
 unittests/intrinsic_debug_log_tests.cpp       |   6 +
 4 files changed, 558 insertions(+), 216 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 349ea16c43f..55a7ceab1a7 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -601,9 +601,11 @@ struct controller_impl {
          db.undo();
       }
 
-      if( intrinsic_log && intrinsic_log->last_block_num() > 0 && head->block_num != intrinsic_log->last_block_num() ) {
+      if( intrinsic_log && intrinsic_log->last_committed_block_num() > 0
+             && head->block_num != intrinsic_log->last_committed_block_num() )
+      {
          wlog( "head block num (${head}) does not match last block in intrinsic.log (${last}): replacing intrinsic.log",
-               ("head", head->block_num)("last", intrinsic_log->last_block_num())
+               ("head", head->block_num)("last", intrinsic_log->last_committed_block_num())
          );
          intrinsic_log->close();
          fc::remove( intrinsic_log->get_path() );
diff --git a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
index 65a29a456db..778dd5c433b 100644
--- a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
+++ b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
@@ -39,7 +39,9 @@ namespace eosio { namespace chain {
          void close();
 
          void start_block( uint32_t block_num );
+         void abort_block();
          void start_transaction( const transaction_id_type& trx_id );
+         void abort_transaction();
          void start_action( uint64_t global_sequence_num,
                             name receiver, name first_receiver, name action_name );
          void acknowledge_intrinsic_without_recording();
@@ -139,8 +141,13 @@ namespace eosio { namespace chain {
          block_reverse_iterator rbegin_block()const { return std::make_reverse_iterator( begin_block() ); }
          block_reverse_iterator rend_blocks()const   { return std::make_reverse_iterator( end_block() ); }
 
+         bool is_open()const;
+         bool is_read_only()const;
+
          const boost::filesystem::path& get_path()const;
-         uint32_t last_block_num()const;
+
+         /** @returns the block number of the last committed block in the log or 0 if no blocks are committed in the log */
+         uint32_t last_committed_block_num()const;
 
          struct intrinsic_differences {
             uint32_t                        block_num = 0;
diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
index f56449f7a8e..9d181d96042 100644
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -8,16 +8,30 @@
 #include <fc/scoped_exit.hpp>
 #include <fstream>
 #include <map>
+#include <variant>
 #include <boost/filesystem.hpp>
 
 namespace bfs = boost::filesystem;
 
+template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+
+using pos_t = uint64_t;
+
 namespace eosio { namespace chain {
 
    namespace detail {
+
+      template<typename T, typename... Us>
+      struct is_one_of {
+         static constexpr bool value = (std::is_same_v<T, Us> || ...);
+      };
+
       struct extended_block_data {
          extended_block_data( intrinsic_debug_log::block_data&& block_data,
-                              int64_t pos, int64_t previous_pos, int64_t next_pos )
+                              const pos_t& pos,
+                              const std::optional<pos_t>& previous_pos,
+                              const std::optional<pos_t>& next_pos )
          :block_data( std::move(block_data) )
          ,pos( pos )
          ,previous_pos( previous_pos )
@@ -25,61 +39,211 @@ namespace eosio { namespace chain {
          {}
 
          intrinsic_debug_log::block_data block_data;
-         int64_t pos; //< pos should never be negative
-         int64_t previous_pos; //< if previous_pos is -1, then this is first block in the log
-         int64_t next_pos; //< if next_pos is -1, then this is the last block in the log
+         pos_t                           pos;
+         std::optional<pos_t>            previous_pos; //< if empty, then this is first block in the log
+         std::optional<pos_t>            next_pos; //< if empty, then this is the last block in the log
       };
 
       class intrinsic_debug_log_impl {
          public:
-            enum class state_t {
-               closed,
-               read_only,
-               waiting_to_start_block,
-               in_block,
-               in_transaction,
-               in_action
+            static constexpr uint8_t block_tag       = 0;
+            static constexpr uint8_t transaction_tag = 1;
+            static constexpr uint8_t action_tag      = 2;
+            static constexpr uint8_t intrinsic_tag   = 3;
+
+            struct closed {};
+
+            struct read_only {
+               explicit read_only( uint32_t last_committed_block_num )
+               :last_committed_block_num( last_committed_block_num )
+               {}
+
+               uint32_t last_committed_block_num;
             };
 
-            static const uint8_t block_tag       = 0;
-            static const uint8_t transaction_tag = 1;
-            static const uint8_t action_tag      = 2;
-            static const uint8_t intrinsic_tag   = 3;
-
-            std::fstream             log;
-            bfs::path                log_path;
-            std::map<uint64_t, extended_block_data> block_data_cache;
-            state_t                  state = state_t::closed;
-            int64_t                  file_size = -1;
-            uint64_t                 last_committed_block_pos = 0;
-            uint64_t                 most_recent_block_pos = 0;
-            uint32_t                 most_recent_block_num = 0;
-            uint32_t                 intrinsic_counter = 0;
-            bool                     written_start_block = false;
-
-            void open( bool read_only, bool start_fresh );
-            void close();
+            struct in_block;
+            struct in_transaction;
+            struct in_action;
 
-            void truncate_to( uint64_t pos );
+            struct waiting_to_start_block {
+               explicit waiting_to_start_block( uint32_t last_committed_block_num );
+               explicit waiting_to_start_block( const in_block& s );
+               explicit waiting_to_start_block( const in_transaction& s );
+               explicit waiting_to_start_block( const in_action& s );
+
+               uint32_t last_committed_block_num;
+            };
+
+            struct in_block {
+               in_block( const waiting_to_start_block& s, pos_t pos, uint32_t num );
+               explicit in_block( const in_transaction& s );
+               explicit in_block( const in_action& s );
+
+               pos_t    block_start_pos;
+               uint32_t block_num;
+               uint32_t last_committed_block_num;
+               bool     block_header_written = false;
+            };
+
+            struct in_transaction {
+               in_transaction( const in_block& s, pos_t transaction_start_pos );
+               in_transaction( const in_transaction& s, pos_t transaction_start_pos );
+               in_transaction( const in_action& s, pos_t transaction_start_pos );
+
+               pos_t    block_start_pos;
+               pos_t    transaction_start_pos;
+               uint32_t block_num;
+               uint32_t last_committed_block_num;
+            };
+
+            struct in_action {
+               struct force_new_t {};
+
+               explicit in_action( const in_transaction& s );
+               in_action( const in_transaction& s, force_new_t ):in_action( s ){}
+               in_action( const in_action& s, force_new_t );
+
+               pos_t    block_start_pos;
+               pos_t    transaction_start_pos;
+               uint32_t block_num;
+               uint32_t last_committed_block_num;
+               uint32_t intrinsic_counter = 0;
+            };
+
+            using state_type = std::variant<
+                                 closed,
+                                 read_only,
+                                 waiting_to_start_block,
+                                 in_block,
+                                 in_transaction,
+                                 in_action
+                               >;
+
+            struct log_metadata_t {
+               pos_t    last_committed_block_begin_pos{};
+               pos_t    last_committed_block_end_pos{};
+            };
+
+            std::fstream                          log;
+            bfs::path                             log_path;
+            std::map<pos_t, extended_block_data>  block_data_cache;
+            state_type                            state{ closed{} };
+            std::optional<log_metadata_t>         log_metadata;
+
+            void open( bool open_as_read_only, bool start_fresh );
+            void close();
 
             void start_block( uint32_t block_num );
-            void ensure_block_start_written();
+            void abort_block();
+            void start_transaction( const transaction_id_type& trx_id );
+            void abort_transaction();
+            void start_action( uint64_t global_sequence_num,
+                               name receiver, name first_receiver, name action_name );
+            void acknowledge_intrinsic_without_recording();
+            void record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash );
             void finish_block();
 
-            int64_t get_position_of_previous_block( int64_t pos );
-            const extended_block_data& get_block_at_position( int64_t pos );
+            bool is_open()const {
+               return !std::holds_alternative<closed>( state );
+            }
+
+            bool is_read_only()const {
+               return std::holds_alternative<read_only>( state );
+            }
+
+            bool can_write()const {
+               return !std::holds_alternative<closed>( state ) && !std::holds_alternative<read_only>( state );
+            }
+
+         protected:
+            void truncate_to( uint64_t pos );
+            std::optional<pos_t> get_position_of_previous_block( pos_t pos );
+            const extended_block_data& get_block_at_position( pos_t pos );
+
+            friend class intrinsic_debug_log::block_iterator;
       };
 
-      void intrinsic_debug_log_impl::open( bool read_only, bool start_fresh ) {
+      intrinsic_debug_log_impl::waiting_to_start_block::waiting_to_start_block( uint32_t last_committed_block_num )
+      :last_committed_block_num( last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::waiting_to_start_block::waiting_to_start_block( const in_block& s )
+      :last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::waiting_to_start_block::waiting_to_start_block( const in_transaction& s )
+      :last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::waiting_to_start_block::waiting_to_start_block( const in_action& s )
+      :last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::in_block::in_block( const waiting_to_start_block& s, pos_t pos, uint32_t num )
+      :block_start_pos( pos )
+      ,block_num( num )
+      ,last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::in_block::in_block( const in_transaction& s )
+      :block_start_pos( s.block_start_pos )
+      ,block_num( s.block_num )
+      ,last_committed_block_num( s.last_committed_block_num )
+      ,block_header_written(true)
+      {}
+
+      intrinsic_debug_log_impl::in_block::in_block( const in_action& s )
+      :block_start_pos( s.block_start_pos )
+      ,block_num( s.block_num )
+      ,last_committed_block_num( s.last_committed_block_num )
+      ,block_header_written(true)
+      {}
+
+      intrinsic_debug_log_impl::in_transaction::in_transaction( const in_block& s, pos_t transaction_start_pos )
+      :block_start_pos( s.block_start_pos )
+      ,transaction_start_pos( transaction_start_pos )
+      ,block_num( s.block_num )
+      ,last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::in_transaction::in_transaction( const in_transaction& s, pos_t transaction_start_pos )
+      :block_start_pos( s.block_start_pos )
+      ,transaction_start_pos( transaction_start_pos )
+      ,block_num( s.block_num )
+      ,last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::in_transaction::in_transaction( const in_action& s, pos_t transaction_start_pos )
+      :block_start_pos( s.block_start_pos )
+      ,transaction_start_pos( transaction_start_pos )
+      ,block_num( s.block_num )
+      ,last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::in_action::in_action( const in_transaction& s )
+      :block_start_pos( s.block_start_pos )
+      ,transaction_start_pos( s.transaction_start_pos )
+      ,block_num( s.block_num )
+      ,last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      intrinsic_debug_log_impl::in_action::in_action( const in_action& s, in_action::force_new_t )
+      :block_start_pos( s.block_start_pos )
+      ,transaction_start_pos( s.transaction_start_pos )
+      ,block_num( s.block_num )
+      ,last_committed_block_num( s.last_committed_block_num )
+      {}
+
+      void intrinsic_debug_log_impl::open( bool open_as_read_only, bool start_fresh ) {
          FC_ASSERT( !log.is_open(), "cannot open when the log is already open" );
-         FC_ASSERT( state == state_t::closed, "state out of sync" );
+         FC_ASSERT( std::holds_alternative<closed>( state ), "state out of sync" );
 
          std::ios_base::openmode open_mode = std::ios::in | std::ios::binary;
 
-         if( !read_only ) {
-            open_mode |= (std::ios::out | std::ios::app);
-         } else {
+         if( open_as_read_only ) {
             FC_ASSERT( !start_fresh, "start_fresh cannot be true in read-only mode" );
+         } else {
+            open_mode |= (std::ios::out | std::ios::app);
          }
 
          if( start_fresh ) {
@@ -87,64 +251,89 @@ namespace eosio { namespace chain {
          }
 
          log.open( log_path.generic_string().c_str(), open_mode );
-         state = (read_only ? state_t::read_only : state_t::waiting_to_start_block);
+
+         uint32_t last_committed_block_num = 0; // 0 indicates no committed blocks in log
 
          log.seekg( 0, std::ios::end );
-         file_size = log.tellg();
+         pos_t file_size = log.tellg();
          if( file_size > 0 ) {
-            log.seekg( -sizeof(last_committed_block_pos), std::ios::end );
-            log.read( (char*)&last_committed_block_pos, sizeof(last_committed_block_pos) );
-            FC_ASSERT( last_committed_block_pos < file_size, "corrupted log: invalid block position" );
-            most_recent_block_pos = last_committed_block_pos;
-
-            log.seekg( last_committed_block_pos, std::ios::beg	);
+            pos_t last_committed_block_begin_pos{};
+            FC_ASSERT( file_size > sizeof(last_committed_block_begin_pos),
+                       "corrupted log: file size is too small to be valid" );
+            log.seekg( -sizeof(last_committed_block_begin_pos), std::ios::end );
+            fc::raw::unpack( log, last_committed_block_begin_pos );
+            FC_ASSERT( last_committed_block_begin_pos < file_size, "corrupted log: invalid block position" );
+
+            log.seekg( last_committed_block_begin_pos, std::ios::beg	);
             uint8_t tag = 0;
-            log.read( (char*)&tag, sizeof(tag) );
+            fc::raw::unpack( log, tag );
             FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
 
-            log.read( (char*)&most_recent_block_num, sizeof(most_recent_block_num) );
+            fc::raw::unpack( log, last_committed_block_num );
+
+            log_metadata.emplace( log_metadata_t{ last_committed_block_begin_pos, file_size } );
          }
 
-         if( read_only ) {
+         if( open_as_read_only ) {
+            state.emplace<read_only>( last_committed_block_num );
             log.seekg( 0, std::ios::beg );
          } else {
+            state.emplace<waiting_to_start_block>( last_committed_block_num );
             log.seekp( 0, std::ios::end );
          }
       }
 
       void intrinsic_debug_log_impl::close() {
          if( !log.is_open() ) return;
-         FC_ASSERT( state != state_t::closed, "state out of sync" );
 
-         log.flush();
-         log.close();
-         if( state != state_t::read_only && state != state_t::waiting_to_start_block ) {
-            bfs::resize_file( log_path, most_recent_block_pos );
+         std::optional<pos_t> truncate_pos = std::visit( overloaded{
+            []( closed ) -> std::optional<pos_t> {
+               FC_ASSERT( false, "state out of sync" );
+               return {}; // unreachable, only added for compilation purposes
+            },
+            []( const read_only& ) -> std::optional<pos_t> { return {}; },
+            []( const waiting_to_start_block&  ) -> std::optional<pos_t> { return {}; },
+            []( const in_block&  ) -> std::optional<pos_t> { return {}; },
+            []( auto&& s )
+            -> std::enable_if_t<
+                  detail::is_one_of< std::decay_t<decltype(s)>,
+                     in_transaction, in_action
+                  >::value,
+                  std::optional<pos_t>
+            >
+            {
+               return s.block_start_pos;
+            }
+         }, state );
+
+         if( truncate_pos ) {
+            truncate_to( *truncate_pos );
+         } else {
+            log.flush();
          }
-         state = state_t::closed;
-         file_size = -1;
-         last_committed_block_pos = 0;
-         most_recent_block_pos = 0;
-         most_recent_block_num = 0;
-         intrinsic_counter = 0;
-         written_start_block = false;
 
+         log.close();
+
+         state.emplace<closed>();
+         log_metadata.reset();
          block_data_cache.clear();
       }
 
-      void intrinsic_debug_log_impl::truncate_to( uint64_t pos ) {
-         FC_ASSERT( state != state_t::closed && state != state_t::read_only,  "called while in invalid state" );
-         FC_ASSERT( pos >= most_recent_block_pos, "truncation would violate invariants" );
+      void intrinsic_debug_log_impl::truncate_to( pos_t pos ) {
+         FC_ASSERT( can_write(),  "called while in invalid state" );
 
          log.seekp( 0, std::ios::end );
-         file_size = log.tellp();
-         FC_ASSERT( pos <= file_size, "position is out of bounds" );
+         pos_t file_size = log.tellp();
+         FC_ASSERT( 0 <= pos && pos <= file_size, "position is out of bounds" );
+
+         FC_ASSERT( !log_metadata || log_metadata->last_committed_block_end_pos <= pos,
+                    "truncation would erase committed block data which is currently not supported" );
 
          log.flush();
          if( pos == file_size ) return;
 
-         if( log.tellg() > pos ) {
-            log.seekg( pos );
+         if( log.tellp() > pos ) {
+            log.seekp( pos );
          }
 
          bfs::resize_file( log_path, pos );
@@ -152,72 +341,235 @@ namespace eosio { namespace chain {
          log.sync();
       }
 
-
       void intrinsic_debug_log_impl::start_block( uint32_t block_num  ) {
-         FC_ASSERT( state == state_t::waiting_to_start_block, "cannot start block while still processing a block" );
-         FC_ASSERT( most_recent_block_num < block_num,
-                    "must start a block with greater height than previously started blocks" );
+         FC_ASSERT( block_num > 0, "block number cannot be 0" );
+         bool writable = std::visit( overloaded{
+            []( closed ) { return false; },
+            []( const read_only& ) { return false; },
+            [&]( const waiting_to_start_block& s ) {
+               FC_ASSERT( s.last_committed_block_num < block_num,
+                          "must start a block with greater height than previously started blocks" );
+               state = in_block( s, log.tellp(), block_num );
+               return true;
+            },
+            []( auto&& s )
+            -> std::enable_if_t<
+                  detail::is_one_of< std::decay_t<decltype(s)>,
+                     in_block, in_transaction, in_action
+                  >::value,
+                  bool
+            >
+            {
+               FC_ASSERT( false, "cannot start block while still processing a block" );
+               return false; // unreachable, only added for compilation purposes
+            }
+         }, state );
+         FC_ASSERT( writable, "log is not setup for writing" );
+      }
 
-         state = state_t::in_block;
-         most_recent_block_pos = log.tellp();
-         most_recent_block_num = block_num;
+      void intrinsic_debug_log_impl::abort_block() {
+         bool writable = std::visit( overloaded{
+            []( closed ) { return false; },
+            []( const read_only& ) { return false; },
+            []( const waiting_to_start_block& ) {
+               return true; // nothing to abort
+            },
+            [&]( auto&& s )
+            -> std::enable_if_t<
+                  detail::is_one_of< std::decay_t<decltype(s)>,
+                     in_block, in_transaction, in_action
+                  >::value,
+                  bool
+            >
+            {
+               truncate_to( s.block_start_pos );
+               state = waiting_to_start_block( s );
+               return true;
+            }
+         }, state );
+         FC_ASSERT( writable, "log is not setup for writing" );
       }
 
-      void intrinsic_debug_log_impl::ensure_block_start_written() {
-         if( written_start_block ) return;
-         FC_ASSERT( state == state_t::in_block, "called while in invalid state" );
-         log.put( block_tag );
-         log.write( (char*)&most_recent_block_num, sizeof(most_recent_block_num) );
-         written_start_block = true;
+      void intrinsic_debug_log_impl::start_transaction( const transaction_id_type& trx_id ) {
+         auto write_transaction_header = [&] {
+            uint64_t transaction_start_pos = log.tellp();
+            fc::raw::pack( log, transaction_tag );
+            fc::raw::pack( log, trx_id );
+            return transaction_start_pos;
+         };
+
+         bool writable = std::visit( overloaded{
+            []( closed ) { return false; },
+            []( const read_only& ) { return false; },
+            []( const waiting_to_start_block& ) {
+               FC_ASSERT( false, "cannot start transaction in the current state" );
+               return false; // unreachable, only added for compilation purposes
+            },
+            [&]( const in_block& s ) {
+               if( !s.block_header_written ) {
+                  fc::raw::pack( log, block_tag );
+                  fc::raw::pack( log, s.block_num );
+               }
+               uint64_t transaction_start_pos = write_transaction_header();
+               state = in_transaction( s, transaction_start_pos );
+               return true;
+            },
+            [&]( auto&& s )
+            -> std::enable_if_t<
+                  detail::is_one_of< std::decay_t<decltype(s)>,
+                     in_transaction, in_action
+                  >::value,
+                  bool
+            >
+            {
+               uint64_t transaction_start_pos = write_transaction_header();
+               state = in_transaction( s, transaction_start_pos );
+               return true;
+            }
+         }, state );
+         FC_ASSERT( writable, "log is not setup for writing" );
+      }
+
+      void intrinsic_debug_log_impl::abort_transaction() {
+         bool writable = std::visit( overloaded{
+            []( closed ) { return false; },
+            []( const read_only& ) { return false; },
+            []( const waiting_to_start_block& ) {
+               FC_ASSERT( false, "cannot abort transaction in the current state" );
+               return false; // unreachable, only added for compilation purposes
+            },
+            []( const in_block& s ) {
+               FC_ASSERT( false, "cannot abort transaction in the current state" );
+               return false; // unreachable, only added for compilation purposes
+            },
+            [&]( auto&& s )
+            -> std::enable_if_t<
+                  detail::is_one_of< std::decay_t<decltype(s)>,
+                     in_transaction, in_action
+                  >::value,
+                  bool
+            >
+            {
+               truncate_to( s.transaction_start_pos );
+               state = in_block( s );
+               return true;
+            }
+         }, state );
+         FC_ASSERT( writable, "log is not setup for writing" );
+      }
+
+      void intrinsic_debug_log_impl::start_action( uint64_t global_sequence_num,
+                                                   name receiver, name first_receiver, name action_name )
+      {
+         bool writable = std::visit( overloaded{
+            []( closed ) { return false; },
+            []( const read_only& ) { return false; },
+            []( const waiting_to_start_block& ) {
+               FC_ASSERT( false, "cannot start action in the current state" );
+               return false; // unreachable, only added for compilation purposes
+            },
+            []( const in_block& ) {
+               FC_ASSERT( false, "cannot start action in the current state" );
+               return false; // unreachable, only added for compilation purposes
+            },
+            [&]( auto&& s )
+            -> std::enable_if_t<
+                  detail::is_one_of< std::decay_t<decltype(s)>,
+                     in_transaction, in_action
+                  >::value,
+                  bool
+            >
+            {
+               fc::raw::pack( log, action_tag );
+               fc::raw::pack( log, global_sequence_num );
+               fc::raw::pack( log, receiver );
+               fc::raw::pack( log, first_receiver );
+               fc::raw::pack( log, action_name );
+               state = in_action( s, in_action::force_new_t{} );
+               return true;
+            }
+         }, state );
+         FC_ASSERT( writable, "log is not setup for writing" );
+      }
+
+      void intrinsic_debug_log_impl::acknowledge_intrinsic_without_recording() {
+         FC_ASSERT( can_write(), "log is not setup for writing" );
+         in_action& s = std::get<in_action>( state );
+         ++(s.intrinsic_counter);
+      }
+
+      void intrinsic_debug_log_impl::record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash ) {
+         FC_ASSERT( can_write(), "log is not setup for writing" );
+         in_action& s = std::get<in_action>( state );
+
+         fc::raw::pack( log, intrinsic_tag );
+         fc::raw::pack( log, s.intrinsic_counter );
+         fc::raw::pack( log, arguments_hash );
+         fc::raw::pack( log, memory_hash );
+
+         ++(s.intrinsic_counter);
       }
 
       void intrinsic_debug_log_impl::finish_block() {
-         if( written_start_block ) {
-            log.put( block_tag );
-            log.write( (char*)&most_recent_block_pos, sizeof(most_recent_block_pos) );
-            file_size = log.tellp();
-            last_committed_block_pos = most_recent_block_pos;
-            log.flush();
-         } else {
-            most_recent_block_pos = last_committed_block_pos;
-            if( file_size > 0 ) {
-               auto old_pos = log.tellg();
-               log.seekg( most_recent_block_pos, std::ios::beg	);
-               uint8_t tag = 0;
-               log.read( (char*)&tag, sizeof(tag) );
-               FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
-
-               log.read( (char*)&most_recent_block_num, sizeof(most_recent_block_num) );
-               log.seekg( old_pos, std::ios::beg	);
-            } else {
-               most_recent_block_num = 0;
+         bool writable = std::visit( overloaded{
+            []( closed ) { return false; },
+            []( const read_only& ) { return false; },
+            []( const waiting_to_start_block& ) {
+               FC_ASSERT( false, "no started block" );
+               return false; // unreachable, only added for compilation purposes
+            },
+            [&]( const in_block& s ) {
+               state = waiting_to_start_block( s.last_committed_block_num );
+               return true; // nothing to commit
+            },
+            [&]( auto&& s )
+            -> std::enable_if_t<
+                  detail::is_one_of< std::decay_t<decltype(s)>,
+                     in_transaction, in_action
+                  >::value,
+                  bool
+            >
+            {
+               fc::raw::pack( log, block_tag );
+               fc::raw::pack( log, s.block_start_pos );
+               pos_t new_last_committed_block_end_pos = log.tellp();
+               log.flush();
+
+               pos_t new_last_committed_block_begin_pos{};
+               if( log_metadata ) {
+                  new_last_committed_block_begin_pos = log_metadata->last_committed_block_end_pos;
+               }
+
+               log_metadata.emplace( log_metadata_t{ new_last_committed_block_begin_pos, new_last_committed_block_end_pos} );
+
+               state = waiting_to_start_block( s.last_committed_block_num );
+               return true;
             }
-         }
-         state = state_t::waiting_to_start_block;
-         intrinsic_counter = 0;
-         written_start_block = false;
+         }, state );
+         FC_ASSERT( writable, "log is not setup for writing" );
       }
 
-      int64_t intrinsic_debug_log_impl::get_position_of_previous_block( int64_t pos ) {
-         int64_t previous_pos = -1;
-         if( pos > sizeof(last_committed_block_pos) ) {
-            decltype(last_committed_block_pos) read_pos{};
+      std::optional<pos_t> intrinsic_debug_log_impl::get_position_of_previous_block( pos_t pos ) {
+         std::optional<pos_t> previous_pos;
+         if( pos > sizeof(pos_t) ) {
+            pos_t read_pos = 0;
             log.seekg( pos - sizeof(read_pos), std::ios::beg );
-            log.read( (char*)&read_pos, sizeof(read_pos) );
+            fc::raw::unpack( log, read_pos );
             FC_ASSERT( read_pos < log.tellg(), "corrupted log: invalid block position" );
             previous_pos = read_pos;
          }
          return previous_pos;
       }
 
-      const extended_block_data& intrinsic_debug_log_impl::get_block_at_position( int64_t pos ) {
-         FC_ASSERT( state == state_t::read_only, "only allowed in read-only mode" );
-         FC_ASSERT( 0 <= pos && pos < file_size, "position is out of bounds" );
+      const extended_block_data& intrinsic_debug_log_impl::get_block_at_position( pos_t pos ) {
+         FC_ASSERT( is_read_only(), "only allowed in read-only mode" );
+         FC_ASSERT( log_metadata && 0 <= pos && pos < log_metadata->last_committed_block_end_pos,
+                    "position is out of bounds" );
 
-         auto itr = block_data_cache.find( static_cast<uint64_t>(pos) );
+         auto itr = block_data_cache.find( pos );
          if( itr != block_data_cache.end() ) return itr->second;
 
-         int64_t previous_pos = get_position_of_previous_block( pos );
+         std::optional<pos_t> previous_pos = get_position_of_previous_block( pos );
          log.seekg( pos, std::ios::beg );
 
          intrinsic_debug_log::block_data block_data;
@@ -225,42 +577,39 @@ namespace eosio { namespace chain {
          // Read all data for the current block.
          {
             uint8_t tag = 0;
-            log.read( (char*)&tag, sizeof(tag) );
+            fc::raw::unpack( log, tag );
             FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
-            log.read( (char*)&block_data.block_num, sizeof(block_data.block_num) );
+            fc::raw::unpack( log, block_data.block_num );
 
             bool in_transaction = false;
             bool in_action      = false;
             uint64_t minimum_accepted_global_sequence_num = 0;
 
             for(;;) {
-               log.read( (char*)&tag, sizeof(tag) );
+               fc::raw::unpack( log, tag );
                if( tag == block_tag ) {
-                  decltype(last_committed_block_pos) read_pos{};
-                  log.read( (char*)&read_pos, sizeof(read_pos) );
+                  pos_t read_pos{};
+                  fc::raw::unpack( log, read_pos );
                   FC_ASSERT( read_pos == pos, "corrupted log: block position did not match" );
                   break;
                } else if( tag == transaction_tag ) {
-                  char buffer[32];
-                  log.read( buffer, sizeof(buffer) );
-                  fc::datastream<char*> ds( buffer, sizeof(buffer) );
                   block_data.transactions.emplace_back();
-                  fc::raw::unpack( ds, block_data.transactions.back().trx_id );
+                  fc::raw::unpack( log, block_data.transactions.back().trx_id );
                   in_transaction = true;
                   in_action      = false;
                } else if( tag == action_tag ) {
                   FC_ASSERT( in_transaction, "corrupted log: no start of transaction before encountering action tag");
                   uint64_t global_sequence_num = 0;
-                  log.read( (char*)&global_sequence_num, sizeof(global_sequence_num) );
+                  fc::raw::unpack( log, global_sequence_num );
                   FC_ASSERT( global_sequence_num >= minimum_accepted_global_sequence_num,
                              "corrupted log: global sequence numbers of actions within a block are not monotonically increasing"
                   );
                   block_data.transactions.back().actions.emplace_back();
                   auto& act = block_data.transactions.back().actions.back();
                   act.global_sequence_num = global_sequence_num;
-                  log.read( (char*)&act.receiver.value,        sizeof(act.receiver.value) );
-                  log.read( (char*)&act.first_receiver.value,  sizeof(act.first_receiver.value) );
-                  log.read( (char*)&act.action_name.value,     sizeof(act.action_name.value) );
+                  fc::raw::unpack( log, act.receiver );
+                  fc::raw::unpack( log, act.first_receiver );
+                  fc::raw::unpack( log, act.action_name );
                   in_action = true;
                   minimum_accepted_global_sequence_num = global_sequence_num + 1;
                } else if( tag == intrinsic_tag ) {
@@ -271,17 +620,14 @@ namespace eosio { namespace chain {
                      minimum_accepted_ordinal = intrinsics.back().intrinsic_ordinal + 1;
                   }
                   uint32_t ordinal = 0;
-                  log.read( (char*)&ordinal, sizeof(ordinal) );
+                  fc::raw::unpack( log, ordinal );
                   FC_ASSERT( ordinal >= minimum_accepted_ordinal,
                              "corrupted log: intrinsic ordinals within an action are not monotonically increasing" );
-                  char buffer[64];
-                  log.read( buffer, sizeof(buffer) );
-                  fc::datastream<char*> ds( buffer, sizeof(buffer) );
                   intrinsics.emplace_back();
                   auto& intrinsic = intrinsics.back();
                   intrinsic.intrinsic_ordinal = ordinal;
-                  fc::raw::unpack( ds, intrinsic.arguments_hash );
-                  fc::raw::unpack( ds, intrinsic.memory_hash );
+                  fc::raw::unpack( log, intrinsic.arguments_hash );
+                  fc::raw::unpack( log, intrinsic.memory_hash );
                } else {
                   FC_ASSERT( false, "corrupted log: unrecognized tag" );
                }
@@ -290,12 +636,12 @@ namespace eosio { namespace chain {
             FC_ASSERT( block_data.transactions.size() > 0, "corrupted log: empty block included" );
          }
 
-         int64_t next_pos = -1;
-         if( log.tellg() < file_size ) next_pos = log.tellg();
+         std::optional<pos_t> next_pos;
+         if( log.tellg() < log_metadata->last_committed_block_end_pos ) next_pos = log.tellg();
 
          auto res = block_data_cache.emplace(
                         std::piecewise_construct,
-                        std::forward_as_tuple( static_cast<uint64_t>(pos) ),
+                        std::forward_as_tuple( pos ),
                         std::forward_as_tuple( std::move(block_data), pos, previous_pos, next_pos )
          );
          return res.first->second;
@@ -314,14 +660,16 @@ namespace eosio { namespace chain {
 
    intrinsic_debug_log::~intrinsic_debug_log() {
       if( my ) {
-         my->close();
+         try {
+            my->close();
+         } FC_LOG_AND_DROP()
          my.reset();
       }
    }
 
    void intrinsic_debug_log::open( open_mode mode ) {
-      bool read_only = (mode == open_mode::read_only);
-      my->open( read_only, ( read_only ? false : (mode == open_mode::create_new) ) );
+      bool open_as_read_only = (mode == open_mode::read_only);
+      my->open( open_as_read_only, ( open_as_read_only ? false : (mode == open_mode::create_new) ) );
    }
 
    void intrinsic_debug_log::close() {
@@ -333,101 +681,80 @@ namespace eosio { namespace chain {
    }
 
    void intrinsic_debug_log::start_block( uint32_t block_num ) {
-      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
-                 "invalid operation in read-only mode" );
       my->start_block( block_num );
    }
 
-   void intrinsic_debug_log::finish_block() {
-      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
-                 "invalid operation in read-only mode" );
-      my->finish_block();
+   void intrinsic_debug_log::abort_block() {
+      my->abort_block();
    }
 
    void intrinsic_debug_log::start_transaction( const transaction_id_type& trx_id ) {
-      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
-                 "invalid operation in read-only mode" );
-      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::closed
-                 && my->state != detail::intrinsic_debug_log_impl::state_t::waiting_to_start_block,
-                 "cannot start transaction in the current state" );
-
-      char buffer[32];
-      fc::datastream<char*> ds( buffer, sizeof(buffer) );
-      fc::raw::pack( ds, trx_id );
-      FC_ASSERT( !ds.remaining(), "unexpected size for transaction id" );
-
-      my->ensure_block_start_written();
-      my->log.put( detail::intrinsic_debug_log_impl::transaction_tag );
-      my->log.write( buffer, sizeof(buffer) );
-
-      my->state = detail::intrinsic_debug_log_impl::state_t::in_transaction;
-      my->intrinsic_counter = 0;
+      my->start_transaction( trx_id );
+   }
+
+   void intrinsic_debug_log::abort_transaction() {
+      my->abort_transaction();
    }
 
    void intrinsic_debug_log::start_action( uint64_t global_sequence_num,
                                            name receiver, name first_receiver, name action_name )
    {
-      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
-                 "invalid operation in read-only mode" );
-      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::in_transaction
-                 || my->state == detail::intrinsic_debug_log_impl::state_t::in_action,
-                 "cannot start action in the current state" );
-
-      my->log.put( detail::intrinsic_debug_log_impl::action_tag );
-      my->log.write( (char*)&global_sequence_num,  sizeof(global_sequence_num) );
-      my->log.write( (char*)&receiver.value,       sizeof(receiver.value) );
-      my->log.write( (char*)&first_receiver.value, sizeof(first_receiver.value) );
-      my->log.write( (char*)&action_name.value,    sizeof(action_name.value) );
-
-      my->state = detail::intrinsic_debug_log_impl::state_t::in_action;
-      my->intrinsic_counter = 0;
+      my->start_action( global_sequence_num, receiver, first_receiver, action_name );
    }
 
    void intrinsic_debug_log::acknowledge_intrinsic_without_recording() {
-      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
-                 "invalid operation in read-only mode" );
-      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::in_action,
-                 "can only acknowledge intrinsic within action state" );
-      ++(my->intrinsic_counter);
+      my->acknowledge_intrinsic_without_recording();
    }
 
    void intrinsic_debug_log::record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash ) {
-      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::read_only,
-                 "invalid operation in read-only mode" );
-      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::in_action,
-                 "can only record intrinsic within action state" );
-
-      char buffer[64];
-      fc::datastream<char*> ds( buffer, sizeof(buffer) );
-      fc::raw::pack( ds, arguments_hash );
-      fc::raw::pack( ds, memory_hash );
-      FC_ASSERT( !ds.remaining(), "unexpected size for digest" );
-
-      my->log.put( detail::intrinsic_debug_log_impl::intrinsic_tag );
-      my->log.write( (char*)&my->intrinsic_counter, sizeof(my->intrinsic_counter) );
-      my->log.write( buffer, sizeof(buffer) );
-
-      ++(my->intrinsic_counter);
+      my->record_intrinsic( arguments_hash, memory_hash );
+   }
+
+   void intrinsic_debug_log::finish_block() {
+      my->finish_block();
+   }
+
+   bool intrinsic_debug_log::is_open()const {
+      return my->is_open();
+   }
+
+   bool intrinsic_debug_log::is_read_only()const {
+      return my->is_read_only();
    }
 
    const boost::filesystem::path& intrinsic_debug_log::get_path()const {
       return my->log_path;
    }
 
-   uint32_t intrinsic_debug_log::last_block_num()const {
-      FC_ASSERT( my->state != detail::intrinsic_debug_log_impl::state_t::closed, "log is closed" );
-      return my->most_recent_block_num;
+   uint32_t intrinsic_debug_log::last_committed_block_num()const {
+      std::optional<uint32_t> result = std::visit( overloaded{
+         []( detail::intrinsic_debug_log_impl::closed ) -> std::optional<uint32_t> { return {}; },
+         [&]( auto&& s )
+         -> std::enable_if_t<
+               detail::is_one_of< std::decay_t<decltype(s)>,
+                  detail::intrinsic_debug_log_impl::read_only,
+                  detail::intrinsic_debug_log_impl::waiting_to_start_block,
+                  detail::intrinsic_debug_log_impl::in_block,
+                  detail::intrinsic_debug_log_impl::in_transaction,
+                  detail::intrinsic_debug_log_impl::in_action
+               >::value,
+               std::optional<uint32_t>
+         >
+         {
+            return s.last_committed_block_num;
+         }
+      }, my->state );
+      FC_ASSERT( result, "log is closed" );
+      return *result;
    }
 
    intrinsic_debug_log::block_iterator intrinsic_debug_log::begin_block()const {
-      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::read_only,
-                 "block_begin is only allowed in read-only mode" );
-      return block_iterator( my.get(), (my->file_size > 0 ? 0ll : -1ll) );
+      FC_ASSERT( my->is_read_only(), "block_begin is only allowed in read-only mode" );
+      return block_iterator( my.get(), (my->log_metadata ? 0ll : -1ll) );
    }
 
    intrinsic_debug_log::block_iterator intrinsic_debug_log::end_block()const {
-      FC_ASSERT( my->state == detail::intrinsic_debug_log_impl::state_t::read_only,
-                 "block_end is only allowed in read-only mode" );
+      FC_ASSERT( my->is_read_only(), "block_end is only allowed in read-only mode" );
       return block_iterator( my.get() );
    }
 
@@ -448,10 +775,10 @@ namespace eosio { namespace chain {
       FC_ASSERT( _pos >= 0, "cannot increment end block iterator" );
 
       if( !_cached_block_data ) {
-         _cached_block_data = &_log->get_block_at_position( _pos );
+         _cached_block_data = &_log->get_block_at_position( static_cast<pos_t>(_pos) );
       }
 
-      _pos = _cached_block_data->next_pos;
+      _pos = (_cached_block_data->next_pos ? static_cast<int64_t>(*_cached_block_data->next_pos) : -1ll);
       _cached_block_data = nullptr;
 
       return *this;
@@ -462,20 +789,20 @@ namespace eosio { namespace chain {
 
       if( _pos < 0 ) {
          FC_ASSERT( !_cached_block_data, "invariant failure" );
-         FC_ASSERT( _log->file_size > 0, "cannot decrement end block iterator when the log contains no blocks" );
-         _pos = static_cast<int64_t>( _log->last_committed_block_pos );
+         FC_ASSERT( _log->log_metadata, "cannot decrement end block iterator when the log contains no blocks" );
+         _pos = static_cast<int64_t>( _log->log_metadata->last_committed_block_begin_pos );
          return *this;
       }
 
-      int64_t prev_pos = -1;
+      std::optional<pos_t> prev_pos;
       if( _cached_block_data ) {
          prev_pos = _cached_block_data->previous_pos;
       } else {
-         prev_pos = _log->get_position_of_previous_block( _pos );
+         prev_pos = _log->get_position_of_previous_block( static_cast<pos_t>(_pos) );
       }
 
-      FC_ASSERT( prev_pos >= 0, "cannot decrement begin block iterator" );
-      _pos = prev_pos;
+      FC_ASSERT( prev_pos, "cannot decrement begin block iterator" );
+      _pos = static_cast<int64_t>(*prev_pos);
       _cached_block_data = nullptr;
       return *this;
    }
diff --git a/unittests/intrinsic_debug_log_tests.cpp b/unittests/intrinsic_debug_log_tests.cpp
index bfe501a483a..9d0261a3c02 100644
--- a/unittests/intrinsic_debug_log_tests.cpp
+++ b/unittests/intrinsic_debug_log_tests.cpp
@@ -225,6 +225,8 @@ BOOST_AUTO_TEST_CASE(equivalence_test) {
       log1.finish_block();
       log1.start_block( 2u );
       log1.start_transaction( transaction_id_type() );
+      log1.abort_transaction();
+      log1.start_transaction( transaction_id_type() );
       log1.start_action( 1ull, alice, alice, foo );
       log1.acknowledge_intrinsic_without_recording();
       log1.record_intrinsic( digest, digest );
@@ -236,6 +238,10 @@ BOOST_AUTO_TEST_CASE(equivalence_test) {
       log1.start_action( 3ull, bob, alice, bar );
       log1.finish_block();
       log1.start_block( 5u );
+      log1.start_transaction( transaction_id_type() );
+      log1.start_action( 4ull, alice, alice, foo );
+      log1.abort_block();
+      log1.start_block( 5u );
       log1.close();
    }
 

From 18f69d2bd567d40cc58bb0c9280f3497c24d0603 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Sat, 18 May 2019 18:51:24 -0400
Subject: [PATCH 0437/1648] improve intrinsic logging support for transactions
 (particularly deferred transactions)

---
 libraries/chain/controller.cpp | 38 ++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 55a7ceab1a7..6422605e945 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1142,8 +1142,16 @@ struct controller_impl {
 
       uint32_t cpu_time_to_bill_us = billed_cpu_time_us;
 
-      // TODO: Figure out how to handle deferred transactions.
-      // It seems like I need to augment intrinsic_debug_log to support transaction level rollback.
+      auto abort_transaction_in_intrinsic_log_on_exit = fc::make_scoped_exit(
+      [abort_transaction=static_cast<bool>(intrinsic_log), this] {
+         if( abort_transaction ) {
+            intrinsic_log->abort_transaction();
+         }
+      });
+
+      if( intrinsic_log ) {
+         intrinsic_log->start_transaction( gtrx.trx_id );
+      }
 
       transaction_context trx_context( self, dtrx, gtrx.trx_id );
       trx_context.leeway =  fc::microseconds(0); // avoid stealing cpu resource
@@ -1186,6 +1194,7 @@ struct controller_impl {
          undo_session.squash();
 
          restore.cancel();
+         abort_transaction_in_intrinsic_log_on_exit.cancel();
 
          return trace;
       } catch( const disallowed_transaction_extensions_bad_block_exception& ) {
@@ -1216,6 +1225,7 @@ struct controller_impl {
             emit( self.accepted_transaction, trx );
             emit( self.applied_transaction, std::tie(trace, dtrx) );
             undo_session.squash();
+            abort_transaction_in_intrinsic_log_on_exit.cancel();
             return trace;
          }
          trace->elapsed = fc::time_point::now() - trx_context.start;
@@ -1234,10 +1244,6 @@ struct controller_impl {
       if ( !subjective ) {
          // hard failure logic
 
-         if( intrinsic_log ) {
-            intrinsic_log->start_transaction( gtrx.trx_id );
-         }
-
          if( !explicit_billed_cpu_time ) {
             auto& rl = self.get_mutable_resource_limits_manager();
             rl.update_account_usage( trx_context.bill_to_accounts, block_timestamp_type(self.pending_block_time()).slot );
@@ -1259,6 +1265,7 @@ struct controller_impl {
          emit( self.applied_transaction, std::tie(trace, dtrx) );
 
          undo_session.squash();
+         abort_transaction_in_intrinsic_log_on_exit.cancel();
       } else {
          emit( self.accepted_transaction, trx );
          emit( self.applied_transaction, std::tie(trace, dtrx) );
@@ -1318,9 +1325,18 @@ struct controller_impl {
 
          const signed_transaction& trn = trx->packed_trx()->get_signed_transaction();
          transaction_context trx_context(self, trn, trx->id(), start);
+
+         auto abort_transaction_in_intrinsic_log_on_exit = fc::make_scoped_exit(
+         [abort_transaction=static_cast<bool>(intrinsic_log), this] {
+            if( abort_transaction ) {
+               intrinsic_log->abort_transaction();
+            }
+         });
+
          if( intrinsic_log ) {
             intrinsic_log->start_transaction( trx_context.id );
          }
+
          if ((bool)subjective_cpu_leeway && pending->_block_status == controller::block_status::incomplete) {
             trx_context.leeway = *subjective_cpu_leeway;
          }
@@ -1387,6 +1403,7 @@ struct controller_impl {
                trx_context.undo();
             } else {
                restore.cancel();
+               abort_transaction_in_intrinsic_log_on_exit.cancel();
                trx_context.squash();
             }
 
@@ -2006,6 +2023,15 @@ struct controller_impl {
          }
          pending.reset();
          protocol_features.popped_blocks_to( head->block_num );
+
+         // intrinsic_log is only supported in replay at the moment and abort_block should not be called during replay.
+         // But this is here since intrinsic_log already supports abort_block and it sets things up for the future
+         // in case we want to adapt the intrinsic_log to working during regular operation.
+         // In that case, we would also need to add support for popping committed blocks from the intrinsic log
+         // and call the appropriate function from controller_impl::pop_block().
+         if( intrinsic_log ) {
+            intrinsic_log->abort_block();
+         }
       }
    }
 

From d6e77c84ce53c366a350606c3a141adff7633133 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 20 May 2019 09:53:12 -0400
Subject: [PATCH 0438/1648] update to integrated fc changes

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index bb9ffe1b5cc..fea7e02ae29 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit bb9ffe1b5cc7b14807f0e275f8bae024a8fb66d3
+Subproject commit fea7e02ae297c21fcd7e96a35fb1331dcde90e0d

From 8443d9ae25d7efa1bfb2e16892257b795281d9f2 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 20 May 2019 11:59:45 -0400
Subject: [PATCH 0439/1648] add intrinsic logging with hash of WASM linear
 memory and hash of arguments (except for pointers which are currently not
 supported)

---
 .../eosio/chain/webassembly/common.hpp        | 27 ++++++++++++++++---
 .../include/eosio/chain/webassembly/wabt.hpp  | 20 ++++++++++----
 .../include/eosio/chain/webassembly/wavm.hpp  | 16 ++++++++---
 libraries/chain/webassembly/wabt.cpp          |  6 +++++
 libraries/chain/webassembly/wavm.cpp          |  9 +++++++
 5 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/common.hpp b/libraries/chain/include/eosio/chain/webassembly/common.hpp
index 723bd3039b6..2ef02e9d9a5 100644
--- a/libraries/chain/include/eosio/chain/webassembly/common.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/common.hpp
@@ -7,7 +7,7 @@
 
 using namespace fc;
 
-namespace eosio { namespace chain { 
+namespace eosio { namespace chain {
 
    class apply_context;
    class transaction_context;
@@ -23,7 +23,7 @@ namespace eosio { namespace chain {
          return T(ctx);
       }
    };
-   
+
    template<>
    struct class_from_wasm<transaction_context> {
       /**
@@ -73,8 +73,15 @@ namespace eosio { namespace chain {
          return static_cast<U *>(value);
       }
 
+      template<typename DataStream>
+      friend inline DataStream& operator<<( DataStream& ds, const array_ptr<T>& ) {
+         uint64_t zero = 0;
+         ds.write( (const char*)&zero, sizeof(zero) ); // Serializing pointers is not currently supported
+         return ds;
+      }
+
       T *value;
-   }; 
+   };
 
    /**
     * class to represent an in-wasm-memory char array that must be null terminated
@@ -95,7 +102,21 @@ namespace eosio { namespace chain {
          return static_cast<U *>(value);
       }
 
+      template<typename DataStream>
+      friend inline DataStream& operator<<( DataStream& ds, const null_terminated_ptr& ) {
+         uint64_t zero = 0;
+         ds.write( (const char*)&zero, sizeof(zero) ); // Serializing pointers is not currently supported
+         return ds;
+      }
+
       char *value;
    };
 
+   template<typename... Params>
+   digest_type calc_arguments_hash( Params&&... params ) {
+      digest_type::encoder enc;
+      (fc::raw::pack( enc, std::forward<Params>(params) ), ...);
+      return enc.result();
+   }
+
  } } // eosio::chain
diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index 31456dc1dda..dbc827f5a33 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -35,7 +35,7 @@ struct intrinsic_registrator {
    struct intrinsic_func_info {
       FuncSignature sig;
       intrinsic_fn func;
-   }; 
+   };
 
    static auto& get_map(){
       static map<string, map<string, intrinsic_func_info>> _map;
@@ -395,13 +395,13 @@ struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, size_t, Inputs...>>
          std::vector<std::remove_const_t<T> > copy(length > 0 ? length : 1);
          T* copy_ptr = &copy[0];
          memcpy( (void*)copy_ptr, (void*)base, length * sizeof(T) );
-         Ret ret = Then(vars, static_cast<array_ptr<T>>(copy_ptr), length, rest..., args, (uint32_t)offset - 2);  
+         Ret ret = Then(vars, static_cast<array_ptr<T>>(copy_ptr), length, rest..., args, (uint32_t)offset - 2);
          memcpy( (void*)base, (void*)copy_ptr, length * sizeof(T) );
          return ret;
       }
       return Then(vars, static_cast<array_ptr<T>>(base), length, rest..., args, (uint32_t)offset - 2);
    };
-   
+
    template<then_type Then>
    static const auto fn() {
       return next_step::template fn<translate_one<Then>>();
@@ -525,7 +525,7 @@ struct intrinsic_invoker_impl<Ret, std::tuple<T *, Inputs...>> {
          memcpy( (void*)&copy, (void*)base, sizeof(T) );
          Ret ret = Then(vars, &copy, rest..., args, (uint32_t)offset - 1);
          memcpy( (void*)base, (void*)&copy, sizeof(T) );
-         return ret; 
+         return ret;
       }
       return Then(vars, base, rest..., args, (uint32_t)offset - 1);
    };
@@ -632,7 +632,7 @@ struct intrinsic_invoker_impl<Ret, std::tuple<T &, Inputs...>> {
          memcpy( (void*)&copy, (void*)base, sizeof(T) );
          Ret ret = Then(vars, copy, rest..., args, (uint32_t)offset - 1);
          memcpy( (void*)base, (void*)&copy, sizeof(T) );
-         return ret; 
+         return ret;
       }
       return Then(vars, *base, rest..., args, (uint32_t)offset - 1);
    }
@@ -646,6 +646,8 @@ struct intrinsic_invoker_impl<Ret, std::tuple<T &, Inputs...>> {
 
 extern apply_context* fixme_context;
 
+digest_type calc_memory_hash( const Memory& mem );
+
 /**
  * forward declaration of a wrapper class to call methods of the class
  */
@@ -656,6 +658,10 @@ struct intrinsic_function_invoker {
    template<MethodSig Method>
    static Ret wrapper(wabt_apply_instance_vars& vars, Params... params, const TypedValues&, int) {
       class_from_wasm<Cls>::value(vars.ctx).checktime();
+      auto& intrinsic_log = vars.ctx.control.get_intrinsic_debug_log();
+      if( intrinsic_log ) {
+         intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( *vars.memory ) );
+      }
       return (class_from_wasm<Cls>::value(vars.ctx).*Method)(params...);
    }
 
@@ -672,6 +678,10 @@ struct intrinsic_function_invoker<void, MethodSig, Cls, Params...> {
    template<MethodSig Method>
    static void_type wrapper(wabt_apply_instance_vars& vars, Params... params, const TypedValues& args, int offset) {
       class_from_wasm<Cls>::value(vars.ctx).checktime();
+      auto& intrinsic_log = vars.ctx.control.get_intrinsic_debug_log();
+      if( intrinsic_log ) {
+         intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( *vars.memory ) );
+      }
       (class_from_wasm<Cls>::value(vars.ctx).*Method)(params...);
       return void_type();
    }
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 5bce9db8b40..4885e8c1e00 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -43,13 +43,13 @@ template<typename T>
 inline array_ptr<T> array_ptr_impl (running_instance_context& ctx, U32 ptr, size_t length)
 {
    MemoryInstance* mem = ctx.memory;
-   if (!mem) 
+   if (!mem)
       Runtime::causeException(Exception::Cause::accessViolation);
 
    size_t mem_total = IR::numBytesPerPage * Runtime::getMemoryNumPages(mem);
    if (ptr >= mem_total || length > (mem_total - ptr) / sizeof(T))
       Runtime::causeException(Exception::Cause::accessViolation);
-   
+
    T* ret_ptr = (T*)(getMemoryBaseAddress(mem) + ptr);
 
    return array_ptr<T>((T*)(getMemoryBaseAddress(mem) + ptr));
@@ -408,7 +408,7 @@ struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, size_t, Inputs...>,
          std::vector<std::remove_const_t<T> > copy(length > 0 ? length : 1);
          T* copy_ptr = &copy[0];
          memcpy( (void*)copy_ptr, (void*)base, length * sizeof(T) );
-         Ret ret = Then(ctx, static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);  
+         Ret ret = Then(ctx, static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
          memcpy( (void*)base, (void*)copy_ptr, length * sizeof(T) );
          return ret;
       }
@@ -633,6 +633,8 @@ struct intrinsic_invoker_impl<Ret, std::tuple<T &, Inputs...>, std::tuple<Transl
    }
 };
 
+digest_type calc_memory_hash( MemoryInstance* mem );
+
 /**
  * forward declaration of a wrapper class to call methods of the class
  */
@@ -643,6 +645,10 @@ struct intrinsic_function_invoker {
    template<MethodSig Method>
    static Ret wrapper(running_instance_context& ctx, Params... params) {
       class_from_wasm<Cls>::value(*ctx.apply_ctx).checktime();
+      auto& intrinsic_log = ctx.apply_ctx->control.get_intrinsic_debug_log();
+      if( intrinsic_log ) {
+         intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( ctx.memory ) );
+      }
       return (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
    }
 
@@ -662,6 +668,10 @@ struct intrinsic_function_invoker<WasmSig, void, MethodSig, Cls, Params...> {
    template<MethodSig Method>
    static void_type wrapper(running_instance_context& ctx, Params... params) {
       class_from_wasm<Cls>::value(*ctx.apply_ctx).checktime();
+      auto& intrinsic_log = ctx.apply_ctx->control.get_intrinsic_debug_log();
+      if( intrinsic_log ) {
+         intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( ctx.memory ) );
+      }
       (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
       return void_type();
    }
diff --git a/libraries/chain/webassembly/wabt.cpp b/libraries/chain/webassembly/wabt.cpp
index a23919e0ec6..49beb8ea295 100644
--- a/libraries/chain/webassembly/wabt.cpp
+++ b/libraries/chain/webassembly/wabt.cpp
@@ -100,4 +100,10 @@ void wabt_runtime::immediately_exit_currently_running_module() {
    throw wasm_exit();
 }
 
+digest_type calc_memory_hash( const Memory& mem ) {
+   digest_type::encoder enc;
+   enc.write( mem.data.data(), mem.data.size() );
+   return enc.result();
+}
+
 }}}}
diff --git a/libraries/chain/webassembly/wavm.cpp b/libraries/chain/webassembly/wavm.cpp
index e006d237c5c..e1bcc9e490e 100644
--- a/libraries/chain/webassembly/wavm.cpp
+++ b/libraries/chain/webassembly/wavm.cpp
@@ -160,4 +160,13 @@ void wavm_runtime::immediately_exit_currently_running_module() {
 #endif
 }
 
+digest_type calc_memory_hash( MemoryInstance* mem ) {
+   const char* base_of_memory = (const char*)( getMemoryBaseAddress(mem) );
+   std::size_t mem_size = IR::numBytesPerPage * Runtime::getMemoryNumPages(mem);
+
+   digest_type::encoder enc;
+   enc.write( base_of_memory, mem_size );
+   return enc.result();
+}
+
 }}}}

From e5a8940a703cd839283af7302438444137edb699 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 20 May 2019 12:07:22 -0400
Subject: [PATCH 0440/1648] added unit tests for aliased variant and variant of
 aliases.  fixed exception expectation on other unit test

---
 unittests/abi_tests.cpp | 55 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/unittests/abi_tests.cpp b/unittests/abi_tests.cpp
index 7e6c84fb6f2..e632cb20c75 100644
--- a/unittests/abi_tests.cpp
+++ b/unittests/abi_tests.cpp
@@ -1955,8 +1955,8 @@ BOOST_AUTO_TEST_CASE(abi_type_redefine)
    }
    )=====";
 
-   auto is_type_exception = [](fc::exception const & e) -> bool { return e.to_detail_string().find("invalid type") != std::string::npos; };
-   BOOST_CHECK_EXCEPTION( abi_serializer abis(fc::json::from_string(repeat_abi).as<abi_def>(), max_serialization_time), invalid_type_inside_abi, is_type_exception );
+   auto is_type_exception = [](fc::exception const & e) -> bool { return e.to_detail_string().find("Circular reference in type account_name") != std::string::npos; };
+   BOOST_CHECK_EXCEPTION( abi_serializer abis(fc::json::from_string(repeat_abi).as<abi_def>(), max_serialization_time), abi_circular_def_exception, is_type_exception );
 
 } FC_LOG_AND_RETHROW() }
 
@@ -2304,6 +2304,57 @@ BOOST_AUTO_TEST_CASE(variants)
    } FC_LOG_AND_RETHROW()
 }
 
+BOOST_AUTO_TEST_CASE(aliased_variants)
+{
+   using eosio::testing::fc_exception_message_starts_with;
+
+   auto aliased_variant = R"({
+      "version": "eosio::abi/1.1",
+      "types": [
+         { "new_type_name": "foo", "type": "foo_variant" }
+      ],
+      "variants": [
+         {"name": "foo_variant", "types": ["int8", "string"]}
+      ],
+   })";
+
+   try {
+      // round-trip abi through multiple formats
+      // json -> variant -> abi_def -> bin
+      auto bin = fc::raw::pack(fc::json::from_string(aliased_variant).as<abi_def>());
+      // bin -> abi_def -> variant -> abi_def
+      abi_serializer abis(variant(fc::raw::unpack<abi_def>(bin)).as<abi_def>(), max_serialization_time );
+
+      verify_round_trip_conversion(abis, "foo", R"(["int8",21])", "0015");
+   } FC_LOG_AND_RETHROW()
+}
+
+BOOST_AUTO_TEST_CASE(variant_of_aliases)
+{
+   using eosio::testing::fc_exception_message_starts_with;
+
+   auto aliased_variant = R"({
+      "version": "eosio::abi/1.1",
+      "types": [
+         { "new_type_name": "foo_0", "type": "int8" },
+         { "new_type_name": "foo_1", "type": "string" }
+      ],
+      "variants": [
+         {"name": "foo", "types": ["foo_0", "foo_1"]}
+      ],
+   })";
+
+   try {
+      // round-trip abi through multiple formats
+      // json -> variant -> abi_def -> bin
+      auto bin = fc::raw::pack(fc::json::from_string(aliased_variant).as<abi_def>());
+      // bin -> abi_def -> variant -> abi_def
+      abi_serializer abis(variant(fc::raw::unpack<abi_def>(bin)).as<abi_def>(), max_serialization_time );
+
+      verify_round_trip_conversion(abis, "foo", R"(["foo_0",21])", "0015");
+   } FC_LOG_AND_RETHROW()
+}
+
 BOOST_AUTO_TEST_CASE(extend)
 {
    using eosio::testing::fc_exception_message_starts_with;

From 1a86660efa5c3e26cc13d700b89c6a660440ae03 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Mon, 20 May 2019 14:00:24 -0400
Subject: [PATCH 0441/1648] Ship: port #7383 and #7384 to develop

---
 .../state_history_serialization.hpp           | 13 +++++++++++--
 .../state_history_plugin.cpp                  | 19 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index 07b241aeec6..6685eadadd5 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -89,10 +89,19 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_big_vector_w
    return ds;
 }
 
+template <typename ST>
+inline void history_pack_varuint64(datastream<ST>& ds, uint64_t val) {
+   do {
+      uint8_t b = uint8_t(val) & 0x7f;
+      val >>= 7;
+      b |= ((val > 0) << 7);
+      ds.write((char*)&b, 1);
+   } while (val);
+}
+
 template <typename ST>
 void history_pack_big_bytes(datastream<ST>& ds, const eosio::chain::bytes& v) {
-   FC_ASSERT(v.size() <= 1024 * 1024 * 1024);
-   fc::raw::pack(ds, unsigned_int((uint32_t)v.size()));
+   history_pack_varuint64(ds, v.size());
    if (v.size())
       ds.write(&v.front(), (uint32_t)v.size());
 }
diff --git a/plugins/state_history_plugin/state_history_plugin.cpp b/plugins/state_history_plugin/state_history_plugin.cpp
index 0d6d33fb34a..27ace9718d3 100644
--- a/plugins/state_history_plugin/state_history_plugin.cpp
+++ b/plugins/state_history_plugin/state_history_plugin.cpp
@@ -53,6 +53,16 @@ static bytes zlib_compress_bytes(bytes in) {
    return out;
 }
 
+static bytes zlib_decompress(const bytes& in) {
+   bytes                  out;
+   bio::filtering_ostream decomp;
+   decomp.push(bio::zlib_decompressor());
+   decomp.push(bio::back_inserter(out));
+   bio::write(decomp, in.data(), in.size());
+   bio::close(decomp);
+   return out;
+}
+
 template <typename T>
 bool include_delta(const T& old, const T& curr) {
    return true;
@@ -126,10 +136,10 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
       auto&                    stream = log.get_entry(block_num, header);
       uint32_t                 s;
       stream.read((char*)&s, sizeof(s));
-      result.emplace();
-      result->resize(s);
+      bytes compressed(s);
       if (s)
-         stream.read(result->data(), s);
+         stream.read(compressed.data(), s);
+      result = zlib_decompress(compressed);
    }
 
    void get_block(uint32_t block_num, fc::optional<bytes>& result) {
@@ -139,7 +149,8 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
       } catch (...) {
          return;
       }
-      result = fc::raw::pack(*p);
+      if (p)
+         result = fc::raw::pack(*p);
    }
 
    fc::optional<chain::block_id_type> get_block_id(uint32_t block_num) {

From 51cce2ac8b942852ac6e2c67d036808056a85a43 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 20 May 2019 15:24:43 -0400
Subject: [PATCH 0442/1648] fix ABI problems

---
 .../state_history_plugin_abi.cpp                 |  2 +-
 unittests/contracts/eosio.bios/eosio.bios.abi    | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/plugins/state_history_plugin/state_history_plugin_abi.cpp b/plugins/state_history_plugin/state_history_plugin_abi.cpp
index aa9c1fdc1be..338dc867852 100644
--- a/plugins/state_history_plugin/state_history_plugin_abi.cpp
+++ b/plugins/state_history_plugin/state_history_plugin_abi.cpp
@@ -313,7 +313,7 @@ extern const char* const state_history_plugin_abi = R"({
         },
         {
             "name": "block_signing_authority_v0", "fields": [
-                { "type": "uint32", "name": "weight" }
+                { "type": "uint32", "name": "weight" },
                 { "type": "key_weight[]", "name": "keys" }
             ]
         },
diff --git a/unittests/contracts/eosio.bios/eosio.bios.abi b/unittests/contracts/eosio.bios/eosio.bios.abi
index 0cf509deb60..9c9a46eda6f 100644
--- a/unittests/contracts/eosio.bios/eosio.bios.abi
+++ b/unittests/contracts/eosio.bios/eosio.bios.abi
@@ -54,6 +54,20 @@
                 }
             ]
         },
+        {
+            "name": "block_signing_authority_v0",
+            "base": "",
+            "fields": [
+                {
+                    "name": "threshold",
+                    "type": "uint32"
+                },
+                {
+                    "name": "keys",
+                    "type": "key_weight[]"
+                }
+            ]
+        },
         {
             "name": "blockchain_parameters",
             "base": "",
@@ -265,7 +279,7 @@
                     "type": "name"
                 },
                 {
-                    "name": "block_signing_authority",
+                    "name": "authority",
                     "type": "block_signing_authority"
                 }
             ]

From a57656c5fe93252a69fc0297516f330a4bd3276a Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 20 May 2019 17:05:42 -0400
Subject: [PATCH 0443/1648] fix ABI and tester compatibility with variant
 differences

---
 libraries/chain/CMakeLists.txt                |  1 +
 .../include/eosio/chain/producer_schedule.hpp | 14 +++++++++++
 libraries/chain/producer_schedule.cpp         | 25 +++++++++++++++++++
 libraries/testing/tester.cpp                  |  9 ++++++-
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 libraries/chain/producer_schedule.cpp

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 254d462c5ed..7ce955ae6a7 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -49,6 +49,7 @@ add_library( eosio_chain
              protocol_state_object.cpp
              protocol_feature_activation.cpp
              protocol_feature_manager.cpp
+             producer_schedule.cpp
              genesis_intrinsics.cpp
              whitelisted_intrinsics.cpp
              thread_utils.cpp
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index ffe249e535c..b2970d9d581 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -84,6 +84,20 @@ namespace eosio { namespace chain {
          return key_is_relevant(key, authority);
       }
 
+      /**
+       * ABI's for contracts expect variants to be serialized as a 2 entry array of
+       * [type-name, value].
+       *
+       * This is incompatible with standard FC rules for
+       * static_variants which produce
+       *
+       * [ordinal, value]
+       *
+       * this method produces an appropriate variant for contracts where the authority field
+       * is correctly formatted
+       */
+      fc::variant get_abi_variant() const;
+
       friend bool operator == ( const producer_authority& lhs, const producer_authority& rhs ) {
          return tie( lhs.producer_name, lhs.authority ) == tie( rhs.producer_name, rhs.authority );
       }
diff --git a/libraries/chain/producer_schedule.cpp b/libraries/chain/producer_schedule.cpp
new file mode 100644
index 00000000000..151e9e7e200
--- /dev/null
+++ b/libraries/chain/producer_schedule.cpp
@@ -0,0 +1,25 @@
+#include <eosio/chain/producer_schedule.hpp>
+
+namespace eosio { namespace chain {
+
+fc::variant producer_authority::get_abi_variant() const {
+      auto authority_variant = authority.visit([](const auto& a){
+         fc::variant value;
+         fc::to_variant(a, value);
+
+         std::string full_type_name = fc::get_typename<std::decay_t<decltype(a)>>::name();
+         auto last_colon = full_type_name.rfind(":");
+         std::string type_name = last_colon == std::string::npos ? std::move(full_type_name): full_type_name.substr(last_colon + 1);
+
+         return fc::variants {
+               fc::variant(std::move(type_name)),
+               std::move(value)
+         };
+      });
+
+      return fc::mutable_variant_object()
+            ("producer_name", producer_name)
+            ("authority", std::move(authority_variant));
+}
+
+} } /// eosio::chain
\ No newline at end of file
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 6f44d718d3a..bc8a6bc6726 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -970,8 +970,15 @@ namespace eosio { namespace testing {
    transaction_trace_ptr base_tester::set_producers(const vector<account_name>& producer_names) {
       auto schedule = get_producer_authorities( producer_names );
 
+      // FC reflection does not create variants that are compatible with ABI 1.1 so we manually translate.
+      fc::variants schedule_variant;
+      schedule_variant.reserve(schedule.size());
+      for( const auto& e: schedule ) {
+         schedule_variant.emplace_back(e.get_abi_variant());
+      }
+
       return push_action( config::system_account_name, N(setprods), config::system_account_name,
-                          fc::mutable_variant_object()("schedule", schedule));
+                          fc::mutable_variant_object()("schedule", schedule_variant));
    }
 
    const table_id_object* base_tester::find_table( name code, name scope, name table ) {

From 393356ffacf264b754de8d70d8e07d2078775dae Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Mon, 20 May 2019 17:13:26 -0400
Subject: [PATCH 0444/1648] stuff

---
 libraries/CMakeLists.txt               | 2 +-
 libraries/chain/webassembly/eos-vm.cpp | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 9727f511f19..e95544bcd7e 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -14,7 +14,7 @@ set(RUN_RE2C OFF CACHE BOOL "Run re2c")
 set(WITH_EXCEPTIONS ON CACHE BOOL "Build with exceptions enabled" FORCE)
 add_subdirectory( wabt )
 
-set(USE_EXISTING_SOFTFLOAT ON)
+set(USE_EXISTING_SOFTFLOAT ON CACHE BOOL "use pre-exisiting softfloat lib")
 set(ENABLE_TESTS OFF)
 set(ENABLE_ADDRESS_SANITIZER OFF)
 set(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER OFF)
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index c47c10b3c81..6c7420ed69f 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -38,14 +38,11 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
 eos_vm_runtime::eos_vm_runtime() {}
 
 std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
-   std::vector<uint8_t> cb((uint8_t*)code_bytes, (uint8_t*)code_bytes+code_size);
-   //std::vector<uint8_t> cb;
-   //cb.resize(code_size);
-   //memcpy(cb.data(), code_bytes, code_size);
    std::ofstream mf("temp.wasm");
-   mf.write((char*)cb.data(), cb.size());
+   mf.write((char*)code_bytes, code_size);
    mf.close();
-   std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>( cb );
+   wasm_code_ptr code((uint8_t*)code_bytes, 0);
+   std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size);
    registered_host_functions<apply_context>::resolve(bkend->get_module());
    _bkend = bkend.get();
    return std::make_unique<eos_vm_instantiated_module>(std::move(bkend));

From ac0f6209ee00f0b007473cdb0bfee6297d845c77 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 20 May 2019 17:44:49 -0400
Subject: [PATCH 0445/1648] fix more tests that relied on pre-authority
 producer schedules intentionally

---
 .../testing/include/eosio/testing/tester.hpp   |  1 +
 libraries/testing/tester.cpp                   | 18 ++++++++++++++++++
 unittests/producer_schedule_tests.cpp          |  6 +++---
 unittests/protocol_feature_tests.cpp           | 16 ++++++++--------
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 9ade5bf9971..444972c10a5 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -173,6 +173,7 @@ namespace eosio { namespace testing {
 
          vector<producer_authority>  get_producer_authorities( const vector<account_name>& producer_names )const;
          transaction_trace_ptr       set_producers(const vector<account_name>& producer_names);
+         transaction_trace_ptr       set_producers_legacy(const vector<account_name>& producer_names);
 
          void link_authority( account_name account, account_name code,  permission_name req, action_name type = "" );
          void unlink_authority( account_name account, account_name code, action_name type = "" );
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index bc8a6bc6726..d9799d62966 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -981,6 +981,24 @@ namespace eosio { namespace testing {
                           fc::mutable_variant_object()("schedule", schedule_variant));
    }
 
+   transaction_trace_ptr base_tester::set_producers_legacy(const vector<account_name>& producer_names) {
+      auto schedule = get_producer_authorities( producer_names );
+      // down-rank to old version
+
+      vector<legacy::producer_key> legacy_keys;
+      legacy_keys.reserve(schedule.size());
+      for (const auto &p : schedule) {
+         p.authority.visit([&legacy_keys, &p](const auto& auth){
+            legacy_keys.emplace_back(legacy::producer_key{p.producer_name, auth.keys.front().key});
+         });
+      }
+
+      return push_action( config::system_account_name, N(setprods), config::system_account_name,
+                          fc::mutable_variant_object()("schedule", legacy_keys));
+
+   }
+
+
    const table_id_object* base_tester::find_table( name code, name scope, name table ) {
       auto tid = control->db().find<table_id_object, by_code_scope_table>(boost::make_tuple(code, scope, table));
       return tid;
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index 4dbc28808a5..7d8a20f959b 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -340,7 +340,7 @@ BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
       return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
    };
 
-   auto res = c.set_producers( {N(alice),N(bob)} );
+   auto res = c.set_producers_legacy( {N(alice),N(bob)} );
    vector<producer_authority> sch1 = {
                                  producer_authority{N(alice), block_signing_authority_v0{ 1, {{ get_public_key(N(alice), "active"),1}}}},
                                  producer_authority{N(bob),   block_signing_authority_v0{ 1, {{ get_public_key(N(bob),   "active"),1}}}}
@@ -362,7 +362,7 @@ BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
    BOOST_CHECK_EQUAL( true, compare_schedules( sch1, c.control->active_producers() ) );
    c.produce_blocks(6);
 
-   res = c.set_producers( {} );
+   res = c.set_producers_legacy( {} );
    wlog("set producer schedule to []");
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
    BOOST_CHECK_EQUAL( c.control->proposed_producers()->producers.size(), 0u );
@@ -382,7 +382,7 @@ BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
    BOOST_CHECK_EQUAL( c.control->pending_producers().version, 2u );
 
    // Setting a new producer schedule should still use version 2
-   res = c.set_producers( {N(alice),N(bob),N(carol)} );
+   res = c.set_producers_legacy( {N(alice),N(bob),N(carol)} );
    vector<producer_authority> sch2 = {
                                  producer_authority{N(alice), block_signing_authority_v0{ 1, {{get_public_key(N(alice), "active"),1}}}},
                                  producer_authority{N(bob),   block_signing_authority_v0{ 1, {{get_public_key(N(bob),   "active"),1}}}},
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index fae902ab157..ea1b2459548 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -52,8 +52,8 @@ BOOST_AUTO_TEST_CASE( activate_preactivate_feature ) try {
    c.produce_block();
 
    // Now the latest bios contract can be set.
-   c.set_code( config::system_account_name, contracts::eosio_bios_wasm() );
-   c.set_abi( config::system_account_name, contracts::eosio_bios_abi().data() );
+   c.set_code( config::system_account_name, contracts::before_producer_authority_eosio_bios_wasm() );
+   c.set_abi( config::system_account_name, contracts::before_producer_authority_eosio_bios_abi().data() );
 
    c.produce_block();
 
@@ -332,7 +332,7 @@ BOOST_AUTO_TEST_CASE( subjective_restrictions_test ) try {
 
    // Second, test subjective_restrictions on feature that need to be activated WITH preactivation (ONLY_LINK_TO_EXISTING_PERMISSION)
 
-   c.set_bios_contract();
+   c.set_before_producer_authority_bios_contract();
    c.produce_block();
 
    custom_subjective_restrictions = {
@@ -763,7 +763,7 @@ BOOST_AUTO_TEST_CASE( disallow_empty_producer_schedule_test ) { try {
    BOOST_REQUIRE( d );
 
    // Before activation, it is allowed to set empty producer schedule
-   c.set_producers( {} );
+   c.set_producers_legacy( {} );
 
    // After activation, it should not be allowed
    c.preactivate_protocol_features( {*d} );
@@ -775,7 +775,7 @@ BOOST_AUTO_TEST_CASE( disallow_empty_producer_schedule_test ) { try {
    // Setting non empty producer schedule should still be fine
    vector<name> producer_names = {N(alice),N(bob),N(carol)};
    c.create_accounts( producer_names );
-   c.set_producers( producer_names );
+   c.set_producers_legacy( producer_names );
    c.produce_blocks(2);
    const auto& schedule = c.get_producer_authorities( producer_names );
    BOOST_CHECK( std::equal( schedule.begin(), schedule.end(), c.control->active_producers().producers.begin()) );
@@ -969,7 +969,7 @@ BOOST_AUTO_TEST_CASE( forward_setcode_test ) { try {
    const auto& pfm = c.control->get_protocol_feature_manager();
    const auto& d = pfm.get_builtin_digest( builtin_protocol_feature_t::forward_setcode );
    BOOST_REQUIRE( d );
-   c.set_bios_contract();
+   c.set_before_producer_authority_bios_contract();
    c.preactivate_protocol_features( {*d} );
    c.produce_block();
    c.set_code( config::system_account_name, contracts::reject_all_wasm() );
@@ -985,7 +985,7 @@ BOOST_AUTO_TEST_CASE( forward_setcode_test ) { try {
    tester c2(setup_policy::none);
    push_blocks( c, c2 ); // make a backup of the chain to enable testing further conditions.
 
-   c.set_bios_contract(); // To allow pushing further actions for setting up the other part of the test.
+   c.set_before_producer_authority_bios_contract(); // To allow pushing further actions for setting up the other part of the test.
    c.create_account( N(rejectall) );
    c.produce_block();
    // The existence of the rejectall account will make the reject_all contract reject all actions with no exception.
@@ -1005,7 +1005,7 @@ BOOST_AUTO_TEST_CASE( forward_setcode_test ) { try {
 
    // However, it should still be possible to set the bios contract because the WASM on eosio is called after the
    // native setcode function completes.
-   c2.set_bios_contract();
+   c2.set_before_producer_authority_bios_contract();
    c2.produce_block();
 } FC_LOG_AND_RETHROW() }
 

From 04be48745a948e4fbdb9db085a8b3995913812b9 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Mon, 20 May 2019 17:53:31 -0400
Subject: [PATCH 0446/1648] added eos-vm as submodule

---
 .gitmodules      | 3 +++
 libraries/eos-vm | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 libraries/eos-vm

diff --git a/.gitmodules b/.gitmodules
index 80fe86f626d..4e25bc2f43c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,3 +18,6 @@
 [submodule "libraries/yubihsm"]
 	path = libraries/yubihsm
 	url = https://github.com/Yubico/yubihsm-shell
+[submodule "libraries/eos-vm"]
+	path = libraries/eos-vm
+	url = git@github.com:eosio/eos-vm
diff --git a/libraries/eos-vm b/libraries/eos-vm
new file mode 160000
index 00000000000..4f1c727ba54
--- /dev/null
+++ b/libraries/eos-vm
@@ -0,0 +1 @@
+Subproject commit 4f1c727ba5484aee95bc166c2cfaf0c2aa9c81d4

From b90a0d2cf1b2c6cfdfdedccae4f9b6f6d18c9cfc Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 21 May 2019 10:50:49 -0400
Subject: [PATCH 0447/1648] work on multiple sigs

---
 libraries/chain/block.cpp                     | 64 +++++++++++++++++++
 libraries/chain/block_header_state.cpp        | 58 ++++++++++++++---
 libraries/chain/include/eosio/chain/block.hpp | 41 +++++++++++-
 .../eosio/chain/block_header_state.hpp        | 14 ++--
 .../chain/include/eosio/chain/exceptions.hpp  |  9 ++-
 .../include/eosio/chain/producer_schedule.hpp | 14 ++++
 6 files changed, 180 insertions(+), 20 deletions(-)
 create mode 100644 libraries/chain/block.cpp

diff --git a/libraries/chain/block.cpp b/libraries/chain/block.cpp
new file mode 100644
index 00000000000..cb9ed80cd07
--- /dev/null
+++ b/libraries/chain/block.cpp
@@ -0,0 +1,64 @@
+#include <eosio/chain/block.hpp>
+
+namespace eosio { namespace chain {
+   void additional_block_signatures_extension::reflector_init() {
+      static_assert( fc::raw::has_feature_reflector_init_on_unpacked_reflected_types,
+                     "additional_block_signatures_extension expects FC to support reflector_init" );
+
+      EOS_ASSERT( signatures.size() > 0, ill_additional_block_signatures_extension,
+                  "Additional block signatures extension must contain at least one signature",
+      );
+
+      set<signature_type> s;
+
+      for( const auto& s : signatures ) {
+         auto res = s.insert( s );
+         EOS_ASSERT( res.second, ill_additional_block_signatures_extension,
+                     "Signature ${s} was repeated in the additional block signatures extension",
+                     ("s", s)
+         );
+      }
+   }
+
+   flat_multimap<uint16_t, block_extension> block::validate_and_extract_extensions()const {
+      using decompose_t = block_extension_types::decompose_t;
+
+      flat_multimap<uint16_t, block_header_extension> results;
+
+      uint16_t id_type_lower_bound = 0;
+
+      for( size_t i = 0; i < block_extensions.size(); ++i ) {
+         const auto& e = block_extensions[i];
+         auto id = e.first;
+
+         EOS_ASSERT( id >= id_type_lower_bound, invalid_block_extension,
+                     "Block extensions are not in the correct order (ascending id types required)"
+         );
+
+         auto iter = results.emplace(std::piecewise_construct,
+            std::forward_as_tuple(id),
+            std::forward_as_tuple()
+         );
+
+         auto match = decompose_t::extract<block_extension>( id, e.second, iter->second );
+         EOS_ASSERT( match, invalid_block_extension,
+                     "Block extension with id type ${id} is not supported",
+                     ("id", id)
+         );
+
+         if( match->enforce_unique ) {
+            EOS_ASSERT( i == 0 || id > id_type_lower_bound, invalid_block_header_extension,
+                        "Block extension with id type ${id} is not allowed to repeat",
+                        ("id", id)
+            );
+         }
+
+
+         id_type_lower_bound = id;
+      }
+
+      return results;
+
+   }
+
+} } /// namespace eosio::chain
\ No newline at end of file
diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index dd2e3b9fa07..cd940827add 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -314,6 +314,7 @@ namespace eosio { namespace chain {
 
    block_header_state pending_block_header_state::finish_next(
                                  const signed_block_header& h,
+                                 const vector<signature_type>& additional_signatures,
                                  const protocol_feature_set& pfs,
                                  const std::function<void( block_timestamp_type,
                                                            const flat_set<digest_type>&,
@@ -323,6 +324,15 @@ namespace eosio { namespace chain {
    {
       auto result = std::move(*this)._finish_next( h, pfs, validator );
 
+      if( !additional_signatures.empty() ) {
+         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
+         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+
+         EOS_ASSERT(wtmsig_enabled, producer_schedule_exception, "Block contains multiple signatures before WTMsig block signatures are enabled" );
+         result.additional_signatures = additional_signatures;
+      }
+
       // ASSUMPTION FROM controller_impl::apply_block = all untrusted blocks will have their signatures pre-validated here
       if( !skip_validate_signee ) {
         result.verify_signee( );
@@ -343,6 +353,15 @@ namespace eosio { namespace chain {
       auto result = std::move(*this)._finish_next( h, pfs, validator );
       result.sign( signer );
       h.producer_signature = result.header.producer_signature;
+
+      if( !result.additional_signatures.empty() ) {
+         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
+         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+
+         EOS_ASSERT(wtmsig_enabled, producer_schedule_exception, "Block was signed with multiple signatures before WTMsig block signatures are enabled" );
+      }
+
       return result;
    }
 
@@ -356,13 +375,14 @@ namespace eosio { namespace chain {
     */
    block_header_state block_header_state::next(
                         const signed_block_header& h,
+                        const vector<signature_type>& _additional_signatures,
                         const protocol_feature_set& pfs,
                         const std::function<void( block_timestamp_type,
                                                   const flat_set<digest_type>&,
                                                   const vector<digest_type>& )>& validator,
                         bool skip_validate_signee )const
    {
-      return next( h.timestamp, h.confirmed ).finish_next( h, pfs, validator, skip_validate_signee );
+      return next( h.timestamp, h.confirmed ).finish_next( h, _additional_signatures, pfs, validator, skip_validate_signee );
    }
 
    digest_type   block_header_state::sig_digest()const {
@@ -374,21 +394,39 @@ namespace eosio { namespace chain {
       auto d = sig_digest();
       // TODO: modify block to allow multiple sigs
       auto sigs = signer( d );
-      header.producer_signature = sigs.front();
 
-      EOS_ASSERT( producer_authority::key_is_relevant(signee(), valid_block_signing_authority), wrong_signing_key, "block is signed with unexpected key" );
-   }
+      EOS_ASSERT(!sigs.empty(), no_block_signatures, "Signer returned no signatures");
+      header.producer_signature = sigs.back();
+      sigs.pop_back();
+
+      additional_signatures = std::move(sigs);
 
-   public_key_type block_header_state::signee()const {
-      return fc::crypto::public_key( header.producer_signature, sig_digest(), true );
+      verify_signee();
    }
 
    void block_header_state::verify_signee( )const {
-      auto signing_key = signee();
+      flat_set<public_key_type> keys;
+      keys.reserve(1 + additional_signatures.size());
+      keys.emplace(fc::crypto::public_key( header.producer_signature, sig_digest(), true ));
+
+      for (const auto& s: additional_signatures) {
+         auto key = fc::crypto::public_key( s, sig_digest(), true );
+         EOS_ASSERT(keys.find(key) != keys.end(), wrong_signing_key,
+               "block signed by same key twice",
+               ("key", key));
+
+         keys.emplace(std::move(key));
+      }
+
+      for (const auto& k: keys) {
+         EOS_ASSERT(producer_authority::key_is_relevant(k, valid_block_signing_authority), wrong_signing_key,
+                    "block signed by unexpected key",
+                    ("signing_key", k)("valid_keys", valid_block_signing_authority));
+      }
 
-      EOS_ASSERT( producer_authority::key_is_relevant(signing_key, valid_block_signing_authority), wrong_signing_key,
-                  "block not signed by expected key",
-                  ("signing_key", signing_key)( "valid_keys", valid_block_signing_authority ) );
+      EOS_ASSERT(producer_authority::keys_satisfy(keys, valid_block_signing_authority), wrong_signing_key,
+            "block signatures do not satisfy the block signing authority",
+            ("keys", keys)("authority", valid_block_signing_authority));
    }
 
    /**
diff --git a/libraries/chain/include/eosio/chain/block.hpp b/libraries/chain/include/eosio/chain/block.hpp
index eee489e2961..6229c6760c0 100644
--- a/libraries/chain/include/eosio/chain/block.hpp
+++ b/libraries/chain/include/eosio/chain/block.hpp
@@ -51,13 +51,45 @@ namespace eosio { namespace chain {
       }
    };
 
+   struct additional_block_signatures_extension : fc::reflect_init {
+      static constexpr uint16_t extension_id() { return 2; }
+      static constexpr bool     enforce_unique() { return true; }
+
+      additional_block_signatures_extension() = default;
+
+      additional_block_signatures_extension( const vector<signature_type>& signatures )
+      :signatures( signatures )
+      {}
+
+      additional_block_signatures_extension( vector<signature_type>&& signatures )
+      :signatures( std::move(signatures) )
+      {}
+
+      void reflector_init();
+
+      vector<signature_type> signatures;
+   };
+
+   namespace detail {
+      template<typename... Ts>
+      struct block_extension_types {
+         using block_extension_t = fc::static_variant< Ts... >;
+         using decompose_t = decompose< Ts... >;
+      };
+   }
+
+   using block_extension_types = detail::block_extension_types<
+         additional_block_signatures_extension
+   >;
+
+   using block_extension = block_extension_types::block_extension_t;
 
    /**
     */
-   struct signed_block : public signed_block_header {
-    private:
+   struct signed_block : public signed_block_header{
+   private:
       signed_block( const signed_block& ) = default;
-    public:
+   public:
       signed_block() = default;
       explicit signed_block( const signed_block_header& h ):signed_block_header(h){}
       signed_block( signed_block&& ) = default;
@@ -66,6 +98,8 @@ namespace eosio { namespace chain {
 
       vector<transaction_receipt>   transactions; /// new or generated transactions
       extensions_type               block_extensions;
+
+      flat_multimap<uint16_t, block_extension> validate_and_extract_extensions()const;
    };
    using signed_block_ptr = std::shared_ptr<signed_block>;
 
@@ -83,4 +117,5 @@ FC_REFLECT_ENUM( eosio::chain::transaction_receipt::status_enum,
 
 FC_REFLECT(eosio::chain::transaction_receipt_header, (status)(cpu_usage_us)(net_usage_words) )
 FC_REFLECT_DERIVED(eosio::chain::transaction_receipt, (eosio::chain::transaction_receipt_header), (trx) )
+FC_REFLECT(eosio::chain::additional_block_signatures_extension, (signatures));
 FC_REFLECT_DERIVED(eosio::chain::signed_block, (eosio::chain::signed_block_header), (transactions)(block_extensions) )
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 6b3deca5dfe..9fb7bbf2d67 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -47,6 +47,7 @@ struct pending_block_header_state : public detail::block_header_state_common {
                                           const protocol_feature_set& pfs)const;
 
    block_header_state  finish_next( const signed_block_header& h,
+                                    const vector<signature_type>& additional_signatures,
                                     const protocol_feature_set& pfs,
                                     const std::function<void( block_timestamp_type,
                                                               const flat_set<digest_type>&,
@@ -78,6 +79,7 @@ struct block_header_state : public detail::block_header_state_common {
    signed_block_header                  header;
    detail::schedule_info                pending_schedule;
    protocol_feature_activation_set_ptr  activated_protocol_features;
+   vector<signature_type>               additional_signatures;
 
    /// this data is redundant with the data stored in header, but it acts as a cache that avoids
    /// duplication of work
@@ -92,6 +94,7 @@ struct block_header_state : public detail::block_header_state_common {
    pending_block_header_state  next( block_timestamp_type when, uint16_t num_prev_blocks_to_confirm )const;
 
    block_header_state   next( const signed_block_header& h,
+                              const vector<signature_type>& additional_signatures,
                               const protocol_feature_set& pfs,
                               const std::function<void( block_timestamp_type,
                                                         const flat_set<digest_type>&,
@@ -102,12 +105,11 @@ struct block_header_state : public detail::block_header_state_common {
    uint32_t             calc_dpos_last_irreversible( account_name producer_of_next_block )const;
    bool                 is_active_producer( account_name n )const;
 
-   producer_authority   get_scheduled_producer( block_timestamp_type t )const;
-   const block_id_type& prev()const { return header.previous; }
-   digest_type          sig_digest()const;
-   void                 sign( const signer_callback_type& signer );
-   public_key_type      signee()const;
-   void                 verify_signee()const;
+   producer_authority     get_scheduled_producer( block_timestamp_type t )const;
+   const block_id_type&   prev()const { return header.previous; }
+   digest_type            sig_digest()const;
+   void                   sign( const signer_callback_type& signer );
+   void                   verify_signee()const;
 
    const vector<digest_type>& get_new_protocol_feature_activations()const;
 };
diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 28ff33b21db..3d571762725 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -204,7 +204,10 @@ namespace eosio { namespace chain {
                                     3030010, "Invalid block header extension" )
       FC_DECLARE_DERIVED_EXCEPTION( ill_formed_protocol_feature_activation, block_validate_exception,
                                     3030011, "Block includes an ill-formed protocol feature activation extension" )
-
+      FC_DECLARE_DERIVED_EXCEPTION( invalid_block_extension, block_validate_exception,
+                                    3030012, "Invalid block extension" )
+      FC_DECLARE_DERIVED_EXCEPTION( ill_formed_additional_block_signatures_extension, block_validate_exception,
+                                    3030013, "Block includes an ill-formed additional block signature extension" )
 
 
    FC_DECLARE_DERIVED_EXCEPTION( transaction_exception,             chain_exception,
@@ -519,6 +522,10 @@ namespace eosio { namespace chain {
                                     3170009, "Snapshot Finalization Exception" )
       FC_DECLARE_DERIVED_EXCEPTION( invalid_protocol_features_to_activate,  producer_exception,
                                     3170010, "The protocol features to be activated were not valid" )
+      FC_DECLARE_DERIVED_EXCEPTION( no_block_signatures,  producer_exception,
+                                    3170011, "The signer returned no valid block signatures" )
+      FC_DECLARE_DERIVED_EXCEPTION( unsupported_multiple_block_signatures,  producer_exception,
+                                    3170011, "The signer returned multiple signatures but that is not supported" )
 
    FC_DECLARE_DERIVED_EXCEPTION( reversible_blocks_exception,           chain_exception,
                                  3180000, "Reversible Blocks exception" )
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index b2970d9d581..d2cf682fd6b 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -60,6 +60,10 @@ namespace eosio { namespace chain {
          }) != keys.end();
       }
 
+      bool keys_satisfy( const flat_set<public_key_type>& keys ) const {
+         return true;
+      }
+
       friend bool operator == ( const block_signing_authority_v0& lhs, const block_signing_authority_v0& rhs ) {
          return tie( lhs.threshold, lhs.keys ) == tie( rhs.threshold, rhs.keys );
       }
@@ -84,6 +88,16 @@ namespace eosio { namespace chain {
          return key_is_relevant(key, authority);
       }
 
+      static bool keys_satisfy( const flat_set<public_key_type>& keys, const block_signing_authority& authority ) {
+         return authority.visit([&keys](const auto &a){
+            return a.keys_satisfy(keys);
+         });
+      }
+
+      bool keys_satisfy( const flat_set<public_key_type>& keys ) const {
+         return keys_satisfy(keys, authority);
+      }
+
       /**
        * ABI's for contracts expect variants to be serialized as a 2 entry array of
        * [type-name, value].

From 32e601ebb4aaae829383a0d690b97393eba8cbc9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 21 May 2019 14:17:07 -0500
Subject: [PATCH 0448/1648] Merge issue between #7315 and #7316

---
 plugins/chain_plugin/chain_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 7346519c022..0ff9240f380 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -2240,7 +2240,7 @@ read_only::get_account_results read_only::get_account( const get_account_params&
       t_id = d.find<chain::table_id_object, chain::by_code_scope_table>(boost::make_tuple( config::system_account_name, config::system_account_name, N(rexbal) ));
       if (t_id != nullptr) {
          const auto &idx = d.get_index<key_value_index, by_scope_primary>();
-         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name ));
+         auto it = idx.find(boost::make_tuple( t_id->id, params.account_name.to_uint64_t() ));
          if( it != idx.end() ) {
             vector<char> data;
             copy_inline_row(*it, data);

From 1cdd3490e96bd94aa4d464b2e2c0f882382c9254 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 21 May 2019 14:31:27 -0500
Subject: [PATCH 0449/1648] Output log message as debug instead of warn

---
 libraries/chain/transaction_metadata.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index b3f7763f82b..ac6012fff4a 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -16,7 +16,7 @@ recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chai
 
    g.unlock();
    // shared_keys_future not created or different chain_id
-   wlog( "recovering keys in recover_keys" );
+   dlog( "recovering keys in recover_keys" );
    auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
    const signed_transaction& trn = _packed_trx->get_signed_transaction();
    fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, fc::time_point::maximum(), *recovered_pub_keys );

From a98ac5a07c669d4d539112e96acb4d365cc5ed79 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 21 May 2019 15:23:30 -0500
Subject: [PATCH 0450/1648] Moved max_incoming_transaction_queue_size to
 incoming_transaction_queue class and minor cleanup.

---
 plugins/producer_plugin/producer_plugin.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 9f4e139e189..a56a34bfa8c 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -201,10 +201,9 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       std::atomic<int32_t>                                      _max_transaction_time_ms; // modified by app thread, read by net_plugin thread pool
       fc::microseconds                                          _max_irreversible_block_age_us;
-      static uint64_t                                           _max_incoming_transaction_queue_size;
       int32_t                                                   _produce_time_offset_us = 0;
       int32_t                                                   _last_block_time_offset_us = 0;
-      int32_t                                                   _max_scheduled_transaction_time_per_block_ms;
+      int32_t                                                   _max_scheduled_transaction_time_per_block_ms = 0;
       fc::time_point                                            _irreversible_block_time;
       fc::microseconds                                          _keosd_provider_timeout_us;
 
@@ -430,18 +429,21 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       }
 
       class incoming_transaction_queue {
+         uint64_t max_incoming_transaction_queue_size = 0;
          uint64_t size_in_bytes = 0;
          std::deque<std::tuple<transaction_metadata_ptr, bool, next_function<transaction_trace_ptr>>> _incoming_transactions;
 
       private:
-         uint64_t calc_size( const transaction_metadata_ptr& trx ) {
+         static uint64_t calc_size( const transaction_metadata_ptr& trx ) {
             return trx->packed_trx()->get_unprunable_size() + trx->packed_trx()->get_prunable_size() + sizeof( *trx );
          }
 
       public:
+         void set_max_incoming_transaction_queue_size( uint64_t v ) { max_incoming_transaction_queue_size = v; }
+
          void add( const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next ) {
             auto size = calc_size( trx );
-            EOS_ASSERT( size_in_bytes + size < _max_incoming_transaction_queue_size, tx_resource_exhaustion, "Transaction exceeded producer resource limit" );
+            EOS_ASSERT( size_in_bytes + size < max_incoming_transaction_queue_size, tx_resource_exhaustion, "Transaction exceeded producer resource limit" );
             size_in_bytes += size;
             _incoming_transactions.emplace_back( trx, persist_until_expired, std::move( next ) );
          }
@@ -603,8 +605,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       void schedule_delayed_production_loop(const std::weak_ptr<producer_plugin_impl>& weak_this, const block_timestamp_type& current_block_time);
 };
 
-uint64_t producer_plugin_impl::_max_incoming_transaction_queue_size = 0;
-
 void new_chain_banner(const eosio::chain::controller& db)
 {
    std::cerr << "\n"
@@ -810,9 +810,12 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
 
    my->_max_irreversible_block_age_us = fc::seconds(options.at("max-irreversible-block-age").as<int32_t>());
 
-   my->_max_incoming_transaction_queue_size = options.at("incoming-transaction-queue-size-mb").as<uint16_t>() * 1024*1024;
-   EOS_ASSERT( my->_max_incoming_transaction_queue_size > 0, plugin_config_exception,
-               "incoming-transaction-queue-size-mb ${mb} must be greater than 0", ("mb", my->_max_incoming_transaction_queue_size) );
+   auto max_incoming_transaction_queue_size = options.at("incoming-transaction-queue-size-mb").as<uint16_t>() * 1024*1024;
+
+   EOS_ASSERT( max_incoming_transaction_queue_size > 0, plugin_config_exception,
+               "incoming-transaction-queue-size-mb ${mb} must be greater than 0", ("mb", max_incoming_transaction_queue_size) );
+
+   my->_pending_incoming_transactions.set_max_incoming_transaction_queue_size( max_incoming_transaction_queue_size );
 
    my->_incoming_defer_ratio = options.at("incoming-defer-ratio").as<double>();
 

From d466ced62d3de38580b8fe94adaf1edc193e4c30 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 21 May 2019 15:47:21 -0500
Subject: [PATCH 0451/1648] Check for duplicate and expiration before storing
 in pending queue

---
 plugins/producer_plugin/producer_plugin.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index a56a34bfa8c..0407788fb57 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -513,19 +513,14 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          };
 
          try {
-            if( !chain.is_building_block()) {
-               _pending_incoming_transactions.add( trx, persist_until_expired, next );
-               return;
-            }
-
-            auto block_time = chain.pending_block_time();
-
             const auto& id = trx->id();
-            if( fc::time_point( trx->packed_trx()->expiration()) < block_time ) {
+
+            fc::time_point bt = chain.is_building_block() ? chain.pending_block_time() : chain.head_block_time();
+            if( fc::time_point( trx->packed_trx()->expiration()) < bt ) {
                send_response( std::static_pointer_cast<fc::exception>(
                      std::make_shared<expired_tx_exception>(
                            FC_LOG_MESSAGE( error, "expired transaction ${id}, expiration ${e}, block time ${bt}",
-                                           ("id", id)("e", trx->packed_trx()->expiration())( "bt", block_time )))));
+                                           ("id", id)("e", trx->packed_trx()->expiration())( "bt", bt )))));
                return;
             }
 
@@ -535,9 +530,14 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                return;
             }
 
+            if( !chain.is_building_block()) {
+               _pending_incoming_transactions.add( trx, persist_until_expired, next );
+               return;
+            }
+
             auto deadline = fc::time_point::now() + fc::milliseconds( _max_transaction_time_ms );
             bool deadline_is_subjective = false;
-            const auto block_deadline = calculate_block_deadline( block_time );
+            const auto block_deadline = calculate_block_deadline( chain.pending_block_time() );
             if( _max_transaction_time_ms < 0 ||
                 (_pending_block_mode == pending_block_mode::producing && block_deadline < deadline)) {
                deadline_is_subjective = true;

From bf4635b94814e87e955b439320be8778d2324ff4 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 22 May 2019 00:22:15 -0400
Subject: [PATCH 0452/1648] create initial scaffolding for a new utility
 program: intrinsic-debug-log

The program uses a new wrapper over boost::program_options that makes it
easy to do cleos like subcommands.
---
 programs/CMakeLists.txt                    |   1 +
 programs/intrinsic-log-util/CMakeLists.txt |  26 +
 programs/intrinsic-log-util/main.cpp       | 224 +++++++
 programs/intrinsic-log-util/subcommand.hpp | 651 +++++++++++++++++++++
 4 files changed, 902 insertions(+)
 create mode 100644 programs/intrinsic-log-util/CMakeLists.txt
 create mode 100644 programs/intrinsic-log-util/main.cpp
 create mode 100644 programs/intrinsic-log-util/subcommand.hpp

diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index a40ef3b423c..6cb1e5bd635 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -3,3 +3,4 @@ add_subdirectory( cleos )
 add_subdirectory( keosd )
 add_subdirectory( eosio-launcher )
 add_subdirectory( eosio-blocklog )
+add_subdirectory( intrinsic-log-util )
diff --git a/programs/intrinsic-log-util/CMakeLists.txt b/programs/intrinsic-log-util/CMakeLists.txt
new file mode 100644
index 00000000000..6850d4396df
--- /dev/null
+++ b/programs/intrinsic-log-util/CMakeLists.txt
@@ -0,0 +1,26 @@
+add_executable( intrinsic-log-util main.cpp )
+
+if( UNIX AND NOT APPLE )
+  set(rt_library rt )
+endif()
+
+find_package( Gperftools QUIET )
+if( GPERFTOOLS_FOUND )
+    message( STATUS "Found gperftools; compiling intrinsic-log-util with TCMalloc")
+    list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
+endif()
+
+target_include_directories(intrinsic-log-util PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+
+target_link_libraries( intrinsic-log-util
+        PRIVATE appbase
+        PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+
+copy_bin( intrinsic-log-util )
+#install( TARGETS
+#   intrinsic-log-util
+#
+#   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+#   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+#   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+#)
diff --git a/programs/intrinsic-log-util/main.cpp b/programs/intrinsic-log-util/main.cpp
new file mode 100644
index 00000000000..7089157c70f
--- /dev/null
+++ b/programs/intrinsic-log-util/main.cpp
@@ -0,0 +1,224 @@
+/**
+ *  @file
+ *  @copyright defined in eosio/LICENSE.txt
+ */
+#include "subcommand.hpp"
+#include <eosio/chain/intrinsic_debug_log.hpp>
+
+#include <fc/io/json.hpp>
+#include <fc/filesystem.hpp>
+
+#include <boost/exception/diagnostic_information.hpp>
+#include <boost/program_options.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+
+#include <cstring>
+
+using namespace eosio;
+using namespace eosio::chain;
+
+namespace bfs = boost::filesystem;
+namespace bpo = boost::program_options;
+
+struct intrinsic_log {
+   intrinsic_log()
+   {}
+
+   fc::optional<intrinsic_debug_log> log;
+};
+
+struct print_block_subcommand
+   :  public subcommand<
+         print_block_subcommand,
+         subcommand_style::terminal_subcommand_with_positional_arguments
+      >
+{
+   static constexpr const char* name = "block";
+
+   static std::string get_description() {
+      return "Print a specific block";
+   }
+
+   void set_options( bpo::options_description& options )const {
+      options.add_options()
+         ("output-file,o", bpo::value<bfs::path>(),
+          "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
+      ;
+   }
+
+   bpo::positional_options_description
+   get_positional_options( bpo::options_description& options, positional_descriptions& pos_desc )const {
+      options.add_options()
+         ("block-num", bpo::value<uint32_t>(),
+          "the block number to print")
+      ;
+
+      std::array<std::string, 1> pos_args = {
+         "block-num"
+      };
+
+      return build_positional_descriptions( pos_args, options, pos_desc );
+   }
+};
+
+struct print_blocks_subcommand
+   :  public subcommand<
+         print_blocks_subcommand,
+         subcommand_style::terminal_subcommand_without_positional_arguments
+      >
+{
+   static constexpr const char* name = "blocks";
+
+   static std::string get_description() {
+      return "Print a range of blocks";
+   }
+
+   void set_options( bpo::options_description& options )const {
+      options.add_options()
+         ("output-file,o", bpo::value<bfs::path>(),
+          "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
+         ("first,f", bpo::value<uint32_t>()->default_value(0),
+          "the first block number to print")
+         ("last,l", bpo::value<uint32_t>()->default_value(std::numeric_limits<uint32_t>::max()),
+          "the first block number to print")
+      ;
+   }
+
+   void initialize( bpo::variables_map&& vm ) {
+      if( vm.count( "first" ) ) {
+         first_block_num = vm.at( "first" ).as<uint32_t>();
+      }
+
+      if( vm.count( "last" ) ) {
+         last_block_num = vm.at( "last" ).as<uint32_t>();
+         FC_ASSERT( last_block_num >= first_block_num, "invalid range" );
+      }
+   }
+
+   uint32_t first_block_num = 0;
+   uint32_t last_block_num = 0;
+};
+
+struct print_subcommand
+   :  public subcommand<
+         print_subcommand,
+         subcommand_style::contains_subcommands,
+         print_block_subcommand,
+         print_blocks_subcommand
+      >
+{
+   static constexpr const char* name = "print";
+
+   static std::string get_description() {
+      return "Print blocks in a log file";
+   }
+
+   void set_options( bpo::options_description& options )const {
+      options.add_options()
+         ("no-pretty-print", bpo::bool_switch()->default_value(false), "avoid pretty printing")
+      ;
+   }
+};
+
+struct diff_subcommand
+   :  public subcommand<
+         diff_subcommand,
+         subcommand_style::terminal_subcommand_with_positional_arguments
+      >
+{
+   static constexpr const char* name = "diff";
+
+   static std::string get_description() {
+      return "Find the differences between two log files";
+   }
+
+   void set_options( bpo::options_description& options )const {
+      options.add_options()
+         ("start-block", bpo::value<uint32_t>()->default_value(0),
+          "ignore any differences prior to this block")
+      ;
+   }
+
+   bpo::positional_options_description
+   get_positional_options( bpo::options_description& options, positional_descriptions& pos_desc )const {
+      options.add_options()
+         ("first-log", bpo::value<bfs::path>(),
+         "path to the first log file to compare")
+         ("second-log", bpo::value<bfs::path>(),
+         "path to the second log file to compare")
+      ;
+
+      std::array<std::string, 2> pos_args = {
+         "first-log",
+         "second-log"
+      };
+
+      return build_positional_descriptions( pos_args, options, pos_desc );
+   }
+};
+
+struct root_command
+   : public subcommand<
+      root_command,
+      subcommand_style::contains_subcommands,
+      print_subcommand,
+      diff_subcommand
+     >
+{
+   static constexpr const char* name = "Generic";
+
+   static std::string get_description() {
+      return "Utility to inspect intrinsic log files";
+   }
+
+   void set_options( bpo::options_description& options ) {
+      options.add_options()
+         ("help,h", bpo::bool_switch(&print_help)->default_value(false), "Print this help message and exit.")
+         ("no-detail", bpo::bool_switch()->default_value(false), "Temporarily added for testing purposes.")
+      ;
+   }
+
+   bool print_help = false;
+};
+
+int main( int argc, const char** argv ) {
+   try {
+      root_command rc;
+      auto res = parse_program_options_extended( rc, argc, argv, std::cout, &std::cerr );
+
+      if( std::holds_alternative<parse_failure>( res ) ) {
+         FC_ASSERT( false, "parse error occurred" );
+      } else if( std::holds_alternative<autocomplete_failure>( res ) ) {
+         return -1;
+      } else if( std::holds_alternative<autocomplete_success>( res ) ) {
+         return 0;
+      }
+
+      const auto& pm = std::get<parse_metadata>( res );
+
+      if( argc == 1 || rc.print_help ) {
+         print_subcommand_help( std::cout, bfs::path( argv[0] ).filename().generic_string(), pm );
+         return 0;
+      }
+
+      std::ios::sync_with_stdio(false); // for potential performance boost for large log files
+
+
+
+   } catch( const fc::exception& e ) {
+      elog( "${e}", ("e", e.to_detail_string()));
+      return -1;
+   } catch( const boost::exception& e ) {
+      elog("${e}", ("e",boost::diagnostic_information(e)));
+      return -1;
+   } catch( const std::exception& e ) {
+      elog("${e}", ("e",e.what()));
+      return -1;
+   } catch( ... ) {
+      elog("unknown exception");
+      return -1;
+   }
+
+   return 0;
+}
diff --git a/programs/intrinsic-log-util/subcommand.hpp b/programs/intrinsic-log-util/subcommand.hpp
new file mode 100644
index 00000000000..8b2293f47fe
--- /dev/null
+++ b/programs/intrinsic-log-util/subcommand.hpp
@@ -0,0 +1,651 @@
+/**
+ *  @file
+ *  @copyright defined in eosio/LICENSE.txt
+ */
+#pragma once
+
+#include <fc/exception/exception.hpp>
+
+#include <boost/program_options.hpp>
+#include <boost/filesystem.hpp>
+
+#include <variant>
+#include <memory>
+#include <type_traits>
+
+//#include <iosfwd>
+#include <iostream>
+#include <sstream>
+#include <iterator>
+
+namespace eosio {
+
+namespace bfs = boost::filesystem;
+namespace bpo = boost::program_options;
+
+enum class subcommand_style {
+   contains_subcommands,
+   terminal_subcommand_with_positional_arguments,
+   terminal_subcommand_without_positional_arguments
+};
+
+namespace detail {
+   template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+   template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+
+   template<typename T, typename = int>
+   struct has_name : std::false_type {};
+
+   template<typename T>
+   struct has_name<T, decltype((void) T::name, 0)> : std::true_type {};
+
+   template<typename T, typename = int>
+   struct has_description : std::false_type {};
+
+   template<typename T>
+   struct has_description<T, decltype((void) T::get_description(), 0)> : std::true_type {};
+
+   template<typename T, typename = int>
+   struct has_initialize : std::false_type {};
+
+   template<typename T>
+   struct has_initialize<T, decltype((void) std::declval<T>().initialize( std::move( std::declval<bpo::variables_map>() ) ), 0)>
+   : std::true_type
+   {};
+
+   template<int I, typename Visitor, typename... Ts>
+   bool visit_by_name_helper( const std::variant<Ts...>& var, const std::string& subcommand_name, Visitor&& visitor ) {
+      using variant_type = std::variant<Ts...>;
+
+      if constexpr( I < std::variant_size_v<variant_type> )
+      {
+         if constexpr( has_name< std::variant_alternative_t<I, variant_type> >::value ) {
+            if( subcommand_name.compare( std::variant_alternative_t<I, variant_type>::name ) == 0 ) {
+               std::forward<Visitor>(visitor)( std::get<I>( var ) );
+               return true;
+            }
+         }
+         return visit_by_name_helper<I+1>( var,
+                                           subcommand_name,
+                                           std::forward<Visitor>(visitor) );
+      } else {
+         return false;
+      }
+   }
+
+   template<typename Visitor, typename... Ts>
+   bool visit_by_name( const std::variant<Ts...>& var, const std::string& subcommand_name, Visitor&& visitor ) {
+      return visit_by_name_helper<0>( var, subcommand_name, std::forward<Visitor>( visitor ) );
+   }
+
+   template<int I, typename Variant, typename Visitor, typename... Args>
+   bool construct_variant_by_name_helper( Variant& var,
+                                          const std::string& subcommand_name,
+                                          Visitor&& visitor,
+                                          Args&&... args )
+   {
+      if constexpr( I < std::variant_size_v<Variant> ) {
+         if constexpr( has_name< std::variant_alternative_t<I, Variant> >::value ) {
+            if( subcommand_name.compare( std::variant_alternative_t<I, Variant>::name ) == 0 ) {
+               std::forward<Visitor>(visitor)( var.template emplace<I>( std::forward<Args>(args)... ) );
+               return true;
+            }
+         }
+         return construct_variant_by_name_helper<I+1>( var,
+                                                       subcommand_name,
+                                                       std::forward<Visitor>(visitor),
+                                                       std::forward<Args>(args)... );
+      } else {
+         return false;
+      }
+   }
+
+   template<typename Variant, typename... Args>
+   bool construct_variant_by_name( Variant& var,
+                                   const std::string& subcommand_name,
+                                   Args&&... args )
+   {
+      return construct_variant_by_name_helper<0>( var,
+                                                  subcommand_name,
+                                                  []( auto&& ) {}, // do nothing in visitor
+                                                  std::forward<Args>(args)... );
+   }
+
+   template<typename Variant, typename Visitor, typename... Args>
+   bool construct_and_visit_variant_by_name( Variant& var,
+                                             const std::string& subcommand_name,
+                                             Visitor&& visitor,
+                                             Args&&... args )
+   {
+      return construct_variant_by_name_helper<0>( var,
+                                                  subcommand_name,
+                                                  std::forward<Visitor>(visitor),
+                                                  std::forward<Args>(args)... );
+   }
+
+   template<int I, typename Variant, typename Visitor>
+   void static_visit_all_helper( Visitor&& visitor )
+   {
+      if constexpr( I < std::variant_size_v<Variant> ) {
+         if constexpr( has_name< std::variant_alternative_t<I, Variant> >::value ) {
+            std::string desc;
+            if constexpr( has_description< std::variant_alternative_t<I, Variant> >::value ) {
+               desc = std::variant_alternative_t<I, Variant>::get_description();
+            }
+            visitor( std::variant_alternative_t<I, Variant>::name, desc );
+         }
+         return static_visit_all_helper<I+1, Variant>( std::forward<Visitor>(visitor) );
+      }
+   }
+
+   template<typename Variant, typename Visitor>
+   void static_visit_all( Visitor&& visitor ) {
+      static_visit_all_helper<0, Variant>( std::forward<Visitor>(visitor) );
+   }
+
+   struct no_subcommand {};
+
+   class subcommand_untyped_base {};
+
+   template<typename T, typename... Us>
+   class subcommand_base : public subcommand_untyped_base {
+      static_assert( (std::is_default_constructible_v<Us> && ...) );
+      static_assert( (std::is_base_of_v<subcommand_untyped_base, Us> && ...), "subcommands must derive from subcommand type" );
+
+   protected:
+      subcommand_base() = default;
+      friend T;
+
+      bpo::options_description _get_options( const std::vector<std::string>& subcommand_context )
+      {
+         std::string options_name;
+         if( subcommand_context.size() > 0 ) {
+            for( const auto& s : subcommand_context ) {
+               options_name += s;
+               options_name += " ";
+            }
+         } else {
+            options_name += T::name;
+            options_name += " ";
+         }
+         options_name += "options";
+
+         bpo::options_description options( options_name );
+         T& derived = static_cast<T&>( *this );
+         derived.set_options( options );
+         return options;
+      }
+
+      template<typename U=T>
+      static std::string _get_description() {
+         if constexpr( detail::has_description<U>::value ) {
+            return U::get_description();
+         } else {
+            return {};
+         }
+      }
+
+      template<typename U=T>
+      void _initialize( bpo::variables_map&& vm ) {
+         if constexpr( detail::has_initialize<U>::value ) {
+            T& derived = static_cast<T&>( *this );
+            derived.initialize( std::move(vm) );
+         }
+      }
+   };
+
+} /// namespace eosio::detail
+
+struct subcommand_description {
+   subcommand_description( const std::string& subcommand_name, const std::string& description )
+   :subcommand_name( subcommand_name )
+   ,description( description )
+   {}
+
+   std::string subcommand_name;
+   std::string description;
+};
+
+using subcommand_descriptions = std::vector<subcommand_description>;
+
+struct positional_description {
+   positional_description( const std::string& positional_name, const std::string& description )
+   :positional_name( positional_name )
+   ,description( description )
+   {}
+
+   std::string positional_name;
+   std::string description;
+};
+
+using positional_descriptions = std::vector<positional_description>;
+
+struct parse_metadata {
+   parse_metadata( const std::vector<std::string>& context )
+   :subcommand_context( context )
+   {}
+
+   /** @pre subcommand_descriptions alternative of other_description must be present */
+   void add_subcommand_description( const std::string& subcommand, const std::string& description )
+   {
+      std::get<subcommand_descriptions>( other_description ).emplace_back( subcommand, description );
+   }
+
+   void set_positional_descriptions( const positional_descriptions& pos_desc ) {
+      other_description.emplace<positional_descriptions>( pos_desc );
+   }
+
+   void set_positional_descriptions( positional_descriptions&& pos_desc ) {
+      other_description.emplace<positional_descriptions>( std::move(pos_desc) );
+   }
+
+   std::vector<std::string>                                       subcommand_context;
+   std::string                                                    subcommand_desc;
+   std::shared_ptr<bpo::options_description>                      opts_description;
+   std::variant<subcommand_descriptions, positional_descriptions> other_description;
+   bool                                                           initialization_skipped = false;
+};
+
+template<typename T, subcommand_style SubcommandStyle, typename... Us>
+class subcommand;
+
+template<typename T, typename... Us>
+class subcommand<T, subcommand_style::contains_subcommands, Us...>
+   : public detail::subcommand_base<T,  Us...>
+{
+protected:
+   using base_type = detail::subcommand_base<T,  Us...>;
+   using subcommands_type = std::variant<detail::no_subcommand, Us...>;
+
+   subcommands_type _subcommand;
+
+public:
+
+   parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
+                         const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
+   {
+      parse_metadata pm( subcommand_context );
+      bpo::options_description subcommand_options{base_type::_get_options(subcommand_context)};
+
+      auto subcommand_options_ptr = std::make_shared<bpo::options_description>( subcommand_options );
+
+      subcommand_options.add_options()
+         ("__command", bpo::value<std::string>(), "command to execute" )
+         ("__subargs", bpo::value<std::vector<std::string>>(), "arguments for command" )
+      ;
+
+      bpo::positional_options_description pos;
+      pos.add( "__command", 1 ).add( "__subargs", -1 );
+
+      bpo::parsed_options parsed = bpo::command_line_parser( opts )
+                                    .options( subcommand_options )
+                                    .positional( pos )
+                                    .allow_unregistered()
+                                    .run();
+
+      bpo::variables_map vm;
+
+      bpo::variables_map vm_temp;
+      bpo::store( parsed, vm_temp );
+
+      if( vm_temp.count( "__command" ) > 0 ) {
+         std::string cmd_name = vm_temp["__command"].as<std::string>();
+
+         std::vector<std::string> inner_opts = bpo::collect_unrecognized( parsed.options, bpo::include_positional );
+         FC_ASSERT( inner_opts.size() > 0, "unexpected error" );
+         FC_ASSERT( *inner_opts.begin() == cmd_name,
+                    "unrecognized option '${option}'",
+                    ("option", *inner_opts.begin())
+         );
+         inner_opts.erase( inner_opts.begin() );
+
+         bool success = detail::construct_and_visit_variant_by_name( _subcommand, cmd_name,
+            [&inner_opts, &pm, &cmd_name, &subcommand_options_ptr, &skip_initialize, context = subcommand_context]
+            ( auto&& s ) mutable {
+               context.emplace_back( cmd_name );
+               pm = s.parse( inner_opts, skip_initialize, context );
+               FC_ASSERT( pm.opts_description, "unexpected error" );
+               subcommand_options_ptr->add( *pm.opts_description );
+               pm.opts_description = subcommand_options_ptr;
+            }
+         );
+         FC_ASSERT(  success, "unrecognized sub-command '${name}' within context: ${context}",
+                     ("name", cmd_name)("context", subcommand_context)
+         );
+         vm = std::move(vm_temp);
+      } else {
+         bpo::parsed_options parsed2 = bpo::command_line_parser( opts )
+                                          .options( *subcommand_options_ptr )
+                                          .run();
+         bpo::store( parsed2, vm );
+
+         detail::static_visit_all<std::decay_t<decltype(_subcommand)>>(
+            [&pm]( const char* name, const std::string& desc ) {
+               pm.add_subcommand_description( name, desc );
+            }
+         );
+
+         pm.opts_description = std::move(subcommand_options_ptr);
+         pm.subcommand_desc  = base_type::_get_description();
+         pm.initialization_skipped = skip_initialize;
+      }
+
+      if( !skip_initialize ) {
+         bpo::notify( vm );
+         base_type::_initialize( std::move(vm) );
+      }
+
+      return pm;
+   }
+
+   const subcommands_type& get_subcommand()const { return _subcommand; }
+};
+
+template<typename T, typename... Us>
+class subcommand<T, subcommand_style::terminal_subcommand_with_positional_arguments, Us...>
+   : public detail::subcommand_base<T,  Us...>
+{
+protected:
+   using base_type = detail::subcommand_base<T,  Us...>;
+
+public:
+   parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
+                         const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
+   {
+      parse_metadata pm( subcommand_context );
+      pm.subcommand_desc  = base_type::_get_description();
+      pm.opts_description = std::make_shared<bpo::options_description>( base_type::_get_options(subcommand_context) );
+
+      bpo::options_description subcommand_options{ *pm.opts_description };
+      positional_descriptions pos_desc;
+      const auto& pos = _get_positional_options( subcommand_options, pos_desc );
+      pm.set_positional_descriptions( pos_desc );
+
+      bpo::variables_map vm;
+
+      bpo::store( bpo::command_line_parser( opts )
+                     .options( subcommand_options )
+                     .positional( pos )
+                     .run(),
+                  vm );
+
+      if( !skip_initialize ) {
+         bpo::notify( vm );
+         base_type::_initialize( std::move(vm) );
+      }
+      pm.initialization_skipped = skip_initialize;
+
+      return pm;
+   }
+
+protected:
+   bpo::positional_options_description _get_positional_options( bpo::options_description& options,
+                                                                positional_descriptions& pos_desc )const
+   {
+      const T& derived = static_cast<const T&>( *this );
+      return derived.get_positional_options( options, pos_desc );
+   }
+};
+
+template<typename T, typename... Us>
+class subcommand<T, subcommand_style::terminal_subcommand_without_positional_arguments, Us...>
+   : public detail::subcommand_base<T,  Us...>
+{
+protected:
+   using base_type = detail::subcommand_base<T,  Us...>;
+
+public:
+   parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
+                         const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
+   {
+      parse_metadata pm( subcommand_context );
+      pm.subcommand_desc  = base_type::_get_description();
+      pm.opts_description = std::make_shared<bpo::options_description>( base_type::_get_options(subcommand_context) );
+
+      bpo::variables_map vm;
+
+      bpo::store( bpo::command_line_parser( opts )
+                     .options( *pm.opts_description )
+                     .run(),
+                  vm );
+
+      if( !skip_initialize ) {
+         bpo::notify( vm );
+         base_type::_initialize( std::move(vm) );
+      }
+      pm.initialization_skipped = skip_initialize;
+
+      return pm;
+   }
+};
+
+template<std::size_t N>
+bpo::positional_options_description
+build_positional_descriptions( const std::array<std::string, N>& pos_names,
+                               const bpo::options_description& options,
+                               positional_descriptions& pos_desc )
+{
+   bpo::positional_options_description pos;
+
+   for( std::size_t i = 0; i < pos_names.size(); ++i ) {
+      pos.add( pos_names[i].c_str(), 1 );
+      const bpo::option_description* opt = options.find_nothrow( pos_names[i], false );
+      if( opt ) {
+         pos_desc.emplace_back( pos_names[i], opt->description() );
+      } else {
+         pos_desc.emplace_back( pos_names[i], "" );
+      }
+   }
+
+   return pos;
+}
+
+void print_subcommand_help( std::ostream& stream, const std::string& program_name, const parse_metadata& pm ) {
+   const subcommand_descriptions* subcommands = std::get_if<subcommand_descriptions>( &pm.other_description );
+   bool subcommands_present = (subcommands && subcommands->size() > 0);
+
+   const positional_descriptions* positionals = std::get_if<positional_descriptions>( &pm.other_description );
+   bool positionals_present = (positionals && positionals->size() > 0);
+
+   auto formatting_width = pm.opts_description->get_option_column_width() - 2;
+
+   std::string subcommand_usage;
+   for( const auto& s : pm.subcommand_context ) {
+      subcommand_usage += " ";
+      subcommand_usage += s;
+   }
+   if( subcommands_present ) {
+      subcommand_usage += " SUBCOMMAND";
+   }
+
+   if( pm.subcommand_desc.size() > 0 ) {
+      stream << pm.subcommand_desc << std::endl;
+   }
+
+   stream   << "Usage: " << program_name
+            << subcommand_usage
+            << " [OPTIONS]";
+
+   if( positionals_present ) {
+      for( const auto& p : *positionals ) {
+         stream << " " << p.positional_name;
+      }
+   }
+
+   stream << std::endl << std::endl;
+
+   if( positionals_present ) {
+      stream << "Positionals:" << std::endl;
+
+      for( const auto& p : *positionals ) {
+         stream << "  ";
+         auto orig_width = stream.width( formatting_width );
+         stream << std::left << p.positional_name;
+         stream.width( orig_width );
+         stream << p.description << std::endl;
+      }
+
+      stream << std::endl;
+   }
+
+   pm.opts_description->print( stream );
+
+   if( subcommands_present ) {
+      stream << std::endl;
+
+      std::string subcommands_title;
+      if( pm.subcommand_context.size() > 0 ) {
+         for( const auto& s : pm.subcommand_context ) {
+            subcommands_title += s;
+            subcommands_title += " ";
+         }
+         subcommands_title += "subcommands:";
+      } else {
+         subcommands_title = "Subcommands:";
+      }
+
+      stream << subcommands_title << std::endl;
+      for( const auto& s : *subcommands ) {
+         stream << "  ";
+         auto orig_width = stream.width( formatting_width );
+         stream << std::left << s.subcommand_name;
+         stream.width( orig_width );
+         stream << s.description << std::endl;
+      }
+   }
+}
+
+bool print_autocomplete_suggestions( std::ostream& stream, const parse_metadata& pm, const std::string& last_token ) {
+   bool printed_something = false;
+
+   if( std::holds_alternative<subcommand_descriptions>( pm.other_description ) ) {
+      for( const auto& s : std::get<subcommand_descriptions>( pm.other_description ) ) {
+         if( s.subcommand_name.find( last_token ) != 0 ) continue;
+         if( printed_something )
+            stream << " ";
+         stream << s.subcommand_name;
+         printed_something = true;
+      }
+   }
+
+   if( last_token.size() > 0 ) {
+      for( const auto& opt : pm.opts_description->options() ) {
+         //if( opt->match( last_token, true, false, false ) == bpo::option_description::no_match ) continue;
+         // The option_description::match function doesn't seem to work.
+
+         const auto& short_name = opt->canonical_display_name( bpo::command_line_style::allow_dash_for_short );
+         if( short_name.size() > 0 && short_name[0] == '-' && short_name.find( last_token ) == 0 ) {
+            if( printed_something )
+               stream << " ";
+            stream << short_name;
+            printed_something = true;
+         }
+
+         const auto& long_name = opt->canonical_display_name( bpo::command_line_style::allow_long );
+         if( long_name.size() > 0 && long_name[0] == '-' && long_name.find( last_token ) == 0 ) {
+            if( printed_something )
+               stream << " ";
+            stream << long_name;
+            printed_something = true;
+         }
+      }
+   }
+
+   return printed_something;
+}
+
+template<typename T>
+std::optional<parse_metadata>
+parse_program_options( T& root, const std::vector<std::string>& opts, //int argc, const char** argv,
+                       bool skip_initialize = false, bool avoid_throwing = false )
+{
+   try {
+      return root.parse( opts, skip_initialize );
+   } catch( ... ) {
+      if( !avoid_throwing ) throw;
+   }
+
+   return {};
+}
+
+struct autocomplete_failure {};
+struct autocomplete_success {};
+struct parse_failure {};
+
+template<typename T>
+std::variant<autocomplete_failure, autocomplete_success, parse_failure, parse_metadata>
+parse_program_options_extended( T& root, int argc, const char** argv,
+                                std::ostream& out_stream, std::ostream* err_stream = nullptr,
+                                bool avoid_throwing = false )
+{
+   if( argc <= 0 ) {
+      if( avoid_throwing ) return parse_failure{};
+      FC_ASSERT( false, "command line arguments should at least include program name" );
+   }
+
+   std::string program_name{ bfs::path( argv[0] ).filename().generic_string() };
+
+   bool autocomplete_mode = false;
+
+   std::vector<std::string> opts;
+   opts.reserve( argc - 1 );
+   for( int i = 1; i < argc; ++i ) {
+      opts.emplace_back( std::string( *(argv + i) ) );
+      if( opts.back().compare( "-" ) == 0 ) {
+         if( autocomplete_mode ) return autocomplete_failure{};
+         if( avoid_throwing ) return parse_failure{};
+         FC_ASSERT( false, "- is not allowed by itself in the command line arguments" );
+      }
+      if( opts.back().compare( "--" ) == 0 ) {
+         if( i != 1 ) {
+            if( autocomplete_mode ) return autocomplete_failure{};
+            if( avoid_throwing ) return parse_failure{};
+            FC_ASSERT( false, "-- is not allowed by itself in the command line arguments" );
+         }
+         opts.pop_back();
+         autocomplete_mode = true;
+      }
+   }
+
+   if( !autocomplete_mode ) {
+      const auto pm = parse_program_options( root, opts, false, avoid_throwing );
+      if( !pm ) return parse_failure{};
+      return *pm;
+   }
+
+   // Autocomplete helper logic:
+
+   std::string last_token;
+   if( opts.size() > 0 ) {
+      if( opts.back().size() == 0 ) {
+         opts.pop_back();
+      } else {
+         last_token = opts.back();
+      }
+   }
+
+   if( last_token.size() > 0 ) {
+      if( opts.size() == 0 ) return autocomplete_failure{};
+      opts.pop_back();
+   }
+
+   auto pm = parse_program_options( root, opts, true, true );
+   if( !pm ) return autocomplete_failure{};
+
+   if( last_token.size() > 0 ) {
+      if( print_autocomplete_suggestions( out_stream, *pm, last_token ) ) {
+         out_stream << std::endl;
+      } else {
+         return autocomplete_failure{};
+      }
+   }
+
+   if( err_stream ) {
+      *err_stream << std::endl;
+      print_subcommand_help( *err_stream, program_name, *pm );
+   }
+
+   return autocomplete_success{};
+}
+
+} /// namespace eosio

From 010409ca7507eb4d1997d6124f688f6e4ee3d70c Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Wed, 22 May 2019 17:41:02 +0800
Subject: [PATCH 0453/1648] port db_modes_test to python

---
 tests/CMakeLists.txt   |   5 +-
 tests/db_modes_test.py | 101 +++++++++++++++++++++++++++++++++++++++++
 tests/db_modes_test.sh | 101 -----------------------------------------
 3 files changed, 104 insertions(+), 103 deletions(-)
 create mode 100755 tests/db_modes_test.py
 delete mode 100755 tests/db_modes_test.sh

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 57a44808dd6..06836e7a88f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -48,7 +48,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_multiple_version_protocol_feat
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/consensus-validation-malicious-producers.py ${CMAKE_CURRENT_BINARY_DIR}/consensus-validation-malicious-producers.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/validate-dirty-db.py ${CMAKE_CURRENT_BINARY_DIR}/validate-dirty-db.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/launcher_test.py ${CMAKE_CURRENT_BINARY_DIR}/launcher_test.py COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.sh ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.sh COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.py ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/prod_preactivation_test.py ${CMAKE_CURRENT_BINARY_DIR}/prod_preactivation_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-label.sh ${CMAKE_CURRENT_BINARY_DIR}/version-label.sh COPYONLY)
 
@@ -87,7 +87,8 @@ add_test(NAME validate_dirty_db_test COMMAND tests/validate-dirty-db.py -v --cle
 set_property(TEST validate_dirty_db_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME launcher_test COMMAND tests/launcher_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST launcher_test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME db_modes_test COMMAND tests/db_modes_test.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST db_modes_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME version-label-test COMMAND tests/version-label.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # Long running tests
diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
new file mode 100755
index 00000000000..bfc43f62b92
--- /dev/null
+++ b/tests/db_modes_test.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+
+# This test is intended to verify that switching between DB modes "just works". Addtionally
+# it tries to make sure the dirty bit behaves as expected even in heap mode.
+
+from testUtils import Utils
+
+import decimal
+import re
+import os
+import signal
+import time
+import subprocess
+import shlex
+import tempfile
+
+errorExit=Utils.errorExit
+
+nodeosCmd="./programs/nodeos/nodeos -d {} --config-dir {} \
+--chain-state-db-size-mb 8 --chain-state-db-guard-size-mb 0 --reversible-blocks-db-size-mb 1 \
+--reversible-blocks-db-guard-size-mb 0 -e -peosio --plugin eosio::chain_api_plugin \
+--http-server-address=127.0.0.1:8888"
+
+getInfoCmd="./programs/cleos/cleos get info"
+
+def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
+    cmdArr= preCmd + nodeosCmd + extraCmd
+    proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    tries = 10
+    ok = False
+    while (tries > 0):
+        time.sleep(2)
+        reply = Utils.checkOutput(shlex.split(getInfoCmd), ignoreError=True)
+        if reply.find("server_version") != -1:
+            ok = True
+            break
+        tries = tries - 1
+    os.kill(proc.pid, killsig)
+    print("executed nodeosCmd with extra parameter \"%s\", killsig %d, result %d" % (extraCmd, killsig, ok))
+    return ok
+
+print("=== db_modes_test.py starts ===")
+
+tempdir = tempfile.mkdtemp()
+nodeosCmd = nodeosCmd.format(tempdir, tempdir)
+
+print("nodeosCmd is %s" % (nodeosCmd))
+
+#new chain with mapped mode
+if run_and_kill(" --delete-all-blocks") != True:
+    errorExit("Failed in new chain with mapped mode")
+
+#use previous DB with heap mode
+if run_and_kill(" --database-map-mode heap") != True:
+    errorExit("Failed in restart heap mode")
+
+#test lock 
+if run_and_kill(" --database-map-mode locked") != True:
+    errorExit("Failed in restart with locked mode")
+
+#locked mode should fail when it's not possible to lock anything
+if run_and_kill(" --database-map-mode locked", preCmd="ulimit -l 0; ") != False:
+    errorExit("Test Failed in locked mode with ulimit -l 0")
+
+#But shouldn't result in the dirty flag staying set; so next launch should run
+if run_and_kill("") != True:
+    errorExit("Failed in restart heap mode")
+
+#Try killing with hard KILL
+if run_and_kill("", killsig=signal.SIGKILL) != True:
+    errorExit("Failed in restart & hardkill in heap mode")
+
+#should be dirty now
+if run_and_kill("") != False:
+    errorExit("dirty flag test failed")
+
+#should also still be dirty in heap mode
+if run_and_kill(" --database-map-mode heap") != False:
+    errorExit("dirty flag test failed")
+
+#start over again! but this time start with heap mode
+if run_and_kill(" --delete-all-blocks --database-map-mode heap") != True:
+    errorExit("Failed in restart heap mode with --delete-all-blocks")
+
+#Then switch back to mapped
+if run_and_kill("") != True:
+    errorExit("Failed in restart mapped mode")
+
+#try killing it while in heap mode
+if run_and_kill(" --database-map-mode heap", killsig=signal.SIGKILL) != True:
+    errorExit("Failed in restart heap mode and hardkill")
+
+#should be dirty if we run in either mode node
+if run_and_kill(" --database-map-mode heap") != False:
+    errorExit("dirty flag test failed in heap mode")
+
+if run_and_kill("") != False:
+    errorExit("dirty flag test failed in mapped mode")
+
+print("=== db_modes_test.py finished successfully ===")
+
diff --git a/tests/db_modes_test.sh b/tests/db_modes_test.sh
deleted file mode 100755
index f29b8ffcb51..00000000000
--- a/tests/db_modes_test.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env bash
-
-# This test is intended to verify that switching between DB modes "just works". Addtionally
-# it tries to make sure the dirty bit behaves as expected even in heap mode.
-
-set -euo pipefail
-
-VERBOSE=0
-TEST_LOCKED_MODE=0
-
-while getopts ":lv" opt; do
-   case ${opt} in
-      l)
-         TEST_LOCKED_MODE=1
-         ;;
-      v)
-         VERBOSE=1
-         set -o xtrace
-         ;;
-      \?)
-         echo "Use -v for verbose; -l to enable test of locked mode"
-         exit 1;
-         ;;
-      :)
-         echo "Invalid option"
-         exit 1;
-         ;;
-   esac
-done
-
-EOSIO_STUFF_DIR=$(mktemp -d)
-trap "rm -rf $EOSIO_STUFF_DIR" EXIT
-NODEOS_LAUNCH_PARAMS="./programs/nodeos/nodeos -d $EOSIO_STUFF_DIR --config-dir $EOSIO_STUFF_DIR \
---chain-state-db-size-mb 8 --chain-state-db-guard-size-mb 0 --reversible-blocks-db-size-mb 1 \
---reversible-blocks-db-guard-size-mb 0 -e -peosio"
-
-run_nodeos() {
-   if (( $VERBOSE == 0 )); then
-      $NODEOS_LAUNCH_PARAMS --http-server-address '' --p2p-listen-endpoint '' "$@" 2>/dev/null &
-   else
-      $NODEOS_LAUNCH_PARAMS --http-server-address '' --p2p-listen-endpoint '' "$@" &
-   fi
-}
-
-run_expect_success() {
-   run_nodeos "$@"
-   local NODEOS_PID=$!
-   sleep 5
-   kill $NODEOS_PID
-   wait $NODEOS_PID
-}
-
-run_and_kill() {
-   run_nodeos "$@"
-   local NODEOS_PID=$!
-   sleep 5
-   kill -KILL $NODEOS_PID
-   ! wait $NODEOS_PID
-}
-
-run_expect_failure() {
-   run_nodeos "$@"
-   local NODEOS_PID=$!
-   MYPID=$$
-   (sleep 10; kill -ALRM $MYPID) & local TIMER_PID=$!
-   trap "kill $NODEOS_PID; wait $NODEOS_PID; exit 1" ALRM
-   sleep 5
-   if wait $NODEOS_PID; then exit 1; fi
-   kill $TIMER_PID
-   trap ALRM
-}
-
-#new chain with mapped mode
-run_expect_success --delete-all-blocks
-#use previous DB with heap mode
-run_expect_success --database-map-mode heap
-#test lock mode if enabled
-if (( $TEST_LOCKED_MODE == 1 )); then
-   run_expect_success --database-map-mode locked
-fi
-#locked mode should fail when it's not possible to lock anything
-ulimit -l 0
-run_expect_failure --database-map-mode locked
-#But shouldn't result in the dirty flag staying set; so next launch should run
-run_expect_success
-#Try killing with KILL
-run_and_kill
-#should be dirty now
-run_expect_failure
-#should also still be dirty in heap mode
-run_expect_failure --database-map-mode heap
-
-#start over again! but this time start with heap mode
-run_expect_success --delete-all-blocks  --database-map-mode heap
-#Then switch back to mapped
-run_expect_success
-#try killing it while in heap mode
-run_and_kill --database-map-mode heap
-#should be dirty if we run in either mode node
-run_expect_failure --database-map-mode heap
-run_expect_failure

From d49c0301243088906fd0485102a456a30247597d Mon Sep 17 00:00:00 2001
From: Yordan Pavlov <y.d.pavlov@gmail.com>
Date: Thu, 16 May 2019 15:15:24 +0300
Subject: [PATCH 0454/1648] Allow for EOS clone to be a submodule

EOS build script checks that EOS has been cloned from git. Change check
so .git can also be a file as is the case for submodules.
---
 scripts/eosio_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 7f901635396..a373534ac4a 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -150,7 +150,7 @@ if [ $# -ne 0 ]; then
    done
 fi
 
-if [ ! -d "${REPO_ROOT}/.git" ]; then
+if [ ! -e "${REPO_ROOT}/.git" ]; then
    printf "\\nThis build script only works with sources cloned from git\\n"
    printf "Please clone a new eos directory with 'git clone https://github.com/EOSIO/eos --recursive'\\n"
    printf "See the wiki for instructions: https://github.com/EOSIO/eos/wiki\\n"

From 4c4824954201f0d0288695a3a6de0c04b89451c2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 22 May 2019 11:59:42 -0500
Subject: [PATCH 0455/1648] Remove unneeded reads_in_flight as there can only
 ever be one read in flight per connection. Add read_delay_count for giving up
 on a connection when too many consecutive read delays.

---
 plugins/net_plugin/net_plugin.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 33be9320e35..91b6c807799 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -376,8 +376,8 @@ namespace eosio {
    constexpr auto     def_send_buffer_size = 1024*1024*def_send_buffer_size_mb;
    constexpr auto     def_max_write_queue_size = def_send_buffer_size*10;
    constexpr boost::asio::chrono::milliseconds def_read_delay_for_full_write_queue{100};
-   constexpr auto     def_max_reads_in_flight = 1000;
    constexpr auto     def_max_trx_in_progress_size = 100*1024*1024; // 100 MB
+   constexpr auto     def_max_read_delays = 100; // number of times read_delay_timer started without any reads
    constexpr auto     def_max_consecutive_rejected_blocks = 3; // num of rejected blocks before disconnect
    constexpr auto     def_max_consecutive_immediate_connection_close = 9; // back off if client keeps closing
    constexpr auto     def_max_clients = 25; // 0 for unlimited clients
@@ -573,7 +573,6 @@ namespace eosio {
 
       queued_buffer           buffer_queue;
 
-      std::atomic<uint32_t>   reads_in_flight{0};
       std::atomic<uint32_t>   trx_in_progress_size{0};
       fc::sha256              node_id;
       const uint32_t          connection_id;
@@ -587,6 +586,7 @@ namespace eosio {
       std::mutex                            response_expected_timer_mtx;
       boost::asio::steady_timer             response_expected_timer;
 
+      uint16_t                              read_delay_count = 0; // only accessed from strand
       std::mutex                            read_delay_timer_mtx;
       boost::asio::steady_timer             read_delay_timer;
 
@@ -970,6 +970,7 @@ namespace eosio {
       {
          std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
          self->read_delay_timer.cancel();
+         self->read_delay_count = 0;
       }
 
       if( reconnect ) {
@@ -2234,47 +2235,43 @@ namespace eosio {
          };
 
          if( buffer_queue.write_queue_size() > def_max_write_queue_size ||
-             reads_in_flight > def_max_reads_in_flight   ||
              trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
             uint32_t write_queue_size = buffer_queue.write_queue_size();
             uint32_t trx_in_progress_size = this->trx_in_progress_size.load();
-            uint32_t reads_in_flight = this->reads_in_flight.load();
             if( write_queue_size > def_max_write_queue_size ) {
                peer_wlog( this, "write_queue full ${s} bytes", ("s", write_queue_size) );
-            } else if( reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( this, "max reads in flight ${s}", ("s", reads_in_flight) );
             } else {
                peer_wlog( this, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
             if( write_queue_size > 2*def_max_write_queue_size ||
-                reads_in_flight > 2*def_max_reads_in_flight   ||
-                trx_in_progress_size > 2*def_max_trx_in_progress_size )
+                trx_in_progress_size > 2*def_max_trx_in_progress_size ||
+                ++read_delay_count > def_max_read_delays )
             {
                fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
                         ("p", peer_name()) );
-               close();
+               close( false );
                return;
             }
             std::lock_guard<std::mutex> g( read_delay_timer_mtx );
+            read_delay_timer.cancel();
             read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
             connection_wptr weak_conn = shared_from_this();
-            read_delay_timer.async_wait( boost::asio::bind_executor(strand, [weak_conn]( boost::system::error_code ) {
+            read_delay_timer.async_wait( boost::asio::bind_executor(strand, [weak_conn]( boost::system::error_code ec ) {
+               if( ec == boost::asio::error::operation_aborted ) return;
                auto conn = weak_conn.lock();
                if( !conn ) return;
                conn->start_read_message();
             } ) );
             return;
          }
+         read_delay_count = 0;
 
-         ++reads_in_flight;
          boost::asio::async_read( socket,
             pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             boost::asio::bind_executor( strand,
             [conn = shared_from_this()]( boost::system::error_code ec, std::size_t bytes_transferred ) {
-               --conn->reads_in_flight;
-
                // may have closed connection and cleared pending_message_buffer
                if( !conn->socket_is_open() ) return;
 

From 5f0a800598cbc535b252c101c10ea09eee7715a1 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Wed, 22 May 2019 14:53:30 -0400
Subject: [PATCH 0456/1648] support for multiple signatures on blocks via block
 level extension

---
 libraries/chain/CMakeLists.txt                |   1 +
 libraries/chain/block.cpp                     |  12 +-
 libraries/chain/block_header_state.cpp        |   7 +-
 libraries/chain/block_state.cpp               | 117 +++++++++++++++++-
 .../eosio/chain/block_header_state.hpp        |   5 +-
 .../include/eosio/chain/producer_schedule.hpp |  14 ++-
 6 files changed, 139 insertions(+), 17 deletions(-)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 7ce955ae6a7..9ddadd5e8de 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library( eosio_chain
              merkle.cpp
              name.cpp
              transaction.cpp
+             block.cpp
              block_header.cpp
              block_header_state.cpp
              block_state.cpp
diff --git a/libraries/chain/block.cpp b/libraries/chain/block.cpp
index cb9ed80cd07..91c93f6c359 100644
--- a/libraries/chain/block.cpp
+++ b/libraries/chain/block.cpp
@@ -5,25 +5,25 @@ namespace eosio { namespace chain {
       static_assert( fc::raw::has_feature_reflector_init_on_unpacked_reflected_types,
                      "additional_block_signatures_extension expects FC to support reflector_init" );
 
-      EOS_ASSERT( signatures.size() > 0, ill_additional_block_signatures_extension,
+      EOS_ASSERT( signatures.size() > 0, ill_formed_additional_block_signatures_extension,
                   "Additional block signatures extension must contain at least one signature",
       );
 
-      set<signature_type> s;
+      set<signature_type> unique_sigs;
 
       for( const auto& s : signatures ) {
-         auto res = s.insert( s );
-         EOS_ASSERT( res.second, ill_additional_block_signatures_extension,
+         auto res = unique_sigs.insert( s );
+         EOS_ASSERT( res.second, ill_formed_additional_block_signatures_extension,
                      "Signature ${s} was repeated in the additional block signatures extension",
                      ("s", s)
          );
       }
    }
 
-   flat_multimap<uint16_t, block_extension> block::validate_and_extract_extensions()const {
+   flat_multimap<uint16_t, block_extension> signed_block::validate_and_extract_extensions()const {
       using decompose_t = block_extension_types::decompose_t;
 
-      flat_multimap<uint16_t, block_header_extension> results;
+      flat_multimap<uint16_t, block_extension> results;
 
       uint16_t id_type_lower_bound = 0;
 
diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index cd940827add..65c2d8df546 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -314,7 +314,7 @@ namespace eosio { namespace chain {
 
    block_header_state pending_block_header_state::finish_next(
                                  const signed_block_header& h,
-                                 const vector<signature_type>& additional_signatures,
+                                 vector<signature_type>&& additional_signatures,
                                  const protocol_feature_set& pfs,
                                  const std::function<void( block_timestamp_type,
                                                            const flat_set<digest_type>&,
@@ -375,14 +375,14 @@ namespace eosio { namespace chain {
     */
    block_header_state block_header_state::next(
                         const signed_block_header& h,
-                        const vector<signature_type>& _additional_signatures,
+                        vector<signature_type>&& _additional_signatures,
                         const protocol_feature_set& pfs,
                         const std::function<void( block_timestamp_type,
                                                   const flat_set<digest_type>&,
                                                   const vector<digest_type>& )>& validator,
                         bool skip_validate_signee )const
    {
-      return next( h.timestamp, h.confirmed ).finish_next( h, _additional_signatures, pfs, validator, skip_validate_signee );
+      return next( h.timestamp, h.confirmed ).finish_next( h, std::move(_additional_signatures), pfs, validator, skip_validate_signee );
    }
 
    digest_type   block_header_state::sig_digest()const {
@@ -392,7 +392,6 @@ namespace eosio { namespace chain {
 
    void block_header_state::sign( const signer_callback_type& signer ) {
       auto d = sig_digest();
-      // TODO: modify block to allow multiple sigs
       auto sigs = signer( d );
 
       EOS_ASSERT(!sigs.empty(), no_block_signatures, "Signer returned no signatures");
diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index cb8c1a2e5d1..8f51ffde7b2 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -3,6 +3,117 @@
 
 namespace eosio { namespace chain {
 
+   namespace {
+      constexpr auto additional_sigs_eid = additional_block_signatures_extension::extension_id();
+
+      /**
+       * Given a complete signed block, extract the validated additional signatures if present;
+       *
+       * @param b complete signed block
+       * @param pfs protocol feature set for digest access
+       * @param pfa activated protocol feature set to determine if extensions are allowed
+       * @return the list of additional signatures
+       * @throws if additional signatures are present before being supported by protocol feature activations
+       */
+      vector<signature_type> extract_additional_signatures( const signed_block_ptr& b,
+                                                            const protocol_feature_set& pfs,
+                                                            const protocol_feature_activation_set_ptr& pfa )
+      {
+         auto exts = b->validate_and_extract_extensions();
+
+         if ( pfa && exts.count(additional_sigs_eid) > 0 ) {
+            const auto& protocol_features = pfa->protocol_features;
+            auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+            bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+
+            EOS_ASSERT(wtmsig_enabled, block_validate_exception,
+                       "Block contained additional_block_signatures_extension before activation of WTMsig Block Signatures");
+
+            auto& additional_sigs = exts.lower_bound(additional_sigs_eid)->second.get<additional_block_signatures_extension>();
+
+            return std::move(additional_sigs.signatures);
+         }
+
+         return {};
+      }
+
+      /**
+       * Given a pending block header state, wrap the promotion to a block header state such that additional signatures
+       * can be allowed based on activations *prior* to the promoted block and properly injected into the signed block
+       * that is previously constructed and mutated by the promotion
+       *
+       * This cleans up lifetime issues involved with accessing activated protocol features and moving from the
+       * pending block header state
+       *
+       * @param cur the pending block header state to promote
+       * @param b the signed block that will receive signatures during this process
+       * @param pfs protocol feature set for digest access
+       * @param extras all the remaining parameters that pass through
+       * @return the block header state
+       * @throws if the block was signed with multiple signatures before the extension is allowed
+       */
+
+      template<typename ...Extras>
+      block_header_state inject_additional_signatures( pending_block_header_state&& cur,
+                                                       signed_block& b,
+                                                       const protocol_feature_set& pfs,
+                                                       Extras&& ... extras )
+      {
+         const auto& pfa = cur.prev_activated_protocol_features;
+         bool wtmsig_enabled = false;
+
+         if (pfa) {
+            const auto& protocol_features = pfa->protocol_features;
+            auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+            wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+         }
+
+         block_header_state result = std::move(cur).finish_next(b, pfs, std::forward<Extras>(extras)...);
+
+         if (!result.additional_signatures.empty()) {
+            EOS_ASSERT(wtmsig_enabled, block_validate_exception,
+                       "Block has multiple signatures before activation of WTMsig Block Signatures");
+
+            // as an optimization we don't copy this out into the legitimate extension structure as it serializes
+            // the same way as the vector of signatures
+            static_assert(fc::reflector<additional_block_signatures_extension>::total_member_count == 1);
+            static_assert(std::is_same_v<decltype(additional_block_signatures_extension::signatures), std::vector<signature_type>>);
+
+            b.block_extensions.emplace_back(
+                  additional_sigs_eid,
+                  fc::raw::pack( result.additional_signatures )
+            );
+         }
+
+         return result;
+      }
+
+      /**
+       * Given a pending block header state, wrap the promotion to a block header state such that additional signatures
+       * can be extraced from the provided complete signed block and passed into the block header state promotion
+       *
+       * This cleans up lifetime issues involved with accessing activated protocol features and moving from the
+       * pending block header state
+       *
+       * @param cur the pending block header state to promote
+       * @param b the signed block complete with extensions and signatures
+       * @param pfs protocol feature set for digest access
+       * @param extras all the remaining parameters that pass through
+       * @return the block header state
+       */
+      template<typename ...Extras>
+      block_header_state promote_pending(pending_block_header_state&& cur,
+                                         const signed_block_ptr& b,
+                                         const protocol_feature_set& pfs,
+                                         Extras&& ... extras)
+      {
+
+         auto additional_signatures = extract_additional_signatures(b, pfs, cur.prev_activated_protocol_features);
+         return std::move(cur).finish_next( *b, std::move(additional_signatures), pfs, std::forward<Extras>(extras)... );
+      }
+
+   }
+
    block_state::block_state( const block_header_state& prev,
                              signed_block_ptr b,
                              const protocol_feature_set& pfs,
@@ -11,7 +122,7 @@ namespace eosio { namespace chain {
                                                        const vector<digest_type>& )>& validator,
                              bool skip_validate_signee
                            )
-   :block_header_state( prev.next( *b, pfs, validator, skip_validate_signee ) )
+   :block_header_state( prev.next( *b, extract_additional_signatures(b, pfs, prev.activated_protocol_features), pfs, validator, skip_validate_signee ) )
    ,block( std::move(b) )
    {}
 
@@ -24,7 +135,7 @@ namespace eosio { namespace chain {
                                                        const vector<digest_type>& )>& validator,
                              const signer_callback_type& signer
                            )
-   :block_header_state( std::move(cur).finish_next( *b, pfs, validator, signer ) )
+   :block_header_state( inject_additional_signatures( std::move(cur), *b, pfs, validator, signer ) )
    ,block( std::move(b) )
    ,trxs( std::move(trx_metas) )
    {}
@@ -39,7 +150,7 @@ namespace eosio { namespace chain {
                                                        const vector<digest_type>& )>& validator,
                              bool skip_validate_signee
                            )
-   :block_header_state( std::move(cur).finish_next( *b, pfs, validator, skip_validate_signee ) )
+   :block_header_state( promote_pending(std::move(cur), b, pfs, validator, skip_validate_signee ) )
    ,block( b )
    ,trxs( std::move(trx_metas) )
    {}
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 9fb7bbf2d67..8723edfd17e 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -47,7 +47,7 @@ struct pending_block_header_state : public detail::block_header_state_common {
                                           const protocol_feature_set& pfs)const;
 
    block_header_state  finish_next( const signed_block_header& h,
-                                    const vector<signature_type>& additional_signatures,
+                                    vector<signature_type>&& additional_signatures,
                                     const protocol_feature_set& pfs,
                                     const std::function<void( block_timestamp_type,
                                                               const flat_set<digest_type>&,
@@ -94,7 +94,7 @@ struct block_header_state : public detail::block_header_state_common {
    pending_block_header_state  next( block_timestamp_type when, uint16_t num_prev_blocks_to_confirm )const;
 
    block_header_state   next( const signed_block_header& h,
-                              const vector<signature_type>& additional_signatures,
+                              vector<signature_type>&& additional_signatures,
                               const protocol_feature_set& pfs,
                               const std::function<void( block_timestamp_type,
                                                         const flat_set<digest_type>&,
@@ -141,4 +141,5 @@ FC_REFLECT_DERIVED(  eosio::chain::block_header_state, (eosio::chain::detail::bl
                      (header)
                      (pending_schedule)
                      (activated_protocol_features)
+                     (additional_signatures)
 )
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index d2cf682fd6b..9ca24d70e6d 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -60,8 +60,18 @@ namespace eosio { namespace chain {
          }) != keys.end();
       }
 
-      bool keys_satisfy( const flat_set<public_key_type>& keys ) const {
-         return true;
+      bool keys_satisfy( const flat_set<public_key_type>& presented_keys ) const {
+         uint32_t total_weight = 0;
+         for (const auto& kw : keys) {
+            const auto& iter = presented_keys.find(kw.key);
+            if (iter != presented_keys.end()) {
+               total_weight += kw.weight;
+            }
+
+            if (total_weight >= threshold)
+               return true;
+         }
+         return false;
       }
 
       friend bool operator == ( const block_signing_authority_v0& lhs, const block_signing_authority_v0& rhs ) {

From 3cbbca2d58614999a0959fffe383cfcf0d73b603 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Wed, 22 May 2019 16:36:16 -0400
Subject: [PATCH 0457/1648] update expected exception message

---
 unittests/forked_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 61e389b0de3..80d7b34646f 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -274,7 +274,7 @@ BOOST_AUTO_TEST_CASE( forking ) try {
    c.control->abort_block();
    BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs ), fc::exception,
       [] (const fc::exception &ex)->bool {
-         return ex.to_detail_string().find("block not signed by expected key") != std::string::npos;
+         return ex.to_detail_string().find("block signed by unexpected key") != std::string::npos;
       });
 } FC_LOG_AND_RETHROW()
 

From b88bbda91ddbb4bf08e4888e7987b59573e34d13 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Wed, 22 May 2019 18:33:02 -0400
Subject: [PATCH 0458/1648] fix some bad accesses, remove the block extension
 check, add test cases for wtmsig block production, augment tester to
 accomodate

---
 libraries/chain/block_header_state.cpp        |  19 +--
 libraries/chain/controller.cpp                |   1 -
 .../testing/include/eosio/testing/tester.hpp  |   1 +
 libraries/testing/tester.cpp                  |  30 +++--
 unittests/producer_schedule_tests.cpp         | 109 ++++++++++++++++++
 5 files changed, 142 insertions(+), 18 deletions(-)

diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index 65c2d8df546..744bf6a2251 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -322,15 +322,18 @@ namespace eosio { namespace chain {
                                  bool skip_validate_signee
    )&&
    {
-      auto result = std::move(*this)._finish_next( h, pfs, validator );
-
       if( !additional_signatures.empty() ) {
          auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
          const auto& protocol_features = prev_activated_protocol_features->protocol_features;
          bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
 
          EOS_ASSERT(wtmsig_enabled, producer_schedule_exception, "Block contains multiple signatures before WTMsig block signatures are enabled" );
-         result.additional_signatures = additional_signatures;
+      }
+
+      auto result = std::move(*this)._finish_next( h, pfs, validator );
+
+      if( !additional_signatures.empty() ) {
+         result.additional_signatures = std::move(additional_signatures);
       }
 
       // ASSUMPTION FROM controller_impl::apply_block = all untrusted blocks will have their signatures pre-validated here
@@ -350,15 +353,15 @@ namespace eosio { namespace chain {
                                  const signer_callback_type& signer
    )&&
    {
+      auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+      const auto& protocol_features = prev_activated_protocol_features->protocol_features;
+      bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+
       auto result = std::move(*this)._finish_next( h, pfs, validator );
       result.sign( signer );
       h.producer_signature = result.header.producer_signature;
 
       if( !result.additional_signatures.empty() ) {
-         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
-         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
-         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
-
          EOS_ASSERT(wtmsig_enabled, producer_schedule_exception, "Block was signed with multiple signatures before WTMsig block signatures are enabled" );
       }
 
@@ -410,7 +413,7 @@ namespace eosio { namespace chain {
 
       for (const auto& s: additional_signatures) {
          auto key = fc::crypto::public_key( s, sig_digest(), true );
-         EOS_ASSERT(keys.find(key) != keys.end(), wrong_signing_key,
+         EOS_ASSERT(keys.find(key) == keys.end(), wrong_signing_key,
                "block signed by same key twice",
                ("key", key));
 
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 59f9fff2769..898ffed55e3 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1688,7 +1688,6 @@ struct controller_impl {
          const signed_block_ptr& b = bsp->block;
          const auto& new_protocol_feature_activations = bsp->get_new_protocol_feature_activations();
 
-         EOS_ASSERT( b->block_extensions.size() == 0, block_validate_exception, "no supported block extensions" );
          auto producer_block_id = b->id();
          start_block( b->timestamp, b->confirmed, new_protocol_feature_activations, s, producer_block_id);
 
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 444972c10a5..1b3c2b7daa0 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -173,6 +173,7 @@ namespace eosio { namespace testing {
 
          vector<producer_authority>  get_producer_authorities( const vector<account_name>& producer_names )const;
          transaction_trace_ptr       set_producers(const vector<account_name>& producer_names);
+         transaction_trace_ptr       set_producer_schedule(const vector<producer_authority>& schedule);
          transaction_trace_ptr       set_producers_legacy(const vector<account_name>& producer_names);
 
          void link_authority( account_name account, account_name code,  permission_name req, action_name type = "" );
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index d9799d62966..d2287e26e88 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -309,19 +309,26 @@ namespace eosio { namespace testing {
       FC_ASSERT( control->is_building_block(), "must first start a block before it can be finished" );
 
       auto producer = control->head_block_state()->get_scheduled_producer( control->pending_block_time() );
-      private_key_type priv_key = producer.authority.visit([this, &producer](const block_signing_authority_v0& a){
-         for (const auto& k: a.keys) {
-            auto private_key_itr = block_signing_private_keys.find( k.key );
-            if (private_key_itr != block_signing_private_keys.end()) {
-               return private_key_itr->second;
-            }
+      vector<private_key_type> signing_keys;
+
+      for ( const auto& bsk : block_signing_private_keys ) {
+         if (producer.key_is_relevant(bsk.first)) {
+            signing_keys.push_back( bsk.second );
          }
+      }
 
-         return get_private_key( producer.producer_name, "active" );
-      });
+      // if the "active" key is relevant or no other keys were found, add the "active" private key
+      if( signing_keys.empty() || producer.key_is_relevant(get_public_key( producer.producer_name, "active") ) ) {
+         signing_keys.emplace_back( get_private_key( producer.producer_name, "active") );
+      }
 
       control->finalize_block( [&]( digest_type d ) {
-                    return std::vector<signature_type>{priv_key.sign(d)};
+         std::vector<signature_type> result;
+         result.reserve(signing_keys.size());
+         for (const auto& k: signing_keys)
+             result.emplace_back(k.sign(d));
+
+         return result;
       } );
 
       control->commit_block();
@@ -970,6 +977,10 @@ namespace eosio { namespace testing {
    transaction_trace_ptr base_tester::set_producers(const vector<account_name>& producer_names) {
       auto schedule = get_producer_authorities( producer_names );
 
+      return set_producer_schedule(schedule);
+   }
+
+   transaction_trace_ptr base_tester::set_producer_schedule(const vector<producer_authority>& schedule ) {
       // FC reflection does not create variants that are compatible with ABI 1.1 so we manually translate.
       fc::variants schedule_variant;
       schedule_variant.reserve(schedule.size());
@@ -979,6 +990,7 @@ namespace eosio { namespace testing {
 
       return push_action( config::system_account_name, N(setprods), config::system_account_name,
                           fc::mutable_variant_object()("schedule", schedule_variant));
+
    }
 
    transaction_trace_ptr base_tester::set_producers_legacy(const vector<account_name>& producer_names) {
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index 7d8a20f959b..e74bf22e40b 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -502,4 +502,113 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
 
 } FC_LOG_AND_RETHROW()
 
+BOOST_FIXTURE_TEST_CASE( producer_one_of_n_test, TESTER ) try {
+   create_accounts( {N(alice),N(bob)} );
+   while (control->head_block_num() < 3) {
+      produce_block();
+   }
+
+   auto compare_schedules = [&]( const vector<producer_authority>& a, const producer_authority_schedule& b ) {
+      return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
+   };
+
+   vector<producer_authority> sch1 = {
+                                 producer_authority{N(alice), block_signing_authority_v0{1, {{get_public_key(N(alice), "bs1"), 1}, {get_public_key(N(alice), "bs2"), 1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{1, {{get_public_key(N(bob),   "bs1"), 1}, {get_public_key(N(bob),   "bs2"), 1}}}}
+                               };
+
+   auto res = set_producer_schedule( sch1 );
+   block_signing_private_keys.emplace(get_public_key(N(alice), "bs1"), get_private_key(N(alice), "bs1"));
+   block_signing_private_keys.emplace(get_public_key(N(bob),   "bs1"), get_private_key(N(bob),   "bs1"));
+
+   //wdump((fc::json::to_pretty_string(res)));
+   wlog("set producer schedule to [alice,bob]");
+   BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
+   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, *control->proposed_producers() ) );
+   BOOST_CHECK_EQUAL( control->pending_producers().version, 0u );
+   produce_block(); // Starts new block which promotes the proposed schedule to pending
+   BOOST_CHECK_EQUAL( control->pending_producers().version, 1u );
+   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, control->pending_producers() ) );
+   BOOST_CHECK_EQUAL( control->active_producers().version, 0u );
+   produce_block();
+   produce_block(); // Starts new block which promotes the pending schedule to active
+   BOOST_CHECK_EQUAL( control->active_producers().version, 1u );
+   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, control->active_producers() ) );
+   produce_blocks(18);
+
+   // fast forward until the first block of alices round
+   BOOST_REQUIRE_EQUAL( control->head_block_producer(),    N(bob) );
+   BOOST_REQUIRE_EQUAL( control->pending_block_producer(), N(alice) );
+
+   // produce with backup key by listing that in block signing keys
+   block_signing_private_keys.clear();
+   block_signing_private_keys.emplace(get_public_key(N(alice), "bs2"), get_private_key(N(alice), "bs2"));
+   block_signing_private_keys.emplace(get_public_key(N(bob),   "bs2"), get_private_key(N(bob),   "bs2"));
+
+   produce_blocks(config::producer_repetitions, false);
+
+   // check that its bobs turn
+   BOOST_REQUIRE_EQUAL( control->head_block_producer(),    N(alice) );
+   BOOST_REQUIRE_EQUAL( control->pending_block_producer(), N(bob) );
+
+   produce_blocks(config::producer_repetitions, false);
+
+   BOOST_REQUIRE_EQUAL( validate(), true );
+} FC_LOG_AND_RETHROW()
+
+BOOST_FIXTURE_TEST_CASE( producer_m_of_n_test, TESTER ) try {
+   create_accounts( {N(alice),N(bob)} );
+   while (control->head_block_num() < 3) {
+      produce_block();
+   }
+
+   auto compare_schedules = [&]( const vector<producer_authority>& a, const producer_authority_schedule& b ) {
+      return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
+   };
+
+   vector<producer_authority> sch1 = {
+                                 producer_authority{N(alice), block_signing_authority_v0{2, {{get_public_key(N(alice), "bs1"), 1}, {get_public_key(N(alice), "bs2"), 1}}}},
+                                 producer_authority{N(bob),   block_signing_authority_v0{2, {{get_public_key(N(bob),   "bs1"), 1}, {get_public_key(N(bob),   "bs2"), 1}}}}
+                               };
+
+   auto res = set_producer_schedule( sch1 );
+   block_signing_private_keys.emplace(get_public_key(N(alice), "bs1"), get_private_key(N(alice), "bs1"));
+   block_signing_private_keys.emplace(get_public_key(N(alice), "bs2"), get_private_key(N(alice), "bs2"));
+   block_signing_private_keys.emplace(get_public_key(N(bob),   "bs1"), get_private_key(N(bob),   "bs1"));
+   block_signing_private_keys.emplace(get_public_key(N(bob),   "bs2"), get_private_key(N(bob),   "bs2"));
+
+   //wdump((fc::json::to_pretty_string(res)));
+   wlog("set producer schedule to [alice,bob]");
+   BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
+   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, *control->proposed_producers() ) );
+   BOOST_CHECK_EQUAL( control->pending_producers().version, 0u );
+   produce_block(); // Starts new block which promotes the proposed schedule to pending
+   BOOST_CHECK_EQUAL( control->pending_producers().version, 1u );
+   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, control->pending_producers() ) );
+   BOOST_CHECK_EQUAL( control->active_producers().version, 0u );
+   produce_block();
+   produce_block(); // Starts new block which promotes the pending schedule to active
+   BOOST_CHECK_EQUAL( control->active_producers().version, 1u );
+   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, control->active_producers() ) );
+   produce_blocks(18);
+
+   // fast forward until the first block of alices round
+   BOOST_REQUIRE_EQUAL( control->head_block_producer(),    N(bob) );
+   BOOST_REQUIRE_EQUAL( control->pending_block_producer(), N(alice) );
+
+   BOOST_REQUIRE_EQUAL( control->head_block_state()->additional_signatures.size(), 1);
+
+   produce_blocks(config::producer_repetitions, false);
+
+   BOOST_REQUIRE_EQUAL( control->head_block_state()->additional_signatures.size(), 1);
+
+      // check that its bobs turn
+   BOOST_REQUIRE_EQUAL( control->head_block_producer(),    N(alice) );
+   BOOST_REQUIRE_EQUAL( control->pending_block_producer(), N(bob) );
+
+   produce_blocks(config::producer_repetitions, false);
+
+   BOOST_REQUIRE_EQUAL( validate(), true );
+} FC_LOG_AND_RETHROW()
+
 BOOST_AUTO_TEST_SUITE_END()

From 268439e73c19db0fa8cdbb2dd2069d362321a968 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 22 May 2019 21:25:55 -0400
Subject: [PATCH 0459/1648] cleanup subcommand code into eosio::cli_parser
 namespace; rename header file to cli_parser.hpp; add dispatch support to
 cli_parser

---
 programs/intrinsic-log-util/cli_parser.hpp | 790 +++++++++++++++++++++
 programs/intrinsic-log-util/main.cpp       |  60 +-
 programs/intrinsic-log-util/subcommand.hpp | 651 -----------------
 3 files changed, 838 insertions(+), 663 deletions(-)
 create mode 100644 programs/intrinsic-log-util/cli_parser.hpp
 delete mode 100644 programs/intrinsic-log-util/subcommand.hpp

diff --git a/programs/intrinsic-log-util/cli_parser.hpp b/programs/intrinsic-log-util/cli_parser.hpp
new file mode 100644
index 00000000000..e97a279909b
--- /dev/null
+++ b/programs/intrinsic-log-util/cli_parser.hpp
@@ -0,0 +1,790 @@
+/**
+ *  @file
+ *  @copyright defined in eosio/LICENSE.txt
+ */
+#pragma once
+
+#include <fc/exception/exception.hpp>
+
+#include <boost/program_options.hpp>
+#include <boost/filesystem.hpp>
+
+#include <variant>
+#include <memory>
+#include <type_traits>
+
+//#include <iosfwd>
+#include <iostream>
+
+namespace eosio::cli_parser {
+
+   namespace bfs = boost::filesystem;
+   namespace bpo = boost::program_options;
+
+   enum class subcommand_style {
+      contains_subcommands,
+      terminal_subcommand_with_positional_arguments,
+      terminal_subcommand_without_positional_arguments
+   };
+
+   struct subcommand_description {
+      subcommand_description( const std::string& subcommand_name, const std::string& description )
+      :subcommand_name( subcommand_name )
+      ,description( description )
+      {}
+
+      std::string subcommand_name;
+      std::string description;
+   };
+
+   using subcommand_descriptions = std::vector<subcommand_description>;
+
+   struct positional_description {
+      positional_description( const std::string& positional_name, const std::string& description )
+      :positional_name( positional_name )
+      ,description( description )
+      {}
+
+      std::string positional_name;
+      std::string description;
+   };
+
+   using positional_descriptions = std::vector<positional_description>;
+
+   struct autocomplete_failure {};
+   struct autocomplete_success {};
+   struct parse_failure {};
+
+   struct parse_metadata {
+      parse_metadata( const std::vector<std::string>& context )
+      :subcommand_context( context )
+      {}
+
+      /** @pre subcommand_descriptions alternative of other_description must be present */
+      void add_subcommand_description( const std::string& subcommand, const std::string& description )
+      {
+         std::get<subcommand_descriptions>( other_description ).emplace_back( subcommand, description );
+      }
+
+      void set_positional_descriptions( const positional_descriptions& pos_desc ) {
+         other_description.emplace<positional_descriptions>( pos_desc );
+      }
+
+      void set_positional_descriptions( positional_descriptions&& pos_desc ) {
+         other_description.emplace<positional_descriptions>( std::move(pos_desc) );
+      }
+
+      std::vector<std::string>                                       subcommand_context;
+      std::string                                                    subcommand_desc;
+      std::shared_ptr<bpo::options_description>                      opts_description;
+      std::variant<subcommand_descriptions, positional_descriptions> other_description;
+      bool                                                           initialization_skipped = false;
+   };
+
+   namespace detail {
+      template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+      template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+
+      template<typename T, typename = int>
+      struct has_name : std::false_type {};
+
+      template<typename T>
+      struct has_name<T, decltype((void) T::name, 0)> : std::true_type {};
+
+      template<typename T, typename = int>
+      struct has_description : std::false_type {};
+
+      template<typename T>
+      struct has_description<T, decltype((void) T::get_description(), 0)> : std::true_type {};
+
+      template<typename T, typename = int>
+      struct has_initialize : std::false_type {};
+
+      template<typename T>
+      struct has_initialize<T, decltype((void) std::declval<T>().initialize( std::move( std::declval<bpo::variables_map>() ) ), 0)>
+      : std::true_type
+      {};
+
+      template<typename Visitor, typename... Args>
+      bool maybe_call_visitor( Visitor&& visitor, Args&&... args ) {
+         if constexpr( std::is_invocable_v<Visitor, Args...> ) {
+            std::forward<Visitor>(visitor)( std::forward<Args>(args)... );
+            return true;
+         } else {
+            return false;
+         }
+      }
+
+      template<std::size_t I, typename Ret, typename Tuple, typename Extractor, typename Reducer, typename... Args>
+      bool reduce_tuple_helper( Ret& accumulator, Tuple&& t,
+                                Extractor&& extract, Reducer&& reduce )
+      {
+         if constexpr( I < std::tuple_size_v<std::decay_t<Tuple>> ) {
+            if( !reduce( accumulator, I, extract( std::get<I>( t ) ) ) )
+               return false;
+
+            return reduce_tuple_helper<I+1>( accumulator, std::forward<Tuple>(t),
+                                             std::forward<Extractor>(extract),
+                                             std::forward<Reducer>(reduce) );
+         }
+
+         return true;
+      }
+
+      template<typename Ret, typename Tuple, typename Extractor, typename Reducer, typename... Args>
+      bool reduce_tuple( Ret& accumulator, Tuple&& t,
+                         Extractor&& extract, Reducer&& reduce )
+      {
+         return reduce_tuple_helper<0>( accumulator, std::forward<Tuple>(t),
+                                        std::forward<Extractor>(extract),
+                                        std::forward<Reducer>(reduce) );
+      }
+
+      template<int I, typename Visitor, typename... Ts>
+      bool visit_by_name_helper( const std::variant<Ts...>& var, const std::string& subcommand_name, Visitor&& visitor ) {
+         using variant_type = std::variant<Ts...>;
+
+         if constexpr( I < std::variant_size_v<variant_type> )
+         {
+            if constexpr( has_name< std::variant_alternative_t<I, variant_type> >::value ) {
+               if( subcommand_name.compare( std::variant_alternative_t<I, variant_type>::name ) == 0 ) {
+                  std::forward<Visitor>(visitor)( std::get<I>( var ) );
+                  return true;
+               }
+            }
+            return visit_by_name_helper<I+1>( var,
+                                              subcommand_name,
+                                              std::forward<Visitor>(visitor) );
+         } else {
+            return false;
+         }
+      }
+
+      template<typename Visitor, typename... Ts>
+      bool visit_by_name( const std::variant<Ts...>& var, const std::string& subcommand_name, Visitor&& visitor ) {
+         return visit_by_name_helper<0>( var, subcommand_name, std::forward<Visitor>( visitor ) );
+      }
+
+      template<int I, typename Variant, typename Visitor, typename... Args>
+      bool construct_variant_by_name_helper( Variant& var,
+                                             const std::string& subcommand_name,
+                                             Visitor&& visitor,
+                                             Args&&... args )
+      {
+         if constexpr( I < std::variant_size_v<Variant> ) {
+            if constexpr( has_name< std::variant_alternative_t<I, Variant> >::value ) {
+               if( subcommand_name.compare( std::variant_alternative_t<I, Variant>::name ) == 0 ) {
+                  std::forward<Visitor>(visitor)( var.template emplace<I>( std::forward<Args>(args)... ) );
+                  return true;
+               }
+            }
+            return construct_variant_by_name_helper<I+1>( var,
+                                                          subcommand_name,
+                                                          std::forward<Visitor>(visitor),
+                                                          std::forward<Args>(args)... );
+         } else {
+            return false;
+         }
+      }
+
+      template<typename Variant, typename... Args>
+      bool construct_variant_by_name( Variant& var,
+                                      const std::string& subcommand_name,
+                                      Args&&... args )
+      {
+         return construct_variant_by_name_helper<0>( var,
+                                                     subcommand_name,
+                                                     []( auto&& ) {}, // do nothing in visitor
+                                                     std::forward<Args>(args)... );
+      }
+
+      template<typename Variant, typename Visitor, typename... Args>
+      bool construct_and_visit_variant_by_name( Variant& var,
+                                                const std::string& subcommand_name,
+                                                Visitor&& visitor,
+                                                Args&&... args )
+      {
+         return construct_variant_by_name_helper<0>( var,
+                                                     subcommand_name,
+                                                     std::forward<Visitor>(visitor),
+                                                     std::forward<Args>(args)... );
+      }
+
+      template<int I, typename Variant, typename Visitor>
+      void static_visit_all_helper( Visitor&& visitor )
+      {
+         if constexpr( I < std::variant_size_v<Variant> ) {
+            if constexpr( has_name< std::variant_alternative_t<I, Variant> >::value ) {
+               std::string desc;
+               if constexpr( has_description< std::variant_alternative_t<I, Variant> >::value ) {
+                  desc = std::variant_alternative_t<I, Variant>::get_description();
+               }
+               visitor( std::variant_alternative_t<I, Variant>::name, desc );
+            }
+            return static_visit_all_helper<I+1, Variant>( std::forward<Visitor>(visitor) );
+         }
+      }
+
+      template<typename Variant, typename Visitor>
+      void static_visit_all( Visitor&& visitor ) {
+         static_visit_all_helper<0, Variant>( std::forward<Visitor>(visitor) );
+      }
+
+      struct no_subcommand {};
+
+      class subcommand_untyped_base {};
+
+      template<typename T, typename... Us>
+      class subcommand_base : public subcommand_untyped_base {
+         static_assert( (std::is_default_constructible_v<Us> && ...) );
+         static_assert( (std::is_base_of_v<subcommand_untyped_base, Us> && ...), "subcommands must derive from subcommand type" );
+
+      protected:
+         subcommand_base() = default;
+         friend T;
+
+         bpo::options_description _get_options( const std::vector<std::string>& subcommand_context )
+         {
+            std::string options_name;
+            if( subcommand_context.size() > 0 ) {
+               for( const auto& s : subcommand_context ) {
+                  options_name += s;
+                  options_name += " ";
+               }
+            } else {
+               options_name += T::name;
+               options_name += " ";
+            }
+            options_name += "options";
+
+            bpo::options_description options( options_name );
+            T& derived = static_cast<T&>( *this );
+            derived.set_options( options );
+            return options;
+         }
+
+         template<typename U=T>
+         static std::string _get_description() {
+            if constexpr( has_description<U>::value ) {
+               return U::get_description();
+            } else {
+               return {};
+            }
+         }
+
+         template<typename U=T>
+         void _initialize( bpo::variables_map&& vm ) {
+            if constexpr( has_initialize<U>::value ) {
+               T& derived = static_cast<T&>( *this );
+               derived.initialize( std::move(vm) );
+            }
+         }
+      };
+
+      template<typename T, subcommand_style SubcommandStyle, typename... Us>
+      class subcommand;
+
+      template<typename T, typename... Us>
+      class subcommand<T, subcommand_style::contains_subcommands, Us...>
+         : public subcommand_base<T,  Us...>
+      {
+      protected:
+         using base_type = subcommand_base<T,  Us...>;
+         using subcommands_type = std::variant<no_subcommand, Us...>;
+
+         static_assert( sizeof...(Us) > 0 );
+
+         subcommands_type _subcommand;
+
+      public:
+         static constexpr bool has_subcommands = true;
+
+         parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
+                               const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
+         {
+            parse_metadata pm( subcommand_context );
+            bpo::options_description subcommand_options{base_type::_get_options(subcommand_context)};
+
+            auto subcommand_options_ptr = std::make_shared<bpo::options_description>( subcommand_options );
+
+            subcommand_options.add_options()
+               ("__command", bpo::value<std::string>(), "command to execute" )
+               ("__subargs", bpo::value<std::vector<std::string>>(), "arguments for command" )
+            ;
+
+            bpo::positional_options_description pos;
+            pos.add( "__command", 1 ).add( "__subargs", -1 );
+
+            bpo::parsed_options parsed = bpo::command_line_parser( opts )
+                                          .options( subcommand_options )
+                                          .positional( pos )
+                                          .allow_unregistered()
+                                          .run();
+
+            bpo::variables_map vm;
+
+            bpo::variables_map vm_temp;
+            bpo::store( parsed, vm_temp );
+
+            if( vm_temp.count( "__command" ) > 0 ) {
+               std::string cmd_name = vm_temp["__command"].as<std::string>();
+
+               std::vector<std::string> inner_opts = bpo::collect_unrecognized( parsed.options, bpo::include_positional );
+               FC_ASSERT( inner_opts.size() > 0, "unexpected error" );
+               FC_ASSERT( *inner_opts.begin() == cmd_name,
+                          "unrecognized option '${option}'",
+                          ("option", *inner_opts.begin())
+               );
+               inner_opts.erase( inner_opts.begin() );
+
+               bool success = construct_and_visit_variant_by_name( _subcommand, cmd_name,
+                  [&inner_opts, &pm, &cmd_name, &subcommand_options_ptr, &skip_initialize, context = subcommand_context]
+                  ( auto&& s ) mutable {
+                     context.emplace_back( cmd_name );
+                     pm = s.parse( inner_opts, skip_initialize, context );
+                     FC_ASSERT( pm.opts_description, "unexpected error" );
+                     subcommand_options_ptr->add( *pm.opts_description );
+                     pm.opts_description = subcommand_options_ptr;
+                  }
+               );
+               FC_ASSERT(  success, "unrecognized sub-command '${name}' within context: ${context}",
+                           ("name", cmd_name)("context", subcommand_context)
+               );
+               vm = std::move(vm_temp);
+            } else {
+               bpo::parsed_options parsed2 = bpo::command_line_parser( opts )
+                                                .options( *subcommand_options_ptr )
+                                                .run();
+               bpo::store( parsed2, vm );
+
+               static_visit_all<std::decay_t<decltype(_subcommand)>>(
+                  [&pm]( const char* name, const std::string& desc ) {
+                     pm.add_subcommand_description( name, desc );
+                  }
+               );
+
+               pm.opts_description = std::move(subcommand_options_ptr);
+               pm.subcommand_desc  = base_type::_get_description();
+               pm.initialization_skipped = skip_initialize;
+            }
+
+            if( !skip_initialize ) {
+               bpo::notify( vm );
+               base_type::_initialize( std::move(vm) );
+            }
+
+            return pm;
+         }
+
+         const subcommands_type& get_subcommand()const { return _subcommand; }
+      };
+
+      template<typename T>
+      class subcommand<T, subcommand_style::terminal_subcommand_with_positional_arguments>
+         : public subcommand_base<T>
+      {
+      protected:
+         using base_type = subcommand_base<T>;
+
+      public:
+         static constexpr bool has_subcommands = false;
+
+         parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
+                               const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
+         {
+            parse_metadata pm( subcommand_context );
+            pm.subcommand_desc  = base_type::_get_description();
+            pm.opts_description = std::make_shared<bpo::options_description>(
+                                          base_type::_get_options(subcommand_context) );
+
+            bpo::options_description subcommand_options{ *pm.opts_description };
+            positional_descriptions pos_desc;
+            const auto& pos = _get_positional_options( subcommand_options, pos_desc );
+            pm.set_positional_descriptions( pos_desc );
+
+            bpo::variables_map vm;
+
+            bpo::store( bpo::command_line_parser( opts )
+                           .options( subcommand_options )
+                           .positional( pos )
+                           .run(),
+                        vm );
+
+            if( !skip_initialize ) {
+               bpo::notify( vm );
+               base_type::_initialize( std::move(vm) );
+            }
+            pm.initialization_skipped = skip_initialize;
+
+            return pm;
+         }
+
+      protected:
+         bpo::positional_options_description _get_positional_options( bpo::options_description& options,
+                                                                      positional_descriptions& pos_desc )const
+         {
+            const T& derived = static_cast<const T&>( *this );
+            return derived.get_positional_options( options, pos_desc );
+         }
+      };
+
+      template<typename T>
+      class subcommand<T, subcommand_style::terminal_subcommand_without_positional_arguments>
+         : public subcommand_base<T>
+      {
+      protected:
+         using base_type = subcommand_base<T>;
+
+      public:
+         static constexpr bool has_subcommands = false;
+
+
+         parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
+                               const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
+         {
+            parse_metadata pm( subcommand_context );
+            pm.subcommand_desc  = base_type::_get_description();
+            pm.opts_description = std::make_shared<bpo::options_description>(
+                                          base_type::_get_options(subcommand_context) );
+
+            bpo::variables_map vm;
+
+            bpo::store( bpo::command_line_parser( opts )
+                           .options( *pm.opts_description )
+                           .run(),
+                        vm );
+
+            if( !skip_initialize ) {
+               bpo::notify( vm );
+               base_type::_initialize( std::move(vm) );
+            }
+            pm.initialization_skipped = skip_initialize;
+
+            return pm;
+         }
+      };
+
+   } /// namespace detail
+
+   template<typename T, subcommand_style SubcommandStyle, typename... Us>
+   using subcommand = eosio::cli_parser::detail::subcommand<T, SubcommandStyle, Us...>;
+
+   template<std::size_t N>
+   bpo::positional_options_description
+   build_positional_descriptions( const std::array<std::string, N>& pos_names,
+                                  const bpo::options_description& options,
+                                  positional_descriptions& pos_desc )
+   {
+      bpo::positional_options_description pos;
+
+      for( std::size_t i = 0; i < pos_names.size(); ++i ) {
+         pos.add( pos_names[i].c_str(), 1 );
+         const bpo::option_description* opt = options.find_nothrow( pos_names[i], false );
+         if( opt ) {
+            pos_desc.emplace_back( pos_names[i], opt->description() );
+         } else {
+            pos_desc.emplace_back( pos_names[i], "" );
+         }
+      }
+
+      return pos;
+   }
+
+   void print_subcommand_help( std::ostream& stream, const std::string& program_name, const parse_metadata& pm ) {
+      const subcommand_descriptions* subcommands = std::get_if<subcommand_descriptions>( &pm.other_description );
+      bool subcommands_present = (subcommands && subcommands->size() > 0);
+
+      const positional_descriptions* positionals = std::get_if<positional_descriptions>( &pm.other_description );
+      bool positionals_present = (positionals && positionals->size() > 0);
+
+      auto formatting_width = pm.opts_description->get_option_column_width() - 2;
+
+      std::string subcommand_usage;
+      for( const auto& s : pm.subcommand_context ) {
+         subcommand_usage += " ";
+         subcommand_usage += s;
+      }
+      if( subcommands_present ) {
+         subcommand_usage += " SUBCOMMAND";
+      }
+
+      if( pm.subcommand_desc.size() > 0 ) {
+         stream << pm.subcommand_desc << std::endl;
+      }
+
+      stream   << "Usage: " << program_name
+               << subcommand_usage
+               << " [OPTIONS]";
+
+      if( positionals_present ) {
+         for( const auto& p : *positionals ) {
+            stream << " " << p.positional_name;
+         }
+      }
+
+      stream << std::endl << std::endl;
+
+      if( positionals_present ) {
+         stream << "Positionals:" << std::endl;
+
+         for( const auto& p : *positionals ) {
+            stream << "  ";
+            auto orig_width = stream.width( formatting_width );
+            stream << std::left << p.positional_name;
+            stream.width( orig_width );
+            stream << p.description << std::endl;
+         }
+
+         stream << std::endl;
+      }
+
+      pm.opts_description->print( stream );
+
+      if( subcommands_present ) {
+         stream << std::endl;
+
+         std::string subcommands_title;
+         if( pm.subcommand_context.size() > 0 ) {
+            for( const auto& s : pm.subcommand_context ) {
+               subcommands_title += s;
+               subcommands_title += " ";
+            }
+            subcommands_title += "subcommands:";
+         } else {
+            subcommands_title = "Subcommands:";
+         }
+
+         stream << subcommands_title << std::endl;
+         for( const auto& s : *subcommands ) {
+            stream << "  ";
+            auto orig_width = stream.width( formatting_width );
+            stream << std::left << s.subcommand_name;
+            stream.width( orig_width );
+            stream << s.description << std::endl;
+         }
+      }
+   }
+
+   bool print_autocomplete_suggestions( std::ostream& stream, const parse_metadata& pm, const std::string& last_token ) {
+      bool printed_something = false;
+
+      if( std::holds_alternative<subcommand_descriptions>( pm.other_description ) ) {
+         for( const auto& s : std::get<subcommand_descriptions>( pm.other_description ) ) {
+            if( s.subcommand_name.find( last_token ) != 0 ) continue;
+            if( printed_something )
+               stream << " ";
+            stream << s.subcommand_name;
+            printed_something = true;
+         }
+      }
+
+      if( last_token.size() > 0 ) {
+         for( const auto& opt : pm.opts_description->options() ) {
+            //if( opt->match( last_token, true, false, false ) == bpo::option_description::no_match ) continue;
+            // The option_description::match function doesn't seem to work.
+
+            const auto& short_name = opt->canonical_display_name( bpo::command_line_style::allow_dash_for_short );
+            if( short_name.size() > 0 && short_name[0] == '-' && short_name.find( last_token ) == 0 ) {
+               if( printed_something )
+                  stream << " ";
+               stream << short_name;
+               printed_something = true;
+            }
+
+            const auto& long_name = opt->canonical_display_name( bpo::command_line_style::allow_long );
+            if( long_name.size() > 0 && long_name[0] == '-' && long_name.find( last_token ) == 0 ) {
+               if( printed_something )
+                  stream << " ";
+               stream << long_name;
+               printed_something = true;
+            }
+         }
+      }
+
+      return printed_something;
+   }
+
+   template<typename T>
+   std::optional<parse_metadata>
+   parse_program_options( T& root, const std::vector<std::string>& opts,
+                          bool skip_initialize = false, bool avoid_throwing = false )
+   {
+      try {
+         return root.parse( opts, skip_initialize );
+      } catch( ... ) {
+         if( !avoid_throwing ) throw;
+      }
+
+      return {};
+   }
+
+   template<typename T>
+   std::variant<autocomplete_failure, autocomplete_success, parse_failure, parse_metadata>
+   parse_program_options_extended( T& root, int argc, const char** argv,
+                                   std::ostream& out_stream, std::ostream* err_stream = nullptr,
+                                   bool avoid_throwing = false )
+   {
+      if( argc <= 0 ) {
+         if( avoid_throwing ) return parse_failure{};
+         FC_ASSERT( false, "command line arguments should at least include program name" );
+      }
+
+      std::string program_name{ bfs::path( argv[0] ).filename().generic_string() };
+
+      bool autocomplete_mode = false;
+
+      std::vector<std::string> opts;
+      opts.reserve( argc - 1 );
+      for( int i = 1; i < argc; ++i ) {
+         opts.emplace_back( std::string( *(argv + i) ) );
+         if( opts.back().compare( "-" ) == 0 ) {
+            if( autocomplete_mode ) return autocomplete_failure{};
+            if( avoid_throwing ) return parse_failure{};
+            FC_ASSERT( false, "- is not allowed by itself in the command line arguments" );
+         }
+         if( opts.back().compare( "--" ) == 0 ) {
+            if( i != 1 ) {
+               if( autocomplete_mode ) return autocomplete_failure{};
+               if( avoid_throwing ) return parse_failure{};
+               FC_ASSERT( false, "-- is not allowed by itself in the command line arguments" );
+            }
+            opts.pop_back();
+            autocomplete_mode = true;
+         }
+      }
+
+      if( !autocomplete_mode ) {
+         const auto pm = parse_program_options( root, opts, false, avoid_throwing );
+         if( !pm ) return parse_failure{};
+         return *pm;
+      }
+
+      // Autocomplete helper logic:
+
+      std::string last_token;
+      if( opts.size() > 0 ) {
+         if( opts.back().size() == 0 ) {
+            opts.pop_back();
+         } else {
+            last_token = opts.back();
+         }
+      }
+
+      if( last_token.size() > 0 ) {
+         if( opts.size() == 0 ) return autocomplete_failure{};
+         opts.pop_back();
+      }
+
+      auto pm = parse_program_options( root, opts, true, true );
+      if( !pm ) return autocomplete_failure{};
+
+      if( last_token.size() > 0 ) {
+         if( print_autocomplete_suggestions( out_stream, *pm, last_token ) ) {
+            out_stream << std::endl;
+         } else {
+            return autocomplete_failure{};
+         }
+      }
+
+      if( err_stream ) {
+         *err_stream << std::endl;
+         print_subcommand_help( *err_stream, program_name, *pm );
+      }
+
+      return autocomplete_success{};
+   }
+
+   enum class dispatch_status {
+      successful_dispatch,
+      no_handler_for_terminal_subcommand,
+      no_handler_for_nonterminal_subcommand
+   };
+
+   namespace detail {
+
+      template<typename Ret, typename Reducer, typename Visitor, typename LastArg, typename... OtherArgs>
+      auto dispatch_helper( Reducer&& reduce, Visitor&& visitor, const LastArg& last_arg, const OtherArgs&... other_args )
+      -> std::enable_if_t<
+            !std::is_same_v<std::decay_t<LastArg>, no_subcommand>,
+            std::pair<dispatch_status, Ret>
+         >
+      {
+         static_assert( std::is_convertible_v<std::invoke_result_t<Reducer, std::tuple<const OtherArgs&..., const LastArg&>>, Ret> );
+
+         dispatch_status status = dispatch_status::no_handler_for_terminal_subcommand;
+
+         if constexpr( LastArg::has_subcommands ) {
+            return std::visit([&]( const auto& next_subcommand ) {
+               return dispatch_helper<Ret>( std::forward<Reducer>(reduce),
+                                            std::forward<Visitor>(visitor),
+                                            next_subcommand,
+                                            other_args..., last_arg );
+            }, last_arg.get_subcommand() );
+         } else {
+            if( maybe_call_visitor( std::forward<Visitor>(visitor), other_args..., last_arg ) )
+               status = dispatch_status::successful_dispatch;
+         }
+
+         return {status, reduce( std::make_tuple( std::cref(other_args)..., std::cref(last_arg) ) )};
+      }
+
+      template<typename Ret, typename Reducer, typename Visitor, typename LastArg, typename... OtherArgs>
+      auto dispatch_helper( Reducer&& reduce, Visitor&& visitor, const LastArg& last_arg, const OtherArgs&... other_args )
+      -> std::enable_if_t<
+            std::is_same_v<std::decay_t<LastArg>, no_subcommand>,
+            std::pair<dispatch_status, Ret>
+         >
+      {
+         static_assert( std::is_convertible_v<std::invoke_result_t<Reducer, std::tuple<const OtherArgs&...>>, Ret> );
+
+         dispatch_status status = dispatch_status::no_handler_for_nonterminal_subcommand;
+
+         if( maybe_call_visitor( std::forward<Visitor>(visitor), other_args... ) )
+            status = dispatch_status::successful_dispatch;
+
+         return {status, reduce( std::make_tuple( std::cref(other_args)... )  )};
+      }
+
+      template<typename... Args>
+      std::string get_subcommand_string( const std::tuple<const Args&...>& t ) {
+         static_assert( (has_name<Args>::value && ...) );
+
+         std::string result;
+
+         bool completed = reduce_tuple( result, t,
+            []( auto&& v ) -> std::string { return std::decay_t<decltype(v)>::name; },
+            []( std::string& accumulator, std::size_t index, const std::string& v ) -> bool {
+               if( index != 0 ) {
+                  if( index > 1 ) {
+                     accumulator += " ";
+                  }
+                  accumulator += v;
+               }
+               return true;
+            }
+         );
+
+         if( !completed ) return {};
+
+         return result;
+      }
+
+   } /// namespace detail
+
+   template<typename Dispatcher, typename Root>
+   auto dispatch( Dispatcher&& dispatcher, const Root& root ) -> std::pair<dispatch_status, std::string> {
+      return detail::dispatch_helper<std::string>(
+         []( const auto& t ) { return detail::get_subcommand_string(t); },
+         std::forward<Dispatcher>(dispatcher),
+         root
+      );
+   }
+
+} /// namespace eosio::cli_parser
+
+namespace eosio {
+   using subcommand_style = cli_parser::subcommand_style;
+
+   template<typename T, subcommand_style SubcommandStyle, typename... Us>
+   using subcommand = eosio::cli_parser::subcommand<T, SubcommandStyle, Us...>;
+}
diff --git a/programs/intrinsic-log-util/main.cpp b/programs/intrinsic-log-util/main.cpp
index 7089157c70f..7636c782e37 100644
--- a/programs/intrinsic-log-util/main.cpp
+++ b/programs/intrinsic-log-util/main.cpp
@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eosio/LICENSE.txt
  */
-#include "subcommand.hpp"
+#include "cli_parser.hpp"
 #include <eosio/chain/intrinsic_debug_log.hpp>
 
 #include <fc/io/json.hpp>
@@ -14,6 +14,7 @@
 #include <boost/filesystem/path.hpp>
 
 #include <cstring>
+#include <iostream>
 
 using namespace eosio;
 using namespace eosio::chain;
@@ -48,7 +49,7 @@ struct print_block_subcommand
    }
 
    bpo::positional_options_description
-   get_positional_options( bpo::options_description& options, positional_descriptions& pos_desc )const {
+   get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc )const {
       options.add_options()
          ("block-num", bpo::value<uint32_t>(),
           "the block number to print")
@@ -58,7 +59,7 @@ struct print_block_subcommand
          "block-num"
       };
 
-      return build_positional_descriptions( pos_args, options, pos_desc );
+      return cli_parser::build_positional_descriptions( pos_args, options, pos_desc );
    }
 };
 
@@ -141,7 +142,7 @@ struct diff_subcommand
    }
 
    bpo::positional_options_description
-   get_positional_options( bpo::options_description& options, positional_descriptions& pos_desc )const {
+   get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc )const {
       options.add_options()
          ("first-log", bpo::value<bfs::path>(),
          "path to the first log file to compare")
@@ -154,7 +155,7 @@ struct diff_subcommand
          "second-log"
       };
 
-      return build_positional_descriptions( pos_args, options, pos_desc );
+      return cli_parser::build_positional_descriptions( pos_args, options, pos_desc );
    }
 };
 
@@ -182,29 +183,64 @@ struct root_command
    bool print_help = false;
 };
 
+class subcommand_dispatcher {
+public:
+   subcommand_dispatcher( std::ostream& stream )
+   :stream( stream )
+   {}
+
+   void operator()( const root_command& root, const diff_subcommand& diff ) {
+      stream << "diff was called" << std::endl;
+   }
+
+   void operator()( const root_command& root, const print_subcommand& print, const print_blocks_subcommand& blocks ) {
+      stream << "print blocks was called" << std::endl;
+   }
+
+protected:
+   std::ostream& stream;
+};
+
 int main( int argc, const char** argv ) {
    try {
       root_command rc;
-      auto res = parse_program_options_extended( rc, argc, argv, std::cout, &std::cerr );
+      auto parse_result = cli_parser::parse_program_options_extended( rc, argc, argv, std::cout, &std::cerr );
 
-      if( std::holds_alternative<parse_failure>( res ) ) {
+      if( std::holds_alternative<cli_parser::parse_failure>( parse_result ) ) {
          FC_ASSERT( false, "parse error occurred" );
-      } else if( std::holds_alternative<autocomplete_failure>( res ) ) {
+      } else if( std::holds_alternative<cli_parser::autocomplete_failure>( parse_result ) ) {
          return -1;
-      } else if( std::holds_alternative<autocomplete_success>( res ) ) {
+      } else if( std::holds_alternative<cli_parser::autocomplete_success>( parse_result ) ) {
          return 0;
       }
 
-      const auto& pm = std::get<parse_metadata>( res );
+      const auto& pm = std::get<cli_parser::parse_metadata>( parse_result );
 
       if( argc == 1 || rc.print_help ) {
-         print_subcommand_help( std::cout, bfs::path( argv[0] ).filename().generic_string(), pm );
+         cli_parser::print_subcommand_help( std::cout, bfs::path( argv[0] ).filename().generic_string(), pm );
          return 0;
       }
 
       std::ios::sync_with_stdio(false); // for potential performance boost for large log files
 
-
+      subcommand_dispatcher d( std::cout );
+      auto dispatch_result = cli_parser::dispatch( d, rc );
+
+      FC_ASSERT( dispatch_result.first != cli_parser::dispatch_status::no_handler_for_terminal_subcommand,
+                 "The ${subcommand} sub-command has not been implemented yet.",
+                 ("subcommand", dispatch_result.second)
+      );
+
+      if( dispatch_result.first == cli_parser::dispatch_status::no_handler_for_nonterminal_subcommand ) {
+         std::cout << "\033[0;31m"
+                   << "The sub-command "
+                   << "\033[1;31m" << dispatch_result.second << "\033[0;31m"
+                   << " cannot be called by itself."
+                   << "\033[0m"
+                   << std::endl;
+         cli_parser::print_subcommand_help( std::cout, bfs::path( argv[0] ).filename().generic_string(), pm );
+         return -1;
+      }
 
    } catch( const fc::exception& e ) {
       elog( "${e}", ("e", e.to_detail_string()));
diff --git a/programs/intrinsic-log-util/subcommand.hpp b/programs/intrinsic-log-util/subcommand.hpp
deleted file mode 100644
index 8b2293f47fe..00000000000
--- a/programs/intrinsic-log-util/subcommand.hpp
+++ /dev/null
@@ -1,651 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eosio/LICENSE.txt
- */
-#pragma once
-
-#include <fc/exception/exception.hpp>
-
-#include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
-
-#include <variant>
-#include <memory>
-#include <type_traits>
-
-//#include <iosfwd>
-#include <iostream>
-#include <sstream>
-#include <iterator>
-
-namespace eosio {
-
-namespace bfs = boost::filesystem;
-namespace bpo = boost::program_options;
-
-enum class subcommand_style {
-   contains_subcommands,
-   terminal_subcommand_with_positional_arguments,
-   terminal_subcommand_without_positional_arguments
-};
-
-namespace detail {
-   template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
-   template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
-
-   template<typename T, typename = int>
-   struct has_name : std::false_type {};
-
-   template<typename T>
-   struct has_name<T, decltype((void) T::name, 0)> : std::true_type {};
-
-   template<typename T, typename = int>
-   struct has_description : std::false_type {};
-
-   template<typename T>
-   struct has_description<T, decltype((void) T::get_description(), 0)> : std::true_type {};
-
-   template<typename T, typename = int>
-   struct has_initialize : std::false_type {};
-
-   template<typename T>
-   struct has_initialize<T, decltype((void) std::declval<T>().initialize( std::move( std::declval<bpo::variables_map>() ) ), 0)>
-   : std::true_type
-   {};
-
-   template<int I, typename Visitor, typename... Ts>
-   bool visit_by_name_helper( const std::variant<Ts...>& var, const std::string& subcommand_name, Visitor&& visitor ) {
-      using variant_type = std::variant<Ts...>;
-
-      if constexpr( I < std::variant_size_v<variant_type> )
-      {
-         if constexpr( has_name< std::variant_alternative_t<I, variant_type> >::value ) {
-            if( subcommand_name.compare( std::variant_alternative_t<I, variant_type>::name ) == 0 ) {
-               std::forward<Visitor>(visitor)( std::get<I>( var ) );
-               return true;
-            }
-         }
-         return visit_by_name_helper<I+1>( var,
-                                           subcommand_name,
-                                           std::forward<Visitor>(visitor) );
-      } else {
-         return false;
-      }
-   }
-
-   template<typename Visitor, typename... Ts>
-   bool visit_by_name( const std::variant<Ts...>& var, const std::string& subcommand_name, Visitor&& visitor ) {
-      return visit_by_name_helper<0>( var, subcommand_name, std::forward<Visitor>( visitor ) );
-   }
-
-   template<int I, typename Variant, typename Visitor, typename... Args>
-   bool construct_variant_by_name_helper( Variant& var,
-                                          const std::string& subcommand_name,
-                                          Visitor&& visitor,
-                                          Args&&... args )
-   {
-      if constexpr( I < std::variant_size_v<Variant> ) {
-         if constexpr( has_name< std::variant_alternative_t<I, Variant> >::value ) {
-            if( subcommand_name.compare( std::variant_alternative_t<I, Variant>::name ) == 0 ) {
-               std::forward<Visitor>(visitor)( var.template emplace<I>( std::forward<Args>(args)... ) );
-               return true;
-            }
-         }
-         return construct_variant_by_name_helper<I+1>( var,
-                                                       subcommand_name,
-                                                       std::forward<Visitor>(visitor),
-                                                       std::forward<Args>(args)... );
-      } else {
-         return false;
-      }
-   }
-
-   template<typename Variant, typename... Args>
-   bool construct_variant_by_name( Variant& var,
-                                   const std::string& subcommand_name,
-                                   Args&&... args )
-   {
-      return construct_variant_by_name_helper<0>( var,
-                                                  subcommand_name,
-                                                  []( auto&& ) {}, // do nothing in visitor
-                                                  std::forward<Args>(args)... );
-   }
-
-   template<typename Variant, typename Visitor, typename... Args>
-   bool construct_and_visit_variant_by_name( Variant& var,
-                                             const std::string& subcommand_name,
-                                             Visitor&& visitor,
-                                             Args&&... args )
-   {
-      return construct_variant_by_name_helper<0>( var,
-                                                  subcommand_name,
-                                                  std::forward<Visitor>(visitor),
-                                                  std::forward<Args>(args)... );
-   }
-
-   template<int I, typename Variant, typename Visitor>
-   void static_visit_all_helper( Visitor&& visitor )
-   {
-      if constexpr( I < std::variant_size_v<Variant> ) {
-         if constexpr( has_name< std::variant_alternative_t<I, Variant> >::value ) {
-            std::string desc;
-            if constexpr( has_description< std::variant_alternative_t<I, Variant> >::value ) {
-               desc = std::variant_alternative_t<I, Variant>::get_description();
-            }
-            visitor( std::variant_alternative_t<I, Variant>::name, desc );
-         }
-         return static_visit_all_helper<I+1, Variant>( std::forward<Visitor>(visitor) );
-      }
-   }
-
-   template<typename Variant, typename Visitor>
-   void static_visit_all( Visitor&& visitor ) {
-      static_visit_all_helper<0, Variant>( std::forward<Visitor>(visitor) );
-   }
-
-   struct no_subcommand {};
-
-   class subcommand_untyped_base {};
-
-   template<typename T, typename... Us>
-   class subcommand_base : public subcommand_untyped_base {
-      static_assert( (std::is_default_constructible_v<Us> && ...) );
-      static_assert( (std::is_base_of_v<subcommand_untyped_base, Us> && ...), "subcommands must derive from subcommand type" );
-
-   protected:
-      subcommand_base() = default;
-      friend T;
-
-      bpo::options_description _get_options( const std::vector<std::string>& subcommand_context )
-      {
-         std::string options_name;
-         if( subcommand_context.size() > 0 ) {
-            for( const auto& s : subcommand_context ) {
-               options_name += s;
-               options_name += " ";
-            }
-         } else {
-            options_name += T::name;
-            options_name += " ";
-         }
-         options_name += "options";
-
-         bpo::options_description options( options_name );
-         T& derived = static_cast<T&>( *this );
-         derived.set_options( options );
-         return options;
-      }
-
-      template<typename U=T>
-      static std::string _get_description() {
-         if constexpr( detail::has_description<U>::value ) {
-            return U::get_description();
-         } else {
-            return {};
-         }
-      }
-
-      template<typename U=T>
-      void _initialize( bpo::variables_map&& vm ) {
-         if constexpr( detail::has_initialize<U>::value ) {
-            T& derived = static_cast<T&>( *this );
-            derived.initialize( std::move(vm) );
-         }
-      }
-   };
-
-} /// namespace eosio::detail
-
-struct subcommand_description {
-   subcommand_description( const std::string& subcommand_name, const std::string& description )
-   :subcommand_name( subcommand_name )
-   ,description( description )
-   {}
-
-   std::string subcommand_name;
-   std::string description;
-};
-
-using subcommand_descriptions = std::vector<subcommand_description>;
-
-struct positional_description {
-   positional_description( const std::string& positional_name, const std::string& description )
-   :positional_name( positional_name )
-   ,description( description )
-   {}
-
-   std::string positional_name;
-   std::string description;
-};
-
-using positional_descriptions = std::vector<positional_description>;
-
-struct parse_metadata {
-   parse_metadata( const std::vector<std::string>& context )
-   :subcommand_context( context )
-   {}
-
-   /** @pre subcommand_descriptions alternative of other_description must be present */
-   void add_subcommand_description( const std::string& subcommand, const std::string& description )
-   {
-      std::get<subcommand_descriptions>( other_description ).emplace_back( subcommand, description );
-   }
-
-   void set_positional_descriptions( const positional_descriptions& pos_desc ) {
-      other_description.emplace<positional_descriptions>( pos_desc );
-   }
-
-   void set_positional_descriptions( positional_descriptions&& pos_desc ) {
-      other_description.emplace<positional_descriptions>( std::move(pos_desc) );
-   }
-
-   std::vector<std::string>                                       subcommand_context;
-   std::string                                                    subcommand_desc;
-   std::shared_ptr<bpo::options_description>                      opts_description;
-   std::variant<subcommand_descriptions, positional_descriptions> other_description;
-   bool                                                           initialization_skipped = false;
-};
-
-template<typename T, subcommand_style SubcommandStyle, typename... Us>
-class subcommand;
-
-template<typename T, typename... Us>
-class subcommand<T, subcommand_style::contains_subcommands, Us...>
-   : public detail::subcommand_base<T,  Us...>
-{
-protected:
-   using base_type = detail::subcommand_base<T,  Us...>;
-   using subcommands_type = std::variant<detail::no_subcommand, Us...>;
-
-   subcommands_type _subcommand;
-
-public:
-
-   parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
-                         const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
-   {
-      parse_metadata pm( subcommand_context );
-      bpo::options_description subcommand_options{base_type::_get_options(subcommand_context)};
-
-      auto subcommand_options_ptr = std::make_shared<bpo::options_description>( subcommand_options );
-
-      subcommand_options.add_options()
-         ("__command", bpo::value<std::string>(), "command to execute" )
-         ("__subargs", bpo::value<std::vector<std::string>>(), "arguments for command" )
-      ;
-
-      bpo::positional_options_description pos;
-      pos.add( "__command", 1 ).add( "__subargs", -1 );
-
-      bpo::parsed_options parsed = bpo::command_line_parser( opts )
-                                    .options( subcommand_options )
-                                    .positional( pos )
-                                    .allow_unregistered()
-                                    .run();
-
-      bpo::variables_map vm;
-
-      bpo::variables_map vm_temp;
-      bpo::store( parsed, vm_temp );
-
-      if( vm_temp.count( "__command" ) > 0 ) {
-         std::string cmd_name = vm_temp["__command"].as<std::string>();
-
-         std::vector<std::string> inner_opts = bpo::collect_unrecognized( parsed.options, bpo::include_positional );
-         FC_ASSERT( inner_opts.size() > 0, "unexpected error" );
-         FC_ASSERT( *inner_opts.begin() == cmd_name,
-                    "unrecognized option '${option}'",
-                    ("option", *inner_opts.begin())
-         );
-         inner_opts.erase( inner_opts.begin() );
-
-         bool success = detail::construct_and_visit_variant_by_name( _subcommand, cmd_name,
-            [&inner_opts, &pm, &cmd_name, &subcommand_options_ptr, &skip_initialize, context = subcommand_context]
-            ( auto&& s ) mutable {
-               context.emplace_back( cmd_name );
-               pm = s.parse( inner_opts, skip_initialize, context );
-               FC_ASSERT( pm.opts_description, "unexpected error" );
-               subcommand_options_ptr->add( *pm.opts_description );
-               pm.opts_description = subcommand_options_ptr;
-            }
-         );
-         FC_ASSERT(  success, "unrecognized sub-command '${name}' within context: ${context}",
-                     ("name", cmd_name)("context", subcommand_context)
-         );
-         vm = std::move(vm_temp);
-      } else {
-         bpo::parsed_options parsed2 = bpo::command_line_parser( opts )
-                                          .options( *subcommand_options_ptr )
-                                          .run();
-         bpo::store( parsed2, vm );
-
-         detail::static_visit_all<std::decay_t<decltype(_subcommand)>>(
-            [&pm]( const char* name, const std::string& desc ) {
-               pm.add_subcommand_description( name, desc );
-            }
-         );
-
-         pm.opts_description = std::move(subcommand_options_ptr);
-         pm.subcommand_desc  = base_type::_get_description();
-         pm.initialization_skipped = skip_initialize;
-      }
-
-      if( !skip_initialize ) {
-         bpo::notify( vm );
-         base_type::_initialize( std::move(vm) );
-      }
-
-      return pm;
-   }
-
-   const subcommands_type& get_subcommand()const { return _subcommand; }
-};
-
-template<typename T, typename... Us>
-class subcommand<T, subcommand_style::terminal_subcommand_with_positional_arguments, Us...>
-   : public detail::subcommand_base<T,  Us...>
-{
-protected:
-   using base_type = detail::subcommand_base<T,  Us...>;
-
-public:
-   parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
-                         const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
-   {
-      parse_metadata pm( subcommand_context );
-      pm.subcommand_desc  = base_type::_get_description();
-      pm.opts_description = std::make_shared<bpo::options_description>( base_type::_get_options(subcommand_context) );
-
-      bpo::options_description subcommand_options{ *pm.opts_description };
-      positional_descriptions pos_desc;
-      const auto& pos = _get_positional_options( subcommand_options, pos_desc );
-      pm.set_positional_descriptions( pos_desc );
-
-      bpo::variables_map vm;
-
-      bpo::store( bpo::command_line_parser( opts )
-                     .options( subcommand_options )
-                     .positional( pos )
-                     .run(),
-                  vm );
-
-      if( !skip_initialize ) {
-         bpo::notify( vm );
-         base_type::_initialize( std::move(vm) );
-      }
-      pm.initialization_skipped = skip_initialize;
-
-      return pm;
-   }
-
-protected:
-   bpo::positional_options_description _get_positional_options( bpo::options_description& options,
-                                                                positional_descriptions& pos_desc )const
-   {
-      const T& derived = static_cast<const T&>( *this );
-      return derived.get_positional_options( options, pos_desc );
-   }
-};
-
-template<typename T, typename... Us>
-class subcommand<T, subcommand_style::terminal_subcommand_without_positional_arguments, Us...>
-   : public detail::subcommand_base<T,  Us...>
-{
-protected:
-   using base_type = detail::subcommand_base<T,  Us...>;
-
-public:
-   parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
-                         const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
-   {
-      parse_metadata pm( subcommand_context );
-      pm.subcommand_desc  = base_type::_get_description();
-      pm.opts_description = std::make_shared<bpo::options_description>( base_type::_get_options(subcommand_context) );
-
-      bpo::variables_map vm;
-
-      bpo::store( bpo::command_line_parser( opts )
-                     .options( *pm.opts_description )
-                     .run(),
-                  vm );
-
-      if( !skip_initialize ) {
-         bpo::notify( vm );
-         base_type::_initialize( std::move(vm) );
-      }
-      pm.initialization_skipped = skip_initialize;
-
-      return pm;
-   }
-};
-
-template<std::size_t N>
-bpo::positional_options_description
-build_positional_descriptions( const std::array<std::string, N>& pos_names,
-                               const bpo::options_description& options,
-                               positional_descriptions& pos_desc )
-{
-   bpo::positional_options_description pos;
-
-   for( std::size_t i = 0; i < pos_names.size(); ++i ) {
-      pos.add( pos_names[i].c_str(), 1 );
-      const bpo::option_description* opt = options.find_nothrow( pos_names[i], false );
-      if( opt ) {
-         pos_desc.emplace_back( pos_names[i], opt->description() );
-      } else {
-         pos_desc.emplace_back( pos_names[i], "" );
-      }
-   }
-
-   return pos;
-}
-
-void print_subcommand_help( std::ostream& stream, const std::string& program_name, const parse_metadata& pm ) {
-   const subcommand_descriptions* subcommands = std::get_if<subcommand_descriptions>( &pm.other_description );
-   bool subcommands_present = (subcommands && subcommands->size() > 0);
-
-   const positional_descriptions* positionals = std::get_if<positional_descriptions>( &pm.other_description );
-   bool positionals_present = (positionals && positionals->size() > 0);
-
-   auto formatting_width = pm.opts_description->get_option_column_width() - 2;
-
-   std::string subcommand_usage;
-   for( const auto& s : pm.subcommand_context ) {
-      subcommand_usage += " ";
-      subcommand_usage += s;
-   }
-   if( subcommands_present ) {
-      subcommand_usage += " SUBCOMMAND";
-   }
-
-   if( pm.subcommand_desc.size() > 0 ) {
-      stream << pm.subcommand_desc << std::endl;
-   }
-
-   stream   << "Usage: " << program_name
-            << subcommand_usage
-            << " [OPTIONS]";
-
-   if( positionals_present ) {
-      for( const auto& p : *positionals ) {
-         stream << " " << p.positional_name;
-      }
-   }
-
-   stream << std::endl << std::endl;
-
-   if( positionals_present ) {
-      stream << "Positionals:" << std::endl;
-
-      for( const auto& p : *positionals ) {
-         stream << "  ";
-         auto orig_width = stream.width( formatting_width );
-         stream << std::left << p.positional_name;
-         stream.width( orig_width );
-         stream << p.description << std::endl;
-      }
-
-      stream << std::endl;
-   }
-
-   pm.opts_description->print( stream );
-
-   if( subcommands_present ) {
-      stream << std::endl;
-
-      std::string subcommands_title;
-      if( pm.subcommand_context.size() > 0 ) {
-         for( const auto& s : pm.subcommand_context ) {
-            subcommands_title += s;
-            subcommands_title += " ";
-         }
-         subcommands_title += "subcommands:";
-      } else {
-         subcommands_title = "Subcommands:";
-      }
-
-      stream << subcommands_title << std::endl;
-      for( const auto& s : *subcommands ) {
-         stream << "  ";
-         auto orig_width = stream.width( formatting_width );
-         stream << std::left << s.subcommand_name;
-         stream.width( orig_width );
-         stream << s.description << std::endl;
-      }
-   }
-}
-
-bool print_autocomplete_suggestions( std::ostream& stream, const parse_metadata& pm, const std::string& last_token ) {
-   bool printed_something = false;
-
-   if( std::holds_alternative<subcommand_descriptions>( pm.other_description ) ) {
-      for( const auto& s : std::get<subcommand_descriptions>( pm.other_description ) ) {
-         if( s.subcommand_name.find( last_token ) != 0 ) continue;
-         if( printed_something )
-            stream << " ";
-         stream << s.subcommand_name;
-         printed_something = true;
-      }
-   }
-
-   if( last_token.size() > 0 ) {
-      for( const auto& opt : pm.opts_description->options() ) {
-         //if( opt->match( last_token, true, false, false ) == bpo::option_description::no_match ) continue;
-         // The option_description::match function doesn't seem to work.
-
-         const auto& short_name = opt->canonical_display_name( bpo::command_line_style::allow_dash_for_short );
-         if( short_name.size() > 0 && short_name[0] == '-' && short_name.find( last_token ) == 0 ) {
-            if( printed_something )
-               stream << " ";
-            stream << short_name;
-            printed_something = true;
-         }
-
-         const auto& long_name = opt->canonical_display_name( bpo::command_line_style::allow_long );
-         if( long_name.size() > 0 && long_name[0] == '-' && long_name.find( last_token ) == 0 ) {
-            if( printed_something )
-               stream << " ";
-            stream << long_name;
-            printed_something = true;
-         }
-      }
-   }
-
-   return printed_something;
-}
-
-template<typename T>
-std::optional<parse_metadata>
-parse_program_options( T& root, const std::vector<std::string>& opts, //int argc, const char** argv,
-                       bool skip_initialize = false, bool avoid_throwing = false )
-{
-   try {
-      return root.parse( opts, skip_initialize );
-   } catch( ... ) {
-      if( !avoid_throwing ) throw;
-   }
-
-   return {};
-}
-
-struct autocomplete_failure {};
-struct autocomplete_success {};
-struct parse_failure {};
-
-template<typename T>
-std::variant<autocomplete_failure, autocomplete_success, parse_failure, parse_metadata>
-parse_program_options_extended( T& root, int argc, const char** argv,
-                                std::ostream& out_stream, std::ostream* err_stream = nullptr,
-                                bool avoid_throwing = false )
-{
-   if( argc <= 0 ) {
-      if( avoid_throwing ) return parse_failure{};
-      FC_ASSERT( false, "command line arguments should at least include program name" );
-   }
-
-   std::string program_name{ bfs::path( argv[0] ).filename().generic_string() };
-
-   bool autocomplete_mode = false;
-
-   std::vector<std::string> opts;
-   opts.reserve( argc - 1 );
-   for( int i = 1; i < argc; ++i ) {
-      opts.emplace_back( std::string( *(argv + i) ) );
-      if( opts.back().compare( "-" ) == 0 ) {
-         if( autocomplete_mode ) return autocomplete_failure{};
-         if( avoid_throwing ) return parse_failure{};
-         FC_ASSERT( false, "- is not allowed by itself in the command line arguments" );
-      }
-      if( opts.back().compare( "--" ) == 0 ) {
-         if( i != 1 ) {
-            if( autocomplete_mode ) return autocomplete_failure{};
-            if( avoid_throwing ) return parse_failure{};
-            FC_ASSERT( false, "-- is not allowed by itself in the command line arguments" );
-         }
-         opts.pop_back();
-         autocomplete_mode = true;
-      }
-   }
-
-   if( !autocomplete_mode ) {
-      const auto pm = parse_program_options( root, opts, false, avoid_throwing );
-      if( !pm ) return parse_failure{};
-      return *pm;
-   }
-
-   // Autocomplete helper logic:
-
-   std::string last_token;
-   if( opts.size() > 0 ) {
-      if( opts.back().size() == 0 ) {
-         opts.pop_back();
-      } else {
-         last_token = opts.back();
-      }
-   }
-
-   if( last_token.size() > 0 ) {
-      if( opts.size() == 0 ) return autocomplete_failure{};
-      opts.pop_back();
-   }
-
-   auto pm = parse_program_options( root, opts, true, true );
-   if( !pm ) return autocomplete_failure{};
-
-   if( last_token.size() > 0 ) {
-      if( print_autocomplete_suggestions( out_stream, *pm, last_token ) ) {
-         out_stream << std::endl;
-      } else {
-         return autocomplete_failure{};
-      }
-   }
-
-   if( err_stream ) {
-      *err_stream << std::endl;
-      print_subcommand_help( *err_stream, program_name, *pm );
-   }
-
-   return autocomplete_success{};
-}
-
-} /// namespace eosio

From ec98330052259198ea04c82202c66667279001c1 Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Thu, 23 May 2019 09:28:31 +0800
Subject: [PATCH 0460/1648] increate timeout to 1 min

---
 tests/db_modes_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
index bfc43f62b92..1c347b3a951 100755
--- a/tests/db_modes_test.py
+++ b/tests/db_modes_test.py
@@ -26,7 +26,7 @@
 def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
     cmdArr= preCmd + nodeosCmd + extraCmd
     proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    tries = 10
+    tries = 30
     ok = False
     while (tries > 0):
         time.sleep(2)

From 2c6fa3cb7f50b83f873fa9d62a83615b936493c8 Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Thu, 23 May 2019 16:29:54 +0800
Subject: [PATCH 0461/1648] add free port check, current ulimit check

---
 tests/db_modes_test.py | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
index 1c347b3a951..ca1e049b0e6 100755
--- a/tests/db_modes_test.py
+++ b/tests/db_modes_test.py
@@ -13,6 +13,8 @@
 import subprocess
 import shlex
 import tempfile
+import socket
+import sys
 
 errorExit=Utils.errorExit
 
@@ -24,9 +26,23 @@
 getInfoCmd="./programs/cleos/cleos get info"
 
 def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
+    #ensure port 8888 is free
+    tries = 30
+    while (tries > 0):
+        try:
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            server_address = ('127.0.0.1', 8888)
+            sock.bind(server_address)
+            sock.close()
+            time.sleep(1)
+            tries = 0
+        except:
+            tries = tries - 1
+            time.sleep(3)
+    # now start nodeos
     cmdArr= preCmd + nodeosCmd + extraCmd
     proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    tries = 30
+    tries = 10
     ok = False
     while (tries > 0):
         time.sleep(2)
@@ -54,9 +70,17 @@ def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
 if run_and_kill(" --database-map-mode heap") != True:
     errorExit("Failed in restart heap mode")
 
-#test lock 
-if run_and_kill(" --database-map-mode locked") != True:
-    errorExit("Failed in restart with locked mode")
+#test locked mode if max locked memory is unlimited
+ulimits = Utils.checkOutput(shlex.split('ulimit -a'), ignoreError=True).split("\n")
+for row in ulimits:
+    if row.find("max locked memory") != -1:
+        print("output of ulimit -a is: %s:" % (row))
+        if row.find("unlimited") != -1:
+            if run_and_kill(" --database-map-mode locked") != True:
+                errorExit("Failed in restart with locked mode")
+        else:
+            print("skip default locked mode test because max locked memory is not unlimited")
+        break
 
 #locked mode should fail when it's not possible to lock anything
 if run_and_kill(" --database-map-mode locked", preCmd="ulimit -l 0; ") != False:

From f63ed765dfab748244022c3fa8da157000c1fa35 Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Thu, 23 May 2019 17:25:05 +0800
Subject: [PATCH 0462/1648] another try

---
 tests/db_modes_test.py | 2 +-
 tests/testUtils.py     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
index ca1e049b0e6..ec7c5cda842 100755
--- a/tests/db_modes_test.py
+++ b/tests/db_modes_test.py
@@ -71,7 +71,7 @@ def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
     errorExit("Failed in restart heap mode")
 
 #test locked mode if max locked memory is unlimited
-ulimits = Utils.checkOutput(shlex.split('ulimit -a'), ignoreError=True).split("\n")
+ulimits = Utils.checkOutput('ulimit -a', ignoreError=True).split("\n")
 for row in ulimits:
     if row.find("max locked memory") != -1:
         print("output of ulimit -a is: %s:" % (row))
diff --git a/tests/testUtils.py b/tests/testUtils.py
index 4235e725ba5..dfd1823dbf7 100755
--- a/tests/testUtils.py
+++ b/tests/testUtils.py
@@ -152,8 +152,10 @@ def getChainStrategies():
 
     @staticmethod
     def checkOutput(cmd, ignoreError=False):
-        assert(isinstance(cmd, list))
-        popen=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        if (isinstance(cmd, list)):
+            popen=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        else:
+            popen=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
         (output,error)=popen.communicate()
         Utils.CheckOutputDeque.append((output,error,cmd))
         if popen.returncode != 0 and not ignoreError:

From 6eb6a2b93d04c792e11e969c923b326e027f4dac Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 23 May 2019 10:27:15 -0400
Subject: [PATCH 0463/1648] snapshot version support for the changes to block
 header state

---
 libraries/chain/block_header_state.cpp        | 20 ++++++
 libraries/chain/controller.cpp                | 22 +++++--
 .../eosio/chain/block_header_state.hpp        | 64 ++++++++++++++++++-
 .../include/eosio/chain/chain_snapshot.hpp    |  5 +-
 4 files changed, 104 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index 744bf6a2251..f640e0ba1a5 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -443,4 +443,24 @@ namespace eosio { namespace chain {
       return header_exts.lower_bound(protocol_feature_activation::extension_id())->second.get<protocol_feature_activation>().protocol_features;
    }
 
+   block_header_state::block_header_state( legacy::snapshot_block_header_state_v2&& snapshot )
+   {
+      block_num                             = snapshot.block_num;
+      dpos_proposed_irreversible_blocknum   = snapshot.dpos_proposed_irreversible_blocknum;
+      dpos_irreversible_blocknum            = snapshot.dpos_irreversible_blocknum;
+      active_schedule                       = producer_authority_schedule( snapshot.active_schedule );
+      blockroot_merkle                      = std::move(snapshot.blockroot_merkle);
+      producer_to_last_produced             = std::move(snapshot.producer_to_last_produced);
+      producer_to_last_implied_irb          = std::move(snapshot.producer_to_last_implied_irb);
+      valid_block_signing_authority         = block_signing_authority_v0{ 1, {{std::move(snapshot.block_signing_key), 1}} };
+      confirm_count                         = std::move(snapshot.confirm_count);
+      id                                    = std::move(snapshot.id);
+      header                                = std::move(snapshot.header);
+      pending_schedule.schedule_lib_num     = snapshot.pending_schedule.schedule_lib_num;
+      pending_schedule.schedule_hash        = std::move(snapshot.pending_schedule.schedule_hash);
+      pending_schedule.schedule             = producer_authority_schedule( snapshot.pending_schedule.schedule );
+      activated_protocol_features           = std::move(snapshot.activated_protocol_features);
+   }
+
+
 } } /// namespace eosio::chain
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 898ffed55e3..b5bfd25c535 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -805,16 +805,28 @@ struct controller_impl {
    }
 
    void read_from_snapshot( const snapshot_reader_ptr& snapshot, uint32_t blog_start, uint32_t blog_end ) {
-      snapshot->read_section<chain_snapshot_header>([this]( auto &section ){
-         chain_snapshot_header header;
+      chain_snapshot_header header;
+      snapshot->read_section<chain_snapshot_header>([this, &header]( auto &section ){
          section.read_row(header, db);
          header.validate();
       });
 
 
-      snapshot->read_section<block_state>([this, blog_start, blog_end]( auto &section ){
+      { /// load an upgrade the block header state
          block_header_state head_header_state;
-         section.read_row(head_header_state, db);
+         using v2 = legacy::snapshot_block_header_state_v2;
+
+         if (std::clamp(header.version, v2::minimum_version, v2::maximum_version) == header.version ) {
+            snapshot->read_section<block_state>([this, &head_header_state]( auto &section ) {
+               legacy::snapshot_block_header_state_v2 legacy_header_state;
+               section.read_row(legacy_header_state, db);
+               head_header_state = block_header_state(std::move(legacy_header_state));
+            });
+         } else {
+            snapshot->read_section<block_state>([this,&head_header_state]( auto &section ){
+               section.read_row(head_header_state, db);
+            });
+         }
 
          snapshot_head_block = head_header_state.block_num;
          EOS_ASSERT( blog_start <= (snapshot_head_block + 1) && snapshot_head_block <= blog_end,
@@ -828,7 +840,7 @@ struct controller_impl {
          fork_db.reset( head_header_state );
          head = fork_db.head();
          snapshot_head_block = head->block_num;
-      });
+      }
 
       controller_index_set::walk_indices([this, &snapshot]( auto utils ){
          using value_t = typename decltype(utils)::index_t::value_type;
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 8723edfd17e..eda7d45b033 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -2,10 +2,47 @@
 #include <eosio/chain/block_header.hpp>
 #include <eosio/chain/incremental_merkle.hpp>
 #include <eosio/chain/protocol_feature_manager.hpp>
+#include <eosio/chain/chain_snapshot.hpp>
 #include <future>
 
 namespace eosio { namespace chain {
 
+namespace legacy {
+
+   /**
+    * a fc::raw::unpack compatible version of the old block_state structure stored in
+    * version 2 snapshots
+    */
+   struct snapshot_block_header_state_v2 {
+      static constexpr uint32_t minimum_version = 0;
+      static constexpr uint32_t maximum_version = 2;
+      static_assert(chain_snapshot_header::minimum_compatible_version <= maximum_version, "snapshot_block_header_state_v2 is no longer needed");
+
+      struct schedule_info {
+         uint32_t                          schedule_lib_num = 0; /// last irr block num
+         digest_type                       schedule_hash;
+         producer_schedule_type            schedule;
+      };
+
+      /// from block_header_state_common
+      uint32_t                             block_num;
+      uint32_t                             dpos_proposed_irreversible_blocknum;
+      uint32_t                             dpos_irreversible_blocknum;
+      producer_schedule_type               active_schedule;
+      incremental_merkle                   blockroot_merkle;
+      flat_map<account_name,uint32_t>      producer_to_last_produced;
+      flat_map<account_name,uint32_t>      producer_to_last_implied_irb;
+      public_key_type                      block_signing_key;
+      vector<uint8_t>                      confirm_count;
+
+      // from block_header_state
+      block_id_type                        id;
+      signed_block_header                  header;
+      schedule_info                        pending_schedule;
+      protocol_feature_activation_set_ptr  activated_protocol_features;
+   };
+}
+
 using signer_callback_type = std::function<std::vector<signature_type>(const digest_type&)>;
 
 struct block_header_state;
@@ -69,7 +106,6 @@ struct pending_block_header_state : public detail::block_header_state_common {
                                                                const vector<digest_type>& )>& validator )&&;
 };
 
-
 /**
  *  @struct block_header_state
  *  @brief defines the minimum state necessary to validate transaction headers
@@ -91,6 +127,8 @@ struct block_header_state : public detail::block_header_state_common {
    :detail::block_header_state_common( std::move(base) )
    {}
 
+   explicit block_header_state( legacy::snapshot_block_header_state_v2&& snapshot );
+
    pending_block_header_state  next( block_timestamp_type when, uint16_t num_prev_blocks_to_confirm )const;
 
    block_header_state   next( const signed_block_header& h,
@@ -143,3 +181,27 @@ FC_REFLECT_DERIVED(  eosio::chain::block_header_state, (eosio::chain::detail::bl
                      (activated_protocol_features)
                      (additional_signatures)
 )
+
+
+FC_REFLECT( eosio::chain::legacy::snapshot_block_header_state_v2::schedule_info,
+          ( schedule_lib_num )
+          ( schedule_hash )
+          ( schedule )
+)
+
+
+FC_REFLECT( eosio::chain::legacy::snapshot_block_header_state_v2,
+          ( block_num )
+          ( dpos_proposed_irreversible_blocknum )
+          ( dpos_irreversible_blocknum )
+          ( active_schedule )
+          ( blockroot_merkle )
+          ( producer_to_last_produced )
+          ( producer_to_last_implied_irb )
+          ( block_signing_key )
+          ( confirm_count )
+          ( id )
+          ( header )
+          ( pending_schedule )
+          ( activated_protocol_features )
+)
diff --git a/libraries/chain/include/eosio/chain/chain_snapshot.hpp b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
index 5546b301999..9151b7dd566 100644
--- a/libraries/chain/include/eosio/chain/chain_snapshot.hpp
+++ b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
@@ -15,10 +15,13 @@ struct chain_snapshot_header {
     *   2: Updated chain snapshot for v1.8.0 initial protocol features release:
     *         - Incompatible with version 1.
     *         - Adds new indices for: protocol_state_object and account_ram_correction_object
+    *   3: Updated chain snapshot for wtmsig block signing protocol feature:
+    *         - forwards compatible with version 2
+    *         - the block header state changed to include producer authorities and additional signatures
     */
 
    static constexpr uint32_t minimum_compatible_version = 2;
-   static constexpr uint32_t current_version = 2;
+   static constexpr uint32_t current_version = 3;
 
    uint32_t version = current_version;
 

From c708ea2de0ad7d115d2446b5537860f9e006f49e Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 23 May 2019 14:45:39 -0400
Subject: [PATCH 0464/1648] work on snapshot version tests

---
 .../testing/include/eosio/testing/tester.hpp  |  4 ++
 libraries/testing/tester.cpp                  | 27 +++++++++++++
 unittests/CMakeLists.txt                      |  4 +-
 unittests/snapshot_tests.cpp                  | 39 +++++++++++++++++++
 unittests/snapshots.hpp.in                    | 20 ++++++++++
 5 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 unittests/snapshots.hpp.in

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 1b3c2b7daa0..e8656812ef0 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -67,6 +67,10 @@ namespace eosio { namespace testing {
    std::vector<uint8_t> read_wasm( const char* fn );
    std::vector<char>    read_abi( const char* fn );
    std::string          read_wast( const char* fn );
+
+   std::string          read_binary_snapshot( const char* fn );
+   fc::variant          read_json_snapshot( const char* fn );
+
    using namespace eosio::chain;
 
    fc::variant_object filter_fields(const fc::variant_object& filter, const fc::variant_object& value);
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index d2287e26e88..a61c60fa32f 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -4,11 +4,16 @@
 #include <eosio/chain/wast_to_wasm.hpp>
 #include <eosio/chain/eosio_contract.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
+#include <boost/iostreams/filtering_stream.hpp>
+#include <boost/iostreams/copy.hpp>
+#include <boost/iostreams/filter/gzip.hpp>
 
 #include <fstream>
 
 #include <contracts.hpp>
 
+namespace bio = boost::iostreams;
+
 eosio::chain::asset core_from_string(const std::string& s) {
   return eosio::chain::asset::from_string(s + " " CORE_SYMBOL_NAME);
 }
@@ -58,6 +63,28 @@ namespace eosio { namespace testing {
       return abi;
    }
 
+   namespace {
+      std::string read_gzipped_snapshot( const char* fn ) {
+         std::ifstream file(fn, std::ios_base::in | std::ios_base::binary);
+         bio::filtering_streambuf<bio::input> in;
+
+         in.push(bio::gzip_decompressor());
+         in.push(file);
+
+         std::stringstream decompressed;
+         bio::copy(in, decompressed);
+         return decompressed.str();
+      }
+   }
+
+   std::string read_binary_snapshot( const char* fn ) {
+      return read_gzipped_snapshot(fn);
+   }
+
+   fc::variant read_json_snapshot( const char* fn ) {
+      return fc::json::from_string( read_gzipped_snapshot(fn) );
+   }
+
    const fc::microseconds base_tester::abi_serializer_max_time{1000*1000}; // 1s for slow test machines
 
    bool expect_assert_message(const fc::exception& ex, string expected) {
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 82e723e5563..eddf542fe01 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -34,9 +34,11 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 link_directories(${LLVM_LIBRARY_DIR})
 
 add_subdirectory(contracts)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contracts.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/contracts.hpp ESCAPE_QUOTES)
 
+add_subdirectory(snapshots)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/snapshots.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/snapshots.hpp ESCAPE_QUOTES)
+
 ### BUILD UNIT TEST EXECUTABLE ###
 file(GLOB UNIT_TESTS "*.cpp") # find all unit test suites
 add_executable( unit_test ${UNIT_TESTS}) # build unit tests as one executable
diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index a3749f9656a..542bfcdfaad 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -11,6 +11,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <contracts.hpp>
+#include <snapshots.hpp>
 
 using namespace eosio;
 using namespace testing;
@@ -102,6 +103,10 @@ struct variant_snapshot_suite {
       return std::make_shared<reader>(buffer);
    }
 
+   template<typename Snapshot>
+   static snapshot_t load_from_file() {
+      return Snapshot::json();
+   }
 };
 
 struct buffered_snapshot_suite {
@@ -145,6 +150,10 @@ struct buffered_snapshot_suite {
       return std::make_shared<reader>(std::make_shared<read_storage_t>(buffer));
    }
 
+   template<typename Snapshot>
+   static snapshot_t load_from_file() {
+      return Snapshot::bin();
+   }
 };
 
 BOOST_AUTO_TEST_SUITE(snapshot_tests)
@@ -252,4 +261,34 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
    BOOST_REQUIRE_EQUAL(expected_post_integrity_hash.str(), snap_chain.control->calculate_integrity_hash().str());
 }
 
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot_suites)
+{
+   tester chain(setup_policy::preactivate_feature_and_new_bios);
+
+   chain.create_account(N(snapshot));
+   chain.produce_blocks(1);
+   chain.set_code(N(snapshot), contracts::snapshot_test_wasm());
+   chain.set_abi(N(snapshot), contracts::snapshot_test_abi().data());
+   chain.produce_blocks(1);
+   chain.control->abort_block();
+   auto base_integrity_value = chain.control->calculate_integrity_hash();
+
+   {
+      auto v2 = SNAPSHOT_SUITE::template load_from_file<snapshots::snap_v2>();
+      snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
+      auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();
+
+      // create a latest snapshot
+      auto latest_writer = SNAPSHOT_SUITE::get_writer();
+      v2_tester.control->write_snapshot(latest_writer);
+      auto latest = SNAPSHOT_SUITE::finalize(latest_writer);
+
+      // load the latest snapshot
+      snapshotted_tester latest_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(latest), 1);
+      auto latest_integrity_value = latest_tester.control->calculate_integrity_hash();
+
+      BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), latest_integrity_value.str());
+   }
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/unittests/snapshots.hpp.in b/unittests/snapshots.hpp.in
new file mode 100644
index 00000000000..291c452199f
--- /dev/null
+++ b/unittests/snapshots.hpp.in
@@ -0,0 +1,20 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE.txt
+ */
+#pragma once
+
+#define MAKE_READ_SNAPSHOT(NAME) \
+   struct NAME {\
+       static fc::variant json() { return read_json_snapshot  ("${CMAKE_BINARY_DIR}/unittests/snapshots/" #NAME ".json.gz"); } \
+       static std::string bin()  { return read_binary_snapshot("${CMAKE_BINARY_DIR}/unittests/snapshots/" #NAME ".bin.gz" ); } \
+   };\
+
+namespace eosio {
+   namespace testing {
+      struct snapshots {
+         // v2
+         MAKE_READ_SNAPSHOT(snap_v2)
+      };
+   } /// eosio::testing
+}  /// eosio

From 97c8fd78a5381da57f9e0fb6c4549f8ed18b2092 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 16 May 2019 11:28:55 -0400
Subject: [PATCH 0465/1648] added bash-bats folder with tests

New build/install/uninstall scripts

pipeline change

Cmake install path change (removing eosio) and .environment file

gitignore additions

[skip ci] removed 7 from function since devtoolset-8 is available and we might change it in the near future

[skip ci] bats readme updates

[skip ci] Architecture move

[skip ci] Removed set -i from ubuntu

eosio_install improvements

removing -P from pipeline config

Fix exception #

Update to appbase with max priority on main thread

Update to appbase with set_thread_priority_max method

Add call to set_thread_priority_max

(softfloat sync) clean up strict-aliasing rules warnings

this causes a lot of warnings on gcc7

Adds configuration for replay test pipeline

Fix `-b` flag for `cleos get table` subcommand

Add `boost/asio/io_context.hpp` header to `transaction_metadata.hpp`

[skip ci] Fixed build-esssential issue on ubuntu 18

[skip ci] Various fixes for bats

[skip ci] added back build-essentials line

[skip ci] bzip added back to ubuntu deps

[skip ci] More bats fixes to simplify c++ warning

[skip ci] Fix for prompting when all packages are already installed

[skip ci] bootstrap.sh for boost needs toolset=clang if we're pinning (fixes ubuntu16 build

[skip ci] quick removal of debug

[skip ci] Better placement for apt update prompt

[skip ci] Support for llvm/clang7 on ubuntu 16

[skip ci] regex match clang so we can support ehen readlink follows symlinks

[skip ci] Reverted support for clang/llvm7 on ubuntu 16 since it throws an error (Cannot find a C++ compiler that supports both C++11 and the specified C++ flags)

[skip ci] Show output for which install

[skip ci] Moved which to after CURRENT_USER and moved CURRENT_USER to environment file

[skip ci] Support for version inconsistencies

homebrew install fixes and move to helper

Various bats fixes and readme update

centos test fixes for clang/build-essential

amazonlinux2/centos7 gcc-c++ needed for -P

amazonlinux2/centos7 gcc-c++ needed for -P

[skip ci] amazonlinux2/centos7 gcc-c++ needed for -P

[skip ci] centos7 removal since it uses devtoolset-7

[skip ci] Putting centos gcc-c++ install back. Silly mistake

[skip ci] Adding devtoolset-7 install regardless as it's needed for cmake installation

[skip ci] output CXX and CC before build

v3 mac image

[skip ci] Various fixes for running as a user (instead of root)

[skip ci] quick bats fix for amazonlinux

revert of quiet mode for ubuntu

version bump for docker plugin and new mac tag name

version bump for docker plugin and new mac tag name

fixes for bats and ubuntu failing even on success due to teardown [skip ci]

added a check to uninstall-package to speed up tests [skip ci]

[skip ci] Removed working dir as it's no longer needed (Dockerfile defaults to /home/cicd

pipeline fixes for new cicd user home location

testing pipeline location

testing pipeline location

testing pipeline location

testing pipeline location

[skip ci] allow git clone

testing pipeline location

fixes

fixes

pipeline testing

pipeline testing

pipeline testing

pipeline testing

adding --- to Executing so it looks better in buildkite logs

test script fixes

submodule check simplification and fix for amazonlinux2

global VERBOSE=true

fixes for tests

test changes

testing tar of artifact

testing tar of artifact

testing tar of artifact

testing tar of artifact

testing tar of artifact

testing tar of artifact

testing tar of artifact

testing tar of artifact

python3 enable for centos7

package building fixes

centos package fix
---
 .buildkite/pipeline.yml                       | 357 +++++------
 .gitignore                                    |   2 +
 CMakeLists.txt                                |   3 +-
 libraries/appbase                             |   2 +-
 .../chain/include/eosio/chain/exceptions.hpp  |   3 +-
 .../eosio/chain/transaction_metadata.hpp      |   1 +
 libraries/softfloat                           |   2 +-
 pipeline.jsonc                                |   8 +
 programs/cleos/main.cpp                       |   2 +-
 programs/nodeos/main.cpp                      |   1 +
 scripts/.environment                          |  95 +++
 scripts/eosio_build.bash                      | 231 ++++++++
 scripts/eosio_build.sh                        | 404 -------------
 scripts/eosio_build_amazon.sh                 | 353 -----------
 scripts/eosio_build_amazonlinux.bash          |  87 +++
 scripts/eosio_build_amazonlinux2_deps         |  21 +
 scripts/eosio_build_centos.bash               |  99 ++++
 scripts/eosio_build_centos.sh                 | 414 -------------
 scripts/eosio_build_centos7_deps              |  20 +
 scripts/eosio_build_darwin.bash               |  95 +++
 scripts/eosio_build_darwin.sh                 | 324 ----------
 scripts/eosio_build_darwin_deps               |  26 +-
 scripts/eosio_build_ubuntu.bash               |  92 +++
 scripts/eosio_build_ubuntu.sh                 | 358 ------------
 scripts/eosio_build_ubuntu_deps               |  24 +
 .../{eosio_install.sh => eosio_install.bash}  |  48 +-
 scripts/eosio_uninstall.bash                  | 131 +++++
 scripts/eosio_uninstall.sh                    |  87 ---
 scripts/full_uninstaller.sh                   | 133 -----
 scripts/helpers/eosio.bash                    | 553 ++++++++++++++++++
 scripts/helpers/general.bash                  | 138 +++++
 scripts/parallel-test.bash                    |  29 +
 scripts/parallel-test.sh                      |  26 -
 scripts/serial-test.bash                      |  35 ++
 scripts/serial-test.sh                        |  30 -
 tests/bash-bats/README.md                     |  63 ++
 tests/bash-bats/bats-core/bin/bats            |  44 ++
 .../bats-core/libexec/bats-core/bats          | 171 ++++++
 .../libexec/bats-core/bats-exec-suite         | 101 ++++
 .../libexec/bats-core/bats-exec-test          | 373 ++++++++++++
 .../libexec/bats-core/bats-format-tap-stream  | 174 ++++++
 .../libexec/bats-core/bats-preprocess         |  58 ++
 tests/bash-bats/eosio_build.bash              |  75 +++
 tests/bash-bats/eosio_build_amazonlinux.bash  |  49 ++
 tests/bash-bats/eosio_build_centos.bash       |  48 ++
 tests/bash-bats/eosio_build_darwin.bash       |  43 ++
 tests/bash-bats/eosio_build_ubuntu.bash       |  46 ++
 tests/bash-bats/eosio_uninstall.bash          |  75 +++
 tests/bash-bats/helpers.bash                  |  48 ++
 tests/bash-bats/helpers/functions.bash        |  28 +
 tests/bash-bats/helpers/general.bash          |  21 +
 tests/bash-bats/modules/clang.bash            |  35 ++
 tests/bash-bats/modules/cmake.bash            |  19 +
 .../bash-bats/modules/dep_script_options.bash |  16 +
 tests/bash-bats/modules/mongodb.bash          |  17 +
 tests/bash-bats/modules/root-user.bash        |  24 +
 56 files changed, 3411 insertions(+), 2351 deletions(-)
 create mode 100644 scripts/.environment
 create mode 100755 scripts/eosio_build.bash
 delete mode 100755 scripts/eosio_build.sh
 delete mode 100755 scripts/eosio_build_amazon.sh
 create mode 100755 scripts/eosio_build_amazonlinux.bash
 create mode 100755 scripts/eosio_build_amazonlinux2_deps
 create mode 100755 scripts/eosio_build_centos.bash
 delete mode 100755 scripts/eosio_build_centos.sh
 create mode 100644 scripts/eosio_build_centos7_deps
 create mode 100755 scripts/eosio_build_darwin.bash
 delete mode 100755 scripts/eosio_build_darwin.sh
 create mode 100755 scripts/eosio_build_ubuntu.bash
 delete mode 100755 scripts/eosio_build_ubuntu.sh
 create mode 100644 scripts/eosio_build_ubuntu_deps
 rename scripts/{eosio_install.sh => eosio_install.bash} (71%)
 create mode 100755 scripts/eosio_uninstall.bash
 delete mode 100755 scripts/eosio_uninstall.sh
 delete mode 100755 scripts/full_uninstaller.sh
 create mode 100755 scripts/helpers/eosio.bash
 create mode 100755 scripts/helpers/general.bash
 create mode 100755 scripts/parallel-test.bash
 delete mode 100755 scripts/parallel-test.sh
 create mode 100755 scripts/serial-test.bash
 delete mode 100755 scripts/serial-test.sh
 create mode 100644 tests/bash-bats/README.md
 create mode 100755 tests/bash-bats/bats-core/bin/bats
 create mode 100755 tests/bash-bats/bats-core/libexec/bats-core/bats
 create mode 100755 tests/bash-bats/bats-core/libexec/bats-core/bats-exec-suite
 create mode 100755 tests/bash-bats/bats-core/libexec/bats-core/bats-exec-test
 create mode 100755 tests/bash-bats/bats-core/libexec/bats-core/bats-format-tap-stream
 create mode 100755 tests/bash-bats/bats-core/libexec/bats-core/bats-preprocess
 create mode 100644 tests/bash-bats/eosio_build.bash
 create mode 100644 tests/bash-bats/eosio_build_amazonlinux.bash
 create mode 100644 tests/bash-bats/eosio_build_centos.bash
 create mode 100644 tests/bash-bats/eosio_build_darwin.bash
 create mode 100644 tests/bash-bats/eosio_build_ubuntu.bash
 create mode 100644 tests/bash-bats/eosio_uninstall.bash
 create mode 100644 tests/bash-bats/helpers.bash
 create mode 100644 tests/bash-bats/helpers/functions.bash
 create mode 100644 tests/bash-bats/helpers/general.bash
 create mode 100755 tests/bash-bats/modules/clang.bash
 create mode 100755 tests/bash-bats/modules/cmake.bash
 create mode 100755 tests/bash-bats/modules/dep_script_options.bash
 create mode 100755 tests/bash-bats/modules/mongodb.bash
 create mode 100755 tests/bash-bats/modules/root-user.bash

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 683c40a9f98..419a84ccefc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,44 +1,59 @@
+---
+
 env:
+  VERBOSE: true
   ANKA_MOJAVE_TEMPLATE: "10.14.4_6C_14G_40G"
   ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
   CHECKSUMABLE: "scripts/eosio_build*"
-  MAC_TAG: "eosio_2-5"
-  WORKDIR: "/data/job"
+  MAC_TAG: "eosio_1.9.0-developv5"
+  # LINUX_WORKDIR: "/home/cicd"
+  # MAC_WORKDIR: "/home/anka"
 
 steps:
-  - wait
 
-  - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
-    command:
-      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-    agents:
-      - "queue=mac-anka-templater-fleet"
-    env:
-      REPO: "${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}"
-      REPO_COMMIT: "${BUILDKITE_COMMIT}"
-      CHECKSUMABLE: "${CHECKSUMABLE}"
-      TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
-      TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -f -m && cd .. && rm -rf eos" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
-      PROJECT_TAG: "${MAC_TAG}"
-    timeout: 320
-    skip: $SKIP_MOJAVE
+  # - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
+  #   command:
+  #     - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
+  #     - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
+  #   agents:
+  #     - "queue=mac-anka-templater-fleet"
+  #   env:
+  #     REPO: "${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}"
+  #     REPO_COMMIT: "${BUILDKITE_COMMIT}"
+  #     CHECKSUMABLE: "${CHECKSUMABLE}"
+  #     TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
+  #     TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
+  #     TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -m && cd .. && rm -rf eos" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
+  #     PROJECT_TAG: "${MAC_TAG}"
+  #   timeout: 320
 
-  - wait
+  # - trigger: "mac-anka-fleet"
+  #   label: ":anka: Ensure Mojave Anka Template Tag Exists"
+  #   branches: "*"
+  #   async: false
+  #   build:
+  #     branch: "master"
+  #     env:
+  #       REPO: "${BUILDKITE_REPO}"
+  #       REPO_COMMIT: "${BUILDKITE_COMMIT}"
+  #       CHECKSUMABLE: "${CHECKSUMABLE}"
+  #       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
+  #       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
+  #       TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.bash -y -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
+  #       PROJECT_TAG: "${MAC_TAG}"
+
+  # - wait
+
+  ############################
+  # BUILDING #################
+  ############################
 
   - label: ":darwin: [Darwin] Mojave Build"
-    command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
-      git checkout ${BUILDKITE_COMMIT}
-      git submodule update --init --recursive
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -m && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
-        workdir: $WORKDIR
         inherit-environment-vars: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
         vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
@@ -50,38 +65,36 @@ steps:
     agents:
       - "queue=mac-anka-large-node-fleet"
     timeout: 120
-    skip: $SKIP_MOJAVE
+    retry:
+      automatic:
+        - exit_status: 17 # failed to open image, error 2
+          limit: 2
 
   - label: ":aws: Amazon Linux 2 Build"
-    command: |
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -P -m"
+      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
     plugins:
       ecr#v1.1.4:
         login: true
         account_ids: "436617320021"
         no-include-email: true
         region: "us-west-2"
-      docker#v3.1.0:
+      docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_1-9-0-develop"
+        mount-checkout: false
     timeout: 120
 
   - label: ":centos: CentOS 7 Build"
-    command: |
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -P -m"
+      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -91,20 +104,16 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_1-9-0-develop"
+        mount-checkout: false
     timeout: 120
 
   - label: ":ubuntu: Ubuntu 16.04 Build"
-    command: |
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
-    label: ":ubuntu: Ubuntu 16.04 Build"
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -P -m"
+      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -114,19 +123,16 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_1-9-0-develop"
+        mount-checkout: false
     timeout: 120
 
   - label: ":ubuntu: Ubuntu 18.04 Build"
-    command: |
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -P -m"
+      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -136,26 +142,26 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_1-9-0-develop"
+        mount-checkout: false
     timeout: 120
 
   - wait
 
-  # MacOS Mojave
+  # ################################
+  # # TESTS ########################
+  # ################################
+
+  # MOJAVE #
   - label: ":darwin: [Darwin] Mojave Tests"
-    command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
-      git checkout ${BUILDKITE_COMMIT}
-      buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      ./scripts/parallel-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\""
+      - "cd eos && ./scripts/parallel-test.bash"
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
-        workdir: $WORKDIR
         inherit-environment-vars: true
         bash-interactive: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
@@ -164,20 +170,20 @@ steps:
         debug: true
         wait-network: true
     timeout: 120
-    skip: $SKIP_MOJAVE$SKIP_TESTS
+    retry:
+      automatic:
+        - exit_status: 17 # failed to open image, error 2
+          limit: 2
 
   - label: ":darwin: [Darwin] Mojave NP Tests"
-    command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
-      git checkout ${BUILDKITE_COMMIT}
-      buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      ./scripts/serial-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\""
+      - "cd eos && ./scripts/serial-test.bash"
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
-        workdir: $WORKDIR
         inherit-environment-vars: true
         bash-interactive: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
@@ -186,14 +192,16 @@ steps:
         debug: true
         wait-network: true
     timeout: 120
-    skip: $SKIP_MOJAVE
-
-  # Amazon Linux 2
+    retry:
+      automatic:
+        - exit_status: 17 # failed to open image, error 2
+          limit: 2
+          
+  # AmazonLinux #
   - label: ":aws: Amazon Linux 2 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      ./scripts/parallel-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
+      - "./scripts/parallel-test.bash"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -205,18 +213,14 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_1-9-0-develop"
+        mount-checkout: false
     timeout: 60
-    skip: $SKIP_TESTS
 
   - label: ":aws: Amazon Linux 2 NP Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      ./scripts/serial-test.sh
-    label: ":aws: Amazon Linux 2 NP Tests"
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
+      - "./scripts/serial-test.bash"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -228,17 +232,15 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_1-9-0-develop"
+        mount-checkout: false
     timeout: 60
 
-  # CentOS
+  # CentOS #
   - label: ":centos: CentOS 7 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      ./scripts/parallel-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
+      - "./scripts/parallel-test.bash"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -250,17 +252,14 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_1-9-0-develop"
+        mount-checkout: false
     timeout: 60
-    skip: $SKIP_TESTS
 
   - label: ":centos: CentOS 7 NP Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      ./scripts/serial-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
+      - "source /opt/rh/rh-python36/enable && ./scripts/serial-test.bash"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -272,17 +271,15 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_1-9-0-develop"
+        mount-checkout: false
     timeout: 60
 
-  # Ubuntu 16.04
+  # Ubuntu #
   - label: ":ubuntu: Ubuntu 16.04 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      ./scripts/parallel-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
+      - "./scripts/parallel-test.bash"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -294,17 +291,14 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_1-9-0-develop"
+        mount-checkout: false
     timeout: 60
-    skip: $SKIP_TESTS
 
   - label: ":ubuntu: Ubuntu 16.04 NP Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      ./scripts/serial-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
+      - "./scripts/serial-test.bash"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -316,17 +310,14 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_1-9-0-develop"
+        mount-checkout: false
     timeout: 60
 
-  # Ubuntu 18.04
   - label: ":ubuntu: Ubuntu 18.04 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      ./scripts/parallel-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
+      - "./scripts/parallel-test.bash"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -338,17 +329,14 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_1-9-0-develop"
+        mount-checkout: false
     timeout: 60
-    skip: $SKIP_TESTS
 
   - label: ":ubuntu: Ubuntu 18.04 NP Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      ./scripts/serial-test.sh
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
+      - "./scripts/serial-test.bash"
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -360,12 +348,11 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_1-9-0-develop"
+        mount-checkout: false
     timeout: 60
 
-  - wait: # Test Metrics
+  - wait:
     continue_on_failure: true
 
   - command: |
@@ -381,7 +368,22 @@ steps:
 
   - label: ":centos: CentOS 7 Package Builder"
     command: |
-      ./scripts/package-builder.sh ':centos: CentOS 7 Build'
+        git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+        cd eos
+        git checkout ${BUILDKITE_COMMIT}
+        buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
+        yum install -y rpm-build
+        mkdir -p /home/cicd/rpmbuild/BUILD
+        mkdir -p /home/cicd/rpmbuild/BUILDROOT
+        mkdir -p /home/cicd/rpmbuild/RPMS
+        mkdir -p /home/cicd/rpmbuild/SOURCES
+        mkdir -p /home/cicd/rpmbuild/SPECS
+        mkdir -p /home/cicd/rpmbuild/SRPMS
+        cd /home/cicd/eos/build/packages
+        bash generate_package.sh rpm
+        buildkite-agent artifact upload *.rpm
     agents:
       queue: "automation-large-builder-fleet"
     plugins:
@@ -393,16 +395,23 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_1-9-0-develop"
+        mount-checkout: false
     env:
       OS: "el7"
       PKGTYPE: "rpm"
     timeout: 60
 
   - command: | # Ubuntu 16.04 Package Builder
-      ./scripts/package-builder.sh ':ubuntu: Ubuntu 16.04 Build'
+        git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+        cd eos
+        git checkout ${BUILDKITE_COMMIT}
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 16.04 Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
+        cd /home/cicd/eos/build/packages
+        bash generate_package.sh deb
+        buildkite-agent artifact upload *.deb
     label: ":ubuntu: Ubuntu 16.04 Package Builder"
     agents:
       queue: "automation-large-builder-fleet"
@@ -415,16 +424,24 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_1-9-0-develop"
+        mount-checkout: false
     env:
       OS: "ubuntu-16.04"
       PKGTYPE: "deb"
     timeout: 60
 
   - command: | # Ubuntu 18.04 Package Builder
-      ./scripts/package-builder.sh ':ubuntu: Ubuntu 18.04 Build'
+        echo "--- :arrow_down: Downloading build directory"
+        git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+        cd eos
+        git checkout ${BUILDKITE_COMMIT}
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 18.04 Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
+        cd /home/cicd/eos/build/packages
+        bash generate_package.sh deb
+        buildkite-agent artifact upload *.deb
     label: ":ubuntu: Ubuntu 18.04 Package Builder"
     agents:
       queue: "automation-large-builder-fleet"
@@ -437,25 +454,24 @@ steps:
       docker#v3.2.0:
         shell: ["/bin/bash", "-i", "-e", "-c"]
         debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
-        propagate-environment: true
-        workdir: /data/job
+        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_1-9-0-develop"
+        mount-checkout: false
     env:
       OS: "ubuntu-18.04"
       PKGTYPE: "deb"
     timeout: 60
 
   - label: ":darwin: Mojave Package Builder"
-    command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
-      git checkout ${BUILDKITE_COMMIT}
-      ./scripts/package-builder.sh ':darwin: [Darwin] Mojave Build'
+    command:
+      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\" && tar -xzf build.tar.gz"
+      - "cd eos/build/packages && bash generate_package.sh brew"
+      - "cd eos && buildkite-agent artifact upload build/packages/*.tar.gz"
+      - "cd eos && buildkite-agent artifact upload build/packages/*.rb"
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
       chef/anka#v0.4.4:
         no-volume: true
-        workdir: $WORKDIR
         inherit-environment-vars: true
         bash-interactive: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
@@ -463,26 +479,23 @@ steps:
         always-pull: true
         debug: true
         wait-network: true
-    timeout: 60
-    skip: $SKIP_MOJAVE
-
+    timeout: 120
   - wait
 
   - command: | # Brew Updater
-        echo "+++ :arrow_down: Downloading brew files"
-        buildkite-agent artifact download "eosio.rb" . --step ":darwin: Mojave Package Builder"
+        echo "--- :arrow_down: Downloading brew files"
+        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
     label: ":darwin: Brew Updater"
     agents:
       queue: "automation-large-builder-fleet"
     artifact_paths:
-      - "eosio.rb"
+      - "build/packages/eosio.rb"
     timeout: 5
-    skip: $SKIP_MOJAVE
-
   - command: | # Git Submodule Regression Check
-        echo "+++ :git: Running Git Submodule Regression Check"
+        echo "+++ :microscope: Running git submodule regression check" && \
         ./scripts/submodule_check.sh
     label: "Git Submodule Regression Check"
     agents:
       queue: "automation-large-builder-fleet"
-    timeout: 5
\ No newline at end of file
+    timeout: 5
+
diff --git a/.gitignore b/.gitignore
index 49f96db2f43..46a19161c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,8 @@ witness_node_data_dir
 *.pyc
 *.pyo
 
+Testing/*
+build.tar.gz
 build/*
 build-debug/*
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 625c481275d..c9d6a76178e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,7 @@ include(CTest) # suppresses DartConfiguration.tcl error
 enable_testing()
 
 if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-   message(WARNING "CMAKE_INSTALL_PREFIX is set to default path of ${CMAKE_INSTALL_PREFIX}, resetting to ${CMAKE_INSTALL_PREFIX}/eosio")
-   set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/eosio")
+   set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 elseif ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
    message(WARNING "CMAKE_INSTALL_PREFIX is explicitly set to /usr/local. This is not recommended.")
 endif()
diff --git a/libraries/appbase b/libraries/appbase
index b6b55f5ff99..ac1b7ac3db2 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit b6b55f5ff993f4be954d2aa556538636fbdaabb4
+Subproject commit ac1b7ac3db2d5056ccc4a6274fc21381ae4f861b
diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 28ff33b21db..dd13819bcfe 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -243,7 +243,7 @@ namespace eosio { namespace chain {
       FC_DECLARE_DERIVED_EXCEPTION( ill_formed_deferred_transaction_generation_context, transaction_exception,
                                     3040016, "Transaction includes an ill-formed deferred transaction generation context extension" )
       FC_DECLARE_DERIVED_EXCEPTION( disallowed_transaction_extensions_bad_block_exception, transaction_exception,
-                                    3250002, "Transaction includes disallowed extensions (invalid block)" )
+                                    3040017, "Transaction includes disallowed extensions (invalid block)" )
 
 
    FC_DECLARE_DERIVED_EXCEPTION( action_validate_exception, chain_exception,
@@ -325,6 +325,7 @@ namespace eosio { namespace chain {
                                     3080007, "Transaction exceeded the current greylisted account network usage limit" )
       FC_DECLARE_DERIVED_EXCEPTION( greylist_cpu_usage_exceeded, resource_exhausted_exception,
                                     3080008, "Transaction exceeded the current greylisted account CPU usage limit" )
+
       FC_DECLARE_DERIVED_EXCEPTION( leeway_deadline_exception, deadline_exception,
                                     3081001, "Transaction reached the deadline set due to leeway on account CPU limits" )
 
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 1a574c3d15c..9cb61f5a887 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -5,6 +5,7 @@
 #pragma once
 #include <eosio/chain/transaction.hpp>
 #include <eosio/chain/types.hpp>
+#include <boost/asio/io_context.hpp>
 #include <future>
 
 namespace boost { namespace asio {
diff --git a/libraries/softfloat b/libraries/softfloat
index 203b6df7ded..94dac6e56c9 160000
--- a/libraries/softfloat
+++ b/libraries/softfloat
@@ -1 +1 @@
-Subproject commit 203b6df7dedc5bae1b2a7b1b23562335a6344578
+Subproject commit 94dac6e56c980a99e3e38bdff89a94600de0066d
diff --git a/pipeline.jsonc b/pipeline.jsonc
index 7fda37a185c..ed98e86690b 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -23,6 +23,14 @@
         }
     },
     "eosio-sync-tests":
+    {
+        "environment":
+        {
+            "SKIP_PRE_V180": "true",
+            "SKIP_V180": "false"
+        }
+    },
+    "eosio-replay-tests":
     {
         "environment":
         {
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 2711ba0f1c4..5aa80885fca 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -2617,7 +2617,6 @@ int main( int argc, char** argv ) {
    getTable->add_option( "account", code, localized("The account who owns the table") )->required();
    getTable->add_option( "scope", scope, localized("The scope within the contract in which the table is found") )->required();
    getTable->add_option( "table", table, localized("The name of the table as specified by the contract abi") )->required();
-   getTable->add_option( "-b,--binary", binary, localized("Return the value as BINARY rather than using abi to interpret as JSON") );
    getTable->add_option( "-l,--limit", limit, localized("The maximum number of rows to return") );
    getTable->add_option( "-k,--key", table_key, localized("Deprecated") );
    getTable->add_option( "-L,--lower", lower, localized("JSON representation of lower bound value of key, defaults to first") );
@@ -2631,6 +2630,7 @@ int main( int argc, char** argv ) {
    getTable->add_option( "--encode-type", encode_type,
                          localized("The encoding type of key_type (i64 , i128 , float64, float128) only support decimal encoding e.g. 'dec'"
                                     "i256 - supports both 'dec' and 'hex', ripemd160 and sha256 is 'hex' only"));
+   getTable->add_flag("-b,--binary", binary, localized("Return the value as BINARY rather than using abi to interpret as JSON"));
    getTable->add_flag("-r,--reverse", reverse, localized("Iterate in reverse order"));
    getTable->add_flag("--show-payer", show_payer, localized("show RAM payer"));
 
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 04c726ed8df..460dd47ad05 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -100,6 +100,7 @@ int main(int argc, char** argv)
       ilog("${name} using configuration file ${c}", ("name", nodeos::config::node_executable_name)("c", app().full_config_file_path().string()));
       ilog("${name} data directory is ${d}", ("name", nodeos::config::node_executable_name)("d", app().data_dir().string()));
       app().startup();
+      app().set_thread_priority_max();
       app().exec();
    } catch( const extract_genesis_state_exception& e ) {
       return EXTRACTED_GENESIS;
diff --git a/scripts/.environment b/scripts/.environment
new file mode 100644
index 00000000000..177e19639f2
--- /dev/null
+++ b/scripts/.environment
@@ -0,0 +1,95 @@
+export SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export REPO_ROOT="${SCRIPT_DIR}/.."
+export BUILD_DIR="${REPO_ROOT}/build"
+
+export EOSIO_VERSION_MAJOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "set\([ +]?VERSION_MAJOR" | sed 's/set(.*VERSION_MAJOR //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION_MINOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "set\([ +]?VERSION_MINOR" | sed 's/set(.*VERSION_MINOR //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION_PATCH=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "set\([ +]?VERSION_PATCH" | sed 's/set(.*VERSION_PATCH //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION_SUFFIX=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "set\([ +]?VERSION_SUFFIX" | sed 's/set(.*VERSION_SUFFIX //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}.${EOSIO_VERSION_PATCH}-${EOSIO_VERSION_SUFFIX}"
+
+export INSTALL_LOCATION=${INSTALL_LOCATION:-$HOME}
+export EOSIO_INSTALL_DIR="${INSTALL_LOCATION}/eosio/${EOSIO_VERSION}"
+export TEMP_DIR="${INSTALL_LOCATION}/tmp"
+
+export SRC_DIR=${EOSIO_INSTALL_DIR}/src
+export OPT_DIR=${EOSIO_INSTALL_DIR}/opt
+export VAR_DIR=${EOSIO_INSTALL_DIR}/var
+export ETC_DIR=${EOSIO_INSTALL_DIR}/etc
+export BIN_DIR=${EOSIO_INSTALL_DIR}/bin
+export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
+export DATA_DIR=${EOSIO_INSTALL_DIR}/data
+
+# CMAKE
+export CMAKE_VERSION_MAJOR=3
+export CMAKE_VERSION_MINOR=13
+export CMAKE_VERSION_PATCH=2
+export CMAKE_VERSION=${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}
+
+# MONGO
+export MONGODB_VERSION=3.6.3
+export MONGODB_ROOT=${OPT_DIR}/mongodb-${MONGODB_VERSION}
+export MONGODB_BIN=${BIN_DIR}/mongod
+export MONGODB_CONF=${ETC_DIR}/mongod.conf
+export MONGODB_LOG_DIR=${VAR_DIR}/log/mongodb
+export MONGODB_LINK_DIR=${OPT_DIR}/mongodb
+export MONGODB_DATA_DIR=${DATA_DIR}/mongodb
+export MONGO_C_DRIVER_VERSION=1.13.0
+export MONGO_C_DRIVER_ROOT=${SRC_DIR}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}
+export MONGO_CXX_DRIVER_VERSION=3.4.0
+export MONGO_CXX_DRIVER_ROOT=${SRC_DIR}/mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}
+export ENABLE_MONGO=${ENABLE_MONGO:-false}
+export INSTALL_MONGO=${INSTALL_MONGO:-false}
+
+# BOOST
+export BOOST_VERSION_MAJOR=1
+export BOOST_VERSION_MINOR=70
+export BOOST_VERSION_PATCH=0
+export BOOST_VERSION=${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH}
+export BOOST_ROOT=${BOOST_LOCATION:-${SRC_DIR}/boost_${BOOST_VERSION}}
+export BOOST_LINK_LOCATION=${OPT_DIR}/boost
+
+# LLVM
+export LLVM_VERSION=release_40
+export LLVM_ROOT=${OPT_DIR}/llvm
+export LLVM_DIR=${LLVM_ROOT}/lib/cmake/llvm
+
+# DOXYGEN
+export DOXYGEN_VERSION=1_8_14
+export DOXYGEN_ROOT=${SRC_DIR}/doxygen-${DOXYGEN_VERSION}
+export ENABLE_DOXYGEN=${ENABLE_DOXYGEN:-false}
+
+# CLANG
+export CLANG_ROOT=${OPT_DIR}/clang8
+export PINNED_COMPILER_BRANCH=release_80
+export PINNED_COMPILER_LLVM_COMMIT=18e41dc
+export PINNED_COMPILER_CLANG_COMMIT=a03da8b
+export PINNED_COMPILER_LLD_COMMIT=d60a035
+export PINNED_COMPILER_POLLY_COMMIT=1bc06e5
+export PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT=6b34834
+export PINNED_COMPILER_LIBCXX_COMMIT=1853712
+export PINNED_COMPILER_LIBCXXABI_COMMIT=d7338a4
+export PINNED_COMPILER_LIBUNWIND_COMMIT=57f6739
+export PINNED_COMPILER_COMPILER_RT_COMMIT=5bc7979
+export NO_CPP17=${NO_CPP17:-false}
+export PIN_COMPILER=${PIN_COMPILER:-false}
+export BUILD_CLANG=${BUILD_CLANG:-false}
+
+export CORE_SYMBOL_NAME=${CORE_SYMBOL_NAME:-SYS}
+
+export CPU_CORES=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
+export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+
+export NONINTERACTIVE=${NONINTERACTIVE:-false}
+export PROCEED=${PROCEED:-false}
+
+export CURRENT_USER=${CURRENT_USER:-$(whoami)}
+
+export ENABLE_COVERAGE_TESTING=${ENABLE_COVERAGE_TESTING:-false}
+export HOMEBREW_NO_AUTO_UPDATE=1
+export TINI_VERSION=0.18.0
+export DISK_MIN=5
+export COUNT=0
+export DRYRUN=${DRYRUN:-false}
+export VERBOSE=${VERBOSE:-false}
+export SUDO_LOCATION=$( command -v sudo )
diff --git a/scripts/eosio_build.bash b/scripts/eosio_build.bash
new file mode 100755
index 00000000000..5dbc0d20a0b
--- /dev/null
+++ b/scripts/eosio_build.bash
@@ -0,0 +1,231 @@
+#!/usr/bin/env bash
+set -eo pipefail
+SCRIPT_VERSION=3.0 # Build script version (change this to re-build the CICD image)
+##########################################################################
+# This is the EOSIO automated install script for Linux and Mac OS.
+# This file was downloaded from https://github.com/EOSIO/eos
+#
+# Copyright (c) 2017, Respective Authors all rights reserved.
+#
+# After June 1, 2018 this software is available under the following terms:
+#
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# https://github.com/EOSIO/eos/blob/master/LICENSE
+##########################################################################
+
+function usage() {
+   printf "Usage: $0 OPTION...
+  -P          Build with pinned clang and libcxx
+  -o TYPE     Build <Debug|Release|RelWithDebInfo|MinSizeRel> (default: Release)
+  -s NAME     Core Symbol Name <1-7 characters> (default: SYS)
+  -b DIR      Use pre-built boost in DIR
+  -i DIR      Directory to use for installing dependencies & EOSIO (default: $HOME)
+  -y          Noninteractive mode (answers yes to every prompt)
+  -c          Enable Code Coverage
+  -d          Generate Doxygen
+   \\n" "$0" 1>&2
+   exit 1
+}
+
+TIME_BEGIN=$( date -u +%s )
+if [ $# -ne 0 ]; then
+   while getopts "o:s:b:i:ycdhmP" opt; do
+      case "${opt}" in
+         o )
+            options=( "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
+            if [[ "${options[*]}" =~ "${OPTARG}" ]]; then
+               CMAKE_BUILD_TYPE=$OPTARG
+            else
+               echo  "Invalid argument: ${OPTARG}" 1>&2
+               usage
+            fi
+         ;;
+         s )
+            if [ "${#OPTARG}" -gt 7 ] || [ -z "${#OPTARG}" ]; then
+               echo "Invalid argument: ${OPTARG}" 1>&2
+               usage
+            else
+               CORE_SYMBOL_NAME=$OPTARG
+            fi
+         ;;
+         b )
+            BOOST_LOCATION=$OPTARG
+         ;;
+         i )
+            INSTALL_LOCATION=$OPTARG
+         ;;
+         y )
+            NONINTERACTIVE=true
+            PROCEED=true
+         ;;
+         c )
+            ENABLE_COVERAGE_TESTING=true
+         ;;
+         d )
+            ENABLE_DOXYGEN=true
+         ;;
+         m )
+            ENABLE_MONGO=true
+         ;;
+         P )
+            PIN_COMPILER=true
+         ;;
+         h )
+            usage
+         ;;
+         ? )
+            echo "Invalid Option!" 1>&2
+            usage
+         ;;
+         : )
+            echo "Invalid Option: -${OPTARG} requires an argument." 1>&2
+            usage
+         ;;
+         * )
+            usage
+         ;;
+      esac
+   done
+fi
+
+# Load eosio specific helper functions
+. ./scripts/helpers/eosio.bash
+
+echo "Beginning build version: ${SCRIPT_VERSION}"
+echo "EOSIO version to install: ${EOSIO_VERSION}"
+echo "$( date -u )"
+echo "User: ${CURRENT_USER}"
+# echo "git head id: %s" "$( cat .git/refs/heads/master )"
+echo "Current branch: $( execute git rev-parse --abbrev-ref HEAD 2>/dev/null )"
+
+[[ ! $NAME == "Ubuntu" ]] && set -i # Ubuntu doesn't support interactive mode since it uses dash
+
+# Ensure sudo is available (only if not using the root user)
+ensure-sudo
+# Test that which is on the system before proceeding
+ensure-which
+# Prevent a non-git clone from running
+ensure-git-clone
+# If the same version has already been installed...
+previous-install-prompt
+# Prompt user and asks if we should install mongo or not
+prompt-mongo-install
+# Setup directories and envs we need (must come last)
+setup
+
+execute cd $REPO_ROOT
+
+# Submodules need to be up to date
+ensure-submodules-up-to-date
+
+# Use existing cmake on system (either global or specific to eosio)
+# Setup based on architecture
+if [[ $ARCH == "Linux" ]]; then
+   export CMAKE=${CMAKE:-${EOSIO_INSTALL_DIR}/bin/cmake}
+   OPENSSL_ROOT_DIR=/usr/include/openssl
+   [[ ! -e /etc/os-release ]] && print_supported_linux_distros_and_exit
+   case $NAME in
+      "Amazon Linux AMI" | "Amazon Linux")
+         echo "${COLOR_CYAN}[Ensuring YUM installation]${COLOR_NC}"
+         FILE="${REPO_ROOT}/scripts/eosio_build_amazonlinux.bash"
+      ;;
+      "CentOS Linux")
+         FILE="${REPO_ROOT}/scripts/eosio_build_centos.bash"
+      ;;
+      "Ubuntu")
+         FILE="${REPO_ROOT}/scripts/eosio_build_ubuntu.bash"
+      ;;
+      *) print_supported_linux_distros_and_exit;;
+   esac
+   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='$EOSIO_INSTALL_DIR' ${LOCAL_CMAKE_FLAGS}" 
+fi
+
+if [ "$ARCH" == "Darwin" ]; then
+   # opt/gettext: cleos requires Intl, which requires gettext; it's keg only though and we don't want to force linking: https://github.com/EOSIO/eos/issues/2240#issuecomment-396309884
+   # EOSIO_INSTALL_DIR/lib/cmake: mongo_db_plugin.cpp:25:10: fatal error: 'bsoncxx/builder/basic/kvp.hpp' file not found
+   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='/usr/local/opt/gettext;$EOSIO_INSTALL_DIR' ${LOCAL_CMAKE_FLAGS}" 
+   FILE="${SCRIPT_DIR}/eosio_build_darwin.bash"
+   OPENSSL_ROOT_DIR=/usr/local/opt/openssl
+   export CMAKE=${CMAKE}
+fi
+
+( [[ -z "${CMAKE}" ]] && [[ ! -z $(command -v cmake 2>/dev/null) ]] ) && export CMAKE=$(command -v cmake 2>/dev/null)
+
+# Find and replace OPT_DIR in pinned_toolchain.cmake, then move it into build dir
+execute bash -c "sed -e 's~@~$OPT_DIR~g' $SCRIPT_DIR/pinned_toolchain.cmake &> $BUILD_DIR/pinned_toolchain.cmake"
+
+echo "${COLOR_CYAN}====================================================================================="
+echo "======================= ${COLOR_WHITE}Starting EOSIO Dependency Install${COLOR_CYAN} ===========================${COLOR_NC}"
+execute cd $SRC_DIR
+set_system_vars # JOBS, Memory, disk space available, etc
+echo "Architecture: ${ARCH}"
+. $FILE # Execute OS specific build file
+execute cd $REPO_ROOT
+
+echo ""
+echo "${COLOR_CYAN}========================================================================"
+echo "======================= ${COLOR_WHITE}Starting EOSIO Build${COLOR_CYAN} ===========================${COLOR_NC}"
+if $VERBOSE; then
+   echo "CXX: $CXX"
+   echo "CC: $CC"
+fi
+execute cd $BUILD_DIR
+# LOCAL_CMAKE_FLAGS
+$ENABLE_MONGO && LOCAL_CMAKE_FLAGS="-DBUILD_MONGO_DB_PLUGIN=true ${LOCAL_CMAKE_FLAGS}" # Enable Mongo DB Plugin if user has enabled -m
+if $PIN_COMPILER; then
+   LOCAL_CMAKE_FLAGS="${PINNED_TOOLCHAIN} -DCMAKE_PREFIX_PATH='${LLVM_ROOT}' ${LOCAL_CMAKE_FLAGS}"
+else
+   LOCAL_CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='${CXX}' -DCMAKE_C_COMPILER='${CC}' ${LOCAL_CMAKE_FLAGS}"
+fi
+$ENABLE_DOXYGEN && LOCAL_CMAKE_FLAGS="-DBUILD_DOXYGEN='${DOXYGEN}' ${LOCAL_CMAKE_FLAGS}"
+$ENABLE_COVERAGE_TESTING && LOCAL_CMAKE_FLAGS="-DENABLE_COVERAGE_TESTING='${ENABLE_COVERAGE_TESTING}' ${LOCAL_CMAKE_FLAGS}"
+
+execute bash -c "$CMAKE -DCMAKE_BUILD_TYPE='${CMAKE_BUILD_TYPE}' -DCORE_SYMBOL_NAME='${CORE_SYMBOL_NAME}' -DOPENSSL_ROOT_DIR='${OPENSSL_ROOT_DIR}' -DCMAKE_INSTALL_PREFIX='${EOSIO_INSTALL_DIR}' ${LOCAL_CMAKE_FLAGS} '${REPO_ROOT}'"
+execute make -j$JOBS
+execute cd $REPO_ROOT 1>/dev/null
+
+TIME_END=$(( $(date -u +%s) - $TIME_BEGIN ))
+
+echo " _______  _______  _______ _________ _______"
+echo "(  ____ \(  ___  )(  ____   __   __ (  ___  )"
+echo "| (    \/| (   ) || (    \/   ) (   | (   ) |"
+echo "| (__    | |   | || (_____    | |   | |   | |"
+echo "|  __)   | |   | |(_____  )   | |   | |   | |"
+echo "| (      | |   | |      ) |   | |   | |   | |"
+echo "| (____/\| (___) |/\____) |___) (___| (___) |"
+echo "(_______/(_______)\_______)\_______/(_______)"
+echo "=============================================${COLOR_NC}"
+
+echo "${COLOR_GREEN}EOSIO has been successfully built. $(($TIME_END/3600)):$(($TIME_END%3600/60)):$(($TIME_END%60))"
+echo "${COLOR_GREEN}You can now install using: ./scripts/eosio_install.bash${COLOR_NC}"
+echo "${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.bash${COLOR_NC}"
+
+echo ""
+echo "${COLOR_CYAN}If you wish to perform tests to ensure functional code:${COLOR_NC}"
+if $ENABLE_MONGO; then
+   echo "${BIN_DIR}/mongod --dbpath ${MONGODB_DATA_DIR} -f ${MONGODB_CONF} --logpath ${MONGODB_LOG_DIR}/mongod.log &"
+   PATH_TO_USE=" PATH=\$PATH:$OPT_DIR/mongodb/bin"
+fi
+echo "cd ./build &&${PATH_TO_USE} make test" # PATH is set as currently 'mongo' binary is required for the mongodb test
+
+echo ""
+resources
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
deleted file mode 100755
index 7f901635396..00000000000
--- a/scripts/eosio_build.sh
+++ /dev/null
@@ -1,404 +0,0 @@
-#!/bin/bash
-##########################################################################
-# This is the EOSIO automated install script for Linux and Mac OS.
-# This file was downloaded from https://github.com/EOSIO/eos
-#
-# Copyright (c) 2017, Respective Authors all rights reserved.
-#
-# After June 1, 2018 this software is available under the following terms:
-#
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# https://github.com/EOSIO/eos/blob/master/LICENSE
-##########################################################################
-
-VERSION=2.3 # Build script version
-
-# defaults for command-line arguments
-CMAKE_BUILD_TYPE=Release
-DOXYGEN=false
-ENABLE_COVERAGE_TESTING=false
-CORE_SYMBOL_NAME="SYS"
-NONINTERACTIVE=0
-PREFIX=$HOME
-
-TIME_BEGIN=$( date -u +%s )
-txtbld=$(tput bold)
-bldred=${txtbld}$(tput setaf 1)
-txtrst=$(tput sgr0)
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-REPO_ROOT="${SCRIPT_DIR}/.."
-BUILD_DIR="${REPO_ROOT}/build"
-ENABLE_MONGO=false
-
-export BUILD_DIR=$BUILD_DIR
-
-# Use current directory's tmp directory if noexec is enabled for /tmp
-if (mount | grep "/tmp " | grep --quiet noexec); then
-      mkdir -p $REPO_ROOT/tmp
-      TEMP_DIR="${REPO_ROOT}/tmp"
-      rm -rf $REPO_ROOT/tmp/*
-else # noexec wasn't found
-      TEMP_DIR="/tmp"
-fi
-
-export TMP_LOCATION=$TEMP_DIR
-
-function usage()
-{
-    cat >&2 <<EOT
-Usage: $0 OPTION...
-  -o TYPE     Build <Debug|Release|RelWithDebInfo|MinSizeRel> (default: Release)
-  -p DIR      Prefix directory for dependencies & EOS install (default: $HOME)
-  -b DIR      Use pre-built boost in DIR
-  -c          Enable Code Coverage
-  -d          Generate Doxygen
-  -s NAME     Core Symbol Name <1-7 characters> (default: SYS)
-  -y          Noninteractive mode (this script)
-  -P          Build with pinned clang 8 and libcxx
-  -f          Force rebuilding of dependencies
-  -m          Build MongoDB dependencies
-EOT
-   exit 1
-}
-
-if [ $# -ne 0 ]; then
-   while getopts ":cdo:s:p:b:mfPhy" opt; do
-      case "${opt}" in
-         o )
-            options=( "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
-            if [[ "${options[*]}" =~ "${OPTARG}" ]]; then
-               CMAKE_BUILD_TYPE="${OPTARG}"
-            else
-               printf "\\nInvalid argument: %s\\n" "${OPTARG}" 1>&2
-               usage
-               exit 1
-            fi
-         ;;
-         c )
-            ENABLE_COVERAGE_TESTING=true
-         ;;
-         d )
-            DOXYGEN=true
-         ;;
-         s)
-            if [ "${#OPTARG}" -gt 7 ] || [ -z "${#OPTARG}" ]; then
-               printf "\\nInvalid argument: %s\\n" "${OPTARG}" 1>&2
-               usage
-               exit 1
-            else
-               CORE_SYMBOL_NAME="${OPTARG}"
-            fi
-            ;;
-         b)
-             BOOST_ARG=$OPTARG
-             ;;
-         p)
-             PREFIX=$OPTARG
-             ;;
-         P)
-            PIN_COMPILER=true
-            ;;
-         h)
-            usage
-            exit 1
-         ;;
-         y)
-            NONINTERACTIVE=1
-         ;;
-         f)
-            FORCE_BUILD=1
-         ;;
-         m)
-            BUILD_MONGO=1
-            ENABLE_MONGO=1
-         ;;
-         \? )
-            printf "\\nInvalid Option: %s\\n" "-${OPTARG}" 1>&2
-            usage
-            exit 1
-         ;;
-         : )
-            printf "\\nInvalid Option: %s requires an argument.\\n" "-${OPTARG}" 1>&2
-            usage
-            exit 1
-         ;;
-         * )
-            usage
-            exit 1
-         ;;
-      esac
-   done
-fi
-
-if [ ! -d "${REPO_ROOT}/.git" ]; then
-   printf "\\nThis build script only works with sources cloned from git\\n"
-   printf "Please clone a new eos directory with 'git clone https://github.com/EOSIO/eos --recursive'\\n"
-   printf "See the wiki for instructions: https://github.com/EOSIO/eos/wiki\\n"
-   exit 1
-fi
-
-export CMAKE_VERSION_MAJOR=3
-export CMAKE_VERSION_MINOR=13
-export CMAKE_VERSION_PATCH=2
-export CMAKE_VERSION=${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}
-
-export SRC_LOCATION=$PREFIX/src
-export OPT_LOCATION=$PREFIX/opt
-export VAR_LOCATION=$PREFIX/var
-export ETC_LOCATION=$PREFIX/etc
-export BIN_LOCATION=$PREFIX/bin
-export DATA_LOCATION=$PREFIX/data
-
-export MONGODB_VERSION=3.6.3
-export MONGODB_ROOT=${OPT_LOCATION}/mongodb-${MONGODB_VERSION}
-export MONGODB_CONF=${ETC_LOCATION}/mongod.conf
-export MONGODB_LOG_LOCATION=${VAR_LOCATION}/log/mongodb
-export MONGODB_LINK_LOCATION=${OPT_LOCATION}/mongodb
-export MONGODB_DATA_LOCATION=${DATA_LOCATION}/mongodb
-export MONGO_C_DRIVER_VERSION=1.13.0
-export MONGO_C_DRIVER_ROOT=${SRC_LOCATION}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}
-export MONGO_CXX_DRIVER_VERSION=3.4.0
-export MONGO_CXX_DRIVER_ROOT=${SRC_LOCATION}/mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}
-export BOOST_VERSION_MAJOR=1
-export BOOST_VERSION_MINOR=70
-export BOOST_VERSION_PATCH=0
-export BOOST_VERSION=${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH}
-export BOOST_ROOT=${BOOST_ARG:-${SRC_LOCATION}/boost_${BOOST_VERSION}}
-export BOOST_LINK_LOCATION=${OPT_LOCATION}/boost
-export LLVM_VERSION=release_40
-export LLVM_ROOT=${OPT_LOCATION}/llvm
-export LLVM_DIR=${LLVM_ROOT}/lib/cmake/llvm
-export CLANG8_ROOT=${OPT_LOCATION}/clang8
-export PINNED_COMPILER_BRANCH=release_80
-export PINNED_COMPILER_LLVM_COMMIT=18e41dc
-export PINNED_COMPILER_CLANG_COMMIT=a03da8b
-export PINNED_COMPILER_LLD_COMMIT=d60a035
-export PINNED_COMPILER_POLLY_COMMIT=1bc06e5
-export PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT=6b34834
-export PINNED_COMPILER_LIBCXX_COMMIT=1853712
-export PINNED_COMPILER_LIBCXXABI_COMMIT=d7338a4
-export PINNED_COMPILER_LIBUNWIND_COMMIT=57f6739
-export PINNED_COMPILER_COMPILER_RT_COMMIT=5bc7979
-export DOXYGEN_VERSION=1_8_14
-export DOXYGEN_ROOT=${SRC_LOCATION}/doxygen-${DOXYGEN_VERSION}
-export TINI_VERSION=0.18.0
-export DISK_MIN=5
-export FORCE_BUILD=$FORCE_BUILD
-export BUILD_MONGO=$BUILD_MONGO
-
-mkdir -p $BUILD_DIR
-sed -e "s~@~$OPT_LOCATION~g" $SCRIPT_DIR/pinned_toolchain.cmake &> $BUILD_DIR/pinned_toolchain.cmake
-cd $REPO_ROOT
-
-STALE_SUBMODS=$(( $(git submodule status --recursive | grep -c "^[+\-]") ))
-if [ $STALE_SUBMODS -gt 0 ]; then
-   printf "\\ngit submodules are not up to date.\\n"
-   printf "Please run the command 'git submodule update --init --recursive'.\\n"
-   exit 1
-fi
-
-BUILD_CLANG8=false
-if [ ! -z $CXX ]; then
-   CPP_COMP=$CXX
-   CC_COMP=$CC
-else
-   CPP_COMP=c++
-   CC_COMP=cc
-fi
-
-NO_CPP17=false
-
-WHICH_CPP=`which $CPP_COMP`
-COMPILER_TYPE=`readlink $WHICH_CPP`
-if [[ $COMPILER_TYPE == "clang++" ]]; then
-   if [[ `c++ --version | cut -d ' ' -f 1 | head -n 1` == "Apple" ]]; then
-      ### Apple clang version 10
-      if [[ `c++ --version | cut -d ' ' -f 4 | cut -d '.' -f 1 | head -n 1` -lt 10 ]]; then
-         NO_CPP17=true
-      fi
-   else
-      ### clang version 5
-      if [[ `c++ --version | cut -d ' ' -f 4 | cut -d '.' -f 1 | head -n 1` -lt 5 ]]; then
-         NO_CPP17=true
-      fi
-   fi
-else
-   ### gcc version 7
-   if [[ `c++ -dumpversion | cut -d '.' -f 1` -lt 7 ]]; then
-      NO_CPP17=true
-   fi
-fi
-
-if [ $PIN_COMPILER ]; then
-   BUILD_CLANG8=true
-   CPP_COMP=${OPT_LOCATION}/clang8/bin/clang++
-   CC_COMP=${OPT_LOCATION}/clang8/bin/clang
-elif $NO_CPP17; then
-   if [ $NONINTERACTIVE -eq 0 ]; then
-      BUILD_CLANG8=true
-      CPP_COMP=${OPT_LOCATION}/clang8/bin/clang++
-      CC_COMP=${OPT_LOCATION}/clang8/bin/clang
-   else
-      printf "Error no C++17 support.\\nEnter Y/y or N/n to continue with downloading and building a viable compiler or exit now.\\nIf you already have a C++17 compiler installed or would like to install your own, export CXX to point to the compiler of your choosing."
-      read -p "Enter Y/y or N/n to continue with downloading and building a viable compiler or exit now. " yn
-      case $yn in
-         [Yy]* ) BUILD_CLANG8=true; CPP_COMP=${OPT_LOCATION}/clang8/bin/clang++; CC_COMP=${OPT_LOCATION}/clang8/bin/clang; break;;
-         [Nn]* ) exit 1;;
-         * ) echo "Improper input"; exit 1;;
-      esac
-   fi
-fi
-
-CXX=$CPP_COMP
-CC=$CC_COMP
-
-export PIN_COMPILER=$PIN_COMPILER
-
-# Setup directories
-mkdir -p $SRC_LOCATION
-mkdir -p $OPT_LOCATION
-mkdir -p $VAR_LOCATION
-mkdir -p $BIN_LOCATION
-mkdir -p $VAR_LOCATION/log
-mkdir -p $ETC_LOCATION
-mkdir -p $MONGODB_LOG_LOCATION
-mkdir -p $MONGODB_DATA_LOCATION
-
-printf "\\nBeginning build version: %s\\n" "${VERSION}"
-printf "%s\\n" "$( date -u )"
-printf "User: %s\\n" "$( whoami )"
-# printf "git head id: %s\\n" "$( cat .git/refs/heads/master )"
-printf "Current branch: %s\\n" "$( git rev-parse --abbrev-ref HEAD )"
-
-ARCH=$( uname )
-printf "\\nARCHITECTURE: %s\\n" "${ARCH}"
-
-# Find and use existing CMAKE
-export CMAKE=$(command -v cmake 2>/dev/null)
-
-print_supported_linux_distros_and_exit() {
-   printf "\\nOn Linux the EOSIO build script only supports Amazon, Centos, and Ubuntu.\\n"
-   printf "Please install on a supported version of one of these Linux distributions.\\n"
-   printf "https://aws.amazon.com/amazon-linux-ami/\\n"
-   printf "https://www.centos.org/\\n"
-   printf "https://www.ubuntu.com/\\n"
-   printf "Exiting now.\\n"
-   exit 1
-}
-
-if [ "$ARCH" == "Linux" ]; then
-   # Check if cmake is already installed or not and use source install location
-   if [ -z $CMAKE ]; then export CMAKE=$PREFIX/bin/cmake; fi
-   export OS_NAME=$( cat /etc/os-release | grep ^NAME | cut -d'=' -f2 | sed 's/\"//gI' )
-   OPENSSL_ROOT_DIR=/usr/include/openssl
-   if [ ! -e /etc/os-release ]; then
-      print_supported_linux_distros_and_exit
-   fi
-   case "$OS_NAME" in
-      "Amazon Linux AMI"|"Amazon Linux")
-         FILE="${REPO_ROOT}/scripts/eosio_build_amazon.sh"
-      ;;
-      "CentOS Linux")
-         FILE="${REPO_ROOT}/scripts/eosio_build_centos.sh"
-      ;;
-      "Ubuntu")
-         FILE="${REPO_ROOT}/scripts/eosio_build_ubuntu.sh"
-      ;;
-      *)
-         print_supported_linux_distros_and_exit
-   esac
-fi
-
-if [ "$ARCH" == "Darwin" ]; then
-   # Check if cmake is already installed or not and use source install location
-   if [ -z $CMAKE ]; then export CMAKE=/usr/local/bin/cmake; fi
-   export OS_NAME=MacOSX
-   # opt/gettext: cleos requires Intl, which requires gettext; it's keg only though and we don't want to force linking: https://github.com/EOSIO/eos/issues/2240#issuecomment-396309884
-   # HOME/lib/cmake: mongo_db_plugin.cpp:25:10: fatal error: 'bsoncxx/builder/basic/kvp.hpp' file not found
-   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH=/usr/local/opt/gettext;$PREFIX ${LOCAL_CMAKE_FLAGS}"
-   FILE="${REPO_ROOT}/scripts/eosio_build_darwin.sh"
-   OPENSSL_ROOT_DIR=/usr/local/opt/openssl
-fi
-
-# Cleanup old installation
-. ./scripts/full_uninstaller.sh $NONINTERACTIVE
-if [ $? -ne 0 ]; then exit -1; fi # Stop if exit from script is not 0
-
-pushd $SRC_LOCATION &> /dev/null
-. "$FILE" $NONINTERACTIVE # Execute OS specific build file
-popd &> /dev/null
-
-printf "\\n========================================================================\\n"
-printf "======================= Starting EOSIO Build =======================\\n"
-printf "## CMAKE_BUILD_TYPE=%s\\n" "${CMAKE_BUILD_TYPE}"
-printf "## ENABLE_COVERAGE_TESTING=%s\\n" "${ENABLE_COVERAGE_TESTING}"
-
-cd $BUILD_DIR
-
-
-if [ $PIN_COMPILER ]; then
-   $CMAKE -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" -DCMAKE_TOOLCHAIN_FILE=$BUILD_DIR/pinned_toolchain.cmake \
-      -DCORE_SYMBOL_NAME="${CORE_SYMBOL_NAME}" \
-      -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=$ENABLE_MONGO \
-      -DENABLE_COVERAGE_TESTING="${ENABLE_COVERAGE_TESTING}" -DBUILD_DOXYGEN="${DOXYGEN}" \
-      -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_PREFIX_PATH=$OPT_LOCATION/llvm4\
-      -DCMAKE_INSTALL_PREFIX=$OPT_LOCATION/eosio $LOCAL_CMAKE_FLAGS "${REPO_ROOT}"
-else
-   $CMAKE -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" -DCMAKE_CXX_COMPILER="${CXX}" \
-      -DCMAKE_C_COMPILER="${CC}" -DCORE_SYMBOL_NAME="${CORE_SYMBOL_NAME}" \
-      -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=$ENABLE_MONGO \
-      -DENABLE_COVERAGE_TESTING="${ENABLE_COVERAGE_TESTING}" -DBUILD_DOXYGEN="${DOXYGEN}" \
-      -DCMAKE_PREFIX_PATH=$PREFIX \
-      -DCMAKE_INSTALL_PREFIX=$OPT_LOCATION/eosio $LOCAL_CMAKE_FLAGS "${REPO_ROOT}"
-fi
-
-if [ $? -ne 0 ]; then exit -1; fi
-make -j"${JOBS}"
-if [ $? -ne 0 ]; then exit -1; fi
-
-cd $REPO_ROOT
-
-TIME_END=$(( $(date -u +%s) - $TIME_BEGIN ))
-
-printf "${bldred}\n\n _______  _______  _______ _________ _______\n"
-printf '(  ____ \(  ___  )(  ____ \\\\__   __/(  ___  )\n'
-printf "| (    \/| (   ) || (    \/   ) (   | (   ) |\n"
-printf "| (__    | |   | || (_____    | |   | |   | |\n"
-printf "|  __)   | |   | |(_____  )   | |   | |   | |\n"
-printf "| (      | |   | |      ) |   | |   | |   | |\n"
-printf "| (____/\| (___) |/\____) |___) (___| (___) |\n"
-printf "(_______/(_______)\_______)\_______/(_______)\n\n${txtrst}"
-
-printf "\\nEOSIO has been successfully built. %02d:%02d:%02d\\n" $(($TIME_END/3600)) $(($TIME_END%3600/60)) $(($TIME_END%60))
-printf "==============================================================================================\\n${bldred}"
-printf "(Optional) Testing Instructions:\\n"
-print_instructions
-printf "${BIN_LOCATION}/mongod --dbpath ${MONGODB_DATA_LOCATION} -f ${MONGODB_CONF} --logpath ${MONGODB_LOG_LOCATION}/mongod.log &\\n"
-printf "cd ./build && PATH=\$PATH:$MONGODB_LINK_LOCATION/bin make test\\n" # PATH is set as currently 'mongo' binary is required for the mongodb test
-printf "${txtrst}==============================================================================================\\n"
-printf "For more information:\\n"
-printf "EOSIO website: https://eos.io\\n"
-printf "EOSIO Telegram channel @ https://t.me/EOSProject\\n"
-printf "EOSIO resources: https://eos.io/resources/\\n"
-printf "EOSIO Stack Exchange: https://eosio.stackexchange.com\\n"
-printf "EOSIO wiki: https://github.com/EOSIO/eos/wiki\\n\\n\\n"
diff --git a/scripts/eosio_build_amazon.sh b/scripts/eosio_build_amazon.sh
deleted file mode 100755
index d5ffb7f2c83..00000000000
--- a/scripts/eosio_build_amazon.sh
+++ /dev/null
@@ -1,353 +0,0 @@
-if [ $1 == 1 ]; then ANSWER=1; else ANSWER=0; fi
-
-OS_VER=$( grep VERSION_ID /etc/os-release | cut -d'=' -f2 | sed 's/[^0-9\.]//gI' | cut -d'.' -f1 )
-
-DISK_INSTALL=$( df -h . | tail -1 | tr -s ' ' | cut -d\  -f1 )
-DISK_TOTAL_KB=$( df . | tail -1 | awk '{print $2}' )
-DISK_AVAIL_KB=$( df . | tail -1 | awk '{print $4}' )
-DISK_TOTAL=$(( DISK_TOTAL_KB / 1048576 ))
-DISK_AVAIL=$(( DISK_AVAIL_KB / 1048576 ))
-
-if [ "$BUILD_CLANG8" = "true" ]; then
-   PINNED_TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE=$BUILD_DIR/pinned_toolchain.cmake
-fi
-
-DEP_ARRAY=(
-	git procps-ng util-linux gcc gcc-c++ autoconf automake libtool make bzip2 \
-	bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel libusbx-devel \
-	python3 python3-devel python-devel libedit-devel doxygen graphviz
-)
-
-COUNT=1
-DISPLAY=""
-DEP=""
-
-if ! (. /etc/os-release; [ "$VERSION_ID" = "2" ]); then
-	printf "Amazon Linux 2 is the only version of Amazon Linux supported by EOSIO build scripts.\\n"
-	printf "exiting now.\\n"
-	exit 1
-fi
-
-if [ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]; then
-	printf "You must have at least %sGB of available storage to install EOSIO.\\n" "${DISK_MIN}"
-	printf "exiting now.\\n"
-	exit 1
-fi
-
-printf "\\nChecking Yum installation.\\n"
-if ! YUM=$( command -v yum 2>/dev/null )
-then
-	printf "\\nYum must be installed to compile EOS.IO.\\n"
-	printf "\\nExiting now.\\n"
-	exit 1
-fi
-printf "Yum installation found at ${YUM}.\\n"
-
-if [ $ANSWER != 1 ]; then read -p "Do you wish to update YUM repositories? (y/n) " ANSWER; fi
-case $ANSWER in
-	1 | [Yy]* )
-		if ! sudo -E $YUM -y update; then
-			printf " - YUM update failed.\\n"
-			exit 1;
-		else
-			printf " - YUM update complete.\\n"
-		fi
-	;;
-	[Nn]* ) echo " - Proceeding without update!";;
-	* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-esac
-
-printf "Checking RPM for installed dependencies...\\n"
-for (( i=0; i<${#DEP_ARRAY[@]}; i++ )); do
-	pkg=$( rpm -qi "${DEP_ARRAY[$i]}" 2>/dev/null | grep Name )
-	if [[ -z $pkg ]]; then
-		DEP=$DEP" ${DEP_ARRAY[$i]} "
-		DISPLAY="${DISPLAY}${COUNT}. ${DEP_ARRAY[$i]}\\n"
-		printf " - Package %s ${bldred} NOT ${txtrst} found!\\n" "${DEP_ARRAY[$i]}"
-		(( COUNT++ ))
-	else
-		printf " - Package %s found.\\n" "${DEP_ARRAY[$i]}"
-		continue
-	fi
-done
-if [ "${COUNT}" -gt 1 ]; then
-	printf "\\nThe following dependencies are required to install EOSIO:\\n"
-	printf "${DISPLAY}\\n\\n"
-	if [ $ANSWER != 1 ]; then read -p "Do you wish to install these dependencies? (y/n) " ANSWER; fi
-	case $ANSWER in
-		1 | [Yy]* )
-			if ! sudo -E $YUM -y install ${DEP}; then
-				printf " - YUM dependency installation failed!\\n"
-				exit 1;
-			else
-				printf " - YUM dependencies installed successfully.\\n"
-			fi
-		;;
-		[Nn]* ) echo "User aborting installation of required dependencies, Exiting now."; exit;;
-		* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-	esac
-else
-	printf " - No required YUM dependencies to install.\\n"
-fi
-
-# util-linux includes lscpu
-# procps includes free -m
-MEM_MEG=$( free -m | sed -n 2p | tr -s ' ' | cut -d\  -f2 )
-CPU_SPEED=$( lscpu | grep "MHz" | tr -s ' ' | cut -d\  -f3 | cut -d'.' -f1 )
-CPU_CORE=$( nproc )
-MEM_GIG=$(( ((MEM_MEG / 1000) / 2) ))
-export JOBS=$(( MEM_GIG > CPU_CORE ? CPU_CORE : MEM_GIG ))
-
-printf "\\nOS name: %s\\n" "${OS_NAME}"
-printf "OS Version: %s\\n" "${OS_VER}"
-printf "CPU speed: %sMhz\\n" "${CPU_SPEED}"
-printf "CPU cores: %s\\n" "${CPU_CORE}"
-printf "Physical Memory: %sMgb\\n" "${MEM_MEG}"
-printf "Disk space total: %sGb\\n" "${DISK_TOTAL}"
-printf "Disk space available: %sG\\n" "${DISK_AVAIL}"
-
-if [ "${MEM_MEG}" -lt 7000 ]; then
-	printf "Your system must have 7 or more Gigabytes of physical memory installed.\\n"
-	printf "exiting now.\\n"
-	exit 1
-fi
-
-printf "\\n"
-
-### clean up force build before starting
-if [ $FORCE_BUILD ];then
-   rm -rf  \
-   ${SRC_LOCATION}/cmake-$CMAKE_VERSION \
-   ${SRC_LOCATION}/llvm ${OPT_LOCATION}/llvm4 \
-   ${TMP_LOCATION}/clang8 ${OPT_LOCATION}/clang8 \
-   ${SRC_LOCATION}/zlib ${OPT_LOCATION}/zlib \
-   ${SRC_LOCATION}/boost \
-   ${SRC_LOCATION}/mongodb-linux-x86_64-amazon-$MONGODB_VERSION \
-   ${SRC_LOCATION}/mongo-c-driver-$MONGO_C_DRIVER_VERSION \
-   ${SRC_LOCATION}/mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION
-fi
-
-printf "Checking CMAKE installation...\\n"
-if [ ! -e $CMAKE ] || [ $FORCE_BUILD ]; then
-	printf "Installing CMAKE...\\n"
-	curl -LO https://cmake.org/files/v$CMAKE_VERSION_MAJOR.$CMAKE_VERSION_MINOR/cmake-$CMAKE_VERSION.tar.gz \
-	&& tar -xzf cmake-$CMAKE_VERSION.tar.gz \
-	&& cd cmake-$CMAKE_VERSION \
-	&& ./bootstrap --prefix=$PREFIX \
-	&& make -j"${JOBS}" \
-	&& make install \
-	&& cd .. \
-	&& rm -f cmake-$CMAKE_VERSION.tar.gz \
-	|| exit 1
-	printf " - CMAKE successfully installed @ ${CMAKE} \\n"
-else
-	printf " - CMAKE found @ ${CMAKE}.\\n"
-fi
-if [ $? -ne 0 ]; then exit -1; fi
-
-
-
-printf "\\n"
-
-if [ "$BUILD_CLANG8" = "true" ]; then
-   printf "Checking Clang 8 support...\\n"
-   if [ ! -d $CLANG8_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing Clang 8...\\n"
-      cd ${TMP_LOCATION} \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/llvm.git clang8 && cd clang8 \
-      && git checkout $PINNED_COMPILER_LLVM_COMMIT \
-      && cd tools \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/lld.git \
-      && cd lld && git checkout $PINNED_COMPILER_LLD_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/polly.git \
-      && cd polly && git checkout $PINNED_COMPILER_POLLY_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang.git clang && cd clang/tools \
-      && git checkout $PINNED_COMPILER_CLANG_VERSION \
-      && mkdir extra && cd extra \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang-tools-extra.git \
-      && cd clang-tools-extra && git checkout $PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT && cd .. \
-      && cd ../../../../projects \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxx.git \
-      && cd libcxx && git checkout $PINNED_COMPILER_LIBCXX_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxxabi.git \
-      && cd libcxxabi && git checkout $PINNED_COMPILER_LIBCXXABI_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libunwind.git \
-      && cd libunwind && git checkout $PINNED_COMPILER_LIBUNWIND_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/compiler-rt.git \
-      && cd compiler-rt && git checkout $PINNED_COMPILER_COMPILER_RT_COMMIT && cd ../ \
-      && cd ${TMP_LOCATION}/clang8 \
-      && mkdir build && cd build \
-      && $CMAKE -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${CLANG8_ROOT}" -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && rm -rf ${TMP_LOCATION}/clang8 \
-      && cd ../.. \
-      || exit 1
-
-      printf " - Clang 8 successfully installed @ ${CLANG8_ROOT}\\n"
-   else
-      printf " - Clang 8 found @ ${CLANG8_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-
-   printf "Checking LLVM 4 installation...\\n"
-   if [ ! -d $OPT_LOCATION/llvm4 ] || [ $FORCE_BUILD ]; then
-      printf "Installing LLVM 4...\\n"
-      cd $SRC_LOCATION \
-      && git clone https://github.com/llvm-mirror/llvm --single-branch --branch $LLVM_VERSION && cd llvm \
-      && mkdir -p build && cd build \
-      && $CMAKE -DCMAKE_INSTALL_PREFIX=$OPT_LOCATION/llvm4 -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$BUILD_DIR/pinned_toolchain.cmake .. \
-      && make -j"${JOBS}" install \
-      || exit -1
-      printf "Installed LLVM 4 @ ${OPT_LOCATION}/llvm4"
-   fi
-
-   cd $SRC_LOCATION
-   printf "Checking zlib library installation...\\n"
-   if [ ! -d $OPT_LOCATION/zlib ] || [ $FORCE_BUILD ]; then
-      printf "Installing zlib...\\n"
-      curl -LO https://www.zlib.net/zlib-1.2.11.tar.gz && tar -xf zlib-1.2.11.tar.gz \
-      && cd zlib-1.2.11 && mkdir build && cd build \
-      && ../configure --prefix=$OPT_LOCATION/zlib \
-      && make -j"${JOBS}" install \
-      || exit -1
-   fi
-   cd $SRC_LOCATION
-   export PATH=$OPT_LOCATION/clang8/bin:$PATH
-   printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
-   BOOSTVERSION=$( grep "#define BOOST_VERSION" "$BOOST_ROOT/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\  -f3 )
-   if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ] || [ $FORCE_BUILD ]; then
-      printf "Installing Boost library...\\n"
-      curl -LO https://dl.bintray.com/boostorg/release/${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_PATCH}/source/boost_$BOOST_VERSION.tar.bz2 \
-      && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
-      && cd $BOOST_ROOT \
-      && ./bootstrap.sh --prefix=$BOOST_ROOT \
-      && ./b2 toolset=clang cxxflags="-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I${CLANG8_ROOT}/include/c++/v1" linkflags="-stdlib=libc++" link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j"${JOBS}" -sZLIB_LIBRARY_PATH="${OPT_LOCATION}/zlib/lib" -sZLIB_INCLUDE="${OPT_LOCATION}/zlib/include" -sZLIB_SOURCE="${SRC_LOCATION}/zlib-1.2.11" install \
-      && cd .. \
-      && rm -f boost_$BOOST_VERSION.tar.bz2 \
-      && rm -rf $BOOST_LINK_LOCATION \
-      && ln -s $BOOST_ROOT $BOOST_LINK_LOCATION \
-      || exit 1
-      printf " - Boost library successfully installed @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   else
-      printf " - Boost library found with correct version @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-else
-   printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
-   BOOSTVERSION=$( grep "#define BOOST_VERSION" "$BOOST_ROOT/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\  -f3 )
-   if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ] || [ $FORCE_BUILD ]; then
-      printf "Installing Boost library...\\n"
-      curl -LO https://dl.bintray.com/boostorg/release/${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_PATCH}/source/boost_$BOOST_VERSION.tar.bz2 \
-      && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
-      && cd $BOOST_ROOT \
-      && ./bootstrap.sh --prefix=$BOOST_ROOT \
-      && ./b2 -q -j"${JOBS}" install \
-      && cd .. \
-      && rm -f boost_$BOOST_VERSION.tar.bz2 \
-      && rm -rf $BOOST_LINK_LOCATION \
-      && ln -s $BOOST_ROOT $BOOST_LINK_LOCATION \
-      || exit 1
-      printf " - Boost library successfully installed @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   else
-      printf " - Boost library found with correct version @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-
-   printf "\\n"
-
-   printf "Checking LLVM 4 support...\\n"
-   if [ ! -d $LLVM_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing LLVM 4...\\n"
-      cd ../opt \
-      && git clone --depth 1 --single-branch --branch $LLVM_VERSION https://github.com/llvm-mirror/llvm.git llvm && cd llvm \
-      && mkdir build \
-      && cd build \
-      && $CMAKE -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${LLVM_ROOT}" -DLLVM_TARGETS_TO_BUILD="host" -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE="Release" .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && cd ../.. \
-      || exit 1
-      printf " - LLVM successfully installed @ ${LLVM_ROOT}\\n"
-   else
-      printf " - LLVM found @ ${LLVM_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-
-   cd ..
-   printf "\\n"
-fi
-
-if [ $BUILD_MONGO ]; then 
-   printf "Checking MongoDB installation...\\n"
-   if [ ! -d $MONGODB_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB into ${MONGODB_ROOT}...\\n"
-      curl -OL https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
-      && tar -xzf mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
-      && mv $SRC_LOCATION/mongodb-linux-x86_64-amazon-$MONGODB_VERSION $MONGODB_ROOT \
-      && touch $MONGODB_LOG_LOCATION/mongod.log \
-      && rm -f mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
-      && cp -f $REPO_ROOT/scripts/mongod.conf $MONGODB_CONF \
-      && mkdir -p $MONGODB_DATA_LOCATION \
-      && rm -rf $MONGODB_LINK_LOCATION \
-      && rm -rf $BIN_LOCATION/mongod \
-      && ln -s $MONGODB_ROOT $MONGODB_LINK_LOCATION \
-      && ln -s $MONGODB_LINK_LOCATION/bin/mongod $BIN_LOCATION/mongod \
-      || exit 1
-      printf " - MongoDB successfully installed @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_LOCATION}).\\n"
-   else
-      printf " - MongoDB found with correct version @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   printf "Checking MongoDB C driver installation...\\n"
-   if [ ! -d $MONGO_C_DRIVER_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB C driver...\\n"
-      curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/$MONGO_C_DRIVER_VERSION/mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      && tar -xzf mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      && cd mongo-c-driver-$MONGO_C_DRIVER_VERSION \
-      && mkdir -p cmake-build \
-      && cd cmake-build \
-      && $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF $PINNED_TOOLCHAIN .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && cd ../.. \
-      && rm mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      || exit 1
-      printf " - MongoDB C driver successfully installed @ ${MONGO_C_DRIVER_ROOT}.\\n"
-   else
-      printf " - MongoDB C driver found with correct version @ ${MONGO_C_DRIVER_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   printf "Checking MongoDB C++ driver installation...\\n"
-   if [ ! -d $MONGO_CXX_DRIVER_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB C++ driver...\\n"
-      curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r$MONGO_CXX_DRIVER_VERSION.tar.gz -o mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
-      && tar -xzf mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
-      && cd mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION \
-      && sed -i 's/"maxAwaitTimeMS", count/"maxAwaitTimeMS", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
-      && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
-      && cd build \
-      && $CMAKE -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX $PINNED_TOOLCHAIN .. \
-      && make -j"${JOBS}" VERBOSE=1 \
-      && make install \
-      && cd ../.. \
-      && rm -f mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
-      || exit 1
-      printf " - MongoDB C++ driver successfully installed @ ${MONGO_CXX_DRIVER_ROOT}.\\n"
-   else
-      printf " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-fi
-
-function print_instructions() {
-	return 0
-}
diff --git a/scripts/eosio_build_amazonlinux.bash b/scripts/eosio_build_amazonlinux.bash
new file mode 100755
index 00000000000..a8622caad08
--- /dev/null
+++ b/scripts/eosio_build_amazonlinux.bash
@@ -0,0 +1,87 @@
+echo "OS name: ${NAME}"
+echo "OS Version: ${VERSION_ID}"
+echo "CPU cores: ${CPU_CORES}"
+echo "Physical Memory: ${MEM_GIG}G"
+echo "Disk space total: ${DISK_TOTAL}G"
+echo "Disk space available: ${DISK_AVAIL}G"
+
+if [[ "${NAME}" == "Amazon Linux" ]] && [[ $VERSION == 2 ]]; then
+	DEPS_FILE="${REPO_ROOT}/scripts/eosio_build_amazonlinux2_deps"
+else
+	echo " - You must be running Amazon Linux 2017.09 or higher to install EOSIO." && exit 1
+fi
+
+[[ $MEM_GIG -lt 7 ]] && echo "Your system must have 7 or more Gigabytes of physical memory installed." && exit 1
+[[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
+
+# Handle clang/compiler
+ensure-compiler
+# Ensure packages exist
+($PIN_COMPILER && $BUILD_CLANG) && EXTRA_DEPS=(gcc-c++,rpm\ -qa)
+ensure-yum-packages $DEPS_FILE $(echo ${EXTRA_DEPS[@]})
+# CMAKE Installation
+ensure-cmake
+# CLANG Installation
+build-clang
+# LLVM Installation
+ensure-llvm
+# BOOST Installation
+ensure-boost
+
+if $INSTALL_MONGO; then
+
+	echo "${COLOR_CYAN}[Ensuring MongoDB installation]${COLOR_NC}"
+	if [[ ! -d $MONGODB_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -OL https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
+		&& tar -xzf mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
+		&& mv $SRC_DIR/mongodb-linux-x86_64-amazon-$MONGODB_VERSION $MONGODB_ROOT \
+		&& touch $MONGODB_LOG_DIR/mongod.log \
+		&& rm -f mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
+		&& cp -f $REPO_ROOT/scripts/mongod.conf $MONGODB_CONF \
+		&& mkdir -p $MONGODB_DATA_DIR \
+		&& rm -rf $MONGODB_LINK_DIR \
+		&& rm -rf $BIN_DIR/mongod \
+		&& ln -s $MONGODB_ROOT $MONGODB_LINK_DIR \
+		&& ln -s $MONGODB_LINK_DIR/bin/mongod $BIN_DIR/mongod"
+		echo " - MongoDB successfully installed @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_DIR})."
+	else
+		echo " - MongoDB found with correct version @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_DIR})."
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB C driver installation]${COLOR_NC}"
+	if [[ ! -d $MONGO_C_DRIVER_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/$MONGO_C_DRIVER_VERSION/mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
+		&& tar -xzf mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
+		&& cd mongo-c-driver-$MONGO_C_DRIVER_VERSION \
+		&& mkdir -p cmake-build \
+		&& cd cmake-build \
+		&& $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_DIR -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF $PINNED_TOOLCHAIN .. \
+		&& make -j${JOBS} \
+		&& make install \
+		&& cd ../.. \
+		&& rm mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz"
+		echo " - MongoDB C driver successfully installed @ ${MONGO_C_DRIVER_ROOT}."
+	else
+		echo " - MongoDB C driver found with correct version @ ${MONGO_C_DRIVER_ROOT}."
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB C++ driver installation]${COLOR_NC}"
+	if [[ ! -d $MONGO_CXX_DRIVER_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r$MONGO_CXX_DRIVER_VERSION.tar.gz -o mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
+		&& tar -xzf mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
+		&& cd mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION \
+		&& sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
+		&& sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
+		&& cd build \
+		&& $CMAKE -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='$EOSIO_INSTALL_DIR' -DCMAKE_PREFIX_PATH='$EOSIO_INSTALL_DIR' $PINNED_TOOLCHAIN .. \
+		&& make -j${JOBS} VERBOSE=1 \
+		&& make install \
+		&& cd ../.. \
+		&& rm -f mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz"
+		echo " - MongoDB C++ driver successfully installed @ ${MONGO_CXX_DRIVER_ROOT}."
+	else
+		echo " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}."
+	fi
+fi
+echo ""
\ No newline at end of file
diff --git a/scripts/eosio_build_amazonlinux2_deps b/scripts/eosio_build_amazonlinux2_deps
new file mode 100755
index 00000000000..253958b3102
--- /dev/null
+++ b/scripts/eosio_build_amazonlinux2_deps
@@ -0,0 +1,21 @@
+git,rpm -qa
+sudo,rpm -qa
+procps-ng,rpm -qa
+util-linux,rpm -qa
+autoconf,rpm -qa
+automake,rpm -qa
+libtool,rpm -qa
+make,rpm -qa
+bzip2,rpm -qa
+bzip2-devel,rpm -qa
+openssl-devel,rpm -qa
+gmp-devel,rpm -qa
+libstdc++,rpm -qa
+libcurl-devel,rpm -qa
+libusbx-devel,rpm -qa
+python3,rpm -qa
+python3-devel,rpm -qa
+python-devel,rpm -qa
+libedit-devel,rpm -qa
+doxygen,rpm -qa
+graphviz,rpm -qa
\ No newline at end of file
diff --git a/scripts/eosio_build_centos.bash b/scripts/eosio_build_centos.bash
new file mode 100755
index 00000000000..e08a01d266f
--- /dev/null
+++ b/scripts/eosio_build_centos.bash
@@ -0,0 +1,99 @@
+echo "OS name: ${NAME}"
+echo "OS Version: ${VERSION_ID}"
+echo "CPU cores: ${CPU_CORES}"
+echo "Physical Memory: ${MEM_GIG}G"
+echo "Disk space total: ${DISK_TOTAL}G"
+echo "Disk space available: ${DISK_AVAIL}G"
+
+( [[ $NAME == "CentOS Linux" ]] && [[ "$(echo ${VERSION} | sed 's/ .*//g')" < 7 ]] ) && echo " - You must be running Centos 7 or higher to install EOSIO." && exit 1
+
+[[ $MEM_GIG -lt 7 ]] && echo "Your system must have 7 or more Gigabytes of physical memory installed." && exit 1
+[[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
+
+echo ""
+
+# Repo necessary for rh-python3 and devtoolset-7
+ensure-scl
+# GCC7 for Centos / Needed for CMAKE install even if we're pinning
+ensure-devtoolset
+if [[ -d /opt/rh/devtoolset-7 ]]; then
+	echo "${COLOR_CYAN}[Enabling Centos devtoolset-7 (so we can use GCC 7)]${COLOR_NC}"
+	execute-always source /opt/rh/devtoolset-7/enable
+	echo " - ${COLOR_GREEN}Centos devtoolset-7 successfully enabled!${COLOR_NC}"
+fi
+# Handle clang/compiler
+ensure-compiler
+# Ensure packages exist
+ensure-yum-packages "${REPO_ROOT}/scripts/eosio_build_centos7_deps"
+export PYTHON3PATH="/opt/rh/rh-python36"
+if $DRYRUN || [ -d $PYTHON3PATH ]; then
+	echo "${COLOR_CYAN}[Enabling python36]${COLOR_NC}"
+	execute source $PYTHON3PATH/enable
+	echo " ${COLOR_GREEN}- Python36 successfully enabled!${COLOR_NC}"
+	echo ""
+fi
+# CMAKE Installation
+ensure-cmake
+# CLANG Installation
+build-clang
+# LLVM Installation
+ensure-llvm
+# BOOST Installation
+ensure-boost
+
+if $INSTALL_MONGO; then
+
+	echo "${COLOR_CYAN}[Ensuring MongoDB installation]${COLOR_NC}"
+	if [[ ! -d $MONGODB_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -OL https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
+		&& tar -xzf mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
+		&& mv $SRC_DIR/mongodb-linux-x86_64-amazon-$MONGODB_VERSION $MONGODB_ROOT \
+		&& touch $MONGODB_LOG_DIR/mongod.log \
+		&& rm -f mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
+		&& cp -f $REPO_ROOT/scripts/mongod.conf $MONGODB_CONF \
+		&& mkdir -p $MONGODB_DATA_DIR \
+		&& rm -rf $MONGODB_LINK_DIR \
+		&& rm -rf $BIN_DIR/mongod \
+		&& ln -s $MONGODB_ROOT $MONGODB_LINK_DIR \
+		&& ln -s $MONGODB_LINK_DIR/bin/mongod $BIN_DIR/mongod"
+		echo " - MongoDB successfully installed @ ${MONGODB_ROOT}."
+	else
+		echo " - MongoDB found with correct version @ ${MONGODB_ROOT}."
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB C driver installation]${COLOR_NC}"
+	if [[ ! -d $MONGO_C_DRIVER_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/$MONGO_C_DRIVER_VERSION/mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
+		&& tar -xzf mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
+		&& cd mongo-c-driver-$MONGO_C_DRIVER_VERSION \
+		&& mkdir -p cmake-build \
+		&& cd cmake-build \
+		&& $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_DIR -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF $PINNED_TOOLCHAIN .. \
+		&& make -j${JOBS} \
+		&& make install \
+		&& cd ../.. \
+		&& rm mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz"
+		echo " - MongoDB C driver successfully installed @ ${MONGO_C_DRIVER_ROOT}."
+	else
+		echo " - MongoDB C driver found with correct version @ ${MONGO_C_DRIVER_ROOT}."
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB CXX driver installation]${COLOR_NC}"
+	if [[ ! -d $MONGO_CXX_DRIVER_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r$MONGO_CXX_DRIVER_VERSION.tar.gz -o mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
+		&& tar -xzf mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
+		&& cd mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION \
+		&& sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
+		&& sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
+		&& cd build \
+		&& $CMAKE -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_DIR -DCMAKE_PREFIX_PATH=$EOSIO_INSTALL_DIR $PINNED_TOOLCHAIN .. \
+		&& make -j${JOBS} VERBOSE=1 \
+		&& make install \
+		&& cd ../.. \
+		&& rm -f mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz"
+		echo " - MongoDB C++ driver successfully installed @ ${MONGO_CXX_DRIVER_ROOT}."
+	else
+		echo " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}."
+	fi
+fi
diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh
deleted file mode 100755
index d5fea6cccce..00000000000
--- a/scripts/eosio_build_centos.sh
+++ /dev/null
@@ -1,414 +0,0 @@
-if [ $1 == 1 ]; then ANSWER=1; else ANSWER=0; fi
-
-OS_VER=$( grep VERSION_ID /etc/os-release | cut -d'=' -f2 | sed 's/[^0-9\.]//gI' \
-| cut -d'.' -f1 )
-
-MEM_MEG=$( free -m | sed -n 2p | tr -s ' ' | cut -d\  -f2 )
-CPU_SPEED=$( lscpu | grep "MHz" | tr -s ' ' | cut -d\  -f3 | cut -d'.' -f1 )
-CPU_CORE=$( nproc )
-MEM_GIG=$(( ((MEM_MEG / 1000) / 2) ))
-export JOBS=$(( MEM_GIG > CPU_CORE ? CPU_CORE : MEM_GIG ))
-
-DISK_INSTALL=$( df -h . | tail -1 | tr -s ' ' | cut -d\  -f1 )
-DISK_TOTAL_KB=$( df . | tail -1 | awk '{print $2}' )
-DISK_AVAIL_KB=$( df . | tail -1 | awk '{print $4}' )
-DISK_TOTAL=$(( DISK_TOTAL_KB / 1048576 ))
-DISK_AVAIL=$(( DISK_AVAIL_KB / 1048576 ))
-
-printf "\\nOS name: ${OS_NAME}\\n"
-printf "OS Version: ${OS_VER}\\n"
-printf "CPU speed: ${CPU_SPEED}Mhz\\n"
-printf "CPU cores: ${CPU_CORE}\\n"
-printf "Physical Memory: ${MEM_MEG}Mgb\\n"
-printf "Disk install: ${DISK_INSTALL}\\n"
-printf "Disk space total: ${DISK_TOTAL%.*}G\\n"
-printf "Disk space available: ${DISK_AVAIL%.*}G\\n"
-printf "Concurrent Jobs (make -j): ${JOBS}\\n"
-
-if [ "$BUILD_CLANG8" = "true" ]; then
-   PINNED_TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE=$BUILD_DIR/pinned_toolchain.cmake
-fi
-
-if [ "${MEM_MEG}" -lt 7000 ]; then
-	printf "\\nYour system must have 7 or more Gigabytes of physical memory installed.\\n"
-	printf "Exiting now.\\n\\n"
-	exit 1;
-fi
-
-if ! (. /etc/os-release; [ "$VERSION_ID" = "7" ]); then
-	printf "\\nCentos 7 is the only version of Centos supported by EOSIO build scripts.\\n"
-	printf "Exiting now.\\n\\n"
-	exit 1;
-fi
-
-if [ "${DISK_AVAIL%.*}" -lt "${DISK_MIN}" ]; then
-	printf "\\nYou must have at least %sGB of available storage to install EOSIO.\\n" "${DISK_MIN}"
-	printf "Exiting now.\\n\\n"
-	exit 1;
-fi
-
-printf "\\n"
-
-printf "Checking Yum installation...\\n"
-if ! YUM=$( command -v yum 2>/dev/null ); then
-		printf "!! Yum must be installed to compile EOS.IO !!\\n"
-		printf "Exiting now.\\n"
-		exit 1;
-fi
-printf " - Yum installation found at %s.\\n" "${YUM}"
-
-if [ $ANSWER != 1 ]; then read -p "Do you wish to update YUM repositories? (y/n) " ANSWER; fi
-case $ANSWER in
-	1 | [Yy]* )
-		if ! "${YUM}" -y update; then
-			printf " - YUM update failed.\\n"
-			exit 1;
-		else
-			printf " - YUM update complete.\\n"
-		fi
-	;;
-	[Nn]* ) echo " - Proceeding without update!";;
-	* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-esac
-
-printf "Checking installation of Centos Software Collections Repository...\\n"
-SCL=$( rpm -qa | grep -E 'centos-release-scl-[0-9].*' )
-if [ -z "${SCL}" ]; then
-	if [ $ANSWER != 1 ]; then read -p "Do you wish to install and enable this repository? (y/n)? " ANSWER; fi
-	case $ANSWER in
-		1 | [Yy]* )
-			printf "Installing SCL...\\n"
-			if ! "${YUM}" -y --enablerepo=extras install centos-release-scl 2>/dev/null; then
-				printf "!! Centos Software Collections Repository installation failed !!\\n"
-				printf "Exiting now.\\n\\n"
-				exit 1;
-			else
-				printf "Centos Software Collections Repository installed successfully.\\n"
-			fi
-		;;
-		[Nn]* ) echo "User aborting installation of required Centos Software Collections Repository, Exiting now."; exit;;
-	* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-	esac
-else
-	printf " - ${SCL} found.\\n"
-fi
-
-printf "Checking installation of devtoolset-7...\\n"
-DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-7-[0-9].*' )
-if [ -z "${DEVTOOLSET}" ]; then
-	if [ $ANSWER != 1 ]; then read -p "Do you wish to install devtoolset-7? (y/n)? " ANSWER; fi
-	case $ANSWER in
-		1 | [Yy]* )
-			printf "Installing devtoolset-7...\\n"
-			if ! "${YUM}" install -y devtoolset-7; then
-					printf "!! Centos devtoolset-7 installation failed !!\\n"
-					printf "Exiting now.\\n"
-					exit 1;
-			else
-					printf " - Centos devtoolset installed successfully!\\n"
-			fi
-		;;
-		[Nn]* ) echo "User aborting installation of devtoolset-7. Exiting now."; exit;;
-		* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-	esac
-else
-	printf " - ${DEVTOOLSET} found.\\n"
-fi
-if [ -d /opt/rh/devtoolset-7 ]; then
-	printf "Enabling Centos devtoolset-7 so we can use GCC 7...\\n"
-	source /opt/rh/devtoolset-7/enable || exit 1
-	printf " - Centos devtoolset-7 successfully enabled!\\n"
-fi
-
-printf "\\n"
-
-DEP_ARRAY=(
-	git autoconf automake libtool make bzip2 doxygen graphviz \
-	bzip2-devel openssl-devel gmp-devel \
-	ocaml libicu-devel python python-devel rh-python36 \
-	gettext-devel file sudo libusbx-devel libcurl-devel
- )
-COUNT=1
-DISPLAY=""
-DEP=""
-printf "Checking RPM for installed dependencies...\\n"
-for (( i=0; i<${#DEP_ARRAY[@]}; i++ )); do
-	pkg=$( rpm -qi "${DEP_ARRAY[$i]}" 2>/dev/null | grep Name )
-	if [[ -z $pkg ]]; then
-		DEP=$DEP" ${DEP_ARRAY[$i]} "
-		DISPLAY="${DISPLAY}${COUNT}. ${DEP_ARRAY[$i]}\\n"
-		printf " - Package %s ${bldred} NOT ${txtrst} found!\\n" "${DEP_ARRAY[$i]}"
-		(( COUNT++ ))
-	else
-		printf " - Package %s found.\\n" "${DEP_ARRAY[$i]}"
-		continue
-	fi
-done
-if [ "${COUNT}" -gt 1 ]; then
-	printf "\\nThe following dependencies are required to install EOSIO:\\n"
-	printf "${DISPLAY}\\n\\n"
-	if [ $ANSWER != 1 ]; then read -p "Do you wish to install these dependencies? (y/n) " ANSWER; fi
-	case $ANSWER in
-		1 | [Yy]* )
-			if ! "${YUM}" -y install ${DEP}; then
-				printf " - YUM dependency installation failed!\\n"
-				exit 1;
-			else
-				printf " - YUM dependencies installed successfully.\\n"
-			fi
-		;;
-		[Nn]* ) echo "User aborting installation of required dependencies, Exiting now."; exit;;
-		* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-	esac
-else
-	printf " - No required YUM dependencies to install.\\n\\n"
-fi
-
-export PYTHON3PATH="/opt/rh/rh-python36"
-if [ -d $PYTHON3PATH ]; then
-	printf "Enabling python36...\\n"
-	source $PYTHON3PATH/enable || exit 1
-	printf " - Python36 successfully enabled!\\n"
-fi
-
-printf "\\n"
-
-### clean up force build before starting
-if [ $FORCE_BUILD ];then
-   rm -rf  \
-   ${SRC_LOCATION}/cmake-$CMAKE_VERSION \
-   ${SRC_LOCATION}/llvm ${OPT_LOCATION}/llvm4 \
-   ${TMP_LOCATION}/clang8 ${OPT_LOCATION}/clang8 \
-   ${SRC_LOCATION}/zlib ${OPT_LOCATION}/zlib \
-   ${SRC_LOCATION}/boost ${BOOST_ROOT} \
-   ${SRC_LOCATION}/mongodb-linux-x86_64-amazon-$MONGODB_VERSION \
-   ${SRC_LOCATION}/mongo-c-driver-$MONGO_C_DRIVER_VERSION \
-   ${SRC_LOCATION}/mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION
-fi
-
-printf "Checking CMAKE installation...\\n"
-if [ ! -e $CMAKE ] || [ $FORCE_BUILD ]; then
-	printf "Installing CMAKE...\\n"
-	curl -LO https://cmake.org/files/v$CMAKE_VERSION_MAJOR.$CMAKE_VERSION_MINOR/cmake-$CMAKE_VERSION.tar.gz \
-	&& tar -xzf cmake-$CMAKE_VERSION.tar.gz \
-	&& cd cmake-$CMAKE_VERSION \
-	&& ./bootstrap --prefix=$PREFIX \
-	&& make -j"${JOBS}" \
-	&& make install \
-	&& cd .. \
-	&& rm -f cmake-$CMAKE_VERSION.tar.gz \
-	|| exit 1
-	printf " - CMAKE successfully installed @ ${CMAKE} \\n"
-else
-	printf " - CMAKE found @ ${CMAKE}.\\n"
-fi
-if [ $? -ne 0 ]; then exit -1; fi
-
-
-printf "\\n"
-
-
-export CPATH="${CPATH}:${PYTHON3PATH}/root/usr/include/python3.6m" # m on the end causes problems with boost finding python3
-if [ "$BUILD_CLANG8" = "true" ]; then
-   printf "Checking Clang 8 support...\\n"
-   if [ ! -d $CLANG8_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing Clang 8...\\n"
-      cd ${TMP_LOCATION} \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/llvm.git clang8 && cd clang8 \
-      && git checkout $PINNED_COMPILER_LLVM_COMMIT \
-      && cd tools \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/lld.git \
-      && cd lld && git checkout $PINNED_COMPILER_LLD_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/polly.git \
-      && cd polly && git checkout $PINNED_COMPILER_POLLY_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang.git clang && cd clang/tools \
-      && git checkout $PINNED_COMPILER_CLANG_VERSION \
-      && mkdir extra && cd extra \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang-tools-extra.git \
-      && cd clang-tools-extra && git checkout $PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT && cd .. \
-      && cd ../../../../projects \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxx.git \
-      && cd libcxx && git checkout $PINNED_COMPILER_LIBCXX_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxxabi.git \
-      && cd libcxxabi && git checkout $PINNED_COMPILER_LIBCXXABI_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libunwind.git \
-      && cd libunwind && git checkout $PINNED_COMPILER_LIBUNWIND_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/compiler-rt.git \
-      && cd compiler-rt && git checkout $PINNED_COMPILER_COMPILER_RT_COMMIT && cd ../ \
-      && cd ${TMP_LOCATION}/clang8 \
-      && mkdir build && cd build \
-      && $CMAKE -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${CLANG8_ROOT}" -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && rm -rf ${TMP_LOCATION}/clang8 \
-      && cd ../.. \
-      || exit 1
-
-      printf " - Clang 8 successfully installed @ ${CLANG8_ROOT}\\n"
-   else
-      printf " - Clang 8 found @ ${CLANG8_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-
-   printf "Checking LLVM 4 installation...\\n"
-   if [ ! -d $OPT_LOCATION/llvm4 ] || [ $FORCE_BUILD ]; then
-      printf "Installing LLVM 4...\\n"
-      cd $SRC_LOCATION \
-      && git clone https://github.com/llvm-mirror/llvm --single-branch --branch $LLVM_VERSION && cd llvm \
-      && mkdir -p build && cd build \
-      && $CMAKE -DCMAKE_INSTALL_PREFIX=$OPT_LOCATION/llvm4 -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$BUILD_DIR/pinned_toolchain.cmake .. \
-      && make -j"${JOBS}" install \
-      || exit -1
-      printf "Installed LLVM 4 @ ${OPT_LOCATION}/llvm4"
-   fi
-
-   cd $SRC_LOCATION
-   printf "Checking zlib library installation...\\n"
-   if [ ! -d $OPT_LOCATION/zlib ] || [ $FORCE_BUILD ]; then
-      printf "Installing zlib...\\n"
-      curl -LO https://www.zlib.net/zlib-1.2.11.tar.gz && tar -xf zlib-1.2.11.tar.gz \
-      && cd zlib-1.2.11 && mkdir build && cd build \
-      && ../configure --prefix=$OPT_LOCATION/zlib \
-      && make -j"${JOBS}" install \
-      || exit -1
-   fi
-   cd $SRC_LOCATION
-   export PATH=$OPT_LOCATION/clang8/bin:$PATH
-   printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
-   BOOSTVERSION=$( grep "#define BOOST_VERSION" "$BOOST_ROOT/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\  -f3 )
-   if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ] || [ $FORCE_BUILD ]; then
-      printf "Installing Boost library...\\n"
-      curl -LO https://dl.bintray.com/boostorg/release/${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_PATCH}/source/boost_$BOOST_VERSION.tar.bz2 \
-      && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
-      && cd $BOOST_ROOT \
-      && ./bootstrap.sh --prefix=$BOOST_ROOT \
-      && ./b2 toolset=clang cxxflags="-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I${CLANG8_ROOT}/include/c++/v1" linkflags="-stdlib=libc++" link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j"${JOBS}" -sZLIB_LIBRARY_PATH="${OPT_LOCATION}/zlib/lib" -sZLIB_INCLUDE="${OPT_LOCATION}/zlib/include" -sZLIB_SOURCE="${SRC_LOCATION}/zlib-1.2.11" install \
-      && cd .. \
-      && rm -f boost_$BOOST_VERSION.tar.bz2 \
-      && rm -rf $BOOST_LINK_LOCATION \
-      && ln -s $BOOST_ROOT $BOOST_LINK_LOCATION \
-      || exit 1
-      printf " - Boost library successfully installed @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   else
-      printf " - Boost library found with correct version @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   
-   printf "\\n"
-else
-   printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
-   BOOSTVERSION=$( grep "#define BOOST_VERSION" "$BOOST_ROOT/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\  -f3 )
-   if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ] || [ $FORCE_BUILD ]; then
-      printf "Installing Boost library...\\n"
-      curl -LO https://dl.bintray.com/boostorg/release/${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_PATCH}/source/boost_$BOOST_VERSION.tar.bz2 \
-      && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
-      && cd $BOOST_ROOT \
-      && ./bootstrap.sh --prefix=$BOOST_ROOT \
-      && ./b2 -q -j"${JOBS}" install \
-      && cd .. \
-      && rm -f boost_$BOOST_VERSION.tar.bz2 \
-      && rm -rf $BOOST_LINK_LOCATION \
-      && ln -s $BOOST_ROOT $BOOST_LINK_LOCATION \
-      || exit 1
-      printf " - Boost library successfully installed @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   else
-      printf " - Boost library found with correct version @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-
-   printf "\\n"
-
-   printf "Checking LLVM 4 support...\\n"
-   if [ ! -d $LLVM_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing LLVM 4...\\n"
-      cd ../opt \
-      && git clone --depth 1 --single-branch --branch $LLVM_VERSION https://github.com/llvm-mirror/llvm.git llvm && cd llvm \
-      && mkdir build \
-      && cd build \
-      && $CMAKE -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${LLVM_ROOT}" -DLLVM_TARGETS_TO_BUILD="host" -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE="Release" .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && cd ../.. \
-      || exit 1
-      printf " - LLVM successfully installed @ ${LLVM_ROOT}\\n"
-   else
-      printf " - LLVM found @ ${LLVM_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   cd ..
-   printf "\\n"
-fi
-
-if [ $BUILD_MONGO ]; then
-   printf "Checking MongoDB installation...\\n"
-   if [ ! -d $MONGODB_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB into ${MONGODB_ROOT}...\\n"
-      curl -OL https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
-      && tar -xzf mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
-      && mv $SRC_LOCATION/mongodb-linux-x86_64-amazon-$MONGODB_VERSION $MONGODB_ROOT \
-      && touch $MONGODB_LOG_LOCATION/mongod.log \
-      && rm -f mongodb-linux-x86_64-amazon-$MONGODB_VERSION.tgz \
-      && cp -f $REPO_ROOT/scripts/mongod.conf $MONGODB_CONF \
-      && mkdir -p $MONGODB_DATA_LOCATION \
-      && rm -rf $MONGODB_LINK_LOCATION \
-      && rm -rf $BIN_LOCATION/mongod \
-      && ln -s $MONGODB_ROOT $MONGODB_LINK_LOCATION \
-      && ln -s $MONGODB_LINK_LOCATION/bin/mongod $BIN_LOCATION/mongod \
-      || exit 1
-      printf " - MongoDB successfully installed @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_LOCATION}).\\n"
-   else
-      printf " - MongoDB found with correct version @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   printf "Checking MongoDB C driver installation...\\n"
-   if [ ! -d $MONGO_C_DRIVER_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB C driver...\\n"
-      curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/$MONGO_C_DRIVER_VERSION/mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      && tar -xzf mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      && cd mongo-c-driver-$MONGO_C_DRIVER_VERSION \
-      && mkdir -p cmake-build \
-      && cd cmake-build \
-      && $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF $PINNED_TOOLCHAIN .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && cd ../.. \
-      && rm mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      || exit 1
-      printf " - MongoDB C driver successfully installed @ ${MONGO_C_DRIVER_ROOT}.\\n"
-   else
-      printf " - MongoDB C driver found with correct version @ ${MONGO_C_DRIVER_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   printf "Checking MongoDB C++ driver installation...\\n"
-   if [ ! -d $MONGO_CXX_DRIVER_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB C++ driver...\\n"
-      curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r$MONGO_CXX_DRIVER_VERSION.tar.gz -o mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
-      && tar -xzf mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
-      && cd mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION \
-      && sed -i 's/"maxAwaitTimeMS", count/"maxAwaitTimeMS", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
-      && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
-      && cd build \
-      && $CMAKE -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX $PINNED_TOOLCHAIN .. \
-      && make -j"${JOBS}" VERBOSE=1 \
-      && make install \
-      && cd ../.. \
-      && rm -f mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
-      || exit 1
-      printf " - MongoDB C++ driver successfully installed @ ${MONGO_CXX_DRIVER_ROOT}.\\n"
-   else
-      printf " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-fi
-
-function print_instructions() {
-	printf "source ${PYTHON3PATH}/enable\\n"
-	printf "source /opt/rh/devtoolset-7/enable\\n"
-	return 0
-}
diff --git a/scripts/eosio_build_centos7_deps b/scripts/eosio_build_centos7_deps
new file mode 100644
index 00000000000..7f32fada681
--- /dev/null
+++ b/scripts/eosio_build_centos7_deps
@@ -0,0 +1,20 @@
+git,rpm -qa
+autoconf,rpm -qa
+automake,rpm -qa
+libtool,rpm -qa
+make,rpm -qa
+bzip2,rpm -qa
+doxygen,rpm -qa
+graphviz,rpm -qa
+bzip2-devel,rpm -qa
+openssl-devel,rpm -qa
+gmp-devel,rpm -qa
+ocaml,rpm -qa
+libicu-devel,rpm -qa
+python,rpm -qa
+python-devel,rpm -qa
+rh-python36,rpm -qa
+gettext-devel,rpm -qa
+file,rpm -qa
+libusbx-devel,rpm -qa
+libcurl-devel,rpm -qa
\ No newline at end of file
diff --git a/scripts/eosio_build_darwin.bash b/scripts/eosio_build_darwin.bash
new file mode 100755
index 00000000000..d06afd8bb42
--- /dev/null
+++ b/scripts/eosio_build_darwin.bash
@@ -0,0 +1,95 @@
+echo "OS name: ${NAME}"
+echo "OS Version: ${OS_VER}"
+echo "CPU cores: ${CPU_CORES}"
+echo "Physical Memory: ${MEM_GIG}G"
+echo "Disk install: ${DISK_INSTALL}"
+echo "Disk space total: ${DISK_TOTAL}G"
+echo "Disk space available: ${DISK_AVAIL}G"
+
+[[ "${OS_MIN}" -lt 12 ]] && echo "You must be running Mac OS 10.12.x or higher to install EOSIO." && exit 1
+
+[[ $MEM_GIG -lt 7 ]] && echo "Your system must have 7 or more Gigabytes of physical memory installed." && exit 1
+[[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
+
+echo ""
+
+echo "${COLOR_CYAN}[Ensuring xcode-select installation]${COLOR_NC}"
+if ! XCODESELECT=$( command -v xcode-select ); then echo " - xcode-select must be installed in order to proceed!" && exit 1;
+else echo " - xcode-select installation found @ ${XCODESELECT}"; fi
+
+echo "${COLOR_CYAN}[Ensuring Ruby installation]${COLOR_NC}"
+if ! RUBY=$( command -v ruby ); then echo " - Ruby must be installed in order to proceed!" && exit 1;
+else echo " - Ruby installation found @ ${RUBY}"; fi
+
+ensure-homebrew
+
+if [ ! -d /usr/local/Frameworks ]; then
+	echo "${COLOR_YELLOW}/usr/local/Frameworks is necessary to brew install python@3. Run the following commands as sudo and try again:${COLOR_NC}"
+	echo "sudo mkdir /usr/local/Frameworks && sudo chown $(whoami):admin /usr/local/Frameworks"
+	exit 1;
+fi
+
+# Handle clang/compiler
+ensure-compiler
+# Ensure packages exist
+ensure-brew-packages "${REPO_ROOT}/scripts/eosio_build_darwin_deps"
+[[ -z "${CMAKE}" ]] && export CMAKE="/usr/local/bin/cmake"
+# CLANG Installation
+build-clang
+# LLVM Installation
+ensure-llvm
+# BOOST Installation
+ensure-boost
+# MONGO Installation
+if $INSTALL_MONGO; then
+	echo "${COLOR_CYAN}[Ensuring MongoDB installation]${COLOR_NC}"
+	if [[ ! -d $MONGODB_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-$MONGODB_VERSION.tgz \
+		&& tar -xzf mongodb-osx-ssl-x86_64-$MONGODB_VERSION.tgz \
+		&& mv $SRC_DIR/mongodb-osx-x86_64-$MONGODB_VERSION $MONGODB_ROOT \
+		&& touch $MONGODB_LOG_DIR/mongod.log \
+		&& rm -f mongodb-osx-ssl-x86_64-$MONGODB_VERSION.tgz \
+		&& cp -f $REPO_ROOT/scripts/mongod.conf $MONGODB_CONF \
+		&& mkdir -p $MONGODB_DATA_DIR \
+		&& rm -rf $MONGODB_LINK_DIR \
+		&& rm -rf $BIN_DIR/mongod \
+		&& ln -s $MONGODB_ROOT $MONGODB_LINK_DIR \
+		&& ln -s $MONGODB_LINK_DIR/bin/mongod $BIN_DIR/mongod"
+		echo " - MongoDB successfully installed @ ${MONGODB_ROOT}"
+	else
+		echo " - MongoDB found with correct version @ ${MONGODB_ROOT}."
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB C driver installation]${COLOR_NC}"
+	if [[ ! -d $MONGO_C_DRIVER_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/$MONGO_C_DRIVER_VERSION/mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
+		&& tar -xzf mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
+		&& cd mongo-c-driver-$MONGO_C_DRIVER_VERSION \
+		&& mkdir -p cmake-build \
+		&& cd cmake-build \
+		&& $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_DIR -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF .. \
+		&& make -j${JOBS} \
+		&& make install \
+		&& cd ../.. \
+		&& rm mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz"
+		echo " - MongoDB C driver successfully installed @ ${MONGO_C_DRIVER_ROOT}."
+	else
+		echo " - MongoDB C driver found with correct version @ ${MONGO_C_DRIVER_ROOT}."
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB C++ driver installation]${COLOR_NC}"
+	if [[ "$(grep "Version:" $EOSIO_INSTALL_DIR/lib/pkgconfig/libmongocxx-static.pc 2>/dev/null | tr -s ' ' | awk '{print $2}' || true)" != $MONGO_CXX_DRIVER_VERSION ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r${MONGO_CXX_DRIVER_VERSION}.tar.gz -o mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
+		&& tar -xzf mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
+		&& cd mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}/build \
+		&& $CMAKE -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_DIR -DCMAKE_PREFIX_PATH=$EOSIO_INSTALL_DIR .. \
+		&& make -j${JOBS} VERBOSE=1 \
+		&& make install \
+		&& cd ../.. \
+		&& rm -f mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz"
+		echo " - MongoDB C++ driver successfully installed @ ${MONGO_CXX_DRIVER_ROOT}."
+	else
+		echo " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}."
+	fi
+fi
\ No newline at end of file
diff --git a/scripts/eosio_build_darwin.sh b/scripts/eosio_build_darwin.sh
deleted file mode 100755
index 8fb9b895766..00000000000
--- a/scripts/eosio_build_darwin.sh
+++ /dev/null
@@ -1,324 +0,0 @@
-if [ $1 == 1 ]; then ANSWER=1; else ANSWER=0; fi
-
-OS_VER=$(sw_vers -productVersion)
-OS_MAJ=$(echo "${OS_VER}" | cut -d'.' -f1)
-OS_MIN=$(echo "${OS_VER}" | cut -d'.' -f2)
-OS_PATCH=$(echo "${OS_VER}" | cut -d'.' -f3)
-MEM_GIG=$(bc <<< "($(sysctl -in hw.memsize) / 1024000000)")
-CPU_SPEED=$(bc <<< "scale=2; ($(sysctl -in hw.cpufrequency) / 10^8) / 10")
-CPU_CORE=$( sysctl -in machdep.cpu.core_count )
-export JOBS=$(( MEM_GIG > CPU_CORE ? CPU_CORE : MEM_GIG ))
-
-DISK_INSTALL=$(df -h . | tail -1 | tr -s ' ' | cut -d\  -f1 || cut -d' ' -f1)
-blksize=$(df . | head -1 | awk '{print $2}' | cut -d- -f1)
-gbfactor=$(( 1073741824 / blksize ))
-total_blks=$(df . | tail -1 | awk '{print $2}')
-avail_blks=$(df . | tail -1 | awk '{print $4}')
-DISK_TOTAL=$((total_blks / gbfactor ))
-DISK_AVAIL=$((avail_blks / gbfactor ))
-
-export HOMEBREW_NO_AUTO_UPDATE=1
-
-COUNT=1
-DISPLAY=""
-DEPS=""
-
-printf "\\nOS name: ${OS_NAME}\\n"
-printf "OS Version: ${OS_VER}\\n"
-printf "CPU speed: ${CPU_SPEED}Mhz\\n"
-printf "CPU cores: %s\\n" "${CPU_CORE}"
-printf "Physical Memory: ${MEM_GIG} Gbytes\\n"
-printf "Disk install: ${DISK_INSTALL}\\n"
-printf "Disk space total: ${DISK_TOTAL}G\\n"
-printf "Disk space available: ${DISK_AVAIL}G\\n"
-
-if [ "${MEM_GIG}" -lt 7 ]; then
-	echo "Your system must have 7 or more Gigabytes of physical memory installed."
-	echo "Exiting now."
-	exit 1
-fi
-
-if [ "${OS_MIN}" -lt 12 ]; then
-	echo "You must be running Mac OS 10.12.x or higher to install EOSIO."
-	echo "Exiting now."
-	exit 1
-fi
-
-if [ "${DISK_AVAIL}" -lt "$DISK_MIN" ]; then
-	echo "You must have at least ${DISK_MIN}GB of available storage to install EOSIO."
-	echo "Exiting now."
-	exit 1
-fi
-
-printf "\\n"
-
-printf "Checking xcode-select installation...\\n"
-if ! XCODESELECT=$( command -v xcode-select)
-then
-	printf " - XCode must be installed in order to proceed!\\n\\n"
-	exit 1
-fi
-printf " - XCode installation found @ ${XCODESELECT}\\n"
-
-printf "Checking Ruby installation...\\n"
-if ! RUBY=$( command -v ruby)
-then
-	printf " - Ruby must be installed in order to proceed!\\n"
-	exit 1
-fi
-printf " - Ruby installation found @ ${RUBY}\\n"
-
-printf "Checking Home Brew installation...\\n"
-if ! BREW=$( command -v brew )
-then
-	printf "Homebrew must be installed to compile EOS.IO!\\n"
-	if [ $ANSWER != 1 ]; then read -p "Do you wish to install HomeBrew? (y/n)? " ANSWER; fi
-	case $ANSWER in
-		1 | [Yy]* )
-			"${XCODESELECT}" --install 2>/dev/null;
-			if ! "${RUBY}" -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; then
-				echo " - Unable to install homebrew at this time."
-				exit 1;
-			else
-				BREW=$( command -v brew )
-			fi
-		;;
-		[Nn]* ) echo "User aborted homebrew installation. Exiting now."; exit 1;;
-		* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-	esac
-
-fi
-printf " - Home Brew installation found @ ${BREW}\\n"
-
-printf "\\nChecking dependencies...\\n"
-var_ifs="${IFS}"
-IFS=","
-while read -r name tester testee brewname uri; do
-	if [ $tester $testee ]; then
-		printf " - ${name} found!\\n"
-		continue
-	fi
-	# resolve conflict with homebrew glibtool and apple/gnu installs of libtool
-	if [ "${testee}" == "/usr/local/bin/glibtool" ]; then
-		if [ "${tester}" "/usr/local/bin/libtool" ]; then
-			printf " - ${name} found!\\n"
-			continue
-		fi
-	fi
-	DEPS=$DEPS"${brewname},"
-	DISPLAY="${DISPLAY}${COUNT}. ${name}\\n"
-	printf " - ${name} ${bldred}NOT${txtrst} found.\\n"
-	(( COUNT++ ))
-done < "${REPO_ROOT}/scripts/eosio_build_darwin_deps"
-IFS="${var_ifs}"
-
-if [ ! -d /usr/local/Frameworks ]; then
-	printf "\\n${bldred}/usr/local/Frameworks is necessary to brew install python@3. Run the following commands as sudo and try again:${txtrst}\\n"
-	printf "sudo mkdir /usr/local/Frameworks && sudo chown $(whoami):admin /usr/local/Frameworks\\n\\n"
-	exit 1;
-fi
-
-if [ $COUNT -gt 1 ]; then
-	printf "\\nThe following dependencies are required to install EOSIO:\\n"
-	printf "${DISPLAY}\\n\\n"
-	if [ $ANSWER != 1 ]; then read -p "Do you wish to install these packages? (y/n) " ANSWER; fi
-	case $ANSWER in
-		1 | [Yy]* )
-			"${XCODESELECT}" --install 2>/dev/null;
-			if [ $1 == 0 ]; then read -p "Do you wish to update homebrew packages first? (y/n) " ANSWER; fi
-			case $ANSWER in
-				1 | [Yy]* )
-					if ! brew update; then
-						printf " - Brew update failed.\\n"
-						exit 1;
-					else
-						printf " - Brew update complete.\\n"
-					fi
-				;;
-				[Nn]* ) echo "Proceeding without update!";;
-				* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-			esac
-			brew tap eosio/eosio
-			printf "\\nInstalling Dependencies...\\n"
-			OIFS="$IFS"
-			IFS=$','
-			for DEP in $DEPS; do
-				# Eval to support string/arguments with $DEP
-				if ! eval $BREW install $DEP; then
-					printf " - Homebrew exited with the above errors!\\n"
-					exit 1;
-				fi
-			done
-			IFS="$OIFS"
-		;;
-		[Nn]* ) echo "User aborting installation of required dependencies, Exiting now."; exit;;
-		* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-	esac
-else
-	printf " - No required Home Brew dependencies to install.\\n"
-fi
-
-
-printf "\\n"
-
-### clean up force build before starting
-if [ $FORCE_BUILD ];then
-   rm -rf  \
-   ${SRC_LOCATION}/llvm ${OPT_LOCATION}/llvm4 \
-   ${TMP_LOCATION}/clang8 ${OPT_LOCATION}/clang8 \
-   ${SRC_LOCATION}/zlib ${OPT_LOCATION}/zlib \
-   ${SRC_LOCATION}/boost \
-   ${SRC_LOCATION}/mongodb-linux-x86_64-amazon-$MONGODB_VERSION \
-   ${SRC_LOCATION}/mongo-c-driver-$MONGO_C_DRIVER_VERSION \
-   ${SRC_LOCATION}/mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION
-fi
-
-export CPATH="$(python-config --includes | awk '{print $1}' | cut -dI -f2):$CPATH" # Boost has trouble finding pyconfig.h
-printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
-BOOSTVERSION=$( grep "#define BOOST_VERSION" "$BOOST_ROOT/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\  -f3 )
-if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ] || [ $FORCE_BUILD ]; then
-	printf "Installing Boost library...\\n"
-	curl -LO https://dl.bintray.com/boostorg/release/$BOOST_VERSION_MAJOR.$BOOST_VERSION_MINOR.$BOOST_VERSION_PATCH/source/boost_$BOOST_VERSION.tar.bz2 \
-	&& tar -xjf boost_$BOOST_VERSION.tar.bz2 \
-	&& cd $BOOST_ROOT \
-	&& ./bootstrap.sh --prefix=$BOOST_ROOT \
-	&& ./b2 -q -j$(sysctl -in machdep.cpu.core_count) --with-iostreams --with-date_time --with-filesystem \
-	                                                  --with-system --with-program_options --with-chrono --with-test install \
-	&& cd .. \
-	&& rm -f boost_$BOOST_VERSION.tar.bz2 \
-	&& rm -rf $BOOST_LINK_LOCATION \
-	&& ln -s $BOOST_ROOT $BOOST_LINK_LOCATION \
-	|| exit 1
-	printf " - Boost library successfully installed @ ${BOOST_ROOT}.\\n"
-else
-	printf " - Boost library found with correct version @ ${BOOST_ROOT}.\\n"
-fi
-if [ $? -ne 0 ]; then exit -1; fi
-
-
-printf "\\n"
-
-if [ $BUILD_MONGO ]; then
-   printf "Checking MongoDB installation...\\n"
-   if [ ! -d $MONGODB_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB into ${MONGODB_ROOT}...\\n"
-      curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-$MONGODB_VERSION.tgz \
-      && tar -xzf mongodb-osx-ssl-x86_64-$MONGODB_VERSION.tgz \
-      && mv $SRC_LOCATION/mongodb-osx-x86_64-$MONGODB_VERSION $MONGODB_ROOT \
-      && touch $MONGODB_LOG_LOCATION/mongod.log \
-      && rm -f mongodb-osx-ssl-x86_64-$MONGODB_VERSION.tgz \
-      && cp -f $REPO_ROOT/scripts/mongod.conf $MONGODB_CONF \
-      && mkdir -p $MONGODB_DATA_LOCATION \
-      && rm -rf $MONGODB_LINK_LOCATION \
-      && rm -rf $BIN_LOCATION/mongod \
-      && ln -s $MONGODB_ROOT $MONGODB_LINK_LOCATION \
-      && ln -s $MONGODB_LINK_LOCATION/bin/mongod $BIN_LOCATION/mongod \
-      || exit 1
-      printf " - MongoDB successfully installed @ ${MONGODB_ROOT}\\n"
-   else
-      printf " - MongoDB found with correct version @ ${MONGODB_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   printf "Checking MongoDB C driver installation...\\n"
-   if [ ! -d $MONGO_C_DRIVER_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB C driver...\\n"
-      curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/$MONGO_C_DRIVER_VERSION/mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      && tar -xzf mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      && cd mongo-c-driver-$MONGO_C_DRIVER_VERSION \
-      && mkdir -p cmake-build \
-      && cd cmake-build \
-      && $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && cd ../.. \
-      && rm mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      || exit 1
-      printf " - MongoDB C driver successfully installed @ ${MONGO_C_DRIVER_ROOT}.\\n"
-   else
-      printf " - MongoDB C driver found with correct version @ ${MONGO_C_DRIVER_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   printf "Checking MongoDB C++ driver installation...\\n"
-   if [ "$(grep "Version:" $PREFIX/lib/pkgconfig/libmongocxx-static.pc 2>/dev/null | tr -s ' ' | awk '{print $2}')" != $MONGO_CXX_DRIVER_VERSION ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB C++ driver...\\n"
-      curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r$MONGO_CXX_DRIVER_VERSION.tar.gz -o mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
-      && tar -xzf mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
-      && cd mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION \
-      && sed -i '' 's/"maxAwaitTimeMS", count/"maxAwaitTimeMS", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
-      && sed -i '' 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
-      && cd build \
-      && $CMAKE -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX .. \
-      && make -j"${JOBS}" VERBOSE=1 \
-      && make install \
-      && cd ../.. \
-      && rm -f mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
-      || exit 1
-      printf " - MongoDB C++ driver successfully installed @ ${MONGO_CXX_DRIVER_ROOT}.\\n"
-   else
-      printf " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-fi
-
-
-# We install llvm into /usr/local/opt using brew install llvm@4
-printf "Checking LLVM 4 support...\\n"
-if [ ! -d $LLVM_ROOT ]; then
-	ln -s /usr/local/opt/llvm@4 $LLVM_ROOT \
-	|| exit 1
-	printf " - LLVM successfully linked from /usr/local/opt/llvm@4 to ${LLVM_ROOT}\\n"
-else
-	printf " - LLVM found @ ${LLVM_ROOT}.\\n"
-fi
-
-
-cd ..
-printf "\\n"
-
-if [ "$BUILD_CLANG8" = "true" ]; then
-   printf "Checking Clang 8 support...\\n"
-   if [ ! -d $CLANG8_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing Clang 8...\\n"
-      cd ${TMP_LOCATION} \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/llvm.git clang8 \
-      && cd clang8 && git checkout $PINNED_COMPILER_LLVM_COMMIT \
-      && cd tools \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/lld.git \
-      && cd lld && git checkout $PINNED_COMPILER_LLD_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/polly.git \
-      && cd polly && git checkout $PINNED_COMPILER_POLLY_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang.git clang && cd clang/tools \
-      && git checkout $PINNED_COMPILER_CLANG_VERSION \
-      && mkdir extra && cd extra \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang-tools-extra.git \
-      && cd clang-tools-extra && git checkout $PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT && cd .. \
-      && cd ../../../../projects \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxx.git \
-      && cd libcxx && git checkout $PINNED_COMPILER_LIBCXX_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxxabi.git \
-      && cd libcxxabi && git checkout $PINNED_COMPILER_LIBCXXABI_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libunwind.git \
-      && cd libunwind && git checkout $PINNED_COMPILER_LIBUNWIND_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/compiler-rt.git \
-      && cd compiler-rt && git checkout $PINNED_COMPILER_COMPILER_RT_COMMIT && cd ../ \
-      && cd ${TMP_LOCATION}/clang8 \
-      && mkdir build && cd build \
-      && $CMAKE -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${CLANG8_ROOT}" -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=all -DCMAKE_BUILD_TYPE=Release .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && cd ../.. \
-      || exit 1
-      printf " - Clang 8 successfully installed @ ${CLANG8_ROOT}\\n"
-   else
-      printf " - Clang 8 found @ ${CLANG8_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-fi
-
-function print_instructions() {
-	return 0
-}
diff --git a/scripts/eosio_build_darwin_deps b/scripts/eosio_build_darwin_deps
index 617e188f99c..b2cf9a8c6f5 100755
--- a/scripts/eosio_build_darwin_deps
+++ b/scripts/eosio_build_darwin_deps
@@ -1,13 +1,13 @@
-cmake,-f,/usr/local/bin/cmake,cmake,https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4.tar.gz
-automake,-x,/usr/local/bin/automake,automake,http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz
-Libtool,-x,/usr/local/bin/glibtool,libtool,http://gnu.askapache.com/libtool/libtool-2.4.6.tar.gz
-OpenSSL,-f,/usr/local/opt/openssl/lib/libssl.a,openssl,https://www.openssl.org/source/openssl-1.0.2n.tar.gz
-wget,-x,/usr/local/bin/wget,wget,https://ftp.gnu.org/gnu/wget/wget-1.19.2.tar.gz
-GMP,-f,/usr/local/opt/gmp/include/gmpxx.h,gmp,https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.bz2
-llvm,-d,/usr/local/opt/llvm@4,llvm@4,http://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
-python,-d,/usr/local/opt/python3,python,https://www.python.org/ftp/python/3.7.2/Python-3.7.2.tgz
-python@2,-d,/usr/local/opt/python2,python@2,https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz
-doxygen,-f,/usr/local/bin/doxygen,doxygen,http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.14.src.tar.gz
-graphviz,-d,/usr/local/opt/graphviz,graphviz,https://fossies.org/linux/misc/graphviz-2.40.1.tar.gz
-libusb,-f,/usr/local/lib/libusb-1.0.0.dylib,libusb,https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2
-pkgconfig,-x,/usr/local/bin/pkg-config,pkgconfig,https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz
+cmake,/usr/local/bin/cmake
+graphviz,/usr/local/opt/graphviz
+libtool,/usr/local/bin/glibtool
+automake,/usr/local/bin/automake
+wget,/usr/local/bin/wget
+gmp,/usr/local/opt/gmp/include/gmpxx.h
+llvm@4,/usr/local/opt/llvm@4
+pkgconfig,/usr/local/bin/pkg-config
+python,/usr/local/opt/python3
+python@2,/usr/local/opt/python2
+doxygen,/usr/local/bin/doxygen
+libusb,/usr/local/lib/libusb-1.0.0.dylib
+openssl,/usr/local/opt/openssl/lib/libssl.a
\ No newline at end of file
diff --git a/scripts/eosio_build_ubuntu.bash b/scripts/eosio_build_ubuntu.bash
new file mode 100755
index 00000000000..2d4d6295e93
--- /dev/null
+++ b/scripts/eosio_build_ubuntu.bash
@@ -0,0 +1,92 @@
+echo "OS name: ${NAME}"
+echo "OS Version: ${VERSION_ID}"
+echo "CPU cores: ${CPU_CORES}"
+echo "Physical Memory: ${MEM_GIG}G"
+echo "Disk space total: ${DISK_TOTAL}G"
+echo "Disk space available: ${DISK_AVAIL}G"
+
+( [[ $NAME == "Ubuntu" ]] && ( [[ "$(echo ${VERSION_ID})" == "16.04" ]] || [[ "$(echo ${VERSION_ID})" == "18.04" ]] )  ) || ( echo " - You must be running 16.04.x or 18.04.x to install EOSIO." && exit 1 )
+
+[[ $MEM_GIG -lt 7 ]] && echo "Your system must have 7 or more Gigabytes of physical memory installed." && exit 1
+[[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
+
+# C++7 for Ubuntu 18 (16 build-essential has cpp5)
+( [[ $PIN_COMPILER == false ]] && [[ "$(echo ${VERSION_ID})" == "18.04" ]] ) && ensure-build-essential
+# Handle clang/compiler
+ensure-compiler
+# Ensure packages exist
+([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS=(llvm-4.0,dpkg\ -s libclang-4.0-dev,dpkg\ -s)
+$ENABLE_COVERAGE_TESTING && EXTRA_DEPS+=(lcov,dpkg\ -s)
+ensure-apt-packages "${REPO_ROOT}/scripts/eosio_build_ubuntu_deps" $(echo ${EXTRA_DEPS[@]})
+echo ""
+# CMAKE Installation
+ensure-cmake
+# CLANG Installation
+build-clang
+# LLVM Installation
+ensure-llvm
+# BOOST Installation
+ensure-boost
+VERSION_MAJ=$(echo "${VERSION_ID}" | cut -d'.' -f1)
+VERSION_MIN=$(echo "${VERSION_ID}" | cut -d'.' -f2)
+if $INSTALL_MONGO; then
+	if [[ $VERSION_MAJ == 18 ]]; then
+		# UBUNTU 18 doesn't have MONGODB 3.6.3
+		MONGODB_VERSION=4.1.1
+		# We have to re-set this with the new version
+		MONGODB_ROOT=${OPT_DIR}/mongodb-${MONGODB_VERSION}
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB installation]${COLOR_NC}"
+	if [[ ! -d $MONGODB_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -OL http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu${VERSION_MAJ}${VERSION_MIN}-$MONGODB_VERSION.tgz \
+		&& tar -xzf mongodb-linux-x86_64-ubuntu${VERSION_MAJ}${VERSION_MIN}-${MONGODB_VERSION}.tgz \
+		&& mv $SRC_DIR/mongodb-linux-x86_64-ubuntu${VERSION_MAJ}${VERSION_MIN}-${MONGODB_VERSION} $MONGODB_ROOT \
+		&& touch $MONGODB_LOG_DIR/mongod.log \
+		&& rm -f mongodb-linux-x86_64-ubuntu${VERSION_MAJ}${VERSION_MIN}-$MONGODB_VERSION.tgz \
+		&& cp -f $REPO_ROOT/scripts/mongod.conf $MONGODB_CONF \
+		&& mkdir -p $MONGODB_DATA_DIR \
+		&& rm -rf $MONGODB_LINK_DIR \
+		&& rm -rf $BIN_DIR/mongod \
+		&& ln -s $MONGODB_ROOT $MONGODB_LINK_DIR \
+		&& ln -s $MONGODB_LINK_DIR/bin/mongod $BIN_DIR/mongod"
+		echo " - MongoDB successfully installed @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_DIR})."
+	else
+		echo " - MongoDB found with correct version @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_DIR})."
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB C driver installation]${COLOR_NC}"
+	if [[ ! -d $MONGO_C_DRIVER_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/$MONGO_C_DRIVER_VERSION/mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
+		&& tar -xzf mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
+		&& cd mongo-c-driver-$MONGO_C_DRIVER_VERSION \
+		&& mkdir -p cmake-build \
+		&& cd cmake-build \
+		&& $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_DIR -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF $PINNED_TOOLCHAIN .. \
+		&& make -j${JOBS} \
+		&& make install \
+		&& cd ../.. \
+		&& rm mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz"
+		echo " - MongoDB C driver successfully installed @ ${MONGO_C_DRIVER_ROOT}."
+	else
+		echo " - MongoDB C driver found with correct version @ ${MONGO_C_DRIVER_ROOT}."
+	fi
+	echo "${COLOR_CYAN}[Ensuring MongoDB C++ driver installation]${COLOR_NC}"
+	if [[ ! -d $MONGO_CXX_DRIVER_ROOT ]]; then
+		execute bash -c "cd $SRC_DIR && \
+		curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r$MONGO_CXX_DRIVER_VERSION.tar.gz -o mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
+		&& tar -xzf mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
+		&& cd mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION \
+		&& sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
+		&& sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
+		&& cd build \
+		&& $CMAKE -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_DIR -DCMAKE_PREFIX_PATH=$EOSIO_INSTALL_DIR $PINNED_TOOLCHAIN .. \
+		&& make -j${JOBS} VERBOSE=1 \
+		&& make install \
+		&& cd ../.. \
+		&& rm -f mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz"
+		echo " - MongoDB C++ driver successfully installed @ ${MONGO_CXX_DRIVER_ROOT}."
+	else
+		echo " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}."
+	fi
+fi
\ No newline at end of file
diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
deleted file mode 100755
index 9228ed7d862..00000000000
--- a/scripts/eosio_build_ubuntu.sh
+++ /dev/null
@@ -1,358 +0,0 @@
-if [ $1 == 1 ]; then ANSWER=1; else ANSWER=0; fi
-
-OS_VER=$( grep VERSION_ID /etc/os-release | cut -d'=' -f2 | sed 's/[^0-9\.]//gI' )
-OS_MAJ=$(echo "${OS_VER}" | cut -d'.' -f1)
-OS_MIN=$(echo "${OS_VER}" | cut -d'.' -f2)
-
-MEM_MEG=$( free -m | sed -n 2p | tr -s ' ' | cut -d\  -f2 || cut -d' ' -f2 )
-CPU_SPEED=$( lscpu | grep -m1 "MHz" | tr -s ' ' | cut -d\  -f3 || cut -d' ' -f3 | cut -d'.' -f1 )
-CPU_CORE=$( nproc )
-MEM_GIG=$(( ((MEM_MEG / 1000) / 2) ))
-export JOBS=$(( MEM_GIG > CPU_CORE ? CPU_CORE : MEM_GIG ))
-
-DISK_INSTALL=$(df -h . | tail -1 | tr -s ' ' | cut -d\  -f1 || cut -d' ' -f1)
-DISK_TOTAL_KB=$(df . | tail -1 | awk '{print $2}')
-DISK_AVAIL_KB=$(df . | tail -1 | awk '{print $4}')
-DISK_TOTAL=$(( DISK_TOTAL_KB / 1048576 ))
-DISK_AVAIL=$(( DISK_AVAIL_KB / 1048576 ))
-
-printf "\\nOS name: ${OS_NAME}\\n"
-printf "OS Version: ${OS_VER}\\n"
-printf "CPU speed: ${CPU_SPEED}Mhz\\n"
-printf "CPU cores: %s\\n" "${CPU_CORE}"
-printf "Physical Memory: ${MEM_MEG} Mgb\\n"
-printf "Disk install: ${DISK_INSTALL}\\n"
-printf "Disk space total: ${DISK_TOTAL%.*}G\\n"
-printf "Disk space available: ${DISK_AVAIL%.*}G\\n"
-
-if [ "$BUILD_CLANG8" = "true" ]; then
-   PINNED_TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE=$BUILD_DIR/pinned_toolchain.cmake
-fi
-
-if [ "${MEM_MEG}" -lt 7000 ]; then
-	printf "Your system must have 7 or more Gigabytes of physical memory installed.\\n"
-	printf "Exiting now.\\n"
-	exit 1
-fi
-
-case "${OS_NAME}" in
-	"Ubuntu")
-		. /etc/lsb-release
-		if [ "${DISTRIB_CODENAME}" != "xenial" -a "${DISTRIB_CODENAME}" != "bionic" ]; then
-			echo "The only Ubuntu versions this script supports are Ubuntu 16.04 and 18.04"
-			echo "Exiting now."
-			exit 1
-		fi
-		# UBUNTU 18 doesn't have MONGODB 3.6.3
-		if [ $OS_MAJ -gt 16 ]; then
-			export MONGODB_VERSION=4.1.1
-		fi
-		# We have to re-set this with the new version
-		export MONGODB_ROOT=${OPT_LOCATION}/mongodb-${MONGODB_VERSION}
-	;;
-esac
-
-if [ "${DISK_AVAIL%.*}" -lt "${DISK_MIN}" ]; then
-	printf "You must have at least %sGB of available storage to install EOSIO.\\n" "${DISK_MIN}"
-	printf "Exiting now.\\n"
-	exit 1
-fi
-
-
-DEP_ARRAY=(
-   git make automake libbz2-dev libssl-dev doxygen graphviz \
-   libgmp3-dev autotools-dev build-essential libicu-dev python2.7 python2.7-dev python3 python3-dev \
-   autoconf libtool curl zlib1g-dev sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config
-)
-
-# llvm-4.0 is installed into /usr/lib/llvm-4.0
-if [ ! $PIN_COMPILER ]; then
-   DEP_ARRAY+=(llvm-4.0 libclang-4.0-dev)
-fi
-
-COUNT=1
-DISPLAY=""
-DEP=""
-
-if [[ "${ENABLE_CODE_COVERAGE}" == true ]]; then
-	DEP_ARRAY+=(lcov)
-fi
-
-if [ $ANSWER != 1 ]; then read -p "Do you wish to update repositories with apt-get update? (y/n) " ANSWER; fi
-case $ANSWER in
-	1 | [Yy]* )
-		if ! sudo -E apt-get update; then
-			printf " - APT update failed.\\n"
-			exit 1;
-		else
-			printf " - APT update complete.\\n"
-		fi
-	;;
-	[Nn]* ) echo "Proceeding without update!";;
-	* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-esac
-
-printf "\\nChecking for installed dependencies...\\n"
-for (( i=0; i<${#DEP_ARRAY[@]}; i++ )); do
-	pkg=$( dpkg -s "${DEP_ARRAY[$i]}" 2>/dev/null | grep Status | tr -s ' ' | cut -d\  -f4 )
-	if [ -z "$pkg" ]; then
-		DEP=$DEP" ${DEP_ARRAY[$i]} "
-		DISPLAY="${DISPLAY}${COUNT}. ${DEP_ARRAY[$i]}\\n"
-		printf " - Package %s${bldred} NOT${txtrst} found!\\n" "${DEP_ARRAY[$i]}"
-		(( COUNT++ ))
-	else
-		printf " - Package %s found.\\n" "${DEP_ARRAY[$i]}"
-		continue
-	fi
-done
-if [ "${COUNT}" -gt 1 ]; then
-	printf "\\nThe following dependencies are required to install EOSIO:\\n"
-	printf "${DISPLAY}\\n\\n"
-	if [ $ANSWER != 1 ]; then read -p "Do you wish to install these packages? (y/n) " ANSWER; fi
-	case $ANSWER in
-		1 | [Yy]* )
-			if ! sudo -E apt-get -y install ${DEP}; then
-				printf " - APT dependency failed.\\n"
-				exit 1
-			else
-				printf " - APT dependencies installed successfully.\\n"
-			fi
-		;;
-		[Nn]* ) echo "User aborting installation of required dependencies, Exiting now."; exit;;
-		* ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-	esac
-else
-	printf " - No required APT dependencies to install.\\n"
-fi
-
-
-printf "\\n"
-
-### clean up force build before starting
-if [ $FORCE_BUILD ];then
-   rm -rf  \
-   ${SRC_LOCATION}/cmake-$CMAKE_VERSION \
-   ${SRC_LOCATION}/llvm ${OPT_LOCATION}/llvm4 \
-   ${TMP_LOCATION}/clang8 ${OPT_LOCATION}/clang8 \
-   ${SRC_LOCATION}/zlib ${OPT_LOCATION}/zlib \
-   ${SRC_LOCATION}/boost \
-   ${SRC_LOCATION}/mongodb-linux-x86_64-amazon-$MONGODB_VERSION \
-   ${SRC_LOCATION}/mongo-c-driver-$MONGO_C_DRIVER_VERSION \
-   ${SRC_LOCATION}/mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION
-fi
-
-printf "Checking CMAKE installation...\\n"
-if [ ! -e $CMAKE ] || [ $FORCE_BUILD ]; then
-	printf "Installing CMAKE...\\n"
-	curl -LO https://cmake.org/files/v$CMAKE_VERSION_MAJOR.$CMAKE_VERSION_MINOR/cmake-$CMAKE_VERSION.tar.gz \
-	&& tar -xzf cmake-$CMAKE_VERSION.tar.gz \
-	&& cd cmake-$CMAKE_VERSION \
-	&& ./bootstrap --prefix=$PREFIX \
-	&& make -j"${JOBS}" \
-	&& make install \
-	&& cd .. \
-	&& rm -f cmake-$CMAKE_VERSION.tar.gz \
-	|| exit 1
-	printf " - CMAKE successfully installed @ ${CMAKE} \\n"
-else
-	printf " - CMAKE found @ ${CMAKE}.\\n"
-fi
-if [ $? -ne 0 ]; then exit -1; fi
-
-
-printf "\\n"
-
-if [ "$BUILD_CLANG8" = "true" ]; then
-   printf "Checking Clang 8 support...\\n"
-   if [ ! -d $CLANG8_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing Clang 8...\\n"
-      cd ${TMP_LOCATION} \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/llvm.git clang8 && cd clang8 \
-      && git checkout $PINNED_COMPILER_LLVM_COMMIT \
-      && cd tools \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/lld.git \
-      && cd lld && git checkout $PINNED_COMPILER_LLD_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/polly.git \
-      && cd polly && git checkout $PINNED_COMPILER_POLLY_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang.git clang && cd clang/tools \
-      && git checkout $PINNED_COMPILER_CLANG_VERSION \
-      && mkdir extra && cd extra \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang-tools-extra.git \
-      && cd clang-tools-extra && git checkout $PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT && cd .. \
-      && cd ../../../../projects \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxx.git \
-      && cd libcxx && git checkout $PINNED_COMPILER_LIBCXX_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxxabi.git \
-      && cd libcxxabi && git checkout $PINNED_COMPILER_LIBCXXABI_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libunwind.git \
-      && cd libunwind && git checkout $PINNED_COMPILER_LIBUNWIND_COMMIT && cd ../ \
-      && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/compiler-rt.git \
-      && cd compiler-rt && git checkout $PINNED_COMPILER_COMPILER_RT_COMMIT && cd ../ \
-      && cd ${TMP_LOCATION}/clang8 \
-      && mkdir build && cd build \
-      && $CMAKE -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${CLANG8_ROOT}" -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && rm -rf ${TMP_LOCATION}/clang8 \
-      && cd ../.. \
-      || exit 1
-
-      printf " - Clang 8 successfully installed @ ${CLANG8_ROOT}\\n"
-   else
-      printf " - Clang 8 found @ ${CLANG8_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-
-   printf "Checking LLVM 4 installation...\\n"
-   if [ ! -d $OPT_LOCATION/llvm4 ] || [ $FORCE_BUILD ]; then
-      printf "Installing LLVM 4...\\n"
-      cd $SRC_LOCATION \
-      && git clone https://github.com/llvm-mirror/llvm --single-branch --branch $LLVM_VERSION && cd llvm \
-      && mkdir -p build && cd build \
-      && $CMAKE -DCMAKE_INSTALL_PREFIX=$OPT_LOCATION/llvm4 -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$BUILD_DIR/pinned_toolchain.cmake .. \
-      && make -j"${JOBS}" install \
-      || exit -1
-      printf "Installed LLVM 4 @ ${OPT_LOCATION}/llvm4"
-   fi
-
-   cd $SRC_LOCATION
-   printf "Checking zlib library installation...\\n"
-   if [ ! -d $OPT_LOCATION/zlib ] || [ $FORCE_BUILD ]; then
-      printf "Installing zlib...\\n"
-      curl -LO https://www.zlib.net/zlib-1.2.11.tar.gz && tar -xf zlib-1.2.11.tar.gz \
-      && cd zlib-1.2.11 && mkdir build && cd build \
-      && ../configure --prefix=$OPT_LOCATION/zlib \
-      && make -j"${JOBS}" install \
-      || exit -1
-   fi
-
-   cd $SRC_LOCATION
-   export PATH=$OPT_LOCATION/clang8/bin:$PATH
-   printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
-   BOOSTVERSION=$( grep "#define BOOST_VERSION" "$BOOST_ROOT/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\  -f3 )
-   if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ] || [ $FORCE_BUILD ]; then
-      printf "Installing Boost library...\\n"
-      curl -LO https://dl.bintray.com/boostorg/release/${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_PATCH}/source/boost_$BOOST_VERSION.tar.bz2 \
-      && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
-      && cd $BOOST_ROOT \
-      && ./bootstrap.sh --prefix=$BOOST_ROOT \
-      && ./b2 toolset=clang cxxflags="-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I${CLANG8_ROOT}/include/c++/v1" linkflags="-stdlib=libc++" link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j"${JOBS}" -sZLIB_LIBRARY_PATH="${OPT_LOCATION}/zlib/lib" -sZLIB_INCLUDE="${OPT_LOCATION}/zlib/include" -sZLIB_SOURCE="${SRC_LOCATION}/zlib-1.2.11" install \
-      && cd .. \
-      && rm -f boost_$BOOST_VERSION.tar.bz2 \
-      && rm -rf $BOOST_LINK_LOCATION \
-      && ln -s $BOOST_ROOT $BOOST_LINK_LOCATION \
-      || exit 1
-      printf " - Boost library successfully installed @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   else
-      printf " - Boost library found with correct version @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   
-   printf "\\n"
-else
-   printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
-   BOOSTVERSION=$( grep "#define BOOST_VERSION" "$BOOST_ROOT/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\  -f3 )
-   if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ] || [ $FORCE_BUILD ]; then
-      printf "Installing Boost library...\\n"
-      curl -LO https://dl.bintray.com/boostorg/release/${BOOST_VERSION_MAJOR}.${BOOST_VERSION_MINOR}.${BOOST_VERSION_PATCH}/source/boost_$BOOST_VERSION.tar.bz2 \
-      && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
-      && cd $BOOST_ROOT \
-      && ./bootstrap.sh --prefix=$BOOST_ROOT \
-      && ./b2 -q -j"${JOBS}" install \
-      && cd .. \
-      && rm -f boost_$BOOST_VERSION.tar.bz2 \
-      && rm -rf $BOOST_LINK_LOCATION \
-      && ln -s $BOOST_ROOT $BOOST_LINK_LOCATION \
-      || exit 1
-      printf " - Boost library successfully installed @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   else
-      printf " - Boost library found with correct version @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-
-   printf "Checking LLVM 4 support...\\n"
-   if [ ! -d $LLVM_ROOT ] || [ $FORCE_BUILD ]; then
-      ln -s /usr/lib/llvm-4.0 $LLVM_ROOT \
-      || exit 1
-      printf " - LLVM successfully linked from /usr/lib/llvm-4.0 to ${LLVM_ROOT}\\n"
-   else
-      printf " - LLVM found @ ${LLVM_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-fi
-
-if [ $BUILD_MONGO ]; then
-   printf "Checking MongoDB installation...\\n"
-   if [ ! -d $MONGODB_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB into ${MONGODB_ROOT}...\\n"
-      curl -OL http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu$OS_MAJ$OS_MIN-$MONGODB_VERSION.tgz \
-      && tar -xzf mongodb-linux-x86_64-ubuntu$OS_MAJ$OS_MIN-$MONGODB_VERSION.tgz \
-      && mv $SRC_LOCATION/mongodb-linux-x86_64-ubuntu$OS_MAJ$OS_MIN-$MONGODB_VERSION $MONGODB_ROOT \
-      && touch $MONGODB_LOG_LOCATION/mongod.log \
-      && rm -f mongodb-linux-x86_64-ubuntu$OS_MAJ$OS_MIN-$MONGODB_VERSION.tgz \
-      && cp -f $REPO_ROOT/scripts/mongod.conf $MONGODB_CONF \
-      && mkdir -p $MONGODB_DATA_LOCATION \
-      && rm -rf $MONGODB_LINK_LOCATION \
-      && rm -rf $BIN_LOCATION/mongod \
-      && ln -s $MONGODB_ROOT $MONGODB_LINK_LOCATION \
-      && ln -s $MONGODB_LINK_LOCATION/bin/mongod $BIN_LOCATION/mongod \
-      || exit 1
-      printf " - MongoDB successfully installed @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_LOCATION}).\\n"
-   else
-      printf " - MongoDB found with correct version @ ${MONGODB_ROOT} (Symlinked to ${MONGODB_LINK_LOCATION}).\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-   printf "Checking MongoDB C driver installation...\\n"
-   if [ ! -d $MONGO_C_DRIVER_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB C driver...\\n"
-      curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/$MONGO_C_DRIVER_VERSION/mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      && tar -xzf mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      && cd mongo-c-driver-$MONGO_C_DRIVER_VERSION \
-      && mkdir -p cmake-build \
-      && cd cmake-build \
-      && $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF $PINNED_TOOLCHAIN .. \
-      && make -j"${JOBS}" \
-      && make install \
-      && cd ../.. \
-      && rm mongo-c-driver-$MONGO_C_DRIVER_VERSION.tar.gz \
-      || exit 1
-      printf " - MongoDB C driver successfully installed @ ${MONGO_C_DRIVER_ROOT}.\\n"
-   else
-      printf " - MongoDB C driver found with correct version @ ${MONGO_C_DRIVER_ROOT}.\\n"
-   fi
-
-   if [ $? -ne 0 ]; then exit -1; fi
-   printf "Checking MongoDB C++ driver installation...\\n"
-   if [ ! -d $MONGO_CXX_DRIVER_ROOT ] || [ $FORCE_BUILD ]; then
-      printf "Installing MongoDB C++ driver...\\n"
-      curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r$MONGO_CXX_DRIVER_VERSION.tar.gz -o mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
-      && tar -xzf mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}.tar.gz \
-      && cd mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION \
-      && sed -i 's/"maxAwaitTimeMS", count/"maxAwaitTimeMS", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
-      && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
-      && cd build \
-      && $CMAKE -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX $PINNED_TOOLCHAIN .. \
-      && make -j"${JOBS}" VERBOSE=1 \
-      && make install \
-      && cd ../.. \
-      && rm -f mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION.tar.gz \
-      || exit 1
-      printf " - MongoDB C++ driver successfully installed @ ${MONGO_CXX_DRIVER_ROOT}.\\n"
-   else
-      printf " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}.\\n"
-   fi
-   if [ $? -ne 0 ]; then exit -1; fi
-
-   printf "\\n"
-fi
-
-cd ..
-printf "\\n"
-
-function print_instructions() {
-	return 0
-}
diff --git a/scripts/eosio_build_ubuntu_deps b/scripts/eosio_build_ubuntu_deps
new file mode 100644
index 00000000000..bfb6b776148
--- /dev/null
+++ b/scripts/eosio_build_ubuntu_deps
@@ -0,0 +1,24 @@
+git,dpkg -s
+make,dpkg -s
+bzip2,dpkg -s
+automake,dpkg -s
+libbz2-dev,dpkg -s
+libssl-dev,dpkg -s
+doxygen,dpkg -s
+graphviz,dpkg -s
+libgmp3-dev,dpkg -s
+autotools-dev,dpkg -s
+libicu-dev,dpkg -s
+python2.7,dpkg -s
+python2.7-dev,dpkg -s
+python3,dpkg -s
+python3-dev,dpkg -s
+autoconf,dpkg -s
+libtool,dpkg -s
+curl,dpkg -s
+zlib1g-dev,dpkg -s
+sudo,dpkg -s
+ruby,dpkg -s
+libusb-1.0-0-dev,dpkg -s
+libcurl4-gnutls-dev,dpkg -s
+pkg-config,dpkg -s
\ No newline at end of file
diff --git a/scripts/eosio_install.sh b/scripts/eosio_install.bash
similarity index 71%
rename from scripts/eosio_install.sh
rename to scripts/eosio_install.bash
index ee2aba76e4f..7357cc5af57 100755
--- a/scripts/eosio_install.sh
+++ b/scripts/eosio_install.bash
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -eo pipefail
+VERSION=2.0
 ##########################################################################
 # This is the EOSIO automated install script for Linux and Mac OS.
 # This file was downloaded from https://github.com/EOSIO/eos
@@ -30,33 +32,20 @@
 # https://github.com/EOSIO/eos/blob/master/LICENSE.txt
 ##########################################################################
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-REPO_ROOT="${SCRIPT_DIR}/.."
-BUILD_DIR="${REPO_ROOT}/build"
+# Load eosio specific helper functions
+. ./scripts/helpers/eosio.bash
 
-txtbld=$(tput bold)
-bldred=${txtbld}$(tput setaf 1)
-txtrst=$(tput sgr0)
-
-if [ ! -d $BUILD_DIR ]; then
-   printf "\\nError, eosio_build.sh has not ran.  Please run ./eosio_build.sh first!\\n\\n"
-   exit -1
-fi
-
-if ! pushd "${BUILD_DIR}" &> /dev/null;then
-   printf "Unable to enter build directory %s.\\n Exiting now.\\n" "${BUILD_DIR}"
-   exit 1;
-fi
+[[ ! $NAME == "Ubuntu" ]] && set -i # Ubuntu doesn't support interactive mode since it uses dash
 
+[[ ! -d $BUILD_DIR ]] && printf "${COLOR_RED}Please run ./eosio_build.bash first!${COLOR_NC}" && exit 1
+echo "${COLOR_CYAN}====================================================================================="
+echo "========================== ${COLOR_WHITE}Starting EOSIO Installation${COLOR_CYAN} ==============================${COLOR_NC}"
+execute cd $BUILD_DIR
 CMAKE_INSTALL_PREFIX=$(grep ^CMAKE_INSTALL_PREFIX: CMakeCache.txt | sed 's/.*=//')
+execute make install
+execute cd ..
 
-if ! make install; then
-   printf "\\nMAKE installing EOSIO has exited with the above error.\\n\\n"
-   exit -1
-fi
-popd &> /dev/null
-
-printf "\n${bldred}      ___           ___           ___                       ___\n"
+printf "\n${COLOR_RED}      ___           ___           ___                       ___\n"
 printf "     /  /\\         /  /\\         /  /\\        ___          /  /\\ \n"
 printf "    /  /:/_       /  /::\\       /  /:/_      /  /\\        /  /::\\ \n"
 printf "   /  /:/ /\\     /  /:/\\:\\     /  /:/ /\\    /  /:/       /  /:/\\:\\ \n"
@@ -66,13 +55,10 @@ printf " \\  \\:\\/:/ /:/ \\  \\:\\ /  /:/ \\  \\:\\/:/~/:/    \\  \\:\\/\\ \\
 printf "  \\  \\::/ /:/   \\  \\:\\  /:/   \\  \\::/ /:/      \\__\\::/  \\  \\:\\  /:/ \n"
 printf "   \\  \\:\\/:/     \\  \\:\\/:/     \\__\\/ /:/       /__/:/    \\  \\:\\/:/ \n"
 printf "    \\  \\::/       \\  \\::/        /__/:/        \\__\\/      \\  \\::/ \n"
-printf "     \\__\\/         \\__\\/         \\__\\/                     \\__\\/ \n\n${txtrst}"
+printf "     \\__\\/         \\__\\/         \\__\\/                     \\__\\/ \n\n${COLOR_NC}"
 
 printf "==============================================================================================\\n"
-printf "EOSIO has been installed into ${CMAKE_INSTALL_PREFIX}/bin!\\n"
-printf "If you need to, you can uninstall using: ./scripts/full_uninstaller.sh (it will leave your data directory).\\n"
+printf "${COLOR_GREEN}EOSIO has been installed into ${EOSIO_INSTALL_DIR}/bin${COLOR_NC}"
+printf "\\n${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.bash${COLOR_NC}\\n"
 printf "==============================================================================================\\n\\n"
-
-printf "EOSIO website: https://eos.io\\n"
-printf "EOSIO resources: https://eos.io/resources/\\n"
-printf "EOSIO Stack Exchange: https://eosio.stackexchange.com\\n"
+resources
diff --git a/scripts/eosio_uninstall.bash b/scripts/eosio_uninstall.bash
new file mode 100755
index 00000000000..bedfca3248a
--- /dev/null
+++ b/scripts/eosio_uninstall.bash
@@ -0,0 +1,131 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# Load bash script helper functions
+. ./scripts/helpers/eosio.bash
+
+usage() {
+   printf "Usage --- \\n $ %s [ --full ] [ --force ]\\n
+     --full: Removal of data directory (be absolutely sure you want to delete it before using this!)\\n
+     --force: Unattended uninstall which works regardless of the eosio directory existence.\\n              This helps cleanup dependencies and start fresh if you need to.
+   \\n" "$0"
+}
+
+ INSTALL_PATHS=(
+   $HOME/bin/eosio-launcher
+   $HOME/lib/cmake/eosios
+   $HOME/opt/llvm*
+   $HOME/opt/boost
+   $HOME/src/boost_*
+   $HOME/src/cmake-*
+   $HOME/share/cmake-*
+   $HOME/share/aclocal/cmake*
+   $HOME/doc/cmake*
+   $HOME/bin/nodeos 
+   $HOME/bin/keosd 
+   $HOME/bin/cleos 
+   $HOME/bin/ctest 
+   $HOME/bin/*cmake* 
+   $HOME/bin/cpack
+   $HOME/src/mongo*
+   $HOME/opt/mongo*
+   $HOME/bin/mongo*
+   $HOME/lib/cmake
+   $HOME/lib/libbson*
+   $HOME/lib/libmongo*
+   $HOME/lib/pkgconfig
+   $HOME/include/bsoncxx*
+   $HOME/include/libbson*
+   $HOME/include/libmongo*
+   $HOME/include/mongocxx*
+   $HOME/share/mongo*
+)
+
+# User input handling
+PROCEED=false
+DEP_PROCEED=false
+FORCED=false
+FULL=false
+if [[ $@ =~ [[:space:]]?--force[[:space:]]? ]]; then
+   echo "[Forcing Unattended Removal: Enabled]"
+   FORCED=true
+   PROCEED=true
+   DEP_PROCEED=true
+fi
+if [[ $@ =~ [[:space:]]?--full[[:space:]]? ]]; then
+   echo "[Full removal (nodeos generated state, etc): Enabled]"
+   if $FORCED; then
+      FULL=true
+   elif [[ $FORCED == false ]]; then
+      while true; do
+         read -p "Removal of the eosio data directory will require a resync of data which can take days. Do you wish to proceed? (y/n) " PROCEED
+         case $PROCEED in
+            "" ) echo "What would you like to do?";;
+            0 | true | [Yy]* )
+               FULL=true
+            break;;
+            1 | false | [Nn]* ) break;;
+            * ) echo "Please type 'y' for yes or 'n' for no.";;
+         esac
+      done
+   fi
+fi
+if [[ ! -z $@ ]] && [[ ! $@ =~ [[:space:]]?--force[[:space:]]? ]] && [[ ! $@ =~ [[:space:]]?--full[[:space:]]? ]]; then usage && exit; fi
+
+# If eosio folder exist, add it to the INSTALL_PATHS for deletion
+[[ -d "${HOME}/opt/eosio" ]] && INSTALL_PATHS+=("$HOME/opt/eosio")
+# As of 1.8.0, we're using a versioned directories under home: https://github.com/EOSIO/eos/issues/6940
+[[ -d "${EOSIO_INSTALL_DIR}" ]] && INSTALL_PATHS+=("${EOSIO_INSTALL_DIR}") # EOSIO_INSTALL_DIR set in .environment
+
+# Removal
+[[ ! -z "${EOSIO_LOCATION}" ]] && printf "[EOSIO Installation Found: ${EOSIO_LOCATION}]\n"
+while true; do
+   [[ $FORCED == false ]] && read -p "Do you wish to remove the installation? (y/n) " PROCEED
+   case $PROCEED in
+      "" ) echo "What would you like to do?";;
+      0 | true | [Yy]* )
+         echo "[Removing EOSIO and Dependencies]"
+         if [[ $ARCH == "Darwin" ]]; then
+            for package in $(cat scripts/eosio_build_darwin_deps | cut -d, -f1 2>/dev/null); do
+               while true; do
+                  [[ $FORCED == false ]] && read -p "Do you wish to uninstall and unlink all brew installed ${package} versions? (y/n) " DEP_PROCEED
+                  case $DEP_PROCEED in
+                     "") echo "What would you like to do?";;
+                     0 | true | [Yy]* )
+                        execute brew uninstall $package --force || true
+                        execute brew cleanup -s $package || true
+                        break;;
+                     1 | false | [Nn]* ) break;;
+                     * ) echo "Please type 'y' for yes or 'n' for no.";;
+                  esac
+               done
+            done
+         fi
+         # Handle cleanup of data directory
+         if $FULL; then
+            ## Add both just to be safe
+            INSTALL_PATHS+=("${HOME}/Library/Application\ Support/eosio")
+            INSTALL_PATHS+=("${HOME}/.local/share/eosio")
+         fi
+         # Version < 1.8.0; Before we started using ~/eosio/1.8.x
+         # Arrays should return with newlines (IFS=\n;helpers.bash) as Application\ Support will split into two
+         for INSTALL_PATH in ${INSTALL_PATHS[@]}; do
+            execute rm -rf $INSTALL_PATH
+         done
+         # Cleanup directories if they're empty (else the user had the directory there already for a reason)
+         execute rmdir $HOME/src 2>/dev/null
+         execute rmdir $HOME/opt 2>/dev/null
+         execute rmdir $HOME/var/log/mongodb 2>/dev/null
+         execute rmdir $HOME/var/log 2>/dev/null
+         execute rmdir $HOME/var 2>/dev/null
+         execute rmdir $HOME/bin 2>/dev/null
+         execute rmdir $HOME/etc 2>/dev/null
+         execute rmdir $HOME/lib 2>/dev/null
+         execute rmdir $HOME/data/mongodb 2>/dev/null
+         execute rmdir $HOME/data 2>/dev/null
+         echo "[EOSIO Removal Complete]"
+         break;;
+      1 | false | [Nn]* ) echo " - Cancelled EOSIO Removal!"; exit 1;;
+      * ) echo "Please type 'y' for yes or 'n' for no.";;
+   esac
+done
\ No newline at end of file
diff --git a/scripts/eosio_uninstall.sh b/scripts/eosio_uninstall.sh
deleted file mode 100755
index facb5f935f4..00000000000
--- a/scripts/eosio_uninstall.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/bash
-
-OPT_LOCATION=$HOME/opt
-
-binaries=(
-   cleos
-   eosio-abigen
-   eosio-launcher
-   eosio-s2wasm
-   eosio-wast2wasm
-   eosiocpp
-   keosd
-   nodeos
-   eosio-applesdemo
-)
-
-if [ -d $OPT_LOCATION/eosio ]; then
-   printf "Do you wish to remove this install? (requires sudo)\n"
-   select yn in "Yes" "No"; do
-      case $yn in
-         [Yy]* )
-            if [ "$(id -u)" -ne 0 ]; then
-               printf "\nThis requires sudo, please run ./eosio_uninstall.sh with sudo\n\n"
-               exit -1
-            fi
-
-            pushd $HOME &> /dev/null
-            pushd opt &> /dev/null
-            rm -rf eosio
-            # Handle cleanup of directories created from installation
-            if [ "$1" == "--full" ]; then
-               if [ -d ~/Library/Application\ Support/eosio ]; then rm -rf ~/Library/Application\ Support/eosio; fi # Mac OS
-               if [ -d ~/.local/share/eosio ]; then rm -rf ~/.local/share/eosio; fi # Linux
-            fi
-            popd &> /dev/null
-            pushd bin &> /dev/null
-            for binary in ${binaries[@]}; do
-               rm ${binary}
-            done
-            popd &> /dev/null
-            pushd lib/cmake &> /dev/null
-            rm -rf eosio
-            popd &> /dev/null
-
-            break;;
-         [Nn]* )
-            printf "Aborting uninstall\n\n"
-            exit -1;;
-      esac
-   done
-fi
-
-if [ -d "/usr/local/eosio" ]; then
-   printf "Do you wish to remove this install? (requires sudo)\n"
-   select yn in "Yes" "No"; do
-      case $yn in
-         [Yy]* )
-            if [ "$(id -u)" -ne 0 ]; then
-               printf "\nThis requires sudo, please run ./eosio_uninstall.sh with sudo\n\n"
-               exit -1
-            fi
-
-            pushd /usr/local &> /dev/null
-            pushd opt &> /dev/null
-            rm -rf eosio
-            # Handle cleanup of directories created from installation
-            if [ "$1" == "--full" ]; then
-               if [ -d ~/Library/Application\ Support/eosio ]; then rm -rf ~/Library/Application\ Support/eosio; fi # Mac OS
-               if [ -d ~/.local/share/eosio ]; then rm -rf ~/.local/share/eosio; fi # Linux
-            fi
-            popd &> /dev/null
-            pushd bin &> /dev/null
-            for binary in ${binaries[@]}; do
-               rm ${binary}
-            done
-            popd &> /dev/null
-            pushd lib/cmake &> /dev/null
-            rm -rf eosio
-            popd &> /dev/null
-
-            break;;
-         [Nn]* )
-            printf "Aborting uninstall\n\n"
-            exit -1;;
-      esac
-   done
-fi
diff --git a/scripts/full_uninstaller.sh b/scripts/full_uninstaller.sh
deleted file mode 100755
index 04e79106ead..00000000000
--- a/scripts/full_uninstaller.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#! /bin/bash
-ANSWER=0
-if [[ $1 =~ force-* ]]; then FORCED=1; else FORCED=0; fi
-if [ -d "/usr/local/include/eosio" ] || [ -d "$HOME/opt/eosio" ] || [ $FORCED == 1 ]; then # use force for running the script directly
-   printf "\nEOSIO installation (AND DEPENDENCIES) already found...\n"
-   if [ $1 == 0 ]; then
-      read -p "Do you wish to remove them? (this includes dependencies)? (y/n) " ANSWER
-   elif [ $1 == 1 ] || [ $FORCED == 1 ]; then
-      ANSWER=1
-   fi
-   case $ANSWER in
-      1 | [Yy]* )
-         echo "Uninstalling..."
-         if [ -d "$HOME/opt/eosio" ] || [[ $1 == "force-new" ]]; then
-            if [ $( uname ) == "Darwin" ]; then
-               # gettext and other brew packages are not modified as they can be dependencies for things other than eosio
-               if [ $ANSWER != 1 ]; then read -p "Do you wish to uninstall and unlink all brew installed llvm@4 versions? (y/n) " ANSWER; fi
-               case $ANSWER in
-                  1 | [Yy]* )
-                     brew uninstall llvm@4 --force
-                     brew cleanup -s llvm@4
-                  ;;
-                  [Nn]* ) ;;
-                  * ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-               esac
-               if [ $ANSWER != 1 ]; then read -p "Do you wish to uninstall and unlink all brew installed doxygen versions? (y/n) " ANSWER; fi
-               case $ANSWER in
-                  1 | [Yy]* )
-                     brew uninstall doxygen --force
-                     brew cleanup -s doxygen
-                  ;;
-                  [Nn]* ) ;;
-                  * ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-               esac
-               if [ $ANSWER != 1 ]; then read -p "Do you wish to uninstall and unlink all brew installed graphviz versions? (y/n) " ANSWER; fi
-               case $ANSWER in
-                  1 | [Yy]* )
-                     brew uninstall graphviz --force
-                     brew cleanup -s graphviz
-                  ;;
-                  [Nn]* ) ;;
-                  * ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-               esac
-               if [ $ANSWER != 1 ]; then read -p "Do you wish to uninstall and unlink all brew installed libusb versions? (y/n) " ANSWER; fi
-               case $ANSWER in
-                  1 | [Yy]* )
-                     brew uninstall libusb --force
-                     brew cleanup -s libusb
-                  ;;
-                  [Nn]* ) ;;
-                  * ) echo "Please type 'y' for yes or 'n' for no."; exit;;
-               esac
-            fi
-            rm -rf $HOME/opt/eosio
-            rm -f $HOME/bin/eosio-launcher
-            rm -rf $HOME/lib/cmake/eosios
-            rm -rf $HOME/opt/llvm
-            rm -f $HOME/opt/boost
-            rm -rf $HOME/src/boost_*
-            rm -rf $HOME/src/cmake-*
-            rm -rf $HOME/share/cmake-*
-            rm -rf $HOME/share/aclocal/cmake*
-            rm -rf $HOME/doc/cmake*
-            rm -f $HOME/bin/nodeos $HOME/bin/keosd $HOME/bin/cleos $HOME/bin/ctest $HOME/bin/*cmake* $HOME/bin/cpack
-            rm -rf $HOME/src/mongo*
-         fi
-
-         if [ -d "/usr/local/include/eosio" ] || [[ $1 == "force-old" ]]; then
-            if [ "$(id -u)" -ne 0 ]; then
-               printf "\nCleanup requires sudo... Please manually run ./scripts/clean_old_install.sh with sudo.\n"
-               exit -1
-            fi
-            pushd /usr/local &> /dev/null
-            rm -rf wasm
-            pushd include &> /dev/null
-            rm -rf libbson-1.0 libmongoc-1.0 mongocxx bsoncxx appbase chainbase eosio.system eosiolib fc libc++ musl secp256k* 2>/dev/null
-            rm -rf eosio 2>/dev/null
-            popd &> /dev/null
-            pushd bin &> /dev/null
-            rm cleos eosio-abigen eosio-applesedemo eosio-launcher eosio-s2wasm eosio-wast2wasm eosiocpp keosd nodeos 2>/dev/null
-            popd &> /dev/null
-            libraries=(
-               libeosio_testing
-               libeosio_chain
-               libfc
-               libbinaryen
-               libWAST
-               libWASM
-               libRuntime
-               libPlatform
-               libIR
-               libLogging
-               libsoftfloat
-               libchainbase
-               libappbase
-               libbuiltins
-               libbson-1.0
-               libbson-static-1.0.a
-               libbsoncxx-static
-               libmongoc-1.0
-               libmongoc-static-1.0.a
-               libmongocxx-static
-               libsecp256k*
-            )
-            pushd lib &> /dev/null
-            for lib in ${libraries[@]}; do
-               rm ${lib}.a ${lib}.dylib ${lib}.so 2>/dev/null
-               rm pkgconfig/${lib}.pc 2>/dev/null
-               rm cmake/${lib} 2>/dev/null
-            done
-            popd &> /dev/null
-            pushd etc &> /dev/null
-            rm eosio 2>/dev/null
-            popd &> /dev/null
-            pushd share &> /dev/null
-            rm eosio 2>/dev/null
-            popd &> /dev/null
-            pushd usr/share &> /dev/null
-            rm eosio 2>/dev/null
-            popd &> /dev/null
-            pushd var/lib &> /dev/null
-            rm eosio 2>/dev/null
-            popd &> /dev/null
-            pushd var/log &> /dev/null
-            rm eosio 2>/dev/null
-            popd &> /dev/null
-         fi
-      ;;
-      [Nn]* )
-         printf "Skipping\n\n"
-      ;;
-   esac
-fi
diff --git a/scripts/helpers/eosio.bash b/scripts/helpers/eosio.bash
new file mode 100755
index 00000000000..b7d186e0422
--- /dev/null
+++ b/scripts/helpers/eosio.bash
@@ -0,0 +1,553 @@
+# Checks for Arch and OS + Support for tests setting them manually
+## Necessary for linux exclusion while running bats tests/bash-bats/*.bash
+[[ -z "${ARCH}" ]] && export ARCH=$( uname )
+if [[ -z "${NAME}" ]]; then
+    if [[ $ARCH == "Linux" ]]; then
+        [[ ! -e /etc/os-release ]] && echo "${COLOR_RED} - /etc/os-release not found! It seems you're attempting to use an unsupported Linux distribution.${COLOR_NC}" && exit 1
+        # Obtain OS NAME, and VERSION
+        . /etc/os-release
+    elif [[ $ARCH == "Darwin" ]]; then export NAME=$(sw_vers -productName)
+    else echo " ${COLOR_RED}- EOSIO is not supported for your Architecture!${COLOR_NC}" && exit 1
+    fi
+fi
+
+# Setup yum and apt variables
+if [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]]; then
+    if ! YUM=$( command -v yum 2>/dev/null ); then echo "${COLOR_RED}YUM must be installed to compile EOS.IO${COLOR_NC}" && exit 1; fi
+elif [[ $NAME == "Ubuntu" ]]; then
+    if ! APTGET=$( command -v apt-get 2>/dev/null ); then echo "${COLOR_RED}APT-GET must be installed to compile EOS.IO${COLOR_NC}" && exit 1; fi
+fi
+
+# Obtain dependency versions; Must come first in the script
+. ./scripts/.environment
+# Load general helpers
+. ./scripts/helpers/general.bash
+
+[[ $ARCH == "Darwin" ]] && export CTEST_BIN=ctest || export CTEST_BIN=$BIN_DIR/ctest
+
+function setup() {
+    if $VERBOSE; then
+        echo "VERBOSE: ${VERBOSE}"
+        echo "DRYRUN: ${DRYRUN}"
+        echo "TEMP_DIR: ${TEMP_DIR}"
+        echo "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}"
+        echo "CORE_SYMBOL_NAME: ${CORE_SYMBOL_NAME}"
+        echo "BOOST_LOCATION: ${BOOST_LOCATION}"
+        echo "INSTALL_LOCATION: ${INSTALL_LOCATION}"
+        echo "BUILD_DIR: ${BUILD_DIR}"
+        echo "EOSIO_INSTALL_DIR: ${EOSIO_INSTALL_DIR}"
+        echo "NONINTERACTIVE: ${NONINTERACTIVE}"
+        echo "PROCEED: ${PROCEED}"
+        echo "ENABLE_COVERAGE_TESTING: ${ENABLE_COVERAGE_TESTING}"
+        echo "ENABLE_DOXYGEN: ${ENABLE_DOXYGEN}"
+        echo "ENABLE_MONGO: ${ENABLE_MONGO}"
+        echo "INSTALL_MONGO: ${INSTALL_MONGO}"
+        echo "SUDO_LOCATION: ${SUDO_LOCATION}"
+        echo "PIN_COMPILER: ${PIN_COMPILER}"
+    fi
+    [[ -d $BUILD_DIR ]] && execute rm -rf $BUILD_DIR # cleanup old build directory
+    # Be absolutely sure TEMP_DIR is set (we could do damage here)
+    ## IF user set, they can be responsible for creating and then removing stale data
+    if [[ $TEMP_DIR =~ "/tmp" ]]; then
+        if [[ ! -d $TEMP_DIR ]]; then
+            execute-always mkdir -p $TEMP_DIR
+            execute-always rm -rf $TEMP_DIR/*
+        fi
+    fi
+    execute mkdir -p $BUILD_DIR
+    execute mkdir -p $SRC_DIR
+    execute mkdir -p $OPT_DIR
+    execute mkdir -p $VAR_DIR
+    execute mkdir -p $BIN_DIR
+    execute mkdir -p $VAR_DIR/log
+    execute mkdir -p $ETC_DIR
+    execute mkdir -p $LIB_DIR
+    execute mkdir -p $MONGODB_LOG_DIR
+    execute mkdir -p $MONGODB_DATA_DIR
+}
+
+function resources() {
+    echo "${COLOR_CYAN}EOSIO website:${COLOR_NC} https://eos.io"
+    echo "${COLOR_CYAN}EOSIO Telegram channel:${COLOR_NC} https://t.me/EOSProject"
+    echo "${COLOR_CYAN}EOSIO resources:${COLOR_NC} https://eos.io/resources/"
+    echo "${COLOR_CYAN}EOSIO Stack Exchange:${COLOR_NC} https://eosio.stackexchange.com"
+}
+
+function print_supported_linux_distros_and_exit() {
+   echo "On Linux the EOSIO build script only supports Amazon, Centos, and Ubuntu."
+   echo "Please install on a supported version of one of these Linux distributions."
+   echo "https://aws.amazon.com/amazon-linux-ami/"
+   echo "https://www.centos.org/"
+   echo "https://www.ubuntu.com/"
+   echo "Exiting now."
+   exit 1
+}
+
+function prompt-mongo-install() {
+    if $ENABLE_MONGO; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}You have chosen to include MongoDB support. Do you want for us to install MongoDB as well? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) export INSTALL_MONGO=true; break;;
+                1 | false | [Nn]* ) echo "${COLOR_RED} - Existing MongoDB will be used.${COLOR_NC}"; break;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    fi
+}
+
+function ensure-homebrew() {
+    echo "${COLOR_CYAN}[Ensuring HomeBrew installation]${COLOR_NC}"
+    if ! BREW=$( command -v brew ); then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install HomeBrew? (y/n)?${COLOR_NC}" &&  read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    execute "${XCODESELECT}" --install 2>/dev/null || true
+                    if ! execute "${RUBY}" -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; then
+                        echo "${COLOR_RED}Unable to install HomeBrew!${COLOR_NC}" && exit 1;
+                    else BREW=$( command -v brew ); fi
+                break;;
+                1 | false | [Nn]* ) echo "${COLOR_RED} - User aborted required HomeBrew installation.${COLOR_NC}"; exit 1;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo " - HomeBrew installation found @ ${BREW}"
+    fi
+}
+
+function ensure-scl() {
+    echo "${COLOR_CYAN}[Ensuring installation of Centos Software Collections Repository]${COLOR_NC}" # Needed for rh-python36
+    SCL=$( rpm -qa | grep -E 'centos-release-scl-[0-9].*' || true )
+    if [[ -z "${SCL}" ]]; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && read -p "${COLOR_YELLOW}Do you wish to install and enable the Centos Software Collections Repository? (y/n)?${COLOR_NC} " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) install-package centos-release-scl "--enablerepo=extras"; break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of required Centos Software Collections Repository."; exit 1;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo " - ${SCL} found."
+    fi
+}
+
+function ensure-devtoolset() {
+    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-7 with C++7]${COLOR_NC}"
+    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-7-[0-9].*' || true )
+    if [[ -z "${DEVTOOLSET}" ]]; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Not Found: Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) install-package devtoolset-7; break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-7."; break;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo " - ${DEVTOOLSET} found."
+    fi
+}
+
+function ensure-build-essential() {
+    echo "${COLOR_CYAN}[Ensuring installation of build-essential with C++7]${COLOR_NC}"
+    BUILD_ESSENTIAL=$( dpkg -s build-essential | grep 'Package: build-essential' || true )
+    if [[ -z $BUILD_ESSENTIAL ]]; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) 
+                    if install-package build-essential; then
+                        echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
+                    else
+                        echo " - ${COLOR_GREEN}Install of build-essential failed. Please try a manual install.${COLOR_NC}"
+                        exit 1
+                    fi
+                break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of build-essential."; break;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo " - ${BUILD_ESSENTIAL} found."
+    fi
+}
+
+function ensure-compiler() {
+    export CXX=${CXX:-c++}
+    export CC=${CC:-cc}
+    if $PIN_COMPILER || [[ -f $CLANG_ROOT/bin/clang++ ]]; then
+        export PIN_COMPILER=true
+        export BUILD_CLANG=true
+        export CPP_COMP=$CLANG_ROOT/bin/clang++
+        export CC_COMP=$CLANG_ROOT/bin/clang
+        export PATH=$CLANG_ROOT/bin:$PATH
+    elif [[ $PIN_COMPILER == false ]]; then
+        which $CXX &>/dev/null || ( echo "${COLOR_RED}Unable to find compiler: Pass in the -P option if you wish for us to install it or install a C++17 compiler and set \$CXX and \$CC to the proper binary locations. ${COLOR_NC}"; exit 1 )
+        # readlink on mac differs from linux readlink (mac doesn't have -f)
+        [[ $ARCH == "Linux" ]] && READLINK_COMMAND="readlink -f" || READLINK_COMMAND="readlink"
+        COMPILER_TYPE=$( eval $READLINK_COMMAND $(which $CXX) )
+        [[ -z "${COMPILER_TYPE}" ]] && echo "${COLOR_RED}COMPILER_TYPE not set!${COLOR_NC}" && exit 1
+        if [[ $COMPILER_TYPE =~ "clang" ]]; then
+            if [[ $ARCH == "Darwin" ]]; then
+                ### Check for apple clang version 10 or higher
+                [[ $( $(which $CXX) --version | cut -d ' ' -f 4 | cut -d '.' -f 1 | head -n 1 ) -lt 10 ]] && export NO_CPP17=true
+            else
+                if [[ $( $(which $CXX) --version | cut -d ' ' -f 3 | head -n 1 | cut -d '.' -f1) =~ ^[0-9]+$ ]]; then # Check if the version message cut returns an integer
+                    [[ $( $(which $CXX) --version | cut -d ' ' -f 3 | head -n 1 | cut -d '.' -f1) < 5 ]] && export NO_CPP17=true
+                elif [[ $(clang --version | cut -d ' ' -f 4 | head -n 1 | cut -d '.' -f1) =~ ^[0-9]+$ ]]; then # Check if the version message cut returns an integer
+                    [[ $( $(which $CXX) --version | cut -d ' ' -f 4 | cut -d '.' -f 1 | head -n 1 ) < 5 ]] && export NO_CPP17=true
+                fi
+            fi
+        else
+            ## Check for c++ version 7 or higher
+            [[ $( $(which $CXX) -dumpversion | cut -d '.' -f 1 ) -lt 7 ]] && export NO_CPP17=true
+        fi
+    fi
+    if $NO_CPP17; then
+        while true; do
+            echo "${COLOR_YELLOW}Unable to find C++17 support in ${CXX}!${COLOR_NC}"
+            echo "If you already have a C++17 compiler installed or would like to install your own, export CXX to point to the compiler of your choosing."
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to download and build C++17? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    export PIN_COMPILER=true
+                    export BUILD_CLANG=true
+                    export CPP_COMP=$CLANG_ROOT/bin/clang++
+                    export CC_COMP=$CLANG_ROOT/bin/clang
+                    export PATH=$CLANG_ROOT/bin:$PATH
+                break;;
+                1 | false | [Nn]* ) echo "${COLOR_RED} - User aborted C++17 installation!${COLOR_NC}"; exit 1;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    fi
+    $BUILD_CLANG && export PINNED_TOOLCHAIN="-DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake'"
+    echo ""
+}
+
+function ensure-cmake() {
+    echo "${COLOR_CYAN}[Ensuring CMAKE installation]${COLOR_NC}"
+    if [[ ! -e "${CMAKE}" ]]; then
+		execute bash -c "cd $SRC_DIR && \
+        curl -LO https://cmake.org/files/v${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}/cmake-${CMAKE_VERSION}.tar.gz \
+        && tar -xzf cmake-${CMAKE_VERSION}.tar.gz \
+        && cd cmake-${CMAKE_VERSION} \
+        && ./bootstrap --prefix=${EOSIO_INSTALL_DIR} \
+        && make -j${JOBS} \
+        && make install \
+        && cd .. \
+        && rm -f cmake-${CMAKE_VERSION}.tar.gz"
+        [[ -z "${CMAKE}" ]] && export CMAKE="${BIN_DIR}/cmake"
+        echo " - CMAKE successfully installed @ ${CMAKE}"
+        echo ""
+    else
+        echo " - CMAKE found @ ${CMAKE}."
+        echo ""
+    fi
+}
+
+function ensure-boost() {
+    [[ $ARCH == "Darwin" ]] && export CPATH="$(python-config --includes | awk '{print $1}' | cut -dI -f2):$CPATH" # Boost has trouble finding pyconfig.h
+    echo "${COLOR_CYAN}[Ensuring Boost $( echo $BOOST_VERSION | sed 's/_/./g' ) library installation]${COLOR_NC}"
+    BOOSTVERSION=$( grep "#define BOOST_VERSION" "$BOOST_ROOT/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\  -f3 || true )
+    if [[ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ]]; then
+        B2_FLAGS="-q -j${JOBS} --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test install"
+        BOOTSTRAP_FLAGS=""
+        if [[ $ARCH == "Linux" ]] && $PIN_COMPILER; then
+            B2_FLAGS="toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I${CLANG_ROOT}/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j${JOBS} install"
+            BOOTSTRAP_FLAGS="--with-toolset=clang"
+        fi
+		execute bash -c "cd $SRC_DIR && \
+        curl -LO https://dl.bintray.com/boostorg/release/$BOOST_VERSION_MAJOR.$BOOST_VERSION_MINOR.$BOOST_VERSION_PATCH/source/boost_$BOOST_VERSION.tar.bz2 \
+        && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
+        && cd $BOOST_ROOT \
+        && ./bootstrap.sh ${BOOTSTRAP_FLAGS} --prefix=$BOOST_ROOT \
+        && ./b2 ${B2_FLAGS} \
+        && cd .. \
+        && rm -f boost_$BOOST_VERSION.tar.bz2 \
+        && rm -rf $BOOST_LINK_LOCATION"        
+        echo " - Boost library successfully installed @ ${BOOST_ROOT}"
+        echo ""
+    else
+        echo " - Boost library found with correct version @ ${BOOST_ROOT}"
+        echo ""
+    fi
+}
+
+function ensure-llvm() {
+    echo "${COLOR_CYAN}[Ensuring LLVM 4 support]${COLOR_NC}"
+    if [[ ! -d $LLVM_ROOT ]]; then
+        if [[ $ARCH == "Darwin" ]]; then # Handle brew installed llvm@4
+	        execute ln -s /usr/local/opt/llvm@4 $LLVM_ROOT
+	        echo " - LLVM successfully linked from /usr/local/opt/llvm@4 to ${LLVM_ROOT}"
+        else
+            if $PIN_COMPILER || $BUILD_CLANG; then
+                CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX='${LLVM_ROOT}' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' .."
+            else
+                if [[ $NAME == "Ubuntu" ]]; then
+                    execute ln -s /usr/lib/llvm-4.0 $LLVM_ROOT
+                    echo " - LLVM successfully linked from /usr/lib/llvm-4.0 to ${LLVM_ROOT}"
+                    return 0
+                fi
+                CMAKE_FLAGS="-G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX=${LLVM_ROOT} -DLLVM_TARGETS_TO_BUILD='host' -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release .."
+            fi
+            execute bash -c "cd ${OPT_DIR} \
+            && git clone --depth 1 --single-branch --branch $LLVM_VERSION https://github.com/llvm-mirror/llvm.git llvm && cd llvm \
+            && mkdir build \
+            && cd build \
+            && ${CMAKE} ${CMAKE_FLAGS} \
+            && make -j${JOBS} \
+            && make install"
+            echo " - LLVM successfully installed @ ${LLVM_ROOT}"
+            echo ""
+        fi
+    else
+        echo " - LLVM found @ ${LLVM_ROOT}."
+        echo ""
+    fi
+}
+
+
+function build-clang() {
+    if $BUILD_CLANG; then
+        echo "${COLOR_CYAN}[Ensuring Clang support]${COLOR_NC}"
+        if [[ ! -d $CLANG_ROOT ]]; then
+            execute bash -c "cd ${TEMP_DIR} \
+            && rm -rf clang8 \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/llvm.git clang8 \
+            && cd clang8 && git checkout $PINNED_COMPILER_LLVM_COMMIT \
+            && cd tools \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/lld.git \
+            && cd lld && git checkout $PINNED_COMPILER_LLD_COMMIT && cd ../ \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/polly.git \
+            && cd polly && git checkout $PINNED_COMPILER_POLLY_COMMIT && cd ../ \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang.git clang && cd clang/tools \
+            && git checkout $PINNED_COMPILER_CLANG_VERSION \
+            && mkdir extra && cd extra \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang-tools-extra.git \
+            && cd clang-tools-extra && git checkout $PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT && cd .. \
+            && cd ../../../../projects \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxx.git \
+            && cd libcxx && git checkout $PINNED_COMPILER_LIBCXX_COMMIT && cd ../ \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libcxxabi.git \
+            && cd libcxxabi && git checkout $PINNED_COMPILER_LIBCXXABI_COMMIT && cd ../ \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/libunwind.git \
+            && cd libunwind && git checkout $PINNED_COMPILER_LIBUNWIND_COMMIT && cd ../ \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/compiler-rt.git \
+            && cd compiler-rt && git checkout $PINNED_COMPILER_COMPILER_RT_COMMIT && cd ../ \
+            && cd ${TEMP_DIR}/clang8 \
+            && mkdir build && cd build \
+            && ${CMAKE} -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX='${CLANG_ROOT}' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=all -DCMAKE_BUILD_TYPE=Release .. \
+            && make -j${JOBS} \
+            && make install \
+            && rm -rf ${TEMP_DIR}/*"
+            echo " - Clang 8 successfully installed @ ${CLANG_ROOT}"
+            echo ""
+        else
+            echo " - Clang 8 found @ ${CLANG_ROOT}"
+            echo ""
+        fi
+        export CXX=$CPP_COMP
+        export CC=$CC_COMP
+    fi
+}
+
+function ensure-yum-packages() {
+    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
+    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
+    # Create temp file so we can add to it
+    cat $1 > $DEPS_FILE
+    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
+        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
+        OLDIFS="$IFS"; IFS=$''
+        _2=("$(echo $2 | sed 's/-qa /-qa\n/g')")
+        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}\n" | sed 's/-qa\\n/-qa/g' >> $DEPS_FILE; done
+    fi
+    while true; do
+        [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to update YUM repositories? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+        echo ""
+        case $PROCEED in
+            "" ) echo "What would you like to do?";;
+            0 | true | [Yy]* ) execute eval $( [[ $CURRENT_USER == "root" ]] || echo $SUDO_LOCATION -E ) $YUM -y update; break;;
+            1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
+            * ) echo "Please type 'y' for yes or 'n' for no.";;
+        esac
+    done
+    echo "${COLOR_CYAN}[Ensuring package dependencies]${COLOR_NC}"
+    OLDIFS="$IFS"; IFS=$','
+    # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
+    while read -r testee tester || [[ -n "$testee" ]]; do
+        if [[ ! -z $(eval $tester $testee) ]]; then
+            echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}"
+        else
+            DEPS=$DEPS"${testee} "
+            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found."
+            (( COUNT+=1 ))
+        fi
+    done < $DEPS_FILE
+    IFS=$OLDIFS
+    OLDIFS="$IFS"; IFS=$' '
+    echo ""
+    if [[ $COUNT > 0 ]]; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    for DEP in $DEPS; do
+                        install-package $DEP
+                    done
+                break;;
+                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+        echo ""
+    else
+        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
+        echo ""
+    fi
+    IFS=$OLDIFS
+}
+
+function ensure-brew-packages() {
+    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
+    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
+    # Create temp file so we can add to it
+    cat $1 > $DEPS_FILE
+    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
+        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
+        OLDIFS="$IFS"; IFS=$''
+        _2=("$(echo $2 | sed 's/-s /-s\n/g')")
+        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}\n" | sed 's/-s\\n/-s/g' >> $DEPS_FILE; done
+    fi
+    echo "${COLOR_CYAN}[Ensuring HomeBrew dependencies]${COLOR_NC}"
+    OLDIFS="$IFS"; IFS=$','
+    # || [[ -n "$nmae" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
+    while read -r name path || [[ -n "$name" ]]; do
+        if [[ -f $path ]] || [[ -d $path ]]; then
+            echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}"
+            continue
+        fi
+        # resolve conflict with homebrew glibtool and apple/gnu installs of libtool
+        if [[ "${testee}" == "/usr/local/bin/glibtool" ]]; then
+            if [ "${tester}" "/usr/local/bin/libtool" ]; then
+                echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}"
+                continue
+            fi
+        fi
+        DEPS=$DEPS"${name} "
+        echo " - ${name} ${COLOR_RED}NOT${COLOR_NC} found."
+        (( COUNT+=1 ))
+    done < $DEPS_FILE
+    if [[ $COUNT > 0 ]]; then
+        echo ""
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    execute "${XCODESELECT}" --install 2>/dev/null || true
+                    while true; do
+                        [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to update HomeBrew packages first? (y/n)${COLOR_NC}" && read -p " " PROCEED
+                        case $PROCEED in
+                            "" ) echo "What would you like to do?";;
+                            0 | true | [Yy]* ) echo "${COLOR_CYAN}[Updating HomeBrew]${COLOR_NC}" && execute brew update; break;;
+                            1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
+                            * ) echo "Please type 'y' for yes or 'n' for no.";;
+                        esac
+                    done
+                    execute brew tap eosio/eosio
+                    echo "${COLOR_CYAN}[Installing HomeBrew Dependencies]${COLOR_NC}"
+                    execute eval $BREW install $DEPS
+                    IFS="$OIFS"
+                break;;
+                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
+        echo ""
+    fi
+}
+
+function apt-update-prompt() {
+    if [[ $NAME == "Ubuntu" ]]; then
+        while true; do # APT
+            [[ $NONINTERACTIVE == false ]] && read -p "${COLOR_YELLOW}Do you wish to update APT-GET repositories before proceeding? (y/n)?${COLOR_NC} " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) execute-always $APTGET update; break;;
+                1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    fi
+    true
+}
+
+function ensure-apt-packages() {
+    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
+    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
+    # Create temp file so we can add to it
+    cat $1 > $DEPS_FILE
+    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
+        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
+        OLDIFS="$IFS"; IFS=$''
+        _2=("$(echo $2 | sed 's/-s /-s\n/g')")
+        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}" >> $DEPS_FILE; done
+    fi
+    echo "${COLOR_CYAN}[Ensuring package dependencies]${COLOR_NC}"
+    OLDIFS="$IFS"; IFS=$','
+    # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
+    while read -r testee tester || [[ -n "$testee" ]]; do
+        if [[ ! -z $(eval $tester $testee 2>/dev/null) ]]; then
+            echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}"
+        else
+            DEPS=$DEPS"${testee} "
+            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found."
+            (( COUNT+=1 ))
+        fi
+    done < $DEPS_FILE
+    IFS=$OLDIFS
+    OLDIFS="$IFS"; IFS=$' '
+    if [[ $COUNT > 0 ]]; then
+        echo ""
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    for DEP in $DEPS; do
+                        install-package $DEP
+                    done
+                break;;
+                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
+        echo ""
+    fi
+    IFS=$OLDIFS
+}
\ No newline at end of file
diff --git a/scripts/helpers/general.bash b/scripts/helpers/general.bash
new file mode 100755
index 00000000000..bde02cc45cc
--- /dev/null
+++ b/scripts/helpers/general.bash
@@ -0,0 +1,138 @@
+# Arrays should return with newlines so we can do something like "${output##*$'\n'}" to get the last line
+IFS=$'\n'
+
+if [[ $- == *i* ]]; then # Disable if the shell isn't interactive (avoids: tput: No value for $TERM and no -T specified)
+  export COLOR_NC=$(tput sgr0) # No Color
+  export COLOR_RED=$(tput setaf 1)
+  export COLOR_GREEN=$(tput setaf 2)
+  export COLOR_YELLOW=$(tput setaf 3)
+  export COLOR_BLUE=$(tput setaf 4)
+  export COLOR_MAGENTA=$(tput setaf 5)
+  export COLOR_CYAN=$(tput setaf 6)
+  export COLOR_WHITE=$(tput setaf 7)
+fi
+
+function execute() {
+  $VERBOSE && echo "--- Executing: $@"
+  $DRYRUN || "$@"
+}
+
+function execute-quiet() {
+  $VERBOSE && echo "--- Executing: $@ &>/dev/null"
+  $DRYRUN || "$@" &>/dev/null
+}
+
+function execute-always() {
+  ORIGINAL_DRYRUN=$DRYRUN
+  DRYRUN=false
+  execute "$@"
+  DRYRUN=$ORIGINAL_DRYRUN
+}
+
+function execute-without-verbose() {
+  ORIGINAL_VERBOSE=$VERBOSE
+  VERBOSE=false
+  execute "$@"
+  VERBOSE=$ORIGINAL_VERBOSE
+}
+
+function ensure-git-clone() {
+  if [[ ! -e "${REPO_ROOT}/.git" ]]; then
+    echo "This build script only works with sources cloned from git"
+    echo "For example, you can clone a new eos directory with: git clone https://github.com/EOSIO/eos"
+    exit 1
+  fi
+}
+
+function ensure-submodules-up-to-date() {
+  if [[ $DRYRUN == false ]] && [[ ! -z $(execute-without-verbose git submodule status --recursive | grep "^[+\-]") ]]; then
+    echo "${COLOR_RED}git submodules are not up to date: Please run the command 'git submodule update --init --recursive'.${COLOR_NC}"
+    exit 1
+  fi
+}
+
+function ensure-which() {
+  if ! which ls &>/dev/null; then
+    while true; do
+      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}EOSIO compiler checks require the 'which' package: Would you like for us to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+      echo ""
+      case $PROCEED in
+          "" ) echo "What would you like to do?";;
+          0 | true | [Yy]* ) install-package which WETRUN; break;;
+          1 | false | [Nn]* ) echo "${COLOR_RED}Please install the 'which' command before proceeding!${COLOR_NC}"; exit 1;;
+          * ) echo "Please type 'y' for yes or 'n' for no.";;
+      esac
+    done
+  fi
+}
+
+function ensure-sudo() {
+  ( [[ $CURRENT_USER != "root" ]] && [[ -z $SUDO_LOCATION ]] ) && echo "${COLOR_RED}Please install the 'sudo' command before proceeding!${COLOR_NC}" && exit 1
+  true 1>/dev/null # Needed
+}
+
+function previous-install-prompt() {
+  if [[ -d $EOSIO_INSTALL_DIR ]]; then
+    echo "EOSIO has already been installed into ${EOSIO_INSTALL_DIR}... It's suggested that you eosio_uninstall.bash before re-running this script."
+    while true; do
+      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to proceed anyway? (y/n)${COLOR_NC}" && read -p " " PROCEED
+      echo ""
+      case $PROCEED in
+        "" ) echo "What would you like to do?";;
+        0 | true | [Yy]* ) break;;
+        1 | false | [Nn]* ) exit;;
+        * ) echo "Please type 'y' for yes or 'n' for no.";;
+      esac
+	  done
+  fi
+}
+
+function set_system_vars() {
+    if [[ $ARCH == "Darwin" ]]; then
+        export OS_VER=$(sw_vers -productVersion)
+        export OS_MAJ=$(echo "${OS_VER}" | cut -d'.' -f1)
+        export OS_MIN=$(echo "${OS_VER}" | cut -d'.' -f2)
+        export OS_PATCH=$(echo "${OS_VER}" | cut -d'.' -f3)
+        export MEM_GIG=$(bc <<< "($(sysctl -in hw.memsize) / 1024000000)")
+        export DISK_INSTALL=$(df -h . | tail -1 | tr -s ' ' | cut -d\  -f1 || cut -d' ' -f1)
+        export blksize=$(df . | head -1 | awk '{print $2}' | cut -d- -f1)
+        export gbfactor=$(( 1073741824 / blksize ))
+        export total_blks=$(df . | tail -1 | awk '{print $2}')
+        export avail_blks=$(df . | tail -1 | awk '{print $4}')
+        export DISK_TOTAL=$((total_blks / gbfactor ))
+        export DISK_AVAIL=$((avail_blks / gbfactor ))
+    else
+        export DISK_INSTALL=$( df -h . | tail -1 | tr -s ' ' | cut -d\  -f1 )
+        export DISK_TOTAL_KB=$( df . | tail -1 | awk '{print $2}' )
+        export DISK_AVAIL_KB=$( df . | tail -1 | awk '{print $4}' )
+        export MEM_GIG=$(( ( ( $(cat /proc/meminfo | grep MemTotal | awk '{print $2}') / 1000 ) / 1000 ) ))
+        export DISK_TOTAL=$(( DISK_TOTAL_KB / 1048576 ))
+        export DISK_AVAIL=$(( DISK_AVAIL_KB / 1048576 ))
+    fi
+    export JOBS=$(( MEM_GIG > CPU_CORES ? CPU_CORES : MEM_GIG ))
+}
+
+function install-package() {
+  if [[ $ARCH == "Linux" ]]; then
+    EXECUTION_FUNCTION="execute"
+    [[ $2 == "WETRUN" ]] && EXECUTION_FUNCTION="execute-always"
+    ( [[ $2 =~ "--" ]] || [[ $3 =~ "--" ]] ) && OPTIONS="${2}${3}"
+    [[ $CURRENT_USER != "root" ]] && [[ ! -z $SUDO_LOCATION ]] && SUDO_COMMAND="$SUDO_LOCATION -E"
+    ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $YUM $OPTIONS install -y $1
+    ( [[ $NAME =~ "Ubuntu" ]] ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $APTGET $OPTIONS install -y $1
+  fi
+  true # Required; Weird behavior without it
+}
+
+function uninstall-package() {
+  if [[ $ARCH == "Linux" ]]; then
+    EXECUTION_FUNCTION="execute"
+    [[ $2 == "WETRUN" ]] && EXECUTION_FUNCTION="execute-always"
+    ( [[ $2 =~ "--" ]] || [[ $3 =~ "--" ]] ) && OPTIONS="${2}${3}"
+    [[ $CURRENT_USER != "root" ]] && [[ ! -z $SUDO_LOCATION ]] && SUDO_COMMAND="$SUDO_LOCATION -E"
+    # Check if the packages exist before uninstalling them. This speeds things up for tests.
+    ( ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && [[ ! -z $(rpm -qa $1) ]] ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $YUM $OPTIONS remove -y $1
+    ( [[ $NAME =~ "Ubuntu" ]] && $(dpkg -s $1 &>/dev/null) ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $APTGET $OPTIONS remove -y $1
+  fi
+  true
+}
\ No newline at end of file
diff --git a/scripts/parallel-test.bash b/scripts/parallel-test.bash
new file mode 100755
index 00000000000..351d8145604
--- /dev/null
+++ b/scripts/parallel-test.bash
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -ieo pipefail
+# Load eosio specific helper functions
+. ./scripts/helpers/eosio.bash
+echo "+++ Extracting build directory"
+[[ -f build.tar.gz ]] && execute tar -xzf build.tar.gz
+execute ls -l build
+execute cd build
+echo "+++ Running tests"
+# Counting tests available and if they get disabled for some reason, throw a failure
+TEST_COUNT=$($CTEST_BIN -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
+[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+set +e # defer ctest error handling to end
+CORES=$(getconf _NPROCESSORS_ONLN)
+# interactive mode is necessary for our NP tests to function
+execute $CTEST_BIN -j $CORES -LE _tests --output-on-failure -T Test
+EXIT_STATUS=$?
+[[ "$EXIT_STATUS" == 0 ]] && set -e
+# Prepare tests for artifact upload
+echo "+++ Uploading artifacts"
+execute mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
+execute buildkite-agent artifact upload test-results.xml
+# ctest error handling
+if [[ $EXIT_STATUS != 0 ]]; then
+    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
+    execute buildkite-agent artifact upload config.ini
+    execute buildkite-agent artifact upload genesis.json
+    exit $EXIT_STATUS
+fi
\ No newline at end of file
diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
deleted file mode 100755
index 34bdc5e4cca..00000000000
--- a/scripts/parallel-test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-[[ $(uname) == "Darwin" ]] && cd /data/job/eos/build || cd /data/job/build
-echo "+++ Running tests"
-# Counting tests available and if they get disabled for some reason, throw a failure
-TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
-set +e # defer ctest error handling to end
-CORES=$(getconf _NPROCESSORS_ONLN)
-echo "ctest -j $CORES -LE _tests --output-on-failure -T Test"
-ctest -j $CORES -LE _tests --output-on-failure -T Test
-EXIT_STATUS=$?
-[[ "$EXIT_STATUS" == 0 ]] && set -e
-# Prepare tests for artifact upload
-echo "+++ Uploading artifacts"
-mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
-buildkite-agent artifact upload test-results.xml
-# ctest error handling
-if [[ $EXIT_STATUS != 0 ]]; then
-    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
-    buildkite-agent artifact upload config.ini
-    buildkite-agent artifact upload genesis.json
-    exit $EXIT_STATUS
-fi
\ No newline at end of file
diff --git a/scripts/serial-test.bash b/scripts/serial-test.bash
new file mode 100755
index 00000000000..b2d2f478f5f
--- /dev/null
+++ b/scripts/serial-test.bash
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -ieo pipefail
+# Load eosio specific helper functions
+. ./scripts/helpers/eosio.bash
+echo "+++ Extracting build directory"
+[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
+execute ls -l build
+PATH=$PATH:$MONGODB_LINK_DIR/bin # nodeos_run_test-mongodb: no such file in directory 'mongo'
+execute cd build
+if [[ -f $MONGODB_BIN ]]; then
+    echo "+++ Killing old MongoDB"
+    $(pgrep mongod | xargs kill -9) || true
+    echo "+++ Starting MongoDB"
+    execute $MONGODB_BIN --fork --dbpath $MONGODB_DATA_DIR -f $MONGODB_CONF --logpath ./mongod.log
+fi
+echo "+++ Running tests"
+# Counting tests available and if they get disabled for some reason, throw a failure
+TEST_COUNT=$($CTEST_BIN -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
+[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+set +e # defer ctest error handling to end
+# We cannot use interactive mode for ctest nonparallelizable tests
+execute $CTEST_BIN -L nonparallelizable_tests --output-on-failure -T Test
+EXIT_STATUS=$?
+[[ $EXIT_STATUS == 0 ]] && set -e
+echo "+++ Uploading artifacts"
+mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
+execute buildkite-agent artifact upload test-results.xml
+[[ -f $MONGODB_BIN ]] && execute buildkite-agent artifact upload mongod.log
+# ctest error handling
+if [[ $EXIT_STATUS != 0 ]]; then
+    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
+    execute buildkite-agent artifact upload config.ini
+    execute buildkite-agent artifact upload genesis.json
+    exit $EXIT_STATUS
+fi
\ No newline at end of file
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
deleted file mode 100755
index eaf38aa5776..00000000000
--- a/scripts/serial-test.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-[[ $(uname) == "Darwin" ]] && cd /data/job/eos/build || cd /data/job/build
-echo "+++ Killing old MongoDB"
-$(pgrep mongod | xargs kill -9) || true
-echo "+++ Starting MongoDB"
-PATH=$PATH:~/opt/mongodb/bin
-mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath ./mongod.log
-echo "+++ Running tests"
-# Counting tests available and if they get disabled for some reason, throw a failure
-TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
-set +e # defer ctest error handling to end
-echo "ctest -L nonparallelizable_tests --output-on-failure -T Test"
-ctest -L nonparallelizable_tests --output-on-failure -T Test
-EXIT_STATUS=$?
-[[ $EXIT_STATUS == 0 ]] && set -e
-echo "+++ Uploading artifacts"
-mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
-buildkite-agent artifact upload test-results.xml
-buildkite-agent artifact upload mongod.log
-# ctest error handling
-if [[ $EXIT_STATUS != 0 ]]; then
-    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
-    buildkite-agent artifact upload config.ini
-    buildkite-agent artifact upload genesis.json
-    exit $EXIT_STATUS
-fi
\ No newline at end of file
diff --git a/tests/bash-bats/README.md b/tests/bash-bats/README.md
new file mode 100644
index 00000000000..b2527ffecf1
--- /dev/null
+++ b/tests/bash-bats/README.md
@@ -0,0 +1,63 @@
+# BATS Bash Testing
+
+For each bash script we have, there should be a separate .bash file within `REPO_ROOT/tests/bash-bats/`.
+
+### Usage notes:
+
+- BATS requires that you install greadlink: `brew install coreutils`
+- DRYRUN=true is required for all tests and automatically enabled. You can use this when you're manually running eosio_build.bash (`DRYRUN=true VERBOSE=true ./scripts/eosio_build.bash`)
+- execute-always gets around DRYRUN and runs stuff anyway (which installation uses this)
+- To run all tests: 
+    ```
+    $ ./tests/bash-bats/bats-core/bin/bats tests/bash-bats/*.bash
+      ✓ [eosio_build_darwin] > Testing -y/NONINTERACTIVE/PROCEED
+      ✓ [eosio_build_darwin] > Testing prompts
+      ✓ [eosio_build_darwin] > Testing executions
+      ✓ [helpers] > execute > dryrun
+      ✓ [helpers] > execute > verbose
+      ✓ [uninstall] > Usage is visible with right interaction
+      ✓ [uninstall] > Testing user prompts
+      ✓ [uninstall] > Testing executions
+      ✓ [uninstall] > --force
+      ✓ [uninstall] > --force + --full
+
+      10 tests, 0 failures
+    ```
+- Verbose bats output ( `-t` ): 
+  ```
+  ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash
+  ```
+
+---
+
+### Running all tests for all distros:
+```
+echo "[Darwin]"
+./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash 
+echo "[Ubuntu 16]"
+docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:16.04 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+echo "[Ubuntu 18]"
+docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:18.04 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+echo "[AmazonLinux 2]"
+docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos amazonlinux:2 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+echo "[Centos 7]"
+docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos centos:7 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+```
+
+### **Faster testing:** Start docker first, then run (keeping installed packages + faster tests)
+```
+docker run --name ubuntu16 -d -t -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:16.04 /bin/bash
+docker run --name ubuntu18 -d -t -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:18.04 /bin/bash
+docker run --name amazonlinux2 -d -t -v $HOME/BLOCKONE/eos.bats:/eos amazonlinux:2 /bin/bash
+docker run --name centos7 -d -t -v $HOME/BLOCKONE/eos.bats:/eos centos:7 /bin/bash
+echo "[Ubuntu 16]"
+docker exec -it ubuntu16 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+echo "[Ubuntu 18]"
+docker exec -it ubuntu18 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+echo "[AmazonLinux 2]"
+docker exec -it amazonlinux2 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+echo "[Centos 7]"
+docker exec -it centos7 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+```
+
+- You'll need to modify the volume path ($HOME/BLOCKONE/eos.bats) to indicate where you've got eos cloned locally.
diff --git a/tests/bash-bats/bats-core/bin/bats b/tests/bash-bats/bats-core/bin/bats
new file mode 100755
index 00000000000..dea44d326b7
--- /dev/null
+++ b/tests/bash-bats/bats-core/bin/bats
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+set -e
+
+BATS_READLINK='true'
+if command -v 'greadlink' >/dev/null; then
+  BATS_READLINK='greadlink'
+elif command -v 'readlink' >/dev/null; then
+  BATS_READLINK='readlink'
+fi
+
+bats_resolve_absolute_root_dir() {
+  local cwd="$PWD"
+  local path="$1"
+  local result="$2"
+  local target_dir
+  local target_name
+  local original_shell_options="$-"
+
+  # Resolve the parent directory, e.g. /bin => /usr/bin on CentOS (#113).
+  set -P
+
+  while true; do
+    target_dir="${path%/*}"
+    target_name="${path##*/}"
+
+    if [[ "$target_dir" != "$path" ]]; then
+      cd "$target_dir"
+    fi
+
+    if [[ -L "$target_name" ]]; then
+      path="$("$BATS_READLINK" "$target_name")"
+    else
+      printf -v "$result" -- '%s' "${PWD%/*}"
+      set +P "-$original_shell_options"
+      cd "$cwd"
+      return
+    fi
+  done
+}
+
+export BATS_ROOT
+bats_resolve_absolute_root_dir "$0" 'BATS_ROOT'
+exec "$BATS_ROOT/libexec/bats-core/bats" "$@"
diff --git a/tests/bash-bats/bats-core/libexec/bats-core/bats b/tests/bash-bats/bats-core/libexec/bats-core/bats
new file mode 100755
index 00000000000..03c1316f08b
--- /dev/null
+++ b/tests/bash-bats/bats-core/libexec/bats-core/bats
@@ -0,0 +1,171 @@
+#!/usr/bin/env bash
+set -e
+
+export BATS_VERSION='1.1.0'
+
+version() {
+  printf 'Bats %s\n' "$BATS_VERSION"
+}
+
+abort() {
+  printf 'Error: %s\n' "$1" >&2
+  usage >&2
+  exit 1
+}
+
+usage() {
+  local cmd="${0##*/}"
+  local line
+
+  while IFS= read -r line; do
+    printf '%s\n' "$line"
+  done <<END_OF_HELP_TEXT
+Usage: $cmd [-cr] [-f <regex>] [-j <jobs>] [-p | -t] <test>...
+       $cmd [-h | -v]
+
+  <test> is the path to a Bats test file, or the path to a directory
+  containing Bats test files (ending with ".bats").
+
+  -c, --count      Count the number of test cases without running any tests
+  -f, --filter     Filter test cases by names matching the regular expression
+  -h, --help       Display this help message
+  -j, --jobs       Number of parallel jobs to run (requires GNU parallel)
+  -p, --pretty     Show results in pretty format (default for terminals)
+  -r, --recursive  Include tests in subdirectories
+  -t, --tap        Show results in TAP format
+  -v, --version    Display the version number
+
+  For more information, see https://github.com/bats-core/bats-core
+
+END_OF_HELP_TEXT
+}
+
+expand_link() {
+  readlink="$(type -p greadlink readlink | head -1)"
+  "$readlink" -f "$1"
+}
+
+expand_path() {
+  local path="${1%/}"
+  local dirname="${path%/*}"
+  local result="$2"
+
+  if [[ "$dirname" == "$path" ]]; then
+    dirname="$PWD"
+  else
+    cd "$dirname"
+    dirname="$PWD"
+    cd "$OLDPWD"
+  fi
+  printf -v "$result" '%s/%s' "$dirname" "${path##*/}"
+}
+
+BATS_LIBEXEC="$(dirname "$(expand_link "$BASH_SOURCE")")"
+export BATS_CWD="$PWD"
+export BATS_TEST_PATTERN="^[[:blank:]]*@test[[:blank:]]+(.*[^[:blank:]])[[:blank:]]+\{(.*)\$"
+export BATS_TEST_FILTER=
+export PATH="$BATS_LIBEXEC:$PATH"
+
+arguments=()
+
+# Unpack single-character options bundled together, e.g. -cr, -pr.
+for arg in "$@"; do
+  if [[ "$arg" =~ ^-[^-]. ]]; then
+    index=1
+    while option="${arg:$((index++)):1}"; do
+      if [[ -z "$option" ]]; then
+        break
+      fi
+      arguments+=("-$option")
+    done
+  else
+    arguments+=("$arg")
+  fi
+  shift
+done
+
+set -- "${arguments[@]}"
+arguments=()
+
+unset flags pretty recursive
+flags=()
+pretty=
+recursive=
+if [[ -z "${CI:-}" && -t 0 && -t 1 ]] && command -v tput >/dev/null; then
+  pretty=1
+fi
+
+while [[ "$#" -ne 0 ]]; do
+  case "$1" in
+  -h|--help)
+    version
+    usage
+    exit 0
+    ;;
+  -v|--version)
+    version
+    exit 0
+    ;;
+  -c|--count)
+    flags+=('-c')
+    ;;
+  -f|--filter)
+    shift
+    flags+=('-f' "$1")
+    ;;
+  -j|--jobs)
+    shift
+    flags+=('-j' "$1")
+    ;;
+  -r|--recursive)
+    recursive=1
+    ;;
+  -t|--tap)
+    pretty=
+    ;;
+  -p|--pretty)
+    pretty=1
+    ;;
+  -*)
+    abort "Bad command line option '$1'"
+    ;;
+  *)
+    arguments+=("$1")
+    ;;
+  esac
+  shift
+done
+
+if [[ "${#arguments[@]}" -eq 0 ]]; then
+  abort 'Must specify at least one <test>'
+fi
+
+filenames=()
+for filename in "${arguments[@]}"; do
+  expand_path "$filename" 'filename'
+
+  if [[ -d "$filename" ]]; then
+    shopt -s nullglob
+    if [[ "$recursive" -eq 1 ]]; then
+      while IFS= read -r -d $'\0' file; do
+        filenames+=("$file")
+      done < <(find "$filename" -type f -name '*.bats' -print0 | sort -z)
+    else
+      for suite_filename in "$filename"/*.bats; do
+        filenames+=("$suite_filename")
+      done
+    fi
+    shopt -u nullglob
+  else
+    filenames+=("$filename")
+  fi
+done
+
+formatter="cat"
+if [[ -n "$pretty" ]]; then
+  flags+=("-x")
+  formatter="bats-format-tap-stream"
+fi
+
+set -o pipefail execfail
+exec bats-exec-suite "${flags[@]}" "${filenames[@]}" | "$formatter"
diff --git a/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-suite b/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-suite
new file mode 100755
index 00000000000..eb30d74ba00
--- /dev/null
+++ b/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-suite
@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+set -e
+
+count_only_flag=''
+extended_syntax_flag=''
+filter=''
+num_jobs=1
+have_gnu_parallel=
+flags=()
+
+while [[ "$#" -ne 0 ]]; do
+  case "$1" in
+  -c)
+    count_only_flag=1
+    ;;
+  -f)
+    shift
+    filter="$1"
+    flags+=('-f' "$filter")
+    ;;
+  -j)
+    shift
+    num_jobs="$1"
+    ;;
+  -x)
+    extended_syntax_flag='-x'
+    flags+=('-x')
+    ;;
+  *)
+    break
+    ;;
+  esac
+  shift
+done
+
+if ( type -p parallel &>/dev/null ); then
+  have_gnu_parallel=1
+elif [[ "$num_jobs" != 1 ]]; then
+  printf 'bats: cannot execute "%s" jobs without GNU parallel\n' "$num_jobs" >&2
+  exit 1
+fi
+
+trap 'kill 0; exit 1' int
+
+all_tests=()
+for filename in "$@"; do
+  if  [[ ! -f "$filename" ]]; then
+    printf 'bats: %s does not exist\n' "$filename" >&2
+    exit 1
+  fi
+
+  test_names=()
+  test_dupes=()
+  while read -r line; do
+    if [[ ! "$line" =~ ^bats_test_function\  ]]; then
+      continue
+    fi
+    line="${line%$'\r'}"
+    line="${line#* }"
+
+    all_tests+=( "$(printf "%s\t%s" "$filename" "$line")" )
+    if [[ " ${test_names[*]} " == *" $line "* ]]; then
+      test_dupes+=("$line")
+      continue
+    fi
+    test_names+=("$line")
+  done < <(BATS_TEST_FILTER="$filter" bats-preprocess "$filename")
+
+  if [[ "${#test_dupes[@]}" -ne 0 ]]; then
+    printf 'bats warning: duplicate test name(s) in %s: %s\n' "$filename" "${test_dupes[*]}" >&2
+  fi
+done
+
+if [[ -n "$count_only_flag" ]]; then
+  printf '%d\n' "${#all_tests[@]}"
+  exit
+fi
+
+status=0
+printf '1..%d\n' "${#all_tests[@]}"
+
+# No point on continuing if there's no tests.
+if [[ "${#all_tests[@]}" == 0 ]]; then
+  exit
+fi
+
+if [[ "$num_jobs" != 1 ]]; then
+  # Only use GNU parallel when we want parallel execution -- there is a small
+  # amount of overhead using it over a simple loop in the serial case.
+  set -o pipefail
+  printf '%s\n' "${all_tests[@]}" | grep -v '^$' | \
+    parallel -qk -j "$num_jobs" --colsep="\t" -- bats-exec-test "${flags[@]}" '{1}' '{2}' '{#}' || status=1
+else
+  # Just do it serially.
+  test_number=1
+  while IFS=$'\t' read -r filename test_name; do
+    bats-exec-test "${flags[@]}" "$filename" "$test_name" "$test_number" || status=1
+    ((++test_number))
+  done < <(printf '%s\n' "${all_tests[@]}" | grep -v '^$')
+fi
+exit "$status"
diff --git a/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-test b/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-test
new file mode 100755
index 00000000000..feedb45f108
--- /dev/null
+++ b/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-test
@@ -0,0 +1,373 @@
+#!/usr/bin/env bash
+set -eET
+
+BATS_COUNT_ONLY=''
+BATS_TEST_FILTER=''
+BATS_EXTENDED_SYNTAX=''
+
+while [[ "$#" -ne 0 ]]; do
+  case "$1" in
+  -c)
+    BATS_COUNT_ONLY=1
+    ;;
+  -f)
+    shift
+    BATS_TEST_FILTER="$1"
+    ;;
+  -x)
+    BATS_EXTENDED_SYNTAX='-x'
+    ;;
+  *)
+    break
+    ;;
+  esac
+  shift
+done
+
+BATS_TEST_FILENAME="$1"
+shift
+if [[ -z "$BATS_TEST_FILENAME" ]]; then
+  printf 'usage: bats-exec-test <filename>\n' >&2
+  exit 1
+elif [[ ! -f "$BATS_TEST_FILENAME" ]]; then
+  printf 'bats: %s does not exist\n' "$BATS_TEST_FILENAME" >&2
+  exit 1
+fi
+
+BATS_TEST_DIRNAME="${BATS_TEST_FILENAME%/*}"
+BATS_TEST_NAMES=()
+
+load() {
+  local name="$1"
+  local filename
+
+  if [[ "${name:0:1}" == '/' ]]; then
+    filename="${name}"
+  else
+    filename="$BATS_TEST_DIRNAME/${name}.bash"
+  fi
+
+  if [[ ! -f "$filename" ]]; then
+    printf 'bats: %s does not exist\n' "$filename" >&2
+    exit 1
+  fi
+
+  source "${filename}"
+}
+
+run() {
+  local origFlags="$-"
+  set +eET
+  local origIFS="$IFS"
+  output="$("$@" 2>&1)"
+  status="$?"
+  IFS=$'\n' lines=($output)
+  IFS="$origIFS"
+  set "-$origFlags"
+}
+
+setup() {
+  return 0
+}
+
+teardown() {
+  return 0
+}
+
+skip() {
+  BATS_TEST_SKIPPED="${1:-1}"
+  BATS_TEST_COMPLETED=1
+  exit 0
+}
+
+bats_test_begin() {
+  BATS_TEST_DESCRIPTION="$1"
+  if [[ -n "$BATS_EXTENDED_SYNTAX" ]]; then
+    printf 'begin %d %s\n' "$BATS_TEST_NUMBER" "$BATS_TEST_DESCRIPTION" >&3
+  fi
+  setup
+}
+
+bats_test_function() {
+  local test_name="$1"
+  BATS_TEST_NAMES+=("$test_name")
+}
+
+bats_capture_stack_trace() {
+  local test_file
+  local funcname
+  local i
+
+  BATS_STACK_TRACE=()
+
+  for ((i=2; i != ${#FUNCNAME[@]}; ++i)); do
+    # Use BATS_TEST_SOURCE if necessary to work around Bash < 4.4 bug whereby
+    # calling an exported function erases the test file's BASH_SOURCE entry.
+    test_file="${BASH_SOURCE[$i]:-$BATS_TEST_SOURCE}"
+    funcname="${FUNCNAME[$i]}"
+    BATS_STACK_TRACE+=("${BASH_LINENO[$((i-1))]} $funcname $test_file")
+    if [[ "$test_file" == "$BATS_TEST_SOURCE" ]]; then
+      case "$funcname" in
+      "$BATS_TEST_NAME"|setup|teardown)
+        break
+        ;;
+      esac
+    fi
+  done
+}
+
+bats_print_stack_trace() {
+  local frame
+  local index=1
+  local count="${#@}"
+  local filename
+  local lineno
+
+  for frame in "$@"; do
+    bats_frame_filename "$frame" 'filename'
+    bats_trim_filename "$filename" 'filename'
+    bats_frame_lineno "$frame" 'lineno'
+
+    if [[ $index -eq 1 ]]; then
+      printf '# ('
+    else
+      printf '#  '
+    fi
+
+    local fn
+    bats_frame_function "$frame" 'fn'
+    if [[ "$fn" != "$BATS_TEST_NAME" ]]; then
+      printf "from function \`%s' " "$fn"
+    fi
+
+    if [[ $index -eq $count ]]; then
+      printf 'in test file %s, line %d)\n' "$filename" "$lineno"
+    else
+      printf 'in file %s, line %d,\n' "$filename" "$lineno"
+    fi
+
+    ((++index))
+  done
+}
+
+bats_print_failed_command() {
+  local frame="${BATS_STACK_TRACE[${#BATS_STACK_TRACE[@]}-1]}"
+  local filename
+  local lineno
+  local failed_line
+  local failed_command
+
+  bats_frame_filename "$frame" 'filename'
+  bats_frame_lineno "$frame" 'lineno'
+  bats_extract_line "$filename" "$lineno" 'failed_line'
+  bats_strip_string "$failed_line" 'failed_command'
+  printf '%s' "#   \`${failed_command}' "
+
+  if [[ "$BATS_ERROR_STATUS" -eq 1 ]]; then
+    printf 'failed\n'
+  else
+    printf 'failed with status %d\n' "$BATS_ERROR_STATUS"
+  fi
+}
+
+bats_frame_lineno() {
+  printf -v "$2" '%s' "${1%% *}"
+}
+
+bats_frame_function() {
+  local __bff_function="${1#* }"
+  printf -v "$2" '%s' "${__bff_function%% *}"
+}
+
+bats_frame_filename() {
+  local __bff_filename="${1#* }"
+  __bff_filename="${__bff_filename#* }"
+
+  if [[ "$__bff_filename" == "$BATS_TEST_SOURCE" ]]; then
+    __bff_filename="$BATS_TEST_FILENAME"
+  fi
+  printf -v "$2" '%s' "$__bff_filename"
+}
+
+bats_extract_line() {
+  local __bats_extract_line_line
+  local __bats_extract_line_index=0
+
+  while IFS= read -r __bats_extract_line_line; do
+    if [[ "$((++__bats_extract_line_index))" -eq "$2" ]]; then
+      printf -v "$3" '%s' "${__bats_extract_line_line%$'\r'}"
+      break
+    fi
+  done <"$1"
+}
+
+bats_strip_string() {
+  [[ "$1" =~ ^[[:space:]]*(.*)[[:space:]]*$ ]]
+  printf -v "$2" '%s' "${BASH_REMATCH[1]}"
+}
+
+bats_trim_filename() {
+  printf -v "$2" '%s' "${1#$BATS_CWD/}"
+}
+
+bats_debug_trap() {
+  if [[ "$BASH_SOURCE" != "$1" ]]; then
+    bats_capture_stack_trace
+    BATS_LINENO="$BATS_CURRENT_LINENO"
+    BATS_CURRENT_LINENO="${BASH_LINENO[0]}"
+  fi
+}
+
+# For some versions of Bash, the `ERR` trap may not always fire for every
+# command failure, but the `EXIT` trap will. Also, some command failures may not
+# set `$?` properly. See #72 and #81 for details.
+#
+# For this reason, we call `bats_error_trap` at the very beginning of
+# `bats_teardown_trap` (the `DEBUG` trap for the call will move
+# `BATS_CURRENT_LINENO` to `BATS_LINENO`) and check the value of
+# `$BATS_TEST_COMPLETED` before taking other actions. We also adjust the exit
+# status value if needed.
+#
+# See `bats_exit_trap` for an additional EXIT error handling case when `$?`
+# isn't set properly during `teardown()` errors.
+bats_error_trap() {
+  local status="$?"
+  if [[ -z "$BATS_TEST_COMPLETED" ]]; then
+    BATS_ERROR_STATUS="${BATS_ERROR_STATUS:-$status}"
+    if [[ "$BATS_ERROR_STATUS" -eq 0 ]]; then
+      BATS_ERROR_STATUS=1
+    fi
+    BATS_STACK_TRACE[0]="$BATS_LINENO ${BATS_STACK_TRACE[0]#* }"
+    trap - debug
+  fi
+}
+
+bats_teardown_trap() {
+  bats_error_trap
+  local status=0
+  teardown >>"$BATS_OUT" 2>&1 || status="$?"
+
+  if [[ $status -eq 0 ]]; then
+    BATS_TEARDOWN_COMPLETED=1
+  elif [[ -n "$BATS_TEST_COMPLETED" ]]; then
+    BATS_ERROR_STATUS="$status"
+  fi
+
+  bats_exit_trap
+}
+
+bats_exit_trap() {
+  local line
+  local status
+  local skipped=''
+  trap - err exit
+
+  if [[ -n "$BATS_TEST_SKIPPED" ]]; then
+    skipped=' # skip'
+    if [[ "$BATS_TEST_SKIPPED" != '1' ]]; then
+      skipped+=" $BATS_TEST_SKIPPED"
+    fi
+  fi
+
+  if [[ -z "$BATS_TEST_COMPLETED" || -z "$BATS_TEARDOWN_COMPLETED" ]]; then
+    if [[ "$BATS_ERROR_STATUS" -eq 0 ]]; then
+      # For some versions of bash, `$?` may not be set properly for some error
+      # conditions before triggering the EXIT trap directly (see #72 and #81).
+      # Thanks to the `BATS_TEARDOWN_COMPLETED` signal, this will pinpoint such
+      # errors if they happen during `teardown()` when `bats_perform_test` calls
+      # `bats_teardown_trap` directly after the test itself passes.
+      #
+      # If instead the test fails, and the `teardown()` error happens while
+      # `bats_teardown_trap` runs as the EXIT trap, the test will fail with no
+      # output, since there's no way to reach the `bats_exit_trap` call.
+      BATS_STACK_TRACE[0]="$BATS_LINENO ${BATS_STACK_TRACE[0]#* }"
+      BATS_ERROR_STATUS=1
+    fi
+    printf 'not ok %d %s\n' "$BATS_TEST_NUMBER" "$BATS_TEST_DESCRIPTION" >&3
+    bats_print_stack_trace "${BATS_STACK_TRACE[@]}" >&3
+    bats_print_failed_command >&3
+
+    while IFS= read -r line; do
+      printf '# %s\n' "$line"
+    done <"$BATS_OUT" >&3
+    if [[ -n "$line" ]]; then
+      printf '# %s\n' "$line"
+    fi
+    status=1
+  else
+    printf 'ok %d %s%s\n' "$BATS_TEST_NUMBER" "$BATS_TEST_DESCRIPTION" \
+      "$skipped" >&3
+    status=0
+  fi
+
+  rm -f "$BATS_OUT"
+  exit "$status"
+}
+
+bats_perform_test() {
+  BATS_TEST_NAME="$1"
+  BATS_TEST_NUMBER="$2"
+
+  if ! declare -F "$BATS_TEST_NAME" &>/dev/null; then
+    printf "bats: unknown test name \`%s'\n" "$BATS_TEST_NAME" >&2
+    exit 1
+  fi
+
+  # Some versions of Bash will reset BASH_LINENO to the first line of the
+  # function when the ERR trap fires. All versions of Bash appear to reset it
+  # on an unbound variable access error. bats_debug_trap will fire both before
+  # the offending line is executed, and when the error is triggered.
+  # Consequently, we use `BATS_LINENO` to point to the line number seen by the
+  # first call to bats_debug_trap, _before_ the ERR trap or unbound variable
+  # access fires.
+  BATS_CURRENT_LINENO=0
+  BATS_LINENO=0
+  BATS_STACK_TRACE=()
+
+  BATS_TEST_COMPLETED=
+  BATS_TEST_SKIPPED=
+  BATS_TEARDOWN_COMPLETED=
+  BATS_ERROR_STATUS=
+  trap "bats_debug_trap \"\$BASH_SOURCE\"" debug
+  trap 'bats_error_trap' err
+  trap 'bats_teardown_trap' exit
+  "$BATS_TEST_NAME" >>"$BATS_OUT" 2>&1
+  BATS_TEST_COMPLETED=1
+  trap 'bats_exit_trap' exit
+  bats_teardown_trap
+}
+
+if [[ -z "$TMPDIR" ]]; then
+  BATS_TMPDIR='/tmp'
+else
+  BATS_TMPDIR="${TMPDIR%/}"
+fi
+
+BATS_TMPNAME="$BATS_TMPDIR/bats.$$"
+BATS_PARENT_TMPNAME="$BATS_TMPDIR/bats.$PPID"
+BATS_OUT="${BATS_TMPNAME}.out"
+
+bats_preprocess_source() {
+  BATS_TEST_SOURCE="${BATS_TMPNAME}.src"
+  bats-preprocess "$BATS_TEST_FILENAME" >"$BATS_TEST_SOURCE"
+  trap 'bats_cleanup_preprocessed_source' err exit
+  trap 'bats_cleanup_preprocessed_source; exit 1' int
+}
+
+bats_cleanup_preprocessed_source() {
+  rm -f "$BATS_TEST_SOURCE"
+}
+
+bats_evaluate_preprocessed_source() {
+  if [[ -z "$BATS_TEST_SOURCE" ]]; then
+    BATS_TEST_SOURCE="${BATS_PARENT_TMPNAME}.src"
+  fi
+  source "$BATS_TEST_SOURCE"
+}
+
+exec 3<&1
+
+# Run the given test.
+bats_preprocess_source
+bats_evaluate_preprocessed_source
+bats_perform_test "$@"
diff --git a/tests/bash-bats/bats-core/libexec/bats-core/bats-format-tap-stream b/tests/bash-bats/bats-core/libexec/bats-core/bats-format-tap-stream
new file mode 100755
index 00000000000..8c3a9a69592
--- /dev/null
+++ b/tests/bash-bats/bats-core/libexec/bats-core/bats-format-tap-stream
@@ -0,0 +1,174 @@
+#!/usr/bin/env bash
+set -e
+
+header_pattern='[0-9]+\.\.[0-9]+'
+IFS= read -r header
+
+if [[ "$header" =~ $header_pattern ]]; then
+  count="${header:3}"
+  index=0
+  failures=0
+  skipped=0
+  name=
+  count_column_width=$(( ${#count} * 2 + 2 ))
+else
+  # If the first line isn't a TAP plan, print it and pass the rest through
+  printf '%s\n' "$header"
+  exec cat
+fi
+
+update_screen_width() {
+  screen_width="$(tput cols)"
+  count_column_left=$(( $screen_width - $count_column_width ))
+}
+
+trap update_screen_width WINCH
+update_screen_width
+
+begin() {
+  go_to_column 0
+  buffer_with_truncation $(( $count_column_left - 1 )) '   %s' "$name"
+  clear_to_end_of_line
+  go_to_column $count_column_left
+  buffer "%${#count}s/${count}" "$index"
+  go_to_column 1
+}
+
+pass() {
+  go_to_column 0
+  buffer ' ✓ %s' "$name"
+  advance
+}
+
+skip() {
+  local reason="$1"
+  if [[ -n "$reason" ]]; then
+    reason=": $reason"
+  fi
+  go_to_column 0
+  buffer ' - %s (skipped%s)' "$name" "$reason"
+  advance
+}
+
+fail() {
+  go_to_column 0
+  set_color 1 bold
+  buffer ' ✗ %s' "$name"
+  advance
+}
+
+log() {
+  set_color 1
+  buffer '   %s\n' "$1"
+  clear_color
+}
+
+summary() {
+  buffer '\n%d test' "$count"
+  if [[ "$count" -ne 1 ]]; then
+    buffer 's'
+  fi
+
+  buffer ', %d failure' "$failures"
+  if [[ "$failures" -ne 1 ]]; then
+    buffer 's'
+  fi
+
+  if [[ "$skipped" -gt 0 ]]; then
+    buffer ', %d skipped' "$skipped"
+  fi
+
+  buffer '\n'
+}
+
+buffer_with_truncation() {
+  local width="$1"
+  shift
+  local string
+
+  printf -v 'string' -- "$@"
+
+  if [[ "${#string}" -gt "$width" ]]; then
+    buffer '%s...' "${string:0:$(( $width - 4 ))}"
+  else
+    buffer '%s' "$string"
+  fi
+}
+
+go_to_column() {
+  local column="$1"
+  buffer '\x1B[%dG' $(( $column + 1 ))
+}
+
+clear_to_end_of_line() {
+  buffer '\x1B[K'
+}
+
+advance() {
+  clear_to_end_of_line
+  buffer '\n'
+  clear_color
+}
+
+set_color() {
+  local color="$1"
+  local weight=22
+
+  if [[ "$2" == 'bold' ]]; then
+    weight=1
+  fi
+  buffer '\x1B[%d;%dm' "$(( 30 + $color ))" "$weight"
+}
+
+clear_color() {
+  buffer '\x1B[0m'
+}
+
+_buffer=
+
+buffer() {
+  local content
+  printf -v content -- "$@"
+  _buffer+="$content"
+}
+
+flush() {
+  printf '%s' "$_buffer"
+  _buffer=
+}
+
+finish() {
+  flush
+  printf '\n'
+}
+
+trap finish EXIT
+
+while IFS= read -r line; do
+  case "$line" in
+  'begin '* )
+    ((++index))
+    name="${line#* $index }"
+    begin
+    flush
+    ;;
+  'ok '* )
+    skip_expr="ok $index (.*) # skip ?(([[:print:]]*))?"
+    if [[ "$line" =~ $skip_expr ]]; then
+      ((++skipped))
+      skip "${BASH_REMATCH[2]}"
+    else
+      pass
+    fi
+    ;;
+  'not ok '* )
+    ((++failures))
+    fail
+    ;;
+  '# '* )
+    log "${line:2}"
+    ;;
+  esac
+done
+
+summary
diff --git a/tests/bash-bats/bats-core/libexec/bats-core/bats-preprocess b/tests/bash-bats/bats-core/libexec/bats-core/bats-preprocess
new file mode 100755
index 00000000000..8e31705cbc9
--- /dev/null
+++ b/tests/bash-bats/bats-core/libexec/bats-core/bats-preprocess
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+set -e
+
+bats_encode_test_name() {
+  local name="$1"
+  local result='test_'
+  local hex_code
+
+  if [[ ! "$name" =~ [^[:alnum:]\ _-] ]]; then
+    name="${name//_/-5f}"
+    name="${name//-/-2d}"
+    name="${name// /_}"
+    result+="$name"
+  else
+    local length="${#name}"
+    local char i
+
+    for ((i=0; i<length; i++)); do
+      char="${name:$i:1}"
+      if [[ "$char" == ' ' ]]; then
+        result+='_'
+      elif [[ "$char" =~ [[:alnum:]] ]]; then
+        result+="$char"
+      else
+        printf -v 'hex_code' -- '-%02x' \'"$char"
+        result+="$hex_code"
+      fi
+    done
+  fi
+
+  printf -v "$2" '%s' "$result"
+}
+
+test_file="$1"
+tests=()
+
+{
+  while IFS= read -r line; do
+    line="${line//$'\r'}"
+    if [[ "$line" =~ $BATS_TEST_PATTERN ]]; then
+      name="${BASH_REMATCH[1]#[\'\"]}"
+      name="${name%[\'\"]}"
+      body="${BASH_REMATCH[2]}"
+      bats_encode_test_name "$name" 'encoded_name'
+      printf '%s() { bats_test_begin "%s"; %s\n' "$encoded_name" "$name" "$body" || :
+
+      if [[ -z "$BATS_TEST_FILTER" || "$name" =~ $BATS_TEST_FILTER ]]; then
+        tests+=("$encoded_name")
+      fi
+    else
+      printf '%s\n' "$line"
+    fi
+  done
+} <<< "$(< "$test_file")"$'\n'
+
+for test_name in "${tests[@]}"; do
+  printf 'bats_test_function %s\n' "$test_name"
+done
diff --git a/tests/bash-bats/eosio_build.bash b/tests/bash-bats/eosio_build.bash
new file mode 100644
index 00000000000..1037f497f7b
--- /dev/null
+++ b/tests/bash-bats/eosio_build.bash
@@ -0,0 +1,75 @@
+#!/usr/bin/env bats
+load helpers/general
+
+SCRIPT_LOCATION="scripts/eosio_build.bash"
+TEST_LABEL="[eosio_build]"
+
+###################################################################
+# ON MAC YOU NEED TO FULLY UNINSTALL EOSIO BEFORE THESE WILL PASS #
+###################################################################
+
+# A helper function is available to show output and status: `debug`
+@test "${TEST_LABEL} > Testing Arguments & Options" {
+
+    if [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]]; then
+        # which package isn't installed
+        uninstall-package which WETRUN &>/dev/null
+        run bash -c "printf \"n\nn\n\" | ./scripts/eosio_build.bash"
+        [[ ! -z $(echo "${output}" | grep "EOSIO compiler checks require the 'which'") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "Please install the 'which'") ]] || exit
+    fi
+
+    if [[ $ARCH == "Linux" ]]; then
+        if [[ $NAME == "CentOS Linux" ]]; then # Centos has the SCL prompt before checking for the compiler
+            # No c++!
+            run bash -c "printf \"y\ny\nn\n\" | ./${SCRIPT_LOCATION}"
+        else
+            # No c++!
+            run bash -c "printf \"y\nn\nn\n\" | ./${SCRIPT_LOCATION}"
+        fi
+        [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
+    fi 
+
+    # -P with -y
+    run bash -c "./$SCRIPT_LOCATION -y -P"
+    [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
+    [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
+    [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit
+    # -P with prompts
+    run bash -c "printf \"n\nn\nn\n\" | ./$SCRIPT_LOCATION -P"
+    [[ "${output}" =~ .*User.aborted.* ]] || exit
+    # lack of -m
+    [[ ! -z $(echo "${output}" | grep "ENABLE_MONGO: false") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "INSTALL_MONGO: false") ]] || exit
+    # lack of -i
+    [[ ! -z $(echo "${output}" | grep "INSTALL_LOCATION: ${HOME}") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "EOSIO_INSTALL_DIR: ${HOME}/eosio/${EOSIO_VERSION}") ]] || exit
+    ## -o
+    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -o Debug -P"
+    [[ ! -z $(echo "${output}" | grep "CMAKE_BUILD_TYPE: Debug") ]] || exit
+    ## -s
+    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -s EOS2 -P"
+    [[ ! -z $(echo "${output}" | grep "CORE_SYMBOL_NAME: EOS2") ]] || exit
+    ## -b
+    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -b /test -P"
+    [[ ! -z $(echo "${output}" | grep "BOOST_LOCATION: /test") ]] || exit
+    ## -i
+    run bash -c "printf \"y\nn\nn\n\"| ./$SCRIPT_LOCATION -i /NEWPATH -P"
+    [[ ! -z $(echo "${output}" | grep "INSTALL_LOCATION: /NEWPATH") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "TEMP_DIR: /NEWPATH/tmp") ]] || exit
+    ## -c
+    run bash -c "printf \"y\nn\nn\n\"| ./$SCRIPT_LOCATION -c -P"
+    [[ ! -z $(echo "${output}" | grep "ENABLE_COVERAGE_TESTING: true") ]] || exit
+    ## -d
+    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -d -P"
+    [[ ! -z $(echo "${output}" | grep "ENABLE_DOXYGEN: true") ]] || exit
+    ## -m
+    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -m -y -P"
+    [[ ! -z $(echo "${output}" | grep "ENABLE_MONGO: true") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "INSTALL_MONGO: true") ]] || exit
+    ## -h / -anythingwedon'tsupport
+    run bash -c "./$SCRIPT_LOCATION -z"
+    [[ ! -z $(echo "${output}" | grep "Invalid Option!") ]] || exit
+    run bash -c "./$SCRIPT_LOCATION -h"
+    [[ ! -z $(echo "${output}" | grep "Usage:") ]] || exit
+}
\ No newline at end of file
diff --git a/tests/bash-bats/eosio_build_amazonlinux.bash b/tests/bash-bats/eosio_build_amazonlinux.bash
new file mode 100644
index 00000000000..600b4258520
--- /dev/null
+++ b/tests/bash-bats/eosio_build_amazonlinux.bash
@@ -0,0 +1,49 @@
+#!/usr/bin/env bats
+load helpers/general
+export SCRIPT_LOCATION="scripts/eosio_build.bash"
+export TEST_LABEL="[eosio_build_amazonlinux]"
+
+[[ $ARCH == "Linux" ]] || exit 0 # Skip if we're not on linux
+( [[ $NAME == "Amazon Linux AMI" ]] || [[ $NAME == "Amazon Linux" ]] ) || exit 0 # Exit 0 is required for pipeline
+
+# A helper function is available to show output and status: `debug`
+
+# Testing Root user
+./tests/bash-bats/modules/root-user.bash
+# Testing Options
+./tests/bash-bats/modules/dep_script_options.bash
+# Testing CMAKE
+./tests/bash-bats/modules/cmake.bash
+# Testing Clang
+./tests/bash-bats/modules/clang.bash
+# Testing MongoDB
+./tests/bash-bats/modules/mongodb.bash
+
+## Needed to load eosio_build_ files properly; it can be empty
+@test "${TEST_LABEL} > General" {
+    set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
+
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P"
+    [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
+    ### Make sure deps are loaded properly
+    [[ ! -z $(echo "${output}" | grep "Executing: cd ${SRC_DIR}") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
+    if [[ $NAME == "Amazon Linux" ]]; then
+        [[ ! -z $(echo "${output}" | grep "libstdc++.*found!") ]] || exit
+    elif [[ $NAME == "Amazon Linux AMI" ]]; then
+        [[ ! -z $(echo "${output}" | grep "make.*found!") ]] || exit
+    fi
+    [[ ! -z $(echo "${output}" | grep "sudo.*NOT.*found.") ]] || exit
+    [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
+    [[ ! -z $(echo "${output}" | grep ${HOME}.*/src/boost) ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
+    [[ -z $(echo "${output}" | grep "MongoDB C++ driver successfully installed") ]] || exit # Mongo is off
+    # Ensure PIN_COMPILER=false uses proper flags for the various installs
+    install-package gcc-c++ WETRUN
+    run bash -c "./$SCRIPT_LOCATION -y"
+    [[ ! -z $(echo "${output}" | grep " -G 'Unix Makefiles'") ]] || exit # CMAKE
+    [[ ! -z $(echo "${output}" | grep " --with-iostreams --with-date_time") ]] || exit # BOOST
+    uninstall-package gcc-c++ WETRUN
+}
\ No newline at end of file
diff --git a/tests/bash-bats/eosio_build_centos.bash b/tests/bash-bats/eosio_build_centos.bash
new file mode 100644
index 00000000000..bcb6f1425cb
--- /dev/null
+++ b/tests/bash-bats/eosio_build_centos.bash
@@ -0,0 +1,48 @@
+#!/usr/bin/env bats
+load helpers/general
+
+export SCRIPT_LOCATION="scripts/eosio_build.bash"
+export TEST_LABEL="[eosio_build_centos]"
+
+[[ $ARCH == "Linux" ]] || exit 0 # Exit 0 is required for pipeline
+[[ $NAME == "CentOS Linux" ]] || exit 0 # Exit 0 is required for pipeline
+
+# A helper function is available to show output and status: `debug`
+
+# Testing Root user
+./tests/bash-bats/modules/root-user.bash
+# Testing Options
+./tests/bash-bats/modules/dep_script_options.bash
+# Testing CMAKE
+./tests/bash-bats/modules/cmake.bash
+# Testing Clang
+./tests/bash-bats/modules/clang.bash
+# Testing MongoDB
+./tests/bash-bats/modules/mongodb.bash
+
+## Needed to load eosio_build_ files properly; it can be empty
+@test "${TEST_LABEL} > General" {
+    set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
+
+    execute-always yum -y --enablerepo=extras install centos-release-scl &>/dev/null
+    install-package devtoolset-7 WETRUN &>/dev/null
+    # Ensure SCL and devtoolset-7 for c++ binary installation
+    run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION}"
+    [[ ! -z $(echo "${output}" | grep "centos-release-scl-2-3.el7.centos.noarch found") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "devtoolset-7-7.1-4.el7.x86_64 found") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-7/enable") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Python36 successfully enabled") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "python.*found!") ]] || exit
+    [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Ensuring CMAKE") ]] || exit
+    [[ ! -z $(echo "${output}" | grep ${HOME}.*/src/boost) ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
+    uninstall-package devtoolset-7* WETRUN &>/dev/null
+    uninstall-package centos-release-scl WETRUN &>/dev/null
+
+}
\ No newline at end of file
diff --git a/tests/bash-bats/eosio_build_darwin.bash b/tests/bash-bats/eosio_build_darwin.bash
new file mode 100644
index 00000000000..14bc6eb4624
--- /dev/null
+++ b/tests/bash-bats/eosio_build_darwin.bash
@@ -0,0 +1,43 @@
+#!/usr/bin/env bats
+load helpers/general
+
+export SCRIPT_LOCATION="scripts/eosio_build.bash"
+export TEST_LABEL="[eosio_build_darwin]"
+
+[[ $ARCH == "Darwin" ]] || exit 0 # Exit 0 is required for pipeline
+[[ $NAME == "Mac OS X" ]] || exit 0 # Exit 0 is required for pipeline
+
+# A helper function is available to show output and status: `debug`
+
+# Testing Root user
+./tests/bash-bats/modules/root-user.bash
+# Testing Options
+./tests/bash-bats/modules/dep_script_options.bash
+# Testing CMAKE
+./tests/bash-bats/modules/cmake.bash
+# Testing Clang
+./tests/bash-bats/modules/clang.bash
+# Testing MongoDB
+./tests/bash-bats/modules/mongodb.bash
+
+## Needed to load eosio_build_ files properly; it can be empty
+@test "${TEST_LABEL} > General" {
+    set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
+
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+    [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
+    ### Make sure deps are loaded properly
+    [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: /usr/bin/xcode-select --install") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "automake.*NOT.*found") ]] || exit
+    [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
+    rm -f $CMAKE
+    [[ ! -z $(echo "${output}" | grep "[Updating HomeBrew]") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "brew tap eosio/eosio") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "brew install.*llvm@4.*") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "LLVM successfully linked from /usr/local/opt/llvm@4") ]] || exit
+    [[ ! -z $(echo "${output}" | grep ${HOME}.*/src/boost) ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
+    [[ ! -z $(echo "${output}" | grep " --with-iostreams --with-date_time") ]] || exit # BOOST
+    [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
+}
\ No newline at end of file
diff --git a/tests/bash-bats/eosio_build_ubuntu.bash b/tests/bash-bats/eosio_build_ubuntu.bash
new file mode 100644
index 00000000000..2adbdcb7754
--- /dev/null
+++ b/tests/bash-bats/eosio_build_ubuntu.bash
@@ -0,0 +1,46 @@
+#!/usr/bin/env bats
+load helpers/general
+
+export SCRIPT_LOCATION="scripts/eosio_build.bash"
+export TEST_LABEL="[eosio_build_ubuntu]"
+
+[[ $ARCH == "Linux" ]] || exit 0 # Exit 0 is required for pipeline
+[[ $NAME == "Ubuntu" ]] || exit 0 # Exit 0 is required for pipeline
+( [[ $VERSION_ID == "18.04" ]] || [[ $VERSION_ID == "16.04" ]] ) || exit 0 # Exit 0 is required for pipeline
+
+# A helper function is available to show output and status: `debug`
+
+# Testing Root user
+./tests/bash-bats/modules/root-user.bash
+# Testing Options
+./tests/bash-bats/modules/dep_script_options.bash
+# Testing CMAKE
+./tests/bash-bats/modules/cmake.bash
+# Testing Clang
+./tests/bash-bats/modules/clang.bash
+# Testing MongoDB
+./tests/bash-bats/modules/mongodb.bash
+
+## Needed to load eosio_build_ files properly; it can be empty
+@test "${TEST_LABEL} > General" {
+    set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
+
+    # Testing clang already existing (no pinning of clang8)
+    [[ "$(echo ${VERSION_ID})" == "16.04" ]] && install-package clang WETRUN &>/dev/null || install-package build-essential WETRUN
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+    
+    [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
+    [[ ! -z $(echo "${output}" | grep python.*found) ]] || exit
+    [[ ! -z $(echo "${output}" | grep make.*NOT.*found) ]] || exit
+    [[ ! -z $(echo "${output}" | grep ${HOME}.*/src/boost) ]] || exit
+    [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
+    [[ ! -z $(echo "${output}" | grep " --with-iostreams --with-date_time") ]] || exit # BOOST
+    if [[ "$(echo ${VERSION_ID})" == "18.04" ]]; then
+        [[ ! -z $(echo "${output}" | grep llvm-4.0.*found) ]] || exit
+    fi
+    [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
+    [[ -z $(echo "${output}" | grep lcov.*found.) ]] || exit
+    [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
+    [[ "$(echo ${VERSION_ID})" == "16.04" ]] && uninstall-package clang WETRUN || uninstall-package build-essential WETRUN
+}
diff --git a/tests/bash-bats/eosio_uninstall.bash b/tests/bash-bats/eosio_uninstall.bash
new file mode 100644
index 00000000000..df3ec6154df
--- /dev/null
+++ b/tests/bash-bats/eosio_uninstall.bash
@@ -0,0 +1,75 @@
+#!/usr/bin/env bats
+load helpers/general
+
+SCRIPT_LOCATION="scripts/eosio_uninstall.bash"
+TEST_LABEL="[eosio_uninstall]"
+
+mkdir -p $SRC_DIR
+mkdir -p $OPT_DIR
+mkdir -p $VAR_DIR
+mkdir -p $BIN_DIR
+mkdir -p $VAR_DIR/log
+mkdir -p $ETC_DIR
+mkdir -p $LIB_DIR
+mkdir -p $MONGODB_LOG_DIR
+mkdir -p $MONGODB_DATA_DIR
+
+# A helper function is available to show output and status: `debug`
+
+@test "${TEST_LABEL} > Usage is visible with right interaction" {
+  run ./$SCRIPT_LOCATION -help
+  [[ $output =~ "Usage ---" ]] || exit
+  run ./$SCRIPT_LOCATION --help
+  [[ $output =~ "Usage ---" ]] || exit
+  run ./$SCRIPT_LOCATION help
+  [[ $output =~ "Usage ---" ]] || exit
+  run ./$SCRIPT_LOCATION blah
+  [[ $output =~ "Usage ---" ]] || exit
+}
+
+@test "${TEST_LABEL} > Testing user prompts" {
+  ## No y or no warning and re-prompt
+  run bash -c "echo -e \"\nx\nx\nx\" | ./$SCRIPT_LOCATION"
+  ( [[ "${lines[${#lines[@]}-1]}" == "Please type 'y' for yes or 'n' for no." ]] && [[ "${lines[${#lines[@]}-2]}" == "Please type 'y' for yes or 'n' for no." ]] ) || exit
+  ## All yes pass
+  run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+  [[ "${output##*$'\n'}" == "[EOSIO Removal Complete]" ]] || exit
+  ## First no shows "Cancelled..."
+  run bash -c "echo \"n\" | ./$SCRIPT_LOCATION"
+  [[ "${output##*$'\n'}" =~ "Cancelled EOSIO Removal!" ]] || exit
+  ## What would you like to do?"
+  run bash -c "echo \"\" | ./$SCRIPT_LOCATION"
+  [[ "${output##*$'\n'}" =~ "What would you like to do?" ]] || exit
+}
+
+@test "${TEST_LABEL} > Testing executions" {
+  run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+  ### Make sure deps are loaded properly
+  [[ "${output}" =~ "Executing: rm -rf" ]] || exit
+  [[ $ARCH == "Darwin" ]] && ( [[ "${output}" =~ "Executing: brew uninstall cmake --force" ]] || exit )
+  # Legacy support
+  [[ ! -z $( echo $output | grep "Executing: rmdir ${HOME}/src") ]] || exit
+}
+
+
+@test "${TEST_LABEL} > --force" {
+  run ./$SCRIPT_LOCATION --force
+  # Make sure we reach the end
+  [[ "${output##*$'\n'}" == "[EOSIO Removal Complete]" ]] || exit
+}
+
+@test "${TEST_LABEL} > --force + --full" {
+  run ./$SCRIPT_LOCATION --force --full
+  ([[ ! "${output[*]}" =~ "Library/Application\ Support/eosio" ]] && [[ ! "${output[*]}" =~ ".local/share/eosio" ]]) && exit
+  [[ "${output##*$'\n'}" == "[EOSIO Removal Complete]" ]] || exit
+}
+
+rm -rf $SRC_DIR
+rm -rf $OPT_DIR
+rm -rf $VAR_DIR
+rm -rf $BIN_DIR
+rm -rf $VAR_DIR/log
+rm -rf $ETC_DIR
+rm -rf $LIB_DIR
+rm -rf $MONGODB_LOG_DIR
+rm -rf $MONGODB_DATA_DIR
\ No newline at end of file
diff --git a/tests/bash-bats/helpers.bash b/tests/bash-bats/helpers.bash
new file mode 100644
index 00000000000..4febec1988b
--- /dev/null
+++ b/tests/bash-bats/helpers.bash
@@ -0,0 +1,48 @@
+#!/usr/bin/env bats
+load helpers/general
+
+# A helper function is available to show output and status: `debug`
+
+# Load helpers (BE CAREFUL)
+. ./scripts/helpers/general.bash
+
+TEST_LABEL="[helpers]"
+
+@test "${TEST_LABEL} > execute > dryrun" {
+  ## DRYRUN WORKS (true, false, and empty)
+  run execute exit 1
+  ( [[ $output =~ "Executing: exit 1" ]] && [[ $status -eq 0 ]] ) || exit
+  DRYRUN=false
+  run execute exit 1
+  ( [[ $output =~ "Executing: exit 1" ]] && [[ $status -eq 1 ]] ) || exit
+}
+
+@test "${TEST_LABEL} > execute > verbose" {
+  ## VERBOSE WORKS (true, false, and empty)
+  run execute echo "VERBOSE!"
+  ( [[ $output =~ "Executing: echo VERBOSE!" ]] && [[ $status -eq 0 ]] ) || exit
+  VERBOSE=false
+  run execute echo "VERBOSE!"
+  ( [[ ! $output =~ "Executing: echo VERBOSE!" ]] && [[ $status -eq 0 ]] ) || exit
+  VERBOSE=
+  ( [[ ! $output =~ "Executing: echo VERBOSE!" ]] && [[ $status -eq 0 ]] ) || exit
+}
+
+@test "${TEST_LABEL} > previous install prompt" {
+  NONINTERACTIVE=true
+  PROCEED=true
+  # Doesn't exists, no output
+  run previous-install-prompt
+  [[ -z $(echo "${output}") ]] || exit
+  # Exists, prompt
+  mkdir -p $EOSIO_INSTALL_DIR
+  run previous-install-prompt
+  [[ ! -z $(echo "${output}" | grep "EOSIO has already been installed into ${EOSIO_INSTALL_DIR}") ]] || exit
+  rm -rf $EOSIO_INSTALL_DIR
+}
+
+@test "${TEST_LABEL} > TEMP_DIR" {
+  run setup
+  [[ -z $(echo "${output}" | grep "Executing: rm -rf ${REPO_ROOT}/../tmp/*") ]] || exit
+  [[ -z $(echo "${output}" | grep "Executing: mkdir -p ${REPO_ROOT}/../tmp") ]] || exit
+}
\ No newline at end of file
diff --git a/tests/bash-bats/helpers/functions.bash b/tests/bash-bats/helpers/functions.bash
new file mode 100644
index 00000000000..480acd8dc08
--- /dev/null
+++ b/tests/bash-bats/helpers/functions.bash
@@ -0,0 +1,28 @@
+. ./scripts/helpers/eosio.bash # Obtain dependency versions and paths
+
+function debug() {
+  printf " ---------\\n STATUS: ${status}\\n${output}\\n ---------\\n\\n" >&3
+}
+
+function setup-bats-dirs () {
+    if [[ ! $HOME =~ "/$(whoami)" ]]; then 
+        mkdir -p $HOME
+    fi
+    if [[ $TEMP_DIR =~ "${HOME}" ]]; then # Protection
+        mkdir -p $TEMP_DIR
+        rm -rf $TEMP_DIR/*
+    fi
+}
+setup-bats-dirs
+
+function teardown() { # teardown is run once after each test, even if it fails
+  [[ -d "$HOME" ]] && rm -rf "$HOME"
+  [[ -d /opt/rh/devtoolset-7 ]] && rm -rf /opt/rh/devtoolset-7
+  uninstall-package which WETRUN
+  uninstall-package sudo WETRUN
+  uninstall-package devtoolset-7* WETRUN
+  uninstall-package centos-release-scl
+  uninstall-package gcc-c++ WETRUN
+  uninstall-package build-essential WETRUN
+}
+trap teardown EXIT
\ No newline at end of file
diff --git a/tests/bash-bats/helpers/general.bash b/tests/bash-bats/helpers/general.bash
new file mode 100644
index 00000000000..44ef520367c
--- /dev/null
+++ b/tests/bash-bats/helpers/general.bash
@@ -0,0 +1,21 @@
+#!/usr/bin/env bats
+
+# You can add `load helpers/general` to the .bats files you create to include anything in this file.
+# DO NOT REMOVE
+export DRYRUN=true
+export VERBOSE=true
+export BATS_RUN=true
+export CURRENT_USER=$(whoami)
+export HOME="$BATS_TMPDIR/bats-eosio-user-home" # Ensure $HOME is available for all scripts
+load helpers/functions
+
+if [[ $NAME == "Ubuntu" ]]; then # Ubuntu won't find any packages until this runs + ensure update only runs once
+  [[ -z $(find /tmp/apt-updated -mmin -60 2>/dev/null) ]] && apt-get update &>/dev/null
+  [[ ! -f /tmp/apt-updated ]] && touch /tmp/apt-updated
+fi
+
+# Ensure we're in the root directory to execute
+if [[ ! -d "tests" ]] && [[ ! -f "README.md" ]]; then
+  echo "You must navigate into the root directory to execute tests..." >&3
+  exit 1
+fi
\ No newline at end of file
diff --git a/tests/bash-bats/modules/clang.bash b/tests/bash-bats/modules/clang.bash
new file mode 100755
index 00000000000..ae218af2b2e
--- /dev/null
+++ b/tests/bash-bats/modules/clang.bash
@@ -0,0 +1,35 @@
+#!/usr/bin/env bats
+load ../helpers/functions
+
+@test "${TEST_LABEL} > Testing CLANG" {
+
+    if [[ $NAME == "Darwin" ]]; then
+        run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+        ## CLANG already exists (c++/default)
+        [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "DCMAKE_CXX_COMPILER='c++'") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "DCMAKE_C_COMPILER='cc'") ]] || exit
+    elif [[ $NAME == "Ubuntu" ]]; then
+        install-package build-essential WETRUN 1>/dev/null # ubuntu 18 build-essential will be high enough, 16 won't and has a version < 7
+        run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+        ## CLANG already exists (c++/default) (Ubuntu doesn't have clang>7, so we need to make sure it installs Clang 8)
+        [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: false") ]] || exit
+        if [[ $VERSION_ID == "16.04" ]]; then
+            [[ ! -z $(echo "${output}" | grep "Unable to find C++17 support") ]] || exit
+            [[ ! -z $(echo "${output}" | grep "Clang 8 successfully installed") ]] || exit
+            [[ ! -z $(echo "${output}" | grep "$CLANG_ROOT") ]] || exit
+        fi
+        ## CLANG
+        uninstall-package build-essential WETRUN 1>/dev/null
+        run bash -c "./$SCRIPT_LOCATION -y -P"
+        [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "Clang 8 successfully installed") ]] || exit
+        [[ ! -z $(echo "${output}" | grep -E "Clang.*successfully installed @ ${CLANG_ROOT}") ]] || exit
+    fi
+    ## CXX doesn't exist
+    export CXX=c2234
+    export CC=ewwqd
+    run bash -c "./$SCRIPT_LOCATION -y"
+    [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
+    
+}
\ No newline at end of file
diff --git a/tests/bash-bats/modules/cmake.bash b/tests/bash-bats/modules/cmake.bash
new file mode 100755
index 00000000000..89b5b6dd883
--- /dev/null
+++ b/tests/bash-bats/modules/cmake.bash
@@ -0,0 +1,19 @@
+#!/usr/bin/env bats
+load ../helpers/functions
+
+@test "${TEST_LABEL} > Testing CMAKE" {
+    # Testing for if CMAKE already exists
+    export CMAKE=${HOME}/cmake
+    touch $CMAKE
+    run bash -c " ./$SCRIPT_LOCATION -y -P"
+    [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${HOME}/cmake") ]] || exit
+    # Testing for if cmake doesn't exist to be sure it's set properly
+    export CMAKE=
+    run bash -c "./$SCRIPT_LOCATION -y -P"
+    if [[ $ARCH == "Darwin" ]]; then
+        [[ ! -z $(echo "${output}" | grep "Executing: bash -c /usr/local/bin/cmake -DCMAKE_BUILD") ]] || exit
+    else
+        [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${BIN_DIR}/cmake") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "CMAKE successfully installed") ]] || exit
+    fi
+}
\ No newline at end of file
diff --git a/tests/bash-bats/modules/dep_script_options.bash b/tests/bash-bats/modules/dep_script_options.bash
new file mode 100755
index 00000000000..a34968e5df7
--- /dev/null
+++ b/tests/bash-bats/modules/dep_script_options.bash
@@ -0,0 +1,16 @@
+#!/usr/bin/env bats
+load ../helpers/functions
+
+@test "${TEST_LABEL} > Testing Options" {
+    mkdir -p $HOME/test/tmp
+    run bash -c "./$SCRIPT_LOCATION -y -P -i $HOME/test -b /boost_tmp -m"
+    [[ ! -z $(echo "${output}" | grep "CMAKE_INSTALL_PREFIX='${HOME}/test/eosio/${EOSIO_VERSION}") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "@ /boost_tmp") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Ensuring MongoDB installation") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "MongoDB C driver successfully installed") ]] || exit
+    if [[ $ARCH == "Linux" ]]; then
+        ( [[ ! -z $(echo "${output}" | grep "ENABLE_SNAPPY=OFF -DCMAKE_TOOLCHAIN_FILE='$BUILD_DIR/pinned_toolchain.cmake'") ]] ) || exit # MySQL install
+    fi
+    [[ ! -z $(echo "${output}" | grep "CMAKE_TOOLCHAIN_FILE='$BUILD_DIR/pinned_toolchain.cmake' -DCMAKE_PREFIX_PATH") ]] || exit # cmake build
+    [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
+}
\ No newline at end of file
diff --git a/tests/bash-bats/modules/mongodb.bash b/tests/bash-bats/modules/mongodb.bash
new file mode 100755
index 00000000000..1391677d761
--- /dev/null
+++ b/tests/bash-bats/modules/mongodb.bash
@@ -0,0 +1,17 @@
+#!/usr/bin/env bats
+load ../helpers/functions
+
+@test "${TEST_LABEL} > MongoDB" {
+    # Existing MongoDB
+    if [[ $NAME == "CentOS Linux" ]] || [[ $NAME == "Amazon Linux" ]]; then
+        run bash -c "printf \"y\nn\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P" # which prompt requires first y
+    else
+        run bash -c "printf \"n\nn\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P"
+    fi
+    [[ ! -z $(echo "${output}" | grep "Existing MongoDB will be used") ]] || exit
+    [[ -z $(echo "${output}" | grep "Ensuring MongoDB installation") ]] || exit
+    # Installing ours
+    run bash -c "printf \"y\ny\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P"
+    [[ -z $(echo "${output}" | grep "Existing MongoDB will be used") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Ensuring MongoDB installation") ]] || exit
+}
diff --git a/tests/bash-bats/modules/root-user.bash b/tests/bash-bats/modules/root-user.bash
new file mode 100755
index 00000000000..6fb156cf4d3
--- /dev/null
+++ b/tests/bash-bats/modules/root-user.bash
@@ -0,0 +1,24 @@
+#!/usr/bin/env bats
+load ../helpers/functions
+
+@test "${TEST_LABEL} > Testing root user run" {
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P"
+    [[ ! -z $(echo "${output}" | grep "User: $(whoami)") ]] || exit
+    if [[ $ARCH == "Linux" ]]; then
+        [[ -z $(echo "${output}" | grep "$SUDO_LOCATION -E") ]] || exit
+    fi
+    export CURRENT_USER=test
+    run bash -c "printf \"n\n\" | ./$SCRIPT_LOCATION -P"
+    [[ ! -z $(echo "${output}" | grep "User: test") ]] || exit
+    if [[ $ARCH == "Linux" ]]; then
+        [[ ! -z $(echo "${output}" | grep "Please install the 'sudo' command before proceeding") ]] || exit
+    fi
+    install-package sudo WETRUN
+    export SUDO_LOCATION=$( command -v sudo )
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P"
+    [[ ! -z $(echo "${output}" | grep "User: test") ]] || exit
+    if [[ $ARCH == "Linux" ]]; then
+        [[ ! -z $(echo "${output}" | grep "$SUDO_LOCATION -E .* install -y .*") ]] || exit
+    fi
+
+}
\ No newline at end of file

From 161f765637cf98a3c76db3712c7677f2c77049fa Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 23 May 2019 16:03:39 -0400
Subject: [PATCH 0466/1648] set the schedule_hash for block signature digests
 correctly based on the activation of the protocol features.  Added v2
 snapshots based on a deterministic blockchain and added test to make sure
 that recreateing the blockchain and loading the compatible snapshot produce
 the same integrity hash

---
 libraries/chain/block_header_state.cpp |  16 +++++++++-------
 libraries/chain/controller.cpp         |   4 +++-
 unittests/snapshot_tests.cpp           |   2 ++
 unittests/snapshots/CMakeLists.txt     |   2 ++
 unittests/snapshots/snap_v2.bin.gz     | Bin 0 -> 15756 bytes
 unittests/snapshots/snap_v2.json.gz    | Bin 0 -> 38317 bytes
 6 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 unittests/snapshots/CMakeLists.txt
 create mode 100644 unittests/snapshots/snap_v2.bin.gz
 create mode 100644 unittests/snapshots/snap_v2.json.gz

diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index f640e0ba1a5..62dbb2c4e2e 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -234,12 +234,16 @@ namespace eosio { namespace chain {
       auto exts = h.validate_and_extract_header_extensions();
 
       std::optional<producer_authority_schedule> maybe_new_producer_schedule;
+      std::optional<digest_type> maybe_new_producer_schedule_hash;
+      bool wtmsig_enabled = false;
 
-      if( h.new_producers ) {
+      if (h.new_producers || exts.count(producer_schedule_change_extension::extension_id()) > 0 ) {
          auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
          const auto& protocol_features = prev_activated_protocol_features->protocol_features;
-         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+         wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+      }
 
+      if( h.new_producers ) {
          EOS_ASSERT(!wtmsig_enabled, producer_schedule_exception, "Block header contains legacy producer schedule outdated by activation of WTMsig Block Signatures" );
 
          EOS_ASSERT( !was_pending_promoted, producer_schedule_exception, "cannot set pending producer schedule in the same block in which pending was promoted to active" );
@@ -249,14 +253,11 @@ namespace eosio { namespace chain {
          EOS_ASSERT( prev_pending_schedule.schedule.producers.empty(), producer_schedule_exception,
                     "cannot set new pending producers until last pending is confirmed" );
 
+         maybe_new_producer_schedule_hash.emplace(digest_type::hash(new_producers));
          maybe_new_producer_schedule.emplace(new_producers);
       }
 
       if ( exts.count(producer_schedule_change_extension::extension_id()) > 0 ) {
-         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
-         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
-         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
-
          EOS_ASSERT(wtmsig_enabled, producer_schedule_exception, "Block header producer_schedule_change_extension before activation of WTMsig Block Signatures" );
          EOS_ASSERT( !was_pending_promoted, producer_schedule_exception, "cannot set pending producer schedule in the same block in which pending was promoted to active" );
 
@@ -266,6 +267,7 @@ namespace eosio { namespace chain {
          EOS_ASSERT( prev_pending_schedule.schedule.producers.empty(), producer_schedule_exception,
                      "cannot set new pending producers until last pending is confirmed" );
 
+         maybe_new_producer_schedule_hash.emplace(digest_type::hash(new_producer_schedule));
          maybe_new_producer_schedule.emplace(new_producer_schedule);
       }
 
@@ -295,7 +297,7 @@ namespace eosio { namespace chain {
 
       if( maybe_new_producer_schedule ) {
          result.pending_schedule.schedule = std::move(*maybe_new_producer_schedule);
-         result.pending_schedule.schedule_hash = digest_type::hash(result.pending_schedule.schedule);
+         result.pending_schedule.schedule_hash = std::move(*maybe_new_producer_schedule_hash);
          result.pending_schedule.schedule_lib_num    = block_number;
       } else {
          if( was_pending_promoted ) {
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index b5bfd25c535..42bc992bcb3 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -432,11 +432,13 @@ struct controller_impl {
    void initialize_blockchain_state() {
       wlog( "Initializing new blockchain with genesis state" );
       producer_authority_schedule initial_schedule = { 0, { producer_authority{config::system_account_name, block_signing_authority_v0{ 1, {{conf.genesis.initial_key, 1}} } } } };
+      legacy::producer_schedule_type initial_legacy_schedule{ 0, {{config::system_account_name, conf.genesis.initial_key}} };
 
       block_header_state genheader;
       genheader.active_schedule                = initial_schedule;
       genheader.pending_schedule.schedule      = initial_schedule;
-      genheader.pending_schedule.schedule_hash = fc::sha256::hash(initial_schedule);
+      // TODO: if wtmsig block signatures are enabled this should be the hash of the producer authority
+      genheader.pending_schedule.schedule_hash = fc::sha256::hash(initial_legacy_schedule);
       genheader.header.timestamp               = conf.genesis.initial_timestamp;
       genheader.header.action_mroot            = conf.genesis.compute_chain_id();
       genheader.id                             = genheader.header.id();
diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index 542bfcdfaad..7d73f757e40 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -278,6 +278,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot
       snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
       auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();
 
+      BOOST_CHECK_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
+
       // create a latest snapshot
       auto latest_writer = SNAPSHOT_SUITE::get_writer();
       v2_tester.control->write_snapshot(latest_writer);
diff --git a/unittests/snapshots/CMakeLists.txt b/unittests/snapshots/CMakeLists.txt
new file mode 100644
index 00000000000..f22b0f72d2e
--- /dev/null
+++ b/unittests/snapshots/CMakeLists.txt
@@ -0,0 +1,2 @@
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v2.bin.gz ${CMAKE_CURRENT_BINARY_DIR}/snap_v2.bin.gz COPYONLY )
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v2.json.gz  ${CMAKE_CURRENT_BINARY_DIR}/snap_v2.json.gz  COPYONLY )
diff --git a/unittests/snapshots/snap_v2.bin.gz b/unittests/snapshots/snap_v2.bin.gz
new file mode 100644
index 0000000000000000000000000000000000000000..541a429ca6cdc103ee4bf08d7b0eff7065a2112d
GIT binary patch
literal 15756
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
a`PJlLL(a7%$12X>j)@hp*D()%`+oq50Y(b|

literal 0
HcmV?d00001

diff --git a/unittests/snapshots/snap_v2.json.gz b/unittests/snapshots/snap_v2.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..1c2cf69b83e8201afa687ece99baab392de1dc93
GIT binary patch
literal 38317
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

literal 0
HcmV?d00001


From 63151b50832c1fb0a7304dea7d9a1e53a7fd15c4 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 23 May 2019 16:12:00 -0400
Subject: [PATCH 0467/1648] libraries fix

---
 libraries/chain/include/eosio/chain/exceptions.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 21925a166ff..da34027826d 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -272,11 +272,8 @@ namespace eosio { namespace chain {
                                     3040016, "Transaction includes an ill-formed deferred transaction generation context extension" )
       FC_DECLARE_DERIVED_EXCEPTION( disallowed_transaction_extensions_bad_block_exception, transaction_exception,
                                     3040017, "Transaction includes disallowed extensions (invalid block)" )
-<<<<<<< HEAD
-=======
       FC_DECLARE_DERIVED_EXCEPTION( tx_resource_exhaustion, transaction_exception,
                                     3040018, "Transaction exceeded transient resource limit" )
->>>>>>> develop
 
 
    FC_DECLARE_DERIVED_EXCEPTION( action_validate_exception, chain_exception,

From b09b79321082f5ff2c43145b62c0de86fddae2c0 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 23 May 2019 16:16:39 -0400
Subject: [PATCH 0468/1648] anka plugin bump to 0.5.0

---
 .buildkite/pipeline.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 419a84ccefc..6fc885efb16 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -52,7 +52,7 @@ steps:
     command:
       - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -m && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     plugins:
-      chef/anka#v0.4.4:
+      chef/anka#v0.5.0:
         no-volume: true
         inherit-environment-vars: true
         vm-name: $ANKA_MOJAVE_TEMPLATE
@@ -160,7 +160,7 @@ steps:
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
-      chef/anka#v0.4.4:
+      chef/anka#v0.5.0:
         no-volume: true
         inherit-environment-vars: true
         bash-interactive: true
@@ -182,7 +182,7 @@ steps:
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
-      chef/anka#v0.4.4:
+      chef/anka#v0.5.0:
         no-volume: true
         inherit-environment-vars: true
         bash-interactive: true
@@ -470,7 +470,7 @@ steps:
     agents:
       - "queue=mac-anka-node-fleet"
     plugins:
-      chef/anka#v0.4.4:
+      chef/anka#v0.5.0:
         no-volume: true
         inherit-environment-vars: true
         bash-interactive: true

From a41e6884eff116f4732864d8e4e62593091e71ce Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 23 May 2019 16:18:51 -0400
Subject: [PATCH 0469/1648] add a sigil that will trip once the unit test for
 version 2 is no longer necessary to maintain

---
 unittests/snapshot_tests.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index 7d73f757e40..a0de5cb41bc 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -265,15 +265,19 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot
 {
    tester chain(setup_policy::preactivate_feature_and_new_bios);
 
+   ///< Begin deterministic code to generate blockchain for comparison
+   // TODO: create a utility that will write new bin/json gzipped files based on this
    chain.create_account(N(snapshot));
    chain.produce_blocks(1);
    chain.set_code(N(snapshot), contracts::snapshot_test_wasm());
    chain.set_abi(N(snapshot), contracts::snapshot_test_abi().data());
    chain.produce_blocks(1);
    chain.control->abort_block();
+   ///< End deterministic code to generate blockchain for comparison
    auto base_integrity_value = chain.control->calculate_integrity_hash();
 
    {
+      static_assert(chain_snapshot_header::minimum_compatible_version <= 2, "version 2 unit test is no longer needed.  Please clean up data files");
       auto v2 = SNAPSHOT_SUITE::template load_from_file<snapshots::snap_v2>();
       snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
       auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();

From 7a25c2a56c1f6495bffa9f2cff7295a570b03fee Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 23 May 2019 17:02:52 -0400
Subject: [PATCH 0470/1648] quick fix for yum

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6fc885efb16..374ee2dae7a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -374,7 +374,7 @@ steps:
         buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
         tar -zxf build.tar.gz
         echo "+++ :microscope: Starting package build"
-        yum install -y rpm-build
+        sudo yum install -y rpm-build
         mkdir -p /home/cicd/rpmbuild/BUILD
         mkdir -p /home/cicd/rpmbuild/BUILDROOT
         mkdir -p /home/cicd/rpmbuild/RPMS

From 2f979f205d9221c49f8ae3c1458ffaa2846d07c3 Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Fri, 24 May 2019 10:43:53 +0800
Subject: [PATCH 0471/1648] another try

---
 tests/db_modes_test.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
index ec7c5cda842..bb5de4d08fd 100755
--- a/tests/db_modes_test.py
+++ b/tests/db_modes_test.py
@@ -27,7 +27,8 @@
 
 def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
     #ensure port 8888 is free
-    tries = 30
+    print("waiting port 8888 to be freed")
+    tries = 90
     while (tries > 0):
         try:
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -38,21 +39,24 @@ def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
             tries = 0
         except:
             tries = tries - 1
-            time.sleep(3)
+            time.sleep(1)
     # now start nodeos
     cmdArr= preCmd + nodeosCmd + extraCmd
-    proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    tries = 10
+    print("port is free now, start to run nodeosCmd with extra parameter \"%s\"" % (extraCmd))
+    proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, preexec_fn=os.setsid)
+    tries = 20
     ok = False
     while (tries > 0):
-        time.sleep(2)
+        time.sleep(1)
         reply = Utils.checkOutput(shlex.split(getInfoCmd), ignoreError=True)
         if reply.find("server_version") != -1:
             ok = True
+            time.sleep(1)
             break
         tries = tries - 1
-    os.kill(proc.pid, killsig)
-    print("executed nodeosCmd with extra parameter \"%s\", killsig %d, result %d" % (extraCmd, killsig, ok))
+    if ok is True:
+        os.killpg(os.getpgid(proc.pid), killsig)
+    print("got result %d, killed with signal %d" % (ok, killsig))
     return ok
 
 print("=== db_modes_test.py starts ===")

From 9d37e0dab4acc55e0b3a9ea75a9068c2ce957e02 Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Fri, 24 May 2019 12:14:45 +0800
Subject: [PATCH 0472/1648] find free port automatically

---
 tests/db_modes_test.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
index bb5de4d08fd..2977c7c4c55 100755
--- a/tests/db_modes_test.py
+++ b/tests/db_modes_test.py
@@ -20,35 +20,37 @@
 
 nodeosCmd="./programs/nodeos/nodeos -d {} --config-dir {} \
 --chain-state-db-size-mb 8 --chain-state-db-guard-size-mb 0 --reversible-blocks-db-size-mb 1 \
---reversible-blocks-db-guard-size-mb 0 -e -peosio --plugin eosio::chain_api_plugin \
---http-server-address=127.0.0.1:8888"
+--reversible-blocks-db-guard-size-mb 0 -e -peosio --plugin eosio::chain_api_plugin"
 
-getInfoCmd="./programs/cleos/cleos get info"
+cleosPath="./programs/cleos/cleos"
+port=8888
 
 def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
-    #ensure port 8888 is free
-    print("waiting port 8888 to be freed")
-    tries = 90
+    global port
+    port = 8888
+    print("looking for free ports")
+    tries = 200
     while (tries > 0):
         try:
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            server_address = ('127.0.0.1', 8888)
+            server_address = ('127.0.0.1', port)
             sock.bind(server_address)
             sock.close()
             time.sleep(1)
             tries = 0
         except:
             tries = tries - 1
-            time.sleep(1)
+            port = port + 1
     # now start nodeos
-    cmdArr= preCmd + nodeosCmd + extraCmd
-    print("port is free now, start to run nodeosCmd with extra parameter \"%s\"" % (extraCmd))
+    cmdArr= preCmd + nodeosCmd + " --http-server-address=127.0.0.1:" + str(port) + extraCmd
+    print("port %d is free now, start to run nodeosCmd with extra parameter \"%s\"" % (port, extraCmd))
     proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, preexec_fn=os.setsid)
-    tries = 20
+    tries = 10
     ok = False
+    getInfoCmd = cleosPath + " -u http://127.0.0.1:" + str(port) + "/ get info"
     while (tries > 0):
         time.sleep(1)
-        reply = Utils.checkOutput(shlex.split(getInfoCmd), ignoreError=True)
+        reply = Utils.checkOutput(getInfoCmd, ignoreError=True)
         if reply.find("server_version") != -1:
             ok = True
             time.sleep(1)

From 60857720c6dffa3d08d23f8d65fc37b071409ec8 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 23 May 2019 22:08:13 -0400
Subject: [PATCH 0473/1648] (fc sync) Fix certificate trust when trust settings
 is empty

When a certificate has no trust settings it is to be trusted
---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index fcc952b616e..5eb88e0f5c3 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit fcc952b616e5968a5b0898e051e3f56fe3a43245
+Subproject commit 5eb88e0f5c3d2881ae31ee020d76ff7570fb8503

From 016bd876d4d9c98ee9f67c4e2461d2653529646d Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 24 May 2019 09:53:02 -0400
Subject: [PATCH 0474/1648] throw error if trying to create non R1 key on SE or
 YubiHSM wallet

---
 plugins/wallet_plugin/se_wallet.cpp      | 1 +
 plugins/wallet_plugin/yubihsm_wallet.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/wallet_plugin/se_wallet.cpp b/plugins/wallet_plugin/se_wallet.cpp
index 2f9ccfffc06..64c8d0a46ba 100644
--- a/plugins/wallet_plugin/se_wallet.cpp
+++ b/plugins/wallet_plugin/se_wallet.cpp
@@ -362,6 +362,7 @@ bool se_wallet::import_key(string wif_key) {
 }
 
 string se_wallet::create_key(string key_type) {
+   EOS_ASSERT(key_type.empty() || key_type == "R1", chain::unsupported_key_type_exception, "Secure Enclave wallet only supports R1 keys");
    return (string)my->create();
 }
 
diff --git a/plugins/wallet_plugin/yubihsm_wallet.cpp b/plugins/wallet_plugin/yubihsm_wallet.cpp
index 0f367457fa0..04378916011 100644
--- a/plugins/wallet_plugin/yubihsm_wallet.cpp
+++ b/plugins/wallet_plugin/yubihsm_wallet.cpp
@@ -257,6 +257,7 @@ bool yubihsm_wallet::import_key(string wif_key) {
 }
 
 string yubihsm_wallet::create_key(string key_type) {
+   EOS_ASSERT(key_type.empty() || key_type == "R1", chain::unsupported_key_type_exception, "YubiHSM wallet only supports R1 keys");
    return (string)my->create();
 }
 

From 9b6a36a86335a922c6271b69fe1b907011057e84 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 24 May 2019 10:31:39 -0400
Subject: [PATCH 0475/1648] Removed pipeline files from eosio

---
 .buildkite/pipeline.yml                       |  488 -----
 .../node_modules/node-fetch/CHANGELOG.md      |  260 ---
 .../node_modules/node-fetch/LICENSE.md        |   22 -
 .../metrics/node_modules/node-fetch/README.md |  538 ------
 .../node_modules/node-fetch/browser.js        |   23 -
 .../node_modules/node-fetch/lib/index.es.js   | 1631 ----------------
 .../node_modules/node-fetch/lib/index.js      | 1640 -----------------
 .../node_modules/node-fetch/lib/index.mjs     | 1629 ----------------
 .../node_modules/node-fetch/package.json      |   94 -
 scripts/metrics/node_modules/sax/LICENSE      |   41 -
 scripts/metrics/node_modules/sax/README.md    |  225 ---
 scripts/metrics/node_modules/sax/lib/sax.js   | 1565 ----------------
 scripts/metrics/node_modules/sax/package.json |   61 -
 scripts/metrics/node_modules/xml2js/LICENSE   |   19 -
 scripts/metrics/node_modules/xml2js/README.md |  406 ----
 .../metrics/node_modules/xml2js/lib/bom.js    |   12 -
 .../node_modules/xml2js/lib/builder.js        |  127 --
 .../node_modules/xml2js/lib/defaults.js       |   72 -
 .../metrics/node_modules/xml2js/lib/parser.js |  357 ----
 .../node_modules/xml2js/lib/processors.js     |   34 -
 .../metrics/node_modules/xml2js/lib/xml2js.js |   37 -
 .../metrics/node_modules/xml2js/package.json  |  280 ---
 .../node_modules/xmlbuilder/.npmignore        |    5 -
 .../node_modules/xmlbuilder/CHANGELOG.md      |  423 -----
 .../metrics/node_modules/xmlbuilder/LICENSE   |   21 -
 .../metrics/node_modules/xmlbuilder/README.md |   85 -
 .../node_modules/xmlbuilder/lib/Utility.js    |   73 -
 .../xmlbuilder/lib/XMLAttribute.js            |   31 -
 .../node_modules/xmlbuilder/lib/XMLCData.js   |   32 -
 .../node_modules/xmlbuilder/lib/XMLComment.js |   32 -
 .../xmlbuilder/lib/XMLDTDAttList.js           |   50 -
 .../xmlbuilder/lib/XMLDTDElement.js           |   35 -
 .../xmlbuilder/lib/XMLDTDEntity.js            |   56 -
 .../xmlbuilder/lib/XMLDTDNotation.js          |   37 -
 .../xmlbuilder/lib/XMLDeclaration.js          |   40 -
 .../node_modules/xmlbuilder/lib/XMLDocType.js |  107 --
 .../xmlbuilder/lib/XMLDocument.js             |   48 -
 .../xmlbuilder/lib/XMLDocumentCB.js           |  402 ----
 .../node_modules/xmlbuilder/lib/XMLElement.js |  111 --
 .../node_modules/xmlbuilder/lib/XMLNode.js    |  432 -----
 .../lib/XMLProcessingInstruction.js           |   35 -
 .../node_modules/xmlbuilder/lib/XMLRaw.js     |   32 -
 .../xmlbuilder/lib/XMLStreamWriter.js         |  279 ---
 .../xmlbuilder/lib/XMLStringWriter.js         |  334 ----
 .../xmlbuilder/lib/XMLStringifier.js          |  163 --
 .../node_modules/xmlbuilder/lib/XMLText.js    |   32 -
 .../xmlbuilder/lib/XMLWriterBase.js           |   90 -
 .../node_modules/xmlbuilder/lib/index.js      |   53 -
 .../node_modules/xmlbuilder/package.json      |   65 -
 scripts/metrics/package-lock.json             |   30 -
 scripts/metrics/test-metrics.js               |  421 -----
 scripts/package-builder.sh                    |   62 -
 scripts/parallel-test.sh                      |   26 -
 scripts/serial-test.sh                        |   30 -
 scripts/submodule_check.sh                    |   41 -
 55 files changed, 13274 deletions(-)
 delete mode 100644 .buildkite/pipeline.yml
 delete mode 100644 scripts/metrics/node_modules/node-fetch/CHANGELOG.md
 delete mode 100644 scripts/metrics/node_modules/node-fetch/LICENSE.md
 delete mode 100644 scripts/metrics/node_modules/node-fetch/README.md
 delete mode 100644 scripts/metrics/node_modules/node-fetch/browser.js
 delete mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.es.js
 delete mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.js
 delete mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.mjs
 delete mode 100644 scripts/metrics/node_modules/node-fetch/package.json
 delete mode 100644 scripts/metrics/node_modules/sax/LICENSE
 delete mode 100644 scripts/metrics/node_modules/sax/README.md
 delete mode 100644 scripts/metrics/node_modules/sax/lib/sax.js
 delete mode 100644 scripts/metrics/node_modules/sax/package.json
 delete mode 100644 scripts/metrics/node_modules/xml2js/LICENSE
 delete mode 100644 scripts/metrics/node_modules/xml2js/README.md
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/bom.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/builder.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/defaults.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/parser.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/processors.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/xml2js.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/package.json
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/.npmignore
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/LICENSE
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/README.md
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/index.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/package.json
 delete mode 100644 scripts/metrics/package-lock.json
 delete mode 100755 scripts/metrics/test-metrics.js
 delete mode 100755 scripts/package-builder.sh
 delete mode 100755 scripts/parallel-test.sh
 delete mode 100755 scripts/serial-test.sh
 delete mode 100755 scripts/submodule_check.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
deleted file mode 100644
index 683c40a9f98..00000000000
--- a/.buildkite/pipeline.yml
+++ /dev/null
@@ -1,488 +0,0 @@
-env:
-  ANKA_MOJAVE_TEMPLATE: "10.14.4_6C_14G_40G"
-  ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
-  CHECKSUMABLE: "scripts/eosio_build*"
-  MAC_TAG: "eosio_2-5"
-  WORKDIR: "/data/job"
-
-steps:
-  - wait
-
-  - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
-    command:
-      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-    agents:
-      - "queue=mac-anka-templater-fleet"
-    env:
-      REPO: "${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}"
-      REPO_COMMIT: "${BUILDKITE_COMMIT}"
-      CHECKSUMABLE: "${CHECKSUMABLE}"
-      TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
-      TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.sh -y -P -f -m && cd .. && rm -rf eos" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
-      PROJECT_TAG: "${MAC_TAG}"
-    timeout: 320
-    skip: $SKIP_MOJAVE
-
-  - wait
-
-  - label: ":darwin: [Darwin] Mojave Build"
-    command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
-      git checkout ${BUILDKITE_COMMIT}
-      git submodule update --init --recursive
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ -f build.tar.gz ]] && buildkite-agent artifact upload build.tar.gz || (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found, or artifact upload failed!'; echo '$$ ls -la'; ls -la; exit 1)
-    plugins:
-      chef/anka#v0.4.4:
-        no-volume: true
-        workdir: $WORKDIR
-        inherit-environment-vars: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        modify-cpu: 12
-        modify-ram: 24
-        always-pull: true
-        debug: true
-        wait-network: true
-    agents:
-      - "queue=mac-anka-large-node-fleet"
-    timeout: 120
-    skip: $SKIP_MOJAVE
-
-  - label: ":aws: Amazon Linux 2 Build"
-    command: |
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.1.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 120
-
-  - label: ":centos: CentOS 7 Build"
-    command: |
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 120
-
-  - label: ":ubuntu: Ubuntu 16.04 Build"
-    command: |
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
-    label: ":ubuntu: Ubuntu 16.04 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 120
-
-  - label: ":ubuntu: Ubuntu 18.04 Build"
-    command: |
-      ./scripts/eosio_build.sh -y -P -m
-      tar -pczf build.tar.gz build
-      [[ ! -f build.tar.gz ]] && (echo '+++ :no_entry: ERROR: No build.tar.gz artifact found!'; echo '$$ ls -la'; ls -la; exit 1) || :
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 120
-
-  - wait
-
-  # MacOS Mojave
-  - label: ":darwin: [Darwin] Mojave Tests"
-    command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
-      git checkout ${BUILDKITE_COMMIT}
-      buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      ./scripts/parallel-test.sh
-    agents:
-      - "queue=mac-anka-node-fleet"
-    plugins:
-      chef/anka#v0.4.4:
-        no-volume: true
-        workdir: $WORKDIR
-        inherit-environment-vars: true
-        bash-interactive: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        always-pull: true
-        debug: true
-        wait-network: true
-    timeout: 120
-    skip: $SKIP_MOJAVE$SKIP_TESTS
-
-  - label: ":darwin: [Darwin] Mojave NP Tests"
-    command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
-      git checkout ${BUILDKITE_COMMIT}
-      buildkite-agent artifact download build.tar.gz . --step ":darwin: [Darwin] Mojave Build"
-      ./scripts/serial-test.sh
-    agents:
-      - "queue=mac-anka-node-fleet"
-    plugins:
-      chef/anka#v0.4.4:
-        no-volume: true
-        workdir: $WORKDIR
-        inherit-environment-vars: true
-        bash-interactive: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        always-pull: true
-        debug: true
-        wait-network: true
-    timeout: 120
-    skip: $SKIP_MOJAVE
-
-  # Amazon Linux 2
-  - label: ":aws: Amazon Linux 2 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      ./scripts/parallel-test.sh
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-    skip: $SKIP_TESTS
-
-  - label: ":aws: Amazon Linux 2 NP Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":aws: Amazon Linux 2 Build"
-      ./scripts/serial-test.sh
-    label: ":aws: Amazon Linux 2 NP Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-
-  # CentOS
-  - label: ":centos: CentOS 7 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      ./scripts/parallel-test.sh
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-    skip: $SKIP_TESTS
-
-  - label: ":centos: CentOS 7 NP Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":centos: CentOS 7 Build"
-      ./scripts/serial-test.sh
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-
-  # Ubuntu 16.04
-  - label: ":ubuntu: Ubuntu 16.04 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      ./scripts/parallel-test.sh
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-    skip: $SKIP_TESTS
-
-  - label: ":ubuntu: Ubuntu 16.04 NP Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 16.04 Build"
-      ./scripts/serial-test.sh
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-
-  # Ubuntu 18.04
-  - label: ":ubuntu: Ubuntu 18.04 Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      ./scripts/parallel-test.sh
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-    skip: $SKIP_TESTS
-
-  - label: ":ubuntu: Ubuntu 18.04 NP Tests"
-    command: |
-      echo "--- :arrow_down: Downloading Build Directory"
-      buildkite-agent artifact download build.tar.gz . --step ":ubuntu: Ubuntu 18.04 Build"
-      ./scripts/serial-test.sh
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    timeout: 60
-
-  - wait: # Test Metrics
-    continue_on_failure: true
-
-  - command: |
-        cd scripts/metrics
-        node --max-old-space-size=4096 test-metrics.js
-    label: ":bar_chart: Test Metrics"
-    agents:
-      queue: "automation-apps-builder-fleet"
-    timeout: 10
-    soft_fail: true
-
-  - wait
-
-  - label: ":centos: CentOS 7 Package Builder"
-    command: |
-      ./scripts/package-builder.sh ':centos: CentOS 7 Build'
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    env:
-      OS: "el7"
-      PKGTYPE: "rpm"
-    timeout: 60
-
-  - command: | # Ubuntu 16.04 Package Builder
-      ./scripts/package-builder.sh ':ubuntu: Ubuntu 16.04 Build'
-    label: ":ubuntu: Ubuntu 16.04 Package Builder"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    env:
-      OS: "ubuntu-16.04"
-      PKGTYPE: "deb"
-    timeout: 60
-
-  - command: | # Ubuntu 18.04 Package Builder
-      ./scripts/package-builder.sh ':ubuntu: Ubuntu 18.04 Build'
-    label: ":ubuntu: Ubuntu 18.04 Package Builder"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-5"
-        propagate-environment: true
-        workdir: /data/job
-    env:
-      OS: "ubuntu-18.04"
-      PKGTYPE: "deb"
-    timeout: 60
-
-  - label: ":darwin: Mojave Package Builder"
-    command: |
-      git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} .
-      git checkout ${BUILDKITE_COMMIT}
-      ./scripts/package-builder.sh ':darwin: [Darwin] Mojave Build'
-    agents:
-      - "queue=mac-anka-node-fleet"
-    plugins:
-      chef/anka#v0.4.4:
-        no-volume: true
-        workdir: $WORKDIR
-        inherit-environment-vars: true
-        bash-interactive: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        always-pull: true
-        debug: true
-        wait-network: true
-    timeout: 60
-    skip: $SKIP_MOJAVE
-
-  - wait
-
-  - command: | # Brew Updater
-        echo "+++ :arrow_down: Downloading brew files"
-        buildkite-agent artifact download "eosio.rb" . --step ":darwin: Mojave Package Builder"
-    label: ":darwin: Brew Updater"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "eosio.rb"
-    timeout: 5
-    skip: $SKIP_MOJAVE
-
-  - command: | # Git Submodule Regression Check
-        echo "+++ :git: Running Git Submodule Regression Check"
-        ./scripts/submodule_check.sh
-    label: "Git Submodule Regression Check"
-    agents:
-      queue: "automation-large-builder-fleet"
-    timeout: 5
\ No newline at end of file
diff --git a/scripts/metrics/node_modules/node-fetch/CHANGELOG.md b/scripts/metrics/node_modules/node-fetch/CHANGELOG.md
deleted file mode 100644
index 941b6a8d8b7..00000000000
--- a/scripts/metrics/node_modules/node-fetch/CHANGELOG.md
+++ /dev/null
@@ -1,260 +0,0 @@
-
-Changelog
-=========
-
-
-# 2.x release
-
-## v2.5.0
-
-- Enhance: `Response` object now includes `redirected` property.
-- Enhance: `fetch()` now accepts third-party `Blob` implementation as body.
-- Other: disable `package-lock.json` generation as we never commit them.
-- Other: dev dependency update.
-- Other: readme update.
-
-## v2.4.1
-
-- Fix: `Blob` import rule for node < 10, as `Readable` isn't a named export.
-
-## v2.4.0
-
-- Enhance: added `Brotli` compression support (using node's zlib).
-- Enhance: updated `Blob` implementation per spec.
-- Fix: set content type automatically for `URLSearchParams`.
-- Fix: `Headers` now reject empty header names.
-- Fix: test cases, as node 12+ no longer accepts invalid header response.
-
-## v2.3.0
-
-- Enhance: added `AbortSignal` support, with README example.
-- Enhance: handle invalid `Location` header during redirect by rejecting them explicitly with `FetchError`.
-- Fix: update `browser.js` to support react-native environment, where `self` isn't available globally.
-
-## v2.2.1
-
-- Fix: `compress` flag shouldn't overwrite existing `Accept-Encoding` header.
-- Fix: multiple `import` rules, where `PassThrough` etc. doesn't have a named export when using node <10 and `--exerimental-modules` flag.
-- Other: Better README.
-
-## v2.2.0
-
-- Enhance: Support all `ArrayBuffer` view types
-- Enhance: Support Web Workers
-- Enhance: Support Node.js' `--experimental-modules` mode; deprecate `.es.js` file
-- Fix: Add `__esModule` property to the exports object
-- Other: Better example in README for writing response to a file
-- Other: More tests for Agent
-
-## v2.1.2
-
-- Fix: allow `Body` methods to work on `ArrayBuffer`-backed `Body` objects
-- Fix: reject promise returned by `Body` methods when the accumulated `Buffer` exceeds the maximum size
-- Fix: support custom `Host` headers with any casing
-- Fix: support importing `fetch()` from TypeScript in `browser.js`
-- Fix: handle the redirect response body properly
-
-## v2.1.1
-
-Fix packaging errors in v2.1.0.
-
-## v2.1.0
-
-- Enhance: allow using ArrayBuffer as the `body` of a `fetch()` or `Request`
-- Fix: store HTTP headers of a `Headers` object internally with the given case, for compatibility with older servers that incorrectly treated header names in a case-sensitive manner
-- Fix: silently ignore invalid HTTP headers
-- Fix: handle HTTP redirect responses without a `Location` header just like non-redirect responses
-- Fix: include bodies when following a redirection when appropriate
-
-## v2.0.0
-
-This is a major release. Check [our upgrade guide](https://github.com/bitinn/node-fetch/blob/master/UPGRADE-GUIDE.md) for an overview on some key differences between v1 and v2.
-
-### General changes
-
-- Major: Node.js 0.10.x and 0.12.x support is dropped
-- Major: `require('node-fetch/lib/response')` etc. is now unsupported; use `require('node-fetch').Response` or ES6 module imports
-- Enhance: start testing on Node.js v4.x, v6.x, v8.x LTS, as well as v9.x stable
-- Enhance: use Rollup to produce a distributed bundle (less memory overhead and faster startup)
-- Enhance: make `Object.prototype.toString()` on Headers, Requests, and Responses return correct class strings
-- Other: rewrite in ES2015 using Babel
-- Other: use Codecov for code coverage tracking
-- Other: update package.json script for npm 5
-- Other: `encoding` module is now optional (alpha.7)
-- Other: expose browser.js through package.json, avoid bundling mishaps (alpha.9)
-- Other: allow TypeScript to `import` node-fetch by exposing default (alpha.9)
-
-### HTTP requests
-
-- Major: overwrite user's `Content-Length` if we can be sure our information is correct (per spec)
-- Fix: errors in a response are caught before the body is accessed
-- Fix: support WHATWG URL objects, created by `whatwg-url` package or `require('url').URL` in Node.js 7+
-
-### Response and Request classes
-
-- Major: `response.text()` no longer attempts to detect encoding, instead always opting for UTF-8 (per spec); use `response.textConverted()` for the v1 behavior
-- Major: make `response.json()` throw error instead of returning an empty object on 204 no-content respose (per spec; reverts behavior changed in v1.6.2)
-- Major: internal methods are no longer exposed
-- Major: throw error when a `GET` or `HEAD` Request is constructed with a non-null body (per spec)
-- Enhance: add `response.arrayBuffer()` (also applies to Requests)
-- Enhance: add experimental `response.blob()` (also applies to Requests)
-- Enhance: `URLSearchParams` is now accepted as a body
-- Enhance: wrap `response.json()` json parsing error as `FetchError`
-- Fix: fix Request and Response with `null` body
-
-### Headers class
-
-- Major: remove `headers.getAll()`; make `get()` return all headers delimited by commas (per spec)
-- Enhance: make Headers iterable
-- Enhance: make Headers constructor accept an array of tuples
-- Enhance: make sure header names and values are valid in HTTP
-- Fix: coerce Headers prototype function parameters to strings, where applicable
-
-### Documentation
-
-- Enhance: more comprehensive API docs
-- Enhance: add a list of default headers in README
-
-
-# 1.x release
-
-## backport releases (v1.7.0 and beyond)
-
-See [changelog on 1.x branch](https://github.com/bitinn/node-fetch/blob/1.x/CHANGELOG.md) for details.
-
-## v1.6.3
-
-- Enhance: error handling document to explain `FetchError` design
-- Fix: support `form-data` 2.x releases (requires `form-data` >= 2.1.0)
-
-## v1.6.2
-
-- Enhance: minor document update
-- Fix: response.json() returns empty object on 204 no-content response instead of throwing a syntax error
-
-## v1.6.1
-
-- Fix: if `res.body` is a non-stream non-formdata object, we will call `body.toString` and send it as a string
-- Fix: `counter` value is incorrectly set to `follow` value when wrapping Request instance
-- Fix: documentation update
-
-## v1.6.0
-
-- Enhance: added `res.buffer()` api for convenience, it returns body as a Node.js buffer
-- Enhance: better old server support by handling raw deflate response
-- Enhance: skip encoding detection for non-HTML/XML response
-- Enhance: minor document update
-- Fix: HEAD request doesn't need decompression, as body is empty
-- Fix: `req.body` now accepts a Node.js buffer
-
-## v1.5.3
-
-- Fix: handle 204 and 304 responses when body is empty but content-encoding is gzip/deflate
-- Fix: allow resolving response and cloned response in any order
-- Fix: avoid setting `content-length` when `form-data` body use streams
-- Fix: send DELETE request with content-length when body is present
-- Fix: allow any url when calling new Request, but still reject non-http(s) url in fetch
-
-## v1.5.2
-
-- Fix: allow node.js core to handle keep-alive connection pool when passing a custom agent
-
-## v1.5.1
-
-- Fix: redirect mode `manual` should work even when there is no redirection or broken redirection
-
-## v1.5.0
-
-- Enhance: rejected promise now use custom `Error` (thx to @pekeler)
-- Enhance: `FetchError` contains `err.type` and `err.code`, allows for better error handling (thx to @pekeler)
-- Enhance: basic support for redirect mode `manual` and `error`, allows for location header extraction (thx to @jimmywarting for the initial PR)
-
-## v1.4.1
-
-- Fix: wrapping Request instance with FormData body again should preserve the body as-is
-
-## v1.4.0
-
-- Enhance: Request and Response now have `clone` method (thx to @kirill-konshin for the initial PR)
-- Enhance: Request and Response now have proper string and buffer body support (thx to @kirill-konshin)
-- Enhance: Body constructor has been refactored out (thx to @kirill-konshin)
-- Enhance: Headers now has `forEach` method (thx to @tricoder42)
-- Enhance: back to 100% code coverage
-- Fix: better form-data support (thx to @item4)
-- Fix: better character encoding detection under chunked encoding (thx to @dsuket for the initial PR)
-
-## v1.3.3
-
-- Fix: make sure `Content-Length` header is set when body is string for POST/PUT/PATCH requests
-- Fix: handle body stream error, for cases such as incorrect `Content-Encoding` header
-- Fix: when following certain redirects, use `GET` on subsequent request per Fetch Spec
-- Fix: `Request` and `Response` constructors now parse headers input using `Headers`
-
-## v1.3.2
-
-- Enhance: allow auto detect of form-data input (no `FormData` spec on node.js, this is form-data specific feature)
-
-## v1.3.1
-
-- Enhance: allow custom host header to be set (server-side only feature, as it's a forbidden header on client-side)
-
-## v1.3.0
-
-- Enhance: now `fetch.Request` is exposed as well
-
-## v1.2.1
-
-- Enhance: `Headers` now normalized `Number` value to `String`, prevent common mistakes
-
-## v1.2.0
-
-- Enhance: now fetch.Headers and fetch.Response are exposed, making testing easier
-
-## v1.1.2
-
-- Fix: `Headers` should only support `String` and `Array` properties, and ignore others
-
-## v1.1.1
-
-- Enhance: now req.headers accept both plain object and `Headers` instance
-
-## v1.1.0
-
-- Enhance: timeout now also applies to response body (in case of slow response)
-- Fix: timeout is now cleared properly when fetch is done/has failed
-
-## v1.0.6
-
-- Fix: less greedy content-type charset matching
-
-## v1.0.5
-
-- Fix: when `follow = 0`, fetch should not follow redirect
-- Enhance: update tests for better coverage
-- Enhance: code formatting
-- Enhance: clean up doc
-
-## v1.0.4
-
-- Enhance: test iojs support
-- Enhance: timeout attached to socket event only fire once per redirect
-
-## v1.0.3
-
-- Fix: response size limit should reject large chunk
-- Enhance: added character encoding detection for xml, such as rss/atom feed (encoding in DTD)
-
-## v1.0.2
-
-- Fix: added res.ok per spec change
-
-## v1.0.0
-
-- Enhance: better test coverage and doc
-
-
-# 0.x release
-
-## v0.1
-
-- Major: initial public release
diff --git a/scripts/metrics/node_modules/node-fetch/LICENSE.md b/scripts/metrics/node_modules/node-fetch/LICENSE.md
deleted file mode 100644
index 660ffecb58b..00000000000
--- a/scripts/metrics/node_modules/node-fetch/LICENSE.md
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 David Frank
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/scripts/metrics/node_modules/node-fetch/README.md b/scripts/metrics/node_modules/node-fetch/README.md
deleted file mode 100644
index 48f4215e4e7..00000000000
--- a/scripts/metrics/node_modules/node-fetch/README.md
+++ /dev/null
@@ -1,538 +0,0 @@
-node-fetch
-==========
-
-[![npm version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
-[![coverage status][codecov-image]][codecov-url]
-[![install size][install-size-image]][install-size-url]
-
-A light-weight module that brings `window.fetch` to Node.js
-
-(We are looking for [v2 maintainers and collaborators](https://github.com/bitinn/node-fetch/issues/567))
-
-<!-- TOC -->
-
-- [Motivation](#motivation)
-- [Features](#features)
-- [Difference from client-side fetch](#difference-from-client-side-fetch)
-- [Installation](#installation)
-- [Loading and configuring the module](#loading-and-configuring-the-module)
-- [Common Usage](#common-usage)
-    - [Plain text or HTML](#plain-text-or-html)
-    - [JSON](#json)
-    - [Simple Post](#simple-post)
-    - [Post with JSON](#post-with-json)
-    - [Post with form parameters](#post-with-form-parameters)
-    - [Handling exceptions](#handling-exceptions)
-    - [Handling client and server errors](#handling-client-and-server-errors)
-- [Advanced Usage](#advanced-usage)
-    - [Streams](#streams)
-    - [Buffer](#buffer)
-    - [Accessing Headers and other Meta data](#accessing-headers-and-other-meta-data)
-    - [Post data using a file stream](#post-data-using-a-file-stream)
-    - [Post with form-data (detect multipart)](#post-with-form-data-detect-multipart)
-    - [Request cancellation with AbortSignal](#request-cancellation-with-abortsignal)
-- [API](#api)
-    - [fetch(url[, options])](#fetchurl-options)
-    - [Options](#options)
-    - [Class: Request](#class-request)
-    - [Class: Response](#class-response)
-    - [Class: Headers](#class-headers)
-    - [Interface: Body](#interface-body)
-    - [Class: FetchError](#class-fetcherror)
-- [License](#license)
-- [Acknowledgement](#acknowledgement)
-
-<!-- /TOC -->
-
-## Motivation
-
-Instead of implementing `XMLHttpRequest` in Node.js to run browser-specific [Fetch polyfill](https://github.com/github/fetch), why not go from native `http` to `fetch` API directly? Hence `node-fetch`, minimal code for a `window.fetch` compatible API on Node.js runtime.
-
-See Matt Andrews' [isomorphic-fetch](https://github.com/matthew-andrews/isomorphic-fetch) or Leonardo Quixada's [cross-fetch](https://github.com/lquixada/cross-fetch) for isomorphic usage (exports `node-fetch` for server-side, `whatwg-fetch` for client-side).
-
-## Features
-
-- Stay consistent with `window.fetch` API.
-- Make conscious trade-off when following [WHATWG fetch spec][whatwg-fetch] and [stream spec](https://streams.spec.whatwg.org/) implementation details, document known differences.
-- Use native promise, but allow substituting it with [insert your favorite promise library].
-- Use native Node streams for body, on both request and response.
-- Decode content encoding (gzip/deflate) properly, and convert string output (such as `res.text()` and `res.json()`) to UTF-8 automatically.
-- Useful extensions such as timeout, redirect limit, response size limit, [explicit errors](ERROR-HANDLING.md) for troubleshooting.
-
-## Difference from client-side fetch
-
-- See [Known Differences](LIMITS.md) for details.
-- If you happen to use a missing feature that `window.fetch` offers, feel free to open an issue.
-- Pull requests are welcomed too!
-
-## Installation
-
-Current stable release (`2.x`)
-
-```sh
-$ npm install node-fetch --save
-```
-
-## Loading and configuring the module
-We suggest you load the module via `require`, pending the stabalizing of es modules in node:
-```js
-const fetch = require('node-fetch');
-```
-
-If you are using a Promise library other than native, set it through fetch.Promise:
-```js
-const Bluebird = require('bluebird');
-
-fetch.Promise = Bluebird;
-```
-
-## Common Usage
-
-NOTE: The documentation below is up-to-date with `2.x` releases, [see `1.x` readme](https://github.com/bitinn/node-fetch/blob/1.x/README.md), [changelog](https://github.com/bitinn/node-fetch/blob/1.x/CHANGELOG.md) and [2.x upgrade guide](UPGRADE-GUIDE.md) for the differences.
-
-#### Plain text or HTML
-```js
-fetch('https://github.com/')
-    .then(res => res.text())
-    .then(body => console.log(body));
-```
-
-#### JSON
-
-```js
-
-fetch('https://api.github.com/users/github')
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Simple Post
-```js
-fetch('https://httpbin.org/post', { method: 'POST', body: 'a=1' })
-    .then(res => res.json()) // expecting a json response
-    .then(json => console.log(json));
-```
-
-#### Post with JSON
-
-```js
-const body = { a: 1 };
-
-fetch('https://httpbin.org/post', {
-        method: 'post',
-        body:    JSON.stringify(body),
-        headers: { 'Content-Type': 'application/json' },
-    })
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Post with form parameters
-`URLSearchParams` is available in Node.js as of v7.5.0. See [official documentation](https://nodejs.org/api/url.html#url_class_urlsearchparams) for more usage methods.
-
-NOTE: The `Content-Type` header is only set automatically to `x-www-form-urlencoded` when an instance of `URLSearchParams` is given as such:
-
-```js
-const { URLSearchParams } = require('url');
-
-const params = new URLSearchParams();
-params.append('a', 1);
-
-fetch('https://httpbin.org/post', { method: 'POST', body: params })
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Handling exceptions
-NOTE: 3xx-5xx responses are *NOT* exceptions, and should be handled in `then()`, see the next section.
-
-Adding a catch to the fetch promise chain will catch *all* exceptions, such as errors originating from node core libraries, like network errors, and operational errors which are instances of FetchError. See the [error handling document](ERROR-HANDLING.md)  for more details.
-
-```js
-fetch('https://domain.invalid/')
-    .catch(err => console.error(err));
-```
-
-#### Handling client and server errors
-It is common to create a helper function to check that the response contains no client (4xx) or server (5xx) error responses:
-
-```js
-function checkStatus(res) {
-    if (res.ok) { // res.status >= 200 && res.status < 300
-        return res;
-    } else {
-        throw MyCustomError(res.statusText);
-    }
-}
-
-fetch('https://httpbin.org/status/400')
-    .then(checkStatus)
-    .then(res => console.log('will not get here...'))
-```
-
-## Advanced Usage
-
-#### Streams
-The "Node.js way" is to use streams when possible:
-
-```js
-fetch('https://assets-cdn.github.com/images/modules/logos_page/Octocat.png')
-    .then(res => {
-        const dest = fs.createWriteStream('./octocat.png');
-        res.body.pipe(dest);
-    });
-```
-
-#### Buffer
-If you prefer to cache binary data in full, use buffer(). (NOTE: buffer() is a `node-fetch` only API)
-
-```js
-const fileType = require('file-type');
-
-fetch('https://assets-cdn.github.com/images/modules/logos_page/Octocat.png')
-    .then(res => res.buffer())
-    .then(buffer => fileType(buffer))
-    .then(type => { /* ... */ });
-```
-
-#### Accessing Headers and other Meta data
-```js
-fetch('https://github.com/')
-    .then(res => {
-        console.log(res.ok);
-        console.log(res.status);
-        console.log(res.statusText);
-        console.log(res.headers.raw());
-        console.log(res.headers.get('content-type'));
-    });
-```
-
-#### Post data using a file stream
-
-```js
-const { createReadStream } = require('fs');
-
-const stream = createReadStream('input.txt');
-
-fetch('https://httpbin.org/post', { method: 'POST', body: stream })
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Post with form-data (detect multipart)
-
-```js
-const FormData = require('form-data');
-
-const form = new FormData();
-form.append('a', 1);
-
-fetch('https://httpbin.org/post', { method: 'POST', body: form })
-    .then(res => res.json())
-    .then(json => console.log(json));
-
-// OR, using custom headers
-// NOTE: getHeaders() is non-standard API
-
-const form = new FormData();
-form.append('a', 1);
-
-const options = {
-    method: 'POST',
-    body: form,
-    headers: form.getHeaders()
-}
-
-fetch('https://httpbin.org/post', options)
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Request cancellation with AbortSignal
-
-> NOTE: You may only cancel streamed requests on Node >= v8.0.0
-
-You may cancel requests with `AbortController`. A suggested implementation is [`abort-controller`](https://www.npmjs.com/package/abort-controller).
-
-An example of timing out a request after 150ms could be achieved as follows:
-
-```js
-import AbortController from 'abort-controller';
-
-const controller = new AbortController();
-const timeout = setTimeout(
-  () => { controller.abort(); },
-  150,
-);
-
-fetch(url, { signal: controller.signal })
-  .then(res => res.json())
-  .then(
-    data => {
-      useData(data)
-    },
-    err => {
-      if (err.name === 'AbortError') {
-        // request was aborted
-      }
-    },
-  )
-  .finally(() => {
-    clearTimeout(timeout);
-  });
-```
-
-See [test cases](https://github.com/bitinn/node-fetch/blob/master/test/test.js) for more examples.
-
-
-## API
-
-### fetch(url[, options])
-
-- `url` A string representing the URL for fetching
-- `options` [Options](#fetch-options) for the HTTP(S) request
-- Returns: <code>Promise&lt;[Response](#class-response)&gt;</code>
-
-Perform an HTTP(S) fetch.
-
-`url` should be an absolute url, such as `https://example.com/`. A path-relative URL (`/file/under/root`) or protocol-relative URL (`//can-be-http-or-https.com/`) will result in a rejected promise.
-
-<a id="fetch-options"></a>
-### Options
-
-The default values are shown after each option key.
-
-```js
-{
-    // These properties are part of the Fetch Standard
-    method: 'GET',
-    headers: {},        // request headers. format is the identical to that accepted by the Headers constructor (see below)
-    body: null,         // request body. can be null, a string, a Buffer, a Blob, or a Node.js Readable stream
-    redirect: 'follow', // set to `manual` to extract redirect headers, `error` to reject redirect
-    signal: null,       // pass an instance of AbortSignal to optionally abort requests
-
-    // The following properties are node-fetch extensions
-    follow: 20,         // maximum redirect count. 0 to not follow redirect
-    timeout: 0,         // req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies). Signal is recommended instead.
-    compress: true,     // support gzip/deflate content encoding. false to disable
-    size: 0,            // maximum response body size in bytes. 0 to disable
-    agent: null         // http(s).Agent instance, allows custom proxy, certificate, dns lookup etc.
-}
-```
-
-##### Default Headers
-
-If no values are set, the following request headers will be sent automatically:
-
-Header              | Value
-------------------- | --------------------------------------------------------
-`Accept-Encoding`   | `gzip,deflate` _(when `options.compress === true`)_
-`Accept`            | `*/*`
-`Connection`        | `close` _(when no `options.agent` is present)_
-`Content-Length`    | _(automatically calculated, if possible)_
-`Transfer-Encoding` | `chunked` _(when `req.body` is a stream)_
-`User-Agent`        | `node-fetch/1.0 (+https://github.com/bitinn/node-fetch)`
-
-<a id="class-request"></a>
-### Class: Request
-
-An HTTP(S) request containing information about URL, method, headers, and the body. This class implements the [Body](#iface-body) interface.
-
-Due to the nature of Node.js, the following properties are not implemented at this moment:
-
-- `type`
-- `destination`
-- `referrer`
-- `referrerPolicy`
-- `mode`
-- `credentials`
-- `cache`
-- `integrity`
-- `keepalive`
-
-The following node-fetch extension properties are provided:
-
-- `follow`
-- `compress`
-- `counter`
-- `agent`
-
-See [options](#fetch-options) for exact meaning of these extensions.
-
-#### new Request(input[, options])
-
-<small>*(spec-compliant)*</small>
-
-- `input` A string representing a URL, or another `Request` (which will be cloned)
-- `options` [Options][#fetch-options] for the HTTP(S) request
-
-Constructs a new `Request` object. The constructor is identical to that in the [browser](https://developer.mozilla.org/en-US/docs/Web/API/Request/Request).
-
-In most cases, directly `fetch(url, options)` is simpler than creating a `Request` object.
-
-<a id="class-response"></a>
-### Class: Response
-
-An HTTP(S) response. This class implements the [Body](#iface-body) interface.
-
-The following properties are not implemented in node-fetch at this moment:
-
-- `Response.error()`
-- `Response.redirect()`
-- `type`
-- `trailer`
-
-#### new Response([body[, options]])
-
-<small>*(spec-compliant)*</small>
-
-- `body` A string or [Readable stream][node-readable]
-- `options` A [`ResponseInit`][response-init] options dictionary
-
-Constructs a new `Response` object. The constructor is identical to that in the [browser](https://developer.mozilla.org/en-US/docs/Web/API/Response/Response).
-
-Because Node.js does not implement service workers (for which this class was designed), one rarely has to construct a `Response` directly.
-
-#### response.ok
-
-<small>*(spec-compliant)*</small>
-
-Convenience property representing if the request ended normally. Will evaluate to true if the response status was greater than or equal to 200 but smaller than 300.
-
-#### response.redirected
-
-<small>*(spec-compliant)*</small>
-
-Convenience property representing if the request has been redirected at least once. Will evaluate to true if the internal redirect counter is greater than 0.
-
-<a id="class-headers"></a>
-### Class: Headers
-
-This class allows manipulating and iterating over a set of HTTP headers. All methods specified in the [Fetch Standard][whatwg-fetch] are implemented.
-
-#### new Headers([init])
-
-<small>*(spec-compliant)*</small>
-
-- `init` Optional argument to pre-fill the `Headers` object
-
-Construct a new `Headers` object. `init` can be either `null`, a `Headers` object, an key-value map object, or any iterable object.
-
-```js
-// Example adapted from https://fetch.spec.whatwg.org/#example-headers-class
-
-const meta = {
-  'Content-Type': 'text/xml',
-  'Breaking-Bad': '<3'
-};
-const headers = new Headers(meta);
-
-// The above is equivalent to
-const meta = [
-  [ 'Content-Type', 'text/xml' ],
-  [ 'Breaking-Bad', '<3' ]
-];
-const headers = new Headers(meta);
-
-// You can in fact use any iterable objects, like a Map or even another Headers
-const meta = new Map();
-meta.set('Content-Type', 'text/xml');
-meta.set('Breaking-Bad', '<3');
-const headers = new Headers(meta);
-const copyOfHeaders = new Headers(headers);
-```
-
-<a id="iface-body"></a>
-### Interface: Body
-
-`Body` is an abstract interface with methods that are applicable to both `Request` and `Response` classes.
-
-The following methods are not yet implemented in node-fetch at this moment:
-
-- `formData()`
-
-#### body.body
-
-<small>*(deviation from spec)*</small>
-
-* Node.js [`Readable` stream][node-readable]
-
-The data encapsulated in the `Body` object. Note that while the [Fetch Standard][whatwg-fetch] requires the property to always be a WHATWG `ReadableStream`, in node-fetch it is a Node.js [`Readable` stream][node-readable].
-
-#### body.bodyUsed
-
-<small>*(spec-compliant)*</small>
-
-* `Boolean`
-
-A boolean property for if this body has been consumed. Per spec, a consumed body cannot be used again.
-
-#### body.arrayBuffer()
-#### body.blob()
-#### body.json()
-#### body.text()
-
-<small>*(spec-compliant)*</small>
-
-* Returns: <code>Promise</code>
-
-Consume the body and return a promise that will resolve to one of these formats.
-
-#### body.buffer()
-
-<small>*(node-fetch extension)*</small>
-
-* Returns: <code>Promise&lt;Buffer&gt;</code>
-
-Consume the body and return a promise that will resolve to a Buffer.
-
-#### body.textConverted()
-
-<small>*(node-fetch extension)*</small>
-
-* Returns: <code>Promise&lt;String&gt;</code>
-
-Identical to `body.text()`, except instead of always converting to UTF-8, encoding sniffing will be performed and text converted to UTF-8, if possible.
-
-(This API requires an optional dependency on npm package [encoding](https://www.npmjs.com/package/encoding), which you need to install manually. `webpack` users may see [a warning message](https://github.com/bitinn/node-fetch/issues/412#issuecomment-379007792) due to this optional dependency.)
-
-<a id="class-fetcherror"></a>
-### Class: FetchError
-
-<small>*(node-fetch extension)*</small>
-
-An operational error in the fetching process. See [ERROR-HANDLING.md][] for more info.
-
-<a id="class-aborterror"></a>
-### Class: AbortError
-
-<small>*(node-fetch extension)*</small>
-
-An Error thrown when the request is aborted in response to an `AbortSignal`'s `abort` event. It has a `name` property of `AbortError`. See [ERROR-HANDLING.MD][] for more info.
-
-## Acknowledgement
-
-Thanks to [github/fetch](https://github.com/github/fetch) for providing a solid implementation reference.
-
-`node-fetch` v1 was maintained by [@bitinn](https://github.com/bitinn); v2 was maintained by [@TimothyGu](https://github.com/timothygu), [@bitinn](https://github.com/bitinn) and [@jimmywarting](https://github.com/jimmywarting); v2 readme is written by [@jkantr](https://github.com/jkantr).
-
-## License
-
-MIT
-
-[npm-image]: https://flat.badgen.net/npm/v/node-fetch
-[npm-url]: https://www.npmjs.com/package/node-fetch
-[travis-image]: https://flat.badgen.net/travis/bitinn/node-fetch
-[travis-url]: https://travis-ci.org/bitinn/node-fetch
-[codecov-image]: https://flat.badgen.net/codecov/c/github/bitinn/node-fetch/master
-[codecov-url]: https://codecov.io/gh/bitinn/node-fetch
-[install-size-image]: https://flat.badgen.net/packagephobia/install/node-fetch
-[install-size-url]: https://packagephobia.now.sh/result?p=node-fetch
-[whatwg-fetch]: https://fetch.spec.whatwg.org/
-[response-init]: https://fetch.spec.whatwg.org/#responseinit
-[node-readable]: https://nodejs.org/api/stream.html#stream_readable_streams
-[mdn-headers]: https://developer.mozilla.org/en-US/docs/Web/API/Headers
-[LIMITS.md]: https://github.com/bitinn/node-fetch/blob/master/LIMITS.md
-[ERROR-HANDLING.md]: https://github.com/bitinn/node-fetch/blob/master/ERROR-HANDLING.md
-[UPGRADE-GUIDE.md]: https://github.com/bitinn/node-fetch/blob/master/UPGRADE-GUIDE.md
diff --git a/scripts/metrics/node_modules/node-fetch/browser.js b/scripts/metrics/node_modules/node-fetch/browser.js
deleted file mode 100644
index 0ad5de004c4..00000000000
--- a/scripts/metrics/node_modules/node-fetch/browser.js
+++ /dev/null
@@ -1,23 +0,0 @@
-"use strict";
-
-// ref: https://github.com/tc39/proposal-global
-var getGlobal = function () {
-	// the only reliable means to get the global object is
-	// `Function('return this')()`
-	// However, this causes CSP violations in Chrome apps.
-	if (typeof self !== 'undefined') { return self; }
-	if (typeof window !== 'undefined') { return window; }
-	if (typeof global !== 'undefined') { return global; }
-	throw new Error('unable to locate global object');
-}
-
-var global = getGlobal();
-
-module.exports = exports = global.fetch;
-
-// Needed for TypeScript and Webpack.
-exports.default = global.fetch.bind(global);
-
-exports.Headers = global.Headers;
-exports.Request = global.Request;
-exports.Response = global.Response;
\ No newline at end of file
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.es.js b/scripts/metrics/node_modules/node-fetch/lib/index.es.js
deleted file mode 100644
index 20ab807872f..00000000000
--- a/scripts/metrics/node_modules/node-fetch/lib/index.es.js
+++ /dev/null
@@ -1,1631 +0,0 @@
-process.emitWarning("The .es.js file is deprecated. Use .mjs instead.");
-
-import Stream from 'stream';
-import http from 'http';
-import Url from 'url';
-import https from 'https';
-import zlib from 'zlib';
-
-// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
-
-// fix for "Readable" isn't a named export issue
-const Readable = Stream.Readable;
-
-const BUFFER = Symbol('buffer');
-const TYPE = Symbol('type');
-
-class Blob {
-	constructor() {
-		this[TYPE] = '';
-
-		const blobParts = arguments[0];
-		const options = arguments[1];
-
-		const buffers = [];
-		let size = 0;
-
-		if (blobParts) {
-			const a = blobParts;
-			const length = Number(a.length);
-			for (let i = 0; i < length; i++) {
-				const element = a[i];
-				let buffer;
-				if (element instanceof Buffer) {
-					buffer = element;
-				} else if (ArrayBuffer.isView(element)) {
-					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
-				} else if (element instanceof ArrayBuffer) {
-					buffer = Buffer.from(element);
-				} else if (element instanceof Blob) {
-					buffer = element[BUFFER];
-				} else {
-					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
-				}
-				size += buffer.length;
-				buffers.push(buffer);
-			}
-		}
-
-		this[BUFFER] = Buffer.concat(buffers);
-
-		let type = options && options.type !== undefined && String(options.type).toLowerCase();
-		if (type && !/[^\u0020-\u007E]/.test(type)) {
-			this[TYPE] = type;
-		}
-	}
-	get size() {
-		return this[BUFFER].length;
-	}
-	get type() {
-		return this[TYPE];
-	}
-	text() {
-		return Promise.resolve(this[BUFFER].toString());
-	}
-	arrayBuffer() {
-		const buf = this[BUFFER];
-		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		return Promise.resolve(ab);
-	}
-	stream() {
-		const readable = new Readable();
-		readable._read = function () {};
-		readable.push(this[BUFFER]);
-		readable.push(null);
-		return readable;
-	}
-	toString() {
-		return '[object Blob]';
-	}
-	slice() {
-		const size = this.size;
-
-		const start = arguments[0];
-		const end = arguments[1];
-		let relativeStart, relativeEnd;
-		if (start === undefined) {
-			relativeStart = 0;
-		} else if (start < 0) {
-			relativeStart = Math.max(size + start, 0);
-		} else {
-			relativeStart = Math.min(start, size);
-		}
-		if (end === undefined) {
-			relativeEnd = size;
-		} else if (end < 0) {
-			relativeEnd = Math.max(size + end, 0);
-		} else {
-			relativeEnd = Math.min(end, size);
-		}
-		const span = Math.max(relativeEnd - relativeStart, 0);
-
-		const buffer = this[BUFFER];
-		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
-		const blob = new Blob([], { type: arguments[2] });
-		blob[BUFFER] = slicedBuffer;
-		return blob;
-	}
-}
-
-Object.defineProperties(Blob.prototype, {
-	size: { enumerable: true },
-	type: { enumerable: true },
-	slice: { enumerable: true }
-});
-
-Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
-	value: 'Blob',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * fetch-error.js
- *
- * FetchError interface for operational errors
- */
-
-/**
- * Create FetchError instance
- *
- * @param   String      message      Error message for human
- * @param   String      type         Error type for machine
- * @param   String      systemError  For Node.js system error
- * @return  FetchError
- */
-function FetchError(message, type, systemError) {
-  Error.call(this, message);
-
-  this.message = message;
-  this.type = type;
-
-  // when err.type is `system`, err.code contains system error code
-  if (systemError) {
-    this.code = this.errno = systemError.code;
-  }
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-FetchError.prototype = Object.create(Error.prototype);
-FetchError.prototype.constructor = FetchError;
-FetchError.prototype.name = 'FetchError';
-
-let convert;
-try {
-	convert = require('encoding').convert;
-} catch (e) {}
-
-const INTERNALS = Symbol('Body internals');
-
-// fix an issue where "PassThrough" isn't a named export for node <10
-const PassThrough = Stream.PassThrough;
-
-/**
- * Body mixin
- *
- * Ref: https://fetch.spec.whatwg.org/#body
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-function Body(body) {
-	var _this = this;
-
-	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-	    _ref$size = _ref.size;
-
-	let size = _ref$size === undefined ? 0 : _ref$size;
-	var _ref$timeout = _ref.timeout;
-	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
-
-	if (body == null) {
-		// body is undefined or null
-		body = null;
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		body = Buffer.from(body.toString());
-	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		body = Buffer.from(body);
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
-	} else if (body instanceof Stream) ; else {
-		// none of the above
-		// coerce to string then buffer
-		body = Buffer.from(String(body));
-	}
-	this[INTERNALS] = {
-		body,
-		disturbed: false,
-		error: null
-	};
-	this.size = size;
-	this.timeout = timeout;
-
-	if (body instanceof Stream) {
-		body.on('error', function (err) {
-			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
-			_this[INTERNALS].error = error;
-		});
-	}
-}
-
-Body.prototype = {
-	get body() {
-		return this[INTERNALS].body;
-	},
-
-	get bodyUsed() {
-		return this[INTERNALS].disturbed;
-	},
-
-	/**
-  * Decode response as ArrayBuffer
-  *
-  * @return  Promise
-  */
-	arrayBuffer() {
-		return consumeBody.call(this).then(function (buf) {
-			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		});
-	},
-
-	/**
-  * Return raw response as Blob
-  *
-  * @return Promise
-  */
-	blob() {
-		let ct = this.headers && this.headers.get('content-type') || '';
-		return consumeBody.call(this).then(function (buf) {
-			return Object.assign(
-			// Prevent copying
-			new Blob([], {
-				type: ct.toLowerCase()
-			}), {
-				[BUFFER]: buf
-			});
-		});
-	},
-
-	/**
-  * Decode response as json
-  *
-  * @return  Promise
-  */
-	json() {
-		var _this2 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			try {
-				return JSON.parse(buffer.toString());
-			} catch (err) {
-				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
-			}
-		});
-	},
-
-	/**
-  * Decode response as text
-  *
-  * @return  Promise
-  */
-	text() {
-		return consumeBody.call(this).then(function (buffer) {
-			return buffer.toString();
-		});
-	},
-
-	/**
-  * Decode response as buffer (non-spec api)
-  *
-  * @return  Promise
-  */
-	buffer() {
-		return consumeBody.call(this);
-	},
-
-	/**
-  * Decode response as text, while automatically detecting the encoding and
-  * trying to decode to UTF-8 (non-spec api)
-  *
-  * @return  Promise
-  */
-	textConverted() {
-		var _this3 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			return convertBody(buffer, _this3.headers);
-		});
-	}
-};
-
-// In browsers, all properties are enumerable.
-Object.defineProperties(Body.prototype, {
-	body: { enumerable: true },
-	bodyUsed: { enumerable: true },
-	arrayBuffer: { enumerable: true },
-	blob: { enumerable: true },
-	json: { enumerable: true },
-	text: { enumerable: true }
-});
-
-Body.mixIn = function (proto) {
-	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
-		// istanbul ignore else: future proof
-		if (!(name in proto)) {
-			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
-			Object.defineProperty(proto, name, desc);
-		}
-	}
-};
-
-/**
- * Consume and convert an entire Body to a Buffer.
- *
- * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
- *
- * @return  Promise
- */
-function consumeBody() {
-	var _this4 = this;
-
-	if (this[INTERNALS].disturbed) {
-		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
-	}
-
-	this[INTERNALS].disturbed = true;
-
-	if (this[INTERNALS].error) {
-		return Body.Promise.reject(this[INTERNALS].error);
-	}
-
-	let body = this.body;
-
-	// body is null
-	if (body === null) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is blob
-	if (isBlob(body)) {
-		body = body.stream();
-	}
-
-	// body is buffer
-	if (Buffer.isBuffer(body)) {
-		return Body.Promise.resolve(body);
-	}
-
-	// istanbul ignore if: should never happen
-	if (!(body instanceof Stream)) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is stream
-	// get ready to actually consume the body
-	let accum = [];
-	let accumBytes = 0;
-	let abort = false;
-
-	return new Body.Promise(function (resolve, reject) {
-		let resTimeout;
-
-		// allow timeout on slow response body
-		if (_this4.timeout) {
-			resTimeout = setTimeout(function () {
-				abort = true;
-				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
-			}, _this4.timeout);
-		}
-
-		// handle stream errors
-		body.on('error', function (err) {
-			if (err.name === 'AbortError') {
-				// if the request was aborted, reject with this Error
-				abort = true;
-				reject(err);
-			} else {
-				// other errors, such as incorrect content-encoding
-				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-
-		body.on('data', function (chunk) {
-			if (abort || chunk === null) {
-				return;
-			}
-
-			if (_this4.size && accumBytes + chunk.length > _this4.size) {
-				abort = true;
-				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
-				return;
-			}
-
-			accumBytes += chunk.length;
-			accum.push(chunk);
-		});
-
-		body.on('end', function () {
-			if (abort) {
-				return;
-			}
-
-			clearTimeout(resTimeout);
-
-			try {
-				resolve(Buffer.concat(accum, accumBytes));
-			} catch (err) {
-				// handle streams that have accumulated too much data (issue #414)
-				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-	});
-}
-
-/**
- * Detect buffer encoding and convert to target encoding
- * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
- *
- * @param   Buffer  buffer    Incoming buffer
- * @param   String  encoding  Target encoding
- * @return  String
- */
-function convertBody(buffer, headers) {
-	if (typeof convert !== 'function') {
-		throw new Error('The package `encoding` must be installed to use the textConverted() function');
-	}
-
-	const ct = headers.get('content-type');
-	let charset = 'utf-8';
-	let res, str;
-
-	// header
-	if (ct) {
-		res = /charset=([^;]*)/i.exec(ct);
-	}
-
-	// no charset in content type, peek at response body for at most 1024 bytes
-	str = buffer.slice(0, 1024).toString();
-
-	// html5
-	if (!res && str) {
-		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// html4
-	if (!res && str) {
-		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
-
-		if (res) {
-			res = /charset=(.*)/i.exec(res.pop());
-		}
-	}
-
-	// xml
-	if (!res && str) {
-		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// found charset
-	if (res) {
-		charset = res.pop();
-
-		// prevent decode issues when sites use incorrect encoding
-		// ref: https://hsivonen.fi/encoding-menu/
-		if (charset === 'gb2312' || charset === 'gbk') {
-			charset = 'gb18030';
-		}
-	}
-
-	// turn raw buffers into a single utf-8 buffer
-	return convert(buffer, 'UTF-8', charset).toString();
-}
-
-/**
- * Detect a URLSearchParams object
- * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
- *
- * @param   Object  obj     Object to detect by type or brand
- * @return  String
- */
-function isURLSearchParams(obj) {
-	// Duck-typing as a necessary condition.
-	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
-		return false;
-	}
-
-	// Brand-checking and more duck-typing as optional condition.
-	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
-}
-
-/**
- * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
- * @param  {*} obj
- * @return {boolean}
- */
-function isBlob(obj) {
-	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
-}
-
-/**
- * Clone body given Res/Req instance
- *
- * @param   Mixed  instance  Response or Request instance
- * @return  Mixed
- */
-function clone(instance) {
-	let p1, p2;
-	let body = instance.body;
-
-	// don't allow cloning a used body
-	if (instance.bodyUsed) {
-		throw new Error('cannot clone body after it is used');
-	}
-
-	// check that body is a stream and not form-data object
-	// note: we can't clone the form-data object without having it as a dependency
-	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
-		// tee instance body
-		p1 = new PassThrough();
-		p2 = new PassThrough();
-		body.pipe(p1);
-		body.pipe(p2);
-		// set instance body to teed body and return the other teed body
-		instance[INTERNALS].body = p1;
-		body = p2;
-	}
-
-	return body;
-}
-
-/**
- * Performs the operation "extract a `Content-Type` value from |object|" as
- * specified in the specification:
- * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
- *
- * This function assumes that instance.body is present.
- *
- * @param   Mixed  instance  Response or Request instance
- */
-function extractContentType(body) {
-	// istanbul ignore if: Currently, because of a guard in Request, body
-	// can never be null. Included here for completeness.
-	if (body === null) {
-		// body is null
-		return null;
-	} else if (typeof body === 'string') {
-		// body is string
-		return 'text/plain;charset=UTF-8';
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		return 'application/x-www-form-urlencoded;charset=UTF-8';
-	} else if (isBlob(body)) {
-		// body is blob
-		return body.type || null;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return null;
-	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		return null;
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		return null;
-	} else if (typeof body.getBoundary === 'function') {
-		// detect form data input from form-data module
-		return `multipart/form-data;boundary=${body.getBoundary()}`;
-	} else if (body instanceof Stream) {
-		// body is stream
-		// can't really do much about this
-		return null;
-	} else {
-		// Body constructor defaults other things to string
-		return 'text/plain;charset=UTF-8';
-	}
-}
-
-/**
- * The Fetch Standard treats this as if "total bytes" is a property on the body.
- * For us, we have to explicitly get it with a function.
- *
- * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
- *
- * @param   Body    instance   Instance of Body
- * @return  Number?            Number of bytes, or null if not possible
- */
-function getTotalBytes(instance) {
-	const body = instance.body;
-
-	// istanbul ignore if: included for completion
-
-	if (body === null) {
-		// body is null
-		return 0;
-	} else if (isBlob(body)) {
-		return body.size;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return body.length;
-	} else if (body && typeof body.getLengthSync === 'function') {
-		// detect form data input from form-data module
-		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
-		body.hasKnownLength && body.hasKnownLength()) {
-			// 2.x
-			return body.getLengthSync();
-		}
-		return null;
-	} else {
-		// body is stream
-		return instance.size || null;
-	}
-}
-
-/**
- * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
- *
- * @param   Body    instance   Instance of Body
- * @return  Void
- */
-function writeToStream(dest, instance) {
-	const body = instance.body;
-
-
-	if (body === null) {
-		// body is null
-		dest.end();
-	} else if (isBlob(body)) {
-		body.stream().pipe(dest);
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		dest.write(body);
-		dest.end();
-	} else {
-		// body is stream
-		body.pipe(dest);
-	}
-}
-
-// expose Promise
-Body.Promise = global.Promise;
-
-/**
- * headers.js
- *
- * Headers class offers convenient helpers
- */
-
-const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
-const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
-
-function validateName(name) {
-	name = `${name}`;
-	if (invalidTokenRegex.test(name) || name === '') {
-		throw new TypeError(`${name} is not a legal HTTP header name`);
-	}
-}
-
-function validateValue(value) {
-	value = `${value}`;
-	if (invalidHeaderCharRegex.test(value)) {
-		throw new TypeError(`${value} is not a legal HTTP header value`);
-	}
-}
-
-/**
- * Find the key in the map object given a header name.
- *
- * Returns undefined if not found.
- *
- * @param   String  name  Header name
- * @return  String|Undefined
- */
-function find(map, name) {
-	name = name.toLowerCase();
-	for (const key in map) {
-		if (key.toLowerCase() === name) {
-			return key;
-		}
-	}
-	return undefined;
-}
-
-const MAP = Symbol('map');
-class Headers {
-	/**
-  * Headers class
-  *
-  * @param   Object  headers  Response headers
-  * @return  Void
-  */
-	constructor() {
-		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-
-		this[MAP] = Object.create(null);
-
-		if (init instanceof Headers) {
-			const rawHeaders = init.raw();
-			const headerNames = Object.keys(rawHeaders);
-
-			for (const headerName of headerNames) {
-				for (const value of rawHeaders[headerName]) {
-					this.append(headerName, value);
-				}
-			}
-
-			return;
-		}
-
-		// We don't worry about converting prop to ByteString here as append()
-		// will handle it.
-		if (init == null) ; else if (typeof init === 'object') {
-			const method = init[Symbol.iterator];
-			if (method != null) {
-				if (typeof method !== 'function') {
-					throw new TypeError('Header pairs must be iterable');
-				}
-
-				// sequence<sequence<ByteString>>
-				// Note: per spec we have to first exhaust the lists then process them
-				const pairs = [];
-				for (const pair of init) {
-					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
-						throw new TypeError('Each header pair must be iterable');
-					}
-					pairs.push(Array.from(pair));
-				}
-
-				for (const pair of pairs) {
-					if (pair.length !== 2) {
-						throw new TypeError('Each header pair must be a name/value tuple');
-					}
-					this.append(pair[0], pair[1]);
-				}
-			} else {
-				// record<ByteString, ByteString>
-				for (const key of Object.keys(init)) {
-					const value = init[key];
-					this.append(key, value);
-				}
-			}
-		} else {
-			throw new TypeError('Provided initializer must be an object');
-		}
-	}
-
-	/**
-  * Return combined header value given name
-  *
-  * @param   String  name  Header name
-  * @return  Mixed
-  */
-	get(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key === undefined) {
-			return null;
-		}
-
-		return this[MAP][key].join(', ');
-	}
-
-	/**
-  * Iterate over all headers
-  *
-  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
-  * @param   Boolean   thisArg   `this` context for callback function
-  * @return  Void
-  */
-	forEach(callback) {
-		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
-
-		let pairs = getHeaders(this);
-		let i = 0;
-		while (i < pairs.length) {
-			var _pairs$i = pairs[i];
-			const name = _pairs$i[0],
-			      value = _pairs$i[1];
-
-			callback.call(thisArg, value, name, this);
-			pairs = getHeaders(this);
-			i++;
-		}
-	}
-
-	/**
-  * Overwrite header values given name
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	set(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		this[MAP][key !== undefined ? key : name] = [value];
-	}
-
-	/**
-  * Append a value onto existing header
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	append(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			this[MAP][key].push(value);
-		} else {
-			this[MAP][name] = [value];
-		}
-	}
-
-	/**
-  * Check for header name existence
-  *
-  * @param   String   name  Header name
-  * @return  Boolean
-  */
-	has(name) {
-		name = `${name}`;
-		validateName(name);
-		return find(this[MAP], name) !== undefined;
-	}
-
-	/**
-  * Delete all header values given name
-  *
-  * @param   String  name  Header name
-  * @return  Void
-  */
-	delete(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			delete this[MAP][key];
-		}
-	}
-
-	/**
-  * Return raw headers (non-spec api)
-  *
-  * @return  Object
-  */
-	raw() {
-		return this[MAP];
-	}
-
-	/**
-  * Get an iterator on keys.
-  *
-  * @return  Iterator
-  */
-	keys() {
-		return createHeadersIterator(this, 'key');
-	}
-
-	/**
-  * Get an iterator on values.
-  *
-  * @return  Iterator
-  */
-	values() {
-		return createHeadersIterator(this, 'value');
-	}
-
-	/**
-  * Get an iterator on entries.
-  *
-  * This is the default iterator of the Headers object.
-  *
-  * @return  Iterator
-  */
-	[Symbol.iterator]() {
-		return createHeadersIterator(this, 'key+value');
-	}
-}
-Headers.prototype.entries = Headers.prototype[Symbol.iterator];
-
-Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
-	value: 'Headers',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Headers.prototype, {
-	get: { enumerable: true },
-	forEach: { enumerable: true },
-	set: { enumerable: true },
-	append: { enumerable: true },
-	has: { enumerable: true },
-	delete: { enumerable: true },
-	keys: { enumerable: true },
-	values: { enumerable: true },
-	entries: { enumerable: true }
-});
-
-function getHeaders(headers) {
-	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
-
-	const keys = Object.keys(headers[MAP]).sort();
-	return keys.map(kind === 'key' ? function (k) {
-		return k.toLowerCase();
-	} : kind === 'value' ? function (k) {
-		return headers[MAP][k].join(', ');
-	} : function (k) {
-		return [k.toLowerCase(), headers[MAP][k].join(', ')];
-	});
-}
-
-const INTERNAL = Symbol('internal');
-
-function createHeadersIterator(target, kind) {
-	const iterator = Object.create(HeadersIteratorPrototype);
-	iterator[INTERNAL] = {
-		target,
-		kind,
-		index: 0
-	};
-	return iterator;
-}
-
-const HeadersIteratorPrototype = Object.setPrototypeOf({
-	next() {
-		// istanbul ignore if
-		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
-			throw new TypeError('Value of `this` is not a HeadersIterator');
-		}
-
-		var _INTERNAL = this[INTERNAL];
-		const target = _INTERNAL.target,
-		      kind = _INTERNAL.kind,
-		      index = _INTERNAL.index;
-
-		const values = getHeaders(target, kind);
-		const len = values.length;
-		if (index >= len) {
-			return {
-				value: undefined,
-				done: true
-			};
-		}
-
-		this[INTERNAL].index = index + 1;
-
-		return {
-			value: values[index],
-			done: false
-		};
-	}
-}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
-
-Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
-	value: 'HeadersIterator',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * Export the Headers object in a form that Node.js can consume.
- *
- * @param   Headers  headers
- * @return  Object
- */
-function exportNodeCompatibleHeaders(headers) {
-	const obj = Object.assign({ __proto__: null }, headers[MAP]);
-
-	// http.request() only supports string as Host header. This hack makes
-	// specifying custom Host header possible.
-	const hostHeaderKey = find(headers[MAP], 'Host');
-	if (hostHeaderKey !== undefined) {
-		obj[hostHeaderKey] = obj[hostHeaderKey][0];
-	}
-
-	return obj;
-}
-
-/**
- * Create a Headers object from an object of headers, ignoring those that do
- * not conform to HTTP grammar productions.
- *
- * @param   Object  obj  Object of headers
- * @return  Headers
- */
-function createHeadersLenient(obj) {
-	const headers = new Headers();
-	for (const name of Object.keys(obj)) {
-		if (invalidTokenRegex.test(name)) {
-			continue;
-		}
-		if (Array.isArray(obj[name])) {
-			for (const val of obj[name]) {
-				if (invalidHeaderCharRegex.test(val)) {
-					continue;
-				}
-				if (headers[MAP][name] === undefined) {
-					headers[MAP][name] = [val];
-				} else {
-					headers[MAP][name].push(val);
-				}
-			}
-		} else if (!invalidHeaderCharRegex.test(obj[name])) {
-			headers[MAP][name] = [obj[name]];
-		}
-	}
-	return headers;
-}
-
-const INTERNALS$1 = Symbol('Response internals');
-
-// fix an issue where "STATUS_CODES" aren't a named export for node <10
-const STATUS_CODES = http.STATUS_CODES;
-
-/**
- * Response class
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-class Response {
-	constructor() {
-		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		Body.call(this, body, opts);
-
-		const status = opts.status || 200;
-		const headers = new Headers(opts.headers);
-
-		if (body != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(body);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		this[INTERNALS$1] = {
-			url: opts.url,
-			status,
-			statusText: opts.statusText || STATUS_CODES[status],
-			headers,
-			counter: opts.counter
-		};
-	}
-
-	get url() {
-		return this[INTERNALS$1].url;
-	}
-
-	get status() {
-		return this[INTERNALS$1].status;
-	}
-
-	/**
-  * Convenience property representing if the request ended normally
-  */
-	get ok() {
-		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
-	}
-
-	get redirected() {
-		return this[INTERNALS$1].counter > 0;
-	}
-
-	get statusText() {
-		return this[INTERNALS$1].statusText;
-	}
-
-	get headers() {
-		return this[INTERNALS$1].headers;
-	}
-
-	/**
-  * Clone this response
-  *
-  * @return  Response
-  */
-	clone() {
-		return new Response(clone(this), {
-			url: this.url,
-			status: this.status,
-			statusText: this.statusText,
-			headers: this.headers,
-			ok: this.ok,
-			redirected: this.redirected
-		});
-	}
-}
-
-Body.mixIn(Response.prototype);
-
-Object.defineProperties(Response.prototype, {
-	url: { enumerable: true },
-	status: { enumerable: true },
-	ok: { enumerable: true },
-	redirected: { enumerable: true },
-	statusText: { enumerable: true },
-	headers: { enumerable: true },
-	clone: { enumerable: true }
-});
-
-Object.defineProperty(Response.prototype, Symbol.toStringTag, {
-	value: 'Response',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-const INTERNALS$2 = Symbol('Request internals');
-
-// fix an issue where "format", "parse" aren't a named export for node <10
-const parse_url = Url.parse;
-const format_url = Url.format;
-
-const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
-
-/**
- * Check if a value is an instance of Request.
- *
- * @param   Mixed   input
- * @return  Boolean
- */
-function isRequest(input) {
-	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
-}
-
-function isAbortSignal(signal) {
-	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
-	return !!(proto && proto.constructor.name === 'AbortSignal');
-}
-
-/**
- * Request class
- *
- * @param   Mixed   input  Url or Request instance
- * @param   Object  init   Custom options
- * @return  Void
- */
-class Request {
-	constructor(input) {
-		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		let parsedURL;
-
-		// normalize input
-		if (!isRequest(input)) {
-			if (input && input.href) {
-				// in order to support Node.js' Url objects; though WHATWG's URL objects
-				// will fall into this branch also (since their `toString()` will return
-				// `href` property anyway)
-				parsedURL = parse_url(input.href);
-			} else {
-				// coerce input to a string before attempting to parse
-				parsedURL = parse_url(`${input}`);
-			}
-			input = {};
-		} else {
-			parsedURL = parse_url(input.url);
-		}
-
-		let method = init.method || input.method || 'GET';
-		method = method.toUpperCase();
-
-		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
-			throw new TypeError('Request with GET/HEAD method cannot have body');
-		}
-
-		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
-
-		Body.call(this, inputBody, {
-			timeout: init.timeout || input.timeout || 0,
-			size: init.size || input.size || 0
-		});
-
-		const headers = new Headers(init.headers || input.headers || {});
-
-		if (inputBody != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(inputBody);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		let signal = isRequest(input) ? input.signal : null;
-		if ('signal' in init) signal = init.signal;
-
-		if (signal != null && !isAbortSignal(signal)) {
-			throw new TypeError('Expected signal to be an instanceof AbortSignal');
-		}
-
-		this[INTERNALS$2] = {
-			method,
-			redirect: init.redirect || input.redirect || 'follow',
-			headers,
-			parsedURL,
-			signal
-		};
-
-		// node-fetch-only options
-		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
-		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
-		this.counter = init.counter || input.counter || 0;
-		this.agent = init.agent || input.agent;
-	}
-
-	get method() {
-		return this[INTERNALS$2].method;
-	}
-
-	get url() {
-		return format_url(this[INTERNALS$2].parsedURL);
-	}
-
-	get headers() {
-		return this[INTERNALS$2].headers;
-	}
-
-	get redirect() {
-		return this[INTERNALS$2].redirect;
-	}
-
-	get signal() {
-		return this[INTERNALS$2].signal;
-	}
-
-	/**
-  * Clone this request
-  *
-  * @return  Request
-  */
-	clone() {
-		return new Request(this);
-	}
-}
-
-Body.mixIn(Request.prototype);
-
-Object.defineProperty(Request.prototype, Symbol.toStringTag, {
-	value: 'Request',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Request.prototype, {
-	method: { enumerable: true },
-	url: { enumerable: true },
-	headers: { enumerable: true },
-	redirect: { enumerable: true },
-	clone: { enumerable: true },
-	signal: { enumerable: true }
-});
-
-/**
- * Convert a Request to Node.js http request options.
- *
- * @param   Request  A Request instance
- * @return  Object   The options object to be passed to http.request
- */
-function getNodeRequestOptions(request) {
-	const parsedURL = request[INTERNALS$2].parsedURL;
-	const headers = new Headers(request[INTERNALS$2].headers);
-
-	// fetch step 1.3
-	if (!headers.has('Accept')) {
-		headers.set('Accept', '*/*');
-	}
-
-	// Basic fetch
-	if (!parsedURL.protocol || !parsedURL.hostname) {
-		throw new TypeError('Only absolute URLs are supported');
-	}
-
-	if (!/^https?:$/.test(parsedURL.protocol)) {
-		throw new TypeError('Only HTTP(S) protocols are supported');
-	}
-
-	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
-		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
-	}
-
-	// HTTP-network-or-cache fetch steps 2.4-2.7
-	let contentLengthValue = null;
-	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
-		contentLengthValue = '0';
-	}
-	if (request.body != null) {
-		const totalBytes = getTotalBytes(request);
-		if (typeof totalBytes === 'number') {
-			contentLengthValue = String(totalBytes);
-		}
-	}
-	if (contentLengthValue) {
-		headers.set('Content-Length', contentLengthValue);
-	}
-
-	// HTTP-network-or-cache fetch step 2.11
-	if (!headers.has('User-Agent')) {
-		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
-	}
-
-	// HTTP-network-or-cache fetch step 2.15
-	if (request.compress && !headers.has('Accept-Encoding')) {
-		headers.set('Accept-Encoding', 'gzip,deflate');
-	}
-
-	if (!headers.has('Connection') && !request.agent) {
-		headers.set('Connection', 'close');
-	}
-
-	// HTTP-network fetch step 4.2
-	// chunked encoding is handled by Node.js
-
-	return Object.assign({}, parsedURL, {
-		method: request.method,
-		headers: exportNodeCompatibleHeaders(headers),
-		agent: request.agent
-	});
-}
-
-/**
- * abort-error.js
- *
- * AbortError interface for cancelled requests
- */
-
-/**
- * Create AbortError instance
- *
- * @param   String      message      Error message for human
- * @return  AbortError
- */
-function AbortError(message) {
-  Error.call(this, message);
-
-  this.type = 'aborted';
-  this.message = message;
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-AbortError.prototype = Object.create(Error.prototype);
-AbortError.prototype.constructor = AbortError;
-AbortError.prototype.name = 'AbortError';
-
-// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
-const PassThrough$1 = Stream.PassThrough;
-const resolve_url = Url.resolve;
-
-/**
- * Fetch function
- *
- * @param   Mixed    url   Absolute url or Request instance
- * @param   Object   opts  Fetch options
- * @return  Promise
- */
-function fetch(url, opts) {
-
-	// allow custom promise
-	if (!fetch.Promise) {
-		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
-	}
-
-	Body.Promise = fetch.Promise;
-
-	// wrap http.request into fetch
-	return new fetch.Promise(function (resolve, reject) {
-		// build request object
-		const request = new Request(url, opts);
-		const options = getNodeRequestOptions(request);
-
-		const send = (options.protocol === 'https:' ? https : http).request;
-		const signal = request.signal;
-
-		let response = null;
-
-		const abort = function abort() {
-			let error = new AbortError('The user aborted a request.');
-			reject(error);
-			if (request.body && request.body instanceof Stream.Readable) {
-				request.body.destroy(error);
-			}
-			if (!response || !response.body) return;
-			response.body.emit('error', error);
-		};
-
-		if (signal && signal.aborted) {
-			abort();
-			return;
-		}
-
-		const abortAndFinalize = function abortAndFinalize() {
-			abort();
-			finalize();
-		};
-
-		// send request
-		const req = send(options);
-		let reqTimeout;
-
-		if (signal) {
-			signal.addEventListener('abort', abortAndFinalize);
-		}
-
-		function finalize() {
-			req.abort();
-			if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			clearTimeout(reqTimeout);
-		}
-
-		if (request.timeout) {
-			req.once('socket', function (socket) {
-				reqTimeout = setTimeout(function () {
-					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
-					finalize();
-				}, request.timeout);
-			});
-		}
-
-		req.on('error', function (err) {
-			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
-			finalize();
-		});
-
-		req.on('response', function (res) {
-			clearTimeout(reqTimeout);
-
-			const headers = createHeadersLenient(res.headers);
-
-			// HTTP fetch step 5
-			if (fetch.isRedirect(res.statusCode)) {
-				// HTTP fetch step 5.2
-				const location = headers.get('Location');
-
-				// HTTP fetch step 5.3
-				const locationURL = location === null ? null : resolve_url(request.url, location);
-
-				// HTTP fetch step 5.5
-				switch (request.redirect) {
-					case 'error':
-						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
-						finalize();
-						return;
-					case 'manual':
-						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
-						if (locationURL !== null) {
-							// handle corrupted header
-							try {
-								headers.set('Location', locationURL);
-							} catch (err) {
-								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
-								reject(err);
-							}
-						}
-						break;
-					case 'follow':
-						// HTTP-redirect fetch step 2
-						if (locationURL === null) {
-							break;
-						}
-
-						// HTTP-redirect fetch step 5
-						if (request.counter >= request.follow) {
-							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 6 (counter increment)
-						// Create a new Request object.
-						const requestOpts = {
-							headers: new Headers(request.headers),
-							follow: request.follow,
-							counter: request.counter + 1,
-							agent: request.agent,
-							compress: request.compress,
-							method: request.method,
-							body: request.body,
-							signal: request.signal,
-							timeout: request.timeout
-						};
-
-						// HTTP-redirect fetch step 9
-						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
-							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 11
-						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
-							requestOpts.method = 'GET';
-							requestOpts.body = undefined;
-							requestOpts.headers.delete('content-length');
-						}
-
-						// HTTP-redirect fetch step 15
-						resolve(fetch(new Request(locationURL, requestOpts)));
-						finalize();
-						return;
-				}
-			}
-
-			// prepare response
-			res.once('end', function () {
-				if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			});
-			let body = res.pipe(new PassThrough$1());
-
-			const response_options = {
-				url: request.url,
-				status: res.statusCode,
-				statusText: res.statusMessage,
-				headers: headers,
-				size: request.size,
-				timeout: request.timeout,
-				counter: request.counter
-			};
-
-			// HTTP-network fetch step 12.1.1.3
-			const codings = headers.get('Content-Encoding');
-
-			// HTTP-network fetch step 12.1.1.4: handle content codings
-
-			// in following scenarios we ignore compression support
-			// 1. compression support is disabled
-			// 2. HEAD request
-			// 3. no Content-Encoding header
-			// 4. no content response (204)
-			// 5. content not modified response (304)
-			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// For Node v6+
-			// Be less strict when decoding compressed responses, since sometimes
-			// servers send slightly invalid responses that are still accepted
-			// by common browsers.
-			// Always using Z_SYNC_FLUSH is what cURL does.
-			const zlibOptions = {
-				flush: zlib.Z_SYNC_FLUSH,
-				finishFlush: zlib.Z_SYNC_FLUSH
-			};
-
-			// for gzip
-			if (codings == 'gzip' || codings == 'x-gzip') {
-				body = body.pipe(zlib.createGunzip(zlibOptions));
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// for deflate
-			if (codings == 'deflate' || codings == 'x-deflate') {
-				// handle the infamous raw deflate response from old servers
-				// a hack for old IIS and Apache servers
-				const raw = res.pipe(new PassThrough$1());
-				raw.once('data', function (chunk) {
-					// see http://stackoverflow.com/questions/37519828
-					if ((chunk[0] & 0x0F) === 0x08) {
-						body = body.pipe(zlib.createInflate());
-					} else {
-						body = body.pipe(zlib.createInflateRaw());
-					}
-					response = new Response(body, response_options);
-					resolve(response);
-				});
-				return;
-			}
-
-			// for br
-			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
-				body = body.pipe(zlib.createBrotliDecompress());
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// otherwise, use response as-is
-			response = new Response(body, response_options);
-			resolve(response);
-		});
-
-		writeToStream(req, request);
-	});
-}
-/**
- * Redirect code matching
- *
- * @param   Number   code  Status code
- * @return  Boolean
- */
-fetch.isRedirect = function (code) {
-	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
-};
-
-// expose Promise
-fetch.Promise = global.Promise;
-
-export default fetch;
-export { Headers, Request, Response, FetchError };
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.js b/scripts/metrics/node_modules/node-fetch/lib/index.js
deleted file mode 100644
index 86c7c031229..00000000000
--- a/scripts/metrics/node_modules/node-fetch/lib/index.js
+++ /dev/null
@@ -1,1640 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var Stream = _interopDefault(require('stream'));
-var http = _interopDefault(require('http'));
-var Url = _interopDefault(require('url'));
-var https = _interopDefault(require('https'));
-var zlib = _interopDefault(require('zlib'));
-
-// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
-
-// fix for "Readable" isn't a named export issue
-const Readable = Stream.Readable;
-
-const BUFFER = Symbol('buffer');
-const TYPE = Symbol('type');
-
-class Blob {
-	constructor() {
-		this[TYPE] = '';
-
-		const blobParts = arguments[0];
-		const options = arguments[1];
-
-		const buffers = [];
-		let size = 0;
-
-		if (blobParts) {
-			const a = blobParts;
-			const length = Number(a.length);
-			for (let i = 0; i < length; i++) {
-				const element = a[i];
-				let buffer;
-				if (element instanceof Buffer) {
-					buffer = element;
-				} else if (ArrayBuffer.isView(element)) {
-					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
-				} else if (element instanceof ArrayBuffer) {
-					buffer = Buffer.from(element);
-				} else if (element instanceof Blob) {
-					buffer = element[BUFFER];
-				} else {
-					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
-				}
-				size += buffer.length;
-				buffers.push(buffer);
-			}
-		}
-
-		this[BUFFER] = Buffer.concat(buffers);
-
-		let type = options && options.type !== undefined && String(options.type).toLowerCase();
-		if (type && !/[^\u0020-\u007E]/.test(type)) {
-			this[TYPE] = type;
-		}
-	}
-	get size() {
-		return this[BUFFER].length;
-	}
-	get type() {
-		return this[TYPE];
-	}
-	text() {
-		return Promise.resolve(this[BUFFER].toString());
-	}
-	arrayBuffer() {
-		const buf = this[BUFFER];
-		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		return Promise.resolve(ab);
-	}
-	stream() {
-		const readable = new Readable();
-		readable._read = function () {};
-		readable.push(this[BUFFER]);
-		readable.push(null);
-		return readable;
-	}
-	toString() {
-		return '[object Blob]';
-	}
-	slice() {
-		const size = this.size;
-
-		const start = arguments[0];
-		const end = arguments[1];
-		let relativeStart, relativeEnd;
-		if (start === undefined) {
-			relativeStart = 0;
-		} else if (start < 0) {
-			relativeStart = Math.max(size + start, 0);
-		} else {
-			relativeStart = Math.min(start, size);
-		}
-		if (end === undefined) {
-			relativeEnd = size;
-		} else if (end < 0) {
-			relativeEnd = Math.max(size + end, 0);
-		} else {
-			relativeEnd = Math.min(end, size);
-		}
-		const span = Math.max(relativeEnd - relativeStart, 0);
-
-		const buffer = this[BUFFER];
-		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
-		const blob = new Blob([], { type: arguments[2] });
-		blob[BUFFER] = slicedBuffer;
-		return blob;
-	}
-}
-
-Object.defineProperties(Blob.prototype, {
-	size: { enumerable: true },
-	type: { enumerable: true },
-	slice: { enumerable: true }
-});
-
-Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
-	value: 'Blob',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * fetch-error.js
- *
- * FetchError interface for operational errors
- */
-
-/**
- * Create FetchError instance
- *
- * @param   String      message      Error message for human
- * @param   String      type         Error type for machine
- * @param   String      systemError  For Node.js system error
- * @return  FetchError
- */
-function FetchError(message, type, systemError) {
-  Error.call(this, message);
-
-  this.message = message;
-  this.type = type;
-
-  // when err.type is `system`, err.code contains system error code
-  if (systemError) {
-    this.code = this.errno = systemError.code;
-  }
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-FetchError.prototype = Object.create(Error.prototype);
-FetchError.prototype.constructor = FetchError;
-FetchError.prototype.name = 'FetchError';
-
-let convert;
-try {
-	convert = require('encoding').convert;
-} catch (e) {}
-
-const INTERNALS = Symbol('Body internals');
-
-// fix an issue where "PassThrough" isn't a named export for node <10
-const PassThrough = Stream.PassThrough;
-
-/**
- * Body mixin
- *
- * Ref: https://fetch.spec.whatwg.org/#body
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-function Body(body) {
-	var _this = this;
-
-	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-	    _ref$size = _ref.size;
-
-	let size = _ref$size === undefined ? 0 : _ref$size;
-	var _ref$timeout = _ref.timeout;
-	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
-
-	if (body == null) {
-		// body is undefined or null
-		body = null;
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		body = Buffer.from(body.toString());
-	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		body = Buffer.from(body);
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
-	} else if (body instanceof Stream) ; else {
-		// none of the above
-		// coerce to string then buffer
-		body = Buffer.from(String(body));
-	}
-	this[INTERNALS] = {
-		body,
-		disturbed: false,
-		error: null
-	};
-	this.size = size;
-	this.timeout = timeout;
-
-	if (body instanceof Stream) {
-		body.on('error', function (err) {
-			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
-			_this[INTERNALS].error = error;
-		});
-	}
-}
-
-Body.prototype = {
-	get body() {
-		return this[INTERNALS].body;
-	},
-
-	get bodyUsed() {
-		return this[INTERNALS].disturbed;
-	},
-
-	/**
-  * Decode response as ArrayBuffer
-  *
-  * @return  Promise
-  */
-	arrayBuffer() {
-		return consumeBody.call(this).then(function (buf) {
-			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		});
-	},
-
-	/**
-  * Return raw response as Blob
-  *
-  * @return Promise
-  */
-	blob() {
-		let ct = this.headers && this.headers.get('content-type') || '';
-		return consumeBody.call(this).then(function (buf) {
-			return Object.assign(
-			// Prevent copying
-			new Blob([], {
-				type: ct.toLowerCase()
-			}), {
-				[BUFFER]: buf
-			});
-		});
-	},
-
-	/**
-  * Decode response as json
-  *
-  * @return  Promise
-  */
-	json() {
-		var _this2 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			try {
-				return JSON.parse(buffer.toString());
-			} catch (err) {
-				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
-			}
-		});
-	},
-
-	/**
-  * Decode response as text
-  *
-  * @return  Promise
-  */
-	text() {
-		return consumeBody.call(this).then(function (buffer) {
-			return buffer.toString();
-		});
-	},
-
-	/**
-  * Decode response as buffer (non-spec api)
-  *
-  * @return  Promise
-  */
-	buffer() {
-		return consumeBody.call(this);
-	},
-
-	/**
-  * Decode response as text, while automatically detecting the encoding and
-  * trying to decode to UTF-8 (non-spec api)
-  *
-  * @return  Promise
-  */
-	textConverted() {
-		var _this3 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			return convertBody(buffer, _this3.headers);
-		});
-	}
-};
-
-// In browsers, all properties are enumerable.
-Object.defineProperties(Body.prototype, {
-	body: { enumerable: true },
-	bodyUsed: { enumerable: true },
-	arrayBuffer: { enumerable: true },
-	blob: { enumerable: true },
-	json: { enumerable: true },
-	text: { enumerable: true }
-});
-
-Body.mixIn = function (proto) {
-	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
-		// istanbul ignore else: future proof
-		if (!(name in proto)) {
-			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
-			Object.defineProperty(proto, name, desc);
-		}
-	}
-};
-
-/**
- * Consume and convert an entire Body to a Buffer.
- *
- * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
- *
- * @return  Promise
- */
-function consumeBody() {
-	var _this4 = this;
-
-	if (this[INTERNALS].disturbed) {
-		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
-	}
-
-	this[INTERNALS].disturbed = true;
-
-	if (this[INTERNALS].error) {
-		return Body.Promise.reject(this[INTERNALS].error);
-	}
-
-	let body = this.body;
-
-	// body is null
-	if (body === null) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is blob
-	if (isBlob(body)) {
-		body = body.stream();
-	}
-
-	// body is buffer
-	if (Buffer.isBuffer(body)) {
-		return Body.Promise.resolve(body);
-	}
-
-	// istanbul ignore if: should never happen
-	if (!(body instanceof Stream)) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is stream
-	// get ready to actually consume the body
-	let accum = [];
-	let accumBytes = 0;
-	let abort = false;
-
-	return new Body.Promise(function (resolve, reject) {
-		let resTimeout;
-
-		// allow timeout on slow response body
-		if (_this4.timeout) {
-			resTimeout = setTimeout(function () {
-				abort = true;
-				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
-			}, _this4.timeout);
-		}
-
-		// handle stream errors
-		body.on('error', function (err) {
-			if (err.name === 'AbortError') {
-				// if the request was aborted, reject with this Error
-				abort = true;
-				reject(err);
-			} else {
-				// other errors, such as incorrect content-encoding
-				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-
-		body.on('data', function (chunk) {
-			if (abort || chunk === null) {
-				return;
-			}
-
-			if (_this4.size && accumBytes + chunk.length > _this4.size) {
-				abort = true;
-				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
-				return;
-			}
-
-			accumBytes += chunk.length;
-			accum.push(chunk);
-		});
-
-		body.on('end', function () {
-			if (abort) {
-				return;
-			}
-
-			clearTimeout(resTimeout);
-
-			try {
-				resolve(Buffer.concat(accum, accumBytes));
-			} catch (err) {
-				// handle streams that have accumulated too much data (issue #414)
-				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-	});
-}
-
-/**
- * Detect buffer encoding and convert to target encoding
- * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
- *
- * @param   Buffer  buffer    Incoming buffer
- * @param   String  encoding  Target encoding
- * @return  String
- */
-function convertBody(buffer, headers) {
-	if (typeof convert !== 'function') {
-		throw new Error('The package `encoding` must be installed to use the textConverted() function');
-	}
-
-	const ct = headers.get('content-type');
-	let charset = 'utf-8';
-	let res, str;
-
-	// header
-	if (ct) {
-		res = /charset=([^;]*)/i.exec(ct);
-	}
-
-	// no charset in content type, peek at response body for at most 1024 bytes
-	str = buffer.slice(0, 1024).toString();
-
-	// html5
-	if (!res && str) {
-		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// html4
-	if (!res && str) {
-		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
-
-		if (res) {
-			res = /charset=(.*)/i.exec(res.pop());
-		}
-	}
-
-	// xml
-	if (!res && str) {
-		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// found charset
-	if (res) {
-		charset = res.pop();
-
-		// prevent decode issues when sites use incorrect encoding
-		// ref: https://hsivonen.fi/encoding-menu/
-		if (charset === 'gb2312' || charset === 'gbk') {
-			charset = 'gb18030';
-		}
-	}
-
-	// turn raw buffers into a single utf-8 buffer
-	return convert(buffer, 'UTF-8', charset).toString();
-}
-
-/**
- * Detect a URLSearchParams object
- * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
- *
- * @param   Object  obj     Object to detect by type or brand
- * @return  String
- */
-function isURLSearchParams(obj) {
-	// Duck-typing as a necessary condition.
-	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
-		return false;
-	}
-
-	// Brand-checking and more duck-typing as optional condition.
-	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
-}
-
-/**
- * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
- * @param  {*} obj
- * @return {boolean}
- */
-function isBlob(obj) {
-	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
-}
-
-/**
- * Clone body given Res/Req instance
- *
- * @param   Mixed  instance  Response or Request instance
- * @return  Mixed
- */
-function clone(instance) {
-	let p1, p2;
-	let body = instance.body;
-
-	// don't allow cloning a used body
-	if (instance.bodyUsed) {
-		throw new Error('cannot clone body after it is used');
-	}
-
-	// check that body is a stream and not form-data object
-	// note: we can't clone the form-data object without having it as a dependency
-	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
-		// tee instance body
-		p1 = new PassThrough();
-		p2 = new PassThrough();
-		body.pipe(p1);
-		body.pipe(p2);
-		// set instance body to teed body and return the other teed body
-		instance[INTERNALS].body = p1;
-		body = p2;
-	}
-
-	return body;
-}
-
-/**
- * Performs the operation "extract a `Content-Type` value from |object|" as
- * specified in the specification:
- * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
- *
- * This function assumes that instance.body is present.
- *
- * @param   Mixed  instance  Response or Request instance
- */
-function extractContentType(body) {
-	// istanbul ignore if: Currently, because of a guard in Request, body
-	// can never be null. Included here for completeness.
-	if (body === null) {
-		// body is null
-		return null;
-	} else if (typeof body === 'string') {
-		// body is string
-		return 'text/plain;charset=UTF-8';
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		return 'application/x-www-form-urlencoded;charset=UTF-8';
-	} else if (isBlob(body)) {
-		// body is blob
-		return body.type || null;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return null;
-	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		return null;
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		return null;
-	} else if (typeof body.getBoundary === 'function') {
-		// detect form data input from form-data module
-		return `multipart/form-data;boundary=${body.getBoundary()}`;
-	} else if (body instanceof Stream) {
-		// body is stream
-		// can't really do much about this
-		return null;
-	} else {
-		// Body constructor defaults other things to string
-		return 'text/plain;charset=UTF-8';
-	}
-}
-
-/**
- * The Fetch Standard treats this as if "total bytes" is a property on the body.
- * For us, we have to explicitly get it with a function.
- *
- * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
- *
- * @param   Body    instance   Instance of Body
- * @return  Number?            Number of bytes, or null if not possible
- */
-function getTotalBytes(instance) {
-	const body = instance.body;
-
-	// istanbul ignore if: included for completion
-
-	if (body === null) {
-		// body is null
-		return 0;
-	} else if (isBlob(body)) {
-		return body.size;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return body.length;
-	} else if (body && typeof body.getLengthSync === 'function') {
-		// detect form data input from form-data module
-		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
-		body.hasKnownLength && body.hasKnownLength()) {
-			// 2.x
-			return body.getLengthSync();
-		}
-		return null;
-	} else {
-		// body is stream
-		return instance.size || null;
-	}
-}
-
-/**
- * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
- *
- * @param   Body    instance   Instance of Body
- * @return  Void
- */
-function writeToStream(dest, instance) {
-	const body = instance.body;
-
-
-	if (body === null) {
-		// body is null
-		dest.end();
-	} else if (isBlob(body)) {
-		body.stream().pipe(dest);
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		dest.write(body);
-		dest.end();
-	} else {
-		// body is stream
-		body.pipe(dest);
-	}
-}
-
-// expose Promise
-Body.Promise = global.Promise;
-
-/**
- * headers.js
- *
- * Headers class offers convenient helpers
- */
-
-const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
-const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
-
-function validateName(name) {
-	name = `${name}`;
-	if (invalidTokenRegex.test(name) || name === '') {
-		throw new TypeError(`${name} is not a legal HTTP header name`);
-	}
-}
-
-function validateValue(value) {
-	value = `${value}`;
-	if (invalidHeaderCharRegex.test(value)) {
-		throw new TypeError(`${value} is not a legal HTTP header value`);
-	}
-}
-
-/**
- * Find the key in the map object given a header name.
- *
- * Returns undefined if not found.
- *
- * @param   String  name  Header name
- * @return  String|Undefined
- */
-function find(map, name) {
-	name = name.toLowerCase();
-	for (const key in map) {
-		if (key.toLowerCase() === name) {
-			return key;
-		}
-	}
-	return undefined;
-}
-
-const MAP = Symbol('map');
-class Headers {
-	/**
-  * Headers class
-  *
-  * @param   Object  headers  Response headers
-  * @return  Void
-  */
-	constructor() {
-		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-
-		this[MAP] = Object.create(null);
-
-		if (init instanceof Headers) {
-			const rawHeaders = init.raw();
-			const headerNames = Object.keys(rawHeaders);
-
-			for (const headerName of headerNames) {
-				for (const value of rawHeaders[headerName]) {
-					this.append(headerName, value);
-				}
-			}
-
-			return;
-		}
-
-		// We don't worry about converting prop to ByteString here as append()
-		// will handle it.
-		if (init == null) ; else if (typeof init === 'object') {
-			const method = init[Symbol.iterator];
-			if (method != null) {
-				if (typeof method !== 'function') {
-					throw new TypeError('Header pairs must be iterable');
-				}
-
-				// sequence<sequence<ByteString>>
-				// Note: per spec we have to first exhaust the lists then process them
-				const pairs = [];
-				for (const pair of init) {
-					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
-						throw new TypeError('Each header pair must be iterable');
-					}
-					pairs.push(Array.from(pair));
-				}
-
-				for (const pair of pairs) {
-					if (pair.length !== 2) {
-						throw new TypeError('Each header pair must be a name/value tuple');
-					}
-					this.append(pair[0], pair[1]);
-				}
-			} else {
-				// record<ByteString, ByteString>
-				for (const key of Object.keys(init)) {
-					const value = init[key];
-					this.append(key, value);
-				}
-			}
-		} else {
-			throw new TypeError('Provided initializer must be an object');
-		}
-	}
-
-	/**
-  * Return combined header value given name
-  *
-  * @param   String  name  Header name
-  * @return  Mixed
-  */
-	get(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key === undefined) {
-			return null;
-		}
-
-		return this[MAP][key].join(', ');
-	}
-
-	/**
-  * Iterate over all headers
-  *
-  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
-  * @param   Boolean   thisArg   `this` context for callback function
-  * @return  Void
-  */
-	forEach(callback) {
-		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
-
-		let pairs = getHeaders(this);
-		let i = 0;
-		while (i < pairs.length) {
-			var _pairs$i = pairs[i];
-			const name = _pairs$i[0],
-			      value = _pairs$i[1];
-
-			callback.call(thisArg, value, name, this);
-			pairs = getHeaders(this);
-			i++;
-		}
-	}
-
-	/**
-  * Overwrite header values given name
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	set(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		this[MAP][key !== undefined ? key : name] = [value];
-	}
-
-	/**
-  * Append a value onto existing header
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	append(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			this[MAP][key].push(value);
-		} else {
-			this[MAP][name] = [value];
-		}
-	}
-
-	/**
-  * Check for header name existence
-  *
-  * @param   String   name  Header name
-  * @return  Boolean
-  */
-	has(name) {
-		name = `${name}`;
-		validateName(name);
-		return find(this[MAP], name) !== undefined;
-	}
-
-	/**
-  * Delete all header values given name
-  *
-  * @param   String  name  Header name
-  * @return  Void
-  */
-	delete(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			delete this[MAP][key];
-		}
-	}
-
-	/**
-  * Return raw headers (non-spec api)
-  *
-  * @return  Object
-  */
-	raw() {
-		return this[MAP];
-	}
-
-	/**
-  * Get an iterator on keys.
-  *
-  * @return  Iterator
-  */
-	keys() {
-		return createHeadersIterator(this, 'key');
-	}
-
-	/**
-  * Get an iterator on values.
-  *
-  * @return  Iterator
-  */
-	values() {
-		return createHeadersIterator(this, 'value');
-	}
-
-	/**
-  * Get an iterator on entries.
-  *
-  * This is the default iterator of the Headers object.
-  *
-  * @return  Iterator
-  */
-	[Symbol.iterator]() {
-		return createHeadersIterator(this, 'key+value');
-	}
-}
-Headers.prototype.entries = Headers.prototype[Symbol.iterator];
-
-Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
-	value: 'Headers',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Headers.prototype, {
-	get: { enumerable: true },
-	forEach: { enumerable: true },
-	set: { enumerable: true },
-	append: { enumerable: true },
-	has: { enumerable: true },
-	delete: { enumerable: true },
-	keys: { enumerable: true },
-	values: { enumerable: true },
-	entries: { enumerable: true }
-});
-
-function getHeaders(headers) {
-	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
-
-	const keys = Object.keys(headers[MAP]).sort();
-	return keys.map(kind === 'key' ? function (k) {
-		return k.toLowerCase();
-	} : kind === 'value' ? function (k) {
-		return headers[MAP][k].join(', ');
-	} : function (k) {
-		return [k.toLowerCase(), headers[MAP][k].join(', ')];
-	});
-}
-
-const INTERNAL = Symbol('internal');
-
-function createHeadersIterator(target, kind) {
-	const iterator = Object.create(HeadersIteratorPrototype);
-	iterator[INTERNAL] = {
-		target,
-		kind,
-		index: 0
-	};
-	return iterator;
-}
-
-const HeadersIteratorPrototype = Object.setPrototypeOf({
-	next() {
-		// istanbul ignore if
-		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
-			throw new TypeError('Value of `this` is not a HeadersIterator');
-		}
-
-		var _INTERNAL = this[INTERNAL];
-		const target = _INTERNAL.target,
-		      kind = _INTERNAL.kind,
-		      index = _INTERNAL.index;
-
-		const values = getHeaders(target, kind);
-		const len = values.length;
-		if (index >= len) {
-			return {
-				value: undefined,
-				done: true
-			};
-		}
-
-		this[INTERNAL].index = index + 1;
-
-		return {
-			value: values[index],
-			done: false
-		};
-	}
-}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
-
-Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
-	value: 'HeadersIterator',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * Export the Headers object in a form that Node.js can consume.
- *
- * @param   Headers  headers
- * @return  Object
- */
-function exportNodeCompatibleHeaders(headers) {
-	const obj = Object.assign({ __proto__: null }, headers[MAP]);
-
-	// http.request() only supports string as Host header. This hack makes
-	// specifying custom Host header possible.
-	const hostHeaderKey = find(headers[MAP], 'Host');
-	if (hostHeaderKey !== undefined) {
-		obj[hostHeaderKey] = obj[hostHeaderKey][0];
-	}
-
-	return obj;
-}
-
-/**
- * Create a Headers object from an object of headers, ignoring those that do
- * not conform to HTTP grammar productions.
- *
- * @param   Object  obj  Object of headers
- * @return  Headers
- */
-function createHeadersLenient(obj) {
-	const headers = new Headers();
-	for (const name of Object.keys(obj)) {
-		if (invalidTokenRegex.test(name)) {
-			continue;
-		}
-		if (Array.isArray(obj[name])) {
-			for (const val of obj[name]) {
-				if (invalidHeaderCharRegex.test(val)) {
-					continue;
-				}
-				if (headers[MAP][name] === undefined) {
-					headers[MAP][name] = [val];
-				} else {
-					headers[MAP][name].push(val);
-				}
-			}
-		} else if (!invalidHeaderCharRegex.test(obj[name])) {
-			headers[MAP][name] = [obj[name]];
-		}
-	}
-	return headers;
-}
-
-const INTERNALS$1 = Symbol('Response internals');
-
-// fix an issue where "STATUS_CODES" aren't a named export for node <10
-const STATUS_CODES = http.STATUS_CODES;
-
-/**
- * Response class
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-class Response {
-	constructor() {
-		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		Body.call(this, body, opts);
-
-		const status = opts.status || 200;
-		const headers = new Headers(opts.headers);
-
-		if (body != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(body);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		this[INTERNALS$1] = {
-			url: opts.url,
-			status,
-			statusText: opts.statusText || STATUS_CODES[status],
-			headers,
-			counter: opts.counter
-		};
-	}
-
-	get url() {
-		return this[INTERNALS$1].url;
-	}
-
-	get status() {
-		return this[INTERNALS$1].status;
-	}
-
-	/**
-  * Convenience property representing if the request ended normally
-  */
-	get ok() {
-		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
-	}
-
-	get redirected() {
-		return this[INTERNALS$1].counter > 0;
-	}
-
-	get statusText() {
-		return this[INTERNALS$1].statusText;
-	}
-
-	get headers() {
-		return this[INTERNALS$1].headers;
-	}
-
-	/**
-  * Clone this response
-  *
-  * @return  Response
-  */
-	clone() {
-		return new Response(clone(this), {
-			url: this.url,
-			status: this.status,
-			statusText: this.statusText,
-			headers: this.headers,
-			ok: this.ok,
-			redirected: this.redirected
-		});
-	}
-}
-
-Body.mixIn(Response.prototype);
-
-Object.defineProperties(Response.prototype, {
-	url: { enumerable: true },
-	status: { enumerable: true },
-	ok: { enumerable: true },
-	redirected: { enumerable: true },
-	statusText: { enumerable: true },
-	headers: { enumerable: true },
-	clone: { enumerable: true }
-});
-
-Object.defineProperty(Response.prototype, Symbol.toStringTag, {
-	value: 'Response',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-const INTERNALS$2 = Symbol('Request internals');
-
-// fix an issue where "format", "parse" aren't a named export for node <10
-const parse_url = Url.parse;
-const format_url = Url.format;
-
-const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
-
-/**
- * Check if a value is an instance of Request.
- *
- * @param   Mixed   input
- * @return  Boolean
- */
-function isRequest(input) {
-	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
-}
-
-function isAbortSignal(signal) {
-	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
-	return !!(proto && proto.constructor.name === 'AbortSignal');
-}
-
-/**
- * Request class
- *
- * @param   Mixed   input  Url or Request instance
- * @param   Object  init   Custom options
- * @return  Void
- */
-class Request {
-	constructor(input) {
-		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		let parsedURL;
-
-		// normalize input
-		if (!isRequest(input)) {
-			if (input && input.href) {
-				// in order to support Node.js' Url objects; though WHATWG's URL objects
-				// will fall into this branch also (since their `toString()` will return
-				// `href` property anyway)
-				parsedURL = parse_url(input.href);
-			} else {
-				// coerce input to a string before attempting to parse
-				parsedURL = parse_url(`${input}`);
-			}
-			input = {};
-		} else {
-			parsedURL = parse_url(input.url);
-		}
-
-		let method = init.method || input.method || 'GET';
-		method = method.toUpperCase();
-
-		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
-			throw new TypeError('Request with GET/HEAD method cannot have body');
-		}
-
-		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
-
-		Body.call(this, inputBody, {
-			timeout: init.timeout || input.timeout || 0,
-			size: init.size || input.size || 0
-		});
-
-		const headers = new Headers(init.headers || input.headers || {});
-
-		if (inputBody != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(inputBody);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		let signal = isRequest(input) ? input.signal : null;
-		if ('signal' in init) signal = init.signal;
-
-		if (signal != null && !isAbortSignal(signal)) {
-			throw new TypeError('Expected signal to be an instanceof AbortSignal');
-		}
-
-		this[INTERNALS$2] = {
-			method,
-			redirect: init.redirect || input.redirect || 'follow',
-			headers,
-			parsedURL,
-			signal
-		};
-
-		// node-fetch-only options
-		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
-		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
-		this.counter = init.counter || input.counter || 0;
-		this.agent = init.agent || input.agent;
-	}
-
-	get method() {
-		return this[INTERNALS$2].method;
-	}
-
-	get url() {
-		return format_url(this[INTERNALS$2].parsedURL);
-	}
-
-	get headers() {
-		return this[INTERNALS$2].headers;
-	}
-
-	get redirect() {
-		return this[INTERNALS$2].redirect;
-	}
-
-	get signal() {
-		return this[INTERNALS$2].signal;
-	}
-
-	/**
-  * Clone this request
-  *
-  * @return  Request
-  */
-	clone() {
-		return new Request(this);
-	}
-}
-
-Body.mixIn(Request.prototype);
-
-Object.defineProperty(Request.prototype, Symbol.toStringTag, {
-	value: 'Request',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Request.prototype, {
-	method: { enumerable: true },
-	url: { enumerable: true },
-	headers: { enumerable: true },
-	redirect: { enumerable: true },
-	clone: { enumerable: true },
-	signal: { enumerable: true }
-});
-
-/**
- * Convert a Request to Node.js http request options.
- *
- * @param   Request  A Request instance
- * @return  Object   The options object to be passed to http.request
- */
-function getNodeRequestOptions(request) {
-	const parsedURL = request[INTERNALS$2].parsedURL;
-	const headers = new Headers(request[INTERNALS$2].headers);
-
-	// fetch step 1.3
-	if (!headers.has('Accept')) {
-		headers.set('Accept', '*/*');
-	}
-
-	// Basic fetch
-	if (!parsedURL.protocol || !parsedURL.hostname) {
-		throw new TypeError('Only absolute URLs are supported');
-	}
-
-	if (!/^https?:$/.test(parsedURL.protocol)) {
-		throw new TypeError('Only HTTP(S) protocols are supported');
-	}
-
-	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
-		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
-	}
-
-	// HTTP-network-or-cache fetch steps 2.4-2.7
-	let contentLengthValue = null;
-	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
-		contentLengthValue = '0';
-	}
-	if (request.body != null) {
-		const totalBytes = getTotalBytes(request);
-		if (typeof totalBytes === 'number') {
-			contentLengthValue = String(totalBytes);
-		}
-	}
-	if (contentLengthValue) {
-		headers.set('Content-Length', contentLengthValue);
-	}
-
-	// HTTP-network-or-cache fetch step 2.11
-	if (!headers.has('User-Agent')) {
-		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
-	}
-
-	// HTTP-network-or-cache fetch step 2.15
-	if (request.compress && !headers.has('Accept-Encoding')) {
-		headers.set('Accept-Encoding', 'gzip,deflate');
-	}
-
-	if (!headers.has('Connection') && !request.agent) {
-		headers.set('Connection', 'close');
-	}
-
-	// HTTP-network fetch step 4.2
-	// chunked encoding is handled by Node.js
-
-	return Object.assign({}, parsedURL, {
-		method: request.method,
-		headers: exportNodeCompatibleHeaders(headers),
-		agent: request.agent
-	});
-}
-
-/**
- * abort-error.js
- *
- * AbortError interface for cancelled requests
- */
-
-/**
- * Create AbortError instance
- *
- * @param   String      message      Error message for human
- * @return  AbortError
- */
-function AbortError(message) {
-  Error.call(this, message);
-
-  this.type = 'aborted';
-  this.message = message;
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-AbortError.prototype = Object.create(Error.prototype);
-AbortError.prototype.constructor = AbortError;
-AbortError.prototype.name = 'AbortError';
-
-// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
-const PassThrough$1 = Stream.PassThrough;
-const resolve_url = Url.resolve;
-
-/**
- * Fetch function
- *
- * @param   Mixed    url   Absolute url or Request instance
- * @param   Object   opts  Fetch options
- * @return  Promise
- */
-function fetch(url, opts) {
-
-	// allow custom promise
-	if (!fetch.Promise) {
-		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
-	}
-
-	Body.Promise = fetch.Promise;
-
-	// wrap http.request into fetch
-	return new fetch.Promise(function (resolve, reject) {
-		// build request object
-		const request = new Request(url, opts);
-		const options = getNodeRequestOptions(request);
-
-		const send = (options.protocol === 'https:' ? https : http).request;
-		const signal = request.signal;
-
-		let response = null;
-
-		const abort = function abort() {
-			let error = new AbortError('The user aborted a request.');
-			reject(error);
-			if (request.body && request.body instanceof Stream.Readable) {
-				request.body.destroy(error);
-			}
-			if (!response || !response.body) return;
-			response.body.emit('error', error);
-		};
-
-		if (signal && signal.aborted) {
-			abort();
-			return;
-		}
-
-		const abortAndFinalize = function abortAndFinalize() {
-			abort();
-			finalize();
-		};
-
-		// send request
-		const req = send(options);
-		let reqTimeout;
-
-		if (signal) {
-			signal.addEventListener('abort', abortAndFinalize);
-		}
-
-		function finalize() {
-			req.abort();
-			if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			clearTimeout(reqTimeout);
-		}
-
-		if (request.timeout) {
-			req.once('socket', function (socket) {
-				reqTimeout = setTimeout(function () {
-					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
-					finalize();
-				}, request.timeout);
-			});
-		}
-
-		req.on('error', function (err) {
-			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
-			finalize();
-		});
-
-		req.on('response', function (res) {
-			clearTimeout(reqTimeout);
-
-			const headers = createHeadersLenient(res.headers);
-
-			// HTTP fetch step 5
-			if (fetch.isRedirect(res.statusCode)) {
-				// HTTP fetch step 5.2
-				const location = headers.get('Location');
-
-				// HTTP fetch step 5.3
-				const locationURL = location === null ? null : resolve_url(request.url, location);
-
-				// HTTP fetch step 5.5
-				switch (request.redirect) {
-					case 'error':
-						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
-						finalize();
-						return;
-					case 'manual':
-						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
-						if (locationURL !== null) {
-							// handle corrupted header
-							try {
-								headers.set('Location', locationURL);
-							} catch (err) {
-								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
-								reject(err);
-							}
-						}
-						break;
-					case 'follow':
-						// HTTP-redirect fetch step 2
-						if (locationURL === null) {
-							break;
-						}
-
-						// HTTP-redirect fetch step 5
-						if (request.counter >= request.follow) {
-							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 6 (counter increment)
-						// Create a new Request object.
-						const requestOpts = {
-							headers: new Headers(request.headers),
-							follow: request.follow,
-							counter: request.counter + 1,
-							agent: request.agent,
-							compress: request.compress,
-							method: request.method,
-							body: request.body,
-							signal: request.signal,
-							timeout: request.timeout
-						};
-
-						// HTTP-redirect fetch step 9
-						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
-							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 11
-						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
-							requestOpts.method = 'GET';
-							requestOpts.body = undefined;
-							requestOpts.headers.delete('content-length');
-						}
-
-						// HTTP-redirect fetch step 15
-						resolve(fetch(new Request(locationURL, requestOpts)));
-						finalize();
-						return;
-				}
-			}
-
-			// prepare response
-			res.once('end', function () {
-				if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			});
-			let body = res.pipe(new PassThrough$1());
-
-			const response_options = {
-				url: request.url,
-				status: res.statusCode,
-				statusText: res.statusMessage,
-				headers: headers,
-				size: request.size,
-				timeout: request.timeout,
-				counter: request.counter
-			};
-
-			// HTTP-network fetch step 12.1.1.3
-			const codings = headers.get('Content-Encoding');
-
-			// HTTP-network fetch step 12.1.1.4: handle content codings
-
-			// in following scenarios we ignore compression support
-			// 1. compression support is disabled
-			// 2. HEAD request
-			// 3. no Content-Encoding header
-			// 4. no content response (204)
-			// 5. content not modified response (304)
-			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// For Node v6+
-			// Be less strict when decoding compressed responses, since sometimes
-			// servers send slightly invalid responses that are still accepted
-			// by common browsers.
-			// Always using Z_SYNC_FLUSH is what cURL does.
-			const zlibOptions = {
-				flush: zlib.Z_SYNC_FLUSH,
-				finishFlush: zlib.Z_SYNC_FLUSH
-			};
-
-			// for gzip
-			if (codings == 'gzip' || codings == 'x-gzip') {
-				body = body.pipe(zlib.createGunzip(zlibOptions));
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// for deflate
-			if (codings == 'deflate' || codings == 'x-deflate') {
-				// handle the infamous raw deflate response from old servers
-				// a hack for old IIS and Apache servers
-				const raw = res.pipe(new PassThrough$1());
-				raw.once('data', function (chunk) {
-					// see http://stackoverflow.com/questions/37519828
-					if ((chunk[0] & 0x0F) === 0x08) {
-						body = body.pipe(zlib.createInflate());
-					} else {
-						body = body.pipe(zlib.createInflateRaw());
-					}
-					response = new Response(body, response_options);
-					resolve(response);
-				});
-				return;
-			}
-
-			// for br
-			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
-				body = body.pipe(zlib.createBrotliDecompress());
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// otherwise, use response as-is
-			response = new Response(body, response_options);
-			resolve(response);
-		});
-
-		writeToStream(req, request);
-	});
-}
-/**
- * Redirect code matching
- *
- * @param   Number   code  Status code
- * @return  Boolean
- */
-fetch.isRedirect = function (code) {
-	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
-};
-
-// expose Promise
-fetch.Promise = global.Promise;
-
-module.exports = exports = fetch;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = exports;
-exports.Headers = Headers;
-exports.Request = Request;
-exports.Response = Response;
-exports.FetchError = FetchError;
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.mjs b/scripts/metrics/node_modules/node-fetch/lib/index.mjs
deleted file mode 100644
index dca525658b4..00000000000
--- a/scripts/metrics/node_modules/node-fetch/lib/index.mjs
+++ /dev/null
@@ -1,1629 +0,0 @@
-import Stream from 'stream';
-import http from 'http';
-import Url from 'url';
-import https from 'https';
-import zlib from 'zlib';
-
-// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
-
-// fix for "Readable" isn't a named export issue
-const Readable = Stream.Readable;
-
-const BUFFER = Symbol('buffer');
-const TYPE = Symbol('type');
-
-class Blob {
-	constructor() {
-		this[TYPE] = '';
-
-		const blobParts = arguments[0];
-		const options = arguments[1];
-
-		const buffers = [];
-		let size = 0;
-
-		if (blobParts) {
-			const a = blobParts;
-			const length = Number(a.length);
-			for (let i = 0; i < length; i++) {
-				const element = a[i];
-				let buffer;
-				if (element instanceof Buffer) {
-					buffer = element;
-				} else if (ArrayBuffer.isView(element)) {
-					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
-				} else if (element instanceof ArrayBuffer) {
-					buffer = Buffer.from(element);
-				} else if (element instanceof Blob) {
-					buffer = element[BUFFER];
-				} else {
-					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
-				}
-				size += buffer.length;
-				buffers.push(buffer);
-			}
-		}
-
-		this[BUFFER] = Buffer.concat(buffers);
-
-		let type = options && options.type !== undefined && String(options.type).toLowerCase();
-		if (type && !/[^\u0020-\u007E]/.test(type)) {
-			this[TYPE] = type;
-		}
-	}
-	get size() {
-		return this[BUFFER].length;
-	}
-	get type() {
-		return this[TYPE];
-	}
-	text() {
-		return Promise.resolve(this[BUFFER].toString());
-	}
-	arrayBuffer() {
-		const buf = this[BUFFER];
-		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		return Promise.resolve(ab);
-	}
-	stream() {
-		const readable = new Readable();
-		readable._read = function () {};
-		readable.push(this[BUFFER]);
-		readable.push(null);
-		return readable;
-	}
-	toString() {
-		return '[object Blob]';
-	}
-	slice() {
-		const size = this.size;
-
-		const start = arguments[0];
-		const end = arguments[1];
-		let relativeStart, relativeEnd;
-		if (start === undefined) {
-			relativeStart = 0;
-		} else if (start < 0) {
-			relativeStart = Math.max(size + start, 0);
-		} else {
-			relativeStart = Math.min(start, size);
-		}
-		if (end === undefined) {
-			relativeEnd = size;
-		} else if (end < 0) {
-			relativeEnd = Math.max(size + end, 0);
-		} else {
-			relativeEnd = Math.min(end, size);
-		}
-		const span = Math.max(relativeEnd - relativeStart, 0);
-
-		const buffer = this[BUFFER];
-		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
-		const blob = new Blob([], { type: arguments[2] });
-		blob[BUFFER] = slicedBuffer;
-		return blob;
-	}
-}
-
-Object.defineProperties(Blob.prototype, {
-	size: { enumerable: true },
-	type: { enumerable: true },
-	slice: { enumerable: true }
-});
-
-Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
-	value: 'Blob',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * fetch-error.js
- *
- * FetchError interface for operational errors
- */
-
-/**
- * Create FetchError instance
- *
- * @param   String      message      Error message for human
- * @param   String      type         Error type for machine
- * @param   String      systemError  For Node.js system error
- * @return  FetchError
- */
-function FetchError(message, type, systemError) {
-  Error.call(this, message);
-
-  this.message = message;
-  this.type = type;
-
-  // when err.type is `system`, err.code contains system error code
-  if (systemError) {
-    this.code = this.errno = systemError.code;
-  }
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-FetchError.prototype = Object.create(Error.prototype);
-FetchError.prototype.constructor = FetchError;
-FetchError.prototype.name = 'FetchError';
-
-let convert;
-try {
-	convert = require('encoding').convert;
-} catch (e) {}
-
-const INTERNALS = Symbol('Body internals');
-
-// fix an issue where "PassThrough" isn't a named export for node <10
-const PassThrough = Stream.PassThrough;
-
-/**
- * Body mixin
- *
- * Ref: https://fetch.spec.whatwg.org/#body
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-function Body(body) {
-	var _this = this;
-
-	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-	    _ref$size = _ref.size;
-
-	let size = _ref$size === undefined ? 0 : _ref$size;
-	var _ref$timeout = _ref.timeout;
-	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
-
-	if (body == null) {
-		// body is undefined or null
-		body = null;
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		body = Buffer.from(body.toString());
-	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		body = Buffer.from(body);
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
-	} else if (body instanceof Stream) ; else {
-		// none of the above
-		// coerce to string then buffer
-		body = Buffer.from(String(body));
-	}
-	this[INTERNALS] = {
-		body,
-		disturbed: false,
-		error: null
-	};
-	this.size = size;
-	this.timeout = timeout;
-
-	if (body instanceof Stream) {
-		body.on('error', function (err) {
-			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
-			_this[INTERNALS].error = error;
-		});
-	}
-}
-
-Body.prototype = {
-	get body() {
-		return this[INTERNALS].body;
-	},
-
-	get bodyUsed() {
-		return this[INTERNALS].disturbed;
-	},
-
-	/**
-  * Decode response as ArrayBuffer
-  *
-  * @return  Promise
-  */
-	arrayBuffer() {
-		return consumeBody.call(this).then(function (buf) {
-			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		});
-	},
-
-	/**
-  * Return raw response as Blob
-  *
-  * @return Promise
-  */
-	blob() {
-		let ct = this.headers && this.headers.get('content-type') || '';
-		return consumeBody.call(this).then(function (buf) {
-			return Object.assign(
-			// Prevent copying
-			new Blob([], {
-				type: ct.toLowerCase()
-			}), {
-				[BUFFER]: buf
-			});
-		});
-	},
-
-	/**
-  * Decode response as json
-  *
-  * @return  Promise
-  */
-	json() {
-		var _this2 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			try {
-				return JSON.parse(buffer.toString());
-			} catch (err) {
-				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
-			}
-		});
-	},
-
-	/**
-  * Decode response as text
-  *
-  * @return  Promise
-  */
-	text() {
-		return consumeBody.call(this).then(function (buffer) {
-			return buffer.toString();
-		});
-	},
-
-	/**
-  * Decode response as buffer (non-spec api)
-  *
-  * @return  Promise
-  */
-	buffer() {
-		return consumeBody.call(this);
-	},
-
-	/**
-  * Decode response as text, while automatically detecting the encoding and
-  * trying to decode to UTF-8 (non-spec api)
-  *
-  * @return  Promise
-  */
-	textConverted() {
-		var _this3 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			return convertBody(buffer, _this3.headers);
-		});
-	}
-};
-
-// In browsers, all properties are enumerable.
-Object.defineProperties(Body.prototype, {
-	body: { enumerable: true },
-	bodyUsed: { enumerable: true },
-	arrayBuffer: { enumerable: true },
-	blob: { enumerable: true },
-	json: { enumerable: true },
-	text: { enumerable: true }
-});
-
-Body.mixIn = function (proto) {
-	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
-		// istanbul ignore else: future proof
-		if (!(name in proto)) {
-			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
-			Object.defineProperty(proto, name, desc);
-		}
-	}
-};
-
-/**
- * Consume and convert an entire Body to a Buffer.
- *
- * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
- *
- * @return  Promise
- */
-function consumeBody() {
-	var _this4 = this;
-
-	if (this[INTERNALS].disturbed) {
-		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
-	}
-
-	this[INTERNALS].disturbed = true;
-
-	if (this[INTERNALS].error) {
-		return Body.Promise.reject(this[INTERNALS].error);
-	}
-
-	let body = this.body;
-
-	// body is null
-	if (body === null) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is blob
-	if (isBlob(body)) {
-		body = body.stream();
-	}
-
-	// body is buffer
-	if (Buffer.isBuffer(body)) {
-		return Body.Promise.resolve(body);
-	}
-
-	// istanbul ignore if: should never happen
-	if (!(body instanceof Stream)) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is stream
-	// get ready to actually consume the body
-	let accum = [];
-	let accumBytes = 0;
-	let abort = false;
-
-	return new Body.Promise(function (resolve, reject) {
-		let resTimeout;
-
-		// allow timeout on slow response body
-		if (_this4.timeout) {
-			resTimeout = setTimeout(function () {
-				abort = true;
-				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
-			}, _this4.timeout);
-		}
-
-		// handle stream errors
-		body.on('error', function (err) {
-			if (err.name === 'AbortError') {
-				// if the request was aborted, reject with this Error
-				abort = true;
-				reject(err);
-			} else {
-				// other errors, such as incorrect content-encoding
-				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-
-		body.on('data', function (chunk) {
-			if (abort || chunk === null) {
-				return;
-			}
-
-			if (_this4.size && accumBytes + chunk.length > _this4.size) {
-				abort = true;
-				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
-				return;
-			}
-
-			accumBytes += chunk.length;
-			accum.push(chunk);
-		});
-
-		body.on('end', function () {
-			if (abort) {
-				return;
-			}
-
-			clearTimeout(resTimeout);
-
-			try {
-				resolve(Buffer.concat(accum, accumBytes));
-			} catch (err) {
-				// handle streams that have accumulated too much data (issue #414)
-				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-	});
-}
-
-/**
- * Detect buffer encoding and convert to target encoding
- * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
- *
- * @param   Buffer  buffer    Incoming buffer
- * @param   String  encoding  Target encoding
- * @return  String
- */
-function convertBody(buffer, headers) {
-	if (typeof convert !== 'function') {
-		throw new Error('The package `encoding` must be installed to use the textConverted() function');
-	}
-
-	const ct = headers.get('content-type');
-	let charset = 'utf-8';
-	let res, str;
-
-	// header
-	if (ct) {
-		res = /charset=([^;]*)/i.exec(ct);
-	}
-
-	// no charset in content type, peek at response body for at most 1024 bytes
-	str = buffer.slice(0, 1024).toString();
-
-	// html5
-	if (!res && str) {
-		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// html4
-	if (!res && str) {
-		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
-
-		if (res) {
-			res = /charset=(.*)/i.exec(res.pop());
-		}
-	}
-
-	// xml
-	if (!res && str) {
-		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// found charset
-	if (res) {
-		charset = res.pop();
-
-		// prevent decode issues when sites use incorrect encoding
-		// ref: https://hsivonen.fi/encoding-menu/
-		if (charset === 'gb2312' || charset === 'gbk') {
-			charset = 'gb18030';
-		}
-	}
-
-	// turn raw buffers into a single utf-8 buffer
-	return convert(buffer, 'UTF-8', charset).toString();
-}
-
-/**
- * Detect a URLSearchParams object
- * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
- *
- * @param   Object  obj     Object to detect by type or brand
- * @return  String
- */
-function isURLSearchParams(obj) {
-	// Duck-typing as a necessary condition.
-	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
-		return false;
-	}
-
-	// Brand-checking and more duck-typing as optional condition.
-	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
-}
-
-/**
- * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
- * @param  {*} obj
- * @return {boolean}
- */
-function isBlob(obj) {
-	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
-}
-
-/**
- * Clone body given Res/Req instance
- *
- * @param   Mixed  instance  Response or Request instance
- * @return  Mixed
- */
-function clone(instance) {
-	let p1, p2;
-	let body = instance.body;
-
-	// don't allow cloning a used body
-	if (instance.bodyUsed) {
-		throw new Error('cannot clone body after it is used');
-	}
-
-	// check that body is a stream and not form-data object
-	// note: we can't clone the form-data object without having it as a dependency
-	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
-		// tee instance body
-		p1 = new PassThrough();
-		p2 = new PassThrough();
-		body.pipe(p1);
-		body.pipe(p2);
-		// set instance body to teed body and return the other teed body
-		instance[INTERNALS].body = p1;
-		body = p2;
-	}
-
-	return body;
-}
-
-/**
- * Performs the operation "extract a `Content-Type` value from |object|" as
- * specified in the specification:
- * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
- *
- * This function assumes that instance.body is present.
- *
- * @param   Mixed  instance  Response or Request instance
- */
-function extractContentType(body) {
-	// istanbul ignore if: Currently, because of a guard in Request, body
-	// can never be null. Included here for completeness.
-	if (body === null) {
-		// body is null
-		return null;
-	} else if (typeof body === 'string') {
-		// body is string
-		return 'text/plain;charset=UTF-8';
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		return 'application/x-www-form-urlencoded;charset=UTF-8';
-	} else if (isBlob(body)) {
-		// body is blob
-		return body.type || null;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return null;
-	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		return null;
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		return null;
-	} else if (typeof body.getBoundary === 'function') {
-		// detect form data input from form-data module
-		return `multipart/form-data;boundary=${body.getBoundary()}`;
-	} else if (body instanceof Stream) {
-		// body is stream
-		// can't really do much about this
-		return null;
-	} else {
-		// Body constructor defaults other things to string
-		return 'text/plain;charset=UTF-8';
-	}
-}
-
-/**
- * The Fetch Standard treats this as if "total bytes" is a property on the body.
- * For us, we have to explicitly get it with a function.
- *
- * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
- *
- * @param   Body    instance   Instance of Body
- * @return  Number?            Number of bytes, or null if not possible
- */
-function getTotalBytes(instance) {
-	const body = instance.body;
-
-	// istanbul ignore if: included for completion
-
-	if (body === null) {
-		// body is null
-		return 0;
-	} else if (isBlob(body)) {
-		return body.size;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return body.length;
-	} else if (body && typeof body.getLengthSync === 'function') {
-		// detect form data input from form-data module
-		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
-		body.hasKnownLength && body.hasKnownLength()) {
-			// 2.x
-			return body.getLengthSync();
-		}
-		return null;
-	} else {
-		// body is stream
-		return instance.size || null;
-	}
-}
-
-/**
- * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
- *
- * @param   Body    instance   Instance of Body
- * @return  Void
- */
-function writeToStream(dest, instance) {
-	const body = instance.body;
-
-
-	if (body === null) {
-		// body is null
-		dest.end();
-	} else if (isBlob(body)) {
-		body.stream().pipe(dest);
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		dest.write(body);
-		dest.end();
-	} else {
-		// body is stream
-		body.pipe(dest);
-	}
-}
-
-// expose Promise
-Body.Promise = global.Promise;
-
-/**
- * headers.js
- *
- * Headers class offers convenient helpers
- */
-
-const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
-const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
-
-function validateName(name) {
-	name = `${name}`;
-	if (invalidTokenRegex.test(name) || name === '') {
-		throw new TypeError(`${name} is not a legal HTTP header name`);
-	}
-}
-
-function validateValue(value) {
-	value = `${value}`;
-	if (invalidHeaderCharRegex.test(value)) {
-		throw new TypeError(`${value} is not a legal HTTP header value`);
-	}
-}
-
-/**
- * Find the key in the map object given a header name.
- *
- * Returns undefined if not found.
- *
- * @param   String  name  Header name
- * @return  String|Undefined
- */
-function find(map, name) {
-	name = name.toLowerCase();
-	for (const key in map) {
-		if (key.toLowerCase() === name) {
-			return key;
-		}
-	}
-	return undefined;
-}
-
-const MAP = Symbol('map');
-class Headers {
-	/**
-  * Headers class
-  *
-  * @param   Object  headers  Response headers
-  * @return  Void
-  */
-	constructor() {
-		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-
-		this[MAP] = Object.create(null);
-
-		if (init instanceof Headers) {
-			const rawHeaders = init.raw();
-			const headerNames = Object.keys(rawHeaders);
-
-			for (const headerName of headerNames) {
-				for (const value of rawHeaders[headerName]) {
-					this.append(headerName, value);
-				}
-			}
-
-			return;
-		}
-
-		// We don't worry about converting prop to ByteString here as append()
-		// will handle it.
-		if (init == null) ; else if (typeof init === 'object') {
-			const method = init[Symbol.iterator];
-			if (method != null) {
-				if (typeof method !== 'function') {
-					throw new TypeError('Header pairs must be iterable');
-				}
-
-				// sequence<sequence<ByteString>>
-				// Note: per spec we have to first exhaust the lists then process them
-				const pairs = [];
-				for (const pair of init) {
-					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
-						throw new TypeError('Each header pair must be iterable');
-					}
-					pairs.push(Array.from(pair));
-				}
-
-				for (const pair of pairs) {
-					if (pair.length !== 2) {
-						throw new TypeError('Each header pair must be a name/value tuple');
-					}
-					this.append(pair[0], pair[1]);
-				}
-			} else {
-				// record<ByteString, ByteString>
-				for (const key of Object.keys(init)) {
-					const value = init[key];
-					this.append(key, value);
-				}
-			}
-		} else {
-			throw new TypeError('Provided initializer must be an object');
-		}
-	}
-
-	/**
-  * Return combined header value given name
-  *
-  * @param   String  name  Header name
-  * @return  Mixed
-  */
-	get(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key === undefined) {
-			return null;
-		}
-
-		return this[MAP][key].join(', ');
-	}
-
-	/**
-  * Iterate over all headers
-  *
-  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
-  * @param   Boolean   thisArg   `this` context for callback function
-  * @return  Void
-  */
-	forEach(callback) {
-		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
-
-		let pairs = getHeaders(this);
-		let i = 0;
-		while (i < pairs.length) {
-			var _pairs$i = pairs[i];
-			const name = _pairs$i[0],
-			      value = _pairs$i[1];
-
-			callback.call(thisArg, value, name, this);
-			pairs = getHeaders(this);
-			i++;
-		}
-	}
-
-	/**
-  * Overwrite header values given name
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	set(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		this[MAP][key !== undefined ? key : name] = [value];
-	}
-
-	/**
-  * Append a value onto existing header
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	append(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			this[MAP][key].push(value);
-		} else {
-			this[MAP][name] = [value];
-		}
-	}
-
-	/**
-  * Check for header name existence
-  *
-  * @param   String   name  Header name
-  * @return  Boolean
-  */
-	has(name) {
-		name = `${name}`;
-		validateName(name);
-		return find(this[MAP], name) !== undefined;
-	}
-
-	/**
-  * Delete all header values given name
-  *
-  * @param   String  name  Header name
-  * @return  Void
-  */
-	delete(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			delete this[MAP][key];
-		}
-	}
-
-	/**
-  * Return raw headers (non-spec api)
-  *
-  * @return  Object
-  */
-	raw() {
-		return this[MAP];
-	}
-
-	/**
-  * Get an iterator on keys.
-  *
-  * @return  Iterator
-  */
-	keys() {
-		return createHeadersIterator(this, 'key');
-	}
-
-	/**
-  * Get an iterator on values.
-  *
-  * @return  Iterator
-  */
-	values() {
-		return createHeadersIterator(this, 'value');
-	}
-
-	/**
-  * Get an iterator on entries.
-  *
-  * This is the default iterator of the Headers object.
-  *
-  * @return  Iterator
-  */
-	[Symbol.iterator]() {
-		return createHeadersIterator(this, 'key+value');
-	}
-}
-Headers.prototype.entries = Headers.prototype[Symbol.iterator];
-
-Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
-	value: 'Headers',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Headers.prototype, {
-	get: { enumerable: true },
-	forEach: { enumerable: true },
-	set: { enumerable: true },
-	append: { enumerable: true },
-	has: { enumerable: true },
-	delete: { enumerable: true },
-	keys: { enumerable: true },
-	values: { enumerable: true },
-	entries: { enumerable: true }
-});
-
-function getHeaders(headers) {
-	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
-
-	const keys = Object.keys(headers[MAP]).sort();
-	return keys.map(kind === 'key' ? function (k) {
-		return k.toLowerCase();
-	} : kind === 'value' ? function (k) {
-		return headers[MAP][k].join(', ');
-	} : function (k) {
-		return [k.toLowerCase(), headers[MAP][k].join(', ')];
-	});
-}
-
-const INTERNAL = Symbol('internal');
-
-function createHeadersIterator(target, kind) {
-	const iterator = Object.create(HeadersIteratorPrototype);
-	iterator[INTERNAL] = {
-		target,
-		kind,
-		index: 0
-	};
-	return iterator;
-}
-
-const HeadersIteratorPrototype = Object.setPrototypeOf({
-	next() {
-		// istanbul ignore if
-		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
-			throw new TypeError('Value of `this` is not a HeadersIterator');
-		}
-
-		var _INTERNAL = this[INTERNAL];
-		const target = _INTERNAL.target,
-		      kind = _INTERNAL.kind,
-		      index = _INTERNAL.index;
-
-		const values = getHeaders(target, kind);
-		const len = values.length;
-		if (index >= len) {
-			return {
-				value: undefined,
-				done: true
-			};
-		}
-
-		this[INTERNAL].index = index + 1;
-
-		return {
-			value: values[index],
-			done: false
-		};
-	}
-}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
-
-Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
-	value: 'HeadersIterator',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * Export the Headers object in a form that Node.js can consume.
- *
- * @param   Headers  headers
- * @return  Object
- */
-function exportNodeCompatibleHeaders(headers) {
-	const obj = Object.assign({ __proto__: null }, headers[MAP]);
-
-	// http.request() only supports string as Host header. This hack makes
-	// specifying custom Host header possible.
-	const hostHeaderKey = find(headers[MAP], 'Host');
-	if (hostHeaderKey !== undefined) {
-		obj[hostHeaderKey] = obj[hostHeaderKey][0];
-	}
-
-	return obj;
-}
-
-/**
- * Create a Headers object from an object of headers, ignoring those that do
- * not conform to HTTP grammar productions.
- *
- * @param   Object  obj  Object of headers
- * @return  Headers
- */
-function createHeadersLenient(obj) {
-	const headers = new Headers();
-	for (const name of Object.keys(obj)) {
-		if (invalidTokenRegex.test(name)) {
-			continue;
-		}
-		if (Array.isArray(obj[name])) {
-			for (const val of obj[name]) {
-				if (invalidHeaderCharRegex.test(val)) {
-					continue;
-				}
-				if (headers[MAP][name] === undefined) {
-					headers[MAP][name] = [val];
-				} else {
-					headers[MAP][name].push(val);
-				}
-			}
-		} else if (!invalidHeaderCharRegex.test(obj[name])) {
-			headers[MAP][name] = [obj[name]];
-		}
-	}
-	return headers;
-}
-
-const INTERNALS$1 = Symbol('Response internals');
-
-// fix an issue where "STATUS_CODES" aren't a named export for node <10
-const STATUS_CODES = http.STATUS_CODES;
-
-/**
- * Response class
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-class Response {
-	constructor() {
-		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		Body.call(this, body, opts);
-
-		const status = opts.status || 200;
-		const headers = new Headers(opts.headers);
-
-		if (body != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(body);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		this[INTERNALS$1] = {
-			url: opts.url,
-			status,
-			statusText: opts.statusText || STATUS_CODES[status],
-			headers,
-			counter: opts.counter
-		};
-	}
-
-	get url() {
-		return this[INTERNALS$1].url;
-	}
-
-	get status() {
-		return this[INTERNALS$1].status;
-	}
-
-	/**
-  * Convenience property representing if the request ended normally
-  */
-	get ok() {
-		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
-	}
-
-	get redirected() {
-		return this[INTERNALS$1].counter > 0;
-	}
-
-	get statusText() {
-		return this[INTERNALS$1].statusText;
-	}
-
-	get headers() {
-		return this[INTERNALS$1].headers;
-	}
-
-	/**
-  * Clone this response
-  *
-  * @return  Response
-  */
-	clone() {
-		return new Response(clone(this), {
-			url: this.url,
-			status: this.status,
-			statusText: this.statusText,
-			headers: this.headers,
-			ok: this.ok,
-			redirected: this.redirected
-		});
-	}
-}
-
-Body.mixIn(Response.prototype);
-
-Object.defineProperties(Response.prototype, {
-	url: { enumerable: true },
-	status: { enumerable: true },
-	ok: { enumerable: true },
-	redirected: { enumerable: true },
-	statusText: { enumerable: true },
-	headers: { enumerable: true },
-	clone: { enumerable: true }
-});
-
-Object.defineProperty(Response.prototype, Symbol.toStringTag, {
-	value: 'Response',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-const INTERNALS$2 = Symbol('Request internals');
-
-// fix an issue where "format", "parse" aren't a named export for node <10
-const parse_url = Url.parse;
-const format_url = Url.format;
-
-const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
-
-/**
- * Check if a value is an instance of Request.
- *
- * @param   Mixed   input
- * @return  Boolean
- */
-function isRequest(input) {
-	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
-}
-
-function isAbortSignal(signal) {
-	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
-	return !!(proto && proto.constructor.name === 'AbortSignal');
-}
-
-/**
- * Request class
- *
- * @param   Mixed   input  Url or Request instance
- * @param   Object  init   Custom options
- * @return  Void
- */
-class Request {
-	constructor(input) {
-		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		let parsedURL;
-
-		// normalize input
-		if (!isRequest(input)) {
-			if (input && input.href) {
-				// in order to support Node.js' Url objects; though WHATWG's URL objects
-				// will fall into this branch also (since their `toString()` will return
-				// `href` property anyway)
-				parsedURL = parse_url(input.href);
-			} else {
-				// coerce input to a string before attempting to parse
-				parsedURL = parse_url(`${input}`);
-			}
-			input = {};
-		} else {
-			parsedURL = parse_url(input.url);
-		}
-
-		let method = init.method || input.method || 'GET';
-		method = method.toUpperCase();
-
-		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
-			throw new TypeError('Request with GET/HEAD method cannot have body');
-		}
-
-		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
-
-		Body.call(this, inputBody, {
-			timeout: init.timeout || input.timeout || 0,
-			size: init.size || input.size || 0
-		});
-
-		const headers = new Headers(init.headers || input.headers || {});
-
-		if (inputBody != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(inputBody);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		let signal = isRequest(input) ? input.signal : null;
-		if ('signal' in init) signal = init.signal;
-
-		if (signal != null && !isAbortSignal(signal)) {
-			throw new TypeError('Expected signal to be an instanceof AbortSignal');
-		}
-
-		this[INTERNALS$2] = {
-			method,
-			redirect: init.redirect || input.redirect || 'follow',
-			headers,
-			parsedURL,
-			signal
-		};
-
-		// node-fetch-only options
-		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
-		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
-		this.counter = init.counter || input.counter || 0;
-		this.agent = init.agent || input.agent;
-	}
-
-	get method() {
-		return this[INTERNALS$2].method;
-	}
-
-	get url() {
-		return format_url(this[INTERNALS$2].parsedURL);
-	}
-
-	get headers() {
-		return this[INTERNALS$2].headers;
-	}
-
-	get redirect() {
-		return this[INTERNALS$2].redirect;
-	}
-
-	get signal() {
-		return this[INTERNALS$2].signal;
-	}
-
-	/**
-  * Clone this request
-  *
-  * @return  Request
-  */
-	clone() {
-		return new Request(this);
-	}
-}
-
-Body.mixIn(Request.prototype);
-
-Object.defineProperty(Request.prototype, Symbol.toStringTag, {
-	value: 'Request',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Request.prototype, {
-	method: { enumerable: true },
-	url: { enumerable: true },
-	headers: { enumerable: true },
-	redirect: { enumerable: true },
-	clone: { enumerable: true },
-	signal: { enumerable: true }
-});
-
-/**
- * Convert a Request to Node.js http request options.
- *
- * @param   Request  A Request instance
- * @return  Object   The options object to be passed to http.request
- */
-function getNodeRequestOptions(request) {
-	const parsedURL = request[INTERNALS$2].parsedURL;
-	const headers = new Headers(request[INTERNALS$2].headers);
-
-	// fetch step 1.3
-	if (!headers.has('Accept')) {
-		headers.set('Accept', '*/*');
-	}
-
-	// Basic fetch
-	if (!parsedURL.protocol || !parsedURL.hostname) {
-		throw new TypeError('Only absolute URLs are supported');
-	}
-
-	if (!/^https?:$/.test(parsedURL.protocol)) {
-		throw new TypeError('Only HTTP(S) protocols are supported');
-	}
-
-	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
-		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
-	}
-
-	// HTTP-network-or-cache fetch steps 2.4-2.7
-	let contentLengthValue = null;
-	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
-		contentLengthValue = '0';
-	}
-	if (request.body != null) {
-		const totalBytes = getTotalBytes(request);
-		if (typeof totalBytes === 'number') {
-			contentLengthValue = String(totalBytes);
-		}
-	}
-	if (contentLengthValue) {
-		headers.set('Content-Length', contentLengthValue);
-	}
-
-	// HTTP-network-or-cache fetch step 2.11
-	if (!headers.has('User-Agent')) {
-		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
-	}
-
-	// HTTP-network-or-cache fetch step 2.15
-	if (request.compress && !headers.has('Accept-Encoding')) {
-		headers.set('Accept-Encoding', 'gzip,deflate');
-	}
-
-	if (!headers.has('Connection') && !request.agent) {
-		headers.set('Connection', 'close');
-	}
-
-	// HTTP-network fetch step 4.2
-	// chunked encoding is handled by Node.js
-
-	return Object.assign({}, parsedURL, {
-		method: request.method,
-		headers: exportNodeCompatibleHeaders(headers),
-		agent: request.agent
-	});
-}
-
-/**
- * abort-error.js
- *
- * AbortError interface for cancelled requests
- */
-
-/**
- * Create AbortError instance
- *
- * @param   String      message      Error message for human
- * @return  AbortError
- */
-function AbortError(message) {
-  Error.call(this, message);
-
-  this.type = 'aborted';
-  this.message = message;
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-AbortError.prototype = Object.create(Error.prototype);
-AbortError.prototype.constructor = AbortError;
-AbortError.prototype.name = 'AbortError';
-
-// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
-const PassThrough$1 = Stream.PassThrough;
-const resolve_url = Url.resolve;
-
-/**
- * Fetch function
- *
- * @param   Mixed    url   Absolute url or Request instance
- * @param   Object   opts  Fetch options
- * @return  Promise
- */
-function fetch(url, opts) {
-
-	// allow custom promise
-	if (!fetch.Promise) {
-		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
-	}
-
-	Body.Promise = fetch.Promise;
-
-	// wrap http.request into fetch
-	return new fetch.Promise(function (resolve, reject) {
-		// build request object
-		const request = new Request(url, opts);
-		const options = getNodeRequestOptions(request);
-
-		const send = (options.protocol === 'https:' ? https : http).request;
-		const signal = request.signal;
-
-		let response = null;
-
-		const abort = function abort() {
-			let error = new AbortError('The user aborted a request.');
-			reject(error);
-			if (request.body && request.body instanceof Stream.Readable) {
-				request.body.destroy(error);
-			}
-			if (!response || !response.body) return;
-			response.body.emit('error', error);
-		};
-
-		if (signal && signal.aborted) {
-			abort();
-			return;
-		}
-
-		const abortAndFinalize = function abortAndFinalize() {
-			abort();
-			finalize();
-		};
-
-		// send request
-		const req = send(options);
-		let reqTimeout;
-
-		if (signal) {
-			signal.addEventListener('abort', abortAndFinalize);
-		}
-
-		function finalize() {
-			req.abort();
-			if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			clearTimeout(reqTimeout);
-		}
-
-		if (request.timeout) {
-			req.once('socket', function (socket) {
-				reqTimeout = setTimeout(function () {
-					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
-					finalize();
-				}, request.timeout);
-			});
-		}
-
-		req.on('error', function (err) {
-			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
-			finalize();
-		});
-
-		req.on('response', function (res) {
-			clearTimeout(reqTimeout);
-
-			const headers = createHeadersLenient(res.headers);
-
-			// HTTP fetch step 5
-			if (fetch.isRedirect(res.statusCode)) {
-				// HTTP fetch step 5.2
-				const location = headers.get('Location');
-
-				// HTTP fetch step 5.3
-				const locationURL = location === null ? null : resolve_url(request.url, location);
-
-				// HTTP fetch step 5.5
-				switch (request.redirect) {
-					case 'error':
-						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
-						finalize();
-						return;
-					case 'manual':
-						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
-						if (locationURL !== null) {
-							// handle corrupted header
-							try {
-								headers.set('Location', locationURL);
-							} catch (err) {
-								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
-								reject(err);
-							}
-						}
-						break;
-					case 'follow':
-						// HTTP-redirect fetch step 2
-						if (locationURL === null) {
-							break;
-						}
-
-						// HTTP-redirect fetch step 5
-						if (request.counter >= request.follow) {
-							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 6 (counter increment)
-						// Create a new Request object.
-						const requestOpts = {
-							headers: new Headers(request.headers),
-							follow: request.follow,
-							counter: request.counter + 1,
-							agent: request.agent,
-							compress: request.compress,
-							method: request.method,
-							body: request.body,
-							signal: request.signal,
-							timeout: request.timeout
-						};
-
-						// HTTP-redirect fetch step 9
-						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
-							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 11
-						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
-							requestOpts.method = 'GET';
-							requestOpts.body = undefined;
-							requestOpts.headers.delete('content-length');
-						}
-
-						// HTTP-redirect fetch step 15
-						resolve(fetch(new Request(locationURL, requestOpts)));
-						finalize();
-						return;
-				}
-			}
-
-			// prepare response
-			res.once('end', function () {
-				if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			});
-			let body = res.pipe(new PassThrough$1());
-
-			const response_options = {
-				url: request.url,
-				status: res.statusCode,
-				statusText: res.statusMessage,
-				headers: headers,
-				size: request.size,
-				timeout: request.timeout,
-				counter: request.counter
-			};
-
-			// HTTP-network fetch step 12.1.1.3
-			const codings = headers.get('Content-Encoding');
-
-			// HTTP-network fetch step 12.1.1.4: handle content codings
-
-			// in following scenarios we ignore compression support
-			// 1. compression support is disabled
-			// 2. HEAD request
-			// 3. no Content-Encoding header
-			// 4. no content response (204)
-			// 5. content not modified response (304)
-			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// For Node v6+
-			// Be less strict when decoding compressed responses, since sometimes
-			// servers send slightly invalid responses that are still accepted
-			// by common browsers.
-			// Always using Z_SYNC_FLUSH is what cURL does.
-			const zlibOptions = {
-				flush: zlib.Z_SYNC_FLUSH,
-				finishFlush: zlib.Z_SYNC_FLUSH
-			};
-
-			// for gzip
-			if (codings == 'gzip' || codings == 'x-gzip') {
-				body = body.pipe(zlib.createGunzip(zlibOptions));
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// for deflate
-			if (codings == 'deflate' || codings == 'x-deflate') {
-				// handle the infamous raw deflate response from old servers
-				// a hack for old IIS and Apache servers
-				const raw = res.pipe(new PassThrough$1());
-				raw.once('data', function (chunk) {
-					// see http://stackoverflow.com/questions/37519828
-					if ((chunk[0] & 0x0F) === 0x08) {
-						body = body.pipe(zlib.createInflate());
-					} else {
-						body = body.pipe(zlib.createInflateRaw());
-					}
-					response = new Response(body, response_options);
-					resolve(response);
-				});
-				return;
-			}
-
-			// for br
-			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
-				body = body.pipe(zlib.createBrotliDecompress());
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// otherwise, use response as-is
-			response = new Response(body, response_options);
-			resolve(response);
-		});
-
-		writeToStream(req, request);
-	});
-}
-/**
- * Redirect code matching
- *
- * @param   Number   code  Status code
- * @return  Boolean
- */
-fetch.isRedirect = function (code) {
-	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
-};
-
-// expose Promise
-fetch.Promise = global.Promise;
-
-export default fetch;
-export { Headers, Request, Response, FetchError };
diff --git a/scripts/metrics/node_modules/node-fetch/package.json b/scripts/metrics/node_modules/node-fetch/package.json
deleted file mode 100644
index e93129c801f..00000000000
--- a/scripts/metrics/node_modules/node-fetch/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "_from": "node-fetch",
-  "_id": "node-fetch@2.5.0",
-  "_inBundle": false,
-  "_integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw==",
-  "_location": "/node-fetch",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "node-fetch",
-    "name": "node-fetch",
-    "escapedName": "node-fetch",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz",
-  "_shasum": "8028c49fc1191bba56a07adc6e2a954644a48501",
-  "_spec": "node-fetch",
-  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics",
-  "author": {
-    "name": "David Frank"
-  },
-  "browser": "./browser.js",
-  "bugs": {
-    "url": "https://github.com/bitinn/node-fetch/issues"
-  },
-  "bundleDependencies": false,
-  "dependencies": {},
-  "deprecated": false,
-  "description": "A light-weight module that brings window.fetch to node.js",
-  "devDependencies": {
-    "@ungap/url-search-params": "^0.1.2",
-    "abort-controller": "^1.1.0",
-    "abortcontroller-polyfill": "^1.3.0",
-    "babel-core": "^6.26.3",
-    "babel-plugin-istanbul": "^4.1.6",
-    "babel-preset-env": "^1.6.1",
-    "babel-register": "^6.16.3",
-    "chai": "^3.5.0",
-    "chai-as-promised": "^7.1.1",
-    "chai-iterator": "^1.1.1",
-    "chai-string": "~1.3.0",
-    "codecov": "^3.3.0",
-    "cross-env": "^5.2.0",
-    "form-data": "^2.3.3",
-    "is-builtin-module": "^1.0.0",
-    "mocha": "^5.0.0",
-    "nyc": "11.9.0",
-    "parted": "^0.1.1",
-    "promise": "^8.0.3",
-    "resumer": "0.0.0",
-    "rollup": "^0.63.4",
-    "rollup-plugin-babel": "^3.0.7",
-    "string-to-arraybuffer": "^1.0.2",
-    "whatwg-url": "^5.0.0"
-  },
-  "engines": {
-    "node": "4.x || >=6.0.0"
-  },
-  "files": [
-    "lib/index.js",
-    "lib/index.mjs",
-    "lib/index.es.js",
-    "browser.js"
-  ],
-  "homepage": "https://github.com/bitinn/node-fetch",
-  "keywords": [
-    "fetch",
-    "http",
-    "promise"
-  ],
-  "license": "MIT",
-  "main": "lib/index",
-  "module": "lib/index.mjs",
-  "name": "node-fetch",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bitinn/node-fetch.git"
-  },
-  "scripts": {
-    "build": "cross-env BABEL_ENV=rollup rollup -c",
-    "coverage": "cross-env BABEL_ENV=coverage nyc --reporter json --reporter text mocha -R spec test/test.js && codecov -f coverage/coverage-final.json",
-    "prepare": "npm run build",
-    "report": "cross-env BABEL_ENV=coverage nyc --reporter lcov --reporter text mocha -R spec test/test.js",
-    "test": "cross-env BABEL_ENV=test mocha --require babel-register --throw-deprecation test/test.js"
-  },
-  "version": "2.5.0"
-}
diff --git a/scripts/metrics/node_modules/sax/LICENSE b/scripts/metrics/node_modules/sax/LICENSE
deleted file mode 100644
index ccffa082c99..00000000000
--- a/scripts/metrics/node_modules/sax/LICENSE
+++ /dev/null
@@ -1,41 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-====
-
-`String.fromCodePoint` by Mathias Bynens used according to terms of MIT
-License, as follows:
-
-    Copyright Mathias Bynens <https://mathiasbynens.be/>
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/sax/README.md b/scripts/metrics/node_modules/sax/README.md
deleted file mode 100644
index afcd3f3dd65..00000000000
--- a/scripts/metrics/node_modules/sax/README.md
+++ /dev/null
@@ -1,225 +0,0 @@
-# sax js
-
-A sax-style parser for XML and HTML.
-
-Designed with [node](http://nodejs.org/) in mind, but should work fine in
-the browser or other CommonJS implementations.
-
-## What This Is
-
-* A very simple tool to parse through an XML string.
-* A stepping stone to a streaming HTML parser.
-* A handy way to deal with RSS and other mostly-ok-but-kinda-broken XML
-  docs.
-
-## What This Is (probably) Not
-
-* An HTML Parser - That's a fine goal, but this isn't it.  It's just
-  XML.
-* A DOM Builder - You can use it to build an object model out of XML,
-  but it doesn't do that out of the box.
-* XSLT - No DOM = no querying.
-* 100% Compliant with (some other SAX implementation) - Most SAX
-  implementations are in Java and do a lot more than this does.
-* An XML Validator - It does a little validation when in strict mode, but
-  not much.
-* A Schema-Aware XSD Thing - Schemas are an exercise in fetishistic
-  masochism.
-* A DTD-aware Thing - Fetching DTDs is a much bigger job.
-
-## Regarding `<!DOCTYPE`s and `<!ENTITY`s
-
-The parser will handle the basic XML entities in text nodes and attribute
-values: `&amp; &lt; &gt; &apos; &quot;`. It's possible to define additional
-entities in XML by putting them in the DTD. This parser doesn't do anything
-with that. If you want to listen to the `ondoctype` event, and then fetch
-the doctypes, and read the entities and add them to `parser.ENTITIES`, then
-be my guest.
-
-Unknown entities will fail in strict mode, and in loose mode, will pass
-through unmolested.
-
-## Usage
-
-```javascript
-var sax = require("./lib/sax"),
-  strict = true, // set to false for html-mode
-  parser = sax.parser(strict);
-
-parser.onerror = function (e) {
-  // an error happened.
-};
-parser.ontext = function (t) {
-  // got some text.  t is the string of text.
-};
-parser.onopentag = function (node) {
-  // opened a tag.  node has "name" and "attributes"
-};
-parser.onattribute = function (attr) {
-  // an attribute.  attr has "name" and "value"
-};
-parser.onend = function () {
-  // parser stream is done, and ready to have more stuff written to it.
-};
-
-parser.write('<xml>Hello, <who name="world">world</who>!</xml>').close();
-
-// stream usage
-// takes the same options as the parser
-var saxStream = require("sax").createStream(strict, options)
-saxStream.on("error", function (e) {
-  // unhandled errors will throw, since this is a proper node
-  // event emitter.
-  console.error("error!", e)
-  // clear the error
-  this._parser.error = null
-  this._parser.resume()
-})
-saxStream.on("opentag", function (node) {
-  // same object as above
-})
-// pipe is supported, and it's readable/writable
-// same chunks coming in also go out.
-fs.createReadStream("file.xml")
-  .pipe(saxStream)
-  .pipe(fs.createWriteStream("file-copy.xml"))
-```
-
-
-## Arguments
-
-Pass the following arguments to the parser function.  All are optional.
-
-`strict` - Boolean. Whether or not to be a jerk. Default: `false`.
-
-`opt` - Object bag of settings regarding string formatting.  All default to `false`.
-
-Settings supported:
-
-* `trim` - Boolean. Whether or not to trim text and comment nodes.
-* `normalize` - Boolean. If true, then turn any whitespace into a single
-  space.
-* `lowercase` - Boolean. If true, then lowercase tag names and attribute names
-  in loose mode, rather than uppercasing them.
-* `xmlns` - Boolean. If true, then namespaces are supported.
-* `position` - Boolean. If false, then don't track line/col/position.
-* `strictEntities` - Boolean. If true, only parse [predefined XML
-  entities](http://www.w3.org/TR/REC-xml/#sec-predefined-ent)
-  (`&amp;`, `&apos;`, `&gt;`, `&lt;`, and `&quot;`)
-
-## Methods
-
-`write` - Write bytes onto the stream. You don't have to do this all at
-once. You can keep writing as much as you want.
-
-`close` - Close the stream. Once closed, no more data may be written until
-it is done processing the buffer, which is signaled by the `end` event.
-
-`resume` - To gracefully handle errors, assign a listener to the `error`
-event. Then, when the error is taken care of, you can call `resume` to
-continue parsing. Otherwise, the parser will not continue while in an error
-state.
-
-## Members
-
-At all times, the parser object will have the following members:
-
-`line`, `column`, `position` - Indications of the position in the XML
-document where the parser currently is looking.
-
-`startTagPosition` - Indicates the position where the current tag starts.
-
-`closed` - Boolean indicating whether or not the parser can be written to.
-If it's `true`, then wait for the `ready` event to write again.
-
-`strict` - Boolean indicating whether or not the parser is a jerk.
-
-`opt` - Any options passed into the constructor.
-
-`tag` - The current tag being dealt with.
-
-And a bunch of other stuff that you probably shouldn't touch.
-
-## Events
-
-All events emit with a single argument. To listen to an event, assign a
-function to `on<eventname>`. Functions get executed in the this-context of
-the parser object. The list of supported events are also in the exported
-`EVENTS` array.
-
-When using the stream interface, assign handlers using the EventEmitter
-`on` function in the normal fashion.
-
-`error` - Indication that something bad happened. The error will be hanging
-out on `parser.error`, and must be deleted before parsing can continue. By
-listening to this event, you can keep an eye on that kind of stuff. Note:
-this happens *much* more in strict mode. Argument: instance of `Error`.
-
-`text` - Text node. Argument: string of text.
-
-`doctype` - The `<!DOCTYPE` declaration. Argument: doctype string.
-
-`processinginstruction` - Stuff like `<?xml foo="blerg" ?>`. Argument:
-object with `name` and `body` members. Attributes are not parsed, as
-processing instructions have implementation dependent semantics.
-
-`sgmldeclaration` - Random SGML declarations. Stuff like `<!ENTITY p>`
-would trigger this kind of event. This is a weird thing to support, so it
-might go away at some point. SAX isn't intended to be used to parse SGML,
-after all.
-
-`opentagstart` - Emitted immediately when the tag name is available,
-but before any attributes are encountered.  Argument: object with a
-`name` field and an empty `attributes` set.  Note that this is the
-same object that will later be emitted in the `opentag` event.
-
-`opentag` - An opening tag. Argument: object with `name` and `attributes`.
-In non-strict mode, tag names are uppercased, unless the `lowercase`
-option is set.  If the `xmlns` option is set, then it will contain
-namespace binding information on the `ns` member, and will have a
-`local`, `prefix`, and `uri` member.
-
-`closetag` - A closing tag. In loose mode, tags are auto-closed if their
-parent closes. In strict mode, well-formedness is enforced. Note that
-self-closing tags will have `closeTag` emitted immediately after `openTag`.
-Argument: tag name.
-
-`attribute` - An attribute node.  Argument: object with `name` and `value`.
-In non-strict mode, attribute names are uppercased, unless the `lowercase`
-option is set.  If the `xmlns` option is set, it will also contains namespace
-information.
-
-`comment` - A comment node.  Argument: the string of the comment.
-
-`opencdata` - The opening tag of a `<![CDATA[` block.
-
-`cdata` - The text of a `<![CDATA[` block. Since `<![CDATA[` blocks can get
-quite large, this event may fire multiple times for a single block, if it
-is broken up into multiple `write()`s. Argument: the string of random
-character data.
-
-`closecdata` - The closing tag (`]]>`) of a `<![CDATA[` block.
-
-`opennamespace` - If the `xmlns` option is set, then this event will
-signal the start of a new namespace binding.
-
-`closenamespace` - If the `xmlns` option is set, then this event will
-signal the end of a namespace binding.
-
-`end` - Indication that the closed stream has ended.
-
-`ready` - Indication that the stream has reset, and is ready to be written
-to.
-
-`noscript` - In non-strict mode, `<script>` tags trigger a `"script"`
-event, and their contents are not checked for special xml characters.
-If you pass `noscript: true`, then this behavior is suppressed.
-
-## Reporting Problems
-
-It's best to write a failing test if you find an issue.  I will always
-accept pull requests with failing tests if they demonstrate intended
-behavior, but it is very hard to figure out what issue you're describing
-without a test.  Writing a test is also the best way for you yourself
-to figure out if you really understand the issue you think you have with
-sax-js.
diff --git a/scripts/metrics/node_modules/sax/lib/sax.js b/scripts/metrics/node_modules/sax/lib/sax.js
deleted file mode 100644
index 795d607ef63..00000000000
--- a/scripts/metrics/node_modules/sax/lib/sax.js
+++ /dev/null
@@ -1,1565 +0,0 @@
-;(function (sax) { // wrapper for non-node envs
-  sax.parser = function (strict, opt) { return new SAXParser(strict, opt) }
-  sax.SAXParser = SAXParser
-  sax.SAXStream = SAXStream
-  sax.createStream = createStream
-
-  // When we pass the MAX_BUFFER_LENGTH position, start checking for buffer overruns.
-  // When we check, schedule the next check for MAX_BUFFER_LENGTH - (max(buffer lengths)),
-  // since that's the earliest that a buffer overrun could occur.  This way, checks are
-  // as rare as required, but as often as necessary to ensure never crossing this bound.
-  // Furthermore, buffers are only tested at most once per write(), so passing a very
-  // large string into write() might have undesirable effects, but this is manageable by
-  // the caller, so it is assumed to be safe.  Thus, a call to write() may, in the extreme
-  // edge case, result in creating at most one complete copy of the string passed in.
-  // Set to Infinity to have unlimited buffers.
-  sax.MAX_BUFFER_LENGTH = 64 * 1024
-
-  var buffers = [
-    'comment', 'sgmlDecl', 'textNode', 'tagName', 'doctype',
-    'procInstName', 'procInstBody', 'entity', 'attribName',
-    'attribValue', 'cdata', 'script'
-  ]
-
-  sax.EVENTS = [
-    'text',
-    'processinginstruction',
-    'sgmldeclaration',
-    'doctype',
-    'comment',
-    'opentagstart',
-    'attribute',
-    'opentag',
-    'closetag',
-    'opencdata',
-    'cdata',
-    'closecdata',
-    'error',
-    'end',
-    'ready',
-    'script',
-    'opennamespace',
-    'closenamespace'
-  ]
-
-  function SAXParser (strict, opt) {
-    if (!(this instanceof SAXParser)) {
-      return new SAXParser(strict, opt)
-    }
-
-    var parser = this
-    clearBuffers(parser)
-    parser.q = parser.c = ''
-    parser.bufferCheckPosition = sax.MAX_BUFFER_LENGTH
-    parser.opt = opt || {}
-    parser.opt.lowercase = parser.opt.lowercase || parser.opt.lowercasetags
-    parser.looseCase = parser.opt.lowercase ? 'toLowerCase' : 'toUpperCase'
-    parser.tags = []
-    parser.closed = parser.closedRoot = parser.sawRoot = false
-    parser.tag = parser.error = null
-    parser.strict = !!strict
-    parser.noscript = !!(strict || parser.opt.noscript)
-    parser.state = S.BEGIN
-    parser.strictEntities = parser.opt.strictEntities
-    parser.ENTITIES = parser.strictEntities ? Object.create(sax.XML_ENTITIES) : Object.create(sax.ENTITIES)
-    parser.attribList = []
-
-    // namespaces form a prototype chain.
-    // it always points at the current tag,
-    // which protos to its parent tag.
-    if (parser.opt.xmlns) {
-      parser.ns = Object.create(rootNS)
-    }
-
-    // mostly just for error reporting
-    parser.trackPosition = parser.opt.position !== false
-    if (parser.trackPosition) {
-      parser.position = parser.line = parser.column = 0
-    }
-    emit(parser, 'onready')
-  }
-
-  if (!Object.create) {
-    Object.create = function (o) {
-      function F () {}
-      F.prototype = o
-      var newf = new F()
-      return newf
-    }
-  }
-
-  if (!Object.keys) {
-    Object.keys = function (o) {
-      var a = []
-      for (var i in o) if (o.hasOwnProperty(i)) a.push(i)
-      return a
-    }
-  }
-
-  function checkBufferLength (parser) {
-    var maxAllowed = Math.max(sax.MAX_BUFFER_LENGTH, 10)
-    var maxActual = 0
-    for (var i = 0, l = buffers.length; i < l; i++) {
-      var len = parser[buffers[i]].length
-      if (len > maxAllowed) {
-        // Text/cdata nodes can get big, and since they're buffered,
-        // we can get here under normal conditions.
-        // Avoid issues by emitting the text node now,
-        // so at least it won't get any bigger.
-        switch (buffers[i]) {
-          case 'textNode':
-            closeText(parser)
-            break
-
-          case 'cdata':
-            emitNode(parser, 'oncdata', parser.cdata)
-            parser.cdata = ''
-            break
-
-          case 'script':
-            emitNode(parser, 'onscript', parser.script)
-            parser.script = ''
-            break
-
-          default:
-            error(parser, 'Max buffer length exceeded: ' + buffers[i])
-        }
-      }
-      maxActual = Math.max(maxActual, len)
-    }
-    // schedule the next check for the earliest possible buffer overrun.
-    var m = sax.MAX_BUFFER_LENGTH - maxActual
-    parser.bufferCheckPosition = m + parser.position
-  }
-
-  function clearBuffers (parser) {
-    for (var i = 0, l = buffers.length; i < l; i++) {
-      parser[buffers[i]] = ''
-    }
-  }
-
-  function flushBuffers (parser) {
-    closeText(parser)
-    if (parser.cdata !== '') {
-      emitNode(parser, 'oncdata', parser.cdata)
-      parser.cdata = ''
-    }
-    if (parser.script !== '') {
-      emitNode(parser, 'onscript', parser.script)
-      parser.script = ''
-    }
-  }
-
-  SAXParser.prototype = {
-    end: function () { end(this) },
-    write: write,
-    resume: function () { this.error = null; return this },
-    close: function () { return this.write(null) },
-    flush: function () { flushBuffers(this) }
-  }
-
-  var Stream
-  try {
-    Stream = require('stream').Stream
-  } catch (ex) {
-    Stream = function () {}
-  }
-
-  var streamWraps = sax.EVENTS.filter(function (ev) {
-    return ev !== 'error' && ev !== 'end'
-  })
-
-  function createStream (strict, opt) {
-    return new SAXStream(strict, opt)
-  }
-
-  function SAXStream (strict, opt) {
-    if (!(this instanceof SAXStream)) {
-      return new SAXStream(strict, opt)
-    }
-
-    Stream.apply(this)
-
-    this._parser = new SAXParser(strict, opt)
-    this.writable = true
-    this.readable = true
-
-    var me = this
-
-    this._parser.onend = function () {
-      me.emit('end')
-    }
-
-    this._parser.onerror = function (er) {
-      me.emit('error', er)
-
-      // if didn't throw, then means error was handled.
-      // go ahead and clear error, so we can write again.
-      me._parser.error = null
-    }
-
-    this._decoder = null
-
-    streamWraps.forEach(function (ev) {
-      Object.defineProperty(me, 'on' + ev, {
-        get: function () {
-          return me._parser['on' + ev]
-        },
-        set: function (h) {
-          if (!h) {
-            me.removeAllListeners(ev)
-            me._parser['on' + ev] = h
-            return h
-          }
-          me.on(ev, h)
-        },
-        enumerable: true,
-        configurable: false
-      })
-    })
-  }
-
-  SAXStream.prototype = Object.create(Stream.prototype, {
-    constructor: {
-      value: SAXStream
-    }
-  })
-
-  SAXStream.prototype.write = function (data) {
-    if (typeof Buffer === 'function' &&
-      typeof Buffer.isBuffer === 'function' &&
-      Buffer.isBuffer(data)) {
-      if (!this._decoder) {
-        var SD = require('string_decoder').StringDecoder
-        this._decoder = new SD('utf8')
-      }
-      data = this._decoder.write(data)
-    }
-
-    this._parser.write(data.toString())
-    this.emit('data', data)
-    return true
-  }
-
-  SAXStream.prototype.end = function (chunk) {
-    if (chunk && chunk.length) {
-      this.write(chunk)
-    }
-    this._parser.end()
-    return true
-  }
-
-  SAXStream.prototype.on = function (ev, handler) {
-    var me = this
-    if (!me._parser['on' + ev] && streamWraps.indexOf(ev) !== -1) {
-      me._parser['on' + ev] = function () {
-        var args = arguments.length === 1 ? [arguments[0]] : Array.apply(null, arguments)
-        args.splice(0, 0, ev)
-        me.emit.apply(me, args)
-      }
-    }
-
-    return Stream.prototype.on.call(me, ev, handler)
-  }
-
-  // this really needs to be replaced with character classes.
-  // XML allows all manner of ridiculous numbers and digits.
-  var CDATA = '[CDATA['
-  var DOCTYPE = 'DOCTYPE'
-  var XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace'
-  var XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/'
-  var rootNS = { xml: XML_NAMESPACE, xmlns: XMLNS_NAMESPACE }
-
-  // http://www.w3.org/TR/REC-xml/#NT-NameStartChar
-  // This implementation works on strings, a single character at a time
-  // as such, it cannot ever support astral-plane characters (10000-EFFFF)
-  // without a significant breaking change to either this  parser, or the
-  // JavaScript language.  Implementation of an emoji-capable xml parser
-  // is left as an exercise for the reader.
-  var nameStart = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/
-
-  var nameBody = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/
-
-  var entityStart = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/
-  var entityBody = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/
-
-  function isWhitespace (c) {
-    return c === ' ' || c === '\n' || c === '\r' || c === '\t'
-  }
-
-  function isQuote (c) {
-    return c === '"' || c === '\''
-  }
-
-  function isAttribEnd (c) {
-    return c === '>' || isWhitespace(c)
-  }
-
-  function isMatch (regex, c) {
-    return regex.test(c)
-  }
-
-  function notMatch (regex, c) {
-    return !isMatch(regex, c)
-  }
-
-  var S = 0
-  sax.STATE = {
-    BEGIN: S++, // leading byte order mark or whitespace
-    BEGIN_WHITESPACE: S++, // leading whitespace
-    TEXT: S++, // general stuff
-    TEXT_ENTITY: S++, // &amp and such.
-    OPEN_WAKA: S++, // <
-    SGML_DECL: S++, // <!BLARG
-    SGML_DECL_QUOTED: S++, // <!BLARG foo "bar
-    DOCTYPE: S++, // <!DOCTYPE
-    DOCTYPE_QUOTED: S++, // <!DOCTYPE "//blah
-    DOCTYPE_DTD: S++, // <!DOCTYPE "//blah" [ ...
-    DOCTYPE_DTD_QUOTED: S++, // <!DOCTYPE "//blah" [ "foo
-    COMMENT_STARTING: S++, // <!-
-    COMMENT: S++, // <!--
-    COMMENT_ENDING: S++, // <!-- blah -
-    COMMENT_ENDED: S++, // <!-- blah --
-    CDATA: S++, // <![CDATA[ something
-    CDATA_ENDING: S++, // ]
-    CDATA_ENDING_2: S++, // ]]
-    PROC_INST: S++, // <?hi
-    PROC_INST_BODY: S++, // <?hi there
-    PROC_INST_ENDING: S++, // <?hi "there" ?
-    OPEN_TAG: S++, // <strong
-    OPEN_TAG_SLASH: S++, // <strong /
-    ATTRIB: S++, // <a
-    ATTRIB_NAME: S++, // <a foo
-    ATTRIB_NAME_SAW_WHITE: S++, // <a foo _
-    ATTRIB_VALUE: S++, // <a foo=
-    ATTRIB_VALUE_QUOTED: S++, // <a foo="bar
-    ATTRIB_VALUE_CLOSED: S++, // <a foo="bar"
-    ATTRIB_VALUE_UNQUOTED: S++, // <a foo=bar
-    ATTRIB_VALUE_ENTITY_Q: S++, // <foo bar="&quot;"
-    ATTRIB_VALUE_ENTITY_U: S++, // <foo bar=&quot
-    CLOSE_TAG: S++, // </a
-    CLOSE_TAG_SAW_WHITE: S++, // </a   >
-    SCRIPT: S++, // <script> ...
-    SCRIPT_ENDING: S++ // <script> ... <
-  }
-
-  sax.XML_ENTITIES = {
-    'amp': '&',
-    'gt': '>',
-    'lt': '<',
-    'quot': '"',
-    'apos': "'"
-  }
-
-  sax.ENTITIES = {
-    'amp': '&',
-    'gt': '>',
-    'lt': '<',
-    'quot': '"',
-    'apos': "'",
-    'AElig': 198,
-    'Aacute': 193,
-    'Acirc': 194,
-    'Agrave': 192,
-    'Aring': 197,
-    'Atilde': 195,
-    'Auml': 196,
-    'Ccedil': 199,
-    'ETH': 208,
-    'Eacute': 201,
-    'Ecirc': 202,
-    'Egrave': 200,
-    'Euml': 203,
-    'Iacute': 205,
-    'Icirc': 206,
-    'Igrave': 204,
-    'Iuml': 207,
-    'Ntilde': 209,
-    'Oacute': 211,
-    'Ocirc': 212,
-    'Ograve': 210,
-    'Oslash': 216,
-    'Otilde': 213,
-    'Ouml': 214,
-    'THORN': 222,
-    'Uacute': 218,
-    'Ucirc': 219,
-    'Ugrave': 217,
-    'Uuml': 220,
-    'Yacute': 221,
-    'aacute': 225,
-    'acirc': 226,
-    'aelig': 230,
-    'agrave': 224,
-    'aring': 229,
-    'atilde': 227,
-    'auml': 228,
-    'ccedil': 231,
-    'eacute': 233,
-    'ecirc': 234,
-    'egrave': 232,
-    'eth': 240,
-    'euml': 235,
-    'iacute': 237,
-    'icirc': 238,
-    'igrave': 236,
-    'iuml': 239,
-    'ntilde': 241,
-    'oacute': 243,
-    'ocirc': 244,
-    'ograve': 242,
-    'oslash': 248,
-    'otilde': 245,
-    'ouml': 246,
-    'szlig': 223,
-    'thorn': 254,
-    'uacute': 250,
-    'ucirc': 251,
-    'ugrave': 249,
-    'uuml': 252,
-    'yacute': 253,
-    'yuml': 255,
-    'copy': 169,
-    'reg': 174,
-    'nbsp': 160,
-    'iexcl': 161,
-    'cent': 162,
-    'pound': 163,
-    'curren': 164,
-    'yen': 165,
-    'brvbar': 166,
-    'sect': 167,
-    'uml': 168,
-    'ordf': 170,
-    'laquo': 171,
-    'not': 172,
-    'shy': 173,
-    'macr': 175,
-    'deg': 176,
-    'plusmn': 177,
-    'sup1': 185,
-    'sup2': 178,
-    'sup3': 179,
-    'acute': 180,
-    'micro': 181,
-    'para': 182,
-    'middot': 183,
-    'cedil': 184,
-    'ordm': 186,
-    'raquo': 187,
-    'frac14': 188,
-    'frac12': 189,
-    'frac34': 190,
-    'iquest': 191,
-    'times': 215,
-    'divide': 247,
-    'OElig': 338,
-    'oelig': 339,
-    'Scaron': 352,
-    'scaron': 353,
-    'Yuml': 376,
-    'fnof': 402,
-    'circ': 710,
-    'tilde': 732,
-    'Alpha': 913,
-    'Beta': 914,
-    'Gamma': 915,
-    'Delta': 916,
-    'Epsilon': 917,
-    'Zeta': 918,
-    'Eta': 919,
-    'Theta': 920,
-    'Iota': 921,
-    'Kappa': 922,
-    'Lambda': 923,
-    'Mu': 924,
-    'Nu': 925,
-    'Xi': 926,
-    'Omicron': 927,
-    'Pi': 928,
-    'Rho': 929,
-    'Sigma': 931,
-    'Tau': 932,
-    'Upsilon': 933,
-    'Phi': 934,
-    'Chi': 935,
-    'Psi': 936,
-    'Omega': 937,
-    'alpha': 945,
-    'beta': 946,
-    'gamma': 947,
-    'delta': 948,
-    'epsilon': 949,
-    'zeta': 950,
-    'eta': 951,
-    'theta': 952,
-    'iota': 953,
-    'kappa': 954,
-    'lambda': 955,
-    'mu': 956,
-    'nu': 957,
-    'xi': 958,
-    'omicron': 959,
-    'pi': 960,
-    'rho': 961,
-    'sigmaf': 962,
-    'sigma': 963,
-    'tau': 964,
-    'upsilon': 965,
-    'phi': 966,
-    'chi': 967,
-    'psi': 968,
-    'omega': 969,
-    'thetasym': 977,
-    'upsih': 978,
-    'piv': 982,
-    'ensp': 8194,
-    'emsp': 8195,
-    'thinsp': 8201,
-    'zwnj': 8204,
-    'zwj': 8205,
-    'lrm': 8206,
-    'rlm': 8207,
-    'ndash': 8211,
-    'mdash': 8212,
-    'lsquo': 8216,
-    'rsquo': 8217,
-    'sbquo': 8218,
-    'ldquo': 8220,
-    'rdquo': 8221,
-    'bdquo': 8222,
-    'dagger': 8224,
-    'Dagger': 8225,
-    'bull': 8226,
-    'hellip': 8230,
-    'permil': 8240,
-    'prime': 8242,
-    'Prime': 8243,
-    'lsaquo': 8249,
-    'rsaquo': 8250,
-    'oline': 8254,
-    'frasl': 8260,
-    'euro': 8364,
-    'image': 8465,
-    'weierp': 8472,
-    'real': 8476,
-    'trade': 8482,
-    'alefsym': 8501,
-    'larr': 8592,
-    'uarr': 8593,
-    'rarr': 8594,
-    'darr': 8595,
-    'harr': 8596,
-    'crarr': 8629,
-    'lArr': 8656,
-    'uArr': 8657,
-    'rArr': 8658,
-    'dArr': 8659,
-    'hArr': 8660,
-    'forall': 8704,
-    'part': 8706,
-    'exist': 8707,
-    'empty': 8709,
-    'nabla': 8711,
-    'isin': 8712,
-    'notin': 8713,
-    'ni': 8715,
-    'prod': 8719,
-    'sum': 8721,
-    'minus': 8722,
-    'lowast': 8727,
-    'radic': 8730,
-    'prop': 8733,
-    'infin': 8734,
-    'ang': 8736,
-    'and': 8743,
-    'or': 8744,
-    'cap': 8745,
-    'cup': 8746,
-    'int': 8747,
-    'there4': 8756,
-    'sim': 8764,
-    'cong': 8773,
-    'asymp': 8776,
-    'ne': 8800,
-    'equiv': 8801,
-    'le': 8804,
-    'ge': 8805,
-    'sub': 8834,
-    'sup': 8835,
-    'nsub': 8836,
-    'sube': 8838,
-    'supe': 8839,
-    'oplus': 8853,
-    'otimes': 8855,
-    'perp': 8869,
-    'sdot': 8901,
-    'lceil': 8968,
-    'rceil': 8969,
-    'lfloor': 8970,
-    'rfloor': 8971,
-    'lang': 9001,
-    'rang': 9002,
-    'loz': 9674,
-    'spades': 9824,
-    'clubs': 9827,
-    'hearts': 9829,
-    'diams': 9830
-  }
-
-  Object.keys(sax.ENTITIES).forEach(function (key) {
-    var e = sax.ENTITIES[key]
-    var s = typeof e === 'number' ? String.fromCharCode(e) : e
-    sax.ENTITIES[key] = s
-  })
-
-  for (var s in sax.STATE) {
-    sax.STATE[sax.STATE[s]] = s
-  }
-
-  // shorthand
-  S = sax.STATE
-
-  function emit (parser, event, data) {
-    parser[event] && parser[event](data)
-  }
-
-  function emitNode (parser, nodeType, data) {
-    if (parser.textNode) closeText(parser)
-    emit(parser, nodeType, data)
-  }
-
-  function closeText (parser) {
-    parser.textNode = textopts(parser.opt, parser.textNode)
-    if (parser.textNode) emit(parser, 'ontext', parser.textNode)
-    parser.textNode = ''
-  }
-
-  function textopts (opt, text) {
-    if (opt.trim) text = text.trim()
-    if (opt.normalize) text = text.replace(/\s+/g, ' ')
-    return text
-  }
-
-  function error (parser, er) {
-    closeText(parser)
-    if (parser.trackPosition) {
-      er += '\nLine: ' + parser.line +
-        '\nColumn: ' + parser.column +
-        '\nChar: ' + parser.c
-    }
-    er = new Error(er)
-    parser.error = er
-    emit(parser, 'onerror', er)
-    return parser
-  }
-
-  function end (parser) {
-    if (parser.sawRoot && !parser.closedRoot) strictFail(parser, 'Unclosed root tag')
-    if ((parser.state !== S.BEGIN) &&
-      (parser.state !== S.BEGIN_WHITESPACE) &&
-      (parser.state !== S.TEXT)) {
-      error(parser, 'Unexpected end')
-    }
-    closeText(parser)
-    parser.c = ''
-    parser.closed = true
-    emit(parser, 'onend')
-    SAXParser.call(parser, parser.strict, parser.opt)
-    return parser
-  }
-
-  function strictFail (parser, message) {
-    if (typeof parser !== 'object' || !(parser instanceof SAXParser)) {
-      throw new Error('bad call to strictFail')
-    }
-    if (parser.strict) {
-      error(parser, message)
-    }
-  }
-
-  function newTag (parser) {
-    if (!parser.strict) parser.tagName = parser.tagName[parser.looseCase]()
-    var parent = parser.tags[parser.tags.length - 1] || parser
-    var tag = parser.tag = { name: parser.tagName, attributes: {} }
-
-    // will be overridden if tag contails an xmlns="foo" or xmlns:foo="bar"
-    if (parser.opt.xmlns) {
-      tag.ns = parent.ns
-    }
-    parser.attribList.length = 0
-    emitNode(parser, 'onopentagstart', tag)
-  }
-
-  function qname (name, attribute) {
-    var i = name.indexOf(':')
-    var qualName = i < 0 ? [ '', name ] : name.split(':')
-    var prefix = qualName[0]
-    var local = qualName[1]
-
-    // <x "xmlns"="http://foo">
-    if (attribute && name === 'xmlns') {
-      prefix = 'xmlns'
-      local = ''
-    }
-
-    return { prefix: prefix, local: local }
-  }
-
-  function attrib (parser) {
-    if (!parser.strict) {
-      parser.attribName = parser.attribName[parser.looseCase]()
-    }
-
-    if (parser.attribList.indexOf(parser.attribName) !== -1 ||
-      parser.tag.attributes.hasOwnProperty(parser.attribName)) {
-      parser.attribName = parser.attribValue = ''
-      return
-    }
-
-    if (parser.opt.xmlns) {
-      var qn = qname(parser.attribName, true)
-      var prefix = qn.prefix
-      var local = qn.local
-
-      if (prefix === 'xmlns') {
-        // namespace binding attribute. push the binding into scope
-        if (local === 'xml' && parser.attribValue !== XML_NAMESPACE) {
-          strictFail(parser,
-            'xml: prefix must be bound to ' + XML_NAMESPACE + '\n' +
-            'Actual: ' + parser.attribValue)
-        } else if (local === 'xmlns' && parser.attribValue !== XMLNS_NAMESPACE) {
-          strictFail(parser,
-            'xmlns: prefix must be bound to ' + XMLNS_NAMESPACE + '\n' +
-            'Actual: ' + parser.attribValue)
-        } else {
-          var tag = parser.tag
-          var parent = parser.tags[parser.tags.length - 1] || parser
-          if (tag.ns === parent.ns) {
-            tag.ns = Object.create(parent.ns)
-          }
-          tag.ns[local] = parser.attribValue
-        }
-      }
-
-      // defer onattribute events until all attributes have been seen
-      // so any new bindings can take effect. preserve attribute order
-      // so deferred events can be emitted in document order
-      parser.attribList.push([parser.attribName, parser.attribValue])
-    } else {
-      // in non-xmlns mode, we can emit the event right away
-      parser.tag.attributes[parser.attribName] = parser.attribValue
-      emitNode(parser, 'onattribute', {
-        name: parser.attribName,
-        value: parser.attribValue
-      })
-    }
-
-    parser.attribName = parser.attribValue = ''
-  }
-
-  function openTag (parser, selfClosing) {
-    if (parser.opt.xmlns) {
-      // emit namespace binding events
-      var tag = parser.tag
-
-      // add namespace info to tag
-      var qn = qname(parser.tagName)
-      tag.prefix = qn.prefix
-      tag.local = qn.local
-      tag.uri = tag.ns[qn.prefix] || ''
-
-      if (tag.prefix && !tag.uri) {
-        strictFail(parser, 'Unbound namespace prefix: ' +
-          JSON.stringify(parser.tagName))
-        tag.uri = qn.prefix
-      }
-
-      var parent = parser.tags[parser.tags.length - 1] || parser
-      if (tag.ns && parent.ns !== tag.ns) {
-        Object.keys(tag.ns).forEach(function (p) {
-          emitNode(parser, 'onopennamespace', {
-            prefix: p,
-            uri: tag.ns[p]
-          })
-        })
-      }
-
-      // handle deferred onattribute events
-      // Note: do not apply default ns to attributes:
-      //   http://www.w3.org/TR/REC-xml-names/#defaulting
-      for (var i = 0, l = parser.attribList.length; i < l; i++) {
-        var nv = parser.attribList[i]
-        var name = nv[0]
-        var value = nv[1]
-        var qualName = qname(name, true)
-        var prefix = qualName.prefix
-        var local = qualName.local
-        var uri = prefix === '' ? '' : (tag.ns[prefix] || '')
-        var a = {
-          name: name,
-          value: value,
-          prefix: prefix,
-          local: local,
-          uri: uri
-        }
-
-        // if there's any attributes with an undefined namespace,
-        // then fail on them now.
-        if (prefix && prefix !== 'xmlns' && !uri) {
-          strictFail(parser, 'Unbound namespace prefix: ' +
-            JSON.stringify(prefix))
-          a.uri = prefix
-        }
-        parser.tag.attributes[name] = a
-        emitNode(parser, 'onattribute', a)
-      }
-      parser.attribList.length = 0
-    }
-
-    parser.tag.isSelfClosing = !!selfClosing
-
-    // process the tag
-    parser.sawRoot = true
-    parser.tags.push(parser.tag)
-    emitNode(parser, 'onopentag', parser.tag)
-    if (!selfClosing) {
-      // special case for <script> in non-strict mode.
-      if (!parser.noscript && parser.tagName.toLowerCase() === 'script') {
-        parser.state = S.SCRIPT
-      } else {
-        parser.state = S.TEXT
-      }
-      parser.tag = null
-      parser.tagName = ''
-    }
-    parser.attribName = parser.attribValue = ''
-    parser.attribList.length = 0
-  }
-
-  function closeTag (parser) {
-    if (!parser.tagName) {
-      strictFail(parser, 'Weird empty close tag.')
-      parser.textNode += '</>'
-      parser.state = S.TEXT
-      return
-    }
-
-    if (parser.script) {
-      if (parser.tagName !== 'script') {
-        parser.script += '</' + parser.tagName + '>'
-        parser.tagName = ''
-        parser.state = S.SCRIPT
-        return
-      }
-      emitNode(parser, 'onscript', parser.script)
-      parser.script = ''
-    }
-
-    // first make sure that the closing tag actually exists.
-    // <a><b></c></b></a> will close everything, otherwise.
-    var t = parser.tags.length
-    var tagName = parser.tagName
-    if (!parser.strict) {
-      tagName = tagName[parser.looseCase]()
-    }
-    var closeTo = tagName
-    while (t--) {
-      var close = parser.tags[t]
-      if (close.name !== closeTo) {
-        // fail the first time in strict mode
-        strictFail(parser, 'Unexpected close tag')
-      } else {
-        break
-      }
-    }
-
-    // didn't find it.  we already failed for strict, so just abort.
-    if (t < 0) {
-      strictFail(parser, 'Unmatched closing tag: ' + parser.tagName)
-      parser.textNode += '</' + parser.tagName + '>'
-      parser.state = S.TEXT
-      return
-    }
-    parser.tagName = tagName
-    var s = parser.tags.length
-    while (s-- > t) {
-      var tag = parser.tag = parser.tags.pop()
-      parser.tagName = parser.tag.name
-      emitNode(parser, 'onclosetag', parser.tagName)
-
-      var x = {}
-      for (var i in tag.ns) {
-        x[i] = tag.ns[i]
-      }
-
-      var parent = parser.tags[parser.tags.length - 1] || parser
-      if (parser.opt.xmlns && tag.ns !== parent.ns) {
-        // remove namespace bindings introduced by tag
-        Object.keys(tag.ns).forEach(function (p) {
-          var n = tag.ns[p]
-          emitNode(parser, 'onclosenamespace', { prefix: p, uri: n })
-        })
-      }
-    }
-    if (t === 0) parser.closedRoot = true
-    parser.tagName = parser.attribValue = parser.attribName = ''
-    parser.attribList.length = 0
-    parser.state = S.TEXT
-  }
-
-  function parseEntity (parser) {
-    var entity = parser.entity
-    var entityLC = entity.toLowerCase()
-    var num
-    var numStr = ''
-
-    if (parser.ENTITIES[entity]) {
-      return parser.ENTITIES[entity]
-    }
-    if (parser.ENTITIES[entityLC]) {
-      return parser.ENTITIES[entityLC]
-    }
-    entity = entityLC
-    if (entity.charAt(0) === '#') {
-      if (entity.charAt(1) === 'x') {
-        entity = entity.slice(2)
-        num = parseInt(entity, 16)
-        numStr = num.toString(16)
-      } else {
-        entity = entity.slice(1)
-        num = parseInt(entity, 10)
-        numStr = num.toString(10)
-      }
-    }
-    entity = entity.replace(/^0+/, '')
-    if (isNaN(num) || numStr.toLowerCase() !== entity) {
-      strictFail(parser, 'Invalid character entity')
-      return '&' + parser.entity + ';'
-    }
-
-    return String.fromCodePoint(num)
-  }
-
-  function beginWhiteSpace (parser, c) {
-    if (c === '<') {
-      parser.state = S.OPEN_WAKA
-      parser.startTagPosition = parser.position
-    } else if (!isWhitespace(c)) {
-      // have to process this as a text node.
-      // weird, but happens.
-      strictFail(parser, 'Non-whitespace before first tag.')
-      parser.textNode = c
-      parser.state = S.TEXT
-    }
-  }
-
-  function charAt (chunk, i) {
-    var result = ''
-    if (i < chunk.length) {
-      result = chunk.charAt(i)
-    }
-    return result
-  }
-
-  function write (chunk) {
-    var parser = this
-    if (this.error) {
-      throw this.error
-    }
-    if (parser.closed) {
-      return error(parser,
-        'Cannot write after close. Assign an onready handler.')
-    }
-    if (chunk === null) {
-      return end(parser)
-    }
-    if (typeof chunk === 'object') {
-      chunk = chunk.toString()
-    }
-    var i = 0
-    var c = ''
-    while (true) {
-      c = charAt(chunk, i++)
-      parser.c = c
-
-      if (!c) {
-        break
-      }
-
-      if (parser.trackPosition) {
-        parser.position++
-        if (c === '\n') {
-          parser.line++
-          parser.column = 0
-        } else {
-          parser.column++
-        }
-      }
-
-      switch (parser.state) {
-        case S.BEGIN:
-          parser.state = S.BEGIN_WHITESPACE
-          if (c === '\uFEFF') {
-            continue
-          }
-          beginWhiteSpace(parser, c)
-          continue
-
-        case S.BEGIN_WHITESPACE:
-          beginWhiteSpace(parser, c)
-          continue
-
-        case S.TEXT:
-          if (parser.sawRoot && !parser.closedRoot) {
-            var starti = i - 1
-            while (c && c !== '<' && c !== '&') {
-              c = charAt(chunk, i++)
-              if (c && parser.trackPosition) {
-                parser.position++
-                if (c === '\n') {
-                  parser.line++
-                  parser.column = 0
-                } else {
-                  parser.column++
-                }
-              }
-            }
-            parser.textNode += chunk.substring(starti, i - 1)
-          }
-          if (c === '<' && !(parser.sawRoot && parser.closedRoot && !parser.strict)) {
-            parser.state = S.OPEN_WAKA
-            parser.startTagPosition = parser.position
-          } else {
-            if (!isWhitespace(c) && (!parser.sawRoot || parser.closedRoot)) {
-              strictFail(parser, 'Text data outside of root node.')
-            }
-            if (c === '&') {
-              parser.state = S.TEXT_ENTITY
-            } else {
-              parser.textNode += c
-            }
-          }
-          continue
-
-        case S.SCRIPT:
-          // only non-strict
-          if (c === '<') {
-            parser.state = S.SCRIPT_ENDING
-          } else {
-            parser.script += c
-          }
-          continue
-
-        case S.SCRIPT_ENDING:
-          if (c === '/') {
-            parser.state = S.CLOSE_TAG
-          } else {
-            parser.script += '<' + c
-            parser.state = S.SCRIPT
-          }
-          continue
-
-        case S.OPEN_WAKA:
-          // either a /, ?, !, or text is coming next.
-          if (c === '!') {
-            parser.state = S.SGML_DECL
-            parser.sgmlDecl = ''
-          } else if (isWhitespace(c)) {
-            // wait for it...
-          } else if (isMatch(nameStart, c)) {
-            parser.state = S.OPEN_TAG
-            parser.tagName = c
-          } else if (c === '/') {
-            parser.state = S.CLOSE_TAG
-            parser.tagName = ''
-          } else if (c === '?') {
-            parser.state = S.PROC_INST
-            parser.procInstName = parser.procInstBody = ''
-          } else {
-            strictFail(parser, 'Unencoded <')
-            // if there was some whitespace, then add that in.
-            if (parser.startTagPosition + 1 < parser.position) {
-              var pad = parser.position - parser.startTagPosition
-              c = new Array(pad).join(' ') + c
-            }
-            parser.textNode += '<' + c
-            parser.state = S.TEXT
-          }
-          continue
-
-        case S.SGML_DECL:
-          if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
-            emitNode(parser, 'onopencdata')
-            parser.state = S.CDATA
-            parser.sgmlDecl = ''
-            parser.cdata = ''
-          } else if (parser.sgmlDecl + c === '--') {
-            parser.state = S.COMMENT
-            parser.comment = ''
-            parser.sgmlDecl = ''
-          } else if ((parser.sgmlDecl + c).toUpperCase() === DOCTYPE) {
-            parser.state = S.DOCTYPE
-            if (parser.doctype || parser.sawRoot) {
-              strictFail(parser,
-                'Inappropriately located doctype declaration')
-            }
-            parser.doctype = ''
-            parser.sgmlDecl = ''
-          } else if (c === '>') {
-            emitNode(parser, 'onsgmldeclaration', parser.sgmlDecl)
-            parser.sgmlDecl = ''
-            parser.state = S.TEXT
-          } else if (isQuote(c)) {
-            parser.state = S.SGML_DECL_QUOTED
-            parser.sgmlDecl += c
-          } else {
-            parser.sgmlDecl += c
-          }
-          continue
-
-        case S.SGML_DECL_QUOTED:
-          if (c === parser.q) {
-            parser.state = S.SGML_DECL
-            parser.q = ''
-          }
-          parser.sgmlDecl += c
-          continue
-
-        case S.DOCTYPE:
-          if (c === '>') {
-            parser.state = S.TEXT
-            emitNode(parser, 'ondoctype', parser.doctype)
-            parser.doctype = true // just remember that we saw it.
-          } else {
-            parser.doctype += c
-            if (c === '[') {
-              parser.state = S.DOCTYPE_DTD
-            } else if (isQuote(c)) {
-              parser.state = S.DOCTYPE_QUOTED
-              parser.q = c
-            }
-          }
-          continue
-
-        case S.DOCTYPE_QUOTED:
-          parser.doctype += c
-          if (c === parser.q) {
-            parser.q = ''
-            parser.state = S.DOCTYPE
-          }
-          continue
-
-        case S.DOCTYPE_DTD:
-          parser.doctype += c
-          if (c === ']') {
-            parser.state = S.DOCTYPE
-          } else if (isQuote(c)) {
-            parser.state = S.DOCTYPE_DTD_QUOTED
-            parser.q = c
-          }
-          continue
-
-        case S.DOCTYPE_DTD_QUOTED:
-          parser.doctype += c
-          if (c === parser.q) {
-            parser.state = S.DOCTYPE_DTD
-            parser.q = ''
-          }
-          continue
-
-        case S.COMMENT:
-          if (c === '-') {
-            parser.state = S.COMMENT_ENDING
-          } else {
-            parser.comment += c
-          }
-          continue
-
-        case S.COMMENT_ENDING:
-          if (c === '-') {
-            parser.state = S.COMMENT_ENDED
-            parser.comment = textopts(parser.opt, parser.comment)
-            if (parser.comment) {
-              emitNode(parser, 'oncomment', parser.comment)
-            }
-            parser.comment = ''
-          } else {
-            parser.comment += '-' + c
-            parser.state = S.COMMENT
-          }
-          continue
-
-        case S.COMMENT_ENDED:
-          if (c !== '>') {
-            strictFail(parser, 'Malformed comment')
-            // allow <!-- blah -- bloo --> in non-strict mode,
-            // which is a comment of " blah -- bloo "
-            parser.comment += '--' + c
-            parser.state = S.COMMENT
-          } else {
-            parser.state = S.TEXT
-          }
-          continue
-
-        case S.CDATA:
-          if (c === ']') {
-            parser.state = S.CDATA_ENDING
-          } else {
-            parser.cdata += c
-          }
-          continue
-
-        case S.CDATA_ENDING:
-          if (c === ']') {
-            parser.state = S.CDATA_ENDING_2
-          } else {
-            parser.cdata += ']' + c
-            parser.state = S.CDATA
-          }
-          continue
-
-        case S.CDATA_ENDING_2:
-          if (c === '>') {
-            if (parser.cdata) {
-              emitNode(parser, 'oncdata', parser.cdata)
-            }
-            emitNode(parser, 'onclosecdata')
-            parser.cdata = ''
-            parser.state = S.TEXT
-          } else if (c === ']') {
-            parser.cdata += ']'
-          } else {
-            parser.cdata += ']]' + c
-            parser.state = S.CDATA
-          }
-          continue
-
-        case S.PROC_INST:
-          if (c === '?') {
-            parser.state = S.PROC_INST_ENDING
-          } else if (isWhitespace(c)) {
-            parser.state = S.PROC_INST_BODY
-          } else {
-            parser.procInstName += c
-          }
-          continue
-
-        case S.PROC_INST_BODY:
-          if (!parser.procInstBody && isWhitespace(c)) {
-            continue
-          } else if (c === '?') {
-            parser.state = S.PROC_INST_ENDING
-          } else {
-            parser.procInstBody += c
-          }
-          continue
-
-        case S.PROC_INST_ENDING:
-          if (c === '>') {
-            emitNode(parser, 'onprocessinginstruction', {
-              name: parser.procInstName,
-              body: parser.procInstBody
-            })
-            parser.procInstName = parser.procInstBody = ''
-            parser.state = S.TEXT
-          } else {
-            parser.procInstBody += '?' + c
-            parser.state = S.PROC_INST_BODY
-          }
-          continue
-
-        case S.OPEN_TAG:
-          if (isMatch(nameBody, c)) {
-            parser.tagName += c
-          } else {
-            newTag(parser)
-            if (c === '>') {
-              openTag(parser)
-            } else if (c === '/') {
-              parser.state = S.OPEN_TAG_SLASH
-            } else {
-              if (!isWhitespace(c)) {
-                strictFail(parser, 'Invalid character in tag name')
-              }
-              parser.state = S.ATTRIB
-            }
-          }
-          continue
-
-        case S.OPEN_TAG_SLASH:
-          if (c === '>') {
-            openTag(parser, true)
-            closeTag(parser)
-          } else {
-            strictFail(parser, 'Forward-slash in opening tag not followed by >')
-            parser.state = S.ATTRIB
-          }
-          continue
-
-        case S.ATTRIB:
-          // haven't read the attribute name yet.
-          if (isWhitespace(c)) {
-            continue
-          } else if (c === '>') {
-            openTag(parser)
-          } else if (c === '/') {
-            parser.state = S.OPEN_TAG_SLASH
-          } else if (isMatch(nameStart, c)) {
-            parser.attribName = c
-            parser.attribValue = ''
-            parser.state = S.ATTRIB_NAME
-          } else {
-            strictFail(parser, 'Invalid attribute name')
-          }
-          continue
-
-        case S.ATTRIB_NAME:
-          if (c === '=') {
-            parser.state = S.ATTRIB_VALUE
-          } else if (c === '>') {
-            strictFail(parser, 'Attribute without value')
-            parser.attribValue = parser.attribName
-            attrib(parser)
-            openTag(parser)
-          } else if (isWhitespace(c)) {
-            parser.state = S.ATTRIB_NAME_SAW_WHITE
-          } else if (isMatch(nameBody, c)) {
-            parser.attribName += c
-          } else {
-            strictFail(parser, 'Invalid attribute name')
-          }
-          continue
-
-        case S.ATTRIB_NAME_SAW_WHITE:
-          if (c === '=') {
-            parser.state = S.ATTRIB_VALUE
-          } else if (isWhitespace(c)) {
-            continue
-          } else {
-            strictFail(parser, 'Attribute without value')
-            parser.tag.attributes[parser.attribName] = ''
-            parser.attribValue = ''
-            emitNode(parser, 'onattribute', {
-              name: parser.attribName,
-              value: ''
-            })
-            parser.attribName = ''
-            if (c === '>') {
-              openTag(parser)
-            } else if (isMatch(nameStart, c)) {
-              parser.attribName = c
-              parser.state = S.ATTRIB_NAME
-            } else {
-              strictFail(parser, 'Invalid attribute name')
-              parser.state = S.ATTRIB
-            }
-          }
-          continue
-
-        case S.ATTRIB_VALUE:
-          if (isWhitespace(c)) {
-            continue
-          } else if (isQuote(c)) {
-            parser.q = c
-            parser.state = S.ATTRIB_VALUE_QUOTED
-          } else {
-            strictFail(parser, 'Unquoted attribute value')
-            parser.state = S.ATTRIB_VALUE_UNQUOTED
-            parser.attribValue = c
-          }
-          continue
-
-        case S.ATTRIB_VALUE_QUOTED:
-          if (c !== parser.q) {
-            if (c === '&') {
-              parser.state = S.ATTRIB_VALUE_ENTITY_Q
-            } else {
-              parser.attribValue += c
-            }
-            continue
-          }
-          attrib(parser)
-          parser.q = ''
-          parser.state = S.ATTRIB_VALUE_CLOSED
-          continue
-
-        case S.ATTRIB_VALUE_CLOSED:
-          if (isWhitespace(c)) {
-            parser.state = S.ATTRIB
-          } else if (c === '>') {
-            openTag(parser)
-          } else if (c === '/') {
-            parser.state = S.OPEN_TAG_SLASH
-          } else if (isMatch(nameStart, c)) {
-            strictFail(parser, 'No whitespace between attributes')
-            parser.attribName = c
-            parser.attribValue = ''
-            parser.state = S.ATTRIB_NAME
-          } else {
-            strictFail(parser, 'Invalid attribute name')
-          }
-          continue
-
-        case S.ATTRIB_VALUE_UNQUOTED:
-          if (!isAttribEnd(c)) {
-            if (c === '&') {
-              parser.state = S.ATTRIB_VALUE_ENTITY_U
-            } else {
-              parser.attribValue += c
-            }
-            continue
-          }
-          attrib(parser)
-          if (c === '>') {
-            openTag(parser)
-          } else {
-            parser.state = S.ATTRIB
-          }
-          continue
-
-        case S.CLOSE_TAG:
-          if (!parser.tagName) {
-            if (isWhitespace(c)) {
-              continue
-            } else if (notMatch(nameStart, c)) {
-              if (parser.script) {
-                parser.script += '</' + c
-                parser.state = S.SCRIPT
-              } else {
-                strictFail(parser, 'Invalid tagname in closing tag.')
-              }
-            } else {
-              parser.tagName = c
-            }
-          } else if (c === '>') {
-            closeTag(parser)
-          } else if (isMatch(nameBody, c)) {
-            parser.tagName += c
-          } else if (parser.script) {
-            parser.script += '</' + parser.tagName
-            parser.tagName = ''
-            parser.state = S.SCRIPT
-          } else {
-            if (!isWhitespace(c)) {
-              strictFail(parser, 'Invalid tagname in closing tag')
-            }
-            parser.state = S.CLOSE_TAG_SAW_WHITE
-          }
-          continue
-
-        case S.CLOSE_TAG_SAW_WHITE:
-          if (isWhitespace(c)) {
-            continue
-          }
-          if (c === '>') {
-            closeTag(parser)
-          } else {
-            strictFail(parser, 'Invalid characters in closing tag')
-          }
-          continue
-
-        case S.TEXT_ENTITY:
-        case S.ATTRIB_VALUE_ENTITY_Q:
-        case S.ATTRIB_VALUE_ENTITY_U:
-          var returnState
-          var buffer
-          switch (parser.state) {
-            case S.TEXT_ENTITY:
-              returnState = S.TEXT
-              buffer = 'textNode'
-              break
-
-            case S.ATTRIB_VALUE_ENTITY_Q:
-              returnState = S.ATTRIB_VALUE_QUOTED
-              buffer = 'attribValue'
-              break
-
-            case S.ATTRIB_VALUE_ENTITY_U:
-              returnState = S.ATTRIB_VALUE_UNQUOTED
-              buffer = 'attribValue'
-              break
-          }
-
-          if (c === ';') {
-            parser[buffer] += parseEntity(parser)
-            parser.entity = ''
-            parser.state = returnState
-          } else if (isMatch(parser.entity.length ? entityBody : entityStart, c)) {
-            parser.entity += c
-          } else {
-            strictFail(parser, 'Invalid character in entity name')
-            parser[buffer] += '&' + parser.entity + c
-            parser.entity = ''
-            parser.state = returnState
-          }
-
-          continue
-
-        default:
-          throw new Error(parser, 'Unknown state: ' + parser.state)
-      }
-    } // while
-
-    if (parser.position >= parser.bufferCheckPosition) {
-      checkBufferLength(parser)
-    }
-    return parser
-  }
-
-  /*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
-  /* istanbul ignore next */
-  if (!String.fromCodePoint) {
-    (function () {
-      var stringFromCharCode = String.fromCharCode
-      var floor = Math.floor
-      var fromCodePoint = function () {
-        var MAX_SIZE = 0x4000
-        var codeUnits = []
-        var highSurrogate
-        var lowSurrogate
-        var index = -1
-        var length = arguments.length
-        if (!length) {
-          return ''
-        }
-        var result = ''
-        while (++index < length) {
-          var codePoint = Number(arguments[index])
-          if (
-            !isFinite(codePoint) || // `NaN`, `+Infinity`, or `-Infinity`
-            codePoint < 0 || // not a valid Unicode code point
-            codePoint > 0x10FFFF || // not a valid Unicode code point
-            floor(codePoint) !== codePoint // not an integer
-          ) {
-            throw RangeError('Invalid code point: ' + codePoint)
-          }
-          if (codePoint <= 0xFFFF) { // BMP code point
-            codeUnits.push(codePoint)
-          } else { // Astral code point; split in surrogate halves
-            // http://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
-            codePoint -= 0x10000
-            highSurrogate = (codePoint >> 10) + 0xD800
-            lowSurrogate = (codePoint % 0x400) + 0xDC00
-            codeUnits.push(highSurrogate, lowSurrogate)
-          }
-          if (index + 1 === length || codeUnits.length > MAX_SIZE) {
-            result += stringFromCharCode.apply(null, codeUnits)
-            codeUnits.length = 0
-          }
-        }
-        return result
-      }
-      /* istanbul ignore next */
-      if (Object.defineProperty) {
-        Object.defineProperty(String, 'fromCodePoint', {
-          value: fromCodePoint,
-          configurable: true,
-          writable: true
-        })
-      } else {
-        String.fromCodePoint = fromCodePoint
-      }
-    }())
-  }
-})(typeof exports === 'undefined' ? this.sax = {} : exports)
diff --git a/scripts/metrics/node_modules/sax/package.json b/scripts/metrics/node_modules/sax/package.json
deleted file mode 100644
index a65b8fc7e23..00000000000
--- a/scripts/metrics/node_modules/sax/package.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "_from": "sax@>=0.6.0",
-  "_id": "sax@1.2.4",
-  "_inBundle": false,
-  "_integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-  "_location": "/sax",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "sax@>=0.6.0",
-    "name": "sax",
-    "escapedName": "sax",
-    "rawSpec": ">=0.6.0",
-    "saveSpec": null,
-    "fetchSpec": ">=0.6.0"
-  },
-  "_requiredBy": [
-    "/xml2js"
-  ],
-  "_resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-  "_shasum": "2816234e2378bddc4e5354fab5caa895df7100d9",
-  "_spec": "sax@>=0.6.0",
-  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics/node_modules/xml2js",
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/sax-js/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "An evented streaming XML parser in JavaScript",
-  "devDependencies": {
-    "standard": "^8.6.0",
-    "tap": "^10.5.1"
-  },
-  "files": [
-    "lib/sax.js",
-    "LICENSE",
-    "README.md"
-  ],
-  "homepage": "https://github.com/isaacs/sax-js#readme",
-  "license": "ISC",
-  "main": "lib/sax.js",
-  "name": "sax",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/sax-js.git"
-  },
-  "scripts": {
-    "postpublish": "git push origin --all; git push origin --tags",
-    "posttest": "standard -F test/*.js lib/*.js",
-    "postversion": "npm publish",
-    "preversion": "npm test",
-    "test": "tap test/*.js --cov -j4"
-  },
-  "version": "1.2.4"
-}
diff --git a/scripts/metrics/node_modules/xml2js/LICENSE b/scripts/metrics/node_modules/xml2js/LICENSE
deleted file mode 100644
index e3b4222a66a..00000000000
--- a/scripts/metrics/node_modules/xml2js/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright 2010, 2011, 2012, 2013. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/xml2js/README.md b/scripts/metrics/node_modules/xml2js/README.md
deleted file mode 100644
index 9c69d6fbf1a..00000000000
--- a/scripts/metrics/node_modules/xml2js/README.md
+++ /dev/null
@@ -1,406 +0,0 @@
-node-xml2js
-===========
-
-Ever had the urge to parse XML? And wanted to access the data in some sane,
-easy way? Don't want to compile a C parser, for whatever reason? Then xml2js is
-what you're looking for!
-
-Description
-===========
-
-Simple XML to JavaScript object converter. It supports bi-directional conversion.
-Uses [sax-js](https://github.com/isaacs/sax-js/) and
-[xmlbuilder-js](https://github.com/oozcitak/xmlbuilder-js/).
-
-Note: If you're looking for a full DOM parser, you probably want
-[JSDom](https://github.com/tmpvar/jsdom).
-
-Installation
-============
-
-Simplest way to install `xml2js` is to use [npm](http://npmjs.org), just `npm
-install xml2js` which will download xml2js and all dependencies.
-
-xml2js is also available via [Bower](http://bower.io/), just `bower install
-xml2js` which will download xml2js and all dependencies.
-
-Usage
-=====
-
-No extensive tutorials required because you are a smart developer! The task of
-parsing XML should be an easy one, so let's make it so! Here's some examples.
-
-Shoot-and-forget usage
-----------------------
-
-You want to parse XML as simple and easy as possible? It's dangerous to go
-alone, take this:
-
-```javascript
-var parseString = require('xml2js').parseString;
-var xml = "<root>Hello xml2js!</root>"
-parseString(xml, function (err, result) {
-    console.dir(result);
-});
-```
-
-Can't get easier than this, right? This works starting with `xml2js` 0.2.3.
-With CoffeeScript it looks like this:
-
-```coffeescript
-{parseString} = require 'xml2js'
-xml = "<root>Hello xml2js!</root>"
-parseString xml, (err, result) ->
-    console.dir result
-```
-
-If you need some special options, fear not, `xml2js` supports a number of
-options (see below), you can specify these as second argument:
-
-```javascript
-parseString(xml, {trim: true}, function (err, result) {
-});
-```
-
-Simple as pie usage
--------------------
-
-That's right, if you have been using xml-simple or a home-grown
-wrapper, this was added in 0.1.11 just for you:
-
-```javascript
-var fs = require('fs'),
-    xml2js = require('xml2js');
-
-var parser = new xml2js.Parser();
-fs.readFile(__dirname + '/foo.xml', function(err, data) {
-    parser.parseString(data, function (err, result) {
-        console.dir(result);
-        console.log('Done');
-    });
-});
-```
-
-Look ma, no event listeners!
-
-You can also use `xml2js` from
-[CoffeeScript](https://github.com/jashkenas/coffeescript), further reducing
-the clutter:
-
-```coffeescript
-fs = require 'fs',
-xml2js = require 'xml2js'
-
-parser = new xml2js.Parser()
-fs.readFile __dirname + '/foo.xml', (err, data) ->
-  parser.parseString data, (err, result) ->
-    console.dir result
-    console.log 'Done.'
-```
-
-But what happens if you forget the `new` keyword to create a new `Parser`? In
-the middle of a nightly coding session, it might get lost, after all. Worry
-not, we got you covered! Starting with 0.2.8 you can also leave it out, in
-which case `xml2js` will helpfully add it for you, no bad surprises and
-inexplicable bugs!
-
-Parsing multiple files
-----------------------
-
-If you want to parse multiple files, you have multiple possibilities:
-
-  * You can create one `xml2js.Parser` per file. That's the recommended one
-    and is promised to always *just work*.
-  * You can call `reset()` on your parser object.
-  * You can hope everything goes well anyway. This behaviour is not
-    guaranteed work always, if ever. Use option #1 if possible. Thanks!
-
-So you wanna some JSON?
------------------------
-
-Just wrap the `result` object in a call to `JSON.stringify` like this
-`JSON.stringify(result)`. You get a string containing the JSON representation
-of the parsed object that you can feed to JSON-hungry consumers.
-
-Displaying results
-------------------
-
-You might wonder why, using `console.dir` or `console.log` the output at some
-level is only `[Object]`. Don't worry, this is not because `xml2js` got lazy.
-That's because Node uses `util.inspect` to convert the object into strings and
-that function stops after `depth=2` which is a bit low for most XML.
-
-To display the whole deal, you can use `console.log(util.inspect(result, false,
-null))`, which displays the whole result.
-
-So much for that, but what if you use
-[eyes](https://github.com/cloudhead/eyes.js) for nice colored output and it
-truncates the output with `…`? Don't fear, there's also a solution for that,
-you just need to increase the `maxLength` limit by creating a custom inspector
-`var inspect = require('eyes').inspector({maxLength: false})` and then you can
-easily `inspect(result)`.
-
-XML builder usage
------------------
-
-Since 0.4.0, objects can be also be used to build XML:
-
-```javascript
-var fs = require('fs'),
-    xml2js = require('xml2js');
-
-var obj = {name: "Super", Surname: "Man", age: 23};
-
-var builder = new xml2js.Builder();
-var xml = builder.buildObject(obj);
-```
-
-At the moment, a one to one bi-directional conversion is guaranteed only for
-default configuration, except for `attrkey`, `charkey` and `explicitArray` options
-you can redefine to your taste. Writing CDATA is supported via setting the `cdata`
-option to `true`.
-
-Processing attribute, tag names and values
-------------------------------------------
-
-Since 0.4.1 you can optionally provide the parser with attribute name and tag name processors as well as element value processors (Since 0.4.14, you can also optionally provide the parser with attribute value processors):
-
-```javascript
-
-function nameToUpperCase(name){
-    return name.toUpperCase();
-}
-
-//transform all attribute and tag names and values to uppercase
-parseString(xml, {
-  tagNameProcessors: [nameToUpperCase],
-  attrNameProcessors: [nameToUpperCase],
-  valueProcessors: [nameToUpperCase],
-  attrValueProcessors: [nameToUpperCase]},
-  function (err, result) {
-    // processed data
-});
-```
-
-The `tagNameProcessors` and `attrNameProcessors` options
-accept an `Array` of functions with the following signature:
-
-```javascript
-function (name){
-  //do something with `name`
-  return name
-}
-```
-
-The `attrValueProcessors` and `valueProcessors` options
-accept an `Array` of functions with the following signature:
-
-```javascript
-function (value, name) {
-  //`name` will be the node name or attribute name
-  //do something with `value`, (optionally) dependent on the node/attr name
-  return value
-}
-```
-
-Some processors are provided out-of-the-box and can be found in `lib/processors.js`:
-
-- `normalize`: transforms the name to lowercase.
-(Automatically used when `options.normalize` is set to `true`)
-
-- `firstCharLowerCase`: transforms the first character to lower case.
-E.g. 'MyTagName' becomes 'myTagName'
-
-- `stripPrefix`: strips the xml namespace prefix. E.g `<foo:Bar/>` will become 'Bar'.
-(N.B.: the `xmlns` prefix is NOT stripped.)
-
-- `parseNumbers`: parses integer-like strings as integers and float-like strings as floats
-E.g. "0" becomes 0 and "15.56" becomes 15.56
-
-- `parseBooleans`: parses boolean-like strings to booleans
-E.g. "true" becomes true and "False" becomes false
-
-Options
-=======
-
-Apart from the default settings, there are a number of options that can be
-specified for the parser. Options are specified by ``new Parser({optionName:
-value})``. Possible options are:
-
-  * `attrkey` (default: `$`): Prefix that is used to access the attributes.
-    Version 0.1 default was `@`.
-  * `charkey` (default: `_`): Prefix that is used to access the character
-    content. Version 0.1 default was `#`.
-  * `explicitCharkey` (default: `false`)
-  * `trim` (default: `false`): Trim the whitespace at the beginning and end of
-    text nodes.
-  * `normalizeTags` (default: `false`): Normalize all tag names to lowercase.
-  * `normalize` (default: `false`): Trim whitespaces inside text nodes.
-  * `explicitRoot` (default: `true`): Set this if you want to get the root
-    node in the resulting object.
-  * `emptyTag` (default: `''`): what will the value of empty nodes be.
-  * `explicitArray` (default: `true`): Always put child nodes in an array if
-    true; otherwise an array is created only if there is more than one.
-  * `ignoreAttrs` (default: `false`): Ignore all XML attributes and only create
-    text nodes.
-  * `mergeAttrs` (default: `false`): Merge attributes and child elements as
-    properties of the parent, instead of keying attributes off a child
-    attribute object. This option is ignored if `ignoreAttrs` is `false`.
-  * `validator` (default `null`): You can specify a callable that validates
-    the resulting structure somehow, however you want. See unit tests
-    for an example.
-  * `xmlns` (default `false`): Give each element a field usually called '$ns'
-    (the first character is the same as attrkey) that contains its local name
-    and namespace URI.
-  * `explicitChildren` (default `false`): Put child elements to separate
-    property. Doesn't work with `mergeAttrs = true`. If element has no children
-    then "children" won't be created. Added in 0.2.5.
-  * `childkey` (default `$$`): Prefix that is used to access child elements if
-    `explicitChildren` is set to `true`. Added in 0.2.5.
-  * `preserveChildrenOrder` (default `false`): Modifies the behavior of
-    `explicitChildren` so that the value of the "children" property becomes an
-    ordered array. When this is `true`, every node will also get a `#name` field
-    whose value will correspond to the XML nodeName, so that you may iterate
-    the "children" array and still be able to determine node names. The named
-    (and potentially unordered) properties are also retained in this
-    configuration at the same level as the ordered "children" array. Added in
-    0.4.9.
-  * `charsAsChildren` (default `false`): Determines whether chars should be
-    considered children if `explicitChildren` is on. Added in 0.2.5.
-  * `includeWhiteChars` (default `false`): Determines whether whitespace-only
-     text nodes should be included. Added in 0.4.17.
-  * `async` (default `false`): Should the callbacks be async? This *might* be
-    an incompatible change if your code depends on sync execution of callbacks.
-    Future versions of `xml2js` might change this default, so the recommendation
-    is to not depend on sync execution anyway. Added in 0.2.6.
-  * `strict` (default `true`): Set sax-js to strict or non-strict parsing mode.
-    Defaults to `true` which is *highly* recommended, since parsing HTML which
-    is not well-formed XML might yield just about anything. Added in 0.2.7.
-  * `attrNameProcessors` (default: `null`): Allows the addition of attribute
-    name processing functions. Accepts an `Array` of functions with following
-    signature:
-    ```javascript
-    function (name){
-        //do something with `name`
-        return name
-    }
-    ```
-    Added in 0.4.14
-  * `attrValueProcessors` (default: `null`): Allows the addition of attribute
-    value processing functions. Accepts an `Array` of functions with following
-    signature:
-    ```javascript
-    function (name){
-      //do something with `name`
-      return name
-    }
-    ```
-    Added in 0.4.1
-  * `tagNameProcessors` (default: `null`): Allows the addition of tag name
-    processing functions. Accepts an `Array` of functions with following
-    signature:
-    ```javascript
-    function (name){
-      //do something with `name`
-      return name
-    }
-    ```
-    Added in 0.4.1
-  * `valueProcessors` (default: `null`): Allows the addition of element value
-    processing functions. Accepts an `Array` of functions with following
-    signature:
-    ```javascript
-    function (name){
-      //do something with `name`
-      return name
-    }
-    ```
-    Added in 0.4.6
-
-Options for the `Builder` class
--------------------------------
-These options are specified by ``new Builder({optionName: value})``.
-Possible options are:
-
-  * `rootName` (default `root` or the root key name): root element name to be used in case
-     `explicitRoot` is `false` or to override the root element name.
-  * `renderOpts` (default `{ 'pretty': true, 'indent': '  ', 'newline': '\n' }`):
-    Rendering options for xmlbuilder-js.
-    * pretty: prettify generated XML
-    * indent: whitespace for indentation (only when pretty)
-    * newline: newline char (only when pretty)
-  * `xmldec` (default `{ 'version': '1.0', 'encoding': 'UTF-8', 'standalone': true }`:
-    XML declaration attributes.
-    * `xmldec.version` A version number string, e.g. 1.0
-    * `xmldec.encoding` Encoding declaration, e.g. UTF-8
-    * `xmldec.standalone` standalone document declaration: true or false
-  * `doctype` (default `null`): optional DTD. Eg. `{'ext': 'hello.dtd'}`
-  * `headless` (default: `false`): omit the XML header. Added in 0.4.3.
-  * `allowSurrogateChars` (default: `false`): allows using characters from the Unicode
-    surrogate blocks.
-  * `cdata` (default: `false`): wrap text nodes in `<![CDATA[ ... ]]>` instead of
-    escaping when necessary. Does not add `<![CDATA[ ... ]]>` if it is not required.
-    Added in 0.4.5.
-
-`renderOpts`, `xmldec`,`doctype` and `headless` pass through to
-[xmlbuilder-js](https://github.com/oozcitak/xmlbuilder-js).
-
-Updating to new version
-=======================
-
-Version 0.2 changed the default parsing settings, but version 0.1.14 introduced
-the default settings for version 0.2, so these settings can be tried before the
-migration.
-
-```javascript
-var xml2js = require('xml2js');
-var parser = new xml2js.Parser(xml2js.defaults["0.2"]);
-```
-
-To get the 0.1 defaults in version 0.2 you can just use
-`xml2js.defaults["0.1"]` in the same place. This provides you with enough time
-to migrate to the saner way of parsing in `xml2js` 0.2. We try to make the
-migration as simple and gentle as possible, but some breakage cannot be
-avoided.
-
-So, what exactly did change and why? In 0.2 we changed some defaults to parse
-the XML in a more universal and sane way. So we disabled `normalize` and `trim`
-so `xml2js` does not cut out any text content. You can reenable this at will of
-course. A more important change is that we return the root tag in the resulting
-JavaScript structure via the `explicitRoot` setting, so you need to access the
-first element. This is useful for anybody who wants to know what the root node
-is and preserves more information. The last major change was to enable
-`explicitArray`, so everytime it is possible that one might embed more than one
-sub-tag into a tag, xml2js >= 0.2 returns an array even if the array just
-includes one element. This is useful when dealing with APIs that return
-variable amounts of subtags.
-
-Running tests, development
-==========================
-
-[![Build Status](https://travis-ci.org/Leonidas-from-XIV/node-xml2js.svg?branch=master)](https://travis-ci.org/Leonidas-from-XIV/node-xml2js)
-[![Coverage Status](https://coveralls.io/repos/Leonidas-from-XIV/node-xml2js/badge.svg?branch=)](https://coveralls.io/r/Leonidas-from-XIV/node-xml2js?branch=master)
-[![Dependency Status](https://david-dm.org/Leonidas-from-XIV/node-xml2js.svg)](https://david-dm.org/Leonidas-from-XIV/node-xml2js)
-
-The development requirements are handled by npm, you just need to install them.
-We also have a number of unit tests, they can be run using `npm test` directly
-from the project root. This runs zap to discover all the tests and execute
-them.
-
-If you like to contribute, keep in mind that `xml2js` is written in
-CoffeeScript, so don't develop on the JavaScript files that are checked into
-the repository for convenience reasons. Also, please write some unit test to
-check your behaviour and if it is some user-facing thing, add some
-documentation to this README, so people will know it exists. Thanks in advance!
-
-Getting support
-===============
-
-Please, if you have a problem with the library, first make sure you read this
-README. If you read this far, thanks, you're good. Then, please make sure your
-problem really is with `xml2js`. It is? Okay, then I'll look at it. Send me a
-mail and we can talk. Please don't open issues, as I don't think that is the
-proper forum for support problems. Some problems might as well really be bugs
-in `xml2js`, if so I'll let you know to open an issue instead :)
-
-But if you know you really found a bug, feel free to open an issue instead.
diff --git a/scripts/metrics/node_modules/xml2js/lib/bom.js b/scripts/metrics/node_modules/xml2js/lib/bom.js
deleted file mode 100644
index 7b8fb27b118..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/bom.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  exports.stripBOM = function(str) {
-    if (str[0] === '\uFEFF') {
-      return str.substring(1);
-    } else {
-      return str;
-    }
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/builder.js b/scripts/metrics/node_modules/xml2js/lib/builder.js
deleted file mode 100644
index 58f36384891..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/builder.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  var builder, defaults, escapeCDATA, requiresCDATA, wrapCDATA,
-    hasProp = {}.hasOwnProperty;
-
-  builder = require('xmlbuilder');
-
-  defaults = require('./defaults').defaults;
-
-  requiresCDATA = function(entry) {
-    return typeof entry === "string" && (entry.indexOf('&') >= 0 || entry.indexOf('>') >= 0 || entry.indexOf('<') >= 0);
-  };
-
-  wrapCDATA = function(entry) {
-    return "<![CDATA[" + (escapeCDATA(entry)) + "]]>";
-  };
-
-  escapeCDATA = function(entry) {
-    return entry.replace(']]>', ']]]]><![CDATA[>');
-  };
-
-  exports.Builder = (function() {
-    function Builder(opts) {
-      var key, ref, value;
-      this.options = {};
-      ref = defaults["0.2"];
-      for (key in ref) {
-        if (!hasProp.call(ref, key)) continue;
-        value = ref[key];
-        this.options[key] = value;
-      }
-      for (key in opts) {
-        if (!hasProp.call(opts, key)) continue;
-        value = opts[key];
-        this.options[key] = value;
-      }
-    }
-
-    Builder.prototype.buildObject = function(rootObj) {
-      var attrkey, charkey, render, rootElement, rootName;
-      attrkey = this.options.attrkey;
-      charkey = this.options.charkey;
-      if ((Object.keys(rootObj).length === 1) && (this.options.rootName === defaults['0.2'].rootName)) {
-        rootName = Object.keys(rootObj)[0];
-        rootObj = rootObj[rootName];
-      } else {
-        rootName = this.options.rootName;
-      }
-      render = (function(_this) {
-        return function(element, obj) {
-          var attr, child, entry, index, key, value;
-          if (typeof obj !== 'object') {
-            if (_this.options.cdata && requiresCDATA(obj)) {
-              element.raw(wrapCDATA(obj));
-            } else {
-              element.txt(obj);
-            }
-          } else if (Array.isArray(obj)) {
-            for (index in obj) {
-              if (!hasProp.call(obj, index)) continue;
-              child = obj[index];
-              for (key in child) {
-                entry = child[key];
-                element = render(element.ele(key), entry).up();
-              }
-            }
-          } else {
-            for (key in obj) {
-              if (!hasProp.call(obj, key)) continue;
-              child = obj[key];
-              if (key === attrkey) {
-                if (typeof child === "object") {
-                  for (attr in child) {
-                    value = child[attr];
-                    element = element.att(attr, value);
-                  }
-                }
-              } else if (key === charkey) {
-                if (_this.options.cdata && requiresCDATA(child)) {
-                  element = element.raw(wrapCDATA(child));
-                } else {
-                  element = element.txt(child);
-                }
-              } else if (Array.isArray(child)) {
-                for (index in child) {
-                  if (!hasProp.call(child, index)) continue;
-                  entry = child[index];
-                  if (typeof entry === 'string') {
-                    if (_this.options.cdata && requiresCDATA(entry)) {
-                      element = element.ele(key).raw(wrapCDATA(entry)).up();
-                    } else {
-                      element = element.ele(key, entry).up();
-                    }
-                  } else {
-                    element = render(element.ele(key), entry).up();
-                  }
-                }
-              } else if (typeof child === "object") {
-                element = render(element.ele(key), child).up();
-              } else {
-                if (typeof child === 'string' && _this.options.cdata && requiresCDATA(child)) {
-                  element = element.ele(key).raw(wrapCDATA(child)).up();
-                } else {
-                  if (child == null) {
-                    child = '';
-                  }
-                  element = element.ele(key, child.toString()).up();
-                }
-              }
-            }
-          }
-          return element;
-        };
-      })(this);
-      rootElement = builder.create(rootName, this.options.xmldec, this.options.doctype, {
-        headless: this.options.headless,
-        allowSurrogateChars: this.options.allowSurrogateChars
-      });
-      return render(rootElement, rootObj).end(this.options.renderOpts);
-    };
-
-    return Builder;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/defaults.js b/scripts/metrics/node_modules/xml2js/lib/defaults.js
deleted file mode 100644
index 0a21da0a2fc..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/defaults.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  exports.defaults = {
-    "0.1": {
-      explicitCharkey: false,
-      trim: true,
-      normalize: true,
-      normalizeTags: false,
-      attrkey: "@",
-      charkey: "#",
-      explicitArray: false,
-      ignoreAttrs: false,
-      mergeAttrs: false,
-      explicitRoot: false,
-      validator: null,
-      xmlns: false,
-      explicitChildren: false,
-      childkey: '@@',
-      charsAsChildren: false,
-      includeWhiteChars: false,
-      async: false,
-      strict: true,
-      attrNameProcessors: null,
-      attrValueProcessors: null,
-      tagNameProcessors: null,
-      valueProcessors: null,
-      emptyTag: ''
-    },
-    "0.2": {
-      explicitCharkey: false,
-      trim: false,
-      normalize: false,
-      normalizeTags: false,
-      attrkey: "$",
-      charkey: "_",
-      explicitArray: true,
-      ignoreAttrs: false,
-      mergeAttrs: false,
-      explicitRoot: true,
-      validator: null,
-      xmlns: false,
-      explicitChildren: false,
-      preserveChildrenOrder: false,
-      childkey: '$$',
-      charsAsChildren: false,
-      includeWhiteChars: false,
-      async: false,
-      strict: true,
-      attrNameProcessors: null,
-      attrValueProcessors: null,
-      tagNameProcessors: null,
-      valueProcessors: null,
-      rootName: 'root',
-      xmldec: {
-        'version': '1.0',
-        'encoding': 'UTF-8',
-        'standalone': true
-      },
-      doctype: null,
-      renderOpts: {
-        'pretty': true,
-        'indent': '  ',
-        'newline': '\n'
-      },
-      headless: false,
-      chunkSize: 10000,
-      emptyTag: '',
-      cdata: false
-    }
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/parser.js b/scripts/metrics/node_modules/xml2js/lib/parser.js
deleted file mode 100644
index 9e8261ebf5d..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/parser.js
+++ /dev/null
@@ -1,357 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  var bom, defaults, events, isEmpty, processItem, processors, sax, setImmediate,
-    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  sax = require('sax');
-
-  events = require('events');
-
-  bom = require('./bom');
-
-  processors = require('./processors');
-
-  setImmediate = require('timers').setImmediate;
-
-  defaults = require('./defaults').defaults;
-
-  isEmpty = function(thing) {
-    return typeof thing === "object" && (thing != null) && Object.keys(thing).length === 0;
-  };
-
-  processItem = function(processors, item, key) {
-    var i, len, process;
-    for (i = 0, len = processors.length; i < len; i++) {
-      process = processors[i];
-      item = process(item, key);
-    }
-    return item;
-  };
-
-  exports.Parser = (function(superClass) {
-    extend(Parser, superClass);
-
-    function Parser(opts) {
-      this.parseString = bind(this.parseString, this);
-      this.reset = bind(this.reset, this);
-      this.assignOrPush = bind(this.assignOrPush, this);
-      this.processAsync = bind(this.processAsync, this);
-      var key, ref, value;
-      if (!(this instanceof exports.Parser)) {
-        return new exports.Parser(opts);
-      }
-      this.options = {};
-      ref = defaults["0.2"];
-      for (key in ref) {
-        if (!hasProp.call(ref, key)) continue;
-        value = ref[key];
-        this.options[key] = value;
-      }
-      for (key in opts) {
-        if (!hasProp.call(opts, key)) continue;
-        value = opts[key];
-        this.options[key] = value;
-      }
-      if (this.options.xmlns) {
-        this.options.xmlnskey = this.options.attrkey + "ns";
-      }
-      if (this.options.normalizeTags) {
-        if (!this.options.tagNameProcessors) {
-          this.options.tagNameProcessors = [];
-        }
-        this.options.tagNameProcessors.unshift(processors.normalize);
-      }
-      this.reset();
-    }
-
-    Parser.prototype.processAsync = function() {
-      var chunk, err;
-      try {
-        if (this.remaining.length <= this.options.chunkSize) {
-          chunk = this.remaining;
-          this.remaining = '';
-          this.saxParser = this.saxParser.write(chunk);
-          return this.saxParser.close();
-        } else {
-          chunk = this.remaining.substr(0, this.options.chunkSize);
-          this.remaining = this.remaining.substr(this.options.chunkSize, this.remaining.length);
-          this.saxParser = this.saxParser.write(chunk);
-          return setImmediate(this.processAsync);
-        }
-      } catch (error1) {
-        err = error1;
-        if (!this.saxParser.errThrown) {
-          this.saxParser.errThrown = true;
-          return this.emit(err);
-        }
-      }
-    };
-
-    Parser.prototype.assignOrPush = function(obj, key, newValue) {
-      if (!(key in obj)) {
-        if (!this.options.explicitArray) {
-          return obj[key] = newValue;
-        } else {
-          return obj[key] = [newValue];
-        }
-      } else {
-        if (!(obj[key] instanceof Array)) {
-          obj[key] = [obj[key]];
-        }
-        return obj[key].push(newValue);
-      }
-    };
-
-    Parser.prototype.reset = function() {
-      var attrkey, charkey, ontext, stack;
-      this.removeAllListeners();
-      this.saxParser = sax.parser(this.options.strict, {
-        trim: false,
-        normalize: false,
-        xmlns: this.options.xmlns
-      });
-      this.saxParser.errThrown = false;
-      this.saxParser.onerror = (function(_this) {
-        return function(error) {
-          _this.saxParser.resume();
-          if (!_this.saxParser.errThrown) {
-            _this.saxParser.errThrown = true;
-            return _this.emit("error", error);
-          }
-        };
-      })(this);
-      this.saxParser.onend = (function(_this) {
-        return function() {
-          if (!_this.saxParser.ended) {
-            _this.saxParser.ended = true;
-            return _this.emit("end", _this.resultObject);
-          }
-        };
-      })(this);
-      this.saxParser.ended = false;
-      this.EXPLICIT_CHARKEY = this.options.explicitCharkey;
-      this.resultObject = null;
-      stack = [];
-      attrkey = this.options.attrkey;
-      charkey = this.options.charkey;
-      this.saxParser.onopentag = (function(_this) {
-        return function(node) {
-          var key, newValue, obj, processedKey, ref;
-          obj = {};
-          obj[charkey] = "";
-          if (!_this.options.ignoreAttrs) {
-            ref = node.attributes;
-            for (key in ref) {
-              if (!hasProp.call(ref, key)) continue;
-              if (!(attrkey in obj) && !_this.options.mergeAttrs) {
-                obj[attrkey] = {};
-              }
-              newValue = _this.options.attrValueProcessors ? processItem(_this.options.attrValueProcessors, node.attributes[key], key) : node.attributes[key];
-              processedKey = _this.options.attrNameProcessors ? processItem(_this.options.attrNameProcessors, key) : key;
-              if (_this.options.mergeAttrs) {
-                _this.assignOrPush(obj, processedKey, newValue);
-              } else {
-                obj[attrkey][processedKey] = newValue;
-              }
-            }
-          }
-          obj["#name"] = _this.options.tagNameProcessors ? processItem(_this.options.tagNameProcessors, node.name) : node.name;
-          if (_this.options.xmlns) {
-            obj[_this.options.xmlnskey] = {
-              uri: node.uri,
-              local: node.local
-            };
-          }
-          return stack.push(obj);
-        };
-      })(this);
-      this.saxParser.onclosetag = (function(_this) {
-        return function() {
-          var cdata, emptyStr, key, node, nodeName, obj, objClone, old, s, xpath;
-          obj = stack.pop();
-          nodeName = obj["#name"];
-          if (!_this.options.explicitChildren || !_this.options.preserveChildrenOrder) {
-            delete obj["#name"];
-          }
-          if (obj.cdata === true) {
-            cdata = obj.cdata;
-            delete obj.cdata;
-          }
-          s = stack[stack.length - 1];
-          if (obj[charkey].match(/^\s*$/) && !cdata) {
-            emptyStr = obj[charkey];
-            delete obj[charkey];
-          } else {
-            if (_this.options.trim) {
-              obj[charkey] = obj[charkey].trim();
-            }
-            if (_this.options.normalize) {
-              obj[charkey] = obj[charkey].replace(/\s{2,}/g, " ").trim();
-            }
-            obj[charkey] = _this.options.valueProcessors ? processItem(_this.options.valueProcessors, obj[charkey], nodeName) : obj[charkey];
-            if (Object.keys(obj).length === 1 && charkey in obj && !_this.EXPLICIT_CHARKEY) {
-              obj = obj[charkey];
-            }
-          }
-          if (isEmpty(obj)) {
-            obj = _this.options.emptyTag !== '' ? _this.options.emptyTag : emptyStr;
-          }
-          if (_this.options.validator != null) {
-            xpath = "/" + ((function() {
-              var i, len, results;
-              results = [];
-              for (i = 0, len = stack.length; i < len; i++) {
-                node = stack[i];
-                results.push(node["#name"]);
-              }
-              return results;
-            })()).concat(nodeName).join("/");
-            (function() {
-              var err;
-              try {
-                return obj = _this.options.validator(xpath, s && s[nodeName], obj);
-              } catch (error1) {
-                err = error1;
-                return _this.emit("error", err);
-              }
-            })();
-          }
-          if (_this.options.explicitChildren && !_this.options.mergeAttrs && typeof obj === 'object') {
-            if (!_this.options.preserveChildrenOrder) {
-              node = {};
-              if (_this.options.attrkey in obj) {
-                node[_this.options.attrkey] = obj[_this.options.attrkey];
-                delete obj[_this.options.attrkey];
-              }
-              if (!_this.options.charsAsChildren && _this.options.charkey in obj) {
-                node[_this.options.charkey] = obj[_this.options.charkey];
-                delete obj[_this.options.charkey];
-              }
-              if (Object.getOwnPropertyNames(obj).length > 0) {
-                node[_this.options.childkey] = obj;
-              }
-              obj = node;
-            } else if (s) {
-              s[_this.options.childkey] = s[_this.options.childkey] || [];
-              objClone = {};
-              for (key in obj) {
-                if (!hasProp.call(obj, key)) continue;
-                objClone[key] = obj[key];
-              }
-              s[_this.options.childkey].push(objClone);
-              delete obj["#name"];
-              if (Object.keys(obj).length === 1 && charkey in obj && !_this.EXPLICIT_CHARKEY) {
-                obj = obj[charkey];
-              }
-            }
-          }
-          if (stack.length > 0) {
-            return _this.assignOrPush(s, nodeName, obj);
-          } else {
-            if (_this.options.explicitRoot) {
-              old = obj;
-              obj = {};
-              obj[nodeName] = old;
-            }
-            _this.resultObject = obj;
-            _this.saxParser.ended = true;
-            return _this.emit("end", _this.resultObject);
-          }
-        };
-      })(this);
-      ontext = (function(_this) {
-        return function(text) {
-          var charChild, s;
-          s = stack[stack.length - 1];
-          if (s) {
-            s[charkey] += text;
-            if (_this.options.explicitChildren && _this.options.preserveChildrenOrder && _this.options.charsAsChildren && (_this.options.includeWhiteChars || text.replace(/\\n/g, '').trim() !== '')) {
-              s[_this.options.childkey] = s[_this.options.childkey] || [];
-              charChild = {
-                '#name': '__text__'
-              };
-              charChild[charkey] = text;
-              if (_this.options.normalize) {
-                charChild[charkey] = charChild[charkey].replace(/\s{2,}/g, " ").trim();
-              }
-              s[_this.options.childkey].push(charChild);
-            }
-            return s;
-          }
-        };
-      })(this);
-      this.saxParser.ontext = ontext;
-      return this.saxParser.oncdata = (function(_this) {
-        return function(text) {
-          var s;
-          s = ontext(text);
-          if (s) {
-            return s.cdata = true;
-          }
-        };
-      })(this);
-    };
-
-    Parser.prototype.parseString = function(str, cb) {
-      var err;
-      if ((cb != null) && typeof cb === "function") {
-        this.on("end", function(result) {
-          this.reset();
-          return cb(null, result);
-        });
-        this.on("error", function(err) {
-          this.reset();
-          return cb(err);
-        });
-      }
-      try {
-        str = str.toString();
-        if (str.trim() === '') {
-          this.emit("end", null);
-          return true;
-        }
-        str = bom.stripBOM(str);
-        if (this.options.async) {
-          this.remaining = str;
-          setImmediate(this.processAsync);
-          return this.saxParser;
-        }
-        return this.saxParser.write(str).close();
-      } catch (error1) {
-        err = error1;
-        if (!(this.saxParser.errThrown || this.saxParser.ended)) {
-          this.emit('error', err);
-          return this.saxParser.errThrown = true;
-        } else if (this.saxParser.ended) {
-          throw err;
-        }
-      }
-    };
-
-    return Parser;
-
-  })(events.EventEmitter);
-
-  exports.parseString = function(str, a, b) {
-    var cb, options, parser;
-    if (b != null) {
-      if (typeof b === 'function') {
-        cb = b;
-      }
-      if (typeof a === 'object') {
-        options = a;
-      }
-    } else {
-      if (typeof a === 'function') {
-        cb = a;
-      }
-      options = {};
-    }
-    parser = new exports.Parser(options);
-    return parser.parseString(str, cb);
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/processors.js b/scripts/metrics/node_modules/xml2js/lib/processors.js
deleted file mode 100644
index 89aa85f22cf..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/processors.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  var prefixMatch;
-
-  prefixMatch = new RegExp(/(?!xmlns)^.*:/);
-
-  exports.normalize = function(str) {
-    return str.toLowerCase();
-  };
-
-  exports.firstCharLowerCase = function(str) {
-    return str.charAt(0).toLowerCase() + str.slice(1);
-  };
-
-  exports.stripPrefix = function(str) {
-    return str.replace(prefixMatch, '');
-  };
-
-  exports.parseNumbers = function(str) {
-    if (!isNaN(str)) {
-      str = str % 1 === 0 ? parseInt(str, 10) : parseFloat(str);
-    }
-    return str;
-  };
-
-  exports.parseBooleans = function(str) {
-    if (/^(?:true|false)$/i.test(str)) {
-      str = str.toLowerCase() === 'true';
-    }
-    return str;
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/xml2js.js b/scripts/metrics/node_modules/xml2js/lib/xml2js.js
deleted file mode 100644
index 599d3dd2b67..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/xml2js.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  var builder, defaults, parser, processors,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  defaults = require('./defaults');
-
-  builder = require('./builder');
-
-  parser = require('./parser');
-
-  processors = require('./processors');
-
-  exports.defaults = defaults.defaults;
-
-  exports.processors = processors;
-
-  exports.ValidationError = (function(superClass) {
-    extend(ValidationError, superClass);
-
-    function ValidationError(message) {
-      this.message = message;
-    }
-
-    return ValidationError;
-
-  })(Error);
-
-  exports.Builder = builder.Builder;
-
-  exports.Parser = parser.Parser;
-
-  exports.parseString = parser.parseString;
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/package.json b/scripts/metrics/node_modules/xml2js/package.json
deleted file mode 100644
index 94629c201c1..00000000000
--- a/scripts/metrics/node_modules/xml2js/package.json
+++ /dev/null
@@ -1,280 +0,0 @@
-{
-  "_from": "xml2js",
-  "_id": "xml2js@0.4.19",
-  "_inBundle": false,
-  "_integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-  "_location": "/xml2js",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "xml2js",
-    "name": "xml2js",
-    "escapedName": "xml2js",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-  "_shasum": "686c20f213209e94abf0d1bcf1efaa291c7827a7",
-  "_spec": "xml2js",
-  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics",
-  "author": {
-    "name": "Marek Kubica",
-    "email": "marek@xivilization.net",
-    "url": "https://xivilization.net"
-  },
-  "bugs": {
-    "url": "https://github.com/Leonidas-from-XIV/node-xml2js/issues"
-  },
-  "bundleDependencies": false,
-  "contributors": [
-    {
-      "name": "maqr",
-      "email": "maqr.lollerskates@gmail.com",
-      "url": "https://github.com/maqr"
-    },
-    {
-      "name": "Ben Weaver",
-      "url": "http://benweaver.com/"
-    },
-    {
-      "name": "Jae Kwon",
-      "url": "https://github.com/jaekwon"
-    },
-    {
-      "name": "Jim Robert"
-    },
-    {
-      "name": "Ștefan Rusu",
-      "url": "http://www.saltwaterc.eu/"
-    },
-    {
-      "name": "Carter Cole",
-      "email": "carter.cole@cartercole.com",
-      "url": "http://cartercole.com/"
-    },
-    {
-      "name": "Kurt Raschke",
-      "email": "kurt@kurtraschke.com",
-      "url": "http://www.kurtraschke.com/"
-    },
-    {
-      "name": "Contra",
-      "email": "contra@australia.edu",
-      "url": "https://github.com/Contra"
-    },
-    {
-      "name": "Marcelo Diniz",
-      "email": "marudiniz@gmail.com",
-      "url": "https://github.com/mdiniz"
-    },
-    {
-      "name": "Michael Hart",
-      "url": "https://github.com/mhart"
-    },
-    {
-      "name": "Zachary Scott",
-      "email": "zachary@zacharyscott.net",
-      "url": "http://zacharyscott.net/"
-    },
-    {
-      "name": "Raoul Millais",
-      "url": "https://github.com/raoulmillais"
-    },
-    {
-      "name": "Salsita Software",
-      "url": "http://www.salsitasoft.com/"
-    },
-    {
-      "name": "Mike Schilling",
-      "email": "mike@emotive.com",
-      "url": "http://www.emotive.com/"
-    },
-    {
-      "name": "Jackson Tian",
-      "email": "shyvo1987@gmail.com",
-      "url": "http://weibo.com/shyvo"
-    },
-    {
-      "name": "Mikhail Zyatin",
-      "email": "mikhail.zyatin@gmail.com",
-      "url": "https://github.com/Sitin"
-    },
-    {
-      "name": "Chris Tavares",
-      "email": "ctavares@microsoft.com",
-      "url": "https://github.com/christav"
-    },
-    {
-      "name": "Frank Xu",
-      "email": "yyfrankyy@gmail.com",
-      "url": "http://f2e.us/"
-    },
-    {
-      "name": "Guido D'Albore",
-      "email": "guido@bitstorm.it",
-      "url": "http://www.bitstorm.it/"
-    },
-    {
-      "name": "Jack Senechal",
-      "url": "http://jacksenechal.com/"
-    },
-    {
-      "name": "Matthias Hölzl",
-      "email": "tc@xantira.com",
-      "url": "https://github.com/hoelzl"
-    },
-    {
-      "name": "Camille Reynders",
-      "email": "info@creynders.be",
-      "url": "http://www.creynders.be/"
-    },
-    {
-      "name": "Taylor Gautier",
-      "url": "https://github.com/tsgautier"
-    },
-    {
-      "name": "Todd Bryan",
-      "url": "https://github.com/toddrbryan"
-    },
-    {
-      "name": "Leore Avidar",
-      "email": "leore.avidar@gmail.com",
-      "url": "http://leoreavidar.com/"
-    },
-    {
-      "name": "Dave Aitken",
-      "email": "dave.aitken@gmail.com",
-      "url": "http://www.actionshrimp.com/"
-    },
-    {
-      "name": "Shaney Orrowe",
-      "email": "shaney.orrowe@practiceweb.co.uk"
-    },
-    {
-      "name": "Candle",
-      "email": "candle@candle.me.uk"
-    },
-    {
-      "name": "Jess Telford",
-      "email": "hi@jes.st",
-      "url": "http://jes.st"
-    },
-    {
-      "name": "Tom Hughes",
-      "email": "<tom@compton.nu",
-      "url": "http://compton.nu/"
-    },
-    {
-      "name": "Piotr Rochala",
-      "url": "http://rocha.la/"
-    },
-    {
-      "name": "Michael Avila",
-      "url": "https://github.com/michaelavila"
-    },
-    {
-      "name": "Ryan Gahl",
-      "url": "https://github.com/ryedin"
-    },
-    {
-      "name": "Eric Laberge",
-      "email": "e.laberge@gmail.com",
-      "url": "https://github.com/elaberge"
-    },
-    {
-      "name": "Benjamin E. Coe",
-      "email": "ben@npmjs.com",
-      "url": "https://twitter.com/benjamincoe"
-    },
-    {
-      "name": "Stephen Cresswell",
-      "url": "https://github.com/cressie176"
-    },
-    {
-      "name": "Pascal Ehlert",
-      "email": "pascal@hacksrus.net",
-      "url": "http://www.hacksrus.net/"
-    },
-    {
-      "name": "Tom Spencer",
-      "email": "fiznool@gmail.com",
-      "url": "http://fiznool.com/"
-    },
-    {
-      "name": "Tristian Flanagan",
-      "email": "tflanagan@datacollaborative.com",
-      "url": "https://github.com/tflanagan"
-    },
-    {
-      "name": "Tim Johns",
-      "email": "timjohns@yahoo.com",
-      "url": "https://github.com/TimJohns"
-    },
-    {
-      "name": "Bogdan Chadkin",
-      "email": "trysound@yandex.ru",
-      "url": "https://github.com/TrySound"
-    },
-    {
-      "name": "David Wood",
-      "email": "david.p.wood@gmail.com",
-      "url": "http://codesleuth.co.uk/"
-    },
-    {
-      "name": "Nicolas Maquet",
-      "url": "https://github.com/nmaquet"
-    },
-    {
-      "name": "Lovell Fuller",
-      "url": "http://lovell.info/"
-    },
-    {
-      "name": "d3adc0d3",
-      "url": "https://github.com/d3adc0d3"
-    }
-  ],
-  "dependencies": {
-    "sax": ">=0.6.0",
-    "xmlbuilder": "~9.0.1"
-  },
-  "deprecated": false,
-  "description": "Simple XML to JavaScript object converter.",
-  "devDependencies": {
-    "coffee-script": ">=1.10.0",
-    "coveralls": "^2.11.2",
-    "diff": ">=1.0.8",
-    "docco": ">=0.6.2",
-    "nyc": ">=2.2.1",
-    "zap": ">=0.2.9"
-  },
-  "directories": {
-    "lib": "./lib"
-  },
-  "files": [
-    "lib"
-  ],
-  "homepage": "https://github.com/Leonidas-from-XIV/node-xml2js",
-  "keywords": [
-    "xml",
-    "json"
-  ],
-  "license": "MIT",
-  "main": "./lib/xml2js",
-  "name": "xml2js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Leonidas-from-XIV/node-xml2js.git"
-  },
-  "scripts": {
-    "coverage": "nyc npm test && nyc report",
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
-    "test": "zap"
-  },
-  "version": "0.4.19"
-}
diff --git a/scripts/metrics/node_modules/xmlbuilder/.npmignore b/scripts/metrics/node_modules/xmlbuilder/.npmignore
deleted file mode 100644
index b6ad1f6d9b3..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/.npmignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.travis.yml
-src
-test
-perf
-coverage
diff --git a/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md b/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
deleted file mode 100644
index 6264283378a..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
+++ /dev/null
@@ -1,423 +0,0 @@
-# Change Log
-
-All notable changes to this project are documented in this file. This project adheres to [Semantic Versioning](http://semver.org/#semantic-versioning-200).
-
-## [9.0.4] - 2017-08-16
-- `spacebeforeslash` writer option accepts `true` as well as space char(s).
-
-## [9.0.3] - 2017-08-15
-- `spacebeforeslash` writer option can now be used with XML fragments.
-
-## [9.0.2] - 2017-08-15
-- Added the `spacebeforeslash` writer option to add a space character before closing tags of empty elements. See
-[#157](https://github.com/oozcitak/xmlbuilder-js/issues/157).
-
-## [9.0.1] - 2017-06-19
-- Fixed character validity checks to work with node.js 4.0 and 5.0. See
-[#161](https://github.com/oozcitak/xmlbuilder-js/issues/161).
-
-## [9.0.0] - 2017-05-05
-- Removed case conversion options.
-- Removed support for node.js 4.0 and 5.0. Minimum required version is now 6.0.
-- Fixed valid char filter to use XML 1.1 instead of 1.0. See
-[#147](https://github.com/oozcitak/xmlbuilder-js/issues/147).
-- Added options for negative indentation and suppressing pretty printing of text
-nodes. See
-[#145](https://github.com/oozcitak/xmlbuilder-js/issues/145).
-
-## [8.2.2] - 2016-04-08
-- Falsy values can now be used as a text node in callback mode.
-
-## [8.2.1] - 2016-04-07
-- Falsy values can now be used as a text node. See 
-[#117](https://github.com/oozcitak/xmlbuilder-js/issues/117).
-
-## [8.2.0] - 2016-04-01
-- Removed lodash dependency to keep the library small and simple. See
-[#114](https://github.com/oozcitak/xmlbuilder-js/issues/114),
-[#53](https://github.com/oozcitak/xmlbuilder-js/issues/53),
-and [#43](https://github.com/oozcitak/xmlbuilder-js/issues/43).
-- Added title case to name conversion options.
-
-## [8.1.0] - 2016-03-29
-- Added the callback option to the `begin` export function. When used with a
-callback function, the XML document will be generated in chunks and each chunk
-will be passed to the supplied function. In this mode, `begin` uses a different
-code path and the builder should use much less memory since the entire XML tree
-is not kept. There are a few drawbacks though. For example, traversing the document
-tree or adding attributes to a node after it is written is not possible. It is
-also not possible to remove nodes or attributes.
-
-``` js
-var result = '';
-
-builder.begin(function(chunk) { result += chunk; })
-  .dec()
-  .ele('root')
-    .ele('xmlbuilder').up()
-  .end();
-```
-
-- Replaced native `Object.assign` with `lodash.assign` to support old JS engines.  See [#111](https://github.com/oozcitak/xmlbuilder-js/issues/111).
-
-## [8.0.0] - 2016-03-25
-- Added the `begin` export function. See the wiki for details.
-- Added the ability to add comments and processing instructions before and after the root element. Added `commentBefore`, `commentAfter`, `instructionBefore` and `instructionAfter` functions for this purpose.
-- Dropped support for old node.js releases. Minimum required node.js version is now 4.0.
-
-## [7.0.0] - 2016-03-21
-- Processing instructions are now created as regular nodes. This is a major breaking change if you are using processing instructions. Previously processing instructions were inserted before their parent node. After this change processing instructions are appended to the children of the parent node. Note that it is not currently possible to insert processing instructions before or after the root element.
-```js
-root.ele('node').ins('pi');
-// pre-v7
-<?pi?><node/>
-// v7
-<node><?pi?></node>
-```
-
-## [6.0.0] - 2016-03-20
-- Added custom XML writers. The default string conversion functions are now collected under the `XMLStringWriter` class which can be accessed by the `stringWriter(options)` function exported by the module. An `XMLStreamWriter` is also added which outputs the XML document to a writable stream. A stream writer can be created by calling the `streamWriter(stream, options)` function exported by the module. Both classes are heavily customizable and the details are added to the wiki. It is also possible to write an XML writer from scratch and use it when calling `end()` on the XML document.
-
-## [5.0.1] - 2016-03-08
-- Moved require statements for text case conversion to the top of files to reduce lazy requires.
-
-## [5.0.0] - 2016-03-05
-- Added text case option for element names and attribute names. Valid cases are `lower`, `upper`, `camel`, `kebab` and `snake`.
-- Attribute and element values are escaped according to the [Canonical XML 1.0 specification](http://www.w3.org/TR/2000/WD-xml-c14n-20000119.html#charescaping). See [#54](https://github.com/oozcitak/xmlbuilder-js/issues/54) and [#86](https://github.com/oozcitak/xmlbuilder-js/issues/86).
-- Added the `allowEmpty` option to `end()`. When this option is set, empty elements are not self-closed.
-- Added support for [nested CDATA](https://en.wikipedia.org/wiki/CDATA#Nesting). The triad `]]>` in CDATA is now automatically replaced with `]]]]><![CDATA[>`.
-
-## [4.2.1] - 2016-01-15
-- Updated lodash dependency to 4.0.0.
-
-## [4.2.0] - 2015-12-16
-- Added the `noDoubleEncoding` option to `create()` to control whether existing html entities are encoded.
-
-## [4.1.0] - 2015-11-11
-- Added the `separateArrayItems` option to `create()` to control how arrays are handled when converting from objects. e.g.
-
-```js
-root.ele({ number: [ "one", "two"  ]});
-// with separateArrayItems: true
-<number>
-  <one/>
-  <two/>
-</number>
-// with separateArrayItems: false
-<number>one</number>
-<number>two</number>
-```
-
-## [4.0.0] - 2015-11-01
-- Removed the `#list` decorator. Array items are now created as child nodes by default.
-- Fixed a bug where the XML encoding string was checked partially.
-
-## [3.1.0] - 2015-09-19
-- `#list` decorator ignores empty arrays.
-
-## [3.0.0] - 2015-09-10
-- Allow `\r`, `\n` and `\t` in attribute values without escaping. See [#86](https://github.com/oozcitak/xmlbuilder-js/issues/86).
-
-## [2.6.5] - 2015-09-09
-- Use native `isArray` instead of lodash.
-- Indentation of processing instructions are set to the parent element's.
-
-## [2.6.4] - 2015-05-27
-- Updated lodash dependency to 3.5.0.
-
-## [2.6.3] - 2015-05-27
-- Bumped version because previous release was not published on npm.
-
-## [2.6.2] - 2015-03-10
-- Updated lodash dependency to 3.5.0.
-
-## [2.6.1] - 2015-02-20
-- Updated lodash dependency to 3.3.0.
-
-## [2.6.0] - 2015-02-20
-- Fixed a bug where the `XMLNode` constructor overwrote the super class parent.
-- Removed document property from cloned nodes.
-- Switched to mocha.js for testing.
-
-## [2.5.2] - 2015-02-16
-- Updated lodash dependency to 3.2.0.
-
-## [2.5.1] - 2015-02-09
-- Updated lodash dependency to 3.1.0.
-- Support all node >= 0.8.
-
-## [2.5.0] - 2015-00-03
-- Updated lodash dependency to 3.0.0.
-
-## [2.4.6] - 2015-01-26
--	Show more information from attribute creation with null values.
--	Added iojs as an engine.
--	Self close elements with empty text.
-
-## [2.4.5] - 2014-11-15
-- Fixed prepublish script to run on windows.
-- Fixed  bug in XMLStringifier where an undefined value was used while reporting an invalid encoding value.
-- Moved require statements to the top of files to reduce lazy requires. See [#62](https://github.com/oozcitak/xmlbuilder-js/issues/62).
-
-## [2.4.4] - 2014-09-08
-- Added the `offset` option to `toString()` for use in XML fragments.
-
-## [2.4.3] - 2014-08-13
-- Corrected license in package description.
-
-## [2.4.2] - 2014-08-13
-- Dropped performance test and memwatch dependency.
-
-## [2.4.1] - 2014-08-12
-- Fixed a bug where empty indent string was omitted when pretty printing. See [#59](https://github.com/oozcitak/xmlbuilder-js/issues/59).
-
-## [2.4.0] - 2014-08-04
-- Correct cases of pubID and sysID.
-- Use single lodash instead of separate npm modules. See [#53](https://github.com/oozcitak/xmlbuilder-js/issues/53).
-- Escape according to Canonical XML 1.0. See [#54](https://github.com/oozcitak/xmlbuilder-js/issues/54).
-
-## [2.3.0] - 2014-07-17
-- Convert objects to JS primitives while sanitizing user input.
-- Object builder preserves items with null values. See [#44](https://github.com/oozcitak/xmlbuilder-js/issues/44).
-- Use modularized lodash functions to cut down dependencies.
-- Process empty objects when converting from objects so that we don't throw on empty child objects.
-
-## [2.2.1] - 2014-04-04
-- Bumped version because previous release was not published on npm.
-
-## [2.2.0] - 2014-04-04
-- Switch to lodash from underscore.
-- Removed legacy `ext` option from `create()`.
-- Drop old node versions: 0.4, 0.5, 0.6. 0.8 is the minimum requirement from now on.
-
-## [2.1.0] - 2013-12-30
-- Removed duplicate null checks from constructors.
-- Fixed node count in performance test.
-- Added option for skipping null attribute values. See [#26](https://github.com/oozcitak/xmlbuilder-js/issues/26).
-- Allow multiple values in `att()` and `ins()`.
-- Added ability to run individual performance tests.
-- Added flag for ignoring decorator strings.
-
-## [2.0.1] - 2013-12-24
-- Removed performance tests from npm package.
-
-## [2.0.0] - 2013-12-24
-- Combined loops for speed up.
-- Added support for the DTD and XML declaration.
-- `clone` includes attributes.
-- Added performance tests.
-- Evaluate attribute value if function.
-- Evaluate instruction value if function.
-
-## [1.1.2] - 2013-12-11
-- 	Changed processing instruction decorator to `?`.
-
-## [1.1.1] - 2013-12-11
-- 	Added processing instructions to JS object conversion.
-
-## [1.1.0] - 2013-12-10
-- Added license to package.
-- `create()` and `element()` accept JS object to fully build the document.
-- Added `nod()` and `n()` aliases for `node()`.
-- Renamed `convertAttChar` decorator to `convertAttKey`.
-- Ignore empty decorator strings when converting JS objects.
-
-## [1.0.2] - 2013-11-27
-- Removed temp file which was accidentally included in the package.
-
-## [1.0.1] - 2013-11-27
-- Custom stringify functions affect current instance only.
-
-## [1.0.0] - 2013-11-27
-- Added processing instructions.
-- Added stringify functions to sanitize and convert input values.
-- Added option for headless XML documents.
-- Added vows tests.
-- Removed Makefile. Using npm publish scripts instead.
-- Removed the `begin()` function. `create()` begins the document by creating the root node.
-
-## [0.4.3] - 2013-11-08
-- Added option to include surrogate pairs in XML content. See [#29](https://github.com/oozcitak/xmlbuilder-js/issues/29).
-- Fixed empty value string representation in pretty mode.
-- Added pre and postpublish scripts to package.json.
-- Filtered out prototype properties when appending attributes. See [#31](https://github.com/oozcitak/xmlbuilder-js/issues/31).
-
-## [0.4.2] - 2012-09-14
-- Removed README.md from `.npmignore`.
-
-## [0.4.1] - 2012-08-31
-- Removed `begin()` calls in favor of `XMLBuilder` constructor.
-- Added the `end()` function. `end()` is a convenience over `doc().toString()`.
-
-## [0.4.0] - 2012-08-31
-- Added arguments to `XMLBuilder` constructor to allow the name of the root element and XML prolog to be defined in one line.
-- Soft deprecated `begin()`.
-
-## [0.3.11] - 2012-08-13
-- Package keywords are fixed to be an array of values.
-
-## [0.3.10] - 2012-08-13
-- Brought back npm package contents which were lost due to incorrect configuration of `package.json` in previous releases.
-
-## [0.3.3] - 2012-07-27
-- Implemented `importXMLBuilder()`.
-
-## [0.3.2] - 2012-07-20
-- Fixed a duplicated escaping problem on `element()`.
-- Fixed a problem with text node creation from empty string.
-- Calling `root()` on the document element returns the root element.
-- `XMLBuilder` no longer extends `XMLFragment`.
-
-## [0.3.1] - 2011-11-28
-- Added guards for document element so that nodes cannot be inserted at document level.
-
-## [0.3.0] - 2011-11-28
-- Added `doc()` to return the document element.
-
-## [0.2.2] - 2011-11-28
-- Prevent code relying on `up()`'s older behavior to break.
-
-## [0.2.1] - 2011-11-28
-- Added the `root()` function.
-
-## [0.2.0] - 2011-11-21
-- Added Travis-CI integration.
-- Added coffee-script dependency.
-- Added insert, traversal and delete functions.
-
-## [0.1.7] - 2011-10-25
-- No changes. Accidental release.
-
-## [0.1.6] - 2011-10-25
-- Corrected `package.json` bugs link to `url` from `web`.
-
-## [0.1.5] - 2011-08-08
-- Added missing npm package contents.
-
-## [0.1.4] - 2011-07-29
-- Text-only nodes are no longer indented.
-- Added documentation for multiple instances.
-
-## [0.1.3] - 2011-07-27
-- Exported the `create()` function to return a new instance. This allows multiple builder instances to be constructed.
-- Fixed `u()` function so that it now correctly calls `up()`.
-- Fixed typo in `element()` so that `attributes` and `text` can be passed interchangeably.
-
-## [0.1.2] - 2011-06-03
-- `ele()` accepts element text.
-- `attributes()` now overrides existing attributes if passed the same attribute name.
-
-## [0.1.1] - 2011-05-19
-- Added the raw output option.
-- Removed most validity checks.
-
-## [0.1.0] - 2011-04-27
-- `text()` and `cdata()` now return parent element.
-- Attribute values are escaped.
-
-## [0.0.7] - 2011-04-23
--	Coerced text values to string.
-
-## [0.0.6] - 2011-02-23
-- Added support for XML comments.
-- Text nodes are checked against CharData.
-
-## [0.0.5] - 2010-12-31
-- Corrected the name of the main npm module in `package.json`.
-
-## [0.0.4] - 2010-12-28
-- Added `.npmignore`.
-
-## [0.0.3] - 2010-12-27
-- root element is now constructed in `begin()`.
-- moved prolog to `begin()`.
-- Added the ability to have CDATA in element text.
-- Removed unused prolog aliases.
-- Removed `builder()` function from main module.
-- Added the name of the main npm module in `package.json`.
-
-## [0.0.2] - 2010-11-03
-- `element()` expands nested arrays.
-- Added pretty printing.
-- Added the `up()`, `build()` and `prolog()` functions.
-- Added readme.
-
-## 0.0.1 - 2010-11-02
-- Initial release
-
-[9.0.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.3...v9.0.4
-[9.0.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.2...v9.0.3
-[9.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.1...v9.0.2
-[9.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.0...v9.0.1
-[9.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.2...v9.0.0
-[8.2.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.1...v8.2.2
-[8.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.0...v8.2.1
-[8.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.1.0...v8.2.0
-[8.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.0.0...v8.1.0
-[8.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v7.0.0...v8.0.0
-[7.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v6.0.0...v7.0.0
-[6.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v5.0.1...v6.0.0
-[5.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v5.0.0...v5.0.1
-[5.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.2.1...v5.0.0
-[4.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.2.0...v4.2.1
-[4.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.1.0...v4.2.0
-[4.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.0.0...v4.1.0
-[4.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v3.1.0...v4.0.0
-[3.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v3.0.0...v3.1.0
-[3.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.5...v3.0.0
-[2.6.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.4...v2.6.5
-[2.6.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.3...v2.6.4
-[2.6.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.2...v2.6.3
-[2.6.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.1...v2.6.2
-[2.6.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.0...v2.6.1
-[2.6.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.2...v2.6.0
-[2.5.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.1...v2.5.2
-[2.5.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.0...v2.5.1
-[2.5.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.6...v2.5.0
-[2.4.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.5...v2.4.6
-[2.4.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.4...v2.4.5
-[2.4.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.3...v2.4.4
-[2.4.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.2...v2.4.3
-[2.4.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.1...v2.4.2
-[2.4.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.0...v2.4.1
-[2.4.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.3.0...v2.4.0
-[2.3.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.2.1...v2.3.0
-[2.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.2.0...v2.2.1
-[2.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.1.0...v2.2.0
-[2.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.0.1...v2.1.0
-[2.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.0.0...v2.0.1
-[2.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.2...v2.0.0
-[1.1.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.1...v1.1.2
-[1.1.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.0...v1.1.1
-[1.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.2...v1.1.0
-[1.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.1...v1.0.2
-[1.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.0...v1.0.1
-[1.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.3...v1.0.0
-[0.4.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.2...v0.4.3
-[0.4.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.1...v0.4.2
-[0.4.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.0...v0.4.1
-[0.4.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.11...v0.4.0
-[0.3.11]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.10...v0.3.11
-[0.3.10]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.3...v0.3.10
-[0.3.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.2...v0.3.3
-[0.3.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.1...v0.3.2
-[0.3.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.0...v0.3.1
-[0.3.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.2...v0.3.0
-[0.2.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.1...v0.2.2
-[0.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.0...v0.2.1
-[0.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.7...v0.2.0
-[0.1.7]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.6...v0.1.7
-[0.1.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.5...v0.1.6
-[0.1.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.4...v0.1.5
-[0.1.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.3...v0.1.4
-[0.1.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.2...v0.1.3
-[0.1.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.7...v0.1.0
-[0.0.7]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.6...v0.0.7
-[0.0.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.5...v0.0.6
-[0.0.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.4...v0.0.5
-[0.0.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.3...v0.0.4
-[0.0.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.2...v0.0.3
-[0.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.1...v0.0.2
-
diff --git a/scripts/metrics/node_modules/xmlbuilder/LICENSE b/scripts/metrics/node_modules/xmlbuilder/LICENSE
deleted file mode 100644
index e7cbac9a801..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Ozgur Ozcitak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/xmlbuilder/README.md b/scripts/metrics/node_modules/xmlbuilder/README.md
deleted file mode 100644
index 785c4dd6369..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# xmlbuilder-js
-
-An XML builder for [node.js](https://nodejs.org/) similar to
-[java-xmlbuilder](https://github.com/jmurty/java-xmlbuilder).
-
-[![License](http://img.shields.io/npm/l/xmlbuilder.svg?style=flat-square)](http://opensource.org/licenses/MIT)
-[![NPM Version](http://img.shields.io/npm/v/xmlbuilder.svg?style=flat-square)](https://npmjs.com/package/xmlbuilder)
-[![NPM Downloads](https://img.shields.io/npm/dm/xmlbuilder.svg?style=flat-square)](https://npmjs.com/package/xmlbuilder)
-
-[![Build Status](http://img.shields.io/travis/oozcitak/xmlbuilder-js.svg?style=flat-square)](http://travis-ci.org/oozcitak/xmlbuilder-js)
-[![Dev Dependency Status](http://img.shields.io/david/dev/oozcitak/xmlbuilder-js.svg?style=flat-square)](https://david-dm.org/oozcitak/xmlbuilder-js)
-[![Code Coverage](https://img.shields.io/coveralls/oozcitak/xmlbuilder-js.svg?style=flat-square)](https://coveralls.io/github/oozcitak/xmlbuilder-js)
-
-### Installation:
-
-``` sh
-npm install xmlbuilder
-```
-
-### Usage:
-
-``` js
-var builder = require('xmlbuilder');
-var xml = builder.create('root')
-  .ele('xmlbuilder')
-    .ele('repo', {'type': 'git'}, 'git://github.com/oozcitak/xmlbuilder-js.git')
-  .end({ pretty: true});
-
-console.log(xml);
-```
-
-will result in:
-
-``` xml
-<?xml version="1.0"?>
-<root>
-  <xmlbuilder>
-    <repo type="git">git://github.com/oozcitak/xmlbuilder-js.git</repo>
-  </xmlbuilder>
-</root>
-```
-
-It is also possible to convert objects into nodes:
-
-``` js
-builder.create({
-  root: {
-    xmlbuilder: {
-      repo: {
-        '@type': 'git', // attributes start with @
-        '#text': 'git://github.com/oozcitak/xmlbuilder-js.git' // text node
-      }
-    }
-  }
-});
-```
-
-If you need to do some processing:
-
-``` js
-var root = builder.create('squares');
-root.com('f(x) = x^2');
-for(var i = 1; i <= 5; i++)
-{
-  var item = root.ele('data');
-  item.att('x', i);
-  item.att('y', i * i);
-}
-```
-
-This will result in:
-
-``` xml
-<?xml version="1.0"?>
-<squares>
-  <!-- f(x) = x^2 -->
-  <data x="1" y="1"/>
-  <data x="2" y="4"/>
-  <data x="3" y="9"/>
-  <data x="4" y="16"/>
-  <data x="5" y="25"/>
-</squares>
-```
-
-See the [wiki](https://github.com/oozcitak/xmlbuilder-js/wiki) for details and [examples](https://github.com/oozcitak/xmlbuilder-js/wiki/Examples) for more complex examples.
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js b/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
deleted file mode 100644
index 908f8a8a537..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var assign, isArray, isEmpty, isFunction, isObject, isPlainObject,
-    slice = [].slice,
-    hasProp = {}.hasOwnProperty;
-
-  assign = function() {
-    var i, key, len, source, sources, target;
-    target = arguments[0], sources = 2 <= arguments.length ? slice.call(arguments, 1) : [];
-    if (isFunction(Object.assign)) {
-      Object.assign.apply(null, arguments);
-    } else {
-      for (i = 0, len = sources.length; i < len; i++) {
-        source = sources[i];
-        if (source != null) {
-          for (key in source) {
-            if (!hasProp.call(source, key)) continue;
-            target[key] = source[key];
-          }
-        }
-      }
-    }
-    return target;
-  };
-
-  isFunction = function(val) {
-    return !!val && Object.prototype.toString.call(val) === '[object Function]';
-  };
-
-  isObject = function(val) {
-    var ref;
-    return !!val && ((ref = typeof val) === 'function' || ref === 'object');
-  };
-
-  isArray = function(val) {
-    if (isFunction(Array.isArray)) {
-      return Array.isArray(val);
-    } else {
-      return Object.prototype.toString.call(val) === '[object Array]';
-    }
-  };
-
-  isEmpty = function(val) {
-    var key;
-    if (isArray(val)) {
-      return !val.length;
-    } else {
-      for (key in val) {
-        if (!hasProp.call(val, key)) continue;
-        return false;
-      }
-      return true;
-    }
-  };
-
-  isPlainObject = function(val) {
-    var ctor, proto;
-    return isObject(val) && (proto = Object.getPrototypeOf(val)) && (ctor = proto.constructor) && (typeof ctor === 'function') && (ctor instanceof ctor) && (Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object));
-  };
-
-  module.exports.assign = assign;
-
-  module.exports.isFunction = isFunction;
-
-  module.exports.isObject = isObject;
-
-  module.exports.isArray = isArray;
-
-  module.exports.isEmpty = isEmpty;
-
-  module.exports.isPlainObject = isPlainObject;
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
deleted file mode 100644
index 67cc0bcbdd8..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLAttribute;
-
-  module.exports = XMLAttribute = (function() {
-    function XMLAttribute(parent, name, value) {
-      this.options = parent.options;
-      this.stringify = parent.stringify;
-      if (name == null) {
-        throw new Error("Missing attribute name of element " + parent.name);
-      }
-      if (value == null) {
-        throw new Error("Missing attribute value for attribute " + name + " of element " + parent.name);
-      }
-      this.name = this.stringify.attName(name);
-      this.value = this.stringify.attValue(value);
-    }
-
-    XMLAttribute.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLAttribute.prototype.toString = function(options) {
-      return this.options.writer.set(options).attribute(this);
-    };
-
-    return XMLAttribute;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
deleted file mode 100644
index 670e860889d..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLCData, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLCData = (function(superClass) {
-    extend(XMLCData, superClass);
-
-    function XMLCData(parent, text) {
-      XMLCData.__super__.constructor.call(this, parent);
-      if (text == null) {
-        throw new Error("Missing CDATA text");
-      }
-      this.text = this.stringify.cdata(text);
-    }
-
-    XMLCData.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLCData.prototype.toString = function(options) {
-      return this.options.writer.set(options).cdata(this);
-    };
-
-    return XMLCData;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
deleted file mode 100644
index c189714abb3..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLComment, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLComment = (function(superClass) {
-    extend(XMLComment, superClass);
-
-    function XMLComment(parent, text) {
-      XMLComment.__super__.constructor.call(this, parent);
-      if (text == null) {
-        throw new Error("Missing comment text");
-      }
-      this.text = this.stringify.comment(text);
-    }
-
-    XMLComment.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLComment.prototype.toString = function(options) {
-      return this.options.writer.set(options).comment(this);
-    };
-
-    return XMLComment;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
deleted file mode 100644
index 8f911c257dd..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDAttList, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDTDAttList = (function(superClass) {
-    extend(XMLDTDAttList, superClass);
-
-    function XMLDTDAttList(parent, elementName, attributeName, attributeType, defaultValueType, defaultValue) {
-      XMLDTDAttList.__super__.constructor.call(this, parent);
-      if (elementName == null) {
-        throw new Error("Missing DTD element name");
-      }
-      if (attributeName == null) {
-        throw new Error("Missing DTD attribute name");
-      }
-      if (!attributeType) {
-        throw new Error("Missing DTD attribute type");
-      }
-      if (!defaultValueType) {
-        throw new Error("Missing DTD attribute default");
-      }
-      if (defaultValueType.indexOf('#') !== 0) {
-        defaultValueType = '#' + defaultValueType;
-      }
-      if (!defaultValueType.match(/^(#REQUIRED|#IMPLIED|#FIXED|#DEFAULT)$/)) {
-        throw new Error("Invalid default value type; expected: #REQUIRED, #IMPLIED, #FIXED or #DEFAULT");
-      }
-      if (defaultValue && !defaultValueType.match(/^(#FIXED|#DEFAULT)$/)) {
-        throw new Error("Default value only applies to #FIXED or #DEFAULT");
-      }
-      this.elementName = this.stringify.eleName(elementName);
-      this.attributeName = this.stringify.attName(attributeName);
-      this.attributeType = this.stringify.dtdAttType(attributeType);
-      this.defaultValue = this.stringify.dtdAttDefault(defaultValue);
-      this.defaultValueType = defaultValueType;
-    }
-
-    XMLDTDAttList.prototype.toString = function(options) {
-      return this.options.writer.set(options).dtdAttList(this);
-    };
-
-    return XMLDTDAttList;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
deleted file mode 100644
index 43f5d05ec2b..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDElement, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDTDElement = (function(superClass) {
-    extend(XMLDTDElement, superClass);
-
-    function XMLDTDElement(parent, name, value) {
-      XMLDTDElement.__super__.constructor.call(this, parent);
-      if (name == null) {
-        throw new Error("Missing DTD element name");
-      }
-      if (!value) {
-        value = '(#PCDATA)';
-      }
-      if (Array.isArray(value)) {
-        value = '(' + value.join(',') + ')';
-      }
-      this.name = this.stringify.eleName(name);
-      this.value = this.stringify.dtdElementValue(value);
-    }
-
-    XMLDTDElement.prototype.toString = function(options) {
-      return this.options.writer.set(options).dtdElement(this);
-    };
-
-    return XMLDTDElement;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
deleted file mode 100644
index 943f312d50b..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDEntity, XMLNode, isObject,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  isObject = require('./Utility').isObject;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDTDEntity = (function(superClass) {
-    extend(XMLDTDEntity, superClass);
-
-    function XMLDTDEntity(parent, pe, name, value) {
-      XMLDTDEntity.__super__.constructor.call(this, parent);
-      if (name == null) {
-        throw new Error("Missing entity name");
-      }
-      if (value == null) {
-        throw new Error("Missing entity value");
-      }
-      this.pe = !!pe;
-      this.name = this.stringify.eleName(name);
-      if (!isObject(value)) {
-        this.value = this.stringify.dtdEntityValue(value);
-      } else {
-        if (!value.pubID && !value.sysID) {
-          throw new Error("Public and/or system identifiers are required for an external entity");
-        }
-        if (value.pubID && !value.sysID) {
-          throw new Error("System identifier is required for a public external entity");
-        }
-        if (value.pubID != null) {
-          this.pubID = this.stringify.dtdPubID(value.pubID);
-        }
-        if (value.sysID != null) {
-          this.sysID = this.stringify.dtdSysID(value.sysID);
-        }
-        if (value.nData != null) {
-          this.nData = this.stringify.dtdNData(value.nData);
-        }
-        if (this.pe && this.nData) {
-          throw new Error("Notation declaration is not allowed in a parameter entity");
-        }
-      }
-    }
-
-    XMLDTDEntity.prototype.toString = function(options) {
-      return this.options.writer.set(options).dtdEntity(this);
-    };
-
-    return XMLDTDEntity;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
deleted file mode 100644
index 2c0c69820b8..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDNotation, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDTDNotation = (function(superClass) {
-    extend(XMLDTDNotation, superClass);
-
-    function XMLDTDNotation(parent, name, value) {
-      XMLDTDNotation.__super__.constructor.call(this, parent);
-      if (name == null) {
-        throw new Error("Missing notation name");
-      }
-      if (!value.pubID && !value.sysID) {
-        throw new Error("Public or system identifiers are required for an external entity");
-      }
-      this.name = this.stringify.eleName(name);
-      if (value.pubID != null) {
-        this.pubID = this.stringify.dtdPubID(value.pubID);
-      }
-      if (value.sysID != null) {
-        this.sysID = this.stringify.dtdSysID(value.sysID);
-      }
-    }
-
-    XMLDTDNotation.prototype.toString = function(options) {
-      return this.options.writer.set(options).dtdNotation(this);
-    };
-
-    return XMLDTDNotation;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
deleted file mode 100644
index 3251f289ff7..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDeclaration, XMLNode, isObject,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  isObject = require('./Utility').isObject;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDeclaration = (function(superClass) {
-    extend(XMLDeclaration, superClass);
-
-    function XMLDeclaration(parent, version, encoding, standalone) {
-      var ref;
-      XMLDeclaration.__super__.constructor.call(this, parent);
-      if (isObject(version)) {
-        ref = version, version = ref.version, encoding = ref.encoding, standalone = ref.standalone;
-      }
-      if (!version) {
-        version = '1.0';
-      }
-      this.version = this.stringify.xmlVersion(version);
-      if (encoding != null) {
-        this.encoding = this.stringify.xmlEncoding(encoding);
-      }
-      if (standalone != null) {
-        this.standalone = this.stringify.xmlStandalone(standalone);
-      }
-    }
-
-    XMLDeclaration.prototype.toString = function(options) {
-      return this.options.writer.set(options).declaration(this);
-    };
-
-    return XMLDeclaration;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
deleted file mode 100644
index 1bb0429ac50..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDocType, XMLNode, isObject,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  isObject = require('./Utility').isObject;
-
-  XMLNode = require('./XMLNode');
-
-  XMLDTDAttList = require('./XMLDTDAttList');
-
-  XMLDTDEntity = require('./XMLDTDEntity');
-
-  XMLDTDElement = require('./XMLDTDElement');
-
-  XMLDTDNotation = require('./XMLDTDNotation');
-
-  module.exports = XMLDocType = (function(superClass) {
-    extend(XMLDocType, superClass);
-
-    function XMLDocType(parent, pubID, sysID) {
-      var ref, ref1;
-      XMLDocType.__super__.constructor.call(this, parent);
-      this.documentObject = parent;
-      if (isObject(pubID)) {
-        ref = pubID, pubID = ref.pubID, sysID = ref.sysID;
-      }
-      if (sysID == null) {
-        ref1 = [pubID, sysID], sysID = ref1[0], pubID = ref1[1];
-      }
-      if (pubID != null) {
-        this.pubID = this.stringify.dtdPubID(pubID);
-      }
-      if (sysID != null) {
-        this.sysID = this.stringify.dtdSysID(sysID);
-      }
-    }
-
-    XMLDocType.prototype.element = function(name, value) {
-      var child;
-      child = new XMLDTDElement(this, name, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.attList = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
-      var child;
-      child = new XMLDTDAttList(this, elementName, attributeName, attributeType, defaultValueType, defaultValue);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.entity = function(name, value) {
-      var child;
-      child = new XMLDTDEntity(this, false, name, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.pEntity = function(name, value) {
-      var child;
-      child = new XMLDTDEntity(this, true, name, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.notation = function(name, value) {
-      var child;
-      child = new XMLDTDNotation(this, name, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.toString = function(options) {
-      return this.options.writer.set(options).docType(this);
-    };
-
-    XMLDocType.prototype.ele = function(name, value) {
-      return this.element(name, value);
-    };
-
-    XMLDocType.prototype.att = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
-      return this.attList(elementName, attributeName, attributeType, defaultValueType, defaultValue);
-    };
-
-    XMLDocType.prototype.ent = function(name, value) {
-      return this.entity(name, value);
-    };
-
-    XMLDocType.prototype.pent = function(name, value) {
-      return this.pEntity(name, value);
-    };
-
-    XMLDocType.prototype.not = function(name, value) {
-      return this.notation(name, value);
-    };
-
-    XMLDocType.prototype.up = function() {
-      return this.root() || this.documentObject;
-    };
-
-    return XMLDocType;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
deleted file mode 100644
index 38743ee3f4b..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDocument, XMLNode, XMLStringWriter, XMLStringifier, isPlainObject,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  isPlainObject = require('./Utility').isPlainObject;
-
-  XMLNode = require('./XMLNode');
-
-  XMLStringifier = require('./XMLStringifier');
-
-  XMLStringWriter = require('./XMLStringWriter');
-
-  module.exports = XMLDocument = (function(superClass) {
-    extend(XMLDocument, superClass);
-
-    function XMLDocument(options) {
-      XMLDocument.__super__.constructor.call(this, null);
-      options || (options = {});
-      if (!options.writer) {
-        options.writer = new XMLStringWriter();
-      }
-      this.options = options;
-      this.stringify = new XMLStringifier(options);
-      this.isDocument = true;
-    }
-
-    XMLDocument.prototype.end = function(writer) {
-      var writerOptions;
-      if (!writer) {
-        writer = this.options.writer;
-      } else if (isPlainObject(writer)) {
-        writerOptions = writer;
-        writer = this.options.writer.set(writerOptions);
-      }
-      return writer.document(this);
-    };
-
-    XMLDocument.prototype.toString = function(options) {
-      return this.options.writer.set(options).document(this);
-    };
-
-    return XMLDocument;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
deleted file mode 100644
index 00da8dcd2ab..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
+++ /dev/null
@@ -1,402 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLAttribute, XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLDocumentCB, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStringWriter, XMLStringifier, XMLText, isFunction, isObject, isPlainObject, ref,
-    hasProp = {}.hasOwnProperty;
-
-  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction, isPlainObject = ref.isPlainObject;
-
-  XMLElement = require('./XMLElement');
-
-  XMLCData = require('./XMLCData');
-
-  XMLComment = require('./XMLComment');
-
-  XMLRaw = require('./XMLRaw');
-
-  XMLText = require('./XMLText');
-
-  XMLProcessingInstruction = require('./XMLProcessingInstruction');
-
-  XMLDeclaration = require('./XMLDeclaration');
-
-  XMLDocType = require('./XMLDocType');
-
-  XMLDTDAttList = require('./XMLDTDAttList');
-
-  XMLDTDEntity = require('./XMLDTDEntity');
-
-  XMLDTDElement = require('./XMLDTDElement');
-
-  XMLDTDNotation = require('./XMLDTDNotation');
-
-  XMLAttribute = require('./XMLAttribute');
-
-  XMLStringifier = require('./XMLStringifier');
-
-  XMLStringWriter = require('./XMLStringWriter');
-
-  module.exports = XMLDocumentCB = (function() {
-    function XMLDocumentCB(options, onData, onEnd) {
-      var writerOptions;
-      options || (options = {});
-      if (!options.writer) {
-        options.writer = new XMLStringWriter(options);
-      } else if (isPlainObject(options.writer)) {
-        writerOptions = options.writer;
-        options.writer = new XMLStringWriter(writerOptions);
-      }
-      this.options = options;
-      this.writer = options.writer;
-      this.stringify = new XMLStringifier(options);
-      this.onDataCallback = onData || function() {};
-      this.onEndCallback = onEnd || function() {};
-      this.currentNode = null;
-      this.currentLevel = -1;
-      this.openTags = {};
-      this.documentStarted = false;
-      this.documentCompleted = false;
-      this.root = null;
-    }
-
-    XMLDocumentCB.prototype.node = function(name, attributes, text) {
-      var ref1;
-      if (name == null) {
-        throw new Error("Missing node name");
-      }
-      if (this.root && this.currentLevel === -1) {
-        throw new Error("Document can only have one root node");
-      }
-      this.openCurrent();
-      name = name.valueOf();
-      if (attributes == null) {
-        attributes = {};
-      }
-      attributes = attributes.valueOf();
-      if (!isObject(attributes)) {
-        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
-      }
-      this.currentNode = new XMLElement(this, name, attributes);
-      this.currentNode.children = false;
-      this.currentLevel++;
-      this.openTags[this.currentLevel] = this.currentNode;
-      if (text != null) {
-        this.text(text);
-      }
-      return this;
-    };
-
-    XMLDocumentCB.prototype.element = function(name, attributes, text) {
-      if (this.currentNode && this.currentNode instanceof XMLDocType) {
-        return this.dtdElement.apply(this, arguments);
-      } else {
-        return this.node(name, attributes, text);
-      }
-    };
-
-    XMLDocumentCB.prototype.attribute = function(name, value) {
-      var attName, attValue;
-      if (!this.currentNode || this.currentNode.children) {
-        throw new Error("att() can only be used immediately after an ele() call in callback mode");
-      }
-      if (name != null) {
-        name = name.valueOf();
-      }
-      if (isObject(name)) {
-        for (attName in name) {
-          if (!hasProp.call(name, attName)) continue;
-          attValue = name[attName];
-          this.attribute(attName, attValue);
-        }
-      } else {
-        if (isFunction(value)) {
-          value = value.apply();
-        }
-        if (!this.options.skipNullAttributes || (value != null)) {
-          this.currentNode.attributes[name] = new XMLAttribute(this, name, value);
-        }
-      }
-      return this;
-    };
-
-    XMLDocumentCB.prototype.text = function(value) {
-      var node;
-      this.openCurrent();
-      node = new XMLText(this, value);
-      this.onData(this.writer.text(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.cdata = function(value) {
-      var node;
-      this.openCurrent();
-      node = new XMLCData(this, value);
-      this.onData(this.writer.cdata(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.comment = function(value) {
-      var node;
-      this.openCurrent();
-      node = new XMLComment(this, value);
-      this.onData(this.writer.comment(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.raw = function(value) {
-      var node;
-      this.openCurrent();
-      node = new XMLRaw(this, value);
-      this.onData(this.writer.raw(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.instruction = function(target, value) {
-      var i, insTarget, insValue, len, node;
-      this.openCurrent();
-      if (target != null) {
-        target = target.valueOf();
-      }
-      if (value != null) {
-        value = value.valueOf();
-      }
-      if (Array.isArray(target)) {
-        for (i = 0, len = target.length; i < len; i++) {
-          insTarget = target[i];
-          this.instruction(insTarget);
-        }
-      } else if (isObject(target)) {
-        for (insTarget in target) {
-          if (!hasProp.call(target, insTarget)) continue;
-          insValue = target[insTarget];
-          this.instruction(insTarget, insValue);
-        }
-      } else {
-        if (isFunction(value)) {
-          value = value.apply();
-        }
-        node = new XMLProcessingInstruction(this, target, value);
-        this.onData(this.writer.processingInstruction(node, this.currentLevel + 1));
-      }
-      return this;
-    };
-
-    XMLDocumentCB.prototype.declaration = function(version, encoding, standalone) {
-      var node;
-      this.openCurrent();
-      if (this.documentStarted) {
-        throw new Error("declaration() must be the first node");
-      }
-      node = new XMLDeclaration(this, version, encoding, standalone);
-      this.onData(this.writer.declaration(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.doctype = function(root, pubID, sysID) {
-      this.openCurrent();
-      if (root == null) {
-        throw new Error("Missing root node name");
-      }
-      if (this.root) {
-        throw new Error("dtd() must come before the root node");
-      }
-      this.currentNode = new XMLDocType(this, pubID, sysID);
-      this.currentNode.rootNodeName = root;
-      this.currentNode.children = false;
-      this.currentLevel++;
-      this.openTags[this.currentLevel] = this.currentNode;
-      return this;
-    };
-
-    XMLDocumentCB.prototype.dtdElement = function(name, value) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDElement(this, name, value);
-      this.onData(this.writer.dtdElement(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.attList = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDAttList(this, elementName, attributeName, attributeType, defaultValueType, defaultValue);
-      this.onData(this.writer.dtdAttList(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.entity = function(name, value) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDEntity(this, false, name, value);
-      this.onData(this.writer.dtdEntity(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.pEntity = function(name, value) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDEntity(this, true, name, value);
-      this.onData(this.writer.dtdEntity(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.notation = function(name, value) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDNotation(this, name, value);
-      this.onData(this.writer.dtdNotation(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.up = function() {
-      if (this.currentLevel < 0) {
-        throw new Error("The document node has no parent");
-      }
-      if (this.currentNode) {
-        if (this.currentNode.children) {
-          this.closeNode(this.currentNode);
-        } else {
-          this.openNode(this.currentNode);
-        }
-        this.currentNode = null;
-      } else {
-        this.closeNode(this.openTags[this.currentLevel]);
-      }
-      delete this.openTags[this.currentLevel];
-      this.currentLevel--;
-      return this;
-    };
-
-    XMLDocumentCB.prototype.end = function() {
-      while (this.currentLevel >= 0) {
-        this.up();
-      }
-      return this.onEnd();
-    };
-
-    XMLDocumentCB.prototype.openCurrent = function() {
-      if (this.currentNode) {
-        this.currentNode.children = true;
-        return this.openNode(this.currentNode);
-      }
-    };
-
-    XMLDocumentCB.prototype.openNode = function(node) {
-      if (!node.isOpen) {
-        if (!this.root && this.currentLevel === 0 && node instanceof XMLElement) {
-          this.root = node;
-        }
-        this.onData(this.writer.openNode(node, this.currentLevel));
-        return node.isOpen = true;
-      }
-    };
-
-    XMLDocumentCB.prototype.closeNode = function(node) {
-      if (!node.isClosed) {
-        this.onData(this.writer.closeNode(node, this.currentLevel));
-        return node.isClosed = true;
-      }
-    };
-
-    XMLDocumentCB.prototype.onData = function(chunk) {
-      this.documentStarted = true;
-      return this.onDataCallback(chunk);
-    };
-
-    XMLDocumentCB.prototype.onEnd = function() {
-      this.documentCompleted = true;
-      return this.onEndCallback();
-    };
-
-    XMLDocumentCB.prototype.ele = function() {
-      return this.element.apply(this, arguments);
-    };
-
-    XMLDocumentCB.prototype.nod = function(name, attributes, text) {
-      return this.node(name, attributes, text);
-    };
-
-    XMLDocumentCB.prototype.txt = function(value) {
-      return this.text(value);
-    };
-
-    XMLDocumentCB.prototype.dat = function(value) {
-      return this.cdata(value);
-    };
-
-    XMLDocumentCB.prototype.com = function(value) {
-      return this.comment(value);
-    };
-
-    XMLDocumentCB.prototype.ins = function(target, value) {
-      return this.instruction(target, value);
-    };
-
-    XMLDocumentCB.prototype.dec = function(version, encoding, standalone) {
-      return this.declaration(version, encoding, standalone);
-    };
-
-    XMLDocumentCB.prototype.dtd = function(root, pubID, sysID) {
-      return this.doctype(root, pubID, sysID);
-    };
-
-    XMLDocumentCB.prototype.e = function(name, attributes, text) {
-      return this.element(name, attributes, text);
-    };
-
-    XMLDocumentCB.prototype.n = function(name, attributes, text) {
-      return this.node(name, attributes, text);
-    };
-
-    XMLDocumentCB.prototype.t = function(value) {
-      return this.text(value);
-    };
-
-    XMLDocumentCB.prototype.d = function(value) {
-      return this.cdata(value);
-    };
-
-    XMLDocumentCB.prototype.c = function(value) {
-      return this.comment(value);
-    };
-
-    XMLDocumentCB.prototype.r = function(value) {
-      return this.raw(value);
-    };
-
-    XMLDocumentCB.prototype.i = function(target, value) {
-      return this.instruction(target, value);
-    };
-
-    XMLDocumentCB.prototype.att = function() {
-      if (this.currentNode && this.currentNode instanceof XMLDocType) {
-        return this.attList.apply(this, arguments);
-      } else {
-        return this.attribute.apply(this, arguments);
-      }
-    };
-
-    XMLDocumentCB.prototype.a = function() {
-      if (this.currentNode && this.currentNode instanceof XMLDocType) {
-        return this.attList.apply(this, arguments);
-      } else {
-        return this.attribute.apply(this, arguments);
-      }
-    };
-
-    XMLDocumentCB.prototype.ent = function(name, value) {
-      return this.entity(name, value);
-    };
-
-    XMLDocumentCB.prototype.pent = function(name, value) {
-      return this.pEntity(name, value);
-    };
-
-    XMLDocumentCB.prototype.not = function(name, value) {
-      return this.notation(name, value);
-    };
-
-    return XMLDocumentCB;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
deleted file mode 100644
index bd1f46c9039..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLAttribute, XMLElement, XMLNode, isFunction, isObject, ref,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction;
-
-  XMLNode = require('./XMLNode');
-
-  XMLAttribute = require('./XMLAttribute');
-
-  module.exports = XMLElement = (function(superClass) {
-    extend(XMLElement, superClass);
-
-    function XMLElement(parent, name, attributes) {
-      XMLElement.__super__.constructor.call(this, parent);
-      if (name == null) {
-        throw new Error("Missing element name");
-      }
-      this.name = this.stringify.eleName(name);
-      this.attributes = {};
-      if (attributes != null) {
-        this.attribute(attributes);
-      }
-      if (parent.isDocument) {
-        this.isRoot = true;
-        this.documentObject = parent;
-        parent.rootObject = this;
-      }
-    }
-
-    XMLElement.prototype.clone = function() {
-      var att, attName, clonedSelf, ref1;
-      clonedSelf = Object.create(this);
-      if (clonedSelf.isRoot) {
-        clonedSelf.documentObject = null;
-      }
-      clonedSelf.attributes = {};
-      ref1 = this.attributes;
-      for (attName in ref1) {
-        if (!hasProp.call(ref1, attName)) continue;
-        att = ref1[attName];
-        clonedSelf.attributes[attName] = att.clone();
-      }
-      clonedSelf.children = [];
-      this.children.forEach(function(child) {
-        var clonedChild;
-        clonedChild = child.clone();
-        clonedChild.parent = clonedSelf;
-        return clonedSelf.children.push(clonedChild);
-      });
-      return clonedSelf;
-    };
-
-    XMLElement.prototype.attribute = function(name, value) {
-      var attName, attValue;
-      if (name != null) {
-        name = name.valueOf();
-      }
-      if (isObject(name)) {
-        for (attName in name) {
-          if (!hasProp.call(name, attName)) continue;
-          attValue = name[attName];
-          this.attribute(attName, attValue);
-        }
-      } else {
-        if (isFunction(value)) {
-          value = value.apply();
-        }
-        if (!this.options.skipNullAttributes || (value != null)) {
-          this.attributes[name] = new XMLAttribute(this, name, value);
-        }
-      }
-      return this;
-    };
-
-    XMLElement.prototype.removeAttribute = function(name) {
-      var attName, i, len;
-      if (name == null) {
-        throw new Error("Missing attribute name");
-      }
-      name = name.valueOf();
-      if (Array.isArray(name)) {
-        for (i = 0, len = name.length; i < len; i++) {
-          attName = name[i];
-          delete this.attributes[attName];
-        }
-      } else {
-        delete this.attributes[name];
-      }
-      return this;
-    };
-
-    XMLElement.prototype.toString = function(options) {
-      return this.options.writer.set(options).element(this);
-    };
-
-    XMLElement.prototype.att = function(name, value) {
-      return this.attribute(name, value);
-    };
-
-    XMLElement.prototype.a = function(name, value) {
-      return this.attribute(name, value);
-    };
-
-    return XMLElement;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
deleted file mode 100644
index 00ab37d7fd5..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
+++ /dev/null
@@ -1,432 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLCData, XMLComment, XMLDeclaration, XMLDocType, XMLElement, XMLNode, XMLProcessingInstruction, XMLRaw, XMLText, isEmpty, isFunction, isObject, ref,
-    hasProp = {}.hasOwnProperty;
-
-  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction, isEmpty = ref.isEmpty;
-
-  XMLElement = null;
-
-  XMLCData = null;
-
-  XMLComment = null;
-
-  XMLDeclaration = null;
-
-  XMLDocType = null;
-
-  XMLRaw = null;
-
-  XMLText = null;
-
-  XMLProcessingInstruction = null;
-
-  module.exports = XMLNode = (function() {
-    function XMLNode(parent) {
-      this.parent = parent;
-      if (this.parent) {
-        this.options = this.parent.options;
-        this.stringify = this.parent.stringify;
-      }
-      this.children = [];
-      if (!XMLElement) {
-        XMLElement = require('./XMLElement');
-        XMLCData = require('./XMLCData');
-        XMLComment = require('./XMLComment');
-        XMLDeclaration = require('./XMLDeclaration');
-        XMLDocType = require('./XMLDocType');
-        XMLRaw = require('./XMLRaw');
-        XMLText = require('./XMLText');
-        XMLProcessingInstruction = require('./XMLProcessingInstruction');
-      }
-    }
-
-    XMLNode.prototype.element = function(name, attributes, text) {
-      var childNode, item, j, k, key, lastChild, len, len1, ref1, val;
-      lastChild = null;
-      if (attributes == null) {
-        attributes = {};
-      }
-      attributes = attributes.valueOf();
-      if (!isObject(attributes)) {
-        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
-      }
-      if (name != null) {
-        name = name.valueOf();
-      }
-      if (Array.isArray(name)) {
-        for (j = 0, len = name.length; j < len; j++) {
-          item = name[j];
-          lastChild = this.element(item);
-        }
-      } else if (isFunction(name)) {
-        lastChild = this.element(name.apply());
-      } else if (isObject(name)) {
-        for (key in name) {
-          if (!hasProp.call(name, key)) continue;
-          val = name[key];
-          if (isFunction(val)) {
-            val = val.apply();
-          }
-          if ((isObject(val)) && (isEmpty(val))) {
-            val = null;
-          }
-          if (!this.options.ignoreDecorators && this.stringify.convertAttKey && key.indexOf(this.stringify.convertAttKey) === 0) {
-            lastChild = this.attribute(key.substr(this.stringify.convertAttKey.length), val);
-          } else if (!this.options.separateArrayItems && Array.isArray(val)) {
-            for (k = 0, len1 = val.length; k < len1; k++) {
-              item = val[k];
-              childNode = {};
-              childNode[key] = item;
-              lastChild = this.element(childNode);
-            }
-          } else if (isObject(val)) {
-            lastChild = this.element(key);
-            lastChild.element(val);
-          } else {
-            lastChild = this.element(key, val);
-          }
-        }
-      } else {
-        if (!this.options.ignoreDecorators && this.stringify.convertTextKey && name.indexOf(this.stringify.convertTextKey) === 0) {
-          lastChild = this.text(text);
-        } else if (!this.options.ignoreDecorators && this.stringify.convertCDataKey && name.indexOf(this.stringify.convertCDataKey) === 0) {
-          lastChild = this.cdata(text);
-        } else if (!this.options.ignoreDecorators && this.stringify.convertCommentKey && name.indexOf(this.stringify.convertCommentKey) === 0) {
-          lastChild = this.comment(text);
-        } else if (!this.options.ignoreDecorators && this.stringify.convertRawKey && name.indexOf(this.stringify.convertRawKey) === 0) {
-          lastChild = this.raw(text);
-        } else if (!this.options.ignoreDecorators && this.stringify.convertPIKey && name.indexOf(this.stringify.convertPIKey) === 0) {
-          lastChild = this.instruction(name.substr(this.stringify.convertPIKey.length), text);
-        } else {
-          lastChild = this.node(name, attributes, text);
-        }
-      }
-      if (lastChild == null) {
-        throw new Error("Could not create any elements with: " + name);
-      }
-      return lastChild;
-    };
-
-    XMLNode.prototype.insertBefore = function(name, attributes, text) {
-      var child, i, removed;
-      if (this.isRoot) {
-        throw new Error("Cannot insert elements at root level");
-      }
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i);
-      child = this.parent.element(name, attributes, text);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return child;
-    };
-
-    XMLNode.prototype.insertAfter = function(name, attributes, text) {
-      var child, i, removed;
-      if (this.isRoot) {
-        throw new Error("Cannot insert elements at root level");
-      }
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i + 1);
-      child = this.parent.element(name, attributes, text);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return child;
-    };
-
-    XMLNode.prototype.remove = function() {
-      var i, ref1;
-      if (this.isRoot) {
-        throw new Error("Cannot remove the root element");
-      }
-      i = this.parent.children.indexOf(this);
-      [].splice.apply(this.parent.children, [i, i - i + 1].concat(ref1 = [])), ref1;
-      return this.parent;
-    };
-
-    XMLNode.prototype.node = function(name, attributes, text) {
-      var child, ref1;
-      if (name != null) {
-        name = name.valueOf();
-      }
-      attributes || (attributes = {});
-      attributes = attributes.valueOf();
-      if (!isObject(attributes)) {
-        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
-      }
-      child = new XMLElement(this, name, attributes);
-      if (text != null) {
-        child.text(text);
-      }
-      this.children.push(child);
-      return child;
-    };
-
-    XMLNode.prototype.text = function(value) {
-      var child;
-      child = new XMLText(this, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLNode.prototype.cdata = function(value) {
-      var child;
-      child = new XMLCData(this, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLNode.prototype.comment = function(value) {
-      var child;
-      child = new XMLComment(this, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLNode.prototype.commentBefore = function(value) {
-      var child, i, removed;
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i);
-      child = this.parent.comment(value);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return this;
-    };
-
-    XMLNode.prototype.commentAfter = function(value) {
-      var child, i, removed;
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i + 1);
-      child = this.parent.comment(value);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return this;
-    };
-
-    XMLNode.prototype.raw = function(value) {
-      var child;
-      child = new XMLRaw(this, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLNode.prototype.instruction = function(target, value) {
-      var insTarget, insValue, instruction, j, len;
-      if (target != null) {
-        target = target.valueOf();
-      }
-      if (value != null) {
-        value = value.valueOf();
-      }
-      if (Array.isArray(target)) {
-        for (j = 0, len = target.length; j < len; j++) {
-          insTarget = target[j];
-          this.instruction(insTarget);
-        }
-      } else if (isObject(target)) {
-        for (insTarget in target) {
-          if (!hasProp.call(target, insTarget)) continue;
-          insValue = target[insTarget];
-          this.instruction(insTarget, insValue);
-        }
-      } else {
-        if (isFunction(value)) {
-          value = value.apply();
-        }
-        instruction = new XMLProcessingInstruction(this, target, value);
-        this.children.push(instruction);
-      }
-      return this;
-    };
-
-    XMLNode.prototype.instructionBefore = function(target, value) {
-      var child, i, removed;
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i);
-      child = this.parent.instruction(target, value);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return this;
-    };
-
-    XMLNode.prototype.instructionAfter = function(target, value) {
-      var child, i, removed;
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i + 1);
-      child = this.parent.instruction(target, value);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return this;
-    };
-
-    XMLNode.prototype.declaration = function(version, encoding, standalone) {
-      var doc, xmldec;
-      doc = this.document();
-      xmldec = new XMLDeclaration(doc, version, encoding, standalone);
-      if (doc.children[0] instanceof XMLDeclaration) {
-        doc.children[0] = xmldec;
-      } else {
-        doc.children.unshift(xmldec);
-      }
-      return doc.root() || doc;
-    };
-
-    XMLNode.prototype.doctype = function(pubID, sysID) {
-      var child, doc, doctype, i, j, k, len, len1, ref1, ref2;
-      doc = this.document();
-      doctype = new XMLDocType(doc, pubID, sysID);
-      ref1 = doc.children;
-      for (i = j = 0, len = ref1.length; j < len; i = ++j) {
-        child = ref1[i];
-        if (child instanceof XMLDocType) {
-          doc.children[i] = doctype;
-          return doctype;
-        }
-      }
-      ref2 = doc.children;
-      for (i = k = 0, len1 = ref2.length; k < len1; i = ++k) {
-        child = ref2[i];
-        if (child.isRoot) {
-          doc.children.splice(i, 0, doctype);
-          return doctype;
-        }
-      }
-      doc.children.push(doctype);
-      return doctype;
-    };
-
-    XMLNode.prototype.up = function() {
-      if (this.isRoot) {
-        throw new Error("The root node has no parent. Use doc() if you need to get the document object.");
-      }
-      return this.parent;
-    };
-
-    XMLNode.prototype.root = function() {
-      var node;
-      node = this;
-      while (node) {
-        if (node.isDocument) {
-          return node.rootObject;
-        } else if (node.isRoot) {
-          return node;
-        } else {
-          node = node.parent;
-        }
-      }
-    };
-
-    XMLNode.prototype.document = function() {
-      var node;
-      node = this;
-      while (node) {
-        if (node.isDocument) {
-          return node;
-        } else {
-          node = node.parent;
-        }
-      }
-    };
-
-    XMLNode.prototype.end = function(options) {
-      return this.document().end(options);
-    };
-
-    XMLNode.prototype.prev = function() {
-      var i;
-      i = this.parent.children.indexOf(this);
-      if (i < 1) {
-        throw new Error("Already at the first node");
-      }
-      return this.parent.children[i - 1];
-    };
-
-    XMLNode.prototype.next = function() {
-      var i;
-      i = this.parent.children.indexOf(this);
-      if (i === -1 || i === this.parent.children.length - 1) {
-        throw new Error("Already at the last node");
-      }
-      return this.parent.children[i + 1];
-    };
-
-    XMLNode.prototype.importDocument = function(doc) {
-      var clonedRoot;
-      clonedRoot = doc.root().clone();
-      clonedRoot.parent = this;
-      clonedRoot.isRoot = false;
-      this.children.push(clonedRoot);
-      return this;
-    };
-
-    XMLNode.prototype.ele = function(name, attributes, text) {
-      return this.element(name, attributes, text);
-    };
-
-    XMLNode.prototype.nod = function(name, attributes, text) {
-      return this.node(name, attributes, text);
-    };
-
-    XMLNode.prototype.txt = function(value) {
-      return this.text(value);
-    };
-
-    XMLNode.prototype.dat = function(value) {
-      return this.cdata(value);
-    };
-
-    XMLNode.prototype.com = function(value) {
-      return this.comment(value);
-    };
-
-    XMLNode.prototype.ins = function(target, value) {
-      return this.instruction(target, value);
-    };
-
-    XMLNode.prototype.doc = function() {
-      return this.document();
-    };
-
-    XMLNode.prototype.dec = function(version, encoding, standalone) {
-      return this.declaration(version, encoding, standalone);
-    };
-
-    XMLNode.prototype.dtd = function(pubID, sysID) {
-      return this.doctype(pubID, sysID);
-    };
-
-    XMLNode.prototype.e = function(name, attributes, text) {
-      return this.element(name, attributes, text);
-    };
-
-    XMLNode.prototype.n = function(name, attributes, text) {
-      return this.node(name, attributes, text);
-    };
-
-    XMLNode.prototype.t = function(value) {
-      return this.text(value);
-    };
-
-    XMLNode.prototype.d = function(value) {
-      return this.cdata(value);
-    };
-
-    XMLNode.prototype.c = function(value) {
-      return this.comment(value);
-    };
-
-    XMLNode.prototype.r = function(value) {
-      return this.raw(value);
-    };
-
-    XMLNode.prototype.i = function(target, value) {
-      return this.instruction(target, value);
-    };
-
-    XMLNode.prototype.u = function() {
-      return this.up();
-    };
-
-    XMLNode.prototype.importXMLBuilder = function(doc) {
-      return this.importDocument(doc);
-    };
-
-    return XMLNode;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
deleted file mode 100644
index e6f71d15311..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLNode, XMLProcessingInstruction,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLProcessingInstruction = (function(superClass) {
-    extend(XMLProcessingInstruction, superClass);
-
-    function XMLProcessingInstruction(parent, target, value) {
-      XMLProcessingInstruction.__super__.constructor.call(this, parent);
-      if (target == null) {
-        throw new Error("Missing instruction target");
-      }
-      this.target = this.stringify.insTarget(target);
-      if (value) {
-        this.value = this.stringify.insValue(value);
-      }
-    }
-
-    XMLProcessingInstruction.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLProcessingInstruction.prototype.toString = function(options) {
-      return this.options.writer.set(options).processingInstruction(this);
-    };
-
-    return XMLProcessingInstruction;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
deleted file mode 100644
index dbe7fdcd42a..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLNode, XMLRaw,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLRaw = (function(superClass) {
-    extend(XMLRaw, superClass);
-
-    function XMLRaw(parent, text) {
-      XMLRaw.__super__.constructor.call(this, parent);
-      if (text == null) {
-        throw new Error("Missing raw text");
-      }
-      this.value = this.stringify.raw(text);
-    }
-
-    XMLRaw.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLRaw.prototype.toString = function(options) {
-      return this.options.writer.set(options).raw(this);
-    };
-
-    return XMLRaw;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
deleted file mode 100644
index 20d98eed6f7..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
+++ /dev/null
@@ -1,279 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStreamWriter, XMLText, XMLWriterBase,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLDeclaration = require('./XMLDeclaration');
-
-  XMLDocType = require('./XMLDocType');
-
-  XMLCData = require('./XMLCData');
-
-  XMLComment = require('./XMLComment');
-
-  XMLElement = require('./XMLElement');
-
-  XMLRaw = require('./XMLRaw');
-
-  XMLText = require('./XMLText');
-
-  XMLProcessingInstruction = require('./XMLProcessingInstruction');
-
-  XMLDTDAttList = require('./XMLDTDAttList');
-
-  XMLDTDElement = require('./XMLDTDElement');
-
-  XMLDTDEntity = require('./XMLDTDEntity');
-
-  XMLDTDNotation = require('./XMLDTDNotation');
-
-  XMLWriterBase = require('./XMLWriterBase');
-
-  module.exports = XMLStreamWriter = (function(superClass) {
-    extend(XMLStreamWriter, superClass);
-
-    function XMLStreamWriter(stream, options) {
-      XMLStreamWriter.__super__.constructor.call(this, options);
-      this.stream = stream;
-    }
-
-    XMLStreamWriter.prototype.document = function(doc) {
-      var child, i, j, len, len1, ref, ref1, results;
-      ref = doc.children;
-      for (i = 0, len = ref.length; i < len; i++) {
-        child = ref[i];
-        child.isLastRootNode = false;
-      }
-      doc.children[doc.children.length - 1].isLastRootNode = true;
-      ref1 = doc.children;
-      results = [];
-      for (j = 0, len1 = ref1.length; j < len1; j++) {
-        child = ref1[j];
-        switch (false) {
-          case !(child instanceof XMLDeclaration):
-            results.push(this.declaration(child));
-            break;
-          case !(child instanceof XMLDocType):
-            results.push(this.docType(child));
-            break;
-          case !(child instanceof XMLComment):
-            results.push(this.comment(child));
-            break;
-          case !(child instanceof XMLProcessingInstruction):
-            results.push(this.processingInstruction(child));
-            break;
-          default:
-            results.push(this.element(child));
-        }
-      }
-      return results;
-    };
-
-    XMLStreamWriter.prototype.attribute = function(att) {
-      return this.stream.write(' ' + att.name + '="' + att.value + '"');
-    };
-
-    XMLStreamWriter.prototype.cdata = function(node, level) {
-      return this.stream.write(this.space(level) + '<![CDATA[' + node.text + ']]>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.comment = function(node, level) {
-      return this.stream.write(this.space(level) + '<!-- ' + node.text + ' -->' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.declaration = function(node, level) {
-      this.stream.write(this.space(level));
-      this.stream.write('<?xml version="' + node.version + '"');
-      if (node.encoding != null) {
-        this.stream.write(' encoding="' + node.encoding + '"');
-      }
-      if (node.standalone != null) {
-        this.stream.write(' standalone="' + node.standalone + '"');
-      }
-      this.stream.write(this.spacebeforeslash + '?>');
-      return this.stream.write(this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.docType = function(node, level) {
-      var child, i, len, ref;
-      level || (level = 0);
-      this.stream.write(this.space(level));
-      this.stream.write('<!DOCTYPE ' + node.root().name);
-      if (node.pubID && node.sysID) {
-        this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
-      } else if (node.sysID) {
-        this.stream.write(' SYSTEM "' + node.sysID + '"');
-      }
-      if (node.children.length > 0) {
-        this.stream.write(' [');
-        this.stream.write(this.endline(node));
-        ref = node.children;
-        for (i = 0, len = ref.length; i < len; i++) {
-          child = ref[i];
-          switch (false) {
-            case !(child instanceof XMLDTDAttList):
-              this.dtdAttList(child, level + 1);
-              break;
-            case !(child instanceof XMLDTDElement):
-              this.dtdElement(child, level + 1);
-              break;
-            case !(child instanceof XMLDTDEntity):
-              this.dtdEntity(child, level + 1);
-              break;
-            case !(child instanceof XMLDTDNotation):
-              this.dtdNotation(child, level + 1);
-              break;
-            case !(child instanceof XMLCData):
-              this.cdata(child, level + 1);
-              break;
-            case !(child instanceof XMLComment):
-              this.comment(child, level + 1);
-              break;
-            case !(child instanceof XMLProcessingInstruction):
-              this.processingInstruction(child, level + 1);
-              break;
-            default:
-              throw new Error("Unknown DTD node type: " + child.constructor.name);
-          }
-        }
-        this.stream.write(']');
-      }
-      this.stream.write(this.spacebeforeslash + '>');
-      return this.stream.write(this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.element = function(node, level) {
-      var att, child, i, len, name, ref, ref1, space;
-      level || (level = 0);
-      space = this.space(level);
-      this.stream.write(space + '<' + node.name);
-      ref = node.attributes;
-      for (name in ref) {
-        if (!hasProp.call(ref, name)) continue;
-        att = ref[name];
-        this.attribute(att);
-      }
-      if (node.children.length === 0 || node.children.every(function(e) {
-        return e.value === '';
-      })) {
-        if (this.allowEmpty) {
-          this.stream.write('></' + node.name + '>');
-        } else {
-          this.stream.write(this.spacebeforeslash + '/>');
-        }
-      } else if (this.pretty && node.children.length === 1 && (node.children[0].value != null)) {
-        this.stream.write('>');
-        this.stream.write(node.children[0].value);
-        this.stream.write('</' + node.name + '>');
-      } else {
-        this.stream.write('>' + this.newline);
-        ref1 = node.children;
-        for (i = 0, len = ref1.length; i < len; i++) {
-          child = ref1[i];
-          switch (false) {
-            case !(child instanceof XMLCData):
-              this.cdata(child, level + 1);
-              break;
-            case !(child instanceof XMLComment):
-              this.comment(child, level + 1);
-              break;
-            case !(child instanceof XMLElement):
-              this.element(child, level + 1);
-              break;
-            case !(child instanceof XMLRaw):
-              this.raw(child, level + 1);
-              break;
-            case !(child instanceof XMLText):
-              this.text(child, level + 1);
-              break;
-            case !(child instanceof XMLProcessingInstruction):
-              this.processingInstruction(child, level + 1);
-              break;
-            default:
-              throw new Error("Unknown XML node type: " + child.constructor.name);
-          }
-        }
-        this.stream.write(space + '</' + node.name + '>');
-      }
-      return this.stream.write(this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.processingInstruction = function(node, level) {
-      this.stream.write(this.space(level) + '<?' + node.target);
-      if (node.value) {
-        this.stream.write(' ' + node.value);
-      }
-      return this.stream.write(this.spacebeforeslash + '?>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.raw = function(node, level) {
-      return this.stream.write(this.space(level) + node.value + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.text = function(node, level) {
-      return this.stream.write(this.space(level) + node.value + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.dtdAttList = function(node, level) {
-      this.stream.write(this.space(level) + '<!ATTLIST ' + node.elementName + ' ' + node.attributeName + ' ' + node.attributeType);
-      if (node.defaultValueType !== '#DEFAULT') {
-        this.stream.write(' ' + node.defaultValueType);
-      }
-      if (node.defaultValue) {
-        this.stream.write(' "' + node.defaultValue + '"');
-      }
-      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.dtdElement = function(node, level) {
-      this.stream.write(this.space(level) + '<!ELEMENT ' + node.name + ' ' + node.value);
-      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.dtdEntity = function(node, level) {
-      this.stream.write(this.space(level) + '<!ENTITY');
-      if (node.pe) {
-        this.stream.write(' %');
-      }
-      this.stream.write(' ' + node.name);
-      if (node.value) {
-        this.stream.write(' "' + node.value + '"');
-      } else {
-        if (node.pubID && node.sysID) {
-          this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
-        } else if (node.sysID) {
-          this.stream.write(' SYSTEM "' + node.sysID + '"');
-        }
-        if (node.nData) {
-          this.stream.write(' NDATA ' + node.nData);
-        }
-      }
-      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.dtdNotation = function(node, level) {
-      this.stream.write(this.space(level) + '<!NOTATION ' + node.name);
-      if (node.pubID && node.sysID) {
-        this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
-      } else if (node.pubID) {
-        this.stream.write(' PUBLIC "' + node.pubID + '"');
-      } else if (node.sysID) {
-        this.stream.write(' SYSTEM "' + node.sysID + '"');
-      }
-      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.endline = function(node) {
-      if (!node.isLastRootNode) {
-        return this.newline;
-      } else {
-        return '';
-      }
-    };
-
-    return XMLStreamWriter;
-
-  })(XMLWriterBase);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
deleted file mode 100644
index 49da759b409..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
+++ /dev/null
@@ -1,334 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStringWriter, XMLText, XMLWriterBase,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLDeclaration = require('./XMLDeclaration');
-
-  XMLDocType = require('./XMLDocType');
-
-  XMLCData = require('./XMLCData');
-
-  XMLComment = require('./XMLComment');
-
-  XMLElement = require('./XMLElement');
-
-  XMLRaw = require('./XMLRaw');
-
-  XMLText = require('./XMLText');
-
-  XMLProcessingInstruction = require('./XMLProcessingInstruction');
-
-  XMLDTDAttList = require('./XMLDTDAttList');
-
-  XMLDTDElement = require('./XMLDTDElement');
-
-  XMLDTDEntity = require('./XMLDTDEntity');
-
-  XMLDTDNotation = require('./XMLDTDNotation');
-
-  XMLWriterBase = require('./XMLWriterBase');
-
-  module.exports = XMLStringWriter = (function(superClass) {
-    extend(XMLStringWriter, superClass);
-
-    function XMLStringWriter(options) {
-      XMLStringWriter.__super__.constructor.call(this, options);
-    }
-
-    XMLStringWriter.prototype.document = function(doc) {
-      var child, i, len, r, ref;
-      this.textispresent = false;
-      r = '';
-      ref = doc.children;
-      for (i = 0, len = ref.length; i < len; i++) {
-        child = ref[i];
-        r += (function() {
-          switch (false) {
-            case !(child instanceof XMLDeclaration):
-              return this.declaration(child);
-            case !(child instanceof XMLDocType):
-              return this.docType(child);
-            case !(child instanceof XMLComment):
-              return this.comment(child);
-            case !(child instanceof XMLProcessingInstruction):
-              return this.processingInstruction(child);
-            default:
-              return this.element(child, 0);
-          }
-        }).call(this);
-      }
-      if (this.pretty && r.slice(-this.newline.length) === this.newline) {
-        r = r.slice(0, -this.newline.length);
-      }
-      return r;
-    };
-
-    XMLStringWriter.prototype.attribute = function(att) {
-      return ' ' + att.name + '="' + att.value + '"';
-    };
-
-    XMLStringWriter.prototype.cdata = function(node, level) {
-      return this.space(level) + '<![CDATA[' + node.text + ']]>' + this.newline;
-    };
-
-    XMLStringWriter.prototype.comment = function(node, level) {
-      return this.space(level) + '<!-- ' + node.text + ' -->' + this.newline;
-    };
-
-    XMLStringWriter.prototype.declaration = function(node, level) {
-      var r;
-      r = this.space(level);
-      r += '<?xml version="' + node.version + '"';
-      if (node.encoding != null) {
-        r += ' encoding="' + node.encoding + '"';
-      }
-      if (node.standalone != null) {
-        r += ' standalone="' + node.standalone + '"';
-      }
-      r += this.spacebeforeslash + '?>';
-      r += this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.docType = function(node, level) {
-      var child, i, len, r, ref;
-      level || (level = 0);
-      r = this.space(level);
-      r += '<!DOCTYPE ' + node.root().name;
-      if (node.pubID && node.sysID) {
-        r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
-      } else if (node.sysID) {
-        r += ' SYSTEM "' + node.sysID + '"';
-      }
-      if (node.children.length > 0) {
-        r += ' [';
-        r += this.newline;
-        ref = node.children;
-        for (i = 0, len = ref.length; i < len; i++) {
-          child = ref[i];
-          r += (function() {
-            switch (false) {
-              case !(child instanceof XMLDTDAttList):
-                return this.dtdAttList(child, level + 1);
-              case !(child instanceof XMLDTDElement):
-                return this.dtdElement(child, level + 1);
-              case !(child instanceof XMLDTDEntity):
-                return this.dtdEntity(child, level + 1);
-              case !(child instanceof XMLDTDNotation):
-                return this.dtdNotation(child, level + 1);
-              case !(child instanceof XMLCData):
-                return this.cdata(child, level + 1);
-              case !(child instanceof XMLComment):
-                return this.comment(child, level + 1);
-              case !(child instanceof XMLProcessingInstruction):
-                return this.processingInstruction(child, level + 1);
-              default:
-                throw new Error("Unknown DTD node type: " + child.constructor.name);
-            }
-          }).call(this);
-        }
-        r += ']';
-      }
-      r += this.spacebeforeslash + '>';
-      r += this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.element = function(node, level) {
-      var att, child, i, j, len, len1, name, r, ref, ref1, ref2, space, textispresentwasset;
-      level || (level = 0);
-      textispresentwasset = false;
-      if (this.textispresent) {
-        this.newline = '';
-        this.pretty = false;
-      } else {
-        this.newline = this.newlinedefault;
-        this.pretty = this.prettydefault;
-      }
-      space = this.space(level);
-      r = '';
-      r += space + '<' + node.name;
-      ref = node.attributes;
-      for (name in ref) {
-        if (!hasProp.call(ref, name)) continue;
-        att = ref[name];
-        r += this.attribute(att);
-      }
-      if (node.children.length === 0 || node.children.every(function(e) {
-        return e.value === '';
-      })) {
-        if (this.allowEmpty) {
-          r += '></' + node.name + '>' + this.newline;
-        } else {
-          r += this.spacebeforeslash + '/>' + this.newline;
-        }
-      } else if (this.pretty && node.children.length === 1 && (node.children[0].value != null)) {
-        r += '>';
-        r += node.children[0].value;
-        r += '</' + node.name + '>' + this.newline;
-      } else {
-        if (this.dontprettytextnodes) {
-          ref1 = node.children;
-          for (i = 0, len = ref1.length; i < len; i++) {
-            child = ref1[i];
-            if (child.value != null) {
-              this.textispresent++;
-              textispresentwasset = true;
-              break;
-            }
-          }
-        }
-        if (this.textispresent) {
-          this.newline = '';
-          this.pretty = false;
-          space = this.space(level);
-        }
-        r += '>' + this.newline;
-        ref2 = node.children;
-        for (j = 0, len1 = ref2.length; j < len1; j++) {
-          child = ref2[j];
-          r += (function() {
-            switch (false) {
-              case !(child instanceof XMLCData):
-                return this.cdata(child, level + 1);
-              case !(child instanceof XMLComment):
-                return this.comment(child, level + 1);
-              case !(child instanceof XMLElement):
-                return this.element(child, level + 1);
-              case !(child instanceof XMLRaw):
-                return this.raw(child, level + 1);
-              case !(child instanceof XMLText):
-                return this.text(child, level + 1);
-              case !(child instanceof XMLProcessingInstruction):
-                return this.processingInstruction(child, level + 1);
-              default:
-                throw new Error("Unknown XML node type: " + child.constructor.name);
-            }
-          }).call(this);
-        }
-        if (textispresentwasset) {
-          this.textispresent--;
-        }
-        if (!this.textispresent) {
-          this.newline = this.newlinedefault;
-          this.pretty = this.prettydefault;
-        }
-        r += space + '</' + node.name + '>' + this.newline;
-      }
-      return r;
-    };
-
-    XMLStringWriter.prototype.processingInstruction = function(node, level) {
-      var r;
-      r = this.space(level) + '<?' + node.target;
-      if (node.value) {
-        r += ' ' + node.value;
-      }
-      r += this.spacebeforeslash + '?>' + this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.raw = function(node, level) {
-      return this.space(level) + node.value + this.newline;
-    };
-
-    XMLStringWriter.prototype.text = function(node, level) {
-      return this.space(level) + node.value + this.newline;
-    };
-
-    XMLStringWriter.prototype.dtdAttList = function(node, level) {
-      var r;
-      r = this.space(level) + '<!ATTLIST ' + node.elementName + ' ' + node.attributeName + ' ' + node.attributeType;
-      if (node.defaultValueType !== '#DEFAULT') {
-        r += ' ' + node.defaultValueType;
-      }
-      if (node.defaultValue) {
-        r += ' "' + node.defaultValue + '"';
-      }
-      r += this.spacebeforeslash + '>' + this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.dtdElement = function(node, level) {
-      return this.space(level) + '<!ELEMENT ' + node.name + ' ' + node.value + this.spacebeforeslash + '>' + this.newline;
-    };
-
-    XMLStringWriter.prototype.dtdEntity = function(node, level) {
-      var r;
-      r = this.space(level) + '<!ENTITY';
-      if (node.pe) {
-        r += ' %';
-      }
-      r += ' ' + node.name;
-      if (node.value) {
-        r += ' "' + node.value + '"';
-      } else {
-        if (node.pubID && node.sysID) {
-          r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
-        } else if (node.sysID) {
-          r += ' SYSTEM "' + node.sysID + '"';
-        }
-        if (node.nData) {
-          r += ' NDATA ' + node.nData;
-        }
-      }
-      r += this.spacebeforeslash + '>' + this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.dtdNotation = function(node, level) {
-      var r;
-      r = this.space(level) + '<!NOTATION ' + node.name;
-      if (node.pubID && node.sysID) {
-        r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
-      } else if (node.pubID) {
-        r += ' PUBLIC "' + node.pubID + '"';
-      } else if (node.sysID) {
-        r += ' SYSTEM "' + node.sysID + '"';
-      }
-      r += this.spacebeforeslash + '>' + this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.openNode = function(node, level) {
-      var att, name, r, ref;
-      level || (level = 0);
-      if (node instanceof XMLElement) {
-        r = this.space(level) + '<' + node.name;
-        ref = node.attributes;
-        for (name in ref) {
-          if (!hasProp.call(ref, name)) continue;
-          att = ref[name];
-          r += this.attribute(att);
-        }
-        r += (node.children ? '>' : '/>') + this.newline;
-        return r;
-      } else {
-        r = this.space(level) + '<!DOCTYPE ' + node.rootNodeName;
-        if (node.pubID && node.sysID) {
-          r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
-        } else if (node.sysID) {
-          r += ' SYSTEM "' + node.sysID + '"';
-        }
-        r += (node.children ? ' [' : '>') + this.newline;
-        return r;
-      }
-    };
-
-    XMLStringWriter.prototype.closeNode = function(node, level) {
-      level || (level = 0);
-      switch (false) {
-        case !(node instanceof XMLElement):
-          return this.space(level) + '</' + node.name + '>' + this.newline;
-        case !(node instanceof XMLDocType):
-          return this.space(level) + ']>' + this.newline;
-      }
-    };
-
-    return XMLStringWriter;
-
-  })(XMLWriterBase);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
deleted file mode 100644
index c1844fb291d..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
+++ /dev/null
@@ -1,163 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLStringifier,
-    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
-    hasProp = {}.hasOwnProperty;
-
-  module.exports = XMLStringifier = (function() {
-    function XMLStringifier(options) {
-      this.assertLegalChar = bind(this.assertLegalChar, this);
-      var key, ref, value;
-      options || (options = {});
-      this.noDoubleEncoding = options.noDoubleEncoding;
-      ref = options.stringify || {};
-      for (key in ref) {
-        if (!hasProp.call(ref, key)) continue;
-        value = ref[key];
-        this[key] = value;
-      }
-    }
-
-    XMLStringifier.prototype.eleName = function(val) {
-      val = '' + val || '';
-      return this.assertLegalChar(val);
-    };
-
-    XMLStringifier.prototype.eleText = function(val) {
-      val = '' + val || '';
-      return this.assertLegalChar(this.elEscape(val));
-    };
-
-    XMLStringifier.prototype.cdata = function(val) {
-      val = '' + val || '';
-      val = val.replace(']]>', ']]]]><![CDATA[>');
-      return this.assertLegalChar(val);
-    };
-
-    XMLStringifier.prototype.comment = function(val) {
-      val = '' + val || '';
-      if (val.match(/--/)) {
-        throw new Error("Comment text cannot contain double-hypen: " + val);
-      }
-      return this.assertLegalChar(val);
-    };
-
-    XMLStringifier.prototype.raw = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.attName = function(val) {
-      return val = '' + val || '';
-    };
-
-    XMLStringifier.prototype.attValue = function(val) {
-      val = '' + val || '';
-      return this.attEscape(val);
-    };
-
-    XMLStringifier.prototype.insTarget = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.insValue = function(val) {
-      val = '' + val || '';
-      if (val.match(/\?>/)) {
-        throw new Error("Invalid processing instruction value: " + val);
-      }
-      return val;
-    };
-
-    XMLStringifier.prototype.xmlVersion = function(val) {
-      val = '' + val || '';
-      if (!val.match(/1\.[0-9]+/)) {
-        throw new Error("Invalid version number: " + val);
-      }
-      return val;
-    };
-
-    XMLStringifier.prototype.xmlEncoding = function(val) {
-      val = '' + val || '';
-      if (!val.match(/^[A-Za-z](?:[A-Za-z0-9._-])*$/)) {
-        throw new Error("Invalid encoding: " + val);
-      }
-      return val;
-    };
-
-    XMLStringifier.prototype.xmlStandalone = function(val) {
-      if (val) {
-        return "yes";
-      } else {
-        return "no";
-      }
-    };
-
-    XMLStringifier.prototype.dtdPubID = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdSysID = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdElementValue = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdAttType = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdAttDefault = function(val) {
-      if (val != null) {
-        return '' + val || '';
-      } else {
-        return val;
-      }
-    };
-
-    XMLStringifier.prototype.dtdEntityValue = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdNData = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.convertAttKey = '@';
-
-    XMLStringifier.prototype.convertPIKey = '?';
-
-    XMLStringifier.prototype.convertTextKey = '#text';
-
-    XMLStringifier.prototype.convertCDataKey = '#cdata';
-
-    XMLStringifier.prototype.convertCommentKey = '#comment';
-
-    XMLStringifier.prototype.convertRawKey = '#raw';
-
-    XMLStringifier.prototype.assertLegalChar = function(str) {
-      var res;
-      res = str.match(/[\0\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/);
-      if (res) {
-        throw new Error("Invalid character in string: " + str + " at index " + res.index);
-      }
-      return str;
-    };
-
-    XMLStringifier.prototype.elEscape = function(str) {
-      var ampregex;
-      ampregex = this.noDoubleEncoding ? /(?!&\S+;)&/g : /&/g;
-      return str.replace(ampregex, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\r/g, '&#xD;');
-    };
-
-    XMLStringifier.prototype.attEscape = function(str) {
-      var ampregex;
-      ampregex = this.noDoubleEncoding ? /(?!&\S+;)&/g : /&/g;
-      return str.replace(ampregex, '&amp;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/\t/g, '&#x9;').replace(/\n/g, '&#xA;').replace(/\r/g, '&#xD;');
-    };
-
-    return XMLStringifier;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
deleted file mode 100644
index 0ecceb36c6e..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLNode, XMLText,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLText = (function(superClass) {
-    extend(XMLText, superClass);
-
-    function XMLText(parent, text) {
-      XMLText.__super__.constructor.call(this, parent);
-      if (text == null) {
-        throw new Error("Missing element text");
-      }
-      this.value = this.stringify.eleText(text);
-    }
-
-    XMLText.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLText.prototype.toString = function(options) {
-      return this.options.writer.set(options).text(this);
-    };
-
-    return XMLText;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
deleted file mode 100644
index dfa51d8efb3..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLWriterBase,
-    hasProp = {}.hasOwnProperty;
-
-  module.exports = XMLWriterBase = (function() {
-    function XMLWriterBase(options) {
-      var key, ref, ref1, ref2, ref3, ref4, ref5, ref6, value;
-      options || (options = {});
-      this.pretty = options.pretty || false;
-      this.allowEmpty = (ref = options.allowEmpty) != null ? ref : false;
-      if (this.pretty) {
-        this.indent = (ref1 = options.indent) != null ? ref1 : '  ';
-        this.newline = (ref2 = options.newline) != null ? ref2 : '\n';
-        this.offset = (ref3 = options.offset) != null ? ref3 : 0;
-        this.dontprettytextnodes = (ref4 = options.dontprettytextnodes) != null ? ref4 : 0;
-      } else {
-        this.indent = '';
-        this.newline = '';
-        this.offset = 0;
-        this.dontprettytextnodes = 0;
-      }
-      this.spacebeforeslash = (ref5 = options.spacebeforeslash) != null ? ref5 : '';
-      if (this.spacebeforeslash === true) {
-        this.spacebeforeslash = ' ';
-      }
-      this.newlinedefault = this.newline;
-      this.prettydefault = this.pretty;
-      ref6 = options.writer || {};
-      for (key in ref6) {
-        if (!hasProp.call(ref6, key)) continue;
-        value = ref6[key];
-        this[key] = value;
-      }
-    }
-
-    XMLWriterBase.prototype.set = function(options) {
-      var key, ref, value;
-      options || (options = {});
-      if ("pretty" in options) {
-        this.pretty = options.pretty;
-      }
-      if ("allowEmpty" in options) {
-        this.allowEmpty = options.allowEmpty;
-      }
-      if (this.pretty) {
-        this.indent = "indent" in options ? options.indent : '  ';
-        this.newline = "newline" in options ? options.newline : '\n';
-        this.offset = "offset" in options ? options.offset : 0;
-        this.dontprettytextnodes = "dontprettytextnodes" in options ? options.dontprettytextnodes : 0;
-      } else {
-        this.indent = '';
-        this.newline = '';
-        this.offset = 0;
-        this.dontprettytextnodes = 0;
-      }
-      this.spacebeforeslash = "spacebeforeslash" in options ? options.spacebeforeslash : '';
-      if (this.spacebeforeslash === true) {
-        this.spacebeforeslash = ' ';
-      }
-      this.newlinedefault = this.newline;
-      this.prettydefault = this.pretty;
-      ref = options.writer || {};
-      for (key in ref) {
-        if (!hasProp.call(ref, key)) continue;
-        value = ref[key];
-        this[key] = value;
-      }
-      return this;
-    };
-
-    XMLWriterBase.prototype.space = function(level) {
-      var indent;
-      if (this.pretty) {
-        indent = (level || 0) + this.offset + 1;
-        if (indent > 0) {
-          return new Array(indent).join(this.indent);
-        } else {
-          return '';
-        }
-      } else {
-        return '';
-      }
-    };
-
-    return XMLWriterBase;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/index.js b/scripts/metrics/node_modules/xmlbuilder/lib/index.js
deleted file mode 100644
index d2a1dc16fd1..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDocument, XMLDocumentCB, XMLStreamWriter, XMLStringWriter, assign, isFunction, ref;
-
-  ref = require('./Utility'), assign = ref.assign, isFunction = ref.isFunction;
-
-  XMLDocument = require('./XMLDocument');
-
-  XMLDocumentCB = require('./XMLDocumentCB');
-
-  XMLStringWriter = require('./XMLStringWriter');
-
-  XMLStreamWriter = require('./XMLStreamWriter');
-
-  module.exports.create = function(name, xmldec, doctype, options) {
-    var doc, root;
-    if (name == null) {
-      throw new Error("Root element needs a name");
-    }
-    options = assign({}, xmldec, doctype, options);
-    doc = new XMLDocument(options);
-    root = doc.element(name);
-    if (!options.headless) {
-      doc.declaration(options);
-      if ((options.pubID != null) || (options.sysID != null)) {
-        doc.doctype(options);
-      }
-    }
-    return root;
-  };
-
-  module.exports.begin = function(options, onData, onEnd) {
-    var ref1;
-    if (isFunction(options)) {
-      ref1 = [options, onData], onData = ref1[0], onEnd = ref1[1];
-      options = {};
-    }
-    if (onData) {
-      return new XMLDocumentCB(options, onData, onEnd);
-    } else {
-      return new XMLDocument(options);
-    }
-  };
-
-  module.exports.stringWriter = function(options) {
-    return new XMLStringWriter(options);
-  };
-
-  module.exports.streamWriter = function(stream, options) {
-    return new XMLStreamWriter(stream, options);
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/package.json b/scripts/metrics/node_modules/xmlbuilder/package.json
deleted file mode 100644
index d4fca7ded0c..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/package.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "_from": "xmlbuilder@~9.0.1",
-  "_id": "xmlbuilder@9.0.7",
-  "_inBundle": false,
-  "_integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
-  "_location": "/xmlbuilder",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "xmlbuilder@~9.0.1",
-    "name": "xmlbuilder",
-    "escapedName": "xmlbuilder",
-    "rawSpec": "~9.0.1",
-    "saveSpec": null,
-    "fetchSpec": "~9.0.1"
-  },
-  "_requiredBy": [
-    "/xml2js"
-  ],
-  "_resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-  "_shasum": "132ee63d2ec5565c557e20f4c22df9aca686b10d",
-  "_spec": "xmlbuilder@~9.0.1",
-  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics/node_modules/xml2js",
-  "author": {
-    "name": "Ozgur Ozcitak",
-    "email": "oozcitak@gmail.com"
-  },
-  "bugs": {
-    "url": "http://github.com/oozcitak/xmlbuilder-js/issues"
-  },
-  "bundleDependencies": false,
-  "contributors": [],
-  "dependencies": {},
-  "deprecated": false,
-  "description": "An XML builder for node.js",
-  "devDependencies": {
-    "coffee-coverage": "2.*",
-    "coffeescript": "1.*",
-    "coveralls": "*",
-    "istanbul": "*",
-    "mocha": "*"
-  },
-  "engines": {
-    "node": ">=4.0"
-  },
-  "homepage": "http://github.com/oozcitak/xmlbuilder-js",
-  "keywords": [
-    "xml",
-    "xmlbuilder"
-  ],
-  "license": "MIT",
-  "main": "./lib/index",
-  "name": "xmlbuilder",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/oozcitak/xmlbuilder-js.git"
-  },
-  "scripts": {
-    "postpublish": "rm -rf lib",
-    "prepublish": "coffee -co lib src",
-    "test": "mocha \"test/**/*.coffee\" && istanbul report text lcov"
-  },
-  "version": "9.0.7"
-}
diff --git a/scripts/metrics/package-lock.json b/scripts/metrics/package-lock.json
deleted file mode 100644
index 6b58b61ebe9..00000000000
--- a/scripts/metrics/package-lock.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "node-fetch": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz",
-      "integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw=="
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "xml2js": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-      "requires": {
-        "sax": "1.2.4",
-        "xmlbuilder": "9.0.7"
-      }
-    },
-    "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
-    }
-  }
-}
diff --git a/scripts/metrics/test-metrics.js b/scripts/metrics/test-metrics.js
deleted file mode 100755
index 823a2e10b49..00000000000
--- a/scripts/metrics/test-metrics.js
+++ /dev/null
@@ -1,421 +0,0 @@
-#!/usr/bin/env node
-/* includes */
-const execSync = require('child_process').execSync; // run shell commands
-const fetch = require('node-fetch'); // downloading
-const fs = require('fs'); // file stream
-const XML = require('xml2js'); // parse xml
-
-/* globals */
-const buildkiteAccessToken = `?access_token=${process.env.BUILDKITE_API_KEY}`; // import buildkite access token from environment
-const debug = (process.env.DEBUG === 'true') ? true : false;
-let errorCount = 0; // count number of jobs which caused an error
-const EXIT_SUCCESS = 0;
-const inBuildkite = (process.env.BUILDKITE === 'true') ? true : false;
-const outputFile = 'test-metrics.json';
-const pipelineWhitelist = // the pipelines for which we run diagnostics
-[
-    'eosio',
-    'eosio-lrt'
-];
-
-/* functions */
-// given a url string, download a text document
-async function download(url)
-{
-    if (debug) console.log(`download(${url.replace(buildkiteAccessToken, '')})`); // DEBUG
-    const httpResponse = await fetch(url);
-    const body = await httpResponse.text();
-    if (isNullOrEmpty(body))
-    {
-        console.log(`ERROR: URL returned nothing! URL: ${url.replace(buildkiteAccessToken, '')}`);
-        const error =
-        {
-            http: { body, response: httpResponse, url},
-            message: 'http body is null or empty',
-            origin: 'download()',
-        }
-        throw error;
-    }
-    if (debug) console.log('Download complete.'); // DEBUG
-    return body;
-}
-
-// given a pipeline and a build number, get a build object
-async function getBuild(pipeline, buildNumber)
-{
-    if (debug) console.log(`getBuild(${pipeline}, ${buildNumber})`); // DEBUG
-    const httpResponse = await fetch(`https://api.buildkite.com/v2/organizations/EOSIO/pipelines/${pipeline}/builds/${buildNumber}${buildkiteAccessToken}`);
-    return httpResponse.json();
-}
-
-// given a buildkite job, return the environmental variables
-async function getEnvironment(job)
-{
-    if (debug) console.log('getEnvironment()'); // DEBUG
-    const httpResponse = await fetch(`${job.build_url}/jobs/${job.id}/env${buildkiteAccessToken}`);
-    const environment = await httpResponse.json();
-    return environment.env;
-}
-
-// given a string to search, a key as regex or a string, and optionally a start index, return the lowest line number containing the key
-function getLineNumber(text, key, startIndex)
-{
-    if (debug) console.log('getLineNumber()'); // DEBUG
-    const begin = (isNullOrEmpty(startIndex) || !Number.isInteger(startIndex) || startIndex < 1) ? 0 : startIndex;
-    let found = false;
-    let lineNumber = 0;
-    const regex = (key instanceof RegExp);
-    text.split('\n').some((line) =>
-    {
-        if (lineNumber >= begin && ((regex && key.test(line)) || (!regex && line.includes(key))))
-        {
-            found = true;
-            return true; // c-style break
-        }
-        lineNumber += 1;
-        return false; // for the linter, plz delete when linter is fixed
-    });
-    return (found) ? lineNumber : -1;
-}
-
-// given a buildkite job, return a sanitized log file
-async function getLog(job)
-{
-    if (debug) console.log(`getLog(${job.raw_log_url})`); // DEBUG
-    const logText = await download(job.raw_log_url + buildkiteAccessToken);
-    // returns log lowercase, with single spaces and '\n' only, and only ascii-printable characters
-    return sanitize(logText); // made this a separate function for unit testing purposes
-}
-
-// given a Buildkite environment, return the operating system used
-function getOS(environment)
-{
-    if (debug) console.log(`getOS(${environment.BUILDKITE_LABEL})`); // DEBUG
-    if (isNullOrEmpty(environment) || isNullOrEmpty(environment.BUILDKITE_LABEL))
-    {
-        console.log('ERROR: getOS() called with empty environment.BUILDKITE_LABEL!');
-        console.log(JSON.stringify(environment));
-        return null;
-    }
-    const label = environment.BUILDKITE_LABEL.toLowerCase();
-    if ((/aws(?!.*[23])/.test(label) || /amazon(?!.*[23])/.test(label)))
-        return 'Amazon Linux 1';
-    if (/aws.*2/.test(label) || /amazon.*2/.test(label))
-        return 'Amazon Linux 2';
-    if (/centos(?!.*[89])/.test(label))
-        return 'CentOS 7';
-    if (/fedora(?!.*2[89])/.test(label) && /fedora(?!.*3\d)/.test(label))
-        return 'Fedora 27';
-    if (/high.*sierra/.test(label))
-        return 'High Sierra';
-    if (/mojave/.test(label))
-        return 'Mojave';
-    if (/ubuntu.*16.*04/.test(label) || /ubuntu.*16(?!.*10)/.test(label))
-        return 'Ubuntu 16.04';
-    if (/ubuntu.*18.*04/.test(label) || /ubuntu.*18(?!.*10)/.test(label))
-        return 'Ubuntu 18.04';
-    if (/docker/.test(label))
-        return 'Docker';
-    return 'Unknown';
-}
-
-// given a Buildkite job, return the test-results.xml file as JSON
-async function getXML(job)
-{
-    if (debug) console.log('getXML()'); // DEBUG
-    const xmlFilename = 'test-results.xml';
-    const artifacts = await download(job.artifacts_url + buildkiteAccessToken);
-    const testResultsArtifact = JSON.parse(artifacts).filter(artifact => artifact.filename === xmlFilename);
-    if (isNullOrEmpty(testResultsArtifact))
-    {
-        console.log(`WARNING: No ${xmlFilename} found for "${job.name}"! Link: ${job.web_url}`);
-        return null;
-    }
-    const urlBuildkite = testResultsArtifact[0].download_url;
-    const rawXML = await download(urlBuildkite + buildkiteAccessToken);
-    const xmlOptions =
-    {
-        attrNameProcessors: [function lower(name) { return name.toLowerCase(); }],
-        explicitArray: false, // do not put single strings in single-element arrays
-        mergeAttrs: true, // make attributes children of their node
-        normalizeTags: true, // convert all tag names to lowercase
-    };
-    let xmlError, xmlTestResults;
-    await XML.parseString(rawXML, xmlOptions, (err, result) => {xmlTestResults = result; xmlError = err;});
-    if (isNullOrEmpty(xmlError))
-        return xmlTestResults;
-    console.log(`WARNING: Failed to parse xml for "${job.name}" job! Link: ${job.web_url}`);
-    console.log(JSON.stringify(xmlError));
-    return null;
-}
-
-// test if variable is empty
-function isNullOrEmpty(str)
-{
-    return (str === null || str === undefined || str.length === 0 || /^\s*$/.test(str));
-}
-
-// return array of test results from a buildkite job log
-function parseLog(logText)
-{
-    if (debug) console.log('parseLog()'); // DEBUG
-    const lines = logText.split('\n');
-    const resultLines = lines.filter(line => /test\s+#\d+/.test(line)); // 'grep' for the test result lines
-    // parse the strings and make test records
-    return resultLines.map((line) =>
-    {
-        const y = line.trim().split(/test\s+#\d+/).pop(); // remove everything before the test declaration
-        const parts = y.split(/\s+/).slice(1, -1); // split the line and remove the test number and time unit
-        const testName = parts[0];
-        const testTime = parts[(parts.length - 1)];
-        const rawResult = parts.slice(1, -1).join();
-        let testResult;
-        if (rawResult.includes('failed'))
-            testResult = 'Failed';
-        else if (rawResult.includes('passed'))
-            testResult = 'Passed';
-        else
-            testResult = 'Exception';
-        return { testName, testResult, testTime }; // create a test record
-    });
-}
-
-// return array of test results from an xUnit-formatted JSON object
-function parseXunit(xUnit)
-{
-    if (debug) console.log('parseXunit()'); // DEBUG
-    if (isNullOrEmpty(xUnit))
-    {
-        console.log('WARNING: xUnit is empty!');
-        return null;
-    }
-    return xUnit.site.testing.test.map((test) =>
-    {
-        const testName = test.name;
-        const testTime = test.results.namedmeasurement.filter(x => /execution\s+time/.test(x.name.toLowerCase()))[0].value;
-        let testResult;
-        if (test.status.includes('failed'))
-            testResult = 'Failed';
-        else if (test.status.includes('passed'))
-            testResult = 'Passed';
-        else
-            testResult = 'Exception';
-        return { testName, testResult, testTime };
-    });
-}
-
-// returns text lowercase, with single spaces and '\n' only, and only ascii-printable characters
-function sanitize(text)
-{
-    if (debug) console.log(`sanitize(text) where text.length = ${text.length} bytes`); // DEBUG
-    const chunkSize = 131072; // process text in 128 kB chunks
-    if (text.length > chunkSize)
-        return sanitize(text.slice(0, chunkSize)).concat(sanitize(text.slice(chunkSize)));
-    return text
-        .replace(/(?!\n)\r(?!\n)/g, '\n').replace(/\r/g, '') // convert all line endings to '\n'
-        .replace(/[^\S\n]+/g, ' ') // convert all whitespace to ' '
-        .replace(/[^ -~\n]+/g, '') // remove non-printable characters
-        .toLowerCase();
-}
-
-// input is array of whole lines containing "test #" and ("failed" or "exception")
-function testDiagnostics(test, logText)
-{
-    if (debug)
-    {
-        console.log(`testDiagnostics(test, logText) where logText.length = ${logText.length} bytes and test is`); // DEBUG
-        console.log(JSON.stringify(test));
-    }
-    // get basic information
-    const testResultLine = new RegExp(`test\\s+#\\d+.*${test.testName}`, 'g'); // regex defining "test #" line
-    const startIndex = getLineNumber(logText, testResultLine);
-    const output = { errorMsg: null, lineNumber: startIndex + 1, stackTrace: null }; // default output
-    // filter tests
-    if (test.testResult.toLowerCase() === 'passed')
-        return output;
-    output.errorMsg = 'test diangostics are not enabled for this pipeline';
-    if (!pipelineWhitelist.includes(test.pipeline))
-        return output;
-    // diagnostics
-    if (debug) console.log('Running diagnostics...'); // DEBUG
-    output.errorMsg = 'uncategorized';
-    const testLog = logText.split(testResultLine)[1].split(/test\s*#/)[0].split('\n'); // get log output from this test only, as array of lines
-    let errorLine = testLog[0]; // first line, from "test ## name" to '\n' exclusive
-    if (/\.+ *\** *not run\s+0+\.0+ sec$/.test(errorLine)) // not run
-        output.errorMsg = 'test not run';
-    else if (/\.+ *\** *time *out\s+\d+\.\d+ sec$/.test(errorLine)) // timeout
-        output.errorMsg = 'test timeout';
-    else if (/exception/.test(errorLine)) // test exception
-        output.errorMsg = errorLine.split('exception')[1].replace(/[: \d.]/g, '').replace(/sec$/, ''); // isolate the error message after exception
-    else if (/fc::.*exception/.test(testLog.filter(line => !isNullOrEmpty(line))[1])) // fc exception
-    {
-        [, errorLine] = testLog.filter(line => !isNullOrEmpty(line)); // get first line
-        output.errorMsg = `fc::${errorLine.split('::')[1].replace(/['",]/g, '').split(' ')[0]}`; // isolate fx exception body
-    }
-    else if (testLog.join('\n').includes('ctest:')) // ctest exception
-    {
-        [errorLine] = testLog.filter(line => line.includes('ctest:'));
-        output.errorMsg = `ctest:${errorLine.split('ctest:')[1]}`;
-    }
-    else if (!isNullOrEmpty(testLog.filter(line => /boost.+exception/.test(line)))) // boost exception
-    {
-        [errorLine] = testLog.filter(line => /boost.+exception/.test(line));
-        output.errorMsg = `boost: ${errorLine.replace(/[()]/g, '').split(/: (.+)/)[1]}`; // capturing parenthesis, split only at first ' :'
-        output.stackTrace = testLog.filter(line => /thread-\d+/.test(line))[0].split('thread-')[1].replace(/^\d+/, '').trim().replace(/[[]\d+m$/, ''); // get the bottom of the stack trace
-    }
-    else if (/unit[-_. ]+test/.test(test.testName) || /plugin[-_. ]+test/.test(test.testName)) // unit test, application exception
-    {
-        if (!isNullOrEmpty(testLog.filter(line => line.includes('exception: '))))
-        {
-            [errorLine] = testLog.filter(line => line.includes('exception: '));
-            [, output.errorMsg] = errorLine.replace(/[()]/g, '').split(/: (.+)/); // capturing parenthesis, split only at first ' :'
-            output.stackTrace = testLog.filter(line => /thread-\d+/.test(line))[0].split('thread-')[1].replace(/^\d+/, '').trim().replace(/[[]\d+m$/, ''); // get the bottom of the stack trace
-        }
-        // else uncategorized unit test
-    }
-    // else integration test, add cross-referencing code here (or uncategorized)
-    if (errorLine !== testLog[0]) // get real line number from log file
-        output.lineNumber = getLineNumber(logText, errorLine, startIndex) + 1;
-    return output;
-}
-
-// return test metrics given a buildkite job or build
-async function testMetrics(buildkiteObject)
-{
-    if (!isNullOrEmpty(buildkiteObject.type)) // input is a Buildkite job object
-    {
-        const job = buildkiteObject;
-        console.log(`Processing test metrics for "${job.name}"${(inBuildkite) ? '' : ` at ${job.web_url}`}...`);
-        if (isNullOrEmpty(job.exit_status))
-        {
-            console.log(`${(inBuildkite) ? '+++ :warning: ' : ''}WARNING: "${job.name}" was skipped!`);
-            return null;
-        }
-        // get test results
-        const logText = await getLog(job);
-        let testResults;
-        let xUnit;
-        try
-        {
-            xUnit = await getXML(job);
-            testResults = parseXunit(xUnit);
-        }
-        catch (error)
-        {
-            console.log(`XML processing failed for "${job.name}"! Link: ${job.web_url}`);
-            console.log(JSON.stringify(error));
-            testResults = null;
-        }
-        finally
-        {
-            if (isNullOrEmpty(testResults))
-                testResults = parseLog(logText);
-        }
-        // get test metrics
-        const env = await getEnvironment(job);
-        const metrics = [];
-        testResults.forEach((result) =>
-        {
-            // add test properties
-            const test =
-            {
-                ...result, // add testName, testResult, testTime
-                agentName: env.BUILDKITE_AGENT_NAME,
-                agentRole: env.BUILDKITE_AGENT_META_DATA_QUEUE || env.BUILDKITE_AGENT_META_DATA_ROLE,
-                branch: env.BUILDKITE_BRANCH,
-                buildNumber: env.BUILDKITE_BUILD_NUMBER,
-                commit: env.BUILDKITE_COMMIT,
-                job: env.BUILDKITE_LABEL,
-                os: getOS(env),
-                pipeline: env.BUILDKITE_PIPELINE_SLUG,
-                repo: env.BUILDKITE_REPO.replace(new RegExp('^git@github.com:(EOSIO/)?'), '').replace(new RegExp('.git$'), ''),
-                testTime: parseFloat(result.testTime),
-                url: job.web_url,
-            };
-            metrics.push({ ...test, ...testDiagnostics(test, logText) });
-        });
-        return metrics;
-    }
-    else if (!isNullOrEmpty(buildkiteObject.number)) // input is a Buildkite build object
-    {
-        const build = buildkiteObject;
-        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number}${(inBuildkite) ? '' : ` at ${build.web_url}`}...`);
-        let metrics = [], promises = [];
-        // process test metrics
-        build.jobs.filter(job => job.type === 'script' && /test/.test(job.name.toLowerCase()) && ! /test metrics/.test(job.name.toLowerCase())).forEach((job) =>
-        {
-            promises.push(
-                testMetrics(job)
-                    .then((moreMetrics) => {
-                        metrics = metrics.concat(moreMetrics);
-                    }).catch((error) => {
-                        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Failed to process test metrics for "${job.name}"! Link: ${job.web_url}`);
-                        console.log(JSON.stringify(error));
-                        errorCount++;
-                    })
-            );
-        });
-        await Promise.all(promises);
-        return metrics;
-    }
-    else // something else
-    {
-        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Buildkite object not recognized or not a test step!`);
-        console.log(JSON.stringify({buildkiteObject}));
-        return null;
-    }
-}
-
-/* main */
-async function main()
-{
-    if (debug) console.log(`$ ${process.argv.join(' ')}`);
-    let build, metrics = null;
-    console.log(`${(inBuildkite) ? '+++ :evergreen_tree: ' : ''}Getting information from enviroment...`);
-    const buildNumber = process.env.BUILDKITE_BUILD_NUMBER || process.argv[2];
-    const pipeline = process.env.BUILDKITE_PIPELINE_SLUG || process.argv[3];
-    if (debug)
-    {
-        console.log(`BUILDKITE=${process.env.BUILDKITE}`);
-        console.log(`BUILDKITE_BUILD_NUMBER=${process.env.BUILDKITE_BUILD_NUMBER}`);
-        console.log(`BUILDKITE_PIPELINE_SLUG=${process.env.BUILDKITE_PIPELINE_SLUG}`);
-        console.log('    State:')
-        console.log(`inBuildkite = "${inBuildkite}"`);
-        console.log(`buildNumber = "${buildNumber}"`);
-        console.log(`pipeline    = "${pipeline}"`);
-    }
-    if (isNullOrEmpty(buildNumber) || isNullOrEmpty(pipeline) || isNullOrEmpty(process.env.BUILDKITE_API_KEY))
-    {
-        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Missing required inputs!`);
-        if (isNullOrEmpty(process.env.BUILDKITE_API_KEY)) console.log('- Buildkite API key, as BUILDKITE_API_KEY environment variable');
-        if (isNullOrEmpty(buildNumber)) console.log('- Build Number, as BUILDKITE_BUILD_NUMBER or argument 1');
-        if (isNullOrEmpty(pipeline)) console.log('- Pipeline Slug, as BUILDKITE_PIPELINE_SLUG or argument 2');
-        errorCount = -1;
-    }
-    else
-    {
-        console.log(`${(inBuildkite) ? '+++ :bar_chart: ' : ''}Processing test metrics...`);
-        build = await getBuild(pipeline, buildNumber);
-        metrics = await testMetrics(build);
-        console.log('Done processing test metrics.');
-    }
-    console.log(`${(inBuildkite) ? '+++ :pencil: ' : ''}Writing to file...`);
-    fs.writeFileSync(outputFile, JSON.stringify({ metrics }));
-    console.log(`Saved metrics to "${outputFile}" in "${process.cwd()}".`);
-    if (inBuildkite)
-    {
-        console.log('+++ :arrow_up: Uploading artifact...');
-        execSync(`buildkite-agent artifact upload ${outputFile}`);
-    }
-    if (errorCount === 0)
-        console.log(`${(inBuildkite) ? '+++ :white_check_mark: ' : ''}Done!`);
-    else
-    {
-        console.log(`${(inBuildkite) ? '+++ :warning: ' : ''}Finished with errors.`);
-        console.log(`Please send automation a link to this job${(isNullOrEmpty(build)) ? '.' : `: ${build.web_url}`}`);
-        console.log('@kj4ezj or @zreyn on Telegram');
-    }
-    return (inBuildkite) ? process.exit(EXIT_SUCCESS) : process.exit(errorCount);
-};
-
-main();
\ No newline at end of file
diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
deleted file mode 100755
index 07f9d39dd42..00000000000
--- a/scripts/package-builder.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
-echo '+++ :evergreen_tree: Configuring Environment'
-[[ "$BUILD_STEP" == '' ]] && BUILD_STEP="$1"
-[[ "$BUILD_STEP" == '' ]] && (echo '+++ :no_entry: ERROR: Build step name must be given as BUILD_STEP or argument 1!' && exit 1)
-if [[ "$(uname)" == 'Darwin' ]]; then
-    echo 'Darwin family detected, building for brew.'
-    [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.rb;*.tar.gz'
-    PACKAGE_TYPE='brew'
-else
-    . /etc/os-release
-    if [[ "$ID_LIKE" == 'rhel fedora' ]]; then
-        echo 'Fedora family detected, building for RPM.'
-        [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.rpm'
-        PACKAGE_TYPE='rpm'
-        mkdir -p /root/rpmbuild/BUILD
-        mkdir -p /root/rpmbuild/BUILDROOT
-        mkdir -p /root/rpmbuild/RPMS
-        mkdir -p /root/rpmbuild/SOURCES
-        mkdir -p /root/rpmbuild/SPECS
-        mkdir -p /root/rpmbuild/SRPMS
-        yum install -y rpm-build
-    elif [[ "$ID_LIKE" == 'debian' ]]; then
-        echo 'Debian family detected, building for dpkg.'
-        [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.deb'
-        PACKAGE_TYPE='deb'
-    else
-        echo '+++ :no_entry: ERROR: Could not determine which operating system this script is running on!'
-        echo '$ uname'
-        uname
-        echo "ID_LIKE=\"$ID_LIKE\""
-        echo '$ cat /etc/os-release'
-        cat /etc/os-release
-        echo 'Exiting...'
-        exit 1
-    fi
-fi
-echo "+++ :arrow_down: Downloading Build Directory"
-buildkite-agent artifact download build.tar.gz . --step "$BUILD_STEP"
-echo "+++ :compression: Extracting Build Directory"
-[[ -d build ]] && rm -rf build
-tar -zxf build.tar.gz
-echo "+++ :package: Starting Package Build"
-BASE_COMMIT=$(cat build/programs/nodeos/config.hpp | grep 'version' | awk '{print $5}' | tr -d ';')
-BASE_COMMIT="${BASE_COMMIT:2:42}"
-echo "Found build against $BASE_COMMIT."
-cd build/packages
-chmod 755 ./*.sh
-./generate_package.sh "$PACKAGE_TYPE"
-echo '+++ :arrow_up: Uploading Artifacts'
-buildkite-agent artifact upload "./$ARTIFACT"
-for A in $(echo $ARTIFACT | tr ';' ' '); do
-    if [[ $(ls $A | grep -c '') == 0 ]]; then
-        echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!"
-        echo '$ pwd'
-        pwd
-        echo '$ ls -la'
-        ls -la
-        exit 1
-    fi
-done
-echo "+++ :white_check_mark: Done."
\ No newline at end of file
diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
deleted file mode 100755
index 34bdc5e4cca..00000000000
--- a/scripts/parallel-test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-[[ $(uname) == "Darwin" ]] && cd /data/job/eos/build || cd /data/job/build
-echo "+++ Running tests"
-# Counting tests available and if they get disabled for some reason, throw a failure
-TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
-set +e # defer ctest error handling to end
-CORES=$(getconf _NPROCESSORS_ONLN)
-echo "ctest -j $CORES -LE _tests --output-on-failure -T Test"
-ctest -j $CORES -LE _tests --output-on-failure -T Test
-EXIT_STATUS=$?
-[[ "$EXIT_STATUS" == 0 ]] && set -e
-# Prepare tests for artifact upload
-echo "+++ Uploading artifacts"
-mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
-buildkite-agent artifact upload test-results.xml
-# ctest error handling
-if [[ $EXIT_STATUS != 0 ]]; then
-    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
-    buildkite-agent artifact upload config.ini
-    buildkite-agent artifact upload genesis.json
-    exit $EXIT_STATUS
-fi
\ No newline at end of file
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
deleted file mode 100755
index eaf38aa5776..00000000000
--- a/scripts/serial-test.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-[[ $(uname) == "Darwin" ]] && cd /data/job/eos/build || cd /data/job/build
-echo "+++ Killing old MongoDB"
-$(pgrep mongod | xargs kill -9) || true
-echo "+++ Starting MongoDB"
-PATH=$PATH:~/opt/mongodb/bin
-mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath ./mongod.log
-echo "+++ Running tests"
-# Counting tests available and if they get disabled for some reason, throw a failure
-TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
-set +e # defer ctest error handling to end
-echo "ctest -L nonparallelizable_tests --output-on-failure -T Test"
-ctest -L nonparallelizable_tests --output-on-failure -T Test
-EXIT_STATUS=$?
-[[ $EXIT_STATUS == 0 ]] && set -e
-echo "+++ Uploading artifacts"
-mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
-buildkite-agent artifact upload test-results.xml
-buildkite-agent artifact upload mongod.log
-# ctest error handling
-if [[ $EXIT_STATUS != 0 ]]; then
-    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
-    buildkite-agent artifact upload config.ini
-    buildkite-agent artifact upload genesis.json
-    exit $EXIT_STATUS
-fi
\ No newline at end of file
diff --git a/scripts/submodule_check.sh b/scripts/submodule_check.sh
deleted file mode 100755
index b9ec13204fa..00000000000
--- a/scripts/submodule_check.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-REPO_DIR=`mktemp -d`
-git clone "$BUILDKITE_REPO" "$REPO_DIR"
-git submodule update --init --recursive
-cd "$REPO_DIR"
-
-declare -A PR_MAP
-declare -A BASE_MAP
-
-echo "getting submodule info for $BUILDKITE_BRANCH"
-git checkout "$BUILDKITE_BRANCH" &> /dev/null
-git submodule update --init &> /dev/null
-while read -r a b; do
-  PR_MAP[$a]=$b
-done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
-
-echo "getting submodule info for $BUILDKITE_PULL_REQUEST_BASE_BRANCH"
-git checkout "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" &> /dev/null
-git submodule update --init &> /dev/null
-while read -r a b; do
-  BASE_MAP[$a]=$b
-done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
-
-for k in "${!BASE_MAP[@]}"; do
-  base_ts=${BASE_MAP[$k]}
-  pr_ts=${PR_MAP[$k]}
-  echo "submodule $k"
-  echo "  timestamp on $BUILDKITE_BRANCH: $pr_ts"
-  echo "  timestamp on $BUILDKITE_PULL_REQUEST_BASE_BRANCH: $base_ts"
-  if (( $pr_ts < $base_ts)); then
-    echo "$k is older on $BUILDKITE_BRANCH than $BUILDKITE_PULL_REQUEST_BASE_BRANCH; investigating..."
-
-    if for c in `git log $BUILDKITE_BRANCH ^$BUILDKITE_PULL_REQUEST_BASE_BRANCH --pretty=format:"%H"`; do git show --pretty="" --name-only $c; done | grep -q "^$k$"; then
-      echo "ERROR: $k has regressed"
-      exit 1
-    else
-      echo "$k was not in the diff; no regression detected"
-    fi
-  fi
-done

From 491af33c16679c2dbdc966523f39f3a3d1d98ee4 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 24 May 2019 10:52:27 -0400
Subject: [PATCH 0476/1648] add support for a simple header in the state
 database which defines versioning for the application level data.  The intent
 is to have a more direct informative message when the expectations for
 in-memory layout of application data has changed due to explicit changes to
 the structure (as opposed to the implicit change detected by our chainbase
 level checks)

---
 libraries/chain/controller.cpp                | 35 +++++++++++-
 .../eosio/chain/database_header_object.hpp    | 54 +++++++++++++++++++
 .../chain/include/eosio/chain/exceptions.hpp  |  2 +
 libraries/chain/include/eosio/chain/types.hpp |  1 +
 4 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 libraries/chain/include/eosio/chain/database_header_object.hpp

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 6bdf3237d49..03f0f219431 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -17,6 +17,7 @@
 #include <eosio/chain/reversible_block_object.hpp>
 #include <eosio/chain/genesis_intrinsics.hpp>
 #include <eosio/chain/whitelisted_intrinsics.hpp>
+#include <eosio/chain/database_header_object.hpp>
 
 #include <eosio/chain/protocol_feature_manager.hpp>
 #include <eosio/chain/authorization_manager.hpp>
@@ -45,7 +46,8 @@ using controller_index_set = index_set<
    transaction_multi_index,
    generated_transaction_multi_index,
    table_id_multi_index,
-   code_index
+   code_index,
+   database_header_multi_index
 >;
 
 using contract_database_index_set = index_set<
@@ -578,6 +580,22 @@ struct controller_impl {
             head = fork_db.head();
          }
       }
+
+      // check database version
+      const auto& header_idx = db.get_index<database_header_multi_index>().indices().get<by_id>();
+      const auto& header_itr = header_idx.begin();
+      EOS_ASSERT( header_itr != header_idx.end(), bad_database_version_exception,
+                  "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
+
+      header_itr->validate();
+
+      // upgrade to the latest compatible version
+      if (header_itr->version != database_header_object::current_version) {
+         db.modify(*header_itr, [](auto& header) {
+            header.version = database_header_object::current_version;
+         });
+      }
+
       // At this point head != nullptr && fork_db.head() != nullptr && fork_db.root() != nullptr.
       // Furthermore, fork_db.root()->block_num <= lib_num.
       // Also, even though blog.head() may still be nullptr, blog.first_block_num() is guaranteed to be lib_num + 1.
@@ -788,6 +806,11 @@ struct controller_impl {
             return;
          }
 
+         // skip the database_header as it is only relevant to in-memory database
+         if (std::is_same<value_t, database_header_object>::value) {
+            return;
+         }
+
          snapshot->write_section<value_t>([this]( auto& section ){
             decltype(utils)::walk(db, [this, &section]( const auto &row ) {
                section.add_row(row, db);
@@ -835,6 +858,11 @@ struct controller_impl {
             return;
          }
 
+         // skip the database_header as it is only relevant to in-memory database
+         if (std::is_same<value_t, database_header_object>::value) {
+            return;
+         }
+
          snapshot->read_section<value_t>([this]( auto& section ) {
             bool more = !section.empty();
             while(more) {
@@ -893,6 +921,11 @@ struct controller_impl {
    }
 
    void initialize_database() {
+      // create the database header sigil
+      db.create<database_header_object>([&]( auto& header ){
+         // nothing to do for now
+      });
+
       // Initialize block summary index
       for (int i = 0; i < 0x10000; i++)
          db.create<block_summary_object>([&](block_summary_object&) {});
diff --git a/libraries/chain/include/eosio/chain/database_header_object.hpp b/libraries/chain/include/eosio/chain/database_header_object.hpp
new file mode 100644
index 00000000000..6e1e2d17a93
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/database_header_object.hpp
@@ -0,0 +1,54 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#pragma once
+#include <eosio/chain/types.hpp>
+
+#include "multi_index_includes.hpp"
+
+namespace eosio { namespace chain {
+      /**
+       *  @brief tracks the version of the application data stored in the database
+       *  @ingroup object
+       *
+       *  the in-memory database expects that binay structures of data do not shift between executions.  Some
+       *  upgrades will bump this version to indicate that the expectations of the binary application data
+       *  have changed.  When it is safe to directly use an older version that will be allowed though cases
+       *  where this is possible may be rare.
+       */
+      class database_header_object : public chainbase::object<database_header_object_type, database_header_object>
+      {
+         OBJECT_CTOR(database_header_object)
+
+         /**
+          *  VERSION HISTORY
+          *   - 1 : initial version, prior to this no `database_header_object` existed in the shared memory file
+          */
+
+         static constexpr uint32_t current_version            = 1;
+         static constexpr uint32_t minimum_version            = 1;
+
+         id_type        id;
+         uint32_t       version = current_version;
+
+         void validate() const {
+            EOS_ASSERT(std::clamp(version, minimum_version, current_version) == version, bad_database_version_exception,
+                       "state database version is incompatible, please restore from a compatible snapshot or replay!",
+                       ("version", version)("minimum_version", minimum_version)("maximum_version", current_version));
+         }
+      };
+
+      struct by_block_id;
+      using database_header_multi_index = chainbase::shared_multi_index_container<
+            database_header_object,
+            indexed_by<
+                  ordered_unique<tag<by_id>, BOOST_MULTI_INDEX_MEMBER(database_header_object, database_header_object::id_type, id)>
+             >
+      >;
+
+   } }
+
+CHAINBASE_SET_INDEX_TYPE(eosio::chain::database_header_object, eosio::chain::database_header_multi_index)
+
+FC_REFLECT( eosio::chain::database_header_object, (version) )
diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index da34027826d..a8e0448c849 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -313,6 +313,8 @@ namespace eosio { namespace chain {
                                     3060003, "Contract Table Query Exception" )
       FC_DECLARE_DERIVED_EXCEPTION( contract_query_exception,       database_exception,
                                     3060004, "Contract Query Exception" )
+      FC_DECLARE_DERIVED_EXCEPTION( bad_database_version_exception, database_exception,
+                                    3060005, "Database is an unknown or unsupported version" )
 
    FC_DECLARE_DERIVED_EXCEPTION( guard_exception, database_exception,
                                  3060100, "Guard Exception" )
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index d6323fbd23d..dafed48c49a 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -192,6 +192,7 @@ namespace eosio { namespace chain {
       protocol_state_object_type,
       account_ram_correction_object_type,
       code_object_type,
+      database_header_object_type,
       OBJECT_TYPE_COUNT ///< Sentry value which contains the number of different object types
    };
 

From 10a3f45426e142cdc3323091a94d29c46af66d6f Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 24 May 2019 10:57:55 -0400
Subject: [PATCH 0477/1648] agent lost auto retry

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 374ee2dae7a..ef31405073f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -67,7 +67,7 @@ steps:
     timeout: 120
     retry:
       automatic:
-        - exit_status: 17 # failed to open image, error 2
+        - exit_status: -1
           limit: 2
 
   - label: ":aws: Amazon Linux 2 Build"
@@ -172,7 +172,7 @@ steps:
     timeout: 120
     retry:
       automatic:
-        - exit_status: 17 # failed to open image, error 2
+        - exit_status: -1
           limit: 2
 
   - label: ":darwin: [Darwin] Mojave NP Tests"
@@ -194,7 +194,7 @@ steps:
     timeout: 120
     retry:
       automatic:
-        - exit_status: 17 # failed to open image, error 2
+        - exit_status: -1
           limit: 2
           
   # AmazonLinux #

From 2a2315e9b01e9e89bbe86d5948af17bdbc04004c Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 24 May 2019 11:06:27 -0400
Subject: [PATCH 0478/1648] allow in-place upgrade from unversioned to
 versioned state database

---
 libraries/chain/controller.cpp                    | 15 ++++++++++++---
 .../eosio/chain/database_header_object.hpp        |  6 ++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 03f0f219431..103dfa3449e 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -583,10 +583,19 @@ struct controller_impl {
 
       // check database version
       const auto& header_idx = db.get_index<database_header_multi_index>().indices().get<by_id>();
-      const auto& header_itr = header_idx.begin();
-      EOS_ASSERT( header_itr != header_idx.end(), bad_database_version_exception,
-                  "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
 
+      if (database_header_object::minimum_version != 0) {
+         EOS_ASSERT(header_idx.begin() != header_idx.end(), bad_database_version_exception,
+                    "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
+      } else if ( header_idx.empty() ) {
+         // temporary code to upgrade from existing un-versioned state database
+         static_assert(database_header_object::minimum_version == 0, "remove this path once the minimum version moves");
+         db.create<database_header_object>([](const auto& header){
+            // nothing to do here
+         });
+      }
+
+      const auto& header_itr = header_idx.begin();
       header_itr->validate();
 
       // upgrade to the latest compatible version
diff --git a/libraries/chain/include/eosio/chain/database_header_object.hpp b/libraries/chain/include/eosio/chain/database_header_object.hpp
index 6e1e2d17a93..e0da70944f0 100644
--- a/libraries/chain/include/eosio/chain/database_header_object.hpp
+++ b/libraries/chain/include/eosio/chain/database_header_object.hpp
@@ -23,11 +23,13 @@ namespace eosio { namespace chain {
 
          /**
           *  VERSION HISTORY
-          *   - 1 : initial version, prior to this no `database_header_object` existed in the shared memory file
+          *   - 0 : implied version when this header is absent
+          *   - 1 : initial version, prior to this no `database_header_object` existed in the shared memory file but
+          *         no changes to its format were made so it can be safely added to existing databases
           */
 
          static constexpr uint32_t current_version            = 1;
-         static constexpr uint32_t minimum_version            = 1;
+         static constexpr uint32_t minimum_version            = 0;
 
          id_type        id;
          uint32_t       version = current_version;

From 3898c22393b2ce15e95c9aab448a8f6aae459c3f Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 24 May 2019 11:12:09 -0400
Subject: [PATCH 0479/1648] create the database header when loading from a
 snapshot

---
 libraries/chain/controller.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 103dfa3449e..c003286012d 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -888,6 +888,9 @@ struct controller_impl {
       resource_limits.read_from_snapshot(snapshot);
 
       db.set_revision( head->block_num );
+      db.create<database_header_object>([](const auto& header){
+         // nothing to do
+      });
    }
 
    sha256 calculate_integrity_hash() const {

From a17ff6b099d224094a08a05e8ffca2c03010aa8a Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 24 May 2019 11:54:36 -0400
Subject: [PATCH 0480/1648] bump state database version to reflect change from
 producer_key to producer_authority etc

---
 libraries/chain/controller.cpp                       | 12 ++----------
 .../include/eosio/chain/database_header_object.hpp   |  5 +++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index cca9e8d34b9..ecce8a2c496 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -590,16 +590,8 @@ struct controller_impl {
       // check database version
       const auto& header_idx = db.get_index<database_header_multi_index>().indices().get<by_id>();
 
-      if (database_header_object::minimum_version != 0) {
-         EOS_ASSERT(header_idx.begin() != header_idx.end(), bad_database_version_exception,
-                    "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
-      } else if ( header_idx.empty() ) {
-         // temporary code to upgrade from existing un-versioned state database
-         static_assert(database_header_object::minimum_version == 0, "remove this path once the minimum version moves");
-         db.create<database_header_object>([](const auto& header){
-            // nothing to do here
-         });
-      }
+      EOS_ASSERT(header_idx.begin() != header_idx.end(), bad_database_version_exception,
+                 "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
 
       const auto& header_itr = header_idx.begin();
       header_itr->validate();
diff --git a/libraries/chain/include/eosio/chain/database_header_object.hpp b/libraries/chain/include/eosio/chain/database_header_object.hpp
index e0da70944f0..06cca969065 100644
--- a/libraries/chain/include/eosio/chain/database_header_object.hpp
+++ b/libraries/chain/include/eosio/chain/database_header_object.hpp
@@ -26,10 +26,11 @@ namespace eosio { namespace chain {
           *   - 0 : implied version when this header is absent
           *   - 1 : initial version, prior to this no `database_header_object` existed in the shared memory file but
           *         no changes to its format were made so it can be safely added to existing databases
+          *   - 2 : change from producer_key to producer_authority for many in-memory structures
           */
 
-         static constexpr uint32_t current_version            = 1;
-         static constexpr uint32_t minimum_version            = 0;
+         static constexpr uint32_t current_version            = 2;
+         static constexpr uint32_t minimum_version            = 2;
 
          id_type        id;
          uint32_t       version = current_version;

From 30f61a6f9e0e1e0d711fd4641aab41c48deaaf0f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 24 May 2019 18:28:15 -0500
Subject: [PATCH 0481/1648] Improve logging of connection type

---
 plugins/net_plugin/net_plugin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 91b6c807799..3c8ab0b5bfc 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -881,12 +881,14 @@ namespace eosio {
       string type = colon2 == string::npos ? "" : end == string::npos ?
             peer_add.substr( colon2 + 1 ) : peer_add.substr( colon2 + 1, end - (colon2 + 1) );
 
-      fc_ilog( logger, "Setting connection type for: ${peer}", ("peer", peer_add) );
       if( type.empty() ) {
+         fc_ilog( logger, "Setting connection type for: ${peer} to both transactions and blocks", ("peer", peer_add) );
          connection_type = both;
       } else if( type == "trx" ) {
+         fc_ilog( logger, "Setting connection type for: ${peer} to transactions only", ("peer", peer_add) );
          connection_type = transactions_only;
       } else if( type == "blk" ) {
+         fc_ilog( logger, "Setting connection type for: ${peer} to blocks only", ("peer", peer_add) );
          connection_type = blocks_only;
       } else {
          fc_wlog( logger, "Unknown connection type: ${t}", ("t", type) );

From dabc79476bac10aa7230ce698c480c6acf4f55ad Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sat, 25 May 2019 21:39:35 -0400
Subject: [PATCH 0482/1648] webauthn support

---
 libraries/chain/authorization_manager.cpp     |  13 ++
 libraries/chain/controller.cpp                |  15 +-
 .../chain/include/eosio/chain/authority.hpp   | 112 ++++++++++-
 .../include/eosio/chain/authority_checker.hpp |   4 +-
 .../include/eosio/chain/chain_snapshot.hpp    |   4 +-
 .../chain/include/eosio/chain/config.hpp      |   1 +
 .../chain/include/eosio/chain/controller.hpp  |   6 +
 .../chain/include/eosio/chain/exceptions.hpp  |   7 +-
 .../eosio/chain/protocol_feature_manager.hpp  |   3 +-
 .../eosio/chain/transaction_metadata.hpp      |  11 +-
 libraries/chain/protocol_feature_manager.cpp  |  11 ++
 libraries/chain/wasm_interface.cpp            |  19 ++
 libraries/fc                                  |   2 +-
 plugins/chain_plugin/chain_plugin.cpp         |   7 +-
 plugins/net_plugin/net_plugin.cpp             |   2 +-
 .../state_history_serialization.hpp           |   4 +-
 unittests/protocol_feature_tests.cpp          | 179 ++++++++++++++++++
 17 files changed, 384 insertions(+), 16 deletions(-)

diff --git a/libraries/chain/authorization_manager.cpp b/libraries/chain/authorization_manager.cpp
index 37eeba9dcc4..19284c6e6b8 100644
--- a/libraries/chain/authorization_manager.cpp
+++ b/libraries/chain/authorization_manager.cpp
@@ -14,6 +14,7 @@
 #include <eosio/chain/generated_transaction_object.hpp>
 #include <boost/tuple/tuple_io.hpp>
 #include <eosio/chain/database_utils.hpp>
+#include <eosio/chain/protocol_state_object.hpp>
 
 
 namespace eosio { namespace chain {
@@ -140,6 +141,10 @@ namespace eosio { namespace chain {
                                                                       time_point initial_creation_time
                                                                     )
    {
+      for(const key_weight& k: auth.keys)
+         EOS_ASSERT(k.key.which() < _db.get<protocol_state_object>().num_supported_key_types, unactivated_key_type,
+           "Unactivated key type used when creating permission");
+
       auto creation_time = initial_creation_time;
       if( creation_time == time_point() ) {
          creation_time = _control.pending_block_time();
@@ -167,6 +172,10 @@ namespace eosio { namespace chain {
                                                                       time_point initial_creation_time
                                                                     )
    {
+      for(const key_weight& k: auth.keys)
+         EOS_ASSERT(k.key.which() < _db.get<protocol_state_object>().num_supported_key_types, unactivated_key_type,
+           "Unactivated key type used when creating permission");
+
       auto creation_time = initial_creation_time;
       if( creation_time == time_point() ) {
          creation_time = _control.pending_block_time();
@@ -188,6 +197,10 @@ namespace eosio { namespace chain {
    }
 
    void authorization_manager::modify_permission( const permission_object& permission, const authority& auth ) {
+      for(const key_weight& k: auth.keys)
+         EOS_ASSERT(k.key.which() < _db.get<protocol_state_object>().num_supported_key_types, unactivated_key_type,
+           "Unactivated key type used when modifying permission");
+
       _db.modify( permission, [&](permission_object& po) {
          po.auth = auth;
          po.last_updated = _control.pending_block_time();
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 6bdf3237d49..757c12a6f2a 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -312,6 +312,7 @@ struct controller_impl {
       set_activation_handler<builtin_protocol_feature_t::preactivate_feature>();
       set_activation_handler<builtin_protocol_feature_t::replace_deferred>();
       set_activation_handler<builtin_protocol_feature_t::get_sender>();
+      set_activation_handler<builtin_protocol_feature_t::webauthn_key>();
 
       self.irreversible_block.connect([this](const block_state_ptr& bsp) {
          wasmif.current_lib(bsp->block_num);
@@ -1040,7 +1041,8 @@ struct controller_impl {
              || (code == contract_whitelist_exception::code_value)
              || (code == contract_blacklist_exception::code_value)
              || (code == action_blacklist_exception::code_value)
-             || (code == key_blacklist_exception::code_value);
+             || (code == key_blacklist_exception::code_value)
+             || (code == sig_variable_size_limit_exception::code_value);
    }
 
    bool scheduled_failure_is_subjective( const fc::exception& e ) const {
@@ -2931,6 +2933,10 @@ bool controller::is_ram_billing_in_notify_allowed()const {
    return my->conf.disable_all_subjective_mitigations || !is_producing_block() || my->conf.allow_ram_billing_in_notify;
 }
 
+uint32_t controller::configured_subjective_signature_length_limit()const {
+   return my->conf.maximum_variable_signature_length;
+}
+
 void controller::validate_expiration( const transaction& trx )const { try {
    const auto& chain_configuration = get_global_properties().configuration;
 
@@ -3072,6 +3078,13 @@ void controller_impl::on_activation<builtin_protocol_feature_t::replace_deferred
    }
 }
 
+template<>
+void controller_impl::on_activation<builtin_protocol_feature_t::webauthn_key>() {
+   db.modify( db.get<protocol_state_object>(), [&]( auto& ps ) {
+      ps.num_supported_key_types = 3;
+   } );
+}
+
 /// End of protocol feature activation handlers
 
 } } /// eosio::chain
diff --git a/libraries/chain/include/eosio/chain/authority.hpp b/libraries/chain/include/eosio/chain/authority.hpp
index e7a7307bb56..a23896ac17e 100644
--- a/libraries/chain/include/eosio/chain/authority.hpp
+++ b/libraries/chain/include/eosio/chain/authority.hpp
@@ -11,6 +11,78 @@
 
 namespace eosio { namespace chain {
 
+using shared_public_key_data = fc::static_variant<fc::ecc::public_key_shim, fc::crypto::r1::public_key_shim, shared_string>;
+
+template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+
+struct shared_public_key {
+   shared_public_key( shared_public_key_data&& p ) :
+      pubkey(std::move(p)) {}
+
+   operator public_key_type() const {
+      fc::crypto::public_key::storage_type public_key_storage;
+      pubkey.visit(overloaded {
+         [&](const auto& k1r1) {
+            public_key_storage = k1r1;
+         },
+         [&](const shared_string& wa) {
+            fc::datastream ds(wa.data(), wa.size());
+            fc::crypto::webauthn::public_key pub;
+            fc::raw::unpack(ds, pub);
+            public_key_storage = pub;
+         }
+      });
+      return std::move(public_key_storage);
+   }
+
+   operator string() const {
+      return (string)this->operator public_key_type();
+   }
+
+   shared_public_key_data pubkey;
+
+   friend bool operator == ( const shared_public_key& lhs, const shared_public_key& rhs ) {
+      if(lhs.pubkey.which() != rhs.pubkey.which())
+         return false;
+
+      return lhs.pubkey.visit<bool>(overloaded {
+         [&](const fc::ecc::public_key_shim& k1) {
+            return k1._data == rhs.pubkey.get<fc::ecc::public_key_shim>()._data;
+         },
+         [&](const fc::crypto::r1::public_key_shim& r1) {
+            return r1._data == rhs.pubkey.get<fc::crypto::r1::public_key_shim>()._data;
+         },
+         [&](const shared_string& wa) {
+            return wa == rhs.pubkey.get<shared_string>();
+         }
+      });
+   }
+
+   friend bool operator==(const shared_public_key& l, const public_key_type& r) {
+      if(l.pubkey.which() != r._storage.which())
+         return false;
+
+      return l.pubkey.visit<bool>(overloaded {
+         [&](const fc::ecc::public_key_shim& k1) {
+            return k1._data == r._storage.get<fc::ecc::public_key_shim>()._data;
+         },
+         [&](const fc::crypto::r1::public_key_shim& r1) {
+            return r1._data == r._storage.get<fc::crypto::r1::public_key_shim>()._data;
+         },
+         [&](const shared_string& wa) {
+            fc::datastream ds(wa.data(), wa.size());
+            fc::crypto::webauthn::public_key pub;
+            fc::raw::unpack(ds, pub);
+            return pub == r._storage.get<fc::crypto::webauthn::public_key>();
+         }
+      });
+   }
+
+   friend bool operator==(const public_key_type& l, const shared_public_key& r) {
+      return r == l;
+   }
+};
 
 struct permission_level_weight {
    permission_level  permission;
@@ -30,6 +102,23 @@ struct key_weight {
    }
 };
 
+
+struct shared_key_weight {
+   shared_key_weight(shared_public_key_data&& k, const weight_type& w) :
+      key(std::move(k)), weight(w) {}
+
+   operator key_weight() const {
+      return key_weight{key, weight};
+   }
+
+   shared_public_key key;
+   weight_type       weight;
+
+   friend bool operator == ( const shared_key_weight& lhs, const shared_key_weight& rhs ) {
+      return tie( lhs.key, lhs.weight ) == tie( rhs.key, rhs.weight );
+   }
+};
+
 struct wait_weight {
    uint32_t     wait_sec;
    weight_type  weight;
@@ -100,14 +189,31 @@ struct shared_authority {
 
    shared_authority& operator=(const authority& a) {
       threshold = a.threshold;
-      keys = decltype(keys)(a.keys.begin(), a.keys.end(), keys.get_allocator());
+      keys.clear();
+      keys.reserve(a.keys.size());
+      for(const key_weight& k : a.keys) {
+         k.key._storage.visit(overloaded {
+            [&](const auto& k1r1) {
+               keys.emplace_back(k1r1, k.weight);
+            },
+            [&](const fc::crypto::webauthn::public_key& wa) {
+               fc::datastream<size_t> dsz;
+               fc::raw::pack(dsz, wa);
+               shared_string wa_ss(dsz.tellp(), boost::container::default_init, keys.get_allocator());
+               fc::datastream<char*> ds(wa_ss.data(), wa_ss.size());
+               fc::raw::pack(ds, wa);
+
+               keys.emplace_back(std::move(wa_ss), k.weight);
+            }
+         });
+      }
       accounts = decltype(accounts)(a.accounts.begin(), a.accounts.end(), accounts.get_allocator());
       waits = decltype(waits)(a.waits.begin(), a.waits.end(), waits.get_allocator());
       return *this;
    }
 
    uint32_t                                   threshold = 0;
-   shared_vector<key_weight>                  keys;
+   shared_vector<shared_key_weight>           keys;
    shared_vector<permission_level_weight>     accounts;
    shared_vector<wait_weight>                 waits;
 
@@ -202,4 +308,6 @@ FC_REFLECT(eosio::chain::permission_level_weight, (permission)(weight) )
 FC_REFLECT(eosio::chain::key_weight, (key)(weight) )
 FC_REFLECT(eosio::chain::wait_weight, (wait_sec)(weight) )
 FC_REFLECT(eosio::chain::authority, (threshold)(keys)(accounts)(waits) )
+FC_REFLECT(eosio::chain::shared_key_weight, (key)(weight) )
 FC_REFLECT(eosio::chain::shared_authority, (threshold)(keys)(accounts)(waits) )
+FC_REFLECT(eosio::chain::shared_public_key, (pubkey))
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/authority_checker.hpp b/libraries/chain/include/eosio/chain/authority_checker.hpp
index f17eeac10bf..b89e3793264 100644
--- a/libraries/chain/include/eosio/chain/authority_checker.hpp
+++ b/libraries/chain/include/eosio/chain/authority_checker.hpp
@@ -21,7 +21,7 @@ namespace eosio { namespace chain {
 namespace detail {
 
    // Order of the template types in the static_variant matters to meta_permission_comparator.
-   using meta_permission = static_variant<permission_level_weight, key_weight, wait_weight>;
+   using meta_permission = static_variant<permission_level_weight, shared_key_weight, wait_weight>;
 
    struct get_weight_visitor {
       using result_type = uint32_t;
@@ -224,7 +224,7 @@ namespace detail {
                return total_weight;
             }
 
-            uint32_t operator()(const key_weight& permission) {
+            uint32_t operator()(const shared_key_weight& permission) {
                auto itr = boost::find( checker.provided_keys, permission.key );
                if( itr != checker.provided_keys.end() ) {
                   checker._used_keys[itr - checker.provided_keys.begin()] = true;
diff --git a/libraries/chain/include/eosio/chain/chain_snapshot.hpp b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
index 5546b301999..0e42bc64a42 100644
--- a/libraries/chain/include/eosio/chain/chain_snapshot.hpp
+++ b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
@@ -15,10 +15,12 @@ struct chain_snapshot_header {
     *   2: Updated chain snapshot for v1.8.0 initial protocol features release:
     *         - Incompatible with version 1.
     *         - Adds new indices for: protocol_state_object and account_ram_correction_object
+    *   3: Updated for v2.0.0 protocol features:
+    *         - WebAuthn keys
     */
 
    static constexpr uint32_t minimum_compatible_version = 2;
-   static constexpr uint32_t current_version = 2;
+   static constexpr uint32_t current_version = 3;
 
    uint32_t version = current_version;
 
diff --git a/libraries/chain/include/eosio/chain/config.hpp b/libraries/chain/include/eosio/chain/config.hpp
index 5e52c07c78c..32f423beebe 100644
--- a/libraries/chain/include/eosio/chain/config.hpp
+++ b/libraries/chain/include/eosio/chain/config.hpp
@@ -81,6 +81,7 @@ const static uint16_t   default_max_inline_action_depth        = 4;
 const static uint16_t   default_max_auth_depth                 = 6;
 const static uint32_t   default_sig_cpu_bill_pct               = 50 * percent_1; // billable percentage of signature recovery
 const static uint16_t   default_controller_thread_pool_size    = 2;
+const static uint32_t   default_max_variable_signature_length  = 16384u;
 
 const static uint32_t   min_net_usage_delta_between_base_and_max_for_trx  = 10*1024;
 // Should be large enough to allow recovery from badly set blockchain parameters without a hard fork
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index c7702d09414..82cfae54cc8 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -76,6 +76,7 @@ namespace eosio { namespace chain {
             bool                     disable_replay_opts    =  false;
             bool                     contracts_console      =  false;
             bool                     allow_ram_billing_in_notify = false;
+            uint32_t                 maximum_variable_signature_length = chain::config::default_max_variable_signature_length;
             bool                     disable_all_subjective_mitigations = false; //< for testing purposes only
 
             genesis_state            genesis;
@@ -240,6 +241,11 @@ namespace eosio { namespace chain {
 
          bool is_ram_billing_in_notify_allowed()const;
 
+         //This is only an accessor to the user configured subjective limit: i.e. it does not do a
+         // check similar to is_ram_billing_in_notify_allowed() to check if controller is currently
+         // producing a block
+         uint32_t configured_subjective_signature_length_limit()const;
+
          void add_resource_greylist(const account_name &name);
          void remove_resource_greylist(const account_name &name);
          bool is_resource_greylisted(const account_name &name) const;
diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index da34027826d..631b35b3cf5 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -198,6 +198,10 @@ namespace eosio { namespace chain {
                                     3010013, "Invalid fixed key" )
       FC_DECLARE_DERIVED_EXCEPTION( symbol_type_exception,           chain_type_exception,
                                     3010014, "Invalid symbol" )
+      FC_DECLARE_DERIVED_EXCEPTION( unactivated_key_type,              chain_type_exception,
+                                    3010015, "Key type is not a currently activated type" )
+      FC_DECLARE_DERIVED_EXCEPTION( unactivated_signature_type,        chain_type_exception,
+                                    3010016, "Signature type is not a currently activated type" )
 
 
    FC_DECLARE_DERIVED_EXCEPTION( fork_database_exception, chain_exception,
@@ -401,7 +405,8 @@ namespace eosio { namespace chain {
                                     3100008, "Feature is currently unsupported" )
       FC_DECLARE_DERIVED_EXCEPTION( node_management_success,                misc_exception,
                                     3100009, "Node management operation successfully executed" )
-
+      FC_DECLARE_DERIVED_EXCEPTION( sig_variable_size_limit_exception,      misc_exception,
+                                    3100010, "Variable length component of signature too large" )
 
 
    FC_DECLARE_DERIVED_EXCEPTION( plugin_exception, chain_exception,
diff --git a/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp b/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
index c2f0140433f..770b977eab9 100644
--- a/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
+++ b/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
@@ -24,7 +24,8 @@ enum class builtin_protocol_feature_t : uint32_t {
    only_bill_first_authorizer,
    forward_setcode,
    get_sender,
-   ram_restrictions
+   ram_restrictions,
+   webauthn_key
 };
 
 struct protocol_feature_subjective_restrictions {
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 9cb61f5a887..0a4f4202901 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -43,16 +43,23 @@ class transaction_metadata {
       transaction_metadata operator=(transaction_metadata&) = delete;
       transaction_metadata operator=(transaction_metadata&&) = delete;
 
-      explicit transaction_metadata( const signed_transaction& t, packed_transaction::compression_type c = packed_transaction::none )
+      explicit transaction_metadata( const signed_transaction& t, uint32_t max_variable_sig_size = UINT32_MAX, packed_transaction::compression_type c = packed_transaction::none )
             : _packed_trx( std::make_shared<packed_transaction>( t, c ) )
             , _id( t.id() )
             , _signed_id( digest_type::hash( *_packed_trx ) ) {
+         check_variable_sig_size(max_variable_sig_size);
       }
 
-      explicit transaction_metadata( const packed_transaction_ptr& ptrx )
+      explicit transaction_metadata( const packed_transaction_ptr& ptrx, uint32_t max_variable_sig_size = UINT32_MAX )
             : _packed_trx( ptrx )
             , _id( ptrx->id() )
             , _signed_id( digest_type::hash( *_packed_trx ) ) {
+         check_variable_sig_size(max_variable_sig_size);
+      }
+
+      void check_variable_sig_size(uint32_t max) {
+         for(const signature_type& sig : _packed_trx->get_signed_transaction().signatures)
+            EOS_ASSERT(sig.variable_size() <= max, sig_variable_size_limit_exception, "signature variable length component size (${s}) greater than subjective maximum (${m})", ("s", sig.variable_size())("m", max));
       }
 
       const packed_transaction_ptr& packed_trx()const { return _packed_trx; }
diff --git a/libraries/chain/protocol_feature_manager.cpp b/libraries/chain/protocol_feature_manager.cpp
index ca0457ce11d..57c3d74ba93 100644
--- a/libraries/chain/protocol_feature_manager.cpp
+++ b/libraries/chain/protocol_feature_manager.cpp
@@ -154,6 +154,17 @@ is not allowed to schedule a deferred transaction in which the RAM costs are pai
 unless that account authorized the action;
 but is allowed to execute database operations that increase RAM usage of an account other than the receiver as long as
 either the account authorized the action or the action's net effect on RAM usage for the account is to not increase it.
+*/
+            {}
+         } )
+         (  builtin_protocol_feature_t::webauthn_key, builtin_protocol_feature_spec{
+            "WEBAUTHN_KEY",
+            fc::variant("927fdf78c51e77a899f2db938249fb1f8bb38f4e43d9c1f75b190492080cbc34").as<digest_type>(),
+            // SHA256 hash of the raw message below within the comment delimiters (do not modify message below).
+/*
+Builtin protocol feature: WEBAUTHN_KEY
+
+Enables usage of WebAuthn keys and signatures.
 */
             {}
          } )
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index e2a731ca972..896b5818ce9 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -191,6 +191,8 @@ class privileged_api : public context_aware_api {
          std::set<account_name> unique_producers;
          for (const auto& p: producers) {
             EOS_ASSERT( context.is_account(p.producer_name), wasm_execution_error, "producer schedule includes a nonexisting account" );
+            EOS_ASSERT( p.block_signing_key.which() < context.db.get<protocol_state_object>().num_supported_key_types, unactivated_key_type,
+               "Unactivated key type used in proposed producer schedule");
             EOS_ASSERT( p.block_signing_key.valid(), wasm_execution_error, "producer schedule includes an invalid key" );
             unique_producers.insert(p.producer_name);
          }
@@ -734,6 +736,15 @@ class crypto_api : public context_aware_api {
          fc::raw::unpack(ds, s);
          fc::raw::unpack(pubds, p);
 
+         EOS_ASSERT(s.which() < context.db.get<protocol_state_object>().num_supported_key_types, unactivated_signature_type,
+           "Unactivated signature type used during assert_recover_key");
+         EOS_ASSERT(p.which() < context.db.get<protocol_state_object>().num_supported_key_types, unactivated_key_type,
+           "Unactivated key type used when creating assert_recover_key");
+
+         if(context.control.is_producing_block())
+            EOS_ASSERT(s.variable_size() <= context.control.configured_subjective_signature_length_limit(),
+                       sig_variable_size_limit_exception, "signature variable length component size greater than subjective maximum");
+
          auto check = fc::crypto::public_key( s, digest, false );
          EOS_ASSERT( check == p, crypto_api_exception, "Error expected key different than recovered key" );
       }
@@ -746,6 +757,14 @@ class crypto_api : public context_aware_api {
          datastream<char*> pubds( pub, publen );
 
          fc::raw::unpack(ds, s);
+
+         EOS_ASSERT(s.which() < context.db.get<protocol_state_object>().num_supported_key_types, unactivated_signature_type,
+           "Unactivated signature type used during recover_key");
+
+         if(context.control.is_producing_block())
+            EOS_ASSERT(s.variable_size() <= context.control.configured_subjective_signature_length_limit(),
+                       sig_variable_size_limit_exception, "signature variable length component size greater than subjective maximum");
+
          fc::raw::pack( pubds, fc::crypto::public_key( s, digest, false ) );
          return pubds.tellp();
       }
diff --git a/libraries/fc b/libraries/fc
index 5eb88e0f5c3..c1b833a2187 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 5eb88e0f5c3d2881ae31ee020d76ff7570fb8503
+Subproject commit c1b833a21871e13dfe9caf67dd6b9ef8023991eb
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index f4f0fe5f562..18fd352e248 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -232,6 +232,8 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
           "In \"light\" mode all incoming blocks headers will be fully validated; transactions in those validated blocks will be trusted \n")
          ("disable-ram-billing-notify-checks", bpo::bool_switch()->default_value(false),
           "Disable the check which subjectively fails a transaction if a contract bills more RAM to another account within the context of a notification handler (i.e. when the receiver is not the code of the action).")
+         ("maximum-variable-signature-length", bpo::value<uint32_t>()->default_value(16384u),
+          "Subjectively limit the maximum length of variable components in a variable legnth signature to this size in bytes")
          ("trusted-producer", bpo::value<vector<string>>()->composing(), "Indicate a producer whose blocks headers signed by it will be fully validated, but transactions in those validated blocks will be trusted.")
          ("database-map-mode", bpo::value<chainbase::pinnable_mapped_file::map_mode>()->default_value(chainbase::pinnable_mapped_file::map_mode::mapped),
           "Database map mode (\"mapped\", \"heap\", or \"locked\").\n"
@@ -655,6 +657,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
       my->chain_config->disable_replay_opts = options.at( "disable-replay-opts" ).as<bool>();
       my->chain_config->contracts_console = options.at( "contracts-console" ).as<bool>();
       my->chain_config->allow_ram_billing_in_notify = options.at( "disable-ram-billing-notify-checks" ).as<bool>();
+      my->chain_config->maximum_variable_signature_length = options.at( "maximum-variable-signature-length" ).as<uint32_t>();
 
       if( options.count( "extract-genesis-json" ) || options.at( "print-genesis-json" ).as<bool>()) {
          genesis_state gs;
@@ -1878,7 +1881,7 @@ void read_write::push_transaction(const read_write::push_transaction_params& par
       transaction_metadata_ptr ptrx;
       try {
          abi_serializer::from_variant(params, *pretty_input, resolver, abi_serializer_max_time);
-         ptrx = std::make_shared<transaction_metadata>( pretty_input );
+         ptrx = std::make_shared<transaction_metadata>( pretty_input, db.configured_subjective_signature_length_limit() );
       } EOS_RETHROW_EXCEPTIONS(chain::packed_transaction_type_exception, "Invalid packed transaction")
 
       app().get_method<incoming::methods::transaction_async>()(ptrx, true, [this, next](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& result) -> void{
@@ -1994,7 +1997,7 @@ void read_write::send_transaction(const read_write::send_transaction_params& par
       transaction_metadata_ptr ptrx;
       try {
          abi_serializer::from_variant(params, *pretty_input, resolver, abi_serializer_max_time);
-         ptrx = std::make_shared<transaction_metadata>( pretty_input );
+         ptrx = std::make_shared<transaction_metadata>( pretty_input, db.configured_subjective_signature_length_limit() );
       } EOS_RETHROW_EXCEPTIONS(chain::packed_transaction_type_exception, "Invalid packed transaction")
 
       app().get_method<incoming::methods::transaction_async>()(ptrx, true, [this, next](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& result) -> void{
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 00e68767fdc..a62dec52600 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2698,7 +2698,7 @@ namespace eosio {
          return;
       }
 
-      auto ptrx = std::make_shared<transaction_metadata>( trx );
+      auto ptrx = std::make_shared<transaction_metadata>( trx, my_impl->chain_plug->chain().configured_subjective_signature_length_limit() );
       const auto& tid = ptrx->id();
       peer_dlog( this, "received packed_transaction ${id}", ("id", tid) );
 
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index ddbb5fb6fe5..b1b07354170 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -349,8 +349,8 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
 }
 
 template <typename ST>
-datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::key_weight>& obj) {
-   fc::raw::pack(ds, as_type<eosio::chain::public_key_type>(obj.obj.key));
+datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosio::chain::shared_key_weight>& obj) {
+   fc::raw::pack(ds, as_type<eosio::chain::shared_public_key>(obj.obj.key));
    fc::raw::pack(ds, as_type<uint16_t>(obj.obj.weight));
    return ds;
 }
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index db1c3a19ec1..c4ebeff62e4 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -19,6 +19,7 @@
 
 using namespace eosio::chain;
 using namespace eosio::testing;
+using namespace std::literals;
 
 BOOST_AUTO_TEST_SUITE(protocol_feature_tests)
 
@@ -1328,4 +1329,182 @@ BOOST_AUTO_TEST_CASE( ram_restrictions_test ) { try {
 
 } FC_LOG_AND_RETHROW() }
 
+BOOST_AUTO_TEST_CASE( webauthn_producer ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest( builtin_protocol_feature_t::webauthn_key );
+   BOOST_REQUIRE( d );
+
+   c.create_account(N(waprod));
+   c.produce_block();
+
+   vector<producer_key> waprodsched = {{N(waprod), public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ponCFWxQTkDsMC"s)}};
+
+   BOOST_CHECK_THROW(
+      c.push_action(config::system_account_name, N(setprods), config::system_account_name, fc::mutable_variant_object()("schedule", waprodsched)),
+      eosio::chain::unactivated_key_type
+   );
+
+   c.preactivate_protocol_features( {*d} );
+   c.produce_block();
+
+   c.push_action(config::system_account_name, N(setprods), config::system_account_name, fc::mutable_variant_object()("schedule", waprodsched));
+} FC_LOG_AND_RETHROW() }
+
+BOOST_AUTO_TEST_CASE( webauthn_create_account ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::webauthn_key);
+   BOOST_REQUIRE(d);
+
+   signed_transaction trx;
+   c.set_transaction_headers(trx);
+   authority auth = authority(public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ponCFWxQTkDsMC"s));
+
+   trx.actions.emplace_back(vector<permission_level>{{config::system_account_name,config::active_name}},
+                              newaccount{
+                                 .creator  = config::system_account_name,
+                                 .name     = N(waaccount),
+                                 .owner    = auth,
+                                 .active   = auth,
+                              });
+
+   c.set_transaction_headers(trx);
+   trx.sign(get_private_key(config::system_account_name, "active"), c.control->get_chain_id());
+   BOOST_CHECK_THROW(c.push_transaction(trx), eosio::chain::unactivated_key_type);
+
+   c.preactivate_protocol_features( {*d} );
+   c.produce_block();
+   c.push_transaction(trx);
+} FC_LOG_AND_RETHROW() }
+
+BOOST_AUTO_TEST_CASE( webauthn_update_account_auth ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::webauthn_key);
+   BOOST_REQUIRE(d);
+
+   c.create_account(N(billy));
+   c.produce_block();
+
+   BOOST_CHECK_THROW(c.set_authority(N(billy), config::active_name,
+                        authority(public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ponCFWxQTkDsMC"s))),
+                     eosio::chain::unactivated_key_type);
+
+   c.preactivate_protocol_features( {*d} );
+   c.produce_block();
+
+   c.set_authority(N(billy), config::active_name, authority(public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ponCFWxQTkDsMC"s)));
+} FC_LOG_AND_RETHROW() }
+
+/*
+   For the following two recover_key wasm tests:
+   Given digest a2256be721c7d090ba13d6c37eee2a06c663473a40950d4f64f0a762dbe13d49
+   And signature SIG_WA_2AAAuLJS3pLPgkQQPqLsehL6VeRBaAZS7NYM91UYRUrSAEfUvzKN7DCSwhjsDqe74cZNWKUU
+                 GAHGG8ddSA7cvUxChbfKxLSrDCpwe6MVUqz4PDdyCt5tXhEJmKekxG1o1ucY3LVj8Vi9rRbzAkKPCzW
+                 qC8cPcUtpLHNG8qUKkQrN4Xuwa9W8rsBiUKwZv1ToLyVhLrJe42pvHYBXicp4E8qec5E4m6SX11KuXE
+                 RFcV48Mhiie2NyaxdtNtNzQ5XZ5hjBkxRujqejpF4SNHvdAGKRBbvhkiPLA25FD3xoCbrN26z72
+   Should recover to pubkey PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ponCFWxQTkDsMC
+*/
+
+static const char webauthn_recover_key_wast[] = R"=====(
+(module
+ (import "env" "recover_key" (func $recover_key (param i32 i32 i32 i32 i32) (result i32)))
+ (memory $0 1)
+ (export "apply" (func $apply))
+ (func $apply (param $0 i64) (param $1 i64) (param $2 i64)
+   (drop
+      (call $recover_key
+         (i32.const 8)
+         (i32.const 40)
+         (i32.const 220)
+         (i32.const 1024)
+         (i32.const 1024)
+      )
+   )
+ )
+ (data (i32.const 8) "\a2\25\6b\e7\21\c7\d0\90\ba\13\d6\c3\7e\ee\2a\06\c6\63\47\3a\40\95\0d\4f\64\f0\a7\62\db\e1\3d\49")
+ (data (i32.const 40) "\02\20\D9\13\2B\BD\B2\19\E4\E2\D9\9A\F9\C5\07\E3\59\7F\86\B6\15\81\4F\36\67\2D\50\10\34\86\17\92\BB\CF\21\A4\6D\1A\2E\B1\2B\AC\E4\A2\91\00\B9\42\F9\87\49\4F\3A\EF\C8\EF\B2\D5\AF\4D\4D\8D\E3\E0\87\15\25\AA\14\90\5A\F6\0C\A1\7A\1B\B8\0E\0C\F9\C3\B4\69\08\A0\F1\4F\72\56\7A\2F\14\0C\3A\3B\D2\EF\07\4C\01\00\00\00\6D\73\7B\22\6F\72\69\67\69\6E\22\3A\22\68\74\74\70\73\3A\2F\2F\6B\65\6F\73\64\2E\69\6E\76\61\6C\69\64\22\2C\22\74\79\70\65\22\3A\22\77\65\62\61\75\74\68\6E\2E\67\65\74\22\2C\22\63\68\61\6C\6C\65\6E\67\65\22\3A\22\6F\69\56\72\35\79\48\48\30\4A\43\36\45\39\62\44\66\75\34\71\42\73\5A\6A\52\7A\70\41\6C\51\31\50\5A\50\43\6E\59\74\76\68\50\55\6B\3D\22\7D")
+)
+)=====";
+
+BOOST_AUTO_TEST_CASE( webauthn_recover_key ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::webauthn_key);
+   BOOST_REQUIRE(d);
+
+   c.create_account(N(bob));
+   c.set_code(N(bob), webauthn_recover_key_wast);
+   c.produce_block();
+
+   signed_transaction trx;
+   action act;
+   act.account = N(bob);
+   act.name = N();
+   act.authorization = vector<permission_level>{{N(bob),config::active_name}};
+   trx.actions.push_back(act);
+
+   c.set_transaction_headers(trx);
+   trx.sign(c.get_private_key( N(bob), "active" ), c.control->get_chain_id());
+   BOOST_CHECK_THROW(c.push_transaction(trx), eosio::chain::unactivated_signature_type);
+
+   c.preactivate_protocol_features( {*d} );
+   c.produce_block();
+   c.push_transaction(trx);
+
+} FC_LOG_AND_RETHROW() }
+
+static const char webauthn_assert_recover_key_wast[] = R"=====(
+(module
+ (import "env" "assert_recover_key" (func $assert_recover_key (param i32 i32 i32 i32 i32)))
+ (memory $0 1)
+ (export "apply" (func $apply))
+ (func $apply (param $0 i64) (param $1 i64) (param $2 i64)
+   (call $assert_recover_key
+      (i32.const 8)
+      (i32.const 40)
+      (i32.const 220)
+      (i32.const 1024)
+      (i32.const 1024)
+   )
+ )
+ (data (i32.const 8) "\a2\25\6b\e7\21\c7\d0\90\ba\13\d6\c3\7e\ee\2a\06\c6\63\47\3a\40\95\0d\4f\64\f0\a7\62\db\e1\3d\49")
+ (data (i32.const 40) "\02\20\D9\13\2B\BD\B2\19\E4\E2\D9\9A\F9\C5\07\E3\59\7F\86\B6\15\81\4F\36\67\2D\50\10\34\86\17\92\BB\CF\21\A4\6D\1A\2E\B1\2B\AC\E4\A2\91\00\B9\42\F9\87\49\4F\3A\EF\C8\EF\B2\D5\AF\4D\4D\8D\E3\E0\87\15\25\AA\14\90\5A\F6\0C\A1\7A\1B\B8\0E\0C\F9\C3\B4\69\08\A0\F1\4F\72\56\7A\2F\14\0C\3A\3B\D2\EF\07\4C\01\00\00\00\6D\73\7B\22\6F\72\69\67\69\6E\22\3A\22\68\74\74\70\73\3A\2F\2F\6B\65\6F\73\64\2E\69\6E\76\61\6C\69\64\22\2C\22\74\79\70\65\22\3A\22\77\65\62\61\75\74\68\6E\2E\67\65\74\22\2C\22\63\68\61\6C\6C\65\6E\67\65\22\3A\22\6F\69\56\72\35\79\48\48\30\4A\43\36\45\39\62\44\66\75\34\71\42\73\5A\6A\52\7A\70\41\6C\51\31\50\5A\50\43\6E\59\74\76\68\50\55\6B\3D\22\7D")
+ (data (i32.const 1024) "\02\02\20\B9\DA\B5\12\E8\92\39\2A\44\A9\F4\1F\94\33\C9\FB\D8\0D\B8\64\E9\DF\58\89\C2\40\7D\B3\AC\BB\9F\01\0D\6B\65\6F\73\64\2E\69\6E\76\61\6C\69\64")
+)
+)=====";
+
+BOOST_AUTO_TEST_CASE( webauthn_assert_recover_key ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::webauthn_key);
+   BOOST_REQUIRE(d);
+
+   c.create_account(N(bob));
+   c.set_code(N(bob), webauthn_assert_recover_key_wast);
+   c.produce_block();
+
+   signed_transaction trx;
+   action act;
+   act.account = N(bob);
+   act.name = N();
+   act.authorization = vector<permission_level>{{N(bob),config::active_name}};
+   trx.actions.push_back(act);
+
+   c.set_transaction_headers(trx);
+   trx.sign(c.get_private_key( N(bob), "active" ), c.control->get_chain_id());
+   BOOST_CHECK_THROW(c.push_transaction(trx), eosio::chain::unactivated_signature_type);
+
+   c.preactivate_protocol_features( {*d} );
+   c.produce_block();
+   c.push_transaction(trx);
+
+} FC_LOG_AND_RETHROW() }
+
 BOOST_AUTO_TEST_SUITE_END()

From c8e95d09d8123802d10dbb84f9ba162942aeeaa7 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sat, 25 May 2019 21:44:47 -0400
Subject: [PATCH 0483/1648] refactored meta-permissions concept such that it
 does not create a copy of all the structures or rely on custom comparators. 
 It will now store the needed sorting information (where tiebreaking is
 explicit when constructing the map) and a lambda that evaluates the rest of
 the needs of `::satisfies(...)`.  This required making some changes to allow
 for any "key weight" type in the `weight_tally_visitor`.  The order of
 evaluation exactly matches the previous implementation.

---
 .../include/eosio/chain/authority_checker.hpp | 55 ++++++++-----------
 libraries/chain/include/eosio/chain/types.hpp |  8 +++
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/authority_checker.hpp b/libraries/chain/include/eosio/chain/authority_checker.hpp
index b89e3793264..f23404288df 100644
--- a/libraries/chain/include/eosio/chain/authority_checker.hpp
+++ b/libraries/chain/include/eosio/chain/authority_checker.hpp
@@ -19,31 +19,9 @@
 namespace eosio { namespace chain {
 
 namespace detail {
-
-   // Order of the template types in the static_variant matters to meta_permission_comparator.
-   using meta_permission = static_variant<permission_level_weight, shared_key_weight, wait_weight>;
-
-   struct get_weight_visitor {
-      using result_type = uint32_t;
-
-      template<typename Permission>
-      uint32_t operator()( const Permission& permission ) { return permission.weight; }
-   };
-
-   // Orders permissions descending by weight, and breaks ties with Wait permissions being less than
-   // Key permissions which are in turn less than Account permissions
-   struct meta_permission_comparator {
-      bool operator()( const meta_permission& lhs, const meta_permission& rhs ) const {
-         get_weight_visitor scale;
-         auto lhs_weight = lhs.visit(scale);
-         auto lhs_type   = lhs.which();
-         auto rhs_weight = rhs.visit(scale);
-         auto rhs_type   = rhs.which();
-         return std::tie( lhs_weight, lhs_type ) > std::tie( rhs_weight, rhs_type );
-      }
-   };
-
-   using meta_permission_set = boost::container::flat_multiset<meta_permission, meta_permission_comparator>;
+   using meta_permission_key = std::tuple<uint32_t, int>;
+   using meta_permission_value = std::function<uint32_t()>;
+   using meta_permission_map = boost::container::flat_multimap<meta_permission_key, meta_permission_value, std::greater<>>;
 
 } /// namespace detail
 
@@ -186,17 +164,27 @@ namespace detail {
             });
 
             // Sort key permissions and account permissions together into a single set of meta_permissions
-            detail::meta_permission_set permissions;
+            detail::meta_permission_map permissions;
 
-            permissions.insert(authority.waits.begin(), authority.waits.end());
-            permissions.insert(authority.keys.begin(), authority.keys.end());
-            permissions.insert(authority.accounts.begin(), authority.accounts.end());
+            weight_tally_visitor visitor(*this, cached_permissions, depth);
+            auto emplace_permission = [&permissions, &visitor](int priority, const auto& mp) {
+               permissions.emplace(
+                     std::make_tuple(mp.weight, priority),
+                     [&mp, &visitor]() {
+                        return visitor(mp);
+                     }
+               );
+            };
+
+            permissions.reserve(authority.waits.size() + authority.keys.size() + authority.accounts.size());
+            std::for_each(authority.accounts.begin(), authority.accounts.end(), boost::bind<void>(emplace_permission, 1, _1));
+            std::for_each(authority.keys.begin(), authority.keys.end(), boost::bind<void>(emplace_permission, 2, _1));
+            std::for_each(authority.waits.begin(), authority.waits.end(), boost::bind<void>(emplace_permission, 3, _1));
 
             // Check all permissions, from highest weight to lowest, seeing if provided authorization factors satisfies them or not
-            weight_tally_visitor visitor(*this, cached_permissions, depth);
-            for( const auto& permission : permissions )
+            for( const auto& p: permissions )
                // If we've got enough weight, to satisfy the authority, return!
-               if( permission.visit(visitor) >= authority.threshold ) {
+               if( p.second() >= authority.threshold ) {
                   KeyReverter.cancel();
                   return true;
                }
@@ -224,7 +212,8 @@ namespace detail {
                return total_weight;
             }
 
-            uint32_t operator()(const shared_key_weight& permission) {
+            template<typename KeyWeight, typename = std::enable_if_t<detail::is_any_of_v<KeyWeight, shared_key_weight, key_weight>>>
+            uint32_t operator()(const KeyWeight& permission) {
                auto itr = boost::find( checker.provided_keys, permission.key );
                if( itr != checker.provided_keys.end() ) {
                   checker._used_keys[itr - checker.provided_keys.begin()] = true;
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index d6323fbd23d..61632cba459 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -351,6 +351,14 @@ namespace eosio { namespace chain {
             return tail_t::template extract<ResultVariant>( id, data, result );
          }
       };
+
+      template<typename T, typename ... Ts>
+      struct is_any_of {
+         static constexpr bool value = std::disjunction_v<std::is_same<T, Ts>...>;
+      };
+
+      template<typename T, typename ... Ts>
+      constexpr bool is_any_of_v = is_any_of<T, Ts...>::value;
    }
 
    template<typename E, typename F>

From 847c546665ea2015b685b5b117aa051af35ddf4a Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Tue, 28 May 2019 17:18:46 +0800
Subject: [PATCH 0484/1648] txn json to file

---
 programs/cleos/main.cpp | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 2e319ac3eba..3171a33b72a 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -179,6 +179,7 @@ bool   tx_dont_broadcast = false;
 bool   tx_return_packed = false;
 bool   tx_skip_sign = false;
 bool   tx_print_json = false;
+string tx_json_save_file;
 bool   print_request = false;
 bool   print_response = false;
 bool   no_auto_keosd = false;
@@ -208,6 +209,7 @@ void add_standard_transaction_options(CLI::App* cmd, string default_permission =
    cmd->add_flag("-f,--force-unique", tx_force_unique, localized("force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times"));
    cmd->add_flag("-s,--skip-sign", tx_skip_sign, localized("Specify if unlocked wallet keys should be used to sign transaction"));
    cmd->add_flag("-j,--json", tx_print_json, localized("print result as json"));
+   cmd->add_option("--json-file", tx_json_save_file, localized("save result in json format into a file"));
    cmd->add_flag("-d,--dont-broadcast", tx_dont_broadcast, localized("don't broadcast transaction to the network (just print to stdout)"));
    cmd->add_flag("--return-packed", tx_return_packed, localized("used in conjunction with --dont-broadcast to get the packed transaction"));
    cmd->add_option("-r,--ref-block", tx_ref_block_num_or_id, (localized("set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)")));
@@ -503,8 +505,19 @@ using std::cout;
 void send_actions(std::vector<chain::action>&& actions, packed_transaction::compression_type compression = packed_transaction::none ) {
    auto result = push_actions( move(actions), compression);
 
+   string jsonstr;
+   if (tx_json_save_file.length()) {
+      if (jsonstr.length() == 0) {
+         jsonstr = fc::json::to_pretty_string( result );
+      }
+      std::ofstream out(tx_json_save_file);
+      out << jsonstr;
+   }
    if( tx_print_json ) {
-      cout << fc::json::to_pretty_string( result ) << endl;
+      if (jsonstr.length() == 0) {
+         jsonstr = fc::json::to_pretty_string( result );
+      }
+      cout << jsonstr << endl;
    } else {
       print_result( result );
    }
@@ -513,8 +526,19 @@ void send_actions(std::vector<chain::action>&& actions, packed_transaction::comp
 void send_transaction( signed_transaction& trx, packed_transaction::compression_type compression = packed_transaction::none  ) {
    auto result = push_transaction(trx, compression);
 
+   string jsonstr;
+   if (tx_json_save_file.length()) {
+      if (jsonstr.length() == 0) {
+         jsonstr = fc::json::to_pretty_string( result );
+      }
+      std::ofstream out(tx_json_save_file);
+      out << jsonstr;
+   }
    if( tx_print_json ) {
-      cout << fc::json::to_pretty_string( result ) << endl;
+      if (jsonstr.length() == 0) {
+         jsonstr = fc::json::to_pretty_string( result );
+      }
+      cout << jsonstr << endl;
    } else {
       print_result( result );
    }

From 629e9559665e00f9b2f7f9533b34a37210cece48 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 28 May 2019 11:02:34 -0400
Subject: [PATCH 0485/1648] update testnet.template to use the least encumbered
 but upgradable bios

---
 testnet.template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testnet.template b/testnet.template
index 574d7ec9795..efdfd56004e 100644
--- a/testnet.template
+++ b/testnet.template
@@ -14,7 +14,9 @@ fi
 
 bioscontractpath=$BIOS_CONTRACT_PATH
 if [ -z "$bioscontractpath" ]; then
-    bioscontractpath="unittests/contracts/eosio.bios"
+    # this is defaulted to the version of bios that only requires the preactivate_feature
+    # newer versions may require 
+    bioscontractpath="unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/"
 fi
 
 wddir=eosio-ignition-wd

From e290544fad1769f11606171f3c35b4bef613bc90 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 28 May 2019 15:36:40 -0400
Subject: [PATCH 0486/1648] fc bump

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index c1b833a2187..d4e9a88e478 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit c1b833a21871e13dfe9caf67dd6b9ef8023991eb
+Subproject commit d4e9a88e478cb0a4bb34ccc6d33464d7c2cbf7d0

From 4778001edf771cdaa9617f2accea53282258e8b1 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 28 May 2019 16:47:53 -0400
Subject: [PATCH 0487/1648] fix compile errors and semantic errors from merge

---
 .../chain/include/eosio/chain/authority.hpp   | 32 +++++++++++--------
 .../include/eosio/chain/producer_schedule.hpp |  6 ++--
 .../state_history_serialization.hpp           |  2 +-
 unittests/protocol_feature_tests.cpp          |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/authority.hpp b/libraries/chain/include/eosio/chain/authority.hpp
index a23896ac17e..ecc671771ff 100644
--- a/libraries/chain/include/eosio/chain/authority.hpp
+++ b/libraries/chain/include/eosio/chain/authority.hpp
@@ -111,6 +111,23 @@ struct shared_key_weight {
       return key_weight{key, weight};
    }
 
+   static shared_key_weight convert(chainbase::allocator<char> allocator, const key_weight& k) {
+      return k.key._storage.visit<shared_key_weight>(overloaded {
+         [&](const auto& k1r1) {
+            return shared_key_weight(k1r1, k.weight);
+         },
+         [&](const fc::crypto::webauthn::public_key& wa) {
+            fc::datastream<size_t> dsz;
+            fc::raw::pack(dsz, wa);
+            shared_string wa_ss(dsz.tellp(), boost::container::default_init, std::move(allocator));
+            fc::datastream<char*> ds(wa_ss.data(), wa_ss.size());
+            fc::raw::pack(ds, wa);
+
+            return shared_key_weight(std::move(wa_ss), k.weight);
+         }
+      });
+   }
+
    shared_public_key key;
    weight_type       weight;
 
@@ -192,20 +209,7 @@ struct shared_authority {
       keys.clear();
       keys.reserve(a.keys.size());
       for(const key_weight& k : a.keys) {
-         k.key._storage.visit(overloaded {
-            [&](const auto& k1r1) {
-               keys.emplace_back(k1r1, k.weight);
-            },
-            [&](const fc::crypto::webauthn::public_key& wa) {
-               fc::datastream<size_t> dsz;
-               fc::raw::pack(dsz, wa);
-               shared_string wa_ss(dsz.tellp(), boost::container::default_init, keys.get_allocator());
-               fc::datastream<char*> ds(wa_ss.data(), wa_ss.size());
-               fc::raw::pack(ds, wa);
-
-               keys.emplace_back(std::move(wa_ss), k.weight);
-            }
-         });
+         keys.emplace_back(shared_key_weight::convert(keys.get_allocator(), k));
       }
       accounts = decltype(accounts)(a.accounts.begin(), a.accounts.end(), accounts.get_allocator());
       waits = decltype(waits)(a.waits.begin(), a.waits.end(), waits.get_allocator());
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index 9ca24d70e6d..501342ebb41 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -139,8 +139,8 @@ namespace eosio { namespace chain {
       shared_block_signing_authority_v0( chainbase::allocator<char> alloc )
       :keys(alloc){}
 
-      uint32_t                    threshold;
-      shared_vector<key_weight>   keys;
+      uint32_t                           threshold;
+      shared_vector<shared_key_weight>   keys;
 
       friend bool operator == ( const shared_block_signing_authority_v0& lhs, const shared_block_signing_authority_v0& rhs ) {
          return tie( lhs.threshold, lhs.keys ) == tie( rhs.threshold, rhs.keys );
@@ -197,7 +197,7 @@ namespace eosio { namespace chain {
             result.keys.clear();
             result.keys.reserve(src.keys.size());
             for (const auto& k: src.keys) {
-               result.keys.push_back(k);
+               result.keys.emplace_back(shared_key_weight::convert(alloc, k));
             }
 
             return result;
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index a485e033c3f..96e1bb76662 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -273,7 +273,7 @@ datastream<ST>& operator<<(datastream<ST>& ds,
                            const history_serial_wrapper<eosio::chain::shared_block_signing_authority_v0>& obj) {
    fc::raw::pack(ds, as_type<uint32_t>(obj.obj.threshold));
    history_serialize_container(ds, obj.db,
-                               as_type<eosio::chain::shared_vector<eosio::chain::key_weight>>(obj.obj.keys));
+                               as_type<eosio::chain::shared_vector<eosio::chain::shared_key_weight>>(obj.obj.keys));
 
 }
 
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index 4bb5945e546..fc905f92790 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -1339,7 +1339,7 @@ BOOST_AUTO_TEST_CASE( webauthn_producer ) { try {
    c.create_account(N(waprod));
    c.produce_block();
 
-   vector<producer_key> waprodsched = {{N(waprod), public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ponCFWxQTkDsMC"s)}};
+   vector<producer_authority> waprodsched = {{N(waprod), block_signing_authority_v0{ 1, { {public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ßonCFWxQTkDsMC"s), 1} } } } };
 
    BOOST_CHECK_THROW(
       c.push_action(config::system_account_name, N(setprods), config::system_account_name, fc::mutable_variant_object()("schedule", waprodsched)),

From 0d91d0a793ec1c846337c4f38aebf228acd9cebd Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 28 May 2019 18:17:18 -0400
Subject: [PATCH 0488/1648] convert test back to legacy producer keys

---
 unittests/protocol_feature_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index fc905f92790..8c07c062a06 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -1339,7 +1339,7 @@ BOOST_AUTO_TEST_CASE( webauthn_producer ) { try {
    c.create_account(N(waprod));
    c.produce_block();
 
-   vector<producer_authority> waprodsched = {{N(waprod), block_signing_authority_v0{ 1, { {public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ßonCFWxQTkDsMC"s), 1} } } } };
+   vector<legacy::producer_key> waprodsched = {{N(waprod), public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ßonCFWxQTkDsMC"s)}};
 
    BOOST_CHECK_THROW(
       c.push_action(config::system_account_name, N(setprods), config::system_account_name, fc::mutable_variant_object()("schedule", waprodsched)),

From 4b3a43184f6e6d341173664282e69baae2b385e3 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 28 May 2019 18:45:10 -0400
Subject: [PATCH 0489/1648] update packed_transaction::compression_type to be
 an enum class and avoid implicit casting to uint.  Also fix drift in tester
 that was passing compression_type as the subjective limit for signatures

---
 .../chain/include/eosio/chain/transaction.hpp |  6 +++---
 .../eosio/chain/transaction_metadata.hpp      |  2 +-
 libraries/chain/transaction.cpp               | 20 +++++++++----------
 libraries/testing/tester.cpp                  |  6 +++---
 plugins/net_plugin/net_plugin.cpp             |  2 +-
 programs/cleos/main.cpp                       | 20 +++++++++----------
 unittests/misc_tests.cpp                      | 16 +++++++--------
 7 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction.hpp b/libraries/chain/include/eosio/chain/transaction.hpp
index 8f103eb6601..6322d4aa2c5 100644
--- a/libraries/chain/include/eosio/chain/transaction.hpp
+++ b/libraries/chain/include/eosio/chain/transaction.hpp
@@ -138,7 +138,7 @@ namespace eosio { namespace chain {
    };
 
    struct packed_transaction : fc::reflect_init {
-      enum compression_type {
+      enum class compression_type {
          none = 0,
          zlib = 1,
       };
@@ -149,14 +149,14 @@ namespace eosio { namespace chain {
       packed_transaction& operator=(const packed_transaction&) = delete;
       packed_transaction& operator=(packed_transaction&&) = default;
 
-      explicit packed_transaction(const signed_transaction& t, compression_type _compression = none)
+      explicit packed_transaction(const signed_transaction& t, compression_type _compression = compression_type::none)
       :signatures(t.signatures), compression(_compression), unpacked_trx(t)
       {
          local_pack_transaction();
          local_pack_context_free_data();
       }
 
-      explicit packed_transaction(signed_transaction&& t, compression_type _compression = none)
+      explicit packed_transaction(signed_transaction&& t, compression_type _compression = compression_type::none)
       :signatures(t.signatures), compression(_compression), unpacked_trx(std::move(t))
       {
          local_pack_transaction();
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 0a4f4202901..bb151ea0aca 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -43,7 +43,7 @@ class transaction_metadata {
       transaction_metadata operator=(transaction_metadata&) = delete;
       transaction_metadata operator=(transaction_metadata&&) = delete;
 
-      explicit transaction_metadata( const signed_transaction& t, uint32_t max_variable_sig_size = UINT32_MAX, packed_transaction::compression_type c = packed_transaction::none )
+      explicit transaction_metadata( const signed_transaction& t, uint32_t max_variable_sig_size = UINT32_MAX, packed_transaction::compression_type c = packed_transaction::compression_type::none )
             : _packed_trx( std::make_shared<packed_transaction>( t, c ) )
             , _id( t.id() )
             , _signed_id( digest_type::hash( *_packed_trx ) ) {
diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index 1e07f803066..1c8bddfcca7 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -328,9 +328,9 @@ bytes packed_transaction::get_raw_transaction() const
 {
    try {
       switch(compression) {
-         case none:
+         case compression_type::none:
             return packed_trx;
-         case zlib:
+         case compression_type::zlib:
             return zlib_decompress(packed_trx);
          default:
             EOS_THROW(unknown_transaction_compression, "Unknown transaction compression algorithm");
@@ -387,10 +387,10 @@ void packed_transaction::local_unpack_transaction(vector<bytes>&& context_free_d
 {
    try {
       switch( compression ) {
-         case none:
+         case compression_type::none:
             unpacked_trx = signed_transaction( unpack_transaction( packed_trx ), signatures, std::move(context_free_data) );
             break;
-         case zlib:
+         case compression_type::zlib:
             unpacked_trx = signed_transaction( zlib_decompress_transaction( packed_trx ), signatures, std::move(context_free_data) );
             break;
          default:
@@ -404,10 +404,10 @@ void packed_transaction::local_unpack_context_free_data()
    try {
       EOS_ASSERT(unpacked_trx.context_free_data.empty(), tx_decompression_error, "packed_transaction.context_free_data not empty");
       switch( compression ) {
-         case none:
+         case compression_type::none:
             unpacked_trx.context_free_data = unpack_context_free_data( packed_context_free_data );
             break;
-         case zlib:
+         case compression_type::zlib:
             unpacked_trx.context_free_data = zlib_decompress_context_free_data( packed_context_free_data );
             break;
          default:
@@ -420,10 +420,10 @@ void packed_transaction::local_pack_transaction()
 {
    try {
       switch(compression) {
-         case none:
+         case compression_type::none:
             packed_trx = pack_transaction(unpacked_trx);
             break;
-         case zlib:
+         case compression_type::zlib:
             packed_trx = zlib_compress_transaction(unpacked_trx);
             break;
          default:
@@ -436,10 +436,10 @@ void packed_transaction::local_pack_context_free_data()
 {
    try {
       switch(compression) {
-         case none:
+         case compression_type::none:
             packed_context_free_data = pack_context_free_data(unpacked_trx.context_free_data);
             break;
-         case zlib:
+         case compression_type::zlib:
             packed_context_free_data = zlib_compress_context_free_data(unpacked_trx.context_free_data);
             break;
          default:
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 8173849b584..bb3ff700a89 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -466,16 +466,16 @@ namespace eosio { namespace testing {
    { try {
       if( !control->is_building_block() )
          _start_block(control->head_block_time() + fc::microseconds(config::block_interval_us));
-      auto c = packed_transaction::none;
+      auto c = packed_transaction::compression_type::none;
 
       if( fc::raw::pack_size(trx) > 1000 ) {
-         c = packed_transaction::zlib;
+         c = packed_transaction::compression_type::zlib;
       }
 
       auto time_limit = deadline == fc::time_point::maximum() ?
             fc::microseconds::maximum() :
             fc::microseconds( deadline - fc::time_point::now() );
-      auto mtrx = std::make_shared<transaction_metadata>(trx, c);
+      auto mtrx = std::make_shared<transaction_metadata>(trx, UINT32_MAX, c);
       transaction_metadata::start_recover_keys( mtrx, control->get_thread_pool(), control->get_chain_id(), time_limit );
       auto r = control->push_transaction( mtrx, deadline, billed_cpu_time_us );
       if (no_throw) return r;
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a62dec52600..b06d03a79ab 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2592,7 +2592,7 @@ namespace eosio {
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
       }
       switch (msg.known_trx.mode) {
-      case none:
+      case compression_type::none:
          break;
       case last_irr_catch_up: {
          std::unique_lock<std::mutex> g_conn( conn_mtx );
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 2e319ac3eba..f042d61cebd 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -305,7 +305,7 @@ void sign_transaction(signed_transaction& trx, fc::variant& required_keys, const
    trx = signed_trx.as<signed_transaction>();
 }
 
-fc::variant push_transaction( signed_transaction& trx, packed_transaction::compression_type compression = packed_transaction::none ) {
+fc::variant push_transaction( signed_transaction& trx, packed_transaction::compression_type compression = packed_transaction::compression_type::none ) {
    auto info = get_info();
 
    if (trx.signatures.size() == 0) { // #5445 can't change txn content if already signed
@@ -347,7 +347,7 @@ fc::variant push_transaction( signed_transaction& trx, packed_transaction::compr
    }
 }
 
-fc::variant push_actions(std::vector<chain::action>&& actions, packed_transaction::compression_type compression = packed_transaction::none ) {
+fc::variant push_actions(std::vector<chain::action>&& actions, packed_transaction::compression_type compression = packed_transaction::compression_type::none ) {
    signed_transaction trx;
    trx.actions = std::forward<decltype(actions)>(actions);
 
@@ -500,7 +500,7 @@ void print_result( const fc::variant& result ) { try {
 } FC_CAPTURE_AND_RETHROW( (result) ) }
 
 using std::cout;
-void send_actions(std::vector<chain::action>&& actions, packed_transaction::compression_type compression = packed_transaction::none ) {
+void send_actions(std::vector<chain::action>&& actions, packed_transaction::compression_type compression = packed_transaction::compression_type::none ) {
    auto result = push_actions( move(actions), compression);
 
    if( tx_print_json ) {
@@ -510,7 +510,7 @@ void send_actions(std::vector<chain::action>&& actions, packed_transaction::comp
    }
 }
 
-void send_transaction( signed_transaction& trx, packed_transaction::compression_type compression = packed_transaction::none  ) {
+void send_transaction( signed_transaction& trx, packed_transaction::compression_type compression = packed_transaction::compression_type::none  ) {
    auto result = push_transaction(trx, compression);
 
    if( tx_print_json ) {
@@ -2422,11 +2422,11 @@ int main( int argc, char** argv ) {
       if( pack_action_data_flag ) {
          signed_transaction trx;
          abi_serializer::from_variant( trx_var, trx, abi_serializer_resolver, abi_serializer_max_time );
-         std::cout << fc::json::to_pretty_string( packed_transaction( trx, packed_transaction::none )) << std::endl;
+         std::cout << fc::json::to_pretty_string( packed_transaction( trx, packed_transaction::compression_type::none )) << std::endl;
       } else {
          try {
             signed_transaction trx = trx_var.as<signed_transaction>();
-            std::cout << fc::json::to_pretty_string( fc::variant( packed_transaction( trx, packed_transaction::none ))) << std::endl;
+            std::cout << fc::json::to_pretty_string( fc::variant( packed_transaction( trx, packed_transaction::compression_type::none ))) << std::endl;
          } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Fail to convert transaction, --pack-action-data likely needed" )
       }
    });
@@ -2986,7 +2986,7 @@ int main( int argc, char** argv ) {
          actions.emplace_back( create_setcode(name(account), code_bytes ) );
          if ( shouldSend ) {
             std::cerr << localized("Setting Code...") << std::endl;
-            send_actions(std::move(actions), packed_transaction::zlib);
+            send_actions(std::move(actions), packed_transaction::compression_type::zlib);
          }
       } else {
          std::cerr << localized("Skipping set code because the new code is the same as the existing code") << std::endl;
@@ -3034,7 +3034,7 @@ int main( int argc, char** argv ) {
          } EOS_RETHROW_EXCEPTIONS(abi_type_exception,  "Fail to parse ABI JSON")
          if ( shouldSend ) {
             std::cerr << localized("Setting ABI...") << std::endl;
-            send_actions(std::move(actions), packed_transaction::zlib);
+            send_actions(std::move(actions), packed_transaction::compression_type::zlib);
          }
       } else {
          std::cerr << localized("Skipping set abi because the new abi is the same as the existing abi") << std::endl;
@@ -3051,7 +3051,7 @@ int main( int argc, char** argv ) {
       set_abi_callback();
       if (actions.size()) {
          std::cerr << localized("Publishing contract...") << std::endl;
-         send_actions(std::move(actions), packed_transaction::zlib);
+         send_actions(std::move(actions), packed_transaction::compression_type::zlib);
       } else {
          std::cout << "no transaction is sent" << std::endl;
       }
@@ -3332,7 +3332,7 @@ int main( int argc, char** argv ) {
       trx.sign(priv_key, *chain_id);
 
       if(push_trx) {
-         auto trx_result = call(push_txn_func, packed_transaction(trx, packed_transaction::none));
+         auto trx_result = call(push_txn_func, packed_transaction(trx, packed_transaction::compression_type::none));
          std::cout << fc::json::to_pretty_string(trx_result) << std::endl;
       } else {
          std::cout << fc::json::to_pretty_string(trx) << std::endl;
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index fefed60a03a..c687e38a2d9 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -686,9 +686,9 @@ BOOST_AUTO_TEST_CASE(transaction_test) { try {
    BOOST_CHECK_EQUAL(1u, trx.signatures.size());
    trx.validate();
 
-   packed_transaction pkt(trx, packed_transaction::none);
+   packed_transaction pkt(trx, packed_transaction::compression_type::none);
 
-   packed_transaction pkt2(trx, packed_transaction::zlib);
+   packed_transaction pkt2(trx, packed_transaction::compression_type::zlib);
 
    BOOST_CHECK_EQUAL(true, trx.expiration ==  pkt.expiration());
    BOOST_CHECK_EQUAL(true, trx.expiration == pkt2.expiration());
@@ -829,11 +829,11 @@ BOOST_AUTO_TEST_CASE(transaction_metadata_test) { try {
       trx.sign( private_key, test.control->get_chain_id()  );
       BOOST_CHECK_EQUAL(1u, trx.signatures.size());
 
-      packed_transaction pkt(trx, packed_transaction::none);
-      packed_transaction pkt2(trx, packed_transaction::zlib);
+      packed_transaction pkt(trx, packed_transaction::compression_type::none);
+      packed_transaction pkt2(trx, packed_transaction::compression_type::zlib);
 
-      transaction_metadata_ptr mtrx = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::none) );
-      transaction_metadata_ptr mtrx2 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::zlib) );
+      transaction_metadata_ptr mtrx = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::none) );
+      transaction_metadata_ptr mtrx2 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::zlib) );
 
       BOOST_CHECK_EQUAL(trx.id(), pkt.id());
       BOOST_CHECK_EQUAL(trx.id(), pkt2.id());
@@ -863,8 +863,8 @@ BOOST_AUTO_TEST_CASE(transaction_metadata_test) { try {
       BOOST_CHECK_EQUAL(public_key, *keys3.second->begin());
 
       // recover keys without first calling start_recover_keys
-      transaction_metadata_ptr mtrx4 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::none) );
-      transaction_metadata_ptr mtrx5 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::zlib) );
+      transaction_metadata_ptr mtrx4 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::none) );
+      transaction_metadata_ptr mtrx5 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::zlib) );
 
       auto keys4 = mtrx4->recover_keys( test.control->get_chain_id() );
       BOOST_CHECK_EQUAL(1u, keys4.second->size());

From 5fc5d4a2fa0f0ff5a92eb03199f760b26219127c Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 28 May 2019 18:54:46 -0400
Subject: [PATCH 0490/1648] botched a enum class change

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b06d03a79ab..6eb0c167417 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2592,7 +2592,7 @@ namespace eosio {
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
       }
       switch (msg.known_trx.mode) {
-      case compression_type::none:
+      case packed_transaction::compression_type::none:
          break;
       case last_irr_catch_up: {
          std::unique_lock<std::mutex> g_conn( conn_mtx );

From 1b8b8808863ab89e75bc76ed2becd3e4d42c1751 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 28 May 2019 19:03:10 -0400
Subject: [PATCH 0491/1648] fix a bad search and replace, that I doubled down
 on in verbosity...

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6eb0c167417..a62dec52600 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2592,7 +2592,7 @@ namespace eosio {
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );
       }
       switch (msg.known_trx.mode) {
-      case packed_transaction::compression_type::none:
+      case none:
          break;
       case last_irr_catch_up: {
          std::unique_lock<std::mutex> g_conn( conn_mtx );

From 009bc4d9b21d1831489f1dca9eca62595ea33a7d Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Wed, 29 May 2019 10:50:09 +0800
Subject: [PATCH 0492/1648] Add option for cleos sign subcommand to ask keosd
 for signing

---
 programs/cleos/main.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 2e319ac3eba..fe694973a1e 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -3299,16 +3299,22 @@ int main( int argc, char** argv ) {
    string trx_json_to_sign;
    string str_private_key;
    string str_chain_id;
+   string str_private_key_file;
+   string str_keosd_pub_key;
    bool push_trx = false;
 
    auto sign = app.add_subcommand("sign", localized("Sign a transaction"), false);
    sign->add_option("transaction", trx_json_to_sign,
                                  localized("The JSON string or filename defining the transaction to sign"), true)->required();
    sign->add_option("-k,--private-key", str_private_key, localized("The private key that will be used to sign the transaction"));
+   sign->add_option("-w,--wallet", str_keosd_pub_key, localized("Ask keosd to sign with the given public key"));
    sign->add_option("-c,--chain-id", str_chain_id, localized("The chain id that will be used to sign the transaction"));
    sign->add_flag( "-p,--push-transaction", push_trx, localized("Push transaction after signing"));
 
    sign->set_callback([&] {
+
+      EOSC_ASSERT( str_private_key.empty() || str_keosd_pub_key.empty(), "ERROR: Either -k/--private-key or -w/--wallet or none of them can be set" );
+
       signed_transaction trx = json_from_file_or_string(trx_json_to_sign).as<signed_transaction>();
 
       fc::optional<chain_id_type> chain_id;
@@ -3321,16 +3327,26 @@ int main( int argc, char** argv ) {
          chain_id = chain_id_type(str_chain_id);
       }
 
-      if( str_private_key.size() == 0 ) {
+      if( str_private_key.size() > 0 ) {
+         private_key_type priv_key;
+         try {
+            priv_key = private_key_type(str_private_key);
+         } EOS_RETHROW_EXCEPTIONS(private_key_type_exception, "Invalid private key: ${private_key}", ("private_key", str_private_key))
+         trx.sign(priv_key, *chain_id);
+      } else if( str_keosd_pub_key.size() > 0 ) {
+         public_key_type pub_key;
+         try {
+            pub_key = public_key_type(str_keosd_pub_key);
+         } EOS_RETHROW_EXCEPTIONS(public_key_type_exception, "Invalid public key: ${public_key}", ("public_key", str_keosd_pub_key))
+         fc::variant keys_var(flat_set<public_key_type>{ pub_key });
+         sign_transaction(trx, keys_var, *chain_id);
+      } else {
          std::cerr << localized("private key: ");
          fc::set_console_echo(false);
          std::getline( std::cin, str_private_key, '\n' );
          fc::set_console_echo(true);
       }
 
-      auto priv_key = private_key_type(str_private_key);
-      trx.sign(priv_key, *chain_id);
-
       if(push_trx) {
          auto trx_result = call(push_txn_func, packed_transaction(trx, packed_transaction::none));
          std::cout << fc::json::to_pretty_string(trx_result) << std::endl;

From 74483c3f1c3dfdaaa4d2f43b86bef3fd297b0cb9 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Wed, 29 May 2019 13:52:56 +0800
Subject: [PATCH 0493/1648] no need to start keosd for convert

---
 programs/cleos/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 2e319ac3eba..6eeb2aacd3c 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -888,8 +888,8 @@ void try_local_port(uint32_t duration) {
 void ensure_keosd_running(CLI::App* app) {
     if (no_auto_keosd)
         return;
-    // get, version, net do not require keosd
-    if (tx_skip_sign || app->got_subcommand("get") || app->got_subcommand("version") || app->got_subcommand("net"))
+    // get, version, net, convert do not require keosd
+    if (tx_skip_sign || app->got_subcommand("get") || app->got_subcommand("version") || app->got_subcommand("net") || app->got_subcommand("convert"))
         return;
     if (app->get_subcommand("create")->got_subcommand("key")) // create key does not require wallet
        return;

From 25212afd198f81771ba7123818259ba4fa2f0845 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Wed, 29 May 2019 14:21:22 +0800
Subject: [PATCH 0494/1648] no need to start keosd for cleos multisig review

---
 programs/cleos/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 6eeb2aacd3c..2388fe5f85f 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -893,6 +893,8 @@ void ensure_keosd_running(CLI::App* app) {
         return;
     if (app->get_subcommand("create")->got_subcommand("key")) // create key does not require wallet
        return;
+    if (app->get_subcommand("multisig")->got_subcommand("review")) // multisig review does not require wallet
+       return;
     if (auto* subapp = app->get_subcommand("system")) {
        if (subapp->got_subcommand("listproducers") || subapp->got_subcommand("listbw") || subapp->got_subcommand("bidnameinfo")) // system list* do not require wallet
          return;

From e91a7e06ffb18bce46e54afea58c20e33e733064 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Wed, 29 May 2019 09:03:24 -0400
Subject: [PATCH 0495/1648] fix errant unicode typo that I introduced

---
 unittests/protocol_feature_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index 8c07c062a06..d97534ea5a0 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -1339,7 +1339,7 @@ BOOST_AUTO_TEST_CASE( webauthn_producer ) { try {
    c.create_account(N(waprod));
    c.produce_block();
 
-   vector<legacy::producer_key> waprodsched = {{N(waprod), public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ßonCFWxQTkDsMC"s)}};
+   vector<legacy::producer_key> waprodsched = {{N(waprod), public_key_type("PUB_WA_WdCPfafVNxVMiW5ybdNs83oWjenQXvSt1F49fg9mv7qrCiRwHj5b38U3ponCFWxQTkDsMC"s)}};
 
    BOOST_CHECK_THROW(
       c.push_action(config::system_account_name, N(setprods), config::system_account_name, fc::mutable_variant_object()("schedule", waprodsched)),

From e5fcca3352b6a5a9b9607e6bf6c034ea2c7e5d42 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Wed, 29 May 2019 09:12:36 -0400
Subject: [PATCH 0496/1648] update more test drivers for preactivate bios w/o
 producer authorities

---
 tests/Cluster.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Cluster.py b/tests/Cluster.py
index 1ba4b64d749..1b40aaecae1 100644
--- a/tests/Cluster.py
+++ b/tests/Cluster.py
@@ -951,7 +951,7 @@ def bios_bootstrap(self, biosNode, totalNodes, pfSetupPolicy, silent=False):
             "FEATURE_DIGESTS": ""
         }
         if PFSetupPolicy.hasPreactivateFeature(pfSetupPolicy):
-            env["BIOS_CONTRACT_PATH"] = "unittests/contracts/eosio.bios"
+            env["BIOS_CONTRACT_PATH"] = "unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/"
 
         if pfSetupPolicy == PFSetupPolicy.FULL:
             allBuiltinProtocolFeatureDigests = biosNode.getAllBuiltinFeatureDigestsToPreactivate()
@@ -1069,7 +1069,7 @@ def bootstrap(self, biosNode, totalNodes, prodCount, totalProducers, pfSetupPoli
         contract="eosio.bios"
         contractDir="unittests/contracts/%s" % (contract)
         if PFSetupPolicy.hasPreactivateFeature(pfSetupPolicy):
-            contractDir="unittests/contracts/%s" % (contract)
+            contractDir="unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/%s" % (contract)
         else:
             contractDir="unittests/contracts/old_versions/v1.6.0-rc3/%s" % (contract)
         wasmFile="%s.wasm" % (contract)

From 931573e411037ba2ce9b54b759212efa3df636c2 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 28 May 2019 19:19:03 -0400
Subject: [PATCH 0497/1648] Use imported targets for boost
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update the main cmake file and submodules so that imported targets are used for boost. This allows the cmake config files in 1.70  to be used without activating legacy mode via Boost_NO_BOOST_CMAKE. Additionally, fc/appbase/chainbase are cleaned up so that they are usable outside of eosio without any quirks. To squelch a lot of repetition I’m relying on fc brining in a lot of deps like many boost components & threads — we link just about everything to fc
---
 CMakeLists.txt                         | 21 +++------------------
 libraries/appbase                      |  2 +-
 libraries/chainbase                    |  2 +-
 libraries/fc                           |  2 +-
 libraries/testing/CMakeLists.txt       |  2 +-
 programs/eosio-launcher/CMakeLists.txt |  2 +-
 6 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 625c481275d..45d6c2d25fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ elseif ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
    message(WARNING "CMAKE_INSTALL_PREFIX is explicitly set to /usr/local. This is not recommended.")
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 
 if (UNIX AND APPLE)
@@ -19,8 +18,6 @@ if (UNIX AND APPLE)
 endif()
 
 include( GNUInstallDirs )
-include( VersionMacros )
-include( SetupTargetMacros )
 include( InstallDirectoryPermissions )
 include( MASSigning )
 
@@ -84,21 +81,9 @@ else()
 endif()
 
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
-### Remove after Boost 1.70 CMake fixes are in place
-set( Boost_NO_BOOST_CMAKE ON CACHE STRING "ON or OFF" )
-find_package(Boost 1.67 REQUIRED COMPONENTS
-    date_time
-    filesystem
-    system
-    program_options
-    chrono
-    unit_test_framework
-    iostreams)
-
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads)
-link_libraries(Threads::Threads)
+# Most boost deps get implictly picked up via fc, as just about everything links to fc. In addition we pick up
+# the pthread dependency through fc.
+find_package(Boost 1.67 REQUIRED COMPONENTS program_options unit_test_framework)
 
 if( APPLE AND UNIX )
 # Apple Specific Options Here
diff --git a/libraries/appbase b/libraries/appbase
index ac1b7ac3db2..21dee91e3a1 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit ac1b7ac3db2d5056ccc4a6274fc21381ae4f861b
+Subproject commit 21dee91e3a1dc61e28581b56011132242c40e10a
diff --git a/libraries/chainbase b/libraries/chainbase
index b769749d533..de432edfe9f 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit b769749d53303ec1a037d483c631d02268cbf012
+Subproject commit de432edfe9f952d08f5ee42f8e1a02376208ab36
diff --git a/libraries/fc b/libraries/fc
index 5eb88e0f5c3..3a133c8d9ff 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 5eb88e0f5c3d2881ae31ee020d76ff7570fb8503
+Subproject commit 3a133c8d9ff3cbf78fce43882cd7e1ff40d8c649
diff --git a/libraries/testing/CMakeLists.txt b/libraries/testing/CMakeLists.txt
index b03c85760d1..0c71359ec44 100644
--- a/libraries/testing/CMakeLists.txt
+++ b/libraries/testing/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library( eosio_testing
              ${HEADERS}
         )
 
-target_link_libraries( eosio_testing eosio_chain fc chainbase Logging IR WAST WASM Runtime )
+target_link_libraries( eosio_testing eosio_chain fc chainbase Logging IR WAST WASM Runtime Boost::unit_test_framework )
 target_include_directories( eosio_testing
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"
                                    "${CMAKE_CURRENT_SOURCE_DIR}/../wasm-jit/Include"
diff --git a/programs/eosio-launcher/CMakeLists.txt b/programs/eosio-launcher/CMakeLists.txt
index c0c19262e09..9e09a02d804 100644
--- a/programs/eosio-launcher/CMakeLists.txt
+++ b/programs/eosio-launcher/CMakeLists.txt
@@ -29,7 +29,7 @@ configure_file(config.hpp.in config.hpp ESCAPE_QUOTES)
 target_include_directories(eosio-launcher PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(eosio-launcher
-                      PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                      PRIVATE eosio_chain fc Boost::program_options ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 
 install( TARGETS
    eosio-launcher

From 9daf141e74270594b57f95f2588cc2689ccfb2e4 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 29 May 2019 14:05:38 -0400
Subject: [PATCH 0498/1648] =?UTF-8?q?(chainbase)=20don=E2=80=99t=20keep=20?=
 =?UTF-8?q?file=20mapping=20active=20when=20in=20heap/locked=20mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When in heap or locked mapping mode, pinnable_mapped_file initially maps the database so that it can copy its contents in to the heap/locked memory. Then on shutdown it copies the heap/locked memory back to that mapped file.

This means that during execution in heap/locked mode the process actually shows double memory usage as expected: once for the mapped file that is kept around, and once for the heap/locked memory.

This change closes the mapping after its contents have been copied to the heap/locked memory. It then reopens the mapping on shutdown so that the contents can be copied back. So now during execution the database is only consuming the expected memory
---
 libraries/chainbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chainbase b/libraries/chainbase
index b769749d533..04e1f4348fd 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit b769749d53303ec1a037d483c631d02268cbf012
+Subproject commit 04e1f4348fd527512f26d4453190878eb96f010b

From 02732946800a1f7f8c5fee984ada3249b3f0dbb5 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Wed, 29 May 2019 16:18:59 -0400
Subject: [PATCH 0499/1648] fix more NP tests, also fix producer plugins
 capture of data that goes stale before its use in finalize_block

---
 plugins/producer_plugin/producer_plugin.cpp | 22 ++++++++++++---------
 testnet.template                            |  5 +++--
 tests/Cluster.py                            |  2 +-
 tests/Node.py                               |  2 +-
 tests/prod_preactivation_test.py            |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 86bff2ae82d..da78085ecde 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1870,11 +1870,17 @@ void producer_plugin_impl::produce_block() {
 
 
    const auto& auth = chain.pending_block_signing_authority();
-   auto num_relevant_signatures = std::count_if(_signature_providers.begin(), _signature_providers.end(), [&auth](const auto& p){
-      return producer_authority::key_is_relevant(p.first, auth);
-   });
+   std::vector<std::reference_wrapper<const signature_provider_type>> relevant_providers;
+
+   relevant_providers.reserve(_signature_providers.size());
+
+   for (const auto& p : _signature_providers) {
+      if (producer_authority::key_is_relevant(p.first, auth)) {
+         relevant_providers.emplace_back(p.second);
+      }
+   }
 
-   EOS_ASSERT(num_relevant_signatures > 0, producer_priv_key_not_found, "Attempting to produce a block for which we don't have any relevant private keys");
+   EOS_ASSERT(relevant_providers.size() > 0, producer_priv_key_not_found, "Attempting to produce a block for which we don't have any relevant private keys");
 
    if (_protocol_features_signaled) {
       _protocol_features_to_activate.clear(); // clear _protocol_features_to_activate as it is already set in pending_block
@@ -1885,13 +1891,11 @@ void producer_plugin_impl::produce_block() {
    chain.finalize_block( [&]( const digest_type& d ) {
       auto debug_logger = maybe_make_debug_time_logger();
       vector<signature_type> sigs;
-      sigs.reserve(num_relevant_signatures);
+      sigs.reserve(relevant_providers.size());
 
       // sign with all relevant public keys
-      for (const auto& p : _signature_providers) {
-         if (producer_authority::key_is_relevant(p.first, auth)) {
-            sigs.emplace_back(p.second(d));
-         }
+      for (const auto& p : relevant_providers) {
+         sigs.emplace_back(p.get()(d));
       }
       return sigs;
    } );
diff --git a/testnet.template b/testnet.template
index efdfd56004e..69506c34e7a 100644
--- a/testnet.template
+++ b/testnet.template
@@ -16,7 +16,7 @@ bioscontractpath=$BIOS_CONTRACT_PATH
 if [ -z "$bioscontractpath" ]; then
     # this is defaulted to the version of bios that only requires the preactivate_feature
     # newer versions may require 
-    bioscontractpath="unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/"
+    bioscontractpath="unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios"
 fi
 
 wddir=eosio-ignition-wd
@@ -83,7 +83,8 @@ wcmd create --to-console -n ignition
 # where $BIOSKEY is replaced by the private key for the bios node
 # ------ DO NOT ALTER THE NEXT LINE -------
 ###INSERT prodkeys
-
+echo "Activated Features Check:" >> $logfile
+curl http://$bioshost:$biosport/v1/chain/get_activated_protocol_features >> $logfile
 ecmd set contract eosio $bioscontractpath eosio.bios.wasm eosio.bios.abi
 
 # Preactivate all digests
diff --git a/tests/Cluster.py b/tests/Cluster.py
index 1b40aaecae1..989d9477672 100644
--- a/tests/Cluster.py
+++ b/tests/Cluster.py
@@ -951,7 +951,7 @@ def bios_bootstrap(self, biosNode, totalNodes, pfSetupPolicy, silent=False):
             "FEATURE_DIGESTS": ""
         }
         if PFSetupPolicy.hasPreactivateFeature(pfSetupPolicy):
-            env["BIOS_CONTRACT_PATH"] = "unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios/"
+            env["BIOS_CONTRACT_PATH"] = "unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/eosio.bios"
 
         if pfSetupPolicy == PFSetupPolicy.FULL:
             allBuiltinProtocolFeatureDigests = biosNode.getAllBuiltinFeatureDigestsToPreactivate()
diff --git a/tests/Node.py b/tests/Node.py
index f8167663c28..07cc3158175 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1516,7 +1516,7 @@ def activatePreactivateFeature(self):
         self.scheduleProtocolFeatureActivations([preactivateFeatureDigest])
 
         # Wait for the next block to be produced so the scheduled protocol feature is activated
-        self.waitForHeadToAdvance()
+        assert self.waitForHeadToAdvance(), print("ERROR: TIMEOUT WAITING FOR PREACTIVATE")
 
     # Return an array of feature digests to be preactivated in a correct order respecting dependencies
     # Require producer_api_plugin
diff --git a/tests/prod_preactivation_test.py b/tests/prod_preactivation_test.py
index 200477c7356..dbc96c2c457 100755
--- a/tests/prod_preactivation_test.py
+++ b/tests/prod_preactivation_test.py
@@ -108,7 +108,7 @@
 
     node0 = cluster.getNode(0)
     contract="eosio.bios"
-    contractDir="unittests/contracts/%s" % (contract)
+    contractDir="unittests/contracts/old_versions/v1.7.0-develop-preactivate_feature/%s" % (contract)
     wasmFile="%s.wasm" % (contract)
     abiFile="%s.abi" % (contract)
 

From 640f2331d175d30d21503842dcd51a447bc6aaba Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 29 May 2019 19:47:45 -0400
Subject: [PATCH 0500/1648] add support for optional and repeating positional
 arguments; some sub-commands containing nested sub-commands are invokable by
 themselves while others are not

---
 programs/intrinsic-log-util/cli_parser.hpp | 98 ++++++++++++++++------
 programs/intrinsic-log-util/main.cpp       | 59 +++++++------
 2 files changed, 108 insertions(+), 49 deletions(-)

diff --git a/programs/intrinsic-log-util/cli_parser.hpp b/programs/intrinsic-log-util/cli_parser.hpp
index e97a279909b..9d3f793ef76 100644
--- a/programs/intrinsic-log-util/cli_parser.hpp
+++ b/programs/intrinsic-log-util/cli_parser.hpp
@@ -22,7 +22,8 @@ namespace eosio::cli_parser {
    namespace bpo = boost::program_options;
 
    enum class subcommand_style {
-      contains_subcommands,
+      only_contains_subcommands,
+      invokable_and_contains_subcommands,
       terminal_subcommand_with_positional_arguments,
       terminal_subcommand_without_positional_arguments
    };
@@ -37,16 +38,29 @@ namespace eosio::cli_parser {
       std::string description;
    };
 
-   using subcommand_descriptions = std::vector<subcommand_description>;
+   struct subcommand_descriptions {
+      std::vector<subcommand_description> descriptions;
+      bool                                requires_subcommand = false;
+   };
 
    struct positional_description {
-      positional_description( const std::string& positional_name, const std::string& description )
+      enum argument_restriction {
+         required,
+         optional,
+         repeating
+      };
+
+      positional_description( const std::string& positional_name,
+                              const std::string& description,
+                              argument_restriction restriction )
       :positional_name( positional_name )
       ,description( description )
+      ,restriction( restriction )
       {}
 
-      std::string positional_name;
-      std::string description;
+      std::string          positional_name;
+      std::string          description;
+      argument_restriction restriction;
    };
 
    using positional_descriptions = std::vector<positional_description>;
@@ -63,7 +77,7 @@ namespace eosio::cli_parser {
       /** @pre subcommand_descriptions alternative of other_description must be present */
       void add_subcommand_description( const std::string& subcommand, const std::string& description )
       {
-         std::get<subcommand_descriptions>( other_description ).emplace_back( subcommand, description );
+         std::get<subcommand_descriptions>( other_description ).descriptions.emplace_back( subcommand, description );
       }
 
       void set_positional_descriptions( const positional_descriptions& pos_desc ) {
@@ -284,20 +298,26 @@ namespace eosio::cli_parser {
       template<typename T, subcommand_style SubcommandStyle, typename... Us>
       class subcommand;
 
-      template<typename T, typename... Us>
-      class subcommand<T, subcommand_style::contains_subcommands, Us...>
+      template<typename T, subcommand_style SubcommandStyle, typename... Us>
+      class subcommand
          : public subcommand_base<T,  Us...>
       {
       protected:
          using base_type = subcommand_base<T,  Us...>;
          using subcommands_type = std::variant<no_subcommand, Us...>;
 
+         using _enable = std::enable_if_t<
+            SubcommandStyle == subcommand_style::only_contains_subcommands
+            || SubcommandStyle == subcommand_style::invokable_and_contains_subcommands
+         >;
+
          static_assert( sizeof...(Us) > 0 );
 
          subcommands_type _subcommand;
 
       public:
-         static constexpr bool has_subcommands = true;
+         static constexpr bool has_subcommands      = true;
+         static constexpr bool invokable_subcommand = (SubcommandStyle == subcommand_style::invokable_and_contains_subcommands);
 
          parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
                                const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
@@ -357,6 +377,8 @@ namespace eosio::cli_parser {
                                                 .run();
                bpo::store( parsed2, vm );
 
+               std::get<subcommand_descriptions>( pm.other_description ).requires_subcommand = !invokable_subcommand;
+
                static_visit_all<std::decay_t<decltype(_subcommand)>>(
                   [&pm]( const char* name, const std::string& desc ) {
                      pm.add_subcommand_description( name, desc );
@@ -388,6 +410,7 @@ namespace eosio::cli_parser {
 
       public:
          static constexpr bool has_subcommands = false;
+         static constexpr bool invokable_subcommand = true;
 
          parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
                                const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
@@ -421,9 +444,9 @@ namespace eosio::cli_parser {
 
       protected:
          bpo::positional_options_description _get_positional_options( bpo::options_description& options,
-                                                                      positional_descriptions& pos_desc )const
+                                                                      positional_descriptions& pos_desc )
          {
-            const T& derived = static_cast<const T&>( *this );
+            T& derived = static_cast<T&>( *this );
             return derived.get_positional_options( options, pos_desc );
          }
       };
@@ -437,6 +460,7 @@ namespace eosio::cli_parser {
 
       public:
          static constexpr bool has_subcommands = false;
+         static constexpr bool invokable_subcommand = true;
 
 
          parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
@@ -469,22 +493,38 @@ namespace eosio::cli_parser {
    template<typename T, subcommand_style SubcommandStyle, typename... Us>
    using subcommand = eosio::cli_parser::detail::subcommand<T, SubcommandStyle, Us...>;
 
-   template<std::size_t N>
    bpo::positional_options_description
-   build_positional_descriptions( const std::array<std::string, N>& pos_names,
-                                  const bpo::options_description& options,
-                                  positional_descriptions& pos_desc )
+   build_positional_descriptions( const bpo::options_description& options,
+                                  positional_descriptions& pos_desc,
+                                  const std::vector<std::string>& required_pos_names,
+                                  const std::vector<std::string>& optional_pos_names = std::vector<std::string>(),
+                                  const std::string& repeat_name = std::string{}
+                                )
    {
       bpo::positional_options_description pos;
 
-      for( std::size_t i = 0; i < pos_names.size(); ++i ) {
-         pos.add( pos_names[i].c_str(), 1 );
-         const bpo::option_description* opt = options.find_nothrow( pos_names[i], false );
+      auto add_positional = [&pos, &pos_desc, &options]( const std::string& pos_name,
+                                                         positional_description::argument_restriction restriction )
+      {
+         pos.add( pos_name.c_str(), (restriction == positional_description::repeating ? -1 : 1) );
+         const bpo::option_description* opt = options.find_nothrow( pos_name, false );
          if( opt ) {
-            pos_desc.emplace_back( pos_names[i], opt->description() );
+            pos_desc.emplace_back( pos_name, opt->description(), restriction );
          } else {
-            pos_desc.emplace_back( pos_names[i], "" );
+            pos_desc.emplace_back( pos_name, "", restriction );
          }
+      };
+
+      for( const auto& n : required_pos_names ) {
+         add_positional( n, positional_description::required );
+      }
+
+      for( const auto& n : optional_pos_names ) {
+         add_positional( n, positional_description::optional );
+      }
+
+      if( repeat_name.size() > 0 ) {
+         add_positional( repeat_name, positional_description::repeating );
       }
 
       return pos;
@@ -492,7 +532,7 @@ namespace eosio::cli_parser {
 
    void print_subcommand_help( std::ostream& stream, const std::string& program_name, const parse_metadata& pm ) {
       const subcommand_descriptions* subcommands = std::get_if<subcommand_descriptions>( &pm.other_description );
-      bool subcommands_present = (subcommands && subcommands->size() > 0);
+      bool subcommands_present = (subcommands && subcommands->descriptions.size() > 0);
 
       const positional_descriptions* positionals = std::get_if<positional_descriptions>( &pm.other_description );
       bool positionals_present = (positionals && positionals->size() > 0);
@@ -505,7 +545,10 @@ namespace eosio::cli_parser {
          subcommand_usage += s;
       }
       if( subcommands_present ) {
-         subcommand_usage += " SUBCOMMAND";
+         if( subcommands->requires_subcommand )
+            subcommand_usage += " SUBCOMMAND";
+         else
+            subcommand_usage += " [SUBCOMMAND]";
       }
 
       if( pm.subcommand_desc.size() > 0 ) {
@@ -518,7 +561,12 @@ namespace eosio::cli_parser {
 
       if( positionals_present ) {
          for( const auto& p : *positionals ) {
-            stream << " " << p.positional_name;
+            bool optional_arg = (p.restriction == positional_description::optional);
+            stream << " ";
+            if( optional_arg ) stream << "[";
+            stream << p.positional_name;
+            if( optional_arg ) stream << "]";
+            if( p.restriction == positional_description::repeating ) stream << "...";
          }
       }
 
@@ -555,7 +603,7 @@ namespace eosio::cli_parser {
          }
 
          stream << subcommands_title << std::endl;
-         for( const auto& s : *subcommands ) {
+         for( const auto& s : subcommands->descriptions ) {
             stream << "  ";
             auto orig_width = stream.width( formatting_width );
             stream << std::left << s.subcommand_name;
@@ -569,7 +617,7 @@ namespace eosio::cli_parser {
       bool printed_something = false;
 
       if( std::holds_alternative<subcommand_descriptions>( pm.other_description ) ) {
-         for( const auto& s : std::get<subcommand_descriptions>( pm.other_description ) ) {
+         for( const auto& s : std::get<subcommand_descriptions>( pm.other_description ).descriptions ) {
             if( s.subcommand_name.find( last_token ) != 0 ) continue;
             if( printed_something )
                stream << " ";
diff --git a/programs/intrinsic-log-util/main.cpp b/programs/intrinsic-log-util/main.cpp
index 7636c782e37..b8d432cdc34 100644
--- a/programs/intrinsic-log-util/main.cpp
+++ b/programs/intrinsic-log-util/main.cpp
@@ -4,6 +4,7 @@
  */
 #include "cli_parser.hpp"
 #include <eosio/chain/intrinsic_debug_log.hpp>
+#include <eosio/chain/exceptions.hpp>
 
 #include <fc/io/json.hpp>
 #include <fc/filesystem.hpp>
@@ -41,7 +42,7 @@ struct print_block_subcommand
       return "Print a specific block";
    }
 
-   void set_options( bpo::options_description& options )const {
+   void set_options( bpo::options_description& options ) {
       options.add_options()
          ("output-file,o", bpo::value<bfs::path>(),
           "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
@@ -49,18 +50,29 @@ struct print_block_subcommand
    }
 
    bpo::positional_options_description
-   get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc )const {
+   get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc ) {
       options.add_options()
-         ("block-num", bpo::value<uint32_t>(),
+         ("block-num", bpo::value<uint32_t>(&block_num),
           "the block number to print")
+         ("trx-id", bpo::value<std::vector<std::string>>(),
+          "ID of transaction to print (optional)")
       ;
 
-      std::array<std::string, 1> pos_args = {
-         "block-num"
-      };
+      return cli_parser::build_positional_descriptions( options, pos_desc, { "block-num" }, {}, "trx-id" );
+   }
 
-      return cli_parser::build_positional_descriptions( pos_args, options, pos_desc );
+   void initialize( bpo::variables_map&& vm ) {
+      if( vm.count( "trx-id" ) ) {
+         for( const auto& trx_id : vm.at( "trx-id" ).as<std::vector<std::string>>() ) {
+            try {
+               trxs_filter.emplace_back( fc::variant( trx_id ).as<transaction_id_type>() );
+            } EOS_RETHROW_EXCEPTIONS( fc::exception, "invalid transaction id: ${trx_id}", ("trx_id", trx_id) )
+         }
+      }
    }
+
+   uint32_t                          block_num = 0;
+   std::vector<transaction_id_type>  trxs_filter;
 };
 
 struct print_blocks_subcommand
@@ -75,11 +87,11 @@ struct print_blocks_subcommand
       return "Print a range of blocks";
    }
 
-   void set_options( bpo::options_description& options )const {
+   void set_options( bpo::options_description& options ) {
       options.add_options()
          ("output-file,o", bpo::value<bfs::path>(),
           "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
-         ("first,f", bpo::value<uint32_t>()->default_value(0),
+         ("first,f", bpo::value<uint32_t>(&first_block_num)->default_value(0),
           "the first block number to print")
          ("last,l", bpo::value<uint32_t>()->default_value(std::numeric_limits<uint32_t>::max()),
           "the first block number to print")
@@ -87,10 +99,6 @@ struct print_blocks_subcommand
    }
 
    void initialize( bpo::variables_map&& vm ) {
-      if( vm.count( "first" ) ) {
-         first_block_num = vm.at( "first" ).as<uint32_t>();
-      }
-
       if( vm.count( "last" ) ) {
          last_block_num = vm.at( "last" ).as<uint32_t>();
          FC_ASSERT( last_block_num >= first_block_num, "invalid range" );
@@ -104,7 +112,7 @@ struct print_blocks_subcommand
 struct print_subcommand
    :  public subcommand<
          print_subcommand,
-         subcommand_style::contains_subcommands,
+         subcommand_style::invokable_and_contains_subcommands,
          print_block_subcommand,
          print_blocks_subcommand
       >
@@ -115,7 +123,7 @@ struct print_subcommand
       return "Print blocks in a log file";
    }
 
-   void set_options( bpo::options_description& options )const {
+   void set_options( bpo::options_description& options ) {
       options.add_options()
          ("no-pretty-print", bpo::bool_switch()->default_value(false), "avoid pretty printing")
       ;
@@ -134,7 +142,7 @@ struct diff_subcommand
       return "Find the differences between two log files";
    }
 
-   void set_options( bpo::options_description& options )const {
+   void set_options( bpo::options_description& options ) {
       options.add_options()
          ("start-block", bpo::value<uint32_t>()->default_value(0),
           "ignore any differences prior to this block")
@@ -142,7 +150,7 @@ struct diff_subcommand
    }
 
    bpo::positional_options_description
-   get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc )const {
+   get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc ) {
       options.add_options()
          ("first-log", bpo::value<bfs::path>(),
          "path to the first log file to compare")
@@ -150,19 +158,16 @@ struct diff_subcommand
          "path to the second log file to compare")
       ;
 
-      std::array<std::string, 2> pos_args = {
-         "first-log",
-         "second-log"
-      };
-
-      return cli_parser::build_positional_descriptions( pos_args, options, pos_desc );
+      return cli_parser::build_positional_descriptions( options, pos_desc, {
+         "first-log", "second-log"
+      } );
    }
 };
 
 struct root_command
    : public subcommand<
       root_command,
-      subcommand_style::contains_subcommands,
+      subcommand_style::only_contains_subcommands,
       print_subcommand,
       diff_subcommand
      >
@@ -195,6 +200,12 @@ class subcommand_dispatcher {
 
    void operator()( const root_command& root, const print_subcommand& print, const print_blocks_subcommand& blocks ) {
       stream << "print blocks was called" << std::endl;
+      idump((blocks.first_block_num)(blocks.last_block_num));
+   }
+
+   void operator()( const root_command& root, const print_subcommand& print, const print_block_subcommand& block ) {
+      stream << "print block was called" << std::endl;
+      idump((block.block_num)(block.trxs_filter));
    }
 
 protected:

From 9e3b893dbc53337a96fe8bc0353c42aae1f0a8c9 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 30 May 2019 09:50:24 +0800
Subject: [PATCH 0501/1648] Fix missing signing when key is inputted from cin

---
 programs/cleos/main.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index fe694973a1e..b655bb05029 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -3327,13 +3327,7 @@ int main( int argc, char** argv ) {
          chain_id = chain_id_type(str_chain_id);
       }
 
-      if( str_private_key.size() > 0 ) {
-         private_key_type priv_key;
-         try {
-            priv_key = private_key_type(str_private_key);
-         } EOS_RETHROW_EXCEPTIONS(private_key_type_exception, "Invalid private key: ${private_key}", ("private_key", str_private_key))
-         trx.sign(priv_key, *chain_id);
-      } else if( str_keosd_pub_key.size() > 0 ) {
+      if( str_keosd_pub_key.size() > 0 ) {
          public_key_type pub_key;
          try {
             pub_key = public_key_type(str_keosd_pub_key);
@@ -3341,10 +3335,17 @@ int main( int argc, char** argv ) {
          fc::variant keys_var(flat_set<public_key_type>{ pub_key });
          sign_transaction(trx, keys_var, *chain_id);
       } else {
-         std::cerr << localized("private key: ");
-         fc::set_console_echo(false);
-         std::getline( std::cin, str_private_key, '\n' );
-         fc::set_console_echo(true);
+         if( str_private_key.size() == 0 ) {
+            std::cerr << localized("private key: ");
+            fc::set_console_echo(false);
+            std::getline( std::cin, str_private_key, '\n' );
+            fc::set_console_echo(true);
+         }
+         private_key_type priv_key;
+         try {
+            priv_key = private_key_type(str_private_key);
+         } EOS_RETHROW_EXCEPTIONS(private_key_type_exception, "Invalid private key: ${private_key}", ("private_key", str_private_key))
+         trx.sign(priv_key, *chain_id);
       }
 
       if(push_trx) {

From a6adfbf290f5df6d772d8292f8924b6b2474a17e Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 30 May 2019 10:06:40 +0800
Subject: [PATCH 0502/1648] rename option and explanation

---
 programs/cleos/main.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index b655bb05029..3f5b5394fac 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -3300,20 +3300,21 @@ int main( int argc, char** argv ) {
    string str_private_key;
    string str_chain_id;
    string str_private_key_file;
-   string str_keosd_pub_key;
+   string str_public_key;
    bool push_trx = false;
 
    auto sign = app.add_subcommand("sign", localized("Sign a transaction"), false);
    sign->add_option("transaction", trx_json_to_sign,
                                  localized("The JSON string or filename defining the transaction to sign"), true)->required();
    sign->add_option("-k,--private-key", str_private_key, localized("The private key that will be used to sign the transaction"));
-   sign->add_option("-w,--wallet", str_keosd_pub_key, localized("Ask keosd to sign with the given public key"));
+   sign->add_option("--public-key", str_public_key, localized(string("Ask ") + string(key_store_executable_name +
+                                                                 "to sign with the corresponding private key of the given public key"));
    sign->add_option("-c,--chain-id", str_chain_id, localized("The chain id that will be used to sign the transaction"));
-   sign->add_flag( "-p,--push-transaction", push_trx, localized("Push transaction after signing"));
+   sign->add_flag("-p,--push-transaction", push_trx, localized("Push transaction after signing"));
 
    sign->set_callback([&] {
 
-      EOSC_ASSERT( str_private_key.empty() || str_keosd_pub_key.empty(), "ERROR: Either -k/--private-key or -w/--wallet or none of them can be set" );
+      EOSC_ASSERT( str_private_key.empty() || str_public_key.empty(), "ERROR: Either -k/--private-key or --public-key or none of them can be set" );
 
       signed_transaction trx = json_from_file_or_string(trx_json_to_sign).as<signed_transaction>();
 
@@ -3327,11 +3328,11 @@ int main( int argc, char** argv ) {
          chain_id = chain_id_type(str_chain_id);
       }
 
-      if( str_keosd_pub_key.size() > 0 ) {
+      if( str_public_key.size() > 0 ) {
          public_key_type pub_key;
          try {
-            pub_key = public_key_type(str_keosd_pub_key);
-         } EOS_RETHROW_EXCEPTIONS(public_key_type_exception, "Invalid public key: ${public_key}", ("public_key", str_keosd_pub_key))
+            pub_key = public_key_type(str_public_key);
+         } EOS_RETHROW_EXCEPTIONS(public_key_type_exception, "Invalid public key: ${public_key}", ("public_key", str_public_key))
          fc::variant keys_var(flat_set<public_key_type>{ pub_key });
          sign_transaction(trx, keys_var, *chain_id);
       } else {

From 4f60c3827e89750a273238b4e467cff4858df9ac Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 30 May 2019 10:08:51 +0800
Subject: [PATCH 0503/1648] dont echo private key when an error occurs

---
 programs/cleos/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 3f5b5394fac..66d576470ac 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -3219,7 +3219,7 @@ int main( int argc, char** argv ) {
       try {
          wallet_key = private_key_type( wallet_key_str );
       } catch (...) {
-         EOS_THROW(private_key_type_exception, "Invalid private key: ${private_key}", ("private_key", wallet_key_str))
+         EOS_THROW(private_key_type_exception, "Invalid private key")
       }
       public_key_type pubkey = wallet_key.get_public_key();
 
@@ -3345,7 +3345,7 @@ int main( int argc, char** argv ) {
          private_key_type priv_key;
          try {
             priv_key = private_key_type(str_private_key);
-         } EOS_RETHROW_EXCEPTIONS(private_key_type_exception, "Invalid private key: ${private_key}", ("private_key", str_private_key))
+         } EOS_RETHROW_EXCEPTIONS(private_key_type_exception, "Invalid private key")
          trx.sign(priv_key, *chain_id);
       }
 

From 196b384306040795fb09c228cf1e6b655cc51473 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 30 May 2019 11:25:23 +0800
Subject: [PATCH 0504/1648] Fix description of cleos sign public key

---
 programs/cleos/main.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 66d576470ac..146a80fca1d 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -3307,8 +3307,7 @@ int main( int argc, char** argv ) {
    sign->add_option("transaction", trx_json_to_sign,
                                  localized("The JSON string or filename defining the transaction to sign"), true)->required();
    sign->add_option("-k,--private-key", str_private_key, localized("The private key that will be used to sign the transaction"));
-   sign->add_option("--public-key", str_public_key, localized(string("Ask ") + string(key_store_executable_name +
-                                                                 "to sign with the corresponding private key of the given public key"));
+   sign->add_option("--public-key", str_public_key, localized("Ask ${exec} to sign with the corresponding private key of the given public key", ("exec", key_store_executable_name)));
    sign->add_option("-c,--chain-id", str_chain_id, localized("The chain id that will be used to sign the transaction"));
    sign->add_flag("-p,--push-transaction", push_trx, localized("Push transaction after signing"));
 

From 276b7b5a45bd4005281c4d540f7ad0c197dd3124 Mon Sep 17 00:00:00 2001
From: Kayan <taokayan13@gmail.com>
Date: Thu, 30 May 2019 12:29:25 +0800
Subject: [PATCH 0505/1648] add file open fail check

---
 programs/cleos/main.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 3171a33b72a..e3eb156b4a4 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -503,15 +503,18 @@ void print_result( const fc::variant& result ) { try {
 
 using std::cout;
 void send_actions(std::vector<chain::action>&& actions, packed_transaction::compression_type compression = packed_transaction::none ) {
+   std::ofstream out;
+   if (tx_json_save_file.length()) {
+      out.open(tx_json_save_file);
+      EOSC_ASSERT(!out.fail(), "ERROR: Failed to create file \"${p}\"", ("p", tx_json_save_file));
+   }
    auto result = push_actions( move(actions), compression);
 
    string jsonstr;
    if (tx_json_save_file.length()) {
-      if (jsonstr.length() == 0) {
-         jsonstr = fc::json::to_pretty_string( result );
-      }
-      std::ofstream out(tx_json_save_file);
+      jsonstr = fc::json::to_pretty_string( result );
       out << jsonstr;
+      out.close();
    }
    if( tx_print_json ) {
       if (jsonstr.length() == 0) {
@@ -524,15 +527,18 @@ void send_actions(std::vector<chain::action>&& actions, packed_transaction::comp
 }
 
 void send_transaction( signed_transaction& trx, packed_transaction::compression_type compression = packed_transaction::none  ) {
+   std::ofstream out;
+   if (tx_json_save_file.length()) {
+      out.open(tx_json_save_file);
+      EOSC_ASSERT(!out.fail(), "ERROR: Failed to create file \"${p}\"", ("p", tx_json_save_file));
+   }
    auto result = push_transaction(trx, compression);
 
    string jsonstr;
    if (tx_json_save_file.length()) {
-      if (jsonstr.length() == 0) {
-         jsonstr = fc::json::to_pretty_string( result );
-      }
-      std::ofstream out(tx_json_save_file);
+      jsonstr = fc::json::to_pretty_string( result );
       out << jsonstr;
+      out.close();
    }
    if( tx_print_json ) {
       if (jsonstr.length() == 0) {

From a78c5869474f487656777b31437ac5f05a3b0d02 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 24 May 2019 11:26:32 -0400
Subject: [PATCH 0506/1648] anka-debug testing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

remove anka-debug

port db_modes_test to python

increate timeout to 1 min

add free port check, current ulimit check

another try

another try

find free port automatically

throw error if trying to create non R1 key on SE or YubiHSM wallet

(fc sync) Fix certificate trust when trust settings is empty

When a certificate has no trust settings it is to be trusted

pipeline.jsonc in use [skip ci]

testing new pipeline [skip ci]

Removed pipeline files from eosio

add support for a simple header in the state database which defines versioning for the application level data.  The intent is to have a more direct informative message when the expectations for in-memory layout of application data has changed due to explicit changes to the structure (as opposed to the implicit change detected by our chainbase level checks)

allow in-place upgrade from unversioned to versioned state database

create the database header when loading from a snapshot

Remove undefined method

Add blk and trx options to connection for transactions only and block only connections

Add log for connection settting

Update handshake message to indicate type of connection, trx or blk or both

Remove unneeded reads_in_flight as there can only ever be one read in flight per connection. Add read_delay_count for giving up on a connection when too many consecutive read delays.

Improve logging of connection type

pipeline.jsonc changes [skip ci]

test scripts moved to pipelines repo

(chainbase) don’t keep file mapping active when in heap/locked mode

When in heap or locked mapping mode, pinnable_mapped_file initially maps the database so that it can copy its contents in to the heap/locked memory. Then on shutdown it copies the heap/locked memory back to that mapped file.

This means that during execution in heap/locked mode the process actually shows double memory usage as expected: once for the mapped file that is kept around, and once for the heap/locked memory.

This change closes the mapping after its contents have been copied to the heap/locked memory. It then reopens the mapping on shutdown so that the contents can be copied back. So now during execution the database is only consuming the expected memory

Use imported targets for boost

Update the main cmake file and submodules so that imported targets are used for boost. This allows the cmake config files in 1.70  to be used without activating legacy mode via Boost_NO_BOOST_CMAKE. Additionally, fc/appbase/chainbase are cleaned up so that they are usable outside of eosio without any quirks. To squelch a lot of repetition I’m relying on fc brining in a lot of deps like many boost components & threads — we link just about everything to fc

no need to start keosd for convert

no need to start keosd for cleos multisig review

Add option for cleos sign subcommand to ask keosd for signing

Fix missing signing when key is inputted from cin

rename option and explanation

dont echo private key when an error occurs

Fix description of cleos sign public key

txn json to file

add file open fail check
---
 .buildkite/pipeline.yml                       |  501 -----
 CMakeLists.txt                                |   21 +-
 libraries/appbase                             |    2 +-
 libraries/chain/controller.cpp                |   47 +-
 .../eosio/chain/database_header_object.hpp    |   56 +
 .../chain/include/eosio/chain/exceptions.hpp  |    2 +
 libraries/chain/include/eosio/chain/types.hpp |    1 +
 libraries/chainbase                           |    2 +-
 libraries/fc                                  |    2 +-
 libraries/testing/CMakeLists.txt              |    2 +-
 pipeline.jsonc                                |   40 +-
 .../include/eosio/net_plugin/net_plugin.hpp   |    2 -
 plugins/net_plugin/net_plugin.cpp             |  150 +-
 plugins/wallet_plugin/se_wallet.cpp           |    1 +
 plugins/wallet_plugin/yubihsm_wallet.cpp      |    1 +
 programs/cleos/main.cpp                       |   77 +-
 programs/eosio-launcher/CMakeLists.txt        |    2 +-
 scripts/helpers/eosio.bash                    |    2 -
 .../node_modules/node-fetch/CHANGELOG.md      |  260 ---
 .../node_modules/node-fetch/LICENSE.md        |   22 -
 .../metrics/node_modules/node-fetch/README.md |  538 ------
 .../node_modules/node-fetch/browser.js        |   23 -
 .../node_modules/node-fetch/lib/index.es.js   | 1631 ----------------
 .../node_modules/node-fetch/lib/index.js      | 1640 -----------------
 .../node_modules/node-fetch/lib/index.mjs     | 1629 ----------------
 .../node_modules/node-fetch/package.json      |   94 -
 scripts/metrics/node_modules/sax/LICENSE      |   41 -
 scripts/metrics/node_modules/sax/README.md    |  225 ---
 scripts/metrics/node_modules/sax/lib/sax.js   | 1565 ----------------
 scripts/metrics/node_modules/sax/package.json |   61 -
 scripts/metrics/node_modules/xml2js/LICENSE   |   19 -
 scripts/metrics/node_modules/xml2js/README.md |  406 ----
 .../metrics/node_modules/xml2js/lib/bom.js    |   12 -
 .../node_modules/xml2js/lib/builder.js        |  127 --
 .../node_modules/xml2js/lib/defaults.js       |   72 -
 .../metrics/node_modules/xml2js/lib/parser.js |  357 ----
 .../node_modules/xml2js/lib/processors.js     |   34 -
 .../metrics/node_modules/xml2js/lib/xml2js.js |   37 -
 .../metrics/node_modules/xml2js/package.json  |  280 ---
 .../node_modules/xmlbuilder/.npmignore        |    5 -
 .../node_modules/xmlbuilder/CHANGELOG.md      |  423 -----
 .../metrics/node_modules/xmlbuilder/LICENSE   |   21 -
 .../metrics/node_modules/xmlbuilder/README.md |   85 -
 .../node_modules/xmlbuilder/lib/Utility.js    |   73 -
 .../xmlbuilder/lib/XMLAttribute.js            |   31 -
 .../node_modules/xmlbuilder/lib/XMLCData.js   |   32 -
 .../node_modules/xmlbuilder/lib/XMLComment.js |   32 -
 .../xmlbuilder/lib/XMLDTDAttList.js           |   50 -
 .../xmlbuilder/lib/XMLDTDElement.js           |   35 -
 .../xmlbuilder/lib/XMLDTDEntity.js            |   56 -
 .../xmlbuilder/lib/XMLDTDNotation.js          |   37 -
 .../xmlbuilder/lib/XMLDeclaration.js          |   40 -
 .../node_modules/xmlbuilder/lib/XMLDocType.js |  107 --
 .../xmlbuilder/lib/XMLDocument.js             |   48 -
 .../xmlbuilder/lib/XMLDocumentCB.js           |  402 ----
 .../node_modules/xmlbuilder/lib/XMLElement.js |  111 --
 .../node_modules/xmlbuilder/lib/XMLNode.js    |  432 -----
 .../lib/XMLProcessingInstruction.js           |   35 -
 .../node_modules/xmlbuilder/lib/XMLRaw.js     |   32 -
 .../xmlbuilder/lib/XMLStreamWriter.js         |  279 ---
 .../xmlbuilder/lib/XMLStringWriter.js         |  334 ----
 .../xmlbuilder/lib/XMLStringifier.js          |  163 --
 .../node_modules/xmlbuilder/lib/XMLText.js    |   32 -
 .../xmlbuilder/lib/XMLWriterBase.js           |   90 -
 .../node_modules/xmlbuilder/lib/index.js      |   53 -
 .../node_modules/xmlbuilder/package.json      |   65 -
 scripts/metrics/package-lock.json             |   30 -
 scripts/metrics/test-metrics.js               |  421 -----
 scripts/package-builder.sh                    |   62 -
 scripts/parallel-test.bash                    |   29 -
 scripts/serial-test.bash                      |   35 -
 scripts/submodule_check.sh                    |   41 -
 tests/CMakeLists.txt                          |    5 +-
 tests/db_modes_test.py                        |  131 ++
 tests/db_modes_test.sh                        |  101 -
 tests/testUtils.py                            |    6 +-
 76 files changed, 440 insertions(+), 13508 deletions(-)
 delete mode 100644 .buildkite/pipeline.yml
 create mode 100644 libraries/chain/include/eosio/chain/database_header_object.hpp
 delete mode 100644 scripts/metrics/node_modules/node-fetch/CHANGELOG.md
 delete mode 100644 scripts/metrics/node_modules/node-fetch/LICENSE.md
 delete mode 100644 scripts/metrics/node_modules/node-fetch/README.md
 delete mode 100644 scripts/metrics/node_modules/node-fetch/browser.js
 delete mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.es.js
 delete mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.js
 delete mode 100644 scripts/metrics/node_modules/node-fetch/lib/index.mjs
 delete mode 100644 scripts/metrics/node_modules/node-fetch/package.json
 delete mode 100644 scripts/metrics/node_modules/sax/LICENSE
 delete mode 100644 scripts/metrics/node_modules/sax/README.md
 delete mode 100644 scripts/metrics/node_modules/sax/lib/sax.js
 delete mode 100644 scripts/metrics/node_modules/sax/package.json
 delete mode 100644 scripts/metrics/node_modules/xml2js/LICENSE
 delete mode 100644 scripts/metrics/node_modules/xml2js/README.md
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/bom.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/builder.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/defaults.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/parser.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/processors.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/lib/xml2js.js
 delete mode 100644 scripts/metrics/node_modules/xml2js/package.json
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/.npmignore
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/LICENSE
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/README.md
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/lib/index.js
 delete mode 100644 scripts/metrics/node_modules/xmlbuilder/package.json
 delete mode 100644 scripts/metrics/package-lock.json
 delete mode 100755 scripts/metrics/test-metrics.js
 delete mode 100755 scripts/package-builder.sh
 delete mode 100755 scripts/parallel-test.bash
 delete mode 100755 scripts/serial-test.bash
 delete mode 100755 scripts/submodule_check.sh
 create mode 100755 tests/db_modes_test.py
 delete mode 100755 tests/db_modes_test.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
deleted file mode 100644
index ef31405073f..00000000000
--- a/.buildkite/pipeline.yml
+++ /dev/null
@@ -1,501 +0,0 @@
----
-
-env:
-  VERBOSE: true
-  ANKA_MOJAVE_TEMPLATE: "10.14.4_6C_14G_40G"
-  ANKA_TEMPLATE_TAG: "clean::cicd::git-ssh::nas::brew::buildkite-agent-3.11.2"
-  CHECKSUMABLE: "scripts/eosio_build*"
-  MAC_TAG: "eosio_1.9.0-developv5"
-  # LINUX_WORKDIR: "/home/cicd"
-  # MAC_WORKDIR: "/home/anka"
-
-steps:
-
-  # - label: ":darwin: Ensure Mojave Anka Template Dependency Tag/Layer Exists"
-  #   command:
-  #     - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-  #     - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-  #   agents:
-  #     - "queue=mac-anka-templater-fleet"
-  #   env:
-  #     REPO: "${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}"
-  #     REPO_COMMIT: "${BUILDKITE_COMMIT}"
-  #     CHECKSUMABLE: "${CHECKSUMABLE}"
-  #     TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
-  #     TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-  #     TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -m && cd .. && rm -rf eos" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
-  #     PROJECT_TAG: "${MAC_TAG}"
-  #   timeout: 320
-
-  # - trigger: "mac-anka-fleet"
-  #   label: ":anka: Ensure Mojave Anka Template Tag Exists"
-  #   branches: "*"
-  #   async: false
-  #   build:
-  #     branch: "master"
-  #     env:
-  #       REPO: "${BUILDKITE_REPO}"
-  #       REPO_COMMIT: "${BUILDKITE_COMMIT}"
-  #       CHECKSUMABLE: "${CHECKSUMABLE}"
-  #       TEMPLATE: "${ANKA_MOJAVE_TEMPLATE}"
-  #       TEMPLATE_TAG: "${ANKA_TEMPLATE_TAG}"
-  #       TAG_COMMANDS: "CLONED_REPO_DIR/scripts/eosio_build.bash -y -m" # CLONED_REPO_DIR IS REQUIRED and is where the repo is always cloned into
-  #       PROJECT_TAG: "${MAC_TAG}"
-
-  # - wait
-
-  ############################
-  # BUILDING #################
-  ############################
-
-  - label: ":darwin: [Darwin] Mojave Build"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -m && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    plugins:
-      chef/anka#v0.5.0:
-        no-volume: true
-        inherit-environment-vars: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        modify-cpu: 12
-        modify-ram: 24
-        always-pull: true
-        debug: true
-        wait-network: true
-    agents:
-      - "queue=mac-anka-large-node-fleet"
-    timeout: 120
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-
-  - label: ":aws: Amazon Linux 2 Build"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -P -m"
-      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_1-9-0-develop"
-        mount-checkout: false
-    timeout: 120
-
-  - label: ":centos: CentOS 7 Build"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -P -m"
-      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_1-9-0-develop"
-        mount-checkout: false
-    timeout: 120
-
-  - label: ":ubuntu: Ubuntu 16.04 Build"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -P -m"
-      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_1-9-0-develop"
-        mount-checkout: false
-    timeout: 120
-
-  - label: ":ubuntu: Ubuntu 18.04 Build"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && git submodule update --init --recursive && ./scripts/eosio_build.bash -y -P -m"
-      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_1-9-0-develop"
-        mount-checkout: false
-    timeout: 120
-
-  - wait
-
-  # ################################
-  # # TESTS ########################
-  # ################################
-
-  # MOJAVE #
-  - label: ":darwin: [Darwin] Mojave Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\""
-      - "cd eos && ./scripts/parallel-test.bash"
-    agents:
-      - "queue=mac-anka-node-fleet"
-    plugins:
-      chef/anka#v0.5.0:
-        no-volume: true
-        inherit-environment-vars: true
-        bash-interactive: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        always-pull: true
-        debug: true
-        wait-network: true
-    timeout: 120
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-
-  - label: ":darwin: [Darwin] Mojave NP Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\""
-      - "cd eos && ./scripts/serial-test.bash"
-    agents:
-      - "queue=mac-anka-node-fleet"
-    plugins:
-      chef/anka#v0.5.0:
-        no-volume: true
-        inherit-environment-vars: true
-        bash-interactive: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        always-pull: true
-        debug: true
-        wait-network: true
-    timeout: 120
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-          
-  # AmazonLinux #
-  - label: ":aws: Amazon Linux 2 Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
-      - "./scripts/parallel-test.bash"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_1-9-0-develop"
-        mount-checkout: false
-    timeout: 60
-
-  - label: ":aws: Amazon Linux 2 NP Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":aws: Amazon Linux 2 Build\""
-      - "./scripts/serial-test.bash"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_1-9-0-develop"
-        mount-checkout: false
-    timeout: 60
-
-  # CentOS #
-  - label: ":centos: CentOS 7 Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
-      - "./scripts/parallel-test.bash"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_1-9-0-develop"
-        mount-checkout: false
-    timeout: 60
-
-  - label: ":centos: CentOS 7 NP Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":centos: CentOS 7 Build\""
-      - "source /opt/rh/rh-python36/enable && ./scripts/serial-test.bash"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_1-9-0-develop"
-        mount-checkout: false
-    timeout: 60
-
-  # Ubuntu #
-  - label: ":ubuntu: Ubuntu 16.04 Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
-      - "./scripts/parallel-test.bash"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_1-9-0-develop"
-        mount-checkout: false
-    timeout: 60
-
-  - label: ":ubuntu: Ubuntu 16.04 NP Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 16.04 Build\""
-      - "./scripts/serial-test.bash"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_1-9-0-develop"
-        mount-checkout: false
-    timeout: 60
-
-  - label: ":ubuntu: Ubuntu 18.04 Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
-      - "./scripts/parallel-test.bash"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_1-9-0-develop"
-        mount-checkout: false
-    timeout: 60
-
-  - label: ":ubuntu: Ubuntu 18.04 NP Tests"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":ubuntu: Ubuntu 18.04 Build\""
-      - "./scripts/serial-test.bash"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_1-9-0-develop"
-        mount-checkout: false
-    timeout: 60
-
-  - wait:
-    continue_on_failure: true
-
-  - command: |
-        cd scripts/metrics
-        node --max-old-space-size=4096 test-metrics.js
-    label: ":bar_chart: Test Metrics"
-    agents:
-      queue: "automation-apps-builder-fleet"
-    timeout: 10
-    soft_fail: true
-
-  - wait
-
-  - label: ":centos: CentOS 7 Package Builder"
-    command: |
-        git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-        cd eos
-        git checkout ${BUILDKITE_COMMIT}
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: CentOS 7 Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        sudo yum install -y rpm-build
-        mkdir -p /home/cicd/rpmbuild/BUILD
-        mkdir -p /home/cicd/rpmbuild/BUILDROOT
-        mkdir -p /home/cicd/rpmbuild/RPMS
-        mkdir -p /home/cicd/rpmbuild/SOURCES
-        mkdir -p /home/cicd/rpmbuild/SPECS
-        mkdir -p /home/cicd/rpmbuild/SRPMS
-        cd /home/cicd/eos/build/packages
-        bash generate_package.sh rpm
-        buildkite-agent artifact upload *.rpm
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_1-9-0-develop"
-        mount-checkout: false
-    env:
-      OS: "el7"
-      PKGTYPE: "rpm"
-    timeout: 60
-
-  - command: | # Ubuntu 16.04 Package Builder
-        git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-        cd eos
-        git checkout ${BUILDKITE_COMMIT}
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 16.04 Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        cd /home/cicd/eos/build/packages
-        bash generate_package.sh deb
-        buildkite-agent artifact upload *.deb
-    label: ":ubuntu: Ubuntu 16.04 Package Builder"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_1-9-0-develop"
-        mount-checkout: false
-    env:
-      OS: "ubuntu-16.04"
-      PKGTYPE: "deb"
-    timeout: 60
-
-  - command: | # Ubuntu 18.04 Package Builder
-        echo "--- :arrow_down: Downloading build directory"
-        git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-        cd eos
-        git checkout ${BUILDKITE_COMMIT}
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Ubuntu 18.04 Build"
-        tar -zxf build.tar.gz
-        echo "+++ :microscope: Starting package build"
-        cd /home/cicd/eos/build/packages
-        bash generate_package.sh deb
-        buildkite-agent artifact upload *.deb
-    label: ":ubuntu: Ubuntu 18.04 Package Builder"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.2.0:
-        shell: ["/bin/bash", "-i", "-e", "-c"]
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_1-9-0-develop"
-        mount-checkout: false
-    env:
-      OS: "ubuntu-18.04"
-      PKGTYPE: "deb"
-    timeout: 60
-
-  - label: ":darwin: Mojave Package Builder"
-    command:
-      - "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} && cd eos && git checkout ${BUILDKITE_COMMIT} && buildkite-agent artifact download \"build.tar.gz\" . --step \":darwin: [Darwin] Mojave Build\" && tar -xzf build.tar.gz"
-      - "cd eos/build/packages && bash generate_package.sh brew"
-      - "cd eos && buildkite-agent artifact upload build/packages/*.tar.gz"
-      - "cd eos && buildkite-agent artifact upload build/packages/*.rb"
-    agents:
-      - "queue=mac-anka-node-fleet"
-    plugins:
-      chef/anka#v0.5.0:
-        no-volume: true
-        inherit-environment-vars: true
-        bash-interactive: true
-        vm-name: $ANKA_MOJAVE_TEMPLATE
-        vm-registry-tag: "${ANKA_TEMPLATE_TAG}::${MAC_TAG}"
-        always-pull: true
-        debug: true
-        wait-network: true
-    timeout: 120
-  - wait
-
-  - command: | # Brew Updater
-        echo "--- :arrow_down: Downloading brew files"
-        echo \"--- :arrow_down: Downloading Build Directory\" && buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
-    label: ":darwin: Brew Updater"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "build/packages/eosio.rb"
-    timeout: 5
-  - command: | # Git Submodule Regression Check
-        echo "+++ :microscope: Running git submodule regression check" && \
-        ./scripts/submodule_check.sh
-    label: "Git Submodule Regression Check"
-    agents:
-      queue: "automation-large-builder-fleet"
-    timeout: 5
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9d6a76178e..f852cccfe91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,6 @@ elseif ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
    message(WARNING "CMAKE_INSTALL_PREFIX is explicitly set to /usr/local. This is not recommended.")
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 
 if (UNIX AND APPLE)
@@ -18,8 +17,6 @@ if (UNIX AND APPLE)
 endif()
 
 include( GNUInstallDirs )
-include( VersionMacros )
-include( SetupTargetMacros )
 include( InstallDirectoryPermissions )
 include( MASSigning )
 
@@ -83,21 +80,9 @@ else()
 endif()
 
 set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
-### Remove after Boost 1.70 CMake fixes are in place
-set( Boost_NO_BOOST_CMAKE ON CACHE STRING "ON or OFF" )
-find_package(Boost 1.67 REQUIRED COMPONENTS
-    date_time
-    filesystem
-    system
-    program_options
-    chrono
-    unit_test_framework
-    iostreams)
-
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads)
-link_libraries(Threads::Threads)
+# Most boost deps get implictly picked up via fc, as just about everything links to fc. In addition we pick up
+# the pthread dependency through fc.
+find_package(Boost 1.67 REQUIRED COMPONENTS program_options unit_test_framework)
 
 if( APPLE AND UNIX )
 # Apple Specific Options Here
diff --git a/libraries/appbase b/libraries/appbase
index ac1b7ac3db2..21dee91e3a1 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit ac1b7ac3db2d5056ccc4a6274fc21381ae4f861b
+Subproject commit 21dee91e3a1dc61e28581b56011132242c40e10a
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 6bdf3237d49..c003286012d 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -17,6 +17,7 @@
 #include <eosio/chain/reversible_block_object.hpp>
 #include <eosio/chain/genesis_intrinsics.hpp>
 #include <eosio/chain/whitelisted_intrinsics.hpp>
+#include <eosio/chain/database_header_object.hpp>
 
 #include <eosio/chain/protocol_feature_manager.hpp>
 #include <eosio/chain/authorization_manager.hpp>
@@ -45,7 +46,8 @@ using controller_index_set = index_set<
    transaction_multi_index,
    generated_transaction_multi_index,
    table_id_multi_index,
-   code_index
+   code_index,
+   database_header_multi_index
 >;
 
 using contract_database_index_set = index_set<
@@ -578,6 +580,31 @@ struct controller_impl {
             head = fork_db.head();
          }
       }
+
+      // check database version
+      const auto& header_idx = db.get_index<database_header_multi_index>().indices().get<by_id>();
+
+      if (database_header_object::minimum_version != 0) {
+         EOS_ASSERT(header_idx.begin() != header_idx.end(), bad_database_version_exception,
+                    "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
+      } else if ( header_idx.empty() ) {
+         // temporary code to upgrade from existing un-versioned state database
+         static_assert(database_header_object::minimum_version == 0, "remove this path once the minimum version moves");
+         db.create<database_header_object>([](const auto& header){
+            // nothing to do here
+         });
+      }
+
+      const auto& header_itr = header_idx.begin();
+      header_itr->validate();
+
+      // upgrade to the latest compatible version
+      if (header_itr->version != database_header_object::current_version) {
+         db.modify(*header_itr, [](auto& header) {
+            header.version = database_header_object::current_version;
+         });
+      }
+
       // At this point head != nullptr && fork_db.head() != nullptr && fork_db.root() != nullptr.
       // Furthermore, fork_db.root()->block_num <= lib_num.
       // Also, even though blog.head() may still be nullptr, blog.first_block_num() is guaranteed to be lib_num + 1.
@@ -788,6 +815,11 @@ struct controller_impl {
             return;
          }
 
+         // skip the database_header as it is only relevant to in-memory database
+         if (std::is_same<value_t, database_header_object>::value) {
+            return;
+         }
+
          snapshot->write_section<value_t>([this]( auto& section ){
             decltype(utils)::walk(db, [this, &section]( const auto &row ) {
                section.add_row(row, db);
@@ -835,6 +867,11 @@ struct controller_impl {
             return;
          }
 
+         // skip the database_header as it is only relevant to in-memory database
+         if (std::is_same<value_t, database_header_object>::value) {
+            return;
+         }
+
          snapshot->read_section<value_t>([this]( auto& section ) {
             bool more = !section.empty();
             while(more) {
@@ -851,6 +888,9 @@ struct controller_impl {
       resource_limits.read_from_snapshot(snapshot);
 
       db.set_revision( head->block_num );
+      db.create<database_header_object>([](const auto& header){
+         // nothing to do
+      });
    }
 
    sha256 calculate_integrity_hash() const {
@@ -893,6 +933,11 @@ struct controller_impl {
    }
 
    void initialize_database() {
+      // create the database header sigil
+      db.create<database_header_object>([&]( auto& header ){
+         // nothing to do for now
+      });
+
       // Initialize block summary index
       for (int i = 0; i < 0x10000; i++)
          db.create<block_summary_object>([&](block_summary_object&) {});
diff --git a/libraries/chain/include/eosio/chain/database_header_object.hpp b/libraries/chain/include/eosio/chain/database_header_object.hpp
new file mode 100644
index 00000000000..e0da70944f0
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/database_header_object.hpp
@@ -0,0 +1,56 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#pragma once
+#include <eosio/chain/types.hpp>
+
+#include "multi_index_includes.hpp"
+
+namespace eosio { namespace chain {
+      /**
+       *  @brief tracks the version of the application data stored in the database
+       *  @ingroup object
+       *
+       *  the in-memory database expects that binay structures of data do not shift between executions.  Some
+       *  upgrades will bump this version to indicate that the expectations of the binary application data
+       *  have changed.  When it is safe to directly use an older version that will be allowed though cases
+       *  where this is possible may be rare.
+       */
+      class database_header_object : public chainbase::object<database_header_object_type, database_header_object>
+      {
+         OBJECT_CTOR(database_header_object)
+
+         /**
+          *  VERSION HISTORY
+          *   - 0 : implied version when this header is absent
+          *   - 1 : initial version, prior to this no `database_header_object` existed in the shared memory file but
+          *         no changes to its format were made so it can be safely added to existing databases
+          */
+
+         static constexpr uint32_t current_version            = 1;
+         static constexpr uint32_t minimum_version            = 0;
+
+         id_type        id;
+         uint32_t       version = current_version;
+
+         void validate() const {
+            EOS_ASSERT(std::clamp(version, minimum_version, current_version) == version, bad_database_version_exception,
+                       "state database version is incompatible, please restore from a compatible snapshot or replay!",
+                       ("version", version)("minimum_version", minimum_version)("maximum_version", current_version));
+         }
+      };
+
+      struct by_block_id;
+      using database_header_multi_index = chainbase::shared_multi_index_container<
+            database_header_object,
+            indexed_by<
+                  ordered_unique<tag<by_id>, BOOST_MULTI_INDEX_MEMBER(database_header_object, database_header_object::id_type, id)>
+             >
+      >;
+
+   } }
+
+CHAINBASE_SET_INDEX_TYPE(eosio::chain::database_header_object, eosio::chain::database_header_multi_index)
+
+FC_REFLECT( eosio::chain::database_header_object, (version) )
diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index da34027826d..a8e0448c849 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -313,6 +313,8 @@ namespace eosio { namespace chain {
                                     3060003, "Contract Table Query Exception" )
       FC_DECLARE_DERIVED_EXCEPTION( contract_query_exception,       database_exception,
                                     3060004, "Contract Query Exception" )
+      FC_DECLARE_DERIVED_EXCEPTION( bad_database_version_exception, database_exception,
+                                    3060005, "Database is an unknown or unsupported version" )
 
    FC_DECLARE_DERIVED_EXCEPTION( guard_exception, database_exception,
                                  3060100, "Guard Exception" )
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index d6323fbd23d..dafed48c49a 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -192,6 +192,7 @@ namespace eosio { namespace chain {
       protocol_state_object_type,
       account_ram_correction_object_type,
       code_object_type,
+      database_header_object_type,
       OBJECT_TYPE_COUNT ///< Sentry value which contains the number of different object types
    };
 
diff --git a/libraries/chainbase b/libraries/chainbase
index b769749d533..04e1f4348fd 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit b769749d53303ec1a037d483c631d02268cbf012
+Subproject commit 04e1f4348fd527512f26d4453190878eb96f010b
diff --git a/libraries/fc b/libraries/fc
index fcc952b616e..3a133c8d9ff 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit fcc952b616e5968a5b0898e051e3f56fe3a43245
+Subproject commit 3a133c8d9ff3cbf78fce43882cd7e1ff40d8c649
diff --git a/libraries/testing/CMakeLists.txt b/libraries/testing/CMakeLists.txt
index b03c85760d1..0c71359ec44 100644
--- a/libraries/testing/CMakeLists.txt
+++ b/libraries/testing/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library( eosio_testing
              ${HEADERS}
         )
 
-target_link_libraries( eosio_testing eosio_chain fc chainbase Logging IR WAST WASM Runtime )
+target_link_libraries( eosio_testing eosio_chain fc chainbase Logging IR WAST WASM Runtime Boost::unit_test_framework )
 target_include_directories( eosio_testing
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"
                                    "${CMAKE_CURRENT_SOURCE_DIR}/../wasm-jit/Include"
diff --git a/pipeline.jsonc b/pipeline.jsonc
index ed98e86690b..84e8a7ca5fc 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,39 +1,39 @@
 {
-    "eosio-build-unpinned":
-    {
+    "eosio": {
+        "pipeline-branch": "bats-v3",
+        "environment": {
+            "IMAGE_TAG": "bats-v3",
+            "DEBUG": true
+        }
+    },
+    "eosio-base-images": {
+        "pipeline-branch": "bats-v3"
+    },
+    "eosio-build-unpinned": {
         "pipeline-branch": "protocol-features-sync-nodes"
     },
-    "eosio-lrt":
-    {
+    "eosio-lrt": {
         "pipeline-branch": "protocol-features-sync-nodes"
     },
-    "eos-multiversion-tests":
-    {
+    "eos-multiversion-tests": {
         "pipeline-branch": "protocol-features-sync-nodes",
-        "configuration":
-        [
+        "configuration": [
             "170=v1.7.0"
         ]
     },
-    "eosio-docker-builds":
-    {
-        "environment":
-        {
+    "eosio-docker-builds": {
+        "environment": {
             "BUILDER_TAG": "v1.8.0"
         }
     },
-    "eosio-sync-tests":
-    {
-        "environment":
-        {
+    "eosio-sync-tests": {
+        "environment": {
             "SKIP_PRE_V180": "true",
             "SKIP_V180": "false"
         }
     },
-    "eosio-replay-tests":
-    {
-        "environment":
-        {
+    "eosio-replay-tests": {
+        "environment": {
             "SKIP_PRE_V180": "true",
             "SKIP_V180": "false"
         }
diff --git a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
index 0fe35dd4277..2be1553543b 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
@@ -31,8 +31,6 @@ namespace eosio {
         void plugin_startup();
         void plugin_shutdown();
 
-        void   broadcast_block(const chain::signed_block &sb);
-
         string                       connect( const string& endpoint );
         string                       disconnect( const string& endpoint );
         optional<connection_status>  status( const string& endpoint )const;
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 00e68767fdc..3c8ab0b5bfc 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -250,14 +250,6 @@ namespace eosio {
       mutable std::shared_mutex             connections_mtx;
       std::set< connection_ptr >            connections;     // todo: switch to a thread safe container to avoid big mutex over complete collection
 
-      template<typename Function>
-      void for_each_connection( Function f ) {
-         std::shared_lock<std::shared_mutex> g( connections_mtx );
-         for( auto& c : connections ) {
-            if ( !f( c ) ) return;
-         }
-      }
-
       std::mutex                            connector_check_timer_mtx;
       unique_ptr<boost::asio::steady_timer> connector_check_timer;
       int                                   connector_checks_in_flight{0};
@@ -384,8 +376,8 @@ namespace eosio {
    constexpr auto     def_send_buffer_size = 1024*1024*def_send_buffer_size_mb;
    constexpr auto     def_max_write_queue_size = def_send_buffer_size*10;
    constexpr boost::asio::chrono::milliseconds def_read_delay_for_full_write_queue{100};
-   constexpr auto     def_max_reads_in_flight = 1000;
    constexpr auto     def_max_trx_in_progress_size = 100*1024*1024; // 100 MB
+   constexpr auto     def_max_read_delays = 100; // number of times read_delay_timer started without any reads
    constexpr auto     def_max_consecutive_rejected_blocks = 3; // num of rejected blocks before disconnect
    constexpr auto     def_max_consecutive_immediate_connection_close = 9; // back off if client keeps closing
    constexpr auto     def_max_clients = 25; // 0 for unlimited clients
@@ -436,10 +428,6 @@ namespace eosio {
       time_point   start_time; ///< time request made or received
    };
 
-   struct handshake_initializer {
-      static void populate(handshake_message& hello);
-   };
-
    // thread safe
    class queued_buffer : boost::noncopyable {
    public:
@@ -549,6 +537,10 @@ namespace eosio {
       // thread safe, not updated after start_session()
       const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; }
 
+      void set_connection_type( const string& peer_addr );
+      bool is_transactions_only_connection()const { return connection_type == transactions_only; }
+      bool is_blocks_only_connection()const { return connection_type == blocks_only; }
+
    private:
       static const string unknown;
 
@@ -564,6 +556,14 @@ namespace eosio {
       string                  local_endpoint_ip;      // not updated after start
       string                  local_endpoint_port;    // not updated after start
 
+      enum connection_types : char {
+         both,
+         transactions_only,
+         blocks_only
+      };
+
+      std::atomic<connection_types>             connection_type{both};
+
    public:
       boost::asio::io_context::strand           strand;
       tcp::socket                               socket; // only accessed through strand after construction
@@ -573,7 +573,6 @@ namespace eosio {
 
       queued_buffer           buffer_queue;
 
-      std::atomic<uint32_t>   reads_in_flight{0};
       std::atomic<uint32_t>   trx_in_progress_size{0};
       fc::sha256              node_id;
       const uint32_t          connection_id;
@@ -587,6 +586,7 @@ namespace eosio {
       std::mutex                            response_expected_timer_mtx;
       boost::asio::steady_timer             response_expected_timer;
 
+      uint16_t                              read_delay_count = 0; // only accessed from strand
       std::mutex                            read_delay_timer_mtx;
       boost::asio::steady_timer             read_delay_timer;
 
@@ -620,6 +620,8 @@ namespace eosio {
       static void _close( connection* self, bool reconnect ); // for easy capture
    public:
 
+      void populate_handshake( handshake_message& hello );
+
       bool resolve_and_connect();
       void connect(const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
       void start_read_message();
@@ -810,6 +812,23 @@ namespace eosio {
       }
    };
 
+   template<typename Function>
+   void for_each_connection( Function f ) {
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
+      for( auto& c : my_impl->connections ) {
+         if( !f( c ) ) return;
+      }
+   }
+
+   template<typename Function>
+   void for_each_block_connection( Function f ) {
+      std::shared_lock<std::shared_mutex> g( my_impl->connections_mtx );
+      for( auto& c : my_impl->connections ) {
+         if( c->is_transactions_only_connection() ) continue;
+         if( !f( c ) ) return;
+      }
+   }
+
    //---------------------------------------------------------------------------
 
    connection::connection( string endpoint )
@@ -822,7 +841,7 @@ namespace eosio {
         last_handshake_recv(),
         last_handshake_sent()
    {
-      fc_ilog( logger, "created connection to ${n}", ("n", endpoint) );
+      fc_ilog( logger, "creating connection to ${n}", ("n", endpoint) );
       node_id.data()[0] = 0;
    }
 
@@ -851,6 +870,31 @@ namespace eosio {
       local_endpoint_port = ec ? unknown : std::to_string(lep.port());
    }
 
+   void connection::set_connection_type( const string& peer_add ) {
+      // host:port:[<trx>|<blk>]
+      string::size_type colon = peer_add.find(':');
+      string::size_type colon2 = peer_add.find(':', colon + 1);
+      string::size_type end = colon2 == string::npos
+            ? string::npos : peer_add.find_first_of( " :+=.,<>!$%^&(*)|-#@\t", colon2 + 1 ); // future proof by including most symbols without using regex
+      string host = peer_add.substr( 0, colon );
+      string port = peer_add.substr( colon + 1, colon2 == string::npos ? string::npos : colon2 - (colon + 1));
+      string type = colon2 == string::npos ? "" : end == string::npos ?
+            peer_add.substr( colon2 + 1 ) : peer_add.substr( colon2 + 1, end - (colon2 + 1) );
+
+      if( type.empty() ) {
+         fc_ilog( logger, "Setting connection type for: ${peer} to both transactions and blocks", ("peer", peer_add) );
+         connection_type = both;
+      } else if( type == "trx" ) {
+         fc_ilog( logger, "Setting connection type for: ${peer} to transactions only", ("peer", peer_add) );
+         connection_type = transactions_only;
+      } else if( type == "blk" ) {
+         fc_ilog( logger, "Setting connection type for: ${peer} to blocks only", ("peer", peer_add) );
+         connection_type = blocks_only;
+      } else {
+         fc_wlog( logger, "Unknown connection type: ${t}", ("t", type) );
+      }
+   }
+
    connection_status connection::get_status()const {
       connection_status stat;
       stat.peer = peer_addr;
@@ -928,6 +972,7 @@ namespace eosio {
       {
          std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
          self->read_delay_timer.cancel();
+         self->read_delay_count = 0;
       }
 
       if( reconnect ) {
@@ -1009,7 +1054,7 @@ namespace eosio {
    void connection::send_handshake() {
       strand.post( [c = shared_from_this()]() {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
-         handshake_initializer::populate( c->last_handshake_sent );
+         c->populate_handshake( c->last_handshake_sent );
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          auto last_handshake_sent = c->last_handshake_sent;
          g_conn.unlock();
@@ -1400,7 +1445,7 @@ namespace eosio {
                auto cstart_it = cptr;
                do {
                   //select the first one which is current and break out.
-                  if( (*cptr)->current() ) {
+                  if( !(*cptr)->is_transactions_only_connection() && (*cptr)->current() ) {
                      sync_source = *cptr;
                      break;
                   }
@@ -1413,7 +1458,7 @@ namespace eosio {
       }
 
       // verify there is an available source
-      if( !sync_source || !sync_source->current() ) {
+      if( !sync_source || !sync_source->current() || sync_source->is_transactions_only_connection() ) {
          fc_elog( logger, "Unable to continue syncing at this time");
          sync_known_lib_num = lib_block_num;
          sync_last_requested_num = 0;
@@ -1440,7 +1485,7 @@ namespace eosio {
 
    // static, thread safe
    void sync_manager::send_handshakes() {
-      my_impl->for_each_connection( []( auto& ci ) {
+      for_each_connection( []( auto& ci ) {
          if( ci->current() ) {
             ci->send_handshake();
          }
@@ -1499,11 +1544,13 @@ namespace eosio {
    }
 
    void sync_manager::recv_handshake( const connection_ptr& c, const handshake_message& msg ) {
+
+      if( c->is_transactions_only_connection() ) return;
+
       uint32_t lib_num = 0;
       uint32_t peer_lib = msg.last_irreversible_block_num;
       uint32_t head = 0;
       block_id_type head_id;
-
       std::tie( lib_num, std::ignore, head,
                 std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
 
@@ -1524,7 +1571,6 @@ namespace eosio {
       if (head_id == msg.head_id) {
          fc_dlog(logger, "sync check state 0");
          c->syncing = false;
-         // notify peer of our pending transactions
          notice_message note;
          note.known_blocks.mode = none;
          note.known_trx.mode = catch_up;
@@ -1581,7 +1627,7 @@ namespace eosio {
    void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
-      my_impl->for_each_connection( [num, &id, &req]( const auto& cc ) {
+      for_each_block_connection( [num, &id, &req]( const auto& cc ) {
          std::lock_guard<std::mutex> g_conn( cc->conn_mtx );
          if( cc->fork_head_num > num || cc->fork_head == id ) {
             req.req_blocks.mode = none;
@@ -1685,7 +1731,7 @@ namespace eosio {
 
          block_id_type null_id;
          bool set_state_to_head_catchup = false;
-         my_impl->for_each_connection( [&null_id, blk_num, &blk_id, &c, &set_state_to_head_catchup]( const auto& cp ) {
+         for_each_block_connection( [&null_id, blk_num, &blk_id, &c, &set_state_to_head_catchup]( const auto& cp ) {
             std::unique_lock<std::mutex> g_cp_conn( cp->conn_mtx );
             uint32_t fork_head_num = cp->fork_head_num;
             block_id_type fork_head_id = cp->fork_head;
@@ -1828,7 +1874,7 @@ namespace eosio {
 
       if( my_impl->sync_master->syncing_with_peer() ) return;
       bool have_connection = false;
-      my_impl->for_each_connection( [&have_connection]( auto& cp ) {
+      for_each_block_connection( [&have_connection]( auto& cp ) {
          peer_dlog( cp, "socket_is_open ${s}, connecting ${c}, syncing ${ss}",
                     ("s", cp->socket_is_open())("c", cp->connecting.load())("ss", cp->syncing.load()) );
 
@@ -1842,7 +1888,7 @@ namespace eosio {
       if( !have_connection ) return;
       std::shared_ptr<std::vector<char>> send_buffer = create_send_buffer( bs->block );
 
-      my_impl->for_each_connection( [this, bs, send_buffer]( auto& cp ) {
+      for_each_block_connection( [this, bs, send_buffer]( auto& cp ) {
          if( !cp->current() ) {
             return true;
          }
@@ -1894,8 +1940,8 @@ namespace eosio {
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
       std::shared_ptr<std::vector<char>> send_buffer;
-      my_impl->for_each_connection( [this, &trx, &nts, &send_buffer]( auto& cp ) {
-         if( !cp->current() ) {
+      for_each_connection( [this, &trx, &nts, &send_buffer]( auto& cp ) {
+         if( cp->is_blocks_only_connection() || !cp->current() ) {
             return true;
          }
          nts.connection_id = cp->connection_id;
@@ -1997,7 +2043,7 @@ namespace eosio {
          }
          last_req = *c->last_req;
       }
-      my_impl->for_each_connection( [this, &c, &last_req, &bid]( auto& conn ) {
+      for_each_block_connection( [this, &c, &last_req, &bid]( auto& conn ) {
          if( conn == c )
             return true;
          {
@@ -2039,7 +2085,7 @@ namespace eosio {
 
       string::size_type colon = peer_address().find(':');
       if (colon == std::string::npos || colon == 0) {
-         fc_elog( logger, "Invalid peer address. must be \"host:port\": ${p}", ("p", peer_address()) );
+         fc_elog( logger, "Invalid peer address. must be \"host:port[:<blk>|<trx>]\": ${p}", ("p", peer_address()) );
          return false;
       }
 
@@ -2053,9 +2099,11 @@ namespace eosio {
          }
       }
 
+      string::size_type colon2 = peer_address().find(':', colon + 1);
       string host = peer_address().substr( 0, colon );
-      string port = peer_address().substr( colon + 1);
+      string port = peer_address().substr( colon + 1, colon2 == string::npos ? string::npos : colon2 - (colon + 1));
       idump((host)(port));
+      set_connection_type( peer_address() );
       tcp::resolver::query query( tcp::v4(), host, port );
       // Note: need to add support for IPv6 too
 
@@ -2119,7 +2167,7 @@ namespace eosio {
                fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
             } else {
                paddr_str = paddr_add.to_string();
-               my_impl->for_each_connection( [&visitors, &from_addr, &paddr_str]( auto& conn ) {
+               for_each_connection( [&visitors, &from_addr, &paddr_str]( auto& conn ) {
                   if( conn->socket_is_open() ) {
                      if( conn->peer_address().empty() ) {
                         ++visitors;
@@ -2189,47 +2237,43 @@ namespace eosio {
          };
 
          if( buffer_queue.write_queue_size() > def_max_write_queue_size ||
-             reads_in_flight > def_max_reads_in_flight   ||
              trx_in_progress_size > def_max_trx_in_progress_size )
          {
             // too much queued up, reschedule
             uint32_t write_queue_size = buffer_queue.write_queue_size();
             uint32_t trx_in_progress_size = this->trx_in_progress_size.load();
-            uint32_t reads_in_flight = this->reads_in_flight.load();
             if( write_queue_size > def_max_write_queue_size ) {
                peer_wlog( this, "write_queue full ${s} bytes", ("s", write_queue_size) );
-            } else if( reads_in_flight > def_max_reads_in_flight ) {
-               peer_wlog( this, "max reads in flight ${s}", ("s", reads_in_flight) );
             } else {
                peer_wlog( this, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
             }
             if( write_queue_size > 2*def_max_write_queue_size ||
-                reads_in_flight > 2*def_max_reads_in_flight   ||
-                trx_in_progress_size > 2*def_max_trx_in_progress_size )
+                trx_in_progress_size > 2*def_max_trx_in_progress_size ||
+                ++read_delay_count > def_max_read_delays )
             {
                fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
                         ("p", peer_name()) );
-               close();
+               close( false );
                return;
             }
             std::lock_guard<std::mutex> g( read_delay_timer_mtx );
+            read_delay_timer.cancel();
             read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
             connection_wptr weak_conn = shared_from_this();
-            read_delay_timer.async_wait( boost::asio::bind_executor(strand, [weak_conn]( boost::system::error_code ) {
+            read_delay_timer.async_wait( boost::asio::bind_executor(strand, [weak_conn]( boost::system::error_code ec ) {
+               if( ec == boost::asio::error::operation_aborted ) return;
                auto conn = weak_conn.lock();
                if( !conn ) return;
                conn->start_read_message();
             } ) );
             return;
          }
+         read_delay_count = 0;
 
-         ++reads_in_flight;
          boost::asio::async_read( socket,
             pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             boost::asio::bind_executor( strand,
             [conn = shared_from_this()]( boost::system::error_code ec, std::size_t bytes_transferred ) {
-               --conn->reads_in_flight;
-
                // may have closed connection and cleared pending_message_buffer
                if( !conn->socket_is_open() ) return;
 
@@ -2428,6 +2472,10 @@ namespace eosio {
             return;
          }
 
+         if( peer_address().empty() ) {
+            set_connection_type( msg.p2p_address );
+         }
+
          std::unique_lock<std::mutex> g_conn( conn_mtx );
          if( peer_address().empty() || last_handshake_recv.node_id == fc::sha256()) {
             g_conn.unlock();
@@ -2866,7 +2914,7 @@ namespace eosio {
                if( my->in_shutdown ) return;
                fc_wlog( logger, "Peer keepalive ticked sooner than expected: ${m}", ("m", ec.message()) );
             }
-            my->for_each_connection( []( auto& c ) {
+            for_each_connection( []( auto& c ) {
                if( c->socket_is_open() ) {
                   c->strand.post( [c]() {
                      c->send_time();
@@ -3044,7 +3092,7 @@ namespace eosio {
    }
 
    // call from connection strand
-   void handshake_initializer::populate( handshake_message& hello ) {
+   void connection::populate_handshake( handshake_message& hello ) {
       hello.network_version = net_version_base + net_version;
       hello.chain_id = my_impl->chain_id;
       hello.node_id = my_impl->node_id;
@@ -3055,7 +3103,10 @@ namespace eosio {
       // If we couldn't sign, don't send a token.
       if(hello.sig == chain::signature_type())
          hello.token = sha256();
-      hello.p2p_address = my_impl->p2p_address + " - " + hello.node_id.str().substr(0,7);
+      hello.p2p_address = my_impl->p2p_address;
+      if( is_transactions_only_connection() ) hello.p2p_address += ":trx";
+      if( is_blocks_only_connection() ) hello.p2p_address += ":blk";
+      hello.p2p_address += " - " + hello.node_id.str().substr(0,7);
 #if defined( __APPLE__ )
       hello.os = "osx";
 #elif defined( __linux__ )
@@ -3084,7 +3135,14 @@ namespace eosio {
       cfg.add_options()
          ( "p2p-listen-endpoint", bpo::value<string>()->default_value( "0.0.0.0:9876" ), "The actual host:port used to listen for incoming p2p connections.")
          ( "p2p-server-address", bpo::value<string>(), "An externally accessible host:port for identifying this node. Defaults to p2p-listen-endpoint.")
-         ( "p2p-peer-address", bpo::value< vector<string> >()->composing(), "The public endpoint of a peer node to connect to. Use multiple p2p-peer-address options as needed to compose a network.")
+         ( "p2p-peer-address", bpo::value< vector<string> >()->composing(),
+           "The public endpoint of a peer node to connect to. Use multiple p2p-peer-address options as needed to compose a network.\n"
+           "  Syntax: host:port[:<trx>|<blk>]\n"
+           "  The optional 'trx' and 'blk' indicates to node that only transactions 'trx' or blocks 'blk' should be sent."
+           "  Examples:\n"
+           "    p2p.eos.io:9876\n"
+           "    p2p.trx.eos.io:9876:trx\n"
+           "    p2p.blk.eos.io:9876:blk\n")
          ( "p2p-max-nodes-per-host", bpo::value<int>()->default_value(def_max_nodes_per_host), "Maximum number of client nodes from any single IP address")
          ( "agent-name", bpo::value<string>()->default_value("\"EOS Test Agent\""), "The name supplied to identify this node amongst the peers.")
          ( "allowed-connection", bpo::value<vector<string>>()->multitoken()->default_value({"any"}, "any"), "Can be 'any' or 'producers' or 'specified' or 'none'. If 'specified', peer-key must be specified at least once. If only 'producers', peer-key is not required. 'producers' and 'specified' may be combined.")
diff --git a/plugins/wallet_plugin/se_wallet.cpp b/plugins/wallet_plugin/se_wallet.cpp
index 2f9ccfffc06..64c8d0a46ba 100644
--- a/plugins/wallet_plugin/se_wallet.cpp
+++ b/plugins/wallet_plugin/se_wallet.cpp
@@ -362,6 +362,7 @@ bool se_wallet::import_key(string wif_key) {
 }
 
 string se_wallet::create_key(string key_type) {
+   EOS_ASSERT(key_type.empty() || key_type == "R1", chain::unsupported_key_type_exception, "Secure Enclave wallet only supports R1 keys");
    return (string)my->create();
 }
 
diff --git a/plugins/wallet_plugin/yubihsm_wallet.cpp b/plugins/wallet_plugin/yubihsm_wallet.cpp
index 0f367457fa0..04378916011 100644
--- a/plugins/wallet_plugin/yubihsm_wallet.cpp
+++ b/plugins/wallet_plugin/yubihsm_wallet.cpp
@@ -257,6 +257,7 @@ bool yubihsm_wallet::import_key(string wif_key) {
 }
 
 string yubihsm_wallet::create_key(string key_type) {
+   EOS_ASSERT(key_type.empty() || key_type == "R1", chain::unsupported_key_type_exception, "YubiHSM wallet only supports R1 keys");
    return (string)my->create();
 }
 
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 2e319ac3eba..826c2c4bc0e 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -179,6 +179,7 @@ bool   tx_dont_broadcast = false;
 bool   tx_return_packed = false;
 bool   tx_skip_sign = false;
 bool   tx_print_json = false;
+string tx_json_save_file;
 bool   print_request = false;
 bool   print_response = false;
 bool   no_auto_keosd = false;
@@ -208,6 +209,7 @@ void add_standard_transaction_options(CLI::App* cmd, string default_permission =
    cmd->add_flag("-f,--force-unique", tx_force_unique, localized("force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times"));
    cmd->add_flag("-s,--skip-sign", tx_skip_sign, localized("Specify if unlocked wallet keys should be used to sign transaction"));
    cmd->add_flag("-j,--json", tx_print_json, localized("print result as json"));
+   cmd->add_option("--json-file", tx_json_save_file, localized("save result in json format into a file"));
    cmd->add_flag("-d,--dont-broadcast", tx_dont_broadcast, localized("don't broadcast transaction to the network (just print to stdout)"));
    cmd->add_flag("--return-packed", tx_return_packed, localized("used in conjunction with --dont-broadcast to get the packed transaction"));
    cmd->add_option("-r,--ref-block", tx_ref_block_num_or_id, (localized("set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)")));
@@ -501,20 +503,48 @@ void print_result( const fc::variant& result ) { try {
 
 using std::cout;
 void send_actions(std::vector<chain::action>&& actions, packed_transaction::compression_type compression = packed_transaction::none ) {
+   std::ofstream out;
+   if (tx_json_save_file.length()) {
+      out.open(tx_json_save_file);
+      EOSC_ASSERT(!out.fail(), "ERROR: Failed to create file \"${p}\"", ("p", tx_json_save_file));
+   }
    auto result = push_actions( move(actions), compression);
 
+   string jsonstr;
+   if (tx_json_save_file.length()) {
+      jsonstr = fc::json::to_pretty_string( result );
+      out << jsonstr;
+      out.close();
+   }
    if( tx_print_json ) {
-      cout << fc::json::to_pretty_string( result ) << endl;
+      if (jsonstr.length() == 0) {
+         jsonstr = fc::json::to_pretty_string( result );
+      }
+      cout << jsonstr << endl;
    } else {
       print_result( result );
    }
 }
 
 void send_transaction( signed_transaction& trx, packed_transaction::compression_type compression = packed_transaction::none  ) {
+   std::ofstream out;
+   if (tx_json_save_file.length()) {
+      out.open(tx_json_save_file);
+      EOSC_ASSERT(!out.fail(), "ERROR: Failed to create file \"${p}\"", ("p", tx_json_save_file));
+   }
    auto result = push_transaction(trx, compression);
 
+   string jsonstr;
+   if (tx_json_save_file.length()) {
+      jsonstr = fc::json::to_pretty_string( result );
+      out << jsonstr;
+      out.close();
+   }
    if( tx_print_json ) {
-      cout << fc::json::to_pretty_string( result ) << endl;
+      if (jsonstr.length() == 0) {
+         jsonstr = fc::json::to_pretty_string( result );
+      }
+      cout << jsonstr << endl;
    } else {
       print_result( result );
    }
@@ -888,11 +918,13 @@ void try_local_port(uint32_t duration) {
 void ensure_keosd_running(CLI::App* app) {
     if (no_auto_keosd)
         return;
-    // get, version, net do not require keosd
-    if (tx_skip_sign || app->got_subcommand("get") || app->got_subcommand("version") || app->got_subcommand("net"))
+    // get, version, net, convert do not require keosd
+    if (tx_skip_sign || app->got_subcommand("get") || app->got_subcommand("version") || app->got_subcommand("net") || app->got_subcommand("convert"))
         return;
     if (app->get_subcommand("create")->got_subcommand("key")) // create key does not require wallet
        return;
+    if (app->get_subcommand("multisig")->got_subcommand("review")) // multisig review does not require wallet
+       return;
     if (auto* subapp = app->get_subcommand("system")) {
        if (subapp->got_subcommand("listproducers") || subapp->got_subcommand("listbw") || subapp->got_subcommand("bidnameinfo")) // system list* do not require wallet
          return;
@@ -3219,7 +3251,7 @@ int main( int argc, char** argv ) {
       try {
          wallet_key = private_key_type( wallet_key_str );
       } catch (...) {
-         EOS_THROW(private_key_type_exception, "Invalid private key: ${private_key}", ("private_key", wallet_key_str))
+         EOS_THROW(private_key_type_exception, "Invalid private key")
       }
       public_key_type pubkey = wallet_key.get_public_key();
 
@@ -3299,16 +3331,22 @@ int main( int argc, char** argv ) {
    string trx_json_to_sign;
    string str_private_key;
    string str_chain_id;
+   string str_private_key_file;
+   string str_public_key;
    bool push_trx = false;
 
    auto sign = app.add_subcommand("sign", localized("Sign a transaction"), false);
    sign->add_option("transaction", trx_json_to_sign,
                                  localized("The JSON string or filename defining the transaction to sign"), true)->required();
    sign->add_option("-k,--private-key", str_private_key, localized("The private key that will be used to sign the transaction"));
+   sign->add_option("--public-key", str_public_key, localized("Ask ${exec} to sign with the corresponding private key of the given public key", ("exec", key_store_executable_name)));
    sign->add_option("-c,--chain-id", str_chain_id, localized("The chain id that will be used to sign the transaction"));
-   sign->add_flag( "-p,--push-transaction", push_trx, localized("Push transaction after signing"));
+   sign->add_flag("-p,--push-transaction", push_trx, localized("Push transaction after signing"));
 
    sign->set_callback([&] {
+
+      EOSC_ASSERT( str_private_key.empty() || str_public_key.empty(), "ERROR: Either -k/--private-key or --public-key or none of them can be set" );
+
       signed_transaction trx = json_from_file_or_string(trx_json_to_sign).as<signed_transaction>();
 
       fc::optional<chain_id_type> chain_id;
@@ -3321,16 +3359,27 @@ int main( int argc, char** argv ) {
          chain_id = chain_id_type(str_chain_id);
       }
 
-      if( str_private_key.size() == 0 ) {
-         std::cerr << localized("private key: ");
-         fc::set_console_echo(false);
-         std::getline( std::cin, str_private_key, '\n' );
-         fc::set_console_echo(true);
+      if( str_public_key.size() > 0 ) {
+         public_key_type pub_key;
+         try {
+            pub_key = public_key_type(str_public_key);
+         } EOS_RETHROW_EXCEPTIONS(public_key_type_exception, "Invalid public key: ${public_key}", ("public_key", str_public_key))
+         fc::variant keys_var(flat_set<public_key_type>{ pub_key });
+         sign_transaction(trx, keys_var, *chain_id);
+      } else {
+         if( str_private_key.size() == 0 ) {
+            std::cerr << localized("private key: ");
+            fc::set_console_echo(false);
+            std::getline( std::cin, str_private_key, '\n' );
+            fc::set_console_echo(true);
+         }
+         private_key_type priv_key;
+         try {
+            priv_key = private_key_type(str_private_key);
+         } EOS_RETHROW_EXCEPTIONS(private_key_type_exception, "Invalid private key")
+         trx.sign(priv_key, *chain_id);
       }
 
-      auto priv_key = private_key_type(str_private_key);
-      trx.sign(priv_key, *chain_id);
-
       if(push_trx) {
          auto trx_result = call(push_txn_func, packed_transaction(trx, packed_transaction::none));
          std::cout << fc::json::to_pretty_string(trx_result) << std::endl;
diff --git a/programs/eosio-launcher/CMakeLists.txt b/programs/eosio-launcher/CMakeLists.txt
index c0c19262e09..9e09a02d804 100644
--- a/programs/eosio-launcher/CMakeLists.txt
+++ b/programs/eosio-launcher/CMakeLists.txt
@@ -29,7 +29,7 @@ configure_file(config.hpp.in config.hpp ESCAPE_QUOTES)
 target_include_directories(eosio-launcher PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(eosio-launcher
-                      PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                      PRIVATE eosio_chain fc Boost::program_options ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 
 install( TARGETS
    eosio-launcher
diff --git a/scripts/helpers/eosio.bash b/scripts/helpers/eosio.bash
index b7d186e0422..c35f336e8f0 100755
--- a/scripts/helpers/eosio.bash
+++ b/scripts/helpers/eosio.bash
@@ -23,8 +23,6 @@ fi
 # Load general helpers
 . ./scripts/helpers/general.bash
 
-[[ $ARCH == "Darwin" ]] && export CTEST_BIN=ctest || export CTEST_BIN=$BIN_DIR/ctest
-
 function setup() {
     if $VERBOSE; then
         echo "VERBOSE: ${VERBOSE}"
diff --git a/scripts/metrics/node_modules/node-fetch/CHANGELOG.md b/scripts/metrics/node_modules/node-fetch/CHANGELOG.md
deleted file mode 100644
index 941b6a8d8b7..00000000000
--- a/scripts/metrics/node_modules/node-fetch/CHANGELOG.md
+++ /dev/null
@@ -1,260 +0,0 @@
-
-Changelog
-=========
-
-
-# 2.x release
-
-## v2.5.0
-
-- Enhance: `Response` object now includes `redirected` property.
-- Enhance: `fetch()` now accepts third-party `Blob` implementation as body.
-- Other: disable `package-lock.json` generation as we never commit them.
-- Other: dev dependency update.
-- Other: readme update.
-
-## v2.4.1
-
-- Fix: `Blob` import rule for node < 10, as `Readable` isn't a named export.
-
-## v2.4.0
-
-- Enhance: added `Brotli` compression support (using node's zlib).
-- Enhance: updated `Blob` implementation per spec.
-- Fix: set content type automatically for `URLSearchParams`.
-- Fix: `Headers` now reject empty header names.
-- Fix: test cases, as node 12+ no longer accepts invalid header response.
-
-## v2.3.0
-
-- Enhance: added `AbortSignal` support, with README example.
-- Enhance: handle invalid `Location` header during redirect by rejecting them explicitly with `FetchError`.
-- Fix: update `browser.js` to support react-native environment, where `self` isn't available globally.
-
-## v2.2.1
-
-- Fix: `compress` flag shouldn't overwrite existing `Accept-Encoding` header.
-- Fix: multiple `import` rules, where `PassThrough` etc. doesn't have a named export when using node <10 and `--exerimental-modules` flag.
-- Other: Better README.
-
-## v2.2.0
-
-- Enhance: Support all `ArrayBuffer` view types
-- Enhance: Support Web Workers
-- Enhance: Support Node.js' `--experimental-modules` mode; deprecate `.es.js` file
-- Fix: Add `__esModule` property to the exports object
-- Other: Better example in README for writing response to a file
-- Other: More tests for Agent
-
-## v2.1.2
-
-- Fix: allow `Body` methods to work on `ArrayBuffer`-backed `Body` objects
-- Fix: reject promise returned by `Body` methods when the accumulated `Buffer` exceeds the maximum size
-- Fix: support custom `Host` headers with any casing
-- Fix: support importing `fetch()` from TypeScript in `browser.js`
-- Fix: handle the redirect response body properly
-
-## v2.1.1
-
-Fix packaging errors in v2.1.0.
-
-## v2.1.0
-
-- Enhance: allow using ArrayBuffer as the `body` of a `fetch()` or `Request`
-- Fix: store HTTP headers of a `Headers` object internally with the given case, for compatibility with older servers that incorrectly treated header names in a case-sensitive manner
-- Fix: silently ignore invalid HTTP headers
-- Fix: handle HTTP redirect responses without a `Location` header just like non-redirect responses
-- Fix: include bodies when following a redirection when appropriate
-
-## v2.0.0
-
-This is a major release. Check [our upgrade guide](https://github.com/bitinn/node-fetch/blob/master/UPGRADE-GUIDE.md) for an overview on some key differences between v1 and v2.
-
-### General changes
-
-- Major: Node.js 0.10.x and 0.12.x support is dropped
-- Major: `require('node-fetch/lib/response')` etc. is now unsupported; use `require('node-fetch').Response` or ES6 module imports
-- Enhance: start testing on Node.js v4.x, v6.x, v8.x LTS, as well as v9.x stable
-- Enhance: use Rollup to produce a distributed bundle (less memory overhead and faster startup)
-- Enhance: make `Object.prototype.toString()` on Headers, Requests, and Responses return correct class strings
-- Other: rewrite in ES2015 using Babel
-- Other: use Codecov for code coverage tracking
-- Other: update package.json script for npm 5
-- Other: `encoding` module is now optional (alpha.7)
-- Other: expose browser.js through package.json, avoid bundling mishaps (alpha.9)
-- Other: allow TypeScript to `import` node-fetch by exposing default (alpha.9)
-
-### HTTP requests
-
-- Major: overwrite user's `Content-Length` if we can be sure our information is correct (per spec)
-- Fix: errors in a response are caught before the body is accessed
-- Fix: support WHATWG URL objects, created by `whatwg-url` package or `require('url').URL` in Node.js 7+
-
-### Response and Request classes
-
-- Major: `response.text()` no longer attempts to detect encoding, instead always opting for UTF-8 (per spec); use `response.textConverted()` for the v1 behavior
-- Major: make `response.json()` throw error instead of returning an empty object on 204 no-content respose (per spec; reverts behavior changed in v1.6.2)
-- Major: internal methods are no longer exposed
-- Major: throw error when a `GET` or `HEAD` Request is constructed with a non-null body (per spec)
-- Enhance: add `response.arrayBuffer()` (also applies to Requests)
-- Enhance: add experimental `response.blob()` (also applies to Requests)
-- Enhance: `URLSearchParams` is now accepted as a body
-- Enhance: wrap `response.json()` json parsing error as `FetchError`
-- Fix: fix Request and Response with `null` body
-
-### Headers class
-
-- Major: remove `headers.getAll()`; make `get()` return all headers delimited by commas (per spec)
-- Enhance: make Headers iterable
-- Enhance: make Headers constructor accept an array of tuples
-- Enhance: make sure header names and values are valid in HTTP
-- Fix: coerce Headers prototype function parameters to strings, where applicable
-
-### Documentation
-
-- Enhance: more comprehensive API docs
-- Enhance: add a list of default headers in README
-
-
-# 1.x release
-
-## backport releases (v1.7.0 and beyond)
-
-See [changelog on 1.x branch](https://github.com/bitinn/node-fetch/blob/1.x/CHANGELOG.md) for details.
-
-## v1.6.3
-
-- Enhance: error handling document to explain `FetchError` design
-- Fix: support `form-data` 2.x releases (requires `form-data` >= 2.1.0)
-
-## v1.6.2
-
-- Enhance: minor document update
-- Fix: response.json() returns empty object on 204 no-content response instead of throwing a syntax error
-
-## v1.6.1
-
-- Fix: if `res.body` is a non-stream non-formdata object, we will call `body.toString` and send it as a string
-- Fix: `counter` value is incorrectly set to `follow` value when wrapping Request instance
-- Fix: documentation update
-
-## v1.6.0
-
-- Enhance: added `res.buffer()` api for convenience, it returns body as a Node.js buffer
-- Enhance: better old server support by handling raw deflate response
-- Enhance: skip encoding detection for non-HTML/XML response
-- Enhance: minor document update
-- Fix: HEAD request doesn't need decompression, as body is empty
-- Fix: `req.body` now accepts a Node.js buffer
-
-## v1.5.3
-
-- Fix: handle 204 and 304 responses when body is empty but content-encoding is gzip/deflate
-- Fix: allow resolving response and cloned response in any order
-- Fix: avoid setting `content-length` when `form-data` body use streams
-- Fix: send DELETE request with content-length when body is present
-- Fix: allow any url when calling new Request, but still reject non-http(s) url in fetch
-
-## v1.5.2
-
-- Fix: allow node.js core to handle keep-alive connection pool when passing a custom agent
-
-## v1.5.1
-
-- Fix: redirect mode `manual` should work even when there is no redirection or broken redirection
-
-## v1.5.0
-
-- Enhance: rejected promise now use custom `Error` (thx to @pekeler)
-- Enhance: `FetchError` contains `err.type` and `err.code`, allows for better error handling (thx to @pekeler)
-- Enhance: basic support for redirect mode `manual` and `error`, allows for location header extraction (thx to @jimmywarting for the initial PR)
-
-## v1.4.1
-
-- Fix: wrapping Request instance with FormData body again should preserve the body as-is
-
-## v1.4.0
-
-- Enhance: Request and Response now have `clone` method (thx to @kirill-konshin for the initial PR)
-- Enhance: Request and Response now have proper string and buffer body support (thx to @kirill-konshin)
-- Enhance: Body constructor has been refactored out (thx to @kirill-konshin)
-- Enhance: Headers now has `forEach` method (thx to @tricoder42)
-- Enhance: back to 100% code coverage
-- Fix: better form-data support (thx to @item4)
-- Fix: better character encoding detection under chunked encoding (thx to @dsuket for the initial PR)
-
-## v1.3.3
-
-- Fix: make sure `Content-Length` header is set when body is string for POST/PUT/PATCH requests
-- Fix: handle body stream error, for cases such as incorrect `Content-Encoding` header
-- Fix: when following certain redirects, use `GET` on subsequent request per Fetch Spec
-- Fix: `Request` and `Response` constructors now parse headers input using `Headers`
-
-## v1.3.2
-
-- Enhance: allow auto detect of form-data input (no `FormData` spec on node.js, this is form-data specific feature)
-
-## v1.3.1
-
-- Enhance: allow custom host header to be set (server-side only feature, as it's a forbidden header on client-side)
-
-## v1.3.0
-
-- Enhance: now `fetch.Request` is exposed as well
-
-## v1.2.1
-
-- Enhance: `Headers` now normalized `Number` value to `String`, prevent common mistakes
-
-## v1.2.0
-
-- Enhance: now fetch.Headers and fetch.Response are exposed, making testing easier
-
-## v1.1.2
-
-- Fix: `Headers` should only support `String` and `Array` properties, and ignore others
-
-## v1.1.1
-
-- Enhance: now req.headers accept both plain object and `Headers` instance
-
-## v1.1.0
-
-- Enhance: timeout now also applies to response body (in case of slow response)
-- Fix: timeout is now cleared properly when fetch is done/has failed
-
-## v1.0.6
-
-- Fix: less greedy content-type charset matching
-
-## v1.0.5
-
-- Fix: when `follow = 0`, fetch should not follow redirect
-- Enhance: update tests for better coverage
-- Enhance: code formatting
-- Enhance: clean up doc
-
-## v1.0.4
-
-- Enhance: test iojs support
-- Enhance: timeout attached to socket event only fire once per redirect
-
-## v1.0.3
-
-- Fix: response size limit should reject large chunk
-- Enhance: added character encoding detection for xml, such as rss/atom feed (encoding in DTD)
-
-## v1.0.2
-
-- Fix: added res.ok per spec change
-
-## v1.0.0
-
-- Enhance: better test coverage and doc
-
-
-# 0.x release
-
-## v0.1
-
-- Major: initial public release
diff --git a/scripts/metrics/node_modules/node-fetch/LICENSE.md b/scripts/metrics/node_modules/node-fetch/LICENSE.md
deleted file mode 100644
index 660ffecb58b..00000000000
--- a/scripts/metrics/node_modules/node-fetch/LICENSE.md
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 David Frank
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/scripts/metrics/node_modules/node-fetch/README.md b/scripts/metrics/node_modules/node-fetch/README.md
deleted file mode 100644
index 48f4215e4e7..00000000000
--- a/scripts/metrics/node_modules/node-fetch/README.md
+++ /dev/null
@@ -1,538 +0,0 @@
-node-fetch
-==========
-
-[![npm version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
-[![coverage status][codecov-image]][codecov-url]
-[![install size][install-size-image]][install-size-url]
-
-A light-weight module that brings `window.fetch` to Node.js
-
-(We are looking for [v2 maintainers and collaborators](https://github.com/bitinn/node-fetch/issues/567))
-
-<!-- TOC -->
-
-- [Motivation](#motivation)
-- [Features](#features)
-- [Difference from client-side fetch](#difference-from-client-side-fetch)
-- [Installation](#installation)
-- [Loading and configuring the module](#loading-and-configuring-the-module)
-- [Common Usage](#common-usage)
-    - [Plain text or HTML](#plain-text-or-html)
-    - [JSON](#json)
-    - [Simple Post](#simple-post)
-    - [Post with JSON](#post-with-json)
-    - [Post with form parameters](#post-with-form-parameters)
-    - [Handling exceptions](#handling-exceptions)
-    - [Handling client and server errors](#handling-client-and-server-errors)
-- [Advanced Usage](#advanced-usage)
-    - [Streams](#streams)
-    - [Buffer](#buffer)
-    - [Accessing Headers and other Meta data](#accessing-headers-and-other-meta-data)
-    - [Post data using a file stream](#post-data-using-a-file-stream)
-    - [Post with form-data (detect multipart)](#post-with-form-data-detect-multipart)
-    - [Request cancellation with AbortSignal](#request-cancellation-with-abortsignal)
-- [API](#api)
-    - [fetch(url[, options])](#fetchurl-options)
-    - [Options](#options)
-    - [Class: Request](#class-request)
-    - [Class: Response](#class-response)
-    - [Class: Headers](#class-headers)
-    - [Interface: Body](#interface-body)
-    - [Class: FetchError](#class-fetcherror)
-- [License](#license)
-- [Acknowledgement](#acknowledgement)
-
-<!-- /TOC -->
-
-## Motivation
-
-Instead of implementing `XMLHttpRequest` in Node.js to run browser-specific [Fetch polyfill](https://github.com/github/fetch), why not go from native `http` to `fetch` API directly? Hence `node-fetch`, minimal code for a `window.fetch` compatible API on Node.js runtime.
-
-See Matt Andrews' [isomorphic-fetch](https://github.com/matthew-andrews/isomorphic-fetch) or Leonardo Quixada's [cross-fetch](https://github.com/lquixada/cross-fetch) for isomorphic usage (exports `node-fetch` for server-side, `whatwg-fetch` for client-side).
-
-## Features
-
-- Stay consistent with `window.fetch` API.
-- Make conscious trade-off when following [WHATWG fetch spec][whatwg-fetch] and [stream spec](https://streams.spec.whatwg.org/) implementation details, document known differences.
-- Use native promise, but allow substituting it with [insert your favorite promise library].
-- Use native Node streams for body, on both request and response.
-- Decode content encoding (gzip/deflate) properly, and convert string output (such as `res.text()` and `res.json()`) to UTF-8 automatically.
-- Useful extensions such as timeout, redirect limit, response size limit, [explicit errors](ERROR-HANDLING.md) for troubleshooting.
-
-## Difference from client-side fetch
-
-- See [Known Differences](LIMITS.md) for details.
-- If you happen to use a missing feature that `window.fetch` offers, feel free to open an issue.
-- Pull requests are welcomed too!
-
-## Installation
-
-Current stable release (`2.x`)
-
-```sh
-$ npm install node-fetch --save
-```
-
-## Loading and configuring the module
-We suggest you load the module via `require`, pending the stabalizing of es modules in node:
-```js
-const fetch = require('node-fetch');
-```
-
-If you are using a Promise library other than native, set it through fetch.Promise:
-```js
-const Bluebird = require('bluebird');
-
-fetch.Promise = Bluebird;
-```
-
-## Common Usage
-
-NOTE: The documentation below is up-to-date with `2.x` releases, [see `1.x` readme](https://github.com/bitinn/node-fetch/blob/1.x/README.md), [changelog](https://github.com/bitinn/node-fetch/blob/1.x/CHANGELOG.md) and [2.x upgrade guide](UPGRADE-GUIDE.md) for the differences.
-
-#### Plain text or HTML
-```js
-fetch('https://github.com/')
-    .then(res => res.text())
-    .then(body => console.log(body));
-```
-
-#### JSON
-
-```js
-
-fetch('https://api.github.com/users/github')
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Simple Post
-```js
-fetch('https://httpbin.org/post', { method: 'POST', body: 'a=1' })
-    .then(res => res.json()) // expecting a json response
-    .then(json => console.log(json));
-```
-
-#### Post with JSON
-
-```js
-const body = { a: 1 };
-
-fetch('https://httpbin.org/post', {
-        method: 'post',
-        body:    JSON.stringify(body),
-        headers: { 'Content-Type': 'application/json' },
-    })
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Post with form parameters
-`URLSearchParams` is available in Node.js as of v7.5.0. See [official documentation](https://nodejs.org/api/url.html#url_class_urlsearchparams) for more usage methods.
-
-NOTE: The `Content-Type` header is only set automatically to `x-www-form-urlencoded` when an instance of `URLSearchParams` is given as such:
-
-```js
-const { URLSearchParams } = require('url');
-
-const params = new URLSearchParams();
-params.append('a', 1);
-
-fetch('https://httpbin.org/post', { method: 'POST', body: params })
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Handling exceptions
-NOTE: 3xx-5xx responses are *NOT* exceptions, and should be handled in `then()`, see the next section.
-
-Adding a catch to the fetch promise chain will catch *all* exceptions, such as errors originating from node core libraries, like network errors, and operational errors which are instances of FetchError. See the [error handling document](ERROR-HANDLING.md)  for more details.
-
-```js
-fetch('https://domain.invalid/')
-    .catch(err => console.error(err));
-```
-
-#### Handling client and server errors
-It is common to create a helper function to check that the response contains no client (4xx) or server (5xx) error responses:
-
-```js
-function checkStatus(res) {
-    if (res.ok) { // res.status >= 200 && res.status < 300
-        return res;
-    } else {
-        throw MyCustomError(res.statusText);
-    }
-}
-
-fetch('https://httpbin.org/status/400')
-    .then(checkStatus)
-    .then(res => console.log('will not get here...'))
-```
-
-## Advanced Usage
-
-#### Streams
-The "Node.js way" is to use streams when possible:
-
-```js
-fetch('https://assets-cdn.github.com/images/modules/logos_page/Octocat.png')
-    .then(res => {
-        const dest = fs.createWriteStream('./octocat.png');
-        res.body.pipe(dest);
-    });
-```
-
-#### Buffer
-If you prefer to cache binary data in full, use buffer(). (NOTE: buffer() is a `node-fetch` only API)
-
-```js
-const fileType = require('file-type');
-
-fetch('https://assets-cdn.github.com/images/modules/logos_page/Octocat.png')
-    .then(res => res.buffer())
-    .then(buffer => fileType(buffer))
-    .then(type => { /* ... */ });
-```
-
-#### Accessing Headers and other Meta data
-```js
-fetch('https://github.com/')
-    .then(res => {
-        console.log(res.ok);
-        console.log(res.status);
-        console.log(res.statusText);
-        console.log(res.headers.raw());
-        console.log(res.headers.get('content-type'));
-    });
-```
-
-#### Post data using a file stream
-
-```js
-const { createReadStream } = require('fs');
-
-const stream = createReadStream('input.txt');
-
-fetch('https://httpbin.org/post', { method: 'POST', body: stream })
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Post with form-data (detect multipart)
-
-```js
-const FormData = require('form-data');
-
-const form = new FormData();
-form.append('a', 1);
-
-fetch('https://httpbin.org/post', { method: 'POST', body: form })
-    .then(res => res.json())
-    .then(json => console.log(json));
-
-// OR, using custom headers
-// NOTE: getHeaders() is non-standard API
-
-const form = new FormData();
-form.append('a', 1);
-
-const options = {
-    method: 'POST',
-    body: form,
-    headers: form.getHeaders()
-}
-
-fetch('https://httpbin.org/post', options)
-    .then(res => res.json())
-    .then(json => console.log(json));
-```
-
-#### Request cancellation with AbortSignal
-
-> NOTE: You may only cancel streamed requests on Node >= v8.0.0
-
-You may cancel requests with `AbortController`. A suggested implementation is [`abort-controller`](https://www.npmjs.com/package/abort-controller).
-
-An example of timing out a request after 150ms could be achieved as follows:
-
-```js
-import AbortController from 'abort-controller';
-
-const controller = new AbortController();
-const timeout = setTimeout(
-  () => { controller.abort(); },
-  150,
-);
-
-fetch(url, { signal: controller.signal })
-  .then(res => res.json())
-  .then(
-    data => {
-      useData(data)
-    },
-    err => {
-      if (err.name === 'AbortError') {
-        // request was aborted
-      }
-    },
-  )
-  .finally(() => {
-    clearTimeout(timeout);
-  });
-```
-
-See [test cases](https://github.com/bitinn/node-fetch/blob/master/test/test.js) for more examples.
-
-
-## API
-
-### fetch(url[, options])
-
-- `url` A string representing the URL for fetching
-- `options` [Options](#fetch-options) for the HTTP(S) request
-- Returns: <code>Promise&lt;[Response](#class-response)&gt;</code>
-
-Perform an HTTP(S) fetch.
-
-`url` should be an absolute url, such as `https://example.com/`. A path-relative URL (`/file/under/root`) or protocol-relative URL (`//can-be-http-or-https.com/`) will result in a rejected promise.
-
-<a id="fetch-options"></a>
-### Options
-
-The default values are shown after each option key.
-
-```js
-{
-    // These properties are part of the Fetch Standard
-    method: 'GET',
-    headers: {},        // request headers. format is the identical to that accepted by the Headers constructor (see below)
-    body: null,         // request body. can be null, a string, a Buffer, a Blob, or a Node.js Readable stream
-    redirect: 'follow', // set to `manual` to extract redirect headers, `error` to reject redirect
-    signal: null,       // pass an instance of AbortSignal to optionally abort requests
-
-    // The following properties are node-fetch extensions
-    follow: 20,         // maximum redirect count. 0 to not follow redirect
-    timeout: 0,         // req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies). Signal is recommended instead.
-    compress: true,     // support gzip/deflate content encoding. false to disable
-    size: 0,            // maximum response body size in bytes. 0 to disable
-    agent: null         // http(s).Agent instance, allows custom proxy, certificate, dns lookup etc.
-}
-```
-
-##### Default Headers
-
-If no values are set, the following request headers will be sent automatically:
-
-Header              | Value
-------------------- | --------------------------------------------------------
-`Accept-Encoding`   | `gzip,deflate` _(when `options.compress === true`)_
-`Accept`            | `*/*`
-`Connection`        | `close` _(when no `options.agent` is present)_
-`Content-Length`    | _(automatically calculated, if possible)_
-`Transfer-Encoding` | `chunked` _(when `req.body` is a stream)_
-`User-Agent`        | `node-fetch/1.0 (+https://github.com/bitinn/node-fetch)`
-
-<a id="class-request"></a>
-### Class: Request
-
-An HTTP(S) request containing information about URL, method, headers, and the body. This class implements the [Body](#iface-body) interface.
-
-Due to the nature of Node.js, the following properties are not implemented at this moment:
-
-- `type`
-- `destination`
-- `referrer`
-- `referrerPolicy`
-- `mode`
-- `credentials`
-- `cache`
-- `integrity`
-- `keepalive`
-
-The following node-fetch extension properties are provided:
-
-- `follow`
-- `compress`
-- `counter`
-- `agent`
-
-See [options](#fetch-options) for exact meaning of these extensions.
-
-#### new Request(input[, options])
-
-<small>*(spec-compliant)*</small>
-
-- `input` A string representing a URL, or another `Request` (which will be cloned)
-- `options` [Options][#fetch-options] for the HTTP(S) request
-
-Constructs a new `Request` object. The constructor is identical to that in the [browser](https://developer.mozilla.org/en-US/docs/Web/API/Request/Request).
-
-In most cases, directly `fetch(url, options)` is simpler than creating a `Request` object.
-
-<a id="class-response"></a>
-### Class: Response
-
-An HTTP(S) response. This class implements the [Body](#iface-body) interface.
-
-The following properties are not implemented in node-fetch at this moment:
-
-- `Response.error()`
-- `Response.redirect()`
-- `type`
-- `trailer`
-
-#### new Response([body[, options]])
-
-<small>*(spec-compliant)*</small>
-
-- `body` A string or [Readable stream][node-readable]
-- `options` A [`ResponseInit`][response-init] options dictionary
-
-Constructs a new `Response` object. The constructor is identical to that in the [browser](https://developer.mozilla.org/en-US/docs/Web/API/Response/Response).
-
-Because Node.js does not implement service workers (for which this class was designed), one rarely has to construct a `Response` directly.
-
-#### response.ok
-
-<small>*(spec-compliant)*</small>
-
-Convenience property representing if the request ended normally. Will evaluate to true if the response status was greater than or equal to 200 but smaller than 300.
-
-#### response.redirected
-
-<small>*(spec-compliant)*</small>
-
-Convenience property representing if the request has been redirected at least once. Will evaluate to true if the internal redirect counter is greater than 0.
-
-<a id="class-headers"></a>
-### Class: Headers
-
-This class allows manipulating and iterating over a set of HTTP headers. All methods specified in the [Fetch Standard][whatwg-fetch] are implemented.
-
-#### new Headers([init])
-
-<small>*(spec-compliant)*</small>
-
-- `init` Optional argument to pre-fill the `Headers` object
-
-Construct a new `Headers` object. `init` can be either `null`, a `Headers` object, an key-value map object, or any iterable object.
-
-```js
-// Example adapted from https://fetch.spec.whatwg.org/#example-headers-class
-
-const meta = {
-  'Content-Type': 'text/xml',
-  'Breaking-Bad': '<3'
-};
-const headers = new Headers(meta);
-
-// The above is equivalent to
-const meta = [
-  [ 'Content-Type', 'text/xml' ],
-  [ 'Breaking-Bad', '<3' ]
-];
-const headers = new Headers(meta);
-
-// You can in fact use any iterable objects, like a Map or even another Headers
-const meta = new Map();
-meta.set('Content-Type', 'text/xml');
-meta.set('Breaking-Bad', '<3');
-const headers = new Headers(meta);
-const copyOfHeaders = new Headers(headers);
-```
-
-<a id="iface-body"></a>
-### Interface: Body
-
-`Body` is an abstract interface with methods that are applicable to both `Request` and `Response` classes.
-
-The following methods are not yet implemented in node-fetch at this moment:
-
-- `formData()`
-
-#### body.body
-
-<small>*(deviation from spec)*</small>
-
-* Node.js [`Readable` stream][node-readable]
-
-The data encapsulated in the `Body` object. Note that while the [Fetch Standard][whatwg-fetch] requires the property to always be a WHATWG `ReadableStream`, in node-fetch it is a Node.js [`Readable` stream][node-readable].
-
-#### body.bodyUsed
-
-<small>*(spec-compliant)*</small>
-
-* `Boolean`
-
-A boolean property for if this body has been consumed. Per spec, a consumed body cannot be used again.
-
-#### body.arrayBuffer()
-#### body.blob()
-#### body.json()
-#### body.text()
-
-<small>*(spec-compliant)*</small>
-
-* Returns: <code>Promise</code>
-
-Consume the body and return a promise that will resolve to one of these formats.
-
-#### body.buffer()
-
-<small>*(node-fetch extension)*</small>
-
-* Returns: <code>Promise&lt;Buffer&gt;</code>
-
-Consume the body and return a promise that will resolve to a Buffer.
-
-#### body.textConverted()
-
-<small>*(node-fetch extension)*</small>
-
-* Returns: <code>Promise&lt;String&gt;</code>
-
-Identical to `body.text()`, except instead of always converting to UTF-8, encoding sniffing will be performed and text converted to UTF-8, if possible.
-
-(This API requires an optional dependency on npm package [encoding](https://www.npmjs.com/package/encoding), which you need to install manually. `webpack` users may see [a warning message](https://github.com/bitinn/node-fetch/issues/412#issuecomment-379007792) due to this optional dependency.)
-
-<a id="class-fetcherror"></a>
-### Class: FetchError
-
-<small>*(node-fetch extension)*</small>
-
-An operational error in the fetching process. See [ERROR-HANDLING.md][] for more info.
-
-<a id="class-aborterror"></a>
-### Class: AbortError
-
-<small>*(node-fetch extension)*</small>
-
-An Error thrown when the request is aborted in response to an `AbortSignal`'s `abort` event. It has a `name` property of `AbortError`. See [ERROR-HANDLING.MD][] for more info.
-
-## Acknowledgement
-
-Thanks to [github/fetch](https://github.com/github/fetch) for providing a solid implementation reference.
-
-`node-fetch` v1 was maintained by [@bitinn](https://github.com/bitinn); v2 was maintained by [@TimothyGu](https://github.com/timothygu), [@bitinn](https://github.com/bitinn) and [@jimmywarting](https://github.com/jimmywarting); v2 readme is written by [@jkantr](https://github.com/jkantr).
-
-## License
-
-MIT
-
-[npm-image]: https://flat.badgen.net/npm/v/node-fetch
-[npm-url]: https://www.npmjs.com/package/node-fetch
-[travis-image]: https://flat.badgen.net/travis/bitinn/node-fetch
-[travis-url]: https://travis-ci.org/bitinn/node-fetch
-[codecov-image]: https://flat.badgen.net/codecov/c/github/bitinn/node-fetch/master
-[codecov-url]: https://codecov.io/gh/bitinn/node-fetch
-[install-size-image]: https://flat.badgen.net/packagephobia/install/node-fetch
-[install-size-url]: https://packagephobia.now.sh/result?p=node-fetch
-[whatwg-fetch]: https://fetch.spec.whatwg.org/
-[response-init]: https://fetch.spec.whatwg.org/#responseinit
-[node-readable]: https://nodejs.org/api/stream.html#stream_readable_streams
-[mdn-headers]: https://developer.mozilla.org/en-US/docs/Web/API/Headers
-[LIMITS.md]: https://github.com/bitinn/node-fetch/blob/master/LIMITS.md
-[ERROR-HANDLING.md]: https://github.com/bitinn/node-fetch/blob/master/ERROR-HANDLING.md
-[UPGRADE-GUIDE.md]: https://github.com/bitinn/node-fetch/blob/master/UPGRADE-GUIDE.md
diff --git a/scripts/metrics/node_modules/node-fetch/browser.js b/scripts/metrics/node_modules/node-fetch/browser.js
deleted file mode 100644
index 0ad5de004c4..00000000000
--- a/scripts/metrics/node_modules/node-fetch/browser.js
+++ /dev/null
@@ -1,23 +0,0 @@
-"use strict";
-
-// ref: https://github.com/tc39/proposal-global
-var getGlobal = function () {
-	// the only reliable means to get the global object is
-	// `Function('return this')()`
-	// However, this causes CSP violations in Chrome apps.
-	if (typeof self !== 'undefined') { return self; }
-	if (typeof window !== 'undefined') { return window; }
-	if (typeof global !== 'undefined') { return global; }
-	throw new Error('unable to locate global object');
-}
-
-var global = getGlobal();
-
-module.exports = exports = global.fetch;
-
-// Needed for TypeScript and Webpack.
-exports.default = global.fetch.bind(global);
-
-exports.Headers = global.Headers;
-exports.Request = global.Request;
-exports.Response = global.Response;
\ No newline at end of file
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.es.js b/scripts/metrics/node_modules/node-fetch/lib/index.es.js
deleted file mode 100644
index 20ab807872f..00000000000
--- a/scripts/metrics/node_modules/node-fetch/lib/index.es.js
+++ /dev/null
@@ -1,1631 +0,0 @@
-process.emitWarning("The .es.js file is deprecated. Use .mjs instead.");
-
-import Stream from 'stream';
-import http from 'http';
-import Url from 'url';
-import https from 'https';
-import zlib from 'zlib';
-
-// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
-
-// fix for "Readable" isn't a named export issue
-const Readable = Stream.Readable;
-
-const BUFFER = Symbol('buffer');
-const TYPE = Symbol('type');
-
-class Blob {
-	constructor() {
-		this[TYPE] = '';
-
-		const blobParts = arguments[0];
-		const options = arguments[1];
-
-		const buffers = [];
-		let size = 0;
-
-		if (blobParts) {
-			const a = blobParts;
-			const length = Number(a.length);
-			for (let i = 0; i < length; i++) {
-				const element = a[i];
-				let buffer;
-				if (element instanceof Buffer) {
-					buffer = element;
-				} else if (ArrayBuffer.isView(element)) {
-					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
-				} else if (element instanceof ArrayBuffer) {
-					buffer = Buffer.from(element);
-				} else if (element instanceof Blob) {
-					buffer = element[BUFFER];
-				} else {
-					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
-				}
-				size += buffer.length;
-				buffers.push(buffer);
-			}
-		}
-
-		this[BUFFER] = Buffer.concat(buffers);
-
-		let type = options && options.type !== undefined && String(options.type).toLowerCase();
-		if (type && !/[^\u0020-\u007E]/.test(type)) {
-			this[TYPE] = type;
-		}
-	}
-	get size() {
-		return this[BUFFER].length;
-	}
-	get type() {
-		return this[TYPE];
-	}
-	text() {
-		return Promise.resolve(this[BUFFER].toString());
-	}
-	arrayBuffer() {
-		const buf = this[BUFFER];
-		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		return Promise.resolve(ab);
-	}
-	stream() {
-		const readable = new Readable();
-		readable._read = function () {};
-		readable.push(this[BUFFER]);
-		readable.push(null);
-		return readable;
-	}
-	toString() {
-		return '[object Blob]';
-	}
-	slice() {
-		const size = this.size;
-
-		const start = arguments[0];
-		const end = arguments[1];
-		let relativeStart, relativeEnd;
-		if (start === undefined) {
-			relativeStart = 0;
-		} else if (start < 0) {
-			relativeStart = Math.max(size + start, 0);
-		} else {
-			relativeStart = Math.min(start, size);
-		}
-		if (end === undefined) {
-			relativeEnd = size;
-		} else if (end < 0) {
-			relativeEnd = Math.max(size + end, 0);
-		} else {
-			relativeEnd = Math.min(end, size);
-		}
-		const span = Math.max(relativeEnd - relativeStart, 0);
-
-		const buffer = this[BUFFER];
-		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
-		const blob = new Blob([], { type: arguments[2] });
-		blob[BUFFER] = slicedBuffer;
-		return blob;
-	}
-}
-
-Object.defineProperties(Blob.prototype, {
-	size: { enumerable: true },
-	type: { enumerable: true },
-	slice: { enumerable: true }
-});
-
-Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
-	value: 'Blob',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * fetch-error.js
- *
- * FetchError interface for operational errors
- */
-
-/**
- * Create FetchError instance
- *
- * @param   String      message      Error message for human
- * @param   String      type         Error type for machine
- * @param   String      systemError  For Node.js system error
- * @return  FetchError
- */
-function FetchError(message, type, systemError) {
-  Error.call(this, message);
-
-  this.message = message;
-  this.type = type;
-
-  // when err.type is `system`, err.code contains system error code
-  if (systemError) {
-    this.code = this.errno = systemError.code;
-  }
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-FetchError.prototype = Object.create(Error.prototype);
-FetchError.prototype.constructor = FetchError;
-FetchError.prototype.name = 'FetchError';
-
-let convert;
-try {
-	convert = require('encoding').convert;
-} catch (e) {}
-
-const INTERNALS = Symbol('Body internals');
-
-// fix an issue where "PassThrough" isn't a named export for node <10
-const PassThrough = Stream.PassThrough;
-
-/**
- * Body mixin
- *
- * Ref: https://fetch.spec.whatwg.org/#body
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-function Body(body) {
-	var _this = this;
-
-	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-	    _ref$size = _ref.size;
-
-	let size = _ref$size === undefined ? 0 : _ref$size;
-	var _ref$timeout = _ref.timeout;
-	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
-
-	if (body == null) {
-		// body is undefined or null
-		body = null;
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		body = Buffer.from(body.toString());
-	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		body = Buffer.from(body);
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
-	} else if (body instanceof Stream) ; else {
-		// none of the above
-		// coerce to string then buffer
-		body = Buffer.from(String(body));
-	}
-	this[INTERNALS] = {
-		body,
-		disturbed: false,
-		error: null
-	};
-	this.size = size;
-	this.timeout = timeout;
-
-	if (body instanceof Stream) {
-		body.on('error', function (err) {
-			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
-			_this[INTERNALS].error = error;
-		});
-	}
-}
-
-Body.prototype = {
-	get body() {
-		return this[INTERNALS].body;
-	},
-
-	get bodyUsed() {
-		return this[INTERNALS].disturbed;
-	},
-
-	/**
-  * Decode response as ArrayBuffer
-  *
-  * @return  Promise
-  */
-	arrayBuffer() {
-		return consumeBody.call(this).then(function (buf) {
-			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		});
-	},
-
-	/**
-  * Return raw response as Blob
-  *
-  * @return Promise
-  */
-	blob() {
-		let ct = this.headers && this.headers.get('content-type') || '';
-		return consumeBody.call(this).then(function (buf) {
-			return Object.assign(
-			// Prevent copying
-			new Blob([], {
-				type: ct.toLowerCase()
-			}), {
-				[BUFFER]: buf
-			});
-		});
-	},
-
-	/**
-  * Decode response as json
-  *
-  * @return  Promise
-  */
-	json() {
-		var _this2 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			try {
-				return JSON.parse(buffer.toString());
-			} catch (err) {
-				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
-			}
-		});
-	},
-
-	/**
-  * Decode response as text
-  *
-  * @return  Promise
-  */
-	text() {
-		return consumeBody.call(this).then(function (buffer) {
-			return buffer.toString();
-		});
-	},
-
-	/**
-  * Decode response as buffer (non-spec api)
-  *
-  * @return  Promise
-  */
-	buffer() {
-		return consumeBody.call(this);
-	},
-
-	/**
-  * Decode response as text, while automatically detecting the encoding and
-  * trying to decode to UTF-8 (non-spec api)
-  *
-  * @return  Promise
-  */
-	textConverted() {
-		var _this3 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			return convertBody(buffer, _this3.headers);
-		});
-	}
-};
-
-// In browsers, all properties are enumerable.
-Object.defineProperties(Body.prototype, {
-	body: { enumerable: true },
-	bodyUsed: { enumerable: true },
-	arrayBuffer: { enumerable: true },
-	blob: { enumerable: true },
-	json: { enumerable: true },
-	text: { enumerable: true }
-});
-
-Body.mixIn = function (proto) {
-	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
-		// istanbul ignore else: future proof
-		if (!(name in proto)) {
-			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
-			Object.defineProperty(proto, name, desc);
-		}
-	}
-};
-
-/**
- * Consume and convert an entire Body to a Buffer.
- *
- * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
- *
- * @return  Promise
- */
-function consumeBody() {
-	var _this4 = this;
-
-	if (this[INTERNALS].disturbed) {
-		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
-	}
-
-	this[INTERNALS].disturbed = true;
-
-	if (this[INTERNALS].error) {
-		return Body.Promise.reject(this[INTERNALS].error);
-	}
-
-	let body = this.body;
-
-	// body is null
-	if (body === null) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is blob
-	if (isBlob(body)) {
-		body = body.stream();
-	}
-
-	// body is buffer
-	if (Buffer.isBuffer(body)) {
-		return Body.Promise.resolve(body);
-	}
-
-	// istanbul ignore if: should never happen
-	if (!(body instanceof Stream)) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is stream
-	// get ready to actually consume the body
-	let accum = [];
-	let accumBytes = 0;
-	let abort = false;
-
-	return new Body.Promise(function (resolve, reject) {
-		let resTimeout;
-
-		// allow timeout on slow response body
-		if (_this4.timeout) {
-			resTimeout = setTimeout(function () {
-				abort = true;
-				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
-			}, _this4.timeout);
-		}
-
-		// handle stream errors
-		body.on('error', function (err) {
-			if (err.name === 'AbortError') {
-				// if the request was aborted, reject with this Error
-				abort = true;
-				reject(err);
-			} else {
-				// other errors, such as incorrect content-encoding
-				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-
-		body.on('data', function (chunk) {
-			if (abort || chunk === null) {
-				return;
-			}
-
-			if (_this4.size && accumBytes + chunk.length > _this4.size) {
-				abort = true;
-				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
-				return;
-			}
-
-			accumBytes += chunk.length;
-			accum.push(chunk);
-		});
-
-		body.on('end', function () {
-			if (abort) {
-				return;
-			}
-
-			clearTimeout(resTimeout);
-
-			try {
-				resolve(Buffer.concat(accum, accumBytes));
-			} catch (err) {
-				// handle streams that have accumulated too much data (issue #414)
-				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-	});
-}
-
-/**
- * Detect buffer encoding and convert to target encoding
- * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
- *
- * @param   Buffer  buffer    Incoming buffer
- * @param   String  encoding  Target encoding
- * @return  String
- */
-function convertBody(buffer, headers) {
-	if (typeof convert !== 'function') {
-		throw new Error('The package `encoding` must be installed to use the textConverted() function');
-	}
-
-	const ct = headers.get('content-type');
-	let charset = 'utf-8';
-	let res, str;
-
-	// header
-	if (ct) {
-		res = /charset=([^;]*)/i.exec(ct);
-	}
-
-	// no charset in content type, peek at response body for at most 1024 bytes
-	str = buffer.slice(0, 1024).toString();
-
-	// html5
-	if (!res && str) {
-		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// html4
-	if (!res && str) {
-		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
-
-		if (res) {
-			res = /charset=(.*)/i.exec(res.pop());
-		}
-	}
-
-	// xml
-	if (!res && str) {
-		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// found charset
-	if (res) {
-		charset = res.pop();
-
-		// prevent decode issues when sites use incorrect encoding
-		// ref: https://hsivonen.fi/encoding-menu/
-		if (charset === 'gb2312' || charset === 'gbk') {
-			charset = 'gb18030';
-		}
-	}
-
-	// turn raw buffers into a single utf-8 buffer
-	return convert(buffer, 'UTF-8', charset).toString();
-}
-
-/**
- * Detect a URLSearchParams object
- * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
- *
- * @param   Object  obj     Object to detect by type or brand
- * @return  String
- */
-function isURLSearchParams(obj) {
-	// Duck-typing as a necessary condition.
-	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
-		return false;
-	}
-
-	// Brand-checking and more duck-typing as optional condition.
-	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
-}
-
-/**
- * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
- * @param  {*} obj
- * @return {boolean}
- */
-function isBlob(obj) {
-	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
-}
-
-/**
- * Clone body given Res/Req instance
- *
- * @param   Mixed  instance  Response or Request instance
- * @return  Mixed
- */
-function clone(instance) {
-	let p1, p2;
-	let body = instance.body;
-
-	// don't allow cloning a used body
-	if (instance.bodyUsed) {
-		throw new Error('cannot clone body after it is used');
-	}
-
-	// check that body is a stream and not form-data object
-	// note: we can't clone the form-data object without having it as a dependency
-	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
-		// tee instance body
-		p1 = new PassThrough();
-		p2 = new PassThrough();
-		body.pipe(p1);
-		body.pipe(p2);
-		// set instance body to teed body and return the other teed body
-		instance[INTERNALS].body = p1;
-		body = p2;
-	}
-
-	return body;
-}
-
-/**
- * Performs the operation "extract a `Content-Type` value from |object|" as
- * specified in the specification:
- * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
- *
- * This function assumes that instance.body is present.
- *
- * @param   Mixed  instance  Response or Request instance
- */
-function extractContentType(body) {
-	// istanbul ignore if: Currently, because of a guard in Request, body
-	// can never be null. Included here for completeness.
-	if (body === null) {
-		// body is null
-		return null;
-	} else if (typeof body === 'string') {
-		// body is string
-		return 'text/plain;charset=UTF-8';
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		return 'application/x-www-form-urlencoded;charset=UTF-8';
-	} else if (isBlob(body)) {
-		// body is blob
-		return body.type || null;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return null;
-	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		return null;
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		return null;
-	} else if (typeof body.getBoundary === 'function') {
-		// detect form data input from form-data module
-		return `multipart/form-data;boundary=${body.getBoundary()}`;
-	} else if (body instanceof Stream) {
-		// body is stream
-		// can't really do much about this
-		return null;
-	} else {
-		// Body constructor defaults other things to string
-		return 'text/plain;charset=UTF-8';
-	}
-}
-
-/**
- * The Fetch Standard treats this as if "total bytes" is a property on the body.
- * For us, we have to explicitly get it with a function.
- *
- * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
- *
- * @param   Body    instance   Instance of Body
- * @return  Number?            Number of bytes, or null if not possible
- */
-function getTotalBytes(instance) {
-	const body = instance.body;
-
-	// istanbul ignore if: included for completion
-
-	if (body === null) {
-		// body is null
-		return 0;
-	} else if (isBlob(body)) {
-		return body.size;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return body.length;
-	} else if (body && typeof body.getLengthSync === 'function') {
-		// detect form data input from form-data module
-		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
-		body.hasKnownLength && body.hasKnownLength()) {
-			// 2.x
-			return body.getLengthSync();
-		}
-		return null;
-	} else {
-		// body is stream
-		return instance.size || null;
-	}
-}
-
-/**
- * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
- *
- * @param   Body    instance   Instance of Body
- * @return  Void
- */
-function writeToStream(dest, instance) {
-	const body = instance.body;
-
-
-	if (body === null) {
-		// body is null
-		dest.end();
-	} else if (isBlob(body)) {
-		body.stream().pipe(dest);
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		dest.write(body);
-		dest.end();
-	} else {
-		// body is stream
-		body.pipe(dest);
-	}
-}
-
-// expose Promise
-Body.Promise = global.Promise;
-
-/**
- * headers.js
- *
- * Headers class offers convenient helpers
- */
-
-const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
-const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
-
-function validateName(name) {
-	name = `${name}`;
-	if (invalidTokenRegex.test(name) || name === '') {
-		throw new TypeError(`${name} is not a legal HTTP header name`);
-	}
-}
-
-function validateValue(value) {
-	value = `${value}`;
-	if (invalidHeaderCharRegex.test(value)) {
-		throw new TypeError(`${value} is not a legal HTTP header value`);
-	}
-}
-
-/**
- * Find the key in the map object given a header name.
- *
- * Returns undefined if not found.
- *
- * @param   String  name  Header name
- * @return  String|Undefined
- */
-function find(map, name) {
-	name = name.toLowerCase();
-	for (const key in map) {
-		if (key.toLowerCase() === name) {
-			return key;
-		}
-	}
-	return undefined;
-}
-
-const MAP = Symbol('map');
-class Headers {
-	/**
-  * Headers class
-  *
-  * @param   Object  headers  Response headers
-  * @return  Void
-  */
-	constructor() {
-		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-
-		this[MAP] = Object.create(null);
-
-		if (init instanceof Headers) {
-			const rawHeaders = init.raw();
-			const headerNames = Object.keys(rawHeaders);
-
-			for (const headerName of headerNames) {
-				for (const value of rawHeaders[headerName]) {
-					this.append(headerName, value);
-				}
-			}
-
-			return;
-		}
-
-		// We don't worry about converting prop to ByteString here as append()
-		// will handle it.
-		if (init == null) ; else if (typeof init === 'object') {
-			const method = init[Symbol.iterator];
-			if (method != null) {
-				if (typeof method !== 'function') {
-					throw new TypeError('Header pairs must be iterable');
-				}
-
-				// sequence<sequence<ByteString>>
-				// Note: per spec we have to first exhaust the lists then process them
-				const pairs = [];
-				for (const pair of init) {
-					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
-						throw new TypeError('Each header pair must be iterable');
-					}
-					pairs.push(Array.from(pair));
-				}
-
-				for (const pair of pairs) {
-					if (pair.length !== 2) {
-						throw new TypeError('Each header pair must be a name/value tuple');
-					}
-					this.append(pair[0], pair[1]);
-				}
-			} else {
-				// record<ByteString, ByteString>
-				for (const key of Object.keys(init)) {
-					const value = init[key];
-					this.append(key, value);
-				}
-			}
-		} else {
-			throw new TypeError('Provided initializer must be an object');
-		}
-	}
-
-	/**
-  * Return combined header value given name
-  *
-  * @param   String  name  Header name
-  * @return  Mixed
-  */
-	get(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key === undefined) {
-			return null;
-		}
-
-		return this[MAP][key].join(', ');
-	}
-
-	/**
-  * Iterate over all headers
-  *
-  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
-  * @param   Boolean   thisArg   `this` context for callback function
-  * @return  Void
-  */
-	forEach(callback) {
-		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
-
-		let pairs = getHeaders(this);
-		let i = 0;
-		while (i < pairs.length) {
-			var _pairs$i = pairs[i];
-			const name = _pairs$i[0],
-			      value = _pairs$i[1];
-
-			callback.call(thisArg, value, name, this);
-			pairs = getHeaders(this);
-			i++;
-		}
-	}
-
-	/**
-  * Overwrite header values given name
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	set(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		this[MAP][key !== undefined ? key : name] = [value];
-	}
-
-	/**
-  * Append a value onto existing header
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	append(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			this[MAP][key].push(value);
-		} else {
-			this[MAP][name] = [value];
-		}
-	}
-
-	/**
-  * Check for header name existence
-  *
-  * @param   String   name  Header name
-  * @return  Boolean
-  */
-	has(name) {
-		name = `${name}`;
-		validateName(name);
-		return find(this[MAP], name) !== undefined;
-	}
-
-	/**
-  * Delete all header values given name
-  *
-  * @param   String  name  Header name
-  * @return  Void
-  */
-	delete(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			delete this[MAP][key];
-		}
-	}
-
-	/**
-  * Return raw headers (non-spec api)
-  *
-  * @return  Object
-  */
-	raw() {
-		return this[MAP];
-	}
-
-	/**
-  * Get an iterator on keys.
-  *
-  * @return  Iterator
-  */
-	keys() {
-		return createHeadersIterator(this, 'key');
-	}
-
-	/**
-  * Get an iterator on values.
-  *
-  * @return  Iterator
-  */
-	values() {
-		return createHeadersIterator(this, 'value');
-	}
-
-	/**
-  * Get an iterator on entries.
-  *
-  * This is the default iterator of the Headers object.
-  *
-  * @return  Iterator
-  */
-	[Symbol.iterator]() {
-		return createHeadersIterator(this, 'key+value');
-	}
-}
-Headers.prototype.entries = Headers.prototype[Symbol.iterator];
-
-Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
-	value: 'Headers',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Headers.prototype, {
-	get: { enumerable: true },
-	forEach: { enumerable: true },
-	set: { enumerable: true },
-	append: { enumerable: true },
-	has: { enumerable: true },
-	delete: { enumerable: true },
-	keys: { enumerable: true },
-	values: { enumerable: true },
-	entries: { enumerable: true }
-});
-
-function getHeaders(headers) {
-	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
-
-	const keys = Object.keys(headers[MAP]).sort();
-	return keys.map(kind === 'key' ? function (k) {
-		return k.toLowerCase();
-	} : kind === 'value' ? function (k) {
-		return headers[MAP][k].join(', ');
-	} : function (k) {
-		return [k.toLowerCase(), headers[MAP][k].join(', ')];
-	});
-}
-
-const INTERNAL = Symbol('internal');
-
-function createHeadersIterator(target, kind) {
-	const iterator = Object.create(HeadersIteratorPrototype);
-	iterator[INTERNAL] = {
-		target,
-		kind,
-		index: 0
-	};
-	return iterator;
-}
-
-const HeadersIteratorPrototype = Object.setPrototypeOf({
-	next() {
-		// istanbul ignore if
-		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
-			throw new TypeError('Value of `this` is not a HeadersIterator');
-		}
-
-		var _INTERNAL = this[INTERNAL];
-		const target = _INTERNAL.target,
-		      kind = _INTERNAL.kind,
-		      index = _INTERNAL.index;
-
-		const values = getHeaders(target, kind);
-		const len = values.length;
-		if (index >= len) {
-			return {
-				value: undefined,
-				done: true
-			};
-		}
-
-		this[INTERNAL].index = index + 1;
-
-		return {
-			value: values[index],
-			done: false
-		};
-	}
-}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
-
-Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
-	value: 'HeadersIterator',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * Export the Headers object in a form that Node.js can consume.
- *
- * @param   Headers  headers
- * @return  Object
- */
-function exportNodeCompatibleHeaders(headers) {
-	const obj = Object.assign({ __proto__: null }, headers[MAP]);
-
-	// http.request() only supports string as Host header. This hack makes
-	// specifying custom Host header possible.
-	const hostHeaderKey = find(headers[MAP], 'Host');
-	if (hostHeaderKey !== undefined) {
-		obj[hostHeaderKey] = obj[hostHeaderKey][0];
-	}
-
-	return obj;
-}
-
-/**
- * Create a Headers object from an object of headers, ignoring those that do
- * not conform to HTTP grammar productions.
- *
- * @param   Object  obj  Object of headers
- * @return  Headers
- */
-function createHeadersLenient(obj) {
-	const headers = new Headers();
-	for (const name of Object.keys(obj)) {
-		if (invalidTokenRegex.test(name)) {
-			continue;
-		}
-		if (Array.isArray(obj[name])) {
-			for (const val of obj[name]) {
-				if (invalidHeaderCharRegex.test(val)) {
-					continue;
-				}
-				if (headers[MAP][name] === undefined) {
-					headers[MAP][name] = [val];
-				} else {
-					headers[MAP][name].push(val);
-				}
-			}
-		} else if (!invalidHeaderCharRegex.test(obj[name])) {
-			headers[MAP][name] = [obj[name]];
-		}
-	}
-	return headers;
-}
-
-const INTERNALS$1 = Symbol('Response internals');
-
-// fix an issue where "STATUS_CODES" aren't a named export for node <10
-const STATUS_CODES = http.STATUS_CODES;
-
-/**
- * Response class
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-class Response {
-	constructor() {
-		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		Body.call(this, body, opts);
-
-		const status = opts.status || 200;
-		const headers = new Headers(opts.headers);
-
-		if (body != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(body);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		this[INTERNALS$1] = {
-			url: opts.url,
-			status,
-			statusText: opts.statusText || STATUS_CODES[status],
-			headers,
-			counter: opts.counter
-		};
-	}
-
-	get url() {
-		return this[INTERNALS$1].url;
-	}
-
-	get status() {
-		return this[INTERNALS$1].status;
-	}
-
-	/**
-  * Convenience property representing if the request ended normally
-  */
-	get ok() {
-		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
-	}
-
-	get redirected() {
-		return this[INTERNALS$1].counter > 0;
-	}
-
-	get statusText() {
-		return this[INTERNALS$1].statusText;
-	}
-
-	get headers() {
-		return this[INTERNALS$1].headers;
-	}
-
-	/**
-  * Clone this response
-  *
-  * @return  Response
-  */
-	clone() {
-		return new Response(clone(this), {
-			url: this.url,
-			status: this.status,
-			statusText: this.statusText,
-			headers: this.headers,
-			ok: this.ok,
-			redirected: this.redirected
-		});
-	}
-}
-
-Body.mixIn(Response.prototype);
-
-Object.defineProperties(Response.prototype, {
-	url: { enumerable: true },
-	status: { enumerable: true },
-	ok: { enumerable: true },
-	redirected: { enumerable: true },
-	statusText: { enumerable: true },
-	headers: { enumerable: true },
-	clone: { enumerable: true }
-});
-
-Object.defineProperty(Response.prototype, Symbol.toStringTag, {
-	value: 'Response',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-const INTERNALS$2 = Symbol('Request internals');
-
-// fix an issue where "format", "parse" aren't a named export for node <10
-const parse_url = Url.parse;
-const format_url = Url.format;
-
-const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
-
-/**
- * Check if a value is an instance of Request.
- *
- * @param   Mixed   input
- * @return  Boolean
- */
-function isRequest(input) {
-	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
-}
-
-function isAbortSignal(signal) {
-	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
-	return !!(proto && proto.constructor.name === 'AbortSignal');
-}
-
-/**
- * Request class
- *
- * @param   Mixed   input  Url or Request instance
- * @param   Object  init   Custom options
- * @return  Void
- */
-class Request {
-	constructor(input) {
-		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		let parsedURL;
-
-		// normalize input
-		if (!isRequest(input)) {
-			if (input && input.href) {
-				// in order to support Node.js' Url objects; though WHATWG's URL objects
-				// will fall into this branch also (since their `toString()` will return
-				// `href` property anyway)
-				parsedURL = parse_url(input.href);
-			} else {
-				// coerce input to a string before attempting to parse
-				parsedURL = parse_url(`${input}`);
-			}
-			input = {};
-		} else {
-			parsedURL = parse_url(input.url);
-		}
-
-		let method = init.method || input.method || 'GET';
-		method = method.toUpperCase();
-
-		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
-			throw new TypeError('Request with GET/HEAD method cannot have body');
-		}
-
-		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
-
-		Body.call(this, inputBody, {
-			timeout: init.timeout || input.timeout || 0,
-			size: init.size || input.size || 0
-		});
-
-		const headers = new Headers(init.headers || input.headers || {});
-
-		if (inputBody != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(inputBody);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		let signal = isRequest(input) ? input.signal : null;
-		if ('signal' in init) signal = init.signal;
-
-		if (signal != null && !isAbortSignal(signal)) {
-			throw new TypeError('Expected signal to be an instanceof AbortSignal');
-		}
-
-		this[INTERNALS$2] = {
-			method,
-			redirect: init.redirect || input.redirect || 'follow',
-			headers,
-			parsedURL,
-			signal
-		};
-
-		// node-fetch-only options
-		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
-		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
-		this.counter = init.counter || input.counter || 0;
-		this.agent = init.agent || input.agent;
-	}
-
-	get method() {
-		return this[INTERNALS$2].method;
-	}
-
-	get url() {
-		return format_url(this[INTERNALS$2].parsedURL);
-	}
-
-	get headers() {
-		return this[INTERNALS$2].headers;
-	}
-
-	get redirect() {
-		return this[INTERNALS$2].redirect;
-	}
-
-	get signal() {
-		return this[INTERNALS$2].signal;
-	}
-
-	/**
-  * Clone this request
-  *
-  * @return  Request
-  */
-	clone() {
-		return new Request(this);
-	}
-}
-
-Body.mixIn(Request.prototype);
-
-Object.defineProperty(Request.prototype, Symbol.toStringTag, {
-	value: 'Request',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Request.prototype, {
-	method: { enumerable: true },
-	url: { enumerable: true },
-	headers: { enumerable: true },
-	redirect: { enumerable: true },
-	clone: { enumerable: true },
-	signal: { enumerable: true }
-});
-
-/**
- * Convert a Request to Node.js http request options.
- *
- * @param   Request  A Request instance
- * @return  Object   The options object to be passed to http.request
- */
-function getNodeRequestOptions(request) {
-	const parsedURL = request[INTERNALS$2].parsedURL;
-	const headers = new Headers(request[INTERNALS$2].headers);
-
-	// fetch step 1.3
-	if (!headers.has('Accept')) {
-		headers.set('Accept', '*/*');
-	}
-
-	// Basic fetch
-	if (!parsedURL.protocol || !parsedURL.hostname) {
-		throw new TypeError('Only absolute URLs are supported');
-	}
-
-	if (!/^https?:$/.test(parsedURL.protocol)) {
-		throw new TypeError('Only HTTP(S) protocols are supported');
-	}
-
-	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
-		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
-	}
-
-	// HTTP-network-or-cache fetch steps 2.4-2.7
-	let contentLengthValue = null;
-	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
-		contentLengthValue = '0';
-	}
-	if (request.body != null) {
-		const totalBytes = getTotalBytes(request);
-		if (typeof totalBytes === 'number') {
-			contentLengthValue = String(totalBytes);
-		}
-	}
-	if (contentLengthValue) {
-		headers.set('Content-Length', contentLengthValue);
-	}
-
-	// HTTP-network-or-cache fetch step 2.11
-	if (!headers.has('User-Agent')) {
-		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
-	}
-
-	// HTTP-network-or-cache fetch step 2.15
-	if (request.compress && !headers.has('Accept-Encoding')) {
-		headers.set('Accept-Encoding', 'gzip,deflate');
-	}
-
-	if (!headers.has('Connection') && !request.agent) {
-		headers.set('Connection', 'close');
-	}
-
-	// HTTP-network fetch step 4.2
-	// chunked encoding is handled by Node.js
-
-	return Object.assign({}, parsedURL, {
-		method: request.method,
-		headers: exportNodeCompatibleHeaders(headers),
-		agent: request.agent
-	});
-}
-
-/**
- * abort-error.js
- *
- * AbortError interface for cancelled requests
- */
-
-/**
- * Create AbortError instance
- *
- * @param   String      message      Error message for human
- * @return  AbortError
- */
-function AbortError(message) {
-  Error.call(this, message);
-
-  this.type = 'aborted';
-  this.message = message;
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-AbortError.prototype = Object.create(Error.prototype);
-AbortError.prototype.constructor = AbortError;
-AbortError.prototype.name = 'AbortError';
-
-// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
-const PassThrough$1 = Stream.PassThrough;
-const resolve_url = Url.resolve;
-
-/**
- * Fetch function
- *
- * @param   Mixed    url   Absolute url or Request instance
- * @param   Object   opts  Fetch options
- * @return  Promise
- */
-function fetch(url, opts) {
-
-	// allow custom promise
-	if (!fetch.Promise) {
-		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
-	}
-
-	Body.Promise = fetch.Promise;
-
-	// wrap http.request into fetch
-	return new fetch.Promise(function (resolve, reject) {
-		// build request object
-		const request = new Request(url, opts);
-		const options = getNodeRequestOptions(request);
-
-		const send = (options.protocol === 'https:' ? https : http).request;
-		const signal = request.signal;
-
-		let response = null;
-
-		const abort = function abort() {
-			let error = new AbortError('The user aborted a request.');
-			reject(error);
-			if (request.body && request.body instanceof Stream.Readable) {
-				request.body.destroy(error);
-			}
-			if (!response || !response.body) return;
-			response.body.emit('error', error);
-		};
-
-		if (signal && signal.aborted) {
-			abort();
-			return;
-		}
-
-		const abortAndFinalize = function abortAndFinalize() {
-			abort();
-			finalize();
-		};
-
-		// send request
-		const req = send(options);
-		let reqTimeout;
-
-		if (signal) {
-			signal.addEventListener('abort', abortAndFinalize);
-		}
-
-		function finalize() {
-			req.abort();
-			if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			clearTimeout(reqTimeout);
-		}
-
-		if (request.timeout) {
-			req.once('socket', function (socket) {
-				reqTimeout = setTimeout(function () {
-					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
-					finalize();
-				}, request.timeout);
-			});
-		}
-
-		req.on('error', function (err) {
-			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
-			finalize();
-		});
-
-		req.on('response', function (res) {
-			clearTimeout(reqTimeout);
-
-			const headers = createHeadersLenient(res.headers);
-
-			// HTTP fetch step 5
-			if (fetch.isRedirect(res.statusCode)) {
-				// HTTP fetch step 5.2
-				const location = headers.get('Location');
-
-				// HTTP fetch step 5.3
-				const locationURL = location === null ? null : resolve_url(request.url, location);
-
-				// HTTP fetch step 5.5
-				switch (request.redirect) {
-					case 'error':
-						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
-						finalize();
-						return;
-					case 'manual':
-						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
-						if (locationURL !== null) {
-							// handle corrupted header
-							try {
-								headers.set('Location', locationURL);
-							} catch (err) {
-								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
-								reject(err);
-							}
-						}
-						break;
-					case 'follow':
-						// HTTP-redirect fetch step 2
-						if (locationURL === null) {
-							break;
-						}
-
-						// HTTP-redirect fetch step 5
-						if (request.counter >= request.follow) {
-							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 6 (counter increment)
-						// Create a new Request object.
-						const requestOpts = {
-							headers: new Headers(request.headers),
-							follow: request.follow,
-							counter: request.counter + 1,
-							agent: request.agent,
-							compress: request.compress,
-							method: request.method,
-							body: request.body,
-							signal: request.signal,
-							timeout: request.timeout
-						};
-
-						// HTTP-redirect fetch step 9
-						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
-							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 11
-						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
-							requestOpts.method = 'GET';
-							requestOpts.body = undefined;
-							requestOpts.headers.delete('content-length');
-						}
-
-						// HTTP-redirect fetch step 15
-						resolve(fetch(new Request(locationURL, requestOpts)));
-						finalize();
-						return;
-				}
-			}
-
-			// prepare response
-			res.once('end', function () {
-				if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			});
-			let body = res.pipe(new PassThrough$1());
-
-			const response_options = {
-				url: request.url,
-				status: res.statusCode,
-				statusText: res.statusMessage,
-				headers: headers,
-				size: request.size,
-				timeout: request.timeout,
-				counter: request.counter
-			};
-
-			// HTTP-network fetch step 12.1.1.3
-			const codings = headers.get('Content-Encoding');
-
-			// HTTP-network fetch step 12.1.1.4: handle content codings
-
-			// in following scenarios we ignore compression support
-			// 1. compression support is disabled
-			// 2. HEAD request
-			// 3. no Content-Encoding header
-			// 4. no content response (204)
-			// 5. content not modified response (304)
-			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// For Node v6+
-			// Be less strict when decoding compressed responses, since sometimes
-			// servers send slightly invalid responses that are still accepted
-			// by common browsers.
-			// Always using Z_SYNC_FLUSH is what cURL does.
-			const zlibOptions = {
-				flush: zlib.Z_SYNC_FLUSH,
-				finishFlush: zlib.Z_SYNC_FLUSH
-			};
-
-			// for gzip
-			if (codings == 'gzip' || codings == 'x-gzip') {
-				body = body.pipe(zlib.createGunzip(zlibOptions));
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// for deflate
-			if (codings == 'deflate' || codings == 'x-deflate') {
-				// handle the infamous raw deflate response from old servers
-				// a hack for old IIS and Apache servers
-				const raw = res.pipe(new PassThrough$1());
-				raw.once('data', function (chunk) {
-					// see http://stackoverflow.com/questions/37519828
-					if ((chunk[0] & 0x0F) === 0x08) {
-						body = body.pipe(zlib.createInflate());
-					} else {
-						body = body.pipe(zlib.createInflateRaw());
-					}
-					response = new Response(body, response_options);
-					resolve(response);
-				});
-				return;
-			}
-
-			// for br
-			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
-				body = body.pipe(zlib.createBrotliDecompress());
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// otherwise, use response as-is
-			response = new Response(body, response_options);
-			resolve(response);
-		});
-
-		writeToStream(req, request);
-	});
-}
-/**
- * Redirect code matching
- *
- * @param   Number   code  Status code
- * @return  Boolean
- */
-fetch.isRedirect = function (code) {
-	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
-};
-
-// expose Promise
-fetch.Promise = global.Promise;
-
-export default fetch;
-export { Headers, Request, Response, FetchError };
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.js b/scripts/metrics/node_modules/node-fetch/lib/index.js
deleted file mode 100644
index 86c7c031229..00000000000
--- a/scripts/metrics/node_modules/node-fetch/lib/index.js
+++ /dev/null
@@ -1,1640 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var Stream = _interopDefault(require('stream'));
-var http = _interopDefault(require('http'));
-var Url = _interopDefault(require('url'));
-var https = _interopDefault(require('https'));
-var zlib = _interopDefault(require('zlib'));
-
-// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
-
-// fix for "Readable" isn't a named export issue
-const Readable = Stream.Readable;
-
-const BUFFER = Symbol('buffer');
-const TYPE = Symbol('type');
-
-class Blob {
-	constructor() {
-		this[TYPE] = '';
-
-		const blobParts = arguments[0];
-		const options = arguments[1];
-
-		const buffers = [];
-		let size = 0;
-
-		if (blobParts) {
-			const a = blobParts;
-			const length = Number(a.length);
-			for (let i = 0; i < length; i++) {
-				const element = a[i];
-				let buffer;
-				if (element instanceof Buffer) {
-					buffer = element;
-				} else if (ArrayBuffer.isView(element)) {
-					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
-				} else if (element instanceof ArrayBuffer) {
-					buffer = Buffer.from(element);
-				} else if (element instanceof Blob) {
-					buffer = element[BUFFER];
-				} else {
-					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
-				}
-				size += buffer.length;
-				buffers.push(buffer);
-			}
-		}
-
-		this[BUFFER] = Buffer.concat(buffers);
-
-		let type = options && options.type !== undefined && String(options.type).toLowerCase();
-		if (type && !/[^\u0020-\u007E]/.test(type)) {
-			this[TYPE] = type;
-		}
-	}
-	get size() {
-		return this[BUFFER].length;
-	}
-	get type() {
-		return this[TYPE];
-	}
-	text() {
-		return Promise.resolve(this[BUFFER].toString());
-	}
-	arrayBuffer() {
-		const buf = this[BUFFER];
-		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		return Promise.resolve(ab);
-	}
-	stream() {
-		const readable = new Readable();
-		readable._read = function () {};
-		readable.push(this[BUFFER]);
-		readable.push(null);
-		return readable;
-	}
-	toString() {
-		return '[object Blob]';
-	}
-	slice() {
-		const size = this.size;
-
-		const start = arguments[0];
-		const end = arguments[1];
-		let relativeStart, relativeEnd;
-		if (start === undefined) {
-			relativeStart = 0;
-		} else if (start < 0) {
-			relativeStart = Math.max(size + start, 0);
-		} else {
-			relativeStart = Math.min(start, size);
-		}
-		if (end === undefined) {
-			relativeEnd = size;
-		} else if (end < 0) {
-			relativeEnd = Math.max(size + end, 0);
-		} else {
-			relativeEnd = Math.min(end, size);
-		}
-		const span = Math.max(relativeEnd - relativeStart, 0);
-
-		const buffer = this[BUFFER];
-		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
-		const blob = new Blob([], { type: arguments[2] });
-		blob[BUFFER] = slicedBuffer;
-		return blob;
-	}
-}
-
-Object.defineProperties(Blob.prototype, {
-	size: { enumerable: true },
-	type: { enumerable: true },
-	slice: { enumerable: true }
-});
-
-Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
-	value: 'Blob',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * fetch-error.js
- *
- * FetchError interface for operational errors
- */
-
-/**
- * Create FetchError instance
- *
- * @param   String      message      Error message for human
- * @param   String      type         Error type for machine
- * @param   String      systemError  For Node.js system error
- * @return  FetchError
- */
-function FetchError(message, type, systemError) {
-  Error.call(this, message);
-
-  this.message = message;
-  this.type = type;
-
-  // when err.type is `system`, err.code contains system error code
-  if (systemError) {
-    this.code = this.errno = systemError.code;
-  }
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-FetchError.prototype = Object.create(Error.prototype);
-FetchError.prototype.constructor = FetchError;
-FetchError.prototype.name = 'FetchError';
-
-let convert;
-try {
-	convert = require('encoding').convert;
-} catch (e) {}
-
-const INTERNALS = Symbol('Body internals');
-
-// fix an issue where "PassThrough" isn't a named export for node <10
-const PassThrough = Stream.PassThrough;
-
-/**
- * Body mixin
- *
- * Ref: https://fetch.spec.whatwg.org/#body
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-function Body(body) {
-	var _this = this;
-
-	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-	    _ref$size = _ref.size;
-
-	let size = _ref$size === undefined ? 0 : _ref$size;
-	var _ref$timeout = _ref.timeout;
-	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
-
-	if (body == null) {
-		// body is undefined or null
-		body = null;
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		body = Buffer.from(body.toString());
-	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		body = Buffer.from(body);
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
-	} else if (body instanceof Stream) ; else {
-		// none of the above
-		// coerce to string then buffer
-		body = Buffer.from(String(body));
-	}
-	this[INTERNALS] = {
-		body,
-		disturbed: false,
-		error: null
-	};
-	this.size = size;
-	this.timeout = timeout;
-
-	if (body instanceof Stream) {
-		body.on('error', function (err) {
-			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
-			_this[INTERNALS].error = error;
-		});
-	}
-}
-
-Body.prototype = {
-	get body() {
-		return this[INTERNALS].body;
-	},
-
-	get bodyUsed() {
-		return this[INTERNALS].disturbed;
-	},
-
-	/**
-  * Decode response as ArrayBuffer
-  *
-  * @return  Promise
-  */
-	arrayBuffer() {
-		return consumeBody.call(this).then(function (buf) {
-			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		});
-	},
-
-	/**
-  * Return raw response as Blob
-  *
-  * @return Promise
-  */
-	blob() {
-		let ct = this.headers && this.headers.get('content-type') || '';
-		return consumeBody.call(this).then(function (buf) {
-			return Object.assign(
-			// Prevent copying
-			new Blob([], {
-				type: ct.toLowerCase()
-			}), {
-				[BUFFER]: buf
-			});
-		});
-	},
-
-	/**
-  * Decode response as json
-  *
-  * @return  Promise
-  */
-	json() {
-		var _this2 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			try {
-				return JSON.parse(buffer.toString());
-			} catch (err) {
-				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
-			}
-		});
-	},
-
-	/**
-  * Decode response as text
-  *
-  * @return  Promise
-  */
-	text() {
-		return consumeBody.call(this).then(function (buffer) {
-			return buffer.toString();
-		});
-	},
-
-	/**
-  * Decode response as buffer (non-spec api)
-  *
-  * @return  Promise
-  */
-	buffer() {
-		return consumeBody.call(this);
-	},
-
-	/**
-  * Decode response as text, while automatically detecting the encoding and
-  * trying to decode to UTF-8 (non-spec api)
-  *
-  * @return  Promise
-  */
-	textConverted() {
-		var _this3 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			return convertBody(buffer, _this3.headers);
-		});
-	}
-};
-
-// In browsers, all properties are enumerable.
-Object.defineProperties(Body.prototype, {
-	body: { enumerable: true },
-	bodyUsed: { enumerable: true },
-	arrayBuffer: { enumerable: true },
-	blob: { enumerable: true },
-	json: { enumerable: true },
-	text: { enumerable: true }
-});
-
-Body.mixIn = function (proto) {
-	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
-		// istanbul ignore else: future proof
-		if (!(name in proto)) {
-			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
-			Object.defineProperty(proto, name, desc);
-		}
-	}
-};
-
-/**
- * Consume and convert an entire Body to a Buffer.
- *
- * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
- *
- * @return  Promise
- */
-function consumeBody() {
-	var _this4 = this;
-
-	if (this[INTERNALS].disturbed) {
-		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
-	}
-
-	this[INTERNALS].disturbed = true;
-
-	if (this[INTERNALS].error) {
-		return Body.Promise.reject(this[INTERNALS].error);
-	}
-
-	let body = this.body;
-
-	// body is null
-	if (body === null) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is blob
-	if (isBlob(body)) {
-		body = body.stream();
-	}
-
-	// body is buffer
-	if (Buffer.isBuffer(body)) {
-		return Body.Promise.resolve(body);
-	}
-
-	// istanbul ignore if: should never happen
-	if (!(body instanceof Stream)) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is stream
-	// get ready to actually consume the body
-	let accum = [];
-	let accumBytes = 0;
-	let abort = false;
-
-	return new Body.Promise(function (resolve, reject) {
-		let resTimeout;
-
-		// allow timeout on slow response body
-		if (_this4.timeout) {
-			resTimeout = setTimeout(function () {
-				abort = true;
-				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
-			}, _this4.timeout);
-		}
-
-		// handle stream errors
-		body.on('error', function (err) {
-			if (err.name === 'AbortError') {
-				// if the request was aborted, reject with this Error
-				abort = true;
-				reject(err);
-			} else {
-				// other errors, such as incorrect content-encoding
-				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-
-		body.on('data', function (chunk) {
-			if (abort || chunk === null) {
-				return;
-			}
-
-			if (_this4.size && accumBytes + chunk.length > _this4.size) {
-				abort = true;
-				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
-				return;
-			}
-
-			accumBytes += chunk.length;
-			accum.push(chunk);
-		});
-
-		body.on('end', function () {
-			if (abort) {
-				return;
-			}
-
-			clearTimeout(resTimeout);
-
-			try {
-				resolve(Buffer.concat(accum, accumBytes));
-			} catch (err) {
-				// handle streams that have accumulated too much data (issue #414)
-				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-	});
-}
-
-/**
- * Detect buffer encoding and convert to target encoding
- * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
- *
- * @param   Buffer  buffer    Incoming buffer
- * @param   String  encoding  Target encoding
- * @return  String
- */
-function convertBody(buffer, headers) {
-	if (typeof convert !== 'function') {
-		throw new Error('The package `encoding` must be installed to use the textConverted() function');
-	}
-
-	const ct = headers.get('content-type');
-	let charset = 'utf-8';
-	let res, str;
-
-	// header
-	if (ct) {
-		res = /charset=([^;]*)/i.exec(ct);
-	}
-
-	// no charset in content type, peek at response body for at most 1024 bytes
-	str = buffer.slice(0, 1024).toString();
-
-	// html5
-	if (!res && str) {
-		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// html4
-	if (!res && str) {
-		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
-
-		if (res) {
-			res = /charset=(.*)/i.exec(res.pop());
-		}
-	}
-
-	// xml
-	if (!res && str) {
-		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// found charset
-	if (res) {
-		charset = res.pop();
-
-		// prevent decode issues when sites use incorrect encoding
-		// ref: https://hsivonen.fi/encoding-menu/
-		if (charset === 'gb2312' || charset === 'gbk') {
-			charset = 'gb18030';
-		}
-	}
-
-	// turn raw buffers into a single utf-8 buffer
-	return convert(buffer, 'UTF-8', charset).toString();
-}
-
-/**
- * Detect a URLSearchParams object
- * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
- *
- * @param   Object  obj     Object to detect by type or brand
- * @return  String
- */
-function isURLSearchParams(obj) {
-	// Duck-typing as a necessary condition.
-	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
-		return false;
-	}
-
-	// Brand-checking and more duck-typing as optional condition.
-	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
-}
-
-/**
- * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
- * @param  {*} obj
- * @return {boolean}
- */
-function isBlob(obj) {
-	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
-}
-
-/**
- * Clone body given Res/Req instance
- *
- * @param   Mixed  instance  Response or Request instance
- * @return  Mixed
- */
-function clone(instance) {
-	let p1, p2;
-	let body = instance.body;
-
-	// don't allow cloning a used body
-	if (instance.bodyUsed) {
-		throw new Error('cannot clone body after it is used');
-	}
-
-	// check that body is a stream and not form-data object
-	// note: we can't clone the form-data object without having it as a dependency
-	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
-		// tee instance body
-		p1 = new PassThrough();
-		p2 = new PassThrough();
-		body.pipe(p1);
-		body.pipe(p2);
-		// set instance body to teed body and return the other teed body
-		instance[INTERNALS].body = p1;
-		body = p2;
-	}
-
-	return body;
-}
-
-/**
- * Performs the operation "extract a `Content-Type` value from |object|" as
- * specified in the specification:
- * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
- *
- * This function assumes that instance.body is present.
- *
- * @param   Mixed  instance  Response or Request instance
- */
-function extractContentType(body) {
-	// istanbul ignore if: Currently, because of a guard in Request, body
-	// can never be null. Included here for completeness.
-	if (body === null) {
-		// body is null
-		return null;
-	} else if (typeof body === 'string') {
-		// body is string
-		return 'text/plain;charset=UTF-8';
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		return 'application/x-www-form-urlencoded;charset=UTF-8';
-	} else if (isBlob(body)) {
-		// body is blob
-		return body.type || null;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return null;
-	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		return null;
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		return null;
-	} else if (typeof body.getBoundary === 'function') {
-		// detect form data input from form-data module
-		return `multipart/form-data;boundary=${body.getBoundary()}`;
-	} else if (body instanceof Stream) {
-		// body is stream
-		// can't really do much about this
-		return null;
-	} else {
-		// Body constructor defaults other things to string
-		return 'text/plain;charset=UTF-8';
-	}
-}
-
-/**
- * The Fetch Standard treats this as if "total bytes" is a property on the body.
- * For us, we have to explicitly get it with a function.
- *
- * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
- *
- * @param   Body    instance   Instance of Body
- * @return  Number?            Number of bytes, or null if not possible
- */
-function getTotalBytes(instance) {
-	const body = instance.body;
-
-	// istanbul ignore if: included for completion
-
-	if (body === null) {
-		// body is null
-		return 0;
-	} else if (isBlob(body)) {
-		return body.size;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return body.length;
-	} else if (body && typeof body.getLengthSync === 'function') {
-		// detect form data input from form-data module
-		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
-		body.hasKnownLength && body.hasKnownLength()) {
-			// 2.x
-			return body.getLengthSync();
-		}
-		return null;
-	} else {
-		// body is stream
-		return instance.size || null;
-	}
-}
-
-/**
- * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
- *
- * @param   Body    instance   Instance of Body
- * @return  Void
- */
-function writeToStream(dest, instance) {
-	const body = instance.body;
-
-
-	if (body === null) {
-		// body is null
-		dest.end();
-	} else if (isBlob(body)) {
-		body.stream().pipe(dest);
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		dest.write(body);
-		dest.end();
-	} else {
-		// body is stream
-		body.pipe(dest);
-	}
-}
-
-// expose Promise
-Body.Promise = global.Promise;
-
-/**
- * headers.js
- *
- * Headers class offers convenient helpers
- */
-
-const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
-const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
-
-function validateName(name) {
-	name = `${name}`;
-	if (invalidTokenRegex.test(name) || name === '') {
-		throw new TypeError(`${name} is not a legal HTTP header name`);
-	}
-}
-
-function validateValue(value) {
-	value = `${value}`;
-	if (invalidHeaderCharRegex.test(value)) {
-		throw new TypeError(`${value} is not a legal HTTP header value`);
-	}
-}
-
-/**
- * Find the key in the map object given a header name.
- *
- * Returns undefined if not found.
- *
- * @param   String  name  Header name
- * @return  String|Undefined
- */
-function find(map, name) {
-	name = name.toLowerCase();
-	for (const key in map) {
-		if (key.toLowerCase() === name) {
-			return key;
-		}
-	}
-	return undefined;
-}
-
-const MAP = Symbol('map');
-class Headers {
-	/**
-  * Headers class
-  *
-  * @param   Object  headers  Response headers
-  * @return  Void
-  */
-	constructor() {
-		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-
-		this[MAP] = Object.create(null);
-
-		if (init instanceof Headers) {
-			const rawHeaders = init.raw();
-			const headerNames = Object.keys(rawHeaders);
-
-			for (const headerName of headerNames) {
-				for (const value of rawHeaders[headerName]) {
-					this.append(headerName, value);
-				}
-			}
-
-			return;
-		}
-
-		// We don't worry about converting prop to ByteString here as append()
-		// will handle it.
-		if (init == null) ; else if (typeof init === 'object') {
-			const method = init[Symbol.iterator];
-			if (method != null) {
-				if (typeof method !== 'function') {
-					throw new TypeError('Header pairs must be iterable');
-				}
-
-				// sequence<sequence<ByteString>>
-				// Note: per spec we have to first exhaust the lists then process them
-				const pairs = [];
-				for (const pair of init) {
-					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
-						throw new TypeError('Each header pair must be iterable');
-					}
-					pairs.push(Array.from(pair));
-				}
-
-				for (const pair of pairs) {
-					if (pair.length !== 2) {
-						throw new TypeError('Each header pair must be a name/value tuple');
-					}
-					this.append(pair[0], pair[1]);
-				}
-			} else {
-				// record<ByteString, ByteString>
-				for (const key of Object.keys(init)) {
-					const value = init[key];
-					this.append(key, value);
-				}
-			}
-		} else {
-			throw new TypeError('Provided initializer must be an object');
-		}
-	}
-
-	/**
-  * Return combined header value given name
-  *
-  * @param   String  name  Header name
-  * @return  Mixed
-  */
-	get(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key === undefined) {
-			return null;
-		}
-
-		return this[MAP][key].join(', ');
-	}
-
-	/**
-  * Iterate over all headers
-  *
-  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
-  * @param   Boolean   thisArg   `this` context for callback function
-  * @return  Void
-  */
-	forEach(callback) {
-		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
-
-		let pairs = getHeaders(this);
-		let i = 0;
-		while (i < pairs.length) {
-			var _pairs$i = pairs[i];
-			const name = _pairs$i[0],
-			      value = _pairs$i[1];
-
-			callback.call(thisArg, value, name, this);
-			pairs = getHeaders(this);
-			i++;
-		}
-	}
-
-	/**
-  * Overwrite header values given name
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	set(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		this[MAP][key !== undefined ? key : name] = [value];
-	}
-
-	/**
-  * Append a value onto existing header
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	append(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			this[MAP][key].push(value);
-		} else {
-			this[MAP][name] = [value];
-		}
-	}
-
-	/**
-  * Check for header name existence
-  *
-  * @param   String   name  Header name
-  * @return  Boolean
-  */
-	has(name) {
-		name = `${name}`;
-		validateName(name);
-		return find(this[MAP], name) !== undefined;
-	}
-
-	/**
-  * Delete all header values given name
-  *
-  * @param   String  name  Header name
-  * @return  Void
-  */
-	delete(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			delete this[MAP][key];
-		}
-	}
-
-	/**
-  * Return raw headers (non-spec api)
-  *
-  * @return  Object
-  */
-	raw() {
-		return this[MAP];
-	}
-
-	/**
-  * Get an iterator on keys.
-  *
-  * @return  Iterator
-  */
-	keys() {
-		return createHeadersIterator(this, 'key');
-	}
-
-	/**
-  * Get an iterator on values.
-  *
-  * @return  Iterator
-  */
-	values() {
-		return createHeadersIterator(this, 'value');
-	}
-
-	/**
-  * Get an iterator on entries.
-  *
-  * This is the default iterator of the Headers object.
-  *
-  * @return  Iterator
-  */
-	[Symbol.iterator]() {
-		return createHeadersIterator(this, 'key+value');
-	}
-}
-Headers.prototype.entries = Headers.prototype[Symbol.iterator];
-
-Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
-	value: 'Headers',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Headers.prototype, {
-	get: { enumerable: true },
-	forEach: { enumerable: true },
-	set: { enumerable: true },
-	append: { enumerable: true },
-	has: { enumerable: true },
-	delete: { enumerable: true },
-	keys: { enumerable: true },
-	values: { enumerable: true },
-	entries: { enumerable: true }
-});
-
-function getHeaders(headers) {
-	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
-
-	const keys = Object.keys(headers[MAP]).sort();
-	return keys.map(kind === 'key' ? function (k) {
-		return k.toLowerCase();
-	} : kind === 'value' ? function (k) {
-		return headers[MAP][k].join(', ');
-	} : function (k) {
-		return [k.toLowerCase(), headers[MAP][k].join(', ')];
-	});
-}
-
-const INTERNAL = Symbol('internal');
-
-function createHeadersIterator(target, kind) {
-	const iterator = Object.create(HeadersIteratorPrototype);
-	iterator[INTERNAL] = {
-		target,
-		kind,
-		index: 0
-	};
-	return iterator;
-}
-
-const HeadersIteratorPrototype = Object.setPrototypeOf({
-	next() {
-		// istanbul ignore if
-		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
-			throw new TypeError('Value of `this` is not a HeadersIterator');
-		}
-
-		var _INTERNAL = this[INTERNAL];
-		const target = _INTERNAL.target,
-		      kind = _INTERNAL.kind,
-		      index = _INTERNAL.index;
-
-		const values = getHeaders(target, kind);
-		const len = values.length;
-		if (index >= len) {
-			return {
-				value: undefined,
-				done: true
-			};
-		}
-
-		this[INTERNAL].index = index + 1;
-
-		return {
-			value: values[index],
-			done: false
-		};
-	}
-}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
-
-Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
-	value: 'HeadersIterator',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * Export the Headers object in a form that Node.js can consume.
- *
- * @param   Headers  headers
- * @return  Object
- */
-function exportNodeCompatibleHeaders(headers) {
-	const obj = Object.assign({ __proto__: null }, headers[MAP]);
-
-	// http.request() only supports string as Host header. This hack makes
-	// specifying custom Host header possible.
-	const hostHeaderKey = find(headers[MAP], 'Host');
-	if (hostHeaderKey !== undefined) {
-		obj[hostHeaderKey] = obj[hostHeaderKey][0];
-	}
-
-	return obj;
-}
-
-/**
- * Create a Headers object from an object of headers, ignoring those that do
- * not conform to HTTP grammar productions.
- *
- * @param   Object  obj  Object of headers
- * @return  Headers
- */
-function createHeadersLenient(obj) {
-	const headers = new Headers();
-	for (const name of Object.keys(obj)) {
-		if (invalidTokenRegex.test(name)) {
-			continue;
-		}
-		if (Array.isArray(obj[name])) {
-			for (const val of obj[name]) {
-				if (invalidHeaderCharRegex.test(val)) {
-					continue;
-				}
-				if (headers[MAP][name] === undefined) {
-					headers[MAP][name] = [val];
-				} else {
-					headers[MAP][name].push(val);
-				}
-			}
-		} else if (!invalidHeaderCharRegex.test(obj[name])) {
-			headers[MAP][name] = [obj[name]];
-		}
-	}
-	return headers;
-}
-
-const INTERNALS$1 = Symbol('Response internals');
-
-// fix an issue where "STATUS_CODES" aren't a named export for node <10
-const STATUS_CODES = http.STATUS_CODES;
-
-/**
- * Response class
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-class Response {
-	constructor() {
-		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		Body.call(this, body, opts);
-
-		const status = opts.status || 200;
-		const headers = new Headers(opts.headers);
-
-		if (body != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(body);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		this[INTERNALS$1] = {
-			url: opts.url,
-			status,
-			statusText: opts.statusText || STATUS_CODES[status],
-			headers,
-			counter: opts.counter
-		};
-	}
-
-	get url() {
-		return this[INTERNALS$1].url;
-	}
-
-	get status() {
-		return this[INTERNALS$1].status;
-	}
-
-	/**
-  * Convenience property representing if the request ended normally
-  */
-	get ok() {
-		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
-	}
-
-	get redirected() {
-		return this[INTERNALS$1].counter > 0;
-	}
-
-	get statusText() {
-		return this[INTERNALS$1].statusText;
-	}
-
-	get headers() {
-		return this[INTERNALS$1].headers;
-	}
-
-	/**
-  * Clone this response
-  *
-  * @return  Response
-  */
-	clone() {
-		return new Response(clone(this), {
-			url: this.url,
-			status: this.status,
-			statusText: this.statusText,
-			headers: this.headers,
-			ok: this.ok,
-			redirected: this.redirected
-		});
-	}
-}
-
-Body.mixIn(Response.prototype);
-
-Object.defineProperties(Response.prototype, {
-	url: { enumerable: true },
-	status: { enumerable: true },
-	ok: { enumerable: true },
-	redirected: { enumerable: true },
-	statusText: { enumerable: true },
-	headers: { enumerable: true },
-	clone: { enumerable: true }
-});
-
-Object.defineProperty(Response.prototype, Symbol.toStringTag, {
-	value: 'Response',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-const INTERNALS$2 = Symbol('Request internals');
-
-// fix an issue where "format", "parse" aren't a named export for node <10
-const parse_url = Url.parse;
-const format_url = Url.format;
-
-const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
-
-/**
- * Check if a value is an instance of Request.
- *
- * @param   Mixed   input
- * @return  Boolean
- */
-function isRequest(input) {
-	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
-}
-
-function isAbortSignal(signal) {
-	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
-	return !!(proto && proto.constructor.name === 'AbortSignal');
-}
-
-/**
- * Request class
- *
- * @param   Mixed   input  Url or Request instance
- * @param   Object  init   Custom options
- * @return  Void
- */
-class Request {
-	constructor(input) {
-		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		let parsedURL;
-
-		// normalize input
-		if (!isRequest(input)) {
-			if (input && input.href) {
-				// in order to support Node.js' Url objects; though WHATWG's URL objects
-				// will fall into this branch also (since their `toString()` will return
-				// `href` property anyway)
-				parsedURL = parse_url(input.href);
-			} else {
-				// coerce input to a string before attempting to parse
-				parsedURL = parse_url(`${input}`);
-			}
-			input = {};
-		} else {
-			parsedURL = parse_url(input.url);
-		}
-
-		let method = init.method || input.method || 'GET';
-		method = method.toUpperCase();
-
-		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
-			throw new TypeError('Request with GET/HEAD method cannot have body');
-		}
-
-		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
-
-		Body.call(this, inputBody, {
-			timeout: init.timeout || input.timeout || 0,
-			size: init.size || input.size || 0
-		});
-
-		const headers = new Headers(init.headers || input.headers || {});
-
-		if (inputBody != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(inputBody);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		let signal = isRequest(input) ? input.signal : null;
-		if ('signal' in init) signal = init.signal;
-
-		if (signal != null && !isAbortSignal(signal)) {
-			throw new TypeError('Expected signal to be an instanceof AbortSignal');
-		}
-
-		this[INTERNALS$2] = {
-			method,
-			redirect: init.redirect || input.redirect || 'follow',
-			headers,
-			parsedURL,
-			signal
-		};
-
-		// node-fetch-only options
-		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
-		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
-		this.counter = init.counter || input.counter || 0;
-		this.agent = init.agent || input.agent;
-	}
-
-	get method() {
-		return this[INTERNALS$2].method;
-	}
-
-	get url() {
-		return format_url(this[INTERNALS$2].parsedURL);
-	}
-
-	get headers() {
-		return this[INTERNALS$2].headers;
-	}
-
-	get redirect() {
-		return this[INTERNALS$2].redirect;
-	}
-
-	get signal() {
-		return this[INTERNALS$2].signal;
-	}
-
-	/**
-  * Clone this request
-  *
-  * @return  Request
-  */
-	clone() {
-		return new Request(this);
-	}
-}
-
-Body.mixIn(Request.prototype);
-
-Object.defineProperty(Request.prototype, Symbol.toStringTag, {
-	value: 'Request',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Request.prototype, {
-	method: { enumerable: true },
-	url: { enumerable: true },
-	headers: { enumerable: true },
-	redirect: { enumerable: true },
-	clone: { enumerable: true },
-	signal: { enumerable: true }
-});
-
-/**
- * Convert a Request to Node.js http request options.
- *
- * @param   Request  A Request instance
- * @return  Object   The options object to be passed to http.request
- */
-function getNodeRequestOptions(request) {
-	const parsedURL = request[INTERNALS$2].parsedURL;
-	const headers = new Headers(request[INTERNALS$2].headers);
-
-	// fetch step 1.3
-	if (!headers.has('Accept')) {
-		headers.set('Accept', '*/*');
-	}
-
-	// Basic fetch
-	if (!parsedURL.protocol || !parsedURL.hostname) {
-		throw new TypeError('Only absolute URLs are supported');
-	}
-
-	if (!/^https?:$/.test(parsedURL.protocol)) {
-		throw new TypeError('Only HTTP(S) protocols are supported');
-	}
-
-	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
-		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
-	}
-
-	// HTTP-network-or-cache fetch steps 2.4-2.7
-	let contentLengthValue = null;
-	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
-		contentLengthValue = '0';
-	}
-	if (request.body != null) {
-		const totalBytes = getTotalBytes(request);
-		if (typeof totalBytes === 'number') {
-			contentLengthValue = String(totalBytes);
-		}
-	}
-	if (contentLengthValue) {
-		headers.set('Content-Length', contentLengthValue);
-	}
-
-	// HTTP-network-or-cache fetch step 2.11
-	if (!headers.has('User-Agent')) {
-		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
-	}
-
-	// HTTP-network-or-cache fetch step 2.15
-	if (request.compress && !headers.has('Accept-Encoding')) {
-		headers.set('Accept-Encoding', 'gzip,deflate');
-	}
-
-	if (!headers.has('Connection') && !request.agent) {
-		headers.set('Connection', 'close');
-	}
-
-	// HTTP-network fetch step 4.2
-	// chunked encoding is handled by Node.js
-
-	return Object.assign({}, parsedURL, {
-		method: request.method,
-		headers: exportNodeCompatibleHeaders(headers),
-		agent: request.agent
-	});
-}
-
-/**
- * abort-error.js
- *
- * AbortError interface for cancelled requests
- */
-
-/**
- * Create AbortError instance
- *
- * @param   String      message      Error message for human
- * @return  AbortError
- */
-function AbortError(message) {
-  Error.call(this, message);
-
-  this.type = 'aborted';
-  this.message = message;
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-AbortError.prototype = Object.create(Error.prototype);
-AbortError.prototype.constructor = AbortError;
-AbortError.prototype.name = 'AbortError';
-
-// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
-const PassThrough$1 = Stream.PassThrough;
-const resolve_url = Url.resolve;
-
-/**
- * Fetch function
- *
- * @param   Mixed    url   Absolute url or Request instance
- * @param   Object   opts  Fetch options
- * @return  Promise
- */
-function fetch(url, opts) {
-
-	// allow custom promise
-	if (!fetch.Promise) {
-		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
-	}
-
-	Body.Promise = fetch.Promise;
-
-	// wrap http.request into fetch
-	return new fetch.Promise(function (resolve, reject) {
-		// build request object
-		const request = new Request(url, opts);
-		const options = getNodeRequestOptions(request);
-
-		const send = (options.protocol === 'https:' ? https : http).request;
-		const signal = request.signal;
-
-		let response = null;
-
-		const abort = function abort() {
-			let error = new AbortError('The user aborted a request.');
-			reject(error);
-			if (request.body && request.body instanceof Stream.Readable) {
-				request.body.destroy(error);
-			}
-			if (!response || !response.body) return;
-			response.body.emit('error', error);
-		};
-
-		if (signal && signal.aborted) {
-			abort();
-			return;
-		}
-
-		const abortAndFinalize = function abortAndFinalize() {
-			abort();
-			finalize();
-		};
-
-		// send request
-		const req = send(options);
-		let reqTimeout;
-
-		if (signal) {
-			signal.addEventListener('abort', abortAndFinalize);
-		}
-
-		function finalize() {
-			req.abort();
-			if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			clearTimeout(reqTimeout);
-		}
-
-		if (request.timeout) {
-			req.once('socket', function (socket) {
-				reqTimeout = setTimeout(function () {
-					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
-					finalize();
-				}, request.timeout);
-			});
-		}
-
-		req.on('error', function (err) {
-			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
-			finalize();
-		});
-
-		req.on('response', function (res) {
-			clearTimeout(reqTimeout);
-
-			const headers = createHeadersLenient(res.headers);
-
-			// HTTP fetch step 5
-			if (fetch.isRedirect(res.statusCode)) {
-				// HTTP fetch step 5.2
-				const location = headers.get('Location');
-
-				// HTTP fetch step 5.3
-				const locationURL = location === null ? null : resolve_url(request.url, location);
-
-				// HTTP fetch step 5.5
-				switch (request.redirect) {
-					case 'error':
-						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
-						finalize();
-						return;
-					case 'manual':
-						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
-						if (locationURL !== null) {
-							// handle corrupted header
-							try {
-								headers.set('Location', locationURL);
-							} catch (err) {
-								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
-								reject(err);
-							}
-						}
-						break;
-					case 'follow':
-						// HTTP-redirect fetch step 2
-						if (locationURL === null) {
-							break;
-						}
-
-						// HTTP-redirect fetch step 5
-						if (request.counter >= request.follow) {
-							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 6 (counter increment)
-						// Create a new Request object.
-						const requestOpts = {
-							headers: new Headers(request.headers),
-							follow: request.follow,
-							counter: request.counter + 1,
-							agent: request.agent,
-							compress: request.compress,
-							method: request.method,
-							body: request.body,
-							signal: request.signal,
-							timeout: request.timeout
-						};
-
-						// HTTP-redirect fetch step 9
-						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
-							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 11
-						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
-							requestOpts.method = 'GET';
-							requestOpts.body = undefined;
-							requestOpts.headers.delete('content-length');
-						}
-
-						// HTTP-redirect fetch step 15
-						resolve(fetch(new Request(locationURL, requestOpts)));
-						finalize();
-						return;
-				}
-			}
-
-			// prepare response
-			res.once('end', function () {
-				if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			});
-			let body = res.pipe(new PassThrough$1());
-
-			const response_options = {
-				url: request.url,
-				status: res.statusCode,
-				statusText: res.statusMessage,
-				headers: headers,
-				size: request.size,
-				timeout: request.timeout,
-				counter: request.counter
-			};
-
-			// HTTP-network fetch step 12.1.1.3
-			const codings = headers.get('Content-Encoding');
-
-			// HTTP-network fetch step 12.1.1.4: handle content codings
-
-			// in following scenarios we ignore compression support
-			// 1. compression support is disabled
-			// 2. HEAD request
-			// 3. no Content-Encoding header
-			// 4. no content response (204)
-			// 5. content not modified response (304)
-			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// For Node v6+
-			// Be less strict when decoding compressed responses, since sometimes
-			// servers send slightly invalid responses that are still accepted
-			// by common browsers.
-			// Always using Z_SYNC_FLUSH is what cURL does.
-			const zlibOptions = {
-				flush: zlib.Z_SYNC_FLUSH,
-				finishFlush: zlib.Z_SYNC_FLUSH
-			};
-
-			// for gzip
-			if (codings == 'gzip' || codings == 'x-gzip') {
-				body = body.pipe(zlib.createGunzip(zlibOptions));
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// for deflate
-			if (codings == 'deflate' || codings == 'x-deflate') {
-				// handle the infamous raw deflate response from old servers
-				// a hack for old IIS and Apache servers
-				const raw = res.pipe(new PassThrough$1());
-				raw.once('data', function (chunk) {
-					// see http://stackoverflow.com/questions/37519828
-					if ((chunk[0] & 0x0F) === 0x08) {
-						body = body.pipe(zlib.createInflate());
-					} else {
-						body = body.pipe(zlib.createInflateRaw());
-					}
-					response = new Response(body, response_options);
-					resolve(response);
-				});
-				return;
-			}
-
-			// for br
-			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
-				body = body.pipe(zlib.createBrotliDecompress());
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// otherwise, use response as-is
-			response = new Response(body, response_options);
-			resolve(response);
-		});
-
-		writeToStream(req, request);
-	});
-}
-/**
- * Redirect code matching
- *
- * @param   Number   code  Status code
- * @return  Boolean
- */
-fetch.isRedirect = function (code) {
-	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
-};
-
-// expose Promise
-fetch.Promise = global.Promise;
-
-module.exports = exports = fetch;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = exports;
-exports.Headers = Headers;
-exports.Request = Request;
-exports.Response = Response;
-exports.FetchError = FetchError;
diff --git a/scripts/metrics/node_modules/node-fetch/lib/index.mjs b/scripts/metrics/node_modules/node-fetch/lib/index.mjs
deleted file mode 100644
index dca525658b4..00000000000
--- a/scripts/metrics/node_modules/node-fetch/lib/index.mjs
+++ /dev/null
@@ -1,1629 +0,0 @@
-import Stream from 'stream';
-import http from 'http';
-import Url from 'url';
-import https from 'https';
-import zlib from 'zlib';
-
-// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
-
-// fix for "Readable" isn't a named export issue
-const Readable = Stream.Readable;
-
-const BUFFER = Symbol('buffer');
-const TYPE = Symbol('type');
-
-class Blob {
-	constructor() {
-		this[TYPE] = '';
-
-		const blobParts = arguments[0];
-		const options = arguments[1];
-
-		const buffers = [];
-		let size = 0;
-
-		if (blobParts) {
-			const a = blobParts;
-			const length = Number(a.length);
-			for (let i = 0; i < length; i++) {
-				const element = a[i];
-				let buffer;
-				if (element instanceof Buffer) {
-					buffer = element;
-				} else if (ArrayBuffer.isView(element)) {
-					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
-				} else if (element instanceof ArrayBuffer) {
-					buffer = Buffer.from(element);
-				} else if (element instanceof Blob) {
-					buffer = element[BUFFER];
-				} else {
-					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
-				}
-				size += buffer.length;
-				buffers.push(buffer);
-			}
-		}
-
-		this[BUFFER] = Buffer.concat(buffers);
-
-		let type = options && options.type !== undefined && String(options.type).toLowerCase();
-		if (type && !/[^\u0020-\u007E]/.test(type)) {
-			this[TYPE] = type;
-		}
-	}
-	get size() {
-		return this[BUFFER].length;
-	}
-	get type() {
-		return this[TYPE];
-	}
-	text() {
-		return Promise.resolve(this[BUFFER].toString());
-	}
-	arrayBuffer() {
-		const buf = this[BUFFER];
-		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		return Promise.resolve(ab);
-	}
-	stream() {
-		const readable = new Readable();
-		readable._read = function () {};
-		readable.push(this[BUFFER]);
-		readable.push(null);
-		return readable;
-	}
-	toString() {
-		return '[object Blob]';
-	}
-	slice() {
-		const size = this.size;
-
-		const start = arguments[0];
-		const end = arguments[1];
-		let relativeStart, relativeEnd;
-		if (start === undefined) {
-			relativeStart = 0;
-		} else if (start < 0) {
-			relativeStart = Math.max(size + start, 0);
-		} else {
-			relativeStart = Math.min(start, size);
-		}
-		if (end === undefined) {
-			relativeEnd = size;
-		} else if (end < 0) {
-			relativeEnd = Math.max(size + end, 0);
-		} else {
-			relativeEnd = Math.min(end, size);
-		}
-		const span = Math.max(relativeEnd - relativeStart, 0);
-
-		const buffer = this[BUFFER];
-		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
-		const blob = new Blob([], { type: arguments[2] });
-		blob[BUFFER] = slicedBuffer;
-		return blob;
-	}
-}
-
-Object.defineProperties(Blob.prototype, {
-	size: { enumerable: true },
-	type: { enumerable: true },
-	slice: { enumerable: true }
-});
-
-Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
-	value: 'Blob',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * fetch-error.js
- *
- * FetchError interface for operational errors
- */
-
-/**
- * Create FetchError instance
- *
- * @param   String      message      Error message for human
- * @param   String      type         Error type for machine
- * @param   String      systemError  For Node.js system error
- * @return  FetchError
- */
-function FetchError(message, type, systemError) {
-  Error.call(this, message);
-
-  this.message = message;
-  this.type = type;
-
-  // when err.type is `system`, err.code contains system error code
-  if (systemError) {
-    this.code = this.errno = systemError.code;
-  }
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-FetchError.prototype = Object.create(Error.prototype);
-FetchError.prototype.constructor = FetchError;
-FetchError.prototype.name = 'FetchError';
-
-let convert;
-try {
-	convert = require('encoding').convert;
-} catch (e) {}
-
-const INTERNALS = Symbol('Body internals');
-
-// fix an issue where "PassThrough" isn't a named export for node <10
-const PassThrough = Stream.PassThrough;
-
-/**
- * Body mixin
- *
- * Ref: https://fetch.spec.whatwg.org/#body
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-function Body(body) {
-	var _this = this;
-
-	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-	    _ref$size = _ref.size;
-
-	let size = _ref$size === undefined ? 0 : _ref$size;
-	var _ref$timeout = _ref.timeout;
-	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
-
-	if (body == null) {
-		// body is undefined or null
-		body = null;
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		body = Buffer.from(body.toString());
-	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		body = Buffer.from(body);
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
-	} else if (body instanceof Stream) ; else {
-		// none of the above
-		// coerce to string then buffer
-		body = Buffer.from(String(body));
-	}
-	this[INTERNALS] = {
-		body,
-		disturbed: false,
-		error: null
-	};
-	this.size = size;
-	this.timeout = timeout;
-
-	if (body instanceof Stream) {
-		body.on('error', function (err) {
-			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
-			_this[INTERNALS].error = error;
-		});
-	}
-}
-
-Body.prototype = {
-	get body() {
-		return this[INTERNALS].body;
-	},
-
-	get bodyUsed() {
-		return this[INTERNALS].disturbed;
-	},
-
-	/**
-  * Decode response as ArrayBuffer
-  *
-  * @return  Promise
-  */
-	arrayBuffer() {
-		return consumeBody.call(this).then(function (buf) {
-			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		});
-	},
-
-	/**
-  * Return raw response as Blob
-  *
-  * @return Promise
-  */
-	blob() {
-		let ct = this.headers && this.headers.get('content-type') || '';
-		return consumeBody.call(this).then(function (buf) {
-			return Object.assign(
-			// Prevent copying
-			new Blob([], {
-				type: ct.toLowerCase()
-			}), {
-				[BUFFER]: buf
-			});
-		});
-	},
-
-	/**
-  * Decode response as json
-  *
-  * @return  Promise
-  */
-	json() {
-		var _this2 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			try {
-				return JSON.parse(buffer.toString());
-			} catch (err) {
-				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
-			}
-		});
-	},
-
-	/**
-  * Decode response as text
-  *
-  * @return  Promise
-  */
-	text() {
-		return consumeBody.call(this).then(function (buffer) {
-			return buffer.toString();
-		});
-	},
-
-	/**
-  * Decode response as buffer (non-spec api)
-  *
-  * @return  Promise
-  */
-	buffer() {
-		return consumeBody.call(this);
-	},
-
-	/**
-  * Decode response as text, while automatically detecting the encoding and
-  * trying to decode to UTF-8 (non-spec api)
-  *
-  * @return  Promise
-  */
-	textConverted() {
-		var _this3 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			return convertBody(buffer, _this3.headers);
-		});
-	}
-};
-
-// In browsers, all properties are enumerable.
-Object.defineProperties(Body.prototype, {
-	body: { enumerable: true },
-	bodyUsed: { enumerable: true },
-	arrayBuffer: { enumerable: true },
-	blob: { enumerable: true },
-	json: { enumerable: true },
-	text: { enumerable: true }
-});
-
-Body.mixIn = function (proto) {
-	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
-		// istanbul ignore else: future proof
-		if (!(name in proto)) {
-			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
-			Object.defineProperty(proto, name, desc);
-		}
-	}
-};
-
-/**
- * Consume and convert an entire Body to a Buffer.
- *
- * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
- *
- * @return  Promise
- */
-function consumeBody() {
-	var _this4 = this;
-
-	if (this[INTERNALS].disturbed) {
-		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
-	}
-
-	this[INTERNALS].disturbed = true;
-
-	if (this[INTERNALS].error) {
-		return Body.Promise.reject(this[INTERNALS].error);
-	}
-
-	let body = this.body;
-
-	// body is null
-	if (body === null) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is blob
-	if (isBlob(body)) {
-		body = body.stream();
-	}
-
-	// body is buffer
-	if (Buffer.isBuffer(body)) {
-		return Body.Promise.resolve(body);
-	}
-
-	// istanbul ignore if: should never happen
-	if (!(body instanceof Stream)) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is stream
-	// get ready to actually consume the body
-	let accum = [];
-	let accumBytes = 0;
-	let abort = false;
-
-	return new Body.Promise(function (resolve, reject) {
-		let resTimeout;
-
-		// allow timeout on slow response body
-		if (_this4.timeout) {
-			resTimeout = setTimeout(function () {
-				abort = true;
-				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
-			}, _this4.timeout);
-		}
-
-		// handle stream errors
-		body.on('error', function (err) {
-			if (err.name === 'AbortError') {
-				// if the request was aborted, reject with this Error
-				abort = true;
-				reject(err);
-			} else {
-				// other errors, such as incorrect content-encoding
-				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-
-		body.on('data', function (chunk) {
-			if (abort || chunk === null) {
-				return;
-			}
-
-			if (_this4.size && accumBytes + chunk.length > _this4.size) {
-				abort = true;
-				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
-				return;
-			}
-
-			accumBytes += chunk.length;
-			accum.push(chunk);
-		});
-
-		body.on('end', function () {
-			if (abort) {
-				return;
-			}
-
-			clearTimeout(resTimeout);
-
-			try {
-				resolve(Buffer.concat(accum, accumBytes));
-			} catch (err) {
-				// handle streams that have accumulated too much data (issue #414)
-				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-	});
-}
-
-/**
- * Detect buffer encoding and convert to target encoding
- * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
- *
- * @param   Buffer  buffer    Incoming buffer
- * @param   String  encoding  Target encoding
- * @return  String
- */
-function convertBody(buffer, headers) {
-	if (typeof convert !== 'function') {
-		throw new Error('The package `encoding` must be installed to use the textConverted() function');
-	}
-
-	const ct = headers.get('content-type');
-	let charset = 'utf-8';
-	let res, str;
-
-	// header
-	if (ct) {
-		res = /charset=([^;]*)/i.exec(ct);
-	}
-
-	// no charset in content type, peek at response body for at most 1024 bytes
-	str = buffer.slice(0, 1024).toString();
-
-	// html5
-	if (!res && str) {
-		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// html4
-	if (!res && str) {
-		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
-
-		if (res) {
-			res = /charset=(.*)/i.exec(res.pop());
-		}
-	}
-
-	// xml
-	if (!res && str) {
-		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// found charset
-	if (res) {
-		charset = res.pop();
-
-		// prevent decode issues when sites use incorrect encoding
-		// ref: https://hsivonen.fi/encoding-menu/
-		if (charset === 'gb2312' || charset === 'gbk') {
-			charset = 'gb18030';
-		}
-	}
-
-	// turn raw buffers into a single utf-8 buffer
-	return convert(buffer, 'UTF-8', charset).toString();
-}
-
-/**
- * Detect a URLSearchParams object
- * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
- *
- * @param   Object  obj     Object to detect by type or brand
- * @return  String
- */
-function isURLSearchParams(obj) {
-	// Duck-typing as a necessary condition.
-	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
-		return false;
-	}
-
-	// Brand-checking and more duck-typing as optional condition.
-	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
-}
-
-/**
- * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
- * @param  {*} obj
- * @return {boolean}
- */
-function isBlob(obj) {
-	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
-}
-
-/**
- * Clone body given Res/Req instance
- *
- * @param   Mixed  instance  Response or Request instance
- * @return  Mixed
- */
-function clone(instance) {
-	let p1, p2;
-	let body = instance.body;
-
-	// don't allow cloning a used body
-	if (instance.bodyUsed) {
-		throw new Error('cannot clone body after it is used');
-	}
-
-	// check that body is a stream and not form-data object
-	// note: we can't clone the form-data object without having it as a dependency
-	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
-		// tee instance body
-		p1 = new PassThrough();
-		p2 = new PassThrough();
-		body.pipe(p1);
-		body.pipe(p2);
-		// set instance body to teed body and return the other teed body
-		instance[INTERNALS].body = p1;
-		body = p2;
-	}
-
-	return body;
-}
-
-/**
- * Performs the operation "extract a `Content-Type` value from |object|" as
- * specified in the specification:
- * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
- *
- * This function assumes that instance.body is present.
- *
- * @param   Mixed  instance  Response or Request instance
- */
-function extractContentType(body) {
-	// istanbul ignore if: Currently, because of a guard in Request, body
-	// can never be null. Included here for completeness.
-	if (body === null) {
-		// body is null
-		return null;
-	} else if (typeof body === 'string') {
-		// body is string
-		return 'text/plain;charset=UTF-8';
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		return 'application/x-www-form-urlencoded;charset=UTF-8';
-	} else if (isBlob(body)) {
-		// body is blob
-		return body.type || null;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return null;
-	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		return null;
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		return null;
-	} else if (typeof body.getBoundary === 'function') {
-		// detect form data input from form-data module
-		return `multipart/form-data;boundary=${body.getBoundary()}`;
-	} else if (body instanceof Stream) {
-		// body is stream
-		// can't really do much about this
-		return null;
-	} else {
-		// Body constructor defaults other things to string
-		return 'text/plain;charset=UTF-8';
-	}
-}
-
-/**
- * The Fetch Standard treats this as if "total bytes" is a property on the body.
- * For us, we have to explicitly get it with a function.
- *
- * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
- *
- * @param   Body    instance   Instance of Body
- * @return  Number?            Number of bytes, or null if not possible
- */
-function getTotalBytes(instance) {
-	const body = instance.body;
-
-	// istanbul ignore if: included for completion
-
-	if (body === null) {
-		// body is null
-		return 0;
-	} else if (isBlob(body)) {
-		return body.size;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return body.length;
-	} else if (body && typeof body.getLengthSync === 'function') {
-		// detect form data input from form-data module
-		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
-		body.hasKnownLength && body.hasKnownLength()) {
-			// 2.x
-			return body.getLengthSync();
-		}
-		return null;
-	} else {
-		// body is stream
-		return instance.size || null;
-	}
-}
-
-/**
- * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
- *
- * @param   Body    instance   Instance of Body
- * @return  Void
- */
-function writeToStream(dest, instance) {
-	const body = instance.body;
-
-
-	if (body === null) {
-		// body is null
-		dest.end();
-	} else if (isBlob(body)) {
-		body.stream().pipe(dest);
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		dest.write(body);
-		dest.end();
-	} else {
-		// body is stream
-		body.pipe(dest);
-	}
-}
-
-// expose Promise
-Body.Promise = global.Promise;
-
-/**
- * headers.js
- *
- * Headers class offers convenient helpers
- */
-
-const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
-const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
-
-function validateName(name) {
-	name = `${name}`;
-	if (invalidTokenRegex.test(name) || name === '') {
-		throw new TypeError(`${name} is not a legal HTTP header name`);
-	}
-}
-
-function validateValue(value) {
-	value = `${value}`;
-	if (invalidHeaderCharRegex.test(value)) {
-		throw new TypeError(`${value} is not a legal HTTP header value`);
-	}
-}
-
-/**
- * Find the key in the map object given a header name.
- *
- * Returns undefined if not found.
- *
- * @param   String  name  Header name
- * @return  String|Undefined
- */
-function find(map, name) {
-	name = name.toLowerCase();
-	for (const key in map) {
-		if (key.toLowerCase() === name) {
-			return key;
-		}
-	}
-	return undefined;
-}
-
-const MAP = Symbol('map');
-class Headers {
-	/**
-  * Headers class
-  *
-  * @param   Object  headers  Response headers
-  * @return  Void
-  */
-	constructor() {
-		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-
-		this[MAP] = Object.create(null);
-
-		if (init instanceof Headers) {
-			const rawHeaders = init.raw();
-			const headerNames = Object.keys(rawHeaders);
-
-			for (const headerName of headerNames) {
-				for (const value of rawHeaders[headerName]) {
-					this.append(headerName, value);
-				}
-			}
-
-			return;
-		}
-
-		// We don't worry about converting prop to ByteString here as append()
-		// will handle it.
-		if (init == null) ; else if (typeof init === 'object') {
-			const method = init[Symbol.iterator];
-			if (method != null) {
-				if (typeof method !== 'function') {
-					throw new TypeError('Header pairs must be iterable');
-				}
-
-				// sequence<sequence<ByteString>>
-				// Note: per spec we have to first exhaust the lists then process them
-				const pairs = [];
-				for (const pair of init) {
-					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
-						throw new TypeError('Each header pair must be iterable');
-					}
-					pairs.push(Array.from(pair));
-				}
-
-				for (const pair of pairs) {
-					if (pair.length !== 2) {
-						throw new TypeError('Each header pair must be a name/value tuple');
-					}
-					this.append(pair[0], pair[1]);
-				}
-			} else {
-				// record<ByteString, ByteString>
-				for (const key of Object.keys(init)) {
-					const value = init[key];
-					this.append(key, value);
-				}
-			}
-		} else {
-			throw new TypeError('Provided initializer must be an object');
-		}
-	}
-
-	/**
-  * Return combined header value given name
-  *
-  * @param   String  name  Header name
-  * @return  Mixed
-  */
-	get(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key === undefined) {
-			return null;
-		}
-
-		return this[MAP][key].join(', ');
-	}
-
-	/**
-  * Iterate over all headers
-  *
-  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
-  * @param   Boolean   thisArg   `this` context for callback function
-  * @return  Void
-  */
-	forEach(callback) {
-		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
-
-		let pairs = getHeaders(this);
-		let i = 0;
-		while (i < pairs.length) {
-			var _pairs$i = pairs[i];
-			const name = _pairs$i[0],
-			      value = _pairs$i[1];
-
-			callback.call(thisArg, value, name, this);
-			pairs = getHeaders(this);
-			i++;
-		}
-	}
-
-	/**
-  * Overwrite header values given name
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	set(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		this[MAP][key !== undefined ? key : name] = [value];
-	}
-
-	/**
-  * Append a value onto existing header
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	append(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			this[MAP][key].push(value);
-		} else {
-			this[MAP][name] = [value];
-		}
-	}
-
-	/**
-  * Check for header name existence
-  *
-  * @param   String   name  Header name
-  * @return  Boolean
-  */
-	has(name) {
-		name = `${name}`;
-		validateName(name);
-		return find(this[MAP], name) !== undefined;
-	}
-
-	/**
-  * Delete all header values given name
-  *
-  * @param   String  name  Header name
-  * @return  Void
-  */
-	delete(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			delete this[MAP][key];
-		}
-	}
-
-	/**
-  * Return raw headers (non-spec api)
-  *
-  * @return  Object
-  */
-	raw() {
-		return this[MAP];
-	}
-
-	/**
-  * Get an iterator on keys.
-  *
-  * @return  Iterator
-  */
-	keys() {
-		return createHeadersIterator(this, 'key');
-	}
-
-	/**
-  * Get an iterator on values.
-  *
-  * @return  Iterator
-  */
-	values() {
-		return createHeadersIterator(this, 'value');
-	}
-
-	/**
-  * Get an iterator on entries.
-  *
-  * This is the default iterator of the Headers object.
-  *
-  * @return  Iterator
-  */
-	[Symbol.iterator]() {
-		return createHeadersIterator(this, 'key+value');
-	}
-}
-Headers.prototype.entries = Headers.prototype[Symbol.iterator];
-
-Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
-	value: 'Headers',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Headers.prototype, {
-	get: { enumerable: true },
-	forEach: { enumerable: true },
-	set: { enumerable: true },
-	append: { enumerable: true },
-	has: { enumerable: true },
-	delete: { enumerable: true },
-	keys: { enumerable: true },
-	values: { enumerable: true },
-	entries: { enumerable: true }
-});
-
-function getHeaders(headers) {
-	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
-
-	const keys = Object.keys(headers[MAP]).sort();
-	return keys.map(kind === 'key' ? function (k) {
-		return k.toLowerCase();
-	} : kind === 'value' ? function (k) {
-		return headers[MAP][k].join(', ');
-	} : function (k) {
-		return [k.toLowerCase(), headers[MAP][k].join(', ')];
-	});
-}
-
-const INTERNAL = Symbol('internal');
-
-function createHeadersIterator(target, kind) {
-	const iterator = Object.create(HeadersIteratorPrototype);
-	iterator[INTERNAL] = {
-		target,
-		kind,
-		index: 0
-	};
-	return iterator;
-}
-
-const HeadersIteratorPrototype = Object.setPrototypeOf({
-	next() {
-		// istanbul ignore if
-		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
-			throw new TypeError('Value of `this` is not a HeadersIterator');
-		}
-
-		var _INTERNAL = this[INTERNAL];
-		const target = _INTERNAL.target,
-		      kind = _INTERNAL.kind,
-		      index = _INTERNAL.index;
-
-		const values = getHeaders(target, kind);
-		const len = values.length;
-		if (index >= len) {
-			return {
-				value: undefined,
-				done: true
-			};
-		}
-
-		this[INTERNAL].index = index + 1;
-
-		return {
-			value: values[index],
-			done: false
-		};
-	}
-}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
-
-Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
-	value: 'HeadersIterator',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * Export the Headers object in a form that Node.js can consume.
- *
- * @param   Headers  headers
- * @return  Object
- */
-function exportNodeCompatibleHeaders(headers) {
-	const obj = Object.assign({ __proto__: null }, headers[MAP]);
-
-	// http.request() only supports string as Host header. This hack makes
-	// specifying custom Host header possible.
-	const hostHeaderKey = find(headers[MAP], 'Host');
-	if (hostHeaderKey !== undefined) {
-		obj[hostHeaderKey] = obj[hostHeaderKey][0];
-	}
-
-	return obj;
-}
-
-/**
- * Create a Headers object from an object of headers, ignoring those that do
- * not conform to HTTP grammar productions.
- *
- * @param   Object  obj  Object of headers
- * @return  Headers
- */
-function createHeadersLenient(obj) {
-	const headers = new Headers();
-	for (const name of Object.keys(obj)) {
-		if (invalidTokenRegex.test(name)) {
-			continue;
-		}
-		if (Array.isArray(obj[name])) {
-			for (const val of obj[name]) {
-				if (invalidHeaderCharRegex.test(val)) {
-					continue;
-				}
-				if (headers[MAP][name] === undefined) {
-					headers[MAP][name] = [val];
-				} else {
-					headers[MAP][name].push(val);
-				}
-			}
-		} else if (!invalidHeaderCharRegex.test(obj[name])) {
-			headers[MAP][name] = [obj[name]];
-		}
-	}
-	return headers;
-}
-
-const INTERNALS$1 = Symbol('Response internals');
-
-// fix an issue where "STATUS_CODES" aren't a named export for node <10
-const STATUS_CODES = http.STATUS_CODES;
-
-/**
- * Response class
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-class Response {
-	constructor() {
-		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		Body.call(this, body, opts);
-
-		const status = opts.status || 200;
-		const headers = new Headers(opts.headers);
-
-		if (body != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(body);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		this[INTERNALS$1] = {
-			url: opts.url,
-			status,
-			statusText: opts.statusText || STATUS_CODES[status],
-			headers,
-			counter: opts.counter
-		};
-	}
-
-	get url() {
-		return this[INTERNALS$1].url;
-	}
-
-	get status() {
-		return this[INTERNALS$1].status;
-	}
-
-	/**
-  * Convenience property representing if the request ended normally
-  */
-	get ok() {
-		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
-	}
-
-	get redirected() {
-		return this[INTERNALS$1].counter > 0;
-	}
-
-	get statusText() {
-		return this[INTERNALS$1].statusText;
-	}
-
-	get headers() {
-		return this[INTERNALS$1].headers;
-	}
-
-	/**
-  * Clone this response
-  *
-  * @return  Response
-  */
-	clone() {
-		return new Response(clone(this), {
-			url: this.url,
-			status: this.status,
-			statusText: this.statusText,
-			headers: this.headers,
-			ok: this.ok,
-			redirected: this.redirected
-		});
-	}
-}
-
-Body.mixIn(Response.prototype);
-
-Object.defineProperties(Response.prototype, {
-	url: { enumerable: true },
-	status: { enumerable: true },
-	ok: { enumerable: true },
-	redirected: { enumerable: true },
-	statusText: { enumerable: true },
-	headers: { enumerable: true },
-	clone: { enumerable: true }
-});
-
-Object.defineProperty(Response.prototype, Symbol.toStringTag, {
-	value: 'Response',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-const INTERNALS$2 = Symbol('Request internals');
-
-// fix an issue where "format", "parse" aren't a named export for node <10
-const parse_url = Url.parse;
-const format_url = Url.format;
-
-const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
-
-/**
- * Check if a value is an instance of Request.
- *
- * @param   Mixed   input
- * @return  Boolean
- */
-function isRequest(input) {
-	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
-}
-
-function isAbortSignal(signal) {
-	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
-	return !!(proto && proto.constructor.name === 'AbortSignal');
-}
-
-/**
- * Request class
- *
- * @param   Mixed   input  Url or Request instance
- * @param   Object  init   Custom options
- * @return  Void
- */
-class Request {
-	constructor(input) {
-		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		let parsedURL;
-
-		// normalize input
-		if (!isRequest(input)) {
-			if (input && input.href) {
-				// in order to support Node.js' Url objects; though WHATWG's URL objects
-				// will fall into this branch also (since their `toString()` will return
-				// `href` property anyway)
-				parsedURL = parse_url(input.href);
-			} else {
-				// coerce input to a string before attempting to parse
-				parsedURL = parse_url(`${input}`);
-			}
-			input = {};
-		} else {
-			parsedURL = parse_url(input.url);
-		}
-
-		let method = init.method || input.method || 'GET';
-		method = method.toUpperCase();
-
-		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
-			throw new TypeError('Request with GET/HEAD method cannot have body');
-		}
-
-		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
-
-		Body.call(this, inputBody, {
-			timeout: init.timeout || input.timeout || 0,
-			size: init.size || input.size || 0
-		});
-
-		const headers = new Headers(init.headers || input.headers || {});
-
-		if (inputBody != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(inputBody);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		let signal = isRequest(input) ? input.signal : null;
-		if ('signal' in init) signal = init.signal;
-
-		if (signal != null && !isAbortSignal(signal)) {
-			throw new TypeError('Expected signal to be an instanceof AbortSignal');
-		}
-
-		this[INTERNALS$2] = {
-			method,
-			redirect: init.redirect || input.redirect || 'follow',
-			headers,
-			parsedURL,
-			signal
-		};
-
-		// node-fetch-only options
-		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
-		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
-		this.counter = init.counter || input.counter || 0;
-		this.agent = init.agent || input.agent;
-	}
-
-	get method() {
-		return this[INTERNALS$2].method;
-	}
-
-	get url() {
-		return format_url(this[INTERNALS$2].parsedURL);
-	}
-
-	get headers() {
-		return this[INTERNALS$2].headers;
-	}
-
-	get redirect() {
-		return this[INTERNALS$2].redirect;
-	}
-
-	get signal() {
-		return this[INTERNALS$2].signal;
-	}
-
-	/**
-  * Clone this request
-  *
-  * @return  Request
-  */
-	clone() {
-		return new Request(this);
-	}
-}
-
-Body.mixIn(Request.prototype);
-
-Object.defineProperty(Request.prototype, Symbol.toStringTag, {
-	value: 'Request',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Request.prototype, {
-	method: { enumerable: true },
-	url: { enumerable: true },
-	headers: { enumerable: true },
-	redirect: { enumerable: true },
-	clone: { enumerable: true },
-	signal: { enumerable: true }
-});
-
-/**
- * Convert a Request to Node.js http request options.
- *
- * @param   Request  A Request instance
- * @return  Object   The options object to be passed to http.request
- */
-function getNodeRequestOptions(request) {
-	const parsedURL = request[INTERNALS$2].parsedURL;
-	const headers = new Headers(request[INTERNALS$2].headers);
-
-	// fetch step 1.3
-	if (!headers.has('Accept')) {
-		headers.set('Accept', '*/*');
-	}
-
-	// Basic fetch
-	if (!parsedURL.protocol || !parsedURL.hostname) {
-		throw new TypeError('Only absolute URLs are supported');
-	}
-
-	if (!/^https?:$/.test(parsedURL.protocol)) {
-		throw new TypeError('Only HTTP(S) protocols are supported');
-	}
-
-	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
-		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
-	}
-
-	// HTTP-network-or-cache fetch steps 2.4-2.7
-	let contentLengthValue = null;
-	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
-		contentLengthValue = '0';
-	}
-	if (request.body != null) {
-		const totalBytes = getTotalBytes(request);
-		if (typeof totalBytes === 'number') {
-			contentLengthValue = String(totalBytes);
-		}
-	}
-	if (contentLengthValue) {
-		headers.set('Content-Length', contentLengthValue);
-	}
-
-	// HTTP-network-or-cache fetch step 2.11
-	if (!headers.has('User-Agent')) {
-		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
-	}
-
-	// HTTP-network-or-cache fetch step 2.15
-	if (request.compress && !headers.has('Accept-Encoding')) {
-		headers.set('Accept-Encoding', 'gzip,deflate');
-	}
-
-	if (!headers.has('Connection') && !request.agent) {
-		headers.set('Connection', 'close');
-	}
-
-	// HTTP-network fetch step 4.2
-	// chunked encoding is handled by Node.js
-
-	return Object.assign({}, parsedURL, {
-		method: request.method,
-		headers: exportNodeCompatibleHeaders(headers),
-		agent: request.agent
-	});
-}
-
-/**
- * abort-error.js
- *
- * AbortError interface for cancelled requests
- */
-
-/**
- * Create AbortError instance
- *
- * @param   String      message      Error message for human
- * @return  AbortError
- */
-function AbortError(message) {
-  Error.call(this, message);
-
-  this.type = 'aborted';
-  this.message = message;
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-AbortError.prototype = Object.create(Error.prototype);
-AbortError.prototype.constructor = AbortError;
-AbortError.prototype.name = 'AbortError';
-
-// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
-const PassThrough$1 = Stream.PassThrough;
-const resolve_url = Url.resolve;
-
-/**
- * Fetch function
- *
- * @param   Mixed    url   Absolute url or Request instance
- * @param   Object   opts  Fetch options
- * @return  Promise
- */
-function fetch(url, opts) {
-
-	// allow custom promise
-	if (!fetch.Promise) {
-		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
-	}
-
-	Body.Promise = fetch.Promise;
-
-	// wrap http.request into fetch
-	return new fetch.Promise(function (resolve, reject) {
-		// build request object
-		const request = new Request(url, opts);
-		const options = getNodeRequestOptions(request);
-
-		const send = (options.protocol === 'https:' ? https : http).request;
-		const signal = request.signal;
-
-		let response = null;
-
-		const abort = function abort() {
-			let error = new AbortError('The user aborted a request.');
-			reject(error);
-			if (request.body && request.body instanceof Stream.Readable) {
-				request.body.destroy(error);
-			}
-			if (!response || !response.body) return;
-			response.body.emit('error', error);
-		};
-
-		if (signal && signal.aborted) {
-			abort();
-			return;
-		}
-
-		const abortAndFinalize = function abortAndFinalize() {
-			abort();
-			finalize();
-		};
-
-		// send request
-		const req = send(options);
-		let reqTimeout;
-
-		if (signal) {
-			signal.addEventListener('abort', abortAndFinalize);
-		}
-
-		function finalize() {
-			req.abort();
-			if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			clearTimeout(reqTimeout);
-		}
-
-		if (request.timeout) {
-			req.once('socket', function (socket) {
-				reqTimeout = setTimeout(function () {
-					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
-					finalize();
-				}, request.timeout);
-			});
-		}
-
-		req.on('error', function (err) {
-			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
-			finalize();
-		});
-
-		req.on('response', function (res) {
-			clearTimeout(reqTimeout);
-
-			const headers = createHeadersLenient(res.headers);
-
-			// HTTP fetch step 5
-			if (fetch.isRedirect(res.statusCode)) {
-				// HTTP fetch step 5.2
-				const location = headers.get('Location');
-
-				// HTTP fetch step 5.3
-				const locationURL = location === null ? null : resolve_url(request.url, location);
-
-				// HTTP fetch step 5.5
-				switch (request.redirect) {
-					case 'error':
-						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
-						finalize();
-						return;
-					case 'manual':
-						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
-						if (locationURL !== null) {
-							// handle corrupted header
-							try {
-								headers.set('Location', locationURL);
-							} catch (err) {
-								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
-								reject(err);
-							}
-						}
-						break;
-					case 'follow':
-						// HTTP-redirect fetch step 2
-						if (locationURL === null) {
-							break;
-						}
-
-						// HTTP-redirect fetch step 5
-						if (request.counter >= request.follow) {
-							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 6 (counter increment)
-						// Create a new Request object.
-						const requestOpts = {
-							headers: new Headers(request.headers),
-							follow: request.follow,
-							counter: request.counter + 1,
-							agent: request.agent,
-							compress: request.compress,
-							method: request.method,
-							body: request.body,
-							signal: request.signal,
-							timeout: request.timeout
-						};
-
-						// HTTP-redirect fetch step 9
-						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
-							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 11
-						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
-							requestOpts.method = 'GET';
-							requestOpts.body = undefined;
-							requestOpts.headers.delete('content-length');
-						}
-
-						// HTTP-redirect fetch step 15
-						resolve(fetch(new Request(locationURL, requestOpts)));
-						finalize();
-						return;
-				}
-			}
-
-			// prepare response
-			res.once('end', function () {
-				if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			});
-			let body = res.pipe(new PassThrough$1());
-
-			const response_options = {
-				url: request.url,
-				status: res.statusCode,
-				statusText: res.statusMessage,
-				headers: headers,
-				size: request.size,
-				timeout: request.timeout,
-				counter: request.counter
-			};
-
-			// HTTP-network fetch step 12.1.1.3
-			const codings = headers.get('Content-Encoding');
-
-			// HTTP-network fetch step 12.1.1.4: handle content codings
-
-			// in following scenarios we ignore compression support
-			// 1. compression support is disabled
-			// 2. HEAD request
-			// 3. no Content-Encoding header
-			// 4. no content response (204)
-			// 5. content not modified response (304)
-			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// For Node v6+
-			// Be less strict when decoding compressed responses, since sometimes
-			// servers send slightly invalid responses that are still accepted
-			// by common browsers.
-			// Always using Z_SYNC_FLUSH is what cURL does.
-			const zlibOptions = {
-				flush: zlib.Z_SYNC_FLUSH,
-				finishFlush: zlib.Z_SYNC_FLUSH
-			};
-
-			// for gzip
-			if (codings == 'gzip' || codings == 'x-gzip') {
-				body = body.pipe(zlib.createGunzip(zlibOptions));
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// for deflate
-			if (codings == 'deflate' || codings == 'x-deflate') {
-				// handle the infamous raw deflate response from old servers
-				// a hack for old IIS and Apache servers
-				const raw = res.pipe(new PassThrough$1());
-				raw.once('data', function (chunk) {
-					// see http://stackoverflow.com/questions/37519828
-					if ((chunk[0] & 0x0F) === 0x08) {
-						body = body.pipe(zlib.createInflate());
-					} else {
-						body = body.pipe(zlib.createInflateRaw());
-					}
-					response = new Response(body, response_options);
-					resolve(response);
-				});
-				return;
-			}
-
-			// for br
-			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
-				body = body.pipe(zlib.createBrotliDecompress());
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// otherwise, use response as-is
-			response = new Response(body, response_options);
-			resolve(response);
-		});
-
-		writeToStream(req, request);
-	});
-}
-/**
- * Redirect code matching
- *
- * @param   Number   code  Status code
- * @return  Boolean
- */
-fetch.isRedirect = function (code) {
-	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
-};
-
-// expose Promise
-fetch.Promise = global.Promise;
-
-export default fetch;
-export { Headers, Request, Response, FetchError };
diff --git a/scripts/metrics/node_modules/node-fetch/package.json b/scripts/metrics/node_modules/node-fetch/package.json
deleted file mode 100644
index e93129c801f..00000000000
--- a/scripts/metrics/node_modules/node-fetch/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "_from": "node-fetch",
-  "_id": "node-fetch@2.5.0",
-  "_inBundle": false,
-  "_integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw==",
-  "_location": "/node-fetch",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "node-fetch",
-    "name": "node-fetch",
-    "escapedName": "node-fetch",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz",
-  "_shasum": "8028c49fc1191bba56a07adc6e2a954644a48501",
-  "_spec": "node-fetch",
-  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics",
-  "author": {
-    "name": "David Frank"
-  },
-  "browser": "./browser.js",
-  "bugs": {
-    "url": "https://github.com/bitinn/node-fetch/issues"
-  },
-  "bundleDependencies": false,
-  "dependencies": {},
-  "deprecated": false,
-  "description": "A light-weight module that brings window.fetch to node.js",
-  "devDependencies": {
-    "@ungap/url-search-params": "^0.1.2",
-    "abort-controller": "^1.1.0",
-    "abortcontroller-polyfill": "^1.3.0",
-    "babel-core": "^6.26.3",
-    "babel-plugin-istanbul": "^4.1.6",
-    "babel-preset-env": "^1.6.1",
-    "babel-register": "^6.16.3",
-    "chai": "^3.5.0",
-    "chai-as-promised": "^7.1.1",
-    "chai-iterator": "^1.1.1",
-    "chai-string": "~1.3.0",
-    "codecov": "^3.3.0",
-    "cross-env": "^5.2.0",
-    "form-data": "^2.3.3",
-    "is-builtin-module": "^1.0.0",
-    "mocha": "^5.0.0",
-    "nyc": "11.9.0",
-    "parted": "^0.1.1",
-    "promise": "^8.0.3",
-    "resumer": "0.0.0",
-    "rollup": "^0.63.4",
-    "rollup-plugin-babel": "^3.0.7",
-    "string-to-arraybuffer": "^1.0.2",
-    "whatwg-url": "^5.0.0"
-  },
-  "engines": {
-    "node": "4.x || >=6.0.0"
-  },
-  "files": [
-    "lib/index.js",
-    "lib/index.mjs",
-    "lib/index.es.js",
-    "browser.js"
-  ],
-  "homepage": "https://github.com/bitinn/node-fetch",
-  "keywords": [
-    "fetch",
-    "http",
-    "promise"
-  ],
-  "license": "MIT",
-  "main": "lib/index",
-  "module": "lib/index.mjs",
-  "name": "node-fetch",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bitinn/node-fetch.git"
-  },
-  "scripts": {
-    "build": "cross-env BABEL_ENV=rollup rollup -c",
-    "coverage": "cross-env BABEL_ENV=coverage nyc --reporter json --reporter text mocha -R spec test/test.js && codecov -f coverage/coverage-final.json",
-    "prepare": "npm run build",
-    "report": "cross-env BABEL_ENV=coverage nyc --reporter lcov --reporter text mocha -R spec test/test.js",
-    "test": "cross-env BABEL_ENV=test mocha --require babel-register --throw-deprecation test/test.js"
-  },
-  "version": "2.5.0"
-}
diff --git a/scripts/metrics/node_modules/sax/LICENSE b/scripts/metrics/node_modules/sax/LICENSE
deleted file mode 100644
index ccffa082c99..00000000000
--- a/scripts/metrics/node_modules/sax/LICENSE
+++ /dev/null
@@ -1,41 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-====
-
-`String.fromCodePoint` by Mathias Bynens used according to terms of MIT
-License, as follows:
-
-    Copyright Mathias Bynens <https://mathiasbynens.be/>
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/sax/README.md b/scripts/metrics/node_modules/sax/README.md
deleted file mode 100644
index afcd3f3dd65..00000000000
--- a/scripts/metrics/node_modules/sax/README.md
+++ /dev/null
@@ -1,225 +0,0 @@
-# sax js
-
-A sax-style parser for XML and HTML.
-
-Designed with [node](http://nodejs.org/) in mind, but should work fine in
-the browser or other CommonJS implementations.
-
-## What This Is
-
-* A very simple tool to parse through an XML string.
-* A stepping stone to a streaming HTML parser.
-* A handy way to deal with RSS and other mostly-ok-but-kinda-broken XML
-  docs.
-
-## What This Is (probably) Not
-
-* An HTML Parser - That's a fine goal, but this isn't it.  It's just
-  XML.
-* A DOM Builder - You can use it to build an object model out of XML,
-  but it doesn't do that out of the box.
-* XSLT - No DOM = no querying.
-* 100% Compliant with (some other SAX implementation) - Most SAX
-  implementations are in Java and do a lot more than this does.
-* An XML Validator - It does a little validation when in strict mode, but
-  not much.
-* A Schema-Aware XSD Thing - Schemas are an exercise in fetishistic
-  masochism.
-* A DTD-aware Thing - Fetching DTDs is a much bigger job.
-
-## Regarding `<!DOCTYPE`s and `<!ENTITY`s
-
-The parser will handle the basic XML entities in text nodes and attribute
-values: `&amp; &lt; &gt; &apos; &quot;`. It's possible to define additional
-entities in XML by putting them in the DTD. This parser doesn't do anything
-with that. If you want to listen to the `ondoctype` event, and then fetch
-the doctypes, and read the entities and add them to `parser.ENTITIES`, then
-be my guest.
-
-Unknown entities will fail in strict mode, and in loose mode, will pass
-through unmolested.
-
-## Usage
-
-```javascript
-var sax = require("./lib/sax"),
-  strict = true, // set to false for html-mode
-  parser = sax.parser(strict);
-
-parser.onerror = function (e) {
-  // an error happened.
-};
-parser.ontext = function (t) {
-  // got some text.  t is the string of text.
-};
-parser.onopentag = function (node) {
-  // opened a tag.  node has "name" and "attributes"
-};
-parser.onattribute = function (attr) {
-  // an attribute.  attr has "name" and "value"
-};
-parser.onend = function () {
-  // parser stream is done, and ready to have more stuff written to it.
-};
-
-parser.write('<xml>Hello, <who name="world">world</who>!</xml>').close();
-
-// stream usage
-// takes the same options as the parser
-var saxStream = require("sax").createStream(strict, options)
-saxStream.on("error", function (e) {
-  // unhandled errors will throw, since this is a proper node
-  // event emitter.
-  console.error("error!", e)
-  // clear the error
-  this._parser.error = null
-  this._parser.resume()
-})
-saxStream.on("opentag", function (node) {
-  // same object as above
-})
-// pipe is supported, and it's readable/writable
-// same chunks coming in also go out.
-fs.createReadStream("file.xml")
-  .pipe(saxStream)
-  .pipe(fs.createWriteStream("file-copy.xml"))
-```
-
-
-## Arguments
-
-Pass the following arguments to the parser function.  All are optional.
-
-`strict` - Boolean. Whether or not to be a jerk. Default: `false`.
-
-`opt` - Object bag of settings regarding string formatting.  All default to `false`.
-
-Settings supported:
-
-* `trim` - Boolean. Whether or not to trim text and comment nodes.
-* `normalize` - Boolean. If true, then turn any whitespace into a single
-  space.
-* `lowercase` - Boolean. If true, then lowercase tag names and attribute names
-  in loose mode, rather than uppercasing them.
-* `xmlns` - Boolean. If true, then namespaces are supported.
-* `position` - Boolean. If false, then don't track line/col/position.
-* `strictEntities` - Boolean. If true, only parse [predefined XML
-  entities](http://www.w3.org/TR/REC-xml/#sec-predefined-ent)
-  (`&amp;`, `&apos;`, `&gt;`, `&lt;`, and `&quot;`)
-
-## Methods
-
-`write` - Write bytes onto the stream. You don't have to do this all at
-once. You can keep writing as much as you want.
-
-`close` - Close the stream. Once closed, no more data may be written until
-it is done processing the buffer, which is signaled by the `end` event.
-
-`resume` - To gracefully handle errors, assign a listener to the `error`
-event. Then, when the error is taken care of, you can call `resume` to
-continue parsing. Otherwise, the parser will not continue while in an error
-state.
-
-## Members
-
-At all times, the parser object will have the following members:
-
-`line`, `column`, `position` - Indications of the position in the XML
-document where the parser currently is looking.
-
-`startTagPosition` - Indicates the position where the current tag starts.
-
-`closed` - Boolean indicating whether or not the parser can be written to.
-If it's `true`, then wait for the `ready` event to write again.
-
-`strict` - Boolean indicating whether or not the parser is a jerk.
-
-`opt` - Any options passed into the constructor.
-
-`tag` - The current tag being dealt with.
-
-And a bunch of other stuff that you probably shouldn't touch.
-
-## Events
-
-All events emit with a single argument. To listen to an event, assign a
-function to `on<eventname>`. Functions get executed in the this-context of
-the parser object. The list of supported events are also in the exported
-`EVENTS` array.
-
-When using the stream interface, assign handlers using the EventEmitter
-`on` function in the normal fashion.
-
-`error` - Indication that something bad happened. The error will be hanging
-out on `parser.error`, and must be deleted before parsing can continue. By
-listening to this event, you can keep an eye on that kind of stuff. Note:
-this happens *much* more in strict mode. Argument: instance of `Error`.
-
-`text` - Text node. Argument: string of text.
-
-`doctype` - The `<!DOCTYPE` declaration. Argument: doctype string.
-
-`processinginstruction` - Stuff like `<?xml foo="blerg" ?>`. Argument:
-object with `name` and `body` members. Attributes are not parsed, as
-processing instructions have implementation dependent semantics.
-
-`sgmldeclaration` - Random SGML declarations. Stuff like `<!ENTITY p>`
-would trigger this kind of event. This is a weird thing to support, so it
-might go away at some point. SAX isn't intended to be used to parse SGML,
-after all.
-
-`opentagstart` - Emitted immediately when the tag name is available,
-but before any attributes are encountered.  Argument: object with a
-`name` field and an empty `attributes` set.  Note that this is the
-same object that will later be emitted in the `opentag` event.
-
-`opentag` - An opening tag. Argument: object with `name` and `attributes`.
-In non-strict mode, tag names are uppercased, unless the `lowercase`
-option is set.  If the `xmlns` option is set, then it will contain
-namespace binding information on the `ns` member, and will have a
-`local`, `prefix`, and `uri` member.
-
-`closetag` - A closing tag. In loose mode, tags are auto-closed if their
-parent closes. In strict mode, well-formedness is enforced. Note that
-self-closing tags will have `closeTag` emitted immediately after `openTag`.
-Argument: tag name.
-
-`attribute` - An attribute node.  Argument: object with `name` and `value`.
-In non-strict mode, attribute names are uppercased, unless the `lowercase`
-option is set.  If the `xmlns` option is set, it will also contains namespace
-information.
-
-`comment` - A comment node.  Argument: the string of the comment.
-
-`opencdata` - The opening tag of a `<![CDATA[` block.
-
-`cdata` - The text of a `<![CDATA[` block. Since `<![CDATA[` blocks can get
-quite large, this event may fire multiple times for a single block, if it
-is broken up into multiple `write()`s. Argument: the string of random
-character data.
-
-`closecdata` - The closing tag (`]]>`) of a `<![CDATA[` block.
-
-`opennamespace` - If the `xmlns` option is set, then this event will
-signal the start of a new namespace binding.
-
-`closenamespace` - If the `xmlns` option is set, then this event will
-signal the end of a namespace binding.
-
-`end` - Indication that the closed stream has ended.
-
-`ready` - Indication that the stream has reset, and is ready to be written
-to.
-
-`noscript` - In non-strict mode, `<script>` tags trigger a `"script"`
-event, and their contents are not checked for special xml characters.
-If you pass `noscript: true`, then this behavior is suppressed.
-
-## Reporting Problems
-
-It's best to write a failing test if you find an issue.  I will always
-accept pull requests with failing tests if they demonstrate intended
-behavior, but it is very hard to figure out what issue you're describing
-without a test.  Writing a test is also the best way for you yourself
-to figure out if you really understand the issue you think you have with
-sax-js.
diff --git a/scripts/metrics/node_modules/sax/lib/sax.js b/scripts/metrics/node_modules/sax/lib/sax.js
deleted file mode 100644
index 795d607ef63..00000000000
--- a/scripts/metrics/node_modules/sax/lib/sax.js
+++ /dev/null
@@ -1,1565 +0,0 @@
-;(function (sax) { // wrapper for non-node envs
-  sax.parser = function (strict, opt) { return new SAXParser(strict, opt) }
-  sax.SAXParser = SAXParser
-  sax.SAXStream = SAXStream
-  sax.createStream = createStream
-
-  // When we pass the MAX_BUFFER_LENGTH position, start checking for buffer overruns.
-  // When we check, schedule the next check for MAX_BUFFER_LENGTH - (max(buffer lengths)),
-  // since that's the earliest that a buffer overrun could occur.  This way, checks are
-  // as rare as required, but as often as necessary to ensure never crossing this bound.
-  // Furthermore, buffers are only tested at most once per write(), so passing a very
-  // large string into write() might have undesirable effects, but this is manageable by
-  // the caller, so it is assumed to be safe.  Thus, a call to write() may, in the extreme
-  // edge case, result in creating at most one complete copy of the string passed in.
-  // Set to Infinity to have unlimited buffers.
-  sax.MAX_BUFFER_LENGTH = 64 * 1024
-
-  var buffers = [
-    'comment', 'sgmlDecl', 'textNode', 'tagName', 'doctype',
-    'procInstName', 'procInstBody', 'entity', 'attribName',
-    'attribValue', 'cdata', 'script'
-  ]
-
-  sax.EVENTS = [
-    'text',
-    'processinginstruction',
-    'sgmldeclaration',
-    'doctype',
-    'comment',
-    'opentagstart',
-    'attribute',
-    'opentag',
-    'closetag',
-    'opencdata',
-    'cdata',
-    'closecdata',
-    'error',
-    'end',
-    'ready',
-    'script',
-    'opennamespace',
-    'closenamespace'
-  ]
-
-  function SAXParser (strict, opt) {
-    if (!(this instanceof SAXParser)) {
-      return new SAXParser(strict, opt)
-    }
-
-    var parser = this
-    clearBuffers(parser)
-    parser.q = parser.c = ''
-    parser.bufferCheckPosition = sax.MAX_BUFFER_LENGTH
-    parser.opt = opt || {}
-    parser.opt.lowercase = parser.opt.lowercase || parser.opt.lowercasetags
-    parser.looseCase = parser.opt.lowercase ? 'toLowerCase' : 'toUpperCase'
-    parser.tags = []
-    parser.closed = parser.closedRoot = parser.sawRoot = false
-    parser.tag = parser.error = null
-    parser.strict = !!strict
-    parser.noscript = !!(strict || parser.opt.noscript)
-    parser.state = S.BEGIN
-    parser.strictEntities = parser.opt.strictEntities
-    parser.ENTITIES = parser.strictEntities ? Object.create(sax.XML_ENTITIES) : Object.create(sax.ENTITIES)
-    parser.attribList = []
-
-    // namespaces form a prototype chain.
-    // it always points at the current tag,
-    // which protos to its parent tag.
-    if (parser.opt.xmlns) {
-      parser.ns = Object.create(rootNS)
-    }
-
-    // mostly just for error reporting
-    parser.trackPosition = parser.opt.position !== false
-    if (parser.trackPosition) {
-      parser.position = parser.line = parser.column = 0
-    }
-    emit(parser, 'onready')
-  }
-
-  if (!Object.create) {
-    Object.create = function (o) {
-      function F () {}
-      F.prototype = o
-      var newf = new F()
-      return newf
-    }
-  }
-
-  if (!Object.keys) {
-    Object.keys = function (o) {
-      var a = []
-      for (var i in o) if (o.hasOwnProperty(i)) a.push(i)
-      return a
-    }
-  }
-
-  function checkBufferLength (parser) {
-    var maxAllowed = Math.max(sax.MAX_BUFFER_LENGTH, 10)
-    var maxActual = 0
-    for (var i = 0, l = buffers.length; i < l; i++) {
-      var len = parser[buffers[i]].length
-      if (len > maxAllowed) {
-        // Text/cdata nodes can get big, and since they're buffered,
-        // we can get here under normal conditions.
-        // Avoid issues by emitting the text node now,
-        // so at least it won't get any bigger.
-        switch (buffers[i]) {
-          case 'textNode':
-            closeText(parser)
-            break
-
-          case 'cdata':
-            emitNode(parser, 'oncdata', parser.cdata)
-            parser.cdata = ''
-            break
-
-          case 'script':
-            emitNode(parser, 'onscript', parser.script)
-            parser.script = ''
-            break
-
-          default:
-            error(parser, 'Max buffer length exceeded: ' + buffers[i])
-        }
-      }
-      maxActual = Math.max(maxActual, len)
-    }
-    // schedule the next check for the earliest possible buffer overrun.
-    var m = sax.MAX_BUFFER_LENGTH - maxActual
-    parser.bufferCheckPosition = m + parser.position
-  }
-
-  function clearBuffers (parser) {
-    for (var i = 0, l = buffers.length; i < l; i++) {
-      parser[buffers[i]] = ''
-    }
-  }
-
-  function flushBuffers (parser) {
-    closeText(parser)
-    if (parser.cdata !== '') {
-      emitNode(parser, 'oncdata', parser.cdata)
-      parser.cdata = ''
-    }
-    if (parser.script !== '') {
-      emitNode(parser, 'onscript', parser.script)
-      parser.script = ''
-    }
-  }
-
-  SAXParser.prototype = {
-    end: function () { end(this) },
-    write: write,
-    resume: function () { this.error = null; return this },
-    close: function () { return this.write(null) },
-    flush: function () { flushBuffers(this) }
-  }
-
-  var Stream
-  try {
-    Stream = require('stream').Stream
-  } catch (ex) {
-    Stream = function () {}
-  }
-
-  var streamWraps = sax.EVENTS.filter(function (ev) {
-    return ev !== 'error' && ev !== 'end'
-  })
-
-  function createStream (strict, opt) {
-    return new SAXStream(strict, opt)
-  }
-
-  function SAXStream (strict, opt) {
-    if (!(this instanceof SAXStream)) {
-      return new SAXStream(strict, opt)
-    }
-
-    Stream.apply(this)
-
-    this._parser = new SAXParser(strict, opt)
-    this.writable = true
-    this.readable = true
-
-    var me = this
-
-    this._parser.onend = function () {
-      me.emit('end')
-    }
-
-    this._parser.onerror = function (er) {
-      me.emit('error', er)
-
-      // if didn't throw, then means error was handled.
-      // go ahead and clear error, so we can write again.
-      me._parser.error = null
-    }
-
-    this._decoder = null
-
-    streamWraps.forEach(function (ev) {
-      Object.defineProperty(me, 'on' + ev, {
-        get: function () {
-          return me._parser['on' + ev]
-        },
-        set: function (h) {
-          if (!h) {
-            me.removeAllListeners(ev)
-            me._parser['on' + ev] = h
-            return h
-          }
-          me.on(ev, h)
-        },
-        enumerable: true,
-        configurable: false
-      })
-    })
-  }
-
-  SAXStream.prototype = Object.create(Stream.prototype, {
-    constructor: {
-      value: SAXStream
-    }
-  })
-
-  SAXStream.prototype.write = function (data) {
-    if (typeof Buffer === 'function' &&
-      typeof Buffer.isBuffer === 'function' &&
-      Buffer.isBuffer(data)) {
-      if (!this._decoder) {
-        var SD = require('string_decoder').StringDecoder
-        this._decoder = new SD('utf8')
-      }
-      data = this._decoder.write(data)
-    }
-
-    this._parser.write(data.toString())
-    this.emit('data', data)
-    return true
-  }
-
-  SAXStream.prototype.end = function (chunk) {
-    if (chunk && chunk.length) {
-      this.write(chunk)
-    }
-    this._parser.end()
-    return true
-  }
-
-  SAXStream.prototype.on = function (ev, handler) {
-    var me = this
-    if (!me._parser['on' + ev] && streamWraps.indexOf(ev) !== -1) {
-      me._parser['on' + ev] = function () {
-        var args = arguments.length === 1 ? [arguments[0]] : Array.apply(null, arguments)
-        args.splice(0, 0, ev)
-        me.emit.apply(me, args)
-      }
-    }
-
-    return Stream.prototype.on.call(me, ev, handler)
-  }
-
-  // this really needs to be replaced with character classes.
-  // XML allows all manner of ridiculous numbers and digits.
-  var CDATA = '[CDATA['
-  var DOCTYPE = 'DOCTYPE'
-  var XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace'
-  var XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/'
-  var rootNS = { xml: XML_NAMESPACE, xmlns: XMLNS_NAMESPACE }
-
-  // http://www.w3.org/TR/REC-xml/#NT-NameStartChar
-  // This implementation works on strings, a single character at a time
-  // as such, it cannot ever support astral-plane characters (10000-EFFFF)
-  // without a significant breaking change to either this  parser, or the
-  // JavaScript language.  Implementation of an emoji-capable xml parser
-  // is left as an exercise for the reader.
-  var nameStart = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/
-
-  var nameBody = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/
-
-  var entityStart = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/
-  var entityBody = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/
-
-  function isWhitespace (c) {
-    return c === ' ' || c === '\n' || c === '\r' || c === '\t'
-  }
-
-  function isQuote (c) {
-    return c === '"' || c === '\''
-  }
-
-  function isAttribEnd (c) {
-    return c === '>' || isWhitespace(c)
-  }
-
-  function isMatch (regex, c) {
-    return regex.test(c)
-  }
-
-  function notMatch (regex, c) {
-    return !isMatch(regex, c)
-  }
-
-  var S = 0
-  sax.STATE = {
-    BEGIN: S++, // leading byte order mark or whitespace
-    BEGIN_WHITESPACE: S++, // leading whitespace
-    TEXT: S++, // general stuff
-    TEXT_ENTITY: S++, // &amp and such.
-    OPEN_WAKA: S++, // <
-    SGML_DECL: S++, // <!BLARG
-    SGML_DECL_QUOTED: S++, // <!BLARG foo "bar
-    DOCTYPE: S++, // <!DOCTYPE
-    DOCTYPE_QUOTED: S++, // <!DOCTYPE "//blah
-    DOCTYPE_DTD: S++, // <!DOCTYPE "//blah" [ ...
-    DOCTYPE_DTD_QUOTED: S++, // <!DOCTYPE "//blah" [ "foo
-    COMMENT_STARTING: S++, // <!-
-    COMMENT: S++, // <!--
-    COMMENT_ENDING: S++, // <!-- blah -
-    COMMENT_ENDED: S++, // <!-- blah --
-    CDATA: S++, // <![CDATA[ something
-    CDATA_ENDING: S++, // ]
-    CDATA_ENDING_2: S++, // ]]
-    PROC_INST: S++, // <?hi
-    PROC_INST_BODY: S++, // <?hi there
-    PROC_INST_ENDING: S++, // <?hi "there" ?
-    OPEN_TAG: S++, // <strong
-    OPEN_TAG_SLASH: S++, // <strong /
-    ATTRIB: S++, // <a
-    ATTRIB_NAME: S++, // <a foo
-    ATTRIB_NAME_SAW_WHITE: S++, // <a foo _
-    ATTRIB_VALUE: S++, // <a foo=
-    ATTRIB_VALUE_QUOTED: S++, // <a foo="bar
-    ATTRIB_VALUE_CLOSED: S++, // <a foo="bar"
-    ATTRIB_VALUE_UNQUOTED: S++, // <a foo=bar
-    ATTRIB_VALUE_ENTITY_Q: S++, // <foo bar="&quot;"
-    ATTRIB_VALUE_ENTITY_U: S++, // <foo bar=&quot
-    CLOSE_TAG: S++, // </a
-    CLOSE_TAG_SAW_WHITE: S++, // </a   >
-    SCRIPT: S++, // <script> ...
-    SCRIPT_ENDING: S++ // <script> ... <
-  }
-
-  sax.XML_ENTITIES = {
-    'amp': '&',
-    'gt': '>',
-    'lt': '<',
-    'quot': '"',
-    'apos': "'"
-  }
-
-  sax.ENTITIES = {
-    'amp': '&',
-    'gt': '>',
-    'lt': '<',
-    'quot': '"',
-    'apos': "'",
-    'AElig': 198,
-    'Aacute': 193,
-    'Acirc': 194,
-    'Agrave': 192,
-    'Aring': 197,
-    'Atilde': 195,
-    'Auml': 196,
-    'Ccedil': 199,
-    'ETH': 208,
-    'Eacute': 201,
-    'Ecirc': 202,
-    'Egrave': 200,
-    'Euml': 203,
-    'Iacute': 205,
-    'Icirc': 206,
-    'Igrave': 204,
-    'Iuml': 207,
-    'Ntilde': 209,
-    'Oacute': 211,
-    'Ocirc': 212,
-    'Ograve': 210,
-    'Oslash': 216,
-    'Otilde': 213,
-    'Ouml': 214,
-    'THORN': 222,
-    'Uacute': 218,
-    'Ucirc': 219,
-    'Ugrave': 217,
-    'Uuml': 220,
-    'Yacute': 221,
-    'aacute': 225,
-    'acirc': 226,
-    'aelig': 230,
-    'agrave': 224,
-    'aring': 229,
-    'atilde': 227,
-    'auml': 228,
-    'ccedil': 231,
-    'eacute': 233,
-    'ecirc': 234,
-    'egrave': 232,
-    'eth': 240,
-    'euml': 235,
-    'iacute': 237,
-    'icirc': 238,
-    'igrave': 236,
-    'iuml': 239,
-    'ntilde': 241,
-    'oacute': 243,
-    'ocirc': 244,
-    'ograve': 242,
-    'oslash': 248,
-    'otilde': 245,
-    'ouml': 246,
-    'szlig': 223,
-    'thorn': 254,
-    'uacute': 250,
-    'ucirc': 251,
-    'ugrave': 249,
-    'uuml': 252,
-    'yacute': 253,
-    'yuml': 255,
-    'copy': 169,
-    'reg': 174,
-    'nbsp': 160,
-    'iexcl': 161,
-    'cent': 162,
-    'pound': 163,
-    'curren': 164,
-    'yen': 165,
-    'brvbar': 166,
-    'sect': 167,
-    'uml': 168,
-    'ordf': 170,
-    'laquo': 171,
-    'not': 172,
-    'shy': 173,
-    'macr': 175,
-    'deg': 176,
-    'plusmn': 177,
-    'sup1': 185,
-    'sup2': 178,
-    'sup3': 179,
-    'acute': 180,
-    'micro': 181,
-    'para': 182,
-    'middot': 183,
-    'cedil': 184,
-    'ordm': 186,
-    'raquo': 187,
-    'frac14': 188,
-    'frac12': 189,
-    'frac34': 190,
-    'iquest': 191,
-    'times': 215,
-    'divide': 247,
-    'OElig': 338,
-    'oelig': 339,
-    'Scaron': 352,
-    'scaron': 353,
-    'Yuml': 376,
-    'fnof': 402,
-    'circ': 710,
-    'tilde': 732,
-    'Alpha': 913,
-    'Beta': 914,
-    'Gamma': 915,
-    'Delta': 916,
-    'Epsilon': 917,
-    'Zeta': 918,
-    'Eta': 919,
-    'Theta': 920,
-    'Iota': 921,
-    'Kappa': 922,
-    'Lambda': 923,
-    'Mu': 924,
-    'Nu': 925,
-    'Xi': 926,
-    'Omicron': 927,
-    'Pi': 928,
-    'Rho': 929,
-    'Sigma': 931,
-    'Tau': 932,
-    'Upsilon': 933,
-    'Phi': 934,
-    'Chi': 935,
-    'Psi': 936,
-    'Omega': 937,
-    'alpha': 945,
-    'beta': 946,
-    'gamma': 947,
-    'delta': 948,
-    'epsilon': 949,
-    'zeta': 950,
-    'eta': 951,
-    'theta': 952,
-    'iota': 953,
-    'kappa': 954,
-    'lambda': 955,
-    'mu': 956,
-    'nu': 957,
-    'xi': 958,
-    'omicron': 959,
-    'pi': 960,
-    'rho': 961,
-    'sigmaf': 962,
-    'sigma': 963,
-    'tau': 964,
-    'upsilon': 965,
-    'phi': 966,
-    'chi': 967,
-    'psi': 968,
-    'omega': 969,
-    'thetasym': 977,
-    'upsih': 978,
-    'piv': 982,
-    'ensp': 8194,
-    'emsp': 8195,
-    'thinsp': 8201,
-    'zwnj': 8204,
-    'zwj': 8205,
-    'lrm': 8206,
-    'rlm': 8207,
-    'ndash': 8211,
-    'mdash': 8212,
-    'lsquo': 8216,
-    'rsquo': 8217,
-    'sbquo': 8218,
-    'ldquo': 8220,
-    'rdquo': 8221,
-    'bdquo': 8222,
-    'dagger': 8224,
-    'Dagger': 8225,
-    'bull': 8226,
-    'hellip': 8230,
-    'permil': 8240,
-    'prime': 8242,
-    'Prime': 8243,
-    'lsaquo': 8249,
-    'rsaquo': 8250,
-    'oline': 8254,
-    'frasl': 8260,
-    'euro': 8364,
-    'image': 8465,
-    'weierp': 8472,
-    'real': 8476,
-    'trade': 8482,
-    'alefsym': 8501,
-    'larr': 8592,
-    'uarr': 8593,
-    'rarr': 8594,
-    'darr': 8595,
-    'harr': 8596,
-    'crarr': 8629,
-    'lArr': 8656,
-    'uArr': 8657,
-    'rArr': 8658,
-    'dArr': 8659,
-    'hArr': 8660,
-    'forall': 8704,
-    'part': 8706,
-    'exist': 8707,
-    'empty': 8709,
-    'nabla': 8711,
-    'isin': 8712,
-    'notin': 8713,
-    'ni': 8715,
-    'prod': 8719,
-    'sum': 8721,
-    'minus': 8722,
-    'lowast': 8727,
-    'radic': 8730,
-    'prop': 8733,
-    'infin': 8734,
-    'ang': 8736,
-    'and': 8743,
-    'or': 8744,
-    'cap': 8745,
-    'cup': 8746,
-    'int': 8747,
-    'there4': 8756,
-    'sim': 8764,
-    'cong': 8773,
-    'asymp': 8776,
-    'ne': 8800,
-    'equiv': 8801,
-    'le': 8804,
-    'ge': 8805,
-    'sub': 8834,
-    'sup': 8835,
-    'nsub': 8836,
-    'sube': 8838,
-    'supe': 8839,
-    'oplus': 8853,
-    'otimes': 8855,
-    'perp': 8869,
-    'sdot': 8901,
-    'lceil': 8968,
-    'rceil': 8969,
-    'lfloor': 8970,
-    'rfloor': 8971,
-    'lang': 9001,
-    'rang': 9002,
-    'loz': 9674,
-    'spades': 9824,
-    'clubs': 9827,
-    'hearts': 9829,
-    'diams': 9830
-  }
-
-  Object.keys(sax.ENTITIES).forEach(function (key) {
-    var e = sax.ENTITIES[key]
-    var s = typeof e === 'number' ? String.fromCharCode(e) : e
-    sax.ENTITIES[key] = s
-  })
-
-  for (var s in sax.STATE) {
-    sax.STATE[sax.STATE[s]] = s
-  }
-
-  // shorthand
-  S = sax.STATE
-
-  function emit (parser, event, data) {
-    parser[event] && parser[event](data)
-  }
-
-  function emitNode (parser, nodeType, data) {
-    if (parser.textNode) closeText(parser)
-    emit(parser, nodeType, data)
-  }
-
-  function closeText (parser) {
-    parser.textNode = textopts(parser.opt, parser.textNode)
-    if (parser.textNode) emit(parser, 'ontext', parser.textNode)
-    parser.textNode = ''
-  }
-
-  function textopts (opt, text) {
-    if (opt.trim) text = text.trim()
-    if (opt.normalize) text = text.replace(/\s+/g, ' ')
-    return text
-  }
-
-  function error (parser, er) {
-    closeText(parser)
-    if (parser.trackPosition) {
-      er += '\nLine: ' + parser.line +
-        '\nColumn: ' + parser.column +
-        '\nChar: ' + parser.c
-    }
-    er = new Error(er)
-    parser.error = er
-    emit(parser, 'onerror', er)
-    return parser
-  }
-
-  function end (parser) {
-    if (parser.sawRoot && !parser.closedRoot) strictFail(parser, 'Unclosed root tag')
-    if ((parser.state !== S.BEGIN) &&
-      (parser.state !== S.BEGIN_WHITESPACE) &&
-      (parser.state !== S.TEXT)) {
-      error(parser, 'Unexpected end')
-    }
-    closeText(parser)
-    parser.c = ''
-    parser.closed = true
-    emit(parser, 'onend')
-    SAXParser.call(parser, parser.strict, parser.opt)
-    return parser
-  }
-
-  function strictFail (parser, message) {
-    if (typeof parser !== 'object' || !(parser instanceof SAXParser)) {
-      throw new Error('bad call to strictFail')
-    }
-    if (parser.strict) {
-      error(parser, message)
-    }
-  }
-
-  function newTag (parser) {
-    if (!parser.strict) parser.tagName = parser.tagName[parser.looseCase]()
-    var parent = parser.tags[parser.tags.length - 1] || parser
-    var tag = parser.tag = { name: parser.tagName, attributes: {} }
-
-    // will be overridden if tag contails an xmlns="foo" or xmlns:foo="bar"
-    if (parser.opt.xmlns) {
-      tag.ns = parent.ns
-    }
-    parser.attribList.length = 0
-    emitNode(parser, 'onopentagstart', tag)
-  }
-
-  function qname (name, attribute) {
-    var i = name.indexOf(':')
-    var qualName = i < 0 ? [ '', name ] : name.split(':')
-    var prefix = qualName[0]
-    var local = qualName[1]
-
-    // <x "xmlns"="http://foo">
-    if (attribute && name === 'xmlns') {
-      prefix = 'xmlns'
-      local = ''
-    }
-
-    return { prefix: prefix, local: local }
-  }
-
-  function attrib (parser) {
-    if (!parser.strict) {
-      parser.attribName = parser.attribName[parser.looseCase]()
-    }
-
-    if (parser.attribList.indexOf(parser.attribName) !== -1 ||
-      parser.tag.attributes.hasOwnProperty(parser.attribName)) {
-      parser.attribName = parser.attribValue = ''
-      return
-    }
-
-    if (parser.opt.xmlns) {
-      var qn = qname(parser.attribName, true)
-      var prefix = qn.prefix
-      var local = qn.local
-
-      if (prefix === 'xmlns') {
-        // namespace binding attribute. push the binding into scope
-        if (local === 'xml' && parser.attribValue !== XML_NAMESPACE) {
-          strictFail(parser,
-            'xml: prefix must be bound to ' + XML_NAMESPACE + '\n' +
-            'Actual: ' + parser.attribValue)
-        } else if (local === 'xmlns' && parser.attribValue !== XMLNS_NAMESPACE) {
-          strictFail(parser,
-            'xmlns: prefix must be bound to ' + XMLNS_NAMESPACE + '\n' +
-            'Actual: ' + parser.attribValue)
-        } else {
-          var tag = parser.tag
-          var parent = parser.tags[parser.tags.length - 1] || parser
-          if (tag.ns === parent.ns) {
-            tag.ns = Object.create(parent.ns)
-          }
-          tag.ns[local] = parser.attribValue
-        }
-      }
-
-      // defer onattribute events until all attributes have been seen
-      // so any new bindings can take effect. preserve attribute order
-      // so deferred events can be emitted in document order
-      parser.attribList.push([parser.attribName, parser.attribValue])
-    } else {
-      // in non-xmlns mode, we can emit the event right away
-      parser.tag.attributes[parser.attribName] = parser.attribValue
-      emitNode(parser, 'onattribute', {
-        name: parser.attribName,
-        value: parser.attribValue
-      })
-    }
-
-    parser.attribName = parser.attribValue = ''
-  }
-
-  function openTag (parser, selfClosing) {
-    if (parser.opt.xmlns) {
-      // emit namespace binding events
-      var tag = parser.tag
-
-      // add namespace info to tag
-      var qn = qname(parser.tagName)
-      tag.prefix = qn.prefix
-      tag.local = qn.local
-      tag.uri = tag.ns[qn.prefix] || ''
-
-      if (tag.prefix && !tag.uri) {
-        strictFail(parser, 'Unbound namespace prefix: ' +
-          JSON.stringify(parser.tagName))
-        tag.uri = qn.prefix
-      }
-
-      var parent = parser.tags[parser.tags.length - 1] || parser
-      if (tag.ns && parent.ns !== tag.ns) {
-        Object.keys(tag.ns).forEach(function (p) {
-          emitNode(parser, 'onopennamespace', {
-            prefix: p,
-            uri: tag.ns[p]
-          })
-        })
-      }
-
-      // handle deferred onattribute events
-      // Note: do not apply default ns to attributes:
-      //   http://www.w3.org/TR/REC-xml-names/#defaulting
-      for (var i = 0, l = parser.attribList.length; i < l; i++) {
-        var nv = parser.attribList[i]
-        var name = nv[0]
-        var value = nv[1]
-        var qualName = qname(name, true)
-        var prefix = qualName.prefix
-        var local = qualName.local
-        var uri = prefix === '' ? '' : (tag.ns[prefix] || '')
-        var a = {
-          name: name,
-          value: value,
-          prefix: prefix,
-          local: local,
-          uri: uri
-        }
-
-        // if there's any attributes with an undefined namespace,
-        // then fail on them now.
-        if (prefix && prefix !== 'xmlns' && !uri) {
-          strictFail(parser, 'Unbound namespace prefix: ' +
-            JSON.stringify(prefix))
-          a.uri = prefix
-        }
-        parser.tag.attributes[name] = a
-        emitNode(parser, 'onattribute', a)
-      }
-      parser.attribList.length = 0
-    }
-
-    parser.tag.isSelfClosing = !!selfClosing
-
-    // process the tag
-    parser.sawRoot = true
-    parser.tags.push(parser.tag)
-    emitNode(parser, 'onopentag', parser.tag)
-    if (!selfClosing) {
-      // special case for <script> in non-strict mode.
-      if (!parser.noscript && parser.tagName.toLowerCase() === 'script') {
-        parser.state = S.SCRIPT
-      } else {
-        parser.state = S.TEXT
-      }
-      parser.tag = null
-      parser.tagName = ''
-    }
-    parser.attribName = parser.attribValue = ''
-    parser.attribList.length = 0
-  }
-
-  function closeTag (parser) {
-    if (!parser.tagName) {
-      strictFail(parser, 'Weird empty close tag.')
-      parser.textNode += '</>'
-      parser.state = S.TEXT
-      return
-    }
-
-    if (parser.script) {
-      if (parser.tagName !== 'script') {
-        parser.script += '</' + parser.tagName + '>'
-        parser.tagName = ''
-        parser.state = S.SCRIPT
-        return
-      }
-      emitNode(parser, 'onscript', parser.script)
-      parser.script = ''
-    }
-
-    // first make sure that the closing tag actually exists.
-    // <a><b></c></b></a> will close everything, otherwise.
-    var t = parser.tags.length
-    var tagName = parser.tagName
-    if (!parser.strict) {
-      tagName = tagName[parser.looseCase]()
-    }
-    var closeTo = tagName
-    while (t--) {
-      var close = parser.tags[t]
-      if (close.name !== closeTo) {
-        // fail the first time in strict mode
-        strictFail(parser, 'Unexpected close tag')
-      } else {
-        break
-      }
-    }
-
-    // didn't find it.  we already failed for strict, so just abort.
-    if (t < 0) {
-      strictFail(parser, 'Unmatched closing tag: ' + parser.tagName)
-      parser.textNode += '</' + parser.tagName + '>'
-      parser.state = S.TEXT
-      return
-    }
-    parser.tagName = tagName
-    var s = parser.tags.length
-    while (s-- > t) {
-      var tag = parser.tag = parser.tags.pop()
-      parser.tagName = parser.tag.name
-      emitNode(parser, 'onclosetag', parser.tagName)
-
-      var x = {}
-      for (var i in tag.ns) {
-        x[i] = tag.ns[i]
-      }
-
-      var parent = parser.tags[parser.tags.length - 1] || parser
-      if (parser.opt.xmlns && tag.ns !== parent.ns) {
-        // remove namespace bindings introduced by tag
-        Object.keys(tag.ns).forEach(function (p) {
-          var n = tag.ns[p]
-          emitNode(parser, 'onclosenamespace', { prefix: p, uri: n })
-        })
-      }
-    }
-    if (t === 0) parser.closedRoot = true
-    parser.tagName = parser.attribValue = parser.attribName = ''
-    parser.attribList.length = 0
-    parser.state = S.TEXT
-  }
-
-  function parseEntity (parser) {
-    var entity = parser.entity
-    var entityLC = entity.toLowerCase()
-    var num
-    var numStr = ''
-
-    if (parser.ENTITIES[entity]) {
-      return parser.ENTITIES[entity]
-    }
-    if (parser.ENTITIES[entityLC]) {
-      return parser.ENTITIES[entityLC]
-    }
-    entity = entityLC
-    if (entity.charAt(0) === '#') {
-      if (entity.charAt(1) === 'x') {
-        entity = entity.slice(2)
-        num = parseInt(entity, 16)
-        numStr = num.toString(16)
-      } else {
-        entity = entity.slice(1)
-        num = parseInt(entity, 10)
-        numStr = num.toString(10)
-      }
-    }
-    entity = entity.replace(/^0+/, '')
-    if (isNaN(num) || numStr.toLowerCase() !== entity) {
-      strictFail(parser, 'Invalid character entity')
-      return '&' + parser.entity + ';'
-    }
-
-    return String.fromCodePoint(num)
-  }
-
-  function beginWhiteSpace (parser, c) {
-    if (c === '<') {
-      parser.state = S.OPEN_WAKA
-      parser.startTagPosition = parser.position
-    } else if (!isWhitespace(c)) {
-      // have to process this as a text node.
-      // weird, but happens.
-      strictFail(parser, 'Non-whitespace before first tag.')
-      parser.textNode = c
-      parser.state = S.TEXT
-    }
-  }
-
-  function charAt (chunk, i) {
-    var result = ''
-    if (i < chunk.length) {
-      result = chunk.charAt(i)
-    }
-    return result
-  }
-
-  function write (chunk) {
-    var parser = this
-    if (this.error) {
-      throw this.error
-    }
-    if (parser.closed) {
-      return error(parser,
-        'Cannot write after close. Assign an onready handler.')
-    }
-    if (chunk === null) {
-      return end(parser)
-    }
-    if (typeof chunk === 'object') {
-      chunk = chunk.toString()
-    }
-    var i = 0
-    var c = ''
-    while (true) {
-      c = charAt(chunk, i++)
-      parser.c = c
-
-      if (!c) {
-        break
-      }
-
-      if (parser.trackPosition) {
-        parser.position++
-        if (c === '\n') {
-          parser.line++
-          parser.column = 0
-        } else {
-          parser.column++
-        }
-      }
-
-      switch (parser.state) {
-        case S.BEGIN:
-          parser.state = S.BEGIN_WHITESPACE
-          if (c === '\uFEFF') {
-            continue
-          }
-          beginWhiteSpace(parser, c)
-          continue
-
-        case S.BEGIN_WHITESPACE:
-          beginWhiteSpace(parser, c)
-          continue
-
-        case S.TEXT:
-          if (parser.sawRoot && !parser.closedRoot) {
-            var starti = i - 1
-            while (c && c !== '<' && c !== '&') {
-              c = charAt(chunk, i++)
-              if (c && parser.trackPosition) {
-                parser.position++
-                if (c === '\n') {
-                  parser.line++
-                  parser.column = 0
-                } else {
-                  parser.column++
-                }
-              }
-            }
-            parser.textNode += chunk.substring(starti, i - 1)
-          }
-          if (c === '<' && !(parser.sawRoot && parser.closedRoot && !parser.strict)) {
-            parser.state = S.OPEN_WAKA
-            parser.startTagPosition = parser.position
-          } else {
-            if (!isWhitespace(c) && (!parser.sawRoot || parser.closedRoot)) {
-              strictFail(parser, 'Text data outside of root node.')
-            }
-            if (c === '&') {
-              parser.state = S.TEXT_ENTITY
-            } else {
-              parser.textNode += c
-            }
-          }
-          continue
-
-        case S.SCRIPT:
-          // only non-strict
-          if (c === '<') {
-            parser.state = S.SCRIPT_ENDING
-          } else {
-            parser.script += c
-          }
-          continue
-
-        case S.SCRIPT_ENDING:
-          if (c === '/') {
-            parser.state = S.CLOSE_TAG
-          } else {
-            parser.script += '<' + c
-            parser.state = S.SCRIPT
-          }
-          continue
-
-        case S.OPEN_WAKA:
-          // either a /, ?, !, or text is coming next.
-          if (c === '!') {
-            parser.state = S.SGML_DECL
-            parser.sgmlDecl = ''
-          } else if (isWhitespace(c)) {
-            // wait for it...
-          } else if (isMatch(nameStart, c)) {
-            parser.state = S.OPEN_TAG
-            parser.tagName = c
-          } else if (c === '/') {
-            parser.state = S.CLOSE_TAG
-            parser.tagName = ''
-          } else if (c === '?') {
-            parser.state = S.PROC_INST
-            parser.procInstName = parser.procInstBody = ''
-          } else {
-            strictFail(parser, 'Unencoded <')
-            // if there was some whitespace, then add that in.
-            if (parser.startTagPosition + 1 < parser.position) {
-              var pad = parser.position - parser.startTagPosition
-              c = new Array(pad).join(' ') + c
-            }
-            parser.textNode += '<' + c
-            parser.state = S.TEXT
-          }
-          continue
-
-        case S.SGML_DECL:
-          if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
-            emitNode(parser, 'onopencdata')
-            parser.state = S.CDATA
-            parser.sgmlDecl = ''
-            parser.cdata = ''
-          } else if (parser.sgmlDecl + c === '--') {
-            parser.state = S.COMMENT
-            parser.comment = ''
-            parser.sgmlDecl = ''
-          } else if ((parser.sgmlDecl + c).toUpperCase() === DOCTYPE) {
-            parser.state = S.DOCTYPE
-            if (parser.doctype || parser.sawRoot) {
-              strictFail(parser,
-                'Inappropriately located doctype declaration')
-            }
-            parser.doctype = ''
-            parser.sgmlDecl = ''
-          } else if (c === '>') {
-            emitNode(parser, 'onsgmldeclaration', parser.sgmlDecl)
-            parser.sgmlDecl = ''
-            parser.state = S.TEXT
-          } else if (isQuote(c)) {
-            parser.state = S.SGML_DECL_QUOTED
-            parser.sgmlDecl += c
-          } else {
-            parser.sgmlDecl += c
-          }
-          continue
-
-        case S.SGML_DECL_QUOTED:
-          if (c === parser.q) {
-            parser.state = S.SGML_DECL
-            parser.q = ''
-          }
-          parser.sgmlDecl += c
-          continue
-
-        case S.DOCTYPE:
-          if (c === '>') {
-            parser.state = S.TEXT
-            emitNode(parser, 'ondoctype', parser.doctype)
-            parser.doctype = true // just remember that we saw it.
-          } else {
-            parser.doctype += c
-            if (c === '[') {
-              parser.state = S.DOCTYPE_DTD
-            } else if (isQuote(c)) {
-              parser.state = S.DOCTYPE_QUOTED
-              parser.q = c
-            }
-          }
-          continue
-
-        case S.DOCTYPE_QUOTED:
-          parser.doctype += c
-          if (c === parser.q) {
-            parser.q = ''
-            parser.state = S.DOCTYPE
-          }
-          continue
-
-        case S.DOCTYPE_DTD:
-          parser.doctype += c
-          if (c === ']') {
-            parser.state = S.DOCTYPE
-          } else if (isQuote(c)) {
-            parser.state = S.DOCTYPE_DTD_QUOTED
-            parser.q = c
-          }
-          continue
-
-        case S.DOCTYPE_DTD_QUOTED:
-          parser.doctype += c
-          if (c === parser.q) {
-            parser.state = S.DOCTYPE_DTD
-            parser.q = ''
-          }
-          continue
-
-        case S.COMMENT:
-          if (c === '-') {
-            parser.state = S.COMMENT_ENDING
-          } else {
-            parser.comment += c
-          }
-          continue
-
-        case S.COMMENT_ENDING:
-          if (c === '-') {
-            parser.state = S.COMMENT_ENDED
-            parser.comment = textopts(parser.opt, parser.comment)
-            if (parser.comment) {
-              emitNode(parser, 'oncomment', parser.comment)
-            }
-            parser.comment = ''
-          } else {
-            parser.comment += '-' + c
-            parser.state = S.COMMENT
-          }
-          continue
-
-        case S.COMMENT_ENDED:
-          if (c !== '>') {
-            strictFail(parser, 'Malformed comment')
-            // allow <!-- blah -- bloo --> in non-strict mode,
-            // which is a comment of " blah -- bloo "
-            parser.comment += '--' + c
-            parser.state = S.COMMENT
-          } else {
-            parser.state = S.TEXT
-          }
-          continue
-
-        case S.CDATA:
-          if (c === ']') {
-            parser.state = S.CDATA_ENDING
-          } else {
-            parser.cdata += c
-          }
-          continue
-
-        case S.CDATA_ENDING:
-          if (c === ']') {
-            parser.state = S.CDATA_ENDING_2
-          } else {
-            parser.cdata += ']' + c
-            parser.state = S.CDATA
-          }
-          continue
-
-        case S.CDATA_ENDING_2:
-          if (c === '>') {
-            if (parser.cdata) {
-              emitNode(parser, 'oncdata', parser.cdata)
-            }
-            emitNode(parser, 'onclosecdata')
-            parser.cdata = ''
-            parser.state = S.TEXT
-          } else if (c === ']') {
-            parser.cdata += ']'
-          } else {
-            parser.cdata += ']]' + c
-            parser.state = S.CDATA
-          }
-          continue
-
-        case S.PROC_INST:
-          if (c === '?') {
-            parser.state = S.PROC_INST_ENDING
-          } else if (isWhitespace(c)) {
-            parser.state = S.PROC_INST_BODY
-          } else {
-            parser.procInstName += c
-          }
-          continue
-
-        case S.PROC_INST_BODY:
-          if (!parser.procInstBody && isWhitespace(c)) {
-            continue
-          } else if (c === '?') {
-            parser.state = S.PROC_INST_ENDING
-          } else {
-            parser.procInstBody += c
-          }
-          continue
-
-        case S.PROC_INST_ENDING:
-          if (c === '>') {
-            emitNode(parser, 'onprocessinginstruction', {
-              name: parser.procInstName,
-              body: parser.procInstBody
-            })
-            parser.procInstName = parser.procInstBody = ''
-            parser.state = S.TEXT
-          } else {
-            parser.procInstBody += '?' + c
-            parser.state = S.PROC_INST_BODY
-          }
-          continue
-
-        case S.OPEN_TAG:
-          if (isMatch(nameBody, c)) {
-            parser.tagName += c
-          } else {
-            newTag(parser)
-            if (c === '>') {
-              openTag(parser)
-            } else if (c === '/') {
-              parser.state = S.OPEN_TAG_SLASH
-            } else {
-              if (!isWhitespace(c)) {
-                strictFail(parser, 'Invalid character in tag name')
-              }
-              parser.state = S.ATTRIB
-            }
-          }
-          continue
-
-        case S.OPEN_TAG_SLASH:
-          if (c === '>') {
-            openTag(parser, true)
-            closeTag(parser)
-          } else {
-            strictFail(parser, 'Forward-slash in opening tag not followed by >')
-            parser.state = S.ATTRIB
-          }
-          continue
-
-        case S.ATTRIB:
-          // haven't read the attribute name yet.
-          if (isWhitespace(c)) {
-            continue
-          } else if (c === '>') {
-            openTag(parser)
-          } else if (c === '/') {
-            parser.state = S.OPEN_TAG_SLASH
-          } else if (isMatch(nameStart, c)) {
-            parser.attribName = c
-            parser.attribValue = ''
-            parser.state = S.ATTRIB_NAME
-          } else {
-            strictFail(parser, 'Invalid attribute name')
-          }
-          continue
-
-        case S.ATTRIB_NAME:
-          if (c === '=') {
-            parser.state = S.ATTRIB_VALUE
-          } else if (c === '>') {
-            strictFail(parser, 'Attribute without value')
-            parser.attribValue = parser.attribName
-            attrib(parser)
-            openTag(parser)
-          } else if (isWhitespace(c)) {
-            parser.state = S.ATTRIB_NAME_SAW_WHITE
-          } else if (isMatch(nameBody, c)) {
-            parser.attribName += c
-          } else {
-            strictFail(parser, 'Invalid attribute name')
-          }
-          continue
-
-        case S.ATTRIB_NAME_SAW_WHITE:
-          if (c === '=') {
-            parser.state = S.ATTRIB_VALUE
-          } else if (isWhitespace(c)) {
-            continue
-          } else {
-            strictFail(parser, 'Attribute without value')
-            parser.tag.attributes[parser.attribName] = ''
-            parser.attribValue = ''
-            emitNode(parser, 'onattribute', {
-              name: parser.attribName,
-              value: ''
-            })
-            parser.attribName = ''
-            if (c === '>') {
-              openTag(parser)
-            } else if (isMatch(nameStart, c)) {
-              parser.attribName = c
-              parser.state = S.ATTRIB_NAME
-            } else {
-              strictFail(parser, 'Invalid attribute name')
-              parser.state = S.ATTRIB
-            }
-          }
-          continue
-
-        case S.ATTRIB_VALUE:
-          if (isWhitespace(c)) {
-            continue
-          } else if (isQuote(c)) {
-            parser.q = c
-            parser.state = S.ATTRIB_VALUE_QUOTED
-          } else {
-            strictFail(parser, 'Unquoted attribute value')
-            parser.state = S.ATTRIB_VALUE_UNQUOTED
-            parser.attribValue = c
-          }
-          continue
-
-        case S.ATTRIB_VALUE_QUOTED:
-          if (c !== parser.q) {
-            if (c === '&') {
-              parser.state = S.ATTRIB_VALUE_ENTITY_Q
-            } else {
-              parser.attribValue += c
-            }
-            continue
-          }
-          attrib(parser)
-          parser.q = ''
-          parser.state = S.ATTRIB_VALUE_CLOSED
-          continue
-
-        case S.ATTRIB_VALUE_CLOSED:
-          if (isWhitespace(c)) {
-            parser.state = S.ATTRIB
-          } else if (c === '>') {
-            openTag(parser)
-          } else if (c === '/') {
-            parser.state = S.OPEN_TAG_SLASH
-          } else if (isMatch(nameStart, c)) {
-            strictFail(parser, 'No whitespace between attributes')
-            parser.attribName = c
-            parser.attribValue = ''
-            parser.state = S.ATTRIB_NAME
-          } else {
-            strictFail(parser, 'Invalid attribute name')
-          }
-          continue
-
-        case S.ATTRIB_VALUE_UNQUOTED:
-          if (!isAttribEnd(c)) {
-            if (c === '&') {
-              parser.state = S.ATTRIB_VALUE_ENTITY_U
-            } else {
-              parser.attribValue += c
-            }
-            continue
-          }
-          attrib(parser)
-          if (c === '>') {
-            openTag(parser)
-          } else {
-            parser.state = S.ATTRIB
-          }
-          continue
-
-        case S.CLOSE_TAG:
-          if (!parser.tagName) {
-            if (isWhitespace(c)) {
-              continue
-            } else if (notMatch(nameStart, c)) {
-              if (parser.script) {
-                parser.script += '</' + c
-                parser.state = S.SCRIPT
-              } else {
-                strictFail(parser, 'Invalid tagname in closing tag.')
-              }
-            } else {
-              parser.tagName = c
-            }
-          } else if (c === '>') {
-            closeTag(parser)
-          } else if (isMatch(nameBody, c)) {
-            parser.tagName += c
-          } else if (parser.script) {
-            parser.script += '</' + parser.tagName
-            parser.tagName = ''
-            parser.state = S.SCRIPT
-          } else {
-            if (!isWhitespace(c)) {
-              strictFail(parser, 'Invalid tagname in closing tag')
-            }
-            parser.state = S.CLOSE_TAG_SAW_WHITE
-          }
-          continue
-
-        case S.CLOSE_TAG_SAW_WHITE:
-          if (isWhitespace(c)) {
-            continue
-          }
-          if (c === '>') {
-            closeTag(parser)
-          } else {
-            strictFail(parser, 'Invalid characters in closing tag')
-          }
-          continue
-
-        case S.TEXT_ENTITY:
-        case S.ATTRIB_VALUE_ENTITY_Q:
-        case S.ATTRIB_VALUE_ENTITY_U:
-          var returnState
-          var buffer
-          switch (parser.state) {
-            case S.TEXT_ENTITY:
-              returnState = S.TEXT
-              buffer = 'textNode'
-              break
-
-            case S.ATTRIB_VALUE_ENTITY_Q:
-              returnState = S.ATTRIB_VALUE_QUOTED
-              buffer = 'attribValue'
-              break
-
-            case S.ATTRIB_VALUE_ENTITY_U:
-              returnState = S.ATTRIB_VALUE_UNQUOTED
-              buffer = 'attribValue'
-              break
-          }
-
-          if (c === ';') {
-            parser[buffer] += parseEntity(parser)
-            parser.entity = ''
-            parser.state = returnState
-          } else if (isMatch(parser.entity.length ? entityBody : entityStart, c)) {
-            parser.entity += c
-          } else {
-            strictFail(parser, 'Invalid character in entity name')
-            parser[buffer] += '&' + parser.entity + c
-            parser.entity = ''
-            parser.state = returnState
-          }
-
-          continue
-
-        default:
-          throw new Error(parser, 'Unknown state: ' + parser.state)
-      }
-    } // while
-
-    if (parser.position >= parser.bufferCheckPosition) {
-      checkBufferLength(parser)
-    }
-    return parser
-  }
-
-  /*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
-  /* istanbul ignore next */
-  if (!String.fromCodePoint) {
-    (function () {
-      var stringFromCharCode = String.fromCharCode
-      var floor = Math.floor
-      var fromCodePoint = function () {
-        var MAX_SIZE = 0x4000
-        var codeUnits = []
-        var highSurrogate
-        var lowSurrogate
-        var index = -1
-        var length = arguments.length
-        if (!length) {
-          return ''
-        }
-        var result = ''
-        while (++index < length) {
-          var codePoint = Number(arguments[index])
-          if (
-            !isFinite(codePoint) || // `NaN`, `+Infinity`, or `-Infinity`
-            codePoint < 0 || // not a valid Unicode code point
-            codePoint > 0x10FFFF || // not a valid Unicode code point
-            floor(codePoint) !== codePoint // not an integer
-          ) {
-            throw RangeError('Invalid code point: ' + codePoint)
-          }
-          if (codePoint <= 0xFFFF) { // BMP code point
-            codeUnits.push(codePoint)
-          } else { // Astral code point; split in surrogate halves
-            // http://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
-            codePoint -= 0x10000
-            highSurrogate = (codePoint >> 10) + 0xD800
-            lowSurrogate = (codePoint % 0x400) + 0xDC00
-            codeUnits.push(highSurrogate, lowSurrogate)
-          }
-          if (index + 1 === length || codeUnits.length > MAX_SIZE) {
-            result += stringFromCharCode.apply(null, codeUnits)
-            codeUnits.length = 0
-          }
-        }
-        return result
-      }
-      /* istanbul ignore next */
-      if (Object.defineProperty) {
-        Object.defineProperty(String, 'fromCodePoint', {
-          value: fromCodePoint,
-          configurable: true,
-          writable: true
-        })
-      } else {
-        String.fromCodePoint = fromCodePoint
-      }
-    }())
-  }
-})(typeof exports === 'undefined' ? this.sax = {} : exports)
diff --git a/scripts/metrics/node_modules/sax/package.json b/scripts/metrics/node_modules/sax/package.json
deleted file mode 100644
index a65b8fc7e23..00000000000
--- a/scripts/metrics/node_modules/sax/package.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "_from": "sax@>=0.6.0",
-  "_id": "sax@1.2.4",
-  "_inBundle": false,
-  "_integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-  "_location": "/sax",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "sax@>=0.6.0",
-    "name": "sax",
-    "escapedName": "sax",
-    "rawSpec": ">=0.6.0",
-    "saveSpec": null,
-    "fetchSpec": ">=0.6.0"
-  },
-  "_requiredBy": [
-    "/xml2js"
-  ],
-  "_resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-  "_shasum": "2816234e2378bddc4e5354fab5caa895df7100d9",
-  "_spec": "sax@>=0.6.0",
-  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics/node_modules/xml2js",
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/sax-js/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "An evented streaming XML parser in JavaScript",
-  "devDependencies": {
-    "standard": "^8.6.0",
-    "tap": "^10.5.1"
-  },
-  "files": [
-    "lib/sax.js",
-    "LICENSE",
-    "README.md"
-  ],
-  "homepage": "https://github.com/isaacs/sax-js#readme",
-  "license": "ISC",
-  "main": "lib/sax.js",
-  "name": "sax",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/sax-js.git"
-  },
-  "scripts": {
-    "postpublish": "git push origin --all; git push origin --tags",
-    "posttest": "standard -F test/*.js lib/*.js",
-    "postversion": "npm publish",
-    "preversion": "npm test",
-    "test": "tap test/*.js --cov -j4"
-  },
-  "version": "1.2.4"
-}
diff --git a/scripts/metrics/node_modules/xml2js/LICENSE b/scripts/metrics/node_modules/xml2js/LICENSE
deleted file mode 100644
index e3b4222a66a..00000000000
--- a/scripts/metrics/node_modules/xml2js/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright 2010, 2011, 2012, 2013. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/xml2js/README.md b/scripts/metrics/node_modules/xml2js/README.md
deleted file mode 100644
index 9c69d6fbf1a..00000000000
--- a/scripts/metrics/node_modules/xml2js/README.md
+++ /dev/null
@@ -1,406 +0,0 @@
-node-xml2js
-===========
-
-Ever had the urge to parse XML? And wanted to access the data in some sane,
-easy way? Don't want to compile a C parser, for whatever reason? Then xml2js is
-what you're looking for!
-
-Description
-===========
-
-Simple XML to JavaScript object converter. It supports bi-directional conversion.
-Uses [sax-js](https://github.com/isaacs/sax-js/) and
-[xmlbuilder-js](https://github.com/oozcitak/xmlbuilder-js/).
-
-Note: If you're looking for a full DOM parser, you probably want
-[JSDom](https://github.com/tmpvar/jsdom).
-
-Installation
-============
-
-Simplest way to install `xml2js` is to use [npm](http://npmjs.org), just `npm
-install xml2js` which will download xml2js and all dependencies.
-
-xml2js is also available via [Bower](http://bower.io/), just `bower install
-xml2js` which will download xml2js and all dependencies.
-
-Usage
-=====
-
-No extensive tutorials required because you are a smart developer! The task of
-parsing XML should be an easy one, so let's make it so! Here's some examples.
-
-Shoot-and-forget usage
-----------------------
-
-You want to parse XML as simple and easy as possible? It's dangerous to go
-alone, take this:
-
-```javascript
-var parseString = require('xml2js').parseString;
-var xml = "<root>Hello xml2js!</root>"
-parseString(xml, function (err, result) {
-    console.dir(result);
-});
-```
-
-Can't get easier than this, right? This works starting with `xml2js` 0.2.3.
-With CoffeeScript it looks like this:
-
-```coffeescript
-{parseString} = require 'xml2js'
-xml = "<root>Hello xml2js!</root>"
-parseString xml, (err, result) ->
-    console.dir result
-```
-
-If you need some special options, fear not, `xml2js` supports a number of
-options (see below), you can specify these as second argument:
-
-```javascript
-parseString(xml, {trim: true}, function (err, result) {
-});
-```
-
-Simple as pie usage
--------------------
-
-That's right, if you have been using xml-simple or a home-grown
-wrapper, this was added in 0.1.11 just for you:
-
-```javascript
-var fs = require('fs'),
-    xml2js = require('xml2js');
-
-var parser = new xml2js.Parser();
-fs.readFile(__dirname + '/foo.xml', function(err, data) {
-    parser.parseString(data, function (err, result) {
-        console.dir(result);
-        console.log('Done');
-    });
-});
-```
-
-Look ma, no event listeners!
-
-You can also use `xml2js` from
-[CoffeeScript](https://github.com/jashkenas/coffeescript), further reducing
-the clutter:
-
-```coffeescript
-fs = require 'fs',
-xml2js = require 'xml2js'
-
-parser = new xml2js.Parser()
-fs.readFile __dirname + '/foo.xml', (err, data) ->
-  parser.parseString data, (err, result) ->
-    console.dir result
-    console.log 'Done.'
-```
-
-But what happens if you forget the `new` keyword to create a new `Parser`? In
-the middle of a nightly coding session, it might get lost, after all. Worry
-not, we got you covered! Starting with 0.2.8 you can also leave it out, in
-which case `xml2js` will helpfully add it for you, no bad surprises and
-inexplicable bugs!
-
-Parsing multiple files
-----------------------
-
-If you want to parse multiple files, you have multiple possibilities:
-
-  * You can create one `xml2js.Parser` per file. That's the recommended one
-    and is promised to always *just work*.
-  * You can call `reset()` on your parser object.
-  * You can hope everything goes well anyway. This behaviour is not
-    guaranteed work always, if ever. Use option #1 if possible. Thanks!
-
-So you wanna some JSON?
------------------------
-
-Just wrap the `result` object in a call to `JSON.stringify` like this
-`JSON.stringify(result)`. You get a string containing the JSON representation
-of the parsed object that you can feed to JSON-hungry consumers.
-
-Displaying results
-------------------
-
-You might wonder why, using `console.dir` or `console.log` the output at some
-level is only `[Object]`. Don't worry, this is not because `xml2js` got lazy.
-That's because Node uses `util.inspect` to convert the object into strings and
-that function stops after `depth=2` which is a bit low for most XML.
-
-To display the whole deal, you can use `console.log(util.inspect(result, false,
-null))`, which displays the whole result.
-
-So much for that, but what if you use
-[eyes](https://github.com/cloudhead/eyes.js) for nice colored output and it
-truncates the output with `…`? Don't fear, there's also a solution for that,
-you just need to increase the `maxLength` limit by creating a custom inspector
-`var inspect = require('eyes').inspector({maxLength: false})` and then you can
-easily `inspect(result)`.
-
-XML builder usage
------------------
-
-Since 0.4.0, objects can be also be used to build XML:
-
-```javascript
-var fs = require('fs'),
-    xml2js = require('xml2js');
-
-var obj = {name: "Super", Surname: "Man", age: 23};
-
-var builder = new xml2js.Builder();
-var xml = builder.buildObject(obj);
-```
-
-At the moment, a one to one bi-directional conversion is guaranteed only for
-default configuration, except for `attrkey`, `charkey` and `explicitArray` options
-you can redefine to your taste. Writing CDATA is supported via setting the `cdata`
-option to `true`.
-
-Processing attribute, tag names and values
-------------------------------------------
-
-Since 0.4.1 you can optionally provide the parser with attribute name and tag name processors as well as element value processors (Since 0.4.14, you can also optionally provide the parser with attribute value processors):
-
-```javascript
-
-function nameToUpperCase(name){
-    return name.toUpperCase();
-}
-
-//transform all attribute and tag names and values to uppercase
-parseString(xml, {
-  tagNameProcessors: [nameToUpperCase],
-  attrNameProcessors: [nameToUpperCase],
-  valueProcessors: [nameToUpperCase],
-  attrValueProcessors: [nameToUpperCase]},
-  function (err, result) {
-    // processed data
-});
-```
-
-The `tagNameProcessors` and `attrNameProcessors` options
-accept an `Array` of functions with the following signature:
-
-```javascript
-function (name){
-  //do something with `name`
-  return name
-}
-```
-
-The `attrValueProcessors` and `valueProcessors` options
-accept an `Array` of functions with the following signature:
-
-```javascript
-function (value, name) {
-  //`name` will be the node name or attribute name
-  //do something with `value`, (optionally) dependent on the node/attr name
-  return value
-}
-```
-
-Some processors are provided out-of-the-box and can be found in `lib/processors.js`:
-
-- `normalize`: transforms the name to lowercase.
-(Automatically used when `options.normalize` is set to `true`)
-
-- `firstCharLowerCase`: transforms the first character to lower case.
-E.g. 'MyTagName' becomes 'myTagName'
-
-- `stripPrefix`: strips the xml namespace prefix. E.g `<foo:Bar/>` will become 'Bar'.
-(N.B.: the `xmlns` prefix is NOT stripped.)
-
-- `parseNumbers`: parses integer-like strings as integers and float-like strings as floats
-E.g. "0" becomes 0 and "15.56" becomes 15.56
-
-- `parseBooleans`: parses boolean-like strings to booleans
-E.g. "true" becomes true and "False" becomes false
-
-Options
-=======
-
-Apart from the default settings, there are a number of options that can be
-specified for the parser. Options are specified by ``new Parser({optionName:
-value})``. Possible options are:
-
-  * `attrkey` (default: `$`): Prefix that is used to access the attributes.
-    Version 0.1 default was `@`.
-  * `charkey` (default: `_`): Prefix that is used to access the character
-    content. Version 0.1 default was `#`.
-  * `explicitCharkey` (default: `false`)
-  * `trim` (default: `false`): Trim the whitespace at the beginning and end of
-    text nodes.
-  * `normalizeTags` (default: `false`): Normalize all tag names to lowercase.
-  * `normalize` (default: `false`): Trim whitespaces inside text nodes.
-  * `explicitRoot` (default: `true`): Set this if you want to get the root
-    node in the resulting object.
-  * `emptyTag` (default: `''`): what will the value of empty nodes be.
-  * `explicitArray` (default: `true`): Always put child nodes in an array if
-    true; otherwise an array is created only if there is more than one.
-  * `ignoreAttrs` (default: `false`): Ignore all XML attributes and only create
-    text nodes.
-  * `mergeAttrs` (default: `false`): Merge attributes and child elements as
-    properties of the parent, instead of keying attributes off a child
-    attribute object. This option is ignored if `ignoreAttrs` is `false`.
-  * `validator` (default `null`): You can specify a callable that validates
-    the resulting structure somehow, however you want. See unit tests
-    for an example.
-  * `xmlns` (default `false`): Give each element a field usually called '$ns'
-    (the first character is the same as attrkey) that contains its local name
-    and namespace URI.
-  * `explicitChildren` (default `false`): Put child elements to separate
-    property. Doesn't work with `mergeAttrs = true`. If element has no children
-    then "children" won't be created. Added in 0.2.5.
-  * `childkey` (default `$$`): Prefix that is used to access child elements if
-    `explicitChildren` is set to `true`. Added in 0.2.5.
-  * `preserveChildrenOrder` (default `false`): Modifies the behavior of
-    `explicitChildren` so that the value of the "children" property becomes an
-    ordered array. When this is `true`, every node will also get a `#name` field
-    whose value will correspond to the XML nodeName, so that you may iterate
-    the "children" array and still be able to determine node names. The named
-    (and potentially unordered) properties are also retained in this
-    configuration at the same level as the ordered "children" array. Added in
-    0.4.9.
-  * `charsAsChildren` (default `false`): Determines whether chars should be
-    considered children if `explicitChildren` is on. Added in 0.2.5.
-  * `includeWhiteChars` (default `false`): Determines whether whitespace-only
-     text nodes should be included. Added in 0.4.17.
-  * `async` (default `false`): Should the callbacks be async? This *might* be
-    an incompatible change if your code depends on sync execution of callbacks.
-    Future versions of `xml2js` might change this default, so the recommendation
-    is to not depend on sync execution anyway. Added in 0.2.6.
-  * `strict` (default `true`): Set sax-js to strict or non-strict parsing mode.
-    Defaults to `true` which is *highly* recommended, since parsing HTML which
-    is not well-formed XML might yield just about anything. Added in 0.2.7.
-  * `attrNameProcessors` (default: `null`): Allows the addition of attribute
-    name processing functions. Accepts an `Array` of functions with following
-    signature:
-    ```javascript
-    function (name){
-        //do something with `name`
-        return name
-    }
-    ```
-    Added in 0.4.14
-  * `attrValueProcessors` (default: `null`): Allows the addition of attribute
-    value processing functions. Accepts an `Array` of functions with following
-    signature:
-    ```javascript
-    function (name){
-      //do something with `name`
-      return name
-    }
-    ```
-    Added in 0.4.1
-  * `tagNameProcessors` (default: `null`): Allows the addition of tag name
-    processing functions. Accepts an `Array` of functions with following
-    signature:
-    ```javascript
-    function (name){
-      //do something with `name`
-      return name
-    }
-    ```
-    Added in 0.4.1
-  * `valueProcessors` (default: `null`): Allows the addition of element value
-    processing functions. Accepts an `Array` of functions with following
-    signature:
-    ```javascript
-    function (name){
-      //do something with `name`
-      return name
-    }
-    ```
-    Added in 0.4.6
-
-Options for the `Builder` class
--------------------------------
-These options are specified by ``new Builder({optionName: value})``.
-Possible options are:
-
-  * `rootName` (default `root` or the root key name): root element name to be used in case
-     `explicitRoot` is `false` or to override the root element name.
-  * `renderOpts` (default `{ 'pretty': true, 'indent': '  ', 'newline': '\n' }`):
-    Rendering options for xmlbuilder-js.
-    * pretty: prettify generated XML
-    * indent: whitespace for indentation (only when pretty)
-    * newline: newline char (only when pretty)
-  * `xmldec` (default `{ 'version': '1.0', 'encoding': 'UTF-8', 'standalone': true }`:
-    XML declaration attributes.
-    * `xmldec.version` A version number string, e.g. 1.0
-    * `xmldec.encoding` Encoding declaration, e.g. UTF-8
-    * `xmldec.standalone` standalone document declaration: true or false
-  * `doctype` (default `null`): optional DTD. Eg. `{'ext': 'hello.dtd'}`
-  * `headless` (default: `false`): omit the XML header. Added in 0.4.3.
-  * `allowSurrogateChars` (default: `false`): allows using characters from the Unicode
-    surrogate blocks.
-  * `cdata` (default: `false`): wrap text nodes in `<![CDATA[ ... ]]>` instead of
-    escaping when necessary. Does not add `<![CDATA[ ... ]]>` if it is not required.
-    Added in 0.4.5.
-
-`renderOpts`, `xmldec`,`doctype` and `headless` pass through to
-[xmlbuilder-js](https://github.com/oozcitak/xmlbuilder-js).
-
-Updating to new version
-=======================
-
-Version 0.2 changed the default parsing settings, but version 0.1.14 introduced
-the default settings for version 0.2, so these settings can be tried before the
-migration.
-
-```javascript
-var xml2js = require('xml2js');
-var parser = new xml2js.Parser(xml2js.defaults["0.2"]);
-```
-
-To get the 0.1 defaults in version 0.2 you can just use
-`xml2js.defaults["0.1"]` in the same place. This provides you with enough time
-to migrate to the saner way of parsing in `xml2js` 0.2. We try to make the
-migration as simple and gentle as possible, but some breakage cannot be
-avoided.
-
-So, what exactly did change and why? In 0.2 we changed some defaults to parse
-the XML in a more universal and sane way. So we disabled `normalize` and `trim`
-so `xml2js` does not cut out any text content. You can reenable this at will of
-course. A more important change is that we return the root tag in the resulting
-JavaScript structure via the `explicitRoot` setting, so you need to access the
-first element. This is useful for anybody who wants to know what the root node
-is and preserves more information. The last major change was to enable
-`explicitArray`, so everytime it is possible that one might embed more than one
-sub-tag into a tag, xml2js >= 0.2 returns an array even if the array just
-includes one element. This is useful when dealing with APIs that return
-variable amounts of subtags.
-
-Running tests, development
-==========================
-
-[![Build Status](https://travis-ci.org/Leonidas-from-XIV/node-xml2js.svg?branch=master)](https://travis-ci.org/Leonidas-from-XIV/node-xml2js)
-[![Coverage Status](https://coveralls.io/repos/Leonidas-from-XIV/node-xml2js/badge.svg?branch=)](https://coveralls.io/r/Leonidas-from-XIV/node-xml2js?branch=master)
-[![Dependency Status](https://david-dm.org/Leonidas-from-XIV/node-xml2js.svg)](https://david-dm.org/Leonidas-from-XIV/node-xml2js)
-
-The development requirements are handled by npm, you just need to install them.
-We also have a number of unit tests, they can be run using `npm test` directly
-from the project root. This runs zap to discover all the tests and execute
-them.
-
-If you like to contribute, keep in mind that `xml2js` is written in
-CoffeeScript, so don't develop on the JavaScript files that are checked into
-the repository for convenience reasons. Also, please write some unit test to
-check your behaviour and if it is some user-facing thing, add some
-documentation to this README, so people will know it exists. Thanks in advance!
-
-Getting support
-===============
-
-Please, if you have a problem with the library, first make sure you read this
-README. If you read this far, thanks, you're good. Then, please make sure your
-problem really is with `xml2js`. It is? Okay, then I'll look at it. Send me a
-mail and we can talk. Please don't open issues, as I don't think that is the
-proper forum for support problems. Some problems might as well really be bugs
-in `xml2js`, if so I'll let you know to open an issue instead :)
-
-But if you know you really found a bug, feel free to open an issue instead.
diff --git a/scripts/metrics/node_modules/xml2js/lib/bom.js b/scripts/metrics/node_modules/xml2js/lib/bom.js
deleted file mode 100644
index 7b8fb27b118..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/bom.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  exports.stripBOM = function(str) {
-    if (str[0] === '\uFEFF') {
-      return str.substring(1);
-    } else {
-      return str;
-    }
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/builder.js b/scripts/metrics/node_modules/xml2js/lib/builder.js
deleted file mode 100644
index 58f36384891..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/builder.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  var builder, defaults, escapeCDATA, requiresCDATA, wrapCDATA,
-    hasProp = {}.hasOwnProperty;
-
-  builder = require('xmlbuilder');
-
-  defaults = require('./defaults').defaults;
-
-  requiresCDATA = function(entry) {
-    return typeof entry === "string" && (entry.indexOf('&') >= 0 || entry.indexOf('>') >= 0 || entry.indexOf('<') >= 0);
-  };
-
-  wrapCDATA = function(entry) {
-    return "<![CDATA[" + (escapeCDATA(entry)) + "]]>";
-  };
-
-  escapeCDATA = function(entry) {
-    return entry.replace(']]>', ']]]]><![CDATA[>');
-  };
-
-  exports.Builder = (function() {
-    function Builder(opts) {
-      var key, ref, value;
-      this.options = {};
-      ref = defaults["0.2"];
-      for (key in ref) {
-        if (!hasProp.call(ref, key)) continue;
-        value = ref[key];
-        this.options[key] = value;
-      }
-      for (key in opts) {
-        if (!hasProp.call(opts, key)) continue;
-        value = opts[key];
-        this.options[key] = value;
-      }
-    }
-
-    Builder.prototype.buildObject = function(rootObj) {
-      var attrkey, charkey, render, rootElement, rootName;
-      attrkey = this.options.attrkey;
-      charkey = this.options.charkey;
-      if ((Object.keys(rootObj).length === 1) && (this.options.rootName === defaults['0.2'].rootName)) {
-        rootName = Object.keys(rootObj)[0];
-        rootObj = rootObj[rootName];
-      } else {
-        rootName = this.options.rootName;
-      }
-      render = (function(_this) {
-        return function(element, obj) {
-          var attr, child, entry, index, key, value;
-          if (typeof obj !== 'object') {
-            if (_this.options.cdata && requiresCDATA(obj)) {
-              element.raw(wrapCDATA(obj));
-            } else {
-              element.txt(obj);
-            }
-          } else if (Array.isArray(obj)) {
-            for (index in obj) {
-              if (!hasProp.call(obj, index)) continue;
-              child = obj[index];
-              for (key in child) {
-                entry = child[key];
-                element = render(element.ele(key), entry).up();
-              }
-            }
-          } else {
-            for (key in obj) {
-              if (!hasProp.call(obj, key)) continue;
-              child = obj[key];
-              if (key === attrkey) {
-                if (typeof child === "object") {
-                  for (attr in child) {
-                    value = child[attr];
-                    element = element.att(attr, value);
-                  }
-                }
-              } else if (key === charkey) {
-                if (_this.options.cdata && requiresCDATA(child)) {
-                  element = element.raw(wrapCDATA(child));
-                } else {
-                  element = element.txt(child);
-                }
-              } else if (Array.isArray(child)) {
-                for (index in child) {
-                  if (!hasProp.call(child, index)) continue;
-                  entry = child[index];
-                  if (typeof entry === 'string') {
-                    if (_this.options.cdata && requiresCDATA(entry)) {
-                      element = element.ele(key).raw(wrapCDATA(entry)).up();
-                    } else {
-                      element = element.ele(key, entry).up();
-                    }
-                  } else {
-                    element = render(element.ele(key), entry).up();
-                  }
-                }
-              } else if (typeof child === "object") {
-                element = render(element.ele(key), child).up();
-              } else {
-                if (typeof child === 'string' && _this.options.cdata && requiresCDATA(child)) {
-                  element = element.ele(key).raw(wrapCDATA(child)).up();
-                } else {
-                  if (child == null) {
-                    child = '';
-                  }
-                  element = element.ele(key, child.toString()).up();
-                }
-              }
-            }
-          }
-          return element;
-        };
-      })(this);
-      rootElement = builder.create(rootName, this.options.xmldec, this.options.doctype, {
-        headless: this.options.headless,
-        allowSurrogateChars: this.options.allowSurrogateChars
-      });
-      return render(rootElement, rootObj).end(this.options.renderOpts);
-    };
-
-    return Builder;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/defaults.js b/scripts/metrics/node_modules/xml2js/lib/defaults.js
deleted file mode 100644
index 0a21da0a2fc..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/defaults.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  exports.defaults = {
-    "0.1": {
-      explicitCharkey: false,
-      trim: true,
-      normalize: true,
-      normalizeTags: false,
-      attrkey: "@",
-      charkey: "#",
-      explicitArray: false,
-      ignoreAttrs: false,
-      mergeAttrs: false,
-      explicitRoot: false,
-      validator: null,
-      xmlns: false,
-      explicitChildren: false,
-      childkey: '@@',
-      charsAsChildren: false,
-      includeWhiteChars: false,
-      async: false,
-      strict: true,
-      attrNameProcessors: null,
-      attrValueProcessors: null,
-      tagNameProcessors: null,
-      valueProcessors: null,
-      emptyTag: ''
-    },
-    "0.2": {
-      explicitCharkey: false,
-      trim: false,
-      normalize: false,
-      normalizeTags: false,
-      attrkey: "$",
-      charkey: "_",
-      explicitArray: true,
-      ignoreAttrs: false,
-      mergeAttrs: false,
-      explicitRoot: true,
-      validator: null,
-      xmlns: false,
-      explicitChildren: false,
-      preserveChildrenOrder: false,
-      childkey: '$$',
-      charsAsChildren: false,
-      includeWhiteChars: false,
-      async: false,
-      strict: true,
-      attrNameProcessors: null,
-      attrValueProcessors: null,
-      tagNameProcessors: null,
-      valueProcessors: null,
-      rootName: 'root',
-      xmldec: {
-        'version': '1.0',
-        'encoding': 'UTF-8',
-        'standalone': true
-      },
-      doctype: null,
-      renderOpts: {
-        'pretty': true,
-        'indent': '  ',
-        'newline': '\n'
-      },
-      headless: false,
-      chunkSize: 10000,
-      emptyTag: '',
-      cdata: false
-    }
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/parser.js b/scripts/metrics/node_modules/xml2js/lib/parser.js
deleted file mode 100644
index 9e8261ebf5d..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/parser.js
+++ /dev/null
@@ -1,357 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  var bom, defaults, events, isEmpty, processItem, processors, sax, setImmediate,
-    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  sax = require('sax');
-
-  events = require('events');
-
-  bom = require('./bom');
-
-  processors = require('./processors');
-
-  setImmediate = require('timers').setImmediate;
-
-  defaults = require('./defaults').defaults;
-
-  isEmpty = function(thing) {
-    return typeof thing === "object" && (thing != null) && Object.keys(thing).length === 0;
-  };
-
-  processItem = function(processors, item, key) {
-    var i, len, process;
-    for (i = 0, len = processors.length; i < len; i++) {
-      process = processors[i];
-      item = process(item, key);
-    }
-    return item;
-  };
-
-  exports.Parser = (function(superClass) {
-    extend(Parser, superClass);
-
-    function Parser(opts) {
-      this.parseString = bind(this.parseString, this);
-      this.reset = bind(this.reset, this);
-      this.assignOrPush = bind(this.assignOrPush, this);
-      this.processAsync = bind(this.processAsync, this);
-      var key, ref, value;
-      if (!(this instanceof exports.Parser)) {
-        return new exports.Parser(opts);
-      }
-      this.options = {};
-      ref = defaults["0.2"];
-      for (key in ref) {
-        if (!hasProp.call(ref, key)) continue;
-        value = ref[key];
-        this.options[key] = value;
-      }
-      for (key in opts) {
-        if (!hasProp.call(opts, key)) continue;
-        value = opts[key];
-        this.options[key] = value;
-      }
-      if (this.options.xmlns) {
-        this.options.xmlnskey = this.options.attrkey + "ns";
-      }
-      if (this.options.normalizeTags) {
-        if (!this.options.tagNameProcessors) {
-          this.options.tagNameProcessors = [];
-        }
-        this.options.tagNameProcessors.unshift(processors.normalize);
-      }
-      this.reset();
-    }
-
-    Parser.prototype.processAsync = function() {
-      var chunk, err;
-      try {
-        if (this.remaining.length <= this.options.chunkSize) {
-          chunk = this.remaining;
-          this.remaining = '';
-          this.saxParser = this.saxParser.write(chunk);
-          return this.saxParser.close();
-        } else {
-          chunk = this.remaining.substr(0, this.options.chunkSize);
-          this.remaining = this.remaining.substr(this.options.chunkSize, this.remaining.length);
-          this.saxParser = this.saxParser.write(chunk);
-          return setImmediate(this.processAsync);
-        }
-      } catch (error1) {
-        err = error1;
-        if (!this.saxParser.errThrown) {
-          this.saxParser.errThrown = true;
-          return this.emit(err);
-        }
-      }
-    };
-
-    Parser.prototype.assignOrPush = function(obj, key, newValue) {
-      if (!(key in obj)) {
-        if (!this.options.explicitArray) {
-          return obj[key] = newValue;
-        } else {
-          return obj[key] = [newValue];
-        }
-      } else {
-        if (!(obj[key] instanceof Array)) {
-          obj[key] = [obj[key]];
-        }
-        return obj[key].push(newValue);
-      }
-    };
-
-    Parser.prototype.reset = function() {
-      var attrkey, charkey, ontext, stack;
-      this.removeAllListeners();
-      this.saxParser = sax.parser(this.options.strict, {
-        trim: false,
-        normalize: false,
-        xmlns: this.options.xmlns
-      });
-      this.saxParser.errThrown = false;
-      this.saxParser.onerror = (function(_this) {
-        return function(error) {
-          _this.saxParser.resume();
-          if (!_this.saxParser.errThrown) {
-            _this.saxParser.errThrown = true;
-            return _this.emit("error", error);
-          }
-        };
-      })(this);
-      this.saxParser.onend = (function(_this) {
-        return function() {
-          if (!_this.saxParser.ended) {
-            _this.saxParser.ended = true;
-            return _this.emit("end", _this.resultObject);
-          }
-        };
-      })(this);
-      this.saxParser.ended = false;
-      this.EXPLICIT_CHARKEY = this.options.explicitCharkey;
-      this.resultObject = null;
-      stack = [];
-      attrkey = this.options.attrkey;
-      charkey = this.options.charkey;
-      this.saxParser.onopentag = (function(_this) {
-        return function(node) {
-          var key, newValue, obj, processedKey, ref;
-          obj = {};
-          obj[charkey] = "";
-          if (!_this.options.ignoreAttrs) {
-            ref = node.attributes;
-            for (key in ref) {
-              if (!hasProp.call(ref, key)) continue;
-              if (!(attrkey in obj) && !_this.options.mergeAttrs) {
-                obj[attrkey] = {};
-              }
-              newValue = _this.options.attrValueProcessors ? processItem(_this.options.attrValueProcessors, node.attributes[key], key) : node.attributes[key];
-              processedKey = _this.options.attrNameProcessors ? processItem(_this.options.attrNameProcessors, key) : key;
-              if (_this.options.mergeAttrs) {
-                _this.assignOrPush(obj, processedKey, newValue);
-              } else {
-                obj[attrkey][processedKey] = newValue;
-              }
-            }
-          }
-          obj["#name"] = _this.options.tagNameProcessors ? processItem(_this.options.tagNameProcessors, node.name) : node.name;
-          if (_this.options.xmlns) {
-            obj[_this.options.xmlnskey] = {
-              uri: node.uri,
-              local: node.local
-            };
-          }
-          return stack.push(obj);
-        };
-      })(this);
-      this.saxParser.onclosetag = (function(_this) {
-        return function() {
-          var cdata, emptyStr, key, node, nodeName, obj, objClone, old, s, xpath;
-          obj = stack.pop();
-          nodeName = obj["#name"];
-          if (!_this.options.explicitChildren || !_this.options.preserveChildrenOrder) {
-            delete obj["#name"];
-          }
-          if (obj.cdata === true) {
-            cdata = obj.cdata;
-            delete obj.cdata;
-          }
-          s = stack[stack.length - 1];
-          if (obj[charkey].match(/^\s*$/) && !cdata) {
-            emptyStr = obj[charkey];
-            delete obj[charkey];
-          } else {
-            if (_this.options.trim) {
-              obj[charkey] = obj[charkey].trim();
-            }
-            if (_this.options.normalize) {
-              obj[charkey] = obj[charkey].replace(/\s{2,}/g, " ").trim();
-            }
-            obj[charkey] = _this.options.valueProcessors ? processItem(_this.options.valueProcessors, obj[charkey], nodeName) : obj[charkey];
-            if (Object.keys(obj).length === 1 && charkey in obj && !_this.EXPLICIT_CHARKEY) {
-              obj = obj[charkey];
-            }
-          }
-          if (isEmpty(obj)) {
-            obj = _this.options.emptyTag !== '' ? _this.options.emptyTag : emptyStr;
-          }
-          if (_this.options.validator != null) {
-            xpath = "/" + ((function() {
-              var i, len, results;
-              results = [];
-              for (i = 0, len = stack.length; i < len; i++) {
-                node = stack[i];
-                results.push(node["#name"]);
-              }
-              return results;
-            })()).concat(nodeName).join("/");
-            (function() {
-              var err;
-              try {
-                return obj = _this.options.validator(xpath, s && s[nodeName], obj);
-              } catch (error1) {
-                err = error1;
-                return _this.emit("error", err);
-              }
-            })();
-          }
-          if (_this.options.explicitChildren && !_this.options.mergeAttrs && typeof obj === 'object') {
-            if (!_this.options.preserveChildrenOrder) {
-              node = {};
-              if (_this.options.attrkey in obj) {
-                node[_this.options.attrkey] = obj[_this.options.attrkey];
-                delete obj[_this.options.attrkey];
-              }
-              if (!_this.options.charsAsChildren && _this.options.charkey in obj) {
-                node[_this.options.charkey] = obj[_this.options.charkey];
-                delete obj[_this.options.charkey];
-              }
-              if (Object.getOwnPropertyNames(obj).length > 0) {
-                node[_this.options.childkey] = obj;
-              }
-              obj = node;
-            } else if (s) {
-              s[_this.options.childkey] = s[_this.options.childkey] || [];
-              objClone = {};
-              for (key in obj) {
-                if (!hasProp.call(obj, key)) continue;
-                objClone[key] = obj[key];
-              }
-              s[_this.options.childkey].push(objClone);
-              delete obj["#name"];
-              if (Object.keys(obj).length === 1 && charkey in obj && !_this.EXPLICIT_CHARKEY) {
-                obj = obj[charkey];
-              }
-            }
-          }
-          if (stack.length > 0) {
-            return _this.assignOrPush(s, nodeName, obj);
-          } else {
-            if (_this.options.explicitRoot) {
-              old = obj;
-              obj = {};
-              obj[nodeName] = old;
-            }
-            _this.resultObject = obj;
-            _this.saxParser.ended = true;
-            return _this.emit("end", _this.resultObject);
-          }
-        };
-      })(this);
-      ontext = (function(_this) {
-        return function(text) {
-          var charChild, s;
-          s = stack[stack.length - 1];
-          if (s) {
-            s[charkey] += text;
-            if (_this.options.explicitChildren && _this.options.preserveChildrenOrder && _this.options.charsAsChildren && (_this.options.includeWhiteChars || text.replace(/\\n/g, '').trim() !== '')) {
-              s[_this.options.childkey] = s[_this.options.childkey] || [];
-              charChild = {
-                '#name': '__text__'
-              };
-              charChild[charkey] = text;
-              if (_this.options.normalize) {
-                charChild[charkey] = charChild[charkey].replace(/\s{2,}/g, " ").trim();
-              }
-              s[_this.options.childkey].push(charChild);
-            }
-            return s;
-          }
-        };
-      })(this);
-      this.saxParser.ontext = ontext;
-      return this.saxParser.oncdata = (function(_this) {
-        return function(text) {
-          var s;
-          s = ontext(text);
-          if (s) {
-            return s.cdata = true;
-          }
-        };
-      })(this);
-    };
-
-    Parser.prototype.parseString = function(str, cb) {
-      var err;
-      if ((cb != null) && typeof cb === "function") {
-        this.on("end", function(result) {
-          this.reset();
-          return cb(null, result);
-        });
-        this.on("error", function(err) {
-          this.reset();
-          return cb(err);
-        });
-      }
-      try {
-        str = str.toString();
-        if (str.trim() === '') {
-          this.emit("end", null);
-          return true;
-        }
-        str = bom.stripBOM(str);
-        if (this.options.async) {
-          this.remaining = str;
-          setImmediate(this.processAsync);
-          return this.saxParser;
-        }
-        return this.saxParser.write(str).close();
-      } catch (error1) {
-        err = error1;
-        if (!(this.saxParser.errThrown || this.saxParser.ended)) {
-          this.emit('error', err);
-          return this.saxParser.errThrown = true;
-        } else if (this.saxParser.ended) {
-          throw err;
-        }
-      }
-    };
-
-    return Parser;
-
-  })(events.EventEmitter);
-
-  exports.parseString = function(str, a, b) {
-    var cb, options, parser;
-    if (b != null) {
-      if (typeof b === 'function') {
-        cb = b;
-      }
-      if (typeof a === 'object') {
-        options = a;
-      }
-    } else {
-      if (typeof a === 'function') {
-        cb = a;
-      }
-      options = {};
-    }
-    parser = new exports.Parser(options);
-    return parser.parseString(str, cb);
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/processors.js b/scripts/metrics/node_modules/xml2js/lib/processors.js
deleted file mode 100644
index 89aa85f22cf..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/processors.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  var prefixMatch;
-
-  prefixMatch = new RegExp(/(?!xmlns)^.*:/);
-
-  exports.normalize = function(str) {
-    return str.toLowerCase();
-  };
-
-  exports.firstCharLowerCase = function(str) {
-    return str.charAt(0).toLowerCase() + str.slice(1);
-  };
-
-  exports.stripPrefix = function(str) {
-    return str.replace(prefixMatch, '');
-  };
-
-  exports.parseNumbers = function(str) {
-    if (!isNaN(str)) {
-      str = str % 1 === 0 ? parseInt(str, 10) : parseFloat(str);
-    }
-    return str;
-  };
-
-  exports.parseBooleans = function(str) {
-    if (/^(?:true|false)$/i.test(str)) {
-      str = str.toLowerCase() === 'true';
-    }
-    return str;
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/lib/xml2js.js b/scripts/metrics/node_modules/xml2js/lib/xml2js.js
deleted file mode 100644
index 599d3dd2b67..00000000000
--- a/scripts/metrics/node_modules/xml2js/lib/xml2js.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  "use strict";
-  var builder, defaults, parser, processors,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  defaults = require('./defaults');
-
-  builder = require('./builder');
-
-  parser = require('./parser');
-
-  processors = require('./processors');
-
-  exports.defaults = defaults.defaults;
-
-  exports.processors = processors;
-
-  exports.ValidationError = (function(superClass) {
-    extend(ValidationError, superClass);
-
-    function ValidationError(message) {
-      this.message = message;
-    }
-
-    return ValidationError;
-
-  })(Error);
-
-  exports.Builder = builder.Builder;
-
-  exports.Parser = parser.Parser;
-
-  exports.parseString = parser.parseString;
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xml2js/package.json b/scripts/metrics/node_modules/xml2js/package.json
deleted file mode 100644
index 94629c201c1..00000000000
--- a/scripts/metrics/node_modules/xml2js/package.json
+++ /dev/null
@@ -1,280 +0,0 @@
-{
-  "_from": "xml2js",
-  "_id": "xml2js@0.4.19",
-  "_inBundle": false,
-  "_integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-  "_location": "/xml2js",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "xml2js",
-    "name": "xml2js",
-    "escapedName": "xml2js",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-  "_shasum": "686c20f213209e94abf0d1bcf1efaa291c7827a7",
-  "_spec": "xml2js",
-  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics",
-  "author": {
-    "name": "Marek Kubica",
-    "email": "marek@xivilization.net",
-    "url": "https://xivilization.net"
-  },
-  "bugs": {
-    "url": "https://github.com/Leonidas-from-XIV/node-xml2js/issues"
-  },
-  "bundleDependencies": false,
-  "contributors": [
-    {
-      "name": "maqr",
-      "email": "maqr.lollerskates@gmail.com",
-      "url": "https://github.com/maqr"
-    },
-    {
-      "name": "Ben Weaver",
-      "url": "http://benweaver.com/"
-    },
-    {
-      "name": "Jae Kwon",
-      "url": "https://github.com/jaekwon"
-    },
-    {
-      "name": "Jim Robert"
-    },
-    {
-      "name": "Ștefan Rusu",
-      "url": "http://www.saltwaterc.eu/"
-    },
-    {
-      "name": "Carter Cole",
-      "email": "carter.cole@cartercole.com",
-      "url": "http://cartercole.com/"
-    },
-    {
-      "name": "Kurt Raschke",
-      "email": "kurt@kurtraschke.com",
-      "url": "http://www.kurtraschke.com/"
-    },
-    {
-      "name": "Contra",
-      "email": "contra@australia.edu",
-      "url": "https://github.com/Contra"
-    },
-    {
-      "name": "Marcelo Diniz",
-      "email": "marudiniz@gmail.com",
-      "url": "https://github.com/mdiniz"
-    },
-    {
-      "name": "Michael Hart",
-      "url": "https://github.com/mhart"
-    },
-    {
-      "name": "Zachary Scott",
-      "email": "zachary@zacharyscott.net",
-      "url": "http://zacharyscott.net/"
-    },
-    {
-      "name": "Raoul Millais",
-      "url": "https://github.com/raoulmillais"
-    },
-    {
-      "name": "Salsita Software",
-      "url": "http://www.salsitasoft.com/"
-    },
-    {
-      "name": "Mike Schilling",
-      "email": "mike@emotive.com",
-      "url": "http://www.emotive.com/"
-    },
-    {
-      "name": "Jackson Tian",
-      "email": "shyvo1987@gmail.com",
-      "url": "http://weibo.com/shyvo"
-    },
-    {
-      "name": "Mikhail Zyatin",
-      "email": "mikhail.zyatin@gmail.com",
-      "url": "https://github.com/Sitin"
-    },
-    {
-      "name": "Chris Tavares",
-      "email": "ctavares@microsoft.com",
-      "url": "https://github.com/christav"
-    },
-    {
-      "name": "Frank Xu",
-      "email": "yyfrankyy@gmail.com",
-      "url": "http://f2e.us/"
-    },
-    {
-      "name": "Guido D'Albore",
-      "email": "guido@bitstorm.it",
-      "url": "http://www.bitstorm.it/"
-    },
-    {
-      "name": "Jack Senechal",
-      "url": "http://jacksenechal.com/"
-    },
-    {
-      "name": "Matthias Hölzl",
-      "email": "tc@xantira.com",
-      "url": "https://github.com/hoelzl"
-    },
-    {
-      "name": "Camille Reynders",
-      "email": "info@creynders.be",
-      "url": "http://www.creynders.be/"
-    },
-    {
-      "name": "Taylor Gautier",
-      "url": "https://github.com/tsgautier"
-    },
-    {
-      "name": "Todd Bryan",
-      "url": "https://github.com/toddrbryan"
-    },
-    {
-      "name": "Leore Avidar",
-      "email": "leore.avidar@gmail.com",
-      "url": "http://leoreavidar.com/"
-    },
-    {
-      "name": "Dave Aitken",
-      "email": "dave.aitken@gmail.com",
-      "url": "http://www.actionshrimp.com/"
-    },
-    {
-      "name": "Shaney Orrowe",
-      "email": "shaney.orrowe@practiceweb.co.uk"
-    },
-    {
-      "name": "Candle",
-      "email": "candle@candle.me.uk"
-    },
-    {
-      "name": "Jess Telford",
-      "email": "hi@jes.st",
-      "url": "http://jes.st"
-    },
-    {
-      "name": "Tom Hughes",
-      "email": "<tom@compton.nu",
-      "url": "http://compton.nu/"
-    },
-    {
-      "name": "Piotr Rochala",
-      "url": "http://rocha.la/"
-    },
-    {
-      "name": "Michael Avila",
-      "url": "https://github.com/michaelavila"
-    },
-    {
-      "name": "Ryan Gahl",
-      "url": "https://github.com/ryedin"
-    },
-    {
-      "name": "Eric Laberge",
-      "email": "e.laberge@gmail.com",
-      "url": "https://github.com/elaberge"
-    },
-    {
-      "name": "Benjamin E. Coe",
-      "email": "ben@npmjs.com",
-      "url": "https://twitter.com/benjamincoe"
-    },
-    {
-      "name": "Stephen Cresswell",
-      "url": "https://github.com/cressie176"
-    },
-    {
-      "name": "Pascal Ehlert",
-      "email": "pascal@hacksrus.net",
-      "url": "http://www.hacksrus.net/"
-    },
-    {
-      "name": "Tom Spencer",
-      "email": "fiznool@gmail.com",
-      "url": "http://fiznool.com/"
-    },
-    {
-      "name": "Tristian Flanagan",
-      "email": "tflanagan@datacollaborative.com",
-      "url": "https://github.com/tflanagan"
-    },
-    {
-      "name": "Tim Johns",
-      "email": "timjohns@yahoo.com",
-      "url": "https://github.com/TimJohns"
-    },
-    {
-      "name": "Bogdan Chadkin",
-      "email": "trysound@yandex.ru",
-      "url": "https://github.com/TrySound"
-    },
-    {
-      "name": "David Wood",
-      "email": "david.p.wood@gmail.com",
-      "url": "http://codesleuth.co.uk/"
-    },
-    {
-      "name": "Nicolas Maquet",
-      "url": "https://github.com/nmaquet"
-    },
-    {
-      "name": "Lovell Fuller",
-      "url": "http://lovell.info/"
-    },
-    {
-      "name": "d3adc0d3",
-      "url": "https://github.com/d3adc0d3"
-    }
-  ],
-  "dependencies": {
-    "sax": ">=0.6.0",
-    "xmlbuilder": "~9.0.1"
-  },
-  "deprecated": false,
-  "description": "Simple XML to JavaScript object converter.",
-  "devDependencies": {
-    "coffee-script": ">=1.10.0",
-    "coveralls": "^2.11.2",
-    "diff": ">=1.0.8",
-    "docco": ">=0.6.2",
-    "nyc": ">=2.2.1",
-    "zap": ">=0.2.9"
-  },
-  "directories": {
-    "lib": "./lib"
-  },
-  "files": [
-    "lib"
-  ],
-  "homepage": "https://github.com/Leonidas-from-XIV/node-xml2js",
-  "keywords": [
-    "xml",
-    "json"
-  ],
-  "license": "MIT",
-  "main": "./lib/xml2js",
-  "name": "xml2js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Leonidas-from-XIV/node-xml2js.git"
-  },
-  "scripts": {
-    "coverage": "nyc npm test && nyc report",
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
-    "test": "zap"
-  },
-  "version": "0.4.19"
-}
diff --git a/scripts/metrics/node_modules/xmlbuilder/.npmignore b/scripts/metrics/node_modules/xmlbuilder/.npmignore
deleted file mode 100644
index b6ad1f6d9b3..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/.npmignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.travis.yml
-src
-test
-perf
-coverage
diff --git a/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md b/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
deleted file mode 100644
index 6264283378a..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/CHANGELOG.md
+++ /dev/null
@@ -1,423 +0,0 @@
-# Change Log
-
-All notable changes to this project are documented in this file. This project adheres to [Semantic Versioning](http://semver.org/#semantic-versioning-200).
-
-## [9.0.4] - 2017-08-16
-- `spacebeforeslash` writer option accepts `true` as well as space char(s).
-
-## [9.0.3] - 2017-08-15
-- `spacebeforeslash` writer option can now be used with XML fragments.
-
-## [9.0.2] - 2017-08-15
-- Added the `spacebeforeslash` writer option to add a space character before closing tags of empty elements. See
-[#157](https://github.com/oozcitak/xmlbuilder-js/issues/157).
-
-## [9.0.1] - 2017-06-19
-- Fixed character validity checks to work with node.js 4.0 and 5.0. See
-[#161](https://github.com/oozcitak/xmlbuilder-js/issues/161).
-
-## [9.0.0] - 2017-05-05
-- Removed case conversion options.
-- Removed support for node.js 4.0 and 5.0. Minimum required version is now 6.0.
-- Fixed valid char filter to use XML 1.1 instead of 1.0. See
-[#147](https://github.com/oozcitak/xmlbuilder-js/issues/147).
-- Added options for negative indentation and suppressing pretty printing of text
-nodes. See
-[#145](https://github.com/oozcitak/xmlbuilder-js/issues/145).
-
-## [8.2.2] - 2016-04-08
-- Falsy values can now be used as a text node in callback mode.
-
-## [8.2.1] - 2016-04-07
-- Falsy values can now be used as a text node. See 
-[#117](https://github.com/oozcitak/xmlbuilder-js/issues/117).
-
-## [8.2.0] - 2016-04-01
-- Removed lodash dependency to keep the library small and simple. See
-[#114](https://github.com/oozcitak/xmlbuilder-js/issues/114),
-[#53](https://github.com/oozcitak/xmlbuilder-js/issues/53),
-and [#43](https://github.com/oozcitak/xmlbuilder-js/issues/43).
-- Added title case to name conversion options.
-
-## [8.1.0] - 2016-03-29
-- Added the callback option to the `begin` export function. When used with a
-callback function, the XML document will be generated in chunks and each chunk
-will be passed to the supplied function. In this mode, `begin` uses a different
-code path and the builder should use much less memory since the entire XML tree
-is not kept. There are a few drawbacks though. For example, traversing the document
-tree or adding attributes to a node after it is written is not possible. It is
-also not possible to remove nodes or attributes.
-
-``` js
-var result = '';
-
-builder.begin(function(chunk) { result += chunk; })
-  .dec()
-  .ele('root')
-    .ele('xmlbuilder').up()
-  .end();
-```
-
-- Replaced native `Object.assign` with `lodash.assign` to support old JS engines.  See [#111](https://github.com/oozcitak/xmlbuilder-js/issues/111).
-
-## [8.0.0] - 2016-03-25
-- Added the `begin` export function. See the wiki for details.
-- Added the ability to add comments and processing instructions before and after the root element. Added `commentBefore`, `commentAfter`, `instructionBefore` and `instructionAfter` functions for this purpose.
-- Dropped support for old node.js releases. Minimum required node.js version is now 4.0.
-
-## [7.0.0] - 2016-03-21
-- Processing instructions are now created as regular nodes. This is a major breaking change if you are using processing instructions. Previously processing instructions were inserted before their parent node. After this change processing instructions are appended to the children of the parent node. Note that it is not currently possible to insert processing instructions before or after the root element.
-```js
-root.ele('node').ins('pi');
-// pre-v7
-<?pi?><node/>
-// v7
-<node><?pi?></node>
-```
-
-## [6.0.0] - 2016-03-20
-- Added custom XML writers. The default string conversion functions are now collected under the `XMLStringWriter` class which can be accessed by the `stringWriter(options)` function exported by the module. An `XMLStreamWriter` is also added which outputs the XML document to a writable stream. A stream writer can be created by calling the `streamWriter(stream, options)` function exported by the module. Both classes are heavily customizable and the details are added to the wiki. It is also possible to write an XML writer from scratch and use it when calling `end()` on the XML document.
-
-## [5.0.1] - 2016-03-08
-- Moved require statements for text case conversion to the top of files to reduce lazy requires.
-
-## [5.0.0] - 2016-03-05
-- Added text case option for element names and attribute names. Valid cases are `lower`, `upper`, `camel`, `kebab` and `snake`.
-- Attribute and element values are escaped according to the [Canonical XML 1.0 specification](http://www.w3.org/TR/2000/WD-xml-c14n-20000119.html#charescaping). See [#54](https://github.com/oozcitak/xmlbuilder-js/issues/54) and [#86](https://github.com/oozcitak/xmlbuilder-js/issues/86).
-- Added the `allowEmpty` option to `end()`. When this option is set, empty elements are not self-closed.
-- Added support for [nested CDATA](https://en.wikipedia.org/wiki/CDATA#Nesting). The triad `]]>` in CDATA is now automatically replaced with `]]]]><![CDATA[>`.
-
-## [4.2.1] - 2016-01-15
-- Updated lodash dependency to 4.0.0.
-
-## [4.2.0] - 2015-12-16
-- Added the `noDoubleEncoding` option to `create()` to control whether existing html entities are encoded.
-
-## [4.1.0] - 2015-11-11
-- Added the `separateArrayItems` option to `create()` to control how arrays are handled when converting from objects. e.g.
-
-```js
-root.ele({ number: [ "one", "two"  ]});
-// with separateArrayItems: true
-<number>
-  <one/>
-  <two/>
-</number>
-// with separateArrayItems: false
-<number>one</number>
-<number>two</number>
-```
-
-## [4.0.0] - 2015-11-01
-- Removed the `#list` decorator. Array items are now created as child nodes by default.
-- Fixed a bug where the XML encoding string was checked partially.
-
-## [3.1.0] - 2015-09-19
-- `#list` decorator ignores empty arrays.
-
-## [3.0.0] - 2015-09-10
-- Allow `\r`, `\n` and `\t` in attribute values without escaping. See [#86](https://github.com/oozcitak/xmlbuilder-js/issues/86).
-
-## [2.6.5] - 2015-09-09
-- Use native `isArray` instead of lodash.
-- Indentation of processing instructions are set to the parent element's.
-
-## [2.6.4] - 2015-05-27
-- Updated lodash dependency to 3.5.0.
-
-## [2.6.3] - 2015-05-27
-- Bumped version because previous release was not published on npm.
-
-## [2.6.2] - 2015-03-10
-- Updated lodash dependency to 3.5.0.
-
-## [2.6.1] - 2015-02-20
-- Updated lodash dependency to 3.3.0.
-
-## [2.6.0] - 2015-02-20
-- Fixed a bug where the `XMLNode` constructor overwrote the super class parent.
-- Removed document property from cloned nodes.
-- Switched to mocha.js for testing.
-
-## [2.5.2] - 2015-02-16
-- Updated lodash dependency to 3.2.0.
-
-## [2.5.1] - 2015-02-09
-- Updated lodash dependency to 3.1.0.
-- Support all node >= 0.8.
-
-## [2.5.0] - 2015-00-03
-- Updated lodash dependency to 3.0.0.
-
-## [2.4.6] - 2015-01-26
--	Show more information from attribute creation with null values.
--	Added iojs as an engine.
--	Self close elements with empty text.
-
-## [2.4.5] - 2014-11-15
-- Fixed prepublish script to run on windows.
-- Fixed  bug in XMLStringifier where an undefined value was used while reporting an invalid encoding value.
-- Moved require statements to the top of files to reduce lazy requires. See [#62](https://github.com/oozcitak/xmlbuilder-js/issues/62).
-
-## [2.4.4] - 2014-09-08
-- Added the `offset` option to `toString()` for use in XML fragments.
-
-## [2.4.3] - 2014-08-13
-- Corrected license in package description.
-
-## [2.4.2] - 2014-08-13
-- Dropped performance test and memwatch dependency.
-
-## [2.4.1] - 2014-08-12
-- Fixed a bug where empty indent string was omitted when pretty printing. See [#59](https://github.com/oozcitak/xmlbuilder-js/issues/59).
-
-## [2.4.0] - 2014-08-04
-- Correct cases of pubID and sysID.
-- Use single lodash instead of separate npm modules. See [#53](https://github.com/oozcitak/xmlbuilder-js/issues/53).
-- Escape according to Canonical XML 1.0. See [#54](https://github.com/oozcitak/xmlbuilder-js/issues/54).
-
-## [2.3.0] - 2014-07-17
-- Convert objects to JS primitives while sanitizing user input.
-- Object builder preserves items with null values. See [#44](https://github.com/oozcitak/xmlbuilder-js/issues/44).
-- Use modularized lodash functions to cut down dependencies.
-- Process empty objects when converting from objects so that we don't throw on empty child objects.
-
-## [2.2.1] - 2014-04-04
-- Bumped version because previous release was not published on npm.
-
-## [2.2.0] - 2014-04-04
-- Switch to lodash from underscore.
-- Removed legacy `ext` option from `create()`.
-- Drop old node versions: 0.4, 0.5, 0.6. 0.8 is the minimum requirement from now on.
-
-## [2.1.0] - 2013-12-30
-- Removed duplicate null checks from constructors.
-- Fixed node count in performance test.
-- Added option for skipping null attribute values. See [#26](https://github.com/oozcitak/xmlbuilder-js/issues/26).
-- Allow multiple values in `att()` and `ins()`.
-- Added ability to run individual performance tests.
-- Added flag for ignoring decorator strings.
-
-## [2.0.1] - 2013-12-24
-- Removed performance tests from npm package.
-
-## [2.0.0] - 2013-12-24
-- Combined loops for speed up.
-- Added support for the DTD and XML declaration.
-- `clone` includes attributes.
-- Added performance tests.
-- Evaluate attribute value if function.
-- Evaluate instruction value if function.
-
-## [1.1.2] - 2013-12-11
-- 	Changed processing instruction decorator to `?`.
-
-## [1.1.1] - 2013-12-11
-- 	Added processing instructions to JS object conversion.
-
-## [1.1.0] - 2013-12-10
-- Added license to package.
-- `create()` and `element()` accept JS object to fully build the document.
-- Added `nod()` and `n()` aliases for `node()`.
-- Renamed `convertAttChar` decorator to `convertAttKey`.
-- Ignore empty decorator strings when converting JS objects.
-
-## [1.0.2] - 2013-11-27
-- Removed temp file which was accidentally included in the package.
-
-## [1.0.1] - 2013-11-27
-- Custom stringify functions affect current instance only.
-
-## [1.0.0] - 2013-11-27
-- Added processing instructions.
-- Added stringify functions to sanitize and convert input values.
-- Added option for headless XML documents.
-- Added vows tests.
-- Removed Makefile. Using npm publish scripts instead.
-- Removed the `begin()` function. `create()` begins the document by creating the root node.
-
-## [0.4.3] - 2013-11-08
-- Added option to include surrogate pairs in XML content. See [#29](https://github.com/oozcitak/xmlbuilder-js/issues/29).
-- Fixed empty value string representation in pretty mode.
-- Added pre and postpublish scripts to package.json.
-- Filtered out prototype properties when appending attributes. See [#31](https://github.com/oozcitak/xmlbuilder-js/issues/31).
-
-## [0.4.2] - 2012-09-14
-- Removed README.md from `.npmignore`.
-
-## [0.4.1] - 2012-08-31
-- Removed `begin()` calls in favor of `XMLBuilder` constructor.
-- Added the `end()` function. `end()` is a convenience over `doc().toString()`.
-
-## [0.4.0] - 2012-08-31
-- Added arguments to `XMLBuilder` constructor to allow the name of the root element and XML prolog to be defined in one line.
-- Soft deprecated `begin()`.
-
-## [0.3.11] - 2012-08-13
-- Package keywords are fixed to be an array of values.
-
-## [0.3.10] - 2012-08-13
-- Brought back npm package contents which were lost due to incorrect configuration of `package.json` in previous releases.
-
-## [0.3.3] - 2012-07-27
-- Implemented `importXMLBuilder()`.
-
-## [0.3.2] - 2012-07-20
-- Fixed a duplicated escaping problem on `element()`.
-- Fixed a problem with text node creation from empty string.
-- Calling `root()` on the document element returns the root element.
-- `XMLBuilder` no longer extends `XMLFragment`.
-
-## [0.3.1] - 2011-11-28
-- Added guards for document element so that nodes cannot be inserted at document level.
-
-## [0.3.0] - 2011-11-28
-- Added `doc()` to return the document element.
-
-## [0.2.2] - 2011-11-28
-- Prevent code relying on `up()`'s older behavior to break.
-
-## [0.2.1] - 2011-11-28
-- Added the `root()` function.
-
-## [0.2.0] - 2011-11-21
-- Added Travis-CI integration.
-- Added coffee-script dependency.
-- Added insert, traversal and delete functions.
-
-## [0.1.7] - 2011-10-25
-- No changes. Accidental release.
-
-## [0.1.6] - 2011-10-25
-- Corrected `package.json` bugs link to `url` from `web`.
-
-## [0.1.5] - 2011-08-08
-- Added missing npm package contents.
-
-## [0.1.4] - 2011-07-29
-- Text-only nodes are no longer indented.
-- Added documentation for multiple instances.
-
-## [0.1.3] - 2011-07-27
-- Exported the `create()` function to return a new instance. This allows multiple builder instances to be constructed.
-- Fixed `u()` function so that it now correctly calls `up()`.
-- Fixed typo in `element()` so that `attributes` and `text` can be passed interchangeably.
-
-## [0.1.2] - 2011-06-03
-- `ele()` accepts element text.
-- `attributes()` now overrides existing attributes if passed the same attribute name.
-
-## [0.1.1] - 2011-05-19
-- Added the raw output option.
-- Removed most validity checks.
-
-## [0.1.0] - 2011-04-27
-- `text()` and `cdata()` now return parent element.
-- Attribute values are escaped.
-
-## [0.0.7] - 2011-04-23
--	Coerced text values to string.
-
-## [0.0.6] - 2011-02-23
-- Added support for XML comments.
-- Text nodes are checked against CharData.
-
-## [0.0.5] - 2010-12-31
-- Corrected the name of the main npm module in `package.json`.
-
-## [0.0.4] - 2010-12-28
-- Added `.npmignore`.
-
-## [0.0.3] - 2010-12-27
-- root element is now constructed in `begin()`.
-- moved prolog to `begin()`.
-- Added the ability to have CDATA in element text.
-- Removed unused prolog aliases.
-- Removed `builder()` function from main module.
-- Added the name of the main npm module in `package.json`.
-
-## [0.0.2] - 2010-11-03
-- `element()` expands nested arrays.
-- Added pretty printing.
-- Added the `up()`, `build()` and `prolog()` functions.
-- Added readme.
-
-## 0.0.1 - 2010-11-02
-- Initial release
-
-[9.0.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.3...v9.0.4
-[9.0.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.2...v9.0.3
-[9.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.1...v9.0.2
-[9.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v9.0.0...v9.0.1
-[9.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.2...v9.0.0
-[8.2.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.1...v8.2.2
-[8.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.2.0...v8.2.1
-[8.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.1.0...v8.2.0
-[8.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v8.0.0...v8.1.0
-[8.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v7.0.0...v8.0.0
-[7.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v6.0.0...v7.0.0
-[6.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v5.0.1...v6.0.0
-[5.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v5.0.0...v5.0.1
-[5.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.2.1...v5.0.0
-[4.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.2.0...v4.2.1
-[4.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.1.0...v4.2.0
-[4.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v4.0.0...v4.1.0
-[4.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v3.1.0...v4.0.0
-[3.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v3.0.0...v3.1.0
-[3.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.5...v3.0.0
-[2.6.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.4...v2.6.5
-[2.6.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.3...v2.6.4
-[2.6.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.2...v2.6.3
-[2.6.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.1...v2.6.2
-[2.6.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.6.0...v2.6.1
-[2.6.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.2...v2.6.0
-[2.5.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.1...v2.5.2
-[2.5.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.5.0...v2.5.1
-[2.5.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.6...v2.5.0
-[2.4.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.5...v2.4.6
-[2.4.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.4...v2.4.5
-[2.4.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.3...v2.4.4
-[2.4.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.2...v2.4.3
-[2.4.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.1...v2.4.2
-[2.4.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.4.0...v2.4.1
-[2.4.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.3.0...v2.4.0
-[2.3.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.2.1...v2.3.0
-[2.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.2.0...v2.2.1
-[2.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.1.0...v2.2.0
-[2.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.0.1...v2.1.0
-[2.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v2.0.0...v2.0.1
-[2.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.2...v2.0.0
-[1.1.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.1...v1.1.2
-[1.1.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.1.0...v1.1.1
-[1.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.2...v1.1.0
-[1.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.1...v1.0.2
-[1.0.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v1.0.0...v1.0.1
-[1.0.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.3...v1.0.0
-[0.4.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.2...v0.4.3
-[0.4.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.1...v0.4.2
-[0.4.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.4.0...v0.4.1
-[0.4.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.11...v0.4.0
-[0.3.11]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.10...v0.3.11
-[0.3.10]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.3...v0.3.10
-[0.3.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.2...v0.3.3
-[0.3.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.1...v0.3.2
-[0.3.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.3.0...v0.3.1
-[0.3.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.2...v0.3.0
-[0.2.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.1...v0.2.2
-[0.2.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.2.0...v0.2.1
-[0.2.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.7...v0.2.0
-[0.1.7]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.6...v0.1.7
-[0.1.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.5...v0.1.6
-[0.1.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.4...v0.1.5
-[0.1.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.3...v0.1.4
-[0.1.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.2...v0.1.3
-[0.1.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.7...v0.1.0
-[0.0.7]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.6...v0.0.7
-[0.0.6]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.5...v0.0.6
-[0.0.5]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.4...v0.0.5
-[0.0.4]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.3...v0.0.4
-[0.0.3]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.2...v0.0.3
-[0.0.2]: https://github.com/oozcitak/xmlbuilder-js/compare/v0.0.1...v0.0.2
-
diff --git a/scripts/metrics/node_modules/xmlbuilder/LICENSE b/scripts/metrics/node_modules/xmlbuilder/LICENSE
deleted file mode 100644
index e7cbac9a801..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Ozgur Ozcitak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/scripts/metrics/node_modules/xmlbuilder/README.md b/scripts/metrics/node_modules/xmlbuilder/README.md
deleted file mode 100644
index 785c4dd6369..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# xmlbuilder-js
-
-An XML builder for [node.js](https://nodejs.org/) similar to
-[java-xmlbuilder](https://github.com/jmurty/java-xmlbuilder).
-
-[![License](http://img.shields.io/npm/l/xmlbuilder.svg?style=flat-square)](http://opensource.org/licenses/MIT)
-[![NPM Version](http://img.shields.io/npm/v/xmlbuilder.svg?style=flat-square)](https://npmjs.com/package/xmlbuilder)
-[![NPM Downloads](https://img.shields.io/npm/dm/xmlbuilder.svg?style=flat-square)](https://npmjs.com/package/xmlbuilder)
-
-[![Build Status](http://img.shields.io/travis/oozcitak/xmlbuilder-js.svg?style=flat-square)](http://travis-ci.org/oozcitak/xmlbuilder-js)
-[![Dev Dependency Status](http://img.shields.io/david/dev/oozcitak/xmlbuilder-js.svg?style=flat-square)](https://david-dm.org/oozcitak/xmlbuilder-js)
-[![Code Coverage](https://img.shields.io/coveralls/oozcitak/xmlbuilder-js.svg?style=flat-square)](https://coveralls.io/github/oozcitak/xmlbuilder-js)
-
-### Installation:
-
-``` sh
-npm install xmlbuilder
-```
-
-### Usage:
-
-``` js
-var builder = require('xmlbuilder');
-var xml = builder.create('root')
-  .ele('xmlbuilder')
-    .ele('repo', {'type': 'git'}, 'git://github.com/oozcitak/xmlbuilder-js.git')
-  .end({ pretty: true});
-
-console.log(xml);
-```
-
-will result in:
-
-``` xml
-<?xml version="1.0"?>
-<root>
-  <xmlbuilder>
-    <repo type="git">git://github.com/oozcitak/xmlbuilder-js.git</repo>
-  </xmlbuilder>
-</root>
-```
-
-It is also possible to convert objects into nodes:
-
-``` js
-builder.create({
-  root: {
-    xmlbuilder: {
-      repo: {
-        '@type': 'git', // attributes start with @
-        '#text': 'git://github.com/oozcitak/xmlbuilder-js.git' // text node
-      }
-    }
-  }
-});
-```
-
-If you need to do some processing:
-
-``` js
-var root = builder.create('squares');
-root.com('f(x) = x^2');
-for(var i = 1; i <= 5; i++)
-{
-  var item = root.ele('data');
-  item.att('x', i);
-  item.att('y', i * i);
-}
-```
-
-This will result in:
-
-``` xml
-<?xml version="1.0"?>
-<squares>
-  <!-- f(x) = x^2 -->
-  <data x="1" y="1"/>
-  <data x="2" y="4"/>
-  <data x="3" y="9"/>
-  <data x="4" y="16"/>
-  <data x="5" y="25"/>
-</squares>
-```
-
-See the [wiki](https://github.com/oozcitak/xmlbuilder-js/wiki) for details and [examples](https://github.com/oozcitak/xmlbuilder-js/wiki/Examples) for more complex examples.
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js b/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
deleted file mode 100644
index 908f8a8a537..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/Utility.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var assign, isArray, isEmpty, isFunction, isObject, isPlainObject,
-    slice = [].slice,
-    hasProp = {}.hasOwnProperty;
-
-  assign = function() {
-    var i, key, len, source, sources, target;
-    target = arguments[0], sources = 2 <= arguments.length ? slice.call(arguments, 1) : [];
-    if (isFunction(Object.assign)) {
-      Object.assign.apply(null, arguments);
-    } else {
-      for (i = 0, len = sources.length; i < len; i++) {
-        source = sources[i];
-        if (source != null) {
-          for (key in source) {
-            if (!hasProp.call(source, key)) continue;
-            target[key] = source[key];
-          }
-        }
-      }
-    }
-    return target;
-  };
-
-  isFunction = function(val) {
-    return !!val && Object.prototype.toString.call(val) === '[object Function]';
-  };
-
-  isObject = function(val) {
-    var ref;
-    return !!val && ((ref = typeof val) === 'function' || ref === 'object');
-  };
-
-  isArray = function(val) {
-    if (isFunction(Array.isArray)) {
-      return Array.isArray(val);
-    } else {
-      return Object.prototype.toString.call(val) === '[object Array]';
-    }
-  };
-
-  isEmpty = function(val) {
-    var key;
-    if (isArray(val)) {
-      return !val.length;
-    } else {
-      for (key in val) {
-        if (!hasProp.call(val, key)) continue;
-        return false;
-      }
-      return true;
-    }
-  };
-
-  isPlainObject = function(val) {
-    var ctor, proto;
-    return isObject(val) && (proto = Object.getPrototypeOf(val)) && (ctor = proto.constructor) && (typeof ctor === 'function') && (ctor instanceof ctor) && (Function.prototype.toString.call(ctor) === Function.prototype.toString.call(Object));
-  };
-
-  module.exports.assign = assign;
-
-  module.exports.isFunction = isFunction;
-
-  module.exports.isObject = isObject;
-
-  module.exports.isArray = isArray;
-
-  module.exports.isEmpty = isEmpty;
-
-  module.exports.isPlainObject = isPlainObject;
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
deleted file mode 100644
index 67cc0bcbdd8..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLAttribute.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLAttribute;
-
-  module.exports = XMLAttribute = (function() {
-    function XMLAttribute(parent, name, value) {
-      this.options = parent.options;
-      this.stringify = parent.stringify;
-      if (name == null) {
-        throw new Error("Missing attribute name of element " + parent.name);
-      }
-      if (value == null) {
-        throw new Error("Missing attribute value for attribute " + name + " of element " + parent.name);
-      }
-      this.name = this.stringify.attName(name);
-      this.value = this.stringify.attValue(value);
-    }
-
-    XMLAttribute.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLAttribute.prototype.toString = function(options) {
-      return this.options.writer.set(options).attribute(this);
-    };
-
-    return XMLAttribute;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
deleted file mode 100644
index 670e860889d..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLCData.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLCData, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLCData = (function(superClass) {
-    extend(XMLCData, superClass);
-
-    function XMLCData(parent, text) {
-      XMLCData.__super__.constructor.call(this, parent);
-      if (text == null) {
-        throw new Error("Missing CDATA text");
-      }
-      this.text = this.stringify.cdata(text);
-    }
-
-    XMLCData.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLCData.prototype.toString = function(options) {
-      return this.options.writer.set(options).cdata(this);
-    };
-
-    return XMLCData;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
deleted file mode 100644
index c189714abb3..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLComment.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLComment, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLComment = (function(superClass) {
-    extend(XMLComment, superClass);
-
-    function XMLComment(parent, text) {
-      XMLComment.__super__.constructor.call(this, parent);
-      if (text == null) {
-        throw new Error("Missing comment text");
-      }
-      this.text = this.stringify.comment(text);
-    }
-
-    XMLComment.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLComment.prototype.toString = function(options) {
-      return this.options.writer.set(options).comment(this);
-    };
-
-    return XMLComment;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
deleted file mode 100644
index 8f911c257dd..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDAttList.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDAttList, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDTDAttList = (function(superClass) {
-    extend(XMLDTDAttList, superClass);
-
-    function XMLDTDAttList(parent, elementName, attributeName, attributeType, defaultValueType, defaultValue) {
-      XMLDTDAttList.__super__.constructor.call(this, parent);
-      if (elementName == null) {
-        throw new Error("Missing DTD element name");
-      }
-      if (attributeName == null) {
-        throw new Error("Missing DTD attribute name");
-      }
-      if (!attributeType) {
-        throw new Error("Missing DTD attribute type");
-      }
-      if (!defaultValueType) {
-        throw new Error("Missing DTD attribute default");
-      }
-      if (defaultValueType.indexOf('#') !== 0) {
-        defaultValueType = '#' + defaultValueType;
-      }
-      if (!defaultValueType.match(/^(#REQUIRED|#IMPLIED|#FIXED|#DEFAULT)$/)) {
-        throw new Error("Invalid default value type; expected: #REQUIRED, #IMPLIED, #FIXED or #DEFAULT");
-      }
-      if (defaultValue && !defaultValueType.match(/^(#FIXED|#DEFAULT)$/)) {
-        throw new Error("Default value only applies to #FIXED or #DEFAULT");
-      }
-      this.elementName = this.stringify.eleName(elementName);
-      this.attributeName = this.stringify.attName(attributeName);
-      this.attributeType = this.stringify.dtdAttType(attributeType);
-      this.defaultValue = this.stringify.dtdAttDefault(defaultValue);
-      this.defaultValueType = defaultValueType;
-    }
-
-    XMLDTDAttList.prototype.toString = function(options) {
-      return this.options.writer.set(options).dtdAttList(this);
-    };
-
-    return XMLDTDAttList;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
deleted file mode 100644
index 43f5d05ec2b..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDElement.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDElement, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDTDElement = (function(superClass) {
-    extend(XMLDTDElement, superClass);
-
-    function XMLDTDElement(parent, name, value) {
-      XMLDTDElement.__super__.constructor.call(this, parent);
-      if (name == null) {
-        throw new Error("Missing DTD element name");
-      }
-      if (!value) {
-        value = '(#PCDATA)';
-      }
-      if (Array.isArray(value)) {
-        value = '(' + value.join(',') + ')';
-      }
-      this.name = this.stringify.eleName(name);
-      this.value = this.stringify.dtdElementValue(value);
-    }
-
-    XMLDTDElement.prototype.toString = function(options) {
-      return this.options.writer.set(options).dtdElement(this);
-    };
-
-    return XMLDTDElement;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
deleted file mode 100644
index 943f312d50b..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDEntity.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDEntity, XMLNode, isObject,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  isObject = require('./Utility').isObject;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDTDEntity = (function(superClass) {
-    extend(XMLDTDEntity, superClass);
-
-    function XMLDTDEntity(parent, pe, name, value) {
-      XMLDTDEntity.__super__.constructor.call(this, parent);
-      if (name == null) {
-        throw new Error("Missing entity name");
-      }
-      if (value == null) {
-        throw new Error("Missing entity value");
-      }
-      this.pe = !!pe;
-      this.name = this.stringify.eleName(name);
-      if (!isObject(value)) {
-        this.value = this.stringify.dtdEntityValue(value);
-      } else {
-        if (!value.pubID && !value.sysID) {
-          throw new Error("Public and/or system identifiers are required for an external entity");
-        }
-        if (value.pubID && !value.sysID) {
-          throw new Error("System identifier is required for a public external entity");
-        }
-        if (value.pubID != null) {
-          this.pubID = this.stringify.dtdPubID(value.pubID);
-        }
-        if (value.sysID != null) {
-          this.sysID = this.stringify.dtdSysID(value.sysID);
-        }
-        if (value.nData != null) {
-          this.nData = this.stringify.dtdNData(value.nData);
-        }
-        if (this.pe && this.nData) {
-          throw new Error("Notation declaration is not allowed in a parameter entity");
-        }
-      }
-    }
-
-    XMLDTDEntity.prototype.toString = function(options) {
-      return this.options.writer.set(options).dtdEntity(this);
-    };
-
-    return XMLDTDEntity;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
deleted file mode 100644
index 2c0c69820b8..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDTDNotation.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDNotation, XMLNode,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDTDNotation = (function(superClass) {
-    extend(XMLDTDNotation, superClass);
-
-    function XMLDTDNotation(parent, name, value) {
-      XMLDTDNotation.__super__.constructor.call(this, parent);
-      if (name == null) {
-        throw new Error("Missing notation name");
-      }
-      if (!value.pubID && !value.sysID) {
-        throw new Error("Public or system identifiers are required for an external entity");
-      }
-      this.name = this.stringify.eleName(name);
-      if (value.pubID != null) {
-        this.pubID = this.stringify.dtdPubID(value.pubID);
-      }
-      if (value.sysID != null) {
-        this.sysID = this.stringify.dtdSysID(value.sysID);
-      }
-    }
-
-    XMLDTDNotation.prototype.toString = function(options) {
-      return this.options.writer.set(options).dtdNotation(this);
-    };
-
-    return XMLDTDNotation;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
deleted file mode 100644
index 3251f289ff7..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDeclaration.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDeclaration, XMLNode, isObject,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  isObject = require('./Utility').isObject;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLDeclaration = (function(superClass) {
-    extend(XMLDeclaration, superClass);
-
-    function XMLDeclaration(parent, version, encoding, standalone) {
-      var ref;
-      XMLDeclaration.__super__.constructor.call(this, parent);
-      if (isObject(version)) {
-        ref = version, version = ref.version, encoding = ref.encoding, standalone = ref.standalone;
-      }
-      if (!version) {
-        version = '1.0';
-      }
-      this.version = this.stringify.xmlVersion(version);
-      if (encoding != null) {
-        this.encoding = this.stringify.xmlEncoding(encoding);
-      }
-      if (standalone != null) {
-        this.standalone = this.stringify.xmlStandalone(standalone);
-      }
-    }
-
-    XMLDeclaration.prototype.toString = function(options) {
-      return this.options.writer.set(options).declaration(this);
-    };
-
-    return XMLDeclaration;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
deleted file mode 100644
index 1bb0429ac50..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocType.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDocType, XMLNode, isObject,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  isObject = require('./Utility').isObject;
-
-  XMLNode = require('./XMLNode');
-
-  XMLDTDAttList = require('./XMLDTDAttList');
-
-  XMLDTDEntity = require('./XMLDTDEntity');
-
-  XMLDTDElement = require('./XMLDTDElement');
-
-  XMLDTDNotation = require('./XMLDTDNotation');
-
-  module.exports = XMLDocType = (function(superClass) {
-    extend(XMLDocType, superClass);
-
-    function XMLDocType(parent, pubID, sysID) {
-      var ref, ref1;
-      XMLDocType.__super__.constructor.call(this, parent);
-      this.documentObject = parent;
-      if (isObject(pubID)) {
-        ref = pubID, pubID = ref.pubID, sysID = ref.sysID;
-      }
-      if (sysID == null) {
-        ref1 = [pubID, sysID], sysID = ref1[0], pubID = ref1[1];
-      }
-      if (pubID != null) {
-        this.pubID = this.stringify.dtdPubID(pubID);
-      }
-      if (sysID != null) {
-        this.sysID = this.stringify.dtdSysID(sysID);
-      }
-    }
-
-    XMLDocType.prototype.element = function(name, value) {
-      var child;
-      child = new XMLDTDElement(this, name, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.attList = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
-      var child;
-      child = new XMLDTDAttList(this, elementName, attributeName, attributeType, defaultValueType, defaultValue);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.entity = function(name, value) {
-      var child;
-      child = new XMLDTDEntity(this, false, name, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.pEntity = function(name, value) {
-      var child;
-      child = new XMLDTDEntity(this, true, name, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.notation = function(name, value) {
-      var child;
-      child = new XMLDTDNotation(this, name, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLDocType.prototype.toString = function(options) {
-      return this.options.writer.set(options).docType(this);
-    };
-
-    XMLDocType.prototype.ele = function(name, value) {
-      return this.element(name, value);
-    };
-
-    XMLDocType.prototype.att = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
-      return this.attList(elementName, attributeName, attributeType, defaultValueType, defaultValue);
-    };
-
-    XMLDocType.prototype.ent = function(name, value) {
-      return this.entity(name, value);
-    };
-
-    XMLDocType.prototype.pent = function(name, value) {
-      return this.pEntity(name, value);
-    };
-
-    XMLDocType.prototype.not = function(name, value) {
-      return this.notation(name, value);
-    };
-
-    XMLDocType.prototype.up = function() {
-      return this.root() || this.documentObject;
-    };
-
-    return XMLDocType;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
deleted file mode 100644
index 38743ee3f4b..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocument.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDocument, XMLNode, XMLStringWriter, XMLStringifier, isPlainObject,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  isPlainObject = require('./Utility').isPlainObject;
-
-  XMLNode = require('./XMLNode');
-
-  XMLStringifier = require('./XMLStringifier');
-
-  XMLStringWriter = require('./XMLStringWriter');
-
-  module.exports = XMLDocument = (function(superClass) {
-    extend(XMLDocument, superClass);
-
-    function XMLDocument(options) {
-      XMLDocument.__super__.constructor.call(this, null);
-      options || (options = {});
-      if (!options.writer) {
-        options.writer = new XMLStringWriter();
-      }
-      this.options = options;
-      this.stringify = new XMLStringifier(options);
-      this.isDocument = true;
-    }
-
-    XMLDocument.prototype.end = function(writer) {
-      var writerOptions;
-      if (!writer) {
-        writer = this.options.writer;
-      } else if (isPlainObject(writer)) {
-        writerOptions = writer;
-        writer = this.options.writer.set(writerOptions);
-      }
-      return writer.document(this);
-    };
-
-    XMLDocument.prototype.toString = function(options) {
-      return this.options.writer.set(options).document(this);
-    };
-
-    return XMLDocument;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
deleted file mode 100644
index 00da8dcd2ab..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLDocumentCB.js
+++ /dev/null
@@ -1,402 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLAttribute, XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLDocumentCB, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStringWriter, XMLStringifier, XMLText, isFunction, isObject, isPlainObject, ref,
-    hasProp = {}.hasOwnProperty;
-
-  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction, isPlainObject = ref.isPlainObject;
-
-  XMLElement = require('./XMLElement');
-
-  XMLCData = require('./XMLCData');
-
-  XMLComment = require('./XMLComment');
-
-  XMLRaw = require('./XMLRaw');
-
-  XMLText = require('./XMLText');
-
-  XMLProcessingInstruction = require('./XMLProcessingInstruction');
-
-  XMLDeclaration = require('./XMLDeclaration');
-
-  XMLDocType = require('./XMLDocType');
-
-  XMLDTDAttList = require('./XMLDTDAttList');
-
-  XMLDTDEntity = require('./XMLDTDEntity');
-
-  XMLDTDElement = require('./XMLDTDElement');
-
-  XMLDTDNotation = require('./XMLDTDNotation');
-
-  XMLAttribute = require('./XMLAttribute');
-
-  XMLStringifier = require('./XMLStringifier');
-
-  XMLStringWriter = require('./XMLStringWriter');
-
-  module.exports = XMLDocumentCB = (function() {
-    function XMLDocumentCB(options, onData, onEnd) {
-      var writerOptions;
-      options || (options = {});
-      if (!options.writer) {
-        options.writer = new XMLStringWriter(options);
-      } else if (isPlainObject(options.writer)) {
-        writerOptions = options.writer;
-        options.writer = new XMLStringWriter(writerOptions);
-      }
-      this.options = options;
-      this.writer = options.writer;
-      this.stringify = new XMLStringifier(options);
-      this.onDataCallback = onData || function() {};
-      this.onEndCallback = onEnd || function() {};
-      this.currentNode = null;
-      this.currentLevel = -1;
-      this.openTags = {};
-      this.documentStarted = false;
-      this.documentCompleted = false;
-      this.root = null;
-    }
-
-    XMLDocumentCB.prototype.node = function(name, attributes, text) {
-      var ref1;
-      if (name == null) {
-        throw new Error("Missing node name");
-      }
-      if (this.root && this.currentLevel === -1) {
-        throw new Error("Document can only have one root node");
-      }
-      this.openCurrent();
-      name = name.valueOf();
-      if (attributes == null) {
-        attributes = {};
-      }
-      attributes = attributes.valueOf();
-      if (!isObject(attributes)) {
-        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
-      }
-      this.currentNode = new XMLElement(this, name, attributes);
-      this.currentNode.children = false;
-      this.currentLevel++;
-      this.openTags[this.currentLevel] = this.currentNode;
-      if (text != null) {
-        this.text(text);
-      }
-      return this;
-    };
-
-    XMLDocumentCB.prototype.element = function(name, attributes, text) {
-      if (this.currentNode && this.currentNode instanceof XMLDocType) {
-        return this.dtdElement.apply(this, arguments);
-      } else {
-        return this.node(name, attributes, text);
-      }
-    };
-
-    XMLDocumentCB.prototype.attribute = function(name, value) {
-      var attName, attValue;
-      if (!this.currentNode || this.currentNode.children) {
-        throw new Error("att() can only be used immediately after an ele() call in callback mode");
-      }
-      if (name != null) {
-        name = name.valueOf();
-      }
-      if (isObject(name)) {
-        for (attName in name) {
-          if (!hasProp.call(name, attName)) continue;
-          attValue = name[attName];
-          this.attribute(attName, attValue);
-        }
-      } else {
-        if (isFunction(value)) {
-          value = value.apply();
-        }
-        if (!this.options.skipNullAttributes || (value != null)) {
-          this.currentNode.attributes[name] = new XMLAttribute(this, name, value);
-        }
-      }
-      return this;
-    };
-
-    XMLDocumentCB.prototype.text = function(value) {
-      var node;
-      this.openCurrent();
-      node = new XMLText(this, value);
-      this.onData(this.writer.text(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.cdata = function(value) {
-      var node;
-      this.openCurrent();
-      node = new XMLCData(this, value);
-      this.onData(this.writer.cdata(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.comment = function(value) {
-      var node;
-      this.openCurrent();
-      node = new XMLComment(this, value);
-      this.onData(this.writer.comment(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.raw = function(value) {
-      var node;
-      this.openCurrent();
-      node = new XMLRaw(this, value);
-      this.onData(this.writer.raw(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.instruction = function(target, value) {
-      var i, insTarget, insValue, len, node;
-      this.openCurrent();
-      if (target != null) {
-        target = target.valueOf();
-      }
-      if (value != null) {
-        value = value.valueOf();
-      }
-      if (Array.isArray(target)) {
-        for (i = 0, len = target.length; i < len; i++) {
-          insTarget = target[i];
-          this.instruction(insTarget);
-        }
-      } else if (isObject(target)) {
-        for (insTarget in target) {
-          if (!hasProp.call(target, insTarget)) continue;
-          insValue = target[insTarget];
-          this.instruction(insTarget, insValue);
-        }
-      } else {
-        if (isFunction(value)) {
-          value = value.apply();
-        }
-        node = new XMLProcessingInstruction(this, target, value);
-        this.onData(this.writer.processingInstruction(node, this.currentLevel + 1));
-      }
-      return this;
-    };
-
-    XMLDocumentCB.prototype.declaration = function(version, encoding, standalone) {
-      var node;
-      this.openCurrent();
-      if (this.documentStarted) {
-        throw new Error("declaration() must be the first node");
-      }
-      node = new XMLDeclaration(this, version, encoding, standalone);
-      this.onData(this.writer.declaration(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.doctype = function(root, pubID, sysID) {
-      this.openCurrent();
-      if (root == null) {
-        throw new Error("Missing root node name");
-      }
-      if (this.root) {
-        throw new Error("dtd() must come before the root node");
-      }
-      this.currentNode = new XMLDocType(this, pubID, sysID);
-      this.currentNode.rootNodeName = root;
-      this.currentNode.children = false;
-      this.currentLevel++;
-      this.openTags[this.currentLevel] = this.currentNode;
-      return this;
-    };
-
-    XMLDocumentCB.prototype.dtdElement = function(name, value) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDElement(this, name, value);
-      this.onData(this.writer.dtdElement(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.attList = function(elementName, attributeName, attributeType, defaultValueType, defaultValue) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDAttList(this, elementName, attributeName, attributeType, defaultValueType, defaultValue);
-      this.onData(this.writer.dtdAttList(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.entity = function(name, value) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDEntity(this, false, name, value);
-      this.onData(this.writer.dtdEntity(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.pEntity = function(name, value) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDEntity(this, true, name, value);
-      this.onData(this.writer.dtdEntity(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.notation = function(name, value) {
-      var node;
-      this.openCurrent();
-      node = new XMLDTDNotation(this, name, value);
-      this.onData(this.writer.dtdNotation(node, this.currentLevel + 1));
-      return this;
-    };
-
-    XMLDocumentCB.prototype.up = function() {
-      if (this.currentLevel < 0) {
-        throw new Error("The document node has no parent");
-      }
-      if (this.currentNode) {
-        if (this.currentNode.children) {
-          this.closeNode(this.currentNode);
-        } else {
-          this.openNode(this.currentNode);
-        }
-        this.currentNode = null;
-      } else {
-        this.closeNode(this.openTags[this.currentLevel]);
-      }
-      delete this.openTags[this.currentLevel];
-      this.currentLevel--;
-      return this;
-    };
-
-    XMLDocumentCB.prototype.end = function() {
-      while (this.currentLevel >= 0) {
-        this.up();
-      }
-      return this.onEnd();
-    };
-
-    XMLDocumentCB.prototype.openCurrent = function() {
-      if (this.currentNode) {
-        this.currentNode.children = true;
-        return this.openNode(this.currentNode);
-      }
-    };
-
-    XMLDocumentCB.prototype.openNode = function(node) {
-      if (!node.isOpen) {
-        if (!this.root && this.currentLevel === 0 && node instanceof XMLElement) {
-          this.root = node;
-        }
-        this.onData(this.writer.openNode(node, this.currentLevel));
-        return node.isOpen = true;
-      }
-    };
-
-    XMLDocumentCB.prototype.closeNode = function(node) {
-      if (!node.isClosed) {
-        this.onData(this.writer.closeNode(node, this.currentLevel));
-        return node.isClosed = true;
-      }
-    };
-
-    XMLDocumentCB.prototype.onData = function(chunk) {
-      this.documentStarted = true;
-      return this.onDataCallback(chunk);
-    };
-
-    XMLDocumentCB.prototype.onEnd = function() {
-      this.documentCompleted = true;
-      return this.onEndCallback();
-    };
-
-    XMLDocumentCB.prototype.ele = function() {
-      return this.element.apply(this, arguments);
-    };
-
-    XMLDocumentCB.prototype.nod = function(name, attributes, text) {
-      return this.node(name, attributes, text);
-    };
-
-    XMLDocumentCB.prototype.txt = function(value) {
-      return this.text(value);
-    };
-
-    XMLDocumentCB.prototype.dat = function(value) {
-      return this.cdata(value);
-    };
-
-    XMLDocumentCB.prototype.com = function(value) {
-      return this.comment(value);
-    };
-
-    XMLDocumentCB.prototype.ins = function(target, value) {
-      return this.instruction(target, value);
-    };
-
-    XMLDocumentCB.prototype.dec = function(version, encoding, standalone) {
-      return this.declaration(version, encoding, standalone);
-    };
-
-    XMLDocumentCB.prototype.dtd = function(root, pubID, sysID) {
-      return this.doctype(root, pubID, sysID);
-    };
-
-    XMLDocumentCB.prototype.e = function(name, attributes, text) {
-      return this.element(name, attributes, text);
-    };
-
-    XMLDocumentCB.prototype.n = function(name, attributes, text) {
-      return this.node(name, attributes, text);
-    };
-
-    XMLDocumentCB.prototype.t = function(value) {
-      return this.text(value);
-    };
-
-    XMLDocumentCB.prototype.d = function(value) {
-      return this.cdata(value);
-    };
-
-    XMLDocumentCB.prototype.c = function(value) {
-      return this.comment(value);
-    };
-
-    XMLDocumentCB.prototype.r = function(value) {
-      return this.raw(value);
-    };
-
-    XMLDocumentCB.prototype.i = function(target, value) {
-      return this.instruction(target, value);
-    };
-
-    XMLDocumentCB.prototype.att = function() {
-      if (this.currentNode && this.currentNode instanceof XMLDocType) {
-        return this.attList.apply(this, arguments);
-      } else {
-        return this.attribute.apply(this, arguments);
-      }
-    };
-
-    XMLDocumentCB.prototype.a = function() {
-      if (this.currentNode && this.currentNode instanceof XMLDocType) {
-        return this.attList.apply(this, arguments);
-      } else {
-        return this.attribute.apply(this, arguments);
-      }
-    };
-
-    XMLDocumentCB.prototype.ent = function(name, value) {
-      return this.entity(name, value);
-    };
-
-    XMLDocumentCB.prototype.pent = function(name, value) {
-      return this.pEntity(name, value);
-    };
-
-    XMLDocumentCB.prototype.not = function(name, value) {
-      return this.notation(name, value);
-    };
-
-    return XMLDocumentCB;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
deleted file mode 100644
index bd1f46c9039..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLElement.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLAttribute, XMLElement, XMLNode, isFunction, isObject, ref,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction;
-
-  XMLNode = require('./XMLNode');
-
-  XMLAttribute = require('./XMLAttribute');
-
-  module.exports = XMLElement = (function(superClass) {
-    extend(XMLElement, superClass);
-
-    function XMLElement(parent, name, attributes) {
-      XMLElement.__super__.constructor.call(this, parent);
-      if (name == null) {
-        throw new Error("Missing element name");
-      }
-      this.name = this.stringify.eleName(name);
-      this.attributes = {};
-      if (attributes != null) {
-        this.attribute(attributes);
-      }
-      if (parent.isDocument) {
-        this.isRoot = true;
-        this.documentObject = parent;
-        parent.rootObject = this;
-      }
-    }
-
-    XMLElement.prototype.clone = function() {
-      var att, attName, clonedSelf, ref1;
-      clonedSelf = Object.create(this);
-      if (clonedSelf.isRoot) {
-        clonedSelf.documentObject = null;
-      }
-      clonedSelf.attributes = {};
-      ref1 = this.attributes;
-      for (attName in ref1) {
-        if (!hasProp.call(ref1, attName)) continue;
-        att = ref1[attName];
-        clonedSelf.attributes[attName] = att.clone();
-      }
-      clonedSelf.children = [];
-      this.children.forEach(function(child) {
-        var clonedChild;
-        clonedChild = child.clone();
-        clonedChild.parent = clonedSelf;
-        return clonedSelf.children.push(clonedChild);
-      });
-      return clonedSelf;
-    };
-
-    XMLElement.prototype.attribute = function(name, value) {
-      var attName, attValue;
-      if (name != null) {
-        name = name.valueOf();
-      }
-      if (isObject(name)) {
-        for (attName in name) {
-          if (!hasProp.call(name, attName)) continue;
-          attValue = name[attName];
-          this.attribute(attName, attValue);
-        }
-      } else {
-        if (isFunction(value)) {
-          value = value.apply();
-        }
-        if (!this.options.skipNullAttributes || (value != null)) {
-          this.attributes[name] = new XMLAttribute(this, name, value);
-        }
-      }
-      return this;
-    };
-
-    XMLElement.prototype.removeAttribute = function(name) {
-      var attName, i, len;
-      if (name == null) {
-        throw new Error("Missing attribute name");
-      }
-      name = name.valueOf();
-      if (Array.isArray(name)) {
-        for (i = 0, len = name.length; i < len; i++) {
-          attName = name[i];
-          delete this.attributes[attName];
-        }
-      } else {
-        delete this.attributes[name];
-      }
-      return this;
-    };
-
-    XMLElement.prototype.toString = function(options) {
-      return this.options.writer.set(options).element(this);
-    };
-
-    XMLElement.prototype.att = function(name, value) {
-      return this.attribute(name, value);
-    };
-
-    XMLElement.prototype.a = function(name, value) {
-      return this.attribute(name, value);
-    };
-
-    return XMLElement;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
deleted file mode 100644
index 00ab37d7fd5..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLNode.js
+++ /dev/null
@@ -1,432 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLCData, XMLComment, XMLDeclaration, XMLDocType, XMLElement, XMLNode, XMLProcessingInstruction, XMLRaw, XMLText, isEmpty, isFunction, isObject, ref,
-    hasProp = {}.hasOwnProperty;
-
-  ref = require('./Utility'), isObject = ref.isObject, isFunction = ref.isFunction, isEmpty = ref.isEmpty;
-
-  XMLElement = null;
-
-  XMLCData = null;
-
-  XMLComment = null;
-
-  XMLDeclaration = null;
-
-  XMLDocType = null;
-
-  XMLRaw = null;
-
-  XMLText = null;
-
-  XMLProcessingInstruction = null;
-
-  module.exports = XMLNode = (function() {
-    function XMLNode(parent) {
-      this.parent = parent;
-      if (this.parent) {
-        this.options = this.parent.options;
-        this.stringify = this.parent.stringify;
-      }
-      this.children = [];
-      if (!XMLElement) {
-        XMLElement = require('./XMLElement');
-        XMLCData = require('./XMLCData');
-        XMLComment = require('./XMLComment');
-        XMLDeclaration = require('./XMLDeclaration');
-        XMLDocType = require('./XMLDocType');
-        XMLRaw = require('./XMLRaw');
-        XMLText = require('./XMLText');
-        XMLProcessingInstruction = require('./XMLProcessingInstruction');
-      }
-    }
-
-    XMLNode.prototype.element = function(name, attributes, text) {
-      var childNode, item, j, k, key, lastChild, len, len1, ref1, val;
-      lastChild = null;
-      if (attributes == null) {
-        attributes = {};
-      }
-      attributes = attributes.valueOf();
-      if (!isObject(attributes)) {
-        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
-      }
-      if (name != null) {
-        name = name.valueOf();
-      }
-      if (Array.isArray(name)) {
-        for (j = 0, len = name.length; j < len; j++) {
-          item = name[j];
-          lastChild = this.element(item);
-        }
-      } else if (isFunction(name)) {
-        lastChild = this.element(name.apply());
-      } else if (isObject(name)) {
-        for (key in name) {
-          if (!hasProp.call(name, key)) continue;
-          val = name[key];
-          if (isFunction(val)) {
-            val = val.apply();
-          }
-          if ((isObject(val)) && (isEmpty(val))) {
-            val = null;
-          }
-          if (!this.options.ignoreDecorators && this.stringify.convertAttKey && key.indexOf(this.stringify.convertAttKey) === 0) {
-            lastChild = this.attribute(key.substr(this.stringify.convertAttKey.length), val);
-          } else if (!this.options.separateArrayItems && Array.isArray(val)) {
-            for (k = 0, len1 = val.length; k < len1; k++) {
-              item = val[k];
-              childNode = {};
-              childNode[key] = item;
-              lastChild = this.element(childNode);
-            }
-          } else if (isObject(val)) {
-            lastChild = this.element(key);
-            lastChild.element(val);
-          } else {
-            lastChild = this.element(key, val);
-          }
-        }
-      } else {
-        if (!this.options.ignoreDecorators && this.stringify.convertTextKey && name.indexOf(this.stringify.convertTextKey) === 0) {
-          lastChild = this.text(text);
-        } else if (!this.options.ignoreDecorators && this.stringify.convertCDataKey && name.indexOf(this.stringify.convertCDataKey) === 0) {
-          lastChild = this.cdata(text);
-        } else if (!this.options.ignoreDecorators && this.stringify.convertCommentKey && name.indexOf(this.stringify.convertCommentKey) === 0) {
-          lastChild = this.comment(text);
-        } else if (!this.options.ignoreDecorators && this.stringify.convertRawKey && name.indexOf(this.stringify.convertRawKey) === 0) {
-          lastChild = this.raw(text);
-        } else if (!this.options.ignoreDecorators && this.stringify.convertPIKey && name.indexOf(this.stringify.convertPIKey) === 0) {
-          lastChild = this.instruction(name.substr(this.stringify.convertPIKey.length), text);
-        } else {
-          lastChild = this.node(name, attributes, text);
-        }
-      }
-      if (lastChild == null) {
-        throw new Error("Could not create any elements with: " + name);
-      }
-      return lastChild;
-    };
-
-    XMLNode.prototype.insertBefore = function(name, attributes, text) {
-      var child, i, removed;
-      if (this.isRoot) {
-        throw new Error("Cannot insert elements at root level");
-      }
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i);
-      child = this.parent.element(name, attributes, text);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return child;
-    };
-
-    XMLNode.prototype.insertAfter = function(name, attributes, text) {
-      var child, i, removed;
-      if (this.isRoot) {
-        throw new Error("Cannot insert elements at root level");
-      }
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i + 1);
-      child = this.parent.element(name, attributes, text);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return child;
-    };
-
-    XMLNode.prototype.remove = function() {
-      var i, ref1;
-      if (this.isRoot) {
-        throw new Error("Cannot remove the root element");
-      }
-      i = this.parent.children.indexOf(this);
-      [].splice.apply(this.parent.children, [i, i - i + 1].concat(ref1 = [])), ref1;
-      return this.parent;
-    };
-
-    XMLNode.prototype.node = function(name, attributes, text) {
-      var child, ref1;
-      if (name != null) {
-        name = name.valueOf();
-      }
-      attributes || (attributes = {});
-      attributes = attributes.valueOf();
-      if (!isObject(attributes)) {
-        ref1 = [attributes, text], text = ref1[0], attributes = ref1[1];
-      }
-      child = new XMLElement(this, name, attributes);
-      if (text != null) {
-        child.text(text);
-      }
-      this.children.push(child);
-      return child;
-    };
-
-    XMLNode.prototype.text = function(value) {
-      var child;
-      child = new XMLText(this, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLNode.prototype.cdata = function(value) {
-      var child;
-      child = new XMLCData(this, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLNode.prototype.comment = function(value) {
-      var child;
-      child = new XMLComment(this, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLNode.prototype.commentBefore = function(value) {
-      var child, i, removed;
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i);
-      child = this.parent.comment(value);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return this;
-    };
-
-    XMLNode.prototype.commentAfter = function(value) {
-      var child, i, removed;
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i + 1);
-      child = this.parent.comment(value);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return this;
-    };
-
-    XMLNode.prototype.raw = function(value) {
-      var child;
-      child = new XMLRaw(this, value);
-      this.children.push(child);
-      return this;
-    };
-
-    XMLNode.prototype.instruction = function(target, value) {
-      var insTarget, insValue, instruction, j, len;
-      if (target != null) {
-        target = target.valueOf();
-      }
-      if (value != null) {
-        value = value.valueOf();
-      }
-      if (Array.isArray(target)) {
-        for (j = 0, len = target.length; j < len; j++) {
-          insTarget = target[j];
-          this.instruction(insTarget);
-        }
-      } else if (isObject(target)) {
-        for (insTarget in target) {
-          if (!hasProp.call(target, insTarget)) continue;
-          insValue = target[insTarget];
-          this.instruction(insTarget, insValue);
-        }
-      } else {
-        if (isFunction(value)) {
-          value = value.apply();
-        }
-        instruction = new XMLProcessingInstruction(this, target, value);
-        this.children.push(instruction);
-      }
-      return this;
-    };
-
-    XMLNode.prototype.instructionBefore = function(target, value) {
-      var child, i, removed;
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i);
-      child = this.parent.instruction(target, value);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return this;
-    };
-
-    XMLNode.prototype.instructionAfter = function(target, value) {
-      var child, i, removed;
-      i = this.parent.children.indexOf(this);
-      removed = this.parent.children.splice(i + 1);
-      child = this.parent.instruction(target, value);
-      Array.prototype.push.apply(this.parent.children, removed);
-      return this;
-    };
-
-    XMLNode.prototype.declaration = function(version, encoding, standalone) {
-      var doc, xmldec;
-      doc = this.document();
-      xmldec = new XMLDeclaration(doc, version, encoding, standalone);
-      if (doc.children[0] instanceof XMLDeclaration) {
-        doc.children[0] = xmldec;
-      } else {
-        doc.children.unshift(xmldec);
-      }
-      return doc.root() || doc;
-    };
-
-    XMLNode.prototype.doctype = function(pubID, sysID) {
-      var child, doc, doctype, i, j, k, len, len1, ref1, ref2;
-      doc = this.document();
-      doctype = new XMLDocType(doc, pubID, sysID);
-      ref1 = doc.children;
-      for (i = j = 0, len = ref1.length; j < len; i = ++j) {
-        child = ref1[i];
-        if (child instanceof XMLDocType) {
-          doc.children[i] = doctype;
-          return doctype;
-        }
-      }
-      ref2 = doc.children;
-      for (i = k = 0, len1 = ref2.length; k < len1; i = ++k) {
-        child = ref2[i];
-        if (child.isRoot) {
-          doc.children.splice(i, 0, doctype);
-          return doctype;
-        }
-      }
-      doc.children.push(doctype);
-      return doctype;
-    };
-
-    XMLNode.prototype.up = function() {
-      if (this.isRoot) {
-        throw new Error("The root node has no parent. Use doc() if you need to get the document object.");
-      }
-      return this.parent;
-    };
-
-    XMLNode.prototype.root = function() {
-      var node;
-      node = this;
-      while (node) {
-        if (node.isDocument) {
-          return node.rootObject;
-        } else if (node.isRoot) {
-          return node;
-        } else {
-          node = node.parent;
-        }
-      }
-    };
-
-    XMLNode.prototype.document = function() {
-      var node;
-      node = this;
-      while (node) {
-        if (node.isDocument) {
-          return node;
-        } else {
-          node = node.parent;
-        }
-      }
-    };
-
-    XMLNode.prototype.end = function(options) {
-      return this.document().end(options);
-    };
-
-    XMLNode.prototype.prev = function() {
-      var i;
-      i = this.parent.children.indexOf(this);
-      if (i < 1) {
-        throw new Error("Already at the first node");
-      }
-      return this.parent.children[i - 1];
-    };
-
-    XMLNode.prototype.next = function() {
-      var i;
-      i = this.parent.children.indexOf(this);
-      if (i === -1 || i === this.parent.children.length - 1) {
-        throw new Error("Already at the last node");
-      }
-      return this.parent.children[i + 1];
-    };
-
-    XMLNode.prototype.importDocument = function(doc) {
-      var clonedRoot;
-      clonedRoot = doc.root().clone();
-      clonedRoot.parent = this;
-      clonedRoot.isRoot = false;
-      this.children.push(clonedRoot);
-      return this;
-    };
-
-    XMLNode.prototype.ele = function(name, attributes, text) {
-      return this.element(name, attributes, text);
-    };
-
-    XMLNode.prototype.nod = function(name, attributes, text) {
-      return this.node(name, attributes, text);
-    };
-
-    XMLNode.prototype.txt = function(value) {
-      return this.text(value);
-    };
-
-    XMLNode.prototype.dat = function(value) {
-      return this.cdata(value);
-    };
-
-    XMLNode.prototype.com = function(value) {
-      return this.comment(value);
-    };
-
-    XMLNode.prototype.ins = function(target, value) {
-      return this.instruction(target, value);
-    };
-
-    XMLNode.prototype.doc = function() {
-      return this.document();
-    };
-
-    XMLNode.prototype.dec = function(version, encoding, standalone) {
-      return this.declaration(version, encoding, standalone);
-    };
-
-    XMLNode.prototype.dtd = function(pubID, sysID) {
-      return this.doctype(pubID, sysID);
-    };
-
-    XMLNode.prototype.e = function(name, attributes, text) {
-      return this.element(name, attributes, text);
-    };
-
-    XMLNode.prototype.n = function(name, attributes, text) {
-      return this.node(name, attributes, text);
-    };
-
-    XMLNode.prototype.t = function(value) {
-      return this.text(value);
-    };
-
-    XMLNode.prototype.d = function(value) {
-      return this.cdata(value);
-    };
-
-    XMLNode.prototype.c = function(value) {
-      return this.comment(value);
-    };
-
-    XMLNode.prototype.r = function(value) {
-      return this.raw(value);
-    };
-
-    XMLNode.prototype.i = function(target, value) {
-      return this.instruction(target, value);
-    };
-
-    XMLNode.prototype.u = function() {
-      return this.up();
-    };
-
-    XMLNode.prototype.importXMLBuilder = function(doc) {
-      return this.importDocument(doc);
-    };
-
-    return XMLNode;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
deleted file mode 100644
index e6f71d15311..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLProcessingInstruction.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLNode, XMLProcessingInstruction,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLProcessingInstruction = (function(superClass) {
-    extend(XMLProcessingInstruction, superClass);
-
-    function XMLProcessingInstruction(parent, target, value) {
-      XMLProcessingInstruction.__super__.constructor.call(this, parent);
-      if (target == null) {
-        throw new Error("Missing instruction target");
-      }
-      this.target = this.stringify.insTarget(target);
-      if (value) {
-        this.value = this.stringify.insValue(value);
-      }
-    }
-
-    XMLProcessingInstruction.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLProcessingInstruction.prototype.toString = function(options) {
-      return this.options.writer.set(options).processingInstruction(this);
-    };
-
-    return XMLProcessingInstruction;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
deleted file mode 100644
index dbe7fdcd42a..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLRaw.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLNode, XMLRaw,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLRaw = (function(superClass) {
-    extend(XMLRaw, superClass);
-
-    function XMLRaw(parent, text) {
-      XMLRaw.__super__.constructor.call(this, parent);
-      if (text == null) {
-        throw new Error("Missing raw text");
-      }
-      this.value = this.stringify.raw(text);
-    }
-
-    XMLRaw.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLRaw.prototype.toString = function(options) {
-      return this.options.writer.set(options).raw(this);
-    };
-
-    return XMLRaw;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
deleted file mode 100644
index 20d98eed6f7..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStreamWriter.js
+++ /dev/null
@@ -1,279 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStreamWriter, XMLText, XMLWriterBase,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLDeclaration = require('./XMLDeclaration');
-
-  XMLDocType = require('./XMLDocType');
-
-  XMLCData = require('./XMLCData');
-
-  XMLComment = require('./XMLComment');
-
-  XMLElement = require('./XMLElement');
-
-  XMLRaw = require('./XMLRaw');
-
-  XMLText = require('./XMLText');
-
-  XMLProcessingInstruction = require('./XMLProcessingInstruction');
-
-  XMLDTDAttList = require('./XMLDTDAttList');
-
-  XMLDTDElement = require('./XMLDTDElement');
-
-  XMLDTDEntity = require('./XMLDTDEntity');
-
-  XMLDTDNotation = require('./XMLDTDNotation');
-
-  XMLWriterBase = require('./XMLWriterBase');
-
-  module.exports = XMLStreamWriter = (function(superClass) {
-    extend(XMLStreamWriter, superClass);
-
-    function XMLStreamWriter(stream, options) {
-      XMLStreamWriter.__super__.constructor.call(this, options);
-      this.stream = stream;
-    }
-
-    XMLStreamWriter.prototype.document = function(doc) {
-      var child, i, j, len, len1, ref, ref1, results;
-      ref = doc.children;
-      for (i = 0, len = ref.length; i < len; i++) {
-        child = ref[i];
-        child.isLastRootNode = false;
-      }
-      doc.children[doc.children.length - 1].isLastRootNode = true;
-      ref1 = doc.children;
-      results = [];
-      for (j = 0, len1 = ref1.length; j < len1; j++) {
-        child = ref1[j];
-        switch (false) {
-          case !(child instanceof XMLDeclaration):
-            results.push(this.declaration(child));
-            break;
-          case !(child instanceof XMLDocType):
-            results.push(this.docType(child));
-            break;
-          case !(child instanceof XMLComment):
-            results.push(this.comment(child));
-            break;
-          case !(child instanceof XMLProcessingInstruction):
-            results.push(this.processingInstruction(child));
-            break;
-          default:
-            results.push(this.element(child));
-        }
-      }
-      return results;
-    };
-
-    XMLStreamWriter.prototype.attribute = function(att) {
-      return this.stream.write(' ' + att.name + '="' + att.value + '"');
-    };
-
-    XMLStreamWriter.prototype.cdata = function(node, level) {
-      return this.stream.write(this.space(level) + '<![CDATA[' + node.text + ']]>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.comment = function(node, level) {
-      return this.stream.write(this.space(level) + '<!-- ' + node.text + ' -->' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.declaration = function(node, level) {
-      this.stream.write(this.space(level));
-      this.stream.write('<?xml version="' + node.version + '"');
-      if (node.encoding != null) {
-        this.stream.write(' encoding="' + node.encoding + '"');
-      }
-      if (node.standalone != null) {
-        this.stream.write(' standalone="' + node.standalone + '"');
-      }
-      this.stream.write(this.spacebeforeslash + '?>');
-      return this.stream.write(this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.docType = function(node, level) {
-      var child, i, len, ref;
-      level || (level = 0);
-      this.stream.write(this.space(level));
-      this.stream.write('<!DOCTYPE ' + node.root().name);
-      if (node.pubID && node.sysID) {
-        this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
-      } else if (node.sysID) {
-        this.stream.write(' SYSTEM "' + node.sysID + '"');
-      }
-      if (node.children.length > 0) {
-        this.stream.write(' [');
-        this.stream.write(this.endline(node));
-        ref = node.children;
-        for (i = 0, len = ref.length; i < len; i++) {
-          child = ref[i];
-          switch (false) {
-            case !(child instanceof XMLDTDAttList):
-              this.dtdAttList(child, level + 1);
-              break;
-            case !(child instanceof XMLDTDElement):
-              this.dtdElement(child, level + 1);
-              break;
-            case !(child instanceof XMLDTDEntity):
-              this.dtdEntity(child, level + 1);
-              break;
-            case !(child instanceof XMLDTDNotation):
-              this.dtdNotation(child, level + 1);
-              break;
-            case !(child instanceof XMLCData):
-              this.cdata(child, level + 1);
-              break;
-            case !(child instanceof XMLComment):
-              this.comment(child, level + 1);
-              break;
-            case !(child instanceof XMLProcessingInstruction):
-              this.processingInstruction(child, level + 1);
-              break;
-            default:
-              throw new Error("Unknown DTD node type: " + child.constructor.name);
-          }
-        }
-        this.stream.write(']');
-      }
-      this.stream.write(this.spacebeforeslash + '>');
-      return this.stream.write(this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.element = function(node, level) {
-      var att, child, i, len, name, ref, ref1, space;
-      level || (level = 0);
-      space = this.space(level);
-      this.stream.write(space + '<' + node.name);
-      ref = node.attributes;
-      for (name in ref) {
-        if (!hasProp.call(ref, name)) continue;
-        att = ref[name];
-        this.attribute(att);
-      }
-      if (node.children.length === 0 || node.children.every(function(e) {
-        return e.value === '';
-      })) {
-        if (this.allowEmpty) {
-          this.stream.write('></' + node.name + '>');
-        } else {
-          this.stream.write(this.spacebeforeslash + '/>');
-        }
-      } else if (this.pretty && node.children.length === 1 && (node.children[0].value != null)) {
-        this.stream.write('>');
-        this.stream.write(node.children[0].value);
-        this.stream.write('</' + node.name + '>');
-      } else {
-        this.stream.write('>' + this.newline);
-        ref1 = node.children;
-        for (i = 0, len = ref1.length; i < len; i++) {
-          child = ref1[i];
-          switch (false) {
-            case !(child instanceof XMLCData):
-              this.cdata(child, level + 1);
-              break;
-            case !(child instanceof XMLComment):
-              this.comment(child, level + 1);
-              break;
-            case !(child instanceof XMLElement):
-              this.element(child, level + 1);
-              break;
-            case !(child instanceof XMLRaw):
-              this.raw(child, level + 1);
-              break;
-            case !(child instanceof XMLText):
-              this.text(child, level + 1);
-              break;
-            case !(child instanceof XMLProcessingInstruction):
-              this.processingInstruction(child, level + 1);
-              break;
-            default:
-              throw new Error("Unknown XML node type: " + child.constructor.name);
-          }
-        }
-        this.stream.write(space + '</' + node.name + '>');
-      }
-      return this.stream.write(this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.processingInstruction = function(node, level) {
-      this.stream.write(this.space(level) + '<?' + node.target);
-      if (node.value) {
-        this.stream.write(' ' + node.value);
-      }
-      return this.stream.write(this.spacebeforeslash + '?>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.raw = function(node, level) {
-      return this.stream.write(this.space(level) + node.value + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.text = function(node, level) {
-      return this.stream.write(this.space(level) + node.value + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.dtdAttList = function(node, level) {
-      this.stream.write(this.space(level) + '<!ATTLIST ' + node.elementName + ' ' + node.attributeName + ' ' + node.attributeType);
-      if (node.defaultValueType !== '#DEFAULT') {
-        this.stream.write(' ' + node.defaultValueType);
-      }
-      if (node.defaultValue) {
-        this.stream.write(' "' + node.defaultValue + '"');
-      }
-      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.dtdElement = function(node, level) {
-      this.stream.write(this.space(level) + '<!ELEMENT ' + node.name + ' ' + node.value);
-      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.dtdEntity = function(node, level) {
-      this.stream.write(this.space(level) + '<!ENTITY');
-      if (node.pe) {
-        this.stream.write(' %');
-      }
-      this.stream.write(' ' + node.name);
-      if (node.value) {
-        this.stream.write(' "' + node.value + '"');
-      } else {
-        if (node.pubID && node.sysID) {
-          this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
-        } else if (node.sysID) {
-          this.stream.write(' SYSTEM "' + node.sysID + '"');
-        }
-        if (node.nData) {
-          this.stream.write(' NDATA ' + node.nData);
-        }
-      }
-      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.dtdNotation = function(node, level) {
-      this.stream.write(this.space(level) + '<!NOTATION ' + node.name);
-      if (node.pubID && node.sysID) {
-        this.stream.write(' PUBLIC "' + node.pubID + '" "' + node.sysID + '"');
-      } else if (node.pubID) {
-        this.stream.write(' PUBLIC "' + node.pubID + '"');
-      } else if (node.sysID) {
-        this.stream.write(' SYSTEM "' + node.sysID + '"');
-      }
-      return this.stream.write(this.spacebeforeslash + '>' + this.endline(node));
-    };
-
-    XMLStreamWriter.prototype.endline = function(node) {
-      if (!node.isLastRootNode) {
-        return this.newline;
-      } else {
-        return '';
-      }
-    };
-
-    return XMLStreamWriter;
-
-  })(XMLWriterBase);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
deleted file mode 100644
index 49da759b409..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringWriter.js
+++ /dev/null
@@ -1,334 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLCData, XMLComment, XMLDTDAttList, XMLDTDElement, XMLDTDEntity, XMLDTDNotation, XMLDeclaration, XMLDocType, XMLElement, XMLProcessingInstruction, XMLRaw, XMLStringWriter, XMLText, XMLWriterBase,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLDeclaration = require('./XMLDeclaration');
-
-  XMLDocType = require('./XMLDocType');
-
-  XMLCData = require('./XMLCData');
-
-  XMLComment = require('./XMLComment');
-
-  XMLElement = require('./XMLElement');
-
-  XMLRaw = require('./XMLRaw');
-
-  XMLText = require('./XMLText');
-
-  XMLProcessingInstruction = require('./XMLProcessingInstruction');
-
-  XMLDTDAttList = require('./XMLDTDAttList');
-
-  XMLDTDElement = require('./XMLDTDElement');
-
-  XMLDTDEntity = require('./XMLDTDEntity');
-
-  XMLDTDNotation = require('./XMLDTDNotation');
-
-  XMLWriterBase = require('./XMLWriterBase');
-
-  module.exports = XMLStringWriter = (function(superClass) {
-    extend(XMLStringWriter, superClass);
-
-    function XMLStringWriter(options) {
-      XMLStringWriter.__super__.constructor.call(this, options);
-    }
-
-    XMLStringWriter.prototype.document = function(doc) {
-      var child, i, len, r, ref;
-      this.textispresent = false;
-      r = '';
-      ref = doc.children;
-      for (i = 0, len = ref.length; i < len; i++) {
-        child = ref[i];
-        r += (function() {
-          switch (false) {
-            case !(child instanceof XMLDeclaration):
-              return this.declaration(child);
-            case !(child instanceof XMLDocType):
-              return this.docType(child);
-            case !(child instanceof XMLComment):
-              return this.comment(child);
-            case !(child instanceof XMLProcessingInstruction):
-              return this.processingInstruction(child);
-            default:
-              return this.element(child, 0);
-          }
-        }).call(this);
-      }
-      if (this.pretty && r.slice(-this.newline.length) === this.newline) {
-        r = r.slice(0, -this.newline.length);
-      }
-      return r;
-    };
-
-    XMLStringWriter.prototype.attribute = function(att) {
-      return ' ' + att.name + '="' + att.value + '"';
-    };
-
-    XMLStringWriter.prototype.cdata = function(node, level) {
-      return this.space(level) + '<![CDATA[' + node.text + ']]>' + this.newline;
-    };
-
-    XMLStringWriter.prototype.comment = function(node, level) {
-      return this.space(level) + '<!-- ' + node.text + ' -->' + this.newline;
-    };
-
-    XMLStringWriter.prototype.declaration = function(node, level) {
-      var r;
-      r = this.space(level);
-      r += '<?xml version="' + node.version + '"';
-      if (node.encoding != null) {
-        r += ' encoding="' + node.encoding + '"';
-      }
-      if (node.standalone != null) {
-        r += ' standalone="' + node.standalone + '"';
-      }
-      r += this.spacebeforeslash + '?>';
-      r += this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.docType = function(node, level) {
-      var child, i, len, r, ref;
-      level || (level = 0);
-      r = this.space(level);
-      r += '<!DOCTYPE ' + node.root().name;
-      if (node.pubID && node.sysID) {
-        r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
-      } else if (node.sysID) {
-        r += ' SYSTEM "' + node.sysID + '"';
-      }
-      if (node.children.length > 0) {
-        r += ' [';
-        r += this.newline;
-        ref = node.children;
-        for (i = 0, len = ref.length; i < len; i++) {
-          child = ref[i];
-          r += (function() {
-            switch (false) {
-              case !(child instanceof XMLDTDAttList):
-                return this.dtdAttList(child, level + 1);
-              case !(child instanceof XMLDTDElement):
-                return this.dtdElement(child, level + 1);
-              case !(child instanceof XMLDTDEntity):
-                return this.dtdEntity(child, level + 1);
-              case !(child instanceof XMLDTDNotation):
-                return this.dtdNotation(child, level + 1);
-              case !(child instanceof XMLCData):
-                return this.cdata(child, level + 1);
-              case !(child instanceof XMLComment):
-                return this.comment(child, level + 1);
-              case !(child instanceof XMLProcessingInstruction):
-                return this.processingInstruction(child, level + 1);
-              default:
-                throw new Error("Unknown DTD node type: " + child.constructor.name);
-            }
-          }).call(this);
-        }
-        r += ']';
-      }
-      r += this.spacebeforeslash + '>';
-      r += this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.element = function(node, level) {
-      var att, child, i, j, len, len1, name, r, ref, ref1, ref2, space, textispresentwasset;
-      level || (level = 0);
-      textispresentwasset = false;
-      if (this.textispresent) {
-        this.newline = '';
-        this.pretty = false;
-      } else {
-        this.newline = this.newlinedefault;
-        this.pretty = this.prettydefault;
-      }
-      space = this.space(level);
-      r = '';
-      r += space + '<' + node.name;
-      ref = node.attributes;
-      for (name in ref) {
-        if (!hasProp.call(ref, name)) continue;
-        att = ref[name];
-        r += this.attribute(att);
-      }
-      if (node.children.length === 0 || node.children.every(function(e) {
-        return e.value === '';
-      })) {
-        if (this.allowEmpty) {
-          r += '></' + node.name + '>' + this.newline;
-        } else {
-          r += this.spacebeforeslash + '/>' + this.newline;
-        }
-      } else if (this.pretty && node.children.length === 1 && (node.children[0].value != null)) {
-        r += '>';
-        r += node.children[0].value;
-        r += '</' + node.name + '>' + this.newline;
-      } else {
-        if (this.dontprettytextnodes) {
-          ref1 = node.children;
-          for (i = 0, len = ref1.length; i < len; i++) {
-            child = ref1[i];
-            if (child.value != null) {
-              this.textispresent++;
-              textispresentwasset = true;
-              break;
-            }
-          }
-        }
-        if (this.textispresent) {
-          this.newline = '';
-          this.pretty = false;
-          space = this.space(level);
-        }
-        r += '>' + this.newline;
-        ref2 = node.children;
-        for (j = 0, len1 = ref2.length; j < len1; j++) {
-          child = ref2[j];
-          r += (function() {
-            switch (false) {
-              case !(child instanceof XMLCData):
-                return this.cdata(child, level + 1);
-              case !(child instanceof XMLComment):
-                return this.comment(child, level + 1);
-              case !(child instanceof XMLElement):
-                return this.element(child, level + 1);
-              case !(child instanceof XMLRaw):
-                return this.raw(child, level + 1);
-              case !(child instanceof XMLText):
-                return this.text(child, level + 1);
-              case !(child instanceof XMLProcessingInstruction):
-                return this.processingInstruction(child, level + 1);
-              default:
-                throw new Error("Unknown XML node type: " + child.constructor.name);
-            }
-          }).call(this);
-        }
-        if (textispresentwasset) {
-          this.textispresent--;
-        }
-        if (!this.textispresent) {
-          this.newline = this.newlinedefault;
-          this.pretty = this.prettydefault;
-        }
-        r += space + '</' + node.name + '>' + this.newline;
-      }
-      return r;
-    };
-
-    XMLStringWriter.prototype.processingInstruction = function(node, level) {
-      var r;
-      r = this.space(level) + '<?' + node.target;
-      if (node.value) {
-        r += ' ' + node.value;
-      }
-      r += this.spacebeforeslash + '?>' + this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.raw = function(node, level) {
-      return this.space(level) + node.value + this.newline;
-    };
-
-    XMLStringWriter.prototype.text = function(node, level) {
-      return this.space(level) + node.value + this.newline;
-    };
-
-    XMLStringWriter.prototype.dtdAttList = function(node, level) {
-      var r;
-      r = this.space(level) + '<!ATTLIST ' + node.elementName + ' ' + node.attributeName + ' ' + node.attributeType;
-      if (node.defaultValueType !== '#DEFAULT') {
-        r += ' ' + node.defaultValueType;
-      }
-      if (node.defaultValue) {
-        r += ' "' + node.defaultValue + '"';
-      }
-      r += this.spacebeforeslash + '>' + this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.dtdElement = function(node, level) {
-      return this.space(level) + '<!ELEMENT ' + node.name + ' ' + node.value + this.spacebeforeslash + '>' + this.newline;
-    };
-
-    XMLStringWriter.prototype.dtdEntity = function(node, level) {
-      var r;
-      r = this.space(level) + '<!ENTITY';
-      if (node.pe) {
-        r += ' %';
-      }
-      r += ' ' + node.name;
-      if (node.value) {
-        r += ' "' + node.value + '"';
-      } else {
-        if (node.pubID && node.sysID) {
-          r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
-        } else if (node.sysID) {
-          r += ' SYSTEM "' + node.sysID + '"';
-        }
-        if (node.nData) {
-          r += ' NDATA ' + node.nData;
-        }
-      }
-      r += this.spacebeforeslash + '>' + this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.dtdNotation = function(node, level) {
-      var r;
-      r = this.space(level) + '<!NOTATION ' + node.name;
-      if (node.pubID && node.sysID) {
-        r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
-      } else if (node.pubID) {
-        r += ' PUBLIC "' + node.pubID + '"';
-      } else if (node.sysID) {
-        r += ' SYSTEM "' + node.sysID + '"';
-      }
-      r += this.spacebeforeslash + '>' + this.newline;
-      return r;
-    };
-
-    XMLStringWriter.prototype.openNode = function(node, level) {
-      var att, name, r, ref;
-      level || (level = 0);
-      if (node instanceof XMLElement) {
-        r = this.space(level) + '<' + node.name;
-        ref = node.attributes;
-        for (name in ref) {
-          if (!hasProp.call(ref, name)) continue;
-          att = ref[name];
-          r += this.attribute(att);
-        }
-        r += (node.children ? '>' : '/>') + this.newline;
-        return r;
-      } else {
-        r = this.space(level) + '<!DOCTYPE ' + node.rootNodeName;
-        if (node.pubID && node.sysID) {
-          r += ' PUBLIC "' + node.pubID + '" "' + node.sysID + '"';
-        } else if (node.sysID) {
-          r += ' SYSTEM "' + node.sysID + '"';
-        }
-        r += (node.children ? ' [' : '>') + this.newline;
-        return r;
-      }
-    };
-
-    XMLStringWriter.prototype.closeNode = function(node, level) {
-      level || (level = 0);
-      switch (false) {
-        case !(node instanceof XMLElement):
-          return this.space(level) + '</' + node.name + '>' + this.newline;
-        case !(node instanceof XMLDocType):
-          return this.space(level) + ']>' + this.newline;
-      }
-    };
-
-    return XMLStringWriter;
-
-  })(XMLWriterBase);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
deleted file mode 100644
index c1844fb291d..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLStringifier.js
+++ /dev/null
@@ -1,163 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLStringifier,
-    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
-    hasProp = {}.hasOwnProperty;
-
-  module.exports = XMLStringifier = (function() {
-    function XMLStringifier(options) {
-      this.assertLegalChar = bind(this.assertLegalChar, this);
-      var key, ref, value;
-      options || (options = {});
-      this.noDoubleEncoding = options.noDoubleEncoding;
-      ref = options.stringify || {};
-      for (key in ref) {
-        if (!hasProp.call(ref, key)) continue;
-        value = ref[key];
-        this[key] = value;
-      }
-    }
-
-    XMLStringifier.prototype.eleName = function(val) {
-      val = '' + val || '';
-      return this.assertLegalChar(val);
-    };
-
-    XMLStringifier.prototype.eleText = function(val) {
-      val = '' + val || '';
-      return this.assertLegalChar(this.elEscape(val));
-    };
-
-    XMLStringifier.prototype.cdata = function(val) {
-      val = '' + val || '';
-      val = val.replace(']]>', ']]]]><![CDATA[>');
-      return this.assertLegalChar(val);
-    };
-
-    XMLStringifier.prototype.comment = function(val) {
-      val = '' + val || '';
-      if (val.match(/--/)) {
-        throw new Error("Comment text cannot contain double-hypen: " + val);
-      }
-      return this.assertLegalChar(val);
-    };
-
-    XMLStringifier.prototype.raw = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.attName = function(val) {
-      return val = '' + val || '';
-    };
-
-    XMLStringifier.prototype.attValue = function(val) {
-      val = '' + val || '';
-      return this.attEscape(val);
-    };
-
-    XMLStringifier.prototype.insTarget = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.insValue = function(val) {
-      val = '' + val || '';
-      if (val.match(/\?>/)) {
-        throw new Error("Invalid processing instruction value: " + val);
-      }
-      return val;
-    };
-
-    XMLStringifier.prototype.xmlVersion = function(val) {
-      val = '' + val || '';
-      if (!val.match(/1\.[0-9]+/)) {
-        throw new Error("Invalid version number: " + val);
-      }
-      return val;
-    };
-
-    XMLStringifier.prototype.xmlEncoding = function(val) {
-      val = '' + val || '';
-      if (!val.match(/^[A-Za-z](?:[A-Za-z0-9._-])*$/)) {
-        throw new Error("Invalid encoding: " + val);
-      }
-      return val;
-    };
-
-    XMLStringifier.prototype.xmlStandalone = function(val) {
-      if (val) {
-        return "yes";
-      } else {
-        return "no";
-      }
-    };
-
-    XMLStringifier.prototype.dtdPubID = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdSysID = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdElementValue = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdAttType = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdAttDefault = function(val) {
-      if (val != null) {
-        return '' + val || '';
-      } else {
-        return val;
-      }
-    };
-
-    XMLStringifier.prototype.dtdEntityValue = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.dtdNData = function(val) {
-      return '' + val || '';
-    };
-
-    XMLStringifier.prototype.convertAttKey = '@';
-
-    XMLStringifier.prototype.convertPIKey = '?';
-
-    XMLStringifier.prototype.convertTextKey = '#text';
-
-    XMLStringifier.prototype.convertCDataKey = '#cdata';
-
-    XMLStringifier.prototype.convertCommentKey = '#comment';
-
-    XMLStringifier.prototype.convertRawKey = '#raw';
-
-    XMLStringifier.prototype.assertLegalChar = function(str) {
-      var res;
-      res = str.match(/[\0\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/);
-      if (res) {
-        throw new Error("Invalid character in string: " + str + " at index " + res.index);
-      }
-      return str;
-    };
-
-    XMLStringifier.prototype.elEscape = function(str) {
-      var ampregex;
-      ampregex = this.noDoubleEncoding ? /(?!&\S+;)&/g : /&/g;
-      return str.replace(ampregex, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\r/g, '&#xD;');
-    };
-
-    XMLStringifier.prototype.attEscape = function(str) {
-      var ampregex;
-      ampregex = this.noDoubleEncoding ? /(?!&\S+;)&/g : /&/g;
-      return str.replace(ampregex, '&amp;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/\t/g, '&#x9;').replace(/\n/g, '&#xA;').replace(/\r/g, '&#xD;');
-    };
-
-    return XMLStringifier;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
deleted file mode 100644
index 0ecceb36c6e..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLText.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLNode, XMLText,
-    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
-
-  XMLNode = require('./XMLNode');
-
-  module.exports = XMLText = (function(superClass) {
-    extend(XMLText, superClass);
-
-    function XMLText(parent, text) {
-      XMLText.__super__.constructor.call(this, parent);
-      if (text == null) {
-        throw new Error("Missing element text");
-      }
-      this.value = this.stringify.eleText(text);
-    }
-
-    XMLText.prototype.clone = function() {
-      return Object.create(this);
-    };
-
-    XMLText.prototype.toString = function(options) {
-      return this.options.writer.set(options).text(this);
-    };
-
-    return XMLText;
-
-  })(XMLNode);
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js b/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
deleted file mode 100644
index dfa51d8efb3..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/XMLWriterBase.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLWriterBase,
-    hasProp = {}.hasOwnProperty;
-
-  module.exports = XMLWriterBase = (function() {
-    function XMLWriterBase(options) {
-      var key, ref, ref1, ref2, ref3, ref4, ref5, ref6, value;
-      options || (options = {});
-      this.pretty = options.pretty || false;
-      this.allowEmpty = (ref = options.allowEmpty) != null ? ref : false;
-      if (this.pretty) {
-        this.indent = (ref1 = options.indent) != null ? ref1 : '  ';
-        this.newline = (ref2 = options.newline) != null ? ref2 : '\n';
-        this.offset = (ref3 = options.offset) != null ? ref3 : 0;
-        this.dontprettytextnodes = (ref4 = options.dontprettytextnodes) != null ? ref4 : 0;
-      } else {
-        this.indent = '';
-        this.newline = '';
-        this.offset = 0;
-        this.dontprettytextnodes = 0;
-      }
-      this.spacebeforeslash = (ref5 = options.spacebeforeslash) != null ? ref5 : '';
-      if (this.spacebeforeslash === true) {
-        this.spacebeforeslash = ' ';
-      }
-      this.newlinedefault = this.newline;
-      this.prettydefault = this.pretty;
-      ref6 = options.writer || {};
-      for (key in ref6) {
-        if (!hasProp.call(ref6, key)) continue;
-        value = ref6[key];
-        this[key] = value;
-      }
-    }
-
-    XMLWriterBase.prototype.set = function(options) {
-      var key, ref, value;
-      options || (options = {});
-      if ("pretty" in options) {
-        this.pretty = options.pretty;
-      }
-      if ("allowEmpty" in options) {
-        this.allowEmpty = options.allowEmpty;
-      }
-      if (this.pretty) {
-        this.indent = "indent" in options ? options.indent : '  ';
-        this.newline = "newline" in options ? options.newline : '\n';
-        this.offset = "offset" in options ? options.offset : 0;
-        this.dontprettytextnodes = "dontprettytextnodes" in options ? options.dontprettytextnodes : 0;
-      } else {
-        this.indent = '';
-        this.newline = '';
-        this.offset = 0;
-        this.dontprettytextnodes = 0;
-      }
-      this.spacebeforeslash = "spacebeforeslash" in options ? options.spacebeforeslash : '';
-      if (this.spacebeforeslash === true) {
-        this.spacebeforeslash = ' ';
-      }
-      this.newlinedefault = this.newline;
-      this.prettydefault = this.pretty;
-      ref = options.writer || {};
-      for (key in ref) {
-        if (!hasProp.call(ref, key)) continue;
-        value = ref[key];
-        this[key] = value;
-      }
-      return this;
-    };
-
-    XMLWriterBase.prototype.space = function(level) {
-      var indent;
-      if (this.pretty) {
-        indent = (level || 0) + this.offset + 1;
-        if (indent > 0) {
-          return new Array(indent).join(this.indent);
-        } else {
-          return '';
-        }
-      } else {
-        return '';
-      }
-    };
-
-    return XMLWriterBase;
-
-  })();
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/lib/index.js b/scripts/metrics/node_modules/xmlbuilder/lib/index.js
deleted file mode 100644
index d2a1dc16fd1..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/lib/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Generated by CoffeeScript 1.12.7
-(function() {
-  var XMLDocument, XMLDocumentCB, XMLStreamWriter, XMLStringWriter, assign, isFunction, ref;
-
-  ref = require('./Utility'), assign = ref.assign, isFunction = ref.isFunction;
-
-  XMLDocument = require('./XMLDocument');
-
-  XMLDocumentCB = require('./XMLDocumentCB');
-
-  XMLStringWriter = require('./XMLStringWriter');
-
-  XMLStreamWriter = require('./XMLStreamWriter');
-
-  module.exports.create = function(name, xmldec, doctype, options) {
-    var doc, root;
-    if (name == null) {
-      throw new Error("Root element needs a name");
-    }
-    options = assign({}, xmldec, doctype, options);
-    doc = new XMLDocument(options);
-    root = doc.element(name);
-    if (!options.headless) {
-      doc.declaration(options);
-      if ((options.pubID != null) || (options.sysID != null)) {
-        doc.doctype(options);
-      }
-    }
-    return root;
-  };
-
-  module.exports.begin = function(options, onData, onEnd) {
-    var ref1;
-    if (isFunction(options)) {
-      ref1 = [options, onData], onData = ref1[0], onEnd = ref1[1];
-      options = {};
-    }
-    if (onData) {
-      return new XMLDocumentCB(options, onData, onEnd);
-    } else {
-      return new XMLDocument(options);
-    }
-  };
-
-  module.exports.stringWriter = function(options) {
-    return new XMLStringWriter(options);
-  };
-
-  module.exports.streamWriter = function(stream, options) {
-    return new XMLStreamWriter(stream, options);
-  };
-
-}).call(this);
diff --git a/scripts/metrics/node_modules/xmlbuilder/package.json b/scripts/metrics/node_modules/xmlbuilder/package.json
deleted file mode 100644
index d4fca7ded0c..00000000000
--- a/scripts/metrics/node_modules/xmlbuilder/package.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "_from": "xmlbuilder@~9.0.1",
-  "_id": "xmlbuilder@9.0.7",
-  "_inBundle": false,
-  "_integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
-  "_location": "/xmlbuilder",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "xmlbuilder@~9.0.1",
-    "name": "xmlbuilder",
-    "escapedName": "xmlbuilder",
-    "rawSpec": "~9.0.1",
-    "saveSpec": null,
-    "fetchSpec": "~9.0.1"
-  },
-  "_requiredBy": [
-    "/xml2js"
-  ],
-  "_resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-  "_shasum": "132ee63d2ec5565c557e20f4c22df9aca686b10d",
-  "_spec": "xmlbuilder@~9.0.1",
-  "_where": "/Users/zachary.butler/Work/auto-buildkite-pipelines/scripts/metrics/node_modules/xml2js",
-  "author": {
-    "name": "Ozgur Ozcitak",
-    "email": "oozcitak@gmail.com"
-  },
-  "bugs": {
-    "url": "http://github.com/oozcitak/xmlbuilder-js/issues"
-  },
-  "bundleDependencies": false,
-  "contributors": [],
-  "dependencies": {},
-  "deprecated": false,
-  "description": "An XML builder for node.js",
-  "devDependencies": {
-    "coffee-coverage": "2.*",
-    "coffeescript": "1.*",
-    "coveralls": "*",
-    "istanbul": "*",
-    "mocha": "*"
-  },
-  "engines": {
-    "node": ">=4.0"
-  },
-  "homepage": "http://github.com/oozcitak/xmlbuilder-js",
-  "keywords": [
-    "xml",
-    "xmlbuilder"
-  ],
-  "license": "MIT",
-  "main": "./lib/index",
-  "name": "xmlbuilder",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/oozcitak/xmlbuilder-js.git"
-  },
-  "scripts": {
-    "postpublish": "rm -rf lib",
-    "prepublish": "coffee -co lib src",
-    "test": "mocha \"test/**/*.coffee\" && istanbul report text lcov"
-  },
-  "version": "9.0.7"
-}
diff --git a/scripts/metrics/package-lock.json b/scripts/metrics/package-lock.json
deleted file mode 100644
index 6b58b61ebe9..00000000000
--- a/scripts/metrics/package-lock.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "node-fetch": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz",
-      "integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw=="
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "xml2js": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-      "requires": {
-        "sax": "1.2.4",
-        "xmlbuilder": "9.0.7"
-      }
-    },
-    "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
-    }
-  }
-}
diff --git a/scripts/metrics/test-metrics.js b/scripts/metrics/test-metrics.js
deleted file mode 100755
index 823a2e10b49..00000000000
--- a/scripts/metrics/test-metrics.js
+++ /dev/null
@@ -1,421 +0,0 @@
-#!/usr/bin/env node
-/* includes */
-const execSync = require('child_process').execSync; // run shell commands
-const fetch = require('node-fetch'); // downloading
-const fs = require('fs'); // file stream
-const XML = require('xml2js'); // parse xml
-
-/* globals */
-const buildkiteAccessToken = `?access_token=${process.env.BUILDKITE_API_KEY}`; // import buildkite access token from environment
-const debug = (process.env.DEBUG === 'true') ? true : false;
-let errorCount = 0; // count number of jobs which caused an error
-const EXIT_SUCCESS = 0;
-const inBuildkite = (process.env.BUILDKITE === 'true') ? true : false;
-const outputFile = 'test-metrics.json';
-const pipelineWhitelist = // the pipelines for which we run diagnostics
-[
-    'eosio',
-    'eosio-lrt'
-];
-
-/* functions */
-// given a url string, download a text document
-async function download(url)
-{
-    if (debug) console.log(`download(${url.replace(buildkiteAccessToken, '')})`); // DEBUG
-    const httpResponse = await fetch(url);
-    const body = await httpResponse.text();
-    if (isNullOrEmpty(body))
-    {
-        console.log(`ERROR: URL returned nothing! URL: ${url.replace(buildkiteAccessToken, '')}`);
-        const error =
-        {
-            http: { body, response: httpResponse, url},
-            message: 'http body is null or empty',
-            origin: 'download()',
-        }
-        throw error;
-    }
-    if (debug) console.log('Download complete.'); // DEBUG
-    return body;
-}
-
-// given a pipeline and a build number, get a build object
-async function getBuild(pipeline, buildNumber)
-{
-    if (debug) console.log(`getBuild(${pipeline}, ${buildNumber})`); // DEBUG
-    const httpResponse = await fetch(`https://api.buildkite.com/v2/organizations/EOSIO/pipelines/${pipeline}/builds/${buildNumber}${buildkiteAccessToken}`);
-    return httpResponse.json();
-}
-
-// given a buildkite job, return the environmental variables
-async function getEnvironment(job)
-{
-    if (debug) console.log('getEnvironment()'); // DEBUG
-    const httpResponse = await fetch(`${job.build_url}/jobs/${job.id}/env${buildkiteAccessToken}`);
-    const environment = await httpResponse.json();
-    return environment.env;
-}
-
-// given a string to search, a key as regex or a string, and optionally a start index, return the lowest line number containing the key
-function getLineNumber(text, key, startIndex)
-{
-    if (debug) console.log('getLineNumber()'); // DEBUG
-    const begin = (isNullOrEmpty(startIndex) || !Number.isInteger(startIndex) || startIndex < 1) ? 0 : startIndex;
-    let found = false;
-    let lineNumber = 0;
-    const regex = (key instanceof RegExp);
-    text.split('\n').some((line) =>
-    {
-        if (lineNumber >= begin && ((regex && key.test(line)) || (!regex && line.includes(key))))
-        {
-            found = true;
-            return true; // c-style break
-        }
-        lineNumber += 1;
-        return false; // for the linter, plz delete when linter is fixed
-    });
-    return (found) ? lineNumber : -1;
-}
-
-// given a buildkite job, return a sanitized log file
-async function getLog(job)
-{
-    if (debug) console.log(`getLog(${job.raw_log_url})`); // DEBUG
-    const logText = await download(job.raw_log_url + buildkiteAccessToken);
-    // returns log lowercase, with single spaces and '\n' only, and only ascii-printable characters
-    return sanitize(logText); // made this a separate function for unit testing purposes
-}
-
-// given a Buildkite environment, return the operating system used
-function getOS(environment)
-{
-    if (debug) console.log(`getOS(${environment.BUILDKITE_LABEL})`); // DEBUG
-    if (isNullOrEmpty(environment) || isNullOrEmpty(environment.BUILDKITE_LABEL))
-    {
-        console.log('ERROR: getOS() called with empty environment.BUILDKITE_LABEL!');
-        console.log(JSON.stringify(environment));
-        return null;
-    }
-    const label = environment.BUILDKITE_LABEL.toLowerCase();
-    if ((/aws(?!.*[23])/.test(label) || /amazon(?!.*[23])/.test(label)))
-        return 'Amazon Linux 1';
-    if (/aws.*2/.test(label) || /amazon.*2/.test(label))
-        return 'Amazon Linux 2';
-    if (/centos(?!.*[89])/.test(label))
-        return 'CentOS 7';
-    if (/fedora(?!.*2[89])/.test(label) && /fedora(?!.*3\d)/.test(label))
-        return 'Fedora 27';
-    if (/high.*sierra/.test(label))
-        return 'High Sierra';
-    if (/mojave/.test(label))
-        return 'Mojave';
-    if (/ubuntu.*16.*04/.test(label) || /ubuntu.*16(?!.*10)/.test(label))
-        return 'Ubuntu 16.04';
-    if (/ubuntu.*18.*04/.test(label) || /ubuntu.*18(?!.*10)/.test(label))
-        return 'Ubuntu 18.04';
-    if (/docker/.test(label))
-        return 'Docker';
-    return 'Unknown';
-}
-
-// given a Buildkite job, return the test-results.xml file as JSON
-async function getXML(job)
-{
-    if (debug) console.log('getXML()'); // DEBUG
-    const xmlFilename = 'test-results.xml';
-    const artifacts = await download(job.artifacts_url + buildkiteAccessToken);
-    const testResultsArtifact = JSON.parse(artifacts).filter(artifact => artifact.filename === xmlFilename);
-    if (isNullOrEmpty(testResultsArtifact))
-    {
-        console.log(`WARNING: No ${xmlFilename} found for "${job.name}"! Link: ${job.web_url}`);
-        return null;
-    }
-    const urlBuildkite = testResultsArtifact[0].download_url;
-    const rawXML = await download(urlBuildkite + buildkiteAccessToken);
-    const xmlOptions =
-    {
-        attrNameProcessors: [function lower(name) { return name.toLowerCase(); }],
-        explicitArray: false, // do not put single strings in single-element arrays
-        mergeAttrs: true, // make attributes children of their node
-        normalizeTags: true, // convert all tag names to lowercase
-    };
-    let xmlError, xmlTestResults;
-    await XML.parseString(rawXML, xmlOptions, (err, result) => {xmlTestResults = result; xmlError = err;});
-    if (isNullOrEmpty(xmlError))
-        return xmlTestResults;
-    console.log(`WARNING: Failed to parse xml for "${job.name}" job! Link: ${job.web_url}`);
-    console.log(JSON.stringify(xmlError));
-    return null;
-}
-
-// test if variable is empty
-function isNullOrEmpty(str)
-{
-    return (str === null || str === undefined || str.length === 0 || /^\s*$/.test(str));
-}
-
-// return array of test results from a buildkite job log
-function parseLog(logText)
-{
-    if (debug) console.log('parseLog()'); // DEBUG
-    const lines = logText.split('\n');
-    const resultLines = lines.filter(line => /test\s+#\d+/.test(line)); // 'grep' for the test result lines
-    // parse the strings and make test records
-    return resultLines.map((line) =>
-    {
-        const y = line.trim().split(/test\s+#\d+/).pop(); // remove everything before the test declaration
-        const parts = y.split(/\s+/).slice(1, -1); // split the line and remove the test number and time unit
-        const testName = parts[0];
-        const testTime = parts[(parts.length - 1)];
-        const rawResult = parts.slice(1, -1).join();
-        let testResult;
-        if (rawResult.includes('failed'))
-            testResult = 'Failed';
-        else if (rawResult.includes('passed'))
-            testResult = 'Passed';
-        else
-            testResult = 'Exception';
-        return { testName, testResult, testTime }; // create a test record
-    });
-}
-
-// return array of test results from an xUnit-formatted JSON object
-function parseXunit(xUnit)
-{
-    if (debug) console.log('parseXunit()'); // DEBUG
-    if (isNullOrEmpty(xUnit))
-    {
-        console.log('WARNING: xUnit is empty!');
-        return null;
-    }
-    return xUnit.site.testing.test.map((test) =>
-    {
-        const testName = test.name;
-        const testTime = test.results.namedmeasurement.filter(x => /execution\s+time/.test(x.name.toLowerCase()))[0].value;
-        let testResult;
-        if (test.status.includes('failed'))
-            testResult = 'Failed';
-        else if (test.status.includes('passed'))
-            testResult = 'Passed';
-        else
-            testResult = 'Exception';
-        return { testName, testResult, testTime };
-    });
-}
-
-// returns text lowercase, with single spaces and '\n' only, and only ascii-printable characters
-function sanitize(text)
-{
-    if (debug) console.log(`sanitize(text) where text.length = ${text.length} bytes`); // DEBUG
-    const chunkSize = 131072; // process text in 128 kB chunks
-    if (text.length > chunkSize)
-        return sanitize(text.slice(0, chunkSize)).concat(sanitize(text.slice(chunkSize)));
-    return text
-        .replace(/(?!\n)\r(?!\n)/g, '\n').replace(/\r/g, '') // convert all line endings to '\n'
-        .replace(/[^\S\n]+/g, ' ') // convert all whitespace to ' '
-        .replace(/[^ -~\n]+/g, '') // remove non-printable characters
-        .toLowerCase();
-}
-
-// input is array of whole lines containing "test #" and ("failed" or "exception")
-function testDiagnostics(test, logText)
-{
-    if (debug)
-    {
-        console.log(`testDiagnostics(test, logText) where logText.length = ${logText.length} bytes and test is`); // DEBUG
-        console.log(JSON.stringify(test));
-    }
-    // get basic information
-    const testResultLine = new RegExp(`test\\s+#\\d+.*${test.testName}`, 'g'); // regex defining "test #" line
-    const startIndex = getLineNumber(logText, testResultLine);
-    const output = { errorMsg: null, lineNumber: startIndex + 1, stackTrace: null }; // default output
-    // filter tests
-    if (test.testResult.toLowerCase() === 'passed')
-        return output;
-    output.errorMsg = 'test diangostics are not enabled for this pipeline';
-    if (!pipelineWhitelist.includes(test.pipeline))
-        return output;
-    // diagnostics
-    if (debug) console.log('Running diagnostics...'); // DEBUG
-    output.errorMsg = 'uncategorized';
-    const testLog = logText.split(testResultLine)[1].split(/test\s*#/)[0].split('\n'); // get log output from this test only, as array of lines
-    let errorLine = testLog[0]; // first line, from "test ## name" to '\n' exclusive
-    if (/\.+ *\** *not run\s+0+\.0+ sec$/.test(errorLine)) // not run
-        output.errorMsg = 'test not run';
-    else if (/\.+ *\** *time *out\s+\d+\.\d+ sec$/.test(errorLine)) // timeout
-        output.errorMsg = 'test timeout';
-    else if (/exception/.test(errorLine)) // test exception
-        output.errorMsg = errorLine.split('exception')[1].replace(/[: \d.]/g, '').replace(/sec$/, ''); // isolate the error message after exception
-    else if (/fc::.*exception/.test(testLog.filter(line => !isNullOrEmpty(line))[1])) // fc exception
-    {
-        [, errorLine] = testLog.filter(line => !isNullOrEmpty(line)); // get first line
-        output.errorMsg = `fc::${errorLine.split('::')[1].replace(/['",]/g, '').split(' ')[0]}`; // isolate fx exception body
-    }
-    else if (testLog.join('\n').includes('ctest:')) // ctest exception
-    {
-        [errorLine] = testLog.filter(line => line.includes('ctest:'));
-        output.errorMsg = `ctest:${errorLine.split('ctest:')[1]}`;
-    }
-    else if (!isNullOrEmpty(testLog.filter(line => /boost.+exception/.test(line)))) // boost exception
-    {
-        [errorLine] = testLog.filter(line => /boost.+exception/.test(line));
-        output.errorMsg = `boost: ${errorLine.replace(/[()]/g, '').split(/: (.+)/)[1]}`; // capturing parenthesis, split only at first ' :'
-        output.stackTrace = testLog.filter(line => /thread-\d+/.test(line))[0].split('thread-')[1].replace(/^\d+/, '').trim().replace(/[[]\d+m$/, ''); // get the bottom of the stack trace
-    }
-    else if (/unit[-_. ]+test/.test(test.testName) || /plugin[-_. ]+test/.test(test.testName)) // unit test, application exception
-    {
-        if (!isNullOrEmpty(testLog.filter(line => line.includes('exception: '))))
-        {
-            [errorLine] = testLog.filter(line => line.includes('exception: '));
-            [, output.errorMsg] = errorLine.replace(/[()]/g, '').split(/: (.+)/); // capturing parenthesis, split only at first ' :'
-            output.stackTrace = testLog.filter(line => /thread-\d+/.test(line))[0].split('thread-')[1].replace(/^\d+/, '').trim().replace(/[[]\d+m$/, ''); // get the bottom of the stack trace
-        }
-        // else uncategorized unit test
-    }
-    // else integration test, add cross-referencing code here (or uncategorized)
-    if (errorLine !== testLog[0]) // get real line number from log file
-        output.lineNumber = getLineNumber(logText, errorLine, startIndex) + 1;
-    return output;
-}
-
-// return test metrics given a buildkite job or build
-async function testMetrics(buildkiteObject)
-{
-    if (!isNullOrEmpty(buildkiteObject.type)) // input is a Buildkite job object
-    {
-        const job = buildkiteObject;
-        console.log(`Processing test metrics for "${job.name}"${(inBuildkite) ? '' : ` at ${job.web_url}`}...`);
-        if (isNullOrEmpty(job.exit_status))
-        {
-            console.log(`${(inBuildkite) ? '+++ :warning: ' : ''}WARNING: "${job.name}" was skipped!`);
-            return null;
-        }
-        // get test results
-        const logText = await getLog(job);
-        let testResults;
-        let xUnit;
-        try
-        {
-            xUnit = await getXML(job);
-            testResults = parseXunit(xUnit);
-        }
-        catch (error)
-        {
-            console.log(`XML processing failed for "${job.name}"! Link: ${job.web_url}`);
-            console.log(JSON.stringify(error));
-            testResults = null;
-        }
-        finally
-        {
-            if (isNullOrEmpty(testResults))
-                testResults = parseLog(logText);
-        }
-        // get test metrics
-        const env = await getEnvironment(job);
-        const metrics = [];
-        testResults.forEach((result) =>
-        {
-            // add test properties
-            const test =
-            {
-                ...result, // add testName, testResult, testTime
-                agentName: env.BUILDKITE_AGENT_NAME,
-                agentRole: env.BUILDKITE_AGENT_META_DATA_QUEUE || env.BUILDKITE_AGENT_META_DATA_ROLE,
-                branch: env.BUILDKITE_BRANCH,
-                buildNumber: env.BUILDKITE_BUILD_NUMBER,
-                commit: env.BUILDKITE_COMMIT,
-                job: env.BUILDKITE_LABEL,
-                os: getOS(env),
-                pipeline: env.BUILDKITE_PIPELINE_SLUG,
-                repo: env.BUILDKITE_REPO.replace(new RegExp('^git@github.com:(EOSIO/)?'), '').replace(new RegExp('.git$'), ''),
-                testTime: parseFloat(result.testTime),
-                url: job.web_url,
-            };
-            metrics.push({ ...test, ...testDiagnostics(test, logText) });
-        });
-        return metrics;
-    }
-    else if (!isNullOrEmpty(buildkiteObject.number)) // input is a Buildkite build object
-    {
-        const build = buildkiteObject;
-        console.log(`Processing test metrics for ${build.pipeline.slug} build ${build.number}${(inBuildkite) ? '' : ` at ${build.web_url}`}...`);
-        let metrics = [], promises = [];
-        // process test metrics
-        build.jobs.filter(job => job.type === 'script' && /test/.test(job.name.toLowerCase()) && ! /test metrics/.test(job.name.toLowerCase())).forEach((job) =>
-        {
-            promises.push(
-                testMetrics(job)
-                    .then((moreMetrics) => {
-                        metrics = metrics.concat(moreMetrics);
-                    }).catch((error) => {
-                        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Failed to process test metrics for "${job.name}"! Link: ${job.web_url}`);
-                        console.log(JSON.stringify(error));
-                        errorCount++;
-                    })
-            );
-        });
-        await Promise.all(promises);
-        return metrics;
-    }
-    else // something else
-    {
-        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Buildkite object not recognized or not a test step!`);
-        console.log(JSON.stringify({buildkiteObject}));
-        return null;
-    }
-}
-
-/* main */
-async function main()
-{
-    if (debug) console.log(`$ ${process.argv.join(' ')}`);
-    let build, metrics = null;
-    console.log(`${(inBuildkite) ? '+++ :evergreen_tree: ' : ''}Getting information from enviroment...`);
-    const buildNumber = process.env.BUILDKITE_BUILD_NUMBER || process.argv[2];
-    const pipeline = process.env.BUILDKITE_PIPELINE_SLUG || process.argv[3];
-    if (debug)
-    {
-        console.log(`BUILDKITE=${process.env.BUILDKITE}`);
-        console.log(`BUILDKITE_BUILD_NUMBER=${process.env.BUILDKITE_BUILD_NUMBER}`);
-        console.log(`BUILDKITE_PIPELINE_SLUG=${process.env.BUILDKITE_PIPELINE_SLUG}`);
-        console.log('    State:')
-        console.log(`inBuildkite = "${inBuildkite}"`);
-        console.log(`buildNumber = "${buildNumber}"`);
-        console.log(`pipeline    = "${pipeline}"`);
-    }
-    if (isNullOrEmpty(buildNumber) || isNullOrEmpty(pipeline) || isNullOrEmpty(process.env.BUILDKITE_API_KEY))
-    {
-        console.log(`${(inBuildkite) ? '+++ :no_entry: ' : ''}ERROR: Missing required inputs!`);
-        if (isNullOrEmpty(process.env.BUILDKITE_API_KEY)) console.log('- Buildkite API key, as BUILDKITE_API_KEY environment variable');
-        if (isNullOrEmpty(buildNumber)) console.log('- Build Number, as BUILDKITE_BUILD_NUMBER or argument 1');
-        if (isNullOrEmpty(pipeline)) console.log('- Pipeline Slug, as BUILDKITE_PIPELINE_SLUG or argument 2');
-        errorCount = -1;
-    }
-    else
-    {
-        console.log(`${(inBuildkite) ? '+++ :bar_chart: ' : ''}Processing test metrics...`);
-        build = await getBuild(pipeline, buildNumber);
-        metrics = await testMetrics(build);
-        console.log('Done processing test metrics.');
-    }
-    console.log(`${(inBuildkite) ? '+++ :pencil: ' : ''}Writing to file...`);
-    fs.writeFileSync(outputFile, JSON.stringify({ metrics }));
-    console.log(`Saved metrics to "${outputFile}" in "${process.cwd()}".`);
-    if (inBuildkite)
-    {
-        console.log('+++ :arrow_up: Uploading artifact...');
-        execSync(`buildkite-agent artifact upload ${outputFile}`);
-    }
-    if (errorCount === 0)
-        console.log(`${(inBuildkite) ? '+++ :white_check_mark: ' : ''}Done!`);
-    else
-    {
-        console.log(`${(inBuildkite) ? '+++ :warning: ' : ''}Finished with errors.`);
-        console.log(`Please send automation a link to this job${(isNullOrEmpty(build)) ? '.' : `: ${build.web_url}`}`);
-        console.log('@kj4ezj or @zreyn on Telegram');
-    }
-    return (inBuildkite) ? process.exit(EXIT_SUCCESS) : process.exit(errorCount);
-};
-
-main();
\ No newline at end of file
diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
deleted file mode 100755
index 07f9d39dd42..00000000000
--- a/scripts/package-builder.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
-echo '+++ :evergreen_tree: Configuring Environment'
-[[ "$BUILD_STEP" == '' ]] && BUILD_STEP="$1"
-[[ "$BUILD_STEP" == '' ]] && (echo '+++ :no_entry: ERROR: Build step name must be given as BUILD_STEP or argument 1!' && exit 1)
-if [[ "$(uname)" == 'Darwin' ]]; then
-    echo 'Darwin family detected, building for brew.'
-    [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.rb;*.tar.gz'
-    PACKAGE_TYPE='brew'
-else
-    . /etc/os-release
-    if [[ "$ID_LIKE" == 'rhel fedora' ]]; then
-        echo 'Fedora family detected, building for RPM.'
-        [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.rpm'
-        PACKAGE_TYPE='rpm'
-        mkdir -p /root/rpmbuild/BUILD
-        mkdir -p /root/rpmbuild/BUILDROOT
-        mkdir -p /root/rpmbuild/RPMS
-        mkdir -p /root/rpmbuild/SOURCES
-        mkdir -p /root/rpmbuild/SPECS
-        mkdir -p /root/rpmbuild/SRPMS
-        yum install -y rpm-build
-    elif [[ "$ID_LIKE" == 'debian' ]]; then
-        echo 'Debian family detected, building for dpkg.'
-        [[ "$ARTIFACT" == '' ]] && ARTIFACT='*.deb'
-        PACKAGE_TYPE='deb'
-    else
-        echo '+++ :no_entry: ERROR: Could not determine which operating system this script is running on!'
-        echo '$ uname'
-        uname
-        echo "ID_LIKE=\"$ID_LIKE\""
-        echo '$ cat /etc/os-release'
-        cat /etc/os-release
-        echo 'Exiting...'
-        exit 1
-    fi
-fi
-echo "+++ :arrow_down: Downloading Build Directory"
-buildkite-agent artifact download build.tar.gz . --step "$BUILD_STEP"
-echo "+++ :compression: Extracting Build Directory"
-[[ -d build ]] && rm -rf build
-tar -zxf build.tar.gz
-echo "+++ :package: Starting Package Build"
-BASE_COMMIT=$(cat build/programs/nodeos/config.hpp | grep 'version' | awk '{print $5}' | tr -d ';')
-BASE_COMMIT="${BASE_COMMIT:2:42}"
-echo "Found build against $BASE_COMMIT."
-cd build/packages
-chmod 755 ./*.sh
-./generate_package.sh "$PACKAGE_TYPE"
-echo '+++ :arrow_up: Uploading Artifacts'
-buildkite-agent artifact upload "./$ARTIFACT"
-for A in $(echo $ARTIFACT | tr ';' ' '); do
-    if [[ $(ls $A | grep -c '') == 0 ]]; then
-        echo "+++ :no_entry: ERROR: Expected artifact \"$A\" not found!"
-        echo '$ pwd'
-        pwd
-        echo '$ ls -la'
-        ls -la
-        exit 1
-    fi
-done
-echo "+++ :white_check_mark: Done."
\ No newline at end of file
diff --git a/scripts/parallel-test.bash b/scripts/parallel-test.bash
deleted file mode 100755
index 351d8145604..00000000000
--- a/scripts/parallel-test.bash
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-set -ieo pipefail
-# Load eosio specific helper functions
-. ./scripts/helpers/eosio.bash
-echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && execute tar -xzf build.tar.gz
-execute ls -l build
-execute cd build
-echo "+++ Running tests"
-# Counting tests available and if they get disabled for some reason, throw a failure
-TEST_COUNT=$($CTEST_BIN -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
-set +e # defer ctest error handling to end
-CORES=$(getconf _NPROCESSORS_ONLN)
-# interactive mode is necessary for our NP tests to function
-execute $CTEST_BIN -j $CORES -LE _tests --output-on-failure -T Test
-EXIT_STATUS=$?
-[[ "$EXIT_STATUS" == 0 ]] && set -e
-# Prepare tests for artifact upload
-echo "+++ Uploading artifacts"
-execute mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
-execute buildkite-agent artifact upload test-results.xml
-# ctest error handling
-if [[ $EXIT_STATUS != 0 ]]; then
-    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
-    execute buildkite-agent artifact upload config.ini
-    execute buildkite-agent artifact upload genesis.json
-    exit $EXIT_STATUS
-fi
\ No newline at end of file
diff --git a/scripts/serial-test.bash b/scripts/serial-test.bash
deleted file mode 100755
index b2d2f478f5f..00000000000
--- a/scripts/serial-test.bash
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-set -ieo pipefail
-# Load eosio specific helper functions
-. ./scripts/helpers/eosio.bash
-echo "+++ Extracting build directory"
-[[ -f build.tar.gz ]] && tar -xzf build.tar.gz
-execute ls -l build
-PATH=$PATH:$MONGODB_LINK_DIR/bin # nodeos_run_test-mongodb: no such file in directory 'mongo'
-execute cd build
-if [[ -f $MONGODB_BIN ]]; then
-    echo "+++ Killing old MongoDB"
-    $(pgrep mongod | xargs kill -9) || true
-    echo "+++ Starting MongoDB"
-    execute $MONGODB_BIN --fork --dbpath $MONGODB_DATA_DIR -f $MONGODB_CONF --logpath ./mongod.log
-fi
-echo "+++ Running tests"
-# Counting tests available and if they get disabled for some reason, throw a failure
-TEST_COUNT=$($CTEST_BIN -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
-[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
-set +e # defer ctest error handling to end
-# We cannot use interactive mode for ctest nonparallelizable tests
-execute $CTEST_BIN -L nonparallelizable_tests --output-on-failure -T Test
-EXIT_STATUS=$?
-[[ $EXIT_STATUS == 0 ]] && set -e
-echo "+++ Uploading artifacts"
-mv -f ./Testing/$(ls ./Testing/ | grep '20' | tail -n 1)/Test.xml test-results.xml
-execute buildkite-agent artifact upload test-results.xml
-[[ -f $MONGODB_BIN ]] && execute buildkite-agent artifact upload mongod.log
-# ctest error handling
-if [[ $EXIT_STATUS != 0 ]]; then
-    echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
-    execute buildkite-agent artifact upload config.ini
-    execute buildkite-agent artifact upload genesis.json
-    exit $EXIT_STATUS
-fi
\ No newline at end of file
diff --git a/scripts/submodule_check.sh b/scripts/submodule_check.sh
deleted file mode 100755
index b9ec13204fa..00000000000
--- a/scripts/submodule_check.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-REPO_DIR=`mktemp -d`
-git clone "$BUILDKITE_REPO" "$REPO_DIR"
-git submodule update --init --recursive
-cd "$REPO_DIR"
-
-declare -A PR_MAP
-declare -A BASE_MAP
-
-echo "getting submodule info for $BUILDKITE_BRANCH"
-git checkout "$BUILDKITE_BRANCH" &> /dev/null
-git submodule update --init &> /dev/null
-while read -r a b; do
-  PR_MAP[$a]=$b
-done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
-
-echo "getting submodule info for $BUILDKITE_PULL_REQUEST_BASE_BRANCH"
-git checkout "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" &> /dev/null
-git submodule update --init &> /dev/null
-while read -r a b; do
-  BASE_MAP[$a]=$b
-done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
-
-for k in "${!BASE_MAP[@]}"; do
-  base_ts=${BASE_MAP[$k]}
-  pr_ts=${PR_MAP[$k]}
-  echo "submodule $k"
-  echo "  timestamp on $BUILDKITE_BRANCH: $pr_ts"
-  echo "  timestamp on $BUILDKITE_PULL_REQUEST_BASE_BRANCH: $base_ts"
-  if (( $pr_ts < $base_ts)); then
-    echo "$k is older on $BUILDKITE_BRANCH than $BUILDKITE_PULL_REQUEST_BASE_BRANCH; investigating..."
-
-    if for c in `git log $BUILDKITE_BRANCH ^$BUILDKITE_PULL_REQUEST_BASE_BRANCH --pretty=format:"%H"`; do git show --pretty="" --name-only $c; done | grep -q "^$k$"; then
-      echo "ERROR: $k has regressed"
-      exit 1
-    else
-      echo "$k was not in the diff; no regression detected"
-    fi
-  fi
-done
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 57a44808dd6..06836e7a88f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -48,7 +48,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_multiple_version_protocol_feat
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/consensus-validation-malicious-producers.py ${CMAKE_CURRENT_BINARY_DIR}/consensus-validation-malicious-producers.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/validate-dirty-db.py ${CMAKE_CURRENT_BINARY_DIR}/validate-dirty-db.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/launcher_test.py ${CMAKE_CURRENT_BINARY_DIR}/launcher_test.py COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.sh ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.sh COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.py ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/prod_preactivation_test.py ${CMAKE_CURRENT_BINARY_DIR}/prod_preactivation_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-label.sh ${CMAKE_CURRENT_BINARY_DIR}/version-label.sh COPYONLY)
 
@@ -87,7 +87,8 @@ add_test(NAME validate_dirty_db_test COMMAND tests/validate-dirty-db.py -v --cle
 set_property(TEST validate_dirty_db_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME launcher_test COMMAND tests/launcher_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST launcher_test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME db_modes_test COMMAND tests/db_modes_test.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST db_modes_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME version-label-test COMMAND tests/version-label.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # Long running tests
diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
new file mode 100755
index 00000000000..2977c7c4c55
--- /dev/null
+++ b/tests/db_modes_test.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python3
+
+# This test is intended to verify that switching between DB modes "just works". Addtionally
+# it tries to make sure the dirty bit behaves as expected even in heap mode.
+
+from testUtils import Utils
+
+import decimal
+import re
+import os
+import signal
+import time
+import subprocess
+import shlex
+import tempfile
+import socket
+import sys
+
+errorExit=Utils.errorExit
+
+nodeosCmd="./programs/nodeos/nodeos -d {} --config-dir {} \
+--chain-state-db-size-mb 8 --chain-state-db-guard-size-mb 0 --reversible-blocks-db-size-mb 1 \
+--reversible-blocks-db-guard-size-mb 0 -e -peosio --plugin eosio::chain_api_plugin"
+
+cleosPath="./programs/cleos/cleos"
+port=8888
+
+def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
+    global port
+    port = 8888
+    print("looking for free ports")
+    tries = 200
+    while (tries > 0):
+        try:
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            server_address = ('127.0.0.1', port)
+            sock.bind(server_address)
+            sock.close()
+            time.sleep(1)
+            tries = 0
+        except:
+            tries = tries - 1
+            port = port + 1
+    # now start nodeos
+    cmdArr= preCmd + nodeosCmd + " --http-server-address=127.0.0.1:" + str(port) + extraCmd
+    print("port %d is free now, start to run nodeosCmd with extra parameter \"%s\"" % (port, extraCmd))
+    proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, preexec_fn=os.setsid)
+    tries = 10
+    ok = False
+    getInfoCmd = cleosPath + " -u http://127.0.0.1:" + str(port) + "/ get info"
+    while (tries > 0):
+        time.sleep(1)
+        reply = Utils.checkOutput(getInfoCmd, ignoreError=True)
+        if reply.find("server_version") != -1:
+            ok = True
+            time.sleep(1)
+            break
+        tries = tries - 1
+    if ok is True:
+        os.killpg(os.getpgid(proc.pid), killsig)
+    print("got result %d, killed with signal %d" % (ok, killsig))
+    return ok
+
+print("=== db_modes_test.py starts ===")
+
+tempdir = tempfile.mkdtemp()
+nodeosCmd = nodeosCmd.format(tempdir, tempdir)
+
+print("nodeosCmd is %s" % (nodeosCmd))
+
+#new chain with mapped mode
+if run_and_kill(" --delete-all-blocks") != True:
+    errorExit("Failed in new chain with mapped mode")
+
+#use previous DB with heap mode
+if run_and_kill(" --database-map-mode heap") != True:
+    errorExit("Failed in restart heap mode")
+
+#test locked mode if max locked memory is unlimited
+ulimits = Utils.checkOutput('ulimit -a', ignoreError=True).split("\n")
+for row in ulimits:
+    if row.find("max locked memory") != -1:
+        print("output of ulimit -a is: %s:" % (row))
+        if row.find("unlimited") != -1:
+            if run_and_kill(" --database-map-mode locked") != True:
+                errorExit("Failed in restart with locked mode")
+        else:
+            print("skip default locked mode test because max locked memory is not unlimited")
+        break
+
+#locked mode should fail when it's not possible to lock anything
+if run_and_kill(" --database-map-mode locked", preCmd="ulimit -l 0; ") != False:
+    errorExit("Test Failed in locked mode with ulimit -l 0")
+
+#But shouldn't result in the dirty flag staying set; so next launch should run
+if run_and_kill("") != True:
+    errorExit("Failed in restart heap mode")
+
+#Try killing with hard KILL
+if run_and_kill("", killsig=signal.SIGKILL) != True:
+    errorExit("Failed in restart & hardkill in heap mode")
+
+#should be dirty now
+if run_and_kill("") != False:
+    errorExit("dirty flag test failed")
+
+#should also still be dirty in heap mode
+if run_and_kill(" --database-map-mode heap") != False:
+    errorExit("dirty flag test failed")
+
+#start over again! but this time start with heap mode
+if run_and_kill(" --delete-all-blocks --database-map-mode heap") != True:
+    errorExit("Failed in restart heap mode with --delete-all-blocks")
+
+#Then switch back to mapped
+if run_and_kill("") != True:
+    errorExit("Failed in restart mapped mode")
+
+#try killing it while in heap mode
+if run_and_kill(" --database-map-mode heap", killsig=signal.SIGKILL) != True:
+    errorExit("Failed in restart heap mode and hardkill")
+
+#should be dirty if we run in either mode node
+if run_and_kill(" --database-map-mode heap") != False:
+    errorExit("dirty flag test failed in heap mode")
+
+if run_and_kill("") != False:
+    errorExit("dirty flag test failed in mapped mode")
+
+print("=== db_modes_test.py finished successfully ===")
+
diff --git a/tests/db_modes_test.sh b/tests/db_modes_test.sh
deleted file mode 100755
index f29b8ffcb51..00000000000
--- a/tests/db_modes_test.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env bash
-
-# This test is intended to verify that switching between DB modes "just works". Addtionally
-# it tries to make sure the dirty bit behaves as expected even in heap mode.
-
-set -euo pipefail
-
-VERBOSE=0
-TEST_LOCKED_MODE=0
-
-while getopts ":lv" opt; do
-   case ${opt} in
-      l)
-         TEST_LOCKED_MODE=1
-         ;;
-      v)
-         VERBOSE=1
-         set -o xtrace
-         ;;
-      \?)
-         echo "Use -v for verbose; -l to enable test of locked mode"
-         exit 1;
-         ;;
-      :)
-         echo "Invalid option"
-         exit 1;
-         ;;
-   esac
-done
-
-EOSIO_STUFF_DIR=$(mktemp -d)
-trap "rm -rf $EOSIO_STUFF_DIR" EXIT
-NODEOS_LAUNCH_PARAMS="./programs/nodeos/nodeos -d $EOSIO_STUFF_DIR --config-dir $EOSIO_STUFF_DIR \
---chain-state-db-size-mb 8 --chain-state-db-guard-size-mb 0 --reversible-blocks-db-size-mb 1 \
---reversible-blocks-db-guard-size-mb 0 -e -peosio"
-
-run_nodeos() {
-   if (( $VERBOSE == 0 )); then
-      $NODEOS_LAUNCH_PARAMS --http-server-address '' --p2p-listen-endpoint '' "$@" 2>/dev/null &
-   else
-      $NODEOS_LAUNCH_PARAMS --http-server-address '' --p2p-listen-endpoint '' "$@" &
-   fi
-}
-
-run_expect_success() {
-   run_nodeos "$@"
-   local NODEOS_PID=$!
-   sleep 5
-   kill $NODEOS_PID
-   wait $NODEOS_PID
-}
-
-run_and_kill() {
-   run_nodeos "$@"
-   local NODEOS_PID=$!
-   sleep 5
-   kill -KILL $NODEOS_PID
-   ! wait $NODEOS_PID
-}
-
-run_expect_failure() {
-   run_nodeos "$@"
-   local NODEOS_PID=$!
-   MYPID=$$
-   (sleep 10; kill -ALRM $MYPID) & local TIMER_PID=$!
-   trap "kill $NODEOS_PID; wait $NODEOS_PID; exit 1" ALRM
-   sleep 5
-   if wait $NODEOS_PID; then exit 1; fi
-   kill $TIMER_PID
-   trap ALRM
-}
-
-#new chain with mapped mode
-run_expect_success --delete-all-blocks
-#use previous DB with heap mode
-run_expect_success --database-map-mode heap
-#test lock mode if enabled
-if (( $TEST_LOCKED_MODE == 1 )); then
-   run_expect_success --database-map-mode locked
-fi
-#locked mode should fail when it's not possible to lock anything
-ulimit -l 0
-run_expect_failure --database-map-mode locked
-#But shouldn't result in the dirty flag staying set; so next launch should run
-run_expect_success
-#Try killing with KILL
-run_and_kill
-#should be dirty now
-run_expect_failure
-#should also still be dirty in heap mode
-run_expect_failure --database-map-mode heap
-
-#start over again! but this time start with heap mode
-run_expect_success --delete-all-blocks  --database-map-mode heap
-#Then switch back to mapped
-run_expect_success
-#try killing it while in heap mode
-run_and_kill --database-map-mode heap
-#should be dirty if we run in either mode node
-run_expect_failure --database-map-mode heap
-run_expect_failure
diff --git a/tests/testUtils.py b/tests/testUtils.py
index 4235e725ba5..dfd1823dbf7 100755
--- a/tests/testUtils.py
+++ b/tests/testUtils.py
@@ -152,8 +152,10 @@ def getChainStrategies():
 
     @staticmethod
     def checkOutput(cmd, ignoreError=False):
-        assert(isinstance(cmd, list))
-        popen=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        if (isinstance(cmd, list)):
+            popen=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        else:
+            popen=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
         (output,error)=popen.communicate()
         Utils.CheckOutputDeque.append((output,error,cmd))
         if popen.returncode != 0 and not ignoreError:

From 59517cf1f08ea13bc0bdecbda3c7997291d16be6 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 30 May 2019 09:56:18 -0400
Subject: [PATCH 0507/1648] README update

---
 README.md                    | 7 +++----
 scripts/helpers/general.bash | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 59f4d9c612a..9b9dc655d4d 100644
--- a/README.md
+++ b/README.md
@@ -68,10 +68,9 @@ $ sudo yum remove eosio
 
 #### Build Script Uninstall
 
-If you have previously installed EOSIO using build scripts, you have two options (neither impact your data directory by default):
-
-1. `./scripts/eosio_uninstall.sh` - Will uninstall eosio, yet leave dependencies (you can use --full to delete your data directory).
-2. `./scripts/full_uninstaller.sh` - Will uninstall eosio and dependencies (can be forced; see script).
+If you have previously installed EOSIO using build scripts, you may execute `./scripts/eosio_uninstall.sh` to uninstall.
+- Passing `--force` will answer yes to all prompts
+- Passing `--full` will remove data directories (be very careful with this)
 
 ## Supported Operating Systems
 EOSIO currently supports the following operating systems:  
diff --git a/scripts/helpers/general.bash b/scripts/helpers/general.bash
index bde02cc45cc..0fb8586285c 100755
--- a/scripts/helpers/general.bash
+++ b/scripts/helpers/general.bash
@@ -12,6 +12,8 @@ if [[ $- == *i* ]]; then # Disable if the shell isn't interactive (avoids: tput:
   export COLOR_WHITE=$(tput setaf 7)
 fi
 
+# Execution helpers; necessary for BATS testing and log output in buildkite
+
 function execute() {
   $VERBOSE && echo "--- Executing: $@"
   $DRYRUN || "$@"

From 381f27a9e1a828b31e9590bce66ea291c95d476b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 30 May 2019 10:58:04 -0400
Subject: [PATCH 0508/1648] testing github archive for boost

---
 scripts/helpers/eosio.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helpers/eosio.bash b/scripts/helpers/eosio.bash
index c35f336e8f0..36661eeeda6 100755
--- a/scripts/helpers/eosio.bash
+++ b/scripts/helpers/eosio.bash
@@ -270,7 +270,7 @@ function ensure-boost() {
             BOOTSTRAP_FLAGS="--with-toolset=clang"
         fi
 		execute bash -c "cd $SRC_DIR && \
-        curl -LO https://dl.bintray.com/boostorg/release/$BOOST_VERSION_MAJOR.$BOOST_VERSION_MINOR.$BOOST_VERSION_PATCH/source/boost_$BOOST_VERSION.tar.bz2 \
+        curl -LO https://github.com/boostorg/boost/archive/boost-$BOOST_VERSION.tar.gz \
         && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
         && cd $BOOST_ROOT \
         && ./bootstrap.sh ${BOOTSTRAP_FLAGS} --prefix=$BOOST_ROOT \

From 5af7c365e22252a32608b258099685db8c861e8b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 30 May 2019 11:35:33 -0400
Subject: [PATCH 0509/1648] testing github archive for boost

---
 scripts/helpers/eosio.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helpers/eosio.bash b/scripts/helpers/eosio.bash
index 36661eeeda6..6bdb2410ff9 100755
--- a/scripts/helpers/eosio.bash
+++ b/scripts/helpers/eosio.bash
@@ -270,7 +270,7 @@ function ensure-boost() {
             BOOTSTRAP_FLAGS="--with-toolset=clang"
         fi
 		execute bash -c "cd $SRC_DIR && \
-        curl -LO https://github.com/boostorg/boost/archive/boost-$BOOST_VERSION.tar.gz \
+        curl -LO https://github.com/boostorg/boost/archive/boost-$( echo $BOOST_VERSION | sed 's/_/./g' ).tar.gz \
         && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
         && cd $BOOST_ROOT \
         && ./bootstrap.sh ${BOOTSTRAP_FLAGS} --prefix=$BOOST_ROOT \

From e56fbf4b368479db8a710364962cee9fdda0f163 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 30 May 2019 13:46:25 -0400
Subject: [PATCH 0510/1648] boost revert

---
 scripts/helpers/eosio.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helpers/eosio.bash b/scripts/helpers/eosio.bash
index 6bdb2410ff9..c35f336e8f0 100755
--- a/scripts/helpers/eosio.bash
+++ b/scripts/helpers/eosio.bash
@@ -270,7 +270,7 @@ function ensure-boost() {
             BOOTSTRAP_FLAGS="--with-toolset=clang"
         fi
 		execute bash -c "cd $SRC_DIR && \
-        curl -LO https://github.com/boostorg/boost/archive/boost-$( echo $BOOST_VERSION | sed 's/_/./g' ).tar.gz \
+        curl -LO https://dl.bintray.com/boostorg/release/$BOOST_VERSION_MAJOR.$BOOST_VERSION_MINOR.$BOOST_VERSION_PATCH/source/boost_$BOOST_VERSION.tar.bz2 \
         && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
         && cd $BOOST_ROOT \
         && ./bootstrap.sh ${BOOTSTRAP_FLAGS} --prefix=$BOOST_ROOT \

From f660beb013c4cd331cdd511be1a47dc2c75d4097 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 30 May 2019 10:22:18 -0500
Subject: [PATCH 0511/1648] Reference to shared_ptr can be invalidated by
 completion of push_transaction. Create a local copy of transaction_metadata
 shared_ptr to keep alive until end of scope.

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index a2d42610045..7974f07b07a 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1530,7 +1530,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
                   if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
                   if( exhausted ) break;
-                  const auto& trx = itr->second;
+                  const transaction_metadata_ptr trx = itr->second;
                   auto category = calculate_transaction_category(trx);
                   if (category == tx_category::EXPIRED ||
                      (category == tx_category::UNEXPIRED_UNPERSISTED && _producers.empty()))

From 6a5cd5721c401f6a8645c28265cacb0f4c054d59 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 31 May 2019 15:47:09 +0800
Subject: [PATCH 0512/1648] Differentiate error message when parsing from
 filename or from JSON string itself

---
 libraries/chain/include/eosio/chain/exceptions.hpp | 2 ++
 programs/cleos/main.cpp                            | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index a8e0448c849..0b4c38fb1ac 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -403,6 +403,8 @@ namespace eosio { namespace chain {
                                     3100008, "Feature is currently unsupported" )
       FC_DECLARE_DERIVED_EXCEPTION( node_management_success,                misc_exception,
                                     3100009, "Node management operation successfully executed" )
+      FC_DECLARE_DERIVED_EXCEPTION( json_parse_exception,                misc_exception,
+                                    3100010, "JSON parse exception" )
 
 
 
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 826c2c4bc0e..1d32051168e 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -427,9 +427,14 @@ fc::variant json_from_file_or_string(const string& file_or_str, fc::json::parse_
 {
    regex r("^[ \t]*[\{\[]");
    if ( !regex_search(file_or_str, r) && fc::is_regular_file(file_or_str) ) {
-      return fc::json::from_file(file_or_str, ptype);
+      try {
+         return fc::json::from_file(file_or_str, ptype);
+      } EOS_RETHROW_EXCEPTIONS(json_parse_exception, "Fail to parse JSON from file: ${file}", ("file", file_or_str));
+
    } else {
-      return fc::json::from_string(file_or_str, ptype);
+      try {
+         return fc::json::from_string(file_or_str, ptype);
+      } EOS_RETHROW_EXCEPTIONS(json_parse_exception, "Fail to parse JSON from string: ${string}", ("string", file_or_str));
    }
 }
 

From c65ace9472a08cd895575336e8c07c0bc9bd1f85 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 31 May 2019 16:14:17 +0800
Subject: [PATCH 0513/1648] Remove redundant eos throw after json parse
 exception is caught earlier

---
 programs/cleos/main.cpp | 89 ++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 58 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 1d32051168e..c8a876312b2 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -441,9 +441,7 @@ fc::variant json_from_file_or_string(const string& file_or_str, fc::json::parse_
 bytes json_or_file_to_bin( const account_name& account, const action_name& action, const string& data_or_filename ) {
    fc::variant action_args_var;
    if( !data_or_filename.empty() ) {
-      try {
-         action_args_var = json_from_file_or_string(data_or_filename, fc::json::relaxed_parser);
-      } EOS_RETHROW_EXCEPTIONS(action_type_exception, "Fail to parse action JSON data='${data}'", ("data", data_or_filename));
+      action_args_var = json_from_file_or_string(data_or_filename, fc::json::relaxed_parser);
    }
    return variant_to_bin( account, action, action_args_var );
 }
@@ -682,9 +680,10 @@ chain::action create_unlinkauth(const name& account, const name& code, const nam
 }
 
 authority parse_json_authority(const std::string& authorityJsonOrFile) {
+   fc::variant authority_var = json_from_file_or_string(authorityJsonOrFile);
    try {
-      return json_from_file_or_string(authorityJsonOrFile).as<authority>();
-   } EOS_RETHROW_EXCEPTIONS(authority_type_exception, "Fail to parse Authority JSON '${data}'", ("data",authorityJsonOrFile))
+      return authority_var.as<authority>();
+   } EOS_RETHROW_EXCEPTIONS(authority_type_exception, "Invalid authority format '${data}'", ("data",authorityJsonOrFile))
 }
 
 authority parse_json_authority_or_key(const std::string& authorityJsonOrFile) {
@@ -2452,13 +2451,12 @@ int main( int argc, char** argv ) {
    pack_transaction->add_option("transaction", plain_signed_transaction_json, localized("The plain signed json (string)"))->required();
    pack_transaction->add_flag("--pack-action-data", pack_action_data_flag, localized("Pack all action data within transaction, needs interaction with ${n}", ("n", node_executable_name)));
    pack_transaction->set_callback([&] {
-      fc::variant trx_var;
-      try {
-         trx_var = json_from_file_or_string( plain_signed_transaction_json );
-      } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Fail to parse plain transaction JSON '${data}'", ("data", plain_signed_transaction_json))
+      fc::variant trx_var = json_from_file_or_string( plain_signed_transaction_json );
       if( pack_action_data_flag ) {
          signed_transaction trx;
-         abi_serializer::from_variant( trx_var, trx, abi_serializer_resolver, abi_serializer_max_time );
+         try {
+            abi_serializer::from_variant( trx_var, trx, abi_serializer_resolver, abi_serializer_max_time );
+         } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid transaction format: '${data}'", ("data", plain_signed_transaction_json))
          std::cout << fc::json::to_pretty_string( packed_transaction( trx, packed_transaction::none )) << std::endl;
       } else {
          try {
@@ -2475,12 +2473,11 @@ int main( int argc, char** argv ) {
    unpack_transaction->add_option("transaction", packed_transaction_json, localized("The packed transaction json (string containing packed_trx and optionally compression fields)"))->required();
    unpack_transaction->add_flag("--unpack-action-data", unpack_action_data_flag, localized("Unpack all action data within transaction, needs interaction with ${n}", ("n", node_executable_name)));
    unpack_transaction->set_callback([&] {
-      fc::variant packed_trx_var;
+      fc::variant packed_trx_var = json_from_file_or_string( packed_transaction_json );
       packed_transaction packed_trx;
       try {
-         packed_trx_var = json_from_file_or_string( packed_transaction_json );
          fc::from_variant<packed_transaction>( packed_trx_var, packed_trx );
-      } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Fail to parse packed transaction JSON '${data}'", ("data", packed_transaction_json))
+      } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid packed transaction format '${data}'", ("data", packed_transaction_json))
       signed_transaction strx = packed_trx.get_signed_transaction();
       fc::variant trx_var;
       if( unpack_action_data_flag ) {
@@ -2500,11 +2497,11 @@ int main( int argc, char** argv ) {
    pack_action_data->add_option("name", unpacked_action_data_name_string, localized("The name of the function that's called by this action"))->required();
    pack_action_data->add_option("unpacked_action_data", unpacked_action_data_string, localized("The action data expressed as json"))->required();
    pack_action_data->set_callback([&] {
-      fc::variant unpacked_action_data_json;
+      fc::variant unpacked_action_data_json = json_from_file_or_string(unpacked_action_data_string);
+      bytes packed_action_data_string;
       try {
-         unpacked_action_data_json = json_from_file_or_string(unpacked_action_data_string);
+         packed_action_data_string = variant_to_bin(name(unpacked_action_data_account_string), name(unpacked_action_data_name_string), unpacked_action_data_json);
       } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse unpacked action data JSON")
-      bytes packed_action_data_string = variant_to_bin(name(unpacked_action_data_account_string), name(unpacked_action_data_name_string), unpacked_action_data_json);
       std::cout << fc::to_hex(packed_action_data_string.data(), packed_action_data_string.size()) << std::endl;
    });
 
@@ -3351,8 +3348,11 @@ int main( int argc, char** argv ) {
    sign->set_callback([&] {
 
       EOSC_ASSERT( str_private_key.empty() || str_public_key.empty(), "ERROR: Either -k/--private-key or --public-key or none of them can be set" );
-
-      signed_transaction trx = json_from_file_or_string(trx_json_to_sign).as<signed_transaction>();
+      fc::variant trx_var = json_from_file_or_string(trx_json_to_sign);
+      signed_transaction trx;
+      try {
+        trx = trx_var.as<signed_transaction>();
+      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'", ("data", trx_json_to_sign))
 
       fc::optional<chain_id_type> chain_id;
 
@@ -3414,9 +3414,7 @@ int main( int argc, char** argv ) {
    actionsSubcommand->set_callback([&] {
       fc::variant action_args_var;
       if( !data.empty() ) {
-         try {
-            action_args_var = json_from_file_or_string(data, fc::json::relaxed_parser);
-         } EOS_RETHROW_EXCEPTIONS(action_type_exception, "Fail to parse action JSON data='${data}'", ("data", data))
+         action_args_var = json_from_file_or_string(data, fc::json::relaxed_parser);
       }
       auto accountPermissions = get_account_permissions(tx_permission);
 
@@ -3431,10 +3429,7 @@ int main( int argc, char** argv ) {
    add_standard_transaction_options(trxSubcommand);
 
    trxSubcommand->set_callback([&] {
-      fc::variant trx_var;
-      try {
-         trx_var = json_from_file_or_string(trx_to_push);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse transaction JSON '${data}'", ("data",trx_to_push))
+      fc::variant trx_var = json_from_file_or_string(trx_to_push);
       try {
          signed_transaction trx = trx_var.as<signed_transaction>();
          std::cout << fc::json::to_pretty_string( push_transaction( trx )) << std::endl;
@@ -3451,10 +3446,7 @@ int main( int argc, char** argv ) {
    auto trxsSubcommand = push->add_subcommand("transactions", localized("Push an array of arbitrary JSON transactions"));
    trxsSubcommand->add_option("transactions", trxsJson, localized("The JSON string or filename defining the array of the transactions to push"))->required();
    trxsSubcommand->set_callback([&] {
-      fc::variant trx_var;
-      try {
-         trx_var = json_from_file_or_string(trxsJson);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse transaction JSON '${data}'", ("data",trxsJson))
+      fc::variant trx_var = json_from_file_or_string(trxsJson);
       auto trxs_result = call(push_txns_func, trx_var);
       std::cout << fc::json::to_pretty_string(trxs_result) << std::endl;
    });
@@ -3495,19 +3487,13 @@ int main( int argc, char** argv ) {
    propose_action->add_option("proposal_expiration", parse_expiration_hours, localized("Proposal expiration interval in hours"));
 
    propose_action->set_callback([&] {
-      fc::variant requested_perm_var;
-      try {
-         requested_perm_var = json_from_file_or_string(requested_perm);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse permissions JSON '${data}'", ("data",requested_perm))
-      fc::variant transaction_perm_var;
-      try {
-         transaction_perm_var = json_from_file_or_string(transaction_perm);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse permissions JSON '${data}'", ("data",transaction_perm))
-      fc::variant trx_var;
+      fc::variant requested_perm_var = json_from_file_or_string(requested_perm);
+      fc::variant transaction_perm_var = json_from_file_or_string(transaction_perm);
+      fc::variant trx_var = json_from_file_or_string(proposed_transaction);
+      transaction proposed_trx;
       try {
-         trx_var = json_from_file_or_string(proposed_transaction);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse transaction JSON '${data}'", ("data",proposed_transaction))
-      transaction proposed_trx = trx_var.as<transaction>();
+         proposed_trx = trx_var.as<transaction>();
+      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'", ("data",proposed_transaction))
       bytes proposed_trx_serialized = variant_to_bin( name(proposed_contract), name(proposed_action), trx_var );
 
       vector<permission_level> reqperm;
@@ -3562,15 +3548,8 @@ int main( int argc, char** argv ) {
    propose_trx->add_option("proposer", proposer, localized("Account proposing the transaction"));
 
    propose_trx->set_callback([&] {
-      fc::variant requested_perm_var;
-      try {
-         requested_perm_var = json_from_file_or_string(requested_perm);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse permissions JSON '${data}'", ("data",requested_perm))
-
-      fc::variant trx_var;
-      try {
-         trx_var = json_from_file_or_string(trx_to_push);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse transaction JSON '${data}'", ("data",trx_to_push))
+      fc::variant requested_perm_var = json_from_file_or_string(requested_perm);
+      fc::variant trx_var = json_from_file_or_string(trx_to_push);
 
       auto accountPermissions = get_account_permissions(tx_permission);
       if (accountPermissions.empty()) {
@@ -3795,10 +3774,7 @@ int main( int argc, char** argv ) {
    string perm;
    string proposal_hash;
    auto approve_or_unapprove = [&](const string& action) {
-      fc::variant perm_var;
-      try {
-         perm_var = json_from_file_or_string(perm);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse permissions JSON '${data}'", ("data",perm))
+      fc::variant perm_var = json_from_file_or_string(perm);
 
       auto args = fc::mutable_variant_object()
          ("proposer", proposer)
@@ -3915,10 +3891,7 @@ int main( int argc, char** argv ) {
    wrap_exec->add_option("--contract,-c", wrap_con, localized("The account which controls the wrap contract"));
 
    wrap_exec->set_callback([&] {
-      fc::variant trx_var;
-      try {
-         trx_var = json_from_file_or_string(trx_to_exec);
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Fail to parse transaction JSON '${data}'", ("data",trx_to_exec))
+      fc::variant trx_var = json_from_file_or_string(trx_to_exec);
 
       auto accountPermissions = get_account_permissions(tx_permission);
       if( accountPermissions.empty() ) {

From 0d47ebabca80f364c4173f6dc3b55a309e58561b Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 31 May 2019 16:16:08 +0800
Subject: [PATCH 0514/1648] Remove obsolete error message

---
 programs/cleos/help_text.cpp.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/programs/cleos/help_text.cpp.in b/programs/cleos/help_text.cpp.in
index a133e17cade..0d4d6cf1046 100644
--- a/programs/cleos/help_text.cpp.in
+++ b/programs/cleos/help_text.cpp.in
@@ -144,8 +144,7 @@ const char* error_advice_authority_type_exception = R"=====(Ensure that your aut
 }
 )=====";
 const char* error_advice_action_type_exception = R"=====(Ensure that your action JSON follows the contract's abi!)=====";
-const char* error_advice_transaction_type_exception = R"=====(Ensure that your transaction JSON follows the right transaction format!
-You can refer to eosio.cdt/libraries/eosiolib/transaction.hpp for reference)=====";
+const char* error_advice_transaction_type_exception = R"=====(Ensure that your transaction JSON follows the right transaction format!)=====";
 const char* error_advice_abi_type_exception =  R"=====(Ensure that your abi JSON follows the following format!
 {
   "types" : [{ "new_type_name":"type_name", "type":"type_name" }],

From 7c41597c757f2ae7e73468b3317a530dd873a621 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 31 May 2019 17:04:17 +0800
Subject: [PATCH 0515/1648] Print out content of parsed json when exception is
 caught

---
 programs/cleos/main.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index c8a876312b2..36c3be1900a 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -683,7 +683,7 @@ authority parse_json_authority(const std::string& authorityJsonOrFile) {
    fc::variant authority_var = json_from_file_or_string(authorityJsonOrFile);
    try {
       return authority_var.as<authority>();
-   } EOS_RETHROW_EXCEPTIONS(authority_type_exception, "Invalid authority format '${data}'", ("data",authorityJsonOrFile))
+   } EOS_RETHROW_EXCEPTIONS(authority_type_exception, "Invalid authority format '${data}'", ("data", fc::json::to_string(authority_var)))
 }
 
 authority parse_json_authority_or_key(const std::string& authorityJsonOrFile) {
@@ -2456,7 +2456,7 @@ int main( int argc, char** argv ) {
          signed_transaction trx;
          try {
             abi_serializer::from_variant( trx_var, trx, abi_serializer_resolver, abi_serializer_max_time );
-         } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid transaction format: '${data}'", ("data", plain_signed_transaction_json))
+         } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid transaction format: '${data}'", ("data", fc::json::to_string(trx_var)))
          std::cout << fc::json::to_pretty_string( packed_transaction( trx, packed_transaction::none )) << std::endl;
       } else {
          try {
@@ -2477,7 +2477,7 @@ int main( int argc, char** argv ) {
       packed_transaction packed_trx;
       try {
          fc::from_variant<packed_transaction>( packed_trx_var, packed_trx );
-      } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid packed transaction format '${data}'", ("data", packed_transaction_json))
+      } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid packed transaction format: '${data}'", ("data", fc::json::to_string(packed_trx_var)))
       signed_transaction strx = packed_trx.get_signed_transaction();
       fc::variant trx_var;
       if( unpack_action_data_flag ) {
@@ -3352,7 +3352,7 @@ int main( int argc, char** argv ) {
       signed_transaction trx;
       try {
         trx = trx_var.as<signed_transaction>();
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'", ("data", trx_json_to_sign))
+      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'", ("data", fc::json::to_string(trx_var)))
 
       fc::optional<chain_id_type> chain_id;
 
@@ -3493,7 +3493,7 @@ int main( int argc, char** argv ) {
       transaction proposed_trx;
       try {
          proposed_trx = trx_var.as<transaction>();
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'", ("data",proposed_transaction))
+      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'", ("data", fc::json::to_string(trx_var)))
       bytes proposed_trx_serialized = variant_to_bin( name(proposed_contract), name(proposed_action), trx_var );
 
       vector<permission_level> reqperm;

From ed80ac88a10a316582e1146faa2f3a9887ce3100 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 31 May 2019 10:49:36 -0400
Subject: [PATCH 0516/1648] bump state database version to reflect change from
 key_weight & public_key_type to shared_key_weight & shared_public_key within
 shared_authority

---
 libraries/chain/controller.cpp                       | 12 ++----------
 .../include/eosio/chain/database_header_object.hpp   |  5 +++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 8ec0b24e25b..01fd8cab759 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -585,16 +585,8 @@ struct controller_impl {
       // check database version
       const auto& header_idx = db.get_index<database_header_multi_index>().indices().get<by_id>();
 
-      if (database_header_object::minimum_version != 0) {
-         EOS_ASSERT(header_idx.begin() != header_idx.end(), bad_database_version_exception,
-                    "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
-      } else if ( header_idx.empty() ) {
-         // temporary code to upgrade from existing un-versioned state database
-         static_assert(database_header_object::minimum_version == 0, "remove this path once the minimum version moves");
-         db.create<database_header_object>([](const auto& header){
-            // nothing to do here
-         });
-      }
+      EOS_ASSERT(header_idx.begin() != header_idx.end(), bad_database_version_exception,
+                 "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
 
       const auto& header_itr = header_idx.begin();
       header_itr->validate();
diff --git a/libraries/chain/include/eosio/chain/database_header_object.hpp b/libraries/chain/include/eosio/chain/database_header_object.hpp
index e0da70944f0..99baa7a16a2 100644
--- a/libraries/chain/include/eosio/chain/database_header_object.hpp
+++ b/libraries/chain/include/eosio/chain/database_header_object.hpp
@@ -26,10 +26,11 @@ namespace eosio { namespace chain {
           *   - 0 : implied version when this header is absent
           *   - 1 : initial version, prior to this no `database_header_object` existed in the shared memory file but
           *         no changes to its format were made so it can be safely added to existing databases
+          *   - 2 : shared_authority now holds shared_key_weights & shared_public_keys
           */
 
-         static constexpr uint32_t current_version            = 1;
-         static constexpr uint32_t minimum_version            = 0;
+         static constexpr uint32_t current_version            = 2;
+         static constexpr uint32_t minimum_version            = 2;
 
          id_type        id;
          uint32_t       version = current_version;

From 3a1edc0c127398bb0c6dc32530d3d811ae761872 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 31 May 2019 12:29:25 -0500
Subject: [PATCH 0517/1648] Modify push_block to return unapplied blocks from
 fork switch

---
 libraries/chain/controller.cpp                | 20 ++++++++++---------
 .../chain/include/eosio/chain/block_state.hpp |  1 +
 .../chain/include/eosio/chain/controller.hpp  |  8 ++++++--
 .../include/eosio/chain/fork_database.hpp     |  2 --
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c003286012d..83295e53f74 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1840,7 +1840,7 @@ struct controller_impl {
       } );
    }
 
-   void push_block( std::future<block_state_ptr>& block_state_future ) {
+   branch_type push_block( std::future<block_state_ptr>& block_state_future ) {
       controller::block_status s = controller::block_status::complete;
       EOS_ASSERT(!pending, block_validate_exception, "it is not valid to push a block when there is a pending block");
 
@@ -1862,9 +1862,10 @@ struct controller_impl {
          emit( self.accepted_block_header, bsp );
 
          if( read_mode != db_read_mode::IRREVERSIBLE ) {
-            maybe_switch_forks( fork_db.pending_head(), s );
+            return maybe_switch_forks( fork_db.pending_head(), s );
          } else {
             log_irreversible();
+            return {};
          }
 
       } FC_LOG_AND_RETHROW( )
@@ -1920,8 +1921,9 @@ struct controller_impl {
       } FC_LOG_AND_RETHROW( )
    }
 
-   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s ) {
+   branch_type maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s ) {
       bool head_changed = true;
+      branch_type unapplied_branch;
       if( new_head->header.previous == head->id ) {
          try {
             apply_block( new_head, s );
@@ -1980,6 +1982,8 @@ struct controller_impl {
             } // end if exception
          } /// end for each block in branch
 
+         unapplied_branch = std::move( branches.second );
+
          ilog("successfully switched fork to new head ${new_head_id}", ("new_head_id", new_head->id));
       } else {
          head_changed = false;
@@ -1987,6 +1991,8 @@ struct controller_impl {
 
       if( head_changed )
          log_irreversible();
+
+      return unapplied_branch;
    } /// push_block
 
    void abort_block() {
@@ -2516,10 +2522,10 @@ std::future<block_state_ptr> controller::create_block_state_future( const signed
    return my->create_block_state_future( b );
 }
 
-void controller::push_block( std::future<block_state_ptr>& block_state_future ) {
+branch_type controller::push_block( std::future<block_state_ptr>& block_state_future ) {
    validate_db_available_size();
    validate_reversible_available_size();
-   my->push_block( block_state_future );
+   return my->push_block( block_state_future );
 }
 
 transaction_trace_ptr controller::push_transaction( const transaction_metadata_ptr& trx, fc::time_point deadline, uint32_t billed_cpu_time_us ) {
@@ -2764,10 +2770,6 @@ void controller::write_snapshot( const snapshot_writer_ptr& snapshot ) const {
    return my->add_to_snapshot(snapshot);
 }
 
-void controller::pop_block() {
-   my->pop_block();
-}
-
 int64_t controller::set_proposed_producers( vector<producer_key> producers ) {
    const auto& gpo = get_global_properties();
    auto cur_block_num = head_block_num() + 1;
diff --git a/libraries/chain/include/eosio/chain/block_state.hpp b/libraries/chain/include/eosio/chain/block_state.hpp
index e91161cf716..e22f620b4d0 100644
--- a/libraries/chain/include/eosio/chain/block_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_state.hpp
@@ -52,6 +52,7 @@ namespace eosio { namespace chain {
    };
 
    using block_state_ptr = std::shared_ptr<block_state>;
+   using branch_type = std::vector<block_state_ptr>;
 
 } } /// namespace eosio::chain
 
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index c7702d09414..7cf94cb56d6 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -154,10 +154,14 @@ namespace eosio { namespace chain {
          block_state_ptr finalize_block( const std::function<signature_type( const digest_type& )>& signer_callback );
          void sign_block( const std::function<signature_type( const digest_type& )>& signer_callback );
          void commit_block();
-         void pop_block();
 
          std::future<block_state_ptr> create_block_state_future( const signed_block_ptr& b );
-         void push_block( std::future<block_state_ptr>& block_state_future );
+
+         /**
+          * @param block_state_future provide from call to create_block_state_future
+          * @return branch of unapplied blocks from fork switch
+          */
+         branch_type push_block( std::future<block_state_ptr>& block_state_future );
 
          boost::asio::io_context& get_thread_pool();
 
diff --git a/libraries/chain/include/eosio/chain/fork_database.hpp b/libraries/chain/include/eosio/chain/fork_database.hpp
index e225d0fdcd1..bd774f2f71c 100644
--- a/libraries/chain/include/eosio/chain/fork_database.hpp
+++ b/libraries/chain/include/eosio/chain/fork_database.hpp
@@ -8,8 +8,6 @@ namespace eosio { namespace chain {
 
    struct fork_database_impl;
 
-   typedef vector<block_state_ptr> branch_type;
-
    /**
     * @class fork_database
     * @brief manages light-weight state for all potential unconfirmed forks

From 6b280a2d1648a1191d4317b9d8f13856274474c9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 31 May 2019 12:54:25 -0500
Subject: [PATCH 0518/1648] Modify abort_block to return transactions applied
 in the aborted block

---
 libraries/chain/controller.cpp                | 19 ++++++++++---------
 .../chain/include/eosio/chain/controller.hpp  |  5 ++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 83295e53f74..e34afcab83f 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -167,14 +167,14 @@ struct pending_state {
       return _block_stage.get<completed_block>()._block_state->block->transactions;
    }
 
-   const vector<transaction_metadata_ptr>& get_trx_metas()const {
+   vector<transaction_metadata_ptr> extract_trx_metas()const {
       if( _block_stage.contains<building_block>() )
-         return _block_stage.get<building_block>()._pending_trx_metas;
+         return std::move( _block_stage.get<building_block>()._pending_trx_metas );
 
       if( _block_stage.contains<assembled_block>() )
-         return _block_stage.get<assembled_block>()._trx_metas;
+         return std::move( _block_stage.get<assembled_block>()._trx_metas );
 
-      return _block_stage.get<completed_block>()._block_state->trxs;
+      return std::move( _block_stage.get<completed_block>()._block_state->trxs );
    }
 
    bool is_protocol_feature_activated( const digest_type& feature_digest )const {
@@ -1995,15 +1995,16 @@ struct controller_impl {
       return unapplied_branch;
    } /// push_block
 
-   void abort_block() {
+   vector<transaction_metadata_ptr> abort_block() {
+      vector<transaction_metadata_ptr> applied_trxs;
       if( pending ) {
          if ( read_mode == db_read_mode::SPECULATIVE ) {
-            for( const auto& t : pending->get_trx_metas() )
-               unapplied_transactions[t->signed_id()] = t;
+            applied_trxs = pending->extract_trx_metas();
          }
          pending.reset();
          protocol_features.popped_blocks_to( head->block_num );
       }
+      return applied_trxs;
    }
 
    checksum256_type calculate_action_merkle() {
@@ -2510,8 +2511,8 @@ void controller::commit_block() {
    my->commit_block(true);
 }
 
-void controller::abort_block() {
-   my->abort_block();
+vector<transaction_metadata_ptr> controller::abort_block() {
+   return my->abort_block();
 }
 
 boost::asio::io_context& controller::get_thread_pool() {
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 7cf94cb56d6..88487dd5533 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -127,7 +127,10 @@ namespace eosio { namespace chain {
                            uint16_t confirm_block_count,
                            const vector<digest_type>& new_protocol_feature_activations );
 
-         void abort_block();
+         /**
+          * @return transactions applied in aborted block
+          */
+         vector<transaction_metadata_ptr> abort_block();
 
          /**
           *  These transactions were previously pushed by have since been unapplied, recalling push_transaction

From 8a3f30b5616c89af569b6fcdadb2e73092476b7a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 31 May 2019 14:35:31 -0500
Subject: [PATCH 0519/1648] Modify test to call produce_block twice instead of
 produce_block with a skip time which has the side effect of aborting block.

---
 unittests/auth_tests.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unittests/auth_tests.cpp b/unittests/auth_tests.cpp
index d5e26d96355..2f9e5a9d660 100644
--- a/unittests/auth_tests.cpp
+++ b/unittests/auth_tests.cpp
@@ -77,7 +77,8 @@ BOOST_FIXTURE_TEST_CASE( delegate_auth, TESTER ) { try {
    wdump((new_auth));
    BOOST_CHECK_EQUAL((new_auth == delegated_auth), true);
 
-   produce_block( fc::milliseconds(config::block_interval_ms*2) );
+   produce_block();
+   produce_block();
 
    auto auth = static_cast<authority>(control->get_authorization_manager().get_permission({N(alice), config::active_name}).auth);
    wdump((auth));

From ca534067c85285c3ffe9c9159cc8e464ce5ece97 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 31 May 2019 15:28:25 -0500
Subject: [PATCH 0520/1648] Remove get_unapplied_transactions as it is now the
 callers of abort_block() and push_block() reposibility to track transactions
 to apply in new blocks

---
 libraries/chain/controller.cpp                | 24 -------------------
 .../chain/include/eosio/chain/controller.hpp  | 12 ----------
 2 files changed, 36 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index e34afcab83f..83d18ffb01a 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -234,13 +234,6 @@ struct controller_impl {
    map< account_name, map<handler_key, apply_handler> >   apply_handlers;
    unordered_map< builtin_protocol_feature_t, std::function<void(controller_impl&)>, enum_hash<builtin_protocol_feature_t> > protocol_feature_activation_handlers;
 
-   /**
-    *  Transactions that were undone by pop_block or abort_block, transactions
-    *  are removed from this list if they are re-applied in other blocks. Producers
-    *  can query this list when scheduling new transactions into blocks.
-    */
-   unapplied_transactions_type     unapplied_transactions;
-
    void pop_block() {
       auto prev = fork_db.get_block( head->header.previous );
 
@@ -256,8 +249,6 @@ struct controller_impl {
 
       if ( read_mode == db_read_mode::SPECULATIVE ) {
          EOS_ASSERT( head->block, block_validate_exception, "attempting to pop a block that was sparsely loaded from a snapshot");
-         for( const auto& t : head->trxs )
-            unapplied_transactions[t->signed_id()] = t;
       }
 
       head = prev;
@@ -1389,9 +1380,6 @@ struct controller_impl {
                trx_context.squash();
             }
 
-            if (!trx->implicit) {
-               unapplied_transactions.erase( trx->signed_id() );
-            }
             return trace;
          } catch( const disallowed_transaction_extensions_bad_block_exception& ) {
             throw;
@@ -1403,10 +1391,6 @@ struct controller_impl {
             trace->except_ptr = std::current_exception();
          }
 
-         if (!failure_is_subjective(*trace->except)) {
-            unapplied_transactions.erase( trx->signed_id() );
-         }
-
          emit( self.accepted_transaction, trx );
          emit( self.applied_transaction, std::tie(trace, trn) );
 
@@ -2937,14 +2921,6 @@ const account_object& controller::get_account( account_name name )const
    return my->db.get<account_object, by_name>(name);
 } FC_CAPTURE_AND_RETHROW( (name) ) }
 
-unapplied_transactions_type& controller::get_unapplied_transactions() {
-   if ( my->read_mode != db_read_mode::SPECULATIVE ) {
-      EOS_ASSERT( my->unapplied_transactions.empty(), transaction_exception,
-                  "not empty unapplied_transactions in non-speculative mode" ); //should never happen
-   }
-   return my->unapplied_transactions;
-}
-
 bool controller::sender_avoids_whitelist_blacklist_enforcement( account_name sender )const {
    return my->sender_avoids_whitelist_blacklist_enforcement( sender );
 }
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 88487dd5533..a95cf61267c 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -36,7 +36,6 @@ namespace eosio { namespace chain {
    class account_object;
    using resource_limits::resource_limits_manager;
    using apply_handler = std::function<void(apply_context&)>;
-   using unapplied_transactions_type = map<transaction_id_type, transaction_metadata_ptr, sha256_less>;
 
    class fork_database;
 
@@ -132,17 +131,6 @@ namespace eosio { namespace chain {
           */
          vector<transaction_metadata_ptr> abort_block();
 
-         /**
-          *  These transactions were previously pushed by have since been unapplied, recalling push_transaction
-          *  with the transaction_metadata_ptr will remove them from the source of this data IFF it succeeds.
-          *
-          *  The caller is responsible for calling drop_unapplied_transaction on a failing transaction that
-          *  they never intend to retry
-          *
-          *  @return map of transactions which have been unapplied
-          */
-         unapplied_transactions_type& get_unapplied_transactions();
-
          /**
           *
           */

From fdf41809a037f8c8fa973608eec2466617d258f9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 31 May 2019 15:29:00 -0500
Subject: [PATCH 0521/1648] Remove get_unapplied_transactions as it is now the
 callers of abort_block() and push_block() reposibility to track transactions
 to apply in new blocks

---
 libraries/testing/tester.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 8173849b584..2b4c0a904ca 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -246,14 +246,6 @@ namespace eosio { namespace testing {
       }
 
       if( !skip_pending_trxs ) {
-         unapplied_transactions_type unapplied_trxs = control->get_unapplied_transactions(); // make copy of map
-         for (const auto& entry : unapplied_trxs ) {
-            auto trace = control->push_transaction(entry.second, fc::time_point::maximum());
-            if(trace->except) {
-               trace->except->dynamic_rethrow_exception();
-            }
-         }
-
          vector<transaction_id_type> scheduled_trxs;
          while( (scheduled_trxs = get_scheduled_transactions() ).size() > 0 ) {
             for (const auto& trx : scheduled_trxs ) {

From 34ab3008b119ab34aa9c72ee0b75634c3e0d124c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 31 May 2019 15:29:38 -0500
Subject: [PATCH 0522/1648] Add abort block test to verify return of
 abort_block

---
 unittests/block_tests.cpp | 48 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/unittests/block_tests.cpp b/unittests/block_tests.cpp
index fab79a306a1..4d6f452019e 100644
--- a/unittests/block_tests.cpp
+++ b/unittests/block_tests.cpp
@@ -188,7 +188,53 @@ BOOST_AUTO_TEST_CASE(broadcasted_block_test)
   bytes bcasted_blk_by_prod_node_packed = fc::raw::pack(*bcasted_blk_by_prod_node);
   bytes bcasted_blk_by_recv_node_packed = fc::raw::pack(*bcasted_blk_by_recv_node);
   BOOST_CHECK(std::equal(bcasted_blk_by_prod_node_packed.begin(), bcasted_blk_by_prod_node_packed.end(), bcasted_blk_by_recv_node_packed.begin()));
-
 }
 
+/**
+ * Verify abort block returns applied transactions in block
+ */
+BOOST_FIXTURE_TEST_CASE( abort_block_transactions, validating_tester) { try {
+
+      produce_blocks(2);
+      signed_transaction trx;
+
+      account_name a = N(newco);
+      account_name creator = config::system_account_name;
+
+      // account does not exist before test
+      BOOST_REQUIRE_EXCEPTION(control->get_account( a ), fc::exception,
+                              [a] (const fc::exception& e)->bool {
+                                 return std::string( e.what() ).find( a.to_string() ) != std::string::npos;
+                              }) ;
+
+      auto owner_auth = authority( get_public_key( a, "owner" ) );
+      trx.actions.emplace_back( vector<permission_level>{{creator,config::active_name}},
+                                newaccount{
+                                      .creator  = creator,
+                                      .name     = a,
+                                      .owner    = owner_auth,
+                                      .active   = authority( get_public_key( a, "active" ) )
+                                });
+      set_transaction_headers(trx);
+      trx.sign( get_private_key( creator, "active" ), control->get_chain_id()  );
+      auto trace = push_transaction( trx );
+
+      control->get_account( a ); // throws if it does not exist
+
+      vector<transaction_metadata_ptr> unapplied_trxs = control->abort_block();
+
+      // verify transaction returned from abort_block()
+      BOOST_REQUIRE_EQUAL( 1,  unapplied_trxs.size() );
+      BOOST_REQUIRE_EQUAL( trx.id(), unapplied_trxs.at(0)->id() );
+
+      // account does not exist block was aborted which had transaction
+      BOOST_REQUIRE_EXCEPTION(control->get_account( a ), fc::exception,
+                              [a] (const fc::exception& e)->bool {
+                                 return std::string( e.what() ).find( a.to_string() ) != std::string::npos;
+                              }) ;
+
+      produce_blocks(1);
+
+   } FC_LOG_AND_RETHROW() }
+
 BOOST_AUTO_TEST_SUITE_END()

From 38708b819a62f6b684493c6a269612a962f6252d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 31 May 2019 16:20:58 -0500
Subject: [PATCH 0523/1648] Remove return of block from push_block since not
 used.

---
 libraries/testing/include/eosio/testing/tester.hpp | 2 +-
 libraries/testing/tester.cpp                       | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 16dab638d31..8c24f90dba0 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -112,7 +112,7 @@ namespace eosio { namespace testing {
          void                 produce_blocks_for_n_rounds(const uint32_t num_of_rounds = 1);
          // Produce minimal number of blocks as possible to spend the given time without having any producer become inactive
          void                 produce_min_num_of_blocks_to_spend_time_wo_inactive_prod(const fc::microseconds target_elapsed_time = fc::microseconds());
-         signed_block_ptr     push_block(signed_block_ptr b);
+         void                 push_block(signed_block_ptr b);
 
          /**
           * These transaction IDs represent transactions available in the head chain state as scheduled
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 2b4c0a904ca..97a0cf23fc2 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -223,7 +223,7 @@ namespace eosio { namespace testing {
       });
    }
 
-   signed_block_ptr base_tester::push_block(signed_block_ptr b) {
+   void base_tester::push_block(signed_block_ptr b) {
       auto bs = control->create_block_state_future(b);
       control->abort_block();
       control->push_block(bs);
@@ -232,9 +232,7 @@ namespace eosio { namespace testing {
       if (itr == last_produced_block.end() || block_header::num_from_id(b->id()) > block_header::num_from_id(itr->second)) {
          last_produced_block[b->producer] = b->id();
       }
-
-      return b;
-   }
+}
 
    signed_block_ptr base_tester::_produce_block( fc::microseconds skip_time, bool skip_pending_trxs) {
       auto head = control->head_block_state();

From aa784b00915107c305b997ecb187a98413d62118 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 3 Jun 2019 10:05:49 -0400
Subject: [PATCH 0524/1648] add accurate checktime timer for macOS

Add a kevent based timer for accurate checktime timer on macOS. Also, refactor the code such that the appropriate platform specific timer code is used. On platforms without an implementation fall back to poll mode. Also, refactor how the time accuracy is verified ("calibrated") so that it is not a copy paste job and can use the checktime_timer object itself.
---
 libraries/chain/CMakeLists.txt                |  13 ++
 libraries/chain/checktime_timer_calibrate.cpp |  75 ++++++++++
 libraries/chain/checktime_timer_dummy.cpp     |  13 ++
 libraries/chain/checktime_timer_macos.cpp     | 119 +++++++++++++++
 libraries/chain/checktime_timer_posix.cpp     |  86 +++++++++++
 libraries/chain/checktime_timer_posix_test.c  |  10 ++
 libraries/chain/controller.cpp                |   8 +-
 .../include/eosio/chain/checktime_timer.hpp   |  35 +++++
 .../eosio/chain/checktime_timer_calibrate.hpp |  29 ++++
 .../eosio/chain/transaction_context.hpp       |  18 +--
 libraries/chain/transaction_context.cpp       | 137 +-----------------
 11 files changed, 397 insertions(+), 146 deletions(-)
 create mode 100755 libraries/chain/checktime_timer_calibrate.cpp
 create mode 100644 libraries/chain/checktime_timer_dummy.cpp
 create mode 100755 libraries/chain/checktime_timer_macos.cpp
 create mode 100644 libraries/chain/checktime_timer_posix.cpp
 create mode 100644 libraries/chain/checktime_timer_posix_test.c
 create mode 100644 libraries/chain/include/eosio/chain/checktime_timer.hpp
 create mode 100755 libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 254d462c5ed..b47b1e4aaf2 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -5,6 +5,17 @@ file(GLOB HEADERS "include/eosio/chain/*.hpp"
                   "include/eosio/chain/webassembly/*.hpp"
                   "${CMAKE_CURRENT_BINARY_DIR}/include/eosio/chain/core_symbol.hpp" )
 
+if(APPLE AND UNIX)
+   set(CHECKTIME_TIMER_IMPL checktime_timer_macos.cpp)
+else()
+   try_run(POSIX_TIMER_TEST_RUN_RESULT POSIX_TIMER_TEST_COMPILE_RESULT ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/checktime_timer_posix_test.c)
+   if(POSIX_TIMER_TEST_RUN_RESULT EQUAL 0)
+      set(CHECKTIME_TIMER_IMPL checktime_timer_posix.cpp)
+   else()
+      set(CHECKTIME_TIMER_IMPL checktime_timer_dummy.cpp)
+   endif()
+endif()
+
 ## SORT .cpp by most likely to change / break compile
 add_library( eosio_chain
              merkle.cpp
@@ -52,6 +63,8 @@ add_library( eosio_chain
              genesis_intrinsics.cpp
              whitelisted_intrinsics.cpp
              thread_utils.cpp
+             checktime_timer_calibrate.cpp
+             ${CHECKTIME_TIMER_IMPL}
              ${HEADERS}
              )
 
diff --git a/libraries/chain/checktime_timer_calibrate.cpp b/libraries/chain/checktime_timer_calibrate.cpp
new file mode 100755
index 00000000000..506d50c665e
--- /dev/null
+++ b/libraries/chain/checktime_timer_calibrate.cpp
@@ -0,0 +1,75 @@
+#include <eosio/chain/checktime_timer_calibrate.hpp>
+#include <eosio/chain/checktime_timer.hpp>
+
+#include <fc/time.hpp>
+#include <fc/log/logger.hpp>
+
+#include <boost/accumulators/accumulators.hpp>
+#include <boost/accumulators/statistics/stats.hpp>
+#include <boost/accumulators/statistics/min.hpp>
+#include <boost/accumulators/statistics/max.hpp>
+#include <boost/accumulators/statistics/weighted_mean.hpp>
+#include <boost/accumulators/statistics/weighted_variance.hpp>
+
+#include <chrono>
+
+namespace eosio { namespace chain {
+
+namespace bacc = boost::accumulators;
+
+checktime_timer_calibrate::~checktime_timer_calibrate() = default;
+
+struct checktime_timer_calibrate::impl {
+   bacc::accumulator_set<int, bacc::stats<bacc::tag::mean, bacc::tag::min, bacc::tag::max, bacc::tag::variance>, float> samples;
+   bool _stats_once_is_enough = false;
+};
+
+checktime_timer_calibrate::checktime_timer_calibrate() : my(std::make_unique<impl>()) {
+   checktime_timer timer;
+
+   //keep longest first in list. You're effectively going to take test_intervals[0]*sizeof(test_intervals[0])
+   //time to do the the "calibration"
+   int test_intervals[] = {50000, 10000, 5000, 1000, 500, 100, 50, 10};
+
+   for(int& interval : test_intervals) {
+      unsigned int loops = test_intervals[0]/interval;
+
+      for(unsigned int i = 0; i < loops; ++i) {
+         auto start = std::chrono::high_resolution_clock::now();
+         timer.start(fc::time_point(fc::time_point::now().time_since_epoch() + fc::microseconds(interval)));
+         while(!timer.expired) {}
+         auto end = std::chrono::high_resolution_clock::now();
+         int timer_slop = std::chrono::duration_cast<std::chrono::microseconds>(end-start).count() - interval;
+
+         //since more samples are run for the shorter expirations, weigh the longer expirations accordingly. This
+         //helps to make a few results more fair. Two such examples: AWS c4&i5 xen instances being rather stable
+         //down to 100us but then struggling with 50us and 10us. MacOS having performance that seems to correlate
+         //with expiry length; that is, long expirations have high error, short expirations have low error.
+         //That said, for these platforms, a tighter tolerance may possibly be achieved by taking performance
+         //metrics in mulitple bins and appliying the slop based on which bin a deadline resides in. Not clear
+         //if that's worth the extra complexity at this point.
+         my->samples(timer_slop, bacc::weight = interval/(float)test_intervals[0]);
+      }
+   }
+   _timer_overhead = bacc::mean(my->samples) + sqrt(bacc::variance(my->samples))*2; //target 95% of expirations before deadline
+   _use_timer = _timer_overhead < 1000;
+}
+
+void checktime_timer_calibrate::print_stats() {
+   #define TIMER_STATS_FORMAT "min:${min}us max:${max}us mean:${mean}us stddev:${stddev}us"
+   #define TIMER_STATS \
+      ("min", bacc::min(my->samples))("max", bacc::max(my->samples)) \
+      ("mean", (int)bacc::mean(my->samples))("stddev", (int)sqrt(bacc::variance(my->samples))) \
+      ("t", _timer_overhead)
+
+   if(my->_stats_once_is_enough)
+      return;
+   my->_stats_once_is_enough = true;
+
+   if(_use_timer)
+      ilog("Using ${t}us deadline timer for checktime: " TIMER_STATS_FORMAT, TIMER_STATS);
+   else
+      wlog("Using polled checktime; deadline timer too inaccurate: " TIMER_STATS_FORMAT, TIMER_STATS);
+}
+
+}}
\ No newline at end of file
diff --git a/libraries/chain/checktime_timer_dummy.cpp b/libraries/chain/checktime_timer_dummy.cpp
new file mode 100644
index 00000000000..7d9a54663ae
--- /dev/null
+++ b/libraries/chain/checktime_timer_dummy.cpp
@@ -0,0 +1,13 @@
+#include <eosio/chain/checktime_timer.hpp>
+
+namespace eosio { namespace chain {
+
+checktime_timer::checktime_timer() {
+   expired = 1;
+}
+
+checktime_timer::~checktime_timer() {}
+void checktime_timer::start(fc::time_point tp) {}
+void checktime_timer::stop() {}
+
+}}
\ No newline at end of file
diff --git a/libraries/chain/checktime_timer_macos.cpp b/libraries/chain/checktime_timer_macos.cpp
new file mode 100755
index 00000000000..77fb1b81809
--- /dev/null
+++ b/libraries/chain/checktime_timer_macos.cpp
@@ -0,0 +1,119 @@
+#include <eosio/chain/checktime_timer.hpp>
+#include <eosio/chain/checktime_timer_calibrate.hpp>
+
+#include <fc/time.hpp>
+#include <fc/fwd_impl.hpp>
+#include <fc/exception/exception.hpp>
+
+#include <mutex>
+#include <thread>
+
+#include <sys/event.h>
+
+namespace eosio { namespace chain {
+
+//a kqueue & thread is shared for all checktime_timer instances, and since we want these
+// available for the checktime_timer_calibrate instance that we want to happen on process
+// start (and not at some first usage of checktime_timer), these gotta go here
+static std::mutex timer_ref_mutex;
+static unsigned next_timerid;
+static unsigned refcount;
+static int kqueue_fd;
+static std::thread kevent_thread;
+
+//last, because need the thread & mutex above initialized first
+static checktime_timer_calibrate the_calibrate;
+
+struct checktime_timer::impl {
+   uint64_t timerid;
+
+   constexpr static uint64_t quit_event_id = 1;
+};
+
+checktime_timer::checktime_timer() {
+   static_assert(sizeof(impl) <= fwd_size);
+
+   std::lock_guard guard(timer_ref_mutex);
+
+   if(refcount++ == 0) {
+      kqueue_fd = kqueue();
+
+      FC_ASSERT(kqueue_fd != -1, "failed to create kqueue");
+
+      //set up a EVFILT_USER which will be signaled to shut down the thread
+      struct kevent64_s quit_event;
+      EV_SET64(&quit_event, impl::quit_event_id, EVFILT_USER, EV_ADD|EV_ENABLE, NOTE_FFNOP, 0, 0, 0, 0);
+      FC_ASSERT(kevent64(kqueue_fd, &quit_event, 1, NULL, 0, KEVENT_FLAG_IMMEDIATE, NULL) == 0, "failed to create quit event");
+
+      kevent_thread = std::thread([]() {
+         while(true) {
+            struct kevent64_s anEvent;
+            int c = kevent64(kqueue_fd, NULL, 0, &anEvent, 1, 0, NULL);
+
+            if(c == 1 && anEvent.filter == EVFILT_TIMER)
+               *(sig_atomic_t*)(anEvent.udata) = 1;
+            else if(c == 1 && anEvent.filter == EVFILT_USER)
+               return;
+            else if(c == -1 && errno == EINTR)
+               continue;
+            else if(c == -1)
+               return; //?? not much we can do now
+         }
+      });
+   }
+
+   //a kludge until something better: print stats only after calibration completes
+   // (which can be inferred on if timer_overhead in non-zero); because otherwise fc logging
+   // may not be ready
+   if(the_calibrate.timer_overhead())
+      the_calibrate.print_stats();
+
+   my->timerid = next_timerid++;
+}
+
+checktime_timer::~checktime_timer() {
+   stop();
+   if(std::lock_guard guard(timer_ref_mutex); --refcount == 0) {
+      struct kevent64_s signal_quit_event;
+      EV_SET64(&signal_quit_event, impl::quit_event_id, EVFILT_USER, 0, NOTE_TRIGGER, 0, 0, 0, 0);
+
+      if(kevent64(kqueue_fd, &signal_quit_event, 1, NULL, 0, KEVENT_FLAG_IMMEDIATE, NULL) != -1)
+         kevent_thread.join();
+      close(kqueue_fd);
+   }
+}
+
+void checktime_timer::start(fc::time_point tp) {
+   if(tp == fc::time_point::maximum()) {
+      expired = 0;
+      return;
+   }
+   if(!the_calibrate.use_timer()) {
+      expired = 1;
+      return;
+   }
+   fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();
+   ms = (int)x.count()-the_calibrate.timer_overhead();
+   if(x.count() <= the_calibrate.timer_overhead())
+      expired = 1;
+   else {
+      struct kevent64_s aTimerEvent;
+      EV_SET64(&aTimerEvent, my->timerid, EVFILT_TIMER, EV_ADD|EV_ENABLE|EV_ONESHOT, NOTE_USECONDS|NOTE_CRITICAL, (int)x.count()-the_calibrate.timer_overhead(), (uint64_t)&expired, 0, 0);
+
+      expired = 0;
+      if(kevent64(kqueue_fd, &aTimerEvent, 1, NULL, 0, KEVENT_FLAG_IMMEDIATE, NULL) != 0)
+         expired = 1;
+   }
+}
+
+void checktime_timer::stop() {
+   if(expired)
+      return;
+
+   struct kevent64_s stop_timer_event;
+   EV_SET64(&stop_timer_event, my->timerid, EVFILT_TIMER, EV_DELETE, 0, 0, 0, 0, 0);
+   kevent64(kqueue_fd, &stop_timer_event, 1, NULL, 0, KEVENT_FLAG_IMMEDIATE, NULL);
+   expired = 1;
+}
+
+}}
\ No newline at end of file
diff --git a/libraries/chain/checktime_timer_posix.cpp b/libraries/chain/checktime_timer_posix.cpp
new file mode 100644
index 00000000000..bd38f6f23a0
--- /dev/null
+++ b/libraries/chain/checktime_timer_posix.cpp
@@ -0,0 +1,86 @@
+#include <eosio/chain/checktime_timer.hpp>
+#include <eosio/chain/checktime_timer_calibrate.hpp>
+
+#include <fc/time.hpp>
+#include <fc/fwd_impl.hpp>
+#include <fc/exception/exception.hpp>
+
+#include <mutex>
+
+#include <signal.h>
+#include <time.h>
+
+namespace eosio { namespace chain {
+
+static checktime_timer_calibrate the_calibrate;
+
+struct checktime_timer::impl {
+   timer_t timerid;
+
+   static void sig_handler(int, siginfo_t* si, void*) {
+      *(sig_atomic_t*)(si->si_value.sival_ptr) = 1;
+   }
+};
+
+checktime_timer::checktime_timer() {
+   static_assert(sizeof(impl) <= fwd_size);
+
+   static bool initialized;
+   static std::mutex initalized_mutex;
+
+   if(std::lock_guard guard(initalized_mutex); !initialized) {
+      struct sigaction act;
+      sigemptyset(&act.sa_mask);
+      act.sa_sigaction = impl::sig_handler;
+      act.sa_flags = SA_SIGINFO;
+      FC_ASSERT(sigaction(SIGRTMIN, &act, NULL) == 0, "failed to aquire SIGRTMIN signal");
+      initialized = true;
+   }
+
+   struct sigevent se;
+   se.sigev_notify = SIGEV_SIGNAL;
+   se.sigev_signo = SIGRTMIN;
+   se.sigev_value.sival_ptr = (void*)&expired;
+
+   //a kludge until something better: print stats only after calibration completes
+   // (which can be inferred on if timer_overhead in non-zero); because otherwise fc logging
+   // may not be ready
+   if(the_calibrate.timer_overhead())
+      the_calibrate.print_stats();
+
+   FC_ASSERT(timer_create(CLOCK_REALTIME, &se, &my->timerid) == 0, "failed to create timer");
+}
+
+checktime_timer::~checktime_timer() {
+   timer_delete(my->timerid);
+}
+
+void checktime_timer::start(fc::time_point tp) {
+   if(tp == fc::time_point::maximum()) {
+      expired = 0;
+      return;
+   }
+   if(!the_calibrate.use_timer()) {
+      expired = 1;
+      return;
+   }
+   fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();
+   if(x.count() <= the_calibrate.timer_overhead())
+      expired = 1;
+   else {
+      struct itimerspec enable = {{0, 0}, {0, ((int)x.count()-the_calibrate.timer_overhead())*1000}};
+      expired = 0;
+      if(timer_settime(my->timerid, 0, &enable, NULL) != 0)
+         expired = 1;
+   }
+}
+
+void checktime_timer::stop() {
+   if(expired)
+      return;
+   struct itimerspec disable = {{0, 0}, {0, 0}};
+   timer_settime(my->timerid, 0, &disable, NULL);
+   expired = 1;
+}
+
+}}
\ No newline at end of file
diff --git a/libraries/chain/checktime_timer_posix_test.c b/libraries/chain/checktime_timer_posix_test.c
new file mode 100644
index 00000000000..c96ec92810a
--- /dev/null
+++ b/libraries/chain/checktime_timer_posix_test.c
@@ -0,0 +1,10 @@
+#include <signal.h>
+#include <sys/time.h>
+#include <stdlib.h>
+
+int main() {
+   struct itimerval enable = {{0, 0}, {0, 1000u}};
+   if(setitimer(ITIMER_REAL, &enable, NULL))
+      return 1;
+   return 0;
+}
\ No newline at end of file
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c003286012d..fae87475cf3 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -24,6 +24,7 @@
 #include <eosio/chain/resource_limits.hpp>
 #include <eosio/chain/chain_snapshot.hpp>
 #include <eosio/chain/thread_utils.hpp>
+#include <eosio/chain/checktime_timer.hpp>
 
 #include <chainbase/chainbase.hpp>
 #include <fc/io/json.hpp>
@@ -229,6 +230,7 @@ struct controller_impl {
    bool                           trusted_producer_light_validation = false;
    uint32_t                       snapshot_head_block = 0;
    named_thread_pool              thread_pool;
+   checktime_timer                timer;
 
    typedef pair<scope_name,action_name>                   handler_key;
    map< account_name, map<handler_key, apply_handler> >   apply_handlers;
@@ -1029,7 +1031,7 @@ struct controller_impl {
          etrx.set_reference_block( self.head_block_id() );
       }
 
-      transaction_context trx_context( self, etrx, etrx.id(), start );
+      transaction_context trx_context( self, etrx, etrx.id(), timer, start );
       trx_context.deadline = deadline;
       trx_context.explicit_billed_cpu_time = explicit_billed_cpu_time;
       trx_context.billed_cpu_time_us = billed_cpu_time_us;
@@ -1151,7 +1153,7 @@ struct controller_impl {
 
       uint32_t cpu_time_to_bill_us = billed_cpu_time_us;
 
-      transaction_context trx_context( self, dtrx, gtrx.trx_id );
+      transaction_context trx_context( self, dtrx, gtrx.trx_id, timer );
       trx_context.leeway =  fc::microseconds(0); // avoid stealing cpu resource
       trx_context.deadline = deadline;
       trx_context.explicit_billed_cpu_time = explicit_billed_cpu_time;
@@ -1319,7 +1321,7 @@ struct controller_impl {
          }
 
          const signed_transaction& trn = trx->packed_trx()->get_signed_transaction();
-         transaction_context trx_context(self, trn, trx->id(), start);
+         transaction_context trx_context(self, trn, trx->id(), timer, start);
          if ((bool)subjective_cpu_leeway && pending->_block_status == controller::block_status::incomplete) {
             trx_context.leeway = *subjective_cpu_leeway;
          }
diff --git a/libraries/chain/include/eosio/chain/checktime_timer.hpp b/libraries/chain/include/eosio/chain/checktime_timer.hpp
new file mode 100644
index 00000000000..1e9d0c1a611
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/checktime_timer.hpp
@@ -0,0 +1,35 @@
+#pragma once
+#include <fc/time.hpp>
+#include <fc/fwd.hpp>
+
+#include <signal.h>
+
+namespace eosio { namespace chain {
+
+struct checktime_timer {
+   checktime_timer();
+   ~checktime_timer();
+
+   void start(fc::time_point tp);
+   void stop();
+
+   int ms;
+
+   volatile sig_atomic_t expired = 1;
+
+private:
+   struct impl;
+   constexpr static size_t fwd_size = 8;
+   fc::fwd<impl,fwd_size> my;
+};
+
+struct checktime_timer_scoped_stop {
+   checktime_timer_scoped_stop(checktime_timer& t) : _timer(t) {}
+   ~checktime_timer_scoped_stop() {
+      _timer.stop();
+   }
+private:
+   checktime_timer& _timer;
+};
+
+}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp b/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
new file mode 100755
index 00000000000..d9905206177
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <memory>
+
+namespace eosio { namespace chain {
+
+struct checktime_timer_calibrate {
+   //on construction it will do the calibration
+   checktime_timer_calibrate();
+   ~checktime_timer_calibrate();
+
+   bool use_timer() const {return _use_timer;}
+   int timer_overhead() const {return _timer_overhead;}
+
+   void print_stats();
+
+private:
+   //These two values will be inspected by checktime_timer impls to determine if they
+   // should use the timer (accurate enough) and what slop to give the expiration. Set
+   // the defaults to a "perfect" timer because checktime_timer_calibrate will create
+   // a checktime_timer to calibrate with.
+   bool _use_timer = true;
+   int _timer_overhead = 0;
+
+   struct impl;
+   std::unique_ptr<impl> my;
+};
+
+}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index a799d677144..7bbe0e66b09 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -1,23 +1,11 @@
 #pragma once
 #include <eosio/chain/controller.hpp>
 #include <eosio/chain/trace.hpp>
+#include <eosio/chain/checktime_timer.hpp>
 #include <signal.h>
 
 namespace eosio { namespace chain {
 
-   struct deadline_timer {
-         deadline_timer();
-         ~deadline_timer();
-
-         void start(fc::time_point tp);
-         void stop();
-
-         static volatile sig_atomic_t expired;
-      private:
-         static void timer_expired(int);
-         static bool initialized;
-   };
-
    class transaction_context {
       private:
          void init( uint64_t initial_net_usage);
@@ -27,6 +15,7 @@ namespace eosio { namespace chain {
          transaction_context( controller& c,
                               const signed_transaction& t,
                               const transaction_id_type& trx_id,
+                              checktime_timer& timer,
                               fc::time_point start = fc::time_point::now() );
 
          void init_for_implicit_trx( uint64_t initial_net_usage = 0 );
@@ -139,7 +128,8 @@ namespace eosio { namespace chain {
          fc::microseconds              billed_time;
          fc::microseconds              billing_timer_duration_limit;
 
-         deadline_timer                _deadline_timer;
+         checktime_timer&              deadline_timer;
+         checktime_timer_scoped_stop   timer_stopper;
    };
 
 } }
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index d687df7bf96..6aed4868752 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -21,133 +21,10 @@
 
 namespace eosio { namespace chain {
 
-namespace bacc = boost::accumulators;
-
-   struct deadline_timer_verify {
-      deadline_timer_verify() {
-         //keep longest first in list. You're effectively going to take test_intervals[0]*sizeof(test_intervals[0])
-         //time to do the the "calibration"
-         int test_intervals[] = {50000, 10000, 5000, 1000, 500, 100, 50, 10};
-
-         struct sigaction act;
-         sigemptyset(&act.sa_mask);
-         act.sa_handler = timer_hit;
-         act.sa_flags = 0;
-         if(sigaction(SIGALRM, &act, NULL))
-            return;
-
-         sigset_t alrm;
-         sigemptyset(&alrm);
-         sigaddset(&alrm, SIGALRM);
-         int dummy;
-
-         for(int& interval : test_intervals) {
-            unsigned int loops = test_intervals[0]/interval;
-
-            for(unsigned int i = 0; i < loops; ++i) {
-               struct itimerval enable = {{0, 0}, {0, interval}};
-               hit = 0;
-               auto start = std::chrono::high_resolution_clock::now();
-               if(setitimer(ITIMER_REAL, &enable, NULL))
-                  return;
-               while(!hit) {}
-               auto end = std::chrono::high_resolution_clock::now();
-               int timer_slop = std::chrono::duration_cast<std::chrono::microseconds>(end-start).count() - interval;
-
-               //since more samples are run for the shorter expirations, weigh the longer expirations accordingly. This
-               //helps to make a few results more fair. Two such examples: AWS c4&i5 xen instances being rather stable
-               //down to 100us but then struggling with 50us and 10us. MacOS having performance that seems to correlate
-               //with expiry length; that is, long expirations have high error, short expirations have low error.
-               //That said, for these platforms, a tighter tolerance may possibly be achieved by taking performance
-               //metrics in mulitple bins and appliying the slop based on which bin a deadline resides in. Not clear
-               //if that's worth the extra complexity at this point.
-               samples(timer_slop, bacc::weight = interval/(float)test_intervals[0]);
-            }
-         }
-         timer_overhead = bacc::mean(samples) + sqrt(bacc::variance(samples))*2; //target 95% of expirations before deadline
-         use_deadline_timer = timer_overhead < 1000;
-
-         act.sa_handler = SIG_DFL;
-         sigaction(SIGALRM, &act, NULL);
-      }
-
-      static void timer_hit(int) {
-         hit = 1;
-      }
-      static volatile sig_atomic_t hit;
-
-      bacc::accumulator_set<int, bacc::stats<bacc::tag::mean, bacc::tag::min, bacc::tag::max, bacc::tag::variance>, float> samples;
-      bool use_deadline_timer = false;
-      int timer_overhead;
-   };
-   volatile sig_atomic_t deadline_timer_verify::hit;
-   static deadline_timer_verify deadline_timer_verification;
-
-   deadline_timer::deadline_timer() {
-      if(initialized)
-         return;
-      initialized = true;
-
-      #define TIMER_STATS_FORMAT "min:${min}us max:${max}us mean:${mean}us stddev:${stddev}us"
-      #define TIMER_STATS \
-         ("min", bacc::min(deadline_timer_verification.samples))("max", bacc::max(deadline_timer_verification.samples)) \
-         ("mean", (int)bacc::mean(deadline_timer_verification.samples))("stddev", (int)sqrt(bacc::variance(deadline_timer_verification.samples))) \
-         ("t", deadline_timer_verification.timer_overhead)
-
-      if(deadline_timer_verification.use_deadline_timer) {
-         struct sigaction act;
-         act.sa_handler = timer_expired;
-         sigemptyset(&act.sa_mask);
-         act.sa_flags = 0;
-         if(sigaction(SIGALRM, &act, NULL) == 0) {
-            ilog("Using ${t}us deadline timer for checktime: " TIMER_STATS_FORMAT, TIMER_STATS);
-            return;
-         }
-      }
-
-      wlog("Using polled checktime; deadline timer too inaccurate: " TIMER_STATS_FORMAT, TIMER_STATS);
-      deadline_timer_verification.use_deadline_timer = false; //set in case sigaction() fails above
-   }
-
-   void deadline_timer::start(fc::time_point tp) {
-      if(tp == fc::time_point::maximum()) {
-         expired = 0;
-         return;
-      }
-      if(!deadline_timer_verification.use_deadline_timer) {
-         expired = 1;
-         return;
-      }
-      microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();
-      if(x.count() <= deadline_timer_verification.timer_overhead)
-         expired = 1;
-      else {
-         struct itimerval enable = {{0, 0}, {0, (int)x.count()-deadline_timer_verification.timer_overhead}};
-         expired = 0;
-         expired |= !!setitimer(ITIMER_REAL, &enable, NULL);
-      }
-   }
-
-   void deadline_timer::stop() {
-      if(expired)
-         return;
-      struct itimerval disable = {{0, 0}, {0, 0}};
-      setitimer(ITIMER_REAL, &disable, NULL);
-   }
-
-   deadline_timer::~deadline_timer() {
-      stop();
-   }
-
-   void deadline_timer::timer_expired(int) {
-      expired = 1;
-   }
-   volatile sig_atomic_t deadline_timer::expired = 0;
-   bool deadline_timer::initialized = false;
-
    transaction_context::transaction_context( controller& c,
                                              const signed_transaction& t,
                                              const transaction_id_type& trx_id,
+                                             checktime_timer& tmr,
                                              fc::time_point s )
    :control(c)
    ,trx(t)
@@ -157,6 +34,8 @@ namespace bacc = boost::accumulators;
    ,start(s)
    ,net_usage(trace->net_usage)
    ,pseudo_start(s)
+   ,deadline_timer(tmr)
+   ,timer_stopper(tmr)
    {
       if (!c.skip_db_sessions()) {
          undo_session = c.mutable_db().start_undo_session(true);
@@ -280,9 +159,9 @@ namespace bacc = boost::accumulators;
       checktime(); // Fail early if deadline has already been exceeded
 
       if(control.skip_trx_checks())
-         _deadline_timer.expired = 0;
+         deadline_timer.start(fc::time_point::maximum());
       else
-         _deadline_timer.start(_deadline);
+         deadline_timer.start(_deadline);
 
       is_initialized = true;
    }
@@ -465,7 +344,7 @@ namespace bacc = boost::accumulators;
    }
 
    void transaction_context::checktime()const {
-      if(BOOST_LIKELY(_deadline_timer.expired == false))
+      if(BOOST_LIKELY(deadline_timer.expired == false))
          return;
       auto now = fc::time_point::now();
       if( BOOST_UNLIKELY( now > _deadline ) ) {
@@ -504,7 +383,7 @@ namespace bacc = boost::accumulators;
       billed_time = now - pseudo_start;
       deadline_exception_code = deadline_exception::code_value; // Other timeout exceptions cannot be thrown while billable timer is paused.
       pseudo_start = fc::time_point();
-      _deadline_timer.stop();
+      deadline_timer.stop();
    }
 
    void transaction_context::resume_billing_timer() {
@@ -519,7 +398,7 @@ namespace bacc = boost::accumulators;
          _deadline = deadline;
          deadline_exception_code = deadline_exception::code_value;
       }
-      _deadline_timer.start(_deadline);
+      deadline_timer.start(_deadline);
    }
 
    void transaction_context::validate_cpu_usage_to_bill( int64_t billed_us, bool check_minimum )const {

From 56b62f26a39aff2b2858a8d332f2590ddc57f83b Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 3 Jun 2019 10:54:37 -0400
Subject: [PATCH 0525/1648] set initial costs for expensive parallel unit tests

When running multiple tests in parallel it is most optimal to run the longest ones first. Add some initial costs to the known pigs so that they run first.
---
 unittests/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 82e723e5563..a2f1aefcfaa 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -70,6 +70,12 @@ foreach(TEST_SUITE ${UNIT_TESTS}) # create an independent target for each test s
 endforeach(TEST_SUITE)
 set(ctest_tests "'${ctest_tests}' -j8") # surround test list string in apostrophies
 
+# The following tests are known to take the longest, bump up their cost (priority) so that they'll run first
+# even on fresh first time test runs before ctest auto-detects costs
+set_tests_properties(api_unit_test_wavm api_unit_test_wabt PROPERTIES COST 5000)
+set_tests_properties(wasm_unit_test_wavm wasm_unit_test_wabt PROPERTIES COST 4000)
+set_tests_properties(delay_unit_test_wavm delay_unit_test_wabt PROPERTIES COST 3000)
+
 ### COVERAGE TESTING ###
 if(ENABLE_COVERAGE_TESTING)
   set(Coverage_NAME ${PROJECT_NAME}_ut_coverage)

From 0aeb65147ce2558f5ce340034ae21e429c55b54e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 3 Jun 2019 10:20:22 -0500
Subject: [PATCH 0526/1648] Modify tester push_block to return forked/dropped
 transactions

---
 libraries/testing/include/eosio/testing/tester.hpp |  2 +-
 libraries/testing/tester.cpp                       | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 8c24f90dba0..afd8b628b56 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -112,7 +112,7 @@ namespace eosio { namespace testing {
          void                 produce_blocks_for_n_rounds(const uint32_t num_of_rounds = 1);
          // Produce minimal number of blocks as possible to spend the given time without having any producer become inactive
          void                 produce_min_num_of_blocks_to_spend_time_wo_inactive_prod(const fc::microseconds target_elapsed_time = fc::microseconds());
-         void                 push_block(signed_block_ptr b);
+         vector<transaction_metadata_ptr>  push_block(signed_block_ptr b);
 
          /**
           * These transaction IDs represent transactions available in the head chain state as scheduled
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 97a0cf23fc2..d1601d4baf0 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -223,15 +223,22 @@ namespace eosio { namespace testing {
       });
    }
 
-   void base_tester::push_block(signed_block_ptr b) {
+   vector<transaction_metadata_ptr> base_tester::push_block(signed_block_ptr b) {
       auto bs = control->create_block_state_future(b);
-      control->abort_block();
-      control->push_block(bs);
+      vector<transaction_metadata_ptr> trxs;
+      trxs = control->abort_block();
+      branch_type forked_branch = control->push_block(bs);
+      // branch is in reverse order
+      for( auto ritr = forked_branch.rbegin(), end = forked_branch.rend(); ritr != end; ++ritr ) {
+         trxs.insert( trxs.end(), (*ritr)->trxs.begin(), (*ritr)->trxs.end() );
+      }
 
       auto itr = last_produced_block.find(b->producer);
       if (itr == last_produced_block.end() || block_header::num_from_id(b->id()) > block_header::num_from_id(itr->second)) {
          last_produced_block[b->producer] = b->id();
       }
+
+      return trxs;
 }
 
    signed_block_ptr base_tester::_produce_block( fc::microseconds skip_time, bool skip_pending_trxs) {

From 1bf825b787c93bd61dd8a72c713ad0c4ea1d6402 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 3 Jun 2019 10:20:52 -0500
Subject: [PATCH 0527/1648] Add test for push_block returning forked
 transactions

---
 unittests/forked_tests.cpp | 81 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 920d759e951..1bb000f0d5c 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -577,4 +577,85 @@ BOOST_AUTO_TEST_CASE( reopen_forkdb ) try {
 
 } FC_LOG_AND_RETHROW()
 
+BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
+   tester c;
+   while (c.control->head_block_num() < 3) {
+      c.produce_block();
+   }
+   auto r = c.create_accounts( {N(dan),N(sam),N(pam)} );
+   c.produce_block();
+   auto res = c.set_producers( {N(dan),N(sam),N(pam)} );
+   wlog("set producer schedule to [dan,sam,pam]");
+   c.produce_blocks(40);
+
+   tester c2;
+   wlog( "push c1 blocks to c2" );
+   push_blocks(c, c2);
+
+   wlog( "c1 blocks:" );
+   c.produce_blocks(3);
+   signed_block_ptr b;
+   b = c.produce_block();
+   account_name expected_producer = N(dan);
+   BOOST_REQUIRE_EQUAL( b->producer.to_string(), expected_producer.to_string() );
+
+   b = c.produce_block();
+   expected_producer = N(sam);
+   BOOST_REQUIRE_EQUAL( b->producer.to_string(), expected_producer.to_string() );
+   c.produce_blocks(10);
+   c.create_accounts( {N(cam)} );
+   c.set_producers( {N(dan),N(sam),N(pam),N(cam)} );
+   wlog("set producer schedule to [dan,sam,pam,cam]");
+   c.produce_block();
+   // The next block should be produced by pam.
+
+   // Sync second chain with first chain.
+   wlog( "push c1 blocks to c2" );
+   push_blocks(c, c2);
+   wlog( "end push c1 blocks to c2" );
+
+   // Now sam and pam go on their own fork while dan is producing blocks by himself.
+
+   wlog( "sam and pam go off on their own fork on c2 while dan produces blocks by himself in c1" );
+   auto fork_block_num = c.control->head_block_num();
+
+   wlog( "c2 blocks:" );
+   c2.produce_blocks(12); // pam produces 12 blocks
+   b = c2.produce_block( fc::milliseconds(config::block_interval_ms * 13) ); // sam skips over dan's blocks
+   expected_producer = N(sam);
+   BOOST_REQUIRE_EQUAL( b->producer.to_string(), expected_producer.to_string() );
+   c2.produce_blocks(11 + 12);
+
+
+   wlog( "c1 blocks:" );
+   b = c.produce_block( fc::milliseconds(config::block_interval_ms * 13) ); // dan skips over pam's blocks
+   expected_producer = N(dan);
+   BOOST_REQUIRE_EQUAL( b->producer.to_string(), expected_producer.to_string() );
+   // create accounts on c1 which will be forked out
+   c.produce_block();
+   auto trace1 = c.create_account( N(test1) );
+   c.produce_block();
+   auto trace2 = c.create_account( N(test2) );
+   auto trace3 = c.create_account( N(test3) );
+   c.produce_block();
+   c.produce_blocks(9);
+
+   // dan on chain 1 now gets all of the blocks from chain 2 which should cause fork switch
+   wlog( "push c2 blocks to c1" );
+   vector<transaction_metadata_ptr> trxs;
+   for( uint32_t start = fork_block_num + 1, end = c2.control->head_block_num(); start <= end; ++start ) {
+      auto fb = c2.control->fetch_block_by_number( start );
+      vector<transaction_metadata_ptr> push_block_trxs = c.push_block( fb );
+      trxs.insert( trxs.end(), push_block_trxs.begin(), push_block_trxs.end() );
+   }
+
+   // verify transaction on fork is reported by push_block in order
+   BOOST_REQUIRE_EQUAL( 3, trxs.size() );
+   BOOST_REQUIRE_EQUAL( trace1->id, trxs.at(0)->id() );
+   BOOST_REQUIRE_EQUAL( trace2->id, trxs.at(1)->id() );
+   BOOST_REQUIRE_EQUAL( trace3->id, trxs.at(2)->id() );
+
+} FC_LOG_AND_RETHROW()
+
+
 BOOST_AUTO_TEST_SUITE_END()

From 6277c426c87db470fd6bd99c1a11841b4bbde182 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 3 Jun 2019 15:36:35 -0500
Subject: [PATCH 0528/1648] Add unapplied_transation_queue to effeciently track
 unapplied transactions

---
 .../unapplied_transaction_queue.hpp           |  96 ++++++++++
 tests/CMakeLists.txt                          |   3 +-
 tests/producer_plugin_tests.cpp               | 171 ++++++++++++++++++
 3 files changed, 269 insertions(+), 1 deletion(-)
 create mode 100644 plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
 create mode 100644 tests/producer_plugin_tests.cpp

diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
new file mode 100644
index 00000000000..65017ca80a3
--- /dev/null
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
@@ -0,0 +1,96 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+
+#pragma once
+
+#include <eosio/chain/transaction_metadata.hpp>
+#include <eosio/chain/block_state.hpp>
+
+#include <queue>
+
+namespace eosio {
+
+/**
+ * Track unapplied transactions for aborted blocks, forked blocks, and subjectively
+ * failed transactions.
+ */
+class unapplied_transaction_queue {
+   std::deque<std::vector<chain::transaction_metadata_ptr>> aborted_block_trxs;
+   size_t current_trx_in_trxs = 0;
+   std::deque<chain::branch_type> forked_branches;
+   size_t current_trx_in_block = 0;
+   std::deque<chain::transaction_metadata_ptr> subjective_failed_trxs;
+public:
+   void add_aborted( std::vector<chain::transaction_metadata_ptr> aborted_trxs ) {
+      if( aborted_trxs.empty() ) return;
+      // fifo queue so pop back
+      aborted_block_trxs.emplace_front( std::move( aborted_trxs ) );
+   }
+
+   void add_subjective_failure( chain::transaction_metadata_ptr trx ) {
+      // fifo queue so pop back
+      subjective_failed_trxs.emplace_front( std::move( trx ) );
+   }
+
+   void add_forked( chain::branch_type forked_branch ) {
+      if( forked_branch.empty() ) return;
+      // forked_branch is in reverse order
+      // fifo queue for branches so pop back
+      forked_branches.emplace_front( std::move( forked_branch ) );
+   }
+
+   /// Order returned: aborted block transactions, subjectively failed, forked
+   /// FIFO within each category
+   /// @return nullptr if no next
+   chain::transaction_metadata_ptr next() {
+      if( !aborted_block_trxs.empty() ) {
+         std::vector<chain::transaction_metadata_ptr>& p = aborted_block_trxs.back();
+         chain::transaction_metadata_ptr n = p[current_trx_in_trxs];
+         ++current_trx_in_trxs;
+         if( current_trx_in_trxs >= p.size() ) {
+            current_trx_in_trxs = 0;
+            aborted_block_trxs.pop_back();
+         }
+         return n;
+      }
+      if( !subjective_failed_trxs.empty() ) {
+         chain::transaction_metadata_ptr n = subjective_failed_trxs.back();
+         subjective_failed_trxs.pop_back();
+         return n;
+      }
+      while( !forked_branches.empty() ) {
+         chain::branch_type& branch = forked_branches.back();
+         if( branch.empty() ) {
+            current_trx_in_block = 0;
+            forked_branches.pop_back();
+            continue;
+         }
+         chain::block_state_ptr& bs = branch.back();
+         if( current_trx_in_block >= bs->trxs.size() ) {
+            current_trx_in_block = 0;
+            branch.resize( branch.size() - 1 );
+            if( branch.empty() ) {
+               forked_branches.pop_back();
+            }
+            continue;
+         } else {
+            chain::transaction_metadata_ptr n = bs->trxs[current_trx_in_block];
+            ++current_trx_in_block;
+            if( current_trx_in_block >= bs->trxs.size() ) {
+               current_trx_in_block = 0;
+               branch.resize( branch.size() - 1 );
+               if( branch.empty() ) {
+                  forked_branches.pop_back();
+               }
+            }
+            return n;
+         }
+      }
+      return {};
+   }
+
+};
+
+} //eosio
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 06836e7a88f..657f9860c1a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,7 +10,8 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")
+include_directories( "${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include"
+                     "${CMAKE_SOURCE_DIR}/plugins/producer_plugin/include" )
 
 file(GLOB UNIT_TESTS "*.cpp")
 
diff --git a/tests/producer_plugin_tests.cpp b/tests/producer_plugin_tests.cpp
new file mode 100644
index 00000000000..18ddffe9c50
--- /dev/null
+++ b/tests/producer_plugin_tests.cpp
@@ -0,0 +1,171 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE.txt
+ */
+#include <boost/test/unit_test.hpp>
+#include <eosio/producer_plugin/unapplied_transaction_queue.hpp>
+#include <eosio/chain/contract_types.hpp>
+
+using namespace eosio;
+using namespace eosio::chain;
+
+BOOST_AUTO_TEST_SUITE(producer_plugin_tests)
+
+auto unique_trx_meta_data() {
+
+   static uint64_t nextid = 0;
+   ++nextid;
+
+   signed_transaction trx;
+   account_name creator = config::system_account_name;
+   trx.actions.emplace_back( vector<permission_level>{{creator,config::active_name}},
+                             onerror{ nextid, "test", 4 });
+   return std::make_shared<transaction_metadata>( trx );
+}
+
+BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
+
+   unapplied_transaction_queue q;
+
+   auto trx1 = unique_trx_meta_data();
+   auto trx2 = unique_trx_meta_data();
+   auto trx3 = unique_trx_meta_data();
+   auto trx4 = unique_trx_meta_data();
+   auto trx5 = unique_trx_meta_data();
+   auto trx6 = unique_trx_meta_data();
+   auto trx7 = unique_trx_meta_data();
+   auto trx8 = unique_trx_meta_data();
+   auto trx9 = unique_trx_meta_data();
+
+   // empty
+   auto p = q.next();
+   BOOST_CHECK( p == nullptr );
+
+   // 1 subjective failure
+   q.add_subjective_failure( trx1 );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( q.next() == nullptr );
+
+   // fifo subjective
+   q.add_subjective_failure( trx1 );
+   q.add_subjective_failure( trx2 );
+   q.add_subjective_failure( trx3 );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_REQUIRE( q.next() == nullptr );
+
+   // fifo aborted
+   q.add_aborted( { trx1, trx2, trx3 } );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_REQUIRE( q.next() == nullptr );
+
+   // order: aborted, subjective
+   q.add_subjective_failure( trx6 );
+   q.add_aborted( { trx1, trx2, trx3 } );
+   q.add_aborted( { trx4, trx5 } );
+   q.add_subjective_failure( trx7 );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( q.next() == nullptr );
+
+   // fifo forked, one fork
+   auto bs1 = std::make_shared<block_state>();
+   bs1->trxs = { trx1, trx2 };
+   auto bs2 = std::make_shared<block_state>();
+   bs2->trxs = { trx3, trx4, trx5 };
+   auto bs3 = std::make_shared<block_state>();
+   bs3->trxs = { trx6 };
+   q.add_forked( { bs3, bs2, bs1 } );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( q.next() == nullptr );
+
+   // fifo forked, multi forks
+   auto bs4 = std::make_shared<block_state>();
+   bs4->trxs = { trx7 };
+   q.add_forked( { bs3, bs2, bs1 } );
+   q.add_forked( { bs4 } );
+   q.add_forked( { bs3, bs2 } );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( q.next() == nullptr );
+
+   // fifo forked
+   q.add_forked( { bs1 } );
+   q.add_forked( { bs3, bs2 } );
+   q.add_forked( { bs4 } );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( q.next() == nullptr );
+
+   auto trx11 = unique_trx_meta_data();
+   auto trx12 = unique_trx_meta_data();
+   auto trx13 = unique_trx_meta_data();
+   auto trx14 = unique_trx_meta_data();
+   auto trx15 = unique_trx_meta_data();
+   auto trx16 = unique_trx_meta_data();
+   auto trx17 = unique_trx_meta_data();
+   auto trx18 = unique_trx_meta_data();
+   auto trx19 = unique_trx_meta_data();
+
+   // altogether, order fifo: aborted, subjectively failed, forked
+   q.add_forked( { bs3, bs2, bs1 } );
+   q.add_subjective_failure( trx7 );
+   q.add_aborted( { trx9, trx11 } );
+   q.add_subjective_failure( trx8 );
+   q.add_aborted( { trx12, trx13 } );
+   q.add_forked( { bs4, bs3, bs2, bs1 } );
+   BOOST_REQUIRE( q.next() == trx9 );
+   BOOST_REQUIRE( q.next() == trx11 );
+   BOOST_REQUIRE( q.next() == trx12 );
+   BOOST_REQUIRE( q.next() == trx13 );
+   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( q.next() == trx8 );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( q.next() == nullptr );
+
+
+
+} FC_LOG_AND_RETHROW() /// unapplied_transaction_queue_test
+
+
+BOOST_AUTO_TEST_SUITE_END()

From 3ab054f2ae50004eb996d05a048f33e62d410bdb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 3 Jun 2019 16:03:53 -0500
Subject: [PATCH 0529/1648] Added clear()

---
 .../producer_plugin/unapplied_transaction_queue.hpp      | 9 +++++++++
 tests/producer_plugin_tests.cpp                          | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
index 65017ca80a3..370381ea2d9 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
@@ -23,6 +23,15 @@ class unapplied_transaction_queue {
    size_t current_trx_in_block = 0;
    std::deque<chain::transaction_metadata_ptr> subjective_failed_trxs;
 public:
+
+   void clear() {
+      aborted_block_trxs.clear();
+      current_trx_in_trxs = 0;
+      forked_branches.clear();
+      current_trx_in_block = 0;
+      subjective_failed_trxs.clear();
+   }
+
    void add_aborted( std::vector<chain::transaction_metadata_ptr> aborted_trxs ) {
       if( aborted_trxs.empty() ) return;
       // fifo queue so pop back
diff --git a/tests/producer_plugin_tests.cpp b/tests/producer_plugin_tests.cpp
index 18ddffe9c50..f3a3d674798 100644
--- a/tests/producer_plugin_tests.cpp
+++ b/tests/producer_plugin_tests.cpp
@@ -163,7 +163,11 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx7 );
    BOOST_REQUIRE( q.next() == nullptr );
 
-
+   q.add_forked( { bs3, bs2, bs1 } );
+   q.add_aborted( { trx9, trx11 } );
+   q.add_subjective_failure( trx8 );
+   q.clear();
+   BOOST_REQUIRE( q.next() == nullptr );
 
 } FC_LOG_AND_RETHROW() /// unapplied_transaction_queue_test
 

From 9d1ccbc8e68191065d22ad1506e5ce80029af6cc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 3 Jun 2019 16:32:03 -0500
Subject: [PATCH 0530/1648] Add empty() method

---
 .../producer_plugin/unapplied_transaction_queue.hpp    |  4 ++++
 tests/producer_plugin_tests.cpp                        | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
index 370381ea2d9..0f5ae09de88 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
@@ -24,6 +24,10 @@ class unapplied_transaction_queue {
    std::deque<chain::transaction_metadata_ptr> subjective_failed_trxs;
 public:
 
+   bool empty() const {
+      return aborted_block_trxs.empty() && forked_branches.empty() && subjective_failed_trxs.empty();
+   }
+
    void clear() {
       aborted_block_trxs.clear();
       current_trx_in_trxs = 0;
diff --git a/tests/producer_plugin_tests.cpp b/tests/producer_plugin_tests.cpp
index f3a3d674798..7e09f25b9a2 100644
--- a/tests/producer_plugin_tests.cpp
+++ b/tests/producer_plugin_tests.cpp
@@ -26,6 +26,7 @@ auto unique_trx_meta_data() {
 BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
 
    unapplied_transaction_queue q;
+   BOOST_CHECK( q.empty() );
 
    auto trx1 = unique_trx_meta_data();
    auto trx2 = unique_trx_meta_data();
@@ -46,6 +47,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx1 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_CHECK( q.empty() );
 
    // fifo subjective
    q.add_subjective_failure( trx1 );
@@ -55,6 +57,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx2 );
    BOOST_REQUIRE( q.next() == trx3 );
    BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_CHECK( q.empty() );
 
    // fifo aborted
    q.add_aborted( { trx1, trx2, trx3 } );
@@ -62,6 +65,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx2 );
    BOOST_REQUIRE( q.next() == trx3 );
    BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_CHECK( q.empty() );
 
    // order: aborted, subjective
    q.add_subjective_failure( trx6 );
@@ -76,6 +80,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx6 );
    BOOST_REQUIRE( q.next() == trx7 );
    BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_CHECK( q.empty() );
 
    // fifo forked, one fork
    auto bs1 = std::make_shared<block_state>();
@@ -92,6 +97,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx5 );
    BOOST_REQUIRE( q.next() == trx6 );
    BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_CHECK( q.empty() );
 
    // fifo forked, multi forks
    auto bs4 = std::make_shared<block_state>();
@@ -111,6 +117,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx5 );
    BOOST_REQUIRE( q.next() == trx6 );
    BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_CHECK( q.empty() );
 
    // fifo forked
    q.add_forked( { bs1 } );
@@ -124,6 +131,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx6 );
    BOOST_REQUIRE( q.next() == trx7 );
    BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_CHECK( q.empty() );
 
    auto trx11 = unique_trx_meta_data();
    auto trx12 = unique_trx_meta_data();
@@ -162,11 +170,13 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx6 );
    BOOST_REQUIRE( q.next() == trx7 );
    BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_CHECK( q.empty() );
 
    q.add_forked( { bs3, bs2, bs1 } );
    q.add_aborted( { trx9, trx11 } );
    q.add_subjective_failure( trx8 );
    q.clear();
+   BOOST_CHECK( q.empty() );
    BOOST_REQUIRE( q.next() == nullptr );
 
 } FC_LOG_AND_RETHROW() /// unapplied_transaction_queue_test

From 8a0fb6b3ad6a52cda984b6258eabf78dd9e459e0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 3 Jun 2019 16:32:50 -0500
Subject: [PATCH 0531/1648] Integrate unapplicated_transactions_queue

---
 plugins/producer_plugin/producer_plugin.cpp | 61 ++++++++++-----------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 7974f07b07a..74e7a9c54cc 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -3,6 +3,7 @@
  *  @copyright defined in eos/LICENSE
  */
 #include <eosio/producer_plugin/producer_plugin.hpp>
+#include <eosio/producer_plugin/unapplied_transaction_queue.hpp>
 #include <eosio/chain/plugin_interface.hpp>
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
@@ -181,6 +182,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       std::map<chain::account_name, uint32_t>                   _producer_watermarks;
       pending_block_mode                                        _pending_block_mode;
       transaction_id_with_expiry_index                          _persistent_transactions;
+      unapplied_transaction_queue                               _unapplied_transactions;
       fc::optional<named_thread_pool>                           _thread_pool;
 
       std::atomic<int32_t>                                      _max_transaction_time_ms; // modified by app thread, read by net_plugin thread pool
@@ -372,7 +374,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          auto bsf = chain.create_block_state_future( block );
 
          // abort the pending block
-         chain.abort_block();
+         vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
+         _unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
 
          // exceptions throw out, make sure we restart our loop
          auto ensure = fc::make_scoped_exit([this](){
@@ -382,7 +385,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          // push the new block
          bool except = false;
          try {
-            chain.push_block( bsf );
+            branch_type forked_branch = chain.push_block( bsf );
+            _unapplied_transactions.add_forked( std::move( forked_branch ) );
          } catch ( const guard_exception& e ) {
             chain_plug->handle_guard_exception(e);
             return;
@@ -443,7 +447,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
          bool empty()const { return _incoming_transactions.empty(); }
          size_t size()const { return _incoming_transactions.size(); }
-
       };
 
       incoming_transaction_queue _pending_incoming_transactions;
@@ -932,7 +935,8 @@ void producer_plugin::resume() {
    //
    if (my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      chain.abort_block();
+      vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
+      my->_unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
       my->schedule_production_loop();
    }
 }
@@ -971,7 +975,8 @@ void producer_plugin::update_runtime_options(const runtime_options& options) {
 
    if (check_speculating && my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      chain.abort_block();
+      vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
+      my->_unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
       my->schedule_production_loop();
    }
 
@@ -1047,7 +1052,8 @@ producer_plugin::integrity_hash_information producer_plugin::get_integrity_hash(
 
    if (chain.is_building_block()) {
       // abort the pending block
-      chain.abort_block();
+      vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
+      my->_unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
    } else {
       reschedule.cancel();
    }
@@ -1076,7 +1082,8 @@ void producer_plugin::create_snapshot(producer_plugin::next_function<producer_pl
 
       if (chain.is_building_block()) {
          // abort the pending block
-         chain.abort_block();
+         vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
+         my->_unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
       } else {
          reschedule.cancel();
       }
@@ -1405,7 +1412,8 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          }
       }
 
-      chain.abort_block();
+      vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
+      _unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
 
       auto features_to_activate = chain.get_preactivated_protocol_features();
       if( _pending_block_mode == pending_block_mode::producing && _protocol_features_to_activate.size() > 0 ) {
@@ -1504,12 +1512,10 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          if (_producers.empty() && persisted_by_id.empty()) {
             // if this node can never produce and has no persisted transactions,
             // there is no need for unapplied transactions they can be dropped
-            chain.get_unapplied_transactions().clear();
+            _unapplied_transactions.clear();
          } else {
             // derive appliable transactions from unapplied_transactions and drop droppable transactions
-            unapplied_transactions_type& unapplied_trxs = chain.get_unapplied_transactions();
-            if( !unapplied_trxs.empty() ) {
-               auto unapplied_trxs_size = unapplied_trxs.size();
+            if( !_unapplied_transactions.empty() ) {
                int num_applied = 0;
                int num_failed = 0;
                int num_processed = 0;
@@ -1523,14 +1529,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                   }
                };
 
-               auto itr = unapplied_trxs.begin();
-               while( itr != unapplied_trxs.end() ) {
-                  auto itr_next = itr; // save off next since itr may be invalidated by loop
-                  ++itr_next;
-
-                  if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
-                  if( exhausted ) break;
-                  const transaction_metadata_ptr trx = itr->second;
+               while( transaction_metadata_ptr trx = _unapplied_transactions.next() ) {
                   auto category = calculate_transaction_category(trx);
                   if (category == tx_category::EXPIRED ||
                      (category == tx_category::UNEXPIRED_UNPERSISTED && _producers.empty()))
@@ -1539,8 +1538,10 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                         fc_dlog(_trx_trace_log, "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
                                ("txid", trx->id()));
                      }
-                     itr = unapplied_trxs.erase( itr ); // unapplied_trxs map has not been modified, so simply erase and continue
-                     continue;
+                     if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
+                     if( exhausted ) break;
+                     continue; // _unapplied_transactions removed trx, so just continue
+
                   } else if (category == tx_category::PERSISTED ||
                             (category == tx_category::UNEXPIRED_UNPERSISTED && _pending_block_mode == pending_block_mode::producing))
                   {
@@ -1558,11 +1559,10 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                         if (trace->except) {
                            if (failure_is_subjective(*trace->except, deadline_is_subjective)) {
                               exhausted = true;
+                              _unapplied_transactions.add_subjective_failure( trx );
                               break;
                            } else {
                               // this failed our configured maximum transaction time, we don't want to replay it
-                              // chain.plus_transactions can modify unapplied_trxs, so erase by id
-                              unapplied_trxs.erase( trx->signed_id() );
                               ++num_failed;
                            }
                         } else {
@@ -1574,14 +1574,12 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                      } FC_LOG_AND_DROP();
                   }
 
-                  itr = itr_next;
+                  if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
+                  if( exhausted ) break;
                }
 
-               fc_dlog(_log, "Processed ${m} of ${n} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",
-                             ("m", num_processed)
-                             ("n", unapplied_trxs_size)
-                             ("applied", num_applied)
-                             ("failed", num_failed));
+               fc_dlog(_log, "Processed ${all} of the ${m} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",
+                             ("all", exhausted ? "some" : "all")("m", num_processed)("applied", num_applied)("failed", num_failed));
             }
          }
 
@@ -1860,7 +1858,8 @@ bool producer_plugin_impl::maybe_produce_block() {
 
    fc_dlog(_log, "Aborting block due to produce_block error");
    chain::controller& chain = chain_plug->chain();
-   chain.abort_block();
+   vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
+   _unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
    return false;
 }
 

From 0dd9508d04c7b0dde75435f43ab022f33d133c42 Mon Sep 17 00:00:00 2001
From: Baegjae Sung <baegjae@gmail.com>
Date: Tue, 4 Jun 2019 19:14:48 +0900
Subject: [PATCH 0532/1648] Name txn_test_gen threads

Like other threads, txn_test_gen threads are also named (txntest-N).
---
 .../txn_test_gen_plugin.cpp                   | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)
 mode change 100755 => 100644 plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp

diff --git a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
old mode 100755
new mode 100644
index c17729b990b..580d6d0f3bd
--- a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
+++ b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
@@ -5,6 +5,7 @@
 #include <eosio/txn_test_gen_plugin/txn_test_gen_plugin.hpp>
 #include <eosio/chain_plugin/chain_plugin.hpp>
 #include <eosio/chain/wast_to_wasm.hpp>
+#include <eosio/chain/thread_utils.hpp>
 
 #include <fc/variant.hpp>
 #include <fc/io/json.hpp>
@@ -41,7 +42,6 @@ namespace eosio {
 static appbase::abstract_plugin& _txn_test_gen_plugin = app().register_plugin<txn_test_gen_plugin>();
 
 using namespace eosio::chain;
-using io_work_t = boost::asio::executor_work_guard<boost::asio::io_context::executor_type>;
 
 #define CALL(api_name, api_handle, call_name, INVOKE, http_response_code) \
 {std::string("/v1/" #api_name "/" #call_name), \
@@ -100,10 +100,8 @@ struct txn_test_gen_plugin_impl {
    uint64_t _total_us = 0;
    uint64_t _txcount = 0;
 
-   std::shared_ptr<boost::asio::io_context>             gen_ioc;
-   optional<io_work_t>                                  gen_ioc_work;
    uint16_t                                             thread_pool_size;
-   optional<boost::asio::thread_pool>                   thread_pool;
+   fc::optional<eosio::chain::named_thread_pool>        thread_pool;
    std::shared_ptr<boost::asio::high_resolution_timer>  timer;
    name                                                 newaccountA;
    name                                                 newaccountB;
@@ -305,17 +303,13 @@ struct txn_test_gen_plugin_impl {
       batch = batch_size/2;
       nonce_prefix = 0;
 
-      gen_ioc = std::make_shared<boost::asio::io_context>();
-      gen_ioc_work.emplace( boost::asio::make_work_guard(*gen_ioc) );
-      thread_pool.emplace( thread_pool_size );
-      for( uint16_t i = 0; i < thread_pool_size; i++ )
-         boost::asio::post( *thread_pool, [ioc = gen_ioc]() { ioc->run(); } );
-      timer = std::make_shared<boost::asio::high_resolution_timer>(*gen_ioc);
+      thread_pool.emplace( "txntest", thread_pool_size );
+      timer = std::make_shared<boost::asio::high_resolution_timer>(thread_pool->get_executor());
 
       ilog("Started transaction test plugin; generating ${p} transactions every ${m} ms by ${t} load generation threads",
          ("p", batch_size) ("m", period) ("t", thread_pool_size));
 
-      boost::asio::post( *gen_ioc, [this]() {
+      boost::asio::post( thread_pool->get_executor(), [this]() {
          arm_timer(boost::asio::high_resolution_timer::clock_type::now());
       });
       return "success";
@@ -323,7 +317,7 @@ struct txn_test_gen_plugin_impl {
 
    void arm_timer(boost::asio::high_resolution_timer::time_point s) {
       timer->expires_at(s + std::chrono::milliseconds(timer_timeout));
-      boost::asio::post( *gen_ioc, [this]() {
+      boost::asio::post( thread_pool->get_executor(), [this]() {
          send_transaction([this](const fc::exception_ptr& e){
             if (e) {
                elog("pushing transaction failed: ${e}", ("e", e->to_detail_string()));
@@ -400,14 +394,9 @@ struct txn_test_gen_plugin_impl {
          throw fc::exception(fc::invalid_operation_exception_code);
       timer->cancel();
       running = false;
-      if( gen_ioc_work )
-         gen_ioc_work->reset();
-      if( gen_ioc )
-         gen_ioc->stop();
-      if( thread_pool ) {
-         thread_pool->join();
+      if( thread_pool )
          thread_pool->stop();
-      }
+
       ilog("Stopping transaction generation test");
 
       if (_txcount) {

From 03381b575da9b62182722f4074ce6a4a692513e0 Mon Sep 17 00:00:00 2001
From: Baegjae Sung <baegjae@gmail.com>
Date: Tue, 4 Jun 2019 19:23:32 +0900
Subject: [PATCH 0533/1648] Remove log of send_transaction

ilog of send_transaction is output too much.
---
 plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
index 580d6d0f3bd..08289ee477b 100644
--- a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
+++ b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
@@ -385,7 +385,6 @@ struct txn_test_gen_plugin_impl {
          next(e.dynamic_copy_exception());
       }
 
-      ilog("send ${c} transactions", ("c",trxs.size()));
       push_transactions(std::move(trxs), next);
    }
 

From 1eda4db5f1bf3de2f4262775ececad729e140591 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 4 Jun 2019 08:11:28 -0400
Subject: [PATCH 0534/1648] [skip ci] .bash -> .sh

---
 scripts/{eosio_build.bash => eosio_build.sh}  | 14 +++++-----
 ...nlinux.bash => eosio_build_amazonlinux.sh} |  0
 ...uild_centos.bash => eosio_build_centos.sh} |  0
 ...uild_darwin.bash => eosio_build_darwin.sh} |  0
 ...uild_ubuntu.bash => eosio_build_ubuntu.sh} |  0
 .../{eosio_install.bash => eosio_install.sh}  |  6 ++---
 ...osio_uninstall.bash => eosio_uninstall.sh} |  4 +--
 scripts/helpers/{eosio.bash => eosio.sh}      |  4 +--
 scripts/helpers/{general.bash => general.sh}  |  2 +-
 tests/bash-bats/README.md                     | 26 +++++++++----------
 .../libexec/bats-core/bats-exec-test          |  2 +-
 .../{eosio_build.bash => eosio_build.sh}      |  4 +--
 ...nlinux.bash => eosio_build_amazonlinux.sh} | 12 ++++-----
 ...uild_centos.bash => eosio_build_centos.sh} | 12 ++++-----
 ...uild_darwin.bash => eosio_build_darwin.sh} | 12 ++++-----
 ...uild_ubuntu.bash => eosio_build_ubuntu.sh} | 12 ++++-----
 ...osio_uninstall.bash => eosio_uninstall.sh} |  2 +-
 tests/bash-bats/{helpers.bash => helpers.sh}  |  2 +-
 .../helpers/{functions.bash => functions.sh}  |  2 +-
 .../helpers/{general.bash => general.sh}      |  0
 .../modules/{clang.bash => clang.sh}          |  0
 .../modules/{cmake.bash => cmake.sh}          |  0
 ...ipt_options.bash => dep_script_options.sh} |  0
 .../modules/{mongodb.bash => mongodb.sh}      |  0
 .../modules/{root-user.bash => root-user.sh}  |  0
 25 files changed, 58 insertions(+), 58 deletions(-)
 rename scripts/{eosio_build.bash => eosio_build.sh} (95%)
 rename scripts/{eosio_build_amazonlinux.bash => eosio_build_amazonlinux.sh} (100%)
 rename scripts/{eosio_build_centos.bash => eosio_build_centos.sh} (100%)
 rename scripts/{eosio_build_darwin.bash => eosio_build_darwin.sh} (100%)
 rename scripts/{eosio_build_ubuntu.bash => eosio_build_ubuntu.sh} (100%)
 rename scripts/{eosio_install.bash => eosio_install.sh} (97%)
 rename scripts/{eosio_uninstall.bash => eosio_uninstall.sh} (97%)
 rename scripts/helpers/{eosio.bash => eosio.sh} (99%)
 rename scripts/helpers/{general.bash => general.sh} (98%)
 rename tests/bash-bats/{eosio_build.bash => eosio_build.sh} (96%)
 rename tests/bash-bats/{eosio_build_amazonlinux.bash => eosio_build_amazonlinux.sh} (89%)
 rename tests/bash-bats/{eosio_build_centos.bash => eosio_build_centos.sh} (89%)
 rename tests/bash-bats/{eosio_build_darwin.bash => eosio_build_darwin.sh} (87%)
 rename tests/bash-bats/{eosio_build_ubuntu.bash => eosio_build_ubuntu.sh} (88%)
 rename tests/bash-bats/{eosio_uninstall.bash => eosio_uninstall.sh} (98%)
 rename tests/bash-bats/{helpers.bash => helpers.sh} (97%)
 rename tests/bash-bats/helpers/{functions.bash => functions.sh} (91%)
 rename tests/bash-bats/helpers/{general.bash => general.sh} (100%)
 rename tests/bash-bats/modules/{clang.bash => clang.sh} (100%)
 rename tests/bash-bats/modules/{cmake.bash => cmake.sh} (100%)
 rename tests/bash-bats/modules/{dep_script_options.bash => dep_script_options.sh} (100%)
 rename tests/bash-bats/modules/{mongodb.bash => mongodb.sh} (100%)
 rename tests/bash-bats/modules/{root-user.bash => root-user.sh} (100%)

diff --git a/scripts/eosio_build.bash b/scripts/eosio_build.sh
similarity index 95%
rename from scripts/eosio_build.bash
rename to scripts/eosio_build.sh
index 5dbc0d20a0b..8604df72ec3 100755
--- a/scripts/eosio_build.bash
+++ b/scripts/eosio_build.sh
@@ -108,7 +108,7 @@ if [ $# -ne 0 ]; then
 fi
 
 # Load eosio specific helper functions
-. ./scripts/helpers/eosio.bash
+. ./scripts/helpers/eosio.sh
 
 echo "Beginning build version: ${SCRIPT_VERSION}"
 echo "EOSIO version to install: ${EOSIO_VERSION}"
@@ -146,13 +146,13 @@ if [[ $ARCH == "Linux" ]]; then
    case $NAME in
       "Amazon Linux AMI" | "Amazon Linux")
          echo "${COLOR_CYAN}[Ensuring YUM installation]${COLOR_NC}"
-         FILE="${REPO_ROOT}/scripts/eosio_build_amazonlinux.bash"
+         FILE="${REPO_ROOT}/scripts/eosio_build_amazonlinux.sh"
       ;;
       "CentOS Linux")
-         FILE="${REPO_ROOT}/scripts/eosio_build_centos.bash"
+         FILE="${REPO_ROOT}/scripts/eosio_build_centos.sh"
       ;;
       "Ubuntu")
-         FILE="${REPO_ROOT}/scripts/eosio_build_ubuntu.bash"
+         FILE="${REPO_ROOT}/scripts/eosio_build_ubuntu.sh"
       ;;
       *) print_supported_linux_distros_and_exit;;
    esac
@@ -163,7 +163,7 @@ if [ "$ARCH" == "Darwin" ]; then
    # opt/gettext: cleos requires Intl, which requires gettext; it's keg only though and we don't want to force linking: https://github.com/EOSIO/eos/issues/2240#issuecomment-396309884
    # EOSIO_INSTALL_DIR/lib/cmake: mongo_db_plugin.cpp:25:10: fatal error: 'bsoncxx/builder/basic/kvp.hpp' file not found
    LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='/usr/local/opt/gettext;$EOSIO_INSTALL_DIR' ${LOCAL_CMAKE_FLAGS}" 
-   FILE="${SCRIPT_DIR}/eosio_build_darwin.bash"
+   FILE="${SCRIPT_DIR}/eosio_build_darwin.sh"
    OPENSSL_ROOT_DIR=/usr/local/opt/openssl
    export CMAKE=${CMAKE}
 fi
@@ -216,8 +216,8 @@ echo "(_______/(_______)\_______)\_______/(_______)"
 echo "=============================================${COLOR_NC}"
 
 echo "${COLOR_GREEN}EOSIO has been successfully built. $(($TIME_END/3600)):$(($TIME_END%3600/60)):$(($TIME_END%60))"
-echo "${COLOR_GREEN}You can now install using: ./scripts/eosio_install.bash${COLOR_NC}"
-echo "${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.bash${COLOR_NC}"
+echo "${COLOR_GREEN}You can now install using: ./scripts/eosio_install.sh${COLOR_NC}"
+echo "${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.sh${COLOR_NC}"
 
 echo ""
 echo "${COLOR_CYAN}If you wish to perform tests to ensure functional code:${COLOR_NC}"
diff --git a/scripts/eosio_build_amazonlinux.bash b/scripts/eosio_build_amazonlinux.sh
similarity index 100%
rename from scripts/eosio_build_amazonlinux.bash
rename to scripts/eosio_build_amazonlinux.sh
diff --git a/scripts/eosio_build_centos.bash b/scripts/eosio_build_centos.sh
similarity index 100%
rename from scripts/eosio_build_centos.bash
rename to scripts/eosio_build_centos.sh
diff --git a/scripts/eosio_build_darwin.bash b/scripts/eosio_build_darwin.sh
similarity index 100%
rename from scripts/eosio_build_darwin.bash
rename to scripts/eosio_build_darwin.sh
diff --git a/scripts/eosio_build_ubuntu.bash b/scripts/eosio_build_ubuntu.sh
similarity index 100%
rename from scripts/eosio_build_ubuntu.bash
rename to scripts/eosio_build_ubuntu.sh
diff --git a/scripts/eosio_install.bash b/scripts/eosio_install.sh
similarity index 97%
rename from scripts/eosio_install.bash
rename to scripts/eosio_install.sh
index 7357cc5af57..2a09bc11d1f 100755
--- a/scripts/eosio_install.bash
+++ b/scripts/eosio_install.sh
@@ -33,11 +33,11 @@ VERSION=2.0
 ##########################################################################
 
 # Load eosio specific helper functions
-. ./scripts/helpers/eosio.bash
+. ./scripts/helpers/eosio.sh
 
 [[ ! $NAME == "Ubuntu" ]] && set -i # Ubuntu doesn't support interactive mode since it uses dash
 
-[[ ! -d $BUILD_DIR ]] && printf "${COLOR_RED}Please run ./eosio_build.bash first!${COLOR_NC}" && exit 1
+[[ ! -d $BUILD_DIR ]] && printf "${COLOR_RED}Please run ./eosio_build.sh first!${COLOR_NC}" && exit 1
 echo "${COLOR_CYAN}====================================================================================="
 echo "========================== ${COLOR_WHITE}Starting EOSIO Installation${COLOR_CYAN} ==============================${COLOR_NC}"
 execute cd $BUILD_DIR
@@ -59,6 +59,6 @@ printf "     \\__\\/         \\__\\/         \\__\\/                     \\__\\/
 
 printf "==============================================================================================\\n"
 printf "${COLOR_GREEN}EOSIO has been installed into ${EOSIO_INSTALL_DIR}/bin${COLOR_NC}"
-printf "\\n${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.bash${COLOR_NC}\\n"
+printf "\\n${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.sh${COLOR_NC}\\n"
 printf "==============================================================================================\\n\\n"
 resources
diff --git a/scripts/eosio_uninstall.bash b/scripts/eosio_uninstall.sh
similarity index 97%
rename from scripts/eosio_uninstall.bash
rename to scripts/eosio_uninstall.sh
index bedfca3248a..16b3c65bbdc 100755
--- a/scripts/eosio_uninstall.bash
+++ b/scripts/eosio_uninstall.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 
 # Load bash script helper functions
-. ./scripts/helpers/eosio.bash
+. ./scripts/helpers/eosio.sh
 
 usage() {
    printf "Usage --- \\n $ %s [ --full ] [ --force ]\\n
@@ -108,7 +108,7 @@ while true; do
             INSTALL_PATHS+=("${HOME}/.local/share/eosio")
          fi
          # Version < 1.8.0; Before we started using ~/eosio/1.8.x
-         # Arrays should return with newlines (IFS=\n;helpers.bash) as Application\ Support will split into two
+         # Arrays should return with newlines (IFS=\n;helpers.sh) as Application\ Support will split into two
          for INSTALL_PATH in ${INSTALL_PATHS[@]}; do
             execute rm -rf $INSTALL_PATH
          done
diff --git a/scripts/helpers/eosio.bash b/scripts/helpers/eosio.sh
similarity index 99%
rename from scripts/helpers/eosio.bash
rename to scripts/helpers/eosio.sh
index c35f336e8f0..a19bbc2fbee 100755
--- a/scripts/helpers/eosio.bash
+++ b/scripts/helpers/eosio.sh
@@ -1,5 +1,5 @@
 # Checks for Arch and OS + Support for tests setting them manually
-## Necessary for linux exclusion while running bats tests/bash-bats/*.bash
+## Necessary for linux exclusion while running bats tests/bash-bats/*.sh
 [[ -z "${ARCH}" ]] && export ARCH=$( uname )
 if [[ -z "${NAME}" ]]; then
     if [[ $ARCH == "Linux" ]]; then
@@ -21,7 +21,7 @@ fi
 # Obtain dependency versions; Must come first in the script
 . ./scripts/.environment
 # Load general helpers
-. ./scripts/helpers/general.bash
+. ./scripts/helpers/general.sh
 
 function setup() {
     if $VERBOSE; then
diff --git a/scripts/helpers/general.bash b/scripts/helpers/general.sh
similarity index 98%
rename from scripts/helpers/general.bash
rename to scripts/helpers/general.sh
index 0fb8586285c..d8822f4ce8e 100755
--- a/scripts/helpers/general.bash
+++ b/scripts/helpers/general.sh
@@ -75,7 +75,7 @@ function ensure-sudo() {
 
 function previous-install-prompt() {
   if [[ -d $EOSIO_INSTALL_DIR ]]; then
-    echo "EOSIO has already been installed into ${EOSIO_INSTALL_DIR}... It's suggested that you eosio_uninstall.bash before re-running this script."
+    echo "EOSIO has already been installed into ${EOSIO_INSTALL_DIR}... It's suggested that you eosio_uninstall.sh before re-running this script."
     while true; do
       [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to proceed anyway? (y/n)${COLOR_NC}" && read -p " " PROCEED
       echo ""
diff --git a/tests/bash-bats/README.md b/tests/bash-bats/README.md
index b2527ffecf1..c8bd18fdb5a 100644
--- a/tests/bash-bats/README.md
+++ b/tests/bash-bats/README.md
@@ -1,15 +1,15 @@
 # BATS Bash Testing
 
-For each bash script we have, there should be a separate .bash file within `REPO_ROOT/tests/bash-bats/`.
+For each bash script we have, there should be a separate .sh file within `REPO_ROOT/tests/bash-bats/`.
 
 ### Usage notes:
 
 - BATS requires that you install greadlink: `brew install coreutils`
-- DRYRUN=true is required for all tests and automatically enabled. You can use this when you're manually running eosio_build.bash (`DRYRUN=true VERBOSE=true ./scripts/eosio_build.bash`)
+- DRYRUN=true is required for all tests and automatically enabled. You can use this when you're manually running eosio_build.sh (`DRYRUN=true VERBOSE=true ./scripts/eosio_build.sh`)
 - execute-always gets around DRYRUN and runs stuff anyway (which installation uses this)
 - To run all tests: 
     ```
-    $ ./tests/bash-bats/bats-core/bin/bats tests/bash-bats/*.bash
+    $ ./tests/bash-bats/bats-core/bin/bats tests/bash-bats/*.sh
       ✓ [eosio_build_darwin] > Testing -y/NONINTERACTIVE/PROCEED
       ✓ [eosio_build_darwin] > Testing prompts
       ✓ [eosio_build_darwin] > Testing executions
@@ -25,7 +25,7 @@ For each bash script we have, there should be a separate .bash file within `REPO
     ```
 - Verbose bats output ( `-t` ): 
   ```
-  ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash
+  ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh
   ```
 
 ---
@@ -33,15 +33,15 @@ For each bash script we have, there should be a separate .bash file within `REPO
 ### Running all tests for all distros:
 ```
 echo "[Darwin]"
-./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash 
+./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh 
 echo "[Ubuntu 16]"
-docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:16.04 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:16.04 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh"
 echo "[Ubuntu 18]"
-docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:18.04 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:18.04 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh"
 echo "[AmazonLinux 2]"
-docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos amazonlinux:2 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos amazonlinux:2 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh"
 echo "[Centos 7]"
-docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos centos:7 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+docker run --rm -ti -v $HOME/BLOCKONE/eos.bats:/eos centos:7 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh"
 ```
 
 ### **Faster testing:** Start docker first, then run (keeping installed packages + faster tests)
@@ -51,13 +51,13 @@ docker run --name ubuntu18 -d -t -v $HOME/BLOCKONE/eos.bats:/eos ubuntu:18.04 /b
 docker run --name amazonlinux2 -d -t -v $HOME/BLOCKONE/eos.bats:/eos amazonlinux:2 /bin/bash
 docker run --name centos7 -d -t -v $HOME/BLOCKONE/eos.bats:/eos centos:7 /bin/bash
 echo "[Ubuntu 16]"
-docker exec -it ubuntu16 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+docker exec -it ubuntu16 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh"
 echo "[Ubuntu 18]"
-docker exec -it ubuntu18 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+docker exec -it ubuntu18 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh"
 echo "[AmazonLinux 2]"
-docker exec -it amazonlinux2 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+docker exec -it amazonlinux2 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh"
 echo "[Centos 7]"
-docker exec -it centos7 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.bash"
+docker exec -it centos7 bash -c "cd /eos && ./tests/bash-bats/bats-core/bin/bats -t tests/bash-bats/*.sh"
 ```
 
 - You'll need to modify the volume path ($HOME/BLOCKONE/eos.bats) to indicate where you've got eos cloned locally.
diff --git a/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-test b/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-test
index feedb45f108..9b8d09e38fa 100755
--- a/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-test
+++ b/tests/bash-bats/bats-core/libexec/bats-core/bats-exec-test
@@ -44,7 +44,7 @@ load() {
   if [[ "${name:0:1}" == '/' ]]; then
     filename="${name}"
   else
-    filename="$BATS_TEST_DIRNAME/${name}.bash"
+    filename="$BATS_TEST_DIRNAME/${name}.sh"
   fi
 
   if [[ ! -f "$filename" ]]; then
diff --git a/tests/bash-bats/eosio_build.bash b/tests/bash-bats/eosio_build.sh
similarity index 96%
rename from tests/bash-bats/eosio_build.bash
rename to tests/bash-bats/eosio_build.sh
index 1037f497f7b..29a5cf82eda 100644
--- a/tests/bash-bats/eosio_build.bash
+++ b/tests/bash-bats/eosio_build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 load helpers/general
 
-SCRIPT_LOCATION="scripts/eosio_build.bash"
+SCRIPT_LOCATION="scripts/eosio_build.sh"
 TEST_LABEL="[eosio_build]"
 
 ###################################################################
@@ -14,7 +14,7 @@ TEST_LABEL="[eosio_build]"
     if [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]]; then
         # which package isn't installed
         uninstall-package which WETRUN &>/dev/null
-        run bash -c "printf \"n\nn\n\" | ./scripts/eosio_build.bash"
+        run bash -c "printf \"n\nn\n\" | ./scripts/eosio_build.sh"
         [[ ! -z $(echo "${output}" | grep "EOSIO compiler checks require the 'which'") ]] || exit
         [[ ! -z $(echo "${output}" | grep "Please install the 'which'") ]] || exit
     fi
diff --git a/tests/bash-bats/eosio_build_amazonlinux.bash b/tests/bash-bats/eosio_build_amazonlinux.sh
similarity index 89%
rename from tests/bash-bats/eosio_build_amazonlinux.bash
rename to tests/bash-bats/eosio_build_amazonlinux.sh
index 600b4258520..f189c199ef8 100644
--- a/tests/bash-bats/eosio_build_amazonlinux.bash
+++ b/tests/bash-bats/eosio_build_amazonlinux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bats
 load helpers/general
-export SCRIPT_LOCATION="scripts/eosio_build.bash"
+export SCRIPT_LOCATION="scripts/eosio_build.sh"
 export TEST_LABEL="[eosio_build_amazonlinux]"
 
 [[ $ARCH == "Linux" ]] || exit 0 # Skip if we're not on linux
@@ -9,15 +9,15 @@ export TEST_LABEL="[eosio_build_amazonlinux]"
 # A helper function is available to show output and status: `debug`
 
 # Testing Root user
-./tests/bash-bats/modules/root-user.bash
+./tests/bash-bats/modules/root-user.sh
 # Testing Options
-./tests/bash-bats/modules/dep_script_options.bash
+./tests/bash-bats/modules/dep_script_options.sh
 # Testing CMAKE
-./tests/bash-bats/modules/cmake.bash
+./tests/bash-bats/modules/cmake.sh
 # Testing Clang
-./tests/bash-bats/modules/clang.bash
+./tests/bash-bats/modules/clang.sh
 # Testing MongoDB
-./tests/bash-bats/modules/mongodb.bash
+./tests/bash-bats/modules/mongodb.sh
 
 ## Needed to load eosio_build_ files properly; it can be empty
 @test "${TEST_LABEL} > General" {
diff --git a/tests/bash-bats/eosio_build_centos.bash b/tests/bash-bats/eosio_build_centos.sh
similarity index 89%
rename from tests/bash-bats/eosio_build_centos.bash
rename to tests/bash-bats/eosio_build_centos.sh
index bcb6f1425cb..2d18263dbe9 100644
--- a/tests/bash-bats/eosio_build_centos.bash
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 load helpers/general
 
-export SCRIPT_LOCATION="scripts/eosio_build.bash"
+export SCRIPT_LOCATION="scripts/eosio_build.sh"
 export TEST_LABEL="[eosio_build_centos]"
 
 [[ $ARCH == "Linux" ]] || exit 0 # Exit 0 is required for pipeline
@@ -10,15 +10,15 @@ export TEST_LABEL="[eosio_build_centos]"
 # A helper function is available to show output and status: `debug`
 
 # Testing Root user
-./tests/bash-bats/modules/root-user.bash
+./tests/bash-bats/modules/root-user.sh
 # Testing Options
-./tests/bash-bats/modules/dep_script_options.bash
+./tests/bash-bats/modules/dep_script_options.sh
 # Testing CMAKE
-./tests/bash-bats/modules/cmake.bash
+./tests/bash-bats/modules/cmake.sh
 # Testing Clang
-./tests/bash-bats/modules/clang.bash
+./tests/bash-bats/modules/clang.sh
 # Testing MongoDB
-./tests/bash-bats/modules/mongodb.bash
+./tests/bash-bats/modules/mongodb.sh
 
 ## Needed to load eosio_build_ files properly; it can be empty
 @test "${TEST_LABEL} > General" {
diff --git a/tests/bash-bats/eosio_build_darwin.bash b/tests/bash-bats/eosio_build_darwin.sh
similarity index 87%
rename from tests/bash-bats/eosio_build_darwin.bash
rename to tests/bash-bats/eosio_build_darwin.sh
index 14bc6eb4624..2279bff1b81 100644
--- a/tests/bash-bats/eosio_build_darwin.bash
+++ b/tests/bash-bats/eosio_build_darwin.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 load helpers/general
 
-export SCRIPT_LOCATION="scripts/eosio_build.bash"
+export SCRIPT_LOCATION="scripts/eosio_build.sh"
 export TEST_LABEL="[eosio_build_darwin]"
 
 [[ $ARCH == "Darwin" ]] || exit 0 # Exit 0 is required for pipeline
@@ -10,15 +10,15 @@ export TEST_LABEL="[eosio_build_darwin]"
 # A helper function is available to show output and status: `debug`
 
 # Testing Root user
-./tests/bash-bats/modules/root-user.bash
+./tests/bash-bats/modules/root-user.sh
 # Testing Options
-./tests/bash-bats/modules/dep_script_options.bash
+./tests/bash-bats/modules/dep_script_options.sh
 # Testing CMAKE
-./tests/bash-bats/modules/cmake.bash
+./tests/bash-bats/modules/cmake.sh
 # Testing Clang
-./tests/bash-bats/modules/clang.bash
+./tests/bash-bats/modules/clang.sh
 # Testing MongoDB
-./tests/bash-bats/modules/mongodb.bash
+./tests/bash-bats/modules/mongodb.sh
 
 ## Needed to load eosio_build_ files properly; it can be empty
 @test "${TEST_LABEL} > General" {
diff --git a/tests/bash-bats/eosio_build_ubuntu.bash b/tests/bash-bats/eosio_build_ubuntu.sh
similarity index 88%
rename from tests/bash-bats/eosio_build_ubuntu.bash
rename to tests/bash-bats/eosio_build_ubuntu.sh
index 2adbdcb7754..49821366337 100644
--- a/tests/bash-bats/eosio_build_ubuntu.bash
+++ b/tests/bash-bats/eosio_build_ubuntu.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 load helpers/general
 
-export SCRIPT_LOCATION="scripts/eosio_build.bash"
+export SCRIPT_LOCATION="scripts/eosio_build.sh"
 export TEST_LABEL="[eosio_build_ubuntu]"
 
 [[ $ARCH == "Linux" ]] || exit 0 # Exit 0 is required for pipeline
@@ -11,15 +11,15 @@ export TEST_LABEL="[eosio_build_ubuntu]"
 # A helper function is available to show output and status: `debug`
 
 # Testing Root user
-./tests/bash-bats/modules/root-user.bash
+./tests/bash-bats/modules/root-user.sh
 # Testing Options
-./tests/bash-bats/modules/dep_script_options.bash
+./tests/bash-bats/modules/dep_script_options.sh
 # Testing CMAKE
-./tests/bash-bats/modules/cmake.bash
+./tests/bash-bats/modules/cmake.sh
 # Testing Clang
-./tests/bash-bats/modules/clang.bash
+./tests/bash-bats/modules/clang.sh
 # Testing MongoDB
-./tests/bash-bats/modules/mongodb.bash
+./tests/bash-bats/modules/mongodb.sh
 
 ## Needed to load eosio_build_ files properly; it can be empty
 @test "${TEST_LABEL} > General" {
diff --git a/tests/bash-bats/eosio_uninstall.bash b/tests/bash-bats/eosio_uninstall.sh
similarity index 98%
rename from tests/bash-bats/eosio_uninstall.bash
rename to tests/bash-bats/eosio_uninstall.sh
index df3ec6154df..0bb1521bb7c 100644
--- a/tests/bash-bats/eosio_uninstall.bash
+++ b/tests/bash-bats/eosio_uninstall.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 load helpers/general
 
-SCRIPT_LOCATION="scripts/eosio_uninstall.bash"
+SCRIPT_LOCATION="scripts/eosio_uninstall.sh"
 TEST_LABEL="[eosio_uninstall]"
 
 mkdir -p $SRC_DIR
diff --git a/tests/bash-bats/helpers.bash b/tests/bash-bats/helpers.sh
similarity index 97%
rename from tests/bash-bats/helpers.bash
rename to tests/bash-bats/helpers.sh
index 4febec1988b..962d5d958a7 100644
--- a/tests/bash-bats/helpers.bash
+++ b/tests/bash-bats/helpers.sh
@@ -4,7 +4,7 @@ load helpers/general
 # A helper function is available to show output and status: `debug`
 
 # Load helpers (BE CAREFUL)
-. ./scripts/helpers/general.bash
+. ./scripts/helpers/general.sh
 
 TEST_LABEL="[helpers]"
 
diff --git a/tests/bash-bats/helpers/functions.bash b/tests/bash-bats/helpers/functions.sh
similarity index 91%
rename from tests/bash-bats/helpers/functions.bash
rename to tests/bash-bats/helpers/functions.sh
index 480acd8dc08..eeaa1bd495f 100644
--- a/tests/bash-bats/helpers/functions.bash
+++ b/tests/bash-bats/helpers/functions.sh
@@ -1,4 +1,4 @@
-. ./scripts/helpers/eosio.bash # Obtain dependency versions and paths
+. ./scripts/helpers/eosio.sh # Obtain dependency versions and paths
 
 function debug() {
   printf " ---------\\n STATUS: ${status}\\n${output}\\n ---------\\n\\n" >&3
diff --git a/tests/bash-bats/helpers/general.bash b/tests/bash-bats/helpers/general.sh
similarity index 100%
rename from tests/bash-bats/helpers/general.bash
rename to tests/bash-bats/helpers/general.sh
diff --git a/tests/bash-bats/modules/clang.bash b/tests/bash-bats/modules/clang.sh
similarity index 100%
rename from tests/bash-bats/modules/clang.bash
rename to tests/bash-bats/modules/clang.sh
diff --git a/tests/bash-bats/modules/cmake.bash b/tests/bash-bats/modules/cmake.sh
similarity index 100%
rename from tests/bash-bats/modules/cmake.bash
rename to tests/bash-bats/modules/cmake.sh
diff --git a/tests/bash-bats/modules/dep_script_options.bash b/tests/bash-bats/modules/dep_script_options.sh
similarity index 100%
rename from tests/bash-bats/modules/dep_script_options.bash
rename to tests/bash-bats/modules/dep_script_options.sh
diff --git a/tests/bash-bats/modules/mongodb.bash b/tests/bash-bats/modules/mongodb.sh
similarity index 100%
rename from tests/bash-bats/modules/mongodb.bash
rename to tests/bash-bats/modules/mongodb.sh
diff --git a/tests/bash-bats/modules/root-user.bash b/tests/bash-bats/modules/root-user.sh
similarity index 100%
rename from tests/bash-bats/modules/root-user.bash
rename to tests/bash-bats/modules/root-user.sh

From 626af4a231070a03ea892755bead500b2e1bbb7d Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 4 Jun 2019 10:49:40 -0400
Subject: [PATCH 0535/1648] removed pipelinebranch + new IMAGE_TAG name

---
 pipeline.jsonc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 84e8a7ca5fc..7fa9fcfe7c4 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,8 +1,7 @@
 {
     "eosio": {
-        "pipeline-branch": "bats-v3",
         "environment": {
-            "IMAGE_TAG": "bats-v3",
+            "IMAGE_TAG": "develop",
             "DEBUG": true
         }
     },

From f103a1aca6c13c137213a422c31c6cd6d906940d Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 4 Jun 2019 10:49:44 -0400
Subject: [PATCH 0536/1648] removed pipelinebranch + new IMAGE_TAG name

---
 pipeline.jsonc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 7fa9fcfe7c4..abc84f21cc6 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,5 +1,6 @@
 {
     "eosio": {
+        "pipeline-branch": "develop",
         "environment": {
             "IMAGE_TAG": "develop",
             "DEBUG": true

From 14bfc9bf274ca93cf9c35c6073ee45c48be57686 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 4 Jun 2019 10:52:21 -0400
Subject: [PATCH 0537/1648] [skip ci] develop for pipeline-branch

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index abc84f21cc6..1578f1feb38 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -7,7 +7,7 @@
         }
     },
     "eosio-base-images": {
-        "pipeline-branch": "bats-v3"
+        "pipeline-branch": "develop"
     },
     "eosio-build-unpinned": {
         "pipeline-branch": "protocol-features-sync-nodes"

From 3c643c09fbadf953d4bfbf18214856f3872fc46f Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 5 Jun 2019 17:35:26 -0400
Subject: [PATCH 0538/1648] Updated pipeline configuration file for deletion of
 auto-buildkite-pipelines:protocol-features-sync-nodes

---
 pipeline.jsonc | 48 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 1578f1feb38..6097cb5f877 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -6,34 +6,54 @@
             "DEBUG": true
         }
     },
-    "eosio-base-images": {
+    "eosio-base-images":
+    {
         "pipeline-branch": "develop"
     },
-    "eosio-build-unpinned": {
-        "pipeline-branch": "protocol-features-sync-nodes"
+    "eosio-build-unpinned":
+    {
+        "pipeline-branch": "master"
     },
-    "eosio-lrt": {
-        "pipeline-branch": "protocol-features-sync-nodes"
+    "eosio-lrt":
+    {
+        "pipeline-branch": "master",
+        "environment":
+        {
+            "BUILD_FLAGS": "-y -P -m",
+            "IMAGE_TAG": "_1-8-0-rc2"
+        }
     },
-    "eos-multiversion-tests": {
-        "pipeline-branch": "protocol-features-sync-nodes",
-        "configuration": [
+    "eos-multiversion-tests":
+    {
+        "pipeline-branch": "master",
+        "environment":
+        {
+            "IMAGE_TAG": "_1-8-0-rc2"
+        },
+        "configuration":
+        [
             "170=v1.7.0"
         ]
     },
-    "eosio-docker-builds": {
-        "environment": {
+    "eosio-docker-builds":
+    {
+        "environment":
+        {
             "BUILDER_TAG": "v1.8.0"
         }
     },
-    "eosio-sync-tests": {
-        "environment": {
+    "eosio-sync-tests":
+    {
+        "environment":
+        {
             "SKIP_PRE_V180": "true",
             "SKIP_V180": "false"
         }
     },
-    "eosio-replay-tests": {
-        "environment": {
+    "eosio-replay-tests":
+    {
+        "environment":
+        {
             "SKIP_PRE_V180": "true",
             "SKIP_V180": "false"
         }

From 39eb3f87be5221d3c7d50d34fefef6646677dc94 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 5 Jun 2019 17:36:14 -0400
Subject: [PATCH 0539/1648] eosio pipeline should ALWAYS point to
 auto-buildkite-pipelines:master

---
 pipeline.jsonc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 6097cb5f877..65878ba87b7 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,9 +1,10 @@
 {
-    "eosio": {
-        "pipeline-branch": "develop",
-        "environment": {
-            "IMAGE_TAG": "develop",
-            "DEBUG": true
+    "eosio":
+    {
+        "pipeline-branch": "master",
+        "environment":
+        {
+            "IMAGE_TAG": "_develop"
         }
     },
     "eosio-base-images":

From b9e58a3aae7ee845e9f6f047c0302459c40320c1 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Wed, 5 Jun 2019 18:00:28 -0400
Subject: [PATCH 0540/1648] Update `version` lib

---
 libraries/CMakeLists.txt                      |  1 +
 libraries/version/CMakeLists.txt              | 29 +++++++++++++++++++
 libraries/version/include/version/version.hpp | 18 ++++++++++++
 libraries/version/src/version.cpp             | 21 ++++++++++++++
 libraries/version/src/version_impl.cpp.in     | 28 ++++++++++++++++++
 libraries/version/src/version_impl.hpp        | 25 ++++++++++++++++
 6 files changed, 122 insertions(+)
 create mode 100644 libraries/version/CMakeLists.txt
 create mode 100644 libraries/version/include/version/version.hpp
 create mode 100644 libraries/version/src/version.cpp
 create mode 100644 libraries/version/src/version_impl.cpp.in
 create mode 100644 libraries/version/src/version_impl.hpp

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 54bb2f80e09..c639743f317 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -6,6 +6,7 @@ add_subdirectory( wasm-jit )
 add_subdirectory( appbase )
 add_subdirectory( chain )
 add_subdirectory( testing )
+add_subdirectory( version )
 
 #turn tools&tests off; not needed for library build
 set(BUILD_TESTS OFF CACHE BOOL "Build GTest-based tests")
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
new file mode 100644
index 00000000000..303b92faa72
--- /dev/null
+++ b/libraries/version/CMakeLists.txt
@@ -0,0 +1,29 @@
+cmake_minimum_required(
+  VERSION 2.8.12 ) # What should the version actually be?
+
+project(
+  Version )
+
+add_library(
+   version
+   "./src/version.cpp"
+   "./include/eosio/version/version.hpp" )
+
+target_include_directories(
+   version
+   PUBLIC
+   "${CMAKE_CURRENT_SOURCE_DIR}/include/" )
+
+install(
+   TARGETS
+   version
+   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}   #  Is it needed as a RUNTIME? It' just a library?
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ## Is it needed as both a static and dynamic lib?
+   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ## ...
+
+install(
+   DIRECTORY
+   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
+   DESTINATION
+   ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/version
+   "./include/eosio/version/version.hpp" )
diff --git a/libraries/version/include/version/version.hpp b/libraries/version/include/version/version.hpp
new file mode 100644
index 00000000000..b714e2c588f
--- /dev/null
+++ b/libraries/version/include/version/version.hpp
@@ -0,0 +1,18 @@
+/**
+ *  @file version.hpp
+ *  @copyright defined in eos/LICENSE
+ */
+
+#pragma once
+
+#include <string> // std::string_view
+
+namespace eosio { namespace version {
+
+   ///< Grab the version of the client in the form of: `v1.8.0-rc1`
+   const std::string_view& version_client();
+      
+   ///< Grab the version of the client in the form of: `v1.8.0-rc1-7de458254[-dirty]`
+   const std::string_view& version_full();
+      
+} }
diff --git a/libraries/version/src/version.cpp b/libraries/version/src/version.cpp
new file mode 100644
index 00000000000..e2b8618118e
--- /dev/null
+++ b/libraries/version/src/version.cpp
@@ -0,0 +1,21 @@
+/**
+ *  @file version.cpp
+ *  @copyright defined in eos/LICENSE
+ */
+
+#pragma once
+
+#include <version.hpp>
+#include <version_impl.hpp>
+
+namespace eosio { namespace version {
+
+   const std::string_view& version_client() {
+      return static const std::string{_version_client()};
+   }
+      
+   const std::string_view& version_full() {
+      return static const std::string{_version_full()};
+   }
+      
+} }
diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
new file mode 100644
index 00000000000..62fbea6d431
--- /dev/null
+++ b/libraries/version/src/version_impl.cpp.in
@@ -0,0 +1,28 @@
+/**
+ *  @file version_impl.cpp.in
+ *  @copyright defined in eos/LICENSE
+ *  \warning This file is machine generated. DO NOT EDIT.  See version_impl.cpp.in for changes.
+ */
+
+#pragma once
+
+#include <version_impl.hpp>
+
+namespace eosio { namespace version {
+
+   constexpr std::string_view version_major {"@_VERSION_MAJOR_@"};
+   constexpr std::string_view version_minor {"@_VERSION_MINOR_@"};
+   constexpr std::string_view version_patch {"@_VERSION_PATCH_@"};
+   constexpr std::string_view version_suffix{"@_VERSION_SUFFIX_@"};
+   constexpr std::string_view version_hash  {"@_VERSION_HASH_@"};
+   constexpr std::string_view version_dirty {"@_VERSION_DIRTY_@"};
+
+   const std::string_view& _version_client() {
+      return std::string{"v"+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix};
+   }
+
+   const std::string_view& _version_full() {
+      return std::string{"v"+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix+'-'+version_hash+version_dirty};
+   }
+      
+} }
diff --git a/libraries/version/src/version_impl.hpp b/libraries/version/src/version_impl.hpp
new file mode 100644
index 00000000000..ee946df1804
--- /dev/null
+++ b/libraries/version/src/version_impl.hpp
@@ -0,0 +1,25 @@
+/**
+ *  @file version_impl.hpp
+ *  @copyright defined in eos/LICENSE
+ */
+
+#pragma once
+
+#include <string> // std::string_view
+
+namespace eosio { namespace version {
+      
+   constexpr std::string_view version_major;
+   constexpr std::string_view version_minor;
+   constexpr std::string_view version_patch;
+   constexpr std::string_view version_suffix;
+   constexpr std::string_view version_hash;
+   constexpr std::string_view version_dirty;
+
+   ///< Helper function `version_client()`
+   const std::string_view& _version_client();
+
+   ///< Helper function `version_full()`
+   const std::string_view& _version_full();
+      
+} }

From 220647730c8efe73cead781dc0bf5a374a388ada Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 5 Jun 2019 18:04:29 -0400
Subject: [PATCH 0541/1648] Revert image changes

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 65878ba87b7..1ba8e137d19 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -4,7 +4,7 @@
         "pipeline-branch": "master",
         "environment":
         {
-            "IMAGE_TAG": "_develop"
+            "IMAGE_TAG": "_2-5"
         }
     },
     "eosio-base-images":

From ea98154359e9523425290fc4c5f9a7b847fc3e56 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 5 Jun 2019 18:32:22 -0400
Subject: [PATCH 0542/1648] fix dummy checktime timer to actually compile

---
 libraries/chain/checktime_timer_dummy.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/chain/checktime_timer_dummy.cpp b/libraries/chain/checktime_timer_dummy.cpp
index 7d9a54663ae..0c82d258cbf 100644
--- a/libraries/chain/checktime_timer_dummy.cpp
+++ b/libraries/chain/checktime_timer_dummy.cpp
@@ -1,7 +1,10 @@
 #include <eosio/chain/checktime_timer.hpp>
+#include <fc/fwd_impl.hpp>
 
 namespace eosio { namespace chain {
 
+struct checktime_timer::impl {};
+
 checktime_timer::checktime_timer() {
    expired = 1;
 }

From 5659e72c66b7eac3fbd9c55d3c42a08ab732290c Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 5 Jun 2019 18:36:26 -0400
Subject: [PATCH 0543/1648] remove unused variable

---
 libraries/chain/include/eosio/chain/checktime_timer.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/checktime_timer.hpp b/libraries/chain/include/eosio/chain/checktime_timer.hpp
index 1e9d0c1a611..ea820b0aace 100644
--- a/libraries/chain/include/eosio/chain/checktime_timer.hpp
+++ b/libraries/chain/include/eosio/chain/checktime_timer.hpp
@@ -13,8 +13,6 @@ struct checktime_timer {
    void start(fc::time_point tp);
    void stop();
 
-   int ms;
-
    volatile sig_atomic_t expired = 1;
 
 private:

From aa65f80966328b2b9e6ea573e9184a051191267b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 5 Jun 2019 20:06:27 -0400
Subject: [PATCH 0544/1648] Delete defaults so pipeline.jsonc only contains
 modifications to pipeline defaults

---
 pipeline.jsonc | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 1ba8e137d19..ad224367bd2 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,23 +1,10 @@
 {
-    "eosio":
-    {
-        "pipeline-branch": "master",
-        "environment":
-        {
-            "IMAGE_TAG": "_2-5"
-        }
-    },
     "eosio-base-images":
     {
         "pipeline-branch": "develop"
     },
-    "eosio-build-unpinned":
-    {
-        "pipeline-branch": "master"
-    },
     "eosio-lrt":
     {
-        "pipeline-branch": "master",
         "environment":
         {
             "BUILD_FLAGS": "-y -P -m",
@@ -26,7 +13,6 @@
     },
     "eos-multiversion-tests":
     {
-        "pipeline-branch": "master",
         "environment":
         {
             "IMAGE_TAG": "_1-8-0-rc2"

From 2db693712f75720b4efb9adbaa5b780eb0f02f54 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 5 Jun 2019 20:44:26 -0400
Subject: [PATCH 0545/1648] testing

---
 pipeline.jsonc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 1578f1feb38..f6b3afff455 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,13 +1,13 @@
 {
     "eosio": {
-        "pipeline-branch": "develop",
+        "pipeline-branch": "support-for-improvements",
         "environment": {
             "IMAGE_TAG": "develop",
             "DEBUG": true
         }
     },
     "eosio-base-images": {
-        "pipeline-branch": "develop"
+        "pipeline-branch": "support-for-improvements"
     },
     "eosio-build-unpinned": {
         "pipeline-branch": "protocol-features-sync-nodes"

From 16259e6b1ed18d0e4d7449d056326ce051bdb204 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 6 Jun 2019 13:40:34 -0400
Subject: [PATCH 0546/1648] Continuation

---
 CMakeModules/VersionUtils.cmake               | 24 +++++++++++++++++++
 libraries/version/CMakeLists.txt              | 24 +++++++++++++++----
 .../include/{ => eosio}/version/version.hpp   |  6 ++---
 libraries/version/src/version.cpp             | 15 ++++++------
 libraries/version/src/version_impl.cpp.in     | 24 +++++++++----------
 libraries/version/src/version_impl.hpp        | 17 ++++---------
 6 files changed, 70 insertions(+), 40 deletions(-)
 create mode 100644 CMakeModules/VersionUtils.cmake
 rename libraries/version/include/{ => eosio}/version/version.hpp (70%)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
new file mode 100644
index 00000000000..42020038b59
--- /dev/null
+++ b/CMakeModules/VersionUtils.cmake
@@ -0,0 +1,24 @@
+function(GENERATE_VERSION_METADATA)
+   set(_VERSION_MAJOR_  ${VERSION_MAJOR})
+   set(_VERSION_MINOR_  ${VERSION_MINOR})
+   set(_VERSION_PATCH_  ${VERSION_PATCH})
+   set(_VERSION_SUFFIX_ ${VERSION_SUFFIX})
+   set(_VERSION_HASH_   ${})
+   set(_VERSION_DIRTY_  ${})
+
+   find_package(Git)
+   if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
+      execute_process(
+         COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
+         OUTPUT_VARIABLE _VERSION_HASH_
+         ERROR_QUIET
+         OUTPUT_STRIP_TRAILING_WHITESPACE )
+      execute_process(
+         COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
+         OUTPUT_VARIABLE _VERSION_DIRTY_
+         ERROR_QUIET
+         OUTPUT_STRIP_TRAILING_WHITESPACE )
+      string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+      # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/version.hpp @ONLY)
+   endif()
+endfunction()
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 303b92faa72..567ae840f57 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -4,16 +4,25 @@ cmake_minimum_required(
 project(
   Version )
 
+# Found in directory `eos/CMakeModules/`.
+include(
+  VersionUtils )
+
+# Generate the most up-to-date metadata of the repository.
+GENERATE_VERSION_METADATA()
+
+# Construct the library.
 add_library(
    version
-   "./src/version.cpp"
-   "./include/eosio/version/version.hpp" )
+   "${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp" )
 
+# Make dependencies visible.
 target_include_directories(
    version
    PUBLIC
    "${CMAKE_CURRENT_SOURCE_DIR}/include/" )
 
+# Install the library in the appropriate places.
 install(
    TARGETS
    version
@@ -21,9 +30,16 @@ install(
    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ## Is it needed as both a static and dynamic lib?
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ## ...
 
+# Install the header file in the appropriate place.
 install(
    DIRECTORY
    ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
    DESTINATION
-   ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/version
-   "./include/eosio/version/version.hpp" )
+   ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
+   FILES_MATCHING PATTERN "*.hpp" )
+
+# Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
+configure_file(
+   ${CMAKE_CURRENT_SOURCE_DIR}/src/version_impl.cpp.in
+   ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp
+   @ONLY )
diff --git a/libraries/version/include/version/version.hpp b/libraries/version/include/eosio/version/version.hpp
similarity index 70%
rename from libraries/version/include/version/version.hpp
rename to libraries/version/include/eosio/version/version.hpp
index b714e2c588f..a2c1c887fd8 100644
--- a/libraries/version/include/version/version.hpp
+++ b/libraries/version/include/eosio/version/version.hpp
@@ -5,14 +5,14 @@
 
 #pragma once
 
-#include <string> // std::string_view
+#include <string> // std::string
 
 namespace eosio { namespace version {
 
    ///< Grab the version of the client in the form of: `v1.8.0-rc1`
-   const std::string_view& version_client();
+   const std::string& version_client();
       
    ///< Grab the version of the client in the form of: `v1.8.0-rc1-7de458254[-dirty]`
-   const std::string_view& version_full();
+   const std::string& version_full();
       
 } }
diff --git a/libraries/version/src/version.cpp b/libraries/version/src/version.cpp
index e2b8618118e..fee2aaff479 100644
--- a/libraries/version/src/version.cpp
+++ b/libraries/version/src/version.cpp
@@ -3,19 +3,18 @@
  *  @copyright defined in eos/LICENSE
  */
 
-#pragma once
-
-#include <version.hpp>
-#include <version_impl.hpp>
+#include "version_impl.hpp"
 
 namespace eosio { namespace version {
 
-   const std::string_view& version_client() {
-      return static const std::string{_version_client()};
+   const std::string& version_client() {
+      static const std::string version{_version_client()};
+      return version;
    }
       
-   const std::string_view& version_full() {
-      return static const std::string{_version_full()};
+   const std::string& version_full() {
+      static const std::string version{_version_full()};
+      return version;
    }
       
 } }
diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 62fbea6d431..65ca7c52442 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -4,25 +4,23 @@
  *  \warning This file is machine generated. DO NOT EDIT.  See version_impl.cpp.in for changes.
  */
 
-#pragma once
-
-#include <version_impl.hpp>
+#include "version_impl.hpp"
 
 namespace eosio { namespace version {
 
-   constexpr std::string_view version_major {"@_VERSION_MAJOR_@"};
-   constexpr std::string_view version_minor {"@_VERSION_MINOR_@"};
-   constexpr std::string_view version_patch {"@_VERSION_PATCH_@"};
-   constexpr std::string_view version_suffix{"@_VERSION_SUFFIX_@"};
-   constexpr std::string_view version_hash  {"@_VERSION_HASH_@"};
-   constexpr std::string_view version_dirty {"@_VERSION_DIRTY_@"};
+   const std::string version_major {"@_VERSION_MAJOR_@"};
+   const std::string version_minor {"@_VERSION_MINOR_@"};
+   const std::string version_patch {"@_VERSION_PATCH_@"};
+   const std::string version_suffix{"@_VERSION_SUFFIX_@"};
+   const std::string version_hash  {"@_VERSION_HASH_@"};
+   const std::string version_dirty {"@_VERSION_DIRTY_@"};
 
-   const std::string_view& _version_client() {
-      return std::string{"v"+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix};
+   const std::string& _version_client() {
+      return std::string{'v'+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix};
    }
 
-   const std::string_view& _version_full() {
-      return std::string{"v"+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix+'-'+version_hash+version_dirty};
+   const std::string& _version_full() {
+      return std::string{'v'+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix+'-'+version_hash+version_dirty};
    }
       
 } }
diff --git a/libraries/version/src/version_impl.hpp b/libraries/version/src/version_impl.hpp
index ee946df1804..1af4460b18a 100644
--- a/libraries/version/src/version_impl.hpp
+++ b/libraries/version/src/version_impl.hpp
@@ -5,21 +5,14 @@
 
 #pragma once
 
-#include <string> // std::string_view
+#include <string> // std::string
 
 namespace eosio { namespace version {
-      
-   constexpr std::string_view version_major;
-   constexpr std::string_view version_minor;
-   constexpr std::string_view version_patch;
-   constexpr std::string_view version_suffix;
-   constexpr std::string_view version_hash;
-   constexpr std::string_view version_dirty;
 
-   ///< Helper function `version_client()`
-   const std::string_view& _version_client();
+   ///< Helper function for `version_client()`
+   const std::string& _version_client();
 
-   ///< Helper function `version_full()`
-   const std::string_view& _version_full();
+   ///< Helper function for `version_full()`
+   const std::string& _version_full();
       
 } }

From c9725cf46fff019379a952de2224899cb3108368 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 6 Jun 2019 14:42:38 -0400
Subject: [PATCH 0547/1648] Library is now functional

---
 CMakeModules/VersionUtils.cmake               | 28 +++++++++++++------
 libraries/version/CMakeLists.txt              |  5 ++--
 .../version/include/eosio/version/version.hpp |  4 +--
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index 42020038b59..e29fdc1f93b 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -1,15 +1,13 @@
 function(GENERATE_VERSION_METADATA)
-   set(_VERSION_MAJOR_  ${VERSION_MAJOR})
-   set(_VERSION_MINOR_  ${VERSION_MINOR})
-   set(_VERSION_PATCH_  ${VERSION_PATCH})
-   set(_VERSION_SUFFIX_ ${VERSION_SUFFIX})
-   set(_VERSION_HASH_   ${})
-   set(_VERSION_DIRTY_  ${})
+   set(_VERSION_MAJOR_  ${VERSION_MAJOR}  PARENT_SCOPE)
+   set(_VERSION_MINOR_  ${VERSION_MINOR}  PARENT_SCOPE)
+   set(_VERSION_PATCH_  ${VERSION_PATCH}  PARENT_SCOPE)
+   set(_VERSION_SUFFIX_ ${VERSION_SUFFIX} PARENT_SCOPE)
 
    find_package(Git)
    if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
       execute_process(
-         COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
+         COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
          OUTPUT_VARIABLE _VERSION_HASH_
          ERROR_QUIET
          OUTPUT_STRIP_TRAILING_WHITESPACE )
@@ -18,7 +16,19 @@ function(GENERATE_VERSION_METADATA)
          OUTPUT_VARIABLE _VERSION_DIRTY_
          ERROR_QUIET
          OUTPUT_STRIP_TRAILING_WHITESPACE )
-      string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-      # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/version.hpp @ONLY)
+       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+       # if dirty empty -> false
+       # else -> true
+       #
    endif()
+   set(_VERSION_HASH_   ${_VERSION_HASH_}  PARENT_SCOPE)
+   set(_VERSION_DIRTY_  ${_VERSION_DIRTY_} PARENT_SCOPE)
+   message(STATUS "-------begin-------")
+   message(STATUS ${_VERSION_MAJOR_})
+   message(STATUS ${_VERSION_MINOR_})
+   message(STATUS ${_VERSION_PATCH_})
+   message(STATUS ${_VERSION_SUFFIX_})
+   message(STATUS ${_VERSION_HASH_})
+   message(STATUS ${_VERSION_DIRTY_})
+   message(STATUS "-------end-------")
 endfunction()
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 567ae840f57..3aeb418170c 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -14,13 +14,14 @@ GENERATE_VERSION_METADATA()
 # Construct the library.
 add_library(
    version
-   "${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp" )
+   "${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp"
+   "${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp" )
 
 # Make dependencies visible.
 target_include_directories(
    version
    PUBLIC
-   "${CMAKE_CURRENT_SOURCE_DIR}/include/" )
+   "${CMAKE_CURRENT_SOURCE_DIR}/src" )
 
 # Install the library in the appropriate places.
 install(
diff --git a/libraries/version/include/eosio/version/version.hpp b/libraries/version/include/eosio/version/version.hpp
index a2c1c887fd8..64c356a492f 100644
--- a/libraries/version/include/eosio/version/version.hpp
+++ b/libraries/version/include/eosio/version/version.hpp
@@ -9,10 +9,10 @@
 
 namespace eosio { namespace version {
 
-   ///< Grab the version of the client in the form of: `v1.8.0-rc1`
+   ///< Grab the basic version of the client; example: `v1.8.0-rc1`
    const std::string& version_client();
       
-   ///< Grab the version of the client in the form of: `v1.8.0-rc1-7de458254[-dirty]`
+   ///< Grab the full version of the client; example:  `v1.8.0-rc1-7de458254[-dirty]`
    const std::string& version_full();
       
 } }

From 18c66eb96e845cb972772c3259059cde99569536 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 6 Jun 2019 15:15:56 -0400
Subject: [PATCH 0548/1648] Change `version_dirty` to type `bool`

---
 CMakeModules/VersionUtils.cmake           | 14 ++++++++------
 libraries/version/src/version_impl.cpp.in |  6 ++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index e29fdc1f93b..abeb9b85b12 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -16,13 +16,15 @@ function(GENERATE_VERSION_METADATA)
          OUTPUT_VARIABLE _VERSION_DIRTY_
          ERROR_QUIET
          OUTPUT_STRIP_TRAILING_WHITESPACE )
-       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-       # if dirty empty -> false
-       # else -> true
-       #
+      string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+      if(${_VERSION_DIRTY_} STREQUAL "")
+	 set(_VERSION_DIRTY_ "false")
+       else()
+	 set(_VERSION_DIRTY_ "true")
+      endif()
    endif()
-   set(_VERSION_HASH_   ${_VERSION_HASH_}  PARENT_SCOPE)
-   set(_VERSION_DIRTY_  ${_VERSION_DIRTY_} PARENT_SCOPE)
+   set(_VERSION_HASH_  ${_VERSION_HASH_}  PARENT_SCOPE)
+   set(_VERSION_DIRTY_ ${_VERSION_DIRTY_} PARENT_SCOPE)
    message(STATUS "-------begin-------")
    message(STATUS ${_VERSION_MAJOR_})
    message(STATUS ${_VERSION_MINOR_})
diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 65ca7c52442..961c6550eef 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -16,11 +16,13 @@ namespace eosio { namespace version {
    const std::string version_dirty {"@_VERSION_DIRTY_@"};
 
    const std::string& _version_client() {
-      return std::string{'v'+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix};
+      static const std::string version{'v'+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix};
+      return version;
    }
 
    const std::string& _version_full() {
-      return std::string{'v'+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix+'-'+version_hash+version_dirty};
+      static const std::string version{'v'+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix+'-'+version_hash+version_dirty};
+      return version;
    }
       
 } }

From 84be49c99227110e1cc01f34f22f586858e19e29 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 6 Jun 2019 16:29:39 -0400
Subject: [PATCH 0549/1648] Library fully functional

---
 CMakeModules/VersionUtils.cmake               | 12 ++--------
 libraries/version/CMakeLists.txt              | 10 ++++----
 .../version/include/eosio/version/version.hpp |  4 ++--
 libraries/version/src/version.cpp             |  4 ++--
 libraries/version/src/version_impl.cpp.in     | 24 ++++++++++++-------
 libraries/version/src/version_impl.hpp        |  2 +-
 programs/cleos/CMakeLists.txt                 | 19 +--------------
 programs/cleos/config.hpp.in                  | 11 ++++-----
 programs/cleos/main.cpp                       | 10 ++++++--
 9 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index abeb9b85b12..b3fed7a6214 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -18,19 +18,11 @@ function(GENERATE_VERSION_METADATA)
          OUTPUT_STRIP_TRAILING_WHITESPACE )
       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
       if(${_VERSION_DIRTY_} STREQUAL "")
-	 set(_VERSION_DIRTY_ "false")
+         set(_VERSION_DIRTY_ "false")
        else()
-	 set(_VERSION_DIRTY_ "true")
+         set(_VERSION_DIRTY_ "true")
       endif()
    endif()
    set(_VERSION_HASH_  ${_VERSION_HASH_}  PARENT_SCOPE)
    set(_VERSION_DIRTY_ ${_VERSION_DIRTY_} PARENT_SCOPE)
-   message(STATUS "-------begin-------")
-   message(STATUS ${_VERSION_MAJOR_})
-   message(STATUS ${_VERSION_MINOR_})
-   message(STATUS ${_VERSION_PATCH_})
-   message(STATUS ${_VERSION_SUFFIX_})
-   message(STATUS ${_VERSION_HASH_})
-   message(STATUS ${_VERSION_DIRTY_})
-   message(STATUS "-------end-------")
 endfunction()
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 3aeb418170c..3db82f0b275 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -21,15 +21,17 @@ add_library(
 target_include_directories(
    version
    PUBLIC
-   "${CMAKE_CURRENT_SOURCE_DIR}/src" )
+   "${CMAKE_CURRENT_SOURCE_DIR}/include/"
+   PRIVATE
+   "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
 
 # Install the library in the appropriate places.
 install(
    TARGETS
    version
-   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}   #  Is it needed as a RUNTIME? It' just a library?
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ## Is it needed as both a static and dynamic lib?
-   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ## ...
+   RUNTIME       DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}   #  Is it needed as a RUNTIME? It' just a library?
+   ARCHIVE       DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ## Is it needed as both a static and dynamic lib?
+   LIBRARY       DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ## ...
 
 # Install the header file in the appropriate place.
 install(
diff --git a/libraries/version/include/eosio/version/version.hpp b/libraries/version/include/eosio/version/version.hpp
index 64c356a492f..58f27f411e9 100644
--- a/libraries/version/include/eosio/version/version.hpp
+++ b/libraries/version/include/eosio/version/version.hpp
@@ -11,8 +11,8 @@ namespace eosio { namespace version {
 
    ///< Grab the basic version of the client; example: `v1.8.0-rc1`
    const std::string& version_client();
-      
+
    ///< Grab the full version of the client; example:  `v1.8.0-rc1-7de458254[-dirty]`
    const std::string& version_full();
-      
+
 } }
diff --git a/libraries/version/src/version.cpp b/libraries/version/src/version.cpp
index fee2aaff479..16a23995969 100644
--- a/libraries/version/src/version.cpp
+++ b/libraries/version/src/version.cpp
@@ -11,10 +11,10 @@ namespace eosio { namespace version {
       static const std::string version{_version_client()};
       return version;
    }
-      
+
    const std::string& version_full() {
       static const std::string version{_version_full()};
       return version;
    }
-      
+
 } }
diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 961c6550eef..5d73457a7f4 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -8,21 +8,29 @@
 
 namespace eosio { namespace version {
 
-   const std::string version_major {"@_VERSION_MAJOR_@"};
-   const std::string version_minor {"@_VERSION_MINOR_@"};
-   const std::string version_patch {"@_VERSION_PATCH_@"};
+   const std::string version_major {"@_VERSION_MAJOR_@" };
+   const std::string version_minor {"@_VERSION_MINOR_@" };
+   const std::string version_patch {"@_VERSION_PATCH_@" };
    const std::string version_suffix{"@_VERSION_SUFFIX_@"};
-   const std::string version_hash  {"@_VERSION_HASH_@"};
-   const std::string version_dirty {"@_VERSION_DIRTY_@"};
+   const std::string version_hash  {"@_VERSION_HASH_@"  };
+   const bool        version_dirty { @_VERSION_DIRTY_@  };
 
    const std::string& _version_client() {
-      static const std::string version{'v'+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix};
+      static const std::string version{'v' + version_major +
+                                       '.' + version_minor +
+                                       '.' + version_patch +
+                                       '-' + version_suffix};
       return version;
    }
 
    const std::string& _version_full() {
-      static const std::string version{'v'+version_major+'.'+version_minor+'.'+version_patch+'-'+version_suffix+'-'+version_hash+version_dirty};
+      static const std::string version{'v' + version_major  +
+                                       '.' + version_minor  +
+                                       '.' + version_patch  +
+                                       '-' + version_suffix +
+                                       '-' + version_hash   +
+                                       '-' + ((version_dirty == true) ? ("true") : ("false"))};
       return version;
    }
-      
+
 } }
diff --git a/libraries/version/src/version_impl.hpp b/libraries/version/src/version_impl.hpp
index 1af4460b18a..40997ce6d37 100644
--- a/libraries/version/src/version_impl.hpp
+++ b/libraries/version/src/version_impl.hpp
@@ -14,5 +14,5 @@ namespace eosio { namespace version {
 
    ///< Helper function for `version_full()`
    const std::string& _version_full();
-      
+
 } }
diff --git a/programs/cleos/CMakeLists.txt b/programs/cleos/CMakeLists.txt
index 0787c5fe937..cc7cf865680 100644
--- a/programs/cleos/CMakeLists.txt
+++ b/programs/cleos/CMakeLists.txt
@@ -10,23 +10,6 @@ if( GPERFTOOLS_FOUND )
     list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../.git)
-  find_package(Git)
-  if(GIT_FOUND)
-    execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
-      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.."
-      OUTPUT_VARIABLE "cleos_BUILD_VERSION"
-      ERROR_QUIET
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message(STATUS "Git commit revision: ${cleos_BUILD_VERSION}")
-  else()
-    set(cleos_BUILD_VERSION 0)
-  endif()
-else()
-  set(cleos_BUILD_VERSION 0)
-endif()
-
 find_package(Intl REQUIRED)
 
 set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
@@ -36,7 +19,7 @@ configure_file(config.hpp.in config.hpp ESCAPE_QUOTES)
 target_include_directories(${CLI_CLIENT_EXECUTABLE_NAME} PUBLIC ${Intl_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries( ${CLI_CLIENT_EXECUTABLE_NAME}
-                       PRIVATE appbase chain_api_plugin producer_plugin chain_plugin http_plugin eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ${Intl_LIBRARIES} )
+                       PRIVATE appbase version chain_api_plugin producer_plugin chain_plugin http_plugin eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ${Intl_LIBRARIES} )
                     
 
 copy_bin( ${CLI_CLIENT_EXECUTABLE_NAME} )
diff --git a/programs/cleos/config.hpp.in b/programs/cleos/config.hpp.in
index d9d5f45b1de..b49466f3101 100644
--- a/programs/cleos/config.hpp.in
+++ b/programs/cleos/config.hpp.in
@@ -6,9 +6,8 @@
 #pragma once
 
 namespace eosio { namespace client { namespace config {
-   constexpr char version_str[] = "${cleos_BUILD_VERSION}";
-   constexpr char locale_path[] = "${LOCALEDIR}";
-   constexpr char locale_domain[] = "${LOCALEDOMAIN}";
-   constexpr char key_store_executable_name[] = "${KEY_STORE_EXECUTABLE_NAME}";
-   constexpr char node_executable_name[] = "${NODE_EXECUTABLE_NAME}";
-}}}
+   constexpr char locale_path[]              {"${LOCALEDIR}"};
+   constexpr char locale_domain[]            {"${LOCALEDOMAIN}"};
+   constexpr char key_store_executable_name[]{"${KEY_STORE_EXECUTABLE_NAME}"};
+   constexpr char node_executable_name[]     {"${NODE_EXECUTABLE_NAME}"};
+} } }
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 36c3be1900a..03c8917ffce 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -93,6 +93,8 @@ Usage: ./cleos create account [OPTIONS] creator name OwnerKey ActiveKey
 #include <eosio/chain_plugin/chain_plugin.hpp>
 #include <eosio/chain/contract_types.hpp>
 
+#include <eosio/version/version.hpp>
+
 #pragma push_macro("N")
 #undef N
 
@@ -2402,8 +2404,12 @@ int main( int argc, char** argv ) {
    auto version = app.add_subcommand("version", localized("Retrieve version information"), false);
    version->require_subcommand();
 
-   version->add_subcommand("client", localized("Retrieve version information of the client"))->set_callback([] {
-     std::cout << localized("Build version: ${ver}", ("ver", eosio::client::config::version_str)) << std::endl;
+   version->add_subcommand("client", localized("Retrieve basic version information of the client"))->set_callback([] {
+      std::cout << eosio::version::version_client() << '\n';
+   });
+
+   version->add_subcommand("full", localized("Retrieve full version information of the client"))->set_callback([] {
+     std::cout << eosio::version::version_full() << '\n';
    });
 
    // Create subcommand

From 49fd6054592defa1e9c2746e01d938e458b73c38 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 6 Jun 2019 16:38:25 -0400
Subject: [PATCH 0550/1648] Polish

---
 CMakeModules/VersionUtils.cmake | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index b3fed7a6214..bf98eec77f9 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -1,9 +1,4 @@
 function(GENERATE_VERSION_METADATA)
-   set(_VERSION_MAJOR_  ${VERSION_MAJOR}  PARENT_SCOPE)
-   set(_VERSION_MINOR_  ${VERSION_MINOR}  PARENT_SCOPE)
-   set(_VERSION_PATCH_  ${VERSION_PATCH}  PARENT_SCOPE)
-   set(_VERSION_SUFFIX_ ${VERSION_SUFFIX} PARENT_SCOPE)
-
    find_package(Git)
    if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
       execute_process(
@@ -19,10 +14,21 @@ function(GENERATE_VERSION_METADATA)
       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
       if(${_VERSION_DIRTY_} STREQUAL "")
          set(_VERSION_DIRTY_ "false")
-       else()
+      else()
          set(_VERSION_DIRTY_ "true")
       endif()
+      set(_VERSION_MAJOR_  ${VERSION_MAJOR}   PARENT_SCOPE)
+      set(_VERSION_MINOR_  ${VERSION_MINOR}   PARENT_SCOPE)
+      set(_VERSION_PATCH_  ${VERSION_PATCH}   PARENT_SCOPE)
+      set(_VERSION_SUFFIX_ ${VERSION_SUFFIX}  PARENT_SCOPE)
+      set(_VERSION_HASH_   ${_VERSION_HASH_}  PARENT_SCOPE)
+      set(_VERSION_DIRTY_  ${_VERSION_DIRTY_} PARENT_SCOPE)
+   else()
+      set(_VERSION_MAJOR_  "unknown" PARENT_SCOPE)
+      set(_VERSION_MINOR_  ""        PARENT_SCOPE)
+      set(_VERSION_PATCH_  ""        PARENT_SCOPE)
+      set(_VERSION_SUFFIX_ ""        PARENT_SCOPE)
+      set(_VERSION_HASH_   ""        PARENT_SCOPE)
+      set(_VERSION_DIRTY_  ""        PARENT_SCOPE)
    endif()
-   set(_VERSION_HASH_  ${_VERSION_HASH_}  PARENT_SCOPE)
-   set(_VERSION_DIRTY_ ${_VERSION_DIRTY_} PARENT_SCOPE)
 endfunction()

From 641ed80da8a8f36417eb8e525db5b558a35173db Mon Sep 17 00:00:00 2001
From: John DeBord <john.debord@block.one>
Date: Thu, 6 Jun 2019 16:42:19 -0400
Subject: [PATCH 0551/1648] Polish

---
 libraries/version/CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 3db82f0b275..036bc066f86 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(
-  VERSION 2.8.12 ) # What should the version actually be?
+  VERSION 2.8.12 ) ### What should the version actually be?
 
 project(
   Version )
@@ -8,7 +8,7 @@ project(
 include(
   VersionUtils )
 
-# Generate the most up-to-date metadata of the repository.
+# Generate the most up-to-date version metadata of the repository.
 GENERATE_VERSION_METADATA()
 
 # Construct the library.
@@ -29,9 +29,9 @@ target_include_directories(
 install(
    TARGETS
    version
-   RUNTIME       DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}   #  Is it needed as a RUNTIME? It' just a library?
-   ARCHIVE       DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ## Is it needed as both a static and dynamic lib?
-   LIBRARY       DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ## ...
+   RUNTIME       DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}   ### Is this needed? It's just a library?
+   ARCHIVE       DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ### Is this needed as both a static and dynamic lib?
+   LIBRARY       DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ### ...
 
 # Install the header file in the appropriate place.
 install(

From 1ba5fde04c567cb06c3e57e1b8ee1982c08ef62b Mon Sep 17 00:00:00 2001
From: John DeBord <john.debord@block.one>
Date: Thu, 6 Jun 2019 16:43:15 -0400
Subject: [PATCH 0552/1648] Polish

---
 libraries/version/include/eosio/version/version.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/version/include/eosio/version/version.hpp b/libraries/version/include/eosio/version/version.hpp
index 58f27f411e9..d9bf85f709d 100644
--- a/libraries/version/include/eosio/version/version.hpp
+++ b/libraries/version/include/eosio/version/version.hpp
@@ -9,10 +9,10 @@
 
 namespace eosio { namespace version {
 
-   ///< Grab the basic version of the client; example: `v1.8.0-rc1`
+   ///< Grab the basic version information of the client; example: `v1.8.0-rc1`
    const std::string& version_client();
 
-   ///< Grab the full version of the client; example:  `v1.8.0-rc1-7de458254[-dirty]`
+   ///< Grab the full version information of the client; example:  `v1.8.0-rc1-7de458254[-dirty]`
    const std::string& version_full();
 
 } }

From 0ce696635b4b98c512eb8003f2110f9289598180 Mon Sep 17 00:00:00 2001
From: John DeBord <john.debord@block.one>
Date: Thu, 6 Jun 2019 16:44:42 -0400
Subject: [PATCH 0553/1648] Polish

---
 programs/cleos/config.hpp.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/cleos/config.hpp.in b/programs/cleos/config.hpp.in
index b49466f3101..3441d9cd42d 100644
--- a/programs/cleos/config.hpp.in
+++ b/programs/cleos/config.hpp.in
@@ -6,8 +6,8 @@
 #pragma once
 
 namespace eosio { namespace client { namespace config {
-   constexpr char locale_path[]              {"${LOCALEDIR}"};
-   constexpr char locale_domain[]            {"${LOCALEDOMAIN}"};
+   constexpr char locale_path[]              {"${LOCALEDIR}"                };
+   constexpr char locale_domain[]            {"${LOCALEDOMAIN}"             };
    constexpr char key_store_executable_name[]{"${KEY_STORE_EXECUTABLE_NAME}"};
-   constexpr char node_executable_name[]     {"${NODE_EXECUTABLE_NAME}"};
+   constexpr char node_executable_name[]     {"${NODE_EXECUTABLE_NAME}"     };
 } } }

From 5cac5b3123860597ad623e54dd83e3b05eb1ca0b Mon Sep 17 00:00:00 2001
From: John DeBord <john.debord@block.one>
Date: Thu, 6 Jun 2019 16:45:33 -0400
Subject: [PATCH 0554/1648] Polish

---
 libraries/version/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 036bc066f86..165a004833f 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -29,9 +29,9 @@ target_include_directories(
 install(
    TARGETS
    version
-   RUNTIME       DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}   ### Is this needed? It's just a library?
-   ARCHIVE       DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ### Is this needed as both a static and dynamic lib?
-   LIBRARY       DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ### ...
+   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}   ### Is this needed? It's just a library?
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ### Is this needed as both a static and dynamic lib?
+   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ### ...
 
 # Install the header file in the appropriate place.
 install(

From 1c7eb51b074b0972ace3b9219bb8b4c6b897982d Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 7 Jun 2019 10:19:11 -0400
Subject: [PATCH 0555/1648] pipeline fix

---
 pipeline.jsonc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index f6b3afff455..6496a381c1f 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,10 +1,6 @@
 {
     "eosio": {
         "pipeline-branch": "support-for-improvements",
-        "environment": {
-            "IMAGE_TAG": "develop",
-            "DEBUG": true
-        }
     },
     "eosio-base-images": {
         "pipeline-branch": "support-for-improvements"

From 1c13b6bb3c7425e518958c274821b7d6027d7750 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 7 Jun 2019 10:22:41 -0400
Subject: [PATCH 0556/1648] quick fix

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 6496a381c1f..815117661ba 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,6 +1,6 @@
 {
     "eosio": {
-        "pipeline-branch": "support-for-improvements",
+        "pipeline-branch": "support-for-improvements"
     },
     "eosio-base-images": {
         "pipeline-branch": "support-for-improvements"

From d0f3e096407f6612058e11696abd4a52633cd995 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 7 Jun 2019 15:46:18 -0400
Subject: [PATCH 0557/1648] fix copy_bin() for win32 builds

---
 CMakeModules/utils.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeModules/utils.cmake b/CMakeModules/utils.cmake
index 2b15f3d7d28..d0d55283e75 100644
--- a/CMakeModules/utils.cmake
+++ b/CMakeModules/utils.cmake
@@ -1,4 +1,4 @@
 macro( copy_bin file )
    add_custom_command( TARGET ${file} POST_BUILD COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin )
-   add_custom_command( TARGET ${file} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${file} ${CMAKE_BINARY_DIR}/bin/ )
+   add_custom_command( TARGET ${file} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${file}${CMAKE_EXECUTABLE_SUFFIX} ${CMAKE_BINARY_DIR}/bin/ )
 endmacro( copy_bin )

From 84c7f2dced20c5298998da41aa4af8c1328f39f9 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 5 Jun 2019 17:44:35 -0400
Subject: [PATCH 0558/1648] guard unix socket support in http_plugin depending
 on platform support

oops I did it again! removing some posixing that I was responsible for
---
 plugins/http_plugin/http_plugin.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index a79da78dde4..f8ed9178a67 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -3,7 +3,9 @@
  *  @copyright defined in eos/LICENSE
  */
 #include <eosio/http_plugin/http_plugin.hpp>
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
 #include <eosio/http_plugin/local_endpoint.hpp>
+#endif
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/chain/thread_utils.hpp>
 
@@ -99,6 +101,7 @@ namespace eosio {
           static const long timeout_open_handshake = 0;
       };
 
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
       struct asio_local_with_stub_log : public websocketpp::config::asio {
           typedef asio_local_with_stub_log type;
           typedef asio base;
@@ -130,10 +133,13 @@ namespace eosio {
 
           static const long timeout_open_handshake = 0;
       };
+#endif
    }
 
    using websocket_server_type = websocketpp::server<detail::asio_with_stub_log<websocketpp::transport::asio::basic_socket::endpoint>>;
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
    using websocket_local_server_type = websocketpp::server<detail::asio_local_with_stub_log>;
+#endif
    using websocket_server_tls_type =  websocketpp::server<detail::asio_with_stub_log<websocketpp::transport::asio::tls_socket::endpoint>>;
    using ssl_context_ptr =  websocketpp::lib::shared_ptr<websocketpp::lib::asio::ssl::context>;
 
@@ -163,8 +169,10 @@ namespace eosio {
 
          websocket_server_tls_type https_server;
 
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
          optional<asio::local::stream_protocol::endpoint> unix_endpoint;
          websocket_local_server_type unix_server;
+#endif
 
          bool                     validate_host;
          set<string>              valid_hosts;
@@ -374,10 +382,12 @@ namespace eosio {
          }
    };
 
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
    template<>
    bool http_plugin_impl::allow_host<detail::asio_local_with_stub_log>(const detail::asio_local_with_stub_log::request_type& req, websocketpp::server<detail::asio_local_with_stub_log>::connection_ptr con) {
       return true;
    }
+#endif
 
    http_plugin::http_plugin():my(new http_plugin_impl()){
       app().register_config_type<https_ecdh_curve_t>();
@@ -385,10 +395,12 @@ namespace eosio {
    http_plugin::~http_plugin(){}
 
    void http_plugin::set_program_options(options_description&, options_description& cfg) {
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
       if(current_http_plugin_defaults.default_unix_socket_path.length())
          cfg.add_options()
             ("unix-socket-path", bpo::value<string>()->default_value(current_http_plugin_defaults.default_unix_socket_path),
              "The filename (relative to data-dir) to create a unix socket for HTTP RPC; set blank to disable.");
+#endif
 
       if(current_http_plugin_defaults.default_http_port)
          cfg.add_options()
@@ -484,12 +496,14 @@ namespace eosio {
             }
          }
 
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
          if( options.count( "unix-socket-path" ) && !options.at( "unix-socket-path" ).as<string>().empty()) {
             boost::filesystem::path sock_path = options.at("unix-socket-path").as<string>();
             if (sock_path.is_relative())
                sock_path = app().data_dir() / sock_path;
             my->unix_endpoint = asio::local::stream_protocol::endpoint(sock_path.string());
          }
+#endif
 
          if( options.count( "https-server-address" ) && options.at( "https-server-address" ).as<string>().length()) {
             if( !options.count( "https-certificate-chain-file" ) ||
@@ -562,6 +576,7 @@ namespace eosio {
          }
       }
 
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
       if(my->unix_endpoint) {
          try {
             my->unix_server.clear_access_channels(websocketpp::log::alevel::all);
@@ -583,6 +598,7 @@ namespace eosio {
             throw;
          }
       }
+#endif
 
       if(my->https_listen_endpoint) {
          try {
@@ -631,8 +647,10 @@ namespace eosio {
          my->server.stop_listening();
       if(my->https_server.is_listening())
          my->https_server.stop_listening();
+#ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
       if(my->unix_server.is_listening())
          my->unix_server.stop_listening();
+#endif
 
       if( my->thread_pool ) {
          my->thread_pool->stop();

From 1a11bebb29657b7b9a4727df544dad9f2ccbf747 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Sat, 8 Jun 2019 11:21:22 -0400
Subject: [PATCH 0559/1648] various fixes from pull/7458

---
 scripts/.environment           |  15 +-
 scripts/eosio_build.sh         |  23 ++-
 scripts/eosio_install.sh       |   1 -
 scripts/eosio_uninstall.sh     |  50 +----
 scripts/generate_bottle.sh     |   3 +-
 scripts/generate_deb.sh        |   3 +-
 scripts/generate_package.sh.in |   3 +-
 scripts/generate_rpm.sh        |   3 +-
 scripts/generate_tarball.sh    |   3 +-
 scripts/helpers/eosio.sh       | 335 +++++----------------------------
 scripts/helpers/general.sh     | 305 ++++++++++++++++++++++++++----
 11 files changed, 360 insertions(+), 384 deletions(-)

diff --git a/scripts/.environment b/scripts/.environment
index 177e19639f2..6927f0177c8 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -2,11 +2,16 @@ export SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export REPO_ROOT="${SCRIPT_DIR}/.."
 export BUILD_DIR="${REPO_ROOT}/build"
 
-export EOSIO_VERSION_MAJOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "set\([ +]?VERSION_MAJOR" | sed 's/set(.*VERSION_MAJOR //g' | sed 's/ //g' | cut -d\) -f1)
-export EOSIO_VERSION_MINOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "set\([ +]?VERSION_MINOR" | sed 's/set(.*VERSION_MINOR //g' | sed 's/ //g' | cut -d\) -f1)
-export EOSIO_VERSION_PATCH=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "set\([ +]?VERSION_PATCH" | sed 's/set(.*VERSION_PATCH //g' | sed 's/ //g' | cut -d\) -f1)
-export EOSIO_VERSION_SUFFIX=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "set\([ +]?VERSION_SUFFIX" | sed 's/set(.*VERSION_SUFFIX //g' | sed 's/ //g' | cut -d\) -f1)
-export EOSIO_VERSION="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}.${EOSIO_VERSION_PATCH}-${EOSIO_VERSION_SUFFIX}"
+export EOSIO_VERSION_MAJOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_MAJOR" | tail -1 | sed 's/.*VERSION_MAJOR //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION_MINOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_MINOR" | tail -1 | sed 's/.*VERSION_MINOR //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION_PATCH=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_PATCH" | tail -1 | sed 's/.*VERSION_PATCH //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION_SUFFIX=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_SUFFIX" | tail -1 | sed 's/.*VERSION_SUFFIX //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}"
+if [[ -z $EOSIO_VERSION_SUFFIX ]]; then
+    export EOSIO_VERSION_FULL="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}.${EOSIO_VERSION_PATCH}"
+else
+    export EOSIO_VERSION_FULL="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}.${EOSIO_VERSION_PATCH}-${EOSIO_VERSION_SUFFIX}"
+fi
 
 export INSTALL_LOCATION=${INSTALL_LOCATION:-$HOME}
 export EOSIO_INSTALL_DIR="${INSTALL_LOCATION}/eosio/${EOSIO_VERSION}"
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 8604df72ec3..c3efb5a296e 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -42,6 +42,7 @@ function usage() {
   -y          Noninteractive mode (answers yes to every prompt)
   -c          Enable Code Coverage
   -d          Generate Doxygen
+  -m          Build MongoDB dependencies
    \\n" "$0" 1>&2
    exit 1
 }
@@ -110,14 +111,14 @@ fi
 # Load eosio specific helper functions
 . ./scripts/helpers/eosio.sh
 
-echo "Beginning build version: ${SCRIPT_VERSION}"
-echo "EOSIO version to install: ${EOSIO_VERSION}"
+$VERBOSE && echo "Build Script Version: ${SCRIPT_VERSION}"
+echo "EOSIO Version: ${EOSIO_VERSION_FULL}"
 echo "$( date -u )"
 echo "User: ${CURRENT_USER}"
 # echo "git head id: %s" "$( cat .git/refs/heads/master )"
 echo "Current branch: $( execute git rev-parse --abbrev-ref HEAD 2>/dev/null )"
 
-[[ ! $NAME == "Ubuntu" ]] && set -i # Ubuntu doesn't support interactive mode since it uses dash
+( [[ ! $NAME == "Ubuntu" ]] && [[ ! $ARCH == "Darwin" ]] ) && set -i # Ubuntu doesn't support interactive mode since it uses dash + Some folks are having this issue on Darwin; colors aren't supported yet anyway
 
 # Ensure sudo is available (only if not using the root user)
 ensure-sudo
@@ -137,6 +138,9 @@ execute cd $REPO_ROOT
 # Submodules need to be up to date
 ensure-submodules-up-to-date
 
+# Check if cmake already exists
+( [[ -z "${CMAKE}" ]] && [[ ! -z $(command -v cmake 2>/dev/null) ]] ) && export CMAKE=$(command -v cmake 2>/dev/null)
+
 # Use existing cmake on system (either global or specific to eosio)
 # Setup based on architecture
 if [[ $ARCH == "Linux" ]]; then
@@ -156,20 +160,20 @@ if [[ $ARCH == "Linux" ]]; then
       ;;
       *) print_supported_linux_distros_and_exit;;
    esac
-   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='$EOSIO_INSTALL_DIR' ${LOCAL_CMAKE_FLAGS}" 
+   CMAKE_PREFIX_PATHS="${EOSIO_INSTALL_DIR}"
+   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='$CMAKE_PREFIX_PATHS' ${LOCAL_CMAKE_FLAGS}" 
 fi
 
 if [ "$ARCH" == "Darwin" ]; then
    # opt/gettext: cleos requires Intl, which requires gettext; it's keg only though and we don't want to force linking: https://github.com/EOSIO/eos/issues/2240#issuecomment-396309884
    # EOSIO_INSTALL_DIR/lib/cmake: mongo_db_plugin.cpp:25:10: fatal error: 'bsoncxx/builder/basic/kvp.hpp' file not found
-   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='/usr/local/opt/gettext;$EOSIO_INSTALL_DIR' ${LOCAL_CMAKE_FLAGS}" 
+   CMAKE_PREFIX_PATHS="/usr/local/opt/gettext;${EOSIO_INSTALL_DIR}"
+   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATHS}' ${LOCAL_CMAKE_FLAGS}" 
    FILE="${SCRIPT_DIR}/eosio_build_darwin.sh"
    OPENSSL_ROOT_DIR=/usr/local/opt/openssl
    export CMAKE=${CMAKE}
 fi
 
-( [[ -z "${CMAKE}" ]] && [[ ! -z $(command -v cmake 2>/dev/null) ]] ) && export CMAKE=$(command -v cmake 2>/dev/null)
-
 # Find and replace OPT_DIR in pinned_toolchain.cmake, then move it into build dir
 execute bash -c "sed -e 's~@~$OPT_DIR~g' $SCRIPT_DIR/pinned_toolchain.cmake &> $BUILD_DIR/pinned_toolchain.cmake"
 
@@ -192,9 +196,10 @@ execute cd $BUILD_DIR
 # LOCAL_CMAKE_FLAGS
 $ENABLE_MONGO && LOCAL_CMAKE_FLAGS="-DBUILD_MONGO_DB_PLUGIN=true ${LOCAL_CMAKE_FLAGS}" # Enable Mongo DB Plugin if user has enabled -m
 if $PIN_COMPILER; then
-   LOCAL_CMAKE_FLAGS="${PINNED_TOOLCHAIN} -DCMAKE_PREFIX_PATH='${LLVM_ROOT}' ${LOCAL_CMAKE_FLAGS}"
+   CMAKE_PREFIX_PATHS="${CMAKE_PREFIX_PATHS};${LLVM_ROOT}"
+   LOCAL_CMAKE_FLAGS="${PINNED_TOOLCHAIN} -DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATHS}' ${LOCAL_CMAKE_FLAGS}"
 else
-   LOCAL_CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='${CXX}' -DCMAKE_C_COMPILER='${CC}' ${LOCAL_CMAKE_FLAGS}"
+   LOCAL_CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='${CXX}' -DCMAKE_C_COMPILER='${CC}' -DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATHS}' ${LOCAL_CMAKE_FLAGS}"
 fi
 $ENABLE_DOXYGEN && LOCAL_CMAKE_FLAGS="-DBUILD_DOXYGEN='${DOXYGEN}' ${LOCAL_CMAKE_FLAGS}"
 $ENABLE_COVERAGE_TESTING && LOCAL_CMAKE_FLAGS="-DENABLE_COVERAGE_TESTING='${ENABLE_COVERAGE_TESTING}' ${LOCAL_CMAKE_FLAGS}"
diff --git a/scripts/eosio_install.sh b/scripts/eosio_install.sh
index 2a09bc11d1f..f8909fcac39 100755
--- a/scripts/eosio_install.sh
+++ b/scripts/eosio_install.sh
@@ -41,7 +41,6 @@ VERSION=2.0
 echo "${COLOR_CYAN}====================================================================================="
 echo "========================== ${COLOR_WHITE}Starting EOSIO Installation${COLOR_CYAN} ==============================${COLOR_NC}"
 execute cd $BUILD_DIR
-CMAKE_INSTALL_PREFIX=$(grep ^CMAKE_INSTALL_PREFIX: CMakeCache.txt | sed 's/.*=//')
 execute make install
 execute cd ..
 
diff --git a/scripts/eosio_uninstall.sh b/scripts/eosio_uninstall.sh
index 16b3c65bbdc..fb595779ac8 100755
--- a/scripts/eosio_uninstall.sh
+++ b/scripts/eosio_uninstall.sh
@@ -11,35 +11,7 @@ usage() {
    \\n" "$0"
 }
 
- INSTALL_PATHS=(
-   $HOME/bin/eosio-launcher
-   $HOME/lib/cmake/eosios
-   $HOME/opt/llvm*
-   $HOME/opt/boost
-   $HOME/src/boost_*
-   $HOME/src/cmake-*
-   $HOME/share/cmake-*
-   $HOME/share/aclocal/cmake*
-   $HOME/doc/cmake*
-   $HOME/bin/nodeos 
-   $HOME/bin/keosd 
-   $HOME/bin/cleos 
-   $HOME/bin/ctest 
-   $HOME/bin/*cmake* 
-   $HOME/bin/cpack
-   $HOME/src/mongo*
-   $HOME/opt/mongo*
-   $HOME/bin/mongo*
-   $HOME/lib/cmake
-   $HOME/lib/libbson*
-   $HOME/lib/libmongo*
-   $HOME/lib/pkgconfig
-   $HOME/include/bsoncxx*
-   $HOME/include/libbson*
-   $HOME/include/libmongo*
-   $HOME/include/mongocxx*
-   $HOME/share/mongo*
-)
+INSTALL_PATHS=()
 
 # User input handling
 PROCEED=false
@@ -72,13 +44,10 @@ if [[ $@ =~ [[:space:]]?--full[[:space:]]? ]]; then
 fi
 if [[ ! -z $@ ]] && [[ ! $@ =~ [[:space:]]?--force[[:space:]]? ]] && [[ ! $@ =~ [[:space:]]?--full[[:space:]]? ]]; then usage && exit; fi
 
-# If eosio folder exist, add it to the INSTALL_PATHS for deletion
-[[ -d "${HOME}/opt/eosio" ]] && INSTALL_PATHS+=("$HOME/opt/eosio")
 # As of 1.8.0, we're using a versioned directories under home: https://github.com/EOSIO/eos/issues/6940
-[[ -d "${EOSIO_INSTALL_DIR}" ]] && INSTALL_PATHS+=("${EOSIO_INSTALL_DIR}") # EOSIO_INSTALL_DIR set in .environment
+[[ -d "${EOSIO_INSTALL_DIR}" ]] && echo "[EOSIO Installation Found: ${EOSIO_INSTALL_DIR}]" && INSTALL_PATHS+=("${EOSIO_INSTALL_DIR}") # EOSIO_INSTALL_DIR set in .environment
 
 # Removal
-[[ ! -z "${EOSIO_LOCATION}" ]] && printf "[EOSIO Installation Found: ${EOSIO_LOCATION}]\n"
 while true; do
    [[ $FORCED == false ]] && read -p "Do you wish to remove the installation? (y/n) " PROCEED
    case $PROCEED in
@@ -104,25 +73,14 @@ while true; do
          # Handle cleanup of data directory
          if $FULL; then
             ## Add both just to be safe
-            INSTALL_PATHS+=("${HOME}/Library/Application\ Support/eosio")
-            INSTALL_PATHS+=("${HOME}/.local/share/eosio")
+            [[ $ARCH == "Darwin" ]] && INSTALL_PATHS+=("${HOME}/Library/Application\ Support/eosio")
+            [[ $ARCH != "Darwin" ]] && INSTALL_PATHS+=("${HOME}/.local/share/eosio")
          fi
          # Version < 1.8.0; Before we started using ~/eosio/1.8.x
          # Arrays should return with newlines (IFS=\n;helpers.sh) as Application\ Support will split into two
          for INSTALL_PATH in ${INSTALL_PATHS[@]}; do
             execute rm -rf $INSTALL_PATH
          done
-         # Cleanup directories if they're empty (else the user had the directory there already for a reason)
-         execute rmdir $HOME/src 2>/dev/null
-         execute rmdir $HOME/opt 2>/dev/null
-         execute rmdir $HOME/var/log/mongodb 2>/dev/null
-         execute rmdir $HOME/var/log 2>/dev/null
-         execute rmdir $HOME/var 2>/dev/null
-         execute rmdir $HOME/bin 2>/dev/null
-         execute rmdir $HOME/etc 2>/dev/null
-         execute rmdir $HOME/lib 2>/dev/null
-         execute rmdir $HOME/data/mongodb 2>/dev/null
-         execute rmdir $HOME/data 2>/dev/null
          echo "[EOSIO Removal Complete]"
          break;;
       1 | false | [Nn]* ) echo " - Cancelled EOSIO Removal!"; exit 1;;
diff --git a/scripts/generate_bottle.sh b/scripts/generate_bottle.sh
index 075fb9a7bb7..034ea7bc935 100644
--- a/scripts/generate_bottle.sh
+++ b/scripts/generate_bottle.sh
@@ -1,4 +1,5 @@
-#! /bin/bash
+#!/usr/bin/env bash
+set -eo pipefail
 
 VERS=`sw_vers -productVersion | awk '/10\.13\..*/{print $0}'`
 if [[ -z "$VERS" ]];
diff --git a/scripts/generate_deb.sh b/scripts/generate_deb.sh
index 9686c904036..3c7de977a42 100755
--- a/scripts/generate_deb.sh
+++ b/scripts/generate_deb.sh
@@ -1,4 +1,5 @@
-#! /bin/bash
+#!/usr/bin/env bash
+set -eo pipefail
 
 PREFIX="usr"
 SPREFIX=${PREFIX}
diff --git a/scripts/generate_package.sh.in b/scripts/generate_package.sh.in
index 4874a1b4246..003f268021a 100644
--- a/scripts/generate_package.sh.in
+++ b/scripts/generate_package.sh.in
@@ -1,4 +1,5 @@
-#! /bin/bash
+#!/usr/bin/env bash
+set -eo pipefail
 
 VARIANT=$1
 
diff --git a/scripts/generate_rpm.sh b/scripts/generate_rpm.sh
index 625eff29d7b..71bc2f619da 100644
--- a/scripts/generate_rpm.sh
+++ b/scripts/generate_rpm.sh
@@ -1,4 +1,5 @@
-#! /bin/bash
+#!/usr/bin/env bash
+set -eo pipefail
 
 PREFIX="usr"
 SPREFIX=${PREFIX}
diff --git a/scripts/generate_tarball.sh b/scripts/generate_tarball.sh
index 02f5e009ce5..203ad1a29b9 100644
--- a/scripts/generate_tarball.sh
+++ b/scripts/generate_tarball.sh
@@ -1,4 +1,5 @@
-#! /bin/bash
+#!/usr/bin/env bash
+set -eo pipefail
 
 NAME=$1
 EOS_PREFIX=${PREFIX}/${SUBPREFIX}
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index a19bbc2fbee..98a676ab452 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -13,9 +13,9 @@ fi
 
 # Setup yum and apt variables
 if [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]]; then
-    if ! YUM=$( command -v yum 2>/dev/null ); then echo "${COLOR_RED}YUM must be installed to compile EOS.IO${COLOR_NC}" && exit 1; fi
+    if ! YUM=$( command -v yum 2>/dev/null ); then echo "${COLOR_RED}YUM must be installed to compile EOSIO${COLOR_NC}" && exit 1; fi
 elif [[ $NAME == "Ubuntu" ]]; then
-    if ! APTGET=$( command -v apt-get 2>/dev/null ); then echo "${COLOR_RED}APT-GET must be installed to compile EOS.IO${COLOR_NC}" && exit 1; fi
+    if ! APTGET=$( command -v apt-get 2>/dev/null ); then echo "${COLOR_RED}APT-GET must be installed to compile EOSIO${COLOR_NC}" && exit 1; fi
 fi
 
 # Obtain dependency versions; Must come first in the script
@@ -43,15 +43,8 @@ function setup() {
         echo "SUDO_LOCATION: ${SUDO_LOCATION}"
         echo "PIN_COMPILER: ${PIN_COMPILER}"
     fi
-    [[ -d $BUILD_DIR ]] && execute rm -rf $BUILD_DIR # cleanup old build directory
-    # Be absolutely sure TEMP_DIR is set (we could do damage here)
-    ## IF user set, they can be responsible for creating and then removing stale data
-    if [[ $TEMP_DIR =~ "/tmp" ]]; then
-        if [[ ! -d $TEMP_DIR ]]; then
-            execute-always mkdir -p $TEMP_DIR
-            execute-always rm -rf $TEMP_DIR/*
-        fi
-    fi
+    ( [[ -d $BUILD_DIR ]] && [[ -z $BUILD_DIR_CLEANUP_SKIP ]] ) && execute rm -rf $BUILD_DIR # cleanup old build directory; support disabling it (Zach requested)
+    execute-always mkdir -p $TEMP_DIR
     execute mkdir -p $BUILD_DIR
     execute mkdir -p $SRC_DIR
     execute mkdir -p $OPT_DIR
@@ -64,6 +57,37 @@ function setup() {
     execute mkdir -p $MONGODB_DATA_DIR
 }
 
+function ensure-which() {
+  if ! which ls &>/dev/null; then
+    while true; do
+      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}EOSIO compiler checks require the 'which' package: Would you like for us to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+      echo ""
+      case $PROCEED in
+          "" ) echo "What would you like to do?";;
+          0 | true | [Yy]* ) install-package which WETRUN; break;;
+          1 | false | [Nn]* ) echo "${COLOR_RED}Please install the 'which' command before proceeding!${COLOR_NC}"; exit 1;;
+          * ) echo "Please type 'y' for yes or 'n' for no.";;
+      esac
+    done
+  fi
+}
+
+function previous-install-prompt() {
+  if [[ -d $EOSIO_INSTALL_DIR ]]; then
+    echo "EOSIO has already been installed into ${EOSIO_INSTALL_DIR}... It's suggested that you eosio_uninstall.sh before re-running this script."
+    while true; do
+      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to proceed anyway? (y/n)${COLOR_NC}" && read -p " " PROCEED
+      echo ""
+      case $PROCEED in
+        "" ) echo "What would you like to do?";;
+        0 | true | [Yy]* ) break;;
+        1 | false | [Nn]* ) exit;;
+        * ) echo "Please type 'y' for yes or 'n' for no.";;
+      esac
+	  done
+  fi
+}
+
 function resources() {
     echo "${COLOR_CYAN}EOSIO website:${COLOR_NC} https://eos.io"
     echo "${COLOR_CYAN}EOSIO Telegram channel:${COLOR_NC} https://t.me/EOSProject"
@@ -96,93 +120,6 @@ function prompt-mongo-install() {
     fi
 }
 
-function ensure-homebrew() {
-    echo "${COLOR_CYAN}[Ensuring HomeBrew installation]${COLOR_NC}"
-    if ! BREW=$( command -v brew ); then
-        while true; do
-            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install HomeBrew? (y/n)?${COLOR_NC}" &&  read -p " " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* )
-                    execute "${XCODESELECT}" --install 2>/dev/null || true
-                    if ! execute "${RUBY}" -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; then
-                        echo "${COLOR_RED}Unable to install HomeBrew!${COLOR_NC}" && exit 1;
-                    else BREW=$( command -v brew ); fi
-                break;;
-                1 | false | [Nn]* ) echo "${COLOR_RED} - User aborted required HomeBrew installation.${COLOR_NC}"; exit 1;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-    else
-        echo " - HomeBrew installation found @ ${BREW}"
-    fi
-}
-
-function ensure-scl() {
-    echo "${COLOR_CYAN}[Ensuring installation of Centos Software Collections Repository]${COLOR_NC}" # Needed for rh-python36
-    SCL=$( rpm -qa | grep -E 'centos-release-scl-[0-9].*' || true )
-    if [[ -z "${SCL}" ]]; then
-        while true; do
-            [[ $NONINTERACTIVE == false ]] && read -p "${COLOR_YELLOW}Do you wish to install and enable the Centos Software Collections Repository? (y/n)?${COLOR_NC} " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* ) install-package centos-release-scl "--enablerepo=extras"; break;;
-                1 | false | [Nn]* ) echo " - User aborted installation of required Centos Software Collections Repository."; exit 1;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-    else
-        echo " - ${SCL} found."
-    fi
-}
-
-function ensure-devtoolset() {
-    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-7 with C++7]${COLOR_NC}"
-    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-7-[0-9].*' || true )
-    if [[ -z "${DEVTOOLSET}" ]]; then
-        while true; do
-            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Not Found: Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* ) install-package devtoolset-7; break;;
-                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-7."; break;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-    else
-        echo " - ${DEVTOOLSET} found."
-    fi
-}
-
-function ensure-build-essential() {
-    echo "${COLOR_CYAN}[Ensuring installation of build-essential with C++7]${COLOR_NC}"
-    BUILD_ESSENTIAL=$( dpkg -s build-essential | grep 'Package: build-essential' || true )
-    if [[ -z $BUILD_ESSENTIAL ]]; then
-        while true; do
-            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* ) 
-                    if install-package build-essential; then
-                        echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
-                    else
-                        echo " - ${COLOR_GREEN}Install of build-essential failed. Please try a manual install.${COLOR_NC}"
-                        exit 1
-                    fi
-                break;;
-                1 | false | [Nn]* ) echo " - User aborted installation of build-essential."; break;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-    else
-        echo " - ${BUILD_ESSENTIAL} found."
-    fi
-}
-
 function ensure-compiler() {
     export CXX=${CXX:-c++}
     export CC=${CC:-cc}
@@ -212,6 +149,18 @@ function ensure-compiler() {
         else
             ## Check for c++ version 7 or higher
             [[ $( $(which $CXX) -dumpversion | cut -d '.' -f 1 ) -lt 7 ]] && export NO_CPP17=true
+            if [[ $NO_CPP17 == false ]]; then # https://github.com/EOSIO/eos/issues/7402
+                while true; do
+                    echo "${COLOR_YELLOW}WARNING: Your GCC compiler is less performant than clang (https://github.com/EOSIO/eos/issues/7402). We suggest running the build script with -P or install your own clang and try again. ${CXX}!${COLOR_NC}"
+                    [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to proceed anyway? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+                    case $PROCEED in
+                        "" ) echo "What would you like to do?";;
+                        0 | true | [Yy]* ) break;;
+                        1 | false | [Nn]* ) exit 1;;
+                        * ) echo "Please type 'y' for yes or 'n' for no.";;
+                    esac
+                done
+            fi
         fi
     fi
     if $NO_CPP17; then
@@ -334,7 +283,7 @@ function build-clang() {
             && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/polly.git \
             && cd polly && git checkout $PINNED_COMPILER_POLLY_COMMIT && cd ../ \
             && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang.git clang && cd clang/tools \
-            && git checkout $PINNED_COMPILER_CLANG_VERSION \
+            && git checkout $PINNED_COMPILER_CLANG_COMMIT \
             && mkdir extra && cd extra \
             && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang-tools-extra.git \
             && cd clang-tools-extra && git checkout $PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT && cd .. \
@@ -352,7 +301,7 @@ function build-clang() {
             && ${CMAKE} -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX='${CLANG_ROOT}' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=all -DCMAKE_BUILD_TYPE=Release .. \
             && make -j${JOBS} \
             && make install \
-            && rm -rf ${TEMP_DIR}/*"
+            && rm -rf ${TEMP_DIR}/clang8"
             echo " - Clang 8 successfully installed @ ${CLANG_ROOT}"
             echo ""
         else
@@ -363,189 +312,3 @@ function build-clang() {
         export CC=$CC_COMP
     fi
 }
-
-function ensure-yum-packages() {
-    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
-    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
-    # Create temp file so we can add to it
-    cat $1 > $DEPS_FILE
-    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
-        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
-        OLDIFS="$IFS"; IFS=$''
-        _2=("$(echo $2 | sed 's/-qa /-qa\n/g')")
-        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}\n" | sed 's/-qa\\n/-qa/g' >> $DEPS_FILE; done
-    fi
-    while true; do
-        [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to update YUM repositories? (y/n)?${COLOR_NC}" && read -p " " PROCEED
-        echo ""
-        case $PROCEED in
-            "" ) echo "What would you like to do?";;
-            0 | true | [Yy]* ) execute eval $( [[ $CURRENT_USER == "root" ]] || echo $SUDO_LOCATION -E ) $YUM -y update; break;;
-            1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
-            * ) echo "Please type 'y' for yes or 'n' for no.";;
-        esac
-    done
-    echo "${COLOR_CYAN}[Ensuring package dependencies]${COLOR_NC}"
-    OLDIFS="$IFS"; IFS=$','
-    # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
-    while read -r testee tester || [[ -n "$testee" ]]; do
-        if [[ ! -z $(eval $tester $testee) ]]; then
-            echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}"
-        else
-            DEPS=$DEPS"${testee} "
-            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found."
-            (( COUNT+=1 ))
-        fi
-    done < $DEPS_FILE
-    IFS=$OLDIFS
-    OLDIFS="$IFS"; IFS=$' '
-    echo ""
-    if [[ $COUNT > 0 ]]; then
-        while true; do
-            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)?${COLOR_NC}" && read -p " " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* )
-                    for DEP in $DEPS; do
-                        install-package $DEP
-                    done
-                break;;
-                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-        echo ""
-    else
-        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
-        echo ""
-    fi
-    IFS=$OLDIFS
-}
-
-function ensure-brew-packages() {
-    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
-    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
-    # Create temp file so we can add to it
-    cat $1 > $DEPS_FILE
-    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
-        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
-        OLDIFS="$IFS"; IFS=$''
-        _2=("$(echo $2 | sed 's/-s /-s\n/g')")
-        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}\n" | sed 's/-s\\n/-s/g' >> $DEPS_FILE; done
-    fi
-    echo "${COLOR_CYAN}[Ensuring HomeBrew dependencies]${COLOR_NC}"
-    OLDIFS="$IFS"; IFS=$','
-    # || [[ -n "$nmae" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
-    while read -r name path || [[ -n "$name" ]]; do
-        if [[ -f $path ]] || [[ -d $path ]]; then
-            echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}"
-            continue
-        fi
-        # resolve conflict with homebrew glibtool and apple/gnu installs of libtool
-        if [[ "${testee}" == "/usr/local/bin/glibtool" ]]; then
-            if [ "${tester}" "/usr/local/bin/libtool" ]; then
-                echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}"
-                continue
-            fi
-        fi
-        DEPS=$DEPS"${name} "
-        echo " - ${name} ${COLOR_RED}NOT${COLOR_NC} found."
-        (( COUNT+=1 ))
-    done < $DEPS_FILE
-    if [[ $COUNT > 0 ]]; then
-        echo ""
-        while true; do
-            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)${COLOR_NC}" && read -p " " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* )
-                    execute "${XCODESELECT}" --install 2>/dev/null || true
-                    while true; do
-                        [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to update HomeBrew packages first? (y/n)${COLOR_NC}" && read -p " " PROCEED
-                        case $PROCEED in
-                            "" ) echo "What would you like to do?";;
-                            0 | true | [Yy]* ) echo "${COLOR_CYAN}[Updating HomeBrew]${COLOR_NC}" && execute brew update; break;;
-                            1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
-                            * ) echo "Please type 'y' for yes or 'n' for no.";;
-                        esac
-                    done
-                    execute brew tap eosio/eosio
-                    echo "${COLOR_CYAN}[Installing HomeBrew Dependencies]${COLOR_NC}"
-                    execute eval $BREW install $DEPS
-                    IFS="$OIFS"
-                break;;
-                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-    else
-        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
-        echo ""
-    fi
-}
-
-function apt-update-prompt() {
-    if [[ $NAME == "Ubuntu" ]]; then
-        while true; do # APT
-            [[ $NONINTERACTIVE == false ]] && read -p "${COLOR_YELLOW}Do you wish to update APT-GET repositories before proceeding? (y/n)?${COLOR_NC} " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* ) execute-always $APTGET update; break;;
-                1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-    fi
-    true
-}
-
-function ensure-apt-packages() {
-    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
-    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
-    # Create temp file so we can add to it
-    cat $1 > $DEPS_FILE
-    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
-        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
-        OLDIFS="$IFS"; IFS=$''
-        _2=("$(echo $2 | sed 's/-s /-s\n/g')")
-        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}" >> $DEPS_FILE; done
-    fi
-    echo "${COLOR_CYAN}[Ensuring package dependencies]${COLOR_NC}"
-    OLDIFS="$IFS"; IFS=$','
-    # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
-    while read -r testee tester || [[ -n "$testee" ]]; do
-        if [[ ! -z $(eval $tester $testee 2>/dev/null) ]]; then
-            echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}"
-        else
-            DEPS=$DEPS"${testee} "
-            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found."
-            (( COUNT+=1 ))
-        fi
-    done < $DEPS_FILE
-    IFS=$OLDIFS
-    OLDIFS="$IFS"; IFS=$' '
-    if [[ $COUNT > 0 ]]; then
-        echo ""
-        while true; do
-            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)?${COLOR_NC}" && read -p " " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* )
-                    for DEP in $DEPS; do
-                        install-package $DEP
-                    done
-                break;;
-                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-    else
-        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
-        echo ""
-    fi
-    IFS=$OLDIFS
-}
\ No newline at end of file
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index d8822f4ce8e..bc799871b68 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -41,7 +41,6 @@ function execute-without-verbose() {
 function ensure-git-clone() {
   if [[ ! -e "${REPO_ROOT}/.git" ]]; then
     echo "This build script only works with sources cloned from git"
-    echo "For example, you can clone a new eos directory with: git clone https://github.com/EOSIO/eos"
     exit 1
   fi
 }
@@ -53,42 +52,11 @@ function ensure-submodules-up-to-date() {
   fi
 }
 
-function ensure-which() {
-  if ! which ls &>/dev/null; then
-    while true; do
-      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}EOSIO compiler checks require the 'which' package: Would you like for us to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
-      echo ""
-      case $PROCEED in
-          "" ) echo "What would you like to do?";;
-          0 | true | [Yy]* ) install-package which WETRUN; break;;
-          1 | false | [Nn]* ) echo "${COLOR_RED}Please install the 'which' command before proceeding!${COLOR_NC}"; exit 1;;
-          * ) echo "Please type 'y' for yes or 'n' for no.";;
-      esac
-    done
-  fi
-}
-
 function ensure-sudo() {
   ( [[ $CURRENT_USER != "root" ]] && [[ -z $SUDO_LOCATION ]] ) && echo "${COLOR_RED}Please install the 'sudo' command before proceeding!${COLOR_NC}" && exit 1
   true 1>/dev/null # Needed
 }
 
-function previous-install-prompt() {
-  if [[ -d $EOSIO_INSTALL_DIR ]]; then
-    echo "EOSIO has already been installed into ${EOSIO_INSTALL_DIR}... It's suggested that you eosio_uninstall.sh before re-running this script."
-    while true; do
-      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to proceed anyway? (y/n)${COLOR_NC}" && read -p " " PROCEED
-      echo ""
-      case $PROCEED in
-        "" ) echo "What would you like to do?";;
-        0 | true | [Yy]* ) break;;
-        1 | false | [Nn]* ) exit;;
-        * ) echo "Please type 'y' for yes or 'n' for no.";;
-      esac
-	  done
-  fi
-}
-
 function set_system_vars() {
     if [[ $ARCH == "Darwin" ]]; then
         export OS_VER=$(sw_vers -productVersion)
@@ -137,4 +105,277 @@ function uninstall-package() {
     ( [[ $NAME =~ "Ubuntu" ]] && $(dpkg -s $1 &>/dev/null) ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $APTGET $OPTIONS remove -y $1
   fi
   true
+}
+
+function ensure-homebrew() {
+    echo "${COLOR_CYAN}[Ensuring HomeBrew installation]${COLOR_NC}"
+    if ! BREW=$( command -v brew ); then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install HomeBrew? (y/n)?${COLOR_NC}" &&  read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    execute "${XCODESELECT}" --install 2>/dev/null || true
+                    if ! execute "${RUBY}" -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; then
+                        echo "${COLOR_RED}Unable to install HomeBrew!${COLOR_NC}" && exit 1;
+                    else BREW=$( command -v brew ); fi
+                break;;
+                1 | false | [Nn]* ) echo "${COLOR_RED} - User aborted required HomeBrew installation.${COLOR_NC}"; exit 1;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo " - HomeBrew installation found @ ${BREW}"
+    fi
+}
+
+function ensure-scl() {
+    echo "${COLOR_CYAN}[Ensuring installation of Centos Software Collections Repository]${COLOR_NC}" # Needed for rh-python36
+    SCL=$( rpm -qa | grep -E 'centos-release-scl-[0-9].*' || true )
+    if [[ -z "${SCL}" ]]; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && read -p "${COLOR_YELLOW}Do you wish to install and enable the Centos Software Collections Repository? (y/n)?${COLOR_NC} " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) install-package centos-release-scl "--enablerepo=extras"; break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of required Centos Software Collections Repository."; exit 1;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo " - ${SCL} found."
+    fi
+}
+
+function ensure-devtoolset() {
+    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-7 with C++7]${COLOR_NC}"
+    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-7-[0-9].*' || true )
+    if [[ -z "${DEVTOOLSET}" ]]; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Not Found: Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) install-package devtoolset-7; break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-7."; break;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo " - ${DEVTOOLSET} found."
+    fi
+}
+
+function ensure-build-essential() {
+    echo "${COLOR_CYAN}[Ensuring installation of build-essential with C++7]${COLOR_NC}"
+    BUILD_ESSENTIAL=$( dpkg -s build-essential | grep 'Package: build-essential' || true )
+    if [[ -z $BUILD_ESSENTIAL ]]; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) 
+                    if install-package build-essential; then
+                        echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
+                    else
+                        echo " - ${COLOR_GREEN}Install of build-essential failed. Please try a manual install.${COLOR_NC}"
+                        exit 1
+                    fi
+                break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of build-essential."; break;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo " - ${BUILD_ESSENTIAL} found."
+    fi
+}
+
+function ensure-yum-packages() {
+    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
+    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
+    # Create temp file so we can add to it
+    cat $1 > $DEPS_FILE
+    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
+        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
+        OLDIFS="$IFS"; IFS=$''
+        _2=("$(echo $2 | sed 's/-qa /-qa\n/g')")
+        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}\n" | sed 's/-qa\\n/-qa/g' >> $DEPS_FILE; done
+    fi
+    while true; do
+        [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to update YUM repositories? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+        echo ""
+        case $PROCEED in
+            "" ) echo "What would you like to do?";;
+            0 | true | [Yy]* ) execute eval $( [[ $CURRENT_USER == "root" ]] || echo $SUDO_LOCATION -E ) $YUM -y update; break;;
+            1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
+            * ) echo "Please type 'y' for yes or 'n' for no.";;
+        esac
+    done
+    echo "${COLOR_CYAN}[Ensuring package dependencies]${COLOR_NC}"
+    OLDIFS="$IFS"; IFS=$','
+    # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
+    while read -r testee tester || [[ -n "$testee" ]]; do
+        if [[ ! -z $(eval $tester $testee) ]]; then
+            echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}"
+        else
+            DEPS=$DEPS"${testee} "
+            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found."
+            (( COUNT+=1 ))
+        fi
+    done < $DEPS_FILE
+    IFS=$OLDIFS
+    OLDIFS="$IFS"; IFS=$' '
+    echo ""
+    if [[ $COUNT > 0 ]]; then
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    for DEP in $DEPS; do
+                        install-package $DEP
+                    done
+                break;;
+                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+        echo ""
+    else
+        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
+        echo ""
+    fi
+    IFS=$OLDIFS
+}
+
+function ensure-brew-packages() {
+    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
+    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
+    # Create temp file so we can add to it
+    cat $1 > $DEPS_FILE
+    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
+        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
+        OLDIFS="$IFS"; IFS=$''
+        _2=("$(echo $2 | sed 's/-s /-s\n/g')")
+        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}\n" | sed 's/-s\\n/-s/g' >> $DEPS_FILE; done
+    fi
+    echo "${COLOR_CYAN}[Ensuring HomeBrew dependencies]${COLOR_NC}"
+    OLDIFS="$IFS"; IFS=$','
+    # || [[ -n "$nmae" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
+    while read -r name path || [[ -n "$name" ]]; do
+        if [[ -f $path ]] || [[ -d $path ]]; then
+            echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}"
+            continue
+        fi
+        # resolve conflict with homebrew glibtool and apple/gnu installs of libtool
+        if [[ "${testee}" == "/usr/local/bin/glibtool" ]]; then
+            if [ "${tester}" "/usr/local/bin/libtool" ]; then
+                echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}"
+                continue
+            fi
+        fi
+        DEPS=$DEPS"${name} "
+        echo " - ${name} ${COLOR_RED}NOT${COLOR_NC} found."
+        (( COUNT+=1 ))
+    done < $DEPS_FILE
+    if [[ $COUNT > 0 ]]; then
+        echo ""
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    execute "${XCODESELECT}" --install 2>/dev/null || true
+                    while true; do
+                        [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to update HomeBrew packages first? (y/n)${COLOR_NC}" && read -p " " PROCEED
+                        case $PROCEED in
+                            "" ) echo "What would you like to do?";;
+                            0 | true | [Yy]* ) echo "${COLOR_CYAN}[Updating HomeBrew]${COLOR_NC}" && execute brew update; break;;
+                            1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
+                            * ) echo "Please type 'y' for yes or 'n' for no.";;
+                        esac
+                    done
+                    execute brew tap eosio/eosio
+                    echo "${COLOR_CYAN}[Installing HomeBrew Dependencies]${COLOR_NC}"
+                    execute eval $BREW install $DEPS
+                    IFS="$OIFS"
+                break;;
+                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
+        echo ""
+    fi
+}
+
+function apt-update-prompt() {
+    if [[ $NAME == "Ubuntu" ]]; then
+        while true; do # APT
+            [[ $NONINTERACTIVE == false ]] && read -p "${COLOR_YELLOW}Do you wish to update APT-GET repositories before proceeding? (y/n)?${COLOR_NC} " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* ) execute-always $APTGET update; break;;
+                1 | false | [Nn]* ) echo " - Proceeding without update!"; break;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    fi
+    true
+}
+
+function ensure-apt-packages() {
+    ( [[ -z "${1}" ]] || [[ ! -f "${1}" ]] ) && echo "\$1 must be the location of your dependency file!" && exit 1
+    DEPS_FILE="${TEMP_DIR}/$(basename ${1})"
+    # Create temp file so we can add to it
+    cat $1 > $DEPS_FILE
+    if [[ ! -z "${2}" ]]; then # Handle EXTRA_DEPS passed in and add them to temp DEPS_FILE
+        printf "\n" >> $DEPS_FILE # Avoid needing a new line at the end of deps files
+        OLDIFS="$IFS"; IFS=$''
+        _2=("$(echo $2 | sed 's/-s /-s\n/g')")
+        for ((i = 0; i < ${#_2[@]}; i++)); do echo "${_2[$i]}" >> $DEPS_FILE; done
+    fi
+    echo "${COLOR_CYAN}[Ensuring package dependencies]${COLOR_NC}"
+    OLDIFS="$IFS"; IFS=$','
+    # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
+    while read -r testee tester || [[ -n "$testee" ]]; do
+        if [[ ! -z $(eval $tester $testee 2>/dev/null) ]]; then
+            echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}"
+        else
+            DEPS=$DEPS"${testee} "
+            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found."
+            (( COUNT+=1 ))
+        fi
+    done < $DEPS_FILE
+    IFS=$OLDIFS
+    OLDIFS="$IFS"; IFS=$' '
+    if [[ $COUNT > 0 ]]; then
+        echo ""
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install missing dependencies? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" ) echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                    for DEP in $DEPS; do
+                        install-package $DEP
+                    done
+                break;;
+                1 | false | [Nn]* ) echo " ${COLOR_RED}- User aborted installation of required dependencies.${COLOR_NC}"; exit;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        echo "${COLOR_GREEN} - No required package dependencies to install.${COLOR_NC}"
+        echo ""
+    fi
+    IFS=$OLDIFS
 }
\ No newline at end of file

From fe7639c72ff1aaf535bba53d9888e1cf78385159 Mon Sep 17 00:00:00 2001
From: Jeeyong Um <conr2d@gmail.com>
Date: Sun, 9 Jun 2019 02:21:58 +0900
Subject: [PATCH 0560/1648] Fix abi_serializer to encode optional non-built_in
 types

---
 libraries/chain/abi_serializer.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libraries/chain/abi_serializer.cpp b/libraries/chain/abi_serializer.cpp
index 8b91b332392..30c88c22e07 100644
--- a/libraries/chain/abi_serializer.cpp
+++ b/libraries/chain/abi_serializer.cpp
@@ -420,6 +420,12 @@ namespace eosio { namespace chain {
            _variant_to_binary(fundamental_type(rtype), var, ds, ctx);
            ++i;
          }
+      } else if( is_optional(rtype) ) {
+         char flag = !var.is_null();
+         fc::raw::pack(ds, flag);
+         if( flag ) {
+            _variant_to_binary(fundamental_type(rtype), var, ds, ctx);
+         }
       } else if( (v_itr = variants.find(rtype)) != variants.end() ) {
          ctx.hint_variant_type_if_in_array( v_itr );
          auto& v = v_itr->second;

From a80750e73862100517a6cd0a174ee3ebd0867958 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Sat, 8 Jun 2019 14:51:41 -0400
Subject: [PATCH 0561/1648] minor fix

---
 scripts/eosio_build.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index c3efb5a296e..10ef3ae1125 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -49,7 +49,7 @@ function usage() {
 
 TIME_BEGIN=$( date -u +%s )
 if [ $# -ne 0 ]; then
-   while getopts "o:s:b:i:ycdhmP" opt; do
+   while getopts "o:s:b:i:ycdhmPf" opt; do
       case "${opt}" in
          o )
             options=( "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
@@ -78,6 +78,9 @@ if [ $# -ne 0 ]; then
             NONINTERACTIVE=true
             PROCEED=true
          ;;
+         f ) 
+            echo "DEPRECATION NOTICE: -f will be removed in the next release..."
+         ;; # Needs to be removed in 1.9
          c )
             ENABLE_COVERAGE_TESTING=true
          ;;

From 86fc4724bce532a0ff5be10b8e914b4994ad2cc1 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 9 Jun 2019 16:11:48 -0400
Subject: [PATCH 0562/1648] remove stray SIGUSR1

sneaky sneaky
---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 7974f07b07a..33166a9c5cb 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1854,7 +1854,7 @@ bool producer_plugin_impl::maybe_produce_block() {
          return false;
       } FC_LOG_AND_DROP();
    } catch ( boost::interprocess::bad_alloc&) {
-      raise(SIGUSR1);
+      chain_plugin::handle_db_exhaustion();
       return false;
    }
 

From 397beb0f7298ac1e5477f22eb35ffe5715fe7d9e Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Sun, 9 Jun 2019 17:15:16 -0400
Subject: [PATCH 0563/1648] removal of testing branch

---
 pipeline.jsonc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 815117661ba..a0831f3e394 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,10 +1,4 @@
 {
-    "eosio": {
-        "pipeline-branch": "support-for-improvements"
-    },
-    "eosio-base-images": {
-        "pipeline-branch": "support-for-improvements"
-    },
     "eosio-build-unpinned": {
         "pipeline-branch": "protocol-features-sync-nodes"
     },

From d1f508843b84eee2167c9d90ac9a40367c2c017f Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Sun, 9 Jun 2019 17:20:56 -0400
Subject: [PATCH 0564/1648] removed -f

---
 scripts/eosio_build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 10ef3ae1125..c3efb5a296e 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -49,7 +49,7 @@ function usage() {
 
 TIME_BEGIN=$( date -u +%s )
 if [ $# -ne 0 ]; then
-   while getopts "o:s:b:i:ycdhmPf" opt; do
+   while getopts "o:s:b:i:ycdhmP" opt; do
       case "${opt}" in
          o )
             options=( "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
@@ -78,9 +78,6 @@ if [ $# -ne 0 ]; then
             NONINTERACTIVE=true
             PROCEED=true
          ;;
-         f ) 
-            echo "DEPRECATION NOTICE: -f will be removed in the next release..."
-         ;; # Needs to be removed in 1.9
          c )
             ENABLE_COVERAGE_TESTING=true
          ;;

From c1fb99d51e8732fcffc9c9d37e1a1429eaa72b82 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 10 Jun 2019 09:02:06 -0400
Subject: [PATCH 0565/1648] CMAKELists cleanup

---
 CMakeLists.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f852cccfe91..6511e342f4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,8 @@ project( EOSIO )
 include(CTest) # suppresses DartConfiguration.tcl error
 enable_testing()
 
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-   set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-elseif ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
-   message(WARNING "CMAKE_INSTALL_PREFIX is explicitly set to /usr/local. This is not recommended.")
+if ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
+   message(WARNING "CMAKE_INSTALL_PREFIX is set to /usr/local. This is not recommended.")
 endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")

From 92efbcb884a8ce92f35101b612547e3288633b69 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 10 Jun 2019 12:06:38 -0400
Subject: [PATCH 0566/1648] pipeline.jsonc and LOCAL_CMAKE removals

---
 pipeline.jsonc         | 5 +++++
 scripts/eosio_build.sh | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index e517ad53571..64fdaf15220 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,4 +1,9 @@
 {
+    "eosio": {
+        "environment": {
+            "IMAGE_TAG": "_1.9.0-develop"
+        }
+    },
     "eosio-build-unpinned": {
         "pipeline-branch": "protocol-features-sync-nodes"
     },
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index c3efb5a296e..e5a8857488e 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -161,14 +161,12 @@ if [[ $ARCH == "Linux" ]]; then
       *) print_supported_linux_distros_and_exit;;
    esac
    CMAKE_PREFIX_PATHS="${EOSIO_INSTALL_DIR}"
-   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='$CMAKE_PREFIX_PATHS' ${LOCAL_CMAKE_FLAGS}" 
 fi
 
 if [ "$ARCH" == "Darwin" ]; then
    # opt/gettext: cleos requires Intl, which requires gettext; it's keg only though and we don't want to force linking: https://github.com/EOSIO/eos/issues/2240#issuecomment-396309884
    # EOSIO_INSTALL_DIR/lib/cmake: mongo_db_plugin.cpp:25:10: fatal error: 'bsoncxx/builder/basic/kvp.hpp' file not found
    CMAKE_PREFIX_PATHS="/usr/local/opt/gettext;${EOSIO_INSTALL_DIR}"
-   LOCAL_CMAKE_FLAGS="-DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATHS}' ${LOCAL_CMAKE_FLAGS}" 
    FILE="${SCRIPT_DIR}/eosio_build_darwin.sh"
    OPENSSL_ROOT_DIR=/usr/local/opt/openssl
    export CMAKE=${CMAKE}

From 0a5af7c7759f118b1fc035f25c3e0696acb94cd2 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 10 Jun 2019 12:11:40 -0400
Subject: [PATCH 0567/1648] HELPER_ENABLED

---
 pipeline.jsonc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 64fdaf15220..517ead86671 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,7 +1,8 @@
 {
     "eosio": {
         "environment": {
-            "IMAGE_TAG": "_1.9.0-develop"
+            "IMAGE_TAG": "_1.9.0-develop",
+            "HELPER_ENABLED": true
         }
     },
     "eosio-build-unpinned": {

From 76c9d6ef7a43b2a4e2e23b1514739f0294f55d4b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 10 Jun 2019 12:13:53 -0400
Subject: [PATCH 0568/1648] wrong env'

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 517ead86671..2da922486f2 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,7 +1,7 @@
 {
     "eosio": {
         "environment": {
-            "IMAGE_TAG": "_1.9.0-develop",
+            "IMAGE_TAG": "1.9.0-develop",
             "HELPER_ENABLED": true
         }
     },

From c7448617d7e90ff226f2f1824769bcf96ddb7538 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Tue, 11 Jun 2019 11:00:27 +0800
Subject: [PATCH 0569/1648] let delete-all-blocks option to only remove the
 contents instead of the directory itself

---
 plugins/chain_plugin/chain_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index f4f0fe5f562..085acbd9551 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -709,7 +709,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          if( options.at( "truncate-at-block" ).as<uint32_t>() > 0 )
             wlog( "The --truncate-at-block option does not make sense when deleting all blocks." );
          clear_directory_contents( my->chain_config->state_dir );
-         fc::remove_all( my->blocks_dir );
+         clear_directory_contents( my->blocks_dir );
       } else if( options.at( "hard-replay-blockchain" ).as<bool>()) {
          ilog( "Hard replay requested: deleting state database" );
          clear_directory_contents( my->chain_config->state_dir );

From d5e087a3153bc12a42329832cb09b47c122022ea Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Tue, 11 Jun 2019 17:22:40 +0800
Subject: [PATCH 0570/1648] return zero exit status for nodeos version, help,
 fixed reversible, and extracted genesis

---
 libraries/appbase        |  2 +-
 programs/nodeos/main.cpp | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libraries/appbase b/libraries/appbase
index 21dee91e3a1..18613ba8e19 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit 21dee91e3a1dc61e28581b56011132242c40e10a
+Subproject commit 18613ba8e19a47e4dfafa389d99243e53a0ca39a
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 460dd47ad05..a0cd7bd8682 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -76,8 +76,8 @@ enum return_codes {
    SUCCESS           = 0,
    BAD_ALLOC         = 1,
    DATABASE_DIRTY    = 2,
-   FIXED_REVERSIBLE  = 3,
-   EXTRACTED_GENESIS = 4,
+   FIXED_REVERSIBLE  = SUCCESS,
+   EXTRACTED_GENESIS = SUCCESS,
    NODE_MANAGEMENT_SUCCESS = 5
 };
 
@@ -93,8 +93,12 @@ int main(int argc, char** argv)
          .default_unix_socket_path = "",
          .default_http_port = 8888
       });
-      if(!app().initialize<chain_plugin, net_plugin, producer_plugin>(argc, argv))
+      if(!app().initialize<chain_plugin, net_plugin, producer_plugin>(argc, argv)) {
+         if(app().get_options().count("help") || app().get_options().count("version")) {
+            return SUCCESS;
+         }
          return INITIALIZE_FAIL;
+      }
       initialize_logging();
       ilog("${name} version ${ver}", ("name", nodeos::config::node_executable_name)("ver", app().version_string()));
       ilog("${name} using configuration file ${c}", ("name", nodeos::config::node_executable_name)("c", app().full_config_file_path().string()));

From 2b611745e4ce662a0bedd8844e99b8cfc5f53096 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 11 Jun 2019 10:13:03 -0400
Subject: [PATCH 0571/1648] `CMakeModules/VersionUtils.cmake` quick fix

---
 CMakeModules/VersionUtils.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index bf98eec77f9..0d511ab2dfc 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -12,7 +12,7 @@ function(GENERATE_VERSION_METADATA)
          ERROR_QUIET
          OUTPUT_STRIP_TRAILING_WHITESPACE )
       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-      if(${_VERSION_DIRTY_} STREQUAL "")
+      if(_VERSION_DIRTY_ STREQUAL "")
          set(_VERSION_DIRTY_ "false")
       else()
          set(_VERSION_DIRTY_ "true")

From fe6067e3ff1b8f5fc5aeb82e2d6043e82299926f Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 11 Jun 2019 10:25:33 -0400
Subject: [PATCH 0572/1648] `CMakeModules/VersionUtils.cmake` quick fix

---
 CMakeModules/VersionUtils.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index 0d511ab2dfc..4285c2bb97b 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.5)
 function(GENERATE_VERSION_METADATA)
    find_package(Git)
    if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
@@ -12,7 +13,7 @@ function(GENERATE_VERSION_METADATA)
          ERROR_QUIET
          OUTPUT_STRIP_TRAILING_WHITESPACE )
       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-      if(_VERSION_DIRTY_ STREQUAL "")
+      if("${_VERSION_DIRTY_}" STREQUAL "")
          set(_VERSION_DIRTY_ "false")
       else()
          set(_VERSION_DIRTY_ "true")

From 4199c36ac9e73e7191bc7048775ba424002e3809 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 11 Jun 2019 10:35:30 -0400
Subject: [PATCH 0573/1648]  -d scripts check

---
 scripts/eosio_build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index e5a8857488e..335031ce777 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -108,6 +108,8 @@ if [ $# -ne 0 ]; then
    done
 fi
 
+[[ ! -d scripts ]] && echo "You must run this script from the eos root!" && exit 1
+
 # Load eosio specific helper functions
 . ./scripts/helpers/eosio.sh
 

From 78f2daaa06d9701b365f0f9122521790ab0185b1 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 11 Jun 2019 10:54:17 -0400
Subject: [PATCH 0574/1648] removed legacy rmdir

---
 tests/bash-bats/eosio_uninstall.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/bash-bats/eosio_uninstall.sh b/tests/bash-bats/eosio_uninstall.sh
index 0bb1521bb7c..b5127e83de0 100644
--- a/tests/bash-bats/eosio_uninstall.sh
+++ b/tests/bash-bats/eosio_uninstall.sh
@@ -47,8 +47,6 @@ mkdir -p $MONGODB_DATA_DIR
   ### Make sure deps are loaded properly
   [[ "${output}" =~ "Executing: rm -rf" ]] || exit
   [[ $ARCH == "Darwin" ]] && ( [[ "${output}" =~ "Executing: brew uninstall cmake --force" ]] || exit )
-  # Legacy support
-  [[ ! -z $( echo $output | grep "Executing: rmdir ${HOME}/src") ]] || exit
 }
 
 

From fc4e239c82aed70e732aa5b3e15da6aa6ef9b0e2 Mon Sep 17 00:00:00 2001
From: Jeeyong Um <conr2d@gmail.com>
Date: Wed, 12 Jun 2019 00:01:44 +0900
Subject: [PATCH 0575/1648] Enable extended_asset to be encoded from array

---
 libraries/chain/include/eosio/chain/asset.hpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/libraries/chain/include/eosio/chain/asset.hpp b/libraries/chain/include/eosio/chain/asset.hpp
index 85222652a02..f75420cbb52 100644
--- a/libraries/chain/include/eosio/chain/asset.hpp
+++ b/libraries/chain/include/eosio/chain/asset.hpp
@@ -114,5 +114,19 @@ inline void from_variant(const fc::variant& var, eosio::chain::asset& vo) {
 }
 }
 
+namespace fc {
+inline void from_variant(const fc::variant& var, eosio::chain::extended_asset& vo) {
+   if( var.is_array() ) {
+      const auto& va = var.get_array();
+      from_variant(va.at(0), vo.quantity);
+      from_variant(va.at(1), vo.contract);
+   } else {
+      const auto& vars = var.get_object();
+      from_variant(vars["quantity"], vo.quantity);
+      from_variant(vars["contract"], vo.contract);
+   }
+}
+}
+
 FC_REFLECT(eosio::chain::asset, (amount)(sym))
 FC_REFLECT(eosio::chain::extended_asset, (quantity)(contract) )

From a5999c4772db2df263519b8518285d1a608f0c9f Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 11 Jun 2019 11:19:17 -0400
Subject: [PATCH 0576/1648] Alphabetized environment variables for eosio
 pipeline

---
 pipeline.jsonc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 2da922486f2..c4725bc233b 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,8 +1,10 @@
 {
-    "eosio": {
-        "environment": {
-            "IMAGE_TAG": "1.9.0-develop",
-            "HELPER_ENABLED": true
+    "eosio":
+    {
+        "environment":
+        {
+            "HELPER_ENABLED": true,
+            "IMAGE_TAG": "1.9.0-develop"
         }
     },
     "eosio-build-unpinned": {

From 2a291af8ab71ad673614d678fa4ae666e4801e65 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 11 Jun 2019 11:27:43 -0400
Subject: [PATCH 0577/1648] yum update

---
 tests/bash-bats/eosio_uninstall.sh | 8 ++++----
 tests/bash-bats/helpers/general.sh | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/bash-bats/eosio_uninstall.sh b/tests/bash-bats/eosio_uninstall.sh
index b5127e83de0..77e4779438a 100644
--- a/tests/bash-bats/eosio_uninstall.sh
+++ b/tests/bash-bats/eosio_uninstall.sh
@@ -44,12 +44,12 @@ mkdir -p $MONGODB_DATA_DIR
 
 @test "${TEST_LABEL} > Testing executions" {
   run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
-  ### Make sure deps are loaded properly
-  [[ "${output}" =~ "Executing: rm -rf" ]] || exit
-  [[ $ARCH == "Darwin" ]] && ( [[ "${output}" =~ "Executing: brew uninstall cmake --force" ]] || exit )
+  [[ "${output[*]}" =~ "Executing: rm -rf" ]] || exit
+  if [[ $ARCH == "Darwin" ]]; then
+    [[ "${output}" =~ "Executing: brew uninstall cmake --force" ]] || exit
+  fi
 }
 
-
 @test "${TEST_LABEL} > --force" {
   run ./$SCRIPT_LOCATION --force
   # Make sure we reach the end
diff --git a/tests/bash-bats/helpers/general.sh b/tests/bash-bats/helpers/general.sh
index 44ef520367c..bd5ccaa2480 100644
--- a/tests/bash-bats/helpers/general.sh
+++ b/tests/bash-bats/helpers/general.sh
@@ -12,6 +12,8 @@ load helpers/functions
 if [[ $NAME == "Ubuntu" ]]; then # Ubuntu won't find any packages until this runs + ensure update only runs once
   [[ -z $(find /tmp/apt-updated -mmin -60 2>/dev/null) ]] && apt-get update &>/dev/null
   [[ ! -f /tmp/apt-updated ]] && touch /tmp/apt-updated
+else
+  yum -y update &>/dev/null
 fi
 
 # Ensure we're in the root directory to execute

From ca7d13e3dfbe27cbc6d3e98a76c34b3ee8973d68 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 11 Jun 2019 11:32:17 -0400
Subject: [PATCH 0578/1648] Fix eosio-lrt and eosio-build-unpinned pipelines,
 which pointed to a non-existant branch

---
 pipeline.jsonc | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index c4725bc233b..e516beedc61 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -7,11 +7,18 @@
             "IMAGE_TAG": "1.9.0-develop"
         }
     },
-    "eosio-build-unpinned": {
-        "pipeline-branch": "protocol-features-sync-nodes"
+    "eosio-build-unpinned":
+    {
+        "pipeline-branch": "master"
     },
-    "eosio-lrt": {
-        "pipeline-branch": "protocol-features-sync-nodes"
+    "eosio-lrt":
+    {
+        "pipeline-branch": "master",
+        "environment":
+        {
+            "BUILD_FLAGS": "-y -P -m",
+            "IMAGE_TAG": "_1-8-0-rc2"
+        }
     },
     "eos-multiversion-tests":
     {

From 1000fcf2804f5f9d163d4a94879f74e35e514270 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 11 Jun 2019 11:33:38 -0400
Subject: [PATCH 0579/1648] quick fix

---
 tests/bash-bats/helpers/general.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bash-bats/helpers/general.sh b/tests/bash-bats/helpers/general.sh
index bd5ccaa2480..2e9dd206bfe 100644
--- a/tests/bash-bats/helpers/general.sh
+++ b/tests/bash-bats/helpers/general.sh
@@ -13,7 +13,7 @@ if [[ $NAME == "Ubuntu" ]]; then # Ubuntu won't find any packages until this run
   [[ -z $(find /tmp/apt-updated -mmin -60 2>/dev/null) ]] && apt-get update &>/dev/null
   [[ ! -f /tmp/apt-updated ]] && touch /tmp/apt-updated
 else
-  yum -y update &>/dev/null
+  [[ $ARCH != "Darwin" ]] && yum -y update &>/dev/null
 fi
 
 # Ensure we're in the root directory to execute

From 94422ba794eb8f8f7be769d6c0f11e9a9e96dc53 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 11 Jun 2019 11:44:56 -0400
Subject: [PATCH 0580/1648] Remove pipeline configuration options which are set
 to defaults

---
 pipeline.jsonc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index e516beedc61..5466b37fa8d 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -7,13 +7,8 @@
             "IMAGE_TAG": "1.9.0-develop"
         }
     },
-    "eosio-build-unpinned":
-    {
-        "pipeline-branch": "master"
-    },
     "eosio-lrt":
     {
-        "pipeline-branch": "master",
         "environment":
         {
             "BUILD_FLAGS": "-y -P -m",

From 146cb6abf4a92b43dd30cf8eaa91752a65300464 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 11 Jun 2019 11:52:55 -0400
Subject: [PATCH 0581/1648] Polish

---
 CMakeModules/VersionUtils.cmake  | 4 +++-
 libraries/version/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index 4285c2bb97b..87990ffd99a 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(
+  VERSION 3.5 )
+
 function(GENERATE_VERSION_METADATA)
    find_package(Git)
    if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 165a004833f..704bf402ea6 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(
-  VERSION 2.8.12 ) ### What should the version actually be?
+  VERSION 3.5 )
 
 project(
   Version )

From 85597057aa175d4e16805e678848036df2a242be Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 11 Jun 2019 12:32:07 -0400
Subject: [PATCH 0582/1648] removed !

---
 scripts/eosio_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 335031ce777..3acd08e2840 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -108,7 +108,7 @@ if [ $# -ne 0 ]; then
    done
 fi
 
-[[ ! -d scripts ]] && echo "You must run this script from the eos root!" && exit 1
+[[ ! -d scripts ]] && echo "You must run this script from the eos root." && exit 1
 
 # Load eosio specific helper functions
 . ./scripts/helpers/eosio.sh

From fc19d3a5c5bdf691421c26a7e32569536768b993 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 11 Jun 2019 15:42:50 -0400
Subject: [PATCH 0583/1648] Polish

---
 CMakeModules/VersionUtils.cmake  | 62 ++++++++++++++++----------------
 libraries/version/CMakeLists.txt | 30 ++++++++--------
 2 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index 87990ffd99a..b7bde067ad6 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -1,37 +1,35 @@
 cmake_minimum_required(
   VERSION 3.5 )
 
-function(GENERATE_VERSION_METADATA)
-   find_package(Git)
-   if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
-      execute_process(
-         COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-         OUTPUT_VARIABLE _VERSION_HASH_
-         ERROR_QUIET
-         OUTPUT_STRIP_TRAILING_WHITESPACE )
-      execute_process(
-         COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
-         OUTPUT_VARIABLE _VERSION_DIRTY_
-         ERROR_QUIET
-         OUTPUT_STRIP_TRAILING_WHITESPACE )
-      string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-      if("${_VERSION_DIRTY_}" STREQUAL "")
-         set(_VERSION_DIRTY_ "false")
-      else()
-         set(_VERSION_DIRTY_ "true")
-      endif()
-      set(_VERSION_MAJOR_  ${VERSION_MAJOR}   PARENT_SCOPE)
-      set(_VERSION_MINOR_  ${VERSION_MINOR}   PARENT_SCOPE)
-      set(_VERSION_PATCH_  ${VERSION_PATCH}   PARENT_SCOPE)
-      set(_VERSION_SUFFIX_ ${VERSION_SUFFIX}  PARENT_SCOPE)
-      set(_VERSION_HASH_   ${_VERSION_HASH_}  PARENT_SCOPE)
-      set(_VERSION_DIRTY_  ${_VERSION_DIRTY_} PARENT_SCOPE)
+find_package(Git)
+if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
+   execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+      OUTPUT_VARIABLE _VERSION_HASH_
+      ERROR_QUIET
+      OUTPUT_STRIP_TRAILING_WHITESPACE )
+   execute_process(
+      COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
+      OUTPUT_VARIABLE _VERSION_DIRTY_
+      ERROR_QUIET
+      OUTPUT_STRIP_TRAILING_WHITESPACE )
+   string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+   if("${_VERSION_DIRTY_}" STREQUAL "")
+      set(_VERSION_DIRTY_ "false")
    else()
-      set(_VERSION_MAJOR_  "unknown" PARENT_SCOPE)
-      set(_VERSION_MINOR_  ""        PARENT_SCOPE)
-      set(_VERSION_PATCH_  ""        PARENT_SCOPE)
-      set(_VERSION_SUFFIX_ ""        PARENT_SCOPE)
-      set(_VERSION_HASH_   ""        PARENT_SCOPE)
-      set(_VERSION_DIRTY_  ""        PARENT_SCOPE)
+      set(_VERSION_DIRTY_ "true")
    endif()
-endfunction()
+   set(_VERSION_MAJOR_  ${VERSION_MAJOR})
+   set(_VERSION_MINOR_  ${VERSION_MINOR})
+   set(_VERSION_PATCH_  ${VERSION_PATCH})
+   set(_VERSION_SUFFIX_ ${VERSION_SUFFIX})
+   set(_VERSION_HASH_   ${_VERSION_HASH_})
+   set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
+else()
+   set(_VERSION_MAJOR_  "unknown")
+   set(_VERSION_MINOR_  "")
+   set(_VERSION_PATCH_  "")
+   set(_VERSION_SUFFIX_ "")
+   set(_VERSION_HASH_   "")
+   set(_VERSION_DIRTY_  "")
+endif()
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 704bf402ea6..5113b7b40cb 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -8,9 +8,6 @@ project(
 include(
   VersionUtils )
 
-# Generate the most up-to-date version metadata of the repository.
-GENERATE_VERSION_METADATA()
-
 # Construct the library.
 add_library(
    version
@@ -20,27 +17,28 @@ add_library(
 # Make dependencies visible.
 target_include_directories(
    version
-   PUBLIC
-   "${CMAKE_CURRENT_SOURCE_DIR}/include/"
-   PRIVATE
-   "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
+   PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/"
+   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
 
 # Install the library in the appropriate places.
 install(
-   TARGETS
-   version
-   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}   ### Is this needed? It's just a library?
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}   ### Is this needed as both a static and dynamic lib?
-   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ) ### ...
+   TARGETS version
+   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} )
 
 # Install the header file in the appropriate place.
 install(
-   DIRECTORY
-   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
-   DESTINATION
-   ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
+   DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
+   DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
    FILES_MATCHING PATTERN "*.hpp" )
 
+# Generate the most up-to-date version metadata of the repository.
+add_custom_command(
+   TARGET version
+   PRE_BUILD
+   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake)
+
 # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
 configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/src/version_impl.cpp.in

From d09c8a6580c3642b5540cfb71190d4f90f5fcc08 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 11 Jun 2019 16:05:37 -0400
Subject: [PATCH 0584/1648] Polish

---
 libraries/version/CMakeLists.txt | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 5113b7b40cb..6d999f34856 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -2,7 +2,10 @@ cmake_minimum_required(
   VERSION 3.5 )
 
 project(
-  Version )
+   Version
+   VERSION      0.0.0.1
+   DESCRIPTION  "This library determines the current version in which the target was built"
+   HOMEPAGE_URL "https://eos.io/" )
 
 # Found in directory `eos/CMakeModules/`.
 include(
@@ -17,7 +20,7 @@ add_library(
 # Make dependencies visible.
 target_include_directories(
    version
-   PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/"
+   PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
 
 # Install the library in the appropriate places.
@@ -29,15 +32,19 @@ install(
 
 # Install the header file in the appropriate place.
 install(
-   DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
+   DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
    DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
    FILES_MATCHING PATTERN "*.hpp" )
 
-# Generate the most up-to-date version metadata of the repository.
-add_custom_command(
-   TARGET version
-   PRE_BUILD
-   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake)
+# Generate the most up-to-date version metadata of the repository on every build.
+add_custom_target(
+   on_every_build
+   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake )
+
+# ...
+add_dependencies(
+   version
+   on_every_build )
 
 # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
 configure_file(

From dc11207f5ce43544bae737584fe2625e394b5fb3 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 11 Jun 2019 16:35:57 -0400
Subject: [PATCH 0585/1648] Enabled helpers for unpinned builds.

---
 pipeline.jsonc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 5466b37fa8d..9837d0babd1 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -7,6 +7,13 @@
             "IMAGE_TAG": "1.9.0-develop"
         }
     },
+    "eosio-build-unpinned":
+    {
+        "environment":
+        {
+            "HELPER_ENABLED": true
+        }
+    },
     "eosio-lrt":
     {
         "environment":

From 8ed7ab38d8a76dcb94ca9c46888890c4de8faa42 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 11 Jun 2019 16:46:52 -0400
Subject: [PATCH 0586/1648] Polish

---
 libraries/version/CMakeLists.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 6d999f34856..819f6526beb 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -23,6 +23,16 @@ target_include_directories(
    PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
 
+# Generate the most up-to-date version metadata of the repository on every build.
+add_custom_target(
+   on_every_build
+   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake )
+
+# ...
+add_dependencies(
+   version
+   on_every_build )
+
 # Install the library in the appropriate places.
 install(
    TARGETS version
@@ -36,16 +46,6 @@ install(
    DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
    FILES_MATCHING PATTERN "*.hpp" )
 
-# Generate the most up-to-date version metadata of the repository on every build.
-add_custom_target(
-   on_every_build
-   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake )
-
-# ...
-add_dependencies(
-   version
-   on_every_build )
-
 # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
 configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/src/version_impl.cpp.in

From 384f2c1a97580e0847692c23ddcc2b220e2c3525 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 11 Jun 2019 17:03:27 -0400
Subject: [PATCH 0587/1648] Polish

---
 libraries/version/CMakeLists.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 819f6526beb..0c60dcd6e02 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -2,10 +2,7 @@ cmake_minimum_required(
   VERSION 3.5 )
 
 project(
-   Version
-   VERSION      0.0.0.1
-   DESCRIPTION  "This library determines the current version in which the target was built"
-   HOMEPAGE_URL "https://eos.io/" )
+   Version )
 
 # Found in directory `eos/CMakeModules/`.
 include(

From 969699f58bcac54e0cedb3bbb1e26771b09d8ef7 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 11 Jun 2019 17:19:02 -0400
Subject: [PATCH 0588/1648] Polish

---
 libraries/version/CMakeLists.txt | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 0c60dcd6e02..01c52736ed3 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -20,15 +20,19 @@ target_include_directories(
    PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
 
-# Generate the most up-to-date version metadata of the repository on every build.
-add_custom_target(
-   on_every_build
-   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake )
-
-# ...
-add_dependencies(
-   version
-   on_every_build )
+add_custom_target( on_every_build ALL
+   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
+   COMMENT "generating........................" VERBATIM)
+
+# # Generate the most up-to-date version metadata of the repository on every build.
+# add_custom_target(
+#    on_every_build
+#    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake )
+
+# # ...
+# add_dependencies(
+#    version
+#    on_every_build )
 
 # Install the library in the appropriate places.
 install(

From 3f2097f37433130919aa5c6dfed747ccb3082d20 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 12 Jun 2019 15:24:17 -0500
Subject: [PATCH 0589/1648] Remove const so move actually moves

---
 libraries/chain/controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 83d18ffb01a..25a6a4118ad 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -167,7 +167,7 @@ struct pending_state {
       return _block_stage.get<completed_block>()._block_state->block->transactions;
    }
 
-   vector<transaction_metadata_ptr> extract_trx_metas()const {
+   vector<transaction_metadata_ptr> extract_trx_metas() {
       if( _block_stage.contains<building_block>() )
          return std::move( _block_stage.get<building_block>()._pending_trx_metas );
 

From b02a023d5817ecb0c458a88a3f75e868870fa3b7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 12 Jun 2019 15:31:04 -0500
Subject: [PATCH 0590/1648] Add aborted after forked transactions to queue

---
 libraries/testing/tester.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index d1601d4baf0..9a5b2c9d471 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -225,14 +225,15 @@ namespace eosio { namespace testing {
 
    vector<transaction_metadata_ptr> base_tester::push_block(signed_block_ptr b) {
       auto bs = control->create_block_state_future(b);
-      vector<transaction_metadata_ptr> trxs;
-      trxs = control->abort_block();
+      vector<transaction_metadata_ptr> aborted_trxs = control->abort_block();
       branch_type forked_branch = control->push_block(bs);
-      // branch is in reverse order
+      // forked branch is in reverse order
+      vector<transaction_metadata_ptr> trxs;
       for( auto ritr = forked_branch.rbegin(), end = forked_branch.rend(); ritr != end; ++ritr ) {
          trxs.insert( trxs.end(), (*ritr)->trxs.begin(), (*ritr)->trxs.end() );
       }
-
+      // aborted added after forked branch
+      trxs.insert( trxs.end(), aborted_trxs.begin(), aborted_trxs.end() );
       auto itr = last_produced_block.find(b->producer);
       if (itr == last_produced_block.end() || block_header::num_from_id(b->id()) > block_header::num_from_id(itr->second)) {
          last_produced_block[b->producer] = b->id();

From bcaba024c6f06c5dd70649c6c8d74fe963974ada Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Wed, 12 Jun 2019 16:49:16 -0400
Subject: [PATCH 0591/1648] Continuation; committing in case future reference
 needed

---
 CMakeModules/VersionUtils.cmake           |  91 +++++++-----
 libraries/version/CMakeLists.txt          | 167 +++++++++++++++++-----
 libraries/version/src/version_impl.cpp.in |   2 +-
 3 files changed, 193 insertions(+), 67 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index b7bde067ad6..51043f02259 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -1,35 +1,58 @@
-cmake_minimum_required(
-  VERSION 3.5 )
+# cmake_minimum_required(
+#   VERSION 3.5 )
 
-find_package(Git)
-if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
-   execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-      OUTPUT_VARIABLE _VERSION_HASH_
-      ERROR_QUIET
-      OUTPUT_STRIP_TRAILING_WHITESPACE )
-   execute_process(
-      COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
-      OUTPUT_VARIABLE _VERSION_DIRTY_
-      ERROR_QUIET
-      OUTPUT_STRIP_TRAILING_WHITESPACE )
-   string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-   if("${_VERSION_DIRTY_}" STREQUAL "")
-      set(_VERSION_DIRTY_ "false")
-   else()
-      set(_VERSION_DIRTY_ "true")
-   endif()
-   set(_VERSION_MAJOR_  ${VERSION_MAJOR})
-   set(_VERSION_MINOR_  ${VERSION_MINOR})
-   set(_VERSION_PATCH_  ${VERSION_PATCH})
-   set(_VERSION_SUFFIX_ ${VERSION_SUFFIX})
-   set(_VERSION_HASH_   ${_VERSION_HASH_})
-   set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
-else()
-   set(_VERSION_MAJOR_  "unknown")
-   set(_VERSION_MINOR_  "")
-   set(_VERSION_PATCH_  "")
-   set(_VERSION_SUFFIX_ "")
-   set(_VERSION_HASH_   "")
-   set(_VERSION_DIRTY_  "")
-endif()
+# find_package(Git)
+# function(GENERATE_VERSION_METADATA)
+   # message(STATUS "---------------------VersionUtils before if----------------------------------")
+   # find_package(Git)
+   # message(STATUS ${GIT_FOUND})
+   # message(STATUS ${CMAKE_SOURCE_DIR})
+   # if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
+   message(STATUS ${_CMAKE_SOURCE_DIR_})
+   message(STATUS ${_CMAKE_CURRENT_SOURCE_DIR_})
+      message(STATUS "-----------------VersionUtils in if----------------------------------")
+      execute_process(
+         COMMAND ${_GIT_EXECUTABLE_} rev-parse HEAD
+         OUTPUT_VARIABLE _VERSION_HASH_
+         ERROR_QUIET
+         OUTPUT_STRIP_TRAILING_WHITESPACE )
+      execute_process(
+         COMMAND ${_GIT_EXECUTABLE_} describe --tags --dirty
+         OUTPUT_VARIABLE _VERSION_DIRTY_
+         ERROR_QUIET
+         OUTPUT_STRIP_TRAILING_WHITESPACE )
+       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+       
+       message(STATUS "--------------------")
+       message(STATUS ${_VERSION_MAJOR_})
+       message(STATUS "--------------------")
+       message(STATUS ${_VERSION_MINOR_})
+       message(STATUS "--------------------")
+       message(STATUS ${_VERSION_PATCH_})
+       message(STATUS "--------------------")
+       message(STATUS ${_VERSION_SUFFIX_})
+       message(STATUS "--------------------")
+       message(STATUS ${_VERSION_HASH_})
+       message(STATUS "--------------------")
+       message(STATUS ${_VERSION_DIRTY_})
+      if("${_VERSION_DIRTY_}" STREQUAL "")
+         set(_VERSION_TEMP_ "false" CACHE STRING "Current dirty state of repository" FORCE)
+      else()
+         set(_VERSION_TEMP_ "true" CACHE STRING "Current dirty state of repository" FORCE)
+      endif()
+      # set(_VERSION_MAJOR_  ${VERSION_MAJOR})
+      # set(_VERSION_MINOR_  ${VERSION_MINOR})
+      # set(_VERSION_PATCH_  ${VERSION_PATCH})
+      # set(_VERSION_SUFFIX_ ${VERSION_SUFFIX})
+      # set(_VERSION_HASH_   ${_VERSION_HASH_})
+      # set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
+   # else()
+   #    set(_VERSION_MAJOR_  "unknown")
+   #    set(_VERSION_MINOR_  "")
+   #    set(_VERSION_PATCH_  "")
+   #    set(_VERSION_SUFFIX_ "")
+   #    set(_VERSION_HASH_   "")
+   #    set(_VERSION_DIRTY_  "")
+   # endif()
+   message(STATUS "--------------VersionUtils after if----------------------------------") 
+# endfunction(GENERATE_VERSION_METADATA)
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 01c52736ed3..b0646757174 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -1,54 +1,157 @@
-cmake_minimum_required(
+cmake_minimum_required( 
   VERSION 3.5 )
 
 project(
-   Version )
+  Version )
 
-# Found in directory `eos/CMakeModules/`.
-include(
-  VersionUtils )
+# # The function which grabs the appropriate values for the repository version.
+# function(GENERATE_VERSION_METADATA)
+#    if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
+#       execute_process(
+#          COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+#          OUTPUT_VARIABLE _VERSION_HASH_
+#          ERROR_QUIET
+#          OUTPUT_STRIP_TRAILING_WHITESPACE )
+#       execute_process(
+#          COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
+#          OUTPUT_VARIABLE _VERSION_DIRTY_
+#          ERROR_QUIET
+#          OUTPUT_STRIP_TRAILING_WHITESPACE )
+#       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+#       if("${_VERSION_DIRTY_}" STREQUAL "")
+#          set(_VERSION_DIRTY_ "false")
+#       else()
+#          set(_VERSION_DIRTY_ "true")
+#       endif()
+#       set(_VERSION_MAJOR_  ${VERSION_MAJOR})
+#       set(_VERSION_MINOR_  ${VERSION_MINOR})
+#       set(_VERSION_PATCH_  ${VERSION_PATCH})
+#       set(_VERSION_SUFFIX_ ${VERSION_SUFFIX})
+#       set(_VERSION_HASH_   ${_VERSION_HASH_})
+#       set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
+#    else()
+#       set(_VERSION_MAJOR_  "unknown")
+#       set(_VERSION_MINOR_  "")
+#       set(_VERSION_PATCH_  "")
+#       set(_VERSION_SUFFIX_ "")
+#       set(_VERSION_HASH_   "")
+#       set(_VERSION_DIRTY_  "")
+#    endif()
+# endfunction(GENERATE_VERSION_METADATA)
+
+set(_VERSION_MAJOR_  "unknown" CACHE STRING "Current major version of repository")
+set(_VERSION_MINOR_  ""        CACHE STRING "Current minor version of repository")
+set(_VERSION_PATCH_  ""        CACHE STRING "Current patch version of repository")
+set(_VERSION_SUFFIX_ ""        CACHE STRING "Current suffiex of repository")
+set(_VERSION_HASH_   ""        CACHE STRING "Current hash of repository")
+set(_VERSION_DIRTY_  ""        CACHE STRING "Current dirty state of repository")
 
 # Construct the library.
 add_library(
-   version
-   "${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp"
-   "${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp" )
+  version
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp"
+  "${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp" )
 
 # Make dependencies visible.
 target_include_directories(
-   version
-   PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
-   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
+  version
+  PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
+
+# This one runs everytime; save
+# Create a custom target to be run upon every build.
+message(STATUS ${CMAKE_SOURCE_DIR})
+message(STATUS ${CMAKE_CURRENT_SOURCE_DIR})
+find_package(Git)
+if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND ${GIT_FOUND})
+  add_custom_target(
+    evaluate_every_build ALL
+    COMMAND ${CMAKE_COMMAND} -D_GIT_EXECUTABLE_=${GIT_EXECUTABLE}
+                             -D_CMAKE_SOURCE_DIR_="VAR1"
+                             -D_CMAKE_CURRENT_SOURCE_DIR_="VAR2"
+                             -D_CMAKE_BINARY_DIR_=${CMAKE_BINARY_DIR}
+                             -D_CMAKE_CURRENT_BINARY_DIR_=${CMAKE_CURRENT_BINARY_DIR}
+                             -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
+    COMMENT "***********************Updating version metadata...**********************" VERBATIM )
+  # string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+  # if("${_VERSION_DIRTY_}" STREQUAL "")
+  #   set(_VERSION_DIRTY_ "false")
+  # else()
+  #   set(_VERSION_DIRTY_ "true")
+  # endif()
+  # set(_VERSION_MAJOR_  ${VERSION_MAJOR}   CACHE STRING "Current major version of repository")
+  # set(_VERSION_MINOR_  ${VERSION_MINOR}   CACHE STRING "Current minor version of repository")
+  # set(_VERSION_PATCH_  ${VERSION_PATCH}   CACHE STRING "Current patch version of repository")
+  # set(_VERSION_SUFFIX_ ${VERSION_SUFFIX}  CACHE STRING "Current suffiex of repository")
+  # set(_VERSION_HASH_   ${_VERSION_HASH_}  CACHE STRING "Current hash of repository")
+  # set(_VERSION_DIRTY_  ${_VERSION_DIRTY_} CACHE STRING "Current dirty state of repository")
+  message(STATUS "--------------------")
+  message(STATUS ${_VERSION_MAJOR_})
+  message(STATUS "--------------------")
+  message(STATUS ${_VERSION_MINOR_})
+  message(STATUS "--------------------")
+  message(STATUS ${_VERSION_PATCH_})
+  message(STATUS "--------------------")
+  message(STATUS ${_VERSION_SUFFIX_})
+  message(STATUS "--------------------")
+  message(STATUS ${_VERSION_HASH_})
+  message(STATUS "--------------------")
+  message(STATUS ${_VERSION_DIRTY_})
+endif()
 
-add_custom_target( on_every_build ALL
-   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
-   COMMENT "generating........................" VERBATIM)
+# This one runs everytime; save
+# Create a custom target to be run upon every build.
+# find_package(Git)
+# if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND ${GIT_FOUND})
+#   add_custom_target( evaluate_every_build ALL
+#     COMMAND ${CMAKE_COMMAND} -E ${GIT_EXECUTABLE} --version
+#     COMMENT "generating........................" VERBATIM )
+#   string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+#   if("${_VERSION_DIRTY_}" STREQUAL "")
+#     set(_VERSION_DIRTY_ "false")
+#   else()
+#     set(_VERSION_DIRTY_ "true")
+#   endif()
+#   set(_VERSION_MAJOR_  ${VERSION_MAJOR}   CACHE STRING "Current major version of repository")
+#   set(_VERSION_MINOR_  ${VERSION_MINOR}   CACHE STRING "Current minor version of repository")
+#   set(_VERSION_PATCH_  ${VERSION_PATCH}   CACHE STRING "Current patch version of repository")
+#   set(_VERSION_SUFFIX_ ${VERSION_SUFFIX}  CACHE STRING "Current suffiex of repository")
+#   set(_VERSION_HASH_   ${_VERSION_HASH_}  CACHE STRING "Current hash of repository")
+#   set(_VERSION_DIRTY_  ${_VERSION_DIRTY_} CACHE STRING "Current dirty state of repository")
+# endif()
 
-# # Generate the most up-to-date version metadata of the repository on every build.
-# add_custom_target(
-#    on_every_build
-#    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake )
+# # Create a custom target to be run upon every build.
+# add_custom_target( evaluate_every_build ALL
+#    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
+#    COMMENT "generating........................" VERBATIM)
 
-# # ...
-# add_dependencies(
-#    version
-#    on_every_build )
+# message(STATUS "BEFORE*******************")
+# # Create a custom target to be run upon every build.
+# find_package(Git)
+# if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
+#   message(STATUS "IN*******************")
+#   add_custom_target( evaluate_every_build ALL
+#     COMMAND 
+#   COMMENT "generating........................" VERBATIM)
+# message(STATUS "AFTER*******************")
+# endif()
+# message(STATUS "AFTER IF*******************")
 
 # Install the library in the appropriate places.
 install(
-   TARGETS version
-   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
-   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} )
+  TARGETS version
+  RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} )
 
 # Install the header file in the appropriate place.
 install(
-   DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
-   DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
-   FILES_MATCHING PATTERN "*.hpp" )
+  DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
+  DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
+  FILES_MATCHING PATTERN "*.hpp" )
 
 # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
 configure_file(
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/version_impl.cpp.in
-   ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp
-   @ONLY )
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/version_impl.cpp.in
+  ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp
+  @ONLY )
diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 5d73457a7f4..6dba04e8b64 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -29,7 +29,7 @@ namespace eosio { namespace version {
                                        '.' + version_patch  +
                                        '-' + version_suffix +
                                        '-' + version_hash   +
-                                       '-' + ((version_dirty == true) ? ("true") : ("false"))};
+                                       ((version_dirty == true) ? ("-dirty") : (""))};
       return version;
    }
 

From 3b8ba53a8fa8e86fd0f0f12c19d375a278e25ea2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 12 Jun 2019 16:19:02 -0500
Subject: [PATCH 0592/1648] Change order to forked, aborted, subjective failed

---
 .../unapplied_transaction_queue.hpp           | 63 ++++++++++---------
 tests/producer_plugin_tests.cpp               | 14 ++---
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
index 0f5ae09de88..9d0b8db0a84 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
@@ -13,29 +13,41 @@
 namespace eosio {
 
 /**
- * Track unapplied transactions for aborted blocks, forked blocks, and subjectively
+ * Track unapplied transactions for forked blocks, aborted blocks, and subjectively
  * failed transactions.
  */
 class unapplied_transaction_queue {
-   std::deque<std::vector<chain::transaction_metadata_ptr>> aborted_block_trxs;
-   size_t current_trx_in_trxs = 0;
    std::deque<chain::branch_type> forked_branches;
    size_t current_trx_in_block = 0;
+   std::deque<std::vector<chain::transaction_metadata_ptr>> aborted_block_trxs;
+   size_t current_trx_in_trxs = 0;
    std::deque<chain::transaction_metadata_ptr> subjective_failed_trxs;
+
 public:
 
    bool empty() const {
-      return aborted_block_trxs.empty() && forked_branches.empty() && subjective_failed_trxs.empty();
+      return forked_branches.empty() && aborted_block_trxs.empty() && subjective_failed_trxs.empty();
+   }
+
+   size_t size() const {
+      return forked_branches.size() + aborted_block_trxs.size() + subjective_failed_trxs.size();
    }
 
    void clear() {
-      aborted_block_trxs.clear();
-      current_trx_in_trxs = 0;
       forked_branches.clear();
       current_trx_in_block = 0;
+      aborted_block_trxs.clear();
+      current_trx_in_trxs = 0;
       subjective_failed_trxs.clear();
    }
 
+   void add_forked( chain::branch_type forked_branch ) {
+      if( forked_branch.empty() ) return;
+      // forked_branch is in reverse order
+      // fifo queue for branches so pop back
+      forked_branches.emplace_front( std::move( forked_branch ) );
+   }
+
    void add_aborted( std::vector<chain::transaction_metadata_ptr> aborted_trxs ) {
       if( aborted_trxs.empty() ) return;
       // fifo queue so pop back
@@ -47,32 +59,10 @@ class unapplied_transaction_queue {
       subjective_failed_trxs.emplace_front( std::move( trx ) );
    }
 
-   void add_forked( chain::branch_type forked_branch ) {
-      if( forked_branch.empty() ) return;
-      // forked_branch is in reverse order
-      // fifo queue for branches so pop back
-      forked_branches.emplace_front( std::move( forked_branch ) );
-   }
-
-   /// Order returned: aborted block transactions, subjectively failed, forked
+   /// Order returned: forked block transactions, aborted block transactions, subjectively failed
    /// FIFO within each category
    /// @return nullptr if no next
    chain::transaction_metadata_ptr next() {
-      if( !aborted_block_trxs.empty() ) {
-         std::vector<chain::transaction_metadata_ptr>& p = aborted_block_trxs.back();
-         chain::transaction_metadata_ptr n = p[current_trx_in_trxs];
-         ++current_trx_in_trxs;
-         if( current_trx_in_trxs >= p.size() ) {
-            current_trx_in_trxs = 0;
-            aborted_block_trxs.pop_back();
-         }
-         return n;
-      }
-      if( !subjective_failed_trxs.empty() ) {
-         chain::transaction_metadata_ptr n = subjective_failed_trxs.back();
-         subjective_failed_trxs.pop_back();
-         return n;
-      }
       while( !forked_branches.empty() ) {
          chain::branch_type& branch = forked_branches.back();
          if( branch.empty() ) {
@@ -101,6 +91,21 @@ class unapplied_transaction_queue {
             return n;
          }
       }
+      if( !aborted_block_trxs.empty() ) {
+         std::vector<chain::transaction_metadata_ptr>& p = aborted_block_trxs.back();
+         chain::transaction_metadata_ptr n = p[current_trx_in_trxs];
+         ++current_trx_in_trxs;
+         if( current_trx_in_trxs >= p.size() ) {
+            current_trx_in_trxs = 0;
+            aborted_block_trxs.pop_back();
+         }
+         return n;
+      }
+      if( !subjective_failed_trxs.empty() ) {
+         chain::transaction_metadata_ptr n = subjective_failed_trxs.back();
+         subjective_failed_trxs.pop_back();
+         return n;
+      }
       return {};
    }
 
diff --git a/tests/producer_plugin_tests.cpp b/tests/producer_plugin_tests.cpp
index 7e09f25b9a2..9c57b6ae816 100644
--- a/tests/producer_plugin_tests.cpp
+++ b/tests/producer_plugin_tests.cpp
@@ -143,19 +143,13 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    auto trx18 = unique_trx_meta_data();
    auto trx19 = unique_trx_meta_data();
 
-   // altogether, order fifo: aborted, subjectively failed, forked
+   // altogether, order fifo: forked, aborted, subjectively failed
    q.add_forked( { bs3, bs2, bs1 } );
    q.add_subjective_failure( trx7 );
    q.add_aborted( { trx9, trx11 } );
    q.add_subjective_failure( trx8 );
    q.add_aborted( { trx12, trx13 } );
    q.add_forked( { bs4, bs3, bs2, bs1 } );
-   BOOST_REQUIRE( q.next() == trx9 );
-   BOOST_REQUIRE( q.next() == trx11 );
-   BOOST_REQUIRE( q.next() == trx12 );
-   BOOST_REQUIRE( q.next() == trx13 );
-   BOOST_REQUIRE( q.next() == trx7 );
-   BOOST_REQUIRE( q.next() == trx8 );
    BOOST_REQUIRE( q.next() == trx1 );
    BOOST_REQUIRE( q.next() == trx2 );
    BOOST_REQUIRE_EQUAL( q.next(), trx3 );
@@ -169,6 +163,12 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( q.next() == trx5 );
    BOOST_REQUIRE( q.next() == trx6 );
    BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( q.next() == trx9 );
+   BOOST_REQUIRE( q.next() == trx11 );
+   BOOST_REQUIRE( q.next() == trx12 );
+   BOOST_REQUIRE( q.next() == trx13 );
+   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( q.next() == trx8 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
 

From d9c24cdd2687933fae25382d5375df1a40cffde3 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Wed, 12 Jun 2019 17:47:16 -0400
Subject: [PATCH 0593/1648] Continuation; committing in case future reference
 needed

---
 CMakeModules/VersionUtils.cmake  | 142 ++++++++++++++++++------------
 libraries/version/CMakeLists.txt | 146 ++++++-------------------------
 2 files changed, 110 insertions(+), 178 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index 51043f02259..7c3845f4cbc 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -1,58 +1,86 @@
-# cmake_minimum_required(
-#   VERSION 3.5 )
+cmake_minimum_required(
+  VERSION 3.5 )
 
-# find_package(Git)
-# function(GENERATE_VERSION_METADATA)
-   # message(STATUS "---------------------VersionUtils before if----------------------------------")
-   # find_package(Git)
-   # message(STATUS ${GIT_FOUND})
-   # message(STATUS ${CMAKE_SOURCE_DIR})
-   # if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
-   message(STATUS ${_CMAKE_SOURCE_DIR_})
-   message(STATUS ${_CMAKE_CURRENT_SOURCE_DIR_})
-      message(STATUS "-----------------VersionUtils in if----------------------------------")
-      execute_process(
-         COMMAND ${_GIT_EXECUTABLE_} rev-parse HEAD
-         OUTPUT_VARIABLE _VERSION_HASH_
-         ERROR_QUIET
-         OUTPUT_STRIP_TRAILING_WHITESPACE )
-      execute_process(
-         COMMAND ${_GIT_EXECUTABLE_} describe --tags --dirty
-         OUTPUT_VARIABLE _VERSION_DIRTY_
-         ERROR_QUIET
-         OUTPUT_STRIP_TRAILING_WHITESPACE )
-       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-       
-       message(STATUS "--------------------")
-       message(STATUS ${_VERSION_MAJOR_})
-       message(STATUS "--------------------")
-       message(STATUS ${_VERSION_MINOR_})
-       message(STATUS "--------------------")
-       message(STATUS ${_VERSION_PATCH_})
-       message(STATUS "--------------------")
-       message(STATUS ${_VERSION_SUFFIX_})
-       message(STATUS "--------------------")
-       message(STATUS ${_VERSION_HASH_})
-       message(STATUS "--------------------")
-       message(STATUS ${_VERSION_DIRTY_})
-      if("${_VERSION_DIRTY_}" STREQUAL "")
-         set(_VERSION_TEMP_ "false" CACHE STRING "Current dirty state of repository" FORCE)
-      else()
-         set(_VERSION_TEMP_ "true" CACHE STRING "Current dirty state of repository" FORCE)
-      endif()
-      # set(_VERSION_MAJOR_  ${VERSION_MAJOR})
-      # set(_VERSION_MINOR_  ${VERSION_MINOR})
-      # set(_VERSION_PATCH_  ${VERSION_PATCH})
-      # set(_VERSION_SUFFIX_ ${VERSION_SUFFIX})
-      # set(_VERSION_HASH_   ${_VERSION_HASH_})
-      # set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
-   # else()
-   #    set(_VERSION_MAJOR_  "unknown")
-   #    set(_VERSION_MINOR_  "")
-   #    set(_VERSION_PATCH_  "")
-   #    set(_VERSION_SUFFIX_ "")
-   #    set(_VERSION_HASH_   "")
-   #    set(_VERSION_DIRTY_  "")
-   # endif()
-   message(STATUS "--------------VersionUtils after if----------------------------------") 
-# endfunction(GENERATE_VERSION_METADATA)
+function(GENERATE_VERSION_METADATA)
+   # Execute `git` to grab the corresponding data.
+   message(STATUS "*********************************")
+   message(STATUS ${CMAKE_CURRENT_SOURCE_DIR})
+   message(STATUS "*********************************")
+   message(STATUS ${ROOT_DIR})
+   message(STATUS "*********************************")
+   message(STATUS ${GIT_EXEC})
+   message(STATUS "*********************************")
+   message(STATUS ${LIB_BIN_DIR})
+   message(STATUS "*********************************")
+   message(STATUS ${LIB_CUR_DIR})
+   message(STATUS "*********************************")
+   message(STATUS ${V_MAJOR})
+   message(STATUS "*********************************")
+   message(STATUS ${V_MINOR})
+   message(STATUS "*********************************")
+   message(STATUS ${V_PATCH})
+   message(STATUS "*********************************")
+   message(STATUS ${V_SUFFIX})
+   message(STATUS "*********************************")
+   execute_process(
+      COMMAND ${GIT_EXEC} rev-parse HEAD
+      WORKING_DIRECTORY ${ROOT_DIR}
+      OUTPUT_VARIABLE _VERSION_HASH_
+      ERROR_QUIET
+      OUTPUT_STRIP_TRAILING_WHITESPACE )
+   execute_process(
+      COMMAND ${GIT_EXEC} describe --tags --dirty
+      WORKING_DIRECTORY ${ROOT_DIR}
+      OUTPUT_VARIABLE _VERSION_DIRTY_
+      ERROR_QUIET
+      OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+   message(STATUS "*********************************")
+   message(STATUS ${_VERSION_HASH_})
+   message(STATUS "*********************************")
+   message(STATUS ${_VERSION_DIRTY_})
+   message(STATUS "*********************************")
+    
+   string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+    
+   if("${_VERSION_DIRTY_}" STREQUAL "")
+      set(_VERSION_DIRTY_ "false")
+   else()
+      set(_VERSION_DIRTY_ "true")
+   endif()
+
+   # message(STATUS "*********************************")
+   # message(STATUS ${V_MAJOR})
+   # message(STATUS "*********************************")
+   # message(STATUS ${V_MINOR})
+   # message(STATUS "*********************************")
+   # message(STATUS ${V_PATCH})
+   # message(STATUS "*********************************")
+   # message(STATUS ${V_SUFFIX})
+   # message(STATUS "*********************************")
+    
+   set(_VERSION_MAJOR_  ${V_MAJOR})
+   set(_VERSION_MINOR_  ${V_MINOR})
+   set(_VERSION_PATCH_  ${V_PATCH})
+   set(_VERSION_SUFFIX_ ${V_SUFFIX})
+   set(_VERSION_HASH_   ${_VERSION_HASH_})
+   set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
+
+   # message(STATUS "*********************************")
+   # message(STATUS ${_VERSION_MAJOR_})
+   # message(STATUS "*********************************")
+   # message(STATUS ${_VERSION_MINOR_})
+   # message(STATUS "*********************************")
+   # message(STATUS ${_VERSION_PATCH_})
+   # message(STATUS "*********************************")
+   # message(STATUS ${_VERSION_SUFFIX_})
+   # message(STATUS "*********************************")
+    
+   # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
+   configure_file(
+      ${LIB_CUR_DIR}/src/version_impl.cpp.in
+      ${LIB_BIN_DIR}/src/version_impl.cpp
+      @ONLY )
+endfunction(GENERATE_VERSION_METADATA)
+
+GENERATE_VERSION_METADATA()
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index b0646757174..7034e714067 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -4,47 +4,13 @@ cmake_minimum_required(
 project(
   Version )
 
-# # The function which grabs the appropriate values for the repository version.
-# function(GENERATE_VERSION_METADATA)
-#    if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
-#       execute_process(
-#          COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-#          OUTPUT_VARIABLE _VERSION_HASH_
-#          ERROR_QUIET
-#          OUTPUT_STRIP_TRAILING_WHITESPACE )
-#       execute_process(
-#          COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
-#          OUTPUT_VARIABLE _VERSION_DIRTY_
-#          ERROR_QUIET
-#          OUTPUT_STRIP_TRAILING_WHITESPACE )
-#       string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-#       if("${_VERSION_DIRTY_}" STREQUAL "")
-#          set(_VERSION_DIRTY_ "false")
-#       else()
-#          set(_VERSION_DIRTY_ "true")
-#       endif()
-#       set(_VERSION_MAJOR_  ${VERSION_MAJOR})
-#       set(_VERSION_MINOR_  ${VERSION_MINOR})
-#       set(_VERSION_PATCH_  ${VERSION_PATCH})
-#       set(_VERSION_SUFFIX_ ${VERSION_SUFFIX})
-#       set(_VERSION_HASH_   ${_VERSION_HASH_})
-#       set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
-#    else()
-#       set(_VERSION_MAJOR_  "unknown")
-#       set(_VERSION_MINOR_  "")
-#       set(_VERSION_PATCH_  "")
-#       set(_VERSION_SUFFIX_ "")
-#       set(_VERSION_HASH_   "")
-#       set(_VERSION_DIRTY_  "")
-#    endif()
-# endfunction(GENERATE_VERSION_METADATA)
-
-set(_VERSION_MAJOR_  "unknown" CACHE STRING "Current major version of repository")
-set(_VERSION_MINOR_  ""        CACHE STRING "Current minor version of repository")
-set(_VERSION_PATCH_  ""        CACHE STRING "Current patch version of repository")
-set(_VERSION_SUFFIX_ ""        CACHE STRING "Current suffiex of repository")
-set(_VERSION_HASH_   ""        CACHE STRING "Current hash of repository")
-set(_VERSION_DIRTY_  ""        CACHE STRING "Current dirty state of repository")
+# Define the default version metadata in case `git` cannot be found.
+set(_VERSION_MAJOR_  "unknown")
+set(_VERSION_MINOR_  "")
+set(_VERSION_PATCH_  "")
+set(_VERSION_SUFFIX_ "")
+set(_VERSION_HASH_   "")
+set(_VERSION_DIRTY_  "")
 
 # Construct the library.
 add_library(
@@ -58,85 +24,29 @@ target_include_directories(
   PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
 
-# This one runs everytime; save
 # Create a custom target to be run upon every build.
-message(STATUS ${CMAKE_SOURCE_DIR})
-message(STATUS ${CMAKE_CURRENT_SOURCE_DIR})
 find_package(Git)
 if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND ${GIT_FOUND})
-  add_custom_target(
-    evaluate_every_build ALL
-    COMMAND ${CMAKE_COMMAND} -D_GIT_EXECUTABLE_=${GIT_EXECUTABLE}
-                             -D_CMAKE_SOURCE_DIR_="VAR1"
-                             -D_CMAKE_CURRENT_SOURCE_DIR_="VAR2"
-                             -D_CMAKE_BINARY_DIR_=${CMAKE_BINARY_DIR}
-                             -D_CMAKE_CURRENT_BINARY_DIR_=${CMAKE_CURRENT_BINARY_DIR}
-                             -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
-    COMMENT "***********************Updating version metadata...**********************" VERBATIM )
-  # string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-  # if("${_VERSION_DIRTY_}" STREQUAL "")
-  #   set(_VERSION_DIRTY_ "false")
-  # else()
-  #   set(_VERSION_DIRTY_ "true")
-  # endif()
-  # set(_VERSION_MAJOR_  ${VERSION_MAJOR}   CACHE STRING "Current major version of repository")
-  # set(_VERSION_MINOR_  ${VERSION_MINOR}   CACHE STRING "Current minor version of repository")
-  # set(_VERSION_PATCH_  ${VERSION_PATCH}   CACHE STRING "Current patch version of repository")
-  # set(_VERSION_SUFFIX_ ${VERSION_SUFFIX}  CACHE STRING "Current suffiex of repository")
-  # set(_VERSION_HASH_   ${_VERSION_HASH_}  CACHE STRING "Current hash of repository")
-  # set(_VERSION_DIRTY_  ${_VERSION_DIRTY_} CACHE STRING "Current dirty state of repository")
-  message(STATUS "--------------------")
-  message(STATUS ${_VERSION_MAJOR_})
-  message(STATUS "--------------------")
-  message(STATUS ${_VERSION_MINOR_})
-  message(STATUS "--------------------")
-  message(STATUS ${_VERSION_PATCH_})
-  message(STATUS "--------------------")
-  message(STATUS ${_VERSION_SUFFIX_})
-  message(STATUS "--------------------")
-  message(STATUS ${_VERSION_HASH_})
-  message(STATUS "--------------------")
-  message(STATUS ${_VERSION_DIRTY_})
+   add_custom_target(
+      evaluate_every_build ALL
+      COMMAND ${CMAKE_COMMAND} -DGIT_EXEC=${GIT_EXECUTABLE}
+                               -DLIB_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
+                               -DLIB_CUR_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+                               -DROOT_DIR=${CMAKE_SOURCE_DIR}
+			       -DV_MAJOR=${VERSION_MAJOR}
+			       -DV_MINOR=${VERSION_MINOR}
+			       -DV_PATCH=${VERSION_PATCH}
+			       -DV_SUFFIX=${VERSION_SUFFIX}
+                               -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
+      COMMENT "Updating version metadata.." VERBATIM )
+else()
+   # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
+   configure_file(
+      ${CMAKE_CURRENT_SOURCE_DIR}/src/version_impl.cpp.in
+      ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp
+      @ONLY )
 endif()
 
-# This one runs everytime; save
-# Create a custom target to be run upon every build.
-# find_package(Git)
-# if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND ${GIT_FOUND})
-#   add_custom_target( evaluate_every_build ALL
-#     COMMAND ${CMAKE_COMMAND} -E ${GIT_EXECUTABLE} --version
-#     COMMENT "generating........................" VERBATIM )
-#   string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-#   if("${_VERSION_DIRTY_}" STREQUAL "")
-#     set(_VERSION_DIRTY_ "false")
-#   else()
-#     set(_VERSION_DIRTY_ "true")
-#   endif()
-#   set(_VERSION_MAJOR_  ${VERSION_MAJOR}   CACHE STRING "Current major version of repository")
-#   set(_VERSION_MINOR_  ${VERSION_MINOR}   CACHE STRING "Current minor version of repository")
-#   set(_VERSION_PATCH_  ${VERSION_PATCH}   CACHE STRING "Current patch version of repository")
-#   set(_VERSION_SUFFIX_ ${VERSION_SUFFIX}  CACHE STRING "Current suffiex of repository")
-#   set(_VERSION_HASH_   ${_VERSION_HASH_}  CACHE STRING "Current hash of repository")
-#   set(_VERSION_DIRTY_  ${_VERSION_DIRTY_} CACHE STRING "Current dirty state of repository")
-# endif()
-
-# # Create a custom target to be run upon every build.
-# add_custom_target( evaluate_every_build ALL
-#    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
-#    COMMENT "generating........................" VERBATIM)
-
-# message(STATUS "BEFORE*******************")
-# # Create a custom target to be run upon every build.
-# find_package(Git)
-# if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GIT_FOUND)
-#   message(STATUS "IN*******************")
-#   add_custom_target( evaluate_every_build ALL
-#     COMMAND 
-#   COMMENT "generating........................" VERBATIM)
-# message(STATUS "AFTER*******************")
-# endif()
-# message(STATUS "AFTER IF*******************")
-
 # Install the library in the appropriate places.
 install(
   TARGETS version
@@ -149,9 +59,3 @@ install(
   DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
   DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
   FILES_MATCHING PATTERN "*.hpp" )
-
-# Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/version_impl.cpp.in
-  ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp
-  @ONLY )

From 8e196a425e33b5d92697556a1b0b7d8f36c19c53 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 12 Jun 2019 17:23:25 -0500
Subject: [PATCH 0594/1648] Add total size tracking

---
 .../unapplied_transaction_queue.hpp           | 16 ++++-
 tests/producer_plugin_tests.cpp               | 67 +++++++++++++++++++
 2 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
index 9d0b8db0a84..a7765c72999 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
@@ -22,7 +22,7 @@ class unapplied_transaction_queue {
    std::deque<std::vector<chain::transaction_metadata_ptr>> aborted_block_trxs;
    size_t current_trx_in_trxs = 0;
    std::deque<chain::transaction_metadata_ptr> subjective_failed_trxs;
-
+   size_t total_size;
 public:
 
    bool empty() const {
@@ -30,7 +30,7 @@ class unapplied_transaction_queue {
    }
 
    size_t size() const {
-      return forked_branches.size() + aborted_block_trxs.size() + subjective_failed_trxs.size();
+      return total_size;
    }
 
    void clear() {
@@ -39,24 +39,33 @@ class unapplied_transaction_queue {
       aborted_block_trxs.clear();
       current_trx_in_trxs = 0;
       subjective_failed_trxs.clear();
+      total_size = 0;
    }
 
    void add_forked( chain::branch_type forked_branch ) {
       if( forked_branch.empty() ) return;
       // forked_branch is in reverse order
       // fifo queue for branches so pop back
+      size_t size = 0;
+      for( const auto& bptr : forked_branch ) {
+         size += bptr->trxs.size();
+      }
       forked_branches.emplace_front( std::move( forked_branch ) );
+      total_size += size;
    }
 
    void add_aborted( std::vector<chain::transaction_metadata_ptr> aborted_trxs ) {
       if( aborted_trxs.empty() ) return;
       // fifo queue so pop back
+      size_t size = aborted_trxs.size();
       aborted_block_trxs.emplace_front( std::move( aborted_trxs ) );
+      total_size += size;
    }
 
    void add_subjective_failure( chain::transaction_metadata_ptr trx ) {
       // fifo queue so pop back
       subjective_failed_trxs.emplace_front( std::move( trx ) );
+      ++total_size;
    }
 
    /// Order returned: forked block transactions, aborted block transactions, subjectively failed
@@ -88,6 +97,7 @@ class unapplied_transaction_queue {
                   forked_branches.pop_back();
                }
             }
+            --total_size;
             return n;
          }
       }
@@ -99,11 +109,13 @@ class unapplied_transaction_queue {
             current_trx_in_trxs = 0;
             aborted_block_trxs.pop_back();
          }
+         --total_size;
          return n;
       }
       if( !subjective_failed_trxs.empty() ) {
          chain::transaction_metadata_ptr n = subjective_failed_trxs.back();
          subjective_failed_trxs.pop_back();
+         --total_size;
          return n;
       }
       return {};
diff --git a/tests/producer_plugin_tests.cpp b/tests/producer_plugin_tests.cpp
index 9c57b6ae816..8dbd7674b8f 100644
--- a/tests/producer_plugin_tests.cpp
+++ b/tests/producer_plugin_tests.cpp
@@ -27,6 +27,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
 
    unapplied_transaction_queue q;
    BOOST_CHECK( q.empty() );
+   BOOST_CHECK( q.size() == 0 );
 
    auto trx1 = unique_trx_meta_data();
    auto trx2 = unique_trx_meta_data();
@@ -44,7 +45,9 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
 
    // 1 subjective failure
    q.add_subjective_failure( trx1 );
+   BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
@@ -53,17 +56,25 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.add_subjective_failure( trx1 );
    q.add_subjective_failure( trx2 );
    q.add_subjective_failure( trx3 );
+   BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 2 );
    BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
 
    // fifo aborted
    q.add_aborted( { trx1, trx2, trx3 } );
+   BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 2 );
    BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
 
@@ -72,13 +83,21 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.add_aborted( { trx1, trx2, trx3 } );
    q.add_aborted( { trx4, trx5 } );
    q.add_subjective_failure( trx7 );
+   BOOST_CHECK( q.size() == 7 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_CHECK( q.size() == 5 );
    BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_CHECK( q.size() == 4 );
    BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_CHECK( q.size() == 2 );
    BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
 
@@ -90,12 +109,19 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    auto bs3 = std::make_shared<block_state>();
    bs3->trxs = { trx6 };
    q.add_forked( { bs3, bs2, bs1 } );
+   BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 5 );
    BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_CHECK( q.size() == 4 );
    BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_CHECK( q.size() == 2 );
    BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
 
@@ -105,17 +131,29 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.add_forked( { bs3, bs2, bs1 } );
    q.add_forked( { bs4 } );
    q.add_forked( { bs3, bs2 } );
+   BOOST_CHECK( q.size() == 11 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 10 );
    BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_CHECK( q.size() == 9 );
    BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_CHECK( q.size() == 8 );
    BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_CHECK( q.size() == 7 );
    BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_CHECK( q.size() == 5 );
    BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_CHECK( q.size() == 4 );
    BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_CHECK( q.size() == 2 );
    BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
 
@@ -123,13 +161,21 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.add_forked( { bs1 } );
    q.add_forked( { bs3, bs2 } );
    q.add_forked( { bs4 } );
+   BOOST_CHECK( q.size() == 7 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_CHECK( q.size() == 5 );
    BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_CHECK( q.size() == 4 );
    BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_CHECK( q.size() == 2 );
    BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
 
@@ -150,25 +196,45 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.add_subjective_failure( trx8 );
    q.add_aborted( { trx12, trx13 } );
    q.add_forked( { bs4, bs3, bs2, bs1 } );
+   BOOST_CHECK( q.size() == 19 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 18 );
    BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_CHECK( q.size() == 17 );
    BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_CHECK( q.size() == 16 );
    BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_CHECK( q.size() == 15 );
    BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_CHECK( q.size() == 14 );
    BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_CHECK( q.size() == 13 );
    BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_CHECK( q.size() == 12 );
    BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_CHECK( q.size() == 11 );
    BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_CHECK( q.size() == 10 );
    BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_CHECK( q.size() == 9 );
    BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_CHECK( q.size() == 8 );
    BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_CHECK( q.size() == 7 );
    BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( q.next() == trx9 );
+   BOOST_CHECK( q.size() == 5 );
    BOOST_REQUIRE( q.next() == trx11 );
+   BOOST_CHECK( q.size() == 4 );
    BOOST_REQUIRE( q.next() == trx12 );
+   BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( q.next() == trx13 );
+   BOOST_CHECK( q.size() == 2 );
    BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( q.next() == trx8 );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
    BOOST_CHECK( q.empty() );
 
@@ -177,6 +243,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.add_subjective_failure( trx8 );
    q.clear();
    BOOST_CHECK( q.empty() );
+   BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( q.next() == nullptr );
 
 } FC_LOG_AND_RETHROW() /// unapplied_transaction_queue_test

From 92d9c88e4d1cefc3394d2537a67751bb058bcb60 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Wed, 12 Jun 2019 19:06:46 -0400
Subject: [PATCH 0595/1648] Working on my machine when pre-built

---
 CMakeModules/VersionUtils.cmake  | 48 +-------------------------------
 libraries/version/CMakeLists.txt |  7 ++---
 2 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index 7c3845f4cbc..19d1f1dc5c9 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -1,27 +1,7 @@
-cmake_minimum_required(
-  VERSION 3.5 )
+cmake_minimum_required(VERSION 3.5)
 
 function(GENERATE_VERSION_METADATA)
    # Execute `git` to grab the corresponding data.
-   message(STATUS "*********************************")
-   message(STATUS ${CMAKE_CURRENT_SOURCE_DIR})
-   message(STATUS "*********************************")
-   message(STATUS ${ROOT_DIR})
-   message(STATUS "*********************************")
-   message(STATUS ${GIT_EXEC})
-   message(STATUS "*********************************")
-   message(STATUS ${LIB_BIN_DIR})
-   message(STATUS "*********************************")
-   message(STATUS ${LIB_CUR_DIR})
-   message(STATUS "*********************************")
-   message(STATUS ${V_MAJOR})
-   message(STATUS "*********************************")
-   message(STATUS ${V_MINOR})
-   message(STATUS "*********************************")
-   message(STATUS ${V_PATCH})
-   message(STATUS "*********************************")
-   message(STATUS ${V_SUFFIX})
-   message(STATUS "*********************************")
    execute_process(
       COMMAND ${GIT_EXEC} rev-parse HEAD
       WORKING_DIRECTORY ${ROOT_DIR}
@@ -34,12 +14,6 @@ function(GENERATE_VERSION_METADATA)
       OUTPUT_VARIABLE _VERSION_DIRTY_
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE )
-
-   message(STATUS "*********************************")
-   message(STATUS ${_VERSION_HASH_})
-   message(STATUS "*********************************")
-   message(STATUS ${_VERSION_DIRTY_})
-   message(STATUS "*********************************")
     
    string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
     
@@ -48,16 +22,6 @@ function(GENERATE_VERSION_METADATA)
    else()
       set(_VERSION_DIRTY_ "true")
    endif()
-
-   # message(STATUS "*********************************")
-   # message(STATUS ${V_MAJOR})
-   # message(STATUS "*********************************")
-   # message(STATUS ${V_MINOR})
-   # message(STATUS "*********************************")
-   # message(STATUS ${V_PATCH})
-   # message(STATUS "*********************************")
-   # message(STATUS ${V_SUFFIX})
-   # message(STATUS "*********************************")
     
    set(_VERSION_MAJOR_  ${V_MAJOR})
    set(_VERSION_MINOR_  ${V_MINOR})
@@ -65,16 +29,6 @@ function(GENERATE_VERSION_METADATA)
    set(_VERSION_SUFFIX_ ${V_SUFFIX})
    set(_VERSION_HASH_   ${_VERSION_HASH_})
    set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
-
-   # message(STATUS "*********************************")
-   # message(STATUS ${_VERSION_MAJOR_})
-   # message(STATUS "*********************************")
-   # message(STATUS ${_VERSION_MINOR_})
-   # message(STATUS "*********************************")
-   # message(STATUS ${_VERSION_PATCH_})
-   # message(STATUS "*********************************")
-   # message(STATUS ${_VERSION_SUFFIX_})
-   # message(STATUS "*********************************")
     
    # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
    configure_file(
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 7034e714067..e14a42b18b2 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -1,8 +1,5 @@
-cmake_minimum_required( 
-  VERSION 3.5 )
-
-project(
-  Version )
+cmake_minimum_required(VERSION 3.5)
+project(Version)
 
 # Define the default version metadata in case `git` cannot be found.
 set(_VERSION_MAJOR_  "unknown")

From 89667267d3c06afb1c868f3a5b7a153ef3315713 Mon Sep 17 00:00:00 2001
From: Jeeyong Um <conr2d@gmail.com>
Date: Thu, 13 Jun 2019 12:17:42 +0900
Subject: [PATCH 0596/1648] Add unit test for encoding optional non-built_in
 types

---
 unittests/abi_tests.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/unittests/abi_tests.cpp b/unittests/abi_tests.cpp
index d1cdfd92834..4e4e3103e50 100644
--- a/unittests/abi_tests.cpp
+++ b/unittests/abi_tests.cpp
@@ -2771,4 +2771,24 @@ BOOST_AUTO_TEST_CASE(abi_deserialize_detailed_error_messages)
    } FC_LOG_AND_RETHROW()
 }
 
+BOOST_AUTO_TEST_CASE(serialize_optional_struct_type)
+{
+   auto abi = R"({
+      "version": "eosio::abi/1.0",
+      "structs": [
+         {"name": "s", "base": "", "fields": [
+            {"name": "i0", "type": "int8"}
+         ]},
+      ],
+   })";
+
+   try {
+      abi_serializer abis( fc::json::from_string(abi).as<abi_def>(), max_serialization_time );
+
+      verify_round_trip_conversion(abis, "s?", R"({"i0":5})", "0105");
+      verify_round_trip_conversion(abis, "s?", R"(null)", "00");
+
+   } FC_LOG_AND_RETHROW()
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 181e65445f71e2bac9a1aff141de2ada2e1e6e43 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 08:24:42 -0500
Subject: [PATCH 0597/1648] Move unapplied_transaction_queue to eosio chain
 library

---
 .../eosio/chain}/unapplied_transaction_queue.hpp       |  4 ++--
 plugins/producer_plugin/producer_plugin.cpp            | 10 ++++------
 tests/CMakeLists.txt                                   |  3 +--
 .../unapplied_transaction_queue_tests.cpp              |  4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)
 rename {plugins/producer_plugin/include/eosio/producer_plugin => libraries/chain/include/eosio/chain}/unapplied_transaction_queue.hpp (98%)
 rename tests/producer_plugin_tests.cpp => unittests/unapplied_transaction_queue_tests.cpp (98%)

diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
similarity index 98%
rename from plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
rename to libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index a7765c72999..a59d0656127 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -10,7 +10,7 @@
 
 #include <queue>
 
-namespace eosio {
+namespace eosio { namespace chain {
 
 /**
  * Track unapplied transactions for forked blocks, aborted blocks, and subjectively
@@ -123,4 +123,4 @@ class unapplied_transaction_queue {
 
 };
 
-} //eosio
+} } //eosio::chain
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 2bd2ff7ab91..b7ddd99b6fd 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -3,13 +3,13 @@
  *  @copyright defined in eos/LICENSE
  */
 #include <eosio/producer_plugin/producer_plugin.hpp>
-#include <eosio/producer_plugin/unapplied_transaction_queue.hpp>
 #include <eosio/chain/plugin_interface.hpp>
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
+#include <eosio/chain/snapshot.hpp>
 #include <eosio/chain/transaction_object.hpp>
 #include <eosio/chain/thread_utils.hpp>
-#include <eosio/chain/snapshot.hpp>
+#include <eosio/chain/unapplied_transaction_queue.hpp>
 
 #include <fc/io/json.hpp>
 #include <fc/log/logger_config.hpp>
@@ -374,8 +374,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          auto bsf = chain.create_block_state_future( block );
 
          // abort the pending block
-         vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
-         _unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
+         _unapplied_transactions.add_aborted( chain.abort_block() );
 
          // exceptions throw out, make sure we restart our loop
          auto ensure = fc::make_scoped_exit([this](){
@@ -385,8 +384,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          // push the new block
          bool except = false;
          try {
-            branch_type forked_branch = chain.push_block( bsf );
-            _unapplied_transactions.add_forked( std::move( forked_branch ) );
+            _unapplied_transactions.add_forked( chain.push_block( bsf ) );
          } catch ( const guard_exception& e ) {
             chain_plug->handle_guard_exception(e);
             return;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 657f9860c1a..a70dea4c1be 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,8 +10,7 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-include_directories( "${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include"
-                     "${CMAKE_SOURCE_DIR}/plugins/producer_plugin/include" )
+include_directories( "${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include" )
 
 file(GLOB UNIT_TESTS "*.cpp")
 
diff --git a/tests/producer_plugin_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
similarity index 98%
rename from tests/producer_plugin_tests.cpp
rename to unittests/unapplied_transaction_queue_tests.cpp
index 8dbd7674b8f..02b7f0ce643 100644
--- a/tests/producer_plugin_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -3,13 +3,13 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #include <boost/test/unit_test.hpp>
-#include <eosio/producer_plugin/unapplied_transaction_queue.hpp>
+#include <eosio/chain/unapplied_transaction_queue.hpp>
 #include <eosio/chain/contract_types.hpp>
 
 using namespace eosio;
 using namespace eosio::chain;
 
-BOOST_AUTO_TEST_SUITE(producer_plugin_tests)
+BOOST_AUTO_TEST_SUITE(unapplied_transaction_queue_tests)
 
 auto unique_trx_meta_data() {
 

From 91195314640387ad2cc04d9bd28a9f418ca73aa5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 08:38:19 -0500
Subject: [PATCH 0598/1648] Add trxs to queue in order they will be processed

---
 plugins/producer_plugin/producer_plugin.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index b7ddd99b6fd..39b940cb15c 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -374,10 +374,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          auto bsf = chain.create_block_state_future( block );
 
          // abort the pending block
-         _unapplied_transactions.add_aborted( chain.abort_block() );
+         vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
 
          // exceptions throw out, make sure we restart our loop
-         auto ensure = fc::make_scoped_exit([this](){
+         auto ensure = fc::make_scoped_exit([this, &aborted_trxs](){
+            _unapplied_transactions.add_aborted( aborted_trxs );
             schedule_production_loop();
          });
 

From c084b4465b9ace98d1a0d91e817e5eceeb3caa04 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 08:47:12 -0500
Subject: [PATCH 0599/1648] Simplify abort_block addition to queue

---
 plugins/producer_plugin/producer_plugin.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 39b940cb15c..d1d9a32fcd8 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -934,8 +934,7 @@ void producer_plugin::resume() {
    //
    if (my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
-      my->_unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
+      my->_unapplied_transactions.add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 }
@@ -974,8 +973,7 @@ void producer_plugin::update_runtime_options(const runtime_options& options) {
 
    if (check_speculating && my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
-      my->_unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
+      my->_unapplied_transactions.add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 
@@ -1051,8 +1049,7 @@ producer_plugin::integrity_hash_information producer_plugin::get_integrity_hash(
 
    if (chain.is_building_block()) {
       // abort the pending block
-      vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
-      my->_unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
+      my->_unapplied_transactions.add_aborted( chain.abort_block() );
    } else {
       reschedule.cancel();
    }
@@ -1081,8 +1078,7 @@ void producer_plugin::create_snapshot(producer_plugin::next_function<producer_pl
 
       if (chain.is_building_block()) {
          // abort the pending block
-         vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
-         my->_unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
+         my->_unapplied_transactions.add_aborted( chain.abort_block() );
       } else {
          reschedule.cancel();
       }
@@ -1411,8 +1407,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          }
       }
 
-      vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
-      _unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
+      _unapplied_transactions.add_aborted( chain.abort_block() );
 
       auto features_to_activate = chain.get_preactivated_protocol_features();
       if( _pending_block_mode == pending_block_mode::producing && _protocol_features_to_activate.size() > 0 ) {
@@ -1857,8 +1852,7 @@ bool producer_plugin_impl::maybe_produce_block() {
 
    fc_dlog(_log, "Aborting block due to produce_block error");
    chain::controller& chain = chain_plug->chain();
-   vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
-   _unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
+   _unapplied_transactions.add_aborted( chain.abort_block() );
    return false;
 }
 

From 2f7223ef2d097e00a9f603d2001417d8aca657e3 Mon Sep 17 00:00:00 2001
From: Olexiy Buyanskyy <olexiyb@gmail.com>
Date: Thu, 13 Jun 2019 16:58:43 +0300
Subject: [PATCH 0600/1648] properly add single quotes for parameter with
 spaces. Useful for --nodeos parameter.

Example:

programs/eosio-launcher/eosio-launcher -p 4 -n 4 -d 1 -i 2019-06-13T13:14:13.031 -f --producers 84 --unstarted-nodes 0 --nodeos '--max-transaction-time -1 --abi-serializer-max-time-ms 990000 --filter-on "*" --p2p-max-nodes-per-host 4 --contracts-console --plugin eosio::producer_api_plugin' --max-block-cpu-usage 160000000 --max-transaction-cpu-usage 150000000 --shape mesh
---
 tests/Cluster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Cluster.py b/tests/Cluster.py
index 1ba4b64d749..8ca632e02e5 100644
--- a/tests/Cluster.py
+++ b/tests/Cluster.py
@@ -384,7 +384,7 @@ def connectGroup(group, producerNodes, bridgeNodes) :
 
         Cluster.__LauncherCmdArr = cmdArr.copy()
 
-        s=" ".join(cmdArr)
+        s=" ".join([("'{0}'".format(element) if (' ' in element) else element) for element in cmdArr.copy()])
         if Utils.Debug: Utils.Print("cmd: %s" % (s))
         if 0 != subprocess.call(cmdArr):
             Utils.Print("ERROR: Launcher failed to launch. failed cmd: %s" % (s))

From bc7379599dcde31c093608b5ada13128497199db Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 13 Jun 2019 11:05:59 -0400
Subject: [PATCH 0601/1648] Fully functional

---
 CMakeModules/VersionUtils.cmake  | 13 ++++++++-----
 libraries/version/CMakeLists.txt | 16 +++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index 19d1f1dc5c9..de027cf28f5 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -14,27 +14,30 @@ function(GENERATE_VERSION_METADATA)
       OUTPUT_VARIABLE _VERSION_DIRTY_
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE )
-    
+
+   # ...
    string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
-    
+
+   # ...
    if("${_VERSION_DIRTY_}" STREQUAL "")
       set(_VERSION_DIRTY_ "false")
    else()
       set(_VERSION_DIRTY_ "true")
    endif()
-    
+
+   # ...
    set(_VERSION_MAJOR_  ${V_MAJOR})
    set(_VERSION_MINOR_  ${V_MINOR})
    set(_VERSION_PATCH_  ${V_PATCH})
    set(_VERSION_SUFFIX_ ${V_SUFFIX})
    set(_VERSION_HASH_   ${_VERSION_HASH_})
    set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
-    
+   
    # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
    configure_file(
       ${LIB_CUR_DIR}/src/version_impl.cpp.in
       ${LIB_BIN_DIR}/src/version_impl.cpp
       @ONLY )
 endfunction(GENERATE_VERSION_METADATA)
-
+  
 GENERATE_VERSION_METADATA()
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index e14a42b18b2..00d1732585a 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -13,7 +13,7 @@ set(_VERSION_DIRTY_  "")
 add_library(
   version
   "${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp" )
+  "${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp")
 
 # Make dependencies visible.
 target_include_directories(
@@ -30,10 +30,10 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND ${GIT_FOUND})
                                -DLIB_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
                                -DLIB_CUR_DIR=${CMAKE_CURRENT_SOURCE_DIR}
                                -DROOT_DIR=${CMAKE_SOURCE_DIR}
-			       -DV_MAJOR=${VERSION_MAJOR}
-			       -DV_MINOR=${VERSION_MINOR}
-			       -DV_PATCH=${VERSION_PATCH}
-			       -DV_SUFFIX=${VERSION_SUFFIX}
+                               -DV_MAJOR=${VERSION_MAJOR}
+                               -DV_MINOR=${VERSION_MINOR}
+                               -DV_PATCH=${VERSION_PATCH}
+                               -DV_SUFFIX=${VERSION_SUFFIX}
                                -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
       COMMENT "Updating version metadata.." VERBATIM )
 else()
@@ -44,6 +44,12 @@ else()
       @ONLY )
 endif()
 
+# ...
+set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp PROPERTY GENERATED 1)
+
+# ...
+add_dependencies(version evaluate_every_build)
+
 # Install the library in the appropriate places.
 install(
   TARGETS version

From e0bb088e75d7807bcb507ad695f142e14db4e8d1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 10:15:43 -0500
Subject: [PATCH 0602/1648] Init total_size

---
 .../chain/include/eosio/chain/unapplied_transaction_queue.hpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index a59d0656127..5fa035e0ea9 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -22,7 +22,7 @@ class unapplied_transaction_queue {
    std::deque<std::vector<chain::transaction_metadata_ptr>> aborted_block_trxs;
    size_t current_trx_in_trxs = 0;
    std::deque<chain::transaction_metadata_ptr> subjective_failed_trxs;
-   size_t total_size;
+   size_t total_size = 0;
 public:
 
    bool empty() const {

From c20b862ed15e6892a7cf404d4b2c9d3b2033fd1d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 10:16:51 -0500
Subject: [PATCH 0603/1648] Add unapplied_transaction_queue to tester

---
 .../testing/include/eosio/testing/tester.hpp    |  6 +++++-
 libraries/testing/tester.cpp                    | 17 +++++------------
 unittests/forked_tests.cpp                      | 12 +++++-------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index afd8b628b56..894839d1721 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -4,6 +4,7 @@
 #include <eosio/chain/contract_table_objects.hpp>
 #include <eosio/chain/account_object.hpp>
 #include <eosio/chain/abi_serializer.hpp>
+#include <eosio/chain/unapplied_transaction_queue.hpp>
 #include <fc/io/json.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/tuple/tuple_io.hpp>
@@ -112,7 +113,7 @@ namespace eosio { namespace testing {
          void                 produce_blocks_for_n_rounds(const uint32_t num_of_rounds = 1);
          // Produce minimal number of blocks as possible to spend the given time without having any producer become inactive
          void                 produce_min_num_of_blocks_to_spend_time_wo_inactive_prod(const fc::microseconds target_elapsed_time = fc::microseconds());
-         vector<transaction_metadata_ptr>  push_block(signed_block_ptr b);
+         void                 push_block(signed_block_ptr b);
 
          /**
           * These transaction IDs represent transactions available in the head chain state as scheduled
@@ -124,6 +125,7 @@ namespace eosio { namespace testing {
           * @return
           */
          vector<transaction_id_type> get_scheduled_transactions() const;
+         unapplied_transaction_queue& get_unapplied_transaction_queue() { return unapplied_transactions; }
 
          transaction_trace_ptr    push_transaction( packed_transaction& trx, fc::time_point deadline = fc::time_point::maximum(), uint32_t billed_cpu_time_us = DEFAULT_BILLED_CPU_TIME_US );
          transaction_trace_ptr    push_transaction( signed_transaction& trx, fc::time_point deadline = fc::time_point::maximum(), uint32_t billed_cpu_time_us = DEFAULT_BILLED_CPU_TIME_US, bool no_throw = false );
@@ -316,6 +318,8 @@ namespace eosio { namespace testing {
          controller::config                            cfg;
          map<transaction_id_type, transaction_receipt> chain_transactions;
          map<account_name, block_id_type>              last_produced_block;
+         unapplied_transaction_queue                   unapplied_transactions;
+
       public:
          vector<digest_type>                           protocol_features_to_be_activated_wo_preactivation;
    };
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 9a5b2c9d471..6972814d5e6 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -223,24 +223,17 @@ namespace eosio { namespace testing {
       });
    }
 
-   vector<transaction_metadata_ptr> base_tester::push_block(signed_block_ptr b) {
+   void base_tester::push_block(signed_block_ptr b) {
       auto bs = control->create_block_state_future(b);
       vector<transaction_metadata_ptr> aborted_trxs = control->abort_block();
-      branch_type forked_branch = control->push_block(bs);
-      // forked branch is in reverse order
-      vector<transaction_metadata_ptr> trxs;
-      for( auto ritr = forked_branch.rbegin(), end = forked_branch.rend(); ritr != end; ++ritr ) {
-         trxs.insert( trxs.end(), (*ritr)->trxs.begin(), (*ritr)->trxs.end() );
-      }
-      // aborted added after forked branch
-      trxs.insert( trxs.end(), aborted_trxs.begin(), aborted_trxs.end() );
+      unapplied_transactions.add_forked( control->push_block( bs ) );
+      unapplied_transactions.add_aborted( aborted_trxs );
+
       auto itr = last_produced_block.find(b->producer);
       if (itr == last_produced_block.end() || block_header::num_from_id(b->id()) > block_header::num_from_id(itr->second)) {
          last_produced_block[b->producer] = b->id();
       }
-
-      return trxs;
-}
+   }
 
    signed_block_ptr base_tester::_produce_block( fc::microseconds skip_time, bool skip_pending_trxs) {
       auto head = control->head_block_state();
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 1bb000f0d5c..a0ec9e10009 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -642,18 +642,16 @@ BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
 
    // dan on chain 1 now gets all of the blocks from chain 2 which should cause fork switch
    wlog( "push c2 blocks to c1" );
-   vector<transaction_metadata_ptr> trxs;
    for( uint32_t start = fork_block_num + 1, end = c2.control->head_block_num(); start <= end; ++start ) {
       auto fb = c2.control->fetch_block_by_number( start );
-      vector<transaction_metadata_ptr> push_block_trxs = c.push_block( fb );
-      trxs.insert( trxs.end(), push_block_trxs.begin(), push_block_trxs.end() );
+      c.push_block( fb );
    }
 
    // verify transaction on fork is reported by push_block in order
-   BOOST_REQUIRE_EQUAL( 3, trxs.size() );
-   BOOST_REQUIRE_EQUAL( trace1->id, trxs.at(0)->id() );
-   BOOST_REQUIRE_EQUAL( trace2->id, trxs.at(1)->id() );
-   BOOST_REQUIRE_EQUAL( trace3->id, trxs.at(2)->id() );
+   BOOST_REQUIRE_EQUAL( 3, c.get_unapplied_transaction_queue().size() );
+   BOOST_REQUIRE_EQUAL( trace1->id, c.get_unapplied_transaction_queue().next()->id() );
+   BOOST_REQUIRE_EQUAL( trace2->id, c.get_unapplied_transaction_queue().next()->id() );
+   BOOST_REQUIRE_EQUAL( trace3->id, c.get_unapplied_transaction_queue().next()->id() );
 
 } FC_LOG_AND_RETHROW()
 

From 49d32ce7d8ee3dc45182d6525703b451c7043473 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 13 Jun 2019 11:30:18 -0400
Subject: [PATCH 0604/1648] pipeline.jsonc

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 9837d0babd1..125db19d9f0 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -4,7 +4,7 @@
         "environment":
         {
             "HELPER_ENABLED": true,
-            "IMAGE_TAG": "1.9.0-develop"
+            "IMAGE_TAG_VERSION": "v2"
         }
     },
     "eosio-build-unpinned":

From ab81dee0d559a8f4e11f36270832a05ebbe86dcf Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 13 Jun 2019 11:31:15 -0400
Subject: [PATCH 0605/1648] fixes

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 125db19d9f0..4baf794b846 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -4,7 +4,7 @@
         "environment":
         {
             "HELPER_ENABLED": true,
-            "IMAGE_TAG_VERSION": "v2"
+            "IMAGE_TAG_VERSION": "v1"
         }
     },
     "eosio-build-unpinned":

From cccfb5cd4a1d98b8b4392c2969713bd13b9eee8b Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 13 Jun 2019 11:48:43 -0400
Subject: [PATCH 0606/1648] Polish

---
 CMakeModules/VersionUtils.cmake           | 30 +++++++--------
 libraries/version/CMakeLists.txt          | 46 +++++++++++------------
 libraries/version/src/version_impl.cpp.in | 37 +++++++++++-------
 libraries/version/src/version_impl.hpp    |  4 +-
 4 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index de027cf28f5..7618f5710d3 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -4,39 +4,39 @@ function(GENERATE_VERSION_METADATA)
    # Execute `git` to grab the corresponding data.
    execute_process(
       COMMAND ${GIT_EXEC} rev-parse HEAD
-      WORKING_DIRECTORY ${ROOT_DIR}
-      OUTPUT_VARIABLE _VERSION_HASH_
+      WORKING_DIRECTORY ${SRC_DIR}
+      OUTPUT_VARIABLE V_HASH
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE )
    execute_process(
       COMMAND ${GIT_EXEC} describe --tags --dirty
-      WORKING_DIRECTORY ${ROOT_DIR}
-      OUTPUT_VARIABLE _VERSION_DIRTY_
+      WORKING_DIRECTORY ${SRC_DIR}
+      OUTPUT_VARIABLE V_DIRTY
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE )
 
-   # ...
-   string(REGEX MATCH "-dirty$" _VERSION_DIRTY_ ${_VERSION_DIRTY_})
+   # Look for the substring "-dirty" in the variable `_VERSION_DIRTY_`.
+   string(REGEX MATCH "-dirty$" V_DIRTY ${V_DIRTY})
 
-   # ...
-   if("${_VERSION_DIRTY_}" STREQUAL "")
-      set(_VERSION_DIRTY_ "false")
+   # If `_VERSION_DIRTY_` is empty, we know that the repository isn't dirty and vice versa.
+   if("${V_DIRTY}" STREQUAL "")
+      set(V_DIRTY "false")
    else()
-      set(_VERSION_DIRTY_ "true")
+      set(V_DIRTY "true")
    endif()
 
-   # ...
+   # Define the proper version metadata for the file `version_impl.cpp.in`.
    set(_VERSION_MAJOR_  ${V_MAJOR})
    set(_VERSION_MINOR_  ${V_MINOR})
    set(_VERSION_PATCH_  ${V_PATCH})
    set(_VERSION_SUFFIX_ ${V_SUFFIX})
-   set(_VERSION_HASH_   ${_VERSION_HASH_})
-   set(_VERSION_DIRTY_  ${_VERSION_DIRTY_})
+   set(_VERSION_HASH_   ${V_HASH})
+   set(_VERSION_DIRTY_  ${V_DIRTY})
    
    # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
    configure_file(
-      ${LIB_CUR_DIR}/src/version_impl.cpp.in
-      ${LIB_BIN_DIR}/src/version_impl.cpp
+      ${CUR_SRC_DIR}/src/version_impl.cpp.in
+      ${CUR_BIN_DIR}/src/version_impl.cpp
       @ONLY )
 endfunction(GENERATE_VERSION_METADATA)
   
diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 00d1732585a..eddb0ce205b 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 project(Version)
 
-# Define the default version metadata in case `git` cannot be found.
+# Define the version metadata by default, in case `git` cannot be found.
 set(_VERSION_MAJOR_  "unknown")
 set(_VERSION_MINOR_  "")
 set(_VERSION_PATCH_  "")
@@ -9,33 +9,33 @@ set(_VERSION_SUFFIX_ "")
 set(_VERSION_HASH_   "")
 set(_VERSION_DIRTY_  "")
 
-# Construct the library.
+# Construct the library target.
 add_library(
-  version
-  "${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp")
+   version
+   "${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp"
+   "${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp")
 
-# Make dependencies visible.
+# Make dependencies visible to the given target library to be constructed.
 target_include_directories(
-  version
-  PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
-  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
+   version
+   PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
+   PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/" )
 
-# Create a custom target to be run upon every build.
+# Create a custom target to update the version metadata upon every build.
 find_package(Git)
 if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND ${GIT_FOUND})
    add_custom_target(
       evaluate_every_build ALL
       COMMAND ${CMAKE_COMMAND} -DGIT_EXEC=${GIT_EXECUTABLE}
-                               -DLIB_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
-                               -DLIB_CUR_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-                               -DROOT_DIR=${CMAKE_SOURCE_DIR}
+                               -DCUR_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
+                               -DCUR_SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+                               -DSRC_DIR=${CMAKE_SOURCE_DIR}
                                -DV_MAJOR=${VERSION_MAJOR}
                                -DV_MINOR=${VERSION_MINOR}
                                -DV_PATCH=${VERSION_PATCH}
                                -DV_SUFFIX=${VERSION_SUFFIX}
                                -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
-      COMMENT "Updating version metadata.." VERBATIM )
+      COMMENT "Updating version metadata..." VERBATIM )
 else()
    # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
    configure_file(
@@ -44,21 +44,21 @@ else()
       @ONLY )
 endif()
 
-# ...
+# Wait for `version_impl.cpp` to get generated before building the target library.
 set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp PROPERTY GENERATED 1)
 
-# ...
+# Create a dependency for the given library target.
 add_dependencies(version evaluate_every_build)
 
 # Install the library in the appropriate places.
 install(
-  TARGETS version
-  RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} )
+   TARGETS version
+   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} )
 
 # Install the header file in the appropriate place.
 install(
-  DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
-  DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
-  FILES_MATCHING PATTERN "*.hpp" )
+   DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
+   DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
+   FILES_MATCHING PATTERN "*.hpp" )
diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 6dba04e8b64..1e439a03881 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -15,22 +15,31 @@ namespace eosio { namespace version {
    const std::string version_hash  {"@_VERSION_HASH_@"  };
    const bool        version_dirty { @_VERSION_DIRTY_@  };
 
-   const std::string& _version_client() {
-      static const std::string version{'v' + version_major +
-                                       '.' + version_minor +
-                                       '.' + version_patch +
-                                       '-' + version_suffix};
-      return version;
+   std::string _version_client() {
+      if (version_major == "Unknown") {
+         std::string version{"Unknown"};
+         return version;
+      }
+      else {
+         std::string version{'v' + version_major + '.' + version_minor + '.' + version_patch + '-' + version_suffix};
+         return version;
+      }
    }
 
-   const std::string& _version_full() {
-      static const std::string version{'v' + version_major  +
-                                       '.' + version_minor  +
-                                       '.' + version_patch  +
-                                       '-' + version_suffix +
-                                       '-' + version_hash   +
-                                       ((version_dirty == true) ? ("-dirty") : (""))};
-      return version;
+   std::string _version_full() {
+      if (version_major == "Unknown") {
+         std::string version{"Unknown"};
+         return version;
+      }
+      else {
+         std::string version{'v' + version_major + '.' + version_minor + '.' + version_patch + '-' + version_suffix + '-' + version_hash};
+         
+         if (version_dirty == true) {
+            version += "-dirty";
+         }
+         
+         return version;
+      }
    }
 
 } }
diff --git a/libraries/version/src/version_impl.hpp b/libraries/version/src/version_impl.hpp
index 40997ce6d37..8266383a417 100644
--- a/libraries/version/src/version_impl.hpp
+++ b/libraries/version/src/version_impl.hpp
@@ -10,9 +10,9 @@
 namespace eosio { namespace version {
 
    ///< Helper function for `version_client()`
-   const std::string& _version_client();
+   std::string _version_client();
 
    ///< Helper function for `version_full()`
-   const std::string& _version_full();
+   std::string _version_full();
 
 } }

From b2ee26ae57d52497e9c755e2f39f9b2a67b7a450 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 13 Jun 2019 13:54:41 -0400
Subject: [PATCH 0607/1648] Adjusted build script functionality to prompt for
 custom installation path if one is not provided.

---
 scripts/.environment       |  2 +-
 scripts/eosio_build.sh     |  2 ++
 scripts/helpers/eosio.sh   | 24 ++++++++++++++++++++++++
 tests/bash-bats/helpers.sh | 16 ++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/scripts/.environment b/scripts/.environment
index 6927f0177c8..e62230508d2 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -13,7 +13,7 @@ else
     export EOSIO_VERSION_FULL="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}.${EOSIO_VERSION_PATCH}-${EOSIO_VERSION_SUFFIX}"
 fi
 
-export INSTALL_LOCATION=${INSTALL_LOCATION:-$HOME}
+export INSTALL_LOCATION=${INSTALL_LOCATION}
 export EOSIO_INSTALL_DIR="${INSTALL_LOCATION}/eosio/${EOSIO_VERSION}"
 export TEMP_DIR="${INSTALL_LOCATION}/tmp"
 
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index e5a8857488e..48010792454 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -126,6 +126,8 @@ ensure-sudo
 ensure-which
 # Prevent a non-git clone from running
 ensure-git-clone
+# Prompt user for installation path.
+install-directory-prompt
 # If the same version has already been installed...
 previous-install-prompt
 # Prompt user and asks if we should install mongo or not
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 98a676ab452..fdeebb69e32 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -72,6 +72,30 @@ function ensure-which() {
   fi
 }
 
+# Prompt user for installation directory.
+function install-directory-prompt() {
+  if [[ -z $INSTALL_LOCATION ]]; then
+    echo "No installation location was specified. Please provide the location where EOSIO is installed."
+    while true; do
+      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to use the default location? (y/n)${COLOR_NC}" && read -p " " PROCEED
+      echo ""
+      case $PROCEED in
+        "" ) echo "What would you like to do?";;
+        0 | true | [Yy]* )
+          INSTALL_LOCATION=${HOME};
+          break;;
+        1 | false | [Nn]* )
+          printf "Enter the desired installation location." && read -p " " INSTALL_LOCATION;
+          break;;
+        * ) echo "Please type 'y' for yes or 'n' for no.";;
+      esac
+    done
+  # Many environment variables rely on INSTALL_LOCATION. Sourcing again...
+  . ./scripts/.environment
+  fi
+  echo "EOSIO will be installed to: ${EOSIO_INSTALL_DIR}"
+}
+
 function previous-install-prompt() {
   if [[ -d $EOSIO_INSTALL_DIR ]]; then
     echo "EOSIO has already been installed into ${EOSIO_INSTALL_DIR}... It's suggested that you eosio_uninstall.sh before re-running this script."
diff --git a/tests/bash-bats/helpers.sh b/tests/bash-bats/helpers.sh
index 962d5d958a7..0396e36c452 100644
--- a/tests/bash-bats/helpers.sh
+++ b/tests/bash-bats/helpers.sh
@@ -28,9 +28,25 @@ TEST_LABEL="[helpers]"
   ( [[ ! $output =~ "Executing: echo VERBOSE!" ]] && [[ $status -eq 0 ]] ) || exit
 }
 
+# Add BATS test for install-directory-prompt.
+@test "${TEST_LABEL} > install directory prompt" {
+  NONINTERACTIVE=true
+  PROCEED=true
+  run install-directory-prompt
+  # Default directory used.
+  [[ ! -z $(echo "${output}" | grep "home") ]] || exit
+  NONINTERACTIVE=false
+  PROCEED=false
+  INSTALL_LOCATION="/etc/eos"
+  run install-directory-prompt
+  # Function received given input.
+  [[ ! -z $(echo "${output}") ]] || exit
+}
+
 @test "${TEST_LABEL} > previous install prompt" {
   NONINTERACTIVE=true
   PROCEED=true
+  EOSIO_INSTALL_DIR=$HOME/eosio/
   # Doesn't exists, no output
   run previous-install-prompt
   [[ -z $(echo "${output}") ]] || exit

From 20247aed1df7e96e2d13d949c58593073109cbbe Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 14:53:26 -0500
Subject: [PATCH 0608/1648] Add back applied transaction processing

---
 libraries/testing/tester.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 6972814d5e6..c12b29538db 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -246,14 +246,21 @@ namespace eosio { namespace testing {
 
       if( !skip_pending_trxs ) {
          vector<transaction_id_type> scheduled_trxs;
-         while( (scheduled_trxs = get_scheduled_transactions() ).size() > 0 ) {
-            for (const auto& trx : scheduled_trxs ) {
-               auto trace = control->push_scheduled_transaction(trx, fc::time_point::maximum());
-               if(trace->except) {
+         while ((scheduled_trxs = get_scheduled_transactions()).size() > 0 ) {
+            for( const auto& trx : scheduled_trxs ) {
+               auto trace = control->push_scheduled_transaction( trx, fc::time_point::maximum());
+               if( trace->except ) {
                   trace->except->dynamic_rethrow_exception();
                }
             }
          }
+
+         while( transaction_metadata_ptr trx = unapplied_transactions.next() ) {
+            auto trace = control->push_transaction(trx, fc::time_point::maximum());
+            if(trace->except) {
+               trace->except->dynamic_rethrow_exception();
+            }
+         }
       }
 
       auto head_block = _finish_block();
@@ -272,7 +279,7 @@ namespace eosio { namespace testing {
          last_produced_block_num = std::max(control->last_irreversible_block_num(), block_header::num_from_id(itr->second));
       }
 
-      control->abort_block();
+      unapplied_transactions.add_aborted( control->abort_block() );
 
       vector<digest_type> feature_to_be_activated;
       // First add protocol features to be activated WITHOUT preactivation

From 4002c123498992f7f33a8e810b6cccef9f400b5a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 15:39:58 -0500
Subject: [PATCH 0609/1648] Restore debug log message with applied transactions
 total included

---
 plugins/producer_plugin/producer_plugin.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index d1d9a32fcd8..3e40bd9e57c 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1513,6 +1513,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                int num_applied = 0;
                int num_failed = 0;
                int num_processed = 0;
+               auto unapplied_trxs_size = _unapplied_transactions.size();
                auto calculate_transaction_category = [&](const transaction_metadata_ptr& trx) {
                   if (trx->packed_trx()->expiration() < pending_block_time) {
                      return tx_category::EXPIRED;
@@ -1572,8 +1573,8 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                   if( exhausted ) break;
                }
 
-               fc_dlog(_log, "Processed ${all} of the ${m} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",
-                             ("all", exhausted ? "some" : "all")("m", num_processed)("applied", num_applied)("failed", num_failed));
+               fc_dlog(_log, "Processed ${m} of ${n} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",
+                       ("m", num_processed)("n", unapplied_trxs_size)("applied", num_applied)("failed", num_failed));
             }
          }
 

From 466612e3f9173a74f0031fdf4520dd09607f2674 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 16:07:38 -0500
Subject: [PATCH 0610/1648] tester now reapplies aborted trxs

---
 .../testing/include/eosio/testing/tester.hpp  |  4 +-
 unittests/block_tests.cpp                     | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 894839d1721..f3bd73be0fb 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -343,7 +343,7 @@ namespace eosio { namespace testing {
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-         control->abort_block();
+         unapplied_transactions.add_aborted( control->abort_block() );
          return _produce_block(skip_time, true);
       }
 
@@ -440,7 +440,7 @@ namespace eosio { namespace testing {
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-         control->abort_block();
+         unapplied_transactions.add_aborted( control->abort_block() );
          auto sb = _produce_block(skip_time, true);
          auto bs = validating_node->create_block_state_future( sb );
          validating_node->push_block( bs );
diff --git a/unittests/block_tests.cpp b/unittests/block_tests.cpp
index 4d6f452019e..8b8fe2c11cf 100644
--- a/unittests/block_tests.cpp
+++ b/unittests/block_tests.cpp
@@ -237,4 +237,45 @@ BOOST_FIXTURE_TEST_CASE( abort_block_transactions, validating_tester) { try {
 
    } FC_LOG_AND_RETHROW() }
 
+/**
+ * Verify abort block returns applied transactions in block
+ */
+BOOST_FIXTURE_TEST_CASE( abort_block_transactions_tester, validating_tester) { try {
+
+      produce_blocks(2);
+      signed_transaction trx;
+
+      account_name a = N(newco);
+      account_name creator = config::system_account_name;
+
+      // account does not exist before test
+      BOOST_REQUIRE_EXCEPTION(control->get_account( a ), fc::exception,
+                              [a] (const fc::exception& e)->bool {
+                                 return std::string( e.what() ).find( a.to_string() ) != std::string::npos;
+                              }) ;
+
+      auto owner_auth = authority( get_public_key( a, "owner" ) );
+      trx.actions.emplace_back( vector<permission_level>{{creator,config::active_name}},
+                                newaccount{
+                                      .creator  = creator,
+                                      .name     = a,
+                                      .owner    = owner_auth,
+                                      .active   = authority( get_public_key( a, "active" ) )
+                                });
+      set_transaction_headers(trx);
+      trx.sign( get_private_key( creator, "active" ), control->get_chain_id()  );
+      auto trace = push_transaction( trx );
+
+      control->get_account( a ); // throws if it does not exist
+
+      produce_block( fc::milliseconds(config::block_interval_ms*2) ); // aborts block, tester should reapply trx
+
+      control->get_account( a ); // throws if it does not exist
+
+      vector<transaction_metadata_ptr> unapplied_trxs = control->abort_block(); // should be empty now
+
+      BOOST_REQUIRE_EQUAL( 0,  unapplied_trxs.size() );
+
+   } FC_LOG_AND_RETHROW() }
+
 BOOST_AUTO_TEST_SUITE_END()

From 1b011d0093bb5d392863e64d3e13d8d91016bbb0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 18:17:03 -0500
Subject: [PATCH 0611/1648] Apply scheduled first to match original code

---
 libraries/testing/tester.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index c12b29538db..c543775e2b9 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -227,7 +227,7 @@ namespace eosio { namespace testing {
       auto bs = control->create_block_state_future(b);
       vector<transaction_metadata_ptr> aborted_trxs = control->abort_block();
       unapplied_transactions.add_forked( control->push_block( bs ) );
-      unapplied_transactions.add_aborted( aborted_trxs );
+      unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
 
       auto itr = last_produced_block.find(b->producer);
       if (itr == last_produced_block.end() || block_header::num_from_id(b->id()) > block_header::num_from_id(itr->second)) {
@@ -245,6 +245,13 @@ namespace eosio { namespace testing {
       }
 
       if( !skip_pending_trxs ) {
+         while( transaction_metadata_ptr trx = unapplied_transactions.next() ) {
+            auto trace = control->push_transaction(trx, fc::time_point::maximum());
+            if(trace->except) {
+               trace->except->dynamic_rethrow_exception();
+            }
+         }
+
          vector<transaction_id_type> scheduled_trxs;
          while ((scheduled_trxs = get_scheduled_transactions()).size() > 0 ) {
             for( const auto& trx : scheduled_trxs ) {
@@ -254,13 +261,6 @@ namespace eosio { namespace testing {
                }
             }
          }
-
-         while( transaction_metadata_ptr trx = unapplied_transactions.next() ) {
-            auto trace = control->push_transaction(trx, fc::time_point::maximum());
-            if(trace->except) {
-               trace->except->dynamic_rethrow_exception();
-            }
-         }
       }
 
       auto head_block = _finish_block();

From 61d9ac65825fc2d1ca696a33dceb11fd6a4e8e5c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 13 Jun 2019 18:17:43 -0500
Subject: [PATCH 0612/1648] Minor peer review fixes

---
 plugins/producer_plugin/producer_plugin.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 3e40bd9e57c..c521739ee27 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -378,7 +378,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
          // exceptions throw out, make sure we restart our loop
          auto ensure = fc::make_scoped_exit([this, &aborted_trxs](){
-            _unapplied_transactions.add_aborted( aborted_trxs );
+            _unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
             schedule_production_loop();
          });
 
@@ -1524,24 +1524,26 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                   }
                };
 
-               while( transaction_metadata_ptr trx = _unapplied_transactions.next() ) {
+               while( !exhausted ) {
+                  transaction_metadata_ptr trx = _unapplied_transactions.next();
+                  if( trx == nullptr ) break;
+
+                  ++num_processed;
                   auto category = calculate_transaction_category(trx);
                   if (category == tx_category::EXPIRED ||
                      (category == tx_category::UNEXPIRED_UNPERSISTED && _producers.empty()))
                   {
+                     ++num_failed;
                      if (!_producers.empty()) {
                         fc_dlog(_trx_trace_log, "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
                                ("txid", trx->id()));
                      }
                      if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
-                     if( exhausted ) break;
                      continue; // _unapplied_transactions removed trx, so just continue
 
                   } else if (category == tx_category::PERSISTED ||
                             (category == tx_category::UNEXPIRED_UNPERSISTED && _pending_block_mode == pending_block_mode::producing))
                   {
-                     ++num_processed;
-
                      try {
                         auto deadline = fc::time_point::now() + fc::milliseconds(_max_transaction_time_ms);
                         bool deadline_is_subjective = false;
@@ -1570,7 +1572,6 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                   }
 
                   if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
-                  if( exhausted ) break;
                }
 
                fc_dlog(_log, "Processed ${m} of ${n} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",

From 17b4e41e1823a4b944128f1e16788ba02195993c Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 14 Jun 2019 11:11:04 -0400
Subject: [PATCH 0613/1648] Added suggested improvements.

---
 scripts/.build_vars        | 81 +++++++++++++++++++++++++++++++++++
 scripts/.environment       | 87 ++------------------------------------
 scripts/helpers/eosio.sh   | 15 ++++---
 tests/bash-bats/helpers.sh |  4 +-
 4 files changed, 93 insertions(+), 94 deletions(-)
 create mode 100644 scripts/.build_vars

diff --git a/scripts/.build_vars b/scripts/.build_vars
new file mode 100644
index 00000000000..585c521c935
--- /dev/null
+++ b/scripts/.build_vars
@@ -0,0 +1,81 @@
+export SRC_DIR=${EOSIO_INSTALL_DIR}/src
+export OPT_DIR=${EOSIO_INSTALL_DIR}/opt
+export VAR_DIR=${EOSIO_INSTALL_DIR}/var
+export ETC_DIR=${EOSIO_INSTALL_DIR}/etc
+export BIN_DIR=${EOSIO_INSTALL_DIR}/bin
+export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
+export DATA_DIR=${EOSIO_INSTALL_DIR}/data
+
+# CMAKE
+export CMAKE_VERSION_MAJOR=3
+export CMAKE_VERSION_MINOR=13
+export CMAKE_VERSION_PATCH=2
+export CMAKE_VERSION=${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}
+
+# MONGO
+export MONGODB_VERSION=3.6.3
+export MONGODB_ROOT=${OPT_DIR}/mongodb-${MONGODB_VERSION}
+export MONGODB_BIN=${BIN_DIR}/mongod
+export MONGODB_CONF=${ETC_DIR}/mongod.conf
+export MONGODB_LOG_DIR=${VAR_DIR}/log/mongodb
+export MONGODB_LINK_DIR=${OPT_DIR}/mongodb
+export MONGODB_DATA_DIR=${DATA_DIR}/mongodb
+export MONGO_C_DRIVER_VERSION=1.13.0
+export MONGO_C_DRIVER_ROOT=${SRC_DIR}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}
+export MONGO_CXX_DRIVER_VERSION=3.4.0
+export MONGO_CXX_DRIVER_ROOT=${SRC_DIR}/mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}
+export ENABLE_MONGO=${ENABLE_MONGO:-false}
+export INSTALL_MONGO=${INSTALL_MONGO:-false}
+
+# BOOST
+export BOOST_VERSION_MAJOR=1
+export BOOST_VERSION_MINOR=70
+export BOOST_VERSION_PATCH=0
+export BOOST_VERSION=${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH}
+export BOOST_ROOT=${BOOST_LOCATION:-${SRC_DIR}/boost_${BOOST_VERSION}}
+export BOOST_LINK_LOCATION=${OPT_DIR}/boost
+
+# LLVM
+export LLVM_VERSION=release_40
+export LLVM_ROOT=${OPT_DIR}/llvm
+export LLVM_DIR=${LLVM_ROOT}/lib/cmake/llvm
+
+# DOXYGEN
+export DOXYGEN_VERSION=1_8_14
+export DOXYGEN_ROOT=${SRC_DIR}/doxygen-${DOXYGEN_VERSION}
+export ENABLE_DOXYGEN=${ENABLE_DOXYGEN:-false}
+
+# CLANG
+export CLANG_ROOT=${OPT_DIR}/clang8
+export PINNED_COMPILER_BRANCH=release_80
+export PINNED_COMPILER_LLVM_COMMIT=18e41dc
+export PINNED_COMPILER_CLANG_COMMIT=a03da8b
+export PINNED_COMPILER_LLD_COMMIT=d60a035
+export PINNED_COMPILER_POLLY_COMMIT=1bc06e5
+export PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT=6b34834
+export PINNED_COMPILER_LIBCXX_COMMIT=1853712
+export PINNED_COMPILER_LIBCXXABI_COMMIT=d7338a4
+export PINNED_COMPILER_LIBUNWIND_COMMIT=57f6739
+export PINNED_COMPILER_COMPILER_RT_COMMIT=5bc7979
+export NO_CPP17=${NO_CPP17:-false}
+export PIN_COMPILER=${PIN_COMPILER:-false}
+export BUILD_CLANG=${BUILD_CLANG:-false}
+
+export CORE_SYMBOL_NAME=${CORE_SYMBOL_NAME:-SYS}
+
+export CPU_CORES=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
+export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+
+export NONINTERACTIVE=${NONINTERACTIVE:-false}
+export PROCEED=${PROCEED:-false}
+
+export CURRENT_USER=${CURRENT_USER:-$(whoami)}
+
+export ENABLE_COVERAGE_TESTING=${ENABLE_COVERAGE_TESTING:-false}
+export HOMEBREW_NO_AUTO_UPDATE=1
+export TINI_VERSION=0.18.0
+export DISK_MIN=5
+export COUNT=0
+export DRYRUN=${DRYRUN:-false}
+export VERBOSE=${VERBOSE:-false}
+export SUDO_LOCATION=$( command -v sudo )
diff --git a/scripts/.environment b/scripts/.environment
index e62230508d2..4a60c29a12b 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -13,88 +13,7 @@ else
     export EOSIO_VERSION_FULL="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}.${EOSIO_VERSION_PATCH}-${EOSIO_VERSION_SUFFIX}"
 fi
 
-export INSTALL_LOCATION=${INSTALL_LOCATION}
-export EOSIO_INSTALL_DIR="${INSTALL_LOCATION}/eosio/${EOSIO_VERSION}"
-export TEMP_DIR="${INSTALL_LOCATION}/tmp"
+export EOSIO_INSTALL_DIR="${EOSIO_INSTALL_DIR:-${HOME}/eosio/${EOSIO_VERSION}}"
+export TEMP_DIR="${TEMP_DIR:-${HOME}/tmp}"
 
-export SRC_DIR=${EOSIO_INSTALL_DIR}/src
-export OPT_DIR=${EOSIO_INSTALL_DIR}/opt
-export VAR_DIR=${EOSIO_INSTALL_DIR}/var
-export ETC_DIR=${EOSIO_INSTALL_DIR}/etc
-export BIN_DIR=${EOSIO_INSTALL_DIR}/bin
-export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
-export DATA_DIR=${EOSIO_INSTALL_DIR}/data
-
-# CMAKE
-export CMAKE_VERSION_MAJOR=3
-export CMAKE_VERSION_MINOR=13
-export CMAKE_VERSION_PATCH=2
-export CMAKE_VERSION=${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}
-
-# MONGO
-export MONGODB_VERSION=3.6.3
-export MONGODB_ROOT=${OPT_DIR}/mongodb-${MONGODB_VERSION}
-export MONGODB_BIN=${BIN_DIR}/mongod
-export MONGODB_CONF=${ETC_DIR}/mongod.conf
-export MONGODB_LOG_DIR=${VAR_DIR}/log/mongodb
-export MONGODB_LINK_DIR=${OPT_DIR}/mongodb
-export MONGODB_DATA_DIR=${DATA_DIR}/mongodb
-export MONGO_C_DRIVER_VERSION=1.13.0
-export MONGO_C_DRIVER_ROOT=${SRC_DIR}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}
-export MONGO_CXX_DRIVER_VERSION=3.4.0
-export MONGO_CXX_DRIVER_ROOT=${SRC_DIR}/mongo-cxx-driver-r${MONGO_CXX_DRIVER_VERSION}
-export ENABLE_MONGO=${ENABLE_MONGO:-false}
-export INSTALL_MONGO=${INSTALL_MONGO:-false}
-
-# BOOST
-export BOOST_VERSION_MAJOR=1
-export BOOST_VERSION_MINOR=70
-export BOOST_VERSION_PATCH=0
-export BOOST_VERSION=${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH}
-export BOOST_ROOT=${BOOST_LOCATION:-${SRC_DIR}/boost_${BOOST_VERSION}}
-export BOOST_LINK_LOCATION=${OPT_DIR}/boost
-
-# LLVM
-export LLVM_VERSION=release_40
-export LLVM_ROOT=${OPT_DIR}/llvm
-export LLVM_DIR=${LLVM_ROOT}/lib/cmake/llvm
-
-# DOXYGEN
-export DOXYGEN_VERSION=1_8_14
-export DOXYGEN_ROOT=${SRC_DIR}/doxygen-${DOXYGEN_VERSION}
-export ENABLE_DOXYGEN=${ENABLE_DOXYGEN:-false}
-
-# CLANG
-export CLANG_ROOT=${OPT_DIR}/clang8
-export PINNED_COMPILER_BRANCH=release_80
-export PINNED_COMPILER_LLVM_COMMIT=18e41dc
-export PINNED_COMPILER_CLANG_COMMIT=a03da8b
-export PINNED_COMPILER_LLD_COMMIT=d60a035
-export PINNED_COMPILER_POLLY_COMMIT=1bc06e5
-export PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT=6b34834
-export PINNED_COMPILER_LIBCXX_COMMIT=1853712
-export PINNED_COMPILER_LIBCXXABI_COMMIT=d7338a4
-export PINNED_COMPILER_LIBUNWIND_COMMIT=57f6739
-export PINNED_COMPILER_COMPILER_RT_COMMIT=5bc7979
-export NO_CPP17=${NO_CPP17:-false}
-export PIN_COMPILER=${PIN_COMPILER:-false}
-export BUILD_CLANG=${BUILD_CLANG:-false}
-
-export CORE_SYMBOL_NAME=${CORE_SYMBOL_NAME:-SYS}
-
-export CPU_CORES=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
-export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
-
-export NONINTERACTIVE=${NONINTERACTIVE:-false}
-export PROCEED=${PROCEED:-false}
-
-export CURRENT_USER=${CURRENT_USER:-$(whoami)}
-
-export ENABLE_COVERAGE_TESTING=${ENABLE_COVERAGE_TESTING:-false}
-export HOMEBREW_NO_AUTO_UPDATE=1
-export TINI_VERSION=0.18.0
-export DISK_MIN=5
-export COUNT=0
-export DRYRUN=${DRYRUN:-false}
-export VERBOSE=${VERBOSE:-false}
-export SUDO_LOCATION=$( command -v sudo )
+. ./scripts/.build_vars
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index fdeebb69e32..d7e526f356f 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -31,7 +31,6 @@ function setup() {
         echo "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}"
         echo "CORE_SYMBOL_NAME: ${CORE_SYMBOL_NAME}"
         echo "BOOST_LOCATION: ${BOOST_LOCATION}"
-        echo "INSTALL_LOCATION: ${INSTALL_LOCATION}"
         echo "BUILD_DIR: ${BUILD_DIR}"
         echo "EOSIO_INSTALL_DIR: ${EOSIO_INSTALL_DIR}"
         echo "NONINTERACTIVE: ${NONINTERACTIVE}"
@@ -77,22 +76,24 @@ function install-directory-prompt() {
   if [[ -z $INSTALL_LOCATION ]]; then
     echo "No installation location was specified. Please provide the location where EOSIO is installed."
     while true; do
-      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to use the default location? (y/n)${COLOR_NC}" && read -p " " PROCEED
+      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to use the default location? ${EOSIO_INSTALL_DIR}? (y/n)${COLOR_NC}" && read -p " " PROCEED
       echo ""
       case $PROCEED in
-        "" ) echo "What would you like to do?";;
+        "" )
+          echo "What would you like to do?";;
         0 | true | [Yy]* )
-          INSTALL_LOCATION=${HOME};
           break;;
         1 | false | [Nn]* )
-          printf "Enter the desired installation location." && read -p " " INSTALL_LOCATION;
+          printf "Enter the desired installation location." && read -p " " EOSIO_INSTALL_DIR;
+          export EOSIO_INSTALL_DIR;
           break;;
         * ) echo "Please type 'y' for yes or 'n' for no.";;
       esac
     done
-  # Many environment variables rely on INSTALL_LOCATION. Sourcing again...
-  . ./scripts/.environment
+  else
+    export EOSIO_INSTALL_DIR=${INSTALL_LOCATION}
   fi
+  . ./scripts/.build_vars
   echo "EOSIO will be installed to: ${EOSIO_INSTALL_DIR}"
 }
 
diff --git a/tests/bash-bats/helpers.sh b/tests/bash-bats/helpers.sh
index 0396e36c452..98c756ac836 100644
--- a/tests/bash-bats/helpers.sh
+++ b/tests/bash-bats/helpers.sh
@@ -28,12 +28,11 @@ TEST_LABEL="[helpers]"
   ( [[ ! $output =~ "Executing: echo VERBOSE!" ]] && [[ $status -eq 0 ]] ) || exit
 }
 
-# Add BATS test for install-directory-prompt.
 @test "${TEST_LABEL} > install directory prompt" {
   NONINTERACTIVE=true
   PROCEED=true
   run install-directory-prompt
-  # Default directory used.
+  # Use default location
   [[ ! -z $(echo "${output}" | grep "home") ]] || exit
   NONINTERACTIVE=false
   PROCEED=false
@@ -46,7 +45,6 @@ TEST_LABEL="[helpers]"
 @test "${TEST_LABEL} > previous install prompt" {
   NONINTERACTIVE=true
   PROCEED=true
-  EOSIO_INSTALL_DIR=$HOME/eosio/
   # Doesn't exists, no output
   run previous-install-prompt
   [[ -z $(echo "${output}") ]] || exit

From 624115bf40e12d9b4d660495c0d982096726ca15 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Fri, 14 Jun 2019 15:38:21 -0400
Subject: [PATCH 0614/1648] Remove unnecessary installations

---
 libraries/version/CMakeLists.txt | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index eddb0ce205b..1331942aefe 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -49,16 +49,3 @@ set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp PROPERTY GE
 
 # Create a dependency for the given library target.
 add_dependencies(version evaluate_every_build)
-
-# Install the library in the appropriate places.
-install(
-   TARGETS version
-   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
-   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} )
-
-# Install the header file in the appropriate place.
-install(
-   DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/version
-   DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/
-   FILES_MATCHING PATTERN "*.hpp" )

From c3a4e7fef76833dfe08705b961c5a51a1f9aa5ee Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Fri, 14 Jun 2019 17:03:26 -0400
Subject: [PATCH 0615/1648] Fix `Makefile` generation where `git` directory
 `.git/` are not found

---
 libraries/version/CMakeLists.txt          | 6 +++---
 libraries/version/src/version_impl.cpp.in | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index 1331942aefe..b6e56a0d27f 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -36,6 +36,9 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND ${GIT_FOUND})
                                -DV_SUFFIX=${VERSION_SUFFIX}
                                -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
       COMMENT "Updating version metadata..." VERBATIM )
+                             
+      # Create a dependency for the given library target.
+      add_dependencies(version evaluate_every_build)
 else()
    # Modify and substitute the `.cpp.in` file for a `.cpp` in the build directory.
    configure_file(
@@ -46,6 +49,3 @@ endif()
 
 # Wait for `version_impl.cpp` to get generated before building the target library.
 set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp PROPERTY GENERATED 1)
-
-# Create a dependency for the given library target.
-add_dependencies(version evaluate_every_build)
diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 1e439a03881..6a45c1dff1f 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -16,8 +16,8 @@ namespace eosio { namespace version {
    const bool        version_dirty { @_VERSION_DIRTY_@  };
 
    std::string _version_client() {
-      if (version_major == "Unknown") {
-         std::string version{"Unknown"};
+      if (version_major == "unknown") {
+         std::string version{"unknown"};
          return version;
       }
       else {
@@ -27,8 +27,8 @@ namespace eosio { namespace version {
    }
 
    std::string _version_full() {
-      if (version_major == "Unknown") {
-         std::string version{"Unknown"};
+      if (version_major == "unknown") {
+         std::string version{"unknown"};
          return version;
       }
       else {

From 5bd3ed98bf6c38e55eb446e66f851082596ba8c3 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 14 Jun 2019 20:54:22 -0400
Subject: [PATCH 0616/1648] HELPER_ENABLED removal

---
 pipeline.jsonc | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 4baf794b846..1b430f8eb47 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,19 +1,4 @@
 {
-    "eosio":
-    {
-        "environment":
-        {
-            "HELPER_ENABLED": true,
-            "IMAGE_TAG_VERSION": "v1"
-        }
-    },
-    "eosio-build-unpinned":
-    {
-        "environment":
-        {
-            "HELPER_ENABLED": true
-        }
-    },
     "eosio-lrt":
     {
         "environment":

From bc02b709dc6006f492b80b8f7da86e14ae8aea22 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Mon, 17 Jun 2019 11:34:30 -0400
Subject: [PATCH 0617/1648] Use `git diff --quiet` to get dirty info

---
 CMakeModules/VersionUtils.cmake | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/CMakeModules/VersionUtils.cmake b/CMakeModules/VersionUtils.cmake
index 7618f5710d3..d4ef7b0d561 100644
--- a/CMakeModules/VersionUtils.cmake
+++ b/CMakeModules/VersionUtils.cmake
@@ -9,20 +9,17 @@ function(GENERATE_VERSION_METADATA)
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE )
    execute_process(
-      COMMAND ${GIT_EXEC} describe --tags --dirty
+      COMMAND ${GIT_EXEC} diff --quiet
       WORKING_DIRECTORY ${SRC_DIR}
-      OUTPUT_VARIABLE V_DIRTY
+      RESULT_VARIABLE V_DIRTY
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE )
 
-   # Look for the substring "-dirty" in the variable `_VERSION_DIRTY_`.
-   string(REGEX MATCH "-dirty$" V_DIRTY ${V_DIRTY})
-
-   # If `_VERSION_DIRTY_` is empty, we know that the repository isn't dirty and vice versa.
-   if("${V_DIRTY}" STREQUAL "")
-      set(V_DIRTY "false")
-   else()
+   # If `V_DIRTY` is equal to 1, we know that the repository is dirty and vice versa.
+   if(${V_DIRTY})
       set(V_DIRTY "true")
+   else()
+      set(V_DIRTY "false")
    endif()
 
    # Define the proper version metadata for the file `version_impl.cpp.in`.

From 861efee6e17e19a8fcc02d2f49350a0fb19f28b9 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 17 Jun 2019 15:22:07 -0400
Subject: [PATCH 0618/1648] redoing eos-vm submodule

---
 libraries/eos-vm | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 libraries/eos-vm

diff --git a/libraries/eos-vm b/libraries/eos-vm
deleted file mode 160000
index 729ead80e28..00000000000
--- a/libraries/eos-vm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 729ead80e28e513d00a90066ea2948683486be5b

From 2ec9e75e26ce4ebaa027c62276e2793a91fb7426 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 17 Jun 2019 15:24:15 -0400
Subject: [PATCH 0619/1648] added eos-vm submodule

---
 .gitmodules      | 2 +-
 libraries/eos-vm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 160000 libraries/eos-vm

diff --git a/.gitmodules b/.gitmodules
index 4e25bc2f43c..bcf5fb4b178 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,4 +20,4 @@
 	url = https://github.com/Yubico/yubihsm-shell
 [submodule "libraries/eos-vm"]
 	path = libraries/eos-vm
-	url = git@github.com:eosio/eos-vm
+	url = https://github.com/eosio/eos-vm
diff --git a/libraries/eos-vm b/libraries/eos-vm
new file mode 160000
index 00000000000..729ead80e28
--- /dev/null
+++ b/libraries/eos-vm
@@ -0,0 +1 @@
+Subproject commit 729ead80e28e513d00a90066ea2948683486be5b

From a6bba2a8835718bfb8d00a18d98ac4aa968083cf Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 17 Jun 2019 23:16:28 -0400
Subject: [PATCH 0620/1648] use create_directories rather than create_directory
 in initialize_protocol_features

---
 plugins/chain_plugin/chain_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 085acbd9551..d8185f085cd 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -362,7 +362,7 @@ protocol_feature_set initialize_protocol_features( const fc::path& p, bool popul
       );
    } else {
       if( populate_missing_builtins )
-         bfs::create_directory( p );
+         bfs::create_directories( p );
       else
          directory_exists = false;
    }

From 6ddeb96bdf86e3581bb550579dc719e95926e32f Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 18 Jun 2019 13:11:06 -0400
Subject: [PATCH 0621/1648] fixed up integration with vm

---
 libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp | 2 +-
 libraries/chain/webassembly/eos-vm.cpp                     | 6 +++---
 libraries/eos-vm                                           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index f6d9ca51a85..72bf23931e2 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -19,7 +19,7 @@ namespace eosio { namespace vm {
    template <typename S, typename Args, typename T, typename WAlloc>
    constexpr auto get_value(WAlloc*, T&& val) 
          -> std::enable_if_t<std::is_same_v<i64_const_t, T> && std::is_same_v<chain::name, std::decay_t<S>>, S> {
-      return {(uint64_t)val.data.ui};
+      return std::move(chain::name{(uint64_t)val.data.ui});
    } 
 
    // we can clean these up if we go with custom vms
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 6c7420ed69f..186a48914a1 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -25,9 +25,9 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
         
          const auto& res = _instantiated_module->call(&context, "env", "apply",
-                                          (uint64_t)context.get_receiver(),
-                                          (uint64_t)context.get_action().account,
-                                          (uint64_t)context.get_action().name);
+                                          context.get_receiver().to_uint64_t(),
+                                          context.get_action().account.to_uint64_t(),
+                                          context.get_action().name.to_uint64_t());
          //EOS_ASSERT(res, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
       }
 
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 729ead80e28..6df8280c6f3 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 729ead80e28e513d00a90066ea2948683486be5b
+Subproject commit 6df8280c6f340f2d372f80acef3047cef9e63bcc

From ef354e78eed42f7a1a675cbad46bd784993d10cb Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 18 Jun 2019 18:26:56 -0400
Subject: [PATCH 0622/1648] Fix so `Ninja` doesn't start building before file
 is generated

---
 libraries/version/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index b6e56a0d27f..b4324f3769a 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -35,6 +35,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND ${GIT_FOUND})
                                -DV_PATCH=${VERSION_PATCH}
                                -DV_SUFFIX=${VERSION_SUFFIX}
                                -P ${CMAKE_SOURCE_DIR}/CMakeModules/VersionUtils.cmake
+      BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp
       COMMENT "Updating version metadata..." VERBATIM )
                              
       # Create a dependency for the given library target.

From 38eca5840a7c6aa59d6cc7d495d55111eff90413 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Tue, 18 Jun 2019 18:36:36 -0400
Subject: [PATCH 0623/1648] Get rid of redundant `set_property` command

---
 libraries/version/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libraries/version/CMakeLists.txt b/libraries/version/CMakeLists.txt
index b4324f3769a..239c479d92b 100644
--- a/libraries/version/CMakeLists.txt
+++ b/libraries/version/CMakeLists.txt
@@ -47,6 +47,3 @@ else()
       ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp
       @ONLY )
 endif()
-
-# Wait for `version_impl.cpp` to get generated before building the target library.
-set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/src/version_impl.cpp PROPERTY GENERATED 1)

From f860cbede4216361c34c7f2c85efc61912371c2d Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 20 Jun 2019 14:04:38 +0800
Subject: [PATCH 0624/1648] Update appbase commit reference

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index 18613ba8e19..74c282f41f4 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit 18613ba8e19a47e4dfafa389d99243e53a0ca39a
+Subproject commit 74c282f41f479d958c74c948b73cb128e5cf3614

From 0f8b69c9be85e76c8110208194a386b81595e37b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 20 Jun 2019 11:11:13 -0400
Subject: [PATCH 0625/1648] arhag's change

---
 scripts/eosio_build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 3acd08e2840..4b601804e03 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -108,7 +108,8 @@ if [ $# -ne 0 ]; then
    done
 fi
 
-[[ ! -d scripts ]] && echo "You must run this script from the eos root." && exit 1
+# Ensure we're in the repo root and not inside of scripts
+cd $( dirname "${BASH_SOURCE[0]}" )/..
 
 # Load eosio specific helper functions
 . ./scripts/helpers/eosio.sh

From d64683be3d512862944008f53f05447240ebffe2 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 20 Jun 2019 11:27:28 -0400
Subject: [PATCH 0626/1648] bats changes to test running from non-root dir

---
 tests/bash-bats/eosio_build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index 29a5cf82eda..c2a3cbc8fb8 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -30,11 +30,12 @@ TEST_LABEL="[eosio_build]"
         [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
     fi 
 
-    # -P with -y
-    run bash -c "./$SCRIPT_LOCATION -y -P"
+    cd .. # Also test that we can run the script from a directory other than the root
+    run bash -c "./eos/$SCRIPT_LOCATION -y -P"
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit
+    cd eos
     # -P with prompts
     run bash -c "printf \"n\nn\nn\n\" | ./$SCRIPT_LOCATION -P"
     [[ "${output}" =~ .*User.aborted.* ]] || exit

From bf171277417e7ed57f1f9761f5418e7ab17af156 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 20 Jun 2019 13:49:55 -0400
Subject: [PATCH 0627/1648] Added removal of double quotes in version numbers.

---
 scripts/.environment | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/.environment b/scripts/.environment
index 4a60c29a12b..d5542098253 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -2,10 +2,10 @@ export SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export REPO_ROOT="${SCRIPT_DIR}/.."
 export BUILD_DIR="${REPO_ROOT}/build"
 
-export EOSIO_VERSION_MAJOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_MAJOR" | tail -1 | sed 's/.*VERSION_MAJOR //g' | sed 's/ //g' | cut -d\) -f1)
-export EOSIO_VERSION_MINOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_MINOR" | tail -1 | sed 's/.*VERSION_MINOR //g' | sed 's/ //g' | cut -d\) -f1)
-export EOSIO_VERSION_PATCH=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_PATCH" | tail -1 | sed 's/.*VERSION_PATCH //g' | sed 's/ //g' | cut -d\) -f1)
-export EOSIO_VERSION_SUFFIX=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_SUFFIX" | tail -1 | sed 's/.*VERSION_SUFFIX //g' | sed 's/ //g' | cut -d\) -f1)
+export EOSIO_VERSION_MAJOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_MAJOR" | tail -1 | sed 's/.*VERSION_MAJOR //g' | sed 's/ //g' | sed 's/"//g' | cut -d\) -f1)
+export EOSIO_VERSION_MINOR=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_MINOR" | tail -1 | sed 's/.*VERSION_MINOR //g' | sed 's/ //g' | sed 's/"//g' | cut -d\) -f1)
+export EOSIO_VERSION_PATCH=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_PATCH" | tail -1 | sed 's/.*VERSION_PATCH //g' | sed 's/ //g' | sed 's/"//g' | cut -d\) -f1)
+export EOSIO_VERSION_SUFFIX=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*set[[:blank:]]*\([[:blank:]]*VERSION_SUFFIX" | tail -1 | sed 's/.*VERSION_SUFFIX //g' | sed 's/ //g' | sed 's/"//g' | cut -d\) -f1)
 export EOSIO_VERSION="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}"
 if [[ -z $EOSIO_VERSION_SUFFIX ]]; then
     export EOSIO_VERSION_FULL="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}.${EOSIO_VERSION_PATCH}"

From 13fd854914b376068abb30393eb4fbb58d3689fb Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 20 Jun 2019 13:57:42 -0400
Subject: [PATCH 0628/1648] use pack_size when appropriate

---
 libraries/chain/include/eosio/chain/authority.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/authority.hpp b/libraries/chain/include/eosio/chain/authority.hpp
index a23896ac17e..a762c27b3e3 100644
--- a/libraries/chain/include/eosio/chain/authority.hpp
+++ b/libraries/chain/include/eosio/chain/authority.hpp
@@ -197,9 +197,8 @@ struct shared_authority {
                keys.emplace_back(k1r1, k.weight);
             },
             [&](const fc::crypto::webauthn::public_key& wa) {
-               fc::datastream<size_t> dsz;
-               fc::raw::pack(dsz, wa);
-               shared_string wa_ss(dsz.tellp(), boost::container::default_init, keys.get_allocator());
+               size_t psz = fc::raw::pack_size(wa);
+               shared_string wa_ss(psz, boost::container::default_init, keys.get_allocator());
                fc::datastream<char*> ds(wa_ss.data(), wa_ss.size());
                fc::raw::pack(ds, wa);
 

From a21a381bb261d28338070d9a1a47b7453dd6fd0d Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 20 Jun 2019 14:23:13 -0400
Subject: [PATCH 0629/1648] upgrade centos7 to devtoolset-8

---
 scripts/eosio_build_centos.sh         | 10 +++++-----
 scripts/helpers/general.sh            |  8 ++++----
 tests/bash-bats/eosio_build_centos.sh | 10 +++++-----
 tests/bash-bats/helpers/functions.sh  |  3 +--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh
index e08a01d266f..44a96474fe0 100755
--- a/scripts/eosio_build_centos.sh
+++ b/scripts/eosio_build_centos.sh
@@ -12,14 +12,14 @@ echo "Disk space available: ${DISK_AVAIL}G"
 
 echo ""
 
-# Repo necessary for rh-python3 and devtoolset-7
+# Repo necessary for rh-python3 and devtoolset-8
 ensure-scl
 # GCC7 for Centos / Needed for CMAKE install even if we're pinning
 ensure-devtoolset
-if [[ -d /opt/rh/devtoolset-7 ]]; then
-	echo "${COLOR_CYAN}[Enabling Centos devtoolset-7 (so we can use GCC 7)]${COLOR_NC}"
-	execute-always source /opt/rh/devtoolset-7/enable
-	echo " - ${COLOR_GREEN}Centos devtoolset-7 successfully enabled!${COLOR_NC}"
+if [[ -d /opt/rh/devtoolset-8 ]]; then
+	echo "${COLOR_CYAN}[Enabling Centos devtoolset-8 (for newer GCC)]${COLOR_NC}"
+	execute-always source /opt/rh/devtoolset-8/enable
+	echo " - ${COLOR_GREEN}Centos devtoolset-8 successfully enabled!${COLOR_NC}"
 fi
 # Handle clang/compiler
 ensure-compiler
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index bc799871b68..b6e8fd57363 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -150,16 +150,16 @@ function ensure-scl() {
 }
 
 function ensure-devtoolset() {
-    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-7 with C++7]${COLOR_NC}"
-    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-7-[0-9].*' || true )
+    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-8]${COLOR_NC}"
+    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-8-[0-9].*' || true )
     if [[ -z "${DEVTOOLSET}" ]]; then
         while true; do
             [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Not Found: Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
             echo ""
             case $PROCEED in
                 "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* ) install-package devtoolset-7; break;;
-                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-7."; break;;
+                0 | true | [Yy]* ) install-package devtoolset-8; break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-8."; break;;
                 * ) echo "Please type 'y' for yes or 'n' for no.";;
             esac
         done
diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index 2d18263dbe9..e8fa93c3708 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -25,12 +25,12 @@ export TEST_LABEL="[eosio_build_centos]"
     set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
 
     execute-always yum -y --enablerepo=extras install centos-release-scl &>/dev/null
-    install-package devtoolset-7 WETRUN &>/dev/null
-    # Ensure SCL and devtoolset-7 for c++ binary installation
+    install-package devtoolset-8 WETRUN &>/dev/null
+    # Ensure SCL and devtoolset-8 for c++ binary installation
     run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION}"
     [[ ! -z $(echo "${output}" | grep "centos-release-scl-2-3.el7.centos.noarch found") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "devtoolset-7-7.1-4.el7.x86_64 found") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-7/enable") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "devtoolset-8-8.0-2.el7.0.1.x86_64 found") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-8/enable") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
@@ -42,7 +42,7 @@ export TEST_LABEL="[eosio_build_centos]"
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
     [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
-    uninstall-package devtoolset-7* WETRUN &>/dev/null
+    uninstall-package devtoolset-8* WETRUN &>/dev/null
     uninstall-package centos-release-scl WETRUN &>/dev/null
 
 }
\ No newline at end of file
diff --git a/tests/bash-bats/helpers/functions.sh b/tests/bash-bats/helpers/functions.sh
index eeaa1bd495f..0aabbbe947b 100644
--- a/tests/bash-bats/helpers/functions.sh
+++ b/tests/bash-bats/helpers/functions.sh
@@ -17,10 +17,9 @@ setup-bats-dirs
 
 function teardown() { # teardown is run once after each test, even if it fails
   [[ -d "$HOME" ]] && rm -rf "$HOME"
-  [[ -d /opt/rh/devtoolset-7 ]] && rm -rf /opt/rh/devtoolset-7
   uninstall-package which WETRUN
   uninstall-package sudo WETRUN
-  uninstall-package devtoolset-7* WETRUN
+  uninstall-package devtoolset-8* WETRUN
   uninstall-package centos-release-scl
   uninstall-package gcc-c++ WETRUN
   uninstall-package build-essential WETRUN

From cdfb2dc5e08b03cdd3fed42bb889765c044d4f56 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 20 Jun 2019 14:54:11 -0400
Subject: [PATCH 0630/1648] install system clang on ubuntu 18 & amz2

Also, make sure that deps are installed before checking if a sufficient compiler is present
---
 scripts/eosio_build_amazonlinux.sh    |  4 ++--
 scripts/eosio_build_amazonlinux2_deps |  3 ++-
 scripts/eosio_build_ubuntu.sh         | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/eosio_build_amazonlinux.sh b/scripts/eosio_build_amazonlinux.sh
index a8622caad08..8e748c3cd22 100755
--- a/scripts/eosio_build_amazonlinux.sh
+++ b/scripts/eosio_build_amazonlinux.sh
@@ -14,11 +14,11 @@ fi
 [[ $MEM_GIG -lt 7 ]] && echo "Your system must have 7 or more Gigabytes of physical memory installed." && exit 1
 [[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
 
-# Handle clang/compiler
-ensure-compiler
 # Ensure packages exist
 ($PIN_COMPILER && $BUILD_CLANG) && EXTRA_DEPS=(gcc-c++,rpm\ -qa)
 ensure-yum-packages $DEPS_FILE $(echo ${EXTRA_DEPS[@]})
+# Handle clang/compiler
+ensure-compiler
 # CMAKE Installation
 ensure-cmake
 # CLANG Installation
diff --git a/scripts/eosio_build_amazonlinux2_deps b/scripts/eosio_build_amazonlinux2_deps
index 253958b3102..c599e9b1ae4 100755
--- a/scripts/eosio_build_amazonlinux2_deps
+++ b/scripts/eosio_build_amazonlinux2_deps
@@ -18,4 +18,5 @@ python3-devel,rpm -qa
 python-devel,rpm -qa
 libedit-devel,rpm -qa
 doxygen,rpm -qa
-graphviz,rpm -qa
\ No newline at end of file
+graphviz,rpm -qa
+clang,rpm -qa
\ No newline at end of file
diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 2d4d6295e93..0c267b976b4 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -10,15 +10,15 @@ echo "Disk space available: ${DISK_AVAIL}G"
 [[ $MEM_GIG -lt 7 ]] && echo "Your system must have 7 or more Gigabytes of physical memory installed." && exit 1
 [[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
 
-# C++7 for Ubuntu 18 (16 build-essential has cpp5)
-( [[ $PIN_COMPILER == false ]] && [[ "$(echo ${VERSION_ID})" == "18.04" ]] ) && ensure-build-essential
-# Handle clang/compiler
-ensure-compiler
+# system clang and build essential for Ubuntu 18 (16 too old)
+( [[ $PIN_COMPILER == false ]] && [[ "$(echo ${VERSION_ID})" == "18.04" ]] ) && ensure-build-essential && EXTRA_DEPS=(clang,dpkg\ -s)
 # Ensure packages exist
-([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS=(llvm-4.0,dpkg\ -s libclang-4.0-dev,dpkg\ -s)
+([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS+=(llvm-4.0,dpkg\ -s)
 $ENABLE_COVERAGE_TESTING && EXTRA_DEPS+=(lcov,dpkg\ -s)
 ensure-apt-packages "${REPO_ROOT}/scripts/eosio_build_ubuntu_deps" $(echo ${EXTRA_DEPS[@]})
 echo ""
+# Handle clang/compiler
+ensure-compiler
 # CMAKE Installation
 ensure-cmake
 # CLANG Installation

From 49a596c2e97350217bbfadd21d3e23787808278d Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 20 Jun 2019 15:03:30 -0400
Subject: [PATCH 0631/1648] set clang to default compiler on ubuntu,amz2,macos

also bump the minimum version of clang the script looks for to 6.0 (cmake check is left at 5.0 for now still, still that still technically compiles eosio okay)
---
 scripts/helpers/eosio.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 98a676ab452..077a4675230 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -121,8 +121,14 @@ function prompt-mongo-install() {
 }
 
 function ensure-compiler() {
-    export CXX=${CXX:-c++}
-    export CC=${CC:-cc}
+    DEFAULT_CXX=clang++
+    DEFAULT_CC=clang
+    if [[ $NAME == "CentOS Linux" ]]; then
+        DEFAULT_CXX=g++
+        DEFAULT_CC=gcc
+    fi
+    export CXX=${CXX:-$DEFAULT_CXX}
+    export CC=${CC:-$DEFAULT_CC}
     if $PIN_COMPILER || [[ -f $CLANG_ROOT/bin/clang++ ]]; then
         export PIN_COMPILER=true
         export BUILD_CLANG=true
@@ -141,9 +147,9 @@ function ensure-compiler() {
                 [[ $( $(which $CXX) --version | cut -d ' ' -f 4 | cut -d '.' -f 1 | head -n 1 ) -lt 10 ]] && export NO_CPP17=true
             else
                 if [[ $( $(which $CXX) --version | cut -d ' ' -f 3 | head -n 1 | cut -d '.' -f1) =~ ^[0-9]+$ ]]; then # Check if the version message cut returns an integer
-                    [[ $( $(which $CXX) --version | cut -d ' ' -f 3 | head -n 1 | cut -d '.' -f1) < 5 ]] && export NO_CPP17=true
+                    [[ $( $(which $CXX) --version | cut -d ' ' -f 3 | head -n 1 | cut -d '.' -f1) < 6 ]] && export NO_CPP17=true
                 elif [[ $(clang --version | cut -d ' ' -f 4 | head -n 1 | cut -d '.' -f1) =~ ^[0-9]+$ ]]; then # Check if the version message cut returns an integer
-                    [[ $( $(which $CXX) --version | cut -d ' ' -f 4 | cut -d '.' -f 1 | head -n 1 ) < 5 ]] && export NO_CPP17=true
+                    [[ $( $(which $CXX) --version | cut -d ' ' -f 4 | cut -d '.' -f 1 | head -n 1 ) < 6 ]] && export NO_CPP17=true
                 fi
             fi
         else

From 88693fa140dae1b9d6c5731b44120787a5b95391 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 20 Jun 2019 16:20:33 -0400
Subject: [PATCH 0632/1648] removed lrt from pipeline.jsonc

---
 pipeline.jsonc | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index 1b430f8eb47..eecbb9795eb 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -1,12 +1,4 @@
 {
-    "eosio-lrt":
-    {
-        "environment":
-        {
-            "BUILD_FLAGS": "-y -P -m",
-            "IMAGE_TAG": "_1-8-0-rc2"
-        }
-    },
     "eos-multiversion-tests":
     {
         "environment":

From 621c46eebf315c12ef916643864c9ed0b7a5292a Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 21 Jun 2019 11:41:40 +0800
Subject: [PATCH 0633/1648] Expand get_table_rows with more2 field when doing
 lookup with primary key

---
 plugins/chain_plugin/chain_plugin.cpp                      | 7 +++++++
 .../include/eosio/chain_plugin/chain_plugin.hpp            | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 085acbd9551..1a832ff1e2b 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1439,6 +1439,13 @@ double convert_to_type(const string& str, const string& desc) {
    return val;
 }
 
+template<typename Type>
+string convert_to_string(const Type& source, const string& key_type, const string& encode_type, const string& desc) {
+   try {
+      return fc::variant(source).as<string>();
+   } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} from '${source}' to string.", ("desc", desc)("source",source) )
+}
+
 abi_def get_abi( const controller& db, const name& account ) {
    const auto &d = db.db();
    const account_object *code_accnt = d.find<account_object, by_name>(account);
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index ed7c62b2751..25d134057c6 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -69,6 +69,9 @@ uint64_t convert_to_type(const string& str, const string& desc);
 template<>
 double convert_to_type(const string& str, const string& desc);
 
+template<typename Type>
+string convert_to_string(const Type& source, const string& key_type, const string& encode_type, const string& desc);
+
 class read_only {
    const controller& db;
    const fc::microseconds abi_serializer_max_time;
@@ -297,6 +300,7 @@ class read_only {
    struct get_table_rows_result {
       vector<fc::variant> rows; ///< one row per item, either encoded as hex String or JSON object
       bool                more = false; ///< true if last element in data is not the end and sizeof data() < limit
+      string              more2; ///< fill lower_bound with this value to fetch more rows
    };
 
    get_table_rows_result get_table_rows( const get_table_rows_params& params )const;
@@ -559,6 +563,7 @@ class read_only {
             }
             if( itr != end_itr ) {
                result.more = true;
+               result.more2 = convert_to_string(itr->primary_key, p.key_type, p.encode_type, "more2 - next lower bound");
             }
          };
 
@@ -739,7 +744,7 @@ FC_REFLECT(eosio::chain_apis::read_only::get_block_header_state_params, (block_n
 FC_REFLECT( eosio::chain_apis::read_write::push_transaction_results, (transaction_id)(processed) )
 
 FC_REFLECT( eosio::chain_apis::read_only::get_table_rows_params, (json)(code)(scope)(table)(table_key)(lower_bound)(upper_bound)(limit)(key_type)(index_position)(encode_type)(reverse)(show_payer) )
-FC_REFLECT( eosio::chain_apis::read_only::get_table_rows_result, (rows)(more) );
+FC_REFLECT( eosio::chain_apis::read_only::get_table_rows_result, (rows)(more)(more2) );
 
 FC_REFLECT( eosio::chain_apis::read_only::get_table_by_scope_params, (code)(table)(lower_bound)(upper_bound)(limit)(reverse) )
 FC_REFLECT( eosio::chain_apis::read_only::get_table_by_scope_result_row, (code)(scope)(table)(payer)(count));

From 51582b2c048245f87a304f3091b1435916ccbe46 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 21 Jun 2019 11:42:04 +0800
Subject: [PATCH 0634/1648] Replace fixed_key with fixed_bytes from eosio.cdt

---
 .../chain/include/eosio/chain/fixed_bytes.hpp | 394 ++++++++++++++++++
 .../chain/include/eosio/chain/fixed_key.hpp   | 225 ----------
 2 files changed, 394 insertions(+), 225 deletions(-)
 create mode 100644 libraries/chain/include/eosio/chain/fixed_bytes.hpp
 delete mode 100644 libraries/chain/include/eosio/chain/fixed_key.hpp

diff --git a/libraries/chain/include/eosio/chain/fixed_bytes.hpp b/libraries/chain/include/eosio/chain/fixed_bytes.hpp
new file mode 100644
index 00000000000..d1a4099153a
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/fixed_bytes.hpp
@@ -0,0 +1,394 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#pragma once
+
+#include <eosio/chain/types.hpp>
+
+// #include <fc/exception/exception.hpp>
+
+#include <array>
+#include <algorithm>
+#include <functional>
+#include <type_traits>
+
+namespace eosio {
+
+   /// @cond IMPLEMENTATIONS
+
+   using chain::uint128_t;
+
+   template<size_t Size>
+   class fixed_bytes;
+
+   template<size_t Size>
+   bool operator ==(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+   template<size_t Size>
+   bool operator !=(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+   template<size_t Size>
+   bool operator >(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+   template<size_t Size>
+   bool operator <(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+   template<size_t Size>
+   bool operator >=(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+   template<size_t Size>
+   bool operator <=(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+   /// @endcond
+
+    /**
+     *  @defgroup fixed_bytes Fixed Size Byte Array
+     *  @ingroup core
+     *  @ingroup types
+     *  @brief Fixed size array of bytes sorted lexicographically
+     */
+
+   /**
+    *  Fixed size byte array sorted lexicographically
+    *
+    *  @ingroup fixed_bytes
+    *  @tparam Size - Size of the fixed_bytes object
+    */
+   template<size_t Size>
+   class fixed_bytes {
+      private:
+
+         template<bool...> struct bool_pack;
+         template<bool... bs>
+         using all_true = std::is_same< bool_pack<bs..., true>, bool_pack<true, bs...> >;
+
+         template<typename Word, size_t NumWords>
+         static void set_from_word_sequence(const Word* arr_begin, const Word* arr_end, fixed_bytes<Size>& key)
+         {
+            auto itr = key._data.begin();
+            word_t temp_word = 0;
+            const size_t sub_word_shift = 8 * sizeof(Word);
+            const size_t num_sub_words = sizeof(word_t) / sizeof(Word);
+            auto sub_words_left = num_sub_words;
+            for( auto w_itr = arr_begin; w_itr != arr_end; ++w_itr ) {
+               if( sub_words_left > 1 ) {
+                   temp_word |= static_cast<word_t>(*w_itr);
+                   temp_word <<= sub_word_shift;
+                   --sub_words_left;
+                   continue;
+               }
+
+               FC_ASSERT( sub_words_left == 1, "unexpected error in fixed_bytes constructor" );
+               temp_word |= static_cast<word_t>(*w_itr);
+               sub_words_left = num_sub_words;
+
+               *itr = temp_word;
+               temp_word = 0;
+               ++itr;
+            }
+            if( sub_words_left != num_sub_words ) {
+               if( sub_words_left > 1 )
+                  temp_word <<= 8 * (sub_words_left-1);
+               *itr = temp_word;
+            }
+         }
+
+      public:
+         typedef uint128_t word_t;
+
+         /**
+          * Get number of words contained in this fixed_bytes object. A word is defined to be 16 bytes in size
+          */
+
+         static constexpr size_t num_words() { return (Size + sizeof(word_t) - 1) / sizeof(word_t); }
+
+         /**
+          * Get number of padded bytes contained in this fixed_bytes object. Padded bytes are the remaining bytes
+          * inside the fixed_bytes object after all the words are allocated
+          */
+         static constexpr size_t padded_bytes() { return num_words() * sizeof(word_t) - Size; }
+
+         /**
+         * Default constructor to fixed_bytes object which initializes all bytes to zero
+         */
+         constexpr fixed_bytes() : _data() {}
+
+         /**
+         * Constructor to fixed_bytes object from std::array of num_words() word_t types
+         *
+         * @param arr    data
+         */
+         fixed_bytes(const std::array<word_t, num_words()>& arr)
+         {
+           std::copy(arr.begin(), arr.end(), _data.begin());
+         }
+
+         /**
+         * Constructor to fixed_bytes object from std::array of Word types smaller in size than word_t
+         *
+         * @param arr - Source data
+         */
+         template<typename Word, size_t NumWords,
+                  typename Enable = typename std::enable_if<std::is_integral<Word>::value &&
+                                                             std::is_unsigned<Word>::value &&
+                                                             !std::is_same<Word, bool>::value &&
+                                                             std::less<size_t>{}(sizeof(Word), sizeof(word_t))>::type >
+         fixed_bytes(const std::array<Word, NumWords>& arr)
+         {
+            static_assert( sizeof(word_t) == (sizeof(word_t)/sizeof(Word)) * sizeof(Word),
+                           "size of the backing word size is not divisible by the size of the array element" );
+            static_assert( sizeof(Word) * NumWords <= Size, "too many words supplied to fixed_bytes constructor" );
+
+            set_from_word_sequence<Word, NumWords>(arr.data(), arr.data() + arr.size(), *this);
+         }
+
+         /**
+         * Constructor to fixed_bytes object from fixed-sized C array of Word types smaller in size than word_t
+         *
+         * @param arr - Source data
+         */
+         template<typename Word, size_t NumWords,
+                  typename Enable = typename std::enable_if<std::is_integral<Word>::value &&
+                                                             std::is_unsigned<Word>::value &&
+                                                             !std::is_same<Word, bool>::value &&
+                                                             std::less<size_t>{}(sizeof(Word), sizeof(word_t))>::type >
+         fixed_bytes(const Word(&arr)[NumWords])
+         {
+            static_assert( sizeof(word_t) == (sizeof(word_t)/sizeof(Word)) * sizeof(Word),
+                           "size of the backing word size is not divisible by the size of the array element" );
+            static_assert( sizeof(Word) * NumWords <= Size, "too many words supplied to fixed_bytes constructor" );
+
+            set_from_word_sequence<Word, NumWords>(arr, arr + NumWords, *this);
+         }
+
+         /**
+         *  Create a new fixed_bytes object from a sequence of words
+         *
+         *  @tparam FirstWord - The type of the first word in the sequence
+         *  @tparam Rest - The type of the remaining words in the sequence
+         *  @param first_word - The first word in the sequence
+         *  @param rest - The remaining words in the sequence
+         */
+         template<typename FirstWord, typename... Rest>
+         static
+         fixed_bytes<Size>
+         make_from_word_sequence(typename std::enable_if<std::is_integral<FirstWord>::value &&
+                                                          std::is_unsigned<FirstWord>::value &&
+                                                          !std::is_same<FirstWord, bool>::value &&
+                                                          sizeof(FirstWord) <= sizeof(word_t) &&
+                                                          all_true<(std::is_same<FirstWord, Rest>::value)...>::value,
+                                                         FirstWord>::type first_word,
+                                 Rest... rest)
+         {
+            static_assert( sizeof(word_t) == (sizeof(word_t)/sizeof(FirstWord)) * sizeof(FirstWord),
+                           "size of the backing word size is not divisible by the size of the words supplied as arguments" );
+            static_assert( sizeof(FirstWord) * (1 + sizeof...(Rest)) <= Size, "too many words supplied to make_from_word_sequence" );
+
+            fixed_bytes<Size> key;
+            std::array<FirstWord, 1+sizeof...(Rest)> arr{{ first_word, rest... }};
+            set_from_word_sequence<FirstWord, 1+sizeof...(Rest)>(arr.data(), arr.data() + arr.size(), key);
+            return key;
+         }
+
+         /**
+          * Get the contained std::array
+          */
+         const auto& get_array()const { return _data; }
+
+         /**
+          * Get the underlying data of the contained std::array
+          */
+         auto data() { return _data.data(); }
+
+         /// @cond INTERNAL
+
+         /**
+          * Get the underlying data of the contained std::array
+          */
+         auto data()const { return _data.data(); }
+
+         /// @endcond
+
+         /**
+          * Get the size of the contained std::array
+          */
+         auto size()const { return _data.size(); }
+
+
+         /**
+          * Extract the contained data as an array of bytes
+          *
+          * @return - the extracted data as array of bytes
+          */
+         std::array<uint8_t, Size> extract_as_byte_array()const {
+            std::array<uint8_t, Size> arr;
+
+            const size_t num_sub_words = sizeof(word_t);
+
+            auto arr_itr  = arr.begin();
+            auto data_itr = _data.begin();
+
+            for( size_t counter = _data.size(); counter > 0; --counter, ++data_itr ) {
+               size_t sub_words_left = num_sub_words;
+
+               auto temp_word = *data_itr;
+               if( counter == 1 ) { // If last word in _data array...
+                  sub_words_left -= padded_bytes();
+                  temp_word >>= 8*padded_bytes();
+               }
+               for( ; sub_words_left > 0; --sub_words_left ) {
+                  *(arr_itr + sub_words_left - 1) = static_cast<uint8_t>(temp_word & 0xFF);
+                  temp_word >>= 8;
+               }
+               arr_itr += num_sub_words;
+            }
+
+            return arr;
+         }
+
+         /**
+          * Prints fixed_bytes as a hexidecimal string
+          *
+          * @param val to be printed
+          */
+         inline void print()const {
+            auto arr = extract_as_byte_array();
+            printhex(static_cast<const void*>(arr.data()), arr.size());
+         }
+
+         /// @cond OPERATORS
+
+         friend bool operator == <>(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+         friend bool operator != <>(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+         friend bool operator > <>(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+         friend bool operator < <>(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+         friend bool operator >= <>(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+         friend bool operator <= <>(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2);
+
+         /// @endcond
+
+      private:
+
+         std::array<word_t, num_words()> _data;
+    };
+
+  /// @cond IMPLEMENTATIONS
+
+   /**
+    * Lexicographically compares two fixed_bytes variables c1 and c2
+    *
+    * @param c1 - First fixed_bytes object to compare
+    * @param c2 - Second fixed_bytes object to compare
+    * @return if c1 == c2, return true, otherwise false
+    */
+   template<size_t Size>
+   bool operator ==(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2) {
+      return c1._data == c2._data;
+   }
+
+   /**
+    * Lexicographically compares two fixed_bytes variables c1 and c2
+    *
+    * @param c1 - First fixed_bytes object to compare
+    * @param c2 - Second fixed_bytes object to compare
+    * @return if c1 != c2, return true, otherwise false
+    */
+   template<size_t Size>
+   bool operator !=(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2) {
+      return c1._data != c2._data;
+   }
+
+   /**
+    * Lexicographically compares two fixed_bytes variables c1 and c2
+    *
+    * @param c1 - First fixed_bytes object to compare
+    * @param c2 - Second fixed_bytes object to compare
+    * @return if c1 > c2, return true, otherwise false
+    */
+   template<size_t Size>
+   bool operator >(const fixed_bytes<Size>& c1, const fixed_bytes<Size>& c2) {
+      return c1._data > c2._data;
+   }
+
+   /**
+    * Lexicographically compares two fixed_bytes variables c1 and c2
+    *
+    * @param c1 - First fixed_bytes object to compare
+    * @param c2 - Second fixed_bytes object to compare
+    * @return if c1 < c2, return true, otherwise false
+    */
+   template<size_t Size>
+   bool operator <(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2) {
+      return c1._data < c2._data;
+   }
+
+   /**
+    * Lexicographically compares two fixed_bytes variables c1 and c2
+    *
+    * @param c1 - First fixed_bytes object to compare
+    * @param c2 - Second fixed_bytes object to compare
+    * @return if c1 >= c2, return true, otherwise false
+    */
+   template<size_t Size>
+   bool operator >=(const fixed_bytes<Size>& c1, const fixed_bytes<Size>& c2) {
+      return c1._data >= c2._data;
+   }
+
+   /**
+    * Lexicographically compares two fixed_bytes variables c1 and c2
+    *
+    * @param c1 - First fixed_bytes object to compare
+    * @param c2 - Second fixed_bytes object to compare
+    * @return if c1 <= c2, return true, otherwise false
+    */
+   template<size_t Size>
+   bool operator <=(const fixed_bytes<Size> &c1, const fixed_bytes<Size> &c2) {
+      return c1._data <= c2._data;
+   }
+
+
+   using checksum160 = fixed_bytes<20>;
+   using checksum256 = fixed_bytes<32>;
+   using checksum512 = fixed_bytes<64>;
+
+   /**
+    *  Serialize a fixed_bytes into a stream
+    *
+    *  @brief Serialize a fixed_bytes
+    *  @param ds - The stream to write
+    *  @param d - The value to serialize
+    *  @tparam DataStream - Type of datastream buffer
+    *  @return DataStream& - Reference to the datastream
+    */
+   template<typename DataStream, size_t Size>
+   inline DataStream& operator<<(DataStream& ds, const fixed_bytes<Size>& d) {
+      auto arr = d.extract_as_byte_array();
+      ds.write( (const char*)arr.data(), arr.size() );
+      return ds;
+   }
+
+   /**
+    *  Deserialize a fixed_bytes from a stream
+    *
+    *  @brief Deserialize a fixed_bytes
+    *  @param ds - The stream to read
+    *  @param d - The destination for deserialized value
+    *  @tparam DataStream - Type of datastream buffer
+    *  @return DataStream& - Reference to the datastream
+    */
+   template<typename DataStream, size_t Size>
+   inline DataStream& operator>>(DataStream& ds, fixed_bytes<Size>& d) {
+      std::array<uint8_t, Size> arr;
+      ds.read( (char*)arr.data(), arr.size() );
+      d = fixed_bytes<Size>( arr );
+      return ds;
+   }
+
+   /// @endcond
+}
diff --git a/libraries/chain/include/eosio/chain/fixed_key.hpp b/libraries/chain/include/eosio/chain/fixed_key.hpp
deleted file mode 100644
index 5dd90f901ad..00000000000
--- a/libraries/chain/include/eosio/chain/fixed_key.hpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-#pragma once
-
-#include <array>
-#include <algorithm>
-#include <type_traits>
-
-#include <fc/exception/exception.hpp>
-#include <eosio/chain/exceptions.hpp>
-namespace eosio {
-
-   using chain::uint128_t;
-
-   template<size_t Size>
-   class fixed_key;
-
-   template<size_t Size>
-   bool operator==(const fixed_key<Size> &c1, const fixed_key<Size> &c2);
-
-   template<size_t Size>
-   bool operator!=(const fixed_key<Size> &c1, const fixed_key<Size> &c2);
-
-   template<size_t Size>
-   bool operator>(const fixed_key<Size> &c1, const fixed_key<Size> &c2);
-
-   template<size_t Size>
-   bool operator<(const fixed_key<Size> &c1, const fixed_key<Size> &c2);
-
-    /**
-    *  @defgroup fixed_key fixed size key sorted lexicographically
-    *  @ingroup types
-    * @{
-    */
-   template<size_t Size>
-   class fixed_key {
-      private:
-
-         template<bool...> struct bool_pack;
-         template<bool... bs>
-         using all_true = std::is_same< bool_pack<bs..., true>, bool_pack<true, bs...> >;
-
-         template<typename Word, size_t NumWords>
-         static void set_from_word_sequence(const std::array<Word, NumWords>& arr, fixed_key<Size>& key)
-         {
-            auto itr = key._data.begin();
-            word_t temp_word = 0;
-            const size_t sub_word_shift = 8 * sizeof(Word);
-            const size_t num_sub_words = sizeof(word_t) / sizeof(Word);
-            auto sub_words_left = num_sub_words;
-            for( auto&& w : arr ) {
-               if( sub_words_left > 1 ) {
-                   temp_word |= static_cast<word_t>(w);
-                   temp_word <<= sub_word_shift;
-                   --sub_words_left;
-                   continue;
-               }
-
-               EOS_ASSERT( sub_words_left == 1, chain::fixed_key_type_exception, "unexpected error in fixed_key constructor" );
-               temp_word |= static_cast<word_t>(w);
-               sub_words_left = num_sub_words;
-
-               *itr = temp_word;
-               temp_word = 0;
-               ++itr;
-            }
-            if( sub_words_left != num_sub_words ) {
-               if( sub_words_left > 1 )
-                  temp_word <<= 8 * (sub_words_left-1);
-               *itr = temp_word;
-            }
-         }
-
-      public:
-
-         typedef uint128_t word_t;
-
-         static constexpr size_t num_words() { return (Size + sizeof(word_t) - 1) / sizeof(word_t); }
-         static constexpr size_t padded_bytes() { return num_words() * sizeof(word_t) - Size; }
-
-         /**
-         * @brief Default constructor to fixed_key object
-         *
-         * @details Default constructor to fixed_key object which initializes all bytes to zero
-         */
-         fixed_key() : _data() {}
-
-         /**
-         * @brief Constructor to fixed_key object from std::array of num_words() words
-         *
-         * @details Constructor to fixed_key object from std::array of num_words() words
-         * @param arr    data
-         */
-         fixed_key(const std::array<word_t, num_words()>& arr)
-         {
-           std::copy(arr.begin(), arr.end(), _data.begin());
-         }
-
-         template<typename Word, size_t NumWords,
-                  typename Enable = typename std::enable_if<std::is_integral<Word>::value &&
-                                                             !std::is_same<Word, bool>::value &&
-                                                             sizeof(Word) < sizeof(word_t)>::type >
-         fixed_key(const std::array<Word, NumWords>& arr)
-         {
-            static_assert( sizeof(word_t) == (sizeof(word_t)/sizeof(Word)) * sizeof(Word),
-                           "size of the backing word size is not divisible by the size of the array element" );
-            static_assert( sizeof(Word) * NumWords <= Size, "too many words supplied to fixed_key constructor" );
-
-            set_from_word_sequence(arr, *this);
-         }
-
-         template<typename FirstWord, typename... Rest>
-         static
-         fixed_key<Size>
-         make_from_word_sequence(typename std::enable_if<std::is_integral<FirstWord>::value &&
-                                                          !std::is_same<FirstWord, bool>::value &&
-                                                          sizeof(FirstWord) <= sizeof(word_t) &&
-                                                          all_true<(std::is_same<FirstWord, Rest>::value)...>::value,
-                                                         FirstWord>::type first_word,
-                                 Rest... rest)
-         {
-            static_assert( sizeof(word_t) == (sizeof(word_t)/sizeof(FirstWord)) * sizeof(FirstWord),
-                           "size of the backing word size is not divisible by the size of the words supplied as arguments" );
-            static_assert( sizeof(FirstWord) * (1 + sizeof...(Rest)) <= Size, "too many words supplied to make_from_word_sequence" );
-
-            fixed_key<Size> key;
-            set_from_word_sequence(std::array<FirstWord, 1+sizeof...(Rest)>{{ first_word, rest... }}, key);
-            return key;
-         }
-
-         const auto& get_array()const { return _data; }
-
-         auto data() { return _data.data(); }
-         auto data()const { return _data.data(); }
-
-         auto size()const { return _data.size(); }
-
-         std::array<uint8_t, Size> extract_as_byte_array()const {
-            std::array<uint8_t, Size> arr;
-
-            const size_t num_sub_words = sizeof(word_t);
-
-            auto arr_itr  = arr.begin();
-            auto data_itr = _data.begin();
-
-            for( size_t counter = _data.size(); counter > 0; --counter, ++data_itr ) {
-               size_t sub_words_left = num_sub_words;
-
-               if( counter == 1 ) { // If last word in _data array...
-                  sub_words_left -= padded_bytes();
-               }
-               auto temp_word = *data_itr;
-               for( ; sub_words_left > 0; --sub_words_left ) {
-                  *(arr_itr + sub_words_left - 1) = static_cast<uint8_t>(temp_word & 0xFF);
-                  temp_word >>= 8;
-               }
-               arr_itr += num_sub_words;
-            }
-
-            return arr;
-         }
-
-         // Comparison operators
-         friend bool operator== <>(const fixed_key<Size> &c1, const fixed_key<Size> &c2);
-
-         friend bool operator!= <>(const fixed_key<Size> &c1, const fixed_key<Size> &c2);
-
-         friend bool operator> <>(const fixed_key<Size> &c1, const fixed_key<Size> &c2);
-
-         friend bool operator< <>(const fixed_key<Size> &c1, const fixed_key<Size> &c2);
-
-      private:
-
-         std::array<word_t, num_words()> _data;
-    };
-
-   /**
-    * @brief Compares two fixed_key variables c1 and c2
-    *
-    * @details Lexicographically compares two fixed_key variables c1 and c2
-    * @return if c1 == c2, return true, otherwise false
-    */
-   template<size_t Size>
-   bool operator==(const fixed_key<Size> &c1, const fixed_key<Size> &c2) {
-      return c1._data == c2._data;
-   }
-
-   /**
-    * @brief Compares two fixed_key variables c1 and c2
-    *
-    * @details Lexicographically compares two fixed_key variables c1 and c2
-    * @return if c1 != c2, return true, otherwise false
-    */
-   template<size_t Size>
-   bool operator!=(const fixed_key<Size> &c1, const fixed_key<Size> &c2) {
-      return c1._data != c2._data;
-   }
-
-   /**
-    * @brief Compares two fixed_key variables c1 and c2
-    *
-    * @details Lexicographically compares two fixed_key variables c1 and c2
-    * @return if c1 > c2, return true, otherwise false
-    */
-   template<size_t Size>
-   bool operator>(const fixed_key<Size> &c1, const fixed_key<Size> &c2) {
-      return c1._data > c2._data;
-   }
-
-   /**
-    * @brief Compares two fixed_key variables c1 and c2
-    *
-    * @details Lexicographically compares two fixed_key variables c1 and c2
-    * @return if c1 < c2, return true, otherwise false
-    */
-   template<size_t Size>
-   bool operator<(const fixed_key<Size> &c1, const fixed_key<Size> &c2) {
-      return c1._data < c2._data;
-   }
-   /// @} fixed_key
-
-   typedef fixed_key<32> key256;
-}

From 2c5c1586d6e2586cbd49dc3e83c6ee6fb22e4327 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 21 Jun 2019 11:43:15 +0800
Subject: [PATCH 0635/1648] Expand get_table_rows with more2 field when doing
 lookup with secondary index i64, i128, float64

---
 plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 25d134057c6..42399c984aa 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -489,6 +489,7 @@ class read_only {
             }
             if( itr != end_itr ) {
                result.more = true;
+               result.more2 = convert_to_string(itr->secondary_key, p.key_type, p.encode_type, "more2 - next lower bound");
             }
          };
 

From 6ac064640d1b4baf79033b18a9c2dc34350281c8 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Fri, 21 Jun 2019 10:54:37 -0400
Subject: [PATCH 0636/1648] update eos-vm

---
 libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp | 2 +-
 libraries/eos-vm                                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 72bf23931e2..20b111be80d 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -73,7 +73,7 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
       eos_vm_runtime();
       std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) override;
 
-      void immediately_exit_currently_running_module() override { _bkend->immediate_exit(); }
+      void immediately_exit_currently_running_module() override { _bkend->exit({}); }
 
    private:
       backend<apply_context>* _bkend;  // non owning pointer to allow for immediate exit
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 6df8280c6f3..cc5005c44c3 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 6df8280c6f340f2d372f80acef3047cef9e63bcc
+Subproject commit cc5005c44c3d07504dc983ef2a6c8ff52b002f6a

From 10b5c442ab0b16f7a72bde2b8609866368a9d145 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 21 Jun 2019 11:24:12 -0400
Subject: [PATCH 0637/1648] add script to enable autocomplete to script
 directory

---
 scripts/complete.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100755 scripts/complete.sh

diff --git a/scripts/complete.sh b/scripts/complete.sh
new file mode 100755
index 00000000000..608433af43e
--- /dev/null
+++ b/scripts/complete.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+_complete()
+{
+   COMPREPLY=()
+
+   local cur=${COMP_WORDS[COMP_CWORD]}
+   local cmd=${COMP_WORDS[0]}
+
+   choices=$( ${cmd} -- "${COMP_WORDS[@]:1}" 2>/dev/null )
+   ret=$?
+   
+   if [[ "$ret" -ne 0 ]]; then
+      return 0
+   fi
+
+   local DISPLAY_HELP=1
+   if [ "${__COMPLETE_PREV_LINE:-}" != "$COMP_LINE" ] ||
+       [ "${__COMPLETE_PREV_POINT:-}" != "$COMP_POINT" ]; then
+       __COMPLETE_PREV_LINE=$COMP_LINE
+       __COMPLETE_PREV_POINT=$COMP_POINT
+       DISPLAY_HELP=
+   fi
+
+   EXPANDED_PS1="$(bash --rcfile <(echo "PS1='$PS1'") -i <<<'' 2>&1 | head -n 1)"
+
+   if [[ ! -z "${choices[@]}" ]]; then
+      COMPREPLY=( $( compgen -W '${choices}' -- ${cur} ) )
+      
+      if [[ ! -z "${cur}" ]]; then
+         return 0 
+      fi
+   fi
+
+   if [ -n "$DISPLAY_HELP" ]; then 
+      ${cmd} -- "${COMP_WORDS[@]:1}" 2>&1 > /dev/null
+
+      if [[ -z "${choices[@]}" ]]; then
+         echo -n "${EXPANDED_PS1}"
+         echo -n "${COMP_WORDS[@]}"
+      fi
+   fi
+
+   return 0
+}
+
+complete -F _complete $@

From 8e7530fc6925e30c77561e4f76ec9a577b7448e5 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 21 Jun 2019 11:29:39 -0400
Subject: [PATCH 0638/1648] true fix

---
 scripts/helpers/eosio.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 8ce616b06a4..7926100cbde 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -164,8 +164,8 @@ function ensure-compiler() {
         which $CXX &>/dev/null || ( echo "${COLOR_RED}Unable to find compiler: Pass in the -P option if you wish for us to install it or install a C++17 compiler and set \$CXX and \$CC to the proper binary locations. ${COLOR_NC}"; exit 1 )
         # readlink on mac differs from linux readlink (mac doesn't have -f)
         [[ $ARCH == "Linux" ]] && READLINK_COMMAND="readlink -f" || READLINK_COMMAND="readlink"
-        COMPILER_TYPE=$( eval $READLINK_COMMAND $(which $CXX) )
-        [[ -z "${COMPILER_TYPE}" ]] && echo "${COLOR_RED}COMPILER_TYPE not set!${COLOR_NC}" && exit 1
+        COMPILER_TYPE=$( eval $READLINK_COMMAND $(which $CXX) || true )
+        [[ -z $COMPILER_TYPE ]] && echo "${COLOR_RED}COMPILER_TYPE not set!${COLOR_NC}" && exit 1
         if [[ $COMPILER_TYPE =~ "clang" ]]; then
             if [[ $ARCH == "Darwin" ]]; then
                 ### Check for apple clang version 10 or higher

From 3d87980e4842f8360c69335c0e81b9a08cda726c Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 21 Jun 2019 11:33:51 -0400
Subject: [PATCH 0639/1648] fix for if

---
 scripts/helpers/eosio.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 7926100cbde..3bea7b5f72b 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -165,8 +165,7 @@ function ensure-compiler() {
         # readlink on mac differs from linux readlink (mac doesn't have -f)
         [[ $ARCH == "Linux" ]] && READLINK_COMMAND="readlink -f" || READLINK_COMMAND="readlink"
         COMPILER_TYPE=$( eval $READLINK_COMMAND $(which $CXX) || true )
-        [[ -z $COMPILER_TYPE ]] && echo "${COLOR_RED}COMPILER_TYPE not set!${COLOR_NC}" && exit 1
-        if [[ $COMPILER_TYPE =~ "clang" ]]; then
+        if [[ $CXX =~ "clang" ]] || [[ $COMPILER_TYPE =~ "clang" ]]; then
             if [[ $ARCH == "Darwin" ]]; then
                 ### Check for apple clang version 10 or higher
                 [[ $( $(which $CXX) --version | cut -d ' ' -f 4 | cut -d '.' -f 1 | head -n 1 ) -lt 10 ]] && export NO_CPP17=true

From aadf32fef9a89c3593444ea585751962cf51fb39 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 11:53:43 -0400
Subject: [PATCH 0640/1648] Adjusted BATS to support new install path prompt.

---
 tests/bash-bats/eosio_build.sh                | 24 +++++++++----------
 tests/bash-bats/eosio_build_amazonlinux.sh    |  4 ++--
 tests/bash-bats/eosio_build_centos.sh         |  4 ++--
 tests/bash-bats/eosio_build_darwin.sh         |  6 ++---
 tests/bash-bats/eosio_build_ubuntu.sh         |  4 ++--
 tests/bash-bats/modules/dep_script_options.sh |  3 ++-
 tests/bash-bats/modules/mongodb.sh            |  4 ++--
 7 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index c2a3cbc8fb8..22e06f2fafa 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -14,7 +14,7 @@ TEST_LABEL="[eosio_build]"
     if [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]]; then
         # which package isn't installed
         uninstall-package which WETRUN &>/dev/null
-        run bash -c "printf \"n\nn\n\" | ./scripts/eosio_build.sh"
+        run bash -c "printf \"y\nn\nn\n\" | ./scripts/eosio_build.sh"
         [[ ! -z $(echo "${output}" | grep "EOSIO compiler checks require the 'which'") ]] || exit
         [[ ! -z $(echo "${output}" | grep "Please install the 'which'") ]] || exit
     fi
@@ -37,35 +37,35 @@ TEST_LABEL="[eosio_build]"
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit
     cd eos
     # -P with prompts
-    run bash -c "printf \"n\nn\nn\n\" | ./$SCRIPT_LOCATION -P"
+    run bash -c "printf \"y\nn\nn\nn\n\" | ./$SCRIPT_LOCATION -P"
     [[ "${output}" =~ .*User.aborted.* ]] || exit
     # lack of -m
     [[ ! -z $(echo "${output}" | grep "ENABLE_MONGO: false") ]] || exit
     [[ ! -z $(echo "${output}" | grep "INSTALL_MONGO: false") ]] || exit
     # lack of -i
-    [[ ! -z $(echo "${output}" | grep "INSTALL_LOCATION: ${HOME}") ]] || exit
+    # [[ ! -z $(echo "${output}" | grep "INSTALL_LOCATION: ${HOME}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO_INSTALL_DIR: ${HOME}/eosio/${EOSIO_VERSION}") ]] || exit
     ## -o
-    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -o Debug -P"
+    run bash -c "printf \"y\ny\nn\nn\n\" | ./$SCRIPT_LOCATION -o Debug -P"
     [[ ! -z $(echo "${output}" | grep "CMAKE_BUILD_TYPE: Debug") ]] || exit
     ## -s
-    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -s EOS2 -P"
+    run bash -c "printf \"y\ny\nn\nn\n\" | ./$SCRIPT_LOCATION -s EOS2 -P"
     [[ ! -z $(echo "${output}" | grep "CORE_SYMBOL_NAME: EOS2") ]] || exit
     ## -b
-    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -b /test -P"
+    run bash -c "printf \"y\ny\nn\nn\n\" | ./$SCRIPT_LOCATION -b /test -P"
     [[ ! -z $(echo "${output}" | grep "BOOST_LOCATION: /test") ]] || exit
     ## -i
-    run bash -c "printf \"y\nn\nn\n\"| ./$SCRIPT_LOCATION -i /NEWPATH -P"
-    [[ ! -z $(echo "${output}" | grep "INSTALL_LOCATION: /NEWPATH") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "TEMP_DIR: /NEWPATH/tmp") ]] || exit
+    run bash -c "printf \"y\ny\nn\nn\n\"| ./$SCRIPT_LOCATION -i /NEWPATH -P"
+    [[ ! -z $(echo "${output}" | grep "EOSIO_INSTALL_DIR: /NEWPATH") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "TEMP_DIR: ${HOME}/tmp") ]] || exit
     ## -c
-    run bash -c "printf \"y\nn\nn\n\"| ./$SCRIPT_LOCATION -c -P"
+    run bash -c "printf \"y\ny\nn\nn\n\"| ./$SCRIPT_LOCATION -c -P"
     [[ ! -z $(echo "${output}" | grep "ENABLE_COVERAGE_TESTING: true") ]] || exit
     ## -d
-    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -d -P"
+    run bash -c "printf \"y\ny\nn\nn\n\" | ./$SCRIPT_LOCATION -d -P"
     [[ ! -z $(echo "${output}" | grep "ENABLE_DOXYGEN: true") ]] || exit
     ## -m
-    run bash -c "printf \"y\nn\nn\n\" | ./$SCRIPT_LOCATION -m -y -P"
+    run bash -c "printf \"y\ny\nn\nn\n\" | ./$SCRIPT_LOCATION -m -y -P"
     [[ ! -z $(echo "${output}" | grep "ENABLE_MONGO: true") ]] || exit
     [[ ! -z $(echo "${output}" | grep "INSTALL_MONGO: true") ]] || exit
     ## -h / -anythingwedon'tsupport
diff --git a/tests/bash-bats/eosio_build_amazonlinux.sh b/tests/bash-bats/eosio_build_amazonlinux.sh
index f189c199ef8..ad372339378 100644
--- a/tests/bash-bats/eosio_build_amazonlinux.sh
+++ b/tests/bash-bats/eosio_build_amazonlinux.sh
@@ -23,7 +23,7 @@ export TEST_LABEL="[eosio_build_amazonlinux]"
 @test "${TEST_LABEL} > General" {
     set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
 
-    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P"
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P  -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     ### Make sure deps are loaded properly
     [[ ! -z $(echo "${output}" | grep "Executing: cd ${SRC_DIR}") ]] || exit
@@ -36,7 +36,7 @@ export TEST_LABEL="[eosio_build_amazonlinux]"
     fi
     [[ ! -z $(echo "${output}" | grep "sudo.*NOT.*found.") ]] || exit
     [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
-    [[ ! -z $(echo "${output}" | grep ${HOME}.*/src/boost) ]] || exit
+    [[ ! -z $(echo "${output}" | grep /NEWPATH*/src/boost) ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
     [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
     [[ -z $(echo "${output}" | grep "MongoDB C++ driver successfully installed") ]] || exit # Mongo is off
diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index e8fa93c3708..665d93cb086 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -27,7 +27,7 @@ export TEST_LABEL="[eosio_build_centos]"
     execute-always yum -y --enablerepo=extras install centos-release-scl &>/dev/null
     install-package devtoolset-8 WETRUN &>/dev/null
     # Ensure SCL and devtoolset-8 for c++ binary installation
-    run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION}"
+    run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION} -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "centos-release-scl-2-3.el7.centos.noarch found") ]] || exit
     [[ ! -z $(echo "${output}" | grep "devtoolset-8-8.0-2.el7.0.1.x86_64 found") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-8/enable") ]] || exit
@@ -38,7 +38,7 @@ export TEST_LABEL="[eosio_build_centos]"
     [[ ! -z $(echo "${output}" | grep "python.*found!") ]] || exit
     [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Ensuring CMAKE") ]] || exit
-    [[ ! -z $(echo "${output}" | grep ${HOME}.*/src/boost) ]] || exit
+    [[ ! -z $(echo "${output}" | grep /NEWPATH.*/src/boost) ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
     [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
diff --git a/tests/bash-bats/eosio_build_darwin.sh b/tests/bash-bats/eosio_build_darwin.sh
index 2279bff1b81..9ddec35b9af 100644
--- a/tests/bash-bats/eosio_build_darwin.sh
+++ b/tests/bash-bats/eosio_build_darwin.sh
@@ -24,19 +24,19 @@ export TEST_LABEL="[eosio_build_darwin]"
 @test "${TEST_LABEL} > General" {
     set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
 
-    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     ### Make sure deps are loaded properly
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: /usr/bin/xcode-select --install") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "automake.*NOT.*found") ]] || exit
+    # [[ ! -z $(echo "${output}" | grep "automake.*NOT.*found") ]] || exit
     [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
     rm -f $CMAKE
     [[ ! -z $(echo "${output}" | grep "[Updating HomeBrew]") ]] || exit
     [[ ! -z $(echo "${output}" | grep "brew tap eosio/eosio") ]] || exit
     [[ ! -z $(echo "${output}" | grep "brew install.*llvm@4.*") ]] || exit
     [[ ! -z $(echo "${output}" | grep "LLVM successfully linked from /usr/local/opt/llvm@4") ]] || exit
-    [[ ! -z $(echo "${output}" | grep ${HOME}.*/src/boost) ]] || exit
+    [[ ! -z $(echo "${output}" | grep /NEWPATH.*/src/boost) ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
     [[ ! -z $(echo "${output}" | grep " --with-iostreams --with-date_time") ]] || exit # BOOST
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
diff --git a/tests/bash-bats/eosio_build_ubuntu.sh b/tests/bash-bats/eosio_build_ubuntu.sh
index 49821366337..b664e5a0038 100644
--- a/tests/bash-bats/eosio_build_ubuntu.sh
+++ b/tests/bash-bats/eosio_build_ubuntu.sh
@@ -27,13 +27,13 @@ export TEST_LABEL="[eosio_build_ubuntu]"
 
     # Testing clang already existing (no pinning of clang8)
     [[ "$(echo ${VERSION_ID})" == "16.04" ]] && install-package clang WETRUN &>/dev/null || install-package build-essential WETRUN
-    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
     
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep python.*found) ]] || exit
     [[ ! -z $(echo "${output}" | grep make.*NOT.*found) ]] || exit
-    [[ ! -z $(echo "${output}" | grep ${HOME}.*/src/boost) ]] || exit
+    [[ ! -z $(echo "${output}" | grep /NEWPATH.*/src/boost) ]] || exit
     [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
     [[ ! -z $(echo "${output}" | grep " --with-iostreams --with-date_time") ]] || exit # BOOST
     if [[ "$(echo ${VERSION_ID})" == "18.04" ]]; then
diff --git a/tests/bash-bats/modules/dep_script_options.sh b/tests/bash-bats/modules/dep_script_options.sh
index a34968e5df7..e1519a2f890 100755
--- a/tests/bash-bats/modules/dep_script_options.sh
+++ b/tests/bash-bats/modules/dep_script_options.sh
@@ -4,7 +4,8 @@ load ../helpers/functions
 @test "${TEST_LABEL} > Testing Options" {
     mkdir -p $HOME/test/tmp
     run bash -c "./$SCRIPT_LOCATION -y -P -i $HOME/test -b /boost_tmp -m"
-    [[ ! -z $(echo "${output}" | grep "CMAKE_INSTALL_PREFIX='${HOME}/test/eosio/${EOSIO_VERSION}") ]] || exit
+    # echo $output >&3
+    [[ ! -z $(echo "${output}" | grep "CMAKE_INSTALL_PREFIX='${HOME}/test") ]] || exit
     [[ ! -z $(echo "${output}" | grep "@ /boost_tmp") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Ensuring MongoDB installation") ]] || exit
     [[ ! -z $(echo "${output}" | grep "MongoDB C driver successfully installed") ]] || exit
diff --git a/tests/bash-bats/modules/mongodb.sh b/tests/bash-bats/modules/mongodb.sh
index 1391677d761..145baad009e 100755
--- a/tests/bash-bats/modules/mongodb.sh
+++ b/tests/bash-bats/modules/mongodb.sh
@@ -4,9 +4,9 @@ load ../helpers/functions
 @test "${TEST_LABEL} > MongoDB" {
     # Existing MongoDB
     if [[ $NAME == "CentOS Linux" ]] || [[ $NAME == "Amazon Linux" ]]; then
-        run bash -c "printf \"y\nn\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P" # which prompt requires first y
+        run bash -c "printf \"y\yn\nn\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P" # which prompt requires first y
     else
-        run bash -c "printf \"n\nn\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P"
+        run bash -c "printf \"y\nn\nn\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P"
     fi
     [[ ! -z $(echo "${output}" | grep "Existing MongoDB will be used") ]] || exit
     [[ -z $(echo "${output}" | grep "Ensuring MongoDB installation") ]] || exit

From f19b7b9053acab43c78bf33cb85b7324be50575b Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 12:36:22 -0400
Subject: [PATCH 0641/1648] BATS fixes for Centos implementation.

---
 tests/bash-bats/eosio_build_centos.sh | 4 ++--
 tests/bash-bats/modules/mongodb.sh    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index 665d93cb086..a4131bedcb0 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -29,7 +29,7 @@ export TEST_LABEL="[eosio_build_centos]"
     # Ensure SCL and devtoolset-8 for c++ binary installation
     run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION} -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "centos-release-scl-2-3.el7.centos.noarch found") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "devtoolset-8-8.0-2.el7.0.1.x86_64 found") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "devtoolset-8-8.0-2.el7.x86_64 found") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-8/enable") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
@@ -44,5 +44,5 @@ export TEST_LABEL="[eosio_build_centos]"
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
     uninstall-package devtoolset-8* WETRUN &>/dev/null
     uninstall-package centos-release-scl WETRUN &>/dev/null
-
+devtoolset-8-8.0-2.el7.x86_64 found
 }
\ No newline at end of file
diff --git a/tests/bash-bats/modules/mongodb.sh b/tests/bash-bats/modules/mongodb.sh
index 145baad009e..428d9977a20 100755
--- a/tests/bash-bats/modules/mongodb.sh
+++ b/tests/bash-bats/modules/mongodb.sh
@@ -4,14 +4,14 @@ load ../helpers/functions
 @test "${TEST_LABEL} > MongoDB" {
     # Existing MongoDB
     if [[ $NAME == "CentOS Linux" ]] || [[ $NAME == "Amazon Linux" ]]; then
-        run bash -c "printf \"y\yn\nn\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P" # which prompt requires first y
+        run bash -c "printf \"y\ny\nn\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P -i /NEWPATH" # which prompt requires first y
     else
-        run bash -c "printf \"y\nn\nn\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P"
+        run bash -c "printf \"y\nn\nn\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P -i /NEWPATH"
     fi
     [[ ! -z $(echo "${output}" | grep "Existing MongoDB will be used") ]] || exit
     [[ -z $(echo "${output}" | grep "Ensuring MongoDB installation") ]] || exit
     # Installing ours
-    run bash -c "printf \"y\ny\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P"
+    run bash -c "printf \"y\ny\ny\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P"
     [[ -z $(echo "${output}" | grep "Existing MongoDB will be used") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Ensuring MongoDB installation") ]] || exit
 }

From a02cc4286202751150506f0f3a4148f4c0a6ab5d Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 12:45:56 -0400
Subject: [PATCH 0642/1648] BATS fixes for Centos implementation.

---
 tests/bash-bats/eosio_build_centos.sh | 1 -
 tests/bash-bats/modules/mongodb.sh    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index a4131bedcb0..f03ef6fe2ae 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -44,5 +44,4 @@ export TEST_LABEL="[eosio_build_centos]"
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
     uninstall-package devtoolset-8* WETRUN &>/dev/null
     uninstall-package centos-release-scl WETRUN &>/dev/null
-devtoolset-8-8.0-2.el7.x86_64 found
 }
\ No newline at end of file
diff --git a/tests/bash-bats/modules/mongodb.sh b/tests/bash-bats/modules/mongodb.sh
index 428d9977a20..d04b058b06b 100755
--- a/tests/bash-bats/modules/mongodb.sh
+++ b/tests/bash-bats/modules/mongodb.sh
@@ -4,9 +4,9 @@ load ../helpers/functions
 @test "${TEST_LABEL} > MongoDB" {
     # Existing MongoDB
     if [[ $NAME == "CentOS Linux" ]] || [[ $NAME == "Amazon Linux" ]]; then
-        run bash -c "printf \"y\ny\nn\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P -i /NEWPATH" # which prompt requires first y
+        run bash -c "printf \"y\ny\nn\ny\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P" # which prompt requires first y
     else
-        run bash -c "printf \"y\nn\nn\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P -i /NEWPATH"
+        run bash -c "printf \"y\nn\nn\ny\ny\n\" | ./$SCRIPT_LOCATION -m -P"
     fi
     [[ ! -z $(echo "${output}" | grep "Existing MongoDB will be used") ]] || exit
     [[ -z $(echo "${output}" | grep "Ensuring MongoDB installation") ]] || exit

From 252dcd7951b531a3b47b4f8219676ed76c0f0113 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 13:11:16 -0400
Subject: [PATCH 0643/1648] BATS fixes for Centos implementation.

---
 tests/bash-bats/eosio_build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index 22e06f2fafa..2b861c3c0aa 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -14,18 +14,18 @@ TEST_LABEL="[eosio_build]"
     if [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]]; then
         # which package isn't installed
         uninstall-package which WETRUN &>/dev/null
-        run bash -c "printf \"y\nn\nn\n\" | ./scripts/eosio_build.sh"
+        run bash -c "printf \"y\ny\nn\nn\n\" | ./scripts/eosio_build.sh"
         [[ ! -z $(echo "${output}" | grep "EOSIO compiler checks require the 'which'") ]] || exit
-        [[ ! -z $(echo "${output}" | grep "Please install the 'which'") ]] || exit
+        # [[ ! -z $(echo "${output}" | grep "Please install the 'which'") ]] || exit
     fi
 
     if [[ $ARCH == "Linux" ]]; then
         if [[ $NAME == "CentOS Linux" ]]; then # Centos has the SCL prompt before checking for the compiler
             # No c++!
-            run bash -c "printf \"y\ny\nn\n\" | ./${SCRIPT_LOCATION}"
+            run bash -c "printf \"y\ny\ny\nn\n\" | ./${SCRIPT_LOCATION}"
         else
             # No c++!
-            run bash -c "printf \"y\nn\nn\n\" | ./${SCRIPT_LOCATION}"
+            run bash -c "printf \"y\ny\nn\nn\n\" | ./${SCRIPT_LOCATION}"
         fi
         [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
     fi 

From 7b29c9832c8b9a67cc2f37be20536abf359c0ed8 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 13:55:39 -0400
Subject: [PATCH 0644/1648] BATS fixes for Ubuntu implementation.

---
 tests/bash-bats/modules/clang.sh     | 4 ++--
 tests/bash-bats/modules/root-user.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/bash-bats/modules/clang.sh b/tests/bash-bats/modules/clang.sh
index ae218af2b2e..af885871ee4 100755
--- a/tests/bash-bats/modules/clang.sh
+++ b/tests/bash-bats/modules/clang.sh
@@ -4,14 +4,14 @@ load ../helpers/functions
 @test "${TEST_LABEL} > Testing CLANG" {
 
     if [[ $NAME == "Darwin" ]]; then
-        run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+        run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
         ## CLANG already exists (c++/default)
         [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
         [[ ! -z $(echo "${output}" | grep "DCMAKE_CXX_COMPILER='c++'") ]] || exit
         [[ ! -z $(echo "${output}" | grep "DCMAKE_C_COMPILER='cc'") ]] || exit
     elif [[ $NAME == "Ubuntu" ]]; then
         install-package build-essential WETRUN 1>/dev/null # ubuntu 18 build-essential will be high enough, 16 won't and has a version < 7
-        run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
+        run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
         ## CLANG already exists (c++/default) (Ubuntu doesn't have clang>7, so we need to make sure it installs Clang 8)
         [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: false") ]] || exit
         if [[ $VERSION_ID == "16.04" ]]; then
diff --git a/tests/bash-bats/modules/root-user.sh b/tests/bash-bats/modules/root-user.sh
index 6fb156cf4d3..5f4311766a3 100755
--- a/tests/bash-bats/modules/root-user.sh
+++ b/tests/bash-bats/modules/root-user.sh
@@ -2,20 +2,20 @@
 load ../helpers/functions
 
 @test "${TEST_LABEL} > Testing root user run" {
-    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P"
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "User: $(whoami)") ]] || exit
     if [[ $ARCH == "Linux" ]]; then
         [[ -z $(echo "${output}" | grep "$SUDO_LOCATION -E") ]] || exit
     fi
     export CURRENT_USER=test
-    run bash -c "printf \"n\n\" | ./$SCRIPT_LOCATION -P"
+    run bash -c "printf \"y\nn\n\" | ./$SCRIPT_LOCATION -P"
     [[ ! -z $(echo "${output}" | grep "User: test") ]] || exit
     if [[ $ARCH == "Linux" ]]; then
         [[ ! -z $(echo "${output}" | grep "Please install the 'sudo' command before proceeding") ]] || exit
     fi
     install-package sudo WETRUN
     export SUDO_LOCATION=$( command -v sudo )
-    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P"
+    run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "User: test") ]] || exit
     if [[ $ARCH == "Linux" ]]; then
         [[ ! -z $(echo "${output}" | grep "$SUDO_LOCATION -E .* install -y .*") ]] || exit

From 9cacdb8b191d457ff165cf399fe7ab78bf4834b8 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 14:21:06 -0400
Subject: [PATCH 0645/1648] BATS fixes for Ubuntu implementation.

---
 tests/bash-bats/modules/clang.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/bash-bats/modules/clang.sh b/tests/bash-bats/modules/clang.sh
index af885871ee4..1f8dba4fb1e 100755
--- a/tests/bash-bats/modules/clang.sh
+++ b/tests/bash-bats/modules/clang.sh
@@ -14,11 +14,11 @@ load ../helpers/functions
         run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
         ## CLANG already exists (c++/default) (Ubuntu doesn't have clang>7, so we need to make sure it installs Clang 8)
         [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: false") ]] || exit
-        if [[ $VERSION_ID == "16.04" ]]; then
-            [[ ! -z $(echo "${output}" | grep "Unable to find C++17 support") ]] || exit
-            [[ ! -z $(echo "${output}" | grep "Clang 8 successfully installed") ]] || exit
-            [[ ! -z $(echo "${output}" | grep "$CLANG_ROOT") ]] || exit
-        fi
+        # if [[ $VERSION_ID == "16.04" ]]; then
+        #     [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
+        #     [[ ! -z $(echo "${output}" | grep "Clang 8 successfully installed") ]] || exit
+        #     [[ ! -z $(echo "${output}" | grep "$CLANG_ROOT") ]] || exit
+        # fi
         ## CLANG
         uninstall-package build-essential WETRUN 1>/dev/null
         run bash -c "./$SCRIPT_LOCATION -y -P"

From 0d4d71bd1f9113d91b4bb74490b3781ccab33a5d Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Fri, 21 Jun 2019 14:25:46 -0400
Subject: [PATCH 0646/1648] eos-vm: use intrinsic_log

---
 .../eosio/chain/webassembly/eos-vm.hpp        | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 20b111be80d..89be337a5b1 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -7,6 +7,11 @@
 #include <softfloat_types.h>
 
 //eos-vm includes
+#include <eosio/vm/host_function.hpp>
+namespace eosio { namespace vm {
+   template <>
+   struct registered_host_functions<eosio::chain::apply_context>;
+} }
 #include <eosio/vm/backend.hpp>
 
 // eosio specific specializations
@@ -62,6 +67,105 @@ namespace eosio { namespace vm {
 
 }} // ns eosio::vm
 
+namespace eosio { namespace vm {
+   template <typename WAlloc, typename Cls, typename Cls2, auto F, typename R, typename Args, size_t... Is>
+   auto create_logging_function(std::index_sequence<Is...>) {
+      return std::function<void(Cls*, WAlloc*, operand_stack&)>{ [](Cls* self, WAlloc* walloc, operand_stack& os) {
+         size_t i = sizeof...(Is) - 1;
+         auto& intrinsic_log = self->control.get_intrinsic_debug_log();
+         if (intrinsic_log) {
+            eosio::chain::digest_type::encoder enc;
+            enc.write(walloc->template get_base_ptr<char>(), walloc->get_current_page() * 64 * 1024);
+            intrinsic_log->record_intrinsic(
+               eosio::chain::calc_arguments_hash(
+                  get_value<typename std::tuple_element<Is, Args>::type, Args>(
+                        walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
+                                       os.get_back(i - Is)))...),
+               enc.result());
+         }
+         if constexpr (!std::is_same_v<R, void>) {
+            if constexpr (std::is_same_v<Cls2, std::nullptr_t>) {
+               R res = std::invoke(F, get_value<typename std::tuple_element<Is, Args>::type, Args>(
+                                            walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
+                                                          os.get_back(i - Is)))...);
+               os.trim(sizeof...(Is));
+               os.push(resolve_result<R>(std::move(res), walloc));
+            } else {
+               R res = std::invoke(F, construct_derived<Cls2, Cls>::value(*self),
+                                   get_value<typename std::tuple_element<Is, Args>::type, Args>(
+                                         walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
+                                                       os.get_back(i - Is)))...);
+               os.trim(sizeof...(Is));
+               os.push(resolve_result<R>(std::move(res), walloc));
+            }
+         } else {
+            if constexpr (std::is_same_v<Cls2, std::nullptr_t>) {
+               std::invoke(F, get_value<typename std::tuple_element<Is, Args>::type, Args>(
+                                    walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
+                                                  os.get_back(i - Is)))...);
+            } else {
+               std::invoke(F, construct_derived<Cls2, Cls>::value(*self),
+                           get_value<typename std::tuple_element<Is, Args>::type, Args>(
+                                 walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
+                                               os.get_back(i - Is)))...);
+            }
+            os.trim(sizeof...(Is));
+         }
+      } };
+   }
+
+   template <>
+   struct registered_host_functions<eosio::chain::apply_context> {
+      using Cls = eosio::chain::apply_context;
+
+      template <typename WAlloc>
+      struct mappings {
+         std::unordered_map<std::pair<std::string, std::string>, uint32_t, host_func_pair_hash> named_mapping;
+         std::vector<host_function>                                                             host_functions;
+         std::vector<std::function<void(Cls*, WAlloc*, operand_stack&)>>                        functions;
+         size_t                                                                                 current_index = 0;
+      };
+
+      template <typename WAlloc>
+      static mappings<WAlloc>& get_mappings() {
+         static mappings<WAlloc> _mappings;
+         return _mappings;
+      }
+
+      template <typename Cls2, auto Func, typename WAlloc>
+      static void add(const std::string& mod, const std::string& name) {
+         using deduced_full_ts                         = decltype(get_args_full(Func));
+         using deduced_ts                              = decltype(get_args(Func));
+         using res_t                                   = typename decltype(get_return_t(Func))::type;
+         static constexpr auto is                      = std::make_index_sequence<std::tuple_size<deduced_ts>::value>();
+         auto&                 current_mappings        = get_mappings<WAlloc>();
+         current_mappings.named_mapping[{ mod, name }] = current_mappings.current_index++;
+         current_mappings.functions.push_back(create_logging_function<WAlloc, Cls, Cls2, Func, res_t, deduced_full_ts>(is));
+      }
+
+      template <typename Module>
+      static void resolve(Module& mod) {
+         decltype(mod.import_functions) imports          = { mod.allocator, mod.get_imported_functions_size() };
+         auto&                          current_mappings = get_mappings<wasm_allocator>();
+         for (int i = 0; i < mod.imports.size(); i++) {
+            std::string mod_name =
+                  std::string((char*)mod.imports[i].module_str.raw(), mod.imports[i].module_str.size());
+            std::string fn_name = std::string((char*)mod.imports[i].field_str.raw(), mod.imports[i].field_str.size());
+            EOS_WB_ASSERT(current_mappings.named_mapping.count({ mod_name, fn_name }), wasm_link_exception,
+                          "no mapping for imported function");
+            imports[i] = current_mappings.named_mapping[{ mod_name, fn_name }];
+         }
+         mod.import_functions = std::move(imports);
+      }
+
+      template <typename Execution_Context>
+      void operator()(Cls* host, Execution_Context& ctx, uint32_t index) {
+         const auto& _func = get_mappings<wasm_allocator>().functions[index];
+         std::invoke(_func, host, ctx.get_wasm_allocator(), ctx.get_operand_stack());
+      }
+   };
+} } // eosio::vm
+
 namespace eosio { namespace chain { namespace webassembly { namespace eos_vm_runtime {
 
 using namespace fc;

From fab718569e7ae625447bb742fcb2c9c98054b670 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 14:48:53 -0400
Subject: [PATCH 0647/1648] BATS fixes for Ubuntu implementation.

---
 tests/bash-bats/eosio_build.sh        | 2 +-
 tests/bash-bats/eosio_build_ubuntu.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index 2b861c3c0aa..d294c44e23d 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -25,7 +25,7 @@ TEST_LABEL="[eosio_build]"
             run bash -c "printf \"y\ny\ny\nn\n\" | ./${SCRIPT_LOCATION}"
         else
             # No c++!
-            run bash -c "printf \"y\ny\nn\nn\n\" | ./${SCRIPT_LOCATION}"
+            run bash -c "printf \"y\ny\ny\nn\nn\n\" | ./${SCRIPT_LOCATION}"
         fi
         [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
     fi 
diff --git a/tests/bash-bats/eosio_build_ubuntu.sh b/tests/bash-bats/eosio_build_ubuntu.sh
index b664e5a0038..3130647e5d8 100644
--- a/tests/bash-bats/eosio_build_ubuntu.sh
+++ b/tests/bash-bats/eosio_build_ubuntu.sh
@@ -26,7 +26,8 @@ export TEST_LABEL="[eosio_build_ubuntu]"
     set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
 
     # Testing clang already existing (no pinning of clang8)
-    [[ "$(echo ${VERSION_ID})" == "16.04" ]] && install-package clang WETRUN &>/dev/null || install-package build-essential WETRUN
+    # [[ "$(echo ${VERSION_ID})" == "16.04" ]] && install-package clang WETRUN &>/dev/null || install-package build-essential WETRUN
+    install-package clang WETRUN &>/dev/null 
     run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
     
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit

From 4cfcd744db4b709bce6d6818431f329565562ac7 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 15:28:22 -0400
Subject: [PATCH 0648/1648] BATS fixes for Amazon Linux implementation.

---
 tests/bash-bats/eosio_build_amazonlinux.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/bash-bats/eosio_build_amazonlinux.sh b/tests/bash-bats/eosio_build_amazonlinux.sh
index ad372339378..3ff1d12a71c 100644
--- a/tests/bash-bats/eosio_build_amazonlinux.sh
+++ b/tests/bash-bats/eosio_build_amazonlinux.sh
@@ -26,7 +26,7 @@ export TEST_LABEL="[eosio_build_amazonlinux]"
     run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -P  -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     ### Make sure deps are loaded properly
-    [[ ! -z $(echo "${output}" | grep "Executing: cd ${SRC_DIR}") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: cd /NEWPATH/src") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
     if [[ $NAME == "Amazon Linux" ]]; then
@@ -42,8 +42,10 @@ export TEST_LABEL="[eosio_build_amazonlinux]"
     [[ -z $(echo "${output}" | grep "MongoDB C++ driver successfully installed") ]] || exit # Mongo is off
     # Ensure PIN_COMPILER=false uses proper flags for the various installs
     install-package gcc-c++ WETRUN
+    install-package clang WETRUN
     run bash -c "./$SCRIPT_LOCATION -y"
     [[ ! -z $(echo "${output}" | grep " -G 'Unix Makefiles'") ]] || exit # CMAKE
     [[ ! -z $(echo "${output}" | grep " --with-iostreams --with-date_time") ]] || exit # BOOST
     uninstall-package gcc-c++ WETRUN
+    uninstall-package clang WETRUN
 }
\ No newline at end of file

From 4f24785b56040a1c51224b03896e7fa1dbc9f534 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 15:43:29 -0400
Subject: [PATCH 0649/1648] Debugging errors in containers.

---
 tests/bash-bats/eosio_build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index d294c44e23d..9fb9ec874bc 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -31,7 +31,9 @@ TEST_LABEL="[eosio_build]"
     fi 
 
     cd .. # Also test that we can run the script from a directory other than the root
+    echo $(pwd) >&3
     run bash -c "./eos/$SCRIPT_LOCATION -y -P"
+    echo $output >&3
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit

From ebcedc17b98607fb4060c01420b2bd669b189def Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 15:46:08 -0400
Subject: [PATCH 0650/1648] Debugging errors in containers.

---
 tests/bash-bats/eosio_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index 9fb9ec874bc..b66f1afe88f 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -31,7 +31,7 @@ TEST_LABEL="[eosio_build]"
     fi 
 
     cd .. # Also test that we can run the script from a directory other than the root
-    echo $(pwd) >&3
+    echo $(pwd && ls) >&3
     run bash -c "./eos/$SCRIPT_LOCATION -y -P"
     echo $output >&3
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit

From f725c4802c0baea58b58aa62cd408a1a657f42a9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 15:48:31 -0400
Subject: [PATCH 0651/1648] Debugging errors in containers.

---
 tests/bash-bats/eosio_build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index b66f1afe88f..dba59e0937a 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -38,6 +38,7 @@ TEST_LABEL="[eosio_build]"
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit
     cd eos
+    echo $(pwd && ls) >&3
     # -P with prompts
     run bash -c "printf \"y\nn\nn\nn\n\" | ./$SCRIPT_LOCATION -P"
     [[ "${output}" =~ .*User.aborted.* ]] || exit

From 16536bd8d3753c92d2ac9626befe4ac8a21e8d0d Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 21 Jun 2019 15:50:00 -0400
Subject: [PATCH 0652/1648] refactor intrinsic-log-util

---
 programs/intrinsic-log-util/CMakeLists.txt    |  6 +-
 programs/intrinsic-log-util/cli_parser.hpp    |  4 -
 programs/intrinsic-log-util/diff.cpp          | 14 +++
 programs/intrinsic-log-util/diff.hpp          | 16 ++++
 programs/intrinsic-log-util/intrinsic_log.hpp |  0
 programs/intrinsic-log-util/main.cpp          | 94 +++++++++----------
 programs/intrinsic-log-util/print.cpp         | 24 +++++
 programs/intrinsic-log-util/print.hpp         | 33 +++++++
 programs/intrinsic-log-util/root.hpp          | 24 +++++
 9 files changed, 161 insertions(+), 54 deletions(-)
 create mode 100644 programs/intrinsic-log-util/diff.cpp
 create mode 100644 programs/intrinsic-log-util/diff.hpp
 create mode 100644 programs/intrinsic-log-util/intrinsic_log.hpp
 create mode 100644 programs/intrinsic-log-util/print.cpp
 create mode 100644 programs/intrinsic-log-util/print.hpp
 create mode 100644 programs/intrinsic-log-util/root.hpp

diff --git a/programs/intrinsic-log-util/CMakeLists.txt b/programs/intrinsic-log-util/CMakeLists.txt
index 6850d4396df..4697c35d47a 100644
--- a/programs/intrinsic-log-util/CMakeLists.txt
+++ b/programs/intrinsic-log-util/CMakeLists.txt
@@ -1,4 +1,8 @@
-add_executable( intrinsic-log-util main.cpp )
+add_executable( intrinsic-log-util
+   main.cpp
+   print.cpp
+   diff.cpp
+)
 
 if( UNIX AND NOT APPLE )
   set(rt_library rt )
diff --git a/programs/intrinsic-log-util/cli_parser.hpp b/programs/intrinsic-log-util/cli_parser.hpp
index 9d3f793ef76..bdb41621bed 100644
--- a/programs/intrinsic-log-util/cli_parser.hpp
+++ b/programs/intrinsic-log-util/cli_parser.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eosio/LICENSE.txt
- */
 #pragma once
 
 #include <fc/exception/exception.hpp>
diff --git a/programs/intrinsic-log-util/diff.cpp b/programs/intrinsic-log-util/diff.cpp
new file mode 100644
index 00000000000..72d22ce33a3
--- /dev/null
+++ b/programs/intrinsic-log-util/diff.cpp
@@ -0,0 +1,14 @@
+#include "diff.hpp"
+
+#include <eosio/chain/exceptions.hpp>
+#include <eosio/chain/intrinsic_debug_log.hpp>
+
+#include <ostream>
+
+void exec_diff( subcommand_dispatcher_base& dispatcher,
+                const configuration::root& root,
+                const configuration::diff& diff  )
+{
+   dispatcher.stream << "diff was called" << std::endl;
+   idump((diff.first_log.generic_string())(diff.second_log.generic_string()));
+}
diff --git a/programs/intrinsic-log-util/diff.hpp b/programs/intrinsic-log-util/diff.hpp
new file mode 100644
index 00000000000..a8654d56b71
--- /dev/null
+++ b/programs/intrinsic-log-util/diff.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "root.hpp"
+
+namespace configuration {
+   struct root;
+
+   struct diff {
+      bfs::path first_log;
+      bfs::path second_log;
+   };
+}
+
+void exec_diff( subcommand_dispatcher_base& dispatcher,
+                const configuration::root& root,
+                const configuration::diff& diff  );
diff --git a/programs/intrinsic-log-util/intrinsic_log.hpp b/programs/intrinsic-log-util/intrinsic_log.hpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/programs/intrinsic-log-util/main.cpp b/programs/intrinsic-log-util/main.cpp
index b8d432cdc34..e5c5550fcd0 100644
--- a/programs/intrinsic-log-util/main.cpp
+++ b/programs/intrinsic-log-util/main.cpp
@@ -2,17 +2,18 @@
  *  @file
  *  @copyright defined in eosio/LICENSE.txt
  */
+#include "root.hpp"
+#include "diff.hpp"
+#include "print.hpp"
+
 #include "cli_parser.hpp"
-#include <eosio/chain/intrinsic_debug_log.hpp>
+
 #include <eosio/chain/exceptions.hpp>
 
 #include <fc/io/json.hpp>
-#include <fc/filesystem.hpp>
 
-#include <boost/exception/diagnostic_information.hpp>
 #include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/exception/diagnostic_information.hpp>
 
 #include <cstring>
 #include <iostream>
@@ -20,18 +21,11 @@
 using namespace eosio;
 using namespace eosio::chain;
 
-namespace bfs = boost::filesystem;
 namespace bpo = boost::program_options;
 
-struct intrinsic_log {
-   intrinsic_log()
-   {}
-
-   fc::optional<intrinsic_debug_log> log;
-};
-
 struct print_block_subcommand
-   :  public subcommand<
+   :  public configuration::print_block,
+      public subcommand<
          print_block_subcommand,
          subcommand_style::terminal_subcommand_with_positional_arguments
       >
@@ -70,13 +64,11 @@ struct print_block_subcommand
          }
       }
    }
-
-   uint32_t                          block_num = 0;
-   std::vector<transaction_id_type>  trxs_filter;
 };
 
 struct print_blocks_subcommand
-   :  public subcommand<
+   :  public configuration::print_blocks,
+      public subcommand<
          print_blocks_subcommand,
          subcommand_style::terminal_subcommand_without_positional_arguments
       >
@@ -91,9 +83,9 @@ struct print_blocks_subcommand
       options.add_options()
          ("output-file,o", bpo::value<bfs::path>(),
           "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
-         ("first,f", bpo::value<uint32_t>(&first_block_num)->default_value(0),
+         ("first,f", bpo::value<uint32_t>(&first_block_num)->default_value(first_block_num),
           "the first block number to print")
-         ("last,l", bpo::value<uint32_t>()->default_value(std::numeric_limits<uint32_t>::max()),
+         ("last,l", bpo::value<uint32_t>()->default_value(last_block_num),
           "the first block number to print")
       ;
    }
@@ -104,15 +96,13 @@ struct print_blocks_subcommand
          FC_ASSERT( last_block_num >= first_block_num, "invalid range" );
       }
    }
-
-   uint32_t first_block_num = 0;
-   uint32_t last_block_num = 0;
 };
 
 struct print_subcommand
-   :  public subcommand<
+   :  public configuration::print,
+      public subcommand<
          print_subcommand,
-         subcommand_style::invokable_and_contains_subcommands,
+         subcommand_style::only_contains_subcommands,
          print_block_subcommand,
          print_blocks_subcommand
       >
@@ -125,13 +115,20 @@ struct print_subcommand
 
    void set_options( bpo::options_description& options ) {
       options.add_options()
-         ("no-pretty-print", bpo::bool_switch()->default_value(false), "avoid pretty printing")
+         ("log-file", bpo::value<bfs::path>(), "path to the log file (required)")
+         ("no-pretty-print", bpo::bool_switch()->default_value(no_pretty_print), "avoid pretty printing")
       ;
    }
+
+   void initialize( bpo::variables_map&& vm ) {
+      FC_ASSERT( vm.count( "log-file" ) > 0, "path to log file must be provided (use --log-file)" );
+      log_path = bfs::canonical( vm.at( "log-file" ).as<bfs::path>() );
+   }
 };
 
 struct diff_subcommand
-   :  public subcommand<
+   :  public configuration::diff,
+      public subcommand<
          diff_subcommand,
          subcommand_style::terminal_subcommand_with_positional_arguments
       >
@@ -152,9 +149,9 @@ struct diff_subcommand
    bpo::positional_options_description
    get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc ) {
       options.add_options()
-         ("first-log", bpo::value<bfs::path>(),
+         ("first-log", bpo::value<bfs::path>(&first_log),
          "path to the first log file to compare")
-         ("second-log", bpo::value<bfs::path>(),
+         ("second-log", bpo::value<bfs::path>(&second_log),
          "path to the second log file to compare")
       ;
 
@@ -162,15 +159,21 @@ struct diff_subcommand
          "first-log", "second-log"
       } );
    }
+
+   void initialize( bpo::variables_map&& vm ) {
+      first_log  = bfs::canonical( first_log );
+      second_log = bfs::canonical( second_log );
+   }
 };
 
 struct root_command
-   : public subcommand<
-      root_command,
-      subcommand_style::only_contains_subcommands,
-      print_subcommand,
-      diff_subcommand
-     >
+   :  public configuration::root,
+      public subcommand<
+         root_command,
+         subcommand_style::only_contains_subcommands,
+         print_subcommand,
+         diff_subcommand
+      >
 {
    static constexpr const char* name = "Generic";
 
@@ -180,36 +183,29 @@ struct root_command
 
    void set_options( bpo::options_description& options ) {
       options.add_options()
-         ("help,h", bpo::bool_switch(&print_help)->default_value(false), "Print this help message and exit.")
-         ("no-detail", bpo::bool_switch()->default_value(false), "Temporarily added for testing purposes.")
+         ("help,h", bpo::bool_switch(&print_help)->default_value(print_help), "Print this help message and exit.")
+         ("no-detail", bpo::bool_switch()->default_value(no_detail), "Temporarily added for testing purposes.")
       ;
    }
-
-   bool print_help = false;
 };
 
-class subcommand_dispatcher {
+class subcommand_dispatcher : public subcommand_dispatcher_base {
 public:
    subcommand_dispatcher( std::ostream& stream )
-   :stream( stream )
+   :subcommand_dispatcher_base( stream )
    {}
 
    void operator()( const root_command& root, const diff_subcommand& diff ) {
-      stream << "diff was called" << std::endl;
+      exec_diff( *this, root, diff );
    }
 
    void operator()( const root_command& root, const print_subcommand& print, const print_blocks_subcommand& blocks ) {
-      stream << "print blocks was called" << std::endl;
-      idump((blocks.first_block_num)(blocks.last_block_num));
+      exec_print_blocks( *this, root, print, blocks );
    }
 
    void operator()( const root_command& root, const print_subcommand& print, const print_block_subcommand& block ) {
-      stream << "print block was called" << std::endl;
-      idump((block.block_num)(block.trxs_filter));
+      exec_print_block( *this, root, print, block );
    }
-
-protected:
-   std::ostream& stream;
 };
 
 int main( int argc, const char** argv ) {
diff --git a/programs/intrinsic-log-util/print.cpp b/programs/intrinsic-log-util/print.cpp
new file mode 100644
index 00000000000..f5483bc9af0
--- /dev/null
+++ b/programs/intrinsic-log-util/print.cpp
@@ -0,0 +1,24 @@
+#include "print.hpp"
+
+#include <eosio/chain/exceptions.hpp>
+#include <eosio/chain/intrinsic_debug_log.hpp>
+
+#include <ostream>
+
+void exec_print_block(  subcommand_dispatcher_base& dispatcher,
+                        const configuration::root& root,
+                        const configuration::print& print,
+                        const configuration::print_block&  block )
+{
+   dispatcher.stream << "print block was called" << std::endl;
+   idump((print.log_path.generic_string())(block.block_num)(block.trxs_filter));
+}
+
+void exec_print_blocks( subcommand_dispatcher_base& dispatcher,
+                        const configuration::root& root,
+                        const configuration::print& print,
+                        const configuration::print_blocks& blocks )
+{
+   dispatcher.stream << "print blocks was called" << std::endl;
+   idump((print.log_path.generic_string())(blocks.first_block_num)(blocks.last_block_num));
+}
diff --git a/programs/intrinsic-log-util/print.hpp b/programs/intrinsic-log-util/print.hpp
new file mode 100644
index 00000000000..7eb32cab8a0
--- /dev/null
+++ b/programs/intrinsic-log-util/print.hpp
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "root.hpp"
+
+#include <eosio/chain/types.hpp>
+
+namespace configuration {
+   struct print {
+      bfs::path log_path;
+      bool      no_pretty_print = false;
+   };
+
+   struct print_block {
+      uint32_t                                        block_num = 0;
+      std::vector<eosio::chain::transaction_id_type>  trxs_filter;
+   };
+
+   struct print_blocks {
+      uint32_t first_block_num = 0;
+      uint32_t last_block_num = std::numeric_limits<uint32_t>::max();
+   };
+
+}
+
+void exec_print_block(  subcommand_dispatcher_base& dispatcher,
+                        const configuration::root& root,
+                        const configuration::print& print,
+                        const configuration::print_block&  block );
+
+void exec_print_blocks( subcommand_dispatcher_base& dispatcher,
+                        const configuration::root& root,
+                        const configuration::print& print,
+                        const configuration::print_blocks& blocks );
diff --git a/programs/intrinsic-log-util/root.hpp b/programs/intrinsic-log-util/root.hpp
new file mode 100644
index 00000000000..0f17ade8d88
--- /dev/null
+++ b/programs/intrinsic-log-util/root.hpp
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <iosfwd>
+
+#include <boost/filesystem.hpp>
+
+namespace bfs = boost::filesystem;
+
+namespace configuration {
+   struct root {
+      bool print_help = false;
+      bool no_detail = false;
+   };
+}
+
+class subcommand_dispatcher_base {
+public:
+   subcommand_dispatcher_base( std::ostream& stream )
+   :stream( stream )
+   {}
+
+public:
+   std::ostream& stream;
+};

From a1ffddd1441a2feb43ddde8b2ee14534d758ba9d Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 15:53:06 -0400
Subject: [PATCH 0653/1648] Debugging errors in containers.

---
 tests/bash-bats/eosio_build.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index dba59e0937a..9d2419067e0 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -30,15 +30,12 @@ TEST_LABEL="[eosio_build]"
         [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
     fi 
 
-    cd .. # Also test that we can run the script from a directory other than the root
-    echo $(pwd && ls) >&3
-    run bash -c "./eos/$SCRIPT_LOCATION -y -P"
+    # cd .. # Also test that we can run the script from a directory other than the root
+    run bash -c "./$SCRIPT_LOCATION -y -P"
     echo $output >&3
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit
-    cd eos
-    echo $(pwd && ls) >&3
     # -P with prompts
     run bash -c "printf \"y\nn\nn\nn\n\" | ./$SCRIPT_LOCATION -P"
     [[ "${output}" =~ .*User.aborted.* ]] || exit

From 6ce545251f2f9ed92753c04a6af2179e697514d4 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 15:53:17 -0400
Subject: [PATCH 0654/1648] Debugging errors in containers.

---
 tests/bash-bats/eosio_build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index 9d2419067e0..2f5afc7fc8a 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -32,7 +32,6 @@ TEST_LABEL="[eosio_build]"
 
     # cd .. # Also test that we can run the script from a directory other than the root
     run bash -c "./$SCRIPT_LOCATION -y -P"
-    echo $output >&3
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit

From 7b7ee4cc883e867bbb63cdd4da587077aefcc0d1 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 16:10:00 -0400
Subject: [PATCH 0655/1648] Debugging errors in containers.

---
 tests/bash-bats/eosio_build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index 2f5afc7fc8a..a13d8e3b23e 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -30,8 +30,8 @@ TEST_LABEL="[eosio_build]"
         [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
     fi 
 
-    # cd .. # Also test that we can run the script from a directory other than the root
-    run bash -c "./$SCRIPT_LOCATION -y -P"
+    cd ./scripts # Also test that we can run the script from a directory other than the root
+    run bash -c "./eosio_build.sh -y -P"
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit

From 4ef5771e804a64bd3f18b5f176a728bbc360db71 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 16:11:00 -0400
Subject: [PATCH 0656/1648] Debugging errors in containers.

---
 tests/bash-bats/eosio_build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index a13d8e3b23e..db5f42a0415 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -36,6 +36,7 @@ TEST_LABEL="[eosio_build]"
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit
     # -P with prompts
+    cd ..
     run bash -c "printf \"y\nn\nn\nn\n\" | ./$SCRIPT_LOCATION -P"
     [[ "${output}" =~ .*User.aborted.* ]] || exit
     # lack of -m

From f3bbba8597675560ee97c763101c6fb34342e5b0 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 21 Jun 2019 16:26:27 -0400
Subject: [PATCH 0657/1648] avoid getting into inconsistent state when
 intrinsic_debug_log::open throws

---
 libraries/chain/intrinsic_debug_log.cpp | 37 ++++++++++++++-----------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
index 9d181d96042..dc698099572 100644
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -254,24 +254,29 @@ namespace eosio { namespace chain {
 
          uint32_t last_committed_block_num = 0; // 0 indicates no committed blocks in log
 
-         log.seekg( 0, std::ios::end );
-         pos_t file_size = log.tellg();
-         if( file_size > 0 ) {
-            pos_t last_committed_block_begin_pos{};
-            FC_ASSERT( file_size > sizeof(last_committed_block_begin_pos),
-                       "corrupted log: file size is too small to be valid" );
-            log.seekg( -sizeof(last_committed_block_begin_pos), std::ios::end );
-            fc::raw::unpack( log, last_committed_block_begin_pos );
-            FC_ASSERT( last_committed_block_begin_pos < file_size, "corrupted log: invalid block position" );
-
-            log.seekg( last_committed_block_begin_pos, std::ios::beg	);
-            uint8_t tag = 0;
-            fc::raw::unpack( log, tag );
-            FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
+         try {
+            log.seekg( 0, std::ios::end );
+            pos_t file_size = log.tellg();
+            if( file_size > 0 ) {
+               pos_t last_committed_block_begin_pos{};
+               FC_ASSERT( file_size > sizeof(last_committed_block_begin_pos),
+                          "corrupted log: file size is too small to be valid" );
+               log.seekg( -sizeof(last_committed_block_begin_pos), std::ios::end );
+               fc::raw::unpack( log, last_committed_block_begin_pos );
+               FC_ASSERT( last_committed_block_begin_pos < file_size, "corrupted log: invalid block position" );
+
+               log.seekg( last_committed_block_begin_pos, std::ios::beg	);
+               uint8_t tag = 0;
+               fc::raw::unpack( log, tag );
+               FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
 
-            fc::raw::unpack( log, last_committed_block_num );
+               fc::raw::unpack( log, last_committed_block_num );
 
-            log_metadata.emplace( log_metadata_t{ last_committed_block_begin_pos, file_size } );
+               log_metadata.emplace( log_metadata_t{ last_committed_block_begin_pos, file_size } );
+            }
+         } catch( ... ) {
+            log.close();
+            throw;
          }
 
          if( open_as_read_only ) {

From 8d5da7678f39abaab83d5da5a185dd1f954e0fca Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 21 Jun 2019 15:28:55 -0500
Subject: [PATCH 0658/1648] Modified to use boost multiindex

---
 .../chain/unapplied_transaction_queue.hpp     | 166 ++++++++-------
 .../unapplied_transaction_queue_tests.cpp     | 197 +++++++++---------
 2 files changed, 193 insertions(+), 170 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 5fa035e0ea9..9996de4faf9 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -8,118 +8,130 @@
 #include <eosio/chain/transaction_metadata.hpp>
 #include <eosio/chain/block_state.hpp>
 
-#include <queue>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/sequenced_index.hpp>
+#include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/member.hpp>
+
+namespace fc {
+  inline std::size_t hash_value( const fc::sha256& v ) {
+     return v._hash[3];
+  }
+}
 
 namespace eosio { namespace chain {
 
+using namespace boost::multi_index;
+
+enum trx_enum_type {
+   unknown = 0,
+   persisted = 1,
+   forked = 2,
+   aborted = 3,
+   subjective = 4
+};
+
+struct unapplied_transaction {
+   const transaction_metadata_ptr trx_meta;
+   const fc::time_point           expiry;
+   const trx_enum_type            trx_type = unknown;
+
+   const transaction_id_type& signed_id()const { return trx_meta->signed_id(); }
+   const transaction_id_type& id()const { return trx_meta->id(); }
+   bool is_persisted()const { return trx_type == persisted; }
+
+   unapplied_transaction(const unapplied_transaction&) = delete;
+   unapplied_transaction() = delete;
+   unapplied_transaction& operator=(const unapplied_transaction&) = delete;
+   unapplied_transaction(unapplied_transaction&&) = default;
+};
+
 /**
- * Track unapplied transactions for forked blocks, aborted blocks, and subjectively
+ * Track unapplied transactions for persisted, forked blocks, aborted blocks, and subjectively
  * failed transactions.
  */
 class unapplied_transaction_queue {
+
+   struct by_signed_id;
+   struct by_type;
+   struct by_expiry;
+
+   typedef multi_index_container< unapplied_transaction,
+      indexed_by<
+         sequenced<>,
+         hashed_unique< tag<by_signed_id>,
+               const_mem_fun<unapplied_transaction, const transaction_id_type&, &unapplied_transaction::signed_id>
+         >,
+         ordered_non_unique< tag<by_type>, member<unapplied_transaction, const trx_enum_type, &unapplied_transaction::trx_type> >,
+         ordered_non_unique< tag<by_expiry>, member<unapplied_transaction, const fc::time_point, &unapplied_transaction::expiry> >
+      >
+   > unapplied_trx_queue_type;
+
+   unapplied_trx_queue_type queue;
+
    std::deque<chain::branch_type> forked_branches;
    size_t current_trx_in_block = 0;
-   std::deque<std::vector<chain::transaction_metadata_ptr>> aborted_block_trxs;
+   std::deque<std::vector<transaction_metadata_ptr>> aborted_block_trxs;
    size_t current_trx_in_trxs = 0;
    std::deque<chain::transaction_metadata_ptr> subjective_failed_trxs;
    size_t total_size = 0;
 public:
 
    bool empty() const {
-      return forked_branches.empty() && aborted_block_trxs.empty() && subjective_failed_trxs.empty();
+      return queue.empty();
    }
 
    size_t size() const {
-      return total_size;
+      return queue.size();
    }
 
    void clear() {
-      forked_branches.clear();
-      current_trx_in_block = 0;
-      aborted_block_trxs.clear();
-      current_trx_in_trxs = 0;
-      subjective_failed_trxs.clear();
-      total_size = 0;
+      queue.clear();
+   }
+
+   bool contains_persisted()const {
+      return queue.get<by_type>().find( persisted ) != queue.get<by_type>().end();
+   }
+
+   template <typename Func>
+   bool clear_expired( const time_point& pending_block_time, const time_point& deadline, Func&& callback ) {
+      auto& persisted_by_expiry = queue.get<by_expiry>();
+      while(!persisted_by_expiry.empty() && persisted_by_expiry.begin()->expiry <= pending_block_time) {
+         if (deadline <= fc::time_point::now()) {
+            return false;
+         }
+         callback( persisted_by_expiry.begin()->id() );
+         persisted_by_expiry.erase( persisted_by_expiry.begin() );
+      }
+      return true;
    }
 
    void add_forked( chain::branch_type forked_branch ) {
-      if( forked_branch.empty() ) return;
       // forked_branch is in reverse order
-      // fifo queue for branches so pop back
-      size_t size = 0;
-      for( const auto& bptr : forked_branch ) {
-         size += bptr->trxs.size();
+      for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
+         for( auto itr = (*ritr)->trxs.begin(), end = (*ritr)->trxs.end(); itr != end; ++itr ) {
+            const auto& trx = *itr;
+            queue.push_back( {trx, trx->packed_trx()->expiration(), forked} );
+         }
       }
-      forked_branches.emplace_front( std::move( forked_branch ) );
-      total_size += size;
    }
 
    void add_aborted( std::vector<chain::transaction_metadata_ptr> aborted_trxs ) {
       if( aborted_trxs.empty() ) return;
-      // fifo queue so pop back
-      size_t size = aborted_trxs.size();
-      aborted_block_trxs.emplace_front( std::move( aborted_trxs ) );
-      total_size += size;
+      for( const auto& trx : aborted_trxs ) {
+         queue.push_back( { trx, trx->packed_trx()->expiration(), aborted } );
+      }
    }
 
    void add_subjective_failure( chain::transaction_metadata_ptr trx ) {
-      // fifo queue so pop back
-      subjective_failed_trxs.emplace_front( std::move( trx ) );
-      ++total_size;
+      queue.push_back( { trx, trx->packed_trx()->expiration(), subjective } );
    }
 
-   /// Order returned: forked block transactions, aborted block transactions, subjectively failed
-   /// FIFO within each category
-   /// @return nullptr if no next
-   chain::transaction_metadata_ptr next() {
-      while( !forked_branches.empty() ) {
-         chain::branch_type& branch = forked_branches.back();
-         if( branch.empty() ) {
-            current_trx_in_block = 0;
-            forked_branches.pop_back();
-            continue;
-         }
-         chain::block_state_ptr& bs = branch.back();
-         if( current_trx_in_block >= bs->trxs.size() ) {
-            current_trx_in_block = 0;
-            branch.resize( branch.size() - 1 );
-            if( branch.empty() ) {
-               forked_branches.pop_back();
-            }
-            continue;
-         } else {
-            chain::transaction_metadata_ptr n = bs->trxs[current_trx_in_block];
-            ++current_trx_in_block;
-            if( current_trx_in_block >= bs->trxs.size() ) {
-               current_trx_in_block = 0;
-               branch.resize( branch.size() - 1 );
-               if( branch.empty() ) {
-                  forked_branches.pop_back();
-               }
-            }
-            --total_size;
-            return n;
-         }
-      }
-      if( !aborted_block_trxs.empty() ) {
-         std::vector<chain::transaction_metadata_ptr>& p = aborted_block_trxs.back();
-         chain::transaction_metadata_ptr n = p[current_trx_in_trxs];
-         ++current_trx_in_trxs;
-         if( current_trx_in_trxs >= p.size() ) {
-            current_trx_in_trxs = 0;
-            aborted_block_trxs.pop_back();
-         }
-         --total_size;
-         return n;
-      }
-      if( !subjective_failed_trxs.empty() ) {
-         chain::transaction_metadata_ptr n = subjective_failed_trxs.back();
-         subjective_failed_trxs.pop_back();
-         --total_size;
-         return n;
-      }
-      return {};
-   }
+   using iterator = unapplied_trx_queue_type::index<by_type>::type::iterator;
+
+   iterator begin() { return queue.get<by_type>().begin(); }
+   iterator end() { return queue.get<by_type>().end(); }
+   iterator erase( iterator itr ) { return queue.get<by_type>().erase( itr ); }
 
 };
 
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index 02b7f0ce643..885fcb26502 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -23,6 +23,16 @@ auto unique_trx_meta_data() {
    return std::make_shared<transaction_metadata>( trx );
 }
 
+auto next( unapplied_transaction_queue& q ) {
+   transaction_metadata_ptr trx;
+   auto itr = q.begin();
+   if( itr != q.end() ) {
+      trx = itr->trx_meta;
+      q.erase( itr );
+   }
+   return trx;
+}
+
 BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
 
    unapplied_transaction_queue q;
@@ -40,16 +50,16 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    auto trx9 = unique_trx_meta_data();
 
    // empty
-   auto p = q.next();
+   auto p = next( q );
    BOOST_CHECK( p == nullptr );
 
    // 1 subjective failure
    q.add_subjective_failure( trx1 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
-   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
    // fifo subjective
@@ -57,25 +67,25 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.add_subjective_failure( trx2 );
    q.add_subjective_failure( trx3 );
    BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_REQUIRE( next( q ) == trx3 );
    BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
    // fifo aborted
    q.add_aborted( { trx1, trx2, trx3 } );
    BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_REQUIRE( next( q ) == trx3 );
    BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
    // order: aborted, subjective
@@ -84,21 +94,21 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.add_aborted( { trx4, trx5 } );
    q.add_subjective_failure( trx7 );
    BOOST_CHECK( q.size() == 7 );
-   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 6 );
-   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 5 );
-   BOOST_REQUIRE( q.next() == trx3 );
+   BOOST_REQUIRE( next( q ) == trx3 );
    BOOST_CHECK( q.size() == 4 );
-   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( next( q ) == trx4 );
    BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( next( q ) == trx5 );
    BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( next( q ) == trx6 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( next( q ) == trx7 );
    BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
    // fifo forked, one fork
@@ -110,73 +120,43 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    bs3->trxs = { trx6 };
    q.add_forked( { bs3, bs2, bs1 } );
    BOOST_CHECK( q.size() == 6 );
-   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 5 );
-   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 4 );
-   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE_EQUAL( next( q ), trx3 );
    BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( next( q ) == trx4 );
    BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( next( q ) == trx5 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( next( q ) == trx6 );
    BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
-   // fifo forked, multi forks
+   // fifo forked
    auto bs4 = std::make_shared<block_state>();
    bs4->trxs = { trx7 };
-   q.add_forked( { bs3, bs2, bs1 } );
-   q.add_forked( { bs4 } );
-   q.add_forked( { bs3, bs2 } );
-   BOOST_CHECK( q.size() == 11 );
-   BOOST_REQUIRE( q.next() == trx1 );
-   BOOST_CHECK( q.size() == 10 );
-   BOOST_REQUIRE( q.next() == trx2 );
-   BOOST_CHECK( q.size() == 9 );
-   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
-   BOOST_CHECK( q.size() == 8 );
-   BOOST_REQUIRE( q.next() == trx4 );
-   BOOST_CHECK( q.size() == 7 );
-   BOOST_REQUIRE( q.next() == trx5 );
-   BOOST_CHECK( q.size() == 6 );
-   BOOST_REQUIRE( q.next() == trx6 );
-   BOOST_CHECK( q.size() == 5 );
-   BOOST_REQUIRE( q.next() == trx7 );
-   BOOST_CHECK( q.size() == 4 );
-   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
-   BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( q.next() == trx4 );
-   BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( q.next() == trx5 );
-   BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( q.next() == trx6 );
-   BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
-   BOOST_CHECK( q.empty() );
-
-   // fifo forked
    q.add_forked( { bs1 } );
    q.add_forked( { bs3, bs2 } );
    q.add_forked( { bs4 } );
    BOOST_CHECK( q.size() == 7 );
-   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 6 );
-   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 5 );
-   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE_EQUAL( next( q ), trx3 );
    BOOST_CHECK( q.size() == 4 );
-   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( next( q ) == trx4 );
    BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE( next( q ) == trx5 );
    BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( next( q ) == trx6 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( next( q ) == trx7 );
    BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
    auto trx11 = unique_trx_meta_data();
@@ -189,53 +169,84 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    auto trx18 = unique_trx_meta_data();
    auto trx19 = unique_trx_meta_data();
 
+   // fifo forked, multi forks
+   auto bs5 = std::make_shared<block_state>();
+   auto bs6 = std::make_shared<block_state>();
+   bs5->trxs = { trx11, trx12, trx13 };
+   bs6->trxs = { trx11, trx15 };
+   q.add_forked( { bs3, bs2, bs1 } );
+   q.add_forked( { bs4 } );
+   q.add_forked( { bs3, bs2 } ); // dups removed
+   q.add_forked( { bs6, bs5 } );
+   BOOST_CHECK_EQUAL( q.size(), 11 );
+   BOOST_REQUIRE( next( q ) == trx1 );
+   BOOST_CHECK( q.size() == 10 );
+   BOOST_REQUIRE( next( q ) == trx2 );
+   BOOST_CHECK( q.size() == 9 );
+   BOOST_REQUIRE_EQUAL( next( q ), trx3 );
+   BOOST_CHECK( q.size() == 8 );
+   BOOST_REQUIRE( next( q ) == trx4 );
+   BOOST_CHECK( q.size() == 7 );
+   BOOST_REQUIRE( next( q ) == trx5 );
+   BOOST_CHECK( q.size() == 6 );
+   BOOST_REQUIRE( next( q ) == trx6 );
+   BOOST_CHECK( q.size() == 5 );
+   BOOST_REQUIRE( next( q ) == trx7 );
+   BOOST_CHECK( q.size() == 4 );
+   BOOST_REQUIRE_EQUAL( next( q ), trx11 );
+   BOOST_CHECK( q.size() == 3 );
+   BOOST_REQUIRE( next( q ) == trx12 );
+   BOOST_CHECK( q.size() == 2 );
+   BOOST_REQUIRE( next( q ) == trx13 );
+   BOOST_CHECK( q.size() == 1 );
+   BOOST_REQUIRE( next( q ) == trx15 );
+   BOOST_CHECK( q.size() == 0 );
+   BOOST_REQUIRE( next( q ) == nullptr );
+   BOOST_CHECK( q.empty() );
+
    // altogether, order fifo: forked, aborted, subjectively failed
    q.add_forked( { bs3, bs2, bs1 } );
-   q.add_subjective_failure( trx7 );
-   q.add_aborted( { trx9, trx11 } );
+   q.add_subjective_failure( trx16 );
+   q.add_aborted( { trx9, trx14 } );
    q.add_subjective_failure( trx8 );
-   q.add_aborted( { trx12, trx13 } );
-   q.add_forked( { bs4, bs3, bs2, bs1 } );
-   BOOST_CHECK( q.size() == 19 );
-   BOOST_REQUIRE( q.next() == trx1 );
-   BOOST_CHECK( q.size() == 18 );
-   BOOST_REQUIRE( q.next() == trx2 );
+   q.add_aborted( { trx18, trx19 } );
+   q.add_forked( { bs6, bs5, bs4 } );
    BOOST_CHECK( q.size() == 17 );
-   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 16 );
-   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 15 );
-   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE_EQUAL( next( q ), trx3 );
    BOOST_CHECK( q.size() == 14 );
-   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( next( q ) == trx4 );
    BOOST_CHECK( q.size() == 13 );
-   BOOST_REQUIRE( q.next() == trx1 );
+   BOOST_REQUIRE( next( q ) == trx5 );
    BOOST_CHECK( q.size() == 12 );
-   BOOST_REQUIRE( q.next() == trx2 );
+   BOOST_REQUIRE( next( q ) == trx6 );
    BOOST_CHECK( q.size() == 11 );
-   BOOST_REQUIRE_EQUAL( q.next(), trx3 );
+   BOOST_REQUIRE( next( q ) == trx7 );
    BOOST_CHECK( q.size() == 10 );
-   BOOST_REQUIRE( q.next() == trx4 );
+   BOOST_REQUIRE( next( q ) == trx11 );
    BOOST_CHECK( q.size() == 9 );
-   BOOST_REQUIRE( q.next() == trx5 );
+   BOOST_REQUIRE_EQUAL( next( q ), trx12 );
    BOOST_CHECK( q.size() == 8 );
-   BOOST_REQUIRE( q.next() == trx6 );
+   BOOST_REQUIRE( next( q ) == trx13 );
    BOOST_CHECK( q.size() == 7 );
-   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( next( q ) == trx15 );
    BOOST_CHECK( q.size() == 6 );
-   BOOST_REQUIRE( q.next() == trx9 );
+   BOOST_REQUIRE( next( q ) == trx9 );
    BOOST_CHECK( q.size() == 5 );
-   BOOST_REQUIRE( q.next() == trx11 );
+   BOOST_REQUIRE( next( q ) == trx14 );
    BOOST_CHECK( q.size() == 4 );
-   BOOST_REQUIRE( q.next() == trx12 );
+   BOOST_REQUIRE( next( q ) == trx18 );
    BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( q.next() == trx13 );
+   BOOST_REQUIRE( next( q ) == trx19 );
    BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( q.next() == trx7 );
+   BOOST_REQUIRE( next( q ) == trx16 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( q.next() == trx8 );
+   BOOST_REQUIRE( next( q ) == trx8 );
    BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
    q.add_forked( { bs3, bs2, bs1 } );
@@ -244,7 +255,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    q.clear();
    BOOST_CHECK( q.empty() );
    BOOST_CHECK( q.size() == 0 );
-   BOOST_REQUIRE( q.next() == nullptr );
+   BOOST_REQUIRE( next( q ) == nullptr );
 
 } FC_LOG_AND_RETHROW() /// unapplied_transaction_queue_test
 

From 5a53cd347d54a3bc1b87883445813395a83ffd9c Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 21 Jun 2019 16:33:34 -0400
Subject: [PATCH 0659/1648] Comment cleanup.

---
 tests/bash-bats/eosio_build.sh        | 2 --
 tests/bash-bats/eosio_build_darwin.sh | 1 -
 tests/bash-bats/eosio_build_ubuntu.sh | 1 -
 3 files changed, 4 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index db5f42a0415..50e3e066881 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -16,7 +16,6 @@ TEST_LABEL="[eosio_build]"
         uninstall-package which WETRUN &>/dev/null
         run bash -c "printf \"y\ny\nn\nn\n\" | ./scripts/eosio_build.sh"
         [[ ! -z $(echo "${output}" | grep "EOSIO compiler checks require the 'which'") ]] || exit
-        # [[ ! -z $(echo "${output}" | grep "Please install the 'which'") ]] || exit
     fi
 
     if [[ $ARCH == "Linux" ]]; then
@@ -43,7 +42,6 @@ TEST_LABEL="[eosio_build]"
     [[ ! -z $(echo "${output}" | grep "ENABLE_MONGO: false") ]] || exit
     [[ ! -z $(echo "${output}" | grep "INSTALL_MONGO: false") ]] || exit
     # lack of -i
-    # [[ ! -z $(echo "${output}" | grep "INSTALL_LOCATION: ${HOME}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO_INSTALL_DIR: ${HOME}/eosio/${EOSIO_VERSION}") ]] || exit
     ## -o
     run bash -c "printf \"y\ny\nn\nn\n\" | ./$SCRIPT_LOCATION -o Debug -P"
diff --git a/tests/bash-bats/eosio_build_darwin.sh b/tests/bash-bats/eosio_build_darwin.sh
index 9ddec35b9af..da7f6f1b5bc 100644
--- a/tests/bash-bats/eosio_build_darwin.sh
+++ b/tests/bash-bats/eosio_build_darwin.sh
@@ -29,7 +29,6 @@ export TEST_LABEL="[eosio_build_darwin]"
     ### Make sure deps are loaded properly
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: /usr/bin/xcode-select --install") ]] || exit
-    # [[ ! -z $(echo "${output}" | grep "automake.*NOT.*found") ]] || exit
     [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
     rm -f $CMAKE
     [[ ! -z $(echo "${output}" | grep "[Updating HomeBrew]") ]] || exit
diff --git a/tests/bash-bats/eosio_build_ubuntu.sh b/tests/bash-bats/eosio_build_ubuntu.sh
index 3130647e5d8..c87630c59ee 100644
--- a/tests/bash-bats/eosio_build_ubuntu.sh
+++ b/tests/bash-bats/eosio_build_ubuntu.sh
@@ -26,7 +26,6 @@ export TEST_LABEL="[eosio_build_ubuntu]"
     set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
 
     # Testing clang already existing (no pinning of clang8)
-    # [[ "$(echo ${VERSION_ID})" == "16.04" ]] && install-package clang WETRUN &>/dev/null || install-package build-essential WETRUN
     install-package clang WETRUN &>/dev/null 
     run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
     

From f3099e012db8412cc06e676f7d3874e4b4f2875a Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 21 Jun 2019 17:12:44 -0400
Subject: [PATCH 0660/1648] add mode to intrinsic_debug_log to automatically
 call finish_block (if appropriate) on close

---
 .../eosio/chain/intrinsic_debug_log.hpp       |  4 +-
 libraries/chain/intrinsic_debug_log.cpp       | 31 +++++++-
 unittests/intrinsic_debug_log_tests.cpp       | 79 +++++++++++++++++++
 3 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
index 778dd5c433b..b04166ef2f2 100644
--- a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
+++ b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
@@ -29,7 +29,9 @@ namespace eosio { namespace chain {
          enum class open_mode {
             read_only,
             create_new,
-            continue_existing
+            continue_existing,
+            create_new_and_auto_finish_block,
+            continue_existing_and_auto_finish_block
          };
 
          void open( open_mode mode = open_mode::continue_existing );
diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
index dc698099572..f2f33dd4255 100644
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ b/libraries/chain/intrinsic_debug_log.cpp
@@ -129,8 +129,9 @@ namespace eosio { namespace chain {
             std::map<pos_t, extended_block_data>  block_data_cache;
             state_type                            state{ closed{} };
             std::optional<log_metadata_t>         log_metadata;
+            bool                                  finish_block_on_shutdown = false;
 
-            void open( bool open_as_read_only, bool start_fresh );
+            void open( bool open_as_read_only, bool start_fresh, bool auto_finish_block );
             void close();
 
             void start_block( uint32_t block_num );
@@ -234,14 +235,15 @@ namespace eosio { namespace chain {
       ,last_committed_block_num( s.last_committed_block_num )
       {}
 
-      void intrinsic_debug_log_impl::open( bool open_as_read_only, bool start_fresh ) {
+      void intrinsic_debug_log_impl::open( bool open_as_read_only, bool start_fresh, bool auto_finish_block ) {
          FC_ASSERT( !log.is_open(), "cannot open when the log is already open" );
          FC_ASSERT( std::holds_alternative<closed>( state ), "state out of sync" );
 
          std::ios_base::openmode open_mode = std::ios::in | std::ios::binary;
 
          if( open_as_read_only ) {
-            FC_ASSERT( !start_fresh, "start_fresh cannot be true in read-only mode" );
+            FC_ASSERT( !start_fresh,       "start_fresh cannot be true in read-only mode" );
+            FC_ASSERT( !auto_finish_block, "auto_finish_block cannot be true in read-only mode" );
          } else {
             open_mode |= (std::ios::out | std::ios::app);
          }
@@ -279,6 +281,8 @@ namespace eosio { namespace chain {
             throw;
          }
 
+         finish_block_on_shutdown = auto_finish_block;
+
          if( open_as_read_only ) {
             state.emplace<read_only>( last_committed_block_num );
             log.seekg( 0, std::ios::beg );
@@ -291,6 +295,14 @@ namespace eosio { namespace chain {
       void intrinsic_debug_log_impl::close() {
          if( !log.is_open() ) return;
 
+         if( finish_block_on_shutdown
+               && !std::holds_alternative<closed>( state )
+               && !std::holds_alternative<read_only>( state )
+               && !std::holds_alternative<waiting_to_start_block>( state )
+         ) {
+            finish_block();
+         }
+
          std::optional<pos_t> truncate_pos = std::visit( overloaded{
             []( closed ) -> std::optional<pos_t> {
                FC_ASSERT( false, "state out of sync" );
@@ -319,6 +331,8 @@ namespace eosio { namespace chain {
 
          log.close();
 
+         finish_block_on_shutdown = false;
+
          state.emplace<closed>();
          log_metadata.reset();
          block_data_cache.clear();
@@ -674,7 +688,16 @@ namespace eosio { namespace chain {
 
    void intrinsic_debug_log::open( open_mode mode ) {
       bool open_as_read_only = (mode == open_mode::read_only);
-      my->open( open_as_read_only, ( open_as_read_only ? false : (mode == open_mode::create_new) ) );
+      bool start_fresh = false;
+      bool auto_finish_block = false;
+
+      if( !open_as_read_only ) {
+         start_fresh = ( mode == open_mode::create_new || mode == open_mode::create_new_and_auto_finish_block );
+         auto_finish_block = ( mode == open_mode::create_new_and_auto_finish_block
+                                 || mode == open_mode::continue_existing_and_auto_finish_block );
+      }
+
+      my->open( open_as_read_only, start_fresh, auto_finish_block );
    }
 
    void intrinsic_debug_log::close() {
diff --git a/unittests/intrinsic_debug_log_tests.cpp b/unittests/intrinsic_debug_log_tests.cpp
index 9d0261a3c02..399d1eeb7d7 100644
--- a/unittests/intrinsic_debug_log_tests.cpp
+++ b/unittests/intrinsic_debug_log_tests.cpp
@@ -270,4 +270,83 @@ BOOST_AUTO_TEST_CASE(equivalence_test) {
    BOOST_REQUIRE( !result );
 }
 
+BOOST_AUTO_TEST_CASE(auto_finish_block_test) {
+   fc::temp_directory  tempdir;
+   auto ref_log1_path = tempdir.path() / "intrinsic1.log";
+   auto ref_log2_path = tempdir.path() / "intrinsic2.log";
+   auto log_path      = tempdir.path() / "intrinsic.log";
+   auto trx_id = fc::variant("0102030405060708090a0b0c0d0e0f100102030405060708090a0b0c0d0e0f10").as<transaction_id_type>();
+   auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
+   name alice("alice");
+   name foo("foo");
+
+   intrinsic_debug_log ref_log1( ref_log1_path ); // reference log 1
+   {
+      ref_log1.open();
+      ref_log1.start_block( 1u );
+      ref_log1.finish_block();
+      ref_log1.close();
+   }
+
+   intrinsic_debug_log ref_log2( ref_log2_path ); // reference log 2
+   {
+      ref_log2.open();
+      ref_log2.start_block( 1u );
+      ref_log2.finish_block();
+      ref_log2.start_block( 2u );
+      ref_log2.start_transaction( trx_id );
+      ref_log2.start_action( 1ull, alice, alice, foo );
+      ref_log2.acknowledge_intrinsic_without_recording();
+      ref_log2.record_intrinsic( digest, digest );
+      ref_log2.finish_block();
+      ref_log2.close();
+   }
+
+   // Mode 1 (default mode): do not automatically finish any pending block.
+   // This mode enforces that the log remains consistent with block activity (truncate blocks if necessary).
+   {
+      {
+         intrinsic_debug_log log( log_path );
+         log.open();
+         log.start_block( 1u );
+         log.finish_block();
+         log.start_block( 2u );
+         log.start_transaction( trx_id );
+         log.start_action( 1ull, alice, alice, foo );
+         log.acknowledge_intrinsic_without_recording();
+         log.record_intrinsic( digest, digest );
+      }
+
+      intrinsic_debug_log log( log_path );
+      log.open( intrinsic_debug_log::open_mode::read_only );
+
+      auto result = intrinsic_debug_log::find_first_difference( log, ref_log1 );
+      BOOST_REQUIRE( !result );
+   }
+
+   // Mode 2: automatically finish any pending block.
+   // This mode keeps recent information in log during any shutdown by automatically finish the block even if it
+   // is not explicitly called. This may result in the data recorded for last block in the log to not have all
+   // the data that actually occurred in that block.
+   {
+      {
+         intrinsic_debug_log log( log_path );
+         log.open( intrinsic_debug_log::open_mode::continue_existing_and_auto_finish_block );
+         log.start_block( 1u );
+         log.finish_block();
+         log.start_block( 2u );
+         log.start_transaction( trx_id);
+         log.start_action( 1ull, alice, alice, foo );
+         log.acknowledge_intrinsic_without_recording();
+         log.record_intrinsic( digest, digest );
+      }
+
+      intrinsic_debug_log log( log_path );
+      log.open( intrinsic_debug_log::open_mode::read_only );
+
+      auto result = intrinsic_debug_log::find_first_difference( log, ref_log2 );
+      BOOST_REQUIRE( !result );
+   }
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From ea126174020a918f778c9687102c557678b97c83 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 14:24:36 -0400
Subject: [PATCH 0661/1648] removed python2

---
 scripts/eosio_build_amazonlinux2_deps | 1 -
 scripts/eosio_build_centos7_deps      | 2 --
 scripts/eosio_build_darwin_deps       | 1 -
 scripts/eosio_build_ubuntu_deps       | 2 --
 4 files changed, 6 deletions(-)

diff --git a/scripts/eosio_build_amazonlinux2_deps b/scripts/eosio_build_amazonlinux2_deps
index c599e9b1ae4..abe8b2343d6 100755
--- a/scripts/eosio_build_amazonlinux2_deps
+++ b/scripts/eosio_build_amazonlinux2_deps
@@ -15,7 +15,6 @@ libcurl-devel,rpm -qa
 libusbx-devel,rpm -qa
 python3,rpm -qa
 python3-devel,rpm -qa
-python-devel,rpm -qa
 libedit-devel,rpm -qa
 doxygen,rpm -qa
 graphviz,rpm -qa
diff --git a/scripts/eosio_build_centos7_deps b/scripts/eosio_build_centos7_deps
index 7f32fada681..19c8b966c28 100644
--- a/scripts/eosio_build_centos7_deps
+++ b/scripts/eosio_build_centos7_deps
@@ -11,8 +11,6 @@ openssl-devel,rpm -qa
 gmp-devel,rpm -qa
 ocaml,rpm -qa
 libicu-devel,rpm -qa
-python,rpm -qa
-python-devel,rpm -qa
 rh-python36,rpm -qa
 gettext-devel,rpm -qa
 file,rpm -qa
diff --git a/scripts/eosio_build_darwin_deps b/scripts/eosio_build_darwin_deps
index b2cf9a8c6f5..f45bc65c959 100755
--- a/scripts/eosio_build_darwin_deps
+++ b/scripts/eosio_build_darwin_deps
@@ -7,7 +7,6 @@ gmp,/usr/local/opt/gmp/include/gmpxx.h
 llvm@4,/usr/local/opt/llvm@4
 pkgconfig,/usr/local/bin/pkg-config
 python,/usr/local/opt/python3
-python@2,/usr/local/opt/python2
 doxygen,/usr/local/bin/doxygen
 libusb,/usr/local/lib/libusb-1.0.0.dylib
 openssl,/usr/local/opt/openssl/lib/libssl.a
\ No newline at end of file
diff --git a/scripts/eosio_build_ubuntu_deps b/scripts/eosio_build_ubuntu_deps
index bfb6b776148..658ee058189 100644
--- a/scripts/eosio_build_ubuntu_deps
+++ b/scripts/eosio_build_ubuntu_deps
@@ -9,8 +9,6 @@ graphviz,dpkg -s
 libgmp3-dev,dpkg -s
 autotools-dev,dpkg -s
 libicu-dev,dpkg -s
-python2.7,dpkg -s
-python2.7-dev,dpkg -s
 python3,dpkg -s
 python3-dev,dpkg -s
 autoconf,dpkg -s

From 84cd42d2878d2ed46b3fa1ab527e5283923386d5 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 16:01:59 -0400
Subject: [PATCH 0662/1648] build-essential is needed to install cmake, clang8,
 etc

---
 scripts/.build_vars           |  3 +++
 scripts/eosio_build_ubuntu.sh | 12 ++++++++----
 scripts/helpers/eosio.sh      | 15 +++++++--------
 scripts/helpers/general.sh    |  7 ++++---
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index 585c521c935..da9c84a665b 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -6,6 +6,9 @@ export BIN_DIR=${EOSIO_INSTALL_DIR}/bin
 export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
 export DATA_DIR=${EOSIO_INSTALL_DIR}/data
 
+# Used to cleanup build-essential, unless the user has it already when they execute build scripts
+export PINNED_BUILD_ESSENTIALS=false
+
 # CMAKE
 export CMAKE_VERSION_MAJOR=3
 export CMAKE_VERSION_MINOR=13
diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 0c267b976b4..31ce69bfaf4 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -11,14 +11,15 @@ echo "Disk space available: ${DISK_AVAIL}G"
 [[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
 
 # system clang and build essential for Ubuntu 18 (16 too old)
-( [[ $PIN_COMPILER == false ]] && [[ "$(echo ${VERSION_ID})" == "18.04" ]] ) && ensure-build-essential && EXTRA_DEPS=(clang,dpkg\ -s)
+ensure-build-essential # We need build-essential regardless to build cmake, clang, llvm, etc
+# Handle clang/compiler; Must come before PIN_COMPILER/BUILD_CLANG
+ensure-compiler
+( [[ $PIN_COMPILER == false ]] && [[ "$(echo ${VERSION_ID})" == "18.04" ]] ) && EXTRA_DEPS=(clang,dpkg\ -s)
 # Ensure packages exist
 ([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS+=(llvm-4.0,dpkg\ -s)
 $ENABLE_COVERAGE_TESTING && EXTRA_DEPS+=(lcov,dpkg\ -s)
 ensure-apt-packages "${REPO_ROOT}/scripts/eosio_build_ubuntu_deps" $(echo ${EXTRA_DEPS[@]})
 echo ""
-# Handle clang/compiler
-ensure-compiler
 # CMAKE Installation
 ensure-cmake
 # CLANG Installation
@@ -89,4 +90,7 @@ if $INSTALL_MONGO; then
 	else
 		echo " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}."
 	fi
-fi
\ No newline at end of file
+fi
+
+# Cleanup build-essential as they were only needed for installing source packages
+( $PINNED_BUILD_ESSENTIAL && $PIN_COMPILER ) && apt autoremove build-essential -y >/dev/null
\ No newline at end of file
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 3bea7b5f72b..62bb3c4ca86 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -146,14 +146,13 @@ function prompt-mongo-install() {
 }
 
 function ensure-compiler() {
-    DEFAULT_CXX=clang++
-    DEFAULT_CC=clang
     if [[ $NAME == "CentOS Linux" ]]; then
-        DEFAULT_CXX=g++
-        DEFAULT_CC=gcc
+        export CXX=${CXX:-'g++'}
+        export CC=${CC:-'gcc'}
     fi
-    export CXX=${CXX:-$DEFAULT_CXX}
-    export CC=${CC:-$DEFAULT_CC}
+    export CXX=${CXX:-'clang++'}
+    export CC=${CC:-'clang'}
+    echo "Using Compiler: CXX: $CXX & CC: $CC"
     if $PIN_COMPILER || [[ -f $CLANG_ROOT/bin/clang++ ]]; then
         export PIN_COMPILER=true
         export BUILD_CLANG=true
@@ -161,7 +160,7 @@ function ensure-compiler() {
         export CC_COMP=$CLANG_ROOT/bin/clang
         export PATH=$CLANG_ROOT/bin:$PATH
     elif [[ $PIN_COMPILER == false ]]; then
-        which $CXX &>/dev/null || ( echo "${COLOR_RED}Unable to find compiler: Pass in the -P option if you wish for us to install it or install a C++17 compiler and set \$CXX and \$CC to the proper binary locations. ${COLOR_NC}"; exit 1 )
+        which $CXX &>/dev/null || ( echo "${COLOR_RED}Unable to find $CXX compiler: Pass in the -P option if you wish for us to install it or install a C++17 compiler and set \$CXX and \$CC to the proper binary locations. ${COLOR_NC}"; exit 1 )
         # readlink on mac differs from linux readlink (mac doesn't have -f)
         [[ $ARCH == "Linux" ]] && READLINK_COMMAND="readlink -f" || READLINK_COMMAND="readlink"
         COMPILER_TYPE=$( eval $READLINK_COMMAND $(which $CXX) || true )
@@ -181,7 +180,7 @@ function ensure-compiler() {
             [[ $( $(which $CXX) -dumpversion | cut -d '.' -f 1 ) -lt 7 ]] && export NO_CPP17=true
             if [[ $NO_CPP17 == false ]]; then # https://github.com/EOSIO/eos/issues/7402
                 while true; do
-                    echo "${COLOR_YELLOW}WARNING: Your GCC compiler is less performant than clang (https://github.com/EOSIO/eos/issues/7402). We suggest running the build script with -P or install your own clang and try again. ${CXX}!${COLOR_NC}"
+                    echo "${COLOR_YELLOW}WARNING: Your GCC compiler ($CXX) is less performant than clang (https://github.com/EOSIO/eos/issues/7402). We suggest running the build script with -P or install your own clang and try again.${COLOR_NC}"
                     [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to proceed anyway? (y/n)?${COLOR_NC}" && read -p " " PROCEED
                     case $PROCEED in
                         "" ) echo "What would you like to do?";;
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index b6e8fd57363..ed206fc34e5 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -169,7 +169,7 @@ function ensure-devtoolset() {
 }
 
 function ensure-build-essential() {
-    echo "${COLOR_CYAN}[Ensuring installation of build-essential with C++7]${COLOR_NC}"
+    echo "${COLOR_CYAN}[Ensuring installation of build-essential (needed for installing depedencies; we will remove it after)]${COLOR_NC}"
     BUILD_ESSENTIAL=$( dpkg -s build-essential | grep 'Package: build-essential' || true )
     if [[ -z $BUILD_ESSENTIAL ]]; then
         while true; do
@@ -177,8 +177,9 @@ function ensure-build-essential() {
             echo ""
             case $PROCEED in
                 "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* ) 
-                    if install-package build-essential; then
+                0 | true | [Yy]* )
+                    if install-package build-essential WETRUN; then
+                        $PIN_COMPILER && export PINNED_BUILD_ESSENTIALS=true
                         echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
                     else
                         echo " - ${COLOR_GREEN}Install of build-essential failed. Please try a manual install.${COLOR_NC}"

From 34a414a80acedaf60c3ea47e3b37d8103c70f485 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 16:47:24 -0400
Subject: [PATCH 0663/1648] fixed bats for ubuntu

---
 scripts/helpers/general.sh           | 2 +-
 tests/bash-bats/eosio_build.sh       | 3 ++-
 tests/bash-bats/helpers/functions.sh | 2 +-
 tests/bash-bats/modules/clang.sh     | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index ed206fc34e5..8dff4074f32 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -178,7 +178,7 @@ function ensure-build-essential() {
             case $PROCEED in
                 "" ) echo "What would you like to do?";;
                 0 | true | [Yy]* )
-                    if install-package build-essential WETRUN; then
+                    if install-package build-essential; then
                         $PIN_COMPILER && export PINNED_BUILD_ESSENTIALS=true
                         echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
                     else
diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index 50e3e066881..f5059b2dd00 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -26,12 +26,13 @@ TEST_LABEL="[eosio_build]"
             # No c++!
             run bash -c "printf \"y\ny\ny\nn\nn\n\" | ./${SCRIPT_LOCATION}"
         fi
-        [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "Unable to find .* compiler") ]] || exit
     fi 
 
     cd ./scripts # Also test that we can run the script from a directory other than the root
     run bash -c "./eosio_build.sh -y -P"
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Installed build-essential") ]] || exit # Ensure build-essentials is installed so we can compile cmake, clang, boost, etc
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit
     # -P with prompts
diff --git a/tests/bash-bats/helpers/functions.sh b/tests/bash-bats/helpers/functions.sh
index 0aabbbe947b..43935f23413 100644
--- a/tests/bash-bats/helpers/functions.sh
+++ b/tests/bash-bats/helpers/functions.sh
@@ -22,6 +22,6 @@ function teardown() { # teardown is run once after each test, even if it fails
   uninstall-package devtoolset-8* WETRUN
   uninstall-package centos-release-scl
   uninstall-package gcc-c++ WETRUN
-  uninstall-package build-essential WETRUN
+  ( [[ $NAME == 'Ubuntu' ]] && [[ ! $( dpkg -s build-essential 2>/dev/null ) ]] ) && apt autoremove build-essential -y &>/dev/null
 }
 trap teardown EXIT
\ No newline at end of file
diff --git a/tests/bash-bats/modules/clang.sh b/tests/bash-bats/modules/clang.sh
index 1f8dba4fb1e..4033dc4c66d 100755
--- a/tests/bash-bats/modules/clang.sh
+++ b/tests/bash-bats/modules/clang.sh
@@ -20,7 +20,7 @@ load ../helpers/functions
         #     [[ ! -z $(echo "${output}" | grep "$CLANG_ROOT") ]] || exit
         # fi
         ## CLANG
-        uninstall-package build-essential WETRUN 1>/dev/null
+        apt autoremove build-essential -y 1>/dev/null
         run bash -c "./$SCRIPT_LOCATION -y -P"
         [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
         [[ ! -z $(echo "${output}" | grep "Clang 8 successfully installed") ]] || exit
@@ -30,6 +30,6 @@ load ../helpers/functions
     export CXX=c2234
     export CC=ewwqd
     run bash -c "./$SCRIPT_LOCATION -y"
-    [[ ! -z $(echo "${output}" | grep "Unable to find compiler") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Unable to find .* compiler") ]] || exit
     
 }
\ No newline at end of file

From f55bd24205b96eb31f0b799551d1b9970713dc8e Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 17:44:18 -0400
Subject: [PATCH 0664/1648] bats fixes

---
 scripts/eosio_build_ubuntu.sh         |  2 +-
 scripts/helpers/eosio.sh              |  1 -
 scripts/helpers/general.sh            | 48 ++++++++++++++-------------
 tests/bash-bats/eosio_build.sh        |  5 ++-
 tests/bash-bats/eosio_build_ubuntu.sh |  3 +-
 tests/bash-bats/helpers/functions.sh  | 17 ++++++----
 6 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 31ce69bfaf4..62b1b9de7f8 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -93,4 +93,4 @@ if $INSTALL_MONGO; then
 fi
 
 # Cleanup build-essential as they were only needed for installing source packages
-( $PINNED_BUILD_ESSENTIAL && $PIN_COMPILER ) && apt autoremove build-essential -y >/dev/null
\ No newline at end of file
+($PIN_COMPILER && $PINNED_BUILD_ESSENTIALS) && apt autoremove build-essential -y; true
\ No newline at end of file
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 62bb3c4ca86..c765705d944 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -152,7 +152,6 @@ function ensure-compiler() {
     fi
     export CXX=${CXX:-'clang++'}
     export CC=${CC:-'clang'}
-    echo "Using Compiler: CXX: $CXX & CC: $CC"
     if $PIN_COMPILER || [[ -f $CLANG_ROOT/bin/clang++ ]]; then
         export PIN_COMPILER=true
         export BUILD_CLANG=true
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 8dff4074f32..5cb3ff3f705 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -169,29 +169,31 @@ function ensure-devtoolset() {
 }
 
 function ensure-build-essential() {
-    echo "${COLOR_CYAN}[Ensuring installation of build-essential (needed for installing depedencies; we will remove it after)]${COLOR_NC}"
-    BUILD_ESSENTIAL=$( dpkg -s build-essential | grep 'Package: build-essential' || true )
-    if [[ -z $BUILD_ESSENTIAL ]]; then
-        while true; do
-            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
-            echo ""
-            case $PROCEED in
-                "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* )
-                    if install-package build-essential; then
-                        $PIN_COMPILER && export PINNED_BUILD_ESSENTIALS=true
-                        echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
-                    else
-                        echo " - ${COLOR_GREEN}Install of build-essential failed. Please try a manual install.${COLOR_NC}"
-                        exit 1
-                    fi
-                break;;
-                1 | false | [Nn]* ) echo " - User aborted installation of build-essential."; break;;
-                * ) echo "Please type 'y' for yes or 'n' for no.";;
-            esac
-        done
-    else
-        echo " - ${BUILD_ESSENTIAL} found."
+    if [[ ! $(dpkg -s clang 2>/dev/null) ]]; then # Clang already exists, so no need for build essentials
+        echo "${COLOR_CYAN}[Ensuring installation of build-essential (needed for installing depedencies; we will remove it after)]${COLOR_NC}"
+        BUILD_ESSENTIAL=$( dpkg -s build-essential | grep 'Package: build-essential' || true )
+        if [[ -z $BUILD_ESSENTIAL ]]; then
+            while true; do
+                [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
+                echo ""
+                case $PROCEED in
+                    "" ) echo "What would you like to do?";;
+                    0 | true | [Yy]* )
+                        if install-package build-essential; then
+                            $PIN_COMPILER && export PINNED_BUILD_ESSENTIALS=true
+                            echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
+                        else
+                            echo " - ${COLOR_GREEN}Install of build-essential failed. Please try a manual install.${COLOR_NC}"
+                            exit 1
+                        fi
+                    break;;
+                    1 | false | [Nn]* ) echo " - User aborted installation of build-essential."; break;;
+                    * ) echo "Please type 'y' for yes or 'n' for no.";;
+                esac
+            done
+        else
+            echo " - ${BUILD_ESSENTIAL} found."
+        fi
     fi
 }
 
diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index f5059b2dd00..fe78e93c8cf 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -32,7 +32,10 @@ TEST_LABEL="[eosio_build]"
     cd ./scripts # Also test that we can run the script from a directory other than the root
     run bash -c "./eosio_build.sh -y -P"
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "Installed build-essential") ]] || exit # Ensure build-essentials is installed so we can compile cmake, clang, boost, etc
+    # Ensure build-essentials is installed so we can compile cmake, clang, boost, etc
+    if [[ $NAME == "Ubuntu" ]]; then
+        [[ ! -z $(echo "${output}" | grep "Installed build-essential") ]] || exit
+    fi
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit
     [[ "${output}" =~ "Clang 8 successfully installed" ]] || exit
     # -P with prompts
diff --git a/tests/bash-bats/eosio_build_ubuntu.sh b/tests/bash-bats/eosio_build_ubuntu.sh
index c87630c59ee..e18145369f1 100644
--- a/tests/bash-bats/eosio_build_ubuntu.sh
+++ b/tests/bash-bats/eosio_build_ubuntu.sh
@@ -28,7 +28,6 @@ export TEST_LABEL="[eosio_build_ubuntu]"
     # Testing clang already existing (no pinning of clang8)
     install-package clang WETRUN &>/dev/null 
     run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
-    
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep python.*found) ]] || exit
@@ -42,5 +41,5 @@ export TEST_LABEL="[eosio_build_ubuntu]"
     [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
     [[ -z $(echo "${output}" | grep lcov.*found.) ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
-    [[ "$(echo ${VERSION_ID})" == "16.04" ]] && uninstall-package clang WETRUN || uninstall-package build-essential WETRUN
+    [[ "$(echo ${VERSION_ID})" == "16.04" ]] && uninstall-package clang WETRUN || apt autoremove build-essential -y
 }
diff --git a/tests/bash-bats/helpers/functions.sh b/tests/bash-bats/helpers/functions.sh
index 43935f23413..f8edaea624a 100644
--- a/tests/bash-bats/helpers/functions.sh
+++ b/tests/bash-bats/helpers/functions.sh
@@ -17,11 +17,16 @@ setup-bats-dirs
 
 function teardown() { # teardown is run once after each test, even if it fails
   [[ -d "$HOME" ]] && rm -rf "$HOME"
-  uninstall-package which WETRUN
-  uninstall-package sudo WETRUN
-  uninstall-package devtoolset-8* WETRUN
-  uninstall-package centos-release-scl
-  uninstall-package gcc-c++ WETRUN
-  ( [[ $NAME == 'Ubuntu' ]] && [[ ! $( dpkg -s build-essential 2>/dev/null ) ]] ) && apt autoremove build-essential -y &>/dev/null
+  if [[ $ARCH == "Linux" ]]; then
+    uninstall-package which WETRUN
+    export SUDO_FORCE_REMOVE=yes
+    uninstall-package sudo WETRUN
+    uninstall-package devtoolset-8* WETRUN
+    uninstall-package centos-release-scl
+    uninstall-package gcc-c++ WETRUN
+    if [[ $NAME == 'Ubuntu' ]]; then
+      [[ ! $( dpkg -s build-essential 2>/dev/null ) ]] && apt autoremove build-essential -y &>/dev/null
+    fi
+  fi
 }
 trap teardown EXIT
\ No newline at end of file

From b39bdae93064cab12eef94de0dc8322fb44cba63 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 17:44:35 -0400
Subject: [PATCH 0665/1648] bats fixes

---
 tests/bash-bats/eosio_build_centos.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index f03ef6fe2ae..c58cee78e9d 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -35,7 +35,6 @@ export TEST_LABEL="[eosio_build_centos]"
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Python36 successfully enabled") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "python.*found!") ]] || exit
     [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Ensuring CMAKE") ]] || exit
     [[ ! -z $(echo "${output}" | grep /NEWPATH.*/src/boost) ]] || exit

From 2771dd08bf5466d07c0d26109c7f15fe8075a465 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 24 Jun 2019 16:47:01 -0500
Subject: [PATCH 0666/1648] Remove add_subjective_failure, add add_persisted

---
 .../chain/unapplied_transaction_queue.hpp     | 51 +++++++------
 .../unapplied_transaction_queue_tests.cpp     | 74 +++++++++----------
 2 files changed, 67 insertions(+), 58 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 9996de4faf9..bab35d23de7 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -27,18 +27,16 @@ enum trx_enum_type {
    unknown = 0,
    persisted = 1,
    forked = 2,
-   aborted = 3,
-   subjective = 4
+   aborted = 3
 };
 
 struct unapplied_transaction {
    const transaction_metadata_ptr trx_meta;
    const fc::time_point           expiry;
-   const trx_enum_type            trx_type = unknown;
+   trx_enum_type                  trx_type = unknown;
 
    const transaction_id_type& signed_id()const { return trx_meta->signed_id(); }
    const transaction_id_type& id()const { return trx_meta->id(); }
-   bool is_persisted()const { return trx_type == persisted; }
 
    unapplied_transaction(const unapplied_transaction&) = delete;
    unapplied_transaction() = delete;
@@ -47,7 +45,7 @@ struct unapplied_transaction {
 };
 
 /**
- * Track unapplied transactions for persisted, forked blocks, aborted blocks, and subjectively
+ * Track unapplied transactions for persisted, forked blocks, aborted blocks
  * failed transactions.
  */
 class unapplied_transaction_queue {
@@ -62,19 +60,13 @@ class unapplied_transaction_queue {
          hashed_unique< tag<by_signed_id>,
                const_mem_fun<unapplied_transaction, const transaction_id_type&, &unapplied_transaction::signed_id>
          >,
-         ordered_non_unique< tag<by_type>, member<unapplied_transaction, const trx_enum_type, &unapplied_transaction::trx_type> >,
+         ordered_non_unique< tag<by_type>, member<unapplied_transaction, trx_enum_type, &unapplied_transaction::trx_type> >,
          ordered_non_unique< tag<by_expiry>, member<unapplied_transaction, const fc::time_point, &unapplied_transaction::expiry> >
       >
    > unapplied_trx_queue_type;
 
    unapplied_trx_queue_type queue;
 
-   std::deque<chain::branch_type> forked_branches;
-   size_t current_trx_in_block = 0;
-   std::deque<std::vector<transaction_metadata_ptr>> aborted_block_trxs;
-   size_t current_trx_in_trxs = 0;
-   std::deque<chain::transaction_metadata_ptr> subjective_failed_trxs;
-   size_t total_size = 0;
 public:
 
    bool empty() const {
@@ -93,6 +85,12 @@ class unapplied_transaction_queue {
       return queue.get<by_type>().find( persisted ) != queue.get<by_type>().end();
    }
 
+   bool is_persisted(const transaction_metadata_ptr& trx)const {
+      auto itr = queue.get<by_signed_id>().find( trx->signed_id() );
+      if( itr == queue.get<by_signed_id>().end() ) return false;
+      return itr->trx_type == persisted;
+   }
+
    template <typename Func>
    bool clear_expired( const time_point& pending_block_time, const time_point& deadline, Func&& callback ) {
       auto& persisted_by_expiry = queue.get<by_expiry>();
@@ -100,31 +98,42 @@ class unapplied_transaction_queue {
          if (deadline <= fc::time_point::now()) {
             return false;
          }
-         callback( persisted_by_expiry.begin()->id() );
+         callback( persisted_by_expiry.begin()->id(), persisted_by_expiry.begin()->trx_type );
          persisted_by_expiry.erase( persisted_by_expiry.begin() );
       }
       return true;
    }
 
-   void add_forked( chain::branch_type forked_branch ) {
+   void add_forked( branch_type forked_branch ) {
       // forked_branch is in reverse order
       for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
-         for( auto itr = (*ritr)->trxs.begin(), end = (*ritr)->trxs.end(); itr != end; ++itr ) {
+         block_state_ptr& bsptr = *ritr;
+         for( auto itr = bsptr->trxs.begin(), end = bsptr->trxs.end(); itr != end; ++itr ) {
             const auto& trx = *itr;
-            queue.push_back( {trx, trx->packed_trx()->expiration(), forked} );
+            fc::time_point expiry = trx->packed_trx()->expiration();
+            queue.push_back( { trx, std::move( expiry ), forked } );
          }
       }
    }
 
-   void add_aborted( std::vector<chain::transaction_metadata_ptr> aborted_trxs ) {
+   void add_aborted( std::vector<transaction_metadata_ptr> aborted_trxs ) {
       if( aborted_trxs.empty() ) return;
-      for( const auto& trx : aborted_trxs ) {
-         queue.push_back( { trx, trx->packed_trx()->expiration(), aborted } );
+      for( auto& trx : aborted_trxs ) {
+         fc::time_point expiry = trx->packed_trx()->expiration();
+         queue.push_back( { std::move( trx ), std::move( expiry ), aborted } );
       }
    }
 
-   void add_subjective_failure( chain::transaction_metadata_ptr trx ) {
-      queue.push_back( { trx, trx->packed_trx()->expiration(), subjective } );
+   void add_persisted( const transaction_metadata_ptr& trx ) {
+      auto itr = queue.get<by_signed_id>().find( trx->signed_id() );
+      if( itr == queue.get<by_signed_id>().end() ) {
+         fc::time_point expiry = trx->packed_trx()->expiration();
+         queue.push_back( { trx, std::move( expiry ), persisted } );
+      } else if( itr->trx_type != persisted ) {
+         queue.get<by_signed_id>().modify( itr, [](auto& un){
+            un.trx_type = persisted;
+         } );
+      }
    }
 
    using iterator = unapplied_trx_queue_type::index<by_type>::type::iterator;
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index 885fcb26502..c1d530c412f 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -53,8 +53,8 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    auto p = next( q );
    BOOST_CHECK( p == nullptr );
 
-   // 1 subjective failure
-   q.add_subjective_failure( trx1 );
+   // 1 persisted
+   q.add_persisted( trx1 );
    BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 0 );
@@ -62,10 +62,10 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
-   // fifo subjective
-   q.add_subjective_failure( trx1 );
-   q.add_subjective_failure( trx2 );
-   q.add_subjective_failure( trx3 );
+   // fifo persisted
+   q.add_persisted( trx1 );
+   q.add_persisted( trx2 );
+   q.add_persisted( trx3 );
    BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 2 );
@@ -88,25 +88,25 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
-   // order: aborted, subjective
-   q.add_subjective_failure( trx6 );
+   // order: persisted, aborted
+   q.add_persisted( trx6 );
    q.add_aborted( { trx1, trx2, trx3 } );
    q.add_aborted( { trx4, trx5 } );
-   q.add_subjective_failure( trx7 );
+   q.add_persisted( trx7 );
    BOOST_CHECK( q.size() == 7 );
-   BOOST_REQUIRE( next( q ) == trx1 );
+   BOOST_REQUIRE( next( q ) == trx6 );
    BOOST_CHECK( q.size() == 6 );
-   BOOST_REQUIRE( next( q ) == trx2 );
+   BOOST_REQUIRE( next( q ) == trx7 );
    BOOST_CHECK( q.size() == 5 );
-   BOOST_REQUIRE( next( q ) == trx3 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 4 );
-   BOOST_REQUIRE( next( q ) == trx4 );
+   BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( next( q ) == trx5 );
+   BOOST_REQUIRE( next( q ) == trx3 );
    BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( next( q ) == trx6 );
+   BOOST_REQUIRE( next( q ) == trx4 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( next( q ) == trx7 );
+   BOOST_REQUIRE( next( q ) == trx5 );
    BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
@@ -204,54 +204,54 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
-   // altogether, order fifo: forked, aborted, subjectively failed
+   // altogether, order fifo: persisted, forked, aborted
    q.add_forked( { bs3, bs2, bs1 } );
-   q.add_subjective_failure( trx16 );
+   q.add_persisted( trx16 );
    q.add_aborted( { trx9, trx14 } );
-   q.add_subjective_failure( trx8 );
+   q.add_persisted( trx8 );
    q.add_aborted( { trx18, trx19 } );
    q.add_forked( { bs6, bs5, bs4 } );
    BOOST_CHECK( q.size() == 17 );
-   BOOST_REQUIRE( next( q ) == trx1 );
+   BOOST_REQUIRE( next( q ) == trx16 );
    BOOST_CHECK( q.size() == 16 );
-   BOOST_REQUIRE( next( q ) == trx2 );
+   BOOST_REQUIRE( next( q ) == trx8 );
    BOOST_CHECK( q.size() == 15 );
-   BOOST_REQUIRE_EQUAL( next( q ), trx3 );
+   BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 14 );
-   BOOST_REQUIRE( next( q ) == trx4 );
+   BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 13 );
-   BOOST_REQUIRE( next( q ) == trx5 );
+   BOOST_REQUIRE_EQUAL( next( q ), trx3 );
    BOOST_CHECK( q.size() == 12 );
-   BOOST_REQUIRE( next( q ) == trx6 );
+   BOOST_REQUIRE( next( q ) == trx4 );
    BOOST_CHECK( q.size() == 11 );
-   BOOST_REQUIRE( next( q ) == trx7 );
+   BOOST_REQUIRE( next( q ) == trx5 );
    BOOST_CHECK( q.size() == 10 );
-   BOOST_REQUIRE( next( q ) == trx11 );
+   BOOST_REQUIRE( next( q ) == trx6 );
    BOOST_CHECK( q.size() == 9 );
-   BOOST_REQUIRE_EQUAL( next( q ), trx12 );
+   BOOST_REQUIRE( next( q ) == trx7 );
    BOOST_CHECK( q.size() == 8 );
-   BOOST_REQUIRE( next( q ) == trx13 );
+   BOOST_REQUIRE( next( q ) == trx11 );
    BOOST_CHECK( q.size() == 7 );
-   BOOST_REQUIRE( next( q ) == trx15 );
+   BOOST_REQUIRE_EQUAL( next( q ), trx12 );
    BOOST_CHECK( q.size() == 6 );
-   BOOST_REQUIRE( next( q ) == trx9 );
+   BOOST_REQUIRE( next( q ) == trx13 );
    BOOST_CHECK( q.size() == 5 );
-   BOOST_REQUIRE( next( q ) == trx14 );
+   BOOST_REQUIRE( next( q ) == trx15 );
    BOOST_CHECK( q.size() == 4 );
-   BOOST_REQUIRE( next( q ) == trx18 );
+   BOOST_REQUIRE( next( q ) == trx9 );
    BOOST_CHECK( q.size() == 3 );
-   BOOST_REQUIRE( next( q ) == trx19 );
+   BOOST_REQUIRE( next( q ) == trx14 );
    BOOST_CHECK( q.size() == 2 );
-   BOOST_REQUIRE( next( q ) == trx16 );
+   BOOST_REQUIRE( next( q ) == trx18 );
    BOOST_CHECK( q.size() == 1 );
-   BOOST_REQUIRE( next( q ) == trx8 );
+   BOOST_REQUIRE( next( q ) == trx19 );
    BOOST_CHECK( q.size() == 0 );
    BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
    q.add_forked( { bs3, bs2, bs1 } );
    q.add_aborted( { trx9, trx11 } );
-   q.add_subjective_failure( trx8 );
+   q.add_persisted( trx8 );
    q.clear();
    BOOST_CHECK( q.empty() );
    BOOST_CHECK( q.size() == 0 );

From 34c402386424984e778213ea13c3c759fc4abb65 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 24 Jun 2019 16:47:31 -0500
Subject: [PATCH 0667/1648] Use iterator

---
 libraries/testing/tester.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index c543775e2b9..f6b64a69477 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -245,11 +245,12 @@ namespace eosio { namespace testing {
       }
 
       if( !skip_pending_trxs ) {
-         while( transaction_metadata_ptr trx = unapplied_transactions.next() ) {
-            auto trace = control->push_transaction(trx, fc::time_point::maximum());
+         for( auto itr = unapplied_transactions.begin(); itr != unapplied_transactions.end();  ) {
+            auto trace = control->push_transaction(itr->trx_meta, fc::time_point::maximum());
             if(trace->except) {
                trace->except->dynamic_rethrow_exception();
             }
+            itr = unapplied_transactions.erase( itr );
          }
 
          vector<transaction_id_type> scheduled_trxs;

From c6611b92aaeb34595044ec762dac5495e62ca98f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 24 Jun 2019 16:47:57 -0500
Subject: [PATCH 0668/1648] Use iterator

---
 unittests/forked_tests.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index a0ec9e10009..4352c381820 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -649,9 +649,11 @@ BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
 
    // verify transaction on fork is reported by push_block in order
    BOOST_REQUIRE_EQUAL( 3, c.get_unapplied_transaction_queue().size() );
-   BOOST_REQUIRE_EQUAL( trace1->id, c.get_unapplied_transaction_queue().next()->id() );
-   BOOST_REQUIRE_EQUAL( trace2->id, c.get_unapplied_transaction_queue().next()->id() );
-   BOOST_REQUIRE_EQUAL( trace3->id, c.get_unapplied_transaction_queue().next()->id() );
+   BOOST_REQUIRE_EQUAL( trace1->id, c.get_unapplied_transaction_queue().begin()->id() );
+   c.get_unapplied_transaction_queue().erase( c.get_unapplied_transaction_queue().begin() );
+   BOOST_REQUIRE_EQUAL( trace2->id, c.get_unapplied_transaction_queue().begin()->id() );
+   c.get_unapplied_transaction_queue().erase( c.get_unapplied_transaction_queue().begin() );
+   BOOST_REQUIRE_EQUAL( trace3->id, c.get_unapplied_transaction_queue().begin()->id() );
 
 } FC_LOG_AND_RETHROW()
 

From fab96f115b5b41126b27c82c991a8a716eb3c971 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 20:12:45 -0400
Subject: [PATCH 0669/1648] g++ for ubuntu16 so it prompts to install clang8

---
 scripts/eosio_build_ubuntu.sh |  9 +++++----
 scripts/helpers/eosio.sh      |  2 +-
 scripts/helpers/general.sh    | 11 ++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 62b1b9de7f8..69e52161d6a 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -11,15 +11,16 @@ echo "Disk space available: ${DISK_AVAIL}G"
 [[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
 
 # system clang and build essential for Ubuntu 18 (16 too old)
-ensure-build-essential # We need build-essential regardless to build cmake, clang, llvm, etc
-# Handle clang/compiler; Must come before PIN_COMPILER/BUILD_CLANG
-ensure-compiler
-( [[ $PIN_COMPILER == false ]] && [[ "$(echo ${VERSION_ID})" == "18.04" ]] ) && EXTRA_DEPS=(clang,dpkg\ -s)
+( [[ $PIN_COMPILER == false ]] && [[ $VERSION_ID == "18.04" ]] ) && EXTRA_DEPS=(clang,dpkg\ -s)
+# We install clang8 for Ubuntu 16, but we still need something to compile cmake, boost, etc
+[[ $VERSION_ID == "16.04" ]] && ensure-build-essential
 # Ensure packages exist
 ([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS+=(llvm-4.0,dpkg\ -s)
 $ENABLE_COVERAGE_TESTING && EXTRA_DEPS+=(lcov,dpkg\ -s)
 ensure-apt-packages "${REPO_ROOT}/scripts/eosio_build_ubuntu_deps" $(echo ${EXTRA_DEPS[@]})
 echo ""
+# Handle clang/compiler
+ensure-compiler
 # CMAKE Installation
 ensure-cmake
 # CLANG Installation
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index c765705d944..c9d160c6b35 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -146,7 +146,7 @@ function prompt-mongo-install() {
 }
 
 function ensure-compiler() {
-    if [[ $NAME == "CentOS Linux" ]]; then
+    if [[ $NAME == "CentOS Linux" ]] || [[ $VERSION_ID == "16.04" ]]; then
         export CXX=${CXX:-'g++'}
         export CC=${CC:-'gcc'}
     fi
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 5cb3ff3f705..15397a727bb 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -179,13 +179,10 @@ function ensure-build-essential() {
                 case $PROCEED in
                     "" ) echo "What would you like to do?";;
                     0 | true | [Yy]* )
-                        if install-package build-essential; then
-                            $PIN_COMPILER && export PINNED_BUILD_ESSENTIALS=true
-                            echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
-                        else
-                            echo " - ${COLOR_GREEN}Install of build-essential failed. Please try a manual install.${COLOR_NC}"
-                            exit 1
-                        fi
+                        apt update
+                        install-package build-essential
+                        $PIN_COMPILER && export PINNED_BUILD_ESSENTIALS=true
+                        echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
                     break;;
                     1 | false | [Nn]* ) echo " - User aborted installation of build-essential."; break;;
                     * ) echo "Please type 'y' for yes or 'n' for no.";;

From d00eb75caf367d388d92d82998715eb2910b7aa3 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 20:22:43 -0400
Subject: [PATCH 0670/1648] quick fix

---
 tests/bash-bats/eosio_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index fe78e93c8cf..e550bf8141b 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -33,7 +33,7 @@ TEST_LABEL="[eosio_build]"
     run bash -c "./eosio_build.sh -y -P"
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
     # Ensure build-essentials is installed so we can compile cmake, clang, boost, etc
-    if [[ $NAME == "Ubuntu" ]]; then
+    if [[ $VERSION_ID == "16.04" ]]; then
         [[ ! -z $(echo "${output}" | grep "Installed build-essential") ]] || exit
     fi
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit

From 5e111952af97b056710c43fb5ada6c0f728a402d Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 20:35:34 -0400
Subject: [PATCH 0671/1648] various fixes for ubuntu:

---
 tests/bash-bats/eosio_build_ubuntu.sh | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/tests/bash-bats/eosio_build_ubuntu.sh b/tests/bash-bats/eosio_build_ubuntu.sh
index e18145369f1..3c3296d0b0e 100644
--- a/tests/bash-bats/eosio_build_ubuntu.sh
+++ b/tests/bash-bats/eosio_build_ubuntu.sh
@@ -10,23 +10,22 @@ export TEST_LABEL="[eosio_build_ubuntu]"
 
 # A helper function is available to show output and status: `debug`
 
-# Testing Root user
-./tests/bash-bats/modules/root-user.sh
-# Testing Options
-./tests/bash-bats/modules/dep_script_options.sh
-# Testing CMAKE
-./tests/bash-bats/modules/cmake.sh
-# Testing Clang
-./tests/bash-bats/modules/clang.sh
-# Testing MongoDB
-./tests/bash-bats/modules/mongodb.sh
+# # Testing Root user
+# ./tests/bash-bats/modules/root-user.sh
+# # Testing Options
+# ./tests/bash-bats/modules/dep_script_options.sh
+# # Testing CMAKE
+# ./tests/bash-bats/modules/cmake.sh
+# # Testing Clang
+# ./tests/bash-bats/modules/clang.sh
+# # Testing MongoDB
+# ./tests/bash-bats/modules/mongodb.sh
 
 ## Needed to load eosio_build_ files properly; it can be empty
 @test "${TEST_LABEL} > General" {
     set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
 
-    # Testing clang already existing (no pinning of clang8)
-    install-package clang WETRUN &>/dev/null 
+    [[ "$(echo ${VERSION_ID})" == "16.04" ]] && install-package build-essential WETRUN 1>/dev/null || install-package clang WETRUN 1>/dev/null
     run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
@@ -41,5 +40,5 @@ export TEST_LABEL="[eosio_build_ubuntu]"
     [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
     [[ -z $(echo "${output}" | grep lcov.*found.) ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
-    [[ "$(echo ${VERSION_ID})" == "16.04" ]] && uninstall-package clang WETRUN || apt autoremove build-essential -y
+    [[ "$(echo ${VERSION_ID})" == "16.04" ]] && apt autoremove build-essential -y || uninstall-package clang WETRUN
 }

From b7a0279387c5e1ba95cd47d5a17f41b07bbdcea2 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 24 Jun 2019 20:43:01 -0400
Subject: [PATCH 0672/1648] quick fix

---
 tests/bash-bats/eosio_build_ubuntu.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/bash-bats/eosio_build_ubuntu.sh b/tests/bash-bats/eosio_build_ubuntu.sh
index 3c3296d0b0e..f5153719359 100644
--- a/tests/bash-bats/eosio_build_ubuntu.sh
+++ b/tests/bash-bats/eosio_build_ubuntu.sh
@@ -10,16 +10,16 @@ export TEST_LABEL="[eosio_build_ubuntu]"
 
 # A helper function is available to show output and status: `debug`
 
-# # Testing Root user
-# ./tests/bash-bats/modules/root-user.sh
-# # Testing Options
-# ./tests/bash-bats/modules/dep_script_options.sh
-# # Testing CMAKE
-# ./tests/bash-bats/modules/cmake.sh
-# # Testing Clang
-# ./tests/bash-bats/modules/clang.sh
-# # Testing MongoDB
-# ./tests/bash-bats/modules/mongodb.sh
+# Testing Root user
+./tests/bash-bats/modules/root-user.sh
+# Testing Options
+./tests/bash-bats/modules/dep_script_options.sh
+# Testing CMAKE
+./tests/bash-bats/modules/cmake.sh
+# Testing Clang
+./tests/bash-bats/modules/clang.sh
+# Testing MongoDB
+./tests/bash-bats/modules/mongodb.sh
 
 ## Needed to load eosio_build_ files properly; it can be empty
 @test "${TEST_LABEL} > General" {

From ca3f64ba87d92d571804f8245885696736178e17 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 21 Jun 2019 11:44:50 +0800
Subject: [PATCH 0673/1648] Expand get_table_rows with more2 field when doing
 lookup with secondary index i256, sha256, ripemd160

---
 plugins/chain_plugin/chain_plugin.cpp         | 22 +++++++++++++++++++
 .../eosio/chain_plugin/chain_plugin.hpp       |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 1a832ff1e2b..489cd755442 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1446,6 +1446,28 @@ string convert_to_string(const Type& source, const string& key_type, const strin
    } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} from '${source}' to string.", ("desc", desc)("source",source) )
 }
 
+template<>
+string convert_to_string(const chain::key256_t& source, const string& key_type, const string& encode_type, const string& desc) {
+   try {
+      if (key_type == chain_apis::sha256 || (key_type == chain_apis::i256 && encode_type == chain_apis::hex)) {
+         auto byte_array = fixed_bytes<32>(source).extract_as_byte_array();
+         fc::sha256 val(reinterpret_cast<char *>(byte_array.data()), byte_array.size());
+         return std::string(val);
+      } else if (key_type == chain_apis::i256) {
+         auto byte_array = fixed_bytes<32>(source).extract_as_byte_array();
+         fc::sha256 val(reinterpret_cast<char *>(byte_array.data()), byte_array.size());
+         return std::string("0x") + std::string(val);
+      } else if (key_type == chain_apis::ripemd160) {
+         auto byte_array = fixed_bytes<20>(source).extract_as_byte_array();
+         fc::ripemd160 val;
+         memcpy(val._hash, byte_array.data(), byte_array.size() );
+         return std::string(val);
+      }
+      EOS_ASSERT( false, chain_type_exception, "Incompatible key_type and encode_type for key256_t more2" );
+     
+   } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} source '${source}' to string.", ("desc", desc)("source",source) )
+}
+
 abi_def get_abi( const controller& db, const name& account ) {
    const auto &d = db.db();
    const account_object *code_accnt = d.find<account_object, by_name>(account);
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 42399c984aa..e8f2b7f8195 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -15,6 +15,7 @@
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/chain/plugin_interface.hpp>
 #include <eosio/chain/types.hpp>
+#include <eosio/chain/fixed_bytes.hpp>
 
 #include <boost/container/flat_set.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
@@ -72,6 +73,9 @@ double convert_to_type(const string& str, const string& desc);
 template<typename Type>
 string convert_to_string(const Type& source, const string& key_type, const string& encode_type, const string& desc);
 
+template<>
+string convert_to_string(const chain::key256_t& source, const string& key_type, const string& encode_type, const string& desc);
+
 class read_only {
    const controller& db;
    const fc::microseconds abi_serializer_max_time;

From c72ca9e6ec3964df5235aa00b1bfa987bbaae0df Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 21 Jun 2019 11:46:42 +0800
Subject: [PATCH 0674/1648] Properly align the input for get_table_rows query
 with key type i256, sha256, ripemd160

---
 .../eosio/chain_plugin/chain_plugin.hpp       | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index e8f2b7f8195..484bc17a8ad 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -639,13 +639,8 @@ class read_write {
      using index_type = chain::index256_index;
      static auto function() {
         return [](const input_type& v) {
-            chain::key256_t k;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-            k[0] = ((uint128_t *)&v._hash)[0]; //0-127
-            k[1] = ((uint128_t *)&v._hash)[1]; //127-256
-#pragma GCC diagnostic pop
-            return k;
+            fixed_bytes<32> fb(*reinterpret_cast<const std::array<const uint8_t, 32>*>(v.data())); 
+            return chain::key256_t(fb.get_array());
         };
      }
  };
@@ -657,10 +652,8 @@ class read_write {
      using index_type = chain::index256_index;
      static auto function() {
         return [](const input_type& v) {
-            chain::key256_t k;
-            memset(k.data(), 0, sizeof(k));
-            memcpy(k.data(), v._hash, sizeof(v._hash));
-            return k;
+            fixed_bytes<20> fb(*reinterpret_cast<const std::array<const uint8_t, 20>*>(v.data())); 
+            return chain::key256_t(fb.get_array());
         };
      }
  };
@@ -672,8 +665,8 @@ class read_write {
      static auto function() {
         return [](const input_type v) {
             chain::key256_t k;
-            k[0] = ((uint128_t *)&v)[0]; //0-127
-            k[1] = ((uint128_t *)&v)[1]; //127-256
+            k[0] = ((uint128_t *)&v)[1]; //128-256
+            k[1] = ((uint128_t *)&v)[0]; //0-127
             return k;
         };
      }

From 89dbac63a3c1f95ae470024a7c33c6c50e240d77 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 21 Jun 2019 11:47:17 +0800
Subject: [PATCH 0675/1648] Expand get_table_rows with more2 field when doing
 lookup with secondary index float128

---
 plugins/chain_plugin/chain_plugin.cpp                     | 8 ++++++++
 .../include/eosio/chain_plugin/chain_plugin.hpp           | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 489cd755442..c76b0b883c7 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1468,6 +1468,14 @@ string convert_to_string(const chain::key256_t& source, const string& key_type,
    } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} source '${source}' to string.", ("desc", desc)("source",source) )
 }
 
+template<>
+string convert_to_string(const float128_t& source, const string& key_type, const string& encode_type, const string& desc) {
+      try {
+      const uint128_t val = *reinterpret_cast<const uint128_t *>(&source);
+      return fc::variant(val).as<string>();
+   } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} from '${source}' to string.", ("desc", desc)("source",source) )
+}
+
 abi_def get_abi( const controller& db, const name& account ) {
    const auto &d = db.db();
    const account_object *code_accnt = d.find<account_object, by_name>(account);
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 484bc17a8ad..6978237a460 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -76,6 +76,10 @@ string convert_to_string(const Type& source, const string& key_type, const strin
 template<>
 string convert_to_string(const chain::key256_t& source, const string& key_type, const string& encode_type, const string& desc);
 
+template<>
+string convert_to_string(const float128_t& source, const string& key_type, const string& encode_type, const string& desc);
+
+
 class read_only {
    const controller& db;
    const fc::microseconds abi_serializer_max_time;

From 2266398b4542cac48a262eebb1657b4f2cbf3d89 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 21 Jun 2019 11:48:35 +0800
Subject: [PATCH 0676/1648] Change the format of the input of get_table_rows
 query with key type float128 to match the returned value (represented as
 uint128_t)

---
 plugins/chain_plugin/chain_plugin.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index c76b0b883c7..d00d3b57bc1 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1535,11 +1535,8 @@ read_only::get_table_rows_result read_only::get_table_rows( const read_only::get
          });
       }
       else if (p.key_type == chain_apis::float128) {
-         return get_table_rows_by_seckey<index_long_double_index, double>(p, abi, [](double v)->float128_t{
-            float64_t f = *(float64_t *)&v;
-            float128_t f128;
-            f64_to_f128M(f, &f128);
-            return f128;
+         return get_table_rows_by_seckey<index_long_double_index, uint128_t>(p, abi, [](uint128_t v)->float128_t{
+            return *reinterpret_cast<float128_t *>(&v);
          });
       }
       else if (p.key_type == chain_apis::sha256) {

From c2e529956a1086cfdb2ad54d17f9ab18b6f8b988 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Tue, 25 Jun 2019 15:21:09 +0800
Subject: [PATCH 0677/1648] Add unit test for get table

---
 tests/chain_plugin_tests.cpp                  | 170 ++++++++++++++++++
 unittests/contracts.hpp.in                    |   1 +
 unittests/test-contracts/CMakeLists.txt       |   1 +
 .../get_table_test/CMakeLists.txt             |   6 +
 .../get_table_test/get_table_test.abi         | 105 +++++++++++
 .../get_table_test/get_table_test.cpp         |  26 +++
 .../get_table_test/get_table_test.hpp         |  63 +++++++
 .../get_table_test/get_table_test.wasm        | Bin 0 -> 13428 bytes
 8 files changed, 372 insertions(+)
 create mode 100644 unittests/test-contracts/get_table_test/CMakeLists.txt
 create mode 100644 unittests/test-contracts/get_table_test/get_table_test.abi
 create mode 100644 unittests/test-contracts/get_table_test/get_table_test.cpp
 create mode 100644 unittests/test-contracts/get_table_test/get_table_test.hpp
 create mode 100755 unittests/test-contracts/get_table_test/get_table_test.wasm

diff --git a/tests/chain_plugin_tests.cpp b/tests/chain_plugin_tests.cpp
index a6e119a5b06..e506b224f3e 100644
--- a/tests/chain_plugin_tests.cpp
+++ b/tests/chain_plugin_tests.cpp
@@ -15,6 +15,7 @@
 
 #include <contracts.hpp>
 
+#include <fc/io/fstream.hpp>
 #include <fc/io/fstream.hpp>
 
 #include <Runtime/Runtime.h>
@@ -122,4 +123,173 @@ BOOST_FIXTURE_TEST_CASE( get_block_with_invalid_abi, TESTER ) try {
 
 } FC_LOG_AND_RETHROW() /// get_block_with_invalid_abi
 
+BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
+   create_account(N(test));
+
+   // setup contract and abi
+   set_code( N(test), contracts::get_table_test_wasm() );
+   set_abi( N(test), contracts::get_table_test_abi().data() );
+   produce_block();
+
+   // Init some data
+   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 2));
+   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 5));
+   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 7));
+   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "firstinput"));
+   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "secondinput"));
+   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "thirdinput"));
+   produce_block();
+
+   // The result of the init will populate
+   // For numobjs table (secondary index is on sec64, sec128, secdouble, secldouble)
+   // {
+   //   "rows": [{
+   //       "key": 0,
+   //       "sec64": 2,
+   //       "sec128": "0x02000000000000000000000000000000",
+   //       "secdouble": "2.00000000000000000",
+   //       "secldouble": "0x00000000000000000000000000000040"
+   //     },{
+   //       "key": 1,
+   //       "sec64": 5,
+   //       "sec128": "0x05000000000000000000000000000000",
+   //       "secdouble": "5.00000000000000000",
+   //       "secldouble": "0x00000000000000000000000000400140"
+   //     },{
+   //       "key": 2,
+   //       "sec64": 7,
+   //       "sec128": "0x07000000000000000000000000000000",
+   //       "secdouble": "7.00000000000000000",
+   //       "secldouble": "0x00000000000000000000000000c00140"
+   //     }
+   //   "more": false,
+   //   "more2": ""
+   // }
+   // For hashobjs table (secondary index is on sec256 and sec160):
+   // {
+   //   "rows": [{
+   //       "key": 0,
+   //       "hash_input": "firstinput",
+   //       "sec256": "05f5aa6b6c5568c53e886591daa9d9f636fa8e77873581ba67ca46a0f96c226e",
+   //       "sec160": "2a9baa59f1e376eda2e963c140d13c7e77c2f1fb"
+   //     },{
+   //       "key": 1,
+   //       "hash_input": "secondinput",
+   //       "sec256": "3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264",
+   //       "sec160": "fb9d03d3012dc2a6c7b319f914542e3423550c2a"
+   //     },{
+   //       "key": 2,
+   //       "hash_input": "thirdinput",
+   //       "sec256": "2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5",
+   //       "sec160": "ab4314638b573fdc39e5a7b107938ad1b5a16414"
+   //     }
+   //   ],
+   //   "more": false,
+   //   "more2": ""
+   // }
+
+
+   chain_apis::read_only plugin(*(this->control), fc::microseconds::maximum());
+   chain_apis::read_only::get_table_rows_params params{
+      .code=N(test),
+      .scope="test",
+      .limit=1,
+      .json=true
+   };
+
+      params.table = N(numobjs);
+
+      // i64 primary key type
+      params.key_type = "i64";
+      params.index_position = "1";
+      params.lower_bound = "0";
+
+      auto res_1 = plugin.get_table_rows(params);
+      BOOST_TEST(res_1.rows[0].get_object()["key"].as<uint64_t>() == 0);
+      BOOST_TEST(res_1.more2 == "1");
+
+      // i64 secondary key type
+      params.key_type = "i64";
+      params.index_position = "2";
+      params.lower_bound = "5";
+
+      auto res_2 = plugin.get_table_rows(params);
+      BOOST_TEST(res_2.rows[0].get_object()["sec64"].as<uint64_t>() == 5);
+      BOOST_TEST(res_2.more2 == "7");
+
+      // i128 secondary key type
+      params.key_type = "i128";
+      params.index_position = "3";
+      params.lower_bound = "0x05000000000000000000000000000000";
+
+      auto res_3 = plugin.get_table_rows(params);
+      chain::uint128_t sec128_expected_value = 5;
+      BOOST_CHECK(res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == sec128_expected_value);
+      BOOST_TEST(res_3.more2 == "0x07000000000000000000000000000000");
+
+      // float64 secondary key type
+      params.key_type = "float64";
+      params.index_position = "4";
+      params.lower_bound = "5.0";
+
+      auto res_4 = plugin.get_table_rows(params);
+      float64_t secdouble_expected_value = ui64_to_f64(5);
+      double secdouble_res_value = res_4.rows[0].get_object()["secdouble"].as<double>();
+      BOOST_CHECK(*reinterpret_cast<float64_t*>(&secdouble_res_value) == secdouble_expected_value);
+      BOOST_TEST(res_4.more2 == "7.00000000000000000");
+
+      // float128 secondary key type
+      params.key_type = "float128";
+      params.index_position = "5";
+      params.lower_bound = "0x00000000000000000000000000400140";
+
+      auto res_5 = plugin.get_table_rows(params);
+      float128_t secldouble_expected_value = ui64_to_f128(5);
+      chain::uint128_t secldouble_res_value =  res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
+      BOOST_TEST(*reinterpret_cast<float128_t*>(&secldouble_res_value) == secldouble_expected_value);
+      BOOST_TEST(res_5.more2 == "0x00000000000000000000000000c00140");
+
+      params.table = N(hashobjs);
+
+       // sha256 secondary key type
+      params.key_type = "sha256";
+      params.index_position = "2";
+      params.lower_bound = "2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5";
+
+      auto res_6 = plugin.get_table_rows(params);
+     
+      checksum256_type sec256_expected_value = checksum256_type::hash(std::string("thirdinput"));
+      
+      checksum256_type sec256_res_value = res_6.rows[0].get_object()["sec256"].as<checksum256_type>();
+      BOOST_TEST(std::string(sec256_res_value) == std::string(sec256_expected_value));
+      BOOST_TEST(res_6.rows[0].get_object()["hash_input"].as<string>() == std::string("thirdinput"));
+      BOOST_TEST(res_6.more2 == "3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
+
+      // i256 secondary key type
+      params.key_type = "i256";
+      params.index_position = "2";
+      params.lower_bound = "0x2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5";
+
+      auto res_7 = plugin.get_table_rows(params);
+      checksum256_type i256_expected_value = checksum256_type::hash(std::string("thirdinput"));
+      checksum256_type i256_res_value = res_7.rows[0].get_object()["sec256"].as<checksum256_type>();
+      BOOST_CHECK(i256_res_value == i256_expected_value);
+      BOOST_TEST(res_7.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
+      BOOST_TEST(res_7.more2 == "0x3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
+
+      // ripemd160 secondary key type
+      params.key_type = "ripemd160";
+      params.index_position = "3";
+      params.lower_bound = "ab4314638b573fdc39e5a7b107938ad1b5a16414";
+
+      auto res_8 = plugin.get_table_rows(params);
+      ripemd160 sec160_expected_value =  ripemd160::hash(std::string("thirdinput"));
+      ripemd160 sec160_res_value =  res_8.rows[0].get_object()["sec160"].as<ripemd160>();
+      BOOST_CHECK(sec160_res_value == sec160_expected_value);
+      BOOST_TEST(res_8.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
+      BOOST_TEST(res_8.more2 == "fb9d03d3012dc2a6c7b319f914542e3423550c2a");
+
+  
+
+} FC_LOG_AND_RETHROW() /// get_table_test
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/unittests/contracts.hpp.in b/unittests/contracts.hpp.in
index efafa1846c8..60de8096f25 100644
--- a/unittests/contracts.hpp.in
+++ b/unittests/contracts.hpp.in
@@ -42,6 +42,7 @@ namespace eosio {
          MAKE_READ_WASM_ABI(asserter,              asserter,              test-contracts)
          MAKE_READ_WASM_ABI(deferred_test,         deferred_test,         test-contracts)
          MAKE_READ_WASM_ABI(get_sender_test,       get_sender_test,       test-contracts)
+         MAKE_READ_WASM_ABI(get_table_test,        get_table_test,        test-contracts)
          MAKE_READ_WASM_ABI(noop,                  noop,                  test-contracts)
          MAKE_READ_WASM_ABI(payloadless,           payloadless,           test-contracts)
          MAKE_READ_WASM_ABI(proxy,                 proxy,                 test-contracts)
diff --git a/unittests/test-contracts/CMakeLists.txt b/unittests/test-contracts/CMakeLists.txt
index 1aded520712..7c48729a524 100644
--- a/unittests/test-contracts/CMakeLists.txt
+++ b/unittests/test-contracts/CMakeLists.txt
@@ -10,6 +10,7 @@ endif()
 add_subdirectory( asserter )
 add_subdirectory( deferred_test )
 add_subdirectory( get_sender_test )
+add_subdirectory( get_table_test )
 add_subdirectory( integration_test )
 add_subdirectory( noop )
 add_subdirectory( payloadless )
diff --git a/unittests/test-contracts/get_table_test/CMakeLists.txt b/unittests/test-contracts/get_table_test/CMakeLists.txt
new file mode 100644
index 00000000000..846bf453406
--- /dev/null
+++ b/unittests/test-contracts/get_table_test/CMakeLists.txt
@@ -0,0 +1,6 @@
+if( EOSIO_COMPILE_TEST_CONTRACTS )
+   add_contract( get_table_test get_table_test get_table_test.cpp )
+else()
+   configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/get_table_test.wasm ${CMAKE_CURRENT_BINARY_DIR}/get_table_test.wasm COPYONLY )
+   configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/get_table_test.abi  ${CMAKE_CURRENT_BINARY_DIR}/get_table_test.abi  COPYONLY )
+endif()
diff --git a/unittests/test-contracts/get_table_test/get_table_test.abi b/unittests/test-contracts/get_table_test/get_table_test.abi
new file mode 100644
index 00000000000..1a7cdcc2137
--- /dev/null
+++ b/unittests/test-contracts/get_table_test/get_table_test.abi
@@ -0,0 +1,105 @@
+{
+    "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
+    "version": "eosio::abi/1.1",
+    "types": [],
+    "structs": [
+        {
+            "name": "addhashobj",
+            "base": "",
+            "fields": [
+                {
+                    "name": "hashinput",
+                    "type": "string"
+                }
+            ]
+        },
+        {
+            "name": "addnumobj",
+            "base": "",
+            "fields": [
+                {
+                    "name": "input",
+                    "type": "uint64"
+                }
+            ]
+        },
+        {
+            "name": "hashobj",
+            "base": "",
+            "fields": [
+                {
+                    "name": "key",
+                    "type": "uint64"
+                },
+                {
+                    "name": "hash_input",
+                    "type": "string"
+                },
+                {
+                    "name": "sec256",
+                    "type": "checksum256"
+                },
+                {
+                    "name": "sec160",
+                    "type": "checksum160"
+                }
+            ]
+        },
+        {
+            "name": "numobj",
+            "base": "",
+            "fields": [
+                {
+                    "name": "key",
+                    "type": "uint64"
+                },
+                {
+                    "name": "sec64",
+                    "type": "uint64"
+                },
+                {
+                    "name": "sec128",
+                    "type": "uint128"
+                },
+                {
+                    "name": "secdouble",
+                    "type": "float64"
+                },
+                {
+                    "name": "secldouble",
+                    "type": "float128"
+                }
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "name": "addhashobj",
+            "type": "addhashobj",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "addnumobj",
+            "type": "addnumobj",
+            "ricardian_contract": ""
+        }
+    ],
+    "tables": [
+        {
+            "name": "hashobjs",
+            "type": "hashobj",
+            "index_type": "i64",
+            "key_names": [],
+            "key_types": []
+        },
+        {
+            "name": "numobjs",
+            "type": "numobj",
+            "index_type": "i64",
+            "key_names": [],
+            "key_types": []
+        }
+    ],
+    "ricardian_clauses": [],
+    "variants": []
+}
\ No newline at end of file
diff --git a/unittests/test-contracts/get_table_test/get_table_test.cpp b/unittests/test-contracts/get_table_test/get_table_test.cpp
new file mode 100644
index 00000000000..c35409f2ac2
--- /dev/null
+++ b/unittests/test-contracts/get_table_test/get_table_test.cpp
@@ -0,0 +1,26 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#include "get_table_test.hpp"
+
+void get_table_test::addnumobj(uint64_t input) {
+   numobjs numobjs_table( _self, _self.value );
+      numobjs_table.emplace(_self, [&]( auto& obj ) {
+         obj.key = numobjs_table.available_primary_key();
+         obj.sec64 = input;
+         obj.sec128 = input;
+         obj.secdouble = input;
+         obj.secldouble = input;
+      });
+}
+
+void get_table_test::addhashobj(std::string hashinput) {
+   hashobjs hashobjs_table( _self, _self.value );
+      hashobjs_table.emplace(_self, [&]( auto& obj ) {
+         obj.key = hashobjs_table.available_primary_key();
+         obj.hash_input = hashinput;
+         obj.sec256 = sha256(hashinput.data(), hashinput.size());
+         obj.sec160 = ripemd160(hashinput.data(), hashinput.size());
+      });
+}
\ No newline at end of file
diff --git a/unittests/test-contracts/get_table_test/get_table_test.hpp b/unittests/test-contracts/get_table_test/get_table_test.hpp
new file mode 100644
index 00000000000..a777bfd63ee
--- /dev/null
+++ b/unittests/test-contracts/get_table_test/get_table_test.hpp
@@ -0,0 +1,63 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
+#pragma once
+
+#include <eosio/eosio.hpp>
+#include <eosio/crypto.hpp>
+
+using namespace eosio;
+
+class [[eosio::contract]] get_table_test : public eosio::contract {
+    public:
+    using eosio::contract::contract;
+
+    // Number object
+    struct [[eosio::table]] numobj {
+        uint64_t        key;
+        uint64_t        sec64;
+        uint128_t       sec128;
+        double          secdouble;
+        long double     secldouble;
+
+        uint64_t primary_key() const { return key; }
+        uint64_t sec64_key() const { return sec64; }
+        uint128_t sec128_key() const { return sec128; }
+        double secdouble_key() const { return secdouble; }
+        long double secldouble_key() const { return secldouble; }
+    };
+
+    // Hash object
+    struct [[eosio::table]] hashobj {
+        uint64_t        key;
+        std::string     hash_input;
+        checksum256     sec256;
+        checksum160     sec160;
+
+        uint64_t primary_key() const { return key; }
+        checksum256 sec256_key() const { return sec256; }
+        checksum256 sec160_key() const { return checksum256(sec160.get_array()); }
+    };
+
+    typedef eosio::multi_index< "numobjs"_n, numobj, 
+                                indexed_by<"bysec1"_n, const_mem_fun<numobj, uint64_t, &numobj::sec64_key>>,
+                                indexed_by<"bysec2"_n, const_mem_fun<numobj, uint128_t, &numobj::sec128_key>>,
+                                indexed_by<"bysec3"_n, const_mem_fun<numobj, double, &numobj::secdouble_key>>,
+                                indexed_by<"bysec4"_n, const_mem_fun<numobj, long double, &numobj::secldouble_key>>
+                                > numobjs;
+
+    typedef eosio::multi_index< "hashobjs"_n, hashobj, 
+                            indexed_by<"bysec1"_n, const_mem_fun<hashobj, checksum256, &hashobj::sec256_key>>,
+                            indexed_by<"bysec2"_n, const_mem_fun<hashobj, checksum256, &hashobj::sec160_key>>
+                            > hashobjs;
+
+   [[eosio::action]]
+   void addnumobj(uint64_t input);
+
+
+   [[eosio::action]]
+   void addhashobj(std::string hashinput);
+
+
+};
\ No newline at end of file
diff --git a/unittests/test-contracts/get_table_test/get_table_test.wasm b/unittests/test-contracts/get_table_test/get_table_test.wasm
new file mode 100755
index 0000000000000000000000000000000000000000..cc1b5399505b8370abfa52a7c264c2cbca1ba9e8
GIT binary patch
literal 13428
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

literal 0
HcmV?d00001


From 99f45af9eb52d0b12b2aa272c400d06d84a6d1e4 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Tue, 25 Jun 2019 15:38:35 +0800
Subject: [PATCH 0678/1648] Add comments for get table test

---
 tests/chain_plugin_tests.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/chain_plugin_tests.cpp b/tests/chain_plugin_tests.cpp
index e506b224f3e..b5821ab43f6 100644
--- a/tests/chain_plugin_tests.cpp
+++ b/tests/chain_plugin_tests.cpp
@@ -220,7 +220,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
       // i128 secondary key type
       params.key_type = "i128";
       params.index_position = "3";
-      params.lower_bound = "0x05000000000000000000000000000000";
+      params.lower_bound = "0x05000000000000000000000000000000"; // This is 5 in uint128 representation
 
       auto res_3 = plugin.get_table_rows(params);
       chain::uint128_t sec128_expected_value = 5;
@@ -241,7 +241,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
       // float128 secondary key type
       params.key_type = "float128";
       params.index_position = "5";
-      params.lower_bound = "0x00000000000000000000000000400140";
+      params.lower_bound = "0x00000000000000000000000000400140"; // This is 5.0 in uint128 representation
 
       auto res_5 = plugin.get_table_rows(params);
       float128_t secldouble_expected_value = ui64_to_f128(5);
@@ -254,7 +254,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
        // sha256 secondary key type
       params.key_type = "sha256";
       params.index_position = "2";
-      params.lower_bound = "2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5";
+      params.lower_bound = "2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5"; // This is hash of "thirdinput"
 
       auto res_6 = plugin.get_table_rows(params);
      
@@ -268,7 +268,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
       // i256 secondary key type
       params.key_type = "i256";
       params.index_position = "2";
-      params.lower_bound = "0x2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5";
+      params.lower_bound = "0x2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5"; // This is sha256 hash of "thirdinput" as number
 
       auto res_7 = plugin.get_table_rows(params);
       checksum256_type i256_expected_value = checksum256_type::hash(std::string("thirdinput"));
@@ -280,7 +280,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
       // ripemd160 secondary key type
       params.key_type = "ripemd160";
       params.index_position = "3";
-      params.lower_bound = "ab4314638b573fdc39e5a7b107938ad1b5a16414";
+      params.lower_bound = "ab4314638b573fdc39e5a7b107938ad1b5a16414"; // This is ripemd160 hash of "thirdinput"
 
       auto res_8 = plugin.get_table_rows(params);
       ripemd160 sec160_expected_value =  ripemd160::hash(std::string("thirdinput"));

From 73bb3af94ea89c7b04ad2c0661aaac9fa4f85d9c Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Tue, 25 Jun 2019 17:26:30 +0800
Subject: [PATCH 0679/1648] Update comments

---
 .../chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 6978237a460..e9a8ca00a59 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -669,7 +669,7 @@ class read_write {
      static auto function() {
         return [](const input_type v) {
             chain::key256_t k;
-            k[0] = ((uint128_t *)&v)[1]; //128-256
+            k[0] = ((uint128_t *)&v)[1]; //128-255
             k[1] = ((uint128_t *)&v)[0]; //0-127
             return k;
         };

From 22aceb1ff1b4db00de00d63a9edbe6453f7af843 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 07:54:56 -0400
Subject: [PATCH 0680/1648] removed apt update

---
 scripts/helpers/general.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 15397a727bb..25f56677588 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -179,7 +179,6 @@ function ensure-build-essential() {
                 case $PROCEED in
                     "" ) echo "What would you like to do?";;
                     0 | true | [Yy]* )
-                        apt update
                         install-package build-essential
                         $PIN_COMPILER && export PINNED_BUILD_ESSENTIALS=true
                         echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"

From 7a2579f023edb03f064846b9bffb8d1be811e0e3 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 07:59:35 -0400
Subject: [PATCH 0681/1648] build-essential for 18 if pinning

---
 scripts/eosio_build_ubuntu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 69e52161d6a..0927e33b45d 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -13,7 +13,7 @@ echo "Disk space available: ${DISK_AVAIL}G"
 # system clang and build essential for Ubuntu 18 (16 too old)
 ( [[ $PIN_COMPILER == false ]] && [[ $VERSION_ID == "18.04" ]] ) && EXTRA_DEPS=(clang,dpkg\ -s)
 # We install clang8 for Ubuntu 16, but we still need something to compile cmake, boost, etc
-[[ $VERSION_ID == "16.04" ]] && ensure-build-essential
+[[ $VERSION_ID == "16.04" ]] || ( $PIN_COMPILER && [[ $VERSION_ID == "18.04" ]] ) && ensure-build-essential
 # Ensure packages exist
 ([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS+=(llvm-4.0,dpkg\ -s)
 $ENABLE_COVERAGE_TESTING && EXTRA_DEPS+=(lcov,dpkg\ -s)

From 402b522f040cb6c5d89488057ecc0466920c4410 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 08:00:28 -0400
Subject: [PATCH 0682/1648] build-essential for 18 if pinning

---
 scripts/eosio_build_ubuntu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 0927e33b45d..0b95dfb8cc6 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -12,7 +12,7 @@ echo "Disk space available: ${DISK_AVAIL}G"
 
 # system clang and build essential for Ubuntu 18 (16 too old)
 ( [[ $PIN_COMPILER == false ]] && [[ $VERSION_ID == "18.04" ]] ) && EXTRA_DEPS=(clang,dpkg\ -s)
-# We install clang8 for Ubuntu 16, but we still need something to compile cmake, boost, etc
+# We install clang8 for Ubuntu 16, but we still need something to compile cmake, boost, etc + pinned 18 still needs something to build source
 [[ $VERSION_ID == "16.04" ]] || ( $PIN_COMPILER && [[ $VERSION_ID == "18.04" ]] ) && ensure-build-essential
 # Ensure packages exist
 ([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS+=(llvm-4.0,dpkg\ -s)

From c02dafd0daa22777d1c907af7354a1fcb2290f0b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 08:10:02 -0400
Subject: [PATCH 0683/1648] python2 back

---
 scripts/eosio_build_amazonlinux2_deps | 1 +
 scripts/eosio_build_centos7_deps      | 2 ++
 scripts/eosio_build_darwin_deps       | 1 +
 scripts/eosio_build_ubuntu_deps       | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/scripts/eosio_build_amazonlinux2_deps b/scripts/eosio_build_amazonlinux2_deps
index abe8b2343d6..c599e9b1ae4 100755
--- a/scripts/eosio_build_amazonlinux2_deps
+++ b/scripts/eosio_build_amazonlinux2_deps
@@ -15,6 +15,7 @@ libcurl-devel,rpm -qa
 libusbx-devel,rpm -qa
 python3,rpm -qa
 python3-devel,rpm -qa
+python-devel,rpm -qa
 libedit-devel,rpm -qa
 doxygen,rpm -qa
 graphviz,rpm -qa
diff --git a/scripts/eosio_build_centos7_deps b/scripts/eosio_build_centos7_deps
index 19c8b966c28..b40dee8416d 100644
--- a/scripts/eosio_build_centos7_deps
+++ b/scripts/eosio_build_centos7_deps
@@ -12,6 +12,8 @@ gmp-devel,rpm -qa
 ocaml,rpm -qa
 libicu-devel,rpm -qa
 rh-python36,rpm -qa
+python,rpm -qa
+python-devel,rpm -qa
 gettext-devel,rpm -qa
 file,rpm -qa
 libusbx-devel,rpm -qa
diff --git a/scripts/eosio_build_darwin_deps b/scripts/eosio_build_darwin_deps
index f45bc65c959..b2cf9a8c6f5 100755
--- a/scripts/eosio_build_darwin_deps
+++ b/scripts/eosio_build_darwin_deps
@@ -7,6 +7,7 @@ gmp,/usr/local/opt/gmp/include/gmpxx.h
 llvm@4,/usr/local/opt/llvm@4
 pkgconfig,/usr/local/bin/pkg-config
 python,/usr/local/opt/python3
+python@2,/usr/local/opt/python2
 doxygen,/usr/local/bin/doxygen
 libusb,/usr/local/lib/libusb-1.0.0.dylib
 openssl,/usr/local/opt/openssl/lib/libssl.a
\ No newline at end of file
diff --git a/scripts/eosio_build_ubuntu_deps b/scripts/eosio_build_ubuntu_deps
index 658ee058189..e9174618e19 100644
--- a/scripts/eosio_build_ubuntu_deps
+++ b/scripts/eosio_build_ubuntu_deps
@@ -11,6 +11,8 @@ autotools-dev,dpkg -s
 libicu-dev,dpkg -s
 python3,dpkg -s
 python3-dev,dpkg -s
+python2.7,dpkg -s
+python2.7-dev,dpkg -s
 autoconf,dpkg -s
 libtool,dpkg -s
 curl,dpkg -s

From 12ecda860e1a42bf3d8180993f0e0ba7551ea5c0 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 09:13:19 -0400
Subject: [PATCH 0684/1648] build-essentials for 18.04

---
 scripts/eosio_build_ubuntu.sh | 2 +-
 scripts/helpers/eosio.sh      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 0b95dfb8cc6..b14897268fa 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -13,7 +13,7 @@ echo "Disk space available: ${DISK_AVAIL}G"
 # system clang and build essential for Ubuntu 18 (16 too old)
 ( [[ $PIN_COMPILER == false ]] && [[ $VERSION_ID == "18.04" ]] ) && EXTRA_DEPS=(clang,dpkg\ -s)
 # We install clang8 for Ubuntu 16, but we still need something to compile cmake, boost, etc + pinned 18 still needs something to build source
-[[ $VERSION_ID == "16.04" ]] || ( $PIN_COMPILER && [[ $VERSION_ID == "18.04" ]] ) && ensure-build-essential
+( [[ $VERSION_ID == "16.04" ]] || ( $PIN_COMPILER && [[ $VERSION_ID == "18.04" ]] ) ) && ensure-build-essential
 # Ensure packages exist
 ([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS+=(llvm-4.0,dpkg\ -s)
 $ENABLE_COVERAGE_TESTING && EXTRA_DEPS+=(lcov,dpkg\ -s)
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index c9d160c6b35..5d4b3e1ff60 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -146,7 +146,8 @@ function prompt-mongo-install() {
 }
 
 function ensure-compiler() {
-    if [[ $NAME == "CentOS Linux" ]] || [[ $VERSION_ID == "16.04" ]]; then
+    # Support build-essentials 
+    if [[ $NAME == "CentOS Linux" ]] || [[ $VERSION_ID == "16.04" ]] || ( $PIN_COMPILER && [[ $VERSION_ID == "18.04" ]] ); then
         export CXX=${CXX:-'g++'}
         export CC=${CC:-'gcc'}
     fi

From af4dd6d43cd94a5b6338f2a9a667ab15d25c1ec8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 25 Jun 2019 08:14:46 -0500
Subject: [PATCH 0685/1648] Remove signed_id as id is already unique

---
 .../eosio/chain/transaction_metadata.hpp        |  1 -
 .../eosio/chain/unapplied_transaction_queue.hpp | 17 ++++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 9cb61f5a887..9c19cc77e8d 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -57,7 +57,6 @@ class transaction_metadata {
 
       const packed_transaction_ptr& packed_trx()const { return _packed_trx; }
       const transaction_id_type& id()const { return _id; }
-      const transaction_id_type& signed_id()const { return _signed_id; }
 
       // can be called from any thread. It is recommended that next() immediately post to application thread for
       // future processing since next() will be called from the thread_pool.
diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index bab35d23de7..6d029fe5163 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -35,7 +35,6 @@ struct unapplied_transaction {
    const fc::time_point           expiry;
    trx_enum_type                  trx_type = unknown;
 
-   const transaction_id_type& signed_id()const { return trx_meta->signed_id(); }
    const transaction_id_type& id()const { return trx_meta->id(); }
 
    unapplied_transaction(const unapplied_transaction&) = delete;
@@ -50,15 +49,15 @@ struct unapplied_transaction {
  */
 class unapplied_transaction_queue {
 
-   struct by_signed_id;
+   struct by_id;
    struct by_type;
    struct by_expiry;
 
    typedef multi_index_container< unapplied_transaction,
       indexed_by<
          sequenced<>,
-         hashed_unique< tag<by_signed_id>,
-               const_mem_fun<unapplied_transaction, const transaction_id_type&, &unapplied_transaction::signed_id>
+         hashed_unique< tag<by_id>,
+               const_mem_fun<unapplied_transaction, const transaction_id_type&, &unapplied_transaction::id>
          >,
          ordered_non_unique< tag<by_type>, member<unapplied_transaction, trx_enum_type, &unapplied_transaction::trx_type> >,
          ordered_non_unique< tag<by_expiry>, member<unapplied_transaction, const fc::time_point, &unapplied_transaction::expiry> >
@@ -86,8 +85,8 @@ class unapplied_transaction_queue {
    }
 
    bool is_persisted(const transaction_metadata_ptr& trx)const {
-      auto itr = queue.get<by_signed_id>().find( trx->signed_id() );
-      if( itr == queue.get<by_signed_id>().end() ) return false;
+      auto itr = queue.get<by_id>().find( trx->id() );
+      if( itr == queue.get<by_id>().end() ) return false;
       return itr->trx_type == persisted;
    }
 
@@ -125,12 +124,12 @@ class unapplied_transaction_queue {
    }
 
    void add_persisted( const transaction_metadata_ptr& trx ) {
-      auto itr = queue.get<by_signed_id>().find( trx->signed_id() );
-      if( itr == queue.get<by_signed_id>().end() ) {
+      auto itr = queue.get<by_id>().find( trx->id() );
+      if( itr == queue.get<by_id>().end() ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
          queue.push_back( { trx, std::move( expiry ), persisted } );
       } else if( itr->trx_type != persisted ) {
-         queue.get<by_signed_id>().modify( itr, [](auto& un){
+         queue.get<by_id>().modify( itr, [](auto& un){
             un.trx_type = persisted;
          } );
       }

From 204fd008105a8d1c282f313633f25adbf170477e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 25 Jun 2019 08:20:45 -0500
Subject: [PATCH 0686/1648] Use unapplied_transaction_queue iterator

---
 plugins/producer_plugin/producer_plugin.cpp | 103 +++++++++-----------
 1 file changed, 46 insertions(+), 57 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index c521739ee27..f3d6593d7dc 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -181,7 +181,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       boost::asio::deadline_timer                               _timer;
       std::map<chain::account_name, uint32_t>                   _producer_watermarks;
       pending_block_mode                                        _pending_block_mode;
-      transaction_id_with_expiry_index                          _persistent_transactions;
       unapplied_transaction_queue                               _unapplied_transactions;
       fc::optional<named_thread_pool>                           _thread_pool;
 
@@ -551,7 +550,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                if( persist_until_expired ) {
                   // if this trx didnt fail/soft-fail and the persist flag is set, store its ID so that we can
                   // ensure its applied to all future speculative blocks as well.
-                  _persistent_transactions.insert( transaction_id_with_expiry{trx->id(), trx->packed_trx()->expiration()} );
+                  _unapplied_transactions.add_persisted( trx );
                }
                send_response( trace );
             }
@@ -1326,8 +1325,7 @@ fc::time_point producer_plugin_impl::calculate_block_deadline( const fc::time_po
 
 enum class tx_category {
    PERSISTED,
-   UNEXPIRED_UNPERSISTED,
-   EXPIRED,
+   UNEXPIRED_UNPERSISTED
 };
 
 
@@ -1457,44 +1455,39 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          _pending_block_mode = pending_block_mode::speculating;
       }
 
-      // attempt to play persisted transactions first
-      bool exhausted = false;
+      // order: persisted, forked, aborted
 
-      // remove all persisted transactions that have now expired
-      auto& persisted_by_id = _persistent_transactions.get<by_id>();
-      auto& persisted_by_expiry = _persistent_transactions.get<by_expiry>();
-      if (!persisted_by_expiry.empty()) {
-         int num_expired_persistent = 0;
-         int orig_count = _persistent_transactions.size();
-
-         while(!persisted_by_expiry.empty() && persisted_by_expiry.begin()->expiry <= pending_block_time) {
-            if (preprocess_deadline <= fc::time_point::now()) {
-               exhausted = true;
-               break;
-            }
-            auto const& txid = persisted_by_expiry.begin()->trx_id;
-            if (_pending_block_mode == pending_block_mode::producing) {
-               fc_dlog(_trx_trace_log, "[TRX_TRACE] Block ${block_num} for producer ${prod} is EXPIRING PERSISTED tx: ${txid}",
-                       ("block_num", chain.head_block_num() + 1)
-                       ("prod", chain.pending_block_producer())
-                       ("txid", txid));
-            } else {
-               fc_dlog(_trx_trace_log, "[TRX_TRACE] Speculative execution is EXPIRING PERSISTED tx: ${txid}",
-                       ("txid", txid));
-            }
+      bool exhausted = false;
 
-            persisted_by_expiry.erase(persisted_by_expiry.begin());
-            num_expired_persistent++;
-         }
+      // remove all expired transactions
+      size_t num_expired_persistent = 0;
+      size_t orig_count = _unapplied_transactions.size();
+      exhausted = !_unapplied_transactions.clear_expired( pending_block_time, preprocess_deadline,
+                     [&num_expired_persistent, pbm = _pending_block_mode,
+                      &chain, has_producers = !_producers.empty()]( const transaction_id_type& txid, trx_enum_type trx_type ) {
+               if( trx_type == persisted ) {
+                  if( pbm == pending_block_mode::producing ) {
+                     fc_dlog( _trx_trace_log,
+                              "[TRX_TRACE] Block ${block_num} for producer ${prod} is EXPIRING PERSISTED tx: ${txid}",
+                              ("block_num", chain.head_block_num() + 1)("prod", chain.pending_block_producer())("txid", txid));
+                  } else {
+                     fc_dlog( _trx_trace_log, "[TRX_TRACE] Speculative execution is EXPIRING PERSISTED tx: ${txid}", ("txid", txid));
+                  }
+                  ++num_expired_persistent;
+               } else if (has_producers) {
+                  fc_dlog(_trx_trace_log,
+                          "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
+                          ("txid", txid));
+               }
+      });
 
+      if( exhausted || num_expired_persistent > 0 ) {
          if( exhausted ) {
-            fc_wlog( _log, "Unable to process all ${n} persisted transactions before deadline, Expired ${expired}",
-                     ( "n", orig_count )
-                     ( "expired", num_expired_persistent ) );
+            fc_wlog( _log, "Unable to process all ${n} transactions before deadline, Persistent expired ${expired}",
+                     ( "n", orig_count )( "expired", num_expired_persistent ) );
          } else {
-            fc_dlog( _log, "Processed ${n} persisted transactions, Expired ${expired}",
-                     ( "n", orig_count )
-                     ( "expired", num_expired_persistent ) );
+            fc_dlog( _log, "Processed ${n} transactions, Persistent expired ${expired}",
+                     ( "n", orig_count )( "expired", num_expired_persistent ) );
          }
       }
 
@@ -1502,8 +1495,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          size_t orig_pending_txn_size = _pending_incoming_transactions.size();
 
          // Processing unapplied transactions...
-         //
-         if (_producers.empty() && persisted_by_id.empty()) {
+         if( _producers.empty() && !_unapplied_transactions.contains_persisted() ) {
             // if this node can never produce and has no persisted transactions,
             // there is no need for unapplied transactions they can be dropped
             _unapplied_transactions.clear();
@@ -1515,32 +1507,26 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                int num_processed = 0;
                auto unapplied_trxs_size = _unapplied_transactions.size();
                auto calculate_transaction_category = [&](const transaction_metadata_ptr& trx) {
-                  if (trx->packed_trx()->expiration() < pending_block_time) {
-                     return tx_category::EXPIRED;
-                  } else if (persisted_by_id.find(trx->id()) != persisted_by_id.end()) {
+                  if (_unapplied_transactions.is_persisted(trx)) {
                      return tx_category::PERSISTED;
                   } else {
                      return tx_category::UNEXPIRED_UNPERSISTED;
                   }
                };
 
-               while( !exhausted ) {
-                  transaction_metadata_ptr trx = _unapplied_transactions.next();
-                  if( trx == nullptr ) break;
+               auto itr = _unapplied_transactions.begin();
+               while( itr != _unapplied_transactions.end() ) {
+                  if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
+                  if( exhausted ) break;
 
+                  const transaction_metadata_ptr trx = itr->trx_meta;
                   ++num_processed;
                   auto category = calculate_transaction_category(trx);
-                  if (category == tx_category::EXPIRED ||
-                     (category == tx_category::UNEXPIRED_UNPERSISTED && _producers.empty()))
+                  if (category == tx_category::UNEXPIRED_UNPERSISTED && _producers.empty())
                   {
                      ++num_failed;
-                     if (!_producers.empty()) {
-                        fc_dlog(_trx_trace_log, "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
-                               ("txid", trx->id()));
-                     }
-                     if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
-                     continue; // _unapplied_transactions removed trx, so just continue
-
+                     itr = _unapplied_transactions.erase( itr );
+                     continue;
                   } else if (category == tx_category::PERSISTED ||
                             (category == tx_category::UNEXPIRED_UNPERSISTED && _pending_block_mode == pending_block_mode::producing))
                   {
@@ -1556,22 +1542,25 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                         if (trace->except) {
                            if (failure_is_subjective(*trace->except, deadline_is_subjective)) {
                               exhausted = true;
-                              _unapplied_transactions.add_subjective_failure( trx );
+                              // don't erase, subjective failure so try again next time
                               break;
                            } else {
                               // this failed our configured maximum transaction time, we don't want to replay it
                               ++num_failed;
+                              itr = _unapplied_transactions.erase( itr );
+                              continue;
                            }
                         } else {
                            ++num_applied;
+                           itr = _unapplied_transactions.erase( itr );
+                           continue;
                         }
                      } catch ( const guard_exception& e ) {
                         chain_plug->handle_guard_exception(e);
                         return start_block_result::failed;
                      } FC_LOG_AND_DROP();
                   }
-
-                  if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
+                  ++itr;
                }
 
                fc_dlog(_log, "Processed ${m} of ${n} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",

From c565311b256aabda66d64736b091c1c9d1471ea7 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 09:22:12 -0400
Subject: [PATCH 0687/1648] build-essential for 18.04

---
 tests/bash-bats/eosio_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index e550bf8141b..fe78e93c8cf 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -33,7 +33,7 @@ TEST_LABEL="[eosio_build]"
     run bash -c "./eosio_build.sh -y -P"
     [[ ! -z $(echo "${output}" | grep "PIN_COMPILER: true") ]] || exit
     # Ensure build-essentials is installed so we can compile cmake, clang, boost, etc
-    if [[ $VERSION_ID == "16.04" ]]; then
+    if [[ $NAME == "Ubuntu" ]]; then
         [[ ! -z $(echo "${output}" | grep "Installed build-essential") ]] || exit
     fi
     [[ "${output}" =~ -DCMAKE_TOOLCHAIN_FILE=\'.*/scripts/../build/pinned_toolchain.cmake\' ]] || exit

From e0bea300563b7ed4ee946933f57f352b17d8a676 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 25 Jun 2019 08:25:11 -0500
Subject: [PATCH 0688/1648] Update comment

---
 .../chain/include/eosio/chain/unapplied_transaction_queue.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 6d029fe5163..6f2332b72ff 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -44,8 +44,8 @@ struct unapplied_transaction {
 };
 
 /**
- * Track unapplied transactions for persisted, forked blocks, aborted blocks
- * failed transactions.
+ * Track unapplied transactions for persisted, forked blocks, and aborted blocks.
+ * Persisted to first so that they can be applied in each block until expired.
  */
 class unapplied_transaction_queue {
 

From 634d0248e25b35afb5fc2e1170386ea88bb4e61b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 10:27:34 -0400
Subject: [PATCH 0689/1648] autoremove added to function

---
 scripts/eosio_build_ubuntu.sh | 2 +-
 scripts/helpers/general.sh    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index b14897268fa..980f0aaf372 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -94,4 +94,4 @@ if $INSTALL_MONGO; then
 fi
 
 # Cleanup build-essential as they were only needed for installing source packages
-($PIN_COMPILER && $PINNED_BUILD_ESSENTIALS) && apt autoremove build-essential -y; true
\ No newline at end of file
+($PIN_COMPILER && $PINNED_BUILD_ESSENTIALS) && uninstall-package build-essential autoremove
\ No newline at end of file
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 25f56677588..ab7ff61d960 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -97,12 +97,14 @@ function install-package() {
 function uninstall-package() {
   if [[ $ARCH == "Linux" ]]; then
     EXECUTION_FUNCTION="execute"
+    REMOVE="remove"
     [[ $2 == "WETRUN" ]] && EXECUTION_FUNCTION="execute-always"
+    ( [[ $2 == "autoremove" ]] || [[ $3 == "autoremove" ]] ) && REMOVE="autoremove"
     ( [[ $2 =~ "--" ]] || [[ $3 =~ "--" ]] ) && OPTIONS="${2}${3}"
     [[ $CURRENT_USER != "root" ]] && [[ ! -z $SUDO_LOCATION ]] && SUDO_COMMAND="$SUDO_LOCATION -E"
     # Check if the packages exist before uninstalling them. This speeds things up for tests.
-    ( ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && [[ ! -z $(rpm -qa $1) ]] ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $YUM $OPTIONS remove -y $1
-    ( [[ $NAME =~ "Ubuntu" ]] && $(dpkg -s $1 &>/dev/null) ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $APTGET $OPTIONS remove -y $1
+    ( ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && [[ ! -z $(rpm -qa $1) ]] ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $YUM $OPTIONS $REMOVE -y $1
+    ( [[ $NAME =~ "Ubuntu" ]] && $(dpkg -s $1 &>/dev/null) ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $APTGET $OPTIONS $REMOVE -y $1
   fi
   true
 }

From d4c1c0eb024768657e93a4248322433e522a38a9 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 10:52:19 -0400
Subject: [PATCH 0690/1648] back to devtoolset-7 to try and address clang8
 failures

---
 scripts/eosio_build_centos.sh         | 14 +++++++-------
 scripts/eosio_build_ubuntu.sh         |  2 +-
 scripts/helpers/general.sh            |  8 ++++----
 tests/bash-bats/eosio_build_centos.sh | 10 +++++-----
 tests/bash-bats/helpers/functions.sh  |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh
index 44a96474fe0..5e68df2ff28 100755
--- a/scripts/eosio_build_centos.sh
+++ b/scripts/eosio_build_centos.sh
@@ -12,17 +12,15 @@ echo "Disk space available: ${DISK_AVAIL}G"
 
 echo ""
 
-# Repo necessary for rh-python3 and devtoolset-8
+# Repo necessary for rh-python3 and devtoolset-7
 ensure-scl
 # GCC7 for Centos / Needed for CMAKE install even if we're pinning
 ensure-devtoolset
-if [[ -d /opt/rh/devtoolset-8 ]]; then
-	echo "${COLOR_CYAN}[Enabling Centos devtoolset-8 (for newer GCC)]${COLOR_NC}"
-	execute-always source /opt/rh/devtoolset-8/enable
-	echo " - ${COLOR_GREEN}Centos devtoolset-8 successfully enabled!${COLOR_NC}"
+if [[ -d /opt/rh/devtoolset-7 ]]; then
+	echo "${COLOR_CYAN}[Enabling Centos devtoolset-7 (for newer GCC)]${COLOR_NC}"
+	execute-always source /opt/rh/devtoolset-7/enable
+	echo " - ${COLOR_GREEN}Centos devtoolset-7 successfully enabled!${COLOR_NC}"
 fi
-# Handle clang/compiler
-ensure-compiler
 # Ensure packages exist
 ensure-yum-packages "${REPO_ROOT}/scripts/eosio_build_centos7_deps"
 export PYTHON3PATH="/opt/rh/rh-python36"
@@ -32,6 +30,8 @@ if $DRYRUN || [ -d $PYTHON3PATH ]; then
 	echo " ${COLOR_GREEN}- Python36 successfully enabled!${COLOR_NC}"
 	echo ""
 fi
+# Handle clang/compiler
+ensure-compiler
 # CMAKE Installation
 ensure-cmake
 # CLANG Installation
diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 980f0aaf372..f656b8fbb82 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -94,4 +94,4 @@ if $INSTALL_MONGO; then
 fi
 
 # Cleanup build-essential as they were only needed for installing source packages
-($PIN_COMPILER && $PINNED_BUILD_ESSENTIALS) && uninstall-package build-essential autoremove
\ No newline at end of file
+($PIN_COMPILER && $PINNED_BUILD_ESSENTIALS) && uninstall-package build-essential autoremove; true
\ No newline at end of file
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index ab7ff61d960..d262429199f 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -152,16 +152,16 @@ function ensure-scl() {
 }
 
 function ensure-devtoolset() {
-    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-8]${COLOR_NC}"
-    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-8-[0-9].*' || true )
+    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-7]${COLOR_NC}"
+    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-7-[0-9].*' || true )
     if [[ -z "${DEVTOOLSET}" ]]; then
         while true; do
             [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Not Found: Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
             echo ""
             case $PROCEED in
                 "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* ) install-package devtoolset-8; break;;
-                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-8."; break;;
+                0 | true | [Yy]* ) install-package devtoolset-7; break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-7."; break;;
                 * ) echo "Please type 'y' for yes or 'n' for no.";;
             esac
         done
diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index c58cee78e9d..fbd0acbf0fc 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -25,12 +25,12 @@ export TEST_LABEL="[eosio_build_centos]"
     set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
 
     execute-always yum -y --enablerepo=extras install centos-release-scl &>/dev/null
-    install-package devtoolset-8 WETRUN &>/dev/null
-    # Ensure SCL and devtoolset-8 for c++ binary installation
+    install-package devtoolset-7 WETRUN &>/dev/null
+    # Ensure SCL and devtoolset-7 for c++ binary installation
     run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION} -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "centos-release-scl-2-3.el7.centos.noarch found") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "devtoolset-8-8.0-2.el7.x86_64 found") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-8/enable") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "devtoolset-7-8.0-2.el7.x86_64 found") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-7/enable") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
@@ -41,6 +41,6 @@ export TEST_LABEL="[eosio_build_centos]"
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
     [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
-    uninstall-package devtoolset-8* WETRUN &>/dev/null
+    uninstall-package devtoolset-7* WETRUN &>/dev/null
     uninstall-package centos-release-scl WETRUN &>/dev/null
 }
\ No newline at end of file
diff --git a/tests/bash-bats/helpers/functions.sh b/tests/bash-bats/helpers/functions.sh
index f8edaea624a..fe720dc6f5f 100644
--- a/tests/bash-bats/helpers/functions.sh
+++ b/tests/bash-bats/helpers/functions.sh
@@ -21,7 +21,7 @@ function teardown() { # teardown is run once after each test, even if it fails
     uninstall-package which WETRUN
     export SUDO_FORCE_REMOVE=yes
     uninstall-package sudo WETRUN
-    uninstall-package devtoolset-8* WETRUN
+    uninstall-package devtoolset-7* WETRUN
     uninstall-package centos-release-scl
     uninstall-package gcc-c++ WETRUN
     if [[ $NAME == 'Ubuntu' ]]; then

From 092965839456c25ba72b50cb11bfbace46245627 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 11:04:18 -0400
Subject: [PATCH 0691/1648] bats fixes

---
 tests/bash-bats/eosio_build.sh        | 7 ++-----
 tests/bash-bats/eosio_build_centos.sh | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index fe78e93c8cf..fe1e8f8c8c2 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -19,14 +19,11 @@ TEST_LABEL="[eosio_build]"
     fi
 
     if [[ $ARCH == "Linux" ]]; then
-        if [[ $NAME == "CentOS Linux" ]]; then # Centos has the SCL prompt before checking for the compiler
-            # No c++!
-            run bash -c "printf \"y\ny\ny\nn\n\" | ./${SCRIPT_LOCATION}"
-        else
+        if [[ $NAME != "CentOS Linux" ]]; then # Centos has the SCL prompt before checking for the compiler
             # No c++!
             run bash -c "printf \"y\ny\ny\nn\nn\n\" | ./${SCRIPT_LOCATION}"
+            [[ ! -z $(echo "${output}" | grep "Unable to find .* compiler") ]] || exit
         fi
-        [[ ! -z $(echo "${output}" | grep "Unable to find .* compiler") ]] || exit
     fi 
 
     cd ./scripts # Also test that we can run the script from a directory other than the root
diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index fbd0acbf0fc..7e25f3af292 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -29,7 +29,7 @@ export TEST_LABEL="[eosio_build_centos]"
     # Ensure SCL and devtoolset-7 for c++ binary installation
     run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION} -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "centos-release-scl-2-3.el7.centos.noarch found") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "devtoolset-7-8.0-2.el7.x86_64 found") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "devtoolset-7.* found") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-7/enable") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit

From 4df0d856a7d9290e9754ad3eac75efccaa71dbd9 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 14:11:02 -0400
Subject: [PATCH 0692/1648] removed uninstall of build-essential

---
 scripts/.build_vars           | 3 ---
 scripts/eosio_build_ubuntu.sh | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index da9c84a665b..585c521c935 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -6,9 +6,6 @@ export BIN_DIR=${EOSIO_INSTALL_DIR}/bin
 export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
 export DATA_DIR=${EOSIO_INSTALL_DIR}/data
 
-# Used to cleanup build-essential, unless the user has it already when they execute build scripts
-export PINNED_BUILD_ESSENTIALS=false
-
 # CMAKE
 export CMAKE_VERSION_MAJOR=3
 export CMAKE_VERSION_MINOR=13
diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index f656b8fbb82..6912919cc1e 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -91,7 +91,4 @@ if $INSTALL_MONGO; then
 	else
 		echo " - MongoDB C++ driver found with correct version @ ${MONGO_CXX_DRIVER_ROOT}."
 	fi
-fi
-
-# Cleanup build-essential as they were only needed for installing source packages
-($PIN_COMPILER && $PINNED_BUILD_ESSENTIALS) && uninstall-package build-essential autoremove; true
\ No newline at end of file
+fi
\ No newline at end of file

From fa054057f476775cb4ab9e672007dfd7bddf82de Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 25 Jun 2019 14:13:49 -0400
Subject: [PATCH 0693/1648] various fixes

---
 scripts/eosio_build_centos7_deps | 2 +-
 scripts/eosio_build_ubuntu_deps  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/eosio_build_centos7_deps b/scripts/eosio_build_centos7_deps
index b40dee8416d..7f32fada681 100644
--- a/scripts/eosio_build_centos7_deps
+++ b/scripts/eosio_build_centos7_deps
@@ -11,9 +11,9 @@ openssl-devel,rpm -qa
 gmp-devel,rpm -qa
 ocaml,rpm -qa
 libicu-devel,rpm -qa
-rh-python36,rpm -qa
 python,rpm -qa
 python-devel,rpm -qa
+rh-python36,rpm -qa
 gettext-devel,rpm -qa
 file,rpm -qa
 libusbx-devel,rpm -qa
diff --git a/scripts/eosio_build_ubuntu_deps b/scripts/eosio_build_ubuntu_deps
index e9174618e19..bfb6b776148 100644
--- a/scripts/eosio_build_ubuntu_deps
+++ b/scripts/eosio_build_ubuntu_deps
@@ -9,10 +9,10 @@ graphviz,dpkg -s
 libgmp3-dev,dpkg -s
 autotools-dev,dpkg -s
 libicu-dev,dpkg -s
-python3,dpkg -s
-python3-dev,dpkg -s
 python2.7,dpkg -s
 python2.7-dev,dpkg -s
+python3,dpkg -s
+python3-dev,dpkg -s
 autoconf,dpkg -s
 libtool,dpkg -s
 curl,dpkg -s

From c479615b310a08d126cded16fe1fd7219418de62 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Tue, 25 Jun 2019 14:43:45 -0400
Subject: [PATCH 0694/1648] eos-vm fixes

---
 libraries/chain/wasm_interface.cpp     | 2 +-
 libraries/chain/webassembly/eos-vm.cpp | 1 +
 libraries/eos-vm                       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 95252129354..4cd22180b42 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -1152,7 +1152,7 @@ class console_api : public context_aware_api {
          }
       }
 
-      void printn(const name& value) {
+      void printn(name value) {
          if ( !ignore ) {
             context.console_append(value.to_string());
          }
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 186a48914a1..854ddd54b33 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -21,6 +21,7 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
 
       void apply(apply_context& context) override {
          _instantiated_module->set_wasm_allocator( wasm_interface::get_wasm_allocator() );
+         _instantiated_module->get_wasm_allocator()->reset();
          //if (!(const auto& res = _instantiated_module->run_start()))
          //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
         
diff --git a/libraries/eos-vm b/libraries/eos-vm
index cc5005c44c3..f1434490613 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit cc5005c44c3d07504dc983ef2a6c8ff52b002f6a
+Subproject commit f14344906139cb4df2b0d9e558cb323899bdd1c3

From a646e5f308a16304c504ecf208b6e180d2e4f1c4 Mon Sep 17 00:00:00 2001
From: aaron-fu-block-one <aaron.fu@block.one>
Date: Wed, 26 Jun 2019 15:06:43 +0800
Subject: [PATCH 0695/1648] Add -j option to print JSON format for cleos get
 currency balance.

---
 programs/cleos/main.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 03c8917ffce..0e33900d2d4 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -2717,23 +2717,28 @@ int main( int argc, char** argv ) {
    // currency accessors
    // get currency balance
    string symbol;
+   bool currency_balance_print_json = false;
    auto get_currency = get->add_subcommand( "currency", localized("Retrieve information related to standard currencies"), true);
    get_currency->require_subcommand();
    auto get_balance = get_currency->add_subcommand( "balance", localized("Retrieve the balance of an account for a given currency"), false);
    get_balance->add_option( "contract", code, localized("The contract that operates the currency") )->required();
    get_balance->add_option( "account", accountName, localized("The account to query balances for") )->required();
    get_balance->add_option( "symbol", symbol, localized("The symbol for the currency if the contract operates multiple currencies") );
+   get_balance->add_flag("--json,-j", currency_balance_print_json, localized("Output in JSON format") );
    get_balance->set_callback([&] {
       auto result = call(get_currency_balance_func, fc::mutable_variant_object
          ("account", accountName)
          ("code", code)
          ("symbol", symbol.empty() ? fc::variant() : symbol)
       );
-
-      const auto& rows = result.get_array();
-      for( const auto& r : rows ) {
-         std::cout << r.as_string()
-                   << std::endl;
+      if (!currency_balance_print_json) {
+        const auto& rows = result.get_array();
+        for( const auto& r : rows ) {
+           std::cout << r.as_string()
+                     << std::endl;
+        }
+      } else {
+        std::cout << fc::json::to_pretty_string(result) << std::endl;
       }
    });
 

From cad96c4f2d0cd5c14c16b813527aac125808ce1b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 5 Jun 2019 16:13:03 -0500
Subject: [PATCH 0696/1648] connection via listen needs to start in connecting
 mode

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3c8ab0b5bfc..75bb3d35e80 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2155,6 +2155,7 @@ namespace eosio {
 
    void net_plugin_impl::start_listen_loop() {
       connection_ptr new_connection = std::make_shared<connection>();
+      new_connection->connecting = true;
       acceptor->async_accept( new_connection->socket,
             boost::asio::bind_executor( new_connection->strand, [new_connection, this]( boost::system::error_code ec ) {
          if( !ec ) {

From 9558d2e8ca848270e13559abdb82ac2c56cf8935 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 26 Jun 2019 11:20:04 -0400
Subject: [PATCH 0697/1648] removed PINNED_BUILD_ESSENTIALS

---
 scripts/helpers/eosio.sh   | 2 +-
 scripts/helpers/general.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 5d4b3e1ff60..5f668009fbd 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -146,7 +146,7 @@ function prompt-mongo-install() {
 }
 
 function ensure-compiler() {
-    # Support build-essentials 
+    # Support build-essentials on ubuntu
     if [[ $NAME == "CentOS Linux" ]] || [[ $VERSION_ID == "16.04" ]] || ( $PIN_COMPILER && [[ $VERSION_ID == "18.04" ]] ); then
         export CXX=${CXX:-'g++'}
         export CC=${CC:-'gcc'}
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index d262429199f..6ab81575b1b 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -182,7 +182,6 @@ function ensure-build-essential() {
                     "" ) echo "What would you like to do?";;
                     0 | true | [Yy]* )
                         install-package build-essential
-                        $PIN_COMPILER && export PINNED_BUILD_ESSENTIALS=true
                         echo " - ${COLOR_GREEN}Installed build-essential${COLOR_NC}"
                     break;;
                     1 | false | [Nn]* ) echo " - User aborted installation of build-essential."; break;;

From f7617eafc82d284ea81b56f3e5c0e2437b9652df Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Wed, 26 Jun 2019 12:00:12 -0400
Subject: [PATCH 0698/1648] eos-vm: fix eosio_exit

---
 .../chain/include/eosio/chain/webassembly/eos-vm.hpp | 12 ++++++++++--
 libraries/chain/webassembly/eos-vm.cpp               | 11 +++++++----
 libraries/eos-vm                                     |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 89be337a5b1..a89ee19bc68 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -177,10 +177,18 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
       eos_vm_runtime();
       std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) override;
 
-      void immediately_exit_currently_running_module() override { _bkend->exit({}); }
+      void immediately_exit_currently_running_module() override {
+         if (_bkend)
+            _bkend->exit({});
+      }
 
    private:
-      backend<apply_context>* _bkend;  // non owning pointer to allow for immediate exit
+      // todo: managing this will get more complicated with sync calls;
+      //       immediately_exit_currently_running_module() should probably
+      //       move from wasm_runtime_interface to wasm_instantiated_module_interface.
+      backend<apply_context>* _bkend = nullptr;  // non owning pointer to allow for immediate exit
+
+   friend class eos_vm_instantiated_module;
 };
 
 } } } }// eosio::chain::webassembly::wabt_runtime
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 854ddd54b33..9d2b2201145 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -16,7 +16,8 @@ using backend_t = backend<apply_context>;
 class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
    public:
       
-      eos_vm_instantiated_module(std::unique_ptr<backend_t> mod) :
+      eos_vm_instantiated_module(eos_vm_runtime* runtime, std::unique_ptr<backend_t> mod) :
+         _runtime(runtime),
          _instantiated_module(std::move(mod)) {}
 
       void apply(apply_context& context) override {
@@ -24,15 +25,18 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          _instantiated_module->get_wasm_allocator()->reset();
          //if (!(const auto& res = _instantiated_module->run_start()))
          //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
-        
+
+         _runtime->_bkend = _instantiated_module.get();
          const auto& res = _instantiated_module->call(&context, "env", "apply",
                                           context.get_receiver().to_uint64_t(),
                                           context.get_action().account.to_uint64_t(),
                                           context.get_action().name.to_uint64_t());
+         _runtime->_bkend = nullptr;
          //EOS_ASSERT(res, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
       }
 
    private:
+      eos_vm_runtime*            _runtime;
       std::unique_ptr<backend_t> _instantiated_module;
 };
 
@@ -45,8 +49,7 @@ std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime::instantiate_
    wasm_code_ptr code((uint8_t*)code_bytes, 0);
    std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size);
    registered_host_functions<apply_context>::resolve(bkend->get_module());
-   _bkend = bkend.get();
-   return std::make_unique<eos_vm_instantiated_module>(std::move(bkend));
+   return std::make_unique<eos_vm_instantiated_module>(this, std::move(bkend));
 }
 
 }}}}
diff --git a/libraries/eos-vm b/libraries/eos-vm
index f1434490613..8fdf8c4b80c 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit f14344906139cb4df2b0d9e558cb323899bdd1c3
+Subproject commit 8fdf8c4b80ce80f7bf0637f911f9444e968577ed

From b79cda07d7de7d5974837c0d07061d678a34b938 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 26 Jun 2019 13:35:27 -0400
Subject: [PATCH 0699/1648] quick fixes [skip ci]

---
 scripts/eosio_build_centos.sh | 2 +-
 scripts/helpers/general.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh
index 5e68df2ff28..e037f985106 100755
--- a/scripts/eosio_build_centos.sh
+++ b/scripts/eosio_build_centos.sh
@@ -17,7 +17,7 @@ ensure-scl
 # GCC7 for Centos / Needed for CMAKE install even if we're pinning
 ensure-devtoolset
 if [[ -d /opt/rh/devtoolset-7 ]]; then
-	echo "${COLOR_CYAN}[Enabling Centos devtoolset-7 (for newer GCC)]${COLOR_NC}"
+	echo "${COLOR_CYAN}[Enabling Centos devtoolset-7 (so we can use GCC 7)]${COLOR_NC}"
 	execute-always source /opt/rh/devtoolset-7/enable
 	echo " - ${COLOR_GREEN}Centos devtoolset-7 successfully enabled!${COLOR_NC}"
 fi
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 6ab81575b1b..3f9e64981b3 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -172,7 +172,7 @@ function ensure-devtoolset() {
 
 function ensure-build-essential() {
     if [[ ! $(dpkg -s clang 2>/dev/null) ]]; then # Clang already exists, so no need for build essentials
-        echo "${COLOR_CYAN}[Ensuring installation of build-essential (needed for installing depedencies; we will remove it after)]${COLOR_NC}"
+        echo "${COLOR_CYAN}[Ensuring installation of build-essential]${COLOR_NC}"
         BUILD_ESSENTIAL=$( dpkg -s build-essential | grep 'Package: build-essential' || true )
         if [[ -z $BUILD_ESSENTIAL ]]; then
             while true; do

From 9bc2d6bf32c8c59bd91e15a69706c920188f98bc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 26 Jun 2019 14:02:48 -0500
Subject: [PATCH 0700/1648] Cleanup syncing/connecting state

---
 plugins/net_plugin/net_plugin.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 75bb3d35e80..4924e15c44b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -577,8 +577,8 @@ namespace eosio {
       fc::sha256              node_id;
       const uint32_t          connection_id;
       int16_t                 sent_handshake_count = 0;
-      std::atomic<bool>       connecting{false};
-      std::atomic<bool>       syncing{false};
+      std::atomic<bool>       connecting{true};
+      std::atomic<bool>       syncing{true};
       uint16_t                protocol_version = 0;
       uint16_t                consecutive_rejected_blocks = 0;
       std::atomic<uint16_t>   consecutive_immediate_connection_close = 0;
@@ -914,7 +914,6 @@ namespace eosio {
       socket.set_option( nodelay, ec );
       if( ec ) {
          fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", peer_name())( "error", ec.message() ) );
-         connecting = false;
          close();
          return false;
       } else {
@@ -2146,7 +2145,6 @@ namespace eosio {
                   } );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
-                  c->connecting = false;
                   c->close( false );
                }
             }
@@ -2463,9 +2461,7 @@ namespace eosio {
                ("g", msg.generation)( "ep", peer_name() )
                ( "lib", msg.last_irreversible_block_num )( "head", msg.head_num ) );
 
-      if( connecting ) {
-         connecting = false;
-      }
+      connecting = false;
       if (msg.generation == 1) {
          if( msg.node_id == node_id) {
             fc_elog( logger, "Self connection detected node_id ${id}. Closing connection", ("id", node_id) );

From ec1ea61b3a7fccabe0e68802a8f40d18317d0436 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 26 Jun 2019 14:27:48 -0500
Subject: [PATCH 0701/1648] Revert syncing change

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4924e15c44b..fd9cdaba78d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -578,7 +578,7 @@ namespace eosio {
       const uint32_t          connection_id;
       int16_t                 sent_handshake_count = 0;
       std::atomic<bool>       connecting{true};
-      std::atomic<bool>       syncing{true};
+      std::atomic<bool>       syncing{false};
       uint16_t                protocol_version = 0;
       uint16_t                consecutive_rejected_blocks = 0;
       std::atomic<uint16_t>   consecutive_immediate_connection_close = 0;

From 26c31f28555d587b87544439f96088e214012271 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Wed, 26 Jun 2019 18:00:30 -0400
Subject: [PATCH 0702/1648] update eos-vm

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 8fdf8c4b80c..813d8e2c26b 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 8fdf8c4b80ce80f7bf0637f911f9444e968577ed
+Subproject commit 813d8e2c26b21179e29aad08669d3c96685be86f

From 0657c5d1f1a284cef3aed010c7f22857bbfda6a8 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 27 Jun 2019 12:11:07 +0800
Subject: [PATCH 0703/1648] Move get_table_more2_test from chain_plugin_tests
 to get_table_tests

---
 tests/chain_plugin_tests.cpp | 169 ----------------------------
 tests/get_table_tests.cpp    | 206 +++++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+), 169 deletions(-)

diff --git a/tests/chain_plugin_tests.cpp b/tests/chain_plugin_tests.cpp
index b5821ab43f6..edc6d2620da 100644
--- a/tests/chain_plugin_tests.cpp
+++ b/tests/chain_plugin_tests.cpp
@@ -123,173 +123,4 @@ BOOST_FIXTURE_TEST_CASE( get_block_with_invalid_abi, TESTER ) try {
 
 } FC_LOG_AND_RETHROW() /// get_block_with_invalid_abi
 
-BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
-   create_account(N(test));
-
-   // setup contract and abi
-   set_code( N(test), contracts::get_table_test_wasm() );
-   set_abi( N(test), contracts::get_table_test_abi().data() );
-   produce_block();
-
-   // Init some data
-   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 2));
-   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 5));
-   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 7));
-   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "firstinput"));
-   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "secondinput"));
-   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "thirdinput"));
-   produce_block();
-
-   // The result of the init will populate
-   // For numobjs table (secondary index is on sec64, sec128, secdouble, secldouble)
-   // {
-   //   "rows": [{
-   //       "key": 0,
-   //       "sec64": 2,
-   //       "sec128": "0x02000000000000000000000000000000",
-   //       "secdouble": "2.00000000000000000",
-   //       "secldouble": "0x00000000000000000000000000000040"
-   //     },{
-   //       "key": 1,
-   //       "sec64": 5,
-   //       "sec128": "0x05000000000000000000000000000000",
-   //       "secdouble": "5.00000000000000000",
-   //       "secldouble": "0x00000000000000000000000000400140"
-   //     },{
-   //       "key": 2,
-   //       "sec64": 7,
-   //       "sec128": "0x07000000000000000000000000000000",
-   //       "secdouble": "7.00000000000000000",
-   //       "secldouble": "0x00000000000000000000000000c00140"
-   //     }
-   //   "more": false,
-   //   "more2": ""
-   // }
-   // For hashobjs table (secondary index is on sec256 and sec160):
-   // {
-   //   "rows": [{
-   //       "key": 0,
-   //       "hash_input": "firstinput",
-   //       "sec256": "05f5aa6b6c5568c53e886591daa9d9f636fa8e77873581ba67ca46a0f96c226e",
-   //       "sec160": "2a9baa59f1e376eda2e963c140d13c7e77c2f1fb"
-   //     },{
-   //       "key": 1,
-   //       "hash_input": "secondinput",
-   //       "sec256": "3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264",
-   //       "sec160": "fb9d03d3012dc2a6c7b319f914542e3423550c2a"
-   //     },{
-   //       "key": 2,
-   //       "hash_input": "thirdinput",
-   //       "sec256": "2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5",
-   //       "sec160": "ab4314638b573fdc39e5a7b107938ad1b5a16414"
-   //     }
-   //   ],
-   //   "more": false,
-   //   "more2": ""
-   // }
-
-
-   chain_apis::read_only plugin(*(this->control), fc::microseconds::maximum());
-   chain_apis::read_only::get_table_rows_params params{
-      .code=N(test),
-      .scope="test",
-      .limit=1,
-      .json=true
-   };
-
-      params.table = N(numobjs);
-
-      // i64 primary key type
-      params.key_type = "i64";
-      params.index_position = "1";
-      params.lower_bound = "0";
-
-      auto res_1 = plugin.get_table_rows(params);
-      BOOST_TEST(res_1.rows[0].get_object()["key"].as<uint64_t>() == 0);
-      BOOST_TEST(res_1.more2 == "1");
-
-      // i64 secondary key type
-      params.key_type = "i64";
-      params.index_position = "2";
-      params.lower_bound = "5";
-
-      auto res_2 = plugin.get_table_rows(params);
-      BOOST_TEST(res_2.rows[0].get_object()["sec64"].as<uint64_t>() == 5);
-      BOOST_TEST(res_2.more2 == "7");
-
-      // i128 secondary key type
-      params.key_type = "i128";
-      params.index_position = "3";
-      params.lower_bound = "0x05000000000000000000000000000000"; // This is 5 in uint128 representation
-
-      auto res_3 = plugin.get_table_rows(params);
-      chain::uint128_t sec128_expected_value = 5;
-      BOOST_CHECK(res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == sec128_expected_value);
-      BOOST_TEST(res_3.more2 == "0x07000000000000000000000000000000");
-
-      // float64 secondary key type
-      params.key_type = "float64";
-      params.index_position = "4";
-      params.lower_bound = "5.0";
-
-      auto res_4 = plugin.get_table_rows(params);
-      float64_t secdouble_expected_value = ui64_to_f64(5);
-      double secdouble_res_value = res_4.rows[0].get_object()["secdouble"].as<double>();
-      BOOST_CHECK(*reinterpret_cast<float64_t*>(&secdouble_res_value) == secdouble_expected_value);
-      BOOST_TEST(res_4.more2 == "7.00000000000000000");
-
-      // float128 secondary key type
-      params.key_type = "float128";
-      params.index_position = "5";
-      params.lower_bound = "0x00000000000000000000000000400140"; // This is 5.0 in uint128 representation
-
-      auto res_5 = plugin.get_table_rows(params);
-      float128_t secldouble_expected_value = ui64_to_f128(5);
-      chain::uint128_t secldouble_res_value =  res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
-      BOOST_TEST(*reinterpret_cast<float128_t*>(&secldouble_res_value) == secldouble_expected_value);
-      BOOST_TEST(res_5.more2 == "0x00000000000000000000000000c00140");
-
-      params.table = N(hashobjs);
-
-       // sha256 secondary key type
-      params.key_type = "sha256";
-      params.index_position = "2";
-      params.lower_bound = "2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5"; // This is hash of "thirdinput"
-
-      auto res_6 = plugin.get_table_rows(params);
-     
-      checksum256_type sec256_expected_value = checksum256_type::hash(std::string("thirdinput"));
-      
-      checksum256_type sec256_res_value = res_6.rows[0].get_object()["sec256"].as<checksum256_type>();
-      BOOST_TEST(std::string(sec256_res_value) == std::string(sec256_expected_value));
-      BOOST_TEST(res_6.rows[0].get_object()["hash_input"].as<string>() == std::string("thirdinput"));
-      BOOST_TEST(res_6.more2 == "3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
-
-      // i256 secondary key type
-      params.key_type = "i256";
-      params.index_position = "2";
-      params.lower_bound = "0x2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5"; // This is sha256 hash of "thirdinput" as number
-
-      auto res_7 = plugin.get_table_rows(params);
-      checksum256_type i256_expected_value = checksum256_type::hash(std::string("thirdinput"));
-      checksum256_type i256_res_value = res_7.rows[0].get_object()["sec256"].as<checksum256_type>();
-      BOOST_CHECK(i256_res_value == i256_expected_value);
-      BOOST_TEST(res_7.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
-      BOOST_TEST(res_7.more2 == "0x3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
-
-      // ripemd160 secondary key type
-      params.key_type = "ripemd160";
-      params.index_position = "3";
-      params.lower_bound = "ab4314638b573fdc39e5a7b107938ad1b5a16414"; // This is ripemd160 hash of "thirdinput"
-
-      auto res_8 = plugin.get_table_rows(params);
-      ripemd160 sec160_expected_value =  ripemd160::hash(std::string("thirdinput"));
-      ripemd160 sec160_res_value =  res_8.rows[0].get_object()["sec160"].as<ripemd160>();
-      BOOST_CHECK(sec160_res_value == sec160_expected_value);
-      BOOST_TEST(res_8.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
-      BOOST_TEST(res_8.more2 == "fb9d03d3012dc2a6c7b319f914542e3423550c2a");
-
-  
-
-} FC_LOG_AND_RETHROW() /// get_table_test
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/get_table_tests.cpp b/tests/get_table_tests.cpp
index 91fca59ef3b..34f4e10c04e 100644
--- a/tests/get_table_tests.cpp
+++ b/tests/get_table_tests.cpp
@@ -452,4 +452,210 @@ BOOST_FIXTURE_TEST_CASE( get_table_by_seckey_test, TESTER ) try {
 
 } FC_LOG_AND_RETHROW()
 
+
+BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
+   create_account(N(test));
+
+   // setup contract and abi
+   set_code( N(test), contracts::get_table_test_wasm() );
+   set_abi( N(test), contracts::get_table_test_abi().data() );
+   produce_block();
+
+   // Init some data
+   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 2));
+   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 5));
+   push_action(N(test), N(addnumobj), N(test), mutable_variant_object()("input", 7));
+   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "firstinput"));
+   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "secondinput"));
+   push_action(N(test), N(addhashobj), N(test), mutable_variant_object()("hashinput", "thirdinput"));
+   produce_block();
+
+   // The result of the init will populate
+   // For numobjs table (secondary index is on sec64, sec128, secdouble, secldouble)
+   // {
+   //   "rows": [{
+   //       "key": 0,
+   //       "sec64": 2,
+   //       "sec128": "0x02000000000000000000000000000000",
+   //       "secdouble": "2.00000000000000000",
+   //       "secldouble": "0x00000000000000000000000000000040"
+   //     },{
+   //       "key": 1,
+   //       "sec64": 5,
+   //       "sec128": "0x05000000000000000000000000000000",
+   //       "secdouble": "5.00000000000000000",
+   //       "secldouble": "0x00000000000000000000000000400140"
+   //     },{
+   //       "key": 2,
+   //       "sec64": 7,
+   //       "sec128": "0x07000000000000000000000000000000",
+   //       "secdouble": "7.00000000000000000",
+   //       "secldouble": "0x00000000000000000000000000c00140"
+   //     }
+   //   "more": false,
+   //   "more2": ""
+   // }
+   // For hashobjs table (secondary index is on sec256 and sec160):
+   // {
+   //   "rows": [{
+   //       "key": 0,
+   //       "hash_input": "firstinput",
+   //       "sec256": "05f5aa6b6c5568c53e886591daa9d9f636fa8e77873581ba67ca46a0f96c226e",
+   //       "sec160": "2a9baa59f1e376eda2e963c140d13c7e77c2f1fb"
+   //     },{
+   //       "key": 1,
+   //       "hash_input": "secondinput",
+   //       "sec256": "3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264",
+   //       "sec160": "fb9d03d3012dc2a6c7b319f914542e3423550c2a"
+   //     },{
+   //       "key": 2,
+   //       "hash_input": "thirdinput",
+   //       "sec256": "2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5",
+   //       "sec160": "ab4314638b573fdc39e5a7b107938ad1b5a16414"
+   //     }
+   //   ],
+   //   "more": false,
+   //   "more2": ""
+   // }
+
+
+   chain_apis::read_only plugin(*(this->control), fc::microseconds::maximum());
+   chain_apis::read_only::get_table_rows_params params{
+      .code=N(test),
+      .scope="test",
+      .limit=1,
+      .json=true
+   };
+
+   params.table = N(numobjs);
+
+   // i64 primary key type
+   params.key_type = "i64";
+   params.index_position = "1";
+   params.lower_bound = "0";
+
+   auto res_1 = plugin.get_table_rows(params);
+   BOOST_TEST(res_1.rows[0].get_object()["key"].as<uint64_t>() == 0);
+   BOOST_TEST(res_1.more2 == "1");
+   params.lower_bound = res_1.more2;
+   auto more2_res_1 = plugin.get_table_rows(params);
+   BOOST_TEST(more2_res_1.rows[0].get_object()["key"].as<uint64_t>() == 1);
+   
+
+   // i64 secondary key type
+   params.key_type = "i64";
+   params.index_position = "2";
+   params.lower_bound = "5";
+
+   auto res_2 = plugin.get_table_rows(params);
+   BOOST_TEST(res_2.rows[0].get_object()["sec64"].as<uint64_t>() == 5);
+   BOOST_TEST(res_2.more2 == "7");
+   params.lower_bound = res_2.more2;
+   auto more2_res_2 = plugin.get_table_rows(params);
+   BOOST_TEST(more2_res_2.rows[0].get_object()["sec64"].as<uint64_t>() == 7);
+
+   // i128 secondary key type
+   params.key_type = "i128";
+   params.index_position = "3";
+   params.lower_bound = "0x05000000000000000000000000000000"; // This is 5 in uint128 representation
+
+   auto res_3 = plugin.get_table_rows(params);
+   chain::uint128_t sec128_expected_value = 5;
+   BOOST_CHECK(res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == sec128_expected_value);
+   BOOST_TEST(res_3.more2 == "0x07000000000000000000000000000000");
+   params.lower_bound = res_3.more2;
+   auto more2_res_3 = plugin.get_table_rows(params);
+   chain::uint128_t more2_sec128_expected_value = 7;
+   BOOST_CHECK(more2_res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == more2_sec128_expected_value);
+
+   // float64 secondary key type
+   params.key_type = "float64";
+   params.index_position = "4";
+   params.lower_bound = "5.0";
+
+   auto res_4 = plugin.get_table_rows(params);
+   float64_t secdouble_expected_value = ui64_to_f64(5);
+   double secdouble_res_value = res_4.rows[0].get_object()["secdouble"].as<double>();
+   BOOST_CHECK(*reinterpret_cast<float64_t*>(&secdouble_res_value) == secdouble_expected_value);
+   BOOST_TEST(res_4.more2 == "7.00000000000000000");
+   params.lower_bound = res_4.more2;
+   auto more2_res_4 = plugin.get_table_rows(params);
+   float64_t more2_secdouble_expected_value = ui64_to_f64(7);
+   double more2_secdouble_res_value = more2_res_4.rows[0].get_object()["secdouble"].as<double>();
+   BOOST_CHECK(*reinterpret_cast<float64_t*>(&more2_secdouble_res_value) == more2_secdouble_expected_value);
+
+   // float128 secondary key type
+   params.key_type = "float128";
+   params.index_position = "5";
+   params.lower_bound = "0x00000000000000000000000000400140"; // This is 5.0 in uint128 representation
+
+   auto res_5 = plugin.get_table_rows(params);
+   float128_t secldouble_expected_value = ui64_to_f128(5);
+   chain::uint128_t secldouble_res_value =  res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
+   BOOST_TEST(*reinterpret_cast<float128_t*>(&secldouble_res_value) == secldouble_expected_value);
+   BOOST_TEST(res_5.more2 == "0x00000000000000000000000000c00140");
+   params.lower_bound = res_5.more2;
+   auto more2_res_5 = plugin.get_table_rows(params);
+   float128_t more2_secldouble_expected_value = ui64_to_f128(7);
+   chain::uint128_t more2_secldouble_res_value =  more2_res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
+   BOOST_TEST(*reinterpret_cast<float128_t*>(&more2_secldouble_res_value) == more2_secldouble_expected_value);
+
+   params.table = N(hashobjs);
+
+   // sha256 secondary key type
+   params.key_type = "sha256";
+   params.index_position = "2";
+   params.lower_bound = "2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5"; // This is hash of "thirdinput"
+
+   auto res_6 = plugin.get_table_rows(params);
+   checksum256_type sec256_expected_value = checksum256_type::hash(std::string("thirdinput"));
+   checksum256_type sec256_res_value = res_6.rows[0].get_object()["sec256"].as<checksum256_type>();
+   BOOST_TEST(sec256_res_value == sec256_expected_value);
+   BOOST_TEST(res_6.rows[0].get_object()["hash_input"].as<string>() == std::string("thirdinput"));
+   BOOST_TEST(res_6.more2 == "3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
+   params.lower_bound = res_6.more2;
+   auto more2_res_6 = plugin.get_table_rows(params);
+   checksum256_type more2_sec256_expected_value = checksum256_type::hash(std::string("secondinput"));
+   checksum256_type more2_sec256_res_value = more2_res_6.rows[0].get_object()["sec256"].as<checksum256_type>();
+   BOOST_TEST(more2_sec256_res_value == more2_sec256_expected_value);
+   BOOST_TEST(more2_res_6.rows[0].get_object()["hash_input"].as<string>() == std::string("secondinput"));
+
+   // i256 secondary key type
+   params.key_type = "i256";
+   params.index_position = "2";
+   params.lower_bound = "0x2652d68fbbf6000c703b35fdc607b09cd8218cbeea1d108b5c9e84842cdd5ea5"; // This is sha256 hash of "thirdinput" as number
+
+   auto res_7 = plugin.get_table_rows(params);
+   checksum256_type i256_expected_value = checksum256_type::hash(std::string("thirdinput"));
+   checksum256_type i256_res_value = res_7.rows[0].get_object()["sec256"].as<checksum256_type>();
+   BOOST_TEST(i256_res_value == i256_expected_value);
+   BOOST_TEST(res_7.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
+   BOOST_TEST(res_7.more2 == "0x3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
+   params.lower_bound = res_7.more2;
+   auto more2_res_7 = plugin.get_table_rows(params);
+   checksum256_type more2_i256_expected_value = checksum256_type::hash(std::string("secondinput"));
+   checksum256_type more2_i256_res_value = more2_res_7.rows[0].get_object()["sec256"].as<checksum256_type>();
+   BOOST_TEST(more2_i256_res_value == more2_i256_expected_value);
+   BOOST_TEST(more2_res_7.rows[0].get_object()["hash_input"].as<string>() == "secondinput");
+
+   // ripemd160 secondary key type
+   params.key_type = "ripemd160";
+   params.index_position = "3";
+   params.lower_bound = "ab4314638b573fdc39e5a7b107938ad1b5a16414"; // This is ripemd160 hash of "thirdinput"
+
+   auto res_8 = plugin.get_table_rows(params);
+   ripemd160 sec160_expected_value = ripemd160::hash(std::string("thirdinput"));
+   ripemd160 sec160_res_value = res_8.rows[0].get_object()["sec160"].as<ripemd160>();
+   BOOST_TEST(sec160_res_value == sec160_expected_value);
+   BOOST_TEST(res_8.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
+   BOOST_TEST(res_8.more2 == "fb9d03d3012dc2a6c7b319f914542e3423550c2a");
+   params.lower_bound = res_8.more2;
+   auto more2_res_8 = plugin.get_table_rows(params);
+   ripemd160 more2_sec160_expected_value = ripemd160::hash(std::string("secondinput"));
+   ripemd160 more2_sec160_res_value = more2_res_8.rows[0].get_object()["sec160"].as<ripemd160>();
+   BOOST_TEST(more2_sec160_res_value == more2_sec160_expected_value);
+   BOOST_TEST(more2_res_8.rows[0].get_object()["hash_input"].as<string>() == "secondinput");
+
+} FC_LOG_AND_RETHROW() /// get_table_more2_test
+
 BOOST_AUTO_TEST_SUITE_END()

From 45a348cc97849ea7ae47e28be35fea054d1d1ad3 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 27 Jun 2019 12:47:18 -0400
Subject: [PATCH 0704/1648] add support for using devtoolset-8 in built clang

---
 scripts/clang-devtoolset8-support.patch | 55 +++++++++++++++++++++++++
 scripts/helpers/eosio.sh                |  5 ++-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 scripts/clang-devtoolset8-support.patch

diff --git a/scripts/clang-devtoolset8-support.patch b/scripts/clang-devtoolset8-support.patch
new file mode 100644
index 00000000000..64a946e26cd
--- /dev/null
+++ b/scripts/clang-devtoolset8-support.patch
@@ -0,0 +1,55 @@
+From 32b65345c5760295d04c95e0abb3653fe20ffd16 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Tue, 9 Apr 2019 13:26:10 +0000
+Subject: [PATCH] Add support for detection of devtoolset-8
+
+Summary:
+The current llvm/clang et al. project can be built with the latest developer toolset (devtoolset-8) on RHEL, which provides GCC 8.2.1.
+However, the result compiler will not identify this toolset itself when compiling programs, which is of course not desirable.
+
+After the patch - which simply adds the name of the developer toolset to the existing list - it gets identified and selected, as shown below:
+
+[bamboo@bamboo llvm-project]$ clang -v
+clang version 9.0.0 (https://github.com/llvm/llvm-project.git e5ac385fb1ffa4bd3875ea6a4d24efdbd7814572)
+Target: x86_64-unknown-linux-gnu
+Thread model: posix
+InstalledDir: /home/bamboo/llvm/bin
+Found candidate GCC installation: /opt/rh/devtoolset-4/root/usr/lib/gcc/x86_64-redhat-linux/5.2.1
+Found candidate GCC installation: /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7
+Found candidate GCC installation: /opt/rh/devtoolset-8/root/usr/lib/gcc/x86_64-redhat-linux/8
+Found candidate GCC installation: /usr/lib/gcc/x86_64-redhat-linux/4.8.2
+Found candidate GCC installation: /usr/lib/gcc/x86_64-redhat-linux/4.8.5
+Selected GCC installation: /opt/rh/devtoolset-8/root/usr/lib/gcc/x86_64-redhat-linux/8
+Candidate multilib: .;@m64
+Candidate multilib: 32;@m32
+Selected multilib: .;@m64
+
+Patch By: Radu-Adrian Popescu
+
+Reviewers: tstellar, fedor.sergeev
+
+Reviewed By: tstellar
+
+Subscribers: jdoerfert, cfe-commits
+
+Tags: #clang
+
+Differential Revision: https://reviews.llvm.org/D59987
+
+llvm-svn: 358002
+---
+ clang/lib/Driver/ToolChains/Gnu.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
+index 2a58f0f7142..8915e3f948f 100644
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -1875,6 +1875,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+   // Non-Solaris is much simpler - most systems just go with "/usr".
+   if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) {
+     // Yet, still look for RHEL devtoolsets.
++    Prefixes.push_back("/opt/rh/devtoolset-8/root/usr");
+     Prefixes.push_back("/opt/rh/devtoolset-7/root/usr");
+     Prefixes.push_back("/opt/rh/devtoolset-6/root/usr");
+     Prefixes.push_back("/opt/rh/devtoolset-4/root/usr");
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 5f668009fbd..486d9d67b0b 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -311,9 +311,10 @@ function build-clang() {
             && cd lld && git checkout $PINNED_COMPILER_LLD_COMMIT && cd ../ \
             && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/polly.git \
             && cd polly && git checkout $PINNED_COMPILER_POLLY_COMMIT && cd ../ \
-            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang.git clang && cd clang/tools \
+            && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang.git clang && cd clang \
             && git checkout $PINNED_COMPILER_CLANG_COMMIT \
-            && mkdir extra && cd extra \
+            && patch -p2 < \"$REPO_ROOT/scripts/clang-devtoolset8-support.patch\" \
+            && cd tools && mkdir extra && cd extra \
             && git clone --single-branch --branch $PINNED_COMPILER_BRANCH https://git.llvm.org/git/clang-tools-extra.git \
             && cd clang-tools-extra && git checkout $PINNED_COMPILER_CLANG_TOOLS_EXTRA_COMMIT && cd .. \
             && cd ../../../../projects \

From 39d81f377e2aa33fc72c9e3b2f48389e38800eed Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 27 Jun 2019 14:14:43 -0400
Subject: [PATCH 0705/1648] go back to devtoolset-8 on centos7

---
 scripts/eosio_build_centos.sh         | 12 ++++++------
 scripts/helpers/general.sh            |  8 ++++----
 tests/bash-bats/eosio_build_centos.sh | 10 +++++-----
 tests/bash-bats/helpers/functions.sh  |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh
index e037f985106..9e20e86df55 100755
--- a/scripts/eosio_build_centos.sh
+++ b/scripts/eosio_build_centos.sh
@@ -12,14 +12,14 @@ echo "Disk space available: ${DISK_AVAIL}G"
 
 echo ""
 
-# Repo necessary for rh-python3 and devtoolset-7
+# Repo necessary for rh-python3 and devtoolset-8
 ensure-scl
-# GCC7 for Centos / Needed for CMAKE install even if we're pinning
+# GCC8 for Centos / Needed for CMAKE install even if we're pinning
 ensure-devtoolset
-if [[ -d /opt/rh/devtoolset-7 ]]; then
-	echo "${COLOR_CYAN}[Enabling Centos devtoolset-7 (so we can use GCC 7)]${COLOR_NC}"
-	execute-always source /opt/rh/devtoolset-7/enable
-	echo " - ${COLOR_GREEN}Centos devtoolset-7 successfully enabled!${COLOR_NC}"
+if [[ -d /opt/rh/devtoolset-8 ]]; then
+	echo "${COLOR_CYAN}[Enabling Centos devtoolset-8 (so we can use GCC 8)]${COLOR_NC}"
+	execute-always source /opt/rh/devtoolset-8/enable
+	echo " - ${COLOR_GREEN}Centos devtoolset-8 successfully enabled!${COLOR_NC}"
 fi
 # Ensure packages exist
 ensure-yum-packages "${REPO_ROOT}/scripts/eosio_build_centos7_deps"
diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 3f9e64981b3..4fc4761fda1 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -152,16 +152,16 @@ function ensure-scl() {
 }
 
 function ensure-devtoolset() {
-    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-7]${COLOR_NC}"
-    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-7-[0-9].*' || true )
+    echo "${COLOR_CYAN}[Ensuring installation of devtoolset-8]${COLOR_NC}"
+    DEVTOOLSET=$( rpm -qa | grep -E 'devtoolset-8-[0-9].*' || true )
     if [[ -z "${DEVTOOLSET}" ]]; then
         while true; do
             [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Not Found: Do you wish to install it? (y/n)?${COLOR_NC}" && read -p " " PROCEED
             echo ""
             case $PROCEED in
                 "" ) echo "What would you like to do?";;
-                0 | true | [Yy]* ) install-package devtoolset-7; break;;
-                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-7."; break;;
+                0 | true | [Yy]* ) install-package devtoolset-8; break;;
+                1 | false | [Nn]* ) echo " - User aborted installation of devtoolset-8."; break;;
                 * ) echo "Please type 'y' for yes or 'n' for no.";;
             esac
         done
diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index 7e25f3af292..c7927b4a38d 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -25,12 +25,12 @@ export TEST_LABEL="[eosio_build_centos]"
     set_system_vars # Obtain current machine's resources and set the necessary variables (like JOBS, etc)
 
     execute-always yum -y --enablerepo=extras install centos-release-scl &>/dev/null
-    install-package devtoolset-7 WETRUN &>/dev/null
-    # Ensure SCL and devtoolset-7 for c++ binary installation
+    install-package devtoolset-8 WETRUN &>/dev/null
+    # Ensure SCL and devtoolset-8 for c++ binary installation
     run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION} -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "centos-release-scl-2-3.el7.centos.noarch found") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "devtoolset-7.* found") ]] || exit
-    [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-7/enable") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "devtoolset-8.* found") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-8/enable") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
@@ -41,6 +41,6 @@ export TEST_LABEL="[eosio_build_centos]"
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
     [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
-    uninstall-package devtoolset-7* WETRUN &>/dev/null
+    uninstall-package devtoolset-8* WETRUN &>/dev/null
     uninstall-package centos-release-scl WETRUN &>/dev/null
 }
\ No newline at end of file
diff --git a/tests/bash-bats/helpers/functions.sh b/tests/bash-bats/helpers/functions.sh
index fe720dc6f5f..f8edaea624a 100644
--- a/tests/bash-bats/helpers/functions.sh
+++ b/tests/bash-bats/helpers/functions.sh
@@ -21,7 +21,7 @@ function teardown() { # teardown is run once after each test, even if it fails
     uninstall-package which WETRUN
     export SUDO_FORCE_REMOVE=yes
     uninstall-package sudo WETRUN
-    uninstall-package devtoolset-7* WETRUN
+    uninstall-package devtoolset-8* WETRUN
     uninstall-package centos-release-scl
     uninstall-package gcc-c++ WETRUN
     if [[ $NAME == 'Ubuntu' ]]; then

From 3ff9547379ebbf4fbdcdb3f97b07979806eaca61 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Thu, 27 Jun 2019 15:49:08 -0400
Subject: [PATCH 0706/1648] update eos-vm

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 813d8e2c26b..6e24f3ec577 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 813d8e2c26b21179e29aad08669d3c96685be86f
+Subproject commit 6e24f3ec577d19918d12ddb14520be8543f44a38

From 7c44586c778ec58cf36a2cd1568801026532e17b Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 27 Jun 2019 16:18:51 -0400
Subject: [PATCH 0707/1648] add patch as a required dep

---
 scripts/eosio_build_amazonlinux2_deps | 3 ++-
 scripts/eosio_build_centos7_deps      | 3 ++-
 scripts/eosio_build_ubuntu_deps       | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/eosio_build_amazonlinux2_deps b/scripts/eosio_build_amazonlinux2_deps
index c599e9b1ae4..4017586125e 100755
--- a/scripts/eosio_build_amazonlinux2_deps
+++ b/scripts/eosio_build_amazonlinux2_deps
@@ -19,4 +19,5 @@ python-devel,rpm -qa
 libedit-devel,rpm -qa
 doxygen,rpm -qa
 graphviz,rpm -qa
-clang,rpm -qa
\ No newline at end of file
+clang,rpm -qa
+patch,rpm -qa
\ No newline at end of file
diff --git a/scripts/eosio_build_centos7_deps b/scripts/eosio_build_centos7_deps
index 7f32fada681..60452c66252 100644
--- a/scripts/eosio_build_centos7_deps
+++ b/scripts/eosio_build_centos7_deps
@@ -17,4 +17,5 @@ rh-python36,rpm -qa
 gettext-devel,rpm -qa
 file,rpm -qa
 libusbx-devel,rpm -qa
-libcurl-devel,rpm -qa
\ No newline at end of file
+libcurl-devel,rpm -qa
+patch,rpm -qa
\ No newline at end of file
diff --git a/scripts/eosio_build_ubuntu_deps b/scripts/eosio_build_ubuntu_deps
index bfb6b776148..e27bee25952 100644
--- a/scripts/eosio_build_ubuntu_deps
+++ b/scripts/eosio_build_ubuntu_deps
@@ -21,4 +21,5 @@ sudo,dpkg -s
 ruby,dpkg -s
 libusb-1.0-0-dev,dpkg -s
 libcurl4-gnutls-dev,dpkg -s
-pkg-config,dpkg -s
\ No newline at end of file
+pkg-config,dpkg -s
+patch,dpkg -s
\ No newline at end of file

From 02cae9c9481e988db84851e3758cda0698ecef8b Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 27 Jun 2019 17:32:53 -0400
Subject: [PATCH 0708/1648] add nodiscard attribute to tester's push_action

push_action swallows exceptions and expects the caller to investigate its return value. Set nodiscard here to help developers get usage right
---
 libraries/testing/include/eosio/testing/tester.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 16dab638d31..db32a27276a 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -127,6 +127,8 @@ namespace eosio { namespace testing {
 
          transaction_trace_ptr    push_transaction( packed_transaction& trx, fc::time_point deadline = fc::time_point::maximum(), uint32_t billed_cpu_time_us = DEFAULT_BILLED_CPU_TIME_US );
          transaction_trace_ptr    push_transaction( signed_transaction& trx, fc::time_point deadline = fc::time_point::maximum(), uint32_t billed_cpu_time_us = DEFAULT_BILLED_CPU_TIME_US, bool no_throw = false );
+
+         [[nodiscard]]
          action_result            push_action(action&& cert_act, uint64_t authorizer); // TODO/QUESTION: Is this needed?
 
          transaction_trace_ptr    push_action( const account_name& code,

From cc7b087fd4d1e515016b0db8310da960a1823608 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 27 Jun 2019 16:53:22 -0500
Subject: [PATCH 0709/1648] Update to thread-safe fc logging config and appbase
 with sighup handling on startup

---
 libraries/appbase | 2 +-
 libraries/fc      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/appbase b/libraries/appbase
index 74c282f41f4..bc9df062273 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit 74c282f41f479d958c74c948b73cb128e5cf3614
+Subproject commit bc9df06227302394e52b25ea76b704945983f640
diff --git a/libraries/fc b/libraries/fc
index 3a133c8d9ff..94260611488 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 3a133c8d9ff3cbf78fce43882cd7e1ff40d8c649
+Subproject commit 942606114880ec415f083fe1c7fe14f0e848158c

From edb2d4533c2b126a940a53efb4cfebd7fb4876e1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 27 Jun 2019 16:53:32 -0500
Subject: [PATCH 0710/1648] Use new fc::logger::update to update logger

---
 plugins/http_plugin/http_plugin.cpp         |  8 +-------
 plugins/net_plugin/net_plugin.cpp           |  7 +------
 plugins/producer_plugin/producer_plugin.cpp | 15 ++-------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index f8ed9178a67..6bb609c980c 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -29,10 +29,6 @@
 #include <memory>
 #include <regex>
 
-namespace fc {
-   extern std::unordered_map<std::string,logger>& get_logger_map();
-}
-
 const fc::string logger_name("http_plugin");
 fc::logger logger;
 
@@ -637,9 +633,7 @@ namespace eosio {
    }
 
    void http_plugin::handle_sighup() {
-      if( fc::get_logger_map().find( logger_name ) != fc::get_logger_map().end() ) {
-         logger = fc::get_logger_map()[logger_name];
-      }
+      fc::logger::update( logger_name, logger );
    }
 
    void http_plugin::plugin_shutdown() {
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index fd9cdaba78d..9245c84a901 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -33,10 +33,6 @@
 
 using namespace eosio::chain::plugin_interface;
 
-namespace fc {
-   extern std::unordered_map<std::string,logger>& get_logger_map();
-}
-
 namespace eosio {
    static appbase::abstract_plugin& _net_plugin = app().register_plugin<net_plugin>();
 
@@ -3341,8 +3337,7 @@ namespace eosio {
    }
 
    void net_plugin::handle_sighup() {
-      if(fc::get_logger_map().find(logger_name) != fc::get_logger_map().end())
-         logger = fc::get_logger_map()[logger_name];
+      fc::logger::update( logger_name, logger );
    }
 
    void net_plugin::plugin_shutdown() {
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 33166a9c5cb..a3a3ca408ff 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -43,12 +43,6 @@ using std::vector;
 using std::deque;
 using boost::signals2::scoped_connection;
 
-// HACK TO EXPOSE LOGGER MAP
-
-namespace fc {
-   extern std::unordered_map<std::string,logger>& get_logger_map();
-}
-
 const fc::string logger_name("producer_plugin");
 fc::logger _log;
 
@@ -912,13 +906,8 @@ void producer_plugin::plugin_shutdown() {
 }
 
 void producer_plugin::handle_sighup() {
-   auto& logger_map = fc::get_logger_map();
-   if(logger_map.find(logger_name) != logger_map.end()) {
-      _log = logger_map[logger_name];
-   }
-   if( logger_map.find(trx_trace_logger_name) != logger_map.end()) {
-      _trx_trace_log = logger_map[trx_trace_logger_name];
-   }
+   fc::logger::update( logger_name, _log );
+   fc::logger::update( trx_trace_logger_name, _trx_trace_log );
 }
 
 void producer_plugin::pause() {

From c075ffc3aee5d1cb4a801ffce9b776da738c5ac5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 27 Jun 2019 16:53:46 -0500
Subject: [PATCH 0711/1648] Call new fc::log_config::initialize_appenders

---
 programs/nodeos/main.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index a0cd7bd8682..4c7478f3a70 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -21,10 +21,6 @@
 using namespace appbase;
 using namespace eosio;
 
-namespace fc {
-   std::unordered_map<std::string,appender::ptr>& get_appender_map();
-}
-
 namespace detail {
 
 void configure_logging(const bfs::path& config_path)
@@ -51,12 +47,11 @@ void configure_logging(const bfs::path& config_path)
 
 void logging_conf_handler()
 {
-   ilog("Received HUP.  Reloading logging configuration.");
    auto config_path = app().get_logging_conf();
+   ilog("Received HUP.  Reloading logging configuration from ${p}.", ("p", config_path.string()));
    if(fc::exists(config_path))
       ::detail::configure_logging(config_path);
-   for(auto iter : fc::get_appender_map())
-      iter.second->initialize(app().get_io_service());
+   fc::log_config::initialize_appenders( app().get_io_service() );
 }
 
 void initialize_logging()
@@ -64,8 +59,7 @@ void initialize_logging()
    auto config_path = app().get_logging_conf();
    if(fc::exists(config_path))
      fc::configure_logging(config_path); // intentionally allowing exceptions to escape
-   for(auto iter : fc::get_appender_map())
-     iter.second->initialize(app().get_io_service());
+   fc::log_config::initialize_appenders( app().get_io_service() );
 
    app().set_sighup_callback(logging_conf_handler);
 }

From 9e70ca39e4fac7e2f03b3bf882a23e9266849d3a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 27 Jun 2019 21:29:26 -0500
Subject: [PATCH 0712/1648] Update to appbase with peer review fixes

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index bc9df062273..adbb8695d33 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit bc9df06227302394e52b25ea76b704945983f640
+Subproject commit adbb8695d33b848a7431d4121120b57ce1eac2e3

From 26f1ffc29b3206672c14cf4a69d7edfb80353905 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 27 Jun 2019 22:11:08 -0500
Subject: [PATCH 0713/1648] Update to fc and appbase tips

---
 libraries/appbase | 2 +-
 libraries/fc      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/appbase b/libraries/appbase
index adbb8695d33..4b95cd33659 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit adbb8695d33b848a7431d4121120b57ce1eac2e3
+Subproject commit 4b95cd33659e18bd4f6ea2327202cfa20b09c658
diff --git a/libraries/fc b/libraries/fc
index 94260611488..78eaa36e930 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 942606114880ec415f083fe1c7fe14f0e848158c
+Subproject commit 78eaa36e93094b3daabdba291745c38cb549bc0d

From 12bd1c83d0dfc3355623a9c1c1792ae347d304db Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Wed, 26 Jun 2019 15:23:47 -0500
Subject: [PATCH 0714/1648] Improve speed for creating index from existing
 block log.

---
 libraries/chain/block_log.cpp                 | 103 +++++++++++++-----
 .../chain/include/eosio/chain/block_log.hpp   |   2 +
 2 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index fef0dd3f637..e17c6dde2e2 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -317,44 +317,95 @@ namespace eosio { namespace chain {
 
       my->reopen();
 
-      uint64_t end_pos;
+      my->close();
 
-      my->block_stream.seekg(-sizeof( uint64_t), std::ios::end);
-      my->block_stream.read((char*)&end_pos, sizeof(end_pos));
+      block_log::construct_index(my->block_file, my->index_file);
 
-      if( end_pos == npos ) {
-         ilog( "Block log contains no blocks. No need to construct index." );
+      my->reopen();
+   } // construct_index
+
+   void block_log::construct_index(const fc::path& block_file_name, const fc::path& index_file_name) {
+
+      uint64_t pos;
+
+      FILE* fin = fopen(block_file_name.generic_string().c_str(), "r");
+      if (fin == nullptr) {
+         elog("cannot read block file ${file}", ("file", block_file_name.string()) );
          return;
       }
 
-      signed_block tmp;
 
-      uint64_t pos = 0;
-      if (my->version == 1) {
-         pos = 4; // Skip version which should have already been checked.
-      } else {
-         pos = 8; // Skip version and first block offset which should have already been checked
+      const auto block_stream_position = ftell(fin);
+      const auto pos_size = sizeof(pos);
+      auto status = fseek(fin, -pos_size, SEEK_END);
+      uint64_t current_pos = ftell(fin);
+      auto size = fread((char*)&pos, pos_size, 1, fin);
+
+      if( pos == npos ) {
+         ilog( "Block log contains no blocks. No need to construct index." );
+         return;
       }
-      my->block_stream.seekg(pos);
 
-      genesis_state gs;
-      fc::raw::unpack(my->block_stream, gs);
+      status = fseek(fin, 0, SEEK_SET);
+      uint32_t version = 0;
+      size = fread((char*)&version, sizeof(version), 1, fin);
+      uint32_t first_block_num;
+      if (version == 1) {
+         first_block_num = 1;
+      }
+      else if (version == 2) {
+         size = fread ( (char*)&first_block_num, sizeof(first_block_num), 1, fin );
+         if (first_block_num < 1) {
+            elog( "Invalid first block number: ${first}", ("first", first_block_num) );
+            return;
+         }
+         status = fseek(fin, sizeof(npos), SEEK_CUR);
+      }
+      else {
+         elog( "Block log does not support version ${version}", ("version", version) );
+         return;
+      }
 
-      // skip the totem
-      if (my->version > 1) {
-         uint64_t totem;
-         my->block_stream.read((char*) &totem, sizeof(totem));
+      const auto start = ftell(fin);
+
+      const auto reverse_file_name = index_file_name.generic_string() + ".rev";
+      FILE* fout_rev = fopen(reverse_file_name.c_str(), "w+");
+      size = fwrite((void*)&pos, pos_size, 1, fout_rev);
+      status = fseek(fin, -pos_size, SEEK_END);
+
+      uint32_t num_blocks = 0;
+      const auto last = current_pos;
+      auto diff = current_pos - pos + pos_size;
+      current_pos -= diff;
+      // subsequent calculations of diff need to account for read which shifts us forward pos_size
+      // and our current_pos doesn't have that pos_size shift, so need to take it back out
+      for ( ; ; diff = current_pos - pos + pos_size, current_pos -= diff ) {
+         status = fseek(fin, -diff, SEEK_CUR);
+         size = fread((char*)&pos, pos_size, 1, fin);
+         if (pos == npos)
+            break;
+         ++num_blocks;
+         size = fwrite((void*)&pos, pos_size, 1, fout_rev);
+         current_pos += pos_size;
       }
 
-      my->index_stream.seekp(0, std::ios::end);
-      while( pos < end_pos ) {
-         fc::raw::unpack(my->block_stream, tmp);
-         my->block_stream.read((char*)&pos, sizeof(pos));
-         if(tmp.block_num() % 1000 == 0)
-            ilog( "Block log index reconstructed for block ${n}", ("n", tmp.block_num()));
-         my->index_stream.write((char*)&pos, sizeof(pos));
+      const uint32_t last_block_num = first_block_num + num_blocks;
+
+      std::fstream  index_stream;
+      index_stream.open(index_file_name.generic_string().c_str(), LOG_WRITE);
+      EOS_ASSERT( index_stream.is_open(), block_log_exception, "Not able to open ${file}", ("file", index_file_name.generic_string()) );
+      index_stream.seekg(0, std::ios::beg);
+      int64_t reverse_offset = pos_size;
+      for (uint32_t block_num = last_block_num; block_num >= first_block_num; --block_num) {
+         status = fseek(fout_rev, -reverse_offset, SEEK_CUR);
+         size = fread((char*)&pos, pos_size, 1, fout_rev);
+         index_stream.write((char*)&pos, pos_size);
+         reverse_offset = pos_size + pos_size; //need to counteract the stream moving forward
       }
-   } // construct_index
+      fclose(fin);
+      fclose(fout_rev);
+      index_stream.close();
+   }
 
    fc::path block_log::repair_log( const fc::path& data_dir, uint32_t truncate_at_block ) {
       ilog("Recovering Block Log...");
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index 26e1dcb41fa..7a61bc9c165 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -69,6 +69,8 @@ namespace eosio { namespace chain {
 
          static genesis_state extract_genesis_state( const fc::path& data_dir );
 
+         static void construct_index(const fc::path& block_log_path, const fc::path& index_file_name);
+
       private:
          void open(const fc::path& data_dir);
          void construct_index();

From 4bc67ec305f6bc44b442a4e7ab519a179011c6e6 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 27 Jun 2019 14:27:14 -0500
Subject: [PATCH 0715/1648] Changed block log tools --make-index to use common
 index creation code.

---
 programs/eosio-blocklog/main.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 61d9f7c86ed..610c3584a18 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -707,10 +707,17 @@ int main(int argc, char** argv) {
          return 0;
       }
       if (blog.make_index) {
-         bfs::path out_file = "blocks.index";
+         const bfs::path blocks_dir = vmap.at("blocks-dir").as<bfs::path>();
+         bfs::path out_file = blocks_dir / "blocks.index";
+         const bfs::path block_file = blocks_dir / "blocks.log";
+
          if (vmap.count("output-file") > 0)
              out_file = vmap.at("output-file").as<bfs::path>();
-         return make_index(vmap.at("blocks-dir").as<bfs::path>(), out_file);
+
+         report_time rt("making index");
+         block_log::construct_index(block_file.generic_string(), out_file.generic_string());
+         rt.report();
+         return 0;
       }
       //else print blocks.log as JSON
       blog.initialize(vmap);

From 059876a2ec29ea510743540dfbf3b66914d899ed Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 27 Jun 2019 14:29:45 -0500
Subject: [PATCH 0716/1648] Fixed issue with non-empty existing blocks.index
 file.

---
 libraries/chain/block_log.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index e17c6dde2e2..acbd0f1ebf7 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -9,6 +9,7 @@
 
 #define LOG_READ  (std::ios::in | std::ios::binary)
 #define LOG_WRITE (std::ios::out | std::ios::binary | std::ios::app)
+#define LOG_WRITE_NEW (std::ios::out | std::ios::binary)
 #define LOG_RW ( std::ios::in | std::ios::out | std::ios::binary )
 
 namespace eosio { namespace chain {
@@ -392,7 +393,7 @@ namespace eosio { namespace chain {
       const uint32_t last_block_num = first_block_num + num_blocks;
 
       std::fstream  index_stream;
-      index_stream.open(index_file_name.generic_string().c_str(), LOG_WRITE);
+      index_stream.open(index_file_name.generic_string().c_str(), LOG_WRITE_NEW);
       EOS_ASSERT( index_stream.is_open(), block_log_exception, "Not able to open ${file}", ("file", index_file_name.generic_string()) );
       index_stream.seekg(0, std::ios::beg);
       int64_t reverse_offset = pos_size;

From 2a9497230aeea3384740b60f0e8b3242adb74d91 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 27 Jun 2019 14:30:52 -0500
Subject: [PATCH 0717/1648] Minor (temporary) performance logging.

---
 libraries/chain/block_log.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index acbd0f1ebf7..5a7c11396dd 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -347,6 +347,7 @@ namespace eosio { namespace chain {
          return;
       }
 
+      ilog("start block index creation");
       status = fseek(fin, 0, SEEK_SET);
       uint32_t version = 0;
       size = fread((char*)&version, sizeof(version), 1, fin);
@@ -391,6 +392,7 @@ namespace eosio { namespace chain {
       }
 
       const uint32_t last_block_num = first_block_num + num_blocks;
+      ilog("reverse order block index creation");
 
       std::fstream  index_stream;
       index_stream.open(index_file_name.generic_string().c_str(), LOG_WRITE_NEW);
@@ -406,6 +408,7 @@ namespace eosio { namespace chain {
       fclose(fin);
       fclose(fout_rev);
       index_stream.close();
+      ilog("stop block index creation");
    }
 
    fc::path block_log::repair_log( const fc::path& data_dir, uint32_t truncate_at_block ) {

From 029b1b2129e14865c24024ef110647404f42b562 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Fri, 28 Jun 2019 11:15:24 -0400
Subject: [PATCH 0718/1648] update eos-vm

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 6e24f3ec577..779d8a1aa14 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 6e24f3ec577d19918d12ddb14520be8543f44a38
+Subproject commit 779d8a1aa14d14a4174c887086d58e4922ec3442

From 95b7e57e120c8e02815934423ea2612b8a23ed77 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 28 Jun 2019 14:03:58 -0400
Subject: [PATCH 0719/1648] Final changes + bats test for this

---
 scripts/.build_vars              | 1 +
 scripts/eosio_build.sh           | 7 ++++++-
 tests/bash-bats/eosio_build.sh   | 2 +-
 tests/bash-bats/modules/cmake.sh | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index 585c521c935..b466e3e0088 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -7,6 +7,7 @@ export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
 export DATA_DIR=${EOSIO_INSTALL_DIR}/data
 
 # CMAKE
+export CMAKE_REQUIRED_VERSION=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "cmake_minimum_required\([[:blank:]]*VERSION" | tail -1 | sed 's/.*VERSION //g' | cut -d\) -f1 | sed 's/ //g')
 export CMAKE_VERSION_MAJOR=3
 export CMAKE_VERSION_MINOR=13
 export CMAKE_VERSION_PATCH=2
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index d404236657d..f20e070f4d0 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -144,7 +144,12 @@ execute cd $REPO_ROOT
 ensure-submodules-up-to-date
 
 # Check if cmake already exists
-( [[ -z "${CMAKE}" ]] && [[ ! -z $(command -v cmake 2>/dev/null) ]] ) && export CMAKE=$(command -v cmake 2>/dev/null)
+( [[ -z "${CMAKE}" ]] && [[ ! -z $(command -v cmake 2>/dev/null) ]] ) && export CMAKE=$(command -v cmake 2>/dev/null) && export CMAKE_CURRENT_VERSION=$($CMAKE --version | grep -E "cmake version[[:blank:]]*" | sed 's/.*cmake version //g')
+# If it exists, check that it's > required version
+if [[ ! -z $CMAKE_CURRENT_VERSION ]] && [[ $( echo $CURRENT_CMAKE_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) < $( echo $CMAKE_REQUIRED_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) ]]; then
+   echo "${COLOR_YELLOW}The currently installed cmake version ($CMAKE_CURRENT_VERSION) is less than the required version ($CMAKE_REQUIRED_VERSION). We will be installing $CMAKE_VERSION.${COLOR_NC}"
+   export CMAKE=
+fi
 
 # Use existing cmake on system (either global or specific to eosio)
 # Setup based on architecture
diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index fe1e8f8c8c2..f4f75593f3b 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -24,7 +24,7 @@ TEST_LABEL="[eosio_build]"
             run bash -c "printf \"y\ny\ny\nn\nn\n\" | ./${SCRIPT_LOCATION}"
             [[ ! -z $(echo "${output}" | grep "Unable to find .* compiler") ]] || exit
         fi
-    fi 
+    fi
 
     cd ./scripts # Also test that we can run the script from a directory other than the root
     run bash -c "./eosio_build.sh -y -P"
diff --git a/tests/bash-bats/modules/cmake.sh b/tests/bash-bats/modules/cmake.sh
index 89b5b6dd883..b2a932d3ed3 100755
--- a/tests/bash-bats/modules/cmake.sh
+++ b/tests/bash-bats/modules/cmake.sh
@@ -7,6 +7,9 @@ load ../helpers/functions
     touch $CMAKE
     run bash -c " ./$SCRIPT_LOCATION -y -P"
     [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${HOME}/cmake") ]] || exit
+    export CMAKE_CURRENT_VERSION=3.7.1
+    run bash -c " ./$SCRIPT_LOCATION -y -P"
+    [[ ! -z $(echo "${output}" | grep "We will be installing $CMAKE_VERSION") ]] || exit
     # Testing for if cmake doesn't exist to be sure it's set properly
     export CMAKE=
     run bash -c "./$SCRIPT_LOCATION -y -P"

From 38488c657f66f3db4a8c9184d3c48383c1a1a988 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 28 Jun 2019 14:25:45 -0400
Subject: [PATCH 0720/1648] support for darwin's cmake being < required (since
 we don't source install) + bats

---
 scripts/eosio_build.sh           |  7 ++++++-
 tests/bash-bats/modules/cmake.sh | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index f20e070f4d0..c39adacd891 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -147,8 +147,13 @@ ensure-submodules-up-to-date
 ( [[ -z "${CMAKE}" ]] && [[ ! -z $(command -v cmake 2>/dev/null) ]] ) && export CMAKE=$(command -v cmake 2>/dev/null) && export CMAKE_CURRENT_VERSION=$($CMAKE --version | grep -E "cmake version[[:blank:]]*" | sed 's/.*cmake version //g')
 # If it exists, check that it's > required version
 if [[ ! -z $CMAKE_CURRENT_VERSION ]] && [[ $( echo $CURRENT_CMAKE_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) < $( echo $CMAKE_REQUIRED_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) ]]; then
-   echo "${COLOR_YELLOW}The currently installed cmake version ($CMAKE_CURRENT_VERSION) is less than the required version ($CMAKE_REQUIRED_VERSION). We will be installing $CMAKE_VERSION.${COLOR_NC}"
    export CMAKE=
+   if [[ $ARCH == 'Darwin' ]]; then
+      echo "${COLOR_RED}The currently installed cmake version ($CMAKE_CURRENT_VERSION) is less than the required version ($CMAKE_REQUIRED_VERSION). Cannot proceed."
+      exit
+   else
+      echo "${COLOR_YELLOW}The currently installed cmake version ($CMAKE_CURRENT_VERSION) is less than the required version ($CMAKE_REQUIRED_VERSION). We will be installing $CMAKE_VERSION.${COLOR_NC}"
+   fi
 fi
 
 # Use existing cmake on system (either global or specific to eosio)
diff --git a/tests/bash-bats/modules/cmake.sh b/tests/bash-bats/modules/cmake.sh
index b2a932d3ed3..8c1e3e3d963 100755
--- a/tests/bash-bats/modules/cmake.sh
+++ b/tests/bash-bats/modules/cmake.sh
@@ -5,14 +5,26 @@ load ../helpers/functions
     # Testing for if CMAKE already exists
     export CMAKE=${HOME}/cmake
     touch $CMAKE
-    run bash -c " ./$SCRIPT_LOCATION -y -P"
-    [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${HOME}/cmake") ]] || exit
     export CMAKE_CURRENT_VERSION=3.7.1
     run bash -c " ./$SCRIPT_LOCATION -y -P"
-    [[ ! -z $(echo "${output}" | grep "We will be installing $CMAKE_VERSION") ]] || exit
+    if [[ $ARCH == "Darwin" ]]; then
+        [[ ! -z $(echo "${output}" | grep "($CMAKE_REQUIRED_VERSION). Cannot proceed") ]] || exit # Test the required version
+    else
+        [[ ! -z $(echo "${output}" | grep "We will be installing $CMAKE_VERSION") ]] || exit # Test the required version
+        [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${HOME}/cmake") ]] || exit
+    fi
     # Testing for if cmake doesn't exist to be sure it's set properly
     export CMAKE=
     run bash -c "./$SCRIPT_LOCATION -y -P"
+    if [[ $ARCH == "Darwin" ]]; then
+        [[ ! -z $(echo "${output}" | grep "($CMAKE_REQUIRED_VERSION). Cannot proceed") ]] || exit # Test the required version
+    else
+        [[ ! -z $(echo "${output}" | grep "We will be installing $CMAKE_VERSION") ]] || exit # Test the required version
+        [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${BIN_DIR}/cmake") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "CMAKE successfully installed") ]] || exit
+    fi
+    export CMAKE_CURRENT_VERSION=
+    run bash -c "./$SCRIPT_LOCATION -y -P"
     if [[ $ARCH == "Darwin" ]]; then
         [[ ! -z $(echo "${output}" | grep "Executing: bash -c /usr/local/bin/cmake -DCMAKE_BUILD") ]] || exit
     else

From 09daee1cdc349c9c5bde2f749895aa84666fbb86 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 28 Jun 2019 14:39:17 -0400
Subject: [PATCH 0721/1648] bats test fixes

---
 scripts/.build_vars              |  2 +-
 tests/bash-bats/modules/cmake.sh | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index b466e3e0088..70b39c5035b 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -7,7 +7,7 @@ export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
 export DATA_DIR=${EOSIO_INSTALL_DIR}/data
 
 # CMAKE
-export CMAKE_REQUIRED_VERSION=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "cmake_minimum_required\([[:blank:]]*VERSION" | tail -1 | sed 's/.*VERSION //g' | cut -d\) -f1 | sed 's/ //g')
+export CMAKE_REQUIRED_VERSION=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*cmake_minimum_required[[:blank:]]*\([[:blank:]]*VERSION" | tail -1 | sed 's/.*VERSION //g' | sed 's/ //g' | sed 's/"//g' | cut -d\) -f1)
 export CMAKE_VERSION_MAJOR=3
 export CMAKE_VERSION_MINOR=13
 export CMAKE_VERSION_PATCH=2
diff --git a/tests/bash-bats/modules/cmake.sh b/tests/bash-bats/modules/cmake.sh
index 8c1e3e3d963..171e48c5c50 100755
--- a/tests/bash-bats/modules/cmake.sh
+++ b/tests/bash-bats/modules/cmake.sh
@@ -2,6 +2,7 @@
 load ../helpers/functions
 
 @test "${TEST_LABEL} > Testing CMAKE" {
+
     # Testing for if CMAKE already exists
     export CMAKE=${HOME}/cmake
     touch $CMAKE
@@ -11,10 +12,18 @@ load ../helpers/functions
         [[ ! -z $(echo "${output}" | grep "($CMAKE_REQUIRED_VERSION). Cannot proceed") ]] || exit # Test the required version
     else
         [[ ! -z $(echo "${output}" | grep "We will be installing $CMAKE_VERSION") ]] || exit # Test the required version
-        [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${HOME}/cmake") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${BIN_DIR}/cmake") ]] || exit
+    fi
+    export CMAKE_CURRENT_VERSION=
+    run bash -c " ./$SCRIPT_LOCATION -y -P"
+    [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${HOME}/cmake") ]] || exit
+    if [[ $ARCH != "Darwin" ]]; then
+        [[ -z $(echo "${output}" | grep "CMAKE successfully installed") ]] || exit
     fi
+
     # Testing for if cmake doesn't exist to be sure it's set properly
     export CMAKE=
+    export CMAKE_CURRENT_VERSION=3.6
     run bash -c "./$SCRIPT_LOCATION -y -P"
     if [[ $ARCH == "Darwin" ]]; then
         [[ ! -z $(echo "${output}" | grep "($CMAKE_REQUIRED_VERSION). Cannot proceed") ]] || exit # Test the required version

From d096432ca3f50a49209bef7134c6a0acc2b9081d Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 28 Jun 2019 14:40:04 -0400
Subject: [PATCH 0722/1648] CMAKE_REQUIRED_VERSION -> .environment

---
 scripts/.build_vars  | 1 -
 scripts/.environment | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index 70b39c5035b..585c521c935 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -7,7 +7,6 @@ export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
 export DATA_DIR=${EOSIO_INSTALL_DIR}/data
 
 # CMAKE
-export CMAKE_REQUIRED_VERSION=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*cmake_minimum_required[[:blank:]]*\([[:blank:]]*VERSION" | tail -1 | sed 's/.*VERSION //g' | sed 's/ //g' | sed 's/"//g' | cut -d\) -f1)
 export CMAKE_VERSION_MAJOR=3
 export CMAKE_VERSION_MINOR=13
 export CMAKE_VERSION_PATCH=2
diff --git a/scripts/.environment b/scripts/.environment
index d5542098253..7c54a699445 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -13,6 +13,8 @@ else
     export EOSIO_VERSION_FULL="${EOSIO_VERSION_MAJOR}.${EOSIO_VERSION_MINOR}.${EOSIO_VERSION_PATCH}-${EOSIO_VERSION_SUFFIX}"
 fi
 
+export CMAKE_REQUIRED_VERSION=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*cmake_minimum_required[[:blank:]]*\([[:blank:]]*VERSION" | tail -1 | sed 's/.*VERSION //g' | sed 's/ //g' | sed 's/"//g' | cut -d\) -f1)
+
 export EOSIO_INSTALL_DIR="${EOSIO_INSTALL_DIR:-${HOME}/eosio/${EOSIO_VERSION}}"
 export TEMP_DIR="${TEMP_DIR:-${HOME}/tmp}"
 

From cdcfdb6784cafe3089234b3779981fa3db89651d Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 28 Jun 2019 15:16:42 -0400
Subject: [PATCH 0723/1648] exit 1

---
 scripts/eosio_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index c39adacd891..830036575ad 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -150,7 +150,7 @@ if [[ ! -z $CMAKE_CURRENT_VERSION ]] && [[ $( echo $CURRENT_CMAKE_VERSION | awk
    export CMAKE=
    if [[ $ARCH == 'Darwin' ]]; then
       echo "${COLOR_RED}The currently installed cmake version ($CMAKE_CURRENT_VERSION) is less than the required version ($CMAKE_REQUIRED_VERSION). Cannot proceed."
-      exit
+      exit 1
    else
       echo "${COLOR_YELLOW}The currently installed cmake version ($CMAKE_CURRENT_VERSION) is less than the required version ($CMAKE_REQUIRED_VERSION). We will be installing $CMAKE_VERSION.${COLOR_NC}"
    fi

From 2b0b9177d905fc48a6286ea9301fde044182e345 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 28 Jun 2019 15:26:15 -0400
Subject: [PATCH 0724/1648] numeric less than fix test

---
 scripts/eosio_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 830036575ad..1e02f0ac994 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -146,7 +146,7 @@ ensure-submodules-up-to-date
 # Check if cmake already exists
 ( [[ -z "${CMAKE}" ]] && [[ ! -z $(command -v cmake 2>/dev/null) ]] ) && export CMAKE=$(command -v cmake 2>/dev/null) && export CMAKE_CURRENT_VERSION=$($CMAKE --version | grep -E "cmake version[[:blank:]]*" | sed 's/.*cmake version //g')
 # If it exists, check that it's > required version
-if [[ ! -z $CMAKE_CURRENT_VERSION ]] && [[ $( echo $CURRENT_CMAKE_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) < $( echo $CMAKE_REQUIRED_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) ]]; then
+if [[ ! -z $CMAKE_CURRENT_VERSION ]] && (( $( echo $CURRENT_CMAKE_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) < $( echo $CMAKE_REQUIRED_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) )); then
    export CMAKE=
    if [[ $ARCH == 'Darwin' ]]; then
       echo "${COLOR_RED}The currently installed cmake version ($CMAKE_CURRENT_VERSION) is less than the required version ($CMAKE_REQUIRED_VERSION). Cannot proceed."

From cee9752733b902d8edf2a4b63d91c28db4cb2cf7 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 28 Jun 2019 15:52:25 -0400
Subject: [PATCH 0725/1648] bats tests to support darwin cmake requirement

---
 scripts/eosio_build.sh           | 4 ++--
 tests/bash-bats/modules/cmake.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 1e02f0ac994..c252d0595e0 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -145,8 +145,8 @@ ensure-submodules-up-to-date
 
 # Check if cmake already exists
 ( [[ -z "${CMAKE}" ]] && [[ ! -z $(command -v cmake 2>/dev/null) ]] ) && export CMAKE=$(command -v cmake 2>/dev/null) && export CMAKE_CURRENT_VERSION=$($CMAKE --version | grep -E "cmake version[[:blank:]]*" | sed 's/.*cmake version //g')
-# If it exists, check that it's > required version
-if [[ ! -z $CMAKE_CURRENT_VERSION ]] && (( $( echo $CURRENT_CMAKE_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) < $( echo $CMAKE_REQUIRED_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ) )); then
+# If it exists, check that it's > required version + 
+if [[ ! -z $CMAKE_CURRENT_VERSION ]] && [[ $((10#$( echo $CMAKE_CURRENT_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ))) -lt $((10#$( echo $CMAKE_REQUIRED_VERSION | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }' ))) ]]; then
    export CMAKE=
    if [[ $ARCH == 'Darwin' ]]; then
       echo "${COLOR_RED}The currently installed cmake version ($CMAKE_CURRENT_VERSION) is less than the required version ($CMAKE_REQUIRED_VERSION). Cannot proceed."
diff --git a/tests/bash-bats/modules/cmake.sh b/tests/bash-bats/modules/cmake.sh
index 171e48c5c50..e726fce9dc3 100755
--- a/tests/bash-bats/modules/cmake.sh
+++ b/tests/bash-bats/modules/cmake.sh
@@ -9,7 +9,7 @@ load ../helpers/functions
     export CMAKE_CURRENT_VERSION=3.7.1
     run bash -c " ./$SCRIPT_LOCATION -y -P"
     if [[ $ARCH == "Darwin" ]]; then
-        [[ ! -z $(echo "${output}" | grep "($CMAKE_REQUIRED_VERSION). Cannot proceed") ]] || exit # Test the required version
+        [[ "${output##*$'\n'}" =~ "($CMAKE_REQUIRED_VERSION). Cannot proceed" ]] || exit # Test the required version
     else
         [[ ! -z $(echo "${output}" | grep "We will be installing $CMAKE_VERSION") ]] || exit # Test the required version
         [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${BIN_DIR}/cmake") ]] || exit
@@ -26,7 +26,7 @@ load ../helpers/functions
     export CMAKE_CURRENT_VERSION=3.6
     run bash -c "./$SCRIPT_LOCATION -y -P"
     if [[ $ARCH == "Darwin" ]]; then
-        [[ ! -z $(echo "${output}" | grep "($CMAKE_REQUIRED_VERSION). Cannot proceed") ]] || exit # Test the required version
+        [[ "${output##*$'\n'}" =~ "($CMAKE_REQUIRED_VERSION). Cannot proceed" ]] || exit # Test the required version
     else
         [[ ! -z $(echo "${output}" | grep "We will be installing $CMAKE_VERSION") ]] || exit # Test the required version
         [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${BIN_DIR}/cmake") ]] || exit

From e528f34aa4f6e8f7ac4c73653f1d985d05afd06b Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 28 Jun 2019 16:58:50 -0400
Subject: [PATCH 0726/1648] bump fc submod before webauthn merge

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index b8cb01d4d19..ed0c5f43419 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit b8cb01d4d1999548eeb2991d7f27832671f50a51
+Subproject commit ed0c5f434195e0da9c51213643b363d83def3d44

From 7636ef584c7f77f0b6debff0eddd99a667d5289f Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 28 Jun 2019 20:17:50 -0400
Subject: [PATCH 0727/1648] changes

---
 scripts/.build_vars | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index 585c521c935..cdaba23c9b1 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -1,10 +1,10 @@
-export SRC_DIR=${EOSIO_INSTALL_DIR}/src
-export OPT_DIR=${EOSIO_INSTALL_DIR}/opt
-export VAR_DIR=${EOSIO_INSTALL_DIR}/var
-export ETC_DIR=${EOSIO_INSTALL_DIR}/etc
-export BIN_DIR=${EOSIO_INSTALL_DIR}/bin
-export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
-export DATA_DIR=${EOSIO_INSTALL_DIR}/data
+export SRC_DIR=${SRC_DIR:-${EOSIO_INSTALL_DIR}/src}
+export OPT_DIR=${OPT_DIR:-${EOSIO_INSTALL_DIR}/opt}
+export VAR_DIR=${VAR_DIR:-${EOSIO_INSTALL_DIR}/var}
+export ETC_DIR=${ETC_DIR:-${EOSIO_INSTALL_DIR}/etc}
+export BIN_DIR=${BIN_DIR:-${EOSIO_INSTALL_DIR}/bin}
+export LIB_DIR=${LIB_DIR:-${EOSIO_INSTALL_DIR}/lib}
+export DATA_DIR=${DATA_DIR:-${EOSIO_INSTALL_DIR}/data}
 
 # CMAKE
 export CMAKE_VERSION_MAJOR=3

From 785ba8a83b0cf40ba215bdc4046388c6ea05d70b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 08:40:34 -0400
Subject: [PATCH 0728/1648] added wrapper for mongo folder creation

---
 scripts/helpers/eosio.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 486d9d67b0b..090f5066f06 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -52,8 +52,10 @@ function setup() {
     execute mkdir -p $VAR_DIR/log
     execute mkdir -p $ETC_DIR
     execute mkdir -p $LIB_DIR
-    execute mkdir -p $MONGODB_LOG_DIR
-    execute mkdir -p $MONGODB_DATA_DIR
+    if [[ $ENABLE_MONGO != false ]]; then
+        execute mkdir -p $MONGODB_LOG_DIR
+        execute mkdir -p $MONGODB_DATA_DIR
+    fi
 }
 
 function ensure-which() {

From b898b1daebdcdde7c1ed3eadcc49c96917a997c1 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 08:44:15 -0400
Subject: [PATCH 0729/1648] simplificiation

---
 scripts/helpers/eosio.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 090f5066f06..c518bd22550 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -52,7 +52,7 @@ function setup() {
     execute mkdir -p $VAR_DIR/log
     execute mkdir -p $ETC_DIR
     execute mkdir -p $LIB_DIR
-    if [[ $ENABLE_MONGO != false ]]; then
+    if $ENABLE_MONGO; then
         execute mkdir -p $MONGODB_LOG_DIR
         execute mkdir -p $MONGODB_DATA_DIR
     fi

From fad2a8d76f5e2cdcac24073246f5ac94d251a141 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 09:07:33 -0400
Subject: [PATCH 0730/1648] ok

---
 scripts/helpers/general.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 4fc4761fda1..9297d3d9f58 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -220,10 +220,10 @@ function ensure-yum-packages() {
     # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
     while read -r testee tester || [[ -n "$testee" ]]; do
         if [[ ! -z $(eval $tester $testee) ]]; then
-            echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}"
+            echo " - ${testee} ${COLOR_GREEN}ok${COLOR_NC}"
         else
             DEPS=$DEPS"${testee} "
-            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found."
+            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found!"
             (( COUNT+=1 ))
         fi
     done < $DEPS_FILE
@@ -269,18 +269,18 @@ function ensure-brew-packages() {
     # || [[ -n "$nmae" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
     while read -r name path || [[ -n "$name" ]]; do
         if [[ -f $path ]] || [[ -d $path ]]; then
-            echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}"
+            echo " - ${name} ${COLOR_GREEN}ok${COLOR_NC}"
             continue
         fi
         # resolve conflict with homebrew glibtool and apple/gnu installs of libtool
         if [[ "${testee}" == "/usr/local/bin/glibtool" ]]; then
             if [ "${tester}" "/usr/local/bin/libtool" ]; then
-                echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}"
+                echo " - ${name} ${COLOR_GREEN}ok!${COLOR_NC}"
                 continue
             fi
         fi
         DEPS=$DEPS"${name} "
-        echo " - ${name} ${COLOR_RED}NOT${COLOR_NC} found."
+        echo " - ${name} ${COLOR_RED}NOT${COLOR_NC} found!"
         (( COUNT+=1 ))
     done < $DEPS_FILE
     if [[ $COUNT > 0 ]]; then
@@ -348,10 +348,10 @@ function ensure-apt-packages() {
     # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line)
     while read -r testee tester || [[ -n "$testee" ]]; do
         if [[ ! -z $(eval $tester $testee 2>/dev/null) ]]; then
-            echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}"
+            echo " - ${testee} ${COLOR_GREEN}ok${COLOR_NC}"
         else
             DEPS=$DEPS"${testee} "
-            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found."
+            echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found!"
             (( COUNT+=1 ))
         fi
     done < $DEPS_FILE

From 0b19f803089e4f21d87f0fcf4a3df1af26b66263 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 10:17:42 -0400
Subject: [PATCH 0731/1648] fixes and bats tests

---
 scripts/eosio_build.sh             | 4 ++++
 tests/bash-bats/eosio_build.sh     | 5 +++++
 tests/bash-bats/helpers/general.sh | 1 +
 3 files changed, 10 insertions(+)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index d404236657d..61b5ad3a088 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 set -eo pipefail
 SCRIPT_VERSION=3.0 # Build script version (change this to re-build the CICD image)
+export CURRENT_WORKING_DIR=$(pwd) # relative path support
 ##########################################################################
 # This is the EOSIO automated install script for Linux and Mac OS.
 # This file was downloaded from https://github.com/EOSIO/eos
@@ -114,6 +115,9 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 # Load eosio specific helper functions
 . ./scripts/helpers/eosio.sh
 
+# Support relative paths : https://github.com/EOSIO/eos/issues/7560
+( [[ ! -z $INSTALL_LOCATION ]] && [[ ! $INSTALL_LOCATION =~ ^\/ ]] ) && export INSTALL_LOCATION="${CURRENT_WORKING_DIR}/$INSTALL_LOCATION"
+
 $VERBOSE && echo "Build Script Version: ${SCRIPT_VERSION}"
 echo "EOSIO Version: ${EOSIO_VERSION_FULL}"
 echo "$( date -u )"
diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index fe1e8f8c8c2..c136a27ae0d 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -57,6 +57,11 @@ TEST_LABEL="[eosio_build]"
     run bash -c "printf \"y\ny\nn\nn\n\"| ./$SCRIPT_LOCATION -i /NEWPATH -P"
     [[ ! -z $(echo "${output}" | grep "EOSIO_INSTALL_DIR: /NEWPATH") ]] || exit
     [[ ! -z $(echo "${output}" | grep "TEMP_DIR: ${HOME}/tmp") ]] || exit
+        ### Relative path support
+        cd $TEMP_DIR # Also test that we can run the script from a directory other than the root
+        run bash -c "printf \"y\ny\nn\nn\n\"| ${CURRENT_WORKING_DIR}/$SCRIPT_LOCATION -i NEWPATH -P"
+        [[ ! -z $(echo "${output}" | grep "EOSIO_INSTALL_DIR: $TEMP_DIR/NEWPATH") ]] || exit
+        cd $CURRENT_WORKING_DIR
     ## -c
     run bash -c "printf \"y\ny\nn\nn\n\"| ./$SCRIPT_LOCATION -c -P"
     [[ ! -z $(echo "${output}" | grep "ENABLE_COVERAGE_TESTING: true") ]] || exit
diff --git a/tests/bash-bats/helpers/general.sh b/tests/bash-bats/helpers/general.sh
index 2e9dd206bfe..e553e07bd32 100644
--- a/tests/bash-bats/helpers/general.sh
+++ b/tests/bash-bats/helpers/general.sh
@@ -7,6 +7,7 @@ export VERBOSE=true
 export BATS_RUN=true
 export CURRENT_USER=$(whoami)
 export HOME="$BATS_TMPDIR/bats-eosio-user-home" # Ensure $HOME is available for all scripts
+export CURRENT_WORKING_DIR=$(pwd)
 load helpers/functions
 
 if [[ $NAME == "Ubuntu" ]]; then # Ubuntu won't find any packages until this runs + ensure update only runs once

From cb51b34e3743c63eaa34fdbe72a0afe3ae66416b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 11:34:26 -0400
Subject: [PATCH 0732/1648] quick fix

---
 scripts/helpers/general.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 9297d3d9f58..930f3e91d4a 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -275,7 +275,7 @@ function ensure-brew-packages() {
         # resolve conflict with homebrew glibtool and apple/gnu installs of libtool
         if [[ "${testee}" == "/usr/local/bin/glibtool" ]]; then
             if [ "${tester}" "/usr/local/bin/libtool" ]; then
-                echo " - ${name} ${COLOR_GREEN}ok!${COLOR_NC}"
+                echo " - ${name} ${COLOR_GREEN}ok${COLOR_NC}"
                 continue
             fi
         fi

From 60cb1af03ae79d222d2ef14697b7b4391c39bfd7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 1 Jul 2019 12:57:50 -0500
Subject: [PATCH 0733/1648] Update to fc with logger fix

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index ed0c5f43419..9ae6495e3fa 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit ed0c5f434195e0da9c51213643b363d83def3d44
+Subproject commit 9ae6495e3faa0619dc3dd92eedb54ff9c1bdee45

From 69d0479f5f0584bca27b3b3c81da396578a1cd98 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 1 Jul 2019 14:08:32 -0400
Subject: [PATCH 0734/1648] remove unused code

---
 libraries/chain/checktime_timer_macos.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/chain/checktime_timer_macos.cpp b/libraries/chain/checktime_timer_macos.cpp
index 77fb1b81809..00881bf3034 100755
--- a/libraries/chain/checktime_timer_macos.cpp
+++ b/libraries/chain/checktime_timer_macos.cpp
@@ -93,7 +93,6 @@ void checktime_timer::start(fc::time_point tp) {
       return;
    }
    fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();
-   ms = (int)x.count()-the_calibrate.timer_overhead();
    if(x.count() <= the_calibrate.timer_overhead())
       expired = 1;
    else {

From a47de71d993d2297a73adb5b51c669db5530b900 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 15:45:42 -0400
Subject: [PATCH 0735/1648] merged in cd to root + versions for scripts

---
 scripts/eosio_build.sh     | 2 +-
 scripts/eosio_install.sh   | 6 +++++-
 scripts/eosio_uninstall.sh | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 61b5ad3a088..2440d55daff 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail
-SCRIPT_VERSION=3.0 # Build script version (change this to re-build the CICD image)
+SCRIPT_VERSION=3.1 # Build script version (change this to re-build the CICD image)
 export CURRENT_WORKING_DIR=$(pwd) # relative path support
 ##########################################################################
 # This is the EOSIO automated install script for Linux and Mac OS.
diff --git a/scripts/eosio_install.sh b/scripts/eosio_install.sh
index f8909fcac39..cbe04ae4619 100755
--- a/scripts/eosio_install.sh
+++ b/scripts/eosio_install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail
-VERSION=2.0
+VERSION=2.1
 ##########################################################################
 # This is the EOSIO automated install script for Linux and Mac OS.
 # This file was downloaded from https://github.com/EOSIO/eos
@@ -32,6 +32,9 @@ VERSION=2.0
 # https://github.com/EOSIO/eos/blob/master/LICENSE.txt
 ##########################################################################
 
+# Ensure we're in the repo root and not inside of scripts
+cd $( dirname "${BASH_SOURCE[0]}" )/..
+
 # Load eosio specific helper functions
 . ./scripts/helpers/eosio.sh
 
@@ -57,6 +60,7 @@ printf "    \\  \\::/       \\  \\::/        /__/:/        \\__\\/      \\  \\::
 printf "     \\__\\/         \\__\\/         \\__\\/                     \\__\\/ \n\n${COLOR_NC}"
 
 printf "==============================================================================================\\n"
+
 printf "${COLOR_GREEN}EOSIO has been installed into ${EOSIO_INSTALL_DIR}/bin${COLOR_NC}"
 printf "\\n${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.sh${COLOR_NC}\\n"
 printf "==============================================================================================\\n\\n"
diff --git a/scripts/eosio_uninstall.sh b/scripts/eosio_uninstall.sh
index fb595779ac8..b821eaf8a32 100755
--- a/scripts/eosio_uninstall.sh
+++ b/scripts/eosio_uninstall.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 set -eo pipefail
+VERSION=2.1
+
+# Ensure we're in the repo root and not inside of scripts
+cd $( dirname "${BASH_SOURCE[0]}" )/..
 
 # Load bash script helper functions
 . ./scripts/helpers/eosio.sh

From 504acc8e8f4343317268f03220c9c546f56dc955 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 16:30:46 -0400
Subject: [PATCH 0736/1648] better uninstall script

---
 scripts/.environment       |   4 +-
 scripts/eosio_build.sh     |   3 +-
 scripts/eosio_install.sh   |   4 +-
 scripts/eosio_uninstall.sh | 178 ++++++++++++++++++++++---------------
 scripts/helpers/eosio.sh   |   2 -
 5 files changed, 112 insertions(+), 79 deletions(-)

diff --git a/scripts/.environment b/scripts/.environment
index d5542098253..d477ad5cf69 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -16,4 +16,6 @@ fi
 export EOSIO_INSTALL_DIR="${EOSIO_INSTALL_DIR:-${HOME}/eosio/${EOSIO_VERSION}}"
 export TEMP_DIR="${TEMP_DIR:-${HOME}/tmp}"
 
-. ./scripts/.build_vars
+[[ -d $BUILD_DIR ]] && export CACHED_INSTALL_PATH=$(grep "CMAKE_INSTALL_PREFIX:PATH" build/CMakeCache.txt | cut -d= -f2)
+
+. ./scripts/.build_vars
\ No newline at end of file
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 2440d55daff..f3664b9522e 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail
 SCRIPT_VERSION=3.1 # Build script version (change this to re-build the CICD image)
-export CURRENT_WORKING_DIR=$(pwd) # relative path support
 ##########################################################################
 # This is the EOSIO automated install script for Linux and Mac OS.
 # This file was downloaded from https://github.com/EOSIO/eos
@@ -109,6 +108,8 @@ if [ $# -ne 0 ]; then
    done
 fi
 
+export CURRENT_WORKING_DIR=$(pwd) # relative path support
+
 # Ensure we're in the repo root and not inside of scripts
 cd $( dirname "${BASH_SOURCE[0]}" )/..
 
diff --git a/scripts/eosio_install.sh b/scripts/eosio_install.sh
index cbe04ae4619..05ec0ecfa4c 100755
--- a/scripts/eosio_install.sh
+++ b/scripts/eosio_install.sh
@@ -61,7 +61,7 @@ printf "     \\__\\/         \\__\\/         \\__\\/                     \\__\\/
 
 printf "==============================================================================================\\n"
 
-printf "${COLOR_GREEN}EOSIO has been installed into ${EOSIO_INSTALL_DIR}/bin${COLOR_NC}"
-printf "\\n${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.sh${COLOR_NC}\\n"
+printf "${COLOR_GREEN}EOSIO has been installed into ${CACHED_INSTALL_PATH}/bin${COLOR_NC}"
+printf "\\n${COLOR_YELLOW}Uninstall with: ${SCRIPT_DIR}/eosio_uninstall.sh${COLOR_NC}\\n"
 printf "==============================================================================================\\n\\n"
 resources
diff --git a/scripts/eosio_uninstall.sh b/scripts/eosio_uninstall.sh
index b821eaf8a32..070647c6313 100755
--- a/scripts/eosio_uninstall.sh
+++ b/scripts/eosio_uninstall.sh
@@ -1,6 +1,53 @@
 #!/usr/bin/env bash
 set -eo pipefail
 VERSION=2.1
+# User input handling
+DEP_PROCEED=false
+FULL=false
+
+function usage() {
+   printf "Usage: $0 OPTION...
+  -i DIR      Directory where eosio is installed)
+  -y          Noninteractive mode (answers yes to every prompt)
+  -f          Removal of data directory (be absolutely sure you want to delete it before using this!)
+   \\n" "$0" 1>&2
+   exit 1
+}
+
+TIME_BEGIN=$( date -u +%s )
+if [ $# -ne 0 ]; then
+   while getopts "i:yf" opt; do
+      case "${opt}" in
+         i )
+            INSTALL_LOCATION=$OPTARG
+         ;;
+         y )
+            NONINTERACTIVE=true
+            PROCEED=true
+            DEP_PROCEED=true
+         ;;
+         f )
+            FULL=true
+         ;;
+         h )
+            usage
+         ;;
+         ? )
+            echo "Invalid Option!" 1>&2
+            usage
+         ;;
+         : )
+            echo "Invalid Option: -${OPTARG} requires an argument." 1>&2
+            usage
+         ;;
+         * )
+            usage
+         ;;
+      esac
+   done
+fi
+
+export CURRENT_WORKING_DIR=$(pwd) # relative path support
 
 # Ensure we're in the repo root and not inside of scripts
 cd $( dirname "${BASH_SOURCE[0]}" )/..
@@ -8,86 +55,71 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 # Load bash script helper functions
 . ./scripts/helpers/eosio.sh
 
-usage() {
-   printf "Usage --- \\n $ %s [ --full ] [ --force ]\\n
-     --full: Removal of data directory (be absolutely sure you want to delete it before using this!)\\n
-     --force: Unattended uninstall which works regardless of the eosio directory existence.\\n              This helps cleanup dependencies and start fresh if you need to.
-   \\n" "$0"
-}
+# Support relative paths : https://github.com/EOSIO/eos/issues/7560
+( [[ ! -z $INSTALL_LOCATION ]] && [[ ! $INSTALL_LOCATION =~ ^\/ ]] ) && export INSTALL_LOCATION="${CURRENT_WORKING_DIR}/$INSTALL_LOCATION"
 
 INSTALL_PATHS=()
 
-# User input handling
-PROCEED=false
-DEP_PROCEED=false
-FORCED=false
-FULL=false
-if [[ $@ =~ [[:space:]]?--force[[:space:]]? ]]; then
-   echo "[Forcing Unattended Removal: Enabled]"
-   FORCED=true
-   PROCEED=true
-   DEP_PROCEED=true
+if [[ $NONINTERACTIVE == false ]] && $FULL; then
+   while true; do
+      read -p "By specifying -f, removal of the eosio data directory will require a resync of data which can take days. Do you wish to proceed? (y/n) " PROCEED
+      case $PROCEED in
+         "" ) echo "What would you like to do?";;
+         0 | true | [Yy]* ) break;;
+         1 | false | [Nn]* ) exit 0;;
+         * ) echo "Please type 'y' for yes or 'n' for no.";;
+      esac
+   done
+elif $NONINTERACTIVE && $FULL; then
+   echo "${COLOR_RED}By specifying -f, removal of the eosio data directory will require a resync of data which can take days. The script is sleeping for 15 seconds to give you a chance to cancel if this is not what you want.${COLOR_NC}"
+   $DRYRUN || sleep 15
 fi
-if [[ $@ =~ [[:space:]]?--full[[:space:]]? ]]; then
-   echo "[Full removal (nodeos generated state, etc): Enabled]"
-   if $FORCED; then
-      FULL=true
-   elif [[ $FORCED == false ]]; then
+
+export EOSIO_INSTALL_DIR=${INSTALL_LOCATION:-$EOSIO_INSTALL_DIR}
+
+if [[ ! -d "${EOSIO_INSTALL_DIR}" ]]; then
+   echo "[EOSIO installation ${COLOR_YELLOW}NOT${COLOR_NC} found in ${EOSIO_INSTALL_DIR}]"
+else
+   # As of 1.8.0, we're using a versioned directories under home: https://github.com/EOSIO/eos/issues/6940
+   echo "[EOSIO installation found: ${EOSIO_INSTALL_DIR}]" && INSTALL_PATHS+=("${EOSIO_INSTALL_DIR}") # EOSIO_INSTALL_DIR set in .environment
+   while true; do
+      [[ $NONINTERACTIVE == false ]] && read -p "Do you wish to remove the installation in ${EOSIO_INSTALL_DIR}? (y/n) " PROCEED
+      case $PROCEED in
+         "" ) echo "What would you like to do?";;
+         0 | true | [Yy]* )
+            # Handle cleanup of data directory
+            if $FULL; then
+               ## Add both just to be safe
+               [[ $ARCH == "Darwin" ]] && INSTALL_PATHS+=("${HOME}/Library/Application\ Support/eosio")
+               [[ $ARCH != "Darwin" ]] && INSTALL_PATHS+=("${HOME}/.local/share/eosio")
+            fi
+            # Version < 1.8.0; Before we started using ~/eosio/1.8.x
+            # Arrays should return with newlines (IFS=\n;helpers.sh) as Application\ Support will split into two
+            for INSTALL_PATH in ${INSTALL_PATHS[@]}; do
+               execute rm -rf $INSTALL_PATH
+            done
+            echo "[EOSIO Removal Complete]"
+            break;;
+         1 | false | [Nn]* ) echo " - Cancelled EOSIO Removal!"; exit 1;;
+         * ) echo "Please type 'y' for yes or 'n' for no.";;
+      esac
+   done
+fi
+
+echo "[Removing EOSIO Dependencies]"
+if [[ $ARCH == "Darwin" ]]; then
+   for package in $(cat scripts/eosio_build_darwin_deps | cut -d, -f1 2>/dev/null); do
       while true; do
-         read -p "Removal of the eosio data directory will require a resync of data which can take days. Do you wish to proceed? (y/n) " PROCEED
-         case $PROCEED in
-            "" ) echo "What would you like to do?";;
+         [[ $NONINTERACTIVE == false ]] && read -p "Do you wish to uninstall and unlink all brew installed ${package} versions? (y/n) " DEP_PROCEED
+         case $DEP_PROCEED in
+            "") echo "What would you like to do?";;
             0 | true | [Yy]* )
-               FULL=true
-            break;;
+               execute brew uninstall $package --force || true
+               execute brew cleanup -s $package || true
+               break;;
             1 | false | [Nn]* ) break;;
             * ) echo "Please type 'y' for yes or 'n' for no.";;
          esac
       done
-   fi
-fi
-if [[ ! -z $@ ]] && [[ ! $@ =~ [[:space:]]?--force[[:space:]]? ]] && [[ ! $@ =~ [[:space:]]?--full[[:space:]]? ]]; then usage && exit; fi
-
-# As of 1.8.0, we're using a versioned directories under home: https://github.com/EOSIO/eos/issues/6940
-[[ -d "${EOSIO_INSTALL_DIR}" ]] && echo "[EOSIO Installation Found: ${EOSIO_INSTALL_DIR}]" && INSTALL_PATHS+=("${EOSIO_INSTALL_DIR}") # EOSIO_INSTALL_DIR set in .environment
-
-# Removal
-while true; do
-   [[ $FORCED == false ]] && read -p "Do you wish to remove the installation? (y/n) " PROCEED
-   case $PROCEED in
-      "" ) echo "What would you like to do?";;
-      0 | true | [Yy]* )
-         echo "[Removing EOSIO and Dependencies]"
-         if [[ $ARCH == "Darwin" ]]; then
-            for package in $(cat scripts/eosio_build_darwin_deps | cut -d, -f1 2>/dev/null); do
-               while true; do
-                  [[ $FORCED == false ]] && read -p "Do you wish to uninstall and unlink all brew installed ${package} versions? (y/n) " DEP_PROCEED
-                  case $DEP_PROCEED in
-                     "") echo "What would you like to do?";;
-                     0 | true | [Yy]* )
-                        execute brew uninstall $package --force || true
-                        execute brew cleanup -s $package || true
-                        break;;
-                     1 | false | [Nn]* ) break;;
-                     * ) echo "Please type 'y' for yes or 'n' for no.";;
-                  esac
-               done
-            done
-         fi
-         # Handle cleanup of data directory
-         if $FULL; then
-            ## Add both just to be safe
-            [[ $ARCH == "Darwin" ]] && INSTALL_PATHS+=("${HOME}/Library/Application\ Support/eosio")
-            [[ $ARCH != "Darwin" ]] && INSTALL_PATHS+=("${HOME}/.local/share/eosio")
-         fi
-         # Version < 1.8.0; Before we started using ~/eosio/1.8.x
-         # Arrays should return with newlines (IFS=\n;helpers.sh) as Application\ Support will split into two
-         for INSTALL_PATH in ${INSTALL_PATHS[@]}; do
-            execute rm -rf $INSTALL_PATH
-         done
-         echo "[EOSIO Removal Complete]"
-         break;;
-      1 | false | [Nn]* ) echo " - Cancelled EOSIO Removal!"; exit 1;;
-      * ) echo "Please type 'y' for yes or 'n' for no.";;
-   esac
-done
\ No newline at end of file
+   done
+fi
\ No newline at end of file
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 486d9d67b0b..5d607e499e8 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -90,8 +90,6 @@ function install-directory-prompt() {
         * ) echo "Please type 'y' for yes or 'n' for no.";;
       esac
     done
-  else
-    export EOSIO_INSTALL_DIR=${INSTALL_LOCATION}
   fi
   . ./scripts/.build_vars
   echo "EOSIO will be installed to: ${EOSIO_INSTALL_DIR}"

From 77ce5f88a61ab6f520d4b0daa6c1bc288db49d52 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 16:32:08 -0400
Subject: [PATCH 0737/1648] mistakenly removed

---
 scripts/helpers/eosio.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 5d607e499e8..486d9d67b0b 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -90,6 +90,8 @@ function install-directory-prompt() {
         * ) echo "Please type 'y' for yes or 'n' for no.";;
       esac
     done
+  else
+    export EOSIO_INSTALL_DIR=${INSTALL_LOCATION}
   fi
   . ./scripts/.build_vars
   echo "EOSIO will be installed to: ${EOSIO_INSTALL_DIR}"

From 02adc754d310244286bf162c1a53deb8bf02ca02 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 1 Jul 2019 15:36:34 -0500
Subject: [PATCH 0738/1648] Update to head of fc with logging fix

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index 9ae6495e3fa..0732c19245f 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 9ae6495e3faa0619dc3dd92eedb54ff9c1bdee45
+Subproject commit 0732c19245fad322b8785f9d43efda2117066490

From ad98df4e67971ebbe40687a124ecb72445925303 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 1 Jul 2019 16:43:10 -0400
Subject: [PATCH 0739/1648] refactor where checktime_timer calibration is
 performed

Now it's performed on the first consutrction of a checktime_timer instead of global static init time
---
 libraries/chain/checktime_timer_calibrate.cpp | 32 +++++++++----------
 libraries/chain/checktime_timer_macos.cpp     | 13 ++------
 libraries/chain/checktime_timer_posix.cpp     |  8 ++---
 .../eosio/chain/checktime_timer_calibrate.hpp | 10 +++---
 4 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/libraries/chain/checktime_timer_calibrate.cpp b/libraries/chain/checktime_timer_calibrate.cpp
index 506d50c665e..66039d627d5 100755
--- a/libraries/chain/checktime_timer_calibrate.cpp
+++ b/libraries/chain/checktime_timer_calibrate.cpp
@@ -17,15 +17,19 @@ namespace eosio { namespace chain {
 
 namespace bacc = boost::accumulators;
 
+checktime_timer_calibrate::checktime_timer_calibrate() = default;
 checktime_timer_calibrate::~checktime_timer_calibrate() = default;
 
-struct checktime_timer_calibrate::impl {
-   bacc::accumulator_set<int, bacc::stats<bacc::tag::mean, bacc::tag::min, bacc::tag::max, bacc::tag::variance>, float> samples;
-   bool _stats_once_is_enough = false;
-};
+void checktime_timer_calibrate::do_calibrate(checktime_timer& timer) {
+   static std::mutex m;
+   static bool once_is_enough;
+
+   std::lock_guard guard(m);
 
-checktime_timer_calibrate::checktime_timer_calibrate() : my(std::make_unique<impl>()) {
-   checktime_timer timer;
+   if(once_is_enough)
+      return;
+
+   bacc::accumulator_set<int, bacc::stats<bacc::tag::mean, bacc::tag::min, bacc::tag::max, bacc::tag::variance>, float> samples;
 
    //keep longest first in list. You're effectively going to take test_intervals[0]*sizeof(test_intervals[0])
    //time to do the the "calibration"
@@ -48,28 +52,24 @@ checktime_timer_calibrate::checktime_timer_calibrate() : my(std::make_unique<imp
          //That said, for these platforms, a tighter tolerance may possibly be achieved by taking performance
          //metrics in mulitple bins and appliying the slop based on which bin a deadline resides in. Not clear
          //if that's worth the extra complexity at this point.
-         my->samples(timer_slop, bacc::weight = interval/(float)test_intervals[0]);
+         samples(timer_slop, bacc::weight = interval/(float)test_intervals[0]);
       }
    }
-   _timer_overhead = bacc::mean(my->samples) + sqrt(bacc::variance(my->samples))*2; //target 95% of expirations before deadline
+   _timer_overhead = bacc::mean(samples) + sqrt(bacc::variance(samples))*2; //target 95% of expirations before deadline
    _use_timer = _timer_overhead < 1000;
-}
 
-void checktime_timer_calibrate::print_stats() {
    #define TIMER_STATS_FORMAT "min:${min}us max:${max}us mean:${mean}us stddev:${stddev}us"
    #define TIMER_STATS \
-      ("min", bacc::min(my->samples))("max", bacc::max(my->samples)) \
-      ("mean", (int)bacc::mean(my->samples))("stddev", (int)sqrt(bacc::variance(my->samples))) \
+      ("min", bacc::min(samples))("max", bacc::max(samples)) \
+      ("mean", (int)bacc::mean(samples))("stddev", (int)sqrt(bacc::variance(samples))) \
       ("t", _timer_overhead)
 
-   if(my->_stats_once_is_enough)
-      return;
-   my->_stats_once_is_enough = true;
-
    if(_use_timer)
       ilog("Using ${t}us deadline timer for checktime: " TIMER_STATS_FORMAT, TIMER_STATS);
    else
       wlog("Using polled checktime; deadline timer too inaccurate: " TIMER_STATS_FORMAT, TIMER_STATS);
+
+   once_is_enough = true;
 }
 
 }}
\ No newline at end of file
diff --git a/libraries/chain/checktime_timer_macos.cpp b/libraries/chain/checktime_timer_macos.cpp
index 00881bf3034..5355bead86a 100755
--- a/libraries/chain/checktime_timer_macos.cpp
+++ b/libraries/chain/checktime_timer_macos.cpp
@@ -12,16 +12,13 @@
 
 namespace eosio { namespace chain {
 
-//a kqueue & thread is shared for all checktime_timer instances, and since we want these
-// available for the checktime_timer_calibrate instance that we want to happen on process
-// start (and not at some first usage of checktime_timer), these gotta go here
+//a kqueue & thread is shared for all checktime_timer_macos instances
 static std::mutex timer_ref_mutex;
 static unsigned next_timerid;
 static unsigned refcount;
 static int kqueue_fd;
 static std::thread kevent_thread;
 
-//last, because need the thread & mutex above initialized first
 static checktime_timer_calibrate the_calibrate;
 
 struct checktime_timer::impl {
@@ -62,13 +59,9 @@ checktime_timer::checktime_timer() {
       });
    }
 
-   //a kludge until something better: print stats only after calibration completes
-   // (which can be inferred on if timer_overhead in non-zero); because otherwise fc logging
-   // may not be ready
-   if(the_calibrate.timer_overhead())
-      the_calibrate.print_stats();
-
    my->timerid = next_timerid++;
+
+   the_calibrate.do_calibrate(*this);
 }
 
 checktime_timer::~checktime_timer() {
diff --git a/libraries/chain/checktime_timer_posix.cpp b/libraries/chain/checktime_timer_posix.cpp
index bd38f6f23a0..81167ff5b55 100644
--- a/libraries/chain/checktime_timer_posix.cpp
+++ b/libraries/chain/checktime_timer_posix.cpp
@@ -42,13 +42,9 @@ checktime_timer::checktime_timer() {
    se.sigev_signo = SIGRTMIN;
    se.sigev_value.sival_ptr = (void*)&expired;
 
-   //a kludge until something better: print stats only after calibration completes
-   // (which can be inferred on if timer_overhead in non-zero); because otherwise fc logging
-   // may not be ready
-   if(the_calibrate.timer_overhead())
-      the_calibrate.print_stats();
-
    FC_ASSERT(timer_create(CLOCK_REALTIME, &se, &my->timerid) == 0, "failed to create timer");
+
+   the_calibrate.do_calibrate(*this);
 }
 
 checktime_timer::~checktime_timer() {
diff --git a/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp b/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
index d9905206177..21604652805 100755
--- a/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
+++ b/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
@@ -4,16 +4,17 @@
 
 namespace eosio { namespace chain {
 
+struct checktime_timer;
+
 struct checktime_timer_calibrate {
-   //on construction it will do the calibration
    checktime_timer_calibrate();
+   //will run calibration if not already run on this instance
+   void do_calibrate(checktime_timer& t);
    ~checktime_timer_calibrate();
 
    bool use_timer() const {return _use_timer;}
    int timer_overhead() const {return _timer_overhead;}
 
-   void print_stats();
-
 private:
    //These two values will be inspected by checktime_timer impls to determine if they
    // should use the timer (accurate enough) and what slop to give the expiration. Set
@@ -21,9 +22,6 @@ struct checktime_timer_calibrate {
    // a checktime_timer to calibrate with.
    bool _use_timer = true;
    int _timer_overhead = 0;
-
-   struct impl;
-   std::unique_ptr<impl> my;
 };
 
 }}
\ No newline at end of file

From 750c817a0e64f17d75eebb97dd1bd25d3865674b Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Mon, 1 Jul 2019 16:44:33 -0400
Subject: [PATCH 0740/1648] Temporary eos-vm signal handling

---
 libraries/chain/webassembly/eos-vm.cpp | 38 +++++++++++++++++++++-----
 libraries/eos-vm                       |  2 +-
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 9d2b2201145..67f67d3738e 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -21,18 +21,42 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          _instantiated_module(std::move(mod)) {}
 
       void apply(apply_context& context) override {
-         _instantiated_module->set_wasm_allocator( wasm_interface::get_wasm_allocator() );
-         _instantiated_module->get_wasm_allocator()->reset();
+         auto* alloc = wasm_interface::get_wasm_allocator();
+         alloc->reset();
+         _instantiated_module->set_wasm_allocator( alloc );
          //if (!(const auto& res = _instantiated_module->run_start()))
          //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
 
          _runtime->_bkend = _instantiated_module.get();
-         const auto& res = _instantiated_module->call(&context, "env", "apply",
-                                          context.get_receiver().to_uint64_t(),
-                                          context.get_action().account.to_uint64_t(),
-                                          context.get_action().name.to_uint64_t());
+
+         Platform::HardwareTrapType trapType;
+         Platform::CallStack trapCallStack;
+         Uptr trapOperand;
+         trapType = Platform::catchHardwareTraps(trapCallStack,trapOperand, [&]{
+            const auto& res = _instantiated_module->call(&context, "env", "apply",
+                                             context.get_receiver().to_uint64_t(),
+                                             context.get_action().account.to_uint64_t(),
+                                             context.get_action().name.to_uint64_t());
+            //EOS_ASSERT(res, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
+         });
          _runtime->_bkend = nullptr;
-         //EOS_ASSERT(res, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
+
+         switch(trapType)
+         {
+         case Platform::HardwareTrapType::none: break;
+         case Platform::HardwareTrapType::accessViolation:
+         {
+            if (alloc->is_in_region(reinterpret_cast<char*>(trapOperand))) { 
+               throw wasm_execution_error();
+            } else {
+               elog("Access violation outside of memory reserved addresses");
+               abort();
+            }
+         }
+         case Platform::HardwareTrapType::stackOverflow: throw wasm_execution_error();
+         case Platform::HardwareTrapType::intDivideByZeroOrOverflow: throw wasm_execution_error();
+         default: Errors::unreachable();
+         };
       }
 
    private:
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 779d8a1aa14..2e53974067a 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 779d8a1aa14d14a4174c887086d58e4922ec3442
+Subproject commit 2e53974067a6e596eedb97220d8a59bb39ba5412

From 93c943c504a1999c6c71118588a127cce71e6bad Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 1 Jul 2019 16:51:05 -0400
Subject: [PATCH 0741/1648] add mutex header needed for some platforms

---
 libraries/chain/checktime_timer_calibrate.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/chain/checktime_timer_calibrate.cpp b/libraries/chain/checktime_timer_calibrate.cpp
index 66039d627d5..cdff4ee98fe 100755
--- a/libraries/chain/checktime_timer_calibrate.cpp
+++ b/libraries/chain/checktime_timer_calibrate.cpp
@@ -12,6 +12,7 @@
 #include <boost/accumulators/statistics/weighted_variance.hpp>
 
 #include <chrono>
+#include <mutex>
 
 namespace eosio { namespace chain {
 

From 54214c8eaaea8ff9aa36c4294f11da7b80f6e57c Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 16:53:28 -0400
Subject: [PATCH 0742/1648] cehck for CMakeCache

---
 scripts/.environment     | 2 +-
 scripts/eosio_build.sh   | 6 +++---
 scripts/eosio_install.sh | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/.environment b/scripts/.environment
index d477ad5cf69..d0ea64992f0 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -16,6 +16,6 @@ fi
 export EOSIO_INSTALL_DIR="${EOSIO_INSTALL_DIR:-${HOME}/eosio/${EOSIO_VERSION}}"
 export TEMP_DIR="${TEMP_DIR:-${HOME}/tmp}"
 
-[[ -d $BUILD_DIR ]] && export CACHED_INSTALL_PATH=$(grep "CMAKE_INSTALL_PREFIX:PATH" build/CMakeCache.txt | cut -d= -f2)
+([[ -d $BUILD_DIR ]] && [[ -f ${BUILD_DIR}/CMakeCache.txt ]]) && export CACHED_INSTALL_PATH=$(grep "CMAKE_INSTALL_PREFIX:PATH" ${BUILD_DIR}/CMakeCache.txt | cut -d= -f2)
 
 . ./scripts/.build_vars
\ No newline at end of file
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index f3664b9522e..4f3a844457f 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -229,8 +229,8 @@ echo "(_______/(_______)\_______)\_______/(_______)"
 echo "=============================================${COLOR_NC}"
 
 echo "${COLOR_GREEN}EOSIO has been successfully built. $(($TIME_END/3600)):$(($TIME_END%3600/60)):$(($TIME_END%60))"
-echo "${COLOR_GREEN}You can now install using: ./scripts/eosio_install.sh${COLOR_NC}"
-echo "${COLOR_YELLOW}Uninstall with: ./scripts/eosio_uninstall.sh${COLOR_NC}"
+echo "${COLOR_GREEN}You can now install using: ${SCRIPT_DIR}/eosio_install.sh${COLOR_NC}"
+echo "${COLOR_YELLOW}Uninstall with: ${SCRIPT_DIR}/eosio_uninstall.sh${COLOR_NC}"
 
 echo ""
 echo "${COLOR_CYAN}If you wish to perform tests to ensure functional code:${COLOR_NC}"
@@ -238,7 +238,7 @@ if $ENABLE_MONGO; then
    echo "${BIN_DIR}/mongod --dbpath ${MONGODB_DATA_DIR} -f ${MONGODB_CONF} --logpath ${MONGODB_LOG_DIR}/mongod.log &"
    PATH_TO_USE=" PATH=\$PATH:$OPT_DIR/mongodb/bin"
 fi
-echo "cd ./build &&${PATH_TO_USE} make test" # PATH is set as currently 'mongo' binary is required for the mongodb test
+echo "cd ${BUILD_DIR} &&${PATH_TO_USE} make test" # PATH is set as currently 'mongo' binary is required for the mongodb test
 
 echo ""
 resources
diff --git a/scripts/eosio_install.sh b/scripts/eosio_install.sh
index 05ec0ecfa4c..7b4eff2dd81 100755
--- a/scripts/eosio_install.sh
+++ b/scripts/eosio_install.sh
@@ -40,7 +40,7 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 
 [[ ! $NAME == "Ubuntu" ]] && set -i # Ubuntu doesn't support interactive mode since it uses dash
 
-[[ ! -d $BUILD_DIR ]] && printf "${COLOR_RED}Please run ./eosio_build.sh first!${COLOR_NC}" && exit 1
+([[ ! -d $BUILD_DIR ]] && [[ -f ${BUILD_DIR}/CMakeCache.txt ]]) && printf "${COLOR_RED}Please run ${SCRIPT_DIR}/eosio_build.sh first!${COLOR_NC}" && exit 1
 echo "${COLOR_CYAN}====================================================================================="
 echo "========================== ${COLOR_WHITE}Starting EOSIO Installation${COLOR_CYAN} ==============================${COLOR_NC}"
 execute cd $BUILD_DIR
@@ -60,7 +60,6 @@ printf "    \\  \\::/       \\  \\::/        /__/:/        \\__\\/      \\  \\::
 printf "     \\__\\/         \\__\\/         \\__\\/                     \\__\\/ \n\n${COLOR_NC}"
 
 printf "==============================================================================================\\n"
-
 printf "${COLOR_GREEN}EOSIO has been installed into ${CACHED_INSTALL_PATH}/bin${COLOR_NC}"
 printf "\\n${COLOR_YELLOW}Uninstall with: ${SCRIPT_DIR}/eosio_uninstall.sh${COLOR_NC}\\n"
 printf "==============================================================================================\\n\\n"

From d7244dba083507f5b6556221dc532d239e7d12ee Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 16:54:14 -0400
Subject: [PATCH 0743/1648] simplification

---
 scripts/.environment     | 2 +-
 scripts/eosio_install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/.environment b/scripts/.environment
index d0ea64992f0..cbed7df678a 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -16,6 +16,6 @@ fi
 export EOSIO_INSTALL_DIR="${EOSIO_INSTALL_DIR:-${HOME}/eosio/${EOSIO_VERSION}}"
 export TEMP_DIR="${TEMP_DIR:-${HOME}/tmp}"
 
-([[ -d $BUILD_DIR ]] && [[ -f ${BUILD_DIR}/CMakeCache.txt ]]) && export CACHED_INSTALL_PATH=$(grep "CMAKE_INSTALL_PREFIX:PATH" ${BUILD_DIR}/CMakeCache.txt | cut -d= -f2)
+([[ -f ${BUILD_DIR}/CMakeCache.txt ]]) && export CACHED_INSTALL_PATH=$(grep "CMAKE_INSTALL_PREFIX:PATH" ${BUILD_DIR}/CMakeCache.txt | cut -d= -f2)
 
 . ./scripts/.build_vars
\ No newline at end of file
diff --git a/scripts/eosio_install.sh b/scripts/eosio_install.sh
index 7b4eff2dd81..50b77500a97 100755
--- a/scripts/eosio_install.sh
+++ b/scripts/eosio_install.sh
@@ -40,7 +40,7 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 
 [[ ! $NAME == "Ubuntu" ]] && set -i # Ubuntu doesn't support interactive mode since it uses dash
 
-([[ ! -d $BUILD_DIR ]] && [[ -f ${BUILD_DIR}/CMakeCache.txt ]]) && printf "${COLOR_RED}Please run ${SCRIPT_DIR}/eosio_build.sh first!${COLOR_NC}" && exit 1
+([[ -f ${BUILD_DIR}/CMakeCache.txt ]]) && printf "${COLOR_RED}Please run ${SCRIPT_DIR}/eosio_build.sh first!${COLOR_NC}" && exit 1
 echo "${COLOR_CYAN}====================================================================================="
 echo "========================== ${COLOR_WHITE}Starting EOSIO Installation${COLOR_CYAN} ==============================${COLOR_NC}"
 execute cd $BUILD_DIR

From e0846b44231de7663d6bf99c6925c528b5f338e5 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 16:54:55 -0400
Subject: [PATCH 0744/1648] simplification

---
 scripts/.environment     | 2 +-
 scripts/eosio_install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/.environment b/scripts/.environment
index cbed7df678a..8dbb79d433d 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -16,6 +16,6 @@ fi
 export EOSIO_INSTALL_DIR="${EOSIO_INSTALL_DIR:-${HOME}/eosio/${EOSIO_VERSION}}"
 export TEMP_DIR="${TEMP_DIR:-${HOME}/tmp}"
 
-([[ -f ${BUILD_DIR}/CMakeCache.txt ]]) && export CACHED_INSTALL_PATH=$(grep "CMAKE_INSTALL_PREFIX:PATH" ${BUILD_DIR}/CMakeCache.txt | cut -d= -f2)
+[[ -f ${BUILD_DIR}/CMakeCache.txt ]] && export CACHED_INSTALL_PATH=$(grep "CMAKE_INSTALL_PREFIX:PATH" ${BUILD_DIR}/CMakeCache.txt | cut -d= -f2)
 
 . ./scripts/.build_vars
\ No newline at end of file
diff --git a/scripts/eosio_install.sh b/scripts/eosio_install.sh
index 50b77500a97..83de83ce57e 100755
--- a/scripts/eosio_install.sh
+++ b/scripts/eosio_install.sh
@@ -40,7 +40,7 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 
 [[ ! $NAME == "Ubuntu" ]] && set -i # Ubuntu doesn't support interactive mode since it uses dash
 
-([[ -f ${BUILD_DIR}/CMakeCache.txt ]]) && printf "${COLOR_RED}Please run ${SCRIPT_DIR}/eosio_build.sh first!${COLOR_NC}" && exit 1
+[[ -f ${BUILD_DIR}/CMakeCache.txt ]] && printf "${COLOR_RED}Please run ${SCRIPT_DIR}/eosio_build.sh first!${COLOR_NC}" && exit 1
 echo "${COLOR_CYAN}====================================================================================="
 echo "========================== ${COLOR_WHITE}Starting EOSIO Installation${COLOR_CYAN} ==============================${COLOR_NC}"
 execute cd $BUILD_DIR

From 818b240624a0256958658fa0699ed71065c57e15 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 17:40:58 -0400
Subject: [PATCH 0745/1648] tests

---
 scripts/eosio_uninstall.sh         |  6 +++--
 tests/bash-bats/eosio_uninstall.sh | 40 +++++++++++++++---------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/scripts/eosio_uninstall.sh b/scripts/eosio_uninstall.sh
index 070647c6313..a2c2eba6c56 100755
--- a/scripts/eosio_uninstall.sh
+++ b/scripts/eosio_uninstall.sh
@@ -98,7 +98,7 @@ else
             for INSTALL_PATH in ${INSTALL_PATHS[@]}; do
                execute rm -rf $INSTALL_PATH
             done
-            echo "[EOSIO Removal Complete]"
+            echo " - EOSIO Removal Complete"
             break;;
          1 | false | [Nn]* ) echo " - Cancelled EOSIO Removal!"; exit 1;;
          * ) echo "Please type 'y' for yes or 'n' for no.";;
@@ -122,4 +122,6 @@ if [[ $ARCH == "Darwin" ]]; then
          esac
       done
    done
-fi
\ No newline at end of file
+fi
+
+true
\ No newline at end of file
diff --git a/tests/bash-bats/eosio_uninstall.sh b/tests/bash-bats/eosio_uninstall.sh
index 77e4779438a..753832aee33 100644
--- a/tests/bash-bats/eosio_uninstall.sh
+++ b/tests/bash-bats/eosio_uninstall.sh
@@ -16,24 +16,13 @@ mkdir -p $MONGODB_DATA_DIR
 
 # A helper function is available to show output and status: `debug`
 
-@test "${TEST_LABEL} > Usage is visible with right interaction" {
-  run ./$SCRIPT_LOCATION -help
-  [[ $output =~ "Usage ---" ]] || exit
-  run ./$SCRIPT_LOCATION --help
-  [[ $output =~ "Usage ---" ]] || exit
-  run ./$SCRIPT_LOCATION help
-  [[ $output =~ "Usage ---" ]] || exit
-  run ./$SCRIPT_LOCATION blah
-  [[ $output =~ "Usage ---" ]] || exit
-}
-
 @test "${TEST_LABEL} > Testing user prompts" {
   ## No y or no warning and re-prompt
   run bash -c "echo -e \"\nx\nx\nx\" | ./$SCRIPT_LOCATION"
   ( [[ "${lines[${#lines[@]}-1]}" == "Please type 'y' for yes or 'n' for no." ]] && [[ "${lines[${#lines[@]}-2]}" == "Please type 'y' for yes or 'n' for no." ]] ) || exit
   ## All yes pass
   run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION"
-  [[ "${output##*$'\n'}" == "[EOSIO Removal Complete]" ]] || exit
+  [[ $output =~ " - EOSIO Removal Complete" ]] || exit
   ## First no shows "Cancelled..."
   run bash -c "echo \"n\" | ./$SCRIPT_LOCATION"
   [[ "${output##*$'\n'}" =~ "Cancelled EOSIO Removal!" ]] || exit
@@ -50,16 +39,27 @@ mkdir -p $MONGODB_DATA_DIR
   fi
 }
 
-@test "${TEST_LABEL} > --force" {
-  run ./$SCRIPT_LOCATION --force
-  # Make sure we reach the end
-  [[ "${output##*$'\n'}" == "[EOSIO Removal Complete]" ]] || exit
+@test "${TEST_LABEL} > Usage is visible with right interaction" {
+  run ./$SCRIPT_LOCATION -h
+  [[ $output =~ "Usage:" ]] || exit
+}
+
+@test "${TEST_LABEL} > -y" {
+  run ./$SCRIPT_LOCATION -y
+  [[ $output =~ " - EOSIO Removal Complete" ]] || exit
+}
+
+@test "${TEST_LABEL} > -i" {
+  run ./$SCRIPT_LOCATION -y -i eosiotest
+  [[ $output =~ .*/eosiotest ]] || exit
+  ([[ ! $output =~ "Library/Application\ Support/eosio" ]] && [[ ! $output =~ ".local/share/eosio" ]]) || exit
+  [[ ! $output =~ "EOSIO Removal Complete" ]] || exit
 }
 
-@test "${TEST_LABEL} > --force + --full" {
-  run ./$SCRIPT_LOCATION --force --full
-  ([[ ! "${output[*]}" =~ "Library/Application\ Support/eosio" ]] && [[ ! "${output[*]}" =~ ".local/share/eosio" ]]) && exit
-  [[ "${output##*$'\n'}" == "[EOSIO Removal Complete]" ]] || exit
+@test "${TEST_LABEL} > -f" {
+  run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -f"
+  ([[ "${output[*]}" =~ "Library/Application\ Support/eosio" ]] && [[ "${output[*]}" =~ ".local/share/eosio" ]]) && exit
+  [[ $output =~ "EOSIO Removal Complete" ]] || exit
 }
 
 rm -rf $SRC_DIR

From 111853a20d9f3ea8873cbb32baa824a0117dbd2c Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 1 Jul 2019 17:47:02 -0400
Subject: [PATCH 0746/1648] forgot to remove true test

---
 scripts/eosio_uninstall.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/eosio_uninstall.sh b/scripts/eosio_uninstall.sh
index a2c2eba6c56..a56a913c744 100755
--- a/scripts/eosio_uninstall.sh
+++ b/scripts/eosio_uninstall.sh
@@ -123,5 +123,3 @@ if [[ $ARCH == "Darwin" ]]; then
       done
    done
 fi
-
-true
\ No newline at end of file

From 5faea557121ec535c926dca34c9a6e992493e787 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 1 Jul 2019 18:25:38 -0400
Subject: [PATCH 0747/1648] fix hash<>::result_type deprecation spam

the hash<> return value is specified to be size_t and as of c++17 result_type is deprecated. as is this is causing warning spam for compilers that have deprecation warnings on, so just change it to be size_t
---
 libraries/chain/include/eosio/chain/name.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/name.hpp b/libraries/chain/include/eosio/chain/name.hpp
index 80c41ef0d0e..eef06b81ece 100644
--- a/libraries/chain/include/eosio/chain/name.hpp
+++ b/libraries/chain/include/eosio/chain/name.hpp
@@ -93,8 +93,7 @@ namespace eosio::chain {
 namespace std {
    template<> struct hash<eosio::chain::name> : private hash<uint64_t> {
       typedef eosio::chain::name argument_type;
-      typedef typename hash<uint64_t>::result_type result_type;
-      result_type operator()(const argument_type& name) const noexcept
+      size_t operator()(const argument_type& name) const noexcept
       {
          return hash<uint64_t>::operator()(name.to_uint64_t());
       }

From 418c728292b914ff45419820624b9675434448cd Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Tue, 2 Jul 2019 10:41:36 +0800
Subject: [PATCH 0748/1648] Add comments

---
 .../include/eosio/chain_plugin/chain_plugin.hpp          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index e9a8ca00a59..ef9835a9907 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -643,6 +643,9 @@ class read_write {
      using index_type = chain::index256_index;
      static auto function() {
         return [](const input_type& v) {
+            // The input is in big endian, i.e. f58262c8005bb64b8f99ec6083faf050c502d099d9929ae37ffed2fe1bb954fb
+            // fixed_bytes will convert the input to array of 2 uint128_t in little endian, i.e. 50f0fa8360ec998f4bb65b00c86282f5 fb54b91bfed2fe7fe39a92d999d002c5
+            // which is the format used by secondary index
             fixed_bytes<32> fb(*reinterpret_cast<const std::array<const uint8_t, 32>*>(v.data())); 
             return chain::key256_t(fb.get_array());
         };
@@ -656,6 +659,9 @@ class read_write {
      using index_type = chain::index256_index;
      static auto function() {
         return [](const input_type& v) {
+            // The input is in big endian, i.e. 83a83a3876c64c33f66f33c54f1869edef5b5d4a000000000000000000000000
+            // fixed_bytes will convert the input to array of 2 uint128_t in little endian, i.e. ed69184fc5336ff6334cc676383aa883 0000000000000000000000004a5d5bef
+            // which is the format used by secondary index
             fixed_bytes<20> fb(*reinterpret_cast<const std::array<const uint8_t, 20>*>(v.data())); 
             return chain::key256_t(fb.get_array());
         };
@@ -668,6 +674,9 @@ class read_write {
      using index_type = chain::index256_index;
      static auto function() {
         return [](const input_type v) {
+            // The input is in little endian of uint256_t, i.e. fb54b91bfed2fe7fe39a92d999d002c550f0fa8360ec998f4bb65b00c86282f5
+            // fixed_bytes will convert the input to array of 2 uint128_t in little endian, i.e. 50f0fa8360ec998f4bb65b00c86282f5 fb54b91bfed2fe7fe39a92d999d002c5
+            // which is the format used by secondary index
             chain::key256_t k;
             k[0] = ((uint128_t *)&v)[1]; //128-255
             k[1] = ((uint128_t *)&v)[0]; //0-127

From ff15f0e2b07ea8f06e40d7033cd4d95597a5fccb Mon Sep 17 00:00:00 2001
From: Aaron Fu <aaron.fu@block.one>
Date: Tue, 2 Jul 2019 16:33:16 +0800
Subject: [PATCH 0749/1648] enhance cleos push transaction (call send_txn_func
 for nodeos ver >= 1.8)

---
 programs/cleos/httpc.hpp |  2 +-
 programs/cleos/main.cpp  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/programs/cleos/httpc.hpp b/programs/cleos/httpc.hpp
index f90e58046c4..beb1f0f95b5 100644
--- a/programs/cleos/httpc.hpp
+++ b/programs/cleos/httpc.hpp
@@ -84,6 +84,7 @@ namespace eosio { namespace client { namespace http {
 
    const string chain_func_base = "/v1/chain";
    const string get_info_func = chain_func_base + "/get_info";
+   const string send_txn_func = chain_func_base + "/send_transaction";
    const string push_txn_func = chain_func_base + "/push_transaction";
    const string push_txns_func = chain_func_base + "/push_transactions";
    const string json_to_bin_func = chain_func_base + "/abi_json_to_bin";
@@ -103,7 +104,6 @@ namespace eosio { namespace client { namespace http {
    const string get_schedule_func = chain_func_base + "/get_producer_schedule";
    const string get_required_keys = chain_func_base + "/get_required_keys";
 
-
    const string history_func_base = "/v1/history";
    const string get_actions_func = history_func_base + "/get_actions";
    const string get_transaction_func = history_func_base + "/get_transaction";
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 0e33900d2d4..625c6123c3c 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -181,6 +181,7 @@ bool   tx_dont_broadcast = false;
 bool   tx_return_packed = false;
 bool   tx_skip_sign = false;
 bool   tx_print_json = false;
+bool   tx_use_old_rpc = false;
 string tx_json_save_file;
 bool   print_request = false;
 bool   print_response = false;
@@ -215,6 +216,7 @@ void add_standard_transaction_options(CLI::App* cmd, string default_permission =
    cmd->add_flag("-d,--dont-broadcast", tx_dont_broadcast, localized("don't broadcast transaction to the network (just print to stdout)"));
    cmd->add_flag("--return-packed", tx_return_packed, localized("used in conjunction with --dont-broadcast to get the packed transaction"));
    cmd->add_option("-r,--ref-block", tx_ref_block_num_or_id, (localized("set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)")));
+   cmd->add_flag("--use-old-rpc", tx_use_old_rpc, localized("use old RPC push_transaction, rather than new RPC send_transaction"));
 
    string msg = "An account and permission level to authorize, as in 'account@permission'";
    if(!default_permission.empty())
@@ -341,7 +343,14 @@ fc::variant push_transaction( signed_transaction& trx, packed_transaction::compr
    }
 
    if (!tx_dont_broadcast) {
-      return call(push_txn_func, packed_transaction(trx, compression));
+      bool send_txn_func_supported = true;
+      if (info.server_version_string) {
+        int major, minor;
+        if (sscanf(info.server_version_string->c_str(), "v%d.%d", &major, &minor) == 2) {
+          send_txn_func_supported = !(major == 1 && minor < 8);
+        }
+      }
+      return call(!tx_use_old_rpc && send_txn_func_supported ? send_txn_func : push_txn_func, packed_transaction(trx, compression));
    } else {
       if (!tx_return_packed) {
         return fc::variant(trx);
@@ -3452,7 +3461,7 @@ int main( int argc, char** argv ) {
       }
    });
 
-
+   // push transactions
    string trxsJson;
    auto trxsSubcommand = push->add_subcommand("transactions", localized("Push an array of arbitrary JSON transactions"));
    trxsSubcommand->add_option("transactions", trxsJson, localized("The JSON string or filename defining the array of the transactions to push"))->required();

From c0521c248dd93571c734bdb355e93bc4d66eb968 Mon Sep 17 00:00:00 2001
From: Baegjae Sung <baegjae@gmail.com>
Date: Tue, 2 Jul 2019 18:36:14 +0900
Subject: [PATCH 0750/1648] Modify transaction_ack to process bcast_transaction
 and rejected_transaction correctly

In handle_message (const packed_transaction_ptr & trx), the functions (bcast_transaction and rejected_transaction) of dispatcher are processed by the net threads.
However, in transaction_ack, these functions are processed by the application thread.
This PR modifies transaction_ack to process these functions by the net threads.
---
 plugins/net_plugin/net_plugin.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5b18d6aefe5..8e27ec0b723 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2997,17 +2997,19 @@ namespace eosio {
 
    // called from application thread
    void net_plugin_impl::transaction_ack(const std::pair<fc::exception_ptr, transaction_metadata_ptr>& results) {
-      const auto& id = results.second->id();
-      if (results.first) {
-         fc_dlog( logger, "signaled NACK, trx-id = ${id} : ${why}", ("id", id)( "why", results.first->to_detail_string() ) );
+      boost::asio::post( my_impl->thread_pool->get_executor(), [this, results]() {
+         const auto& id = results.second->id();
+         if (results.first) {
+            fc_dlog( logger, "signaled NACK, trx-id = ${id} : ${why}", ("id", id)( "why", results.first->to_detail_string() ) );
 
-         controller& cc = chain_plug->chain();
-         uint32_t head_blk_num = cc.head_block_num();
-         dispatcher->rejected_transaction(id, head_blk_num);
-      } else {
-         fc_dlog( logger, "signaled ACK, trx-id = ${id}", ("id", id) );
-         dispatcher->bcast_transaction(results.second);
-      }
+            controller& cc = chain_plug->chain();
+            uint32_t head_blk_num = cc.head_block_num();
+            dispatcher->rejected_transaction(id, head_blk_num);
+         } else {
+            fc_dlog( logger, "signaled ACK, trx-id = ${id}", ("id", id) );
+            dispatcher->bcast_transaction(results.second);
+         }
+      });
    }
 
    bool net_plugin_impl::authenticate_peer(const handshake_message& msg) const {

From b427de585386f1245f5c1526db73bb4410b94eef Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 2 Jul 2019 08:13:48 -0400
Subject: [PATCH 0751/1648] readme for uninstaller

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9b9dc655d4d..6473de01d9f 100644
--- a/README.md
+++ b/README.md
@@ -68,9 +68,10 @@ $ sudo yum remove eosio
 
 #### Build Script Uninstall
 
-If you have previously installed EOSIO using build scripts, you may execute `./scripts/eosio_uninstall.sh` to uninstall.
-- Passing `--force` will answer yes to all prompts
-- Passing `--full` will remove data directories (be very careful with this)
+If you have previously installed EOSIO using build scripts, you can execute `eosio_uninstall.sh` to uninstall.
+- Passing `-y` will answer yes to all prompts
+- Passing `-f` will remove data directories (be very careful with this)
+- Passing in `-i` allows you to specify where your eosio installation is located
 
 ## Supported Operating Systems
 EOSIO currently supports the following operating systems:  

From 25427705c3ce32b441858b69849fc022fbd68cf8 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 2 Jul 2019 08:17:58 -0400
Subject: [PATCH 0752/1648] readme for uninstaller

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6473de01d9f..8a9a0e123dc 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ $ sudo yum remove eosio
 #### Build Script Uninstall
 
 If you have previously installed EOSIO using build scripts, you can execute `eosio_uninstall.sh` to uninstall.
-- Passing `-y` will answer yes to all prompts
+- Passing `-y` will answer yes to all prompts (forces `-f`)
 - Passing `-f` will remove data directories (be very careful with this)
 - Passing in `-i` allows you to specify where your eosio installation is located
 

From d69cda3c0cb216ee956f7da111020daff5784692 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 2 Jul 2019 08:18:49 -0400
Subject: [PATCH 0753/1648] noninteractive and FULL

---
 scripts/eosio_uninstall.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/eosio_uninstall.sh b/scripts/eosio_uninstall.sh
index a56a913c744..830a480e0a6 100755
--- a/scripts/eosio_uninstall.sh
+++ b/scripts/eosio_uninstall.sh
@@ -60,7 +60,7 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 
 INSTALL_PATHS=()
 
-if [[ $NONINTERACTIVE == false ]] && $FULL; then
+if [[ $NONINTERACTIVE == false ]]; then
    while true; do
       read -p "By specifying -f, removal of the eosio data directory will require a resync of data which can take days. Do you wish to proceed? (y/n) " PROCEED
       case $PROCEED in
@@ -70,9 +70,6 @@ if [[ $NONINTERACTIVE == false ]] && $FULL; then
          * ) echo "Please type 'y' for yes or 'n' for no.";;
       esac
    done
-elif $NONINTERACTIVE && $FULL; then
-   echo "${COLOR_RED}By specifying -f, removal of the eosio data directory will require a resync of data which can take days. The script is sleeping for 15 seconds to give you a chance to cancel if this is not what you want.${COLOR_NC}"
-   $DRYRUN || sleep 15
 fi
 
 export EOSIO_INSTALL_DIR=${INSTALL_LOCATION:-$EOSIO_INSTALL_DIR}

From e572cb2e11d323d984cd71fbc251fba0c4ead018 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 2 Jul 2019 08:40:14 -0400
Subject: [PATCH 0754/1648] fixes

---
 tests/bash-bats/eosio_build_amazonlinux.sh | 4 ++--
 tests/bash-bats/eosio_build_centos.sh      | 4 ++--
 tests/bash-bats/eosio_build_darwin.sh      | 2 +-
 tests/bash-bats/eosio_build_ubuntu.sh      | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/bash-bats/eosio_build_amazonlinux.sh b/tests/bash-bats/eosio_build_amazonlinux.sh
index 3ff1d12a71c..64f53021cc5 100644
--- a/tests/bash-bats/eosio_build_amazonlinux.sh
+++ b/tests/bash-bats/eosio_build_amazonlinux.sh
@@ -30,11 +30,11 @@ export TEST_LABEL="[eosio_build_amazonlinux]"
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
     if [[ $NAME == "Amazon Linux" ]]; then
-        [[ ! -z $(echo "${output}" | grep "libstdc++.*found!") ]] || exit
+        [[ ! -z $(echo "${output}" | grep "libstdc++") ]] || exit
     elif [[ $NAME == "Amazon Linux AMI" ]]; then
         [[ ! -z $(echo "${output}" | grep "make.*found!") ]] || exit
     fi
-    [[ ! -z $(echo "${output}" | grep "sudo.*NOT.*found.") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "sudo.*NOT.*found") ]] || exit
     [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
     [[ ! -z $(echo "${output}" | grep /NEWPATH*/src/boost) ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
diff --git a/tests/bash-bats/eosio_build_centos.sh b/tests/bash-bats/eosio_build_centos.sh
index c7927b4a38d..a0f05562299 100644
--- a/tests/bash-bats/eosio_build_centos.sh
+++ b/tests/bash-bats/eosio_build_centos.sh
@@ -28,14 +28,14 @@ export TEST_LABEL="[eosio_build_centos]"
     install-package devtoolset-8 WETRUN &>/dev/null
     # Ensure SCL and devtoolset-8 for c++ binary installation
     run bash -c "printf \"y\n%.0s\" {1..100}| ./${SCRIPT_LOCATION} -i /NEWPATH"
-    [[ ! -z $(echo "${output}" | grep "centos-release-scl-2-3.el7.centos.noarch found") ]] || exit
+    [[ ! -z $(echo "${output}" | grep "centos-release-.*centos.noarch found") ]] || exit
     [[ ! -z $(echo "${output}" | grep "devtoolset-8.* found") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: source /opt/rh/devtoolset-8/enable") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: eval /usr/bin/yum -y update") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Python36 successfully enabled") ]] || exit
-    [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
+    [[ -z $(echo "${output}" | grep "-   NOT found") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Ensuring CMAKE") ]] || exit
     [[ ! -z $(echo "${output}" | grep /NEWPATH.*/src/boost) ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
diff --git a/tests/bash-bats/eosio_build_darwin.sh b/tests/bash-bats/eosio_build_darwin.sh
index da7f6f1b5bc..b835ce3b46f 100644
--- a/tests/bash-bats/eosio_build_darwin.sh
+++ b/tests/bash-bats/eosio_build_darwin.sh
@@ -29,7 +29,7 @@ export TEST_LABEL="[eosio_build_darwin]"
     ### Make sure deps are loaded properly
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: /usr/bin/xcode-select --install") ]] || exit
-    [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
+    [[ -z $(echo "${output}" | grep "-   NOT found") ]] || exit
     rm -f $CMAKE
     [[ ! -z $(echo "${output}" | grep "[Updating HomeBrew]") ]] || exit
     [[ ! -z $(echo "${output}" | grep "brew tap eosio/eosio") ]] || exit
diff --git a/tests/bash-bats/eosio_build_ubuntu.sh b/tests/bash-bats/eosio_build_ubuntu.sh
index f5153719359..7b7694180c7 100644
--- a/tests/bash-bats/eosio_build_ubuntu.sh
+++ b/tests/bash-bats/eosio_build_ubuntu.sh
@@ -29,7 +29,7 @@ export TEST_LABEL="[eosio_build_ubuntu]"
     run bash -c "printf \"y\n%.0s\" {1..100} | ./$SCRIPT_LOCATION -i /NEWPATH"
     [[ ! -z $(echo "${output}" | grep "Executing: make -j${JOBS}") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
-    [[ ! -z $(echo "${output}" | grep python.*found) ]] || exit
+    [[ ! -z $(echo "${output}" | grep python.*) ]] || exit
     [[ ! -z $(echo "${output}" | grep make.*NOT.*found) ]] || exit
     [[ ! -z $(echo "${output}" | grep /NEWPATH.*/src/boost) ]] || exit
     [[ ! -z $(echo "${output}" | grep "make -j${CPU_CORES}") ]] || exit
@@ -37,8 +37,8 @@ export TEST_LABEL="[eosio_build_ubuntu]"
     if [[ "$(echo ${VERSION_ID})" == "18.04" ]]; then
         [[ ! -z $(echo "${output}" | grep llvm-4.0.*found) ]] || exit
     fi
-    [[ -z $(echo "${output}" | grep "-   NOT found.") ]] || exit
-    [[ -z $(echo "${output}" | grep lcov.*found.) ]] || exit
+    [[ -z $(echo "${output}" | grep "-   NOT found") ]] || exit
+    [[ -z $(echo "${output}" | grep lcov.*found) ]] || exit
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
     [[ "$(echo ${VERSION_ID})" == "16.04" ]] && apt autoremove build-essential -y || uninstall-package clang WETRUN
 }

From f6895ed4c92a602fb025ca46f7fae3a3e198b8dc Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 2 Jul 2019 09:12:14 -0400
Subject: [PATCH 0755/1648] fix

---
 scripts/helpers/general.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 930f3e91d4a..0983a9299ab 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -87,9 +87,9 @@ function install-package() {
     EXECUTION_FUNCTION="execute"
     [[ $2 == "WETRUN" ]] && EXECUTION_FUNCTION="execute-always"
     ( [[ $2 =~ "--" ]] || [[ $3 =~ "--" ]] ) && OPTIONS="${2}${3}"
-    [[ $CURRENT_USER != "root" ]] && [[ ! -z $SUDO_LOCATION ]] && SUDO_COMMAND="$SUDO_LOCATION -E"
-    ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $YUM $OPTIONS install -y $1
-    ( [[ $NAME =~ "Ubuntu" ]] ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $APTGET $OPTIONS install -y $1
+    [[ $CURRENT_USER != "root" ]] && [[ ! -z $SUDO_LOCATION ]] && NEW_SUDO_COMMAND="$SUDO_LOCATION -E"
+    ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && eval $EXECUTION_FUNCTION $NEW_SUDO_COMMAND $YUM $OPTIONS install -y $1
+    ( [[ $NAME =~ "Ubuntu" ]] ) && eval $EXECUTION_FUNCTION $NEW_SUDO_COMMAND $APTGET $OPTIONS install -y $1
   fi
   true # Required; Weird behavior without it
 }
@@ -101,10 +101,10 @@ function uninstall-package() {
     [[ $2 == "WETRUN" ]] && EXECUTION_FUNCTION="execute-always"
     ( [[ $2 == "autoremove" ]] || [[ $3 == "autoremove" ]] ) && REMOVE="autoremove"
     ( [[ $2 =~ "--" ]] || [[ $3 =~ "--" ]] ) && OPTIONS="${2}${3}"
-    [[ $CURRENT_USER != "root" ]] && [[ ! -z $SUDO_LOCATION ]] && SUDO_COMMAND="$SUDO_LOCATION -E"
+    [[ $CURRENT_USER != "root" ]] && [[ ! -z $SUDO_LOCATION ]] && NEW_SUDO_COMMAND="$SUDO_LOCATION -E"
     # Check if the packages exist before uninstalling them. This speeds things up for tests.
-    ( ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && [[ ! -z $(rpm -qa $1) ]] ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $YUM $OPTIONS $REMOVE -y $1
-    ( [[ $NAME =~ "Ubuntu" ]] && $(dpkg -s $1 &>/dev/null) ) && eval $EXECUTION_FUNCTION $SUDO_COMMAND $APTGET $OPTIONS $REMOVE -y $1
+    ( ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && [[ ! -z $(rpm -qa $1) ]] ) && eval $EXECUTION_FUNCTION $NEW_SUDO_COMMAND $YUM $OPTIONS $REMOVE -y $1
+    ( [[ $NAME =~ "Ubuntu" ]] && $(dpkg -s $1 &>/dev/null) ) && eval $EXECUTION_FUNCTION $NEW_SUDO_COMMAND $APTGET $OPTIONS $REMOVE -y $1
   fi
   true
 }

From 472314fb98561109ecc231335657a18d986e44ba Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 2 Jul 2019 09:12:53 -0400
Subject: [PATCH 0756/1648] comment

---
 scripts/helpers/general.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 0983a9299ab..34e2488ef83 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -87,6 +87,7 @@ function install-package() {
     EXECUTION_FUNCTION="execute"
     [[ $2 == "WETRUN" ]] && EXECUTION_FUNCTION="execute-always"
     ( [[ $2 =~ "--" ]] || [[ $3 =~ "--" ]] ) && OPTIONS="${2}${3}"
+    # Can't use $SUDO_COMMAND: https://askubuntu.com/questions/953485/where-do-i-find-the-sudo-command-environment-variable
     [[ $CURRENT_USER != "root" ]] && [[ ! -z $SUDO_LOCATION ]] && NEW_SUDO_COMMAND="$SUDO_LOCATION -E"
     ( [[ $NAME =~ "Amazon Linux" ]] || [[ $NAME == "CentOS Linux" ]] ) && eval $EXECUTION_FUNCTION $NEW_SUDO_COMMAND $YUM $OPTIONS install -y $1
     ( [[ $NAME =~ "Ubuntu" ]] ) && eval $EXECUTION_FUNCTION $NEW_SUDO_COMMAND $APTGET $OPTIONS install -y $1

From be9b61203208a6649fe7ba3e30ca95faf39629c7 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 2 Jul 2019 09:59:14 -0400
Subject: [PATCH 0757/1648] quick fix

---
 README.md                  | 2 +-
 scripts/eosio_uninstall.sh | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8a9a0e123dc..788c14bf56b 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ $ sudo yum remove eosio
 #### Build Script Uninstall
 
 If you have previously installed EOSIO using build scripts, you can execute `eosio_uninstall.sh` to uninstall.
-- Passing `-y` will answer yes to all prompts (forces `-f`)
+- Passing `-y` will answer yes to all prompts (does not remove data directories)
 - Passing `-f` will remove data directories (be very careful with this)
 - Passing in `-i` allows you to specify where your eosio installation is located
 
diff --git a/scripts/eosio_uninstall.sh b/scripts/eosio_uninstall.sh
index 830a480e0a6..ed19035bc96 100755
--- a/scripts/eosio_uninstall.sh
+++ b/scripts/eosio_uninstall.sh
@@ -60,7 +60,10 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 
 INSTALL_PATHS=()
 
-if [[ $NONINTERACTIVE == false ]]; then
+# -y alone should not remove the data directories and not prompt the user for anything. 
+# -f alone should remove the data directories after prompting the user if they are sure. 
+# -f -y should proceed forward with removing the data directories without prompting the user.
+if [[ $NONINTERACTIVE == false ]] && $FULL; then
    while true; do
       read -p "By specifying -f, removal of the eosio data directory will require a resync of data which can take days. Do you wish to proceed? (y/n) " PROCEED
       case $PROCEED in

From a0f266bab92b400c87b9e32690d05b3c8375d685 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 2 Jul 2019 12:27:17 -0400
Subject: [PATCH 0758/1648] various fixes

---
 scripts/.build_vars                   | 15 +++++----
 scripts/.environment                  |  3 +-
 scripts/eosio_build.sh                |  5 +--
 scripts/helpers/eosio.sh              | 46 ++++++++++++++-------------
 tests/bash-bats/eosio_build_darwin.sh |  4 +--
 5 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index cdaba23c9b1..6663f9d86fc 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -1,10 +1,11 @@
-export SRC_DIR=${SRC_DIR:-${EOSIO_INSTALL_DIR}/src}
-export OPT_DIR=${OPT_DIR:-${EOSIO_INSTALL_DIR}/opt}
-export VAR_DIR=${VAR_DIR:-${EOSIO_INSTALL_DIR}/var}
-export ETC_DIR=${ETC_DIR:-${EOSIO_INSTALL_DIR}/etc}
-export BIN_DIR=${BIN_DIR:-${EOSIO_INSTALL_DIR}/bin}
-export LIB_DIR=${LIB_DIR:-${EOSIO_INSTALL_DIR}/lib}
-export DATA_DIR=${DATA_DIR:-${EOSIO_INSTALL_DIR}/data}
+# See install-directory-prompt for logic that sets EOSIO_INSTALL_DIR
+export SRC_DIR=${EOSIO_INSTALL_DIR}/src
+export OPT_DIR=${EOSIO_INSTALL_DIR}/opt
+export VAR_DIR=${EOSIO_INSTALL_DIR}/var
+export ETC_DIR=${EOSIO_INSTALL_DIR}/etc
+export BIN_DIR=${EOSIO_INSTALL_DIR}/bin
+export LIB_DIR=${EOSIO_INSTALL_DIR}/lib
+export DATA_DIR=${EOSIO_INSTALL_DIR}/data
 
 # CMAKE
 export CMAKE_VERSION_MAJOR=3
diff --git a/scripts/.environment b/scripts/.environment
index 484a5d7193b..b5968b1db8b 100644
--- a/scripts/.environment
+++ b/scripts/.environment
@@ -15,9 +15,8 @@ fi
 
 export CMAKE_REQUIRED_VERSION=$(cat $REPO_ROOT/CMakeLists.txt | grep -E "^[[:blank:]]*cmake_minimum_required[[:blank:]]*\([[:blank:]]*VERSION" | tail -1 | sed 's/.*VERSION //g' | sed 's/ //g' | sed 's/"//g' | cut -d\) -f1)
 
-export EOSIO_INSTALL_DIR="${EOSIO_INSTALL_DIR:-${HOME}/eosio/${EOSIO_VERSION}}"
+export EOSIO_INSTALL_DIR="${HOME}/eosio/${EOSIO_VERSION}"
 export TEMP_DIR="${TEMP_DIR:-${HOME}/tmp}"
 
 [[ -f ${BUILD_DIR}/CMakeCache.txt ]] && export CACHED_INSTALL_PATH=$(grep "CMAKE_INSTALL_PREFIX:PATH" ${BUILD_DIR}/CMakeCache.txt | cut -d= -f2)
-
 . ./scripts/.build_vars
\ No newline at end of file
diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index 016319db234..ae07a588051 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -116,9 +116,6 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 # Load eosio specific helper functions
 . ./scripts/helpers/eosio.sh
 
-# Support relative paths : https://github.com/EOSIO/eos/issues/7560
-( [[ ! -z $INSTALL_LOCATION ]] && [[ ! $INSTALL_LOCATION =~ ^\/ ]] ) && export INSTALL_LOCATION="${CURRENT_WORKING_DIR}/$INSTALL_LOCATION"
-
 $VERBOSE && echo "Build Script Version: ${SCRIPT_VERSION}"
 echo "EOSIO Version: ${EOSIO_VERSION_FULL}"
 echo "$( date -u )"
@@ -134,7 +131,7 @@ ensure-sudo
 ensure-which
 # Prevent a non-git clone from running
 ensure-git-clone
-# Prompt user for installation path.
+# Prompt user for installation path (Set EOSIO_INSTALL_DIR)
 install-directory-prompt
 # If the same version has already been installed...
 previous-install-prompt
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index c518bd22550..c11acdc8b9a 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -75,28 +75,30 @@ function ensure-which() {
 
 # Prompt user for installation directory.
 function install-directory-prompt() {
-  if [[ -z $INSTALL_LOCATION ]]; then
-    echo "No installation location was specified. Please provide the location where EOSIO is installed."
-    while true; do
-      [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to use the default location? ${EOSIO_INSTALL_DIR}? (y/n)${COLOR_NC}" && read -p " " PROCEED
-      echo ""
-      case $PROCEED in
-        "" )
-          echo "What would you like to do?";;
-        0 | true | [Yy]* )
-          break;;
-        1 | false | [Nn]* )
-          printf "Enter the desired installation location." && read -p " " EOSIO_INSTALL_DIR;
-          export EOSIO_INSTALL_DIR;
-          break;;
-        * ) echo "Please type 'y' for yes or 'n' for no.";;
-      esac
-    done
-  else
-    export EOSIO_INSTALL_DIR=${INSTALL_LOCATION}
-  fi
-  . ./scripts/.build_vars
-  echo "EOSIO will be installed to: ${EOSIO_INSTALL_DIR}"
+    if [[ -z $INSTALL_LOCATION ]]; then
+        echo "No installation location was specified. Please provide the location where EOSIO is installed."
+        while true; do
+            [[ $NONINTERACTIVE == false ]] && printf "${COLOR_YELLOW}Do you wish to use the default location? ${EOSIO_INSTALL_DIR}? (y/n)${COLOR_NC}" && read -p " " PROCEED
+            echo ""
+            case $PROCEED in
+                "" )
+                echo "What would you like to do?";;
+                0 | true | [Yy]* )
+                break;;
+                1 | false | [Nn]* )
+                printf "Enter the desired installation location." && read -p " " EOSIO_INSTALL_DIR;
+                export EOSIO_INSTALL_DIR;
+                break;;
+                * ) echo "Please type 'y' for yes or 'n' for no.";;
+            esac
+        done
+    else
+        # Support relative paths : https://github.com/EOSIO/eos/issues/7560
+        [[ ! $INSTALL_LOCATION =~ ^\/ ]] && export INSTALL_LOCATION="${CURRENT_WORKING_DIR}/$INSTALL_LOCATION"
+        export EOSIO_INSTALL_DIR="$INSTALL_LOCATION"
+    fi
+    . ./scripts/.build_vars
+    echo "EOSIO will be installed to: ${EOSIO_INSTALL_DIR}"
 }
 
 function previous-install-prompt() {
diff --git a/tests/bash-bats/eosio_build_darwin.sh b/tests/bash-bats/eosio_build_darwin.sh
index b835ce3b46f..e5c063ca4e2 100644
--- a/tests/bash-bats/eosio_build_darwin.sh
+++ b/tests/bash-bats/eosio_build_darwin.sh
@@ -29,8 +29,8 @@ export TEST_LABEL="[eosio_build_darwin]"
     ### Make sure deps are loaded properly
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Dependency Install") ]] || exit
     [[ ! -z $(echo "${output}" | grep "Executing: /usr/bin/xcode-select --install") ]] || exit
-    [[ -z $(echo "${output}" | grep "-   NOT found") ]] || exit
-    rm -f $CMAKE
+    [[ -z $(echo "${output}" | grep " -   NOT found") ]] || exit
+    # rm -f $CMAKE
     [[ ! -z $(echo "${output}" | grep "[Updating HomeBrew]") ]] || exit
     [[ ! -z $(echo "${output}" | grep "brew tap eosio/eosio") ]] || exit
     [[ ! -z $(echo "${output}" | grep "brew install.*llvm@4.*") ]] || exit

From 865ed8b9b95a4f017aaab680dceaafa8eede9947 Mon Sep 17 00:00:00 2001
From: Baegjae Sung <36757961+baegjae@users.noreply.github.com>
Date: Wed, 3 Jul 2019 10:29:17 +0900
Subject: [PATCH 0759/1648] Replace head_block_num with get_chain_info

chain::head_block_num() can only be called from application thread.
---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8e27ec0b723..f1019c47d1c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3002,8 +3002,8 @@ namespace eosio {
          if (results.first) {
             fc_dlog( logger, "signaled NACK, trx-id = ${id} : ${why}", ("id", id)( "why", results.first->to_detail_string() ) );
 
-            controller& cc = chain_plug->chain();
-            uint32_t head_blk_num = cc.head_block_num();
+            uint32_t head_blk_num = 0;
+            std::tie( std::ignore, head_blk_num, std::ignore, std::ignore, std::ignore, std::ignore ) = get_chain_info();
             dispatcher->rejected_transaction(id, head_blk_num);
          } else {
             fc_dlog( logger, "signaled ACK, trx-id = ${id}", ("id", id) );

From 862c8fad63996d79ce10edfd7e1c6894ea93554f Mon Sep 17 00:00:00 2001
From: Aaron Fu <aaron.fu@block.one>
Date: Wed, 3 Jul 2019 11:38:45 +0800
Subject: [PATCH 0760/1648] modify: no version check, call send_txn_func
 directly

---
 programs/cleos/main.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 625c6123c3c..c719e5418ab 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -343,14 +343,17 @@ fc::variant push_transaction( signed_transaction& trx, packed_transaction::compr
    }
 
    if (!tx_dont_broadcast) {
-      bool send_txn_func_supported = true;
-      if (info.server_version_string) {
-        int major, minor;
-        if (sscanf(info.server_version_string->c_str(), "v%d.%d", &major, &minor) == 2) {
-          send_txn_func_supported = !(major == 1 && minor < 8);
-        }
+      if (tx_use_old_rpc) {
+         return call(push_txn_func, packed_transaction(trx, compression));
+      } else {
+         try {
+            return call(send_txn_func, packed_transaction(trx, compression));
+         }
+         catch (chain::missing_chain_api_plugin_exception &) {
+            std::cerr << "New RPC send_transaction may not be supported. Add flag --use-old-rpc to use old RPC push_transaction instead." << std::endl;
+            throw;
+         }
       }
-      return call(!tx_use_old_rpc && send_txn_func_supported ? send_txn_func : push_txn_func, packed_transaction(trx, compression));
    } else {
       if (!tx_return_packed) {
         return fc::variant(trx);

From cf3c2e738f103c56b6f7b62abbe8effed87bfac7 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Wed, 3 Jul 2019 16:41:05 -0400
Subject: [PATCH 0761/1648] update eos-vm

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 2e53974067a..48424513985 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 2e53974067a6e596eedb97220d8a59bb39ba5412
+Subproject commit 484245139855ea34c75d986c9148537ea441ea76

From 0e7e6ae7a9d74ce51b87dc2c354d81b13fde8f0b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 3 Jul 2019 17:11:48 -0500
Subject: [PATCH 0762/1648] All handle_message calls are now on connection
 strand

---
 plugins/net_plugin/net_plugin.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f1019c47d1c..756f863c144 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -712,6 +712,8 @@ namespace eosio {
       void handle_message( const packed_transaction& msg ) = delete; // packed_transaction_ptr overload used instead
       void handle_message( const packed_transaction_ptr& msg );
 
+      void process_signed_block( const signed_block_ptr& msg );
+
       fc::optional<fc::variant_object> _logger_variant;
       const fc::variant_object& get_logger_variant()  {
          if (!_logger_variant) {
@@ -750,12 +752,9 @@ namespace eosio {
       }
 
       void operator()( signed_block&& msg ) const {
+         // continue call to handle_message on connection strand
          shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
-         connection_wptr weak = c;
-         app().post(priority::high, [ptr{std::move(ptr)}, weak{std::move(weak)}] {
-            connection_ptr c = weak.lock();
-            if( c ) c->handle_message( ptr );
-         });
+         c->handle_message( ptr );
       }
 
       void operator()( packed_transaction&& msg ) const {
@@ -2787,8 +2786,16 @@ namespace eosio {
       });
    }
 
+   // called from connection strand
+   void connection::handle_message( const signed_block_ptr& ptr ) {
+      app().post(priority::high, [ptr, weak = weak_from_this()] {
+         connection_ptr c = weak.lock();
+         if( c ) c->process_signed_block( ptr );
+      });
+   }
+
    // called from application thread
-   void connection::handle_message( const signed_block_ptr& msg ) {
+   void connection::process_signed_block( const signed_block_ptr& msg ) {
       controller& cc = my_impl->chain_plug->chain();
       block_id_type blk_id = msg->id();
       uint32_t blk_num = msg->block_num();

From 4c09bd63b2bab97bfb98b3fd144ad9265cf2ec22 Mon Sep 17 00:00:00 2001
From: Zane Reynolds <zane.reynolds@gmail.com>
Date: Thu, 4 Jul 2019 17:28:12 -0400
Subject: [PATCH 0763/1648] Use updated sync nodes

---
 pipeline.jsonc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index eecbb9795eb..aa76bb99dd9 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -30,7 +30,8 @@
         "environment":
         {
             "SKIP_PRE_V180": "true",
-            "SKIP_V180": "false"
+            "SKIP_V180": "true"
+            "SKIP_V200": "false"
         }
     }
 }

From b94701b53805c17c2f8b2a1a19be066f6d36e214 Mon Sep 17 00:00:00 2001
From: Zane Reynolds <zane.reynolds@gmail.com>
Date: Thu, 4 Jul 2019 17:44:46 -0400
Subject: [PATCH 0764/1648] Adds missing comma

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index aa76bb99dd9..a298e3b85a7 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -30,7 +30,7 @@
         "environment":
         {
             "SKIP_PRE_V180": "true",
-            "SKIP_V180": "true"
+            "SKIP_V180": "true",
             "SKIP_V200": "false"
         }
     }

From ea3a9b874579d974097b56a9c81247a8eaa6d738 Mon Sep 17 00:00:00 2001
From: Zane Reynolds <zane.reynolds@gmail.com>
Date: Fri, 5 Jul 2019 03:58:58 -0400
Subject: [PATCH 0765/1648] Updates sync test steps

---
 pipeline.jsonc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index a298e3b85a7..d748c03cbf5 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -22,7 +22,8 @@
         "environment":
         {
             "SKIP_PRE_V180": "true",
-            "SKIP_V180": "false"
+            "SKIP_V180": "true",
+            "SKIP_V200": "false,"
         }
     },
     "eosio-replay-tests":

From 27a0dc980c8537c80d4dc3ec9f1ec75fdb355e58 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 5 Jul 2019 12:38:47 -0500
Subject: [PATCH 0766/1648] Initialize time stamp

---
 plugins/net_plugin/include/eosio/net_plugin/protocol.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
index cdb3d98fd2f..0d96e979222 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
@@ -26,7 +26,7 @@ namespace eosio {
       chain_id_type              chain_id; ///< used to identify chain
       fc::sha256                 node_id; ///< used to identify peers and prevent self-connect
       chain::public_key_type     key; ///< authentication key; may be a producer or peer key, or empty
-      tstamp                     time;
+      tstamp                     time{0};
       fc::sha256                 token; ///< digest of time to prove we own the private key of the key above
       chain::signature_type      sig; ///< signature for the digest
       string                     p2p_address;

From 8f324c54a849efaa530dd44340c3afed89a8529b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 5 Jul 2019 12:45:30 -0500
Subject: [PATCH 0767/1648] Refactor add_peer_block

---
 plugins/net_plugin/net_plugin.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 756f863c144..ed4c85b006d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -181,7 +181,7 @@ namespace eosio {
 
       void retry_fetch(const connection_ptr& conn);
 
-      bool add_peer_block(const peer_block_state& pbs);
+      bool add_peer_block( const block_id_type& blkid, uint32_t connection_id );
       bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
       bool have_block(const block_id_type& blkid);
 
@@ -1023,7 +1023,7 @@ namespace eosio {
             signed_block_ptr b = cc.fetch_block_by_id( blkid );
             if( b ) {
                fc_dlog( logger, "found block for id at num ${n}", ("n", b->block_num()) );
-               my_impl->dispatcher->add_peer_block( {blkid, block_header::num_from_id( blkid ), c->connection_id} );
+               my_impl->dispatcher->add_peer_block( blkid, c->connection_id );
                c->strand.post( [c, b{std::move(b)}]() {
                   c->enqueue_block( b );
                } );
@@ -1768,12 +1768,12 @@ namespace eosio {
    //------------------------------------------------------------------------
 
    // thread safe
-   bool dispatch_manager::add_peer_block(const peer_block_state& entry) {
+   bool dispatch_manager::add_peer_block( const block_id_type& blkid, uint32_t connection_id) {
       std::lock_guard<std::mutex> g( blk_state_mtx );
-      auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(entry.id), entry.connection_id));
+      auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(blkid), connection_id));
       bool added = (bptr == blk_state.end());
       if( added ) {
-         blk_state.insert(entry);
+         blk_state.insert( {blkid, block_header::num_from_id( blkid ), connection_id} );
       }
       return added;
    }
@@ -1892,8 +1892,7 @@ namespace eosio {
             bool has_block = cp->last_handshake_recv.last_irreversible_block_num >= bnum;
             g_conn.unlock();
             if( !has_block ) {
-               peer_block_state pbstate{bs->id, bnum, cp->connection_id};
-               if( !add_peer_block( pbstate ) ) {
+               if( !add_peer_block( bs->id, cp->connection_id ) ) {
                   return;
                }
                fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
@@ -1906,8 +1905,7 @@ namespace eosio {
 
    // called from connection strand
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
-      peer_block_state pbstate{id, bnum, c->connection_id};
-      add_peer_block( pbstate );
+      add_peer_block( id, c->connection_id );
       std::unique_lock<std::mutex> g( c->conn_mtx );
       if (c &&
           c->last_req &&
@@ -1992,7 +1990,7 @@ namespace eosio {
                   controller& cc = my_impl->chain_plug->chain();
                   b = cc.fetch_block_by_id( blkid ); // if exists
                   if( b ) {
-                     add_peer_block( {blkid, block_header::num_from_id( blkid ), c->connection_id} );
+                     add_peer_block( blkid, c->connection_id );
                   }
                } catch( const assert_exception& ex ) {
                   fc_ilog( logger, "caught assert on fetch_block_by_id, ${ex}", ("ex", ex.what()) );

From 980bb90a2a0ec3c0620a684a9fb4f52c7c2bb142 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 5 Jul 2019 15:14:02 -0500
Subject: [PATCH 0768/1648] Add plumbing for tracking of have_block, not used
 yet

---
 plugins/net_plugin/net_plugin.cpp | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ed4c85b006d..53864fb2e81 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -98,6 +98,7 @@ namespace eosio {
       block_id_type id;
       uint32_t      block_num = 0;
       uint32_t      connection_id = 0;
+      bool          have_block = false; // true if we have received the block, false if only received id notification
    };
 
    typedef multi_index_container<
@@ -106,9 +107,10 @@ namespace eosio {
          ordered_unique< tag<by_id>,
                composite_key< peer_block_state,
                      member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
-                     member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>
+                     member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>,
+                     member<peer_block_state, bool, &eosio::peer_block_state::have_block>
                >,
-               composite_key_compare< sha256_less, std::less<uint32_t> >
+               composite_key_compare< sha256_less, std::less<uint32_t>, std::greater<bool> >
          >,
          ordered_non_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
       >
@@ -182,6 +184,7 @@ namespace eosio {
       void retry_fetch(const connection_ptr& conn);
 
       bool add_peer_block( const block_id_type& blkid, uint32_t connection_id );
+      bool add_peer_block_id( const block_id_type& blkid, uint32_t connection_id );
       bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
       bool have_block(const block_id_type& blkid);
 
@@ -1773,7 +1776,21 @@ namespace eosio {
       auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(blkid), connection_id));
       bool added = (bptr == blk_state.end());
       if( added ) {
-         blk_state.insert( {blkid, block_header::num_from_id( blkid ), connection_id} );
+         blk_state.insert( {blkid, block_header::num_from_id( blkid ), connection_id, true} );
+      } else if( !bptr->have_block ) {
+         blk_state.modify( bptr, []( auto& pb ) {
+            pb.have_block = true;
+         });
+      }
+      return added;
+   }
+
+   bool dispatch_manager::add_peer_block_id( const block_id_type& blkid, uint32_t connection_id) {
+      std::lock_guard<std::mutex> g( blk_state_mtx );
+      auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(blkid), connection_id));
+      bool added = (bptr == blk_state.end());
+      if( added ) {
+         blk_state.insert( {blkid, block_header::num_from_id( blkid ), connection_id, false} );
       }
       return added;
    }
@@ -1787,7 +1804,10 @@ namespace eosio {
    bool dispatch_manager::have_block( const block_id_type& blkid ) {
       std::lock_guard<std::mutex> g(blk_state_mtx);
       auto blk_itr = blk_state.get<by_id>().find( blkid );
-      return blk_itr != blk_state.end();
+      if( blk_itr != blk_state.end() ) {
+         return blk_itr->have_block;
+      }
+      return false;
    }
 
    bool dispatch_manager::add_peer_txn( const node_transaction_state& nts ) {

From 77dcb76408e42685db898f08169f59cd62b73858 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 5 Jul 2019 15:56:55 -0500
Subject: [PATCH 0769/1648] block id notification/handling

---
 plugins/net_plugin/net_plugin.cpp | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 53864fb2e81..d01af3d7d9c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -174,6 +174,7 @@ namespace eosio {
       void bcast_transaction(const transaction_metadata_ptr& trx);
       void rejected_transaction(const transaction_id_type& msg, uint32_t head_blk_num);
       void bcast_block(const block_state_ptr& bs);
+      void bcast_notice( const block_id_type& id );
       void rejected_block(const block_id_type& id);
 
       void recv_block(const connection_ptr& conn, const block_id_type& msg, uint32_t bnum);
@@ -1923,6 +1924,31 @@ namespace eosio {
       } );
    }
 
+   void dispatch_manager::bcast_notice( const block_id_type& id ) {
+      if( my_impl->sync_master->syncing_with_peer() ) return;
+
+      fc_dlog( logger, "bcast notice ${b}", ("b", block_header::num_from_id( id )) );
+      notice_message note;
+      note.known_blocks.mode = normal;
+      note.known_blocks.pending = 1; // 1 indicates this is a block id notice
+      note.known_blocks.ids.emplace_back( id );
+
+      for_each_block_connection( [this, note]( auto& cp ) {
+         if( !cp->current() ) {
+            return true;
+         }
+         cp->strand.post( [this, cp, note]() {
+            const block_id_type& id = note.known_blocks.ids.back();
+            if( peer_has_block( id, cp->connection_id ) ) {
+               return;
+            }
+            fc_dlog( logger, "bcast block id ${b} to ${p}", ("b", block_header::num_from_id( id ))("p", cp->peer_name()) );
+            cp->enqueue( note );
+         } );
+         return true;
+      } );
+   }
+
    // called from connection strand
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
       add_peer_block( id, c->connection_id );
@@ -2000,6 +2026,16 @@ namespace eosio {
          req.req_blocks.mode = normal;
          // known_blocks.ids is never > 1
          if( !msg.known_blocks.ids.empty() ) {
+            const block_id_type& blkid = msg.known_blocks.ids.back();
+            if( have_block( blkid )) {
+               add_peer_block( blkid, c->connection_id );
+               return;
+            } else {
+               add_peer_block_id( blkid, c->connection_id );
+            }
+            if( msg.known_blocks.pending == 1 ) { // block id notify
+               return;
+            }
             connection_wptr weak = c;
             app().post( priority::low, [this, msg{std::move(msg)}, req{std::move(req)}, weak{std::move(weak)}]() mutable {
                connection_ptr c = weak.lock();
@@ -2810,6 +2846,7 @@ namespace eosio {
          connection_ptr c = weak.lock();
          if( c ) c->process_signed_block( ptr );
       });
+      my_impl->dispatcher->bcast_notice( ptr->id() );
    }
 
    // called from application thread

From 5f6dbdac2257a66c379f9a3c9d4000fa105d2d1c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 5 Jul 2019 16:47:54 -0500
Subject: [PATCH 0770/1648] Add block_id_notify as newest net_version

---
 plugins/net_plugin/net_plugin.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d01af3d7d9c..1eac170b1be 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -411,8 +411,9 @@ namespace eosio {
     */
    constexpr uint16_t proto_base = 0;
    constexpr uint16_t proto_explicit_sync = 1;
+   constexpr uint16_t block_id_notify = 2;
 
-   constexpr uint16_t net_version = proto_explicit_sync;
+   constexpr uint16_t net_version = block_id_notify;
 
    /**
     * Index by start_block_num
@@ -1938,6 +1939,8 @@ namespace eosio {
             return true;
          }
          cp->strand.post( [this, cp, note]() {
+            // check protocol_version here since only accessed from strand
+            if( cp->protocol_version < block_id_notify ) return;
             const block_id_type& id = note.known_blocks.ids.back();
             if( peer_has_block( id, cp->connection_id ) ) {
                return;

From 5c8bd0e8488bbcbf6a05c4447aeb10950077cd81 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 8 Jul 2019 10:01:20 -0500
Subject: [PATCH 0771/1648] Added classes to process reading in blocks and
 writting them out from memory buffers and periodically read/written to file.

---
 libraries/chain/block_log.cpp                 | 347 ++++++++++++++----
 .../chain/include/eosio/chain/block_log.hpp   |   2 +-
 programs/eosio-blocklog/main.cpp              |   4 +-
 3 files changed, 274 insertions(+), 79 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 5a7c11396dd..a8b2f91a878 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -5,6 +5,7 @@
 #include <eosio/chain/block_log.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <fstream>
+#include <fc/bitutil.hpp>
 #include <fc/io/raw.hpp>
 
 #define LOG_READ  (std::ios::in | std::ios::binary)
@@ -69,6 +70,63 @@ namespace eosio { namespace chain {
 
          open_files = true;
       }
+
+      class reverse_iterator {
+      public:
+         reverse_iterator();
+         ~reverse_iterator();
+         // open a block log file and return the total number of blocks in it
+         uint32_t open(const fc::path& block_file_name);
+         uint64_t previous();
+         uint32_t version() const { return _version; }
+         uint32_t first_block_num() const { return _first_block_num; }
+      private:
+         void update_buffer();
+
+         FILE*                          _file                             = nullptr;
+         uint32_t                       _version                          = 0;
+         uint32_t                       _first_block_num                  = 0;
+         uint32_t                       _last_block_num                   = 0;
+         uint32_t                       _blocks_found                     = 0;
+         uint32_t                       _blocks_expected                  = 0;
+         uint64_t                       _current_position_in_file         = 0;
+         uint64_t                       _eof_position_in_file             = 0;
+         uint64_t                       _end_of_buffer_position           = _unset_position;
+         uint64_t                       _start_of_buffer_position         = 0;
+         std::unique_ptr<char[]>        _buffer_ptr;
+         std::string                    _block_file_name;
+         constexpr static int64_t       _unset_position                   = -1;
+         constexpr static uint32_t      _buf_len                          = 1U << 24;
+         constexpr static uint64_t      _position_size                    = sizeof(_current_position_in_file);
+         constexpr static int           _blknum_offset_from_pos           = 14; //offset from start of block to 4 byte block number, valid for the only allowed versions (1 & 2)
+      };
+
+      constexpr uint64_t buffer_location_to_file_location(uint32_t buffer_location) { return buffer_location << 3; }
+      constexpr uint32_t file_location_to_buffer_location(uint32_t file_location) { return file_location >> 3; }
+
+      class index_writer {
+      public:
+         index_writer(const fc::path& block_index_name, uint32_t blocks_expected, bool report_status);
+         ~index_writer();
+         void write(uint64_t pos);
+         void complete();
+         void calculate_buffer_position();
+      private:
+         void prepare_buffer();
+         bool shift_buffer();
+
+         FILE*                              _file              = nullptr;
+         const std::string                  _block_index_name;
+         const uint32_t                     _blocks_expected;
+         uint32_t                           _block_written;
+         bool                               _report_status;
+         std::unique_ptr<uint64_t[]>        _buffer_ptr;
+         int64_t                            _current_position;
+         int64_t                            _start_of_buffer_position;
+         int64_t                            _end_of_buffer_position;
+         constexpr static uint64_t          _buffer_bytes      = 1U << 22;
+         constexpr static uint64_t          _max_buffer_length = file_location_to_buffer_location(_buffer_bytes);
+      };
    }
 
    block_log::block_log(const fc::path& data_dir)
@@ -318,6 +376,7 @@ namespace eosio { namespace chain {
 
       my->reopen();
 
+
       my->close();
 
       block_log::construct_index(my->block_file, my->index_file);
@@ -325,90 +384,27 @@ namespace eosio { namespace chain {
       my->reopen();
    } // construct_index
 
-   void block_log::construct_index(const fc::path& block_file_name, const fc::path& index_file_name) {
-
-      uint64_t pos;
-
-      FILE* fin = fopen(block_file_name.generic_string().c_str(), "r");
-      if (fin == nullptr) {
-         elog("cannot read block file ${file}", ("file", block_file_name.string()) );
-         return;
+   void block_log::construct_index(const fc::path& block_file_name, const fc::path& index_file_name, bool provide_index_log_status) {
+      detail::reverse_iterator block_log_iter;
+      if (provide_index_log_status) {
+         std::cout << "\nblock log version= " << block_log_iter.version() << '\n';
       }
 
-
-      const auto block_stream_position = ftell(fin);
-      const auto pos_size = sizeof(pos);
-      auto status = fseek(fin, -pos_size, SEEK_END);
-      uint64_t current_pos = ftell(fin);
-      auto size = fread((char*)&pos, pos_size, 1, fin);
-
-      if( pos == npos ) {
-         ilog( "Block log contains no blocks. No need to construct index." );
+      const uint32_t num_blocks = block_log_iter.open(block_file_name);
+      if (num_blocks == 0) {
          return;
       }
 
-      ilog("start block index creation");
-      status = fseek(fin, 0, SEEK_SET);
-      uint32_t version = 0;
-      size = fread((char*)&version, sizeof(version), 1, fin);
-      uint32_t first_block_num;
-      if (version == 1) {
-         first_block_num = 1;
-      }
-      else if (version == 2) {
-         size = fread ( (char*)&first_block_num, sizeof(first_block_num), 1, fin );
-         if (first_block_num < 1) {
-            elog( "Invalid first block number: ${first}", ("first", first_block_num) );
-            return;
-         }
-         status = fseek(fin, sizeof(npos), SEEK_CUR);
-      }
-      else {
-         elog( "Block log does not support version ${version}", ("version", version) );
-         return;
+      if (provide_index_log_status) {
+         std::cout << "\nfirst block= " << block_log_iter.first_block_num() << ", last block= " << (block_log_iter.first_block_num() + num_blocks) << "\n\n";
       }
 
-      const auto start = ftell(fin);
-
-      const auto reverse_file_name = index_file_name.generic_string() + ".rev";
-      FILE* fout_rev = fopen(reverse_file_name.c_str(), "w+");
-      size = fwrite((void*)&pos, pos_size, 1, fout_rev);
-      status = fseek(fin, -pos_size, SEEK_END);
-
-      uint32_t num_blocks = 0;
-      const auto last = current_pos;
-      auto diff = current_pos - pos + pos_size;
-      current_pos -= diff;
-      // subsequent calculations of diff need to account for read which shifts us forward pos_size
-      // and our current_pos doesn't have that pos_size shift, so need to take it back out
-      for ( ; ; diff = current_pos - pos + pos_size, current_pos -= diff ) {
-         status = fseek(fin, -diff, SEEK_CUR);
-         size = fread((char*)&pos, pos_size, 1, fin);
-         if (pos == npos)
-            break;
-         ++num_blocks;
-         size = fwrite((void*)&pos, pos_size, 1, fout_rev);
-         current_pos += pos_size;
-      }
-
-      const uint32_t last_block_num = first_block_num + num_blocks;
-      ilog("reverse order block index creation");
-
-      std::fstream  index_stream;
-      index_stream.open(index_file_name.generic_string().c_str(), LOG_WRITE_NEW);
-      EOS_ASSERT( index_stream.is_open(), block_log_exception, "Not able to open ${file}", ("file", index_file_name.generic_string()) );
-      index_stream.seekg(0, std::ios::beg);
-      int64_t reverse_offset = pos_size;
-      for (uint32_t block_num = last_block_num; block_num >= first_block_num; --block_num) {
-         status = fseek(fout_rev, -reverse_offset, SEEK_CUR);
-         size = fread((char*)&pos, pos_size, 1, fout_rev);
-         index_stream.write((char*)&pos, pos_size);
-         reverse_offset = pos_size + pos_size; //need to counteract the stream moving forward
-      }
-      fclose(fin);
-      fclose(fout_rev);
-      index_stream.close();
-      ilog("stop block index creation");
+      detail::index_writer index(index_file_name, num_blocks, provide_index_log_status);
+      uint64_t position;
+      while ((position = block_log_iter.previous()) != npos) {
+         index.write(position);
+      }
+      index.complete();
    }
 
    fc::path block_log::repair_log( const fc::path& data_dir, uint32_t truncate_at_block ) {
@@ -598,4 +594,201 @@ namespace eosio { namespace chain {
       return gs;
    }
 
+   detail::reverse_iterator::reverse_iterator()
+   : _buffer_ptr(std::make_unique<char[]>(_buf_len)) {
+   }
+
+   detail::reverse_iterator::~reverse_iterator() {
+      if (_file != nullptr) {
+         fclose(_file);
+      }
+   }
+
+   uint32_t detail::reverse_iterator::open(const fc::path& block_file_name) {
+      _block_file_name = block_file_name.generic_string();
+      _file = fopen(_block_file_name.c_str(), "r");
+      EOS_ASSERT( _file != nullptr, block_log_exception, "Could not open Block log file at '${blocks_log}'", ("blocks_log", _block_file_name) );
+      _end_of_buffer_position = _unset_position;
+
+      //read block log to see if version 1 or 2 and get first blocknum (implicit 1 if version 1)
+      _version = 0;
+      auto size = fread((char*)&_version, sizeof(_version), 1, _file);
+      EOS_ASSERT( size == 1, block_log_exception, "Block log file at '${blocks_log}' could not be read.", ("file", _block_file_name) );
+      EOS_ASSERT( _version == 1 || _version == 2, block_log_unsupported_version, "block log version ${v} is not supported", ("v", _version));
+      if (_version == 1) {
+         _first_block_num = 1;
+      }
+      else {
+         size = fread((char*)&_first_block_num, sizeof(_first_block_num), 1, _file);
+         EOS_ASSERT( size == 1, block_log_exception, "Block log file at '${blocks_log}' not formatted consistently with version ${v}.", ("file", _block_file_name)("v", _version) );
+      }
+
+      auto status = fseek(_file, 0, SEEK_END);
+      EOS_ASSERT( status == 0, block_log_exception, "Could not open Block log file at '${blocks_log}'", ("blocks_log", _block_file_name) );
+
+      _eof_position_in_file = ftell(_file);
+      EOS_ASSERT( _eof_position_in_file > 0, block_log_exception, "Block log file at '${blocks_log}' could not be read.", ("blocks_log", _block_file_name) );
+      _current_position_in_file = _eof_position_in_file - _position_size;
+
+      update_buffer();
+
+      _blocks_found = 0;
+      char* buf = _buffer_ptr.get();
+      const uint32_t index_of_pos = _current_position_in_file - _start_of_buffer_position;
+      const uint64_t block_pos = *reinterpret_cast<uint64_t*>(buf + index_of_pos);
+      uint32_t bnum;
+
+      if (block_pos == block_log::npos) {
+         return 0;
+      }
+
+      if (block_pos >= _start_of_buffer_position) {
+         const uint32_t index_of_block = block_pos - _start_of_buffer_position;
+         bnum = *reinterpret_cast<uint32_t*>(buf + index_of_block + _blknum_offset_from_pos);  //block number of previous block (is big endian)
+      }
+      else {
+         const auto blknum_offset_pos = block_pos + _blknum_offset_from_pos;
+         auto status = fseek(_file, blknum_offset_pos, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}", ("blocks_log", _block_file_name)("pos", blknum_offset_pos) );
+         auto size = fread((void*)&bnum, sizeof(bnum), 1, _file);
+         EOS_ASSERT( size == 1, block_log_exception, "Could not read in '${blocks_log}' at position: ${pos}", ("blocks_log", _block_file_name)("pos", blknum_offset_pos) );
+      }
+      _last_block_num = fc::endian_reverse_u32(bnum) + 1;                     //convert from big endian to little endian and add 1
+      _blocks_expected = _last_block_num - _first_block_num + 1;
+      return _blocks_expected;
+   }
+
+   uint64_t detail::reverse_iterator::previous() {
+      EOS_ASSERT( _current_position_in_file != block_log::npos,
+                  block_log_exception,
+                  "Block log file at '${blocks_log}' first block already returned by former call to previous(), it is no longer valid to call this function.", ("blocks_log", _block_file_name) );
+
+      if (_start_of_buffer_position > _current_position_in_file) {
+         update_buffer();
+      }
+
+      char* buf = _buffer_ptr.get();
+      auto offset = _current_position_in_file - _start_of_buffer_position;
+      uint64_t block_location_in_file = *reinterpret_cast<uint64_t*>(buf + offset);
+
+      ++_blocks_found;
+      if (block_location_in_file == block_log::npos) {
+         _current_position_in_file = block_location_in_file;
+         EOS_ASSERT( _blocks_found != _blocks_expected,
+                    block_log_exception,
+                    "Block log file at '${blocks_log}' formatting indicated last block: ${last_block_num}, first block: ${first_block_num}, but found ${num} blocks",
+                    ("blocks_log", _block_file_name)("last_block_num", _last_block_num)("first_block_num", _first_block_num)("num", _blocks_found) );
+      }
+      else {
+         const uint64_t previous_position_in_file = _current_position_in_file;
+         _current_position_in_file = block_location_in_file - _position_size;
+         EOS_ASSERT( _current_position_in_file < previous_position_in_file,
+                     block_log_exception,
+                     "Block log file at '${blocks_log}' formatting is incorrect, indicates position later location in file: ${pos}, which was retrieved at: ${orig_pos}.",
+                     ("blocks_log", _block_file_name)("pos", _current_position_in_file)("orig_pos", previous_position_in_file) );
+         if (_version == 1 && _blocks_found != _blocks_expected) {
+            _current_position_in_file = block_location_in_file = block_log::npos;
+         }
+      }
+
+      return block_location_in_file;
+   }
+
+   void detail::reverse_iterator::update_buffer() {
+      EOS_ASSERT( _current_position_in_file != block_log::npos, block_log_exception, "Block log file not setup properly" );
+
+      // since we need to read in a new section, just need to ensure the next position is at the very end of the buffer
+      _end_of_buffer_position = _current_position_in_file + _position_size;
+      if (_end_of_buffer_position < _buf_len) {
+         _start_of_buffer_position = 0;
+      }
+      else {
+         _start_of_buffer_position = _end_of_buffer_position - _buf_len;
+      }
+
+      auto status = fseek(_file, _start_of_buffer_position, SEEK_SET);
+      EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}", ("blocks_log", _block_file_name)("pos", _start_of_buffer_position) );
+      char* buf = _buffer_ptr.get();
+      auto size = fread((void*)buf, (_end_of_buffer_position - _start_of_buffer_position), 1, _file);//read tail of blocks.log file into buf
+      EOS_ASSERT( size == 1, block_log_exception, "blocks.log read fails" );
+   }
+
+   detail::index_writer::index_writer(const fc::path& block_index_name, uint32_t blocks_expected, bool report_status)
+   : _block_index_name(block_index_name.generic_string())
+   , _blocks_expected(blocks_expected)
+   , _block_written(blocks_expected)
+   , _report_status(report_status)
+   , _buffer_ptr(std::make_unique<uint64_t[]>(_max_buffer_length)) {
+   }
+
+   detail::index_writer::~index_writer() {
+      if (_file != nullptr) {
+         fclose(_file);
+      }
+   }
+
+   void detail::index_writer::write(uint64_t pos) {
+      prepare_buffer();
+      uint64_t* buffer = _buffer_ptr.get();
+      buffer[_current_position - _start_of_buffer_position] = pos;
+      --_current_position;
+      if (_report_status && (_block_written & 0xfffff) == 0) {                            //periodically print a progress indicator
+         std::cout << "block: " << std::setw(10) << _block_written << "    position in file " << std::setw(14) << pos << '\n';
+      }
+      --_block_written;
+   }
+
+   void detail::index_writer::prepare_buffer() {
+      if (_file == nullptr) {
+         _file = fopen(_block_index_name.c_str(), "w");
+         EOS_ASSERT( _file != nullptr, block_log_exception, "Could not open Block index file at '${blocks_index}'", ("blocks_index", _block_index_name) );
+         // allocate 8 bytes for each block position to store
+         const auto full_file_size = buffer_location_to_file_location(_blocks_expected);
+         auto status = fseek(_file, full_file_size, SEEK_SET);
+         EOS_ASSERT( status == 0, block_log_exception, "Could not allocate in '${blocks_index}' storage for all the blocks, size: ${size}", ("blocks_index", _block_index_name)("size", full_file_size) );
+         const auto block_end = file_location_to_buffer_location(full_file_size);
+         _current_position = block_end - 1;
+         calculate_buffer_position();
+      }
+
+      shift_buffer();
+   }
+
+   bool detail::index_writer::shift_buffer() {
+      if (_current_position >= _start_of_buffer_position) {
+         return false;
+      }
+
+      const auto file_location_start = buffer_location_to_file_location(_start_of_buffer_position);
+
+      auto status = fseek(_file, file_location_start, SEEK_SET);
+      EOS_ASSERT( status == 0, block_log_exception, "Could not navigate in '${blocks_index}' file_location_start: ${loc}, _start_of_buffer_position: ${_start_of_buffer_position}", ("blocks_index", _block_index_name)("loc", file_location_start)("_start_of_buffer_position",_start_of_buffer_position) );
+
+      const auto buffer_size = _end_of_buffer_position - _start_of_buffer_position;
+      const auto file_size = buffer_location_to_file_location(buffer_size);
+      uint64_t* buf = _buffer_ptr.get();
+      auto size = fwrite((void*)buf, file_size, 1, _file);
+      EOS_ASSERT( size == 1, block_log_exception, "Writing Block Index file '${file}' failed at location: ${loc}", ("file", _block_index_name)("loc", file_location_start) );
+      calculate_buffer_position();
+      return true;
+   }
+
+   void detail::index_writer::complete() {
+      const bool shifted = shift_buffer();
+      EOS_ASSERT(shifted, block_log_exception, "Failed to write buffer to '${blocks_index}'", ("blocks_index", _block_index_name) );
+      EOS_ASSERT(_current_position == -1,
+                 block_log_exception,
+                 "Should have written buffer, starting at the 0 index block position, to '${blocks_index}' but instead writing ${pos} position",
+                 ("blocks_index", _block_index_name)("pos", _current_position) );
+   }
+
+   void detail::index_writer::calculate_buffer_position() {
+      _end_of_buffer_position = _current_position + 1;
+      if (_end_of_buffer_position < _max_buffer_length) {
+         _start_of_buffer_position = 0;
+      }
+      else {
+         _start_of_buffer_position = _end_of_buffer_position - _max_buffer_length;
+      }
+   }
 } } /// eosio::chain
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index 7a61bc9c165..0c4ca853828 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -69,7 +69,7 @@ namespace eosio { namespace chain {
 
          static genesis_state extract_genesis_state( const fc::path& data_dir );
 
-         static void construct_index(const fc::path& block_log_path, const fc::path& index_file_name);
+         static void construct_index(const fc::path& block_file_name, const fc::path& index_file_name, bool provide_index_log_status = false);
 
       private:
          void open(const fc::path& data_dir);
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 610c3584a18..19540142f47 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -715,7 +715,9 @@ int main(int argc, char** argv) {
              out_file = vmap.at("output-file").as<bfs::path>();
 
          report_time rt("making index");
-         block_log::construct_index(block_file.generic_string(), out_file.generic_string());
+         std::cout << "\nWill read existing blocks.log file " << block_file << '\n';
+         std::cout << "Will write new blocks.index file " << out_file << '\n';
+         block_log::construct_index(block_file.generic_string(), out_file.generic_string(), true);
          rt.report();
          return 0;
       }

From 1afee433ef1d5b4e50609e6a78641fe8dce7b180 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 8 Jul 2019 10:49:44 -0500
Subject: [PATCH 0772/1648] Fixed error with reporting version before it was
 read.

---
 libraries/chain/block_log.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index a8b2f91a878..83f94355a1b 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -386,11 +386,12 @@ namespace eosio { namespace chain {
 
    void block_log::construct_index(const fc::path& block_file_name, const fc::path& index_file_name, bool provide_index_log_status) {
       detail::reverse_iterator block_log_iter;
+
+      const uint32_t num_blocks = block_log_iter.open(block_file_name);
       if (provide_index_log_status) {
          std::cout << "\nblock log version= " << block_log_iter.version() << '\n';
       }
 
-      const uint32_t num_blocks = block_log_iter.open(block_file_name);
       if (num_blocks == 0) {
          return;
       }

From 05cd03759a47b691d4a13f73b04aa46818c48feb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 8 Jul 2019 16:05:39 -0400
Subject: [PATCH 0773/1648] Remove dead code

---
 plugins/net_plugin/net_plugin.cpp | 37 ++++---------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 1eac170b1be..6086c99c9f5 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -985,11 +985,11 @@ namespace eosio {
       std::tie( std::ignore, std::ignore, head_num,
                 std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
 
-      notice_message note;
-      note.known_blocks.mode = normal;
-      note.known_blocks.pending = 0;
       fc_dlog(logger, "head_num = ${h}",("h",head_num));
       if(head_num == 0) {
+         notice_message note;
+         note.known_blocks.mode = normal;
+         note.known_blocks.pending = 0;
          enqueue(note);
          return;
       }
@@ -2026,9 +2026,9 @@ namespace eosio {
          return;
       }
       if (msg.known_blocks.mode == normal) {
-         req.req_blocks.mode = normal;
          // known_blocks.ids is never > 1
          if( !msg.known_blocks.ids.empty() ) {
+            req.req_blocks.mode = normal;
             const block_id_type& blkid = msg.known_blocks.ids.back();
             if( have_block( blkid )) {
                add_peer_block( blkid, c->connection_id );
@@ -2039,35 +2039,6 @@ namespace eosio {
             if( msg.known_blocks.pending == 1 ) { // block id notify
                return;
             }
-            connection_wptr weak = c;
-            app().post( priority::low, [this, msg{std::move(msg)}, req{std::move(req)}, weak{std::move(weak)}]() mutable {
-               connection_ptr c = weak.lock();
-               if( !c ) return;
-               const block_id_type& blkid = msg.known_blocks.ids.back();
-               signed_block_ptr b;
-               try {
-                  controller& cc = my_impl->chain_plug->chain();
-                  b = cc.fetch_block_by_id( blkid ); // if exists
-                  if( b ) {
-                     add_peer_block( blkid, c->connection_id );
-                  }
-               } catch( const assert_exception& ex ) {
-                  fc_ilog( logger, "caught assert on fetch_block_by_id, ${ex}", ("ex", ex.what()) );
-                  // keep going, client can ask another peer
-               } catch( ... ) {
-                  fc_elog( logger, "failed to retrieve block for id" );
-               }
-               if( !b ) {
-                  req.req_blocks.ids.push_back( blkid );
-                  c->strand.post( [req{std::move(req)}, c{std::move(c)}]() mutable {
-                     fc_dlog( logger, "send req" );
-                     c->enqueue( req );
-                     c->fetch_wait();
-                     std::lock_guard<std::mutex> g( c->conn_mtx );
-                     c->last_req = std::move( req );
-                  });
-               }
-            });
          }
       } else if (msg.known_blocks.mode != none) {
          fc_elog( logger, "passed a notice_message with something other than a normal on none known_blocks" );

From 1323caad25af4de137811abe6f04959c949f83a9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 8 Jul 2019 17:21:22 -0400
Subject: [PATCH 0774/1648] Fix have_block to correctly look up have_block
 value

---
 plugins/net_plugin/net_plugin.cpp | 43 +++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6086c99c9f5..228b370cc52 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -101,16 +101,24 @@ namespace eosio {
       bool          have_block = false; // true if we have received the block, false if only received id notification
    };
 
+   struct by_block_id;
+
    typedef multi_index_container<
       eosio::peer_block_state,
       indexed_by<
          ordered_unique< tag<by_id>,
                composite_key< peer_block_state,
-                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
                      member<peer_block_state, uint32_t, &eosio::peer_block_state::connection_id>,
+                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>
+               >,
+               composite_key_compare< std::less<uint32_t>, sha256_less >
+         >,
+         ordered_non_unique< tag<by_block_id>,
+               composite_key< peer_block_state,
+                     member<peer_block_state, block_id_type, &eosio::peer_block_state::id>,
                      member<peer_block_state, bool, &eosio::peer_block_state::have_block>
                >,
-               composite_key_compare< sha256_less, std::less<uint32_t>, std::greater<bool> >
+               composite_key_compare< sha256_less, std::greater<bool> >
          >,
          ordered_non_unique< tag<by_block_num>, member<eosio::peer_block_state, uint32_t, &eosio::peer_block_state::block_num > >
       >
@@ -188,6 +196,7 @@ namespace eosio {
       bool add_peer_block_id( const block_id_type& blkid, uint32_t connection_id );
       bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
       bool have_block(const block_id_type& blkid);
+      size_t num_entries( uint32_t connection_id );
 
       bool add_peer_txn( const node_transaction_state& nts );
       void update_txns_block_num( const signed_block_ptr& sb );
@@ -380,6 +389,7 @@ namespace eosio {
    constexpr auto     def_max_read_delays = 100; // number of times read_delay_timer started without any reads
    constexpr auto     def_max_consecutive_rejected_blocks = 3; // num of rejected blocks before disconnect
    constexpr auto     def_max_consecutive_immediate_connection_close = 9; // back off if client keeps closing
+   constexpr auto     def_max_peer_block_ids_per_connection = 1*1024*1024; // if we reach this many then the connection is spaming us, disconnect
    constexpr auto     def_max_clients = 25; // 0 for unlimited clients
    constexpr auto     def_max_nodes_per_host = 1;
    constexpr auto     def_conn_retry_wait = 30;
@@ -1661,12 +1671,6 @@ namespace eosio {
       fc_ilog( logger, "sync_manager got ${m} block notice", ("m", modes_str( msg.known_blocks.mode )) );
       EOS_ASSERT( msg.known_blocks.mode == catch_up || msg.known_blocks.mode == last_irr_catch_up, plugin_exception,
                   "sync_recv_notice only called on catch_up" );
-      if( msg.known_blocks.ids.size() > 1 ) {
-         fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
-                  ("s", msg.known_blocks.ids.size())("p", c->peer_address()) );
-         c->close();
-         return;
-      }
       if (msg.known_blocks.mode == catch_up) {
          if (msg.known_blocks.ids.size() == 0) {
             fc_elog( logger,"got a catch up with ids size = 0" );
@@ -1775,7 +1779,7 @@ namespace eosio {
    // thread safe
    bool dispatch_manager::add_peer_block( const block_id_type& blkid, uint32_t connection_id) {
       std::lock_guard<std::mutex> g( blk_state_mtx );
-      auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(blkid), connection_id));
+      auto bptr = blk_state.get<by_id>().find( std::make_tuple( connection_id, std::ref( blkid )));
       bool added = (bptr == blk_state.end());
       if( added ) {
          blk_state.insert( {blkid, block_header::num_from_id( blkid ), connection_id, true} );
@@ -1789,7 +1793,7 @@ namespace eosio {
 
    bool dispatch_manager::add_peer_block_id( const block_id_type& blkid, uint32_t connection_id) {
       std::lock_guard<std::mutex> g( blk_state_mtx );
-      auto bptr = blk_state.get<by_id>().find(std::make_tuple(std::ref(blkid), connection_id));
+      auto bptr = blk_state.get<by_id>().find( std::make_tuple( connection_id, std::ref( blkid )));
       bool added = (bptr == blk_state.end());
       if( added ) {
          blk_state.insert( {blkid, block_header::num_from_id( blkid ), connection_id, false} );
@@ -1799,19 +1803,26 @@ namespace eosio {
 
    bool dispatch_manager::peer_has_block( const block_id_type& blkid, uint32_t connection_id ) {
       std::lock_guard<std::mutex> g(blk_state_mtx);
-      auto blk_itr = blk_state.get<by_id>().find(std::make_tuple(std::ref(blkid), connection_id));
+      auto blk_itr = blk_state.get<by_id>().find( std::make_tuple( connection_id, std::ref( blkid )));
       return blk_itr != blk_state.end();
    }
 
    bool dispatch_manager::have_block( const block_id_type& blkid ) {
       std::lock_guard<std::mutex> g(blk_state_mtx);
-      auto blk_itr = blk_state.get<by_id>().find( blkid );
-      if( blk_itr != blk_state.end() ) {
+      // by_block_id sorts have_block by greater so have_block == true will be the first one found
+      auto& index = blk_state.get<by_block_id>();
+      auto blk_itr = index.find( blkid );
+      if( blk_itr != index.end() ) {
          return blk_itr->have_block;
       }
       return false;
    }
 
+   size_t dispatch_manager::num_entries( uint32_t connection_id ) {
+      std::lock_guard<std::mutex> g(blk_state_mtx);
+      return blk_state.get<by_id>().count( connection_id );
+   }
+
    bool dispatch_manager::add_peer_txn( const node_transaction_state& nts ) {
       std::lock_guard<std::mutex> g( local_txns_mtx );
       auto tptr = local_txns.get<by_id>().find( std::make_tuple( std::ref( nts.id ), nts.connection_id ) );
@@ -2655,6 +2666,12 @@ namespace eosio {
       //
       peer_ilog( this, "received notice_message" );
       connecting = false;
+      if( msg.known_blocks.ids.size() > 1 ) {
+         fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
+                  ("s", msg.known_blocks.ids.size())("p", peer_address()) );
+         close( false );
+         return;
+      }
       if( msg.known_trx.mode != none ) {
          fc_dlog( logger, "this is a ${m} notice with ${n} transactions",
                   ("m", modes_str( msg.known_trx.mode ))( "n", msg.known_trx.pending ) );

From 1315d2c3c6e2f7fb5b1cdfcc89bda07216169535 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 8 Jul 2019 17:24:18 -0400
Subject: [PATCH 0775/1648] indicate in brew bottle mojave is required

---
 scripts/generate_bottle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate_bottle.sh b/scripts/generate_bottle.sh
index 034ea7bc935..9371f929eb8 100644
--- a/scripts/generate_bottle.sh
+++ b/scripts/generate_bottle.sh
@@ -46,7 +46,7 @@ echo "class Eosio < Formula
    depends_on \"gettext\"
    depends_on \"openssl\"
    depends_on \"libusb\"
-   depends_on :macos => :high_sierra
+   depends_on :macos => :mojave
    depends_on :arch =>  :intel
 
    bottle do

From 6c7251661f452cec7eeb0ab3e35643c6a3debff3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 8 Jul 2019 17:51:08 -0400
Subject: [PATCH 0776/1648] Add protection agaisnt spamming notice_message

---
 plugins/net_plugin/net_plugin.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 228b370cc52..4eb78189d08 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2026,12 +2026,7 @@ namespace eosio {
 
    // called from connection strand
    void dispatch_manager::recv_notice(const connection_ptr& c, const notice_message& msg, bool generated) {
-      request_message req;
-      req.req_trx.mode = none;
-      req.req_blocks.mode = none;
       if (msg.known_trx.mode == normal) {
-         req.req_trx.mode = normal;
-         req.req_trx.pending = 0;
       } else if (msg.known_trx.mode != none) {
          fc_elog( logger, "passed a notice_message with something other than a normal on none known_trx" );
          return;
@@ -2039,7 +2034,10 @@ namespace eosio {
       if (msg.known_blocks.mode == normal) {
          // known_blocks.ids is never > 1
          if( !msg.known_blocks.ids.empty() ) {
-            req.req_blocks.mode = normal;
+            if( num_entries( c->connection_id ) > def_max_peer_block_ids_per_connection ) {
+               fc_elog( logger, "received too many notice_messages, diconnecting" );
+               c->close( false );
+            }
             const block_id_type& blkid = msg.known_blocks.ids.back();
             if( have_block( blkid )) {
                add_peer_block( blkid, c->connection_id );

From fc6e6cc3a99d782996b729cb8d98a04662ba8e94 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 8 Jul 2019 20:28:18 -0400
Subject: [PATCH 0777/1648] use explicit billing for unapplied and deferred
 transactions that are applied within base_test::_produce_block

---
 libraries/testing/tester.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index bb3ff700a89..3ef990ebfa8 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -248,7 +248,7 @@ namespace eosio { namespace testing {
       if( !skip_pending_trxs ) {
          unapplied_transactions_type unapplied_trxs = control->get_unapplied_transactions(); // make copy of map
          for (const auto& entry : unapplied_trxs ) {
-            auto trace = control->push_transaction(entry.second, fc::time_point::maximum());
+            auto trace = control->push_transaction(entry.second, fc::time_point::maximum(), DEFAULT_BILLED_CPU_TIME_US );
             if(trace->except) {
                trace->except->dynamic_rethrow_exception();
             }
@@ -257,7 +257,7 @@ namespace eosio { namespace testing {
          vector<transaction_id_type> scheduled_trxs;
          while( (scheduled_trxs = get_scheduled_transactions() ).size() > 0 ) {
             for (const auto& trx : scheduled_trxs ) {
-               auto trace = control->push_scheduled_transaction(trx, fc::time_point::maximum());
+               auto trace = control->push_scheduled_transaction(trx, fc::time_point::maximum(), DEFAULT_BILLED_CPU_TIME_US);
                if(trace->except) {
                   trace->except->dynamic_rethrow_exception();
                }

From 3d98abbb3d2054866f3836162d17c88000a0f8a2 Mon Sep 17 00:00:00 2001
From: Aaron Fu <aaron.fu@block.one>
Date: Tue, 9 Jul 2019 16:57:07 +0800
Subject: [PATCH 0778/1648] change hardcoded currency symbol in
 testnet.template into a variable

---
 testnet.template | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 testnet.template

diff --git a/testnet.template b/testnet.template
old mode 100644
new mode 100755
index 574d7ec9795..26900c00ea1
--- a/testnet.template
+++ b/testnet.template
@@ -17,6 +17,11 @@ if [ -z "$bioscontractpath" ]; then
     bioscontractpath="unittests/contracts/eosio.bios"
 fi
 
+bioscurrencysymbol=$BIOS_CURRENCY_SYMBOL
+if [ -z "$bioscurrencysymbol" ]; then
+    bioscurrencysymbol="SYS"
+fi
+
 wddir=eosio-ignition-wd
 wdaddr=localhost:8899
 wdurl=http://$wdaddr
@@ -63,7 +68,7 @@ wcmd () {
 }
 
 cacmd () {
-    programs/cleos/cleos  --wallet-url $wdurl --url http://$bioshost:$biosport system newaccount --transfer --stake-net "10000000.0000 SYS" --stake-cpu "10000000.0000 SYS"  --buy-ram "10000000.0000 SYS" eosio $* >> $logfile 2>&1
+    programs/cleos/cleos  --wallet-url $wdurl --url http://$bioshost:$biosport system newaccount --transfer --stake-net "10000000.0000 "$bioscurrencysymbol --stake-cpu "10000000.0000 "$bioscurrencysymbol  --buy-ram "10000000.0000 "$bioscurrencysymbol eosio $* >> $logfile 2>&1
     ecmd system regproducer $1 $2
     ecmd system voteproducer prods $1 $1
 }
@@ -112,16 +117,16 @@ ecmd set contract eosio.msig unittests/contracts/eosio.msig eosio.msig.wasm eosi
 ecmd set contract eosio.wrap unittests/contracts/eosio.wrap eosio.wrap.wasm eosio.wrap.abi
 
 echo ===== Start: $step ============ >> $logfile
-echo executing: cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio.token create '[ "eosio", "10000000000.0000 SYS" ]' -p eosio.token | tee -a $logfile
-echo executing: cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio.token issue '[ "eosio", "1000000000.0000 SYS", "memo" ]' -p eosio | tee -a $logfile
+echo executing: cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio.token create '[ "eosio", "10000000000.0000 '$bioscurrencysymbol'" ]' -p eosio.token | tee -a $logfile
+echo executing: cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio.token issue '[ "eosio", "1000000000.0000 '$bioscurrencysymbol'", "memo" ]' -p eosio | tee -a $logfile
 echo ----------------------- >> $logfile
-programs/cleos/cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio.token create '[ "eosio", "10000000000.0000 SYS" ]' -p eosio.token >> $logfile 2>&1
-programs/cleos/cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio.token issue '[ "eosio", "1000000000.0000 SYS", "memo" ]' -p eosio >> $logfile 2>&1
+programs/cleos/cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio.token create '[ "eosio", "10000000000.0000 '$bioscurrencysymbol'" ]' -p eosio.token >> $logfile 2>&1
+programs/cleos/cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio.token issue '[ "eosio", "1000000000.0000 '$bioscurrencysymbol'", "memo" ]' -p eosio >> $logfile 2>&1
 echo ==== End: $step ============== >> $logfile
 step=$(($step + 1))
 
 ecmd set contract eosio unittests/contracts/eosio.system eosio.system.wasm eosio.system.abi
-programs/cleos/cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio init '[0, "4,SYS"]' -p eosio >> $logfile 2>&1
+programs/cleos/cleos --wallet-url $wdurl --url http://$bioshost:$biosport push action eosio init '[0, "4,'$bioscurrencysymbol'"]' -p eosio >> $logfile 2>&1
 
 # Manual deployers, add a series of lines below this block that looks like:
 #    cacmd $PRODNAME[0] $OWNERKEY[0] $ACTIVEKEY[0]

From 52f5aa7933fe33fed13b0394a2dfeadd29bf0037 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 9 Jul 2019 08:49:23 -0400
Subject: [PATCH 0779/1648] Fix spelling

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4eb78189d08..1d235bc49eb 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2035,7 +2035,7 @@ namespace eosio {
          // known_blocks.ids is never > 1
          if( !msg.known_blocks.ids.empty() ) {
             if( num_entries( c->connection_id ) > def_max_peer_block_ids_per_connection ) {
-               fc_elog( logger, "received too many notice_messages, diconnecting" );
+               fc_elog( logger, "received too many notice_messages, disconnecting" );
                c->close( false );
             }
             const block_id_type& blkid = msg.known_blocks.ids.back();

From 699219405a87261d3c648fb011d9faa06ce8ebe1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 9 Jul 2019 11:53:34 -0400
Subject: [PATCH 0780/1648] Call resolve on connection strand

---
 plugins/net_plugin/net_plugin.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f1019c47d1c..d3b2846c68c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2094,17 +2094,19 @@ namespace eosio {
          }
       }
 
-      string::size_type colon2 = peer_address().find(':', colon + 1);
-      string host = peer_address().substr( 0, colon );
-      string port = peer_address().substr( colon + 1, colon2 == string::npos ? string::npos : colon2 - (colon + 1));
-      idump((host)(port));
-      set_connection_type( peer_address() );
-      tcp::resolver::query query( tcp::v4(), host, port );
-      // Note: need to add support for IPv6 too
-
-      auto resolver = std::make_shared<tcp::resolver>( my_impl->thread_pool->get_executor() );
-      connection_wptr weak_conn = c;
-      resolver->async_resolve( query, boost::asio::bind_executor( strand,
+      strand.post([c]() {
+         string::size_type colon = c->peer_address().find(':');
+         string::size_type colon2 = c->peer_address().find(':', colon + 1);
+         string host = c->peer_address().substr( 0, colon );
+         string port = c->peer_address().substr( colon + 1, colon2 == string::npos ? string::npos : colon2 - (colon + 1));
+         idump((host)(port));
+         c->set_connection_type( c->peer_address() );
+         tcp::resolver::query query( tcp::v4(), host, port );
+         // Note: need to add support for IPv6 too
+
+         auto resolver = std::make_shared<tcp::resolver>( my_impl->thread_pool->get_executor() );
+         connection_wptr weak_conn = c;
+         resolver->async_resolve( query, boost::asio::bind_executor( c->strand,
             [resolver, weak_conn]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
                auto c = weak_conn.lock();
                if( !c ) return;
@@ -2114,7 +2116,8 @@ namespace eosio {
                   fc_elog( logger, "Unable to resolve ${add}: ${error}", ("add", c->peer_name())( "error", err.message() ) );
                   ++c->consecutive_immediate_connection_close;
                }
-            } ) );
+         } ) );
+      } );
       return true;
    }
 

From 6083e77f5787df01ee76018878bd6b2d2c868570 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 9 Jul 2019 14:22:22 -0400
Subject: [PATCH 0781/1648] additional wasm unittests around max depth

Add some additional unittests around the wasm max depth. Of particular interest is a check that ensures intrinsics are counted against the depth -- in the current injected architecture depth checks happen before calls, so an intrinsic call can still cause depth check to fail. A non-injected runtime needs to ensure it follows this behavior still.
---
 unittests/contracts/test_wasts.hpp | 78 ++++++++++++++++++++++++++++++
 unittests/wasm_tests.cpp           | 52 ++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/unittests/contracts/test_wasts.hpp b/unittests/contracts/test_wasts.hpp
index b1272a7afef..8c7e4fddcc6 100644
--- a/unittests/contracts/test_wasts.hpp
+++ b/unittests/contracts/test_wasts.hpp
@@ -646,4 +646,82 @@ static const char large_maligned_host_ptr[] = R"=====(
    ))
  )
 )
+)=====";
+
+static const char depth_assert_wasm[] = R"=====(
+(module
+ (export "apply" (func $$apply))
+ (func $$apply (param $$0 i64) (param $$1 i64) (param $$2 i64)
+  (if (i64.eq (get_global $$depth) (i64.const 0)) (then
+    (return)
+  ))
+  (set_global $$depth
+   (i64.sub
+    (get_global $$depth)
+    (i64.const 1)
+   )
+  )
+  (call $$apply
+   (get_local $$0)
+   (get_local $$1)
+   (get_local $$2)
+  )
+ )
+ (global $$depth (mut i64) (i64.const ${MAX_DEPTH}))
+)
+)=====";
+
+static const char depth_assert_intrinsic[] = R"=====(
+(module
+ (import "env" "current_time" (func $$current_time (result i64)))
+ (export "apply" (func $$apply))
+ (func $$apply (param $$0 i64) (param $$1 i64) (param $$2 i64)
+  (if (i64.eq (get_global $$depth) (i64.const 1)) (then
+    (drop (call $$current_time))
+    (return)
+  ))
+  (set_global $$depth
+   (i64.sub
+    (get_global $$depth)
+    (i64.const 1)
+   )
+  )
+  (call $$apply
+   (get_local $$0)
+   (get_local $$1)
+   (get_local $$2)
+  )
+ )
+ (global $$depth (mut i64) (i64.const ${MAX_DEPTH}))
+)
+)=====";
+
+static const char depth_assert_wasm_float[] = R"=====(
+(module
+ (export "apply" (func $$apply))
+ (func $$apply (param $$0 i64) (param $$1 i64) (param $$2 i64)
+  (set_global $$mcfloaty
+   (f64.mul
+    (get_global $$mcfloaty)
+    (f64.const 3.1415)
+   )
+  )
+  (if (i64.eq (get_global $$depth) (i64.const 0)) (then
+    (return)
+  ))
+  (set_global $$depth
+   (i64.sub
+    (get_global $$depth)
+    (i64.const 1)
+   )
+  )
+  (call $$apply
+   (get_local $$0)
+   (get_local $$1)
+   (get_local $$2)
+  )
+ )
+ (global $$depth (mut i64) (i64.const ${MAX_DEPTH}))
+ (global $$mcfloaty (mut f64) (f64.const 3.14))
+)
 )=====";
\ No newline at end of file
diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index 4ff0ee2bd75..940ac04f544 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -1742,6 +1742,58 @@ BOOST_FIXTURE_TEST_CASE( big_maligned_host_ptr, TESTER ) try {
    produce_blocks(1);
 } FC_LOG_AND_RETHROW()
 
+BOOST_FIXTURE_TEST_CASE( depth_tests, TESTER ) try {
+   produce_block();
+   create_accounts( {N(depth)} );
+   produce_block();
+
+   signed_transaction trx;
+   trx.actions.emplace_back(vector<permission_level>{{N(depth),config::active_name}}, N(depth), N(), bytes{});
+   trx.actions[0].authorization = vector<permission_level>{{N(depth),config::active_name}};
+
+    auto pushit = [&]() {
+      produce_block();
+      trx.signatures.clear();
+      set_transaction_headers(trx);
+      trx.sign(get_private_key(N(depth), "active"), control->get_chain_id());
+      push_transaction(trx);
+   };
+
+   //strictly wasm recursion to maximum_call_depth & maximum_call_depth+1
+   string wasm_depth_okay = fc::format_string(depth_assert_wasm, fc::mutable_variant_object()
+                                              ("MAX_DEPTH", eosio::chain::wasm_constraints::maximum_call_depth));
+   set_code(N(depth), wasm_depth_okay.c_str());
+   pushit();
+
+   string wasm_depth_one_over = fc::format_string(depth_assert_wasm, fc::mutable_variant_object()
+                                              ("MAX_DEPTH", eosio::chain::wasm_constraints::maximum_call_depth+1));
+   set_code(N(depth), wasm_depth_one_over.c_str());
+   BOOST_CHECK_THROW(pushit(), wasm_execution_error);
+
+   //wasm recursion but call an intrinsic as the last function instead
+   string intrinsic_depth_okay = fc::format_string(depth_assert_intrinsic, fc::mutable_variant_object()
+                                              ("MAX_DEPTH", eosio::chain::wasm_constraints::maximum_call_depth));
+   set_code(N(depth), intrinsic_depth_okay.c_str());
+   pushit();
+
+   string intrinsic_depth_one_over = fc::format_string(depth_assert_intrinsic, fc::mutable_variant_object()
+                                              ("MAX_DEPTH", eosio::chain::wasm_constraints::maximum_call_depth+1));
+   set_code(N(depth), intrinsic_depth_one_over.c_str());
+   BOOST_CHECK_THROW(pushit(), wasm_execution_error);
+
+   //add a float operation in the mix to ensure any injected softfloat call doesn't count against limit
+   string wasm_float_depth_okay = fc::format_string(depth_assert_wasm_float, fc::mutable_variant_object()
+                                              ("MAX_DEPTH", eosio::chain::wasm_constraints::maximum_call_depth));
+   set_code(N(depth), wasm_float_depth_okay.c_str());
+   pushit();
+
+   string wasm_float_depth_one_over = fc::format_string(depth_assert_wasm_float, fc::mutable_variant_object()
+                                              ("MAX_DEPTH", eosio::chain::wasm_constraints::maximum_call_depth+1));
+   set_code(N(depth), wasm_float_depth_one_over.c_str());
+   BOOST_CHECK_THROW(pushit(), wasm_execution_error);
+
+} FC_LOG_AND_RETHROW()
+
 // TODO: restore net_usage_tests
 #if 0
 BOOST_FIXTURE_TEST_CASE(net_usage_tests, tester ) try {

From 5cd0a6e911bd53d20244d5f4ec66e105add7169a Mon Sep 17 00:00:00 2001
From: cc32d9 <cc32d9@gmail.com>
Date: Thu, 27 Jun 2019 12:55:34 +0000
Subject: [PATCH 0782/1648] bios-boot-tutorial.py: bugfix, SYS hardcoded
 instead of using command line arg

---
 tutorials/bios-boot-tutorial/bios-boot-tutorial.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/bios-boot-tutorial/bios-boot-tutorial.py b/tutorials/bios-boot-tutorial/bios-boot-tutorial.py
index 6be44a2d79e..321160429fc 100755
--- a/tutorials/bios-boot-tutorial/bios-boot-tutorial.py
+++ b/tutorials/bios-boot-tutorial/bios-boot-tutorial.py
@@ -297,7 +297,7 @@ def stepSetSystemContract():
     sleep(1)
     run(args.cleos + 'push action eosio setpriv' + jsonArg(['eosio.msig', 1]) + '-p eosio@active')
 def stepInitSystemContract():
-    run(args.cleos + 'push action eosio init' + jsonArg(['0', '4,SYS']) + '-p eosio@active')
+    run(args.cleos + 'push action eosio init' + jsonArg(['0', '4,' + args.symbol]) + '-p eosio@active')
     sleep(1)
 def stepCreateStakedAccounts():
     createStakedAccounts(0, len(accounts))

From ce2fc68e77ef98975b15e8b5008339b7775c1b4e Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 9 Jul 2019 14:21:06 -0500
Subject: [PATCH 0783/1648] Cleaned up logging and added unique_ptr for PR
 comments.

---
 libraries/chain/block_log.cpp                 | 101 ++++++++----------
 .../chain/include/eosio/chain/block_log.hpp   |   2 +-
 programs/eosio-blocklog/main.cpp              |   7 +-
 3 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 83f94355a1b..db388f24754 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -26,6 +26,8 @@ namespace eosio { namespace chain {
    const uint32_t block_log::max_supported_version = 2;
 
    namespace detail {
+      using unique_file = std::unique_ptr<FILE, decltype(&fclose)>;
+
       class block_log_impl {
          public:
             signed_block_ptr         head;
@@ -74,7 +76,6 @@ namespace eosio { namespace chain {
       class reverse_iterator {
       public:
          reverse_iterator();
-         ~reverse_iterator();
          // open a block log file and return the total number of blocks in it
          uint32_t open(const fc::path& block_file_name);
          uint64_t previous();
@@ -83,7 +84,7 @@ namespace eosio { namespace chain {
       private:
          void update_buffer();
 
-         FILE*                          _file                             = nullptr;
+         unique_file                    _file;
          uint32_t                       _version                          = 0;
          uint32_t                       _first_block_num                  = 0;
          uint32_t                       _last_block_num                   = 0;
@@ -106,26 +107,24 @@ namespace eosio { namespace chain {
 
       class index_writer {
       public:
-         index_writer(const fc::path& block_index_name, uint32_t blocks_expected, bool report_status);
-         ~index_writer();
+         index_writer(const fc::path& block_index_name, uint32_t blocks_expected);
          void write(uint64_t pos);
          void complete();
-         void calculate_buffer_position();
+         void update_buffer_position();
       private:
          void prepare_buffer();
          bool shift_buffer();
 
-         FILE*                              _file              = nullptr;
+         unique_file                        _file;
          const std::string                  _block_index_name;
          const uint32_t                     _blocks_expected;
          uint32_t                           _block_written;
-         bool                               _report_status;
          std::unique_ptr<uint64_t[]>        _buffer_ptr;
-         int64_t                            _current_position;
-         int64_t                            _start_of_buffer_position;
-         int64_t                            _end_of_buffer_position;
-         constexpr static uint64_t          _buffer_bytes      = 1U << 22;
-         constexpr static uint64_t          _max_buffer_length = file_location_to_buffer_location(_buffer_bytes);
+         int64_t                            _current_position         = 0;
+         int64_t                            _start_of_buffer_position = 0;
+         int64_t                            _end_of_buffer_position   = 0;
+         constexpr static uint64_t          _buffer_bytes             = 1U << 22;
+         constexpr static uint64_t          _max_buffer_length        = file_location_to_buffer_location(_buffer_bytes);
       };
    }
 
@@ -384,23 +383,24 @@ namespace eosio { namespace chain {
       my->reopen();
    } // construct_index
 
-   void block_log::construct_index(const fc::path& block_file_name, const fc::path& index_file_name, bool provide_index_log_status) {
+   void block_log::construct_index(const fc::path& block_file_name, const fc::path& index_file_name) {
       detail::reverse_iterator block_log_iter;
 
+      ilog("Will read existing blocks.log file ${file}", ("file", block_file_name.generic_string()));
+      ilog("Will write new blocks.index file ${file}", ("file", index_file_name.generic_string()));
+
       const uint32_t num_blocks = block_log_iter.open(block_file_name);
-      if (provide_index_log_status) {
-         std::cout << "\nblock log version= " << block_log_iter.version() << '\n';
-      }
+
+      ilog("block log version= ${version}", ("version", block_log_iter.version()));
 
       if (num_blocks == 0) {
          return;
       }
 
-      if (provide_index_log_status) {
-         std::cout << "\nfirst block= " << block_log_iter.first_block_num() << ", last block= " << (block_log_iter.first_block_num() + num_blocks) << "\n\n";
-      }
+      ilog("first block= ${first}         last block= ${last}",
+           ("first", block_log_iter.first_block_num())("last", (block_log_iter.first_block_num() + num_blocks)));
 
-      detail::index_writer index(index_file_name, num_blocks, provide_index_log_status);
+      detail::index_writer index(index_file_name, num_blocks);
       uint64_t position;
       while ((position = block_log_iter.previous()) != npos) {
          index.write(position);
@@ -596,38 +596,33 @@ namespace eosio { namespace chain {
    }
 
    detail::reverse_iterator::reverse_iterator()
-   : _buffer_ptr(std::make_unique<char[]>(_buf_len)) {
-   }
-
-   detail::reverse_iterator::~reverse_iterator() {
-      if (_file != nullptr) {
-         fclose(_file);
-      }
+   : _file(nullptr, &fclose)
+   , _buffer_ptr(std::make_unique<char[]>(_buf_len)) {
    }
 
    uint32_t detail::reverse_iterator::open(const fc::path& block_file_name) {
       _block_file_name = block_file_name.generic_string();
-      _file = fopen(_block_file_name.c_str(), "r");
-      EOS_ASSERT( _file != nullptr, block_log_exception, "Could not open Block log file at '${blocks_log}'", ("blocks_log", _block_file_name) );
+      _file.reset(fopen(_block_file_name.c_str(), "r"));
+      EOS_ASSERT( _file, block_log_exception, "Could not open Block log file at '${blocks_log}'", ("blocks_log", _block_file_name) );
       _end_of_buffer_position = _unset_position;
 
       //read block log to see if version 1 or 2 and get first blocknum (implicit 1 if version 1)
       _version = 0;
-      auto size = fread((char*)&_version, sizeof(_version), 1, _file);
+      auto size = fread((char*)&_version, sizeof(_version), 1, _file.get());
       EOS_ASSERT( size == 1, block_log_exception, "Block log file at '${blocks_log}' could not be read.", ("file", _block_file_name) );
       EOS_ASSERT( _version == 1 || _version == 2, block_log_unsupported_version, "block log version ${v} is not supported", ("v", _version));
       if (_version == 1) {
          _first_block_num = 1;
       }
       else {
-         size = fread((char*)&_first_block_num, sizeof(_first_block_num), 1, _file);
+         size = fread((char*)&_first_block_num, sizeof(_first_block_num), 1, _file.get());
          EOS_ASSERT( size == 1, block_log_exception, "Block log file at '${blocks_log}' not formatted consistently with version ${v}.", ("file", _block_file_name)("v", _version) );
       }
 
-      auto status = fseek(_file, 0, SEEK_END);
+      auto status = fseek(_file.get(), 0, SEEK_END);
       EOS_ASSERT( status == 0, block_log_exception, "Could not open Block log file at '${blocks_log}'", ("blocks_log", _block_file_name) );
 
-      _eof_position_in_file = ftell(_file);
+      _eof_position_in_file = ftell(_file.get());
       EOS_ASSERT( _eof_position_in_file > 0, block_log_exception, "Block log file at '${blocks_log}' could not be read.", ("blocks_log", _block_file_name) );
       _current_position_in_file = _eof_position_in_file - _position_size;
 
@@ -649,9 +644,9 @@ namespace eosio { namespace chain {
       }
       else {
          const auto blknum_offset_pos = block_pos + _blknum_offset_from_pos;
-         auto status = fseek(_file, blknum_offset_pos, SEEK_SET);
+         auto status = fseek(_file.get(), blknum_offset_pos, SEEK_SET);
          EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}", ("blocks_log", _block_file_name)("pos", blknum_offset_pos) );
-         auto size = fread((void*)&bnum, sizeof(bnum), 1, _file);
+         auto size = fread((void*)&bnum, sizeof(bnum), 1, _file.get());
          EOS_ASSERT( size == 1, block_log_exception, "Could not read in '${blocks_log}' at position: ${pos}", ("blocks_log", _block_file_name)("pos", blknum_offset_pos) );
       }
       _last_block_num = fc::endian_reverse_u32(bnum) + 1;                     //convert from big endian to little endian and add 1
@@ -707,49 +702,43 @@ namespace eosio { namespace chain {
          _start_of_buffer_position = _end_of_buffer_position - _buf_len;
       }
 
-      auto status = fseek(_file, _start_of_buffer_position, SEEK_SET);
+      auto status = fseek(_file.get(), _start_of_buffer_position, SEEK_SET);
       EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}", ("blocks_log", _block_file_name)("pos", _start_of_buffer_position) );
       char* buf = _buffer_ptr.get();
-      auto size = fread((void*)buf, (_end_of_buffer_position - _start_of_buffer_position), 1, _file);//read tail of blocks.log file into buf
+      auto size = fread((void*)buf, (_end_of_buffer_position - _start_of_buffer_position), 1, _file.get());//read tail of blocks.log file into buf
       EOS_ASSERT( size == 1, block_log_exception, "blocks.log read fails" );
    }
 
-   detail::index_writer::index_writer(const fc::path& block_index_name, uint32_t blocks_expected, bool report_status)
-   : _block_index_name(block_index_name.generic_string())
+   detail::index_writer::index_writer(const fc::path& block_index_name, uint32_t blocks_expected)
+   : _file(nullptr, &fclose)
+   , _block_index_name(block_index_name.generic_string())
    , _blocks_expected(blocks_expected)
    , _block_written(blocks_expected)
-   , _report_status(report_status)
    , _buffer_ptr(std::make_unique<uint64_t[]>(_max_buffer_length)) {
    }
 
-   detail::index_writer::~index_writer() {
-      if (_file != nullptr) {
-         fclose(_file);
-      }
-   }
-
    void detail::index_writer::write(uint64_t pos) {
       prepare_buffer();
       uint64_t* buffer = _buffer_ptr.get();
       buffer[_current_position - _start_of_buffer_position] = pos;
       --_current_position;
-      if (_report_status && (_block_written & 0xfffff) == 0) {                            //periodically print a progress indicator
-         std::cout << "block: " << std::setw(10) << _block_written << "    position in file " << std::setw(14) << pos << '\n';
+      if ((_block_written & 0xfffff) == 0) {                            //periodically print a progress indicator
+         dlog("block: ${block_written}      position in file: ${pos}", ("block_written", _block_written)("pos",pos));
       }
       --_block_written;
    }
 
    void detail::index_writer::prepare_buffer() {
       if (_file == nullptr) {
-         _file = fopen(_block_index_name.c_str(), "w");
-         EOS_ASSERT( _file != nullptr, block_log_exception, "Could not open Block index file at '${blocks_index}'", ("blocks_index", _block_index_name) );
+         _file.reset(fopen(_block_index_name.c_str(), "w"));
+         EOS_ASSERT( _file, block_log_exception, "Could not open Block index file at '${blocks_index}'", ("blocks_index", _block_index_name) );
          // allocate 8 bytes for each block position to store
          const auto full_file_size = buffer_location_to_file_location(_blocks_expected);
-         auto status = fseek(_file, full_file_size, SEEK_SET);
+         auto status = fseek(_file.get(), full_file_size, SEEK_SET);
          EOS_ASSERT( status == 0, block_log_exception, "Could not allocate in '${blocks_index}' storage for all the blocks, size: ${size}", ("blocks_index", _block_index_name)("size", full_file_size) );
          const auto block_end = file_location_to_buffer_location(full_file_size);
          _current_position = block_end - 1;
-         calculate_buffer_position();
+         update_buffer_position();
       }
 
       shift_buffer();
@@ -762,15 +751,15 @@ namespace eosio { namespace chain {
 
       const auto file_location_start = buffer_location_to_file_location(_start_of_buffer_position);
 
-      auto status = fseek(_file, file_location_start, SEEK_SET);
+      auto status = fseek(_file.get(), file_location_start, SEEK_SET);
       EOS_ASSERT( status == 0, block_log_exception, "Could not navigate in '${blocks_index}' file_location_start: ${loc}, _start_of_buffer_position: ${_start_of_buffer_position}", ("blocks_index", _block_index_name)("loc", file_location_start)("_start_of_buffer_position",_start_of_buffer_position) );
 
       const auto buffer_size = _end_of_buffer_position - _start_of_buffer_position;
       const auto file_size = buffer_location_to_file_location(buffer_size);
       uint64_t* buf = _buffer_ptr.get();
-      auto size = fwrite((void*)buf, file_size, 1, _file);
+      auto size = fwrite((void*)buf, file_size, 1, _file.get());
       EOS_ASSERT( size == 1, block_log_exception, "Writing Block Index file '${file}' failed at location: ${loc}", ("file", _block_index_name)("loc", file_location_start) );
-      calculate_buffer_position();
+      update_buffer_position();
       return true;
    }
 
@@ -783,7 +772,7 @@ namespace eosio { namespace chain {
                  ("blocks_index", _block_index_name)("pos", _current_position) );
    }
 
-   void detail::index_writer::calculate_buffer_position() {
+   void detail::index_writer::update_buffer_position() {
       _end_of_buffer_position = _current_position + 1;
       if (_end_of_buffer_position < _max_buffer_length) {
          _start_of_buffer_position = 0;
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index 0c4ca853828..c0684d566a6 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -69,7 +69,7 @@ namespace eosio { namespace chain {
 
          static genesis_state extract_genesis_state( const fc::path& data_dir );
 
-         static void construct_index(const fc::path& block_file_name, const fc::path& index_file_name, bool provide_index_log_status = false);
+         static void construct_index(const fc::path& block_file_name, const fc::path& index_file_name);
 
       private:
          void open(const fc::path& data_dir);
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 19540142f47..d244e7974e9 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -715,9 +715,10 @@ int main(int argc, char** argv) {
              out_file = vmap.at("output-file").as<bfs::path>();
 
          report_time rt("making index");
-         std::cout << "\nWill read existing blocks.log file " << block_file << '\n';
-         std::cout << "Will write new blocks.index file " << out_file << '\n';
-         block_log::construct_index(block_file.generic_string(), out_file.generic_string(), true);
+         const auto log_level = fc::logger::get(DEFAULT_LOGGER).get_log_level();
+         fc::logger::get(DEFAULT_LOGGER).set_log_level(fc::log_level::debug);
+         block_log::construct_index(block_file.generic_string(), out_file.generic_string());
+         fc::logger::get(DEFAULT_LOGGER).set_log_level(log_level);
          rt.report();
          return 0;
       }

From 60123231babab22a6610c9512aad0c9c74520373 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 9 Jul 2019 14:31:10 -0500
Subject: [PATCH 0784/1648] Added status to log messages and minor edits for PR
 comments.

---
 libraries/chain/block_log.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index db388f24754..d979b087fbf 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -10,7 +10,6 @@
 
 #define LOG_READ  (std::ios::in | std::ios::binary)
 #define LOG_WRITE (std::ios::out | std::ios::binary | std::ios::app)
-#define LOG_WRITE_NEW (std::ios::out | std::ios::binary)
 #define LOG_RW ( std::ios::in | std::ios::out | std::ios::binary )
 
 namespace eosio { namespace chain {
@@ -620,7 +619,7 @@ namespace eosio { namespace chain {
       }
 
       auto status = fseek(_file.get(), 0, SEEK_END);
-      EOS_ASSERT( status == 0, block_log_exception, "Could not open Block log file at '${blocks_log}'", ("blocks_log", _block_file_name) );
+      EOS_ASSERT( status == 0, block_log_exception, "Could not open Block log file at '${blocks_log}'. Returned status: ${status}", ("blocks_log", _block_file_name)("status", status) );
 
       _eof_position_in_file = ftell(_file.get());
       EOS_ASSERT( _eof_position_in_file > 0, block_log_exception, "Block log file at '${blocks_log}' could not be read.", ("blocks_log", _block_file_name) );
@@ -632,12 +631,12 @@ namespace eosio { namespace chain {
       char* buf = _buffer_ptr.get();
       const uint32_t index_of_pos = _current_position_in_file - _start_of_buffer_position;
       const uint64_t block_pos = *reinterpret_cast<uint64_t*>(buf + index_of_pos);
-      uint32_t bnum;
 
       if (block_pos == block_log::npos) {
          return 0;
       }
 
+      uint32_t bnum = 0;
       if (block_pos >= _start_of_buffer_position) {
          const uint32_t index_of_block = block_pos - _start_of_buffer_position;
          bnum = *reinterpret_cast<uint32_t*>(buf + index_of_block + _blknum_offset_from_pos);  //block number of previous block (is big endian)
@@ -645,7 +644,7 @@ namespace eosio { namespace chain {
       else {
          const auto blknum_offset_pos = block_pos + _blknum_offset_from_pos;
          auto status = fseek(_file.get(), blknum_offset_pos, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}", ("blocks_log", _block_file_name)("pos", blknum_offset_pos) );
+         EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}. Returned status: ${status}", ("blocks_log", _block_file_name)("pos", blknum_offset_pos)("status", status) );
          auto size = fread((void*)&bnum, sizeof(bnum), 1, _file.get());
          EOS_ASSERT( size == 1, block_log_exception, "Could not read in '${blocks_log}' at position: ${pos}", ("blocks_log", _block_file_name)("pos", blknum_offset_pos) );
       }
@@ -703,7 +702,7 @@ namespace eosio { namespace chain {
       }
 
       auto status = fseek(_file.get(), _start_of_buffer_position, SEEK_SET);
-      EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}", ("blocks_log", _block_file_name)("pos", _start_of_buffer_position) );
+      EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}. Returned status: ${status}", ("blocks_log", _block_file_name)("pos", _start_of_buffer_position)("status", status) );
       char* buf = _buffer_ptr.get();
       auto size = fread((void*)buf, (_end_of_buffer_position - _start_of_buffer_position), 1, _file.get());//read tail of blocks.log file into buf
       EOS_ASSERT( size == 1, block_log_exception, "blocks.log read fails" );
@@ -735,7 +734,7 @@ namespace eosio { namespace chain {
          // allocate 8 bytes for each block position to store
          const auto full_file_size = buffer_location_to_file_location(_blocks_expected);
          auto status = fseek(_file.get(), full_file_size, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "Could not allocate in '${blocks_index}' storage for all the blocks, size: ${size}", ("blocks_index", _block_index_name)("size", full_file_size) );
+         EOS_ASSERT( status == 0, block_log_exception, "Could not allocate in '${blocks_index}' storage for all the blocks, size: ${size}. Returned status: ${status}", ("blocks_index", _block_index_name)("size", full_file_size)("status", status) );
          const auto block_end = file_location_to_buffer_location(full_file_size);
          _current_position = block_end - 1;
          update_buffer_position();
@@ -752,7 +751,7 @@ namespace eosio { namespace chain {
       const auto file_location_start = buffer_location_to_file_location(_start_of_buffer_position);
 
       auto status = fseek(_file.get(), file_location_start, SEEK_SET);
-      EOS_ASSERT( status == 0, block_log_exception, "Could not navigate in '${blocks_index}' file_location_start: ${loc}, _start_of_buffer_position: ${_start_of_buffer_position}", ("blocks_index", _block_index_name)("loc", file_location_start)("_start_of_buffer_position",_start_of_buffer_position) );
+      EOS_ASSERT( status == 0, block_log_exception, "Could not navigate in '${blocks_index}' file_location_start: ${loc}, _start_of_buffer_position: ${_start_of_buffer_position}. Returned status: ${status}", ("blocks_index", _block_index_name)("loc", file_location_start)("_start_of_buffer_position",_start_of_buffer_position)("status", status) );
 
       const auto buffer_size = _end_of_buffer_position - _start_of_buffer_position;
       const auto file_size = buffer_location_to_file_location(buffer_size);

From 393170935acd7dea85107fae3abfc8ecfef46512 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 9 Jul 2019 15:03:00 -0500
Subject: [PATCH 0785/1648] Removed ununsed make_index function.

---
 programs/eosio-blocklog/main.cpp | 139 -------------------------------
 1 file changed, 139 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index d244e7974e9..37beec44ca0 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -505,145 +505,6 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
 }
 
 
-int make_index(const bfs::path& block_dir, const bfs::path& out_file) {
-   report_time rt("making index");
-   //this code makes blocks.index much faster than nodeos (in recent test 80 seconds vs. 90 minutes)
-   using namespace std;
-   bfs::path block_file_name = block_dir / "blocks.log";
-   bfs::path out_file_name = block_dir / out_file;
-   cout << '\n';
-   cout << "Will read existing blocks.log file " << block_file_name << '\n';
-   cout << "Will write new blocks.index file " << out_file_name << '\n';
-   FILE* fin = fopen(block_file_name.c_str(), "r");
-   EOS_ASSERT( fin != nullptr, block_log_not_found, "cannot read block file ${file}", ("file", block_file_name.string()) );
-
-   //will read big chunks of blocks.log into buf, will fill fpos_list with file positions before write to blocks.index
-   constexpr uint32_t buf_len{1U << 24};                      //buf_len must be power of 2 >= largest possible block == one MByte
-   auto buffer = make_unique<char[]>(buf_len + 8);            //can write up to 8 bytes past end of buf
-   char* buf = buffer.get();
-   constexpr uint64_t fpos_list_len{1U << 22};                //length of fpos_list[] in bytes
-   auto fpos_buffer = make_unique<uint64_t[]>(fpos_list_len >> 3);
-   uint64_t* fpos_list = fpos_buffer.get();
-
-   //read blocks.log to see if version 1 or 2 and get first_blocknum (implicit 1 if version 1)
-   uint32_t version = 0, first_block = 0;
-   auto size = fread((char*)&version, sizeof(version), 1, fin);
-   EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", block_file_name.string()) );
-   cout << "block log version= " << version << '\n';
-   EOS_ASSERT( version == 1 || version == 2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
-   if (version == 1)
-      first_block = 1;
-   else {
-      size = fread((void*)&first_block, sizeof(first_block), 1, fin);
-      EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", block_file_name.string()) );
-   }
-   cout << "first block= " << first_block << '\n';
-
-   auto status = fseek(fin, 0, SEEK_END);                    //get blocks.log file length
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", block_file_name.string())("pos", 0) );
-   uint64_t pos = ftell(fin);
-   uint64_t last_buf_len = pos & ((uint64_t)buf_len-1);     //buf_len is a power of 2 so -1 creates low bits all 1
-   if (!last_buf_len)                                       //will read integral number of buf_len and one time read last_buf_len
-      last_buf_len = buf_len;
-   status = fseek(fin, -(uint64_t)last_buf_len, SEEK_END);     //one time read last_buf_len
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", block_file_name.string())("pos", last_buf_len) );
-   pos = ftell(fin);
-   uint64_t did_read = fread((void*)buf, last_buf_len, 1, fin);//read tail of blocks.log file into buf
-   EOS_ASSERT( did_read == 1, block_log_exception, "blocks.log read fails" );
-
-   //we traverse linked list of blocks in buf (from end to start), for each block we know this:
-   uint32_t index_start;                                    //buf index for block start
-   uint32_t index_end;                                      //buf index for block end == buf index for block start file position
-   uint64_t file_pos;                                       //file pos of block start
-   uint32_t bnum;                                           //block number
-
-   index_end = last_buf_len - 8;                            //index in buf where last block ends and block file position starts
-   cout << "last_buf_len=" << last_buf_len << " index_end=" << index_end <<  '\n';
-   file_pos = *(uint64_t*)(buf + index_end);                //file pos of block start
-   cout << "file_pos=" << file_pos << " buf=" << (uint64_t)buf <<  '\n';
-   index_start = file_pos - pos;                            //buf index for block start
-   bnum = *(uint32_t*)(buf + index_start + blknum_offset);  //block number of previous block (is big endian)
-   bnum = endian_reverse_u32(bnum) + 1;                     //convert from big endian to little endian and add 1
-   cout << "last block=  " << bnum << '\n';
-   cout << '\n';
-   cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';  //first progress indicator
-   uint64_t last_file_pos = file_pos;                       //used to check that file_pos is strictly decreasing
-   uint32_t end_block{bnum};                                //save for message at end
-
-   //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
-   FILE* fout = fopen(out_file_name.c_str(), "w");
-   EOS_ASSERT( fout != nullptr, block_index_not_found, "cannot write blocks.index" );
-
-   uint64_t ind_file_len = (bnum + 1 - first_block) << 3;            //index file holds 8 bytes for each block in blocks.log
-   uint64_t last_ind_buf_len = ind_file_len & (fpos_list_len - 1); //fpos_list_len is a power of 2 so -1 creates low bits all 1
-   if (!last_ind_buf_len)                                          //will write integral number of buf_len and last_ind_buf_len one time to index file
-      last_ind_buf_len = buf_len;
-   status = fseek(fout, ind_file_len - last_ind_buf_len, SEEK_SET);
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", out_file_name.string())("pos", ind_file_len - last_ind_buf_len) );
-   uint64_t ind_pos = ftell(fout);
-   EOS_ASSERT( ind_pos == ind_file_len - last_ind_buf_len, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", out_file_name.string())("pos", ind_file_len - last_ind_buf_len) );
-   uint64_t blk_base = (ind_pos >> 3) + first_block;              //first entry in fpos_list is for block blk_base
-   cout << "ind_pos= " << ind_pos << "  blk_base= " << blk_base << '\n';
-   fpos_list[bnum - blk_base] = file_pos;                         //write filepos for block bnum
-
-   for (;;) {
-      if (bnum == blk_base) {                                        //if fpos_list is full
-         size = fwrite((void*)fpos_list, last_ind_buf_len, 1, fout); //write fpos_list to index file
-         EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", out_file_name.string()) );
-         if (ind_pos == 0) {                                         //if done writing index file
-            cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';  //last progress indicator
-            EOS_ASSERT( bnum == first_block, block_log_exception, "blocks.log does not contain consecutive block numbers" );
-            break;
-         }
-         ind_pos -= fpos_list_len;
-         blk_base -= (fpos_list_len >> 3);
-         status = fseek(fout, ind_pos, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", out_file_name.string())("pos", ind_pos) );
-         did_read = ftell(fout);
-         EOS_ASSERT( did_read == ind_pos, block_log_exception, "${file} seek fails", ("file", out_file_name.string()) );
-         last_ind_buf_len = fpos_list_len;                           //from now on all writes to index file write a full fpos_list[]
-      }
-      if (index_start < 8) {                                //if block start is split across buf boundary
-         memcpy(buf + buf_len, buf, 8);                     //copy portion at start of buf to past end of buf
-         pos -= buf_len;                                    //file position of buf
-         status = fseek(fin, pos, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", pos) );
-         did_read = fread((void*)buf, buf_len, 1, fin);     //read next buf
-         EOS_ASSERT( did_read == 1, block_log_exception, "blocks.log read fails" );
-         index_start += buf_len;
-      }
-      --bnum;                                               //now move index_start and index_end to prior block
-      index_end = index_start - 8;                          //index in buf where block ends and block file position starts
-      file_pos = *(uint64_t*)(buf + index_end);             //file pos of block start
-      if (file_pos >= last_file_pos) {                      //file_pos will decrease if linked list is not corrupt
-         cout << '\n';
-         cout << "file pos for block " << bnum+1 << " is " << last_file_pos << '\n';
-         cout << "file pos for block " << bnum   << " is " <<      file_pos << '\n';
-         cout << "The linked list of blocks in blocks.log should run from last block to first block in reverse order\n";
-         EOS_ASSERT( file_pos < last_file_pos, block_log_exception, "blocks.log linked list of blocks is corrupt" );
-      }
-      last_file_pos = file_pos;
-      if (file_pos < pos) {                                 //if block start is in prior buf
-         pos -= buf_len;                                    //file position of buf
-         status = fseek(fin, pos, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", pos) );
-         did_read = fread(buf, buf_len, 1, fin);            //read next buf
-         EOS_ASSERT( did_read == 1, block_log_exception, "blocks.log read fails" );
-         index_end += buf_len;
-      }
-      index_start = file_pos - pos;                          //buf index for block start
-      fpos_list[bnum - blk_base]= file_pos;                  //write filepos for block bnum
-      if ((bnum & 0xfffff) == 0)                             //periodically print a progress indicator
-         cout << "block " << setw(10) << bnum << "    file_pos " << setw(14) << file_pos << '\n';
-   }
-
-   fclose(fout);
-   fclose(fin);
-   cout << "\nwrote " << (end_block+1-first_block) << " file positions to " << out_file_name << '\n';
-   rt.report();
-   return 0;
-}
-
 void smoke_test(bfs::path block_dir) {
    using namespace std;
    cout << "\nSmoke test of blocks.log and blocks.index in directory " << block_dir << '\n';

From 9b151d6ef34441a16e16e8f16e9b4508d885a9cd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 9 Jul 2019 16:04:19 -0400
Subject: [PATCH 0786/1648] Tighten max block_ids per connection

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f234bd56574..636d774c838 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -389,7 +389,7 @@ namespace eosio {
    constexpr auto     def_max_read_delays = 100; // number of times read_delay_timer started without any reads
    constexpr auto     def_max_consecutive_rejected_blocks = 3; // num of rejected blocks before disconnect
    constexpr auto     def_max_consecutive_immediate_connection_close = 9; // back off if client keeps closing
-   constexpr auto     def_max_peer_block_ids_per_connection = 1*1024*1024; // if we reach this many then the connection is spaming us, disconnect
+   constexpr auto     def_max_peer_block_ids_per_connection = 100*1024; // if we reach this many then the connection is spaming us, disconnect
    constexpr auto     def_max_clients = 25; // 0 for unlimited clients
    constexpr auto     def_max_nodes_per_host = 1;
    constexpr auto     def_conn_retry_wait = 30;

From 2df75422dfd78ebf317ff6e3270a7ee84a589958 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 9 Jul 2019 17:04:09 -0400
Subject: [PATCH 0787/1648] Access acceptor on connection strand

---
 plugins/net_plugin/net_plugin.cpp | 100 +++++++++++++++---------------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d3b2846c68c..9fb628c0cd9 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2153,63 +2153,65 @@ namespace eosio {
    void net_plugin_impl::start_listen_loop() {
       connection_ptr new_connection = std::make_shared<connection>();
       new_connection->connecting = true;
-      acceptor->async_accept( new_connection->socket,
+      new_connection->strand.post( [this, new_connection = std::move( new_connection )](){
+         acceptor->async_accept( new_connection->socket,
             boost::asio::bind_executor( new_connection->strand, [new_connection, this]( boost::system::error_code ec ) {
-         if( !ec ) {
-            uint32_t visitors = 0;
-            uint32_t from_addr = 0;
-            boost::system::error_code rec;
-            const auto& paddr_add = new_connection->socket.remote_endpoint( rec ).address();
-            string paddr_str;
-            if( rec ) {
-               fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()) );
-            } else {
-               paddr_str = paddr_add.to_string();
-               for_each_connection( [&visitors, &from_addr, &paddr_str]( auto& conn ) {
-                  if( conn->socket_is_open() ) {
-                     if( conn->peer_address().empty() ) {
-                        ++visitors;
-                        if( paddr_str == conn->remote_address() ) {
-                           ++from_addr;
+            if( !ec ) {
+               uint32_t visitors = 0;
+               uint32_t from_addr = 0;
+               boost::system::error_code rec;
+               const auto& paddr_add = new_connection->socket.remote_endpoint( rec ).address();
+               string paddr_str;
+               if( rec ) {
+                  fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()));
+               } else {
+                  paddr_str = paddr_add.to_string();
+                  for_each_connection( [&visitors, &from_addr, &paddr_str]( auto& conn ) {
+                     if( conn->socket_is_open()) {
+                        if( conn->peer_address().empty()) {
+                           ++visitors;
+                           if( paddr_str == conn->remote_address()) {
+                              ++from_addr;
+                           }
                         }
                      }
-                  }
-                  return true;
-               } );
-               if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count) ) {
-                  if( new_connection->start_session() ) {
-                     std::lock_guard<std::shared_mutex> g_unique( connections_mtx );
-                     connections.insert( new_connection );
-                  }
+                     return true;
+                  } );
+                  if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count)) {
+                     if( new_connection->start_session()) {
+                        std::lock_guard<std::shared_mutex> g_unique( connections_mtx );
+                        connections.insert( new_connection );
+                     }
 
-               } else {
-                  if( from_addr >= max_nodes_per_host ) {
-                     fc_elog( logger, "Number of connections (${n}) from ${ra} exceeds limit ${l}",
-                              ("n", from_addr + 1)( "ra", paddr_str )("l", max_nodes_per_host) );
                   } else {
-                     fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count) );
+                     if( from_addr >= max_nodes_per_host ) {
+                        fc_elog( logger, "Number of connections (${n}) from ${ra} exceeds limit ${l}",
+                                 ("n", from_addr + 1)( "ra", paddr_str )( "l", max_nodes_per_host ));
+                     } else {
+                        fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count));
+                     }
+                     // new_connection never added to connections and start_session not called, lifetime will end
+                     new_connection->socket.close();
                   }
-                  // new_connection never added to connections and start_session not called, lifetime will end
-                  new_connection->socket.close();
+               }
+            } else {
+               fc_elog( logger, "Error accepting connection: ${m}", ("m", ec.message()));
+               // For the listed error codes below, recall start_listen_loop()
+               switch (ec.value()) {
+                  case ECONNABORTED:
+                  case EMFILE:
+                  case ENFILE:
+                  case ENOBUFS:
+                  case ENOMEM:
+                  case EPROTO:
+                     break;
+                  default:
+                     return;
                }
             }
-         } else {
-            fc_elog( logger, "Error accepting connection: ${m}", ("m", ec.message()) );
-            // For the listed error codes below, recall start_listen_loop()
-            switch( ec.value() ) {
-               case ECONNABORTED:
-               case EMFILE:
-               case ENFILE:
-               case ENOBUFS:
-               case ENOMEM:
-               case EPROTO:
-                  break;
-               default:
-                  return;
-            }
-         }
-         start_listen_loop();
-      }));
+            start_listen_loop();
+         }));
+      } );
    }
 
    // only called from strand thread

From cf1143694e3a69fd1045c9e3225b6443addb8be1 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 9 Jul 2019 16:48:01 -0500
Subject: [PATCH 0788/1648] Fixed integration test based on changes and fixed
 documentation.

---
 programs/eosio-blocklog/main.cpp | 2 +-
 tests/block_log_util_test.py     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 37beec44ca0..4e8c42037d7 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -172,7 +172,7 @@ void blocklog::set_program_options(options_description& cli)
          ("as-json-array", bpo::bool_switch(&as_json_array)->default_value(false),
           "Print out json blocks wrapped in json array (otherwise the output is free-standing json objects).")
          ("make-index", bpo::bool_switch(&make_index)->default_value(false),
-          "Create blocks.index from blocks.log. Must give 'blocks-dir'. Give 'output-file' relative to blocks-dir (default is blocks.index).")
+          "Create blocks.index from blocks.log. Must give 'blocks-dir'. Give 'output-file' relative to current directory or absolute path (default is <blocks-dir>/blocks.index).")
          ("trim-blocklog", bpo::bool_switch(&trim_log)->default_value(false),
           "Trim blocks.log and blocks.index. Must give 'blocks-dir' and 'first and/or 'last'.")
          ("smoke-test", bpo::bool_switch(&smoke_test)->default_value(false),
diff --git a/tests/block_log_util_test.py b/tests/block_log_util_test.py
index 073347c4b79..2d0a292b7f2 100755
--- a/tests/block_log_util_test.py
+++ b/tests/block_log_util_test.py
@@ -106,14 +106,13 @@ def checkBlockLog(blockLog, blockNumsToFind, firstBlockNum=1):
     expectedStr="no problems found"
     assert output.find(expectedStr) != -1, "Couldn't find \"%s\" in:\n\"%s\"\n" % (expectedStr, output)
 
-    duplicateIndexFileName="duplicate.index"
+    blockLogDir=Utils.getNodeDataDir(0, "blocks")
+    duplicateIndexFileName=os.path.join(blockLogDir, "duplicate.index")
     output=cluster.getBlockLog(0, blockLogAction=BlockLogAction.make_index, outputFile=duplicateIndexFileName)
     assert output is not None, "Couldn't make new index file \"%s\"\n" % (duplicateIndexFileName)
 
-    blockLogDir=Utils.getNodeDataDir(0, "blocks")
     blockIndexFileName=os.path.join(blockLogDir, "blocks.index")
     blockIndexFile=open(blockIndexFileName,"rb")
-    duplicateIndexFileName=os.path.join(blockLogDir, duplicateIndexFileName)
     duplicateIndexFile=open(duplicateIndexFileName,"rb")
     blockIndexStr=blockIndexFile.read()
     duplicateIndexStr=duplicateIndexFile.read()

From 33de58c5fae2d5d5788ad6197ddf69c7647b381b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Jul 2019 09:22:20 -0400
Subject: [PATCH 0789/1648] Add const, peer review request

---
 plugins/net_plugin/net_plugin.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 636d774c838..ae540d2eff6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -173,9 +173,9 @@ namespace eosio {
    };
 
    class dispatch_manager {
-      std::mutex              blk_state_mtx;
+      mutable std::mutex      blk_state_mtx;
       peer_block_state_index  blk_state;
-      std::mutex              local_txns_mtx;
+      mutable std::mutex      local_txns_mtx;
       node_transaction_index  local_txns;
 
    public:
@@ -194,15 +194,15 @@ namespace eosio {
 
       bool add_peer_block( const block_id_type& blkid, uint32_t connection_id );
       bool add_peer_block_id( const block_id_type& blkid, uint32_t connection_id );
-      bool peer_has_block(const block_id_type& blkid, uint32_t connection_id);
-      bool have_block(const block_id_type& blkid);
-      size_t num_entries( uint32_t connection_id );
+      bool peer_has_block(const block_id_type& blkid, uint32_t connection_id) const;
+      bool have_block(const block_id_type& blkid) const;
+      size_t num_entries( uint32_t connection_id ) const;
 
       bool add_peer_txn( const node_transaction_state& nts );
       void update_txns_block_num( const signed_block_ptr& sb );
       void update_txns_block_num( const transaction_id_type& id, uint32_t blk_num );
-      bool peer_has_txn( const transaction_id_type& tid, uint32_t connection_id );
-      bool have_txn( const transaction_id_type& tid );
+      bool peer_has_txn( const transaction_id_type& tid, uint32_t connection_id ) const;
+      bool have_txn( const transaction_id_type& tid ) const;
       void expire_txns( uint32_t lib_num );
    };
 
@@ -1801,13 +1801,13 @@ namespace eosio {
       return added;
    }
 
-   bool dispatch_manager::peer_has_block( const block_id_type& blkid, uint32_t connection_id ) {
+   bool dispatch_manager::peer_has_block( const block_id_type& blkid, uint32_t connection_id ) const {
       std::lock_guard<std::mutex> g(blk_state_mtx);
       auto blk_itr = blk_state.get<by_id>().find( std::make_tuple( connection_id, std::ref( blkid )));
       return blk_itr != blk_state.end();
    }
 
-   bool dispatch_manager::have_block( const block_id_type& blkid ) {
+   bool dispatch_manager::have_block( const block_id_type& blkid ) const {
       std::lock_guard<std::mutex> g(blk_state_mtx);
       // by_block_id sorts have_block by greater so have_block == true will be the first one found
       auto& index = blk_state.get<by_block_id>();
@@ -1818,7 +1818,7 @@ namespace eosio {
       return false;
    }
 
-   size_t dispatch_manager::num_entries( uint32_t connection_id ) {
+   size_t dispatch_manager::num_entries( uint32_t connection_id ) const {
       std::lock_guard<std::mutex> g(blk_state_mtx);
       return blk_state.get<by_id>().count( connection_id );
    }
@@ -1857,13 +1857,13 @@ namespace eosio {
       }
    }
 
-   bool dispatch_manager::peer_has_txn( const transaction_id_type& tid, uint32_t connection_id ) {
+   bool dispatch_manager::peer_has_txn( const transaction_id_type& tid, uint32_t connection_id ) const {
       std::lock_guard<std::mutex> g( local_txns_mtx );
       auto tptr = local_txns.get<by_id>().find( std::make_tuple( std::ref( tid ), connection_id ) );
       return tptr != local_txns.end();
    }
 
-   bool dispatch_manager::have_txn( const transaction_id_type& tid ) {
+   bool dispatch_manager::have_txn( const transaction_id_type& tid ) const {
       std::lock_guard<std::mutex> g( local_txns_mtx );
       auto tptr = local_txns.get<by_id>().find( tid );
       return tptr != local_txns.end();

From e8a788414c8611e9ece2907116ebbc7baafea2f8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Jul 2019 09:45:16 -0400
Subject: [PATCH 0790/1648] More const additions

---
 plugins/net_plugin/net_plugin.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ae540d2eff6..3ccd83e273d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1803,14 +1803,14 @@ namespace eosio {
 
    bool dispatch_manager::peer_has_block( const block_id_type& blkid, uint32_t connection_id ) const {
       std::lock_guard<std::mutex> g(blk_state_mtx);
-      auto blk_itr = blk_state.get<by_id>().find( std::make_tuple( connection_id, std::ref( blkid )));
+      const auto blk_itr = blk_state.get<by_id>().find( std::make_tuple( connection_id, std::ref( blkid )));
       return blk_itr != blk_state.end();
    }
 
    bool dispatch_manager::have_block( const block_id_type& blkid ) const {
       std::lock_guard<std::mutex> g(blk_state_mtx);
       // by_block_id sorts have_block by greater so have_block == true will be the first one found
-      auto& index = blk_state.get<by_block_id>();
+      const auto& index = blk_state.get<by_block_id>();
       auto blk_itr = index.find( blkid );
       if( blk_itr != index.end() ) {
          return blk_itr->have_block;
@@ -1859,13 +1859,13 @@ namespace eosio {
 
    bool dispatch_manager::peer_has_txn( const transaction_id_type& tid, uint32_t connection_id ) const {
       std::lock_guard<std::mutex> g( local_txns_mtx );
-      auto tptr = local_txns.get<by_id>().find( std::make_tuple( std::ref( tid ), connection_id ) );
+      const auto tptr = local_txns.get<by_id>().find( std::make_tuple( std::ref( tid ), connection_id ) );
       return tptr != local_txns.end();
    }
 
    bool dispatch_manager::have_txn( const transaction_id_type& tid ) const {
       std::lock_guard<std::mutex> g( local_txns_mtx );
-      auto tptr = local_txns.get<by_id>().find( tid );
+      const auto tptr = local_txns.get<by_id>().find( tid );
       return tptr != local_txns.end();
    }
 

From 6f2b30ce4940279fd31402c4fa2fdf9d20c59bd0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Jul 2019 13:53:20 -0400
Subject: [PATCH 0791/1648] Don't close unless open

---
 plugins/net_plugin/net_plugin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7bead583f0e..a6b36a8c2b8 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2175,7 +2175,9 @@ namespace eosio {
             } else {
                if( endpoint_itr != tcp::resolver::iterator() ) {
                   c->strand.post( [resolver, c, endpoint_itr]() {
-                     connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
+                     if( c->socket_is_open() ) {
+                        connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
+                     }
                      c->connect( resolver, endpoint_itr );
                   } );
                } else {

From 67a1f63f72f8f0e8d3cfec2c8b4312d9c6003ef9 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 10 Jul 2019 13:58:35 -0400
Subject: [PATCH 0792/1648] !

---
 scripts/eosio_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eosio_install.sh b/scripts/eosio_install.sh
index 83de83ce57e..e2f8f0fdb33 100755
--- a/scripts/eosio_install.sh
+++ b/scripts/eosio_install.sh
@@ -40,7 +40,7 @@ cd $( dirname "${BASH_SOURCE[0]}" )/..
 
 [[ ! $NAME == "Ubuntu" ]] && set -i # Ubuntu doesn't support interactive mode since it uses dash
 
-[[ -f ${BUILD_DIR}/CMakeCache.txt ]] && printf "${COLOR_RED}Please run ${SCRIPT_DIR}/eosio_build.sh first!${COLOR_NC}" && exit 1
+[[ ! -f ${BUILD_DIR}/CMakeCache.txt ]] && printf "${COLOR_RED}Please run ${SCRIPT_DIR}/eosio_build.sh first!${COLOR_NC}" && exit 1
 echo "${COLOR_CYAN}====================================================================================="
 echo "========================== ${COLOR_WHITE}Starting EOSIO Installation${COLOR_CYAN} ==============================${COLOR_NC}"
 execute cd $BUILD_DIR

From 0b34e08e27ea4b6559b16dd7d0e9cc19b84ab84d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Jul 2019 15:29:50 -0400
Subject: [PATCH 0793/1648] Small optimization to move more trx processing off
 application thread

---
 plugins/net_plugin/net_plugin.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3ccd83e273d..e234bc799e8 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2796,19 +2796,14 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( ptrx->packed_trx() );
-      connection_wptr weak = shared_from_this();
       my_impl->chain_plug->accept_transaction( ptrx,
-            [weak{std::move(weak)}, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak = weak_from_this(), ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
-         connection_ptr conn = weak.lock();
-         if( conn ) {
-            conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx() );
-         }
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
             fc_dlog( logger, "bad packed_transaction : ${m}", ("m", result.get<fc::exception_ptr>()->what()) );
          } else {
-            auto trace = result.get<transaction_trace_ptr>();
+            const transaction_trace_ptr& trace = result.get<transaction_trace_ptr>();
             if (!trace->except) {
                fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
                accepted = true;
@@ -2819,15 +2814,18 @@ namespace eosio {
             }
          }
 
-         controller& cc = my_impl->chain_plug->chain();
-         uint32_t head_blk_num = cc.head_block_num();
-
-         boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, ptrx{std::move(ptrx)}, head_blk_num]() {
+         boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, weak{std::move(weak)}, ptrx{std::move(ptrx)}]() {
             if( accepted ) {
                my_impl->dispatcher->bcast_transaction( ptrx );
             } else {
+               uint32_t head_blk_num = 0;
+               std::tie( std::ignore, head_blk_num, std::ignore, std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
                my_impl->dispatcher->rejected_transaction( ptrx->id(), head_blk_num );
             }
+            connection_ptr conn = weak.lock();
+            if( conn ) {
+               conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx() );
+            }
          });
       });
    }

From e1ae64931d7e4af65036aca03786aab372c6e421 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 10 Jul 2019 17:09:18 -0400
Subject: [PATCH 0794/1648] Special handling for connection_refused

---
 plugins/net_plugin/net_plugin.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a6b36a8c2b8..4d173c0c6fa 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2182,7 +2182,10 @@ namespace eosio {
                   } );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
-                  c->close( false );
+                  if( err.value() != boost::system::errc::connection_refused ) {
+                     c->close( false );
+                  }
+                  c->connecting = false;
                }
             }
       } ) );

From 1114096a36e266c1e7a5098cd4a9c7e93c87a3c7 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 10 Jul 2019 18:11:05 -0400
Subject: [PATCH 0795/1648] fix fc::temp_directory usage in tester

Can't have fc::temp_directory scoped to default_config() because that means once defualt_config() returns the only attempt at trying to clean up the tempdir is at that time -- way before any files are actually created. Make default_config() use an fc::temp_directory which tester already has anyways. So, once tester is destroyed that's when the fc::temp_directory falls out of scope and it can properly clean up at that point. A run through unit_test doesn't leave behind all its data files any longer.
---
 libraries/testing/include/eosio/testing/tester.hpp | 5 ++---
 unittests/api_tests.cpp                            | 6 ++++--
 unittests/auth_tests.cpp                           | 3 ++-
 unittests/producer_schedule_tests.cpp              | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index db32a27276a..21f1ac26712 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -370,8 +370,7 @@ namespace eosio { namespace testing {
       }
       controller::config vcfg;
 
-      static controller::config default_config() {
-         fc::temp_directory tempdir;
+      static controller::config default_config(fc::temp_directory& tempdir) {
          controller::config vcfg;
          vcfg.blocks_dir      = tempdir.path() / std::string("v_").append(config::default_blocks_dir_name);
          vcfg.state_dir  = tempdir.path() /  std::string("v_").append(config::default_state_dir_name);
@@ -394,7 +393,7 @@ namespace eosio { namespace testing {
       }
 
       validating_tester(const flat_set<account_name>& trusted_producers = flat_set<account_name>()) {
-         vcfg = default_config();
+         vcfg = default_config(tempdir);
 
          vcfg.trusted_producers = trusted_producers;
 
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 27072862820..fb2eb7671cb 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -591,7 +591,8 @@ BOOST_FIXTURE_TEST_CASE(require_notice_tests, TESTER) { try {
    } FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_CASE(ram_billing_in_notify_tests) { try {
-   validating_tester chain( validating_tester::default_config() );
+   fc::temp_directory tempdir;
+   validating_tester chain( validating_tester::default_config(tempdir) );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
 
    chain.produce_blocks(2);
@@ -1319,7 +1320,8 @@ BOOST_FIXTURE_TEST_CASE(deferred_transaction_tests, TESTER) { try {
 } FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_CASE(more_deferred_transaction_tests) { try {
-   auto cfg = validating_tester::default_config();
+   fc::temp_directory tempdir;
+   auto cfg = validating_tester::default_config(tempdir);
    cfg.contracts_console = true;
    validating_tester chain( cfg );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
diff --git a/unittests/auth_tests.cpp b/unittests/auth_tests.cpp
index d5e26d96355..634e7459f46 100644
--- a/unittests/auth_tests.cpp
+++ b/unittests/auth_tests.cpp
@@ -371,7 +371,8 @@ BOOST_AUTO_TEST_CASE( any_auth ) { try {
 
 BOOST_AUTO_TEST_CASE(no_double_billing) {
 try {
-   validating_tester chain( validating_tester::default_config() );
+   fc::temp_directory tempdir;
+   validating_tester chain( validating_tester::default_config(tempdir) );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
 
    chain.produce_block();
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index bec63376ff5..616380b7acd 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -328,7 +328,8 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_reduction, tester ) try {
 } FC_LOG_AND_RETHROW()
 
 BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
-   validating_tester c( validating_tester::default_config() );
+   fc::temp_directory tempdir;
+   validating_tester c( validating_tester::default_config(tempdir) );
    c.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
 
    c.create_accounts( {N(alice),N(bob),N(carol)} );

From 380f1f288e08097046d69c97b5f31c5d4e3927a8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Jul 2019 09:37:57 -0400
Subject: [PATCH 0796/1648] Recreate connection object on connection failure

---
 plugins/net_plugin/net_plugin.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4d173c0c6fa..a6324a1e965 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2182,10 +2182,17 @@ namespace eosio {
                   } );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
-                  if( err.value() != boost::system::errc::connection_refused ) {
-                     c->close( false );
+                  connection_ptr new_c = std::make_shared<connection>( c->peer_address() );
+                  new_c->connecting = false;
+                  std::lock_guard<std::shared_mutex> g( my_impl->connections_mtx );
+                  for( auto itr = my_impl->connections.begin(); itr != my_impl->connections.end(); ++itr ) {
+                     if( (*itr)->peer_address() == c->peer_address() ) {
+                        (*itr)->close( false );
+                        my_impl->connections.erase(itr);
+                        break;
+                     }
                   }
-                  c->connecting = false;
+                  my_impl->connections.insert( new_c );
                }
             }
       } ) );

From f0a94e3597591923f55c9690413a0863d59c37e4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Jul 2019 11:29:43 -0400
Subject: [PATCH 0797/1648] Only close if open on connect

---
 plugins/net_plugin/net_plugin.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a6324a1e965..3f116b15e88 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2173,21 +2173,19 @@ namespace eosio {
                   c->send_handshake();
                }
             } else {
+               if( c->socket_is_open() ) {
+                  connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
+               }
                if( endpoint_itr != tcp::resolver::iterator() ) {
-                  c->strand.post( [resolver, c, endpoint_itr]() {
-                     if( c->socket_is_open() ) {
-                        connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
-                     }
-                     c->connect( resolver, endpoint_itr );
-                  } );
+                  c->connect( resolver, endpoint_itr );
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
+                  // add new connection so connection monitor can try again with a new connection
                   connection_ptr new_c = std::make_shared<connection>( c->peer_address() );
                   new_c->connecting = false;
                   std::lock_guard<std::shared_mutex> g( my_impl->connections_mtx );
                   for( auto itr = my_impl->connections.begin(); itr != my_impl->connections.end(); ++itr ) {
                      if( (*itr)->peer_address() == c->peer_address() ) {
-                        (*itr)->close( false );
                         my_impl->connections.erase(itr);
                         break;
                      }

From 71da9d640c8a9e4019c686d4c776e2d1734a2a1f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Jul 2019 14:38:51 -0400
Subject: [PATCH 0798/1648] Add sleep for slow mongo

---
 tests/Node.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Node.py b/tests/Node.py
index f8167663c28..c4a9d5a18f7 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1201,6 +1201,7 @@ def getHeadBlockNum(self):
                 return info[headBlockNumTag]
         else:
             # Either this implementation or the one in getIrreversibleBlockNum are likely wrong.
+            time.sleep(1)
             block=self.getBlockFromDb(-1)
             if block is not None:
                 blockNum=block["block_num"]

From c5f7a9e41dcbd80f6be73b184b3b2e01d63d5813 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Jul 2019 14:40:48 -0400
Subject: [PATCH 0799/1648] Recreate socket on disconnect/connect

---
 plugins/net_plugin/net_plugin.cpp | 56 ++++++++++++++-----------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3f116b15e88..11de37bdfd8 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -577,7 +577,7 @@ namespace eosio {
 
    public:
       boost::asio::io_context::strand           strand;
-      tcp::socket                               socket; // only accessed through strand after construction
+      std::unique_ptr<tcp::socket>              socket; // only accessed through strand after construction
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
       std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from strand threads
@@ -844,7 +844,7 @@ namespace eosio {
    connection::connection( string endpoint )
       : peer_addr( endpoint ),
         strand( my_impl->thread_pool->get_executor() ),
-        socket( my_impl->thread_pool->get_executor() ),
+        socket( new tcp::socket( my_impl->thread_pool->get_executor() ) ),
         connection_id( ++my_impl->current_connection_id ),
         response_expected_timer( my_impl->thread_pool->get_executor() ),
         read_delay_timer( my_impl->thread_pool->get_executor() ),
@@ -858,7 +858,7 @@ namespace eosio {
    connection::connection()
       : peer_addr(),
         strand( my_impl->thread_pool->get_executor() ),
-        socket( my_impl->thread_pool->get_executor() ),
+        socket( new tcp::socket( my_impl->thread_pool->get_executor() ) ),
         connection_id( ++my_impl->current_connection_id ),
         response_expected_timer( my_impl->thread_pool->get_executor() ),
         read_delay_timer( my_impl->thread_pool->get_executor() ),
@@ -871,11 +871,11 @@ namespace eosio {
 
    void connection::update_endpoints() {
       boost::system::error_code ec;
-      auto rep = socket.remote_endpoint(ec);
+      auto rep = socket->remote_endpoint(ec);
       remote_endpoint_ip = ec ? unknown : rep.address().to_string();
       remote_endpoint_port = ec ? unknown : std::to_string(rep.port());
 
-      auto lep = socket.local_endpoint(ec);
+      auto lep = socket->local_endpoint(ec);
       local_endpoint_ip = ec ? unknown : lep.address().to_string();
       local_endpoint_port = ec ? unknown : std::to_string(lep.port());
    }
@@ -921,7 +921,7 @@ namespace eosio {
       update_endpoints();
       boost::asio::ip::tcp::no_delay nodelay( true );
       boost::system::error_code ec;
-      socket.set_option( nodelay, ec );
+      socket->set_option( nodelay, ec );
       if( ec ) {
          fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", peer_name())( "error", ec.message() ) );
          close();
@@ -955,8 +955,9 @@ namespace eosio {
    void connection::_close( connection* self, bool reconnect ) {
       self->socket_open = false;
       boost::system::error_code ec;
-      self->socket.shutdown( tcp::socket::shutdown_both, ec );
-      self->socket.close();
+      self->socket->shutdown( tcp::socket::shutdown_both, ec );
+      self->socket->close();
+      self->socket.reset( new tcp::socket( my_impl->thread_pool->get_executor() ) );
       self->flush_queues();
       self->connecting = false;
       self->syncing = false;
@@ -1117,7 +1118,7 @@ namespace eosio {
       buffer_queue.fill_out_buffer( bufs );
 
       strand.dispatch( [c{std::move(c)}, bufs{std::move(bufs)}, priority]() {
-         boost::asio::async_write( c->socket, bufs,
+         boost::asio::async_write( *c->socket, bufs,
             boost::asio::bind_executor( c->strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
             try {
                // May have closed connection and cleared buffer_queue
@@ -2166,31 +2167,23 @@ namespace eosio {
       ++endpoint_itr;
       connecting = true;
       pending_message_buffer.reset();
-      socket.async_connect( current_endpoint,
+      socket->async_connect( current_endpoint,
             boost::asio::bind_executor( strand, [resolver, c = shared_from_this(), endpoint_itr]( const boost::system::error_code& err ) {
-            if( !err && c->socket.is_open() ) {
+            if( !err && c->socket->is_open() ) {
                if( c->start_session() ) {
                   c->send_handshake();
                }
             } else {
-               if( c->socket_is_open() ) {
-                  connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
-               }
                if( endpoint_itr != tcp::resolver::iterator() ) {
-                  c->connect( resolver, endpoint_itr );
+                  c->strand.post( [resolver, c, endpoint_itr]() {
+                     if( c->socket_is_open()) {
+                        connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
+                     }
+                     c->connect( resolver, endpoint_itr );
+                  } ) ;
                } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
-                  // add new connection so connection monitor can try again with a new connection
-                  connection_ptr new_c = std::make_shared<connection>( c->peer_address() );
-                  new_c->connecting = false;
-                  std::lock_guard<std::shared_mutex> g( my_impl->connections_mtx );
-                  for( auto itr = my_impl->connections.begin(); itr != my_impl->connections.end(); ++itr ) {
-                     if( (*itr)->peer_address() == c->peer_address() ) {
-                        my_impl->connections.erase(itr);
-                        break;
-                     }
-                  }
-                  my_impl->connections.insert( new_c );
+                  c->close( false );
                }
             }
       } ) );
@@ -2200,13 +2193,13 @@ namespace eosio {
       connection_ptr new_connection = std::make_shared<connection>();
       new_connection->connecting = true;
       new_connection->strand.post( [this, new_connection = std::move( new_connection )](){
-         acceptor->async_accept( new_connection->socket,
+         acceptor->async_accept( *new_connection->socket,
             boost::asio::bind_executor( new_connection->strand, [new_connection, this]( boost::system::error_code ec ) {
             if( !ec ) {
                uint32_t visitors = 0;
                uint32_t from_addr = 0;
                boost::system::error_code rec;
-               const auto& paddr_add = new_connection->socket.remote_endpoint( rec ).address();
+               const auto& paddr_add = new_connection->socket->remote_endpoint( rec ).address();
                string paddr_str;
                if( rec ) {
                   fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()));
@@ -2237,7 +2230,8 @@ namespace eosio {
                         fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count));
                      }
                      // new_connection never added to connections and start_session not called, lifetime will end
-                     new_connection->socket.close();
+                     new_connection->socket->shutdown( tcp::socket::shutdown_both );
+                     new_connection->socket->close();
                   }
                }
             } else {
@@ -2271,7 +2265,7 @@ namespace eosio {
             const size_t max_socket_read_watermark = 4096;
             std::size_t socket_read_watermark = std::min<std::size_t>(minimum_read, max_socket_read_watermark);
             boost::asio::socket_base::receive_low_watermark read_watermark_opt(socket_read_watermark);
-            socket.set_option(read_watermark_opt);
+            socket->set_option(read_watermark_opt);
          }
 
          auto completion_handler = [minimum_read](boost::system::error_code ec, std::size_t bytes_transferred) -> std::size_t {
@@ -2316,7 +2310,7 @@ namespace eosio {
          }
          read_delay_count = 0;
 
-         boost::asio::async_read( socket,
+         boost::asio::async_read( *socket,
             pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             boost::asio::bind_executor( strand,
             [conn = shared_from_this()]( boost::system::error_code ec, std::size_t bytes_transferred ) {

From 9db6daadb3b828d9c8de09aaef00a6516b6ae1f8 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 11 Jul 2019 15:00:48 -0400
Subject: [PATCH 0800/1648] fix win32 build of eosio-blocklog

.c_str() of a std/bfs::path returns a wchar array. On win32 use _wfopen() instead of fopen() so that we can handle these paths without down converting them to ASCII. I don't see any other way to do this if we want to keep the C file api.

Also change the rename() calls to simply use the bfs::path variants for similar reasons.

Also add "b" to open mode -- win32 does indeed have behavior differences there unlike POSIX.
---
 programs/eosio-blocklog/main.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 4e8c42037d7..d0acd9aca41 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -20,6 +20,14 @@
 
 #include <chrono>
 
+#ifndef _WIN32
+#define FOPEN(p, m) fopen(p, m)
+#else
+#define CAT(s1, s2) s1 ## s2
+#define PREL(s) CAT(L, s)
+#define FOPEN(p, m) _wfopen(p, PREL(m))
+#endif
+
 using namespace eosio::chain;
 namespace bfs = boost::filesystem;
 namespace bpo = boost::program_options;
@@ -234,9 +242,9 @@ trim_data::trim_data(bfs::path block_dir) {
    using namespace std;
    block_file_name = block_dir / "blocks.log";
    index_file_name = block_dir / "blocks.index";
-   blk_in = fopen(block_file_name.c_str(), "r");
+   blk_in = FOPEN(block_file_name.c_str(), "rb");
    EOS_ASSERT( blk_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",block_file_name.string()) );
-   ind_in = fopen(index_file_name.c_str(), "r");
+   ind_in = FOPEN(index_file_name.c_str(), "rb");
    EOS_ASSERT( ind_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",index_file_name.string()) );
    auto size = fread((void*)&version,sizeof(version), 1, blk_in);
    EOS_ASSERT( size == 1, block_log_unsupported_version, "invalid format for file ${file}", ("file",block_file_name.string()));
@@ -340,7 +348,7 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
    char* buf =  buffer.get();
 
    bfs::path block_out_filename = block_dir / "blocks.out";
-   FILE* blk_out = fopen(block_out_filename.c_str(), "w");
+   FILE* blk_out = FOPEN(block_out_filename.c_str(), "wb");
    EOS_ASSERT( blk_out != nullptr, block_log_not_found, "cannot write ${file}", ("file", block_out_filename.string()) );
 
    //in version 1 file: version number, no first block number, rest of header length 0x6e, at 0x72 first block
@@ -385,7 +393,7 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
    auto fpos_buffer = make_unique<uint64_t[]>(buf_len);
    uint64_t* fpos_list = fpos_buffer.get();                        //list of file positions, periodically write to blocks.index
    bfs::path index_out_filename = block_dir / "index.out";
-   FILE* ind_out = fopen(index_out_filename.c_str(), "w");
+   FILE* ind_out = FOPEN(index_out_filename.c_str(), "wb");
    EOS_ASSERT( ind_out != nullptr, block_log_not_found, "cannot write ${file}", ("file",index_out_filename.string()) );
    uint64_t last_fpos_len = total_fpos_len & ((uint64_t)buf_len - 1);//buf_len is a power of 2 so -1 creates low bits all 1
    if (!last_fpos_len)                                            //will write integral number of buf_len and one time write last_fpos_len
@@ -494,10 +502,10 @@ int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first b
    fclose(ind_out);
    bfs::path old_log = block_dir / "old.log";
    bfs::path old_ind = block_dir / "old.index";
-   rename(td.block_file_name.c_str(), old_log.c_str());
-   rename(td.index_file_name.c_str(), old_ind.c_str());
-   rename(block_out_filename.c_str(), td.block_file_name.c_str());
-   rename(index_out_filename.c_str(), td.index_file_name.c_str());
+   rename(td.block_file_name, old_log);
+   rename(td.index_file_name, old_ind);
+   rename(block_out_filename, td.block_file_name);
+   rename(index_out_filename, td.index_file_name);
    cout << "The new " << td.block_file_name << " and " << td.index_file_name << " files contain blocks " << n << " through " << td.last_block << '\n';
    cout << "The original (before trim front) files have been renamed to " << old_log << " and " << old_ind << ".\n";
    rt.report();

From bec2147753e8fb333738e876921f85605a10b474 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Jul 2019 15:12:08 -0400
Subject: [PATCH 0801/1648] Allow more time for nodoes to start for slow test
 machines

---
 tests/db_modes_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
index 2977c7c4c55..effdfc6a555 100755
--- a/tests/db_modes_test.py
+++ b/tests/db_modes_test.py
@@ -45,7 +45,7 @@ def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
     cmdArr= preCmd + nodeosCmd + " --http-server-address=127.0.0.1:" + str(port) + extraCmd
     print("port %d is free now, start to run nodeosCmd with extra parameter \"%s\"" % (port, extraCmd))
     proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, preexec_fn=os.setsid)
-    tries = 10
+    tries = 30
     ok = False
     getInfoCmd = cleosPath + " -u http://127.0.0.1:" + str(port) + "/ get info"
     while (tries > 0):

From 1d763a97673a8697dbd971004ae11a6b4a634822 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 11 Jul 2019 15:35:39 -0400
Subject: [PATCH 0802/1648] remove stale warning about dirty metadata

there is no DB metadata any more
---
 programs/eosio-blocklog/main.cpp | 2 --
 programs/nodeos/main.cpp         | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 4e8c42037d7..f9e26de81c0 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -87,8 +87,6 @@ void blocklog::read_log() {
    } catch( const std::runtime_error& e ) {
       if( std::string(e.what()) == "database dirty flag set" ) {
          elog( "database dirty flag set (likely due to unclean shutdown): only block_log blocks are available" );
-      } else if( std::string(e.what()) == "database metadata dirty flag set" ) {
-         elog( "database metadata dirty flag set (likely due to unclean shutdown): only block_log blocks are available" );
       } else {
          throw;
       }
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 4c7478f3a70..bcd28394036 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -111,9 +111,6 @@ int main(int argc, char** argv)
          if( e.top_message().find( "database dirty flag set" ) != std::string::npos ) {
             elog( "database dirty flag set (likely due to unclean shutdown): replay required" );
             return DATABASE_DIRTY;
-         } else if( e.top_message().find( "database metadata dirty flag set" ) != std::string::npos ) {
-            elog( "database metadata dirty flag set (likely due to unclean shutdown): replay required" );
-            return DATABASE_DIRTY;
          }
       }
       elog( "${e}", ("e", e.to_detail_string()));
@@ -128,9 +125,6 @@ int main(int argc, char** argv)
       if( std::string(e.what()) == "database dirty flag set" ) {
          elog( "database dirty flag set (likely due to unclean shutdown): replay required" );
          return DATABASE_DIRTY;
-      } else if( std::string(e.what()) == "database metadata dirty flag set" ) {
-         elog( "database metadata dirty flag set (likely due to unclean shutdown): replay required" );
-         return DATABASE_DIRTY;
       } else {
          elog( "${e}", ("e",e.what()));
       }

From 9daf74f1cbbf7fb99d201efb2ddce3958d8944dd Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 11 Jul 2019 17:04:04 -0400
Subject: [PATCH 0803/1648] remove unused dlfcn.h include; troublesome for
 win32

---
 plugins/wallet_plugin/yubihsm_wallet.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/wallet_plugin/yubihsm_wallet.cpp b/plugins/wallet_plugin/yubihsm_wallet.cpp
index 04378916011..7b8cb4ef481 100644
--- a/plugins/wallet_plugin/yubihsm_wallet.cpp
+++ b/plugins/wallet_plugin/yubihsm_wallet.cpp
@@ -15,8 +15,6 @@
 #include <boost/asio/posix/stream_descriptor.hpp>
 #include <boost/dll/runtime_symbol_info.hpp>
 
-#include <dlfcn.h>
-
 namespace eosio { namespace wallet {
 
 using namespace fc::crypto::r1;

From 906bdc49b6bdd7ab9a72daedd8de81589c06655d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 11 Jul 2019 17:50:53 -0400
Subject: [PATCH 0804/1648] Only shutdown/close if open

---
 plugins/net_plugin/net_plugin.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 11de37bdfd8..81c6bd29070 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -955,8 +955,10 @@ namespace eosio {
    void connection::_close( connection* self, bool reconnect ) {
       self->socket_open = false;
       boost::system::error_code ec;
-      self->socket->shutdown( tcp::socket::shutdown_both, ec );
-      self->socket->close();
+      if( self->socket->is_open() ) {
+         self->socket->shutdown( tcp::socket::shutdown_both, ec );
+         self->socket->close();
+      }
       self->socket.reset( new tcp::socket( my_impl->thread_pool->get_executor() ) );
       self->flush_queues();
       self->connecting = false;

From d0b7392e876663b76582ae96f308f85cf481219e Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 11 Jul 2019 20:44:01 -0400
Subject: [PATCH 0805/1648] add eosio-blocklog to base install component

---
 programs/eosio-blocklog/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/programs/eosio-blocklog/CMakeLists.txt b/programs/eosio-blocklog/CMakeLists.txt
index 2bc891064c5..2e050924977 100644
--- a/programs/eosio-blocklog/CMakeLists.txt
+++ b/programs/eosio-blocklog/CMakeLists.txt
@@ -20,6 +20,8 @@ copy_bin( eosio-blocklog )
 install( TARGETS
    eosio-blocklog
 
+   COMPONENT base
+
    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}

From e749a125ac028dfd3d5780a6d5b0d807e623072a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Jul 2019 08:32:01 -0400
Subject: [PATCH 0806/1648] Give more time between launches

---
 tests/db_modes_test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
index effdfc6a555..f26ee5029a6 100755
--- a/tests/db_modes_test.py
+++ b/tests/db_modes_test.py
@@ -42,6 +42,7 @@ def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
             tries = tries - 1
             port = port + 1
     # now start nodeos
+    time.sleep(5)
     cmdArr= preCmd + nodeosCmd + " --http-server-address=127.0.0.1:" + str(port) + extraCmd
     print("port %d is free now, start to run nodeosCmd with extra parameter \"%s\"" % (port, extraCmd))
     proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, preexec_fn=os.setsid)

From aca1f5c10c7985a439977e0490fdd1a6e0a0ec2e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Jul 2019 08:56:00 -0400
Subject: [PATCH 0807/1648] Wait a bit for ports to close

---
 tests/nodeos_startup_catchup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/nodeos_startup_catchup.py b/tests/nodeos_startup_catchup.py
index 5934750d3a9..f213ebaafa9 100755
--- a/tests/nodeos_startup_catchup.py
+++ b/tests/nodeos_startup_catchup.py
@@ -142,6 +142,7 @@ def waitForNodeStarted(node):
     Print("Cycle through catchup scenarios")
     twoRounds=21*2*12
     for catchup_num in range(0, catchupCount):
+        time.sleep(5)
         Print("Start catchup node")
         cluster.launchUnstarted(cachePopen=True)
         lastLibNum=lib(node0)
@@ -165,6 +166,7 @@ def waitForNodeStarted(node):
         catchupNode.interruptAndVerifyExitStatus(60)
 
         Print("Restart catchup node")
+        time.sleep(5)
         catchupNode.relaunch(catchupNodeNum, cachePopen=True)
         waitForNodeStarted(catchupNode)
         lastCatchupLibNum=lib(catchupNode)

From 545f63b66ae87cc621159f173f7f0849bd380ae8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Jul 2019 13:28:53 -0400
Subject: [PATCH 0808/1648] Test without shutdown

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 81c6bd29070..62e597dd7cf 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -956,7 +956,7 @@ namespace eosio {
       self->socket_open = false;
       boost::system::error_code ec;
       if( self->socket->is_open() ) {
-         self->socket->shutdown( tcp::socket::shutdown_both, ec );
+//         self->socket->shutdown( tcp::socket::shutdown_both, ec );
          self->socket->close();
       }
       self->socket.reset( new tcp::socket( my_impl->thread_pool->get_executor() ) );

From 1b350b5b5f3afd2a10084876ff43339cc88d6531 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Jul 2019 15:10:58 -0400
Subject: [PATCH 0809/1648] Don't call shutdown on mac

---
 plugins/net_plugin/net_plugin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 62e597dd7cf..d90a314e91a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -956,7 +956,9 @@ namespace eosio {
       self->socket_open = false;
       boost::system::error_code ec;
       if( self->socket->is_open() ) {
-//         self->socket->shutdown( tcp::socket::shutdown_both, ec );
+#ifndef __APPLE__ /* shutdown seems to cause apple to not recover from connection refused */
+         self->socket->shutdown( tcp::socket::shutdown_both, ec );
+#endif
          self->socket->close();
       }
       self->socket.reset( new tcp::socket( my_impl->thread_pool->get_executor() ) );

From ac79dc1da22f8141d8a6faabf17b9d4a715909e1 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Fri, 12 Jul 2019 15:15:30 -0400
Subject: [PATCH 0810/1648] update to fast dispatcher

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 48424513985..4759c1d7fda 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 484245139855ea34c75d986c9148537ea441ea76
+Subproject commit 4759c1d7fda799aab67c0081c15888036659ccc2

From 52f897506d2df7e67b52023e21652c2883d02496 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Fri, 12 Jul 2019 15:28:57 -0400
Subject: [PATCH 0811/1648] update eos-vm reference

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 4759c1d7fda..bb73245839e 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 4759c1d7fda799aab67c0081c15888036659ccc2
+Subproject commit bb73245839ec839bf28bb7930400e0813825fffa

From 373527dbb8c58a616f117da7ebf891d5b531f792 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Jul 2019 15:58:14 -0400
Subject: [PATCH 0812/1648] Set reuse_address on socket

---
 plugins/net_plugin/net_plugin.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d90a314e91a..7b339823331 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -853,6 +853,7 @@ namespace eosio {
    {
       fc_ilog( logger, "creating connection to ${n}", ("n", endpoint) );
       node_id.data()[0] = 0;
+      socket->set_option(tcp::socket::reuse_address(true));
    }
 
    connection::connection()
@@ -867,6 +868,7 @@ namespace eosio {
    {
       fc_ilog( logger, "accepted network connection" );
       node_id.data()[0] = 0;
+      socket->set_option(tcp::socket::reuse_address(true));
    }
 
    void connection::update_endpoints() {
@@ -962,6 +964,7 @@ namespace eosio {
          self->socket->close();
       }
       self->socket.reset( new tcp::socket( my_impl->thread_pool->get_executor() ) );
+      self->socket->set_option(tcp::socket::reuse_address(true));
       self->flush_queues();
       self->connecting = false;
       self->syncing = false;

From 92d92a9f8ef98d6eae6e2f2cccd53fa8fe7b6492 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Fri, 12 Jul 2019 16:30:55 -0400
Subject: [PATCH 0813/1648] remove std::get and comment out trap handling and
 other things

---
 .../include/eosio/chain/webassembly/eos-vm.hpp   | 16 +++++++---------
 libraries/chain/webassembly/eos-vm.cpp           |  3 ++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index a89ee19bc68..1bdc036a8f7 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -73,41 +73,39 @@ namespace eosio { namespace vm {
       return std::function<void(Cls*, WAlloc*, operand_stack&)>{ [](Cls* self, WAlloc* walloc, operand_stack& os) {
          size_t i = sizeof...(Is) - 1;
          auto& intrinsic_log = self->control.get_intrinsic_debug_log();
+	 /*
          if (intrinsic_log) {
             eosio::chain::digest_type::encoder enc;
             enc.write(walloc->template get_base_ptr<char>(), walloc->get_current_page() * 64 * 1024);
             intrinsic_log->record_intrinsic(
                eosio::chain::calc_arguments_hash(
                   get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                        walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
+                        walloc, get_value<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
                                        os.get_back(i - Is)))...),
                enc.result());
          }
+	 */
          if constexpr (!std::is_same_v<R, void>) {
             if constexpr (std::is_same_v<Cls2, std::nullptr_t>) {
                R res = std::invoke(F, get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                                            walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
-                                                          os.get_back(i - Is)))...);
+                                            walloc, std::move(os.get_back(i - Is).get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
                os.trim(sizeof...(Is));
                os.push(resolve_result<R>(std::move(res), walloc));
             } else {
                R res = std::invoke(F, construct_derived<Cls2, Cls>::value(*self),
                                    get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                                         walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
-                                                       os.get_back(i - Is)))...);
+                                         walloc, std::move(os.get_back(i - Is).get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
                os.trim(sizeof...(Is));
                os.push(resolve_result<R>(std::move(res), walloc));
             }
          } else {
             if constexpr (std::is_same_v<Cls2, std::nullptr_t>) {
                std::invoke(F, get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                                    walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
-                                                  os.get_back(i - Is)))...);
+                                    walloc, std::move(os.get_back(i - Is).get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
             } else {
                std::invoke(F, construct_derived<Cls2, Cls>::value(*self),
                            get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                                 walloc, std::get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>(
-                                               os.get_back(i - Is)))...);
+                                 walloc, std::move(os.get_back(i - Is).get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
             }
             os.trim(sizeof...(Is));
          }
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 67f67d3738e..7f1bfebe132 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -40,7 +40,7 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
             //EOS_ASSERT(res, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
          });
          _runtime->_bkend = nullptr;
-
+	 /* TODO clean this up
          switch(trapType)
          {
          case Platform::HardwareTrapType::none: break;
@@ -57,6 +57,7 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          case Platform::HardwareTrapType::intDivideByZeroOrOverflow: throw wasm_execution_error();
          default: Errors::unreachable();
          };
+	 */
       }
 
    private:

From fe68f2c7b1ed58a26d2cc74317918cd6a0bb094c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 12 Jul 2019 16:47:16 -0400
Subject: [PATCH 0814/1648] set reuse after connection

---
 plugins/net_plugin/net_plugin.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7b339823331..5003291904d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -853,7 +853,6 @@ namespace eosio {
    {
       fc_ilog( logger, "creating connection to ${n}", ("n", endpoint) );
       node_id.data()[0] = 0;
-      socket->set_option(tcp::socket::reuse_address(true));
    }
 
    connection::connection()
@@ -868,7 +867,6 @@ namespace eosio {
    {
       fc_ilog( logger, "accepted network connection" );
       node_id.data()[0] = 0;
-      socket->set_option(tcp::socket::reuse_address(true));
    }
 
    void connection::update_endpoints() {
@@ -924,8 +922,11 @@ namespace eosio {
       boost::asio::ip::tcp::no_delay nodelay( true );
       boost::system::error_code ec;
       socket->set_option( nodelay, ec );
-      if( ec ) {
-         fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", peer_name())( "error", ec.message() ) );
+      boost::system::error_code ec2;
+      socket->set_option(tcp::socket::reuse_address(true), ec2);
+
+      if( ec || ec2 ) {
+         fc_elog( logger, "connection failed (set_option) ${peer}: ${e1}, ${e2}", ("peer", peer_name())( "e1", ec.message() )("e2", ec2.message()) );
          close();
          return false;
       } else {
@@ -964,7 +965,6 @@ namespace eosio {
          self->socket->close();
       }
       self->socket.reset( new tcp::socket( my_impl->thread_pool->get_executor() ) );
-      self->socket->set_option(tcp::socket::reuse_address(true));
       self->flush_queues();
       self->connecting = false;
       self->syncing = false;

From d15079a4ffd0ca4ed26270610b69c561d8bc4135 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 15 Jul 2019 11:06:03 -0400
Subject: [PATCH 0815/1648] port #7619 to develop

---
 libraries/chain/block_header_state.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index f7dd7aba656..59a1eaa3394 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -156,7 +156,7 @@ namespace eosio { namespace chain {
       } else {
          result.active_schedule                  = active_schedule;
          result.producer_to_last_produced        = producer_to_last_produced;
-         result.producer_to_last_produced[prokey.producer_name] = block_num;
+         result.producer_to_last_produced[prokey.producer_name] = result.block_num;
          result.producer_to_last_implied_irb     = producer_to_last_implied_irb;
          result.producer_to_last_implied_irb[prokey.producer_name] = dpos_proposed_irreversible_blocknum;
       }

From b64b19c3d46bed99b077bd27e8567a325bd326e7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 15 Jul 2019 11:29:08 -0500
Subject: [PATCH 0816/1648] Revert socket reuse_address option

---
 plugins/net_plugin/net_plugin.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5003291904d..0aeb56deb9f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -922,11 +922,8 @@ namespace eosio {
       boost::asio::ip::tcp::no_delay nodelay( true );
       boost::system::error_code ec;
       socket->set_option( nodelay, ec );
-      boost::system::error_code ec2;
-      socket->set_option(tcp::socket::reuse_address(true), ec2);
-
-      if( ec || ec2 ) {
-         fc_elog( logger, "connection failed (set_option) ${peer}: ${e1}, ${e2}", ("peer", peer_name())( "e1", ec.message() )("e2", ec2.message()) );
+      if( ec ) {
+         fc_elog( logger, "connection failed (set_option) ${peer}: ${e1}", ("peer", peer_name())( "e1", ec.message() ) );
          close();
          return false;
       } else {

From a5d9294df1a0335c4a93f744e71770da9b8334c6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 15 Jul 2019 12:10:29 -0500
Subject: [PATCH 0817/1648] Use new range async connect

---
 plugins/net_plugin/net_plugin.cpp | 33 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0aeb56deb9f..e2b16a41bcc 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -634,7 +634,7 @@ namespace eosio {
       void populate_handshake( handshake_message& hello );
 
       bool resolve_and_connect();
-      void connect(const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr);
+      void connect( const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::results_type endpoints );
       void start_read_message();
 
       /** \brief Process the next message from the pending message buffer
@@ -2148,11 +2148,11 @@ namespace eosio {
          auto resolver = std::make_shared<tcp::resolver>( my_impl->thread_pool->get_executor() );
          connection_wptr weak_conn = c;
          resolver->async_resolve( query, boost::asio::bind_executor( c->strand,
-            [resolver, weak_conn]( const boost::system::error_code& err, tcp::resolver::iterator endpoint_itr ) {
+            [resolver, weak_conn]( const boost::system::error_code& err, tcp::resolver::results_type endpoints ) {
                auto c = weak_conn.lock();
                if( !c ) return;
                if( !err ) {
-                  c->connect( resolver, endpoint_itr );
+                  c->connect( resolver, endpoints );
                } else {
                   fc_elog( logger, "Unable to resolve ${add}: ${error}", ("add", c->peer_name())( "error", err.message() ) );
                   ++c->consecutive_immediate_connection_close;
@@ -2163,32 +2163,31 @@ namespace eosio {
    }
 
    // called from connection strand
-   void connection::connect( const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::iterator endpoint_itr ) {
+   void connection::connect( const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::results_type endpoints ) {
       if( no_retry != go_away_reason::no_reason) {
          return;
       }
-      auto current_endpoint = *endpoint_itr;
-      ++endpoint_itr;
       connecting = true;
       pending_message_buffer.reset();
-      socket->async_connect( current_endpoint,
-            boost::asio::bind_executor( strand, [resolver, c = shared_from_this(), endpoint_itr]( const boost::system::error_code& err ) {
+      boost::asio::async_connect( *socket, endpoints,
+         boost::asio::bind_executor( strand,
+               [resolver, c = shared_from_this()]( const boost::system::error_code& err, const tcp::endpoint& endpoint ) {
             if( !err && c->socket->is_open() ) {
                if( c->start_session() ) {
                   c->send_handshake();
                }
             } else {
-               if( endpoint_itr != tcp::resolver::iterator() ) {
-                  c->strand.post( [resolver, c, endpoint_itr]() {
-                     if( c->socket_is_open()) {
-                        connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
-                     }
-                     c->connect( resolver, endpoint_itr );
-                  } ) ;
-               } else {
+//               if( endpoint_itr != tcp::resolver::iterator() ) {
+//                  c->strand.post( [resolver, c, endpoint_itr]() {
+//                     if( c->socket_is_open()) {
+//                        connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
+//                     }
+//                     c->connect( resolver, endpoint_itr );
+//                  } ) ;
+//               } else {
                   fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
                   c->close( false );
-               }
+//               }
             }
       } ) );
    }

From 35590e603a1d77b444df896a74fde14758b13d96 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 15 Jul 2019 15:19:57 -0500
Subject: [PATCH 0818/1648] shared_ptr for socket and capture on async calls

---
 plugins/net_plugin/net_plugin.cpp | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e2b16a41bcc..42d70054d8b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -577,7 +577,7 @@ namespace eosio {
 
    public:
       boost::asio::io_context::strand           strand;
-      std::unique_ptr<tcp::socket>              socket; // only accessed through strand after construction
+      std::shared_ptr<tcp::socket>              socket; // only accessed through strand after construction
 
       fc::message_buffer<1024*1024>    pending_message_buffer;
       std::atomic<std::size_t>         outstanding_read_bytes{0}; // accessed only from strand threads
@@ -1123,7 +1123,7 @@ namespace eosio {
 
       strand.dispatch( [c{std::move(c)}, bufs{std::move(bufs)}, priority]() {
          boost::asio::async_write( *c->socket, bufs,
-            boost::asio::bind_executor( c->strand, [c, priority]( boost::system::error_code ec, std::size_t w ) {
+            boost::asio::bind_executor( c->strand, [c, socket=c->socket, priority]( boost::system::error_code ec, std::size_t w ) {
             try {
                // May have closed connection and cleared buffer_queue
                if( !c->socket_is_open() ) return;
@@ -2171,23 +2171,14 @@ namespace eosio {
       pending_message_buffer.reset();
       boost::asio::async_connect( *socket, endpoints,
          boost::asio::bind_executor( strand,
-               [resolver, c = shared_from_this()]( const boost::system::error_code& err, const tcp::endpoint& endpoint ) {
-            if( !err && c->socket->is_open() ) {
+               [resolver, c = shared_from_this(), socket=socket]( const boost::system::error_code& err, const tcp::endpoint& endpoint ) {
+            if( !err && socket->is_open() ) {
                if( c->start_session() ) {
                   c->send_handshake();
                }
             } else {
-//               if( endpoint_itr != tcp::resolver::iterator() ) {
-//                  c->strand.post( [resolver, c, endpoint_itr]() {
-//                     if( c->socket_is_open()) {
-//                        connection::_close( c.get(), false ); // close posts to strand, so also post connect otherwise connect can happen before close
-//                     }
-//                     c->connect( resolver, endpoint_itr );
-//                  } ) ;
-//               } else {
-                  fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
-                  c->close( false );
-//               }
+               fc_elog( logger, "connection failed to ${peer}: ${error}", ("peer", c->peer_name())( "error", err.message()));
+               c->close( false );
             }
       } ) );
    }
@@ -2197,12 +2188,12 @@ namespace eosio {
       new_connection->connecting = true;
       new_connection->strand.post( [this, new_connection = std::move( new_connection )](){
          acceptor->async_accept( *new_connection->socket,
-            boost::asio::bind_executor( new_connection->strand, [new_connection, this]( boost::system::error_code ec ) {
+            boost::asio::bind_executor( new_connection->strand, [new_connection, socket=new_connection->socket, this]( boost::system::error_code ec ) {
             if( !ec ) {
                uint32_t visitors = 0;
                uint32_t from_addr = 0;
                boost::system::error_code rec;
-               const auto& paddr_add = new_connection->socket->remote_endpoint( rec ).address();
+               const auto& paddr_add = socket->remote_endpoint( rec ).address();
                string paddr_str;
                if( rec ) {
                   fc_elog( logger, "Error getting remote endpoint: ${m}", ("m", rec.message()));
@@ -2233,8 +2224,8 @@ namespace eosio {
                         fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count));
                      }
                      // new_connection never added to connections and start_session not called, lifetime will end
-                     new_connection->socket->shutdown( tcp::socket::shutdown_both );
-                     new_connection->socket->close();
+                     socket->shutdown( tcp::socket::shutdown_both );
+                     socket->close();
                   }
                }
             } else {
@@ -2316,7 +2307,7 @@ namespace eosio {
          boost::asio::async_read( *socket,
             pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
             boost::asio::bind_executor( strand,
-            [conn = shared_from_this()]( boost::system::error_code ec, std::size_t bytes_transferred ) {
+              [conn = shared_from_this(), socket=socket]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                // may have closed connection and cleared pending_message_buffer
                if( !conn->socket_is_open() ) return;
 

From 661f1492da9e0e3d62868ee63c1d5983d2daa53d Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 15 Jul 2019 16:47:59 -0400
Subject: [PATCH 0819/1648] remove raise() in keosd in favor of simple appbase
 quit (de-posix it)

---
 programs/keosd/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/keosd/main.cpp b/programs/keosd/main.cpp
index 626ef6bd0f8..a5764c06958 100644
--- a/programs/keosd/main.cpp
+++ b/programs/keosd/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
       if(!app().initialize<wallet_plugin, wallet_api_plugin, http_plugin>(argc, argv))
          return -1;
       auto& http = app().get_plugin<http_plugin>();
-      http.add_handler("/v1/" + keosd::config::key_store_executable_name + "/stop", [](string, string, url_response_callback cb) { cb(200, fc::variant(fc::variant_object())); std::raise(SIGTERM); } );
+      http.add_handler("/v1/" + keosd::config::key_store_executable_name + "/stop", [&a=app()](string, string, url_response_callback cb) { cb(200, fc::variant(fc::variant_object())); a.quit(); } );
       app().startup();
       app().exec();
    } catch (const fc::exception& e) {

From 5092c95baab45d27248e1b54bf17cd7b1fc42e06 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 15 Jul 2019 22:37:11 -0400
Subject: [PATCH 0820/1648] use checktime timer exclusively for checktime

Remove the "gear down" from timer to poll and instead strictly use a timer
---
 libraries/chain/checktime_timer_calibrate.cpp | 19 ++---
 libraries/chain/checktime_timer_dummy.cpp     | 85 +++++++++++++++++--
 libraries/chain/checktime_timer_macos.cpp     | 14 ++-
 libraries/chain/checktime_timer_posix.cpp     | 12 +--
 .../eosio/chain/checktime_timer_calibrate.hpp | 21 +----
 libraries/chain/transaction_context.cpp       | 52 ++++++------
 6 files changed, 120 insertions(+), 83 deletions(-)

diff --git a/libraries/chain/checktime_timer_calibrate.cpp b/libraries/chain/checktime_timer_calibrate.cpp
index cdff4ee98fe..fccd8479764 100755
--- a/libraries/chain/checktime_timer_calibrate.cpp
+++ b/libraries/chain/checktime_timer_calibrate.cpp
@@ -18,10 +18,7 @@ namespace eosio { namespace chain {
 
 namespace bacc = boost::accumulators;
 
-checktime_timer_calibrate::checktime_timer_calibrate() = default;
-checktime_timer_calibrate::~checktime_timer_calibrate() = default;
-
-void checktime_timer_calibrate::do_calibrate(checktime_timer& timer) {
+void compute_and_print_timer_accuracy(checktime_timer& timer) {
    static std::mutex m;
    static bool once_is_enough;
 
@@ -33,7 +30,7 @@ void checktime_timer_calibrate::do_calibrate(checktime_timer& timer) {
    bacc::accumulator_set<int, bacc::stats<bacc::tag::mean, bacc::tag::min, bacc::tag::max, bacc::tag::variance>, float> samples;
 
    //keep longest first in list. You're effectively going to take test_intervals[0]*sizeof(test_intervals[0])
-   //time to do the the "calibration"
+   //time to do the the test
    int test_intervals[] = {50000, 10000, 5000, 1000, 500, 100, 50, 10};
 
    for(int& interval : test_intervals) {
@@ -56,19 +53,15 @@ void checktime_timer_calibrate::do_calibrate(checktime_timer& timer) {
          samples(timer_slop, bacc::weight = interval/(float)test_intervals[0]);
       }
    }
-   _timer_overhead = bacc::mean(samples) + sqrt(bacc::variance(samples))*2; //target 95% of expirations before deadline
-   _use_timer = _timer_overhead < 1000;
 
    #define TIMER_STATS_FORMAT "min:${min}us max:${max}us mean:${mean}us stddev:${stddev}us"
    #define TIMER_STATS \
       ("min", bacc::min(samples))("max", bacc::max(samples)) \
-      ("mean", (int)bacc::mean(samples))("stddev", (int)sqrt(bacc::variance(samples))) \
-      ("t", _timer_overhead)
+      ("mean", (int)bacc::mean(samples))("stddev", (int)sqrt(bacc::variance(samples)))
 
-   if(_use_timer)
-      ilog("Using ${t}us deadline timer for checktime: " TIMER_STATS_FORMAT, TIMER_STATS);
-   else
-      wlog("Using polled checktime; deadline timer too inaccurate: " TIMER_STATS_FORMAT, TIMER_STATS);
+   ilog("Checktime timer accuracy: " TIMER_STATS_FORMAT, TIMER_STATS);
+   if(bacc::mean(samples) + sqrt(bacc::variance(samples))*2 > 250)
+      wlog("Checktime timer accuracy on this platform and hardware combination is poor; subjective billing accuracy may suffer");
 
    once_is_enough = true;
 }
diff --git a/libraries/chain/checktime_timer_dummy.cpp b/libraries/chain/checktime_timer_dummy.cpp
index 0c82d258cbf..2ad1d34c111 100644
--- a/libraries/chain/checktime_timer_dummy.cpp
+++ b/libraries/chain/checktime_timer_dummy.cpp
@@ -1,16 +1,91 @@
 #include <eosio/chain/checktime_timer.hpp>
+#include <eosio/chain/checktime_timer_calibrate.hpp>
+
 #include <fc/fwd_impl.hpp>
+#include <fc/log/logger_config.hpp> //set_os_thread_name()
+
+#include <boost/asio.hpp>
+
+#include <mutex>
+#include <thread>
 
 namespace eosio { namespace chain {
 
-struct checktime_timer::impl {};
+//a thread is shared for all instances
+static std::mutex timer_ref_mutex;
+static unsigned refcount;
+static std::thread checktime_thread;
+static std::unique_ptr<boost::asio::io_service> checktime_ios;
+
+struct checktime_timer::impl {
+   std::unique_ptr<boost::asio::high_resolution_timer> timer;
+};
 
 checktime_timer::checktime_timer() {
-   expired = 1;
+   static_assert(sizeof(impl) <= fwd_size);
+
+   std::lock_guard guard(timer_ref_mutex);
+
+   if(refcount++ == 0) {
+      std::promise<void> p;
+      checktime_thread = std::thread([&p]() {
+         fc::set_os_thread_name("checktime");
+         checktime_ios = std::make_unique<boost::asio::io_service>();
+         boost::asio::io_service::work work(*checktime_ios);
+         p.set_value();
+
+         checktime_ios->run();
+      });
+      p.get_future().get();
+   }
+
+   my->timer = std::make_unique<boost::asio::high_resolution_timer>(*checktime_ios);
+
+   //compute_and_print_timer_accuracy(*this);
+}
+
+checktime_timer::~checktime_timer() {
+   stop();
+   if(std::lock_guard guard(timer_ref_mutex); --refcount == 0) {
+      checktime_ios->stop();
+      checktime_thread.join();
+      checktime_ios.reset();
+   }
+}
+
+void checktime_timer::start(fc::time_point tp) {
+   if(tp == fc::time_point::maximum()) {
+      expired = 0;
+      return;
+   }
+   fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();
+   if(x.count() <= 0)
+      expired = 1;
+   else {
+#if 0
+      std::promise<void> p;
+      checktime_ios->post([&p,this]() {
+         expired = 0;
+         p.set_value();
+      });
+      p.get_future().get();
+#endif
+      expired = 0;
+      my->timer->expires_after(std::chrono::microseconds((int)x.count()));
+      my->timer->async_wait([this](const boost::system::error_code& ec) {
+         if(ec)
+            return;
+         expired = 1;
+      });
+   }
 }
 
-checktime_timer::~checktime_timer() {}
-void checktime_timer::start(fc::time_point tp) {}
-void checktime_timer::stop() {}
+void checktime_timer::stop() {
+   if(expired)
+      return;
+
+   my->timer->cancel();
+   expired = 1;
+}
 
 }}
\ No newline at end of file
diff --git a/libraries/chain/checktime_timer_macos.cpp b/libraries/chain/checktime_timer_macos.cpp
index 5355bead86a..a667448dfc9 100755
--- a/libraries/chain/checktime_timer_macos.cpp
+++ b/libraries/chain/checktime_timer_macos.cpp
@@ -4,6 +4,7 @@
 #include <fc/time.hpp>
 #include <fc/fwd_impl.hpp>
 #include <fc/exception/exception.hpp>
+#include <fc/log/logger_config.hpp> //set_os_thread_name()
 
 #include <mutex>
 #include <thread>
@@ -19,8 +20,6 @@ static unsigned refcount;
 static int kqueue_fd;
 static std::thread kevent_thread;
 
-static checktime_timer_calibrate the_calibrate;
-
 struct checktime_timer::impl {
    uint64_t timerid;
 
@@ -43,6 +42,7 @@ checktime_timer::checktime_timer() {
       FC_ASSERT(kevent64(kqueue_fd, &quit_event, 1, NULL, 0, KEVENT_FLAG_IMMEDIATE, NULL) == 0, "failed to create quit event");
 
       kevent_thread = std::thread([]() {
+         fc::set_os_thread_name("checktime");
          while(true) {
             struct kevent64_s anEvent;
             int c = kevent64(kqueue_fd, NULL, 0, &anEvent, 1, 0, NULL);
@@ -61,7 +61,7 @@ checktime_timer::checktime_timer() {
 
    my->timerid = next_timerid++;
 
-   the_calibrate.do_calibrate(*this);
+   compute_and_print_timer_accuracy(*this);
 }
 
 checktime_timer::~checktime_timer() {
@@ -81,16 +81,12 @@ void checktime_timer::start(fc::time_point tp) {
       expired = 0;
       return;
    }
-   if(!the_calibrate.use_timer()) {
-      expired = 1;
-      return;
-   }
    fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();
-   if(x.count() <= the_calibrate.timer_overhead())
+   if(x.count() <= 0)
       expired = 1;
    else {
       struct kevent64_s aTimerEvent;
-      EV_SET64(&aTimerEvent, my->timerid, EVFILT_TIMER, EV_ADD|EV_ENABLE|EV_ONESHOT, NOTE_USECONDS|NOTE_CRITICAL, (int)x.count()-the_calibrate.timer_overhead(), (uint64_t)&expired, 0, 0);
+      EV_SET64(&aTimerEvent, my->timerid, EVFILT_TIMER, EV_ADD|EV_ENABLE|EV_ONESHOT, NOTE_USECONDS|NOTE_CRITICAL, (int)x.count(), (uint64_t)&expired, 0, 0);
 
       expired = 0;
       if(kevent64(kqueue_fd, &aTimerEvent, 1, NULL, 0, KEVENT_FLAG_IMMEDIATE, NULL) != 0)
diff --git a/libraries/chain/checktime_timer_posix.cpp b/libraries/chain/checktime_timer_posix.cpp
index 81167ff5b55..1a7b2e62adb 100644
--- a/libraries/chain/checktime_timer_posix.cpp
+++ b/libraries/chain/checktime_timer_posix.cpp
@@ -12,8 +12,6 @@
 
 namespace eosio { namespace chain {
 
-static checktime_timer_calibrate the_calibrate;
-
 struct checktime_timer::impl {
    timer_t timerid;
 
@@ -44,7 +42,7 @@ checktime_timer::checktime_timer() {
 
    FC_ASSERT(timer_create(CLOCK_REALTIME, &se, &my->timerid) == 0, "failed to create timer");
 
-   the_calibrate.do_calibrate(*this);
+   compute_and_print_timer_accuracy(*this);
 }
 
 checktime_timer::~checktime_timer() {
@@ -56,15 +54,11 @@ void checktime_timer::start(fc::time_point tp) {
       expired = 0;
       return;
    }
-   if(!the_calibrate.use_timer()) {
-      expired = 1;
-      return;
-   }
    fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();
-   if(x.count() <= the_calibrate.timer_overhead())
+   if(x.count() <= 0)
       expired = 1;
    else {
-      struct itimerspec enable = {{0, 0}, {0, ((int)x.count()-the_calibrate.timer_overhead())*1000}};
+      struct itimerspec enable = {{0, 0}, {0, (int)x.count()*1000}};
       expired = 0;
       if(timer_settime(my->timerid, 0, &enable, NULL) != 0)
          expired = 1;
diff --git a/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp b/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
index 21604652805..5cc3c7237e5 100755
--- a/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
+++ b/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
@@ -1,27 +1,8 @@
 #pragma once
 
-#include <memory>
-
 namespace eosio { namespace chain {
 
 struct checktime_timer;
-
-struct checktime_timer_calibrate {
-   checktime_timer_calibrate();
-   //will run calibration if not already run on this instance
-   void do_calibrate(checktime_timer& t);
-   ~checktime_timer_calibrate();
-
-   bool use_timer() const {return _use_timer;}
-   int timer_overhead() const {return _timer_overhead;}
-
-private:
-   //These two values will be inspected by checktime_timer impls to determine if they
-   // should use the timer (accurate enough) and what slop to give the expiration. Set
-   // the defaults to a "perfect" timer because checktime_timer_calibrate will create
-   // a checktime_timer to calibrate with.
-   bool _use_timer = true;
-   int _timer_overhead = 0;
-};
+void compute_and_print_timer_accuracy(checktime_timer& t);
 
 }}
\ No newline at end of file
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index 6aed4868752..10732fba6a0 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -156,13 +156,13 @@ namespace eosio { namespace chain {
       if( initial_net_usage > 0 )
          add_net_usage( initial_net_usage );  // Fail early if current net usage is already greater than the calculated limit
 
-      checktime(); // Fail early if deadline has already been exceeded
-
       if(control.skip_trx_checks())
          deadline_timer.start(fc::time_point::maximum());
       else
          deadline_timer.start(_deadline);
 
+      checktime(); // Fail early if deadline has already been exceeded
+
       is_initialized = true;
    }
 
@@ -346,34 +346,32 @@ namespace eosio { namespace chain {
    void transaction_context::checktime()const {
       if(BOOST_LIKELY(deadline_timer.expired == false))
          return;
+
       auto now = fc::time_point::now();
-      if( BOOST_UNLIKELY( now > _deadline ) ) {
-         // edump((now-start)(now-pseudo_start));
-         if( explicit_billed_cpu_time || deadline_exception_code == deadline_exception::code_value ) {
-            EOS_THROW( deadline_exception, "deadline exceeded ${billing_timer}us",
-                       ("billing_timer", now - pseudo_start)("now", now)("deadline", _deadline)("start", start) );
-         } else if( deadline_exception_code == block_cpu_usage_exceeded::code_value ) {
-            EOS_THROW( block_cpu_usage_exceeded,
-                        "not enough time left in block to complete executing transaction ${billing_timer}us",
-                        ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
-         } else if( deadline_exception_code == tx_cpu_usage_exceeded::code_value ) {
-            if (cpu_limit_due_to_greylist) {
-               EOS_THROW( greylist_cpu_usage_exceeded,
-                        "greylisted transaction was executing for too long ${billing_timer}us",
-                        ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
-            } else {
-               EOS_THROW( tx_cpu_usage_exceeded,
-                        "transaction was executing for too long ${billing_timer}us",
-                        ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
-            }
-         } else if( deadline_exception_code == leeway_deadline_exception::code_value ) {
-            EOS_THROW( leeway_deadline_exception,
-                        "the transaction was unable to complete by deadline, "
-                        "but it is possible it could have succeeded if it were allowed to run to completion ${billing_timer}",
-                        ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
+      if( explicit_billed_cpu_time || deadline_exception_code == deadline_exception::code_value ) {
+         EOS_THROW( deadline_exception, "deadline exceeded ${billing_timer}us",
+                     ("billing_timer", now - pseudo_start)("now", now)("deadline", _deadline)("start", start) );
+      } else if( deadline_exception_code == block_cpu_usage_exceeded::code_value ) {
+         EOS_THROW( block_cpu_usage_exceeded,
+                     "not enough time left in block to complete executing transaction ${billing_timer}us",
+                     ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
+      } else if( deadline_exception_code == tx_cpu_usage_exceeded::code_value ) {
+         if (cpu_limit_due_to_greylist) {
+            EOS_THROW( greylist_cpu_usage_exceeded,
+                     "greylisted transaction was executing for too long ${billing_timer}us",
+                     ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
+         } else {
+            EOS_THROW( tx_cpu_usage_exceeded,
+                     "transaction was executing for too long ${billing_timer}us",
+                     ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
          }
-         EOS_ASSERT( false,  transaction_exception, "unexpected deadline exception code ${code}", ("code", deadline_exception_code) );
+      } else if( deadline_exception_code == leeway_deadline_exception::code_value ) {
+         EOS_THROW( leeway_deadline_exception,
+                     "the transaction was unable to complete by deadline, "
+                     "but it is possible it could have succeeded if it were allowed to run to completion ${billing_timer}",
+                     ("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
       }
+      EOS_ASSERT( false,  transaction_exception, "unexpected deadline exception code ${code}", ("code", deadline_exception_code) );
    }
 
    void transaction_context::pause_billing_timer() {

From 0cc3261a0ffaecbe4c2d941e1c68bc4228b03d16 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 15 Jul 2019 22:42:17 -0400
Subject: [PATCH 0821/1648] rename some of the checktime files

---
 libraries/chain/CMakeLists.txt                                | 4 ++--
 ...ktime_timer_calibrate.cpp => checktime_timer_accuracy.cpp} | 4 ++--
 ...time_timer_dummy.cpp => checktime_timer_asio_fallback.cpp} | 4 ++--
 libraries/chain/checktime_timer_macos.cpp                     | 4 ++--
 libraries/chain/checktime_timer_posix.cpp                     | 4 ++--
 ...ktime_timer_calibrate.hpp => checktime_timer_accuracy.hpp} | 0
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename libraries/chain/{checktime_timer_calibrate.cpp => checktime_timer_accuracy.cpp} (98%)
 rename libraries/chain/{checktime_timer_dummy.cpp => checktime_timer_asio_fallback.cpp} (97%)
 rename libraries/chain/include/eosio/chain/{checktime_timer_calibrate.hpp => checktime_timer_accuracy.hpp} (100%)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index b47b1e4aaf2..f52e3145201 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -12,7 +12,7 @@ else()
    if(POSIX_TIMER_TEST_RUN_RESULT EQUAL 0)
       set(CHECKTIME_TIMER_IMPL checktime_timer_posix.cpp)
    else()
-      set(CHECKTIME_TIMER_IMPL checktime_timer_dummy.cpp)
+      set(CHECKTIME_TIMER_IMPL checktime_timer_asio_fallback.cpp)
    endif()
 endif()
 
@@ -63,7 +63,7 @@ add_library( eosio_chain
              genesis_intrinsics.cpp
              whitelisted_intrinsics.cpp
              thread_utils.cpp
-             checktime_timer_calibrate.cpp
+             checktime_timer_accuracy.cpp
              ${CHECKTIME_TIMER_IMPL}
              ${HEADERS}
              )
diff --git a/libraries/chain/checktime_timer_calibrate.cpp b/libraries/chain/checktime_timer_accuracy.cpp
similarity index 98%
rename from libraries/chain/checktime_timer_calibrate.cpp
rename to libraries/chain/checktime_timer_accuracy.cpp
index fccd8479764..b24349d2315 100755
--- a/libraries/chain/checktime_timer_calibrate.cpp
+++ b/libraries/chain/checktime_timer_accuracy.cpp
@@ -1,4 +1,4 @@
-#include <eosio/chain/checktime_timer_calibrate.hpp>
+#include <eosio/chain/checktime_timer_accuracy.hpp>
 #include <eosio/chain/checktime_timer.hpp>
 
 #include <fc/time.hpp>
@@ -66,4 +66,4 @@ void compute_and_print_timer_accuracy(checktime_timer& timer) {
    once_is_enough = true;
 }
 
-}}
\ No newline at end of file
+}}
diff --git a/libraries/chain/checktime_timer_dummy.cpp b/libraries/chain/checktime_timer_asio_fallback.cpp
similarity index 97%
rename from libraries/chain/checktime_timer_dummy.cpp
rename to libraries/chain/checktime_timer_asio_fallback.cpp
index 2ad1d34c111..9d1cb7d454b 100644
--- a/libraries/chain/checktime_timer_dummy.cpp
+++ b/libraries/chain/checktime_timer_asio_fallback.cpp
@@ -1,5 +1,5 @@
 #include <eosio/chain/checktime_timer.hpp>
-#include <eosio/chain/checktime_timer_calibrate.hpp>
+#include <eosio/chain/checktime_timer_accuracy.hpp>
 
 #include <fc/fwd_impl.hpp>
 #include <fc/log/logger_config.hpp> //set_os_thread_name()
@@ -88,4 +88,4 @@ void checktime_timer::stop() {
    expired = 1;
 }
 
-}}
\ No newline at end of file
+}}
diff --git a/libraries/chain/checktime_timer_macos.cpp b/libraries/chain/checktime_timer_macos.cpp
index a667448dfc9..5a1b6dd9910 100755
--- a/libraries/chain/checktime_timer_macos.cpp
+++ b/libraries/chain/checktime_timer_macos.cpp
@@ -1,5 +1,5 @@
 #include <eosio/chain/checktime_timer.hpp>
-#include <eosio/chain/checktime_timer_calibrate.hpp>
+#include <eosio/chain/checktime_timer_accuracy.hpp>
 
 #include <fc/time.hpp>
 #include <fc/fwd_impl.hpp>
@@ -104,4 +104,4 @@ void checktime_timer::stop() {
    expired = 1;
 }
 
-}}
\ No newline at end of file
+}}
diff --git a/libraries/chain/checktime_timer_posix.cpp b/libraries/chain/checktime_timer_posix.cpp
index 1a7b2e62adb..8b1ccd3a1d6 100644
--- a/libraries/chain/checktime_timer_posix.cpp
+++ b/libraries/chain/checktime_timer_posix.cpp
@@ -1,5 +1,5 @@
 #include <eosio/chain/checktime_timer.hpp>
-#include <eosio/chain/checktime_timer_calibrate.hpp>
+#include <eosio/chain/checktime_timer_accuracy.hpp>
 
 #include <fc/time.hpp>
 #include <fc/fwd_impl.hpp>
@@ -73,4 +73,4 @@ void checktime_timer::stop() {
    expired = 1;
 }
 
-}}
\ No newline at end of file
+}}
diff --git a/libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp b/libraries/chain/include/eosio/chain/checktime_timer_accuracy.hpp
similarity index 100%
rename from libraries/chain/include/eosio/chain/checktime_timer_calibrate.hpp
rename to libraries/chain/include/eosio/chain/checktime_timer_accuracy.hpp

From 0443b078aa461256eee67aabe02065c7efe8427b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 06:46:24 -0500
Subject: [PATCH 0822/1648] Up http response priority slightly

---
 plugins/http_plugin/http_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index 6bb609c980c..fde3f49ca81 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -315,7 +315,7 @@ namespace eosio {
                if( handler_itr != url_handlers.end()) {
                   con->defer_http_response();
                   bytes_in_flight += body.size();
-                  app().post( appbase::priority::low,
+                  app().post( appbase::priority::low+1,
                               [&ioc = thread_pool->get_executor(), &bytes_in_flight = this->bytes_in_flight, handler_itr,
                                resource{std::move( resource )}, body{std::move( body )}, con]() {
                      try {

From f30742e5589a7039fa3e9f094454b191fb966b93 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 16 Jul 2019 09:34:05 -0400
Subject: [PATCH 0823/1648] tweak checktime time accuracy warning

---
 libraries/chain/checktime_timer_accuracy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/checktime_timer_accuracy.cpp b/libraries/chain/checktime_timer_accuracy.cpp
index b24349d2315..e432dea2d1f 100755
--- a/libraries/chain/checktime_timer_accuracy.cpp
+++ b/libraries/chain/checktime_timer_accuracy.cpp
@@ -61,7 +61,7 @@ void compute_and_print_timer_accuracy(checktime_timer& timer) {
 
    ilog("Checktime timer accuracy: " TIMER_STATS_FORMAT, TIMER_STATS);
    if(bacc::mean(samples) + sqrt(bacc::variance(samples))*2 > 250)
-      wlog("Checktime timer accuracy on this platform and hardware combination is poor; subjective billing accuracy may suffer");
+      wlog("Checktime timer accuracy on this platform and hardware combination is poor; accuracy of subjective transaction deadline enforcement will suffer");
 
    once_is_enough = true;
 }

From 769df3db5375b0fe1fc983e6c64acccf9946b42e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 08:47:47 -0500
Subject: [PATCH 0824/1648] Revert http priority change as made no diff

---
 plugins/http_plugin/http_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index fde3f49ca81..6bb609c980c 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -315,7 +315,7 @@ namespace eosio {
                if( handler_itr != url_handlers.end()) {
                   con->defer_http_response();
                   bytes_in_flight += body.size();
-                  app().post( appbase::priority::low+1,
+                  app().post( appbase::priority::low,
                               [&ioc = thread_pool->get_executor(), &bytes_in_flight = this->bytes_in_flight, handler_itr,
                                resource{std::move( resource )}, body{std::move( body )}, con]() {
                      try {

From b2be22491380ae197310ad647e15355cc1f51bf9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 10:08:13 -0500
Subject: [PATCH 0825/1648] verify catchup test

---
 plugins/net_plugin/net_plugin.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 42d70054d8b..a43c19bde46 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -157,7 +157,7 @@ namespace eosio {
       bool is_sync_required( uint32_t fork_head_block_num );
       void request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn = connection_ptr() );
       void start_sync( const connection_ptr& c, uint32_t target );
-      void verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
+      bool verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
 
    public:
       explicit sync_manager( uint32_t span );
@@ -1615,13 +1615,12 @@ namespace eosio {
          return;
       }
 
+      bool catch_up_req_sent = false;
       if (head < msg.head_num ) {
          fc_dlog(logger, "sync check state 3");
          c->syncing = false;
-         verify_catchup(c, msg.head_num, msg.head_id);
-         return;
-      }
-      else {
+         catch_up_req_sent = verify_catchup(c, msg.head_num, msg.head_id);
+      } else {
          fc_dlog(logger, "sync check state 4");
          if (msg.generation > 1 ||  c->protocol_version > proto_base) {
             notice_message note;
@@ -1634,11 +1633,15 @@ namespace eosio {
          c->syncing = true;
          return;
       }
-      c->syncing = false;
-      fc_elog( logger, "sync check failed to resolve status" );
+      if( !catch_up_req_sent ) {
+         request_message req;
+         req.req_blocks.mode = catch_up;
+         req.req_trx.mode = none;
+         c->enqueue( req );
+      }
    }
 
-   void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
+   bool sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
       for_each_block_connection( [num, &id, &req]( const auto& cc ) {
@@ -1661,7 +1664,7 @@ namespace eosio {
                   ("s", stage_str( sync_state ))( "fhn", num )( "lib", sync_known_lib_num )
                   ("ne", sync_next_expected_num ) );
          if( sync_state == lib_catchup || sync_state == head_catchup )
-            return;
+            return false;
          set_state( head_catchup );
       } else {
          std::lock_guard<std::mutex> g_conn( c->conn_mtx );
@@ -1670,6 +1673,7 @@ namespace eosio {
       }
       req.req_trx.mode = none;
       c->enqueue( req );
+      return true;
    }
 
    void sync_manager::sync_recv_notice( const connection_ptr& c, const notice_message& msg) {

From 5b3504c4ce0cff458581db029e4caf490d8c2623 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 10:58:18 -0500
Subject: [PATCH 0826/1648] Remove unneeded signed_id

---
 .../chain/include/eosio/chain/transaction_metadata.hpp     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index dcd7d362b63..dfda13efa42 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -28,7 +28,6 @@ class transaction_metadata {
    private:
       const packed_transaction_ptr                               _packed_trx;
       const transaction_id_type                                  _id;
-      const transaction_id_type                                  _signed_id;
       mutable std::mutex                                         _signing_keys_future_mtx;
       mutable signing_keys_future_type                           _signing_keys_future;
 
@@ -45,15 +44,13 @@ class transaction_metadata {
 
       explicit transaction_metadata( const signed_transaction& t, uint32_t max_variable_sig_size = UINT32_MAX, packed_transaction::compression_type c = packed_transaction::compression_type::none )
             : _packed_trx( std::make_shared<packed_transaction>( t, c ) )
-            , _id( t.id() )
-            , _signed_id( digest_type::hash( *_packed_trx ) ) {
+            , _id( t.id() ) {
          check_variable_sig_size(max_variable_sig_size);
       }
 
       explicit transaction_metadata( const packed_transaction_ptr& ptrx, uint32_t max_variable_sig_size = UINT32_MAX )
             : _packed_trx( ptrx )
-            , _id( ptrx->id() )
-            , _signed_id( digest_type::hash( *_packed_trx ) ) {
+            , _id( ptrx->id() ) {
          check_variable_sig_size(max_variable_sig_size);
       }
 

From 54002df4b9affee796a0515b084d4c6ba87041a9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 11:14:36 -0500
Subject: [PATCH 0827/1648] Code cleanup

---
 .../chain/unapplied_transaction_queue.hpp     | 36 +++++++++----------
 plugins/producer_plugin/producer_plugin.cpp   |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 6f2332b72ff..f0f5bbd8e72 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -23,7 +23,7 @@ namespace eosio { namespace chain {
 
 using namespace boost::multi_index;
 
-enum trx_enum_type {
+enum class trx_enum_type {
    unknown = 0,
    persisted = 1,
    forked = 2,
@@ -33,7 +33,7 @@ enum trx_enum_type {
 struct unapplied_transaction {
    const transaction_metadata_ptr trx_meta;
    const fc::time_point           expiry;
-   trx_enum_type                  trx_type = unknown;
+   trx_enum_type                  trx_type = trx_enum_type::unknown;
 
    const transaction_id_type& id()const { return trx_meta->id(); }
 
@@ -49,14 +49,14 @@ struct unapplied_transaction {
  */
 class unapplied_transaction_queue {
 
-   struct by_id;
+   struct by_trx_id;
    struct by_type;
    struct by_expiry;
 
    typedef multi_index_container< unapplied_transaction,
       indexed_by<
          sequenced<>,
-         hashed_unique< tag<by_id>,
+         hashed_unique< tag<by_trx_id>,
                const_mem_fun<unapplied_transaction, const transaction_id_type&, &unapplied_transaction::id>
          >,
          ordered_non_unique< tag<by_type>, member<unapplied_transaction, trx_enum_type, &unapplied_transaction::trx_type> >,
@@ -81,13 +81,13 @@ class unapplied_transaction_queue {
    }
 
    bool contains_persisted()const {
-      return queue.get<by_type>().find( persisted ) != queue.get<by_type>().end();
+      return queue.get<by_type>().find( trx_enum_type::persisted ) != queue.get<by_type>().end();
    }
 
    bool is_persisted(const transaction_metadata_ptr& trx)const {
-      auto itr = queue.get<by_id>().find( trx->id() );
-      if( itr == queue.get<by_id>().end() ) return false;
-      return itr->trx_type == persisted;
+      auto itr = queue.get<by_trx_id>().find( trx->id() );
+      if( itr == queue.get<by_trx_id>().end() ) return false;
+      return itr->trx_type == trx_enum_type::persisted;
    }
 
    template <typename Func>
@@ -103,14 +103,14 @@ class unapplied_transaction_queue {
       return true;
    }
 
-   void add_forked( branch_type forked_branch ) {
+   void add_forked( const branch_type& forked_branch ) {
       // forked_branch is in reverse order
       for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
-         block_state_ptr& bsptr = *ritr;
+         const block_state_ptr& bsptr = *ritr;
          for( auto itr = bsptr->trxs.begin(), end = bsptr->trxs.end(); itr != end; ++itr ) {
             const auto& trx = *itr;
             fc::time_point expiry = trx->packed_trx()->expiration();
-            queue.push_back( { trx, std::move( expiry ), forked } );
+            queue.push_back( { trx, expiry, trx_enum_type::forked } );
          }
       }
    }
@@ -119,18 +119,18 @@ class unapplied_transaction_queue {
       if( aborted_trxs.empty() ) return;
       for( auto& trx : aborted_trxs ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
-         queue.push_back( { std::move( trx ), std::move( expiry ), aborted } );
+         queue.push_back( { std::move( trx ), expiry, trx_enum_type::aborted } );
       }
    }
 
    void add_persisted( const transaction_metadata_ptr& trx ) {
-      auto itr = queue.get<by_id>().find( trx->id() );
-      if( itr == queue.get<by_id>().end() ) {
+      auto itr = queue.get<by_trx_id>().find( trx->id() );
+      if( itr == queue.get<by_trx_id>().end() ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
-         queue.push_back( { trx, std::move( expiry ), persisted } );
-      } else if( itr->trx_type != persisted ) {
-         queue.get<by_id>().modify( itr, [](auto& un){
-            un.trx_type = persisted;
+         queue.push_back( { trx, expiry, trx_enum_type::persisted } );
+      } else if( itr->trx_type != trx_enum_type::persisted ) {
+         queue.get<by_trx_id>().modify( itr, [](auto& un){
+            un.trx_type = trx_enum_type::persisted;
          } );
       }
    }
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 371af4b276e..43ffeb2a068 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1454,7 +1454,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
       exhausted = !_unapplied_transactions.clear_expired( pending_block_time, preprocess_deadline,
                      [&num_expired_persistent, pbm = _pending_block_mode,
                       &chain, has_producers = !_producers.empty()]( const transaction_id_type& txid, trx_enum_type trx_type ) {
-               if( trx_type == persisted ) {
+               if( trx_type == trx_enum_type::persisted ) {
                   if( pbm == pending_block_mode::producing ) {
                      fc_dlog( _trx_trace_log,
                               "[TRX_TRACE] Block ${block_num} for producer ${prod} is EXPIRING PERSISTED tx: ${txid}",

From 9537c5a14a8af35ef140d1c41a53e280d20ed1ae Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 12:12:15 -0500
Subject: [PATCH 0828/1648] sequenced not needed as fifo is documented behavior
 and we have tests to verify

---
 .../include/eosio/chain/unapplied_transaction_queue.hpp    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index f0f5bbd8e72..9c4f6ec0bc9 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -55,7 +55,6 @@ class unapplied_transaction_queue {
 
    typedef multi_index_container< unapplied_transaction,
       indexed_by<
-         sequenced<>,
          hashed_unique< tag<by_trx_id>,
                const_mem_fun<unapplied_transaction, const transaction_id_type&, &unapplied_transaction::id>
          >,
@@ -110,7 +109,7 @@ class unapplied_transaction_queue {
          for( auto itr = bsptr->trxs.begin(), end = bsptr->trxs.end(); itr != end; ++itr ) {
             const auto& trx = *itr;
             fc::time_point expiry = trx->packed_trx()->expiration();
-            queue.push_back( { trx, expiry, trx_enum_type::forked } );
+            queue.insert( { trx, expiry, trx_enum_type::forked } );
          }
       }
    }
@@ -119,7 +118,7 @@ class unapplied_transaction_queue {
       if( aborted_trxs.empty() ) return;
       for( auto& trx : aborted_trxs ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
-         queue.push_back( { std::move( trx ), expiry, trx_enum_type::aborted } );
+         queue.insert( { std::move( trx ), expiry, trx_enum_type::aborted } );
       }
    }
 
@@ -127,7 +126,7 @@ class unapplied_transaction_queue {
       auto itr = queue.get<by_trx_id>().find( trx->id() );
       if( itr == queue.get<by_trx_id>().end() ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
-         queue.push_back( { trx, expiry, trx_enum_type::persisted } );
+         queue.insert( { trx, expiry, trx_enum_type::persisted } );
       } else if( itr->trx_type != trx_enum_type::persisted ) {
          queue.get<by_trx_id>().modify( itr, [](auto& un){
             un.trx_type = trx_enum_type::persisted;

From c27f0e1886f1404dcaf72879826c4c7788bf6a06 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 12:37:41 -0500
Subject: [PATCH 0829/1648] Add only_track_persisted feature

---
 .../eosio/chain/unapplied_transaction_queue.hpp  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 9c4f6ec0bc9..6eae1298b9b 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -7,6 +7,7 @@
 
 #include <eosio/chain/transaction_metadata.hpp>
 #include <eosio/chain/block_state.hpp>
+#include <eosio/chain/exceptions.hpp>
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
@@ -64,9 +65,17 @@ class unapplied_transaction_queue {
    > unapplied_trx_queue_type;
 
    unapplied_trx_queue_type queue;
+   bool only_track_persisted = false;
 
 public:
 
+   void set_only_track_persisted( bool v ) {
+      if( v ) {
+         EOS_ASSERT( empty(), "set_only_track_persisted queue required to be empty" );
+      }
+      only_track_persisted = v;
+   }
+
    bool empty() const {
       return queue.empty();
    }
@@ -103,6 +112,7 @@ class unapplied_transaction_queue {
    }
 
    void add_forked( const branch_type& forked_branch ) {
+      if( only_track_persisted ) return;
       // forked_branch is in reverse order
       for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
          const block_state_ptr& bsptr = *ritr;
@@ -115,7 +125,7 @@ class unapplied_transaction_queue {
    }
 
    void add_aborted( std::vector<transaction_metadata_ptr> aborted_trxs ) {
-      if( aborted_trxs.empty() ) return;
+      if( aborted_trxs.empty() || only_track_persisted ) return;
       for( auto& trx : aborted_trxs ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
          queue.insert( { std::move( trx ), expiry, trx_enum_type::aborted } );
@@ -138,6 +148,10 @@ class unapplied_transaction_queue {
 
    iterator begin() { return queue.get<by_type>().begin(); }
    iterator end() { return queue.get<by_type>().end(); }
+
+   iterator persisted_begin() { return queue.get<by_type>().lower_bound( persisted ); }
+   iterator persisted_end() { return queue.get<by_type>().upper_bound( persisted ); }
+
    iterator erase( iterator itr ) { return queue.get<by_type>().erase( itr ); }
 
 };

From 1aa6039cbfe521e58adedf63a4f524d09248181b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 14:27:10 -0500
Subject: [PATCH 0830/1648] Simplify logic by using only_track_persisted flag

---
 .../chain/unapplied_transaction_queue.hpp     |   6 +-
 plugins/producer_plugin/producer_plugin.cpp   | 140 ++++++++----------
 2 files changed, 65 insertions(+), 81 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 6eae1298b9b..eb9275eab5e 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -71,7 +71,7 @@ class unapplied_transaction_queue {
 
    void set_only_track_persisted( bool v ) {
       if( v ) {
-         EOS_ASSERT( empty(), "set_only_track_persisted queue required to be empty" );
+         FC_ASSERT( empty(), "set_only_track_persisted queue required to be empty" );
       }
       only_track_persisted = v;
    }
@@ -149,8 +149,8 @@ class unapplied_transaction_queue {
    iterator begin() { return queue.get<by_type>().begin(); }
    iterator end() { return queue.get<by_type>().end(); }
 
-   iterator persisted_begin() { return queue.get<by_type>().lower_bound( persisted ); }
-   iterator persisted_end() { return queue.get<by_type>().upper_bound( persisted ); }
+   iterator persisted_begin() { return queue.get<by_type>().lower_bound( trx_enum_type::persisted ); }
+   iterator persisted_end() { return queue.get<by_type>().upper_bound( trx_enum_type::persisted ); }
 
    iterator erase( iterator itr ) { return queue.get<by_type>().erase( itr ); }
 
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 43ffeb2a068..c4485708b10 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -735,6 +735,8 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
    my->_options = &options;
    LOAD_VALUE_SET(options, "producer-name", my->_producers)
 
+   my->_unapplied_transactions.set_only_track_persisted( my->_producers.empty() );
+
    if( options.count("private-key") )
    {
       const std::vector<std::string> key_id_to_wif_pair_strings = options["private-key"].as<std::vector<std::string>>();
@@ -1450,9 +1452,10 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
       // remove all expired transactions
       size_t num_expired_persistent = 0;
+      size_t num_expired_other = 0;
       size_t orig_count = _unapplied_transactions.size();
       exhausted = !_unapplied_transactions.clear_expired( pending_block_time, preprocess_deadline,
-                     [&num_expired_persistent, pbm = _pending_block_mode,
+                     [&num_expired_persistent, &num_expired_other, pbm = _pending_block_mode,
                       &chain, has_producers = !_producers.empty()]( const transaction_id_type& txid, trx_enum_type trx_type ) {
                if( trx_type == trx_enum_type::persisted ) {
                   if( pbm == pending_block_mode::producing ) {
@@ -1463,98 +1466,79 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                      fc_dlog( _trx_trace_log, "[TRX_TRACE] Speculative execution is EXPIRING PERSISTED tx: ${txid}", ("txid", txid));
                   }
                   ++num_expired_persistent;
-               } else if (has_producers) {
-                  fc_dlog(_trx_trace_log,
-                          "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
-                          ("txid", txid));
+               } else {
+                  if (has_producers) {
+                     fc_dlog(_trx_trace_log,
+                           "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
+                           ("txid", txid));
+                  }
+                  ++num_expired_other;
                }
       });
 
-      if( exhausted || num_expired_persistent > 0 ) {
-         if( exhausted ) {
-            fc_wlog( _log, "Unable to process all ${n} transactions before deadline, Persistent expired ${expired}",
-                     ( "n", orig_count )( "expired", num_expired_persistent ) );
-         } else {
-            fc_dlog( _log, "Processed ${n} transactions, Persistent expired ${expired}",
-                     ( "n", orig_count )( "expired", num_expired_persistent ) );
-         }
+      if( exhausted ) {
+         fc_wlog( _log, "Unable to process all expired transactions in unapplied queue before deadline, "
+                        "Persistent expired ${persistent_expired}, Other expired ${other_expired}",
+                  ("persistent_expired", num_expired_persistent)("other_expired", num_expired_other) );
+      } else {
+         fc_dlog( _log, "Processed ${m} expired transactions of the ${n} transactions in the unapplied queue, "
+                        "Persistent expired ${persistent_expired}, Other expired ${other_expired}",
+                  ("m", num_expired_persistent+num_expired_other)("n", orig_count)
+                  ("persistent_expired", num_expired_persistent)("other_expired", num_expired_other) );
       }
 
       try {
          size_t orig_pending_txn_size = _pending_incoming_transactions.size();
 
          // Processing unapplied transactions...
-         if( _producers.empty() && !_unapplied_transactions.contains_persisted() ) {
-            // if this node can never produce and has no persisted transactions,
-            // there is no need for unapplied transactions they can be dropped
-            _unapplied_transactions.clear();
-         } else {
-            // derive appliable transactions from unapplied_transactions and drop droppable transactions
-            if( !_unapplied_transactions.empty() ) {
-               int num_applied = 0;
-               int num_failed = 0;
-               int num_processed = 0;
-               auto unapplied_trxs_size = _unapplied_transactions.size();
-               auto calculate_transaction_category = [&](const transaction_metadata_ptr& trx) {
-                  if (_unapplied_transactions.is_persisted(trx)) {
-                     return tx_category::PERSISTED;
-                  } else {
-                     return tx_category::UNEXPIRED_UNPERSISTED;
+         if( !_unapplied_transactions.empty() ) {
+            int num_applied = 0, num_failed = 0, num_processed = 0;
+            auto unapplied_trxs_size = _unapplied_transactions.size();
+            auto itr     = (_pending_block_mode == pending_block_mode::producing) ?
+                  _unapplied_transactions.begin() : _unapplied_transactions.persisted_begin();
+            auto end_itr = (_pending_block_mode == pending_block_mode::producing) ?
+                  _unapplied_transactions.end()   : _unapplied_transactions.persisted_end();
+            while( itr != end_itr ) {
+               if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
+               if( exhausted ) break;
+
+               const transaction_metadata_ptr trx = itr->trx_meta;
+               ++num_processed;
+               try {
+                  auto deadline = fc::time_point::now() + fc::milliseconds( _max_transaction_time_ms );
+                  bool deadline_is_subjective = false;
+                  if( _max_transaction_time_ms < 0 ||
+                      (_pending_block_mode == pending_block_mode::producing && preprocess_deadline < deadline) ) {
+                     deadline_is_subjective = true;
+                     deadline = preprocess_deadline;
                   }
-               };
 
-               auto itr = _unapplied_transactions.begin();
-               while( itr != _unapplied_transactions.end() ) {
-                  if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
-                  if( exhausted ) break;
-
-                  const transaction_metadata_ptr trx = itr->trx_meta;
-                  ++num_processed;
-                  auto category = calculate_transaction_category(trx);
-                  if (category == tx_category::UNEXPIRED_UNPERSISTED && _producers.empty())
-                  {
-                     ++num_failed;
+                  auto trace = chain.push_transaction( trx, deadline );
+                  if( trace->except ) {
+                     if( failure_is_subjective( *trace->except, deadline_is_subjective ) ) {
+                        exhausted = true;
+                        // don't erase, subjective failure so try again next time
+                        break;
+                     } else {
+                        // this failed our configured maximum transaction time, we don't want to replay it
+                        ++num_failed;
+                        itr = _unapplied_transactions.erase( itr );
+                        continue;
+                     }
+                  } else {
+                     ++num_applied;
                      itr = _unapplied_transactions.erase( itr );
                      continue;
-                  } else if (category == tx_category::PERSISTED ||
-                            (category == tx_category::UNEXPIRED_UNPERSISTED && _pending_block_mode == pending_block_mode::producing))
-                  {
-                     try {
-                        auto deadline = fc::time_point::now() + fc::milliseconds(_max_transaction_time_ms);
-                        bool deadline_is_subjective = false;
-                        if (_max_transaction_time_ms < 0 || (_pending_block_mode == pending_block_mode::producing && preprocess_deadline < deadline)) {
-                           deadline_is_subjective = true;
-                           deadline = preprocess_deadline;
-                        }
-
-                        auto trace = chain.push_transaction(trx, deadline);
-                        if (trace->except) {
-                           if (failure_is_subjective(*trace->except, deadline_is_subjective)) {
-                              exhausted = true;
-                              // don't erase, subjective failure so try again next time
-                              break;
-                           } else {
-                              // this failed our configured maximum transaction time, we don't want to replay it
-                              ++num_failed;
-                              itr = _unapplied_transactions.erase( itr );
-                              continue;
-                           }
-                        } else {
-                           ++num_applied;
-                           itr = _unapplied_transactions.erase( itr );
-                           continue;
-                        }
-                     } catch ( const guard_exception& e ) {
-                        chain_plug->handle_guard_exception(e);
-                        return start_block_result::failed;
-                     } FC_LOG_AND_DROP();
                   }
-                  ++itr;
-               }
-
-               fc_dlog(_log, "Processed ${m} of ${n} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",
-                       ("m", num_processed)("n", unapplied_trxs_size)("applied", num_applied)("failed", num_failed));
+               } catch( const guard_exception& e ) {
+                  chain_plug->handle_guard_exception( e );
+                  return start_block_result::failed;
+               } FC_LOG_AND_DROP();
+               ++itr;
             }
+
+            fc_dlog( _log, "Processed ${m} of ${n} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",
+                     ("m", num_processed)( "n", unapplied_trxs_size )("applied", num_applied)("failed", num_failed) );
          }
 
          if (_pending_block_mode == pending_block_mode::producing) {

From ae7b868aaa499060765374b1e7e18d0036cf3bfc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 15:31:40 -0500
Subject: [PATCH 0831/1648] Test always sending catchup

---
 plugins/net_plugin/net_plugin.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a43c19bde46..ac93ed25dc0 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1615,6 +1615,12 @@ namespace eosio {
          return;
       }
 
+      request_message req;
+      req.req_blocks.mode = catch_up;
+      req.req_trx.mode = none;
+      c->enqueue( req );
+      /*
+
       bool catch_up_req_sent = false;
       if (head < msg.head_num ) {
          fc_dlog(logger, "sync check state 3");
@@ -1639,6 +1645,7 @@ namespace eosio {
          req.req_trx.mode = none;
          c->enqueue( req );
       }
+       */
    }
 
    bool sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {

From 34f9f385937d19ff7182a0666963f3431f349e6c Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 16 Jul 2019 16:43:53 -0400
Subject: [PATCH 0832/1648] (chainbase sync) print name of DB causing failure
 condition & win32 fixes

---
 libraries/chainbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chainbase b/libraries/chainbase
index 04e1f4348fd..b8985af27b8 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit 04e1f4348fd527512f26d4453190878eb96f010b
+Subproject commit b8985af27b8f66985aeef27879c3d2f92c8cb741

From 20e86664859acaff8b9cb5f3d3461ba13b7b0dcc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 16 Jul 2019 16:12:52 -0500
Subject: [PATCH 0833/1648] Always send catchup req

---
 plugins/net_plugin/net_plugin.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ac93ed25dc0..3d1c4e38afb 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1615,12 +1615,6 @@ namespace eosio {
          return;
       }
 
-      request_message req;
-      req.req_blocks.mode = catch_up;
-      req.req_trx.mode = none;
-      c->enqueue( req );
-      /*
-
       bool catch_up_req_sent = false;
       if (head < msg.head_num ) {
          fc_dlog(logger, "sync check state 3");
@@ -1637,7 +1631,7 @@ namespace eosio {
             c->enqueue( note );
          }
          c->syncing = true;
-         return;
+//         return;
       }
       if( !catch_up_req_sent ) {
          request_message req;
@@ -1645,7 +1639,6 @@ namespace eosio {
          req.req_trx.mode = none;
          c->enqueue( req );
       }
-       */
    }
 
    bool sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {

From 7f68827e3d1ccf94cb216fadc88f035398f2a995 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 16 Jul 2019 18:34:47 -0400
Subject: [PATCH 0834/1648] fix snapshot versioning test to reflect 1.8.1
 changes

---
 unittests/snapshot_tests.cpp        |  89 +++++++++++++++++++++++++++-
 unittests/snapshots/snap_v2.bin.gz  | Bin 15756 -> 15717 bytes
 unittests/snapshots/snap_v2.json.gz | Bin 38317 -> 38299 bytes
 3 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index a0de5cb41bc..e7cf449b119 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -261,6 +261,85 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
    BOOST_REQUIRE_EQUAL(expected_post_integrity_hash.str(), snap_chain.control->calculate_integrity_hash().str());
 }
 
+namespace {
+   void variant_diff_helper(const fc::variant& lhs, const fc::variant& rhs, std::function<void(const std::string&, const fc::variant&, const fc::variant&)>&& out){
+      if (lhs.get_type() != rhs.get_type()) {
+         out("", lhs, rhs);
+      } else if (lhs.is_object() ) {
+         const auto& l_obj = lhs.get_object();
+         const auto& r_obj = rhs.get_object();
+         static const std::string sep = ".";
+
+         // test keys from LHS
+         std::set<std::string_view> keys;
+         for (const auto& entry: l_obj) {
+            const auto& l_val = entry.value();
+            const auto& r_iter = r_obj.find(entry.key());
+            if (r_iter == r_obj.end()) {
+               out(sep + entry.key(), l_val, fc::variant());
+            } else {
+               const auto& r_val = r_iter->value();
+               variant_diff_helper(l_val, r_val, [&out, &entry](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
+                  out(sep + entry.key() + path, lhs, rhs);
+               });
+            }
+
+            keys.insert(entry.key());
+         }
+
+         // print keys in RHS that were not tested
+         for (const auto& entry: r_obj) {
+            if (keys.find(entry.key()) != keys.end()) {
+               continue;
+            }
+            const auto& r_val = entry.value();
+            out(sep + entry.key(), fc::variant(), r_val);
+         }
+      } else if (lhs.is_array()) {
+         const auto& l_arr = lhs.get_array();
+         const auto& r_arr = rhs.get_array();
+
+         // diff common
+         auto common_count = std::min(l_arr.size(), r_arr.size());
+         for (size_t idx = 0; idx < common_count; idx++) {
+            const auto& l_val = l_arr.at(idx);
+            const auto& r_val = r_arr.at(idx);
+            variant_diff_helper(l_val, r_val, [&](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
+               out( std::string("[") + std::to_string(idx) + std::string("]") + path, lhs, rhs);
+            });
+         }
+
+         // print lhs additions
+         for (size_t idx = common_count; idx < lhs.size(); idx++) {
+            const auto& l_val = l_arr.at(idx);
+            out( std::string("[") + std::to_string(idx) + std::string("]"), l_val, fc::variant());
+         }
+
+         // print rhs additions
+         for (size_t idx = common_count; idx < rhs.size(); idx++) {
+            const auto& r_val = r_arr.at(idx);
+            out( std::string("[") + std::to_string(idx) + std::string("]"), fc::variant(), r_val);
+         }
+
+      } else if (!(lhs == rhs)) {
+         out("", lhs, rhs);
+      }
+   }
+
+   void print_variant_diff(const fc::variant& lhs, const fc::variant& rhs) {
+      variant_diff_helper(lhs, rhs, [](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
+         std::cout << path << std::endl;
+         if (!lhs.is_null()) {
+            std::cout << " < " << fc::json::to_pretty_string(lhs) << std::endl;
+         }
+
+         if (!rhs.is_null()) {
+            std::cout << " > " << fc::json::to_pretty_string(rhs) << std::endl;
+         }
+      });
+   }
+}
+
 BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot_suites)
 {
    tester chain(setup_policy::preactivate_feature_and_new_bios);
@@ -276,12 +355,16 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot
    ///< End deterministic code to generate blockchain for comparison
    auto base_integrity_value = chain.control->calculate_integrity_hash();
 
+   // create a latest snapshot
+   auto base_writer = SNAPSHOT_SUITE::get_writer();
+   chain.control->write_snapshot(base_writer);
+   auto base = SNAPSHOT_SUITE::finalize(base_writer);
+
    {
       static_assert(chain_snapshot_header::minimum_compatible_version <= 2, "version 2 unit test is no longer needed.  Please clean up data files");
       auto v2 = SNAPSHOT_SUITE::template load_from_file<snapshots::snap_v2>();
       snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
       auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();
-
       BOOST_CHECK_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
 
       // create a latest snapshot
@@ -289,6 +372,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot
       v2_tester.control->write_snapshot(latest_writer);
       auto latest = SNAPSHOT_SUITE::finalize(latest_writer);
 
+      if (std::is_same_v<SNAPSHOT_SUITE, variant_snapshot_suite> && v2_integrity_value.str() != base_integrity_value.str()) {
+         print_variant_diff(base, latest);
+      }
+
       // load the latest snapshot
       snapshotted_tester latest_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(latest), 1);
       auto latest_integrity_value = latest_tester.control->calculate_integrity_hash();
diff --git a/unittests/snapshots/snap_v2.bin.gz b/unittests/snapshots/snap_v2.bin.gz
index 541a429ca6cdc103ee4bf08d7b0eff7065a2112d..6c2818acee121589a09bd8675162009b12dc0ef0 100644
GIT binary patch
delta 13621
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
KUPnLt<NpK7f#*&D

delta 13661
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
VvTh~VRWko}iYte`je7Lk{{fU%AHx6u

diff --git a/unittests/snapshots/snap_v2.json.gz b/unittests/snapshots/snap_v2.json.gz
index 1c2cf69b83e8201afa687ece99baab392de1dc93..6689f080f0021ff293684c5c4d72520e5fc99224 100644
GIT binary patch
delta 17804
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
Vm)Pz{3J*X139`oqPv6_dPyi#GTZ#Yx

delta 17833
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


From bd923243e1fe3e3832e57a4f287481078e3d9b9e Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 16 Jul 2019 21:52:01 -0400
Subject: [PATCH 0835/1648] update occurrences where text 'database dirty flag
 set' is searched for

---
 programs/eosio-blocklog/main.cpp | 2 +-
 programs/nodeos/main.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 3fc1bb73f2b..33fdf10bed9 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -93,7 +93,7 @@ void blocklog::read_log() {
          reversible_blocks.reset();
       }
    } catch( const std::runtime_error& e ) {
-      if( std::string(e.what()) == "database dirty flag set" ) {
+      if( std::string(e.what()).find("database dirty flag set") != std::string::npos ) {
          elog( "database dirty flag set (likely due to unclean shutdown): only block_log blocks are available" );
       } else {
          throw;
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index bcd28394036..64e6abf9993 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -122,7 +122,7 @@ int main(int argc, char** argv)
       elog("${e}", ("e",boost::diagnostic_information(e)));
       return OTHER_FAIL;
    } catch( const std::runtime_error& e ) {
-      if( std::string(e.what()) == "database dirty flag set" ) {
+      if( std::string(e.what()).find("database dirty flag set") != std::string::npos ) {
          elog( "database dirty flag set (likely due to unclean shutdown): replay required" );
          return DATABASE_DIRTY;
       } else {

From c81a52cc713eef24943994d45d6d2ea3cfb0e278 Mon Sep 17 00:00:00 2001
From: taokayan <taokayan13@gmail.com>
Date: Wed, 17 Jul 2019 15:44:35 +0800
Subject: [PATCH 0836/1648] fix fork resolve in special case

---
 plugins/net_plugin/net_plugin.cpp         |  18 +-
 tests/CMakeLists.txt                      |   4 +
 tests/nodeos_short_fork_take_over_test.py | 418 ++++++++++++++++++++++
 3 files changed, 436 insertions(+), 4 deletions(-)
 create mode 100755 tests/nodeos_short_fork_take_over_test.py

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3ccd83e273d..9d4708059e1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -157,7 +157,7 @@ namespace eosio {
       bool is_sync_required( uint32_t fork_head_block_num );
       void request_next_chunk( std::unique_lock<std::mutex> g_sync, const connection_ptr& conn = connection_ptr() );
       void start_sync( const connection_ptr& c, uint32_t target );
-      void verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
+      bool verify_catchup( const connection_ptr& c, uint32_t num, const block_id_type& id );
 
    public:
       explicit sync_manager( uint32_t span );
@@ -1613,7 +1613,12 @@ namespace eosio {
       if (head < msg.head_num ) {
          fc_dlog(logger, "sync check state 3");
          c->syncing = false;
-         verify_catchup(c, msg.head_num, msg.head_id);
+         if (!verify_catchup(c, msg.head_num, msg.head_id)) {
+            request_message req;
+            req.req_blocks.mode = catch_up;
+            req.req_trx.mode = none;
+            c->enqueue( req );
+         }
          return;
       }
       else {
@@ -1627,13 +1632,17 @@ namespace eosio {
             c->enqueue( note );
          }
          c->syncing = true;
+         request_message req;
+         req.req_blocks.mode = catch_up;
+         req.req_trx.mode = none;
+         c->enqueue( req );
          return;
       }
       c->syncing = false;
       fc_elog( logger, "sync check failed to resolve status" );
    }
 
-   void sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
+   bool sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {
       request_message req;
       req.req_blocks.mode = catch_up;
       for_each_block_connection( [num, &id, &req]( const auto& cc ) {
@@ -1656,7 +1665,7 @@ namespace eosio {
                   ("s", stage_str( sync_state ))( "fhn", num )( "lib", sync_known_lib_num )
                   ("ne", sync_next_expected_num ) );
          if( sync_state == lib_catchup || sync_state == head_catchup )
-            return;
+            return false;
          set_state( head_catchup );
       } else {
          std::lock_guard<std::mutex> g_conn( c->conn_mtx );
@@ -1665,6 +1674,7 @@ namespace eosio {
       }
       req.req_trx.mode = none;
       c->enqueue( req );
+      return true;
    }
 
    void sync_manager::sync_recv_notice( const connection_ptr& c, const notice_message& msg) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a70dea4c1be..30c1f38ac46 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -37,6 +37,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sample-cluster-map.json ${CMAKE_CURRE
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/restart-scenarios-test.py ${CMAKE_CURRENT_BINARY_DIR}/restart-scenarios-test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_startup_catchup.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_startup_catchup.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_forked_chain_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_forked_chain_test.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_short_fork_take_over_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_short_fork_take_over_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_run_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_run_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_run_remote_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_run_remote_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_under_min_avail_ram.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_under_min_avail_ram.py COPYONLY)
@@ -122,6 +123,9 @@ add_test(NAME nodeos_startup_catchup_lr_test COMMAND tests/nodeos_startup_catchu
 set_tests_properties(nodeos_startup_catchup_lr_test PROPERTIES TIMEOUT 3000)
 set_property(TEST nodeos_startup_catchup_lr_test PROPERTY LABELS long_running_tests)
 
+add_test(NAME nodeos_short_fork_take_over_lr_test COMMAND tests/nodeos_short_fork_take_over_test.py -v --wallet-port 9905 --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST nodeos_short_fork_take_over_lr_test PROPERTY LABELS long_running_tests)
+
 set(ALTERNATE_VERSION_LABELS_FILE "${CMAKE_BINARY_DIR}/tests/multiversion_paths.conf")
 
 add_test(NAME nodeos_multiple_version_protocol_feature_mv_test COMMAND tests/nodeos_multiple_version_protocol_feature_test.py
diff --git a/tests/nodeos_short_fork_take_over_test.py b/tests/nodeos_short_fork_take_over_test.py
new file mode 100755
index 00000000000..b21172b8766
--- /dev/null
+++ b/tests/nodeos_short_fork_take_over_test.py
@@ -0,0 +1,418 @@
+#!/usr/bin/env python3
+
+from testUtils import Utils
+import testUtils
+import time
+from Cluster import Cluster
+from WalletMgr import WalletMgr
+from Node import BlockType
+from Node import Node
+from TestHelper import TestHelper
+
+import decimal
+import math
+import re
+import signal
+
+###############################################################
+# nodeos_short_fork_take_over_test
+# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
+# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
+###############################################################
+Print=Utils.Print
+
+from core_symbol import CORE_SYMBOL
+
+def analyzeBPs(bps0, bps1, expectDivergence):
+    start=0
+    index=None
+    length=len(bps0)
+    firstDivergence=None
+    errorInDivergence=False
+    analysysPass=0
+    bpsStr=None
+    bpsStr0=None
+    bpsStr1=None
+    while start < length:
+        analysysPass+=1
+        bpsStr=None
+        for i in range(start,length):
+            bp0=bps0[i]
+            bp1=bps1[i]
+            if bpsStr is None:
+                bpsStr=""
+            else:
+                bpsStr+=", "
+            blockNum0=bp0["blockNum"]
+            prod0=bp0["prod"]
+            blockNum1=bp1["blockNum"]
+            prod1=bp1["prod"]
+            numDiff=True if blockNum0!=blockNum1 else False
+            prodDiff=True if prod0!=prod1 else False
+            if numDiff or prodDiff:
+                index=i
+                if firstDivergence is None:
+                    firstDivergence=min(blockNum0, blockNum1)
+                if not expectDivergence:
+                    errorInDivergence=True
+                break
+            bpsStr+=str(blockNum0)+"->"+prod0
+
+        if index is None:
+            if expectDivergence:
+                errorInDivergence=True
+                break
+            return None
+
+        bpsStr0=None
+        bpsStr2=None
+        start=length
+        for i in range(index,length):
+            if bpsStr0 is None:
+                bpsStr0=""
+                bpsStr1=""
+            else:
+                bpsStr0+=", "
+                bpsStr1+=", "
+            bp0=bps0[i]
+            bp1=bps1[i]
+            blockNum0=bp0["blockNum"]
+            prod0=bp0["prod"]
+            blockNum1=bp1["blockNum"]
+            prod1=bp1["prod"]
+            numDiff="*" if blockNum0!=blockNum1 else ""
+            prodDiff="*" if prod0!=prod1 else ""
+            if not numDiff and not prodDiff:
+                start=i
+                index=None
+                if expectDivergence:
+                    errorInDivergence=True
+                break
+            bpsStr0+=str(blockNum0)+numDiff+"->"+prod0+prodDiff
+            bpsStr1+=str(blockNum1)+numDiff+"->"+prod1+prodDiff
+        if errorInDivergence:
+            break
+
+    if errorInDivergence:
+        msg="Failed analyzing block producers - "
+        if expectDivergence:
+            msg+="nodes do not indicate different block producers for the same blocks, but they are expected to diverge at some point."
+        else:
+            msg+="did not expect nodes to indicate different block producers for the same blocks."
+        msg+="\n  Matching Blocks= %s \n  Diverging branch node0= %s \n  Diverging branch node1= %s" % (bpsStr,bpsStr0,bpsStr1)
+        Utils.errorExit(msg)
+
+    return firstDivergence
+
+def getMinHeadAndLib(prodNodes):
+    info0=prodNodes[0].getInfo(exitOnError=True)
+    info1=prodNodes[1].getInfo(exitOnError=True)
+    headBlockNum=min(int(info0["head_block_num"]),int(info1["head_block_num"]))
+    libNum=min(int(info0["last_irreversible_block_num"]), int(info1["last_irreversible_block_num"]))
+    return (headBlockNum, libNum)
+
+
+
+args = TestHelper.parse_args({"--prod-count","--dump-error-details","--keep-logs","-v","--leave-running","--clean-run",
+                              "--wallet-port"})
+Utils.Debug=args.v
+totalProducerNodes=2
+totalNonProducerNodes=1
+totalNodes=totalProducerNodes+totalNonProducerNodes
+maxActiveProducers=3
+totalProducers=maxActiveProducers
+cluster=Cluster(walletd=True)
+dumpErrorDetails=args.dump_error_details
+keepLogs=args.keep_logs
+dontKill=args.leave_running
+killAll=args.clean_run
+walletPort=args.wallet_port
+
+walletMgr=WalletMgr(True, port=walletPort)
+testSuccessful=False
+killEosInstances=not dontKill
+killWallet=not dontKill
+
+WalletdName=Utils.EosWalletName
+ClientName="cleos"
+
+try:
+    TestHelper.printSystemInfo("BEGIN")
+
+    cluster.setWalletMgr(walletMgr)
+    cluster.killall(allInstances=killAll)
+    cluster.cleanup()
+    Print("Stand up cluster")
+    specificExtraNodeosArgs={}
+    # producer nodes will be mapped to 0 through totalProducerNodes-1, so the number totalProducerNodes will be the non-producing node
+    specificExtraNodeosArgs[totalProducerNodes]="--plugin eosio::test_control_api_plugin"
+
+
+    # ***   setup topogrophy   ***
+
+    # "bridge" shape connects defprocera through defproducerk (in node0) to each other and defproducerl through defproduceru (in node01)
+    # and the only connection between those 2 groups is through the bridge node
+    if cluster.launch(prodCount=2, topo="bridge", pnodes=totalProducerNodes,
+                      totalNodes=totalNodes, totalProducers=totalProducers,
+                      useBiosBootFile=False, specificExtraNodeosArgs=specificExtraNodeosArgs, onlySetProds=True) is False:
+        Utils.cmdError("launcher")
+        Utils.errorExit("Failed to stand up eos cluster.")
+    Print("Validating system accounts after bootstrap")
+    cluster.validateAccounts(None)
+
+    # ***   identify each node (producers and non-producing node)   ***
+
+    nonProdNode=None
+    prodNodes=[]
+    producers=[]
+    for i in range(0, totalNodes):
+        node=cluster.getNode(i)
+        node.producers=Cluster.parseProducers(i)
+        numProducers=len(node.producers)
+        Print("node has producers=%s" % (node.producers))
+        if numProducers==0:
+            if nonProdNode is None:
+                nonProdNode=node
+                nonProdNode.nodeNum=i
+            else:
+                Utils.errorExit("More than one non-producing nodes")
+        else:
+            prodNodes.append(node)
+            producers.extend(node.producers)
+
+
+    node=prodNodes[0]
+    node1=prodNodes[1]
+
+    # ***   Identify a block where production is stable   ***
+
+    #verify nodes are in sync and advancing
+    cluster.waitOnClusterSync(blockAdvancing=5)
+    cluster.biosNode.kill(signal.SIGTERM)
+
+    Utils.Print("catching defproducera")
+    tries = 120
+    blockNum = node.getHeadBlockNum()
+    blockProducer=node.getBlockProducerByNum(blockNum)
+    while blockProducer != "defproducera" and tries > 0:
+        blockNum+=1
+        blockProducer=node.getBlockProducerByNum(blockNum)
+        tries = tries - 1
+
+    if tries == 0:
+        Utils.errorExit("failed to catch a block produced by defproducera")
+
+    Utils.Print("catching the start of defproducerb")
+    tries = 30
+    while blockProducer != "defproducerb" and tries > 0:
+        blockNum+=1
+        blockProducer=node.getBlockProducerByNum(blockNum)
+        tries = tries - 1
+
+    if tries == 0:
+        Utils.errorExit("failed to catch a block produced by defproducerb")
+
+    blockNum+=1
+    blockProducer=node.getBlockProducerByNum(blockNum)
+    blockProducer1=node1.getBlockProducerByNum(blockNum)
+    Utils.Print("block number %d is producer by %s in node0" % (blockNum, blockProducer))
+    Utils.Print("block number %d is producer by %s in node1" % (blockNum, blockProducer1))
+
+    # ***   Killing the "bridge" node   ***
+    Print("Sending command to kill \"bridge\" node to separate the 2 producer groups.")
+    # block number to start expecting node killed after
+    preKillBlockNum=nonProdNode.getBlockNum()
+    preKillBlockProducer=nonProdNode.getBlockProducerByNum(preKillBlockNum)
+    # kill at last block before defproducerl, since the block it is killed on will get propagated
+    killAtProducer="defproducerb"
+    inRowCountPerProducer=12
+    nonProdNode.killNodeOnProducer(producer=killAtProducer, whereInSequence=(inRowCountPerProducer-1))
+
+
+    # ***   Identify a highest block number to check while we are trying to identify where the divergence will occur   ***
+
+    # will search full cycle after the current block, since we don't know how many blocks were produced since retrieving
+    # block number and issuing kill command
+    postKillBlockNum=prodNodes[1].getBlockNum()
+    blockProducers0=[]
+    blockProducers1=[]
+    libs0=[]
+    libs1=[]
+    lastBlockNum=max([preKillBlockNum,postKillBlockNum])+2*maxActiveProducers*inRowCountPerProducer
+    actualLastBlockNum=None
+    prodChanged=False
+    nextProdChange=False
+    #identify the earliest LIB to start identify the earliest block to check if divergent branches eventually reach concensus
+    (headBlockNum, libNumAroundDivergence)=getMinHeadAndLib(prodNodes)
+    Print("Tracking block producers from %d till divergence or %d. Head block is %d and lowest LIB is %d" % (preKillBlockNum, lastBlockNum, headBlockNum, libNumAroundDivergence))
+    transitionCount=0
+    missedTransitionBlock=None
+    for blockNum in range(preKillBlockNum,lastBlockNum):
+        #avoiding getting LIB until my current block passes the head from the last time I checked
+        if blockNum>headBlockNum:
+            (headBlockNum, libNumAroundDivergence)=getMinHeadAndLib(prodNodes)
+
+        # track the block number and producer from each producing node
+        blockProducer0=prodNodes[0].getBlockProducerByNum(blockNum)
+        blockProducer1=prodNodes[1].getBlockProducerByNum(blockNum)
+        blockProducers0.append({"blockNum":blockNum, "prod":blockProducer0})
+        blockProducers1.append({"blockNum":blockNum, "prod":blockProducer1})
+
+        #in the case that the preKillBlockNum was also produced by killAtProducer, ensure that we have
+        #at least one producer transition before checking for killAtProducer
+        if not prodChanged:
+            if preKillBlockProducer!=blockProducer0:
+                prodChanged=True
+
+        #since it is killing for the last block of killAtProducer, we look for the next producer change
+        if not nextProdChange and prodChanged and blockProducer1==killAtProducer:
+            nextProdChange=True
+        elif nextProdChange and blockProducer1!=killAtProducer:
+            nextProdChange=False
+            if blockProducer0!=blockProducer1:
+                Print("Divergence identified at block %s, node_00 producer: %s, node_01 producer: %s" % (blockNum, blockProducer0, blockProducer1))
+                actualLastBlockNum=blockNum
+                break
+            else:
+                missedTransitionBlock=blockNum
+                transitionCount+=1
+                # allow this to transition twice, in case the script was identifying an earlier transition than the bridge node received the kill command
+                if transitionCount>1:
+                    Print("At block %d and have passed producer: %s %d times and we have not diverged, stopping looking and letting errors report" % (blockNum, killAtProducer, transitionCount))
+                    actualLastBlockNum=blockNum
+                    break
+
+        #if we diverge before identifying the actualLastBlockNum, then there is an ERROR
+        if blockProducer0!=blockProducer1:
+            extra="" if transitionCount==0 else " Diverged after expected killAtProducer transition at block %d." % (missedTransitionBlock)
+            Utils.errorExit("Groups reported different block producers for block number %d.%s %s != %s." % (blockNum,extra,blockProducer0,blockProducer1))
+
+    #verify that the non producing node is not alive (and populate the producer nodes with current getInfo data to report if
+    #an error occurs)
+    if nonProdNode.verifyAlive():
+        Utils.errorExit("Expected the non-producing node to have shutdown.")
+
+    Print("Analyzing the producers leading up to the block after killing the non-producing node, expecting divergence at %d" % (blockNum))
+
+    firstDivergence=analyzeBPs(blockProducers0, blockProducers1, expectDivergence=True)
+    # Nodes should not have diverged till the last block
+    if firstDivergence!=blockNum:
+        Utils.errorExit("Expected to diverge at %s, but diverged at %s." % (firstDivergence, blockNum))
+    blockProducers0=[]
+    blockProducers1=[]
+
+    for prodNode in prodNodes:
+        info=prodNode.getInfo()
+        Print("node info: %s" % (info))
+
+    killBlockNum=blockNum
+    lastBlockNum=killBlockNum+(maxActiveProducers - 1)*inRowCountPerProducer+1  # allow 1st testnet group to produce just 1 more block than the 2nd
+
+    Print("Tracking the blocks from the divergence till there are 10*12 blocks on one chain and 10*12+1 on the other, from block %d to %d" % (killBlockNum, lastBlockNum))
+
+    for blockNum in range(killBlockNum,lastBlockNum):
+        blockProducer0=prodNodes[0].getBlockProducerByNum(blockNum)
+        blockProducer1=prodNodes[1].getBlockProducerByNum(blockNum)
+        blockProducers0.append({"blockNum":blockNum, "prod":blockProducer0})
+        blockProducers1.append({"blockNum":blockNum, "prod":blockProducer1})
+
+
+    Print("Analyzing the producers from the divergence to the lastBlockNum and verify they stay diverged, expecting divergence at block %d" % (killBlockNum))
+
+    firstDivergence=analyzeBPs(blockProducers0, blockProducers1, expectDivergence=True)
+    if firstDivergence!=killBlockNum:
+        Utils.errorExit("Expected to diverge at %s, but diverged at %s." % (firstDivergence, killBlockNum))
+    blockProducers0=[]
+    blockProducers1=[]
+
+    for prodNode in prodNodes:
+        info=prodNode.getInfo()
+        Print("node info: %s" % (info))
+
+    Print("killing node1(defproducerc) so that bridge node will frist connect to node0 (defproducera, defproducerb)")
+    node1.kill(killSignal=15)
+    time.sleep(2)
+    if node1.verifyAlive():
+        Utils.errorExit("Expected the node 1 to have shutdown.")
+
+    Print("Relaunching the non-producing bridge node to connect the node 0 (defproducera, defproducerb)")
+    if not nonProdNode.relaunch(nonProdNode.nodeNum, None):
+        errorExit("Failure - (non-production) node %d should have restarted" % (nonProdNode.nodeNum))
+
+    Print("Relaunch node 1 (defproducerc) and let it connect to brigde node that already synced up with node 0")
+    time.sleep(10)
+    if not node1.relaunch(nodeId=1, chainArg=" --enable-stale-production "):
+        errorExit("Failure - (non-production) node 1 should have restarted")
+
+    Print("Waiting to allow forks to resolve")
+    time.sleep(3)
+
+    for prodNode in prodNodes:
+        info=prodNode.getInfo()
+        Print("node info: %s" % (info))
+
+    #ensure that the nodes have enough time to get in concensus, so wait for 3 producers to produce their complete round
+    time.sleep(inRowCountPerProducer * 3 / 2)
+    remainingChecks=20
+    match=False
+    checkHead=False
+    while remainingChecks>0:
+        checkMatchBlock=killBlockNum if not checkHead else prodNodes[0].getBlockNum()
+        blockProducer0=prodNodes[0].getBlockProducerByNum(checkMatchBlock)
+        blockProducer1=prodNodes[1].getBlockProducerByNum(checkMatchBlock)
+        match=blockProducer0==blockProducer1
+        if match:
+            if checkHead:
+                break
+            else:
+                checkHead=True
+                continue
+        Print("Fork has not resolved yet, wait a little more. Block %s has producer %s for node_00 and %s for node_01.  Original divergence was at block %s. Wait time remaining: %d" % (checkMatchBlock, blockProducer0, blockProducer1, killBlockNum, remainingChecks))
+        time.sleep(1)
+        remainingChecks-=1
+
+    for prodNode in prodNodes:
+        info=prodNode.getInfo()
+        Print("node info: %s" % (info))
+
+    # ensure all blocks from the lib before divergence till the current head are now in consensus
+    endBlockNum=max(prodNodes[0].getBlockNum(), prodNodes[1].getBlockNum())
+
+    Print("Identifying the producers from the saved LIB to the current highest head, from block %d to %d" % (libNumAroundDivergence, endBlockNum))
+
+    for blockNum in range(libNumAroundDivergence,endBlockNum):
+        blockProducer0=prodNodes[0].getBlockProducerByNum(blockNum)
+        blockProducer1=prodNodes[1].getBlockProducerByNum(blockNum)
+        blockProducers0.append({"blockNum":blockNum, "prod":blockProducer0})
+        blockProducers1.append({"blockNum":blockNum, "prod":blockProducer1})
+
+
+    Print("Analyzing the producers from the saved LIB to the current highest head and verify they match now")
+
+    analyzeBPs(blockProducers0, blockProducers1, expectDivergence=False)
+
+    resolvedKillBlockProducer=None
+    for prod in blockProducers0:
+        if prod["blockNum"]==killBlockNum:
+            resolvedKillBlockProducer = prod["prod"]
+    if resolvedKillBlockProducer is None:
+        Utils.errorExit("Did not find find block %s (the original divergent block) in blockProducers0, test setup is wrong.  blockProducers0: %s" % (killBlockNum, ", ".join(blockProducers)))
+    Print("Fork resolved and determined producer %s for block %s" % (resolvedKillBlockProducer, killBlockNum))
+
+    blockProducers0=[]
+    blockProducers1=[]
+
+    testSuccessful=True
+finally:
+    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, killEosInstances=killEosInstances, killWallet=killWallet, keepLogs=keepLogs, cleanRun=killAll, dumpErrorDetails=dumpErrorDetails)
+
+    if not testSuccessful:
+        Print(Utils.FileDivider)
+        Print("Compare Blocklog")
+        cluster.compareBlockLogs()
+        Print(Utils.FileDivider)
+        Print("Compare Blocklog")
+        cluster.printBlockLog()
+        Print(Utils.FileDivider)
+
+exit(0)

From 8b3a4afcd932fb0fa1ba93f7cfa6f98f9288b17a Mon Sep 17 00:00:00 2001
From: Aaron Fu <aaron.fu@block.one>
Date: Wed, 17 Jul 2019 17:32:51 +0800
Subject: [PATCH 0837/1648] Fix path error in cleos set code/abi

---
 programs/cleos/main.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 3f000ee75bd..2a59f8b6d9c 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -2972,13 +2972,13 @@ int main( int argc, char** argv ) {
    bool suppress_duplicate_check = false;
    auto codeSubcommand = setSubcommand->add_subcommand("code", localized("Create or update the code on an account"));
    codeSubcommand->add_option("account", account, localized("The account to set code for"))->required();
-   codeSubcommand->add_option("code-file", wasmPath, localized("The fullpath containing the contract WASM"));//->required();
+   codeSubcommand->add_option("code-file", wasmPath, localized("The path containing the contract WASM"));//->required();
    codeSubcommand->add_flag( "-c,--clear", contract_clear, localized("Remove code on an account"));
    codeSubcommand->add_flag( "--suppress-duplicate-check", suppress_duplicate_check, localized("Don't check for duplicate"));
 
    auto abiSubcommand = setSubcommand->add_subcommand("abi", localized("Create or update the abi on an account"));
    abiSubcommand->add_option("account", account, localized("The account to set the ABI for"))->required();
-   abiSubcommand->add_option("abi-file", abiPath, localized("The fullpath containing the contract ABI"));//->required();
+   abiSubcommand->add_option("abi-file", abiPath, localized("The path containing the contract ABI"));//->required();
    abiSubcommand->add_flag( "-c,--clear", contract_clear, localized("Remove abi on an account"));
    abiSubcommand->add_flag( "--suppress-duplicate-check", suppress_duplicate_check, localized("Don't check for duplicate"));
 
@@ -3015,10 +3015,11 @@ int main( int argc, char** argv ) {
         std::string wasm;
         fc::path cpath = fc::canonical(fc::path(contractPath));
 
-        if( wasmPath.empty() )
+        if( wasmPath.empty() ) {
            wasmPath = (cpath / (cpath.filename().generic_string()+".wasm")).generic_string();
-        else
+        } else if ( boost::filesystem::path(wasmPath).is_relative() ) {
            wasmPath = (cpath / wasmPath).generic_string();
+        }
 
         std::cerr << localized(("Reading WASM from " + wasmPath + "...").c_str()) << std::endl;
         fc::read_file_contents(wasmPath, wasm);
@@ -3070,7 +3071,7 @@ int main( int argc, char** argv ) {
 
         if( abiPath.empty() ) {
            abiPath = (cpath / (cpath.filename().generic_string()+".abi")).generic_string();
-        } else {
+        } else if ( boost::filesystem::path(abiPath).is_relative() ) {
            abiPath = (cpath / abiPath).generic_string();
         }
 

From d233a8cc88a34c6a8fcf997f4fa510a5b4c86074 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 17 Jul 2019 08:16:40 -0500
Subject: [PATCH 0838/1648] Revert always send catchup req

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3d1c4e38afb..a43c19bde46 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1631,7 +1631,7 @@ namespace eosio {
             c->enqueue( note );
          }
          c->syncing = true;
-//         return;
+         return;
       }
       if( !catch_up_req_sent ) {
          request_message req;

From 578951829d6e2bb09214b7adcb8ba17f4a380ce3 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Wed, 17 Jul 2019 15:06:10 -0400
Subject: [PATCH 0839/1648] add protocol feature tests for wtmsig that ensure
 block validation rules and intrinsic visibility change at expected blocks and
 in-flight schedule updates are handled appropriately

---
 unittests/protocol_feature_tests.cpp | 235 +++++++++++++++++++++++++++
 1 file changed, 235 insertions(+)

diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index d97534ea5a0..4a6d9304227 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -1507,4 +1507,239 @@ BOOST_AUTO_TEST_CASE( webauthn_assert_recover_key ) { try {
 
 } FC_LOG_AND_RETHROW() }
 
+static const char import_set_proposed_producer_ex_wast[] = R"=====(
+(module
+ (import "env" "set_proposed_producers_ex" (func $set_proposed_producers_ex (param i64 i32 i32) (result i64)))
+ (memory $0 1)
+ (export "apply" (func $apply))
+ (func $apply (param $0 i64) (param $1 i64) (param $2 i64)
+   (drop
+     (call $set_proposed_producers_ex
+       (i64.const 0)
+       (i32.const 0)
+       (i32.const 43)
+     )
+   )
+ )
+ (data (i32.const 8) "\01\00\00\00\00\00\85\5C\34\00\03\EB\CF\44\B4\5A\71\D4\F2\25\76\8F\60\2D\1E\2E\2B\25\EF\77\9E\E9\89\7F\E7\44\BF\1A\16\E8\54\23\D5")
+)
+)=====";
+
+BOOST_AUTO_TEST_CASE( set_proposed_producers_ex_test ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+   BOOST_REQUIRE(d);
+
+   const auto& alice_account = account_name("alice");
+   c.create_accounts( {alice_account} );
+   c.produce_block();
+
+   BOOST_CHECK_EXCEPTION(  c.set_code( alice_account, import_set_proposed_producer_ex_wast ),
+                           wasm_exception,
+                           fc_exception_message_is( "env.set_proposed_producers_ex unresolveable" ) );
+
+   c.preactivate_protocol_features( {*d} );
+   c.produce_block();
+
+   // ensure it now resolves
+   c.set_code( alice_account, import_set_proposed_producer_ex_wast );
+
+   // ensure it requires privilege
+   BOOST_REQUIRE_EQUAL(
+           c.push_action(action({{ alice_account, permission_name("active") }}, alice_account, action_name(), {} ), alice_account.to_uint64_t()),
+           "alice does not have permission to call this API"
+   );
+
+   c.push_action(config::system_account_name, N(setpriv), config::system_account_name,  fc::mutable_variant_object()("account", alice_account)("is_priv", 1));
+
+   //ensure it can be called w/ privilege
+   BOOST_REQUIRE_EQUAL(c.push_action(action({{ alice_account, permission_name("active") }}, alice_account, action_name(), {} ), alice_account.to_uint64_t()), c.success());
+
+   c.produce_block();
+} FC_LOG_AND_RETHROW() }
+
+BOOST_AUTO_TEST_CASE( producer_schedule_change_extension_test ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+   BOOST_REQUIRE(d);
+
+   c.produce_blocks(2);
+
+   // sync a remote node into this chain
+   tester remote( setup_policy::none );
+   push_blocks(c, remote);
+
+   // activate the feature
+   // there is a 1 block delay before header-only validation (which is responsible for extension validation) can be
+   // aware of the activation.  So the expectation is that if it is activated in the _state_ at block N, block N + 1
+   // will bear an extension making header-only validators aware of it, and therefore block N + 2 is the first block
+   // where a block may bear a downstream extension.
+   c.preactivate_protocol_features( {*d} );
+   remote.push_block(c.produce_block());
+
+   auto last_legacy_block = c.produce_block();
+
+
+   { // ensure producer_schedule_change_extension is rejected
+      const auto& hbs = remote.control->head_block_state();
+
+      // create a bad block that has the producer schedule change extension before the feature upgrade
+      auto bad_block = std::make_shared<signed_block>(last_legacy_block->clone());
+      bad_block->header_extensions.emplace_back(
+              producer_schedule_change_extension::extension_id(),
+              fc::raw::pack(std::make_pair(hbs->active_schedule.version + 1, std::vector<char>{}))
+      );
+
+      // re-sign the bad block
+      auto header_bmroot = digest_type::hash( std::make_pair( bad_block->digest(), remote.control->head_block_state()->blockroot_merkle ) );
+      auto sig_digest = digest_type::hash( std::make_pair(header_bmroot, remote.control->head_block_state()->pending_schedule.schedule_hash) );
+      bad_block->producer_signature = remote.get_private_key(N(eosio), "active").sign(sig_digest);
+
+      // ensure it is rejected as an unknown extension
+      BOOST_REQUIRE_EXCEPTION(
+         remote.push_block(bad_block), producer_schedule_exception,
+         fc_exception_message_is( "Block header producer_schedule_change_extension before activation of WTMsig Block Signatures" )
+      );
+   }
+
+   { // ensure that non-null new_producers is accepted (and fails later in validation)
+      const auto& hbs = remote.control->head_block_state();
+
+      // create a bad block that has the producer schedule change extension before the feature upgrade
+      auto bad_block = std::make_shared<signed_block>(last_legacy_block->clone());
+      bad_block->new_producers = legacy::producer_schedule_type{hbs->active_schedule.version + 1, {}};
+
+      // re-sign the bad block
+      auto header_bmroot = digest_type::hash( std::make_pair( bad_block->digest(), remote.control->head_block_state()->blockroot_merkle ) );
+      auto sig_digest = digest_type::hash( std::make_pair(header_bmroot, remote.control->head_block_state()->pending_schedule.schedule_hash) );
+      bad_block->producer_signature = remote.get_private_key(N(eosio), "active").sign(sig_digest);
+
+      // ensure it is accepted (but rejected because it doesn't match expected state)
+      BOOST_REQUIRE_EXCEPTION(
+         remote.push_block(bad_block), wrong_signing_key,
+         fc_exception_message_is( "block signed by unexpected key" )
+      );
+   }
+
+   remote.push_block(last_legacy_block);
+
+   // propagate header awareness of the activation.
+   auto first_new_block = c.produce_block();
+
+   {
+      const auto& hbs = remote.control->head_block_state();
+
+      // create a bad block that has the producer schedule change extension that is valid but not warranted by actions in the block
+      auto bad_block = std::make_shared<signed_block>(first_new_block->clone());
+      bad_block->header_extensions.emplace_back(
+              producer_schedule_change_extension::extension_id(),
+              fc::raw::pack(std::make_pair(hbs->active_schedule.version + 1, std::vector<char>{}))
+      );
+
+      // re-sign the bad block
+      auto header_bmroot = digest_type::hash( std::make_pair( bad_block->digest(), remote.control->head_block_state()->blockroot_merkle ) );
+      auto sig_digest = digest_type::hash( std::make_pair(header_bmroot, remote.control->head_block_state()->pending_schedule.schedule_hash) );
+      bad_block->producer_signature = remote.get_private_key(N(eosio), "active").sign(sig_digest);
+
+      // ensure it is rejected because it doesn't match expected state (but the extention was accepted)
+      BOOST_REQUIRE_EXCEPTION(
+         remote.push_block(bad_block), wrong_signing_key,
+         fc_exception_message_is( "block signed by unexpected key" )
+      );
+   }
+
+   { // ensure that non-null new_producers is rejected
+      const auto& hbs = remote.control->head_block_state();
+
+      // create a bad block that has the producer schedule change extension before the feature upgrade
+      auto bad_block = std::make_shared<signed_block>(first_new_block->clone());
+      bad_block->new_producers = legacy::producer_schedule_type{hbs->active_schedule.version + 1, {}};
+
+      // re-sign the bad block
+      auto header_bmroot = digest_type::hash( std::make_pair( bad_block->digest(), remote.control->head_block_state()->blockroot_merkle ) );
+      auto sig_digest = digest_type::hash( std::make_pair(header_bmroot, remote.control->head_block_state()->pending_schedule.schedule_hash) );
+      bad_block->producer_signature = remote.get_private_key(N(eosio), "active").sign(sig_digest);
+
+      // ensure it is accepted (but rejected because it doesn't match expected state)
+      BOOST_REQUIRE_EXCEPTION(
+         remote.push_block(bad_block), producer_schedule_exception,
+         fc_exception_message_is( "Block header contains legacy producer schedule outdated by activation of WTMsig Block Signatures" )
+      );
+   }
+
+   remote.push_block(first_new_block);
+   remote.push_block(c.produce_block());
+} FC_LOG_AND_RETHROW() }
+
+BOOST_AUTO_TEST_CASE( wtmsig_block_signing_inflight_legacy_test ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+   BOOST_REQUIRE(d);
+
+   c.produce_blocks(2);
+
+   // activate the feature, and start an in-flight producer schedule change with the legacy format
+   c.preactivate_protocol_features( {*d} );
+   vector<legacy::producer_key> sched = {{N(eosio), c.get_public_key(N(eosio), "bsk")}};
+   c.push_action(config::system_account_name, N(setprods), config::system_account_name, fc::mutable_variant_object()("schedule", sched));
+   c.produce_block();
+
+   // ensure the last legacy block contains a new_producers
+   auto last_legacy_block = c.produce_block();
+   BOOST_REQUIRE_EQUAL(last_legacy_block->new_producers.valid(), true);
+
+   // promote to active schedule
+   c.produce_block();
+
+   // ensure that the next block is updated to the new schedule
+   BOOST_REQUIRE_EXCEPTION( c.produce_block(), wrong_signing_key, fc_exception_message_is( "block signed by unexpected key" ));
+   c.control->abort_block();
+
+   c.block_signing_private_keys.emplace(get_public_key(N(eosio), "bsk"), get_private_key(N(eosio), "bsk"));
+   c.produce_block();
+
+} FC_LOG_AND_RETHROW() }
+
+BOOST_AUTO_TEST_CASE( wtmsig_block_signing_inflight_extension_test ) { try {
+   tester c( setup_policy::preactivate_feature_and_new_bios );
+
+   const auto& pfm = c.control->get_protocol_feature_manager();
+   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
+   BOOST_REQUIRE(d);
+
+   c.produce_blocks(2);
+
+   // activate the feature
+   c.preactivate_protocol_features( {*d} );
+   c.produce_block();
+
+   // start an in-flight producer schedule change before the activation is availble to header only validators
+   vector<legacy::producer_key> sched = {{N(eosio), c.get_public_key(N(eosio), "bsk")}};
+   c.push_action(config::system_account_name, N(setprods), config::system_account_name, fc::mutable_variant_object()("schedule", sched));
+   c.produce_block();
+
+   // ensure the first possible new block contains a producer_schedule_change_extension
+   auto first_new_block = c.produce_block();
+   BOOST_REQUIRE_EQUAL(first_new_block->new_producers.valid(), false);
+   BOOST_REQUIRE_EQUAL(first_new_block->header_extensions.size(), 1);
+   BOOST_REQUIRE_EQUAL(first_new_block->header_extensions.at(0).first, producer_schedule_change_extension::extension_id());
+
+   // promote to active schedule
+   c.produce_block();
+
+   // ensure that the next block is updated to the new schedule
+   BOOST_REQUIRE_EXCEPTION( c.produce_block(), wrong_signing_key, fc_exception_message_is( "block signed by unexpected key" ));
+   c.control->abort_block();
+
+   c.block_signing_private_keys.emplace(get_public_key(N(eosio), "bsk"), get_private_key(N(eosio), "bsk"));
+   c.produce_block();
+
+} FC_LOG_AND_RETHROW() }
+
 BOOST_AUTO_TEST_SUITE_END()

From 3884ecb56c8697a5db1ffecce81da9916b7f3fa9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 17 Jul 2019 15:01:45 -0500
Subject: [PATCH 0840/1648] Add http debug logging to tests

---
 programs/eosio-launcher/main.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index 99febd23a1c..bf9cba588db 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -1165,11 +1165,18 @@ launcher_def::write_logging_config_file(tn_node_def &node) {
                   ( "host", instance.name )
              ) );
     log_config.loggers.front().appenders.push_back("net");
+
     fc::logger_config p2p ("net_plugin_impl");
     p2p.level=fc::log_level::debug;
     p2p.appenders.push_back ("stderr");
     p2p.appenders.push_back ("net");
     log_config.loggers.emplace_back(p2p);
+
+     fc::logger_config http("http_plugin");
+     http.level=fc::log_level::debug;
+     http.appenders.push_back("stderr");
+     http.appenders.push_back("net");
+     log_config.loggers.emplace_back(http);
   }
 
   auto str = fc::json::to_pretty_string( log_config, fc::json::stringify_large_ints_and_doubles );

From e7307f25f79edcffeef22915ce29609d200f55fe Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 17 Jul 2019 16:20:15 -0500
Subject: [PATCH 0841/1648] Clear connection node_id to prevent invalid self
 connect error

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8590c8b3aad..c9b8557ce09 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -980,6 +980,7 @@ namespace eosio {
       }
       self->peer_requested.reset();
       self->sent_handshake_count = 0;
+      self->node_id = fc::sha256();
       my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
       fc_dlog( logger, "closed, canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();

From 5444b03a8de6138ad53b575fc2138963286b0612 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 17 Jul 2019 19:58:28 -0500
Subject: [PATCH 0842/1648] Use dispatcher strand so blocks are not broadcast
 out of order

---
 plugins/net_plugin/net_plugin.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c9b8557ce09..24abf95c714 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -179,6 +179,11 @@ namespace eosio {
       node_transaction_index  local_txns;
 
    public:
+      boost::asio::io_context::strand  strand;
+
+      explicit dispatch_manager(boost::asio::io_context& io_context)
+      : strand( io_context ) {}
+
       void bcast_transaction(const transaction_metadata_ptr& trx);
       void rejected_transaction(const transaction_id_type& msg, uint32_t head_blk_num);
       void bcast_block(const block_state_ptr& bs);
@@ -3047,7 +3052,7 @@ namespace eosio {
    // called from application thread
    void net_plugin_impl::on_accepted_block(const block_state_ptr& block) {
       update_chain_info();
-      boost::asio::post( my_impl->thread_pool->get_executor(), [this, block]() {
+      dispatcher->strand.post( [this, block]() {
          fc_dlog( logger, "signaled, blk id = ${id}", ("id", block->id) );
          dispatcher->bcast_block( block );
       });
@@ -3242,7 +3247,6 @@ namespace eosio {
          my->network_version_match = options.at( "network-version-match" ).as<bool>();
 
          my->sync_master.reset( new sync_manager( options.at( "sync-fetch-span" ).as<uint32_t>()));
-         my->dispatcher.reset( new dispatch_manager );
 
          my->connector_period = std::chrono::seconds( options.at( "connection-cleanup-period" ).as<int>());
          my->max_cleanup_time_ms = options.at("max-cleanup-time-msec").as<int>();
@@ -3323,6 +3327,8 @@ namespace eosio {
 
       my->thread_pool.emplace( "net", my->thread_pool_size );
 
+      my->dispatcher.reset( new dispatch_manager( my_impl->thread_pool->get_executor() ) );
+
       tcp::endpoint listen_endpoint;
       if( my->p2p_address.size() > 0 ) {
          auto host = my->p2p_address.substr( 0, my->p2p_address.find( ':' ));

From d1dc31affb79729de4951f7a48fc7be1f451c021 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Jul 2019 07:35:09 -0500
Subject: [PATCH 0843/1648] Fix not finalized error message to actually say

---
 tests/Node.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Node.py b/tests/Node.py
index c4a9d5a18f7..64d17b9f895 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -324,8 +324,8 @@ def isBlockPresent(self, blockNum, blockType=BlockType.head):
         present = True if blockNum <= node_block_num else False
         if Utils.Debug and blockType==BlockType.lib:
             decorator=""
-            if present:
-                decorator="is not "
+            if not present:
+                decorator="not "
             Utils.Print("Block %d is %sfinalized." % (blockNum, decorator))
 
         return present

From 5a3d5f91d6e13d66e8a44bd87e9cd0ed832625c3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Jul 2019 08:19:32 -0500
Subject: [PATCH 0844/1648] Don't do needest work on peer request outside valid
 range

---
 plugins/net_plugin/net_plugin.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 24abf95c714..2d1724757f2 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1035,8 +1035,12 @@ namespace eosio {
          uint32_t end   = std::max( peer_requested->end_block, block_header::num_from_id(head_id) );
          peer_requested = sync_state( start, end, start - 1 );
       }
-      fc_dlog( logger, "enqueue ${s} - ${e}", ("s", peer_requested->start_block)("e", peer_requested->end_block) );
-      enqueue_sync_block();
+      if( peer_requested->start_block <= peer_requested->end_block ) {
+         fc_dlog( logger, "enqueue ${s} - ${e}", ("s", peer_requested->start_block)( "e", peer_requested->end_block ) );
+         enqueue_sync_block();
+      } else {
+         peer_requested.reset();
+      }
    }
 
    void connection::blk_send( const block_id_type& blkid ) {

From 4db34aac04438e7e6b09f68daf961e4c72be5b4b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Jul 2019 14:09:29 -0500
Subject: [PATCH 0845/1648] Only record we have a block if it is a valid
 accepted block to avoid skipping a future good block because we received it
 too early to accept it before.

---
 plugins/net_plugin/net_plugin.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2d1724757f2..84f984d8d54 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1625,7 +1625,6 @@ namespace eosio {
          return;
       }
 
-      bool catch_up_req_sent = false;
       if (head < msg.head_num ) {
          fc_dlog(logger, "sync check state 3");
          c->syncing = false;
@@ -1990,7 +1989,6 @@ namespace eosio {
 
    // called from connection strand
    void dispatch_manager::recv_block(const connection_ptr& c, const block_id_type& id, uint32_t bnum) {
-      add_peer_block( id, c->connection_id );
       std::unique_lock<std::mutex> g( c->conn_mtx );
       if (c &&
           c->last_req &&
@@ -2876,7 +2874,9 @@ namespace eosio {
 
       try {
          if( cc.fetch_block_by_id(blk_id) ) {
-            c->strand.post( [sync_master = my_impl->sync_master.get(), c, blk_id, blk_num]() {
+            c->strand.post( [sync_master = my_impl->sync_master.get(),
+                             dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {
+               dispatcher->add_peer_block( blk_id, c->connection_id );
                sync_master->sync_recv_block( c, blk_id, blk_num );
             });
             return;
@@ -2915,7 +2915,8 @@ namespace eosio {
       }
 
       if( reason == no_reason ) {
-         boost::asio::post( my_impl->thread_pool->get_executor(), [dispatcher = my_impl->dispatcher.get(), msg]() {
+         boost::asio::post( my_impl->thread_pool->get_executor(), [dispatcher = my_impl->dispatcher.get(), c, msg]() {
+            dispatcher->add_peer_block( msg->id(), c->connection_id );
             dispatcher->update_txns_block_num( msg );
          });
          c->strand.post( [sync_master = my_impl->sync_master.get(), dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {

From 42d62c8984a095df2ebffe0e658edb7ee4e17e09 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Jul 2019 14:31:34 -0500
Subject: [PATCH 0846/1648] See no reason why fc exception would have special
 handling to believe it is good. The block could not have been
 accepted/linked.

---
 plugins/net_plugin/net_plugin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 84f984d8d54..d35b5905a09 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2908,7 +2908,6 @@ namespace eosio {
       } catch( const fc::exception &ex) {
          peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));
          fc_elog( logger, "accept_block threw a non-assert exception ${x} from ${p}",( "x",ex.to_string())("p",c->peer_name()));
-         reason = no_reason;
       } catch( ...) {
          peer_elog(c, "bad signed_block : unknown exception");
          fc_elog( logger, "handle sync block caught something else from ${p}",("num",blk_num)("p",c->peer_name()));

From d7d476d3fede26a101641b27bddc9f099cdcd7e0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Jul 2019 14:56:28 -0500
Subject: [PATCH 0847/1648] Better handle quick exit on already received block.
 Bad block before would mess up sync state.

---
 plugins/net_plugin/net_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d35b5905a09..6acae7eac56 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2421,10 +2421,10 @@ namespace eosio {
 
             block_id_type blk_id = bh.id();
             if( my_impl->dispatcher->have_block( blk_id ) ) {
-               auto blk_num = block_header::num_from_id( blk_id );
                connection_ptr c = shared_from_this();
-               my_impl->dispatcher->recv_block( c, blk_id, blk_num );
-               my_impl->sync_master->sync_recv_block( c, blk_id, blk_num );
+               fc_dlog( logger, "canceling wait on ${p}, already received block ${num}",
+                        ("p", c->peer_name())("num", block_header::num_from_id( blk_id )) );
+               c->cancel_wait();
 
                pending_message_buffer.advance_read_ptr( message_length );
                return true;

From ce84c6619d04ea83f395e927449624bb44839f10 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 18 Jul 2019 21:38:40 -0500
Subject: [PATCH 0848/1648] Reset consecutive_rejected_blocks to 0 as before on
 already received block

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6acae7eac56..30bb86b2d8f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2424,6 +2424,7 @@ namespace eosio {
                connection_ptr c = shared_from_this();
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}",
                         ("p", c->peer_name())("num", block_header::num_from_id( blk_id )) );
+               c->consecutive_rejected_blocks = 0;
                c->cancel_wait();
 
                pending_message_buffer.advance_read_ptr( message_length );

From 1575ea7a93be0418e4654fdbc4f86492adbd4c1d Mon Sep 17 00:00:00 2001
From: taokayan <taokayan13@gmail.com>
Date: Fri, 19 Jul 2019 16:22:27 +0800
Subject: [PATCH 0849/1648] fix 7600 double confirm after changing sign key

---
 plugins/producer_plugin/producer_plugin.cpp |  34 +--
 programs/eosio-launcher/main.cpp            |  20 +-
 tests/CMakeLists.txt                        |   5 +
 tests/Cluster.py                            |   7 +-
 tests/Node.py                               |   9 +-
 tests/nodeos_producer_watermark_test.py     | 257 ++++++++++++++++++++
 6 files changed, 302 insertions(+), 30 deletions(-)
 create mode 100755 tests/nodeos_producer_watermark_test.py

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index c4485708b10..a969f4240c4 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -265,28 +265,13 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             }
          } ) );
 
-         // since the watermark has to be set before a block is created, we are looking into the future to
-         // determine the new schedule to identify producers that have become active
-         chain::controller& chain = chain_plug->chain();
-         const auto hbn = bsp->block_num;
-         auto new_pbhs = bsp->next(bsp->header.timestamp.next(), 0);
-
-         // for newly installed producers we can set their watermarks to the block they became active
-         if( bsp->active_schedule.version != new_pbhs.active_schedule.version ) {
-            flat_set<account_name> new_producers;
-            new_producers.reserve(new_pbhs.active_schedule.producers.size());
-            for( const auto& p: new_pbhs.active_schedule.producers) {
-               if (_producers.count(p.producer_name) > 0)
-                  new_producers.insert(p.producer_name);
-            }
-
-            for( const auto& p: bsp->active_schedule.producers) {
-               new_producers.erase(p.producer_name);
-            }
-
-            for (const auto& new_producer: new_producers) {
-               _producer_watermarks[new_producer] = hbn;
-            }
+         // simplify handling of watermark in on_block
+         auto block_producer = bsp->header.producer;
+         auto watermark_itr = _producer_watermarks.find( block_producer );
+         if( watermark_itr != _producer_watermarks.end() ) {
+            watermark_itr->second = bsp->block_num;
+         } else if( _producers.count( block_producer ) > 0 ) {
+            _producer_watermarks.emplace( block_producer, bsp->block_num );
          }
       }
 
@@ -1391,9 +1376,12 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          if (currrent_watermark_itr != _producer_watermarks.end()) {
             auto watermark = currrent_watermark_itr->second;
             if (watermark < hbs->block_num) {
-               blocks_to_confirm = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), (uint16_t)(hbs->block_num - watermark));
+               blocks_to_confirm = (uint16_t)(std::min<uint32_t>(std::numeric_limits<uint16_t>::max(), (uint32_t)(hbs->block_num - watermark)));
             }
          }
+
+         // can not confirm irreversible blocks
+         blocks_to_confirm = (uint16_t)(std::min<uint32_t>(blocks_to_confirm, (uint32_t)(hbs->block_num - hbs->dpos_irreversible_blocknum)));
       }
 
       _unapplied_transactions.add_aborted( chain.abort_block() );
diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index bf9cba588db..d6bca57f09f 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -346,7 +346,7 @@ enum allowed_connection : char {
 
 class producer_names {
 public:
-   static string producer_name(unsigned int producer_number);
+   static string producer_name(unsigned int producer_number, bool shared_producer = false);
 private:
    static const int total_chars = 12;
    static const char slot_chars[];
@@ -358,8 +358,9 @@ const char producer_names::valid_char_range = sizeof(producer_names::slot_chars)
 
 // for 26 or fewer total producers create "defproducera" .. "defproducerz"
 // above 26 produce  "defproducera" .. "defproducerz",  "defproduceaa" .. "defproducerb", etc.
-string producer_names::producer_name(unsigned int producer_number) {
+string producer_names::producer_name(unsigned int producer_number, bool shared_producer) {
    // keeping legacy "defproducer[a-z]", but if greater than valid_char_range, will use "defpraaaaaaa"
+   // shared_producer will appear in all nodes' config
    char prod_name[] = "defproducera";
    if (producer_number > valid_char_range) {
       for (int current_char_loc = 5; current_char_loc < total_chars; ++current_char_loc) {
@@ -380,6 +381,12 @@ string producer_names::producer_name(unsigned int producer_number) {
    // make sure we haven't cycled back to the first 26 names (some time after 26^6)
    if (string(prod_name) == "defproducera" && producer_number != 0)
       throw std::runtime_error( "launcher not designed to handle numbers this large " );
+
+   if (shared_producer) {
+      prod_name[0] = 's';
+      prod_name[1] = 'h';
+      prod_name[2] = 'r';
+   }
    return prod_name;
 }
 
@@ -389,6 +396,7 @@ struct launcher_def {
    size_t unstarted_nodes;
    size_t prod_nodes;
    size_t producers;
+   size_t shared_producers;
    size_t next_node;
    string shape;
    allowed_connection allowed_connections = PC_NONE;
@@ -479,7 +487,8 @@ launcher_def::set_options (bpo::options_description &cfg) {
     ("nodes,n",bpo::value<size_t>(&total_nodes)->default_value(1),"total number of nodes to configure and launch")
     ("unstarted-nodes",bpo::value<size_t>(&unstarted_nodes)->default_value(0),"total number of nodes to configure, but not launch")
     ("pnodes,p",bpo::value<size_t>(&prod_nodes)->default_value(1),"number of nodes that contain one or more producers")
-    ("producers",bpo::value<size_t>(&producers)->default_value(21),"total number of non-bios producer instances in this network")
+    ("producers",bpo::value<size_t>(&producers)->default_value(21),"total number of non-bios and non-shared producer instances in this network")
+    ("shared-producers",bpo::value<size_t>(&shared_producers)->default_value(0),"total number of shared producers on each non-bios nodes")
     ("mode,m",bpo::value<vector<string>>()->multitoken()->default_value({"any"}, "any"),"connection mode, combination of \"any\", \"producers\", \"specified\", \"none\"")
     ("shape,s",bpo::value<string>(&shape)->default_value("star"),"network topology, use \"star\" \"mesh\" or give a filename for custom")
     ("genesis,g",bpo::value<string>()->default_value("./genesis.json"),"set the path to genesis.json")
@@ -901,6 +910,11 @@ launcher_def::bind_nodes () {
                  producer_set.schedule.push_back({prodname,pubkey});
                  ++producer_number;
               }
+              for (unsigned j = 0; j < shared_producers; ++j) {
+                 const auto prodname = producer_names::producer_name(j, true);
+                 node.producers.push_back(prodname);
+                 producer_set.schedule.push_back({prodname,pubkey});                 
+              }
            }
            node.dont_start = i >= to_not_start_node;
         }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 30c1f38ac46..f310972626e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -52,6 +52,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/launcher_test.py ${CMAKE_CURRENT_BINA
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.py ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/prod_preactivation_test.py ${CMAKE_CURRENT_BINARY_DIR}/prod_preactivation_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-label.sh ${CMAKE_CURRENT_BINARY_DIR}/version-label.sh COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_producer_watermark_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_producer_watermark_test.py COPYONLY)
 
 #To run plugin_test with all log from blockchain displayed, put --verbose after --, i.e. plugin_test -- --verbose
 add_test(NAME plugin_test COMMAND plugin_test --report_level=detailed --color_output)
@@ -132,6 +133,10 @@ add_test(NAME nodeos_multiple_version_protocol_feature_mv_test COMMAND tests/nod
          -v --clean-run --dump-error-detail --alternate-version-labels-file ${ALTERNATE_VERSION_LABELS_FILE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_multiple_version_protocol_feature_mv_test PROPERTY LABELS mixed_version_tests)
 
+add_test(NAME nodeos_producer_watermark_lr_test COMMAND tests/nodeos_producer_watermark_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST nodeos_producer_watermark_lr_test PROPERTY LABELS long_running_tests)
+
+
 if(ENABLE_COVERAGE_TESTING)
 
   set(Coverage_NAME ${PROJECT_NAME}_coverage)
diff --git a/tests/Cluster.py b/tests/Cluster.py
index 8ca632e02e5..d73646465a1 100644
--- a/tests/Cluster.py
+++ b/tests/Cluster.py
@@ -144,7 +144,7 @@ def setAlternateVersionLabels(self, file):
     # pylint: disable=too-many-branches
     # pylint: disable=too-many-statements
     def launch(self, pnodes=1, unstartedNodes=0, totalNodes=1, prodCount=1, topo="mesh", delay=1, onlyBios=False, dontBootstrap=False,
-               totalProducers=None, extraNodeosArgs=None, useBiosBootFile=True, specificExtraNodeosArgs=None, onlySetProds=False,
+               totalProducers=None, sharedProducers=0, extraNodeosArgs=None, useBiosBootFile=True, specificExtraNodeosArgs=None, onlySetProds=False,
                pfSetupPolicy=PFSetupPolicy.FULL, alternateVersionLabelsFile=None, associatedNodeLabels=None, loadSystemContract=True):
         """Launch cluster.
         pnodes: producer nodes count
@@ -200,6 +200,9 @@ def launch(self, pnodes=1, unstartedNodes=0, totalNodes=1, prodCount=1, topo="me
             assert(isinstance(totalProducers, (str,int)))
             producerFlag="--producers %s" % (totalProducers)
 
+        if sharedProducers > 0:
+            producerFlag += (" --shared-producers %d" % (sharedProducers))
+
         self.setAlternateVersionLabels(alternateVersionLabelsFile)
 
         tries = 30
@@ -431,7 +434,7 @@ def connectGroup(group, producerNodes, bridgeNodes) :
         if not loadSystemContract:
             useBiosBootFile=False  #ensure we use Cluster.bootstrap
         if onlyBios or not useBiosBootFile:
-            self.biosNode=self.bootstrap(biosNode, startedNodes, prodCount, totalProducers, pfSetupPolicy, onlyBios, onlySetProds, loadSystemContract)
+            self.biosNode=self.bootstrap(biosNode, startedNodes, prodCount + sharedProducers, totalProducers, pfSetupPolicy, onlyBios, onlySetProds, loadSystemContract)
             if self.biosNode is None:
                 Utils.Print("ERROR: Bootstrap failed.")
                 return False
diff --git a/tests/Node.py b/tests/Node.py
index f8167663c28..523d511f09f 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -44,6 +44,7 @@ def __init__(self, host, port, pid=None, cmd=None, walletMgr=None, enableMongo=F
         self.infoValid=None
         self.lastRetrievedHeadBlockNum=None
         self.lastRetrievedLIB=None
+        self.lastRetrievedHeadBlockProducer=""
         self.transCache={}
         self.walletMgr=walletMgr
         self.missingTransaction=False
@@ -1169,6 +1170,7 @@ def getInfo(self, silentErrors=False, exitOnError=False):
             self.infoValid=True
             self.lastRetrievedHeadBlockNum=int(info["head_block_num"])
             self.lastRetrievedLIB=int(info["last_irreversible_block_num"])
+            self.lastRetrievedHeadBlockProducer=info["head_block_producer"]
         return info
 
     def getBlockFromDb(self, idx):
@@ -1313,9 +1315,12 @@ def getBlockProducer(self, timeout=None, waitForBlock=True, exitOnError=True, bl
         return blockProducer
 
     def getNextCleanProductionCycle(self, trans):
-        transId=Node.getTransId(trans)
         rounds=21*12*2  # max time to ensure that at least 2/3+1 of producers x blocks per producer x at least 2 times
-        self.waitForTransFinalization(transId, timeout=rounds/2)
+        if trans is not None:
+            transId=Node.getTransId(trans)
+            self.waitForTransFinalization(transId, timeout=rounds/2)
+        else:
+            transId="Null"
         irreversibleBlockNum=self.getIrreversibleBlockNum()
 
         # The voted schedule should be promoted now, then need to wait for that to become irreversible
diff --git a/tests/nodeos_producer_watermark_test.py b/tests/nodeos_producer_watermark_test.py
new file mode 100755
index 00000000000..822a04243d3
--- /dev/null
+++ b/tests/nodeos_producer_watermark_test.py
@@ -0,0 +1,257 @@
+#!/usr/bin/env python3
+
+from testUtils import Utils
+import testUtils
+from Cluster import Cluster
+from WalletMgr import WalletMgr
+from Node import Node
+from TestHelper import TestHelper
+
+import time
+import decimal
+import math
+import re
+
+###############################################################
+# nodeos_producer_watermark_test
+# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
+# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
+###############################################################
+def isValidBlockProducer(prodsActive, blockNum, node):
+    blockProducer=node.getBlockProducerByNum(blockNum)
+    if blockProducer not in prodsActive:
+        return False
+    return prodsActive[blockProducer]
+
+def validBlockProducer(prodsActive, prodsSeen, blockNum, node):
+    blockProducer=node.getBlockProducerByNum(blockNum)
+    if blockProducer not in prodsActive:
+        Utils.cmdError("unexpected block producer %s at blockNum=%s" % (blockProducer,blockNum))
+        Utils.errorExit("Failed because of invalid block producer")
+    if not prodsActive[blockProducer]:
+        Utils.cmdError("block producer %s for blockNum=%s not elected, belongs to node %s" % (blockProducer, blockNum, ProducerToNode.map[blockProducer]))
+        Utils.errorExit("Failed because of incorrect block producer")
+    prodsSeen[blockProducer]=True
+    return blockProducer
+
+def setProds(sharedProdKey):
+    setProdsStr='{"schedule": ['
+    firstTime=True
+    for name in ["defproducera", "shrproducera", "defproducerb", "defproducerc"]:
+        if firstTime:
+            firstTime = False
+        else:
+            setProdsStr += ','
+        key = cluster.defProducerAccounts[name].activePublicKey
+        if name == "shrproducera":
+            key = sharedProdKey
+        setProdsStr += ' { "producer_name": "%s", "block_signing_key": "%s" }' % (name, key)
+
+    setProdsStr += ' ] }'
+    Utils.Print("setprods: %s" % (setProdsStr))
+    opts="--permission eosio@active"
+    # pylint: disable=redefined-variable-type
+    trans=cluster.biosNode.pushMessage("eosio", "setprods", setProdsStr, opts)
+    if trans is None or not trans[0]:
+        Utils.Print("ERROR: Failed to set producer with cmd %s" % (setProdsStr))
+
+def verifyProductionRounds(trans, node, prodsActive, rounds):
+    blockNum=node.getNextCleanProductionCycle(trans)
+    Utils.Print("Validating blockNum=%s" % (blockNum))
+
+    temp=Utils.Debug
+    Utils.Debug=False
+    Utils.Print("FIND VALID BLOCK PRODUCER")
+    blockProducer=node.getBlockProducerByNum(blockNum)
+    lastBlockProducer=blockProducer
+    adjust=False
+    while not isValidBlockProducer(prodsActive, blockNum, node):
+        adjust=True
+        blockProducer=node.getBlockProducerByNum(blockNum)
+        if lastBlockProducer!=blockProducer:
+            Utils.Print("blockProducer=%s for blockNum=%s is for node=%s" % (blockProducer, blockNum, ProducerToNode.map[blockProducer]))
+        lastBlockProducer=blockProducer
+        blockNum+=1
+
+    Utils.Print("VALID BLOCK PRODUCER")
+    saw=0
+    sawHigh=0
+    startingFrom=blockNum
+    doPrint=0
+    invalidCount=0
+    while adjust:
+        invalidCount+=1
+        if lastBlockProducer==blockProducer:
+            saw+=1
+        else:
+            if saw>=12:
+                startingFrom=blockNum
+                if saw>12:
+                    Utils.Print("ERROR!!!!!!!!!!!!!!      saw=%s, blockProducer=%s, blockNum=%s" % (saw,blockProducer,blockNum))
+                break
+            else:
+                if saw > sawHigh:
+                    sawHigh = saw
+                    Utils.Print("sawHigh=%s" % (sawHigh))
+                if doPrint < 5:
+                    doPrint+=1
+                    Utils.Print("saw=%s, blockProducer=%s, blockNum=%s" % (saw,blockProducer,blockNum))
+                lastBlockProducer=blockProducer
+                saw=1
+        blockProducer=node.getBlockProducerByNum(blockNum)
+        blockNum+=1
+
+    if adjust:
+        blockNum-=1
+
+    Utils.Print("ADJUSTED %s blocks" % (invalidCount-1))
+
+    prodsSeen=None
+    reportFirstMissedBlock=False
+    Utils.Print("Verify %s complete rounds of all producers producing" % (rounds))
+
+    prodsSize = len(prodsActive)
+    for i in range(0, rounds):
+        prodsSeen={}
+        lastBlockProducer=None
+        for j in range(0, prodsSize):
+            # each new set of 12 blocks should have a different blockProducer 
+            if lastBlockProducer is not None and lastBlockProducer==node.getBlockProducerByNum(blockNum):
+                Utils.cmdError("expected blockNum %s to be produced by any of the valid producers except %s" % (blockNum, lastBlockProducer))
+                Utils.errorExit("Failed because of incorrect block producer order")
+
+            # make sure that the next set of 12 blocks all have the same blockProducer
+            lastBlockProducer=node.getBlockProducerByNum(blockNum)
+            for k in range(0, 12):
+                blockProducer = validBlockProducer(prodsActive, prodsSeen, blockNum, node1)
+                if lastBlockProducer!=blockProducer:
+                    if not reportFirstMissedBlock:
+                        printStr=""
+                        newBlockNum=blockNum-18
+                        for l in range(0,36):
+                            printStr+="%s" % (newBlockNum)
+                            printStr+=":"
+                            newBlockProducer=node.getBlockProducerByNum(newBlockNum)
+                            printStr+="%s" % (newBlockProducer)
+                            printStr+="  "
+                            newBlockNum+=1
+                        Utils.Print("NOTE: expected blockNum %s (started from %s) to be produced by %s, but produded by %s: round=%s, prod slot=%s, prod num=%s - %s" % (blockNum, startingFrom, lastBlockProducer, blockProducer, i, j, k, printStr))
+                    reportFirstMissedBlock=True
+                    break
+                blockNum+=1
+
+    # make sure that we have seen all 21 producers
+    prodsSeenKeys=prodsSeen.keys()
+    if len(prodsSeenKeys) != prodsSize:
+        Utils.cmdError("only saw %s producers of expected %d. At blockNum %s only the following producers were seen: %s" % (len(prodsSeenKeys), prodsSize, blockNum, ",".join(prodsSeenKeys)))
+        Utils.errorExit("Failed because of missing block producers")
+
+    Utils.Debug=temp
+
+
+Print=Utils.Print
+errorExit=Utils.errorExit
+
+args = TestHelper.parse_args({"--prod-count","--dump-error-details","--keep-logs","-v","--leave-running","--clean-run",
+                              "--wallet-port"})
+Utils.Debug=args.v
+totalNodes=3
+cluster=Cluster(walletd=True)
+dumpErrorDetails=args.dump_error_details
+keepLogs=args.keep_logs
+dontKill=args.leave_running
+prodCount=args.prod_count
+killAll=args.clean_run
+walletPort=args.wallet_port
+
+walletMgr=WalletMgr(True, port=walletPort)
+testSuccessful=False
+killEosInstances=not dontKill
+killWallet=not dontKill
+
+WalletdName=Utils.EosWalletName
+ClientName="cleos"
+
+try:
+    assert(totalNodes == 3)
+
+    TestHelper.printSystemInfo("BEGIN")
+    cluster.setWalletMgr(walletMgr)
+
+    cluster.killall(allInstances=killAll)
+    cluster.cleanup()
+    Print("Stand up cluster")
+    if cluster.launch(prodCount=prodCount, onlyBios=False, pnodes=totalNodes, totalNodes=totalNodes, totalProducers=totalNodes, useBiosBootFile=False, onlySetProds=True, sharedProducers=1) is False:
+        Utils.cmdError("launcher")
+        Utils.errorExit("Failed to stand up eos cluster.")
+
+    Print("Validating system accounts after bootstrap")
+    cluster.validateAccounts(None)
+
+    node0=cluster.getNode(0)
+    node1=cluster.getNode(1)
+    node2=cluster.getNode(2)
+
+    node=node0
+    numprod = totalNodes + 1
+
+    trans=None
+    prodsActive={}
+    prodsActive["shrproducera"] = True
+    prodsActive["defproducera"] = True
+    prodsActive["defproducerb"] = True
+    prodsActive["defproducerc"] = True
+
+    Print("Wait for initial schedule: defproducera(node 0) shrproducera(node 2) defproducerb(node 1) defproducerc(node 2)")
+    
+    tries=10
+    while tries > 0:
+        node.infoValid = False
+        info = node.getInfo()
+        if node.infoValid and node.lastRetrievedHeadBlockProducer != "eosio":
+            break
+        time.sleep(1)
+        tries = tries-1
+    if tries == 0:
+        Utils.errorExit("failed to wait for initial schedule")
+
+    # try to change signing key of shrproducera, shrproducera will produced by node1 instead of node2
+    Print("change producer signing key, shrproducera will be produced by node1 instead of node2")
+    shracc_node1 = cluster.defProducerAccounts["shrproducera"]
+    shracc_node1.activePublicKey = cluster.defProducerAccounts["defproducerb"].activePublicKey
+    setProds(shracc_node1.activePublicKey)
+    Print("sleep for 4/3 rounds...")
+    time.sleep(numprod * 6 * 4 / 3)
+    verifyProductionRounds(trans, node0, prodsActive, 1)
+
+    # change signing key of shrproducera that no one can sign
+    accounts = cluster.createAccountKeys(1)
+    Print("change producer signing key of shrproducera that none of the node has")
+    shracc_node1.activePublicKey = accounts[0].activePublicKey
+    del prodsActive["shrproducera"]
+    setProds(shracc_node1.activePublicKey)
+    Print("sleep for 4/3 rounds...")
+    time.sleep(numprod * 6 * 4 / 3)
+    verifyProductionRounds(trans, node0, prodsActive, 1)
+
+    # change signing key back to node1
+    Print("change producer signing key of shrproducera so that node1 can produce again")
+    shracc_node1.activePublicKey = cluster.defProducerAccounts["defproducerb"].activePublicKey
+    prodsActive["shrproducera"] = True
+    setProds(shracc_node1.activePublicKey)
+    tries=numprod * 6 * 4 # give 4 rounds
+    while tries > 0:
+        node.infoValid = False
+        info = node.getInfo()
+        if node.infoValid and node.lastRetrievedHeadBlockProducer == "shrproducera":
+            break
+        time.sleep(1)
+        tries = tries-1
+    if tries == 0:
+        Utils.errorExit("shrproducera failed to produce")
+
+    testSuccessful=True
+finally:
+    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, killEosInstances=killEosInstances, killWallet=killWallet, keepLogs=keepLogs, cleanRun=killAll, dumpErrorDetails=dumpErrorDetails)
+
+exit(0)

From dd5063bd99531b8ba15d8b45f68472c4d8c54ef3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 19 Jul 2019 08:08:47 -0500
Subject: [PATCH 0850/1648] Add log to on_irreversible_block

---
 plugins/net_plugin/net_plugin.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 30bb86b2d8f..2b250b42f5d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3058,13 +3058,14 @@ namespace eosio {
    void net_plugin_impl::on_accepted_block(const block_state_ptr& block) {
       update_chain_info();
       dispatcher->strand.post( [this, block]() {
-         fc_dlog( logger, "signaled, blk id = ${id}", ("id", block->id) );
+         fc_dlog( logger, "signaled, blk num = ${num}, id = ${id}", ("num", block->block_num)("id", block->id) );
          dispatcher->bcast_block( block );
       });
    }
 
    // called from application thread
-   void net_plugin_impl::on_irreversible_block( const block_state_ptr& ) {
+   void net_plugin_impl::on_irreversible_block( const block_state_ptr& block) {
+      fc_dlog( logger, "on_irreversible_block, blk num = ${num}, id = ${id}", ("num", block->block_num)("id", block->id) );
       update_chain_info();
    }
 

From 8248aefcff38850b8d9a2dfea6251340985c2f81 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 19 Jul 2019 08:33:30 -0500
Subject: [PATCH 0851/1648] in head_catchup still send req

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2b250b42f5d..9677ac48a0d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1678,7 +1678,7 @@ namespace eosio {
                           "target LIB = ${lib} next_expected = ${ne}",
                   ("s", stage_str( sync_state ))( "fhn", num )( "lib", sync_known_lib_num )
                   ("ne", sync_next_expected_num ) );
-         if( sync_state == lib_catchup || sync_state == head_catchup )
+         if( sync_state == lib_catchup )
             return false;
          set_state( head_catchup );
       } else {

From c7d39911d35540dd9c3642fabe63787d3fb48660 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 19 Jul 2019 13:15:58 -0500
Subject: [PATCH 0852/1648] Remove sleep before start as may not be needed

---
 tests/nodeos_startup_catchup.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/nodeos_startup_catchup.py b/tests/nodeos_startup_catchup.py
index f213ebaafa9..5934750d3a9 100755
--- a/tests/nodeos_startup_catchup.py
+++ b/tests/nodeos_startup_catchup.py
@@ -142,7 +142,6 @@ def waitForNodeStarted(node):
     Print("Cycle through catchup scenarios")
     twoRounds=21*2*12
     for catchup_num in range(0, catchupCount):
-        time.sleep(5)
         Print("Start catchup node")
         cluster.launchUnstarted(cachePopen=True)
         lastLibNum=lib(node0)
@@ -166,7 +165,6 @@ def waitForNodeStarted(node):
         catchupNode.interruptAndVerifyExitStatus(60)
 
         Print("Restart catchup node")
-        time.sleep(5)
         catchupNode.relaunch(catchupNodeNum, cachePopen=True)
         waitForNodeStarted(catchupNode)
         lastCatchupLibNum=lib(catchupNode)

From f459016e1dc11600370997c71eaa7c477e8b533f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 19 Jul 2019 15:28:30 -0500
Subject: [PATCH 0853/1648] Remove #ifdef apple for socket shutdown call

---
 plugins/net_plugin/net_plugin.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 9677ac48a0d..959910e125f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -961,9 +961,7 @@ namespace eosio {
       self->socket_open = false;
       boost::system::error_code ec;
       if( self->socket->is_open() ) {
-#ifndef __APPLE__ /* shutdown seems to cause apple to not recover from connection refused */
          self->socket->shutdown( tcp::socket::shutdown_both, ec );
-#endif
          self->socket->close();
       }
       self->socket.reset( new tcp::socket( my_impl->thread_pool->get_executor() ) );

From 487387dacfda9dc36b0957d262c233e42bd30288 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 22 Jul 2019 11:34:32 -0400
Subject: [PATCH 0854/1648] Add tests for producer schedule authority
 satisfiability, duplicated accounts, duplicated keys on a wtmsig authority. 
 Add enforcement of unique keys in a wtmsig authority

---
 libraries/chain/wasm_interface.cpp    |  8 +++-
 unittests/producer_schedule_tests.cpp | 69 +++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 8751a7568e8..2a9a994705c 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -188,8 +188,9 @@ class privileged_api : public context_aware_api {
          for (const auto& p: producers) {
             EOS_ASSERT( context.is_account(p.producer_name), wasm_execution_error, "producer schedule includes a nonexisting account" );
 
-            p.authority.visit([this](const auto& a) {
+            p.authority.visit([this, &p](const auto& a) {
                uint32_t sum_weights = 0;
+               std::set<public_key_type> unique_keys;
                for (const auto& kw: a.keys ) {
                   EOS_ASSERT( kw.key.which() < context.db.get<protocol_state_object>().num_supported_key_types, unactivated_key_type,
                               "Unactivated key type used in proposed producer schedule");
@@ -201,9 +202,12 @@ class privileged_api : public context_aware_api {
                   } else {
                      sum_weights += kw.weight;
                   }
+
+                  unique_keys.insert(kw.key);
                }
 
-               EOS_ASSERT( sum_weights >= a.threshold, wasm_execution_error, "producer schedule includes an unsatisfiable authority" );
+               EOS_ASSERT( a.keys.size() == unique_keys.size(), wasm_execution_error, "producer schedule includes a duplicated key for ${account}", ("account", p.producer_name));
+               EOS_ASSERT( sum_weights >= a.threshold, wasm_execution_error, "producer schedule includes an unsatisfiable authority for ${account}", ("account", p.producer_name));
             });
 
 
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index 8be96cbdba6..f1d61a7ba78 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -612,4 +612,73 @@ BOOST_FIXTURE_TEST_CASE( producer_m_of_n_test, TESTER ) try {
    BOOST_REQUIRE_EQUAL( validate(), true );
 } FC_LOG_AND_RETHROW()
 
+BOOST_FIXTURE_TEST_CASE( satisfiable_msig_test, TESTER ) try {
+   create_accounts( {N(alice),N(bob)} );
+   while (control->head_block_num() < 3) {
+      produce_block();
+   }
+
+   vector<producer_authority> sch1 = {
+           producer_authority{N(alice), block_signing_authority_v0{2, {{get_public_key(N(alice), "bs1"), 1}}}}
+   };
+
+   // ensure that the entries in a wtmsig schedule are rejected if not satisfiable
+   BOOST_REQUIRE_EXCEPTION(
+      set_producer_schedule( sch1 ), wasm_execution_error,
+      fc_exception_message_is( "producer schedule includes an unsatisfiable authority for alice" )
+   );
+
+   BOOST_REQUIRE_EQUAL( false, control->proposed_producers().valid() );
+
+} FC_LOG_AND_RETHROW()
+
+BOOST_FIXTURE_TEST_CASE( duplicate_producers_test, TESTER ) try {
+   create_accounts( {N(alice),N(bob)} );
+   while (control->head_block_num() < 3) {
+      produce_block();
+   }
+
+   vector<producer_authority> sch1 = {
+           producer_authority{N(alice), block_signing_authority_v0{1, {{get_public_key(N(alice), "bs1"), 1}}}},
+           producer_authority{N(alice), block_signing_authority_v0{1, {{get_public_key(N(alice), "bs2"), 1}}}}
+   };
+
+   // ensure that the schedule is rejected if it has duplicate producers in it
+   BOOST_REQUIRE_EXCEPTION(
+      set_producer_schedule( sch1 ), wasm_execution_error,
+      fc_exception_message_is( "duplicate producer name in producer schedule" )
+   );
+
+   BOOST_REQUIRE_EQUAL( false, control->proposed_producers().valid() );
+
+} FC_LOG_AND_RETHROW()
+
+BOOST_FIXTURE_TEST_CASE( duplicate_keys_test, TESTER ) try {
+   create_accounts( {N(alice),N(bob)} );
+   while (control->head_block_num() < 3) {
+      produce_block();
+   }
+
+   vector<producer_authority> sch1 = {
+           producer_authority{N(alice), block_signing_authority_v0{2, {{get_public_key(N(alice), "bs1"), 1}, {get_public_key(N(alice), "bs1"), 1}}}}
+   };
+
+   // ensure that the schedule is rejected if it has duplicate keys for a single producer in it
+   BOOST_REQUIRE_EXCEPTION(
+      set_producer_schedule( sch1 ), wasm_execution_error,
+      fc_exception_message_is( "producer schedule includes a duplicated key for alice" )
+   );
+
+   BOOST_REQUIRE_EQUAL( false, control->proposed_producers().valid() );
+
+   // ensure that multiple producers are allowed to share keys
+   vector<producer_authority> sch2 = {
+           producer_authority{N(alice), block_signing_authority_v0{1, {{get_public_key(N(alice), "bs1"), 1}}}},
+           producer_authority{N(bob),   block_signing_authority_v0{1, {{get_public_key(N(alice), "bs1"), 1}}}}
+   };
+
+   set_producer_schedule( sch2 );
+   BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
+} FC_LOG_AND_RETHROW()
+
 BOOST_AUTO_TEST_SUITE_END()

From 3fdbcb542eb0ebc4fd6cd51f12460027382ac177 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 22 Jul 2019 17:22:18 -0500
Subject: [PATCH 0855/1648] Capture copy of shared_ptr that can be reset in
 signing_keys_future to prevent self reference

---
 libraries/chain/transaction_metadata.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index ac6012fff4a..8297ef2ab64 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -43,15 +43,16 @@ void transaction_metadata::start_recover_keys( const transaction_metadata_ptr& m
       return;
    }
 
-   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx, next{std::move(next)}]() {
+   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_ptr=mtrx, next{std::move(next)}]() mutable {
       auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
       fc::microseconds cpu_usage;
       try {
          fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
                                    fc::time_point::maximum() : fc::time_point::now() + time_limit;
 
-         const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
+         const signed_transaction& trn = mtrx_ptr->_packed_trx->get_signed_transaction();
          cpu_usage = trn.get_signature_keys( chain_id, deadline, *recovered_pub_keys );
+         mtrx_ptr.reset();
       } catch( ... ) {
          if( next ) next();
          throw;

From 0c874f009810a687db307b5761b4f89fa046c96d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 22 Jul 2019 18:49:01 -0500
Subject: [PATCH 0856/1648] Use weak_ptr for transaction_metadata instead of
 resetting shared_ptr to make lifetime clearer

---
 libraries/chain/transaction_metadata.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index 8297ef2ab64..9e973a83142 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -43,16 +43,19 @@ void transaction_metadata::start_recover_keys( const transaction_metadata_ptr& m
       return;
    }
 
-   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_ptr=mtrx, next{std::move(next)}]() mutable {
+   std::weak_ptr<transaction_metadata> mtrx_wp = mtrx;
+   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_wp, next{std::move(next)}]() mutable {
       auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
       fc::microseconds cpu_usage;
       try {
          fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
                                    fc::time_point::maximum() : fc::time_point::now() + time_limit;
 
-         const signed_transaction& trn = mtrx_ptr->_packed_trx->get_signed_transaction();
-         cpu_usage = trn.get_signature_keys( chain_id, deadline, *recovered_pub_keys );
-         mtrx_ptr.reset();
+         transaction_metadata_ptr mtrx = mtrx_wp.lock(); // if mtrx no longer exists then no signing_keys_future to get results
+         if( mtrx ) {
+            const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
+            cpu_usage = trn.get_signature_keys( chain_id, deadline, *recovered_pub_keys );
+         }
       } catch( ... ) {
          if( next ) next();
          throw;

From e80e4093a93950dc2d6eff734839f3b289eebf88 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 23 Jul 2019 10:36:28 -0400
Subject: [PATCH 0857/1648] Forked tests had been instantiating peers with the
 expectation that they would sync into a blockchain, however they had actually
 been deterministically re-creating the preamble of those chains.  Recent
 changes to the set-up policy violated the implicit expectation by leaving
 unapplied_transactions around after syncing.  These transactions were expired
 and throwing asserts

---
 unittests/forked_tests.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index d0e5efb2eac..902d09a62e8 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE( fork_with_bad_block ) try {
    BOOST_REQUIRE( produce_empty_blocks_until( bios, N(e), N(a) ) );
 
    // sync remote node
-   tester remote;
+   tester remote(setup_policy::none);
    push_blocks(bios, remote);
 
    // produce 6 blocks on bios
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE( forking ) try {
       );
 
 
-   tester c2;
+   tester c2(setup_policy::none);
    wlog( "push c1 blocks to c2" );
    push_blocks(c, c2);
    wlog( "end push c1 blocks to c2" );
@@ -293,7 +293,7 @@ BOOST_AUTO_TEST_CASE( prune_remove_branch ) try {
    wlog("set producer schedule to [dan,sam,pam,scott]");
    c.produce_blocks(50);
 
-   tester c2;
+   tester c2(setup_policy::none);
    wlog( "push c1 blocks to c2" );
    push_blocks(c, c2);
 
@@ -346,9 +346,9 @@ BOOST_AUTO_TEST_CASE( prune_remove_branch ) try {
  */
 BOOST_AUTO_TEST_CASE( validator_accepts_valid_blocks ) try {
 
-   tester n1;
-   tester n2;
-   tester n3;
+   tester n1(setup_policy::none);
+   tester n2(setup_policy::none);
+   tester n3(setup_policy::none);
 
    n1.produce_block();
 
@@ -389,7 +389,7 @@ BOOST_AUTO_TEST_CASE( read_modes ) try {
    auto head_block_num = c.control->head_block_num();
    auto last_irreversible_block_num = c.control->last_irreversible_block_num();
 
-   tester head(setup_policy::old_bios_only, db_read_mode::HEAD);
+   tester head(setup_policy::none, db_read_mode::HEAD);
    push_blocks(c, head);
    BOOST_CHECK_EQUAL(head_block_num, head.control->fork_db_head_block_num());
    BOOST_CHECK_EQUAL(head_block_num, head.control->head_block_num());
@@ -399,7 +399,7 @@ BOOST_AUTO_TEST_CASE( read_modes ) try {
    BOOST_CHECK_EQUAL(head_block_num, read_only.control->fork_db_head_block_num());
    BOOST_CHECK_EQUAL(head_block_num, read_only.control->head_block_num());
 
-   tester irreversible(setup_policy::old_bios_only, db_read_mode::IRREVERSIBLE);
+   tester irreversible(setup_policy::none, db_read_mode::IRREVERSIBLE);
    push_blocks(c, irreversible);
    BOOST_CHECK_EQUAL(head_block_num, irreversible.control->fork_db_pending_head_block_num());
    BOOST_CHECK_EQUAL(last_irreversible_block_num, irreversible.control->fork_db_head_block_num());
@@ -434,7 +434,7 @@ BOOST_AUTO_TEST_CASE( irreversible_mode ) try {
 
    BOOST_REQUIRE( lib2 < hbn1 );
 
-   tester other;
+   tester other(setup_policy::none);
 
    push_blocks( main, other );
    BOOST_CHECK_EQUAL( other.control->head_block_num(), hbn2 );
@@ -533,7 +533,7 @@ BOOST_AUTO_TEST_CASE( reopen_forkdb ) try {
    c1.produce_block();
    produce_empty_blocks_until( c1, N(carol), N(alice) );
 
-   tester c2;
+   tester c2(setup_policy::none);
 
    push_blocks( c1, c2 );
 
@@ -582,7 +582,7 @@ BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
    wlog("set producer schedule to [dan,sam,pam]");
    c.produce_blocks(40);
 
-   tester c2;
+   tester c2(setup_policy::none);
    wlog( "push c1 blocks to c2" );
    push_blocks(c, c2);
 

From 3a47de6422c47ec342b18c6f25d325ce10bda0d5 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 23 Jul 2019 10:48:08 -0400
Subject: [PATCH 0858/1648] remove dangerous default constructor (no
 allocator), fix bad invocations of `std::forward` that should be `std::move`

---
 libraries/chain/include/eosio/chain/producer_schedule.hpp | 4 ++--
 libraries/chain/wasm_interface.cpp                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index 501342ebb41..c1ad09fab03 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -153,7 +153,7 @@ namespace eosio { namespace chain {
    using shared_block_signing_authority = static_variant<shared_block_signing_authority_v0>;
 
    struct shared_producer_authority {
-      shared_producer_authority() = default;
+      shared_producer_authority() = delete;
       shared_producer_authority( const shared_producer_authority& ) = default;
       shared_producer_authority( shared_producer_authority&& ) = default;
       shared_producer_authority& operator= ( shared_producer_authority && ) = default;
@@ -161,7 +161,7 @@ namespace eosio { namespace chain {
 
       shared_producer_authority( const name& producer_name, shared_block_signing_authority&& authority )
       :producer_name(producer_name)
-      ,authority(std::forward<shared_block_signing_authority>(authority))
+      ,authority(std::move(authority))
       {}
 
       name                                     producer_name;
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 2a9a994705c..f3afa9d44f4 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -215,7 +215,7 @@ class privileged_api : public context_aware_api {
          }
          EOS_ASSERT( producers.size() == unique_producers.size(), wasm_execution_error, "duplicate producer name in producer schedule" );
 
-         return context.control.set_proposed_producers( std::forward<vector<producer_authority>>(producers) );
+         return context.control.set_proposed_producers( std::move(producers) );
       }
 
       int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, size_t datalen) {

From 58e7992de05bfcccd99afbb971da74097341c75c Mon Sep 17 00:00:00 2001
From: Chris Gundlach <cgundlach@naughtydawgllc.com>
Date: Tue, 23 Jul 2019 10:03:05 -0700
Subject: [PATCH 0859/1648] added handling for incompatible reversible database

---
 plugins/chain_plugin/chain_plugin.cpp         | 62 +++++++++++--------
 .../eosio/chain_plugin/chain_plugin.hpp       |  1 +
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index e9eaa6776a7..8b82d7bfb2f 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -536,6 +536,27 @@ protocol_feature_set initialize_protocol_features( const fc::path& p, bool popul
    return pfs;
 }
 
+void
+chain_plugin::do_hard_replay(const variables_map& options) {
+         ilog( "Hard replay requested: deleting state database" );
+         clear_directory_contents( my->chain_config->state_dir );
+         auto backup_dir = block_log::repair_log( my->blocks_dir, options.at( "truncate-at-block" ).as<uint32_t>());
+         if( fc::exists( backup_dir / config::reversible_blocks_dir_name ) ||
+             options.at( "fix-reversible-blocks" ).as<bool>()) {
+            // Do not try to recover reversible blocks if the directory does not exist, unless the option was explicitly provided.
+            if( !recover_reversible_blocks( backup_dir / config::reversible_blocks_dir_name,
+                                            my->chain_config->reversible_cache_size,
+                                            my->chain_config->blocks_dir / config::reversible_blocks_dir_name,
+                                            options.at( "truncate-at-block" ).as<uint32_t>())) {
+               ilog( "Reversible blocks database was not corrupted. Copying from backup to blocks directory." );
+               fc::copy( backup_dir / config::reversible_blocks_dir_name,
+                         my->chain_config->blocks_dir / config::reversible_blocks_dir_name );
+               fc::copy( backup_dir / config::reversible_blocks_dir_name / "shared_memory.bin",
+                         my->chain_config->blocks_dir / config::reversible_blocks_dir_name / "shared_memory.bin" );
+            }
+         }
+}
+
 void chain_plugin::plugin_initialize(const variables_map& options) {
    ilog("initializing chain plugin");
 
@@ -714,23 +735,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          clear_directory_contents( my->chain_config->state_dir );
          clear_directory_contents( my->blocks_dir );
       } else if( options.at( "hard-replay-blockchain" ).as<bool>()) {
-         ilog( "Hard replay requested: deleting state database" );
-         clear_directory_contents( my->chain_config->state_dir );
-         auto backup_dir = block_log::repair_log( my->blocks_dir, options.at( "truncate-at-block" ).as<uint32_t>());
-         if( fc::exists( backup_dir / config::reversible_blocks_dir_name ) ||
-             options.at( "fix-reversible-blocks" ).as<bool>()) {
-            // Do not try to recover reversible blocks if the directory does not exist, unless the option was explicitly provided.
-            if( !recover_reversible_blocks( backup_dir / config::reversible_blocks_dir_name,
-                                            my->chain_config->reversible_cache_size,
-                                            my->chain_config->blocks_dir / config::reversible_blocks_dir_name,
-                                            options.at( "truncate-at-block" ).as<uint32_t>())) {
-               ilog( "Reversible blocks database was not corrupted. Copying from backup to blocks directory." );
-               fc::copy( backup_dir / config::reversible_blocks_dir_name,
-                         my->chain_config->blocks_dir / config::reversible_blocks_dir_name );
-               fc::copy( backup_dir / config::reversible_blocks_dir_name / "shared_memory.bin",
-                         my->chain_config->blocks_dir / config::reversible_blocks_dir_name / "shared_memory.bin" );
-            }
-         }
+	do_hard_replay(options);
       } else if( options.at( "replay-blockchain" ).as<bool>()) {
          ilog( "Replay requested: deleting state database" );
          if( options.at( "truncate-at-block" ).as<uint32_t>() > 0 )
@@ -1031,7 +1036,7 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
    } catch( ... ) {
       throw;
    }
-   // Reversible block database is dirty. So back it up (unless already moved) and then create a new one.
+   // Reversible block database is dirty (or incompatible). So back it up (unless already moved) and then create a new one.
 
    auto reversible_dir = fc::canonical( db_dir );
    if( reversible_dir.filename().generic_string() == "." ) {
@@ -1062,10 +1067,11 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
 
    ilog( "Reconstructing '${reversible_dir}' from backed up reversible directory", ("reversible_dir", reversible_dir) );
 
-   chainbase::database  old_reversible( backup_dir, database::read_only, 0, true );
-   chainbase::database  new_reversible( reversible_dir, database::read_write, cache_size );
-   std::fstream         reversible_blocks;
-   reversible_blocks.open( (reversible_dir.parent_path() / std::string("portable-reversible-blocks-").append( now ) ).generic_string().c_str(),
+   try {
+   	chainbase::database  old_reversible( backup_dir, database::read_only, 0, true );
+   	chainbase::database  new_reversible( reversible_dir, database::read_write, cache_size );
+   	std::fstream         reversible_blocks;
+   	reversible_blocks.open( (reversible_dir.parent_path() / std::string("portable-reversible-blocks-").append( now ) ).generic_string().c_str(),
                            std::ios::out | std::ios::binary );
 
    uint32_t num = 0;
@@ -1083,7 +1089,6 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
       ilog( "Did not recover any reversible blocks since the specified block number to stop at (${stop}) is less than first block in the reversible database (${start}).", ("stop", truncate_at_block)("start", start) );
       return true;
    }
-   try {
       for( ; itr != ubi.end(); ++itr ) {
          EOS_ASSERT( itr->blocknum == end + 1, gap_in_reversible_blocks_db,
                      "gap in reversible block database between ${end} and ${blocknum}",
@@ -1099,10 +1104,6 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
          if( end == truncate_at_block )
             break;
       }
-   } catch( const gap_in_reversible_blocks_db& e ) {
-      wlog( "${details}", ("details", e.to_detail_string()) );
-   } catch( ... ) {}
-
    if( end == truncate_at_block )
       ilog( "Stopped recovery of reversible blocks early at specified block number: ${stop}", ("stop", truncate_at_block) );
 
@@ -1113,6 +1114,13 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
    else
       ilog( "Recovered ${num} blocks from reversible block database: blocks ${start} to ${end}",
             ("num", num)("start", start)("end", end) );
+   } catch( const gap_in_reversible_blocks_db& e ) {
+      wlog( "${details}", ("details", e.to_detail_string()) );
+   } catch(const std::runtime_error&) {
+	// since we are allowing for dirty, it must be incompatible
+	return false;
+   } catch( ... ) {}
+
 
    return true;
 }
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index ed7c62b2751..2bec70dd477 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -717,6 +717,7 @@ class chain_plugin : public plugin<chain_plugin> {
    fc::microseconds get_abi_serializer_max_time() const;
 
    void handle_guard_exception(const chain::guard_exception& e) const;
+   void do_hard_replay(const variables_map& options);
 
    static void handle_db_exhaustion();
 private:

From 551453f327e82e563bdcecb8d49adbf882a56078 Mon Sep 17 00:00:00 2001
From: Chris Gundlach <cgundlach@naughtydawgllc.com>
Date: Tue, 23 Jul 2019 13:50:48 -0700
Subject: [PATCH 0860/1648] fixed to return correct return code and log

---
 plugins/chain_plugin/chain_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 8b82d7bfb2f..aa81b18c495 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1117,8 +1117,8 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
    } catch( const gap_in_reversible_blocks_db& e ) {
       wlog( "${details}", ("details", e.to_detail_string()) );
    } catch(const std::runtime_error&) {
+   	ilog( "Reversible database incompatible");
 	// since we are allowing for dirty, it must be incompatible
-	return false;
    } catch( ... ) {}
 
 

From 510118ac3bb48c8eecffb44370a9c7fafc0b32b5 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 23 Jul 2019 18:26:06 -0400
Subject: [PATCH 0861/1648] addressing PR feedback

made all conversions to and from shared data structures explicit and reduced shared structures to just basically POD types
---
 libraries/chain/block.cpp                     |   4 +
 libraries/chain/block_header_state.cpp        |  30 +-
 libraries/chain/block_state.cpp               |  12 +-
 libraries/chain/controller.cpp                |  13 +-
 .../chain/include/eosio/chain/authority.hpp   |   3 -
 .../eosio/chain/block_header_state.hpp        |  10 +-
 .../chain/include/eosio/chain/exceptions.hpp  |   2 +-
 .../eosio/chain/global_property_object.hpp    |   4 +-
 .../include/eosio/chain/producer_schedule.hpp | 274 ++++++++----------
 libraries/chain/include/eosio/chain/types.hpp |   3 +
 libraries/chain/producer_schedule.cpp         |   4 +
 libraries/chain/wasm_interface.cpp            |   1 -
 12 files changed, 159 insertions(+), 201 deletions(-)

diff --git a/libraries/chain/block.cpp b/libraries/chain/block.cpp
index 91c93f6c359..0f43874f77d 100644
--- a/libraries/chain/block.cpp
+++ b/libraries/chain/block.cpp
@@ -1,3 +1,7 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
 #include <eosio/chain/block.hpp>
 
 namespace eosio { namespace chain {
diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index 73980eb7421..842053efde8 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -4,6 +4,16 @@
 
 namespace eosio { namespace chain {
 
+   namespace detail {
+      bool is_builtin_activated( const protocol_feature_activation_set_ptr& pfa,
+                                 const protocol_feature_set& pfs,
+                                 builtin_protocol_feature_t feature_codename )
+      {
+         auto digest = pfs.get_builtin_digest(feature_codename);
+         const auto& protocol_features = pfa->protocol_features;
+         return digest && protocol_features.find(*digest) != protocol_features.end();
+      }
+   }
 
    bool block_header_state::is_active_producer( account_name n )const {
       return producer_to_last_produced.find(n) != producer_to_last_produced.end();
@@ -190,11 +200,7 @@ namespace eosio { namespace chain {
       }
 
       if (new_producers) {
-         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
-         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
-         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
-
-         if ( wtmsig_enabled ) {
+         if ( detail::is_builtin_activated(prev_activated_protocol_features, pfs, builtin_protocol_feature_t::wtmsig_block_signatures) ) {
             // add the header extension to update the block schedule
             h.header_extensions.emplace_back(
                   producer_schedule_change_extension::extension_id(),
@@ -209,7 +215,7 @@ namespace eosio { namespace chain {
                   downgraded_producers.producers.emplace_back(legacy::producer_key{p.producer_name, auth.keys.front().key});
                });
             }
-            h.new_producers = downgraded_producers;
+            h.new_producers = std::move(downgraded_producers);
          }
       }
 
@@ -238,9 +244,7 @@ namespace eosio { namespace chain {
       bool wtmsig_enabled = false;
 
       if (h.new_producers || exts.count(producer_schedule_change_extension::extension_id()) > 0 ) {
-         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
-         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
-         wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+         wtmsig_enabled = detail::is_builtin_activated(prev_activated_protocol_features, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
       }
 
       if( h.new_producers ) {
@@ -325,9 +329,7 @@ namespace eosio { namespace chain {
    )&&
    {
       if( !additional_signatures.empty() ) {
-         auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
-         const auto& protocol_features = prev_activated_protocol_features->protocol_features;
-         bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+         bool wtmsig_enabled = detail::is_builtin_activated(prev_activated_protocol_features, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
 
          EOS_ASSERT(wtmsig_enabled, producer_schedule_exception, "Block contains multiple signatures before WTMsig block signatures are enabled" );
       }
@@ -355,9 +357,7 @@ namespace eosio { namespace chain {
                                  const signer_callback_type& signer
    )&&
    {
-      auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
-      const auto& protocol_features = prev_activated_protocol_features->protocol_features;
-      bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+      bool wtmsig_enabled = detail::is_builtin_activated(prev_activated_protocol_features, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
 
       auto result = std::move(*this)._finish_next( h, pfs, validator );
       result.sign( signer );
diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index 8f51ffde7b2..7fb1f96400f 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -22,9 +22,7 @@ namespace eosio { namespace chain {
          auto exts = b->validate_and_extract_extensions();
 
          if ( pfa && exts.count(additional_sigs_eid) > 0 ) {
-            const auto& protocol_features = pfa->protocol_features;
-            auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
-            bool wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
+            bool wtmsig_enabled = detail::is_builtin_activated(pfa, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
 
             EOS_ASSERT(wtmsig_enabled, block_validate_exception,
                        "Block contained additional_block_signatures_extension before activation of WTMsig Block Signatures");
@@ -60,13 +58,7 @@ namespace eosio { namespace chain {
                                                        Extras&& ... extras )
       {
          const auto& pfa = cur.prev_activated_protocol_features;
-         bool wtmsig_enabled = false;
-
-         if (pfa) {
-            const auto& protocol_features = pfa->protocol_features;
-            auto wtmsig_digest = pfs.get_builtin_digest(builtin_protocol_feature_t::wtmsig_block_signatures);
-            wtmsig_enabled = wtmsig_digest && protocol_features.find(*wtmsig_digest) != protocol_features.end();
-         }
+         bool wtmsig_enabled = pfa && detail::is_builtin_activated(pfa, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
 
          block_header_state result = std::move(cur).finish_next(b, pfs, std::forward<Extras>(extras)...);
 
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c6351fdb5ac..417496baaf5 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -434,7 +434,7 @@ struct controller_impl {
       block_header_state genheader;
       genheader.active_schedule                = initial_schedule;
       genheader.pending_schedule.schedule      = initial_schedule;
-      // TODO: if wtmsig block signatures are enabled this should be the hash of the producer authority
+      // NOTE: if wtmsig block signatures are enabled at genesis time this should be the hash of a producer authority schedule
       genheader.pending_schedule.schedule_hash = fc::sha256::hash(initial_legacy_schedule);
       genheader.header.timestamp               = conf.genesis.initial_timestamp;
       genheader.header.action_mroot            = conf.genesis.compute_chain_id();
@@ -1521,16 +1521,17 @@ struct controller_impl {
                ilog( "promoting proposed schedule (set in block ${proposed_num}) to pending; current block: ${n} lib: ${lib} schedule: ${schedule} ",
                      ("proposed_num", *gpo.proposed_schedule_block_num)("n", pbhs.block_num)
                      ("lib", pbhs.dpos_irreversible_blocknum)
-                     ("schedule", static_cast<producer_authority_schedule>(gpo.proposed_schedule) ) );
+                     ("schedule", producer_authority_schedule::from_shared(gpo.proposed_schedule) ) );
             }
 
             EOS_ASSERT( gpo.proposed_schedule.version == pbhs.active_schedule_version + 1,
                         producer_schedule_exception, "wrong producer schedule version specified" );
 
-            pending->_block_stage.get<building_block>()._new_pending_producer_schedule = gpo.proposed_schedule;
+            pending->_block_stage.get<building_block>()._new_pending_producer_schedule = producer_authority_schedule::from_shared(gpo.proposed_schedule);
             db.modify( gpo, [&]( auto& gp ) {
                gp.proposed_schedule_block_num = optional<block_num_type>();
-               gp.proposed_schedule.clear();
+               gp.proposed_schedule.version=0;
+               gp.proposed_schedule.producers.clear();
             });
          }
 
@@ -2820,7 +2821,7 @@ int64_t controller::set_proposed_producers( vector<producer_authority> producers
 
    my->db.modify( gpo, [&]( auto& gp ) {
       gp.proposed_schedule_block_num = cur_block_num;
-      gp.proposed_schedule = std::move(sch);
+      gp.proposed_schedule = sch.to_shared(gp.proposed_schedule.producers.get_allocator());
    });
    return version;
 }
@@ -2868,7 +2869,7 @@ optional<producer_authority_schedule> controller::proposed_producers()const {
    if( !gpo.proposed_schedule_block_num.valid() )
       return optional<producer_authority_schedule>();
 
-   return (producer_authority_schedule)gpo.proposed_schedule;
+   return producer_authority_schedule::from_shared(gpo.proposed_schedule);
 }
 
 bool controller::light_validation_allowed(bool replay_opts_disabled_by_policy) const {
diff --git a/libraries/chain/include/eosio/chain/authority.hpp b/libraries/chain/include/eosio/chain/authority.hpp
index 604cc5d29bd..882d7be0799 100644
--- a/libraries/chain/include/eosio/chain/authority.hpp
+++ b/libraries/chain/include/eosio/chain/authority.hpp
@@ -13,9 +13,6 @@ namespace eosio { namespace chain {
 
 using shared_public_key_data = fc::static_variant<fc::ecc::public_key_shim, fc::crypto::r1::public_key_shim, shared_string>;
 
-template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
-template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
-
 struct shared_public_key {
    shared_public_key( shared_public_key_data&& p ) :
       pubkey(std::move(p)) {}
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index eda7d45b033..6875d7f800a 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -25,9 +25,9 @@ namespace legacy {
       };
 
       /// from block_header_state_common
-      uint32_t                             block_num;
-      uint32_t                             dpos_proposed_irreversible_blocknum;
-      uint32_t                             dpos_irreversible_blocknum;
+      uint32_t                             block_num = 0;
+      uint32_t                             dpos_proposed_irreversible_blocknum = 0;
+      uint32_t                             dpos_irreversible_blocknum = 0;
       producer_schedule_type               active_schedule;
       incremental_merkle                   blockroot_merkle;
       flat_map<account_name,uint32_t>      producer_to_last_produced;
@@ -65,6 +65,10 @@ namespace detail {
       digest_type                       schedule_hash;
       producer_authority_schedule       schedule;
    };
+
+   bool is_builtin_activated( const protocol_feature_activation_set_ptr& pfa,
+                              const protocol_feature_set& pfs,
+                              builtin_protocol_feature_t feature_codename );
 }
 
 struct pending_block_header_state : public detail::block_header_state_common {
diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 03033726783..6d8e6682177 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -565,7 +565,7 @@ namespace eosio { namespace chain {
       FC_DECLARE_DERIVED_EXCEPTION( no_block_signatures,  producer_exception,
                                     3170011, "The signer returned no valid block signatures" )
       FC_DECLARE_DERIVED_EXCEPTION( unsupported_multiple_block_signatures,  producer_exception,
-                                    3170011, "The signer returned multiple signatures but that is not supported" )
+                                    3170012, "The signer returned multiple signatures but that is not supported" )
 
    FC_DECLARE_DERIVED_EXCEPTION( reversible_blocks_exception,           chain_exception,
                                  3180000, "Reversible Blocks exception" )
diff --git a/libraries/chain/include/eosio/chain/global_property_object.hpp b/libraries/chain/include/eosio/chain/global_property_object.hpp
index 56281da86c3..99b4e8ba3dd 100644
--- a/libraries/chain/include/eosio/chain/global_property_object.hpp
+++ b/libraries/chain/include/eosio/chain/global_property_object.hpp
@@ -57,12 +57,12 @@ namespace eosio { namespace chain {
          using snapshot_type = snapshot_global_property_object;
 
          static snapshot_global_property_object to_snapshot_row( const global_property_object& value, const chainbase::database& ) {
-            return {value.proposed_schedule_block_num, (producer_authority_schedule)value.proposed_schedule, value.configuration};
+            return {value.proposed_schedule_block_num, producer_authority_schedule::from_shared(value.proposed_schedule), value.configuration};
          }
 
          static void from_snapshot_row( snapshot_global_property_object&& row, global_property_object& value, chainbase::database& ) {
             value.proposed_schedule_block_num = row.proposed_schedule_block_num;
-            value.proposed_schedule = row.proposed_schedule;
+            value.proposed_schedule = row.proposed_schedule.to_shared(value.proposed_schedule.producers.get_allocator());
             value.configuration = row.configuration;
          }
       };
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index c1ad09fab03..a0862135f66 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -46,12 +46,59 @@ namespace eosio { namespace chain {
       };
    }
 
+   struct shared_block_signing_authority_v0 {
+      shared_block_signing_authority_v0() = delete;
+      shared_block_signing_authority_v0( const shared_block_signing_authority_v0& ) = default;
+      shared_block_signing_authority_v0( shared_block_signing_authority_v0&& ) = default;
+      shared_block_signing_authority_v0& operator= ( shared_block_signing_authority_v0 && ) = default;
+      shared_block_signing_authority_v0& operator= ( const shared_block_signing_authority_v0 & ) = default;
+
+      explicit shared_block_signing_authority_v0( chainbase::allocator<char> alloc )
+      :keys(alloc){}
+
+      uint32_t                           threshold = 0;
+      shared_vector<shared_key_weight>   keys;
+   };
+
+   using shared_block_signing_authority = static_variant<shared_block_signing_authority_v0>;
+
+   struct shared_producer_authority {
+      shared_producer_authority() = delete;
+      shared_producer_authority( const shared_producer_authority& ) = default;
+      shared_producer_authority( shared_producer_authority&& ) = default;
+      shared_producer_authority& operator= ( shared_producer_authority && ) = default;
+      shared_producer_authority& operator= ( const shared_producer_authority & ) = default;
+
+      shared_producer_authority( const name& producer_name, shared_block_signing_authority&& authority )
+      :producer_name(producer_name)
+      ,authority(std::move(authority))
+      {}
+
+      name                                     producer_name;
+      shared_block_signing_authority           authority;
+   };
+
+   struct shared_producer_authority_schedule {
+      shared_producer_authority_schedule() = delete;
+
+      explicit shared_producer_authority_schedule( chainbase::allocator<char> alloc )
+      :producers(alloc){}
+
+      shared_producer_authority_schedule( const shared_producer_authority_schedule& ) = default;
+      shared_producer_authority_schedule( shared_producer_authority_schedule&& ) = default;
+      shared_producer_authority_schedule& operator= ( shared_producer_authority_schedule && ) = default;
+      shared_producer_authority_schedule& operator= ( const shared_producer_authority_schedule & ) = default;
+
+      uint32_t                                       version = 0; ///< sequentially incrementing version number
+      shared_vector<shared_producer_authority>       producers;
+   };
+
    /**
     * block signing authority version 0
     * this authority allows for a weighted threshold multi-sig per-producer
     */
    struct block_signing_authority_v0 {
-      uint32_t                    threshold;
+      uint32_t                    threshold = 0;
       vector<key_weight>          keys;
 
       bool key_is_relevant( const public_key_type& key ) const {
@@ -74,6 +121,29 @@ namespace eosio { namespace chain {
          return false;
       }
 
+      auto to_shared(chainbase::allocator<char> alloc) const {
+         shared_block_signing_authority_v0 result(alloc);
+         result.threshold = threshold;
+         result.keys.clear();
+         result.keys.reserve(keys.size());
+         for (const auto& k: keys) {
+            result.keys.emplace_back(shared_key_weight::convert(alloc, k));
+         }
+
+         return result;
+      }
+
+      static auto from_shared(const shared_block_signing_authority_v0& src) {
+         block_signing_authority_v0 result;
+         result.threshold = src.threshold;
+         result.keys.reserve(src.keys.size());
+         for (const auto& k: src.keys) {
+            result.keys.push_back(k);
+         }
+
+         return result;
+      }
+
       friend bool operator == ( const block_signing_authority_v0& lhs, const block_signing_authority_v0& rhs ) {
          return tie( lhs.threshold, lhs.keys ) == tie( rhs.threshold, rhs.keys );
       }
@@ -108,6 +178,26 @@ namespace eosio { namespace chain {
          return keys_satisfy(keys, authority);
       }
 
+      auto to_shared(chainbase::allocator<char> alloc) const {
+         auto shared_auth = authority.visit([&alloc](const auto& a) {
+            return a.to_shared(alloc);
+         });
+
+         return shared_producer_authority(producer_name, std::move(shared_auth));
+      }
+
+      static auto from_shared( const shared_producer_authority& src ) {
+         producer_authority result;
+         result.producer_name = src.producer_name;
+         result.authority = src.authority.visit(overloaded {
+            [](const shared_block_signing_authority_v0& a) {
+               return block_signing_authority_v0::from_shared(a);
+            }
+         });
+
+         return result;
+      }
+
       /**
        * ABI's for contracts expect variants to be serialized as a 2 entry array of
        * [type-name, value].
@@ -130,120 +220,6 @@ namespace eosio { namespace chain {
       }
    };
 
-   struct shared_block_signing_authority_v0 {
-      shared_block_signing_authority_v0( const shared_block_signing_authority_v0& ) = default;
-      shared_block_signing_authority_v0( shared_block_signing_authority_v0&& ) = default;
-      shared_block_signing_authority_v0& operator= ( shared_block_signing_authority_v0 && ) = default;
-      shared_block_signing_authority_v0& operator= ( const shared_block_signing_authority_v0 & ) = default;
-
-      shared_block_signing_authority_v0( chainbase::allocator<char> alloc )
-      :keys(alloc){}
-
-      uint32_t                           threshold;
-      shared_vector<shared_key_weight>   keys;
-
-      friend bool operator == ( const shared_block_signing_authority_v0& lhs, const shared_block_signing_authority_v0& rhs ) {
-         return tie( lhs.threshold, lhs.keys ) == tie( rhs.threshold, rhs.keys );
-      }
-      friend bool operator != ( const shared_block_signing_authority_v0& lhs, const shared_block_signing_authority_v0& rhs ) {
-         return tie( lhs.threshold, lhs.keys ) != tie( rhs.threshold, rhs.keys );
-      }
-   };
-
-   using shared_block_signing_authority = static_variant<shared_block_signing_authority_v0>;
-
-   struct shared_producer_authority {
-      shared_producer_authority() = delete;
-      shared_producer_authority( const shared_producer_authority& ) = default;
-      shared_producer_authority( shared_producer_authority&& ) = default;
-      shared_producer_authority& operator= ( shared_producer_authority && ) = default;
-      shared_producer_authority& operator= ( const shared_producer_authority & ) = default;
-
-      shared_producer_authority( const name& producer_name, shared_block_signing_authority&& authority )
-      :producer_name(producer_name)
-      ,authority(std::move(authority))
-      {}
-
-      name                                     producer_name;
-      shared_block_signing_authority           authority;
-
-      friend bool operator == ( const shared_producer_authority& lhs, const shared_producer_authority& rhs ) {
-         return tie( lhs.producer_name, lhs.authority ) == tie( rhs.producer_name, rhs.authority );
-      }
-      friend bool operator != ( const shared_producer_authority& lhs, const shared_producer_authority& rhs ) {
-         return tie( lhs.producer_name, lhs.authority ) != tie( rhs.producer_name, rhs.authority );
-      }
-   };
-
-   namespace detail {
-      template<typename T>
-      struct shared_converter;
-
-      template<typename T>
-      auto shared_convert( chainbase::allocator<char> alloc, const T& src ) {
-         return shared_converter<std::decay_t<decltype(src)>>::convert(alloc, src);
-      }
-
-      template<typename T>
-      auto shared_convert( const T& src ) {
-         return shared_converter<std::decay_t<decltype(src)>>::convert(src);
-      }
-
-      template<>
-      struct shared_converter<block_signing_authority_v0> {
-         static shared_block_signing_authority_v0 convert (chainbase::allocator<char> alloc, const block_signing_authority_v0& src) {
-            shared_block_signing_authority_v0 result(alloc);
-            result.threshold = src.threshold;
-            result.keys.clear();
-            result.keys.reserve(src.keys.size());
-            for (const auto& k: src.keys) {
-               result.keys.emplace_back(shared_key_weight::convert(alloc, k));
-            }
-
-            return result;
-         }
-      };
-
-      template<>
-      struct shared_converter<shared_block_signing_authority_v0> {
-         static block_signing_authority_v0 convert (const shared_block_signing_authority_v0& src) {
-            block_signing_authority_v0 result;
-            result.threshold = src.threshold;
-            result.keys.reserve(src.keys.size());
-            for (const auto& k: src.keys) {
-               result.keys.push_back(k);
-            }
-
-            return result;
-         }
-      };
-
-      template<>
-      struct shared_converter<producer_authority> {
-         static shared_producer_authority convert (chainbase::allocator<char> alloc, const producer_authority& src) {
-            auto authority = src.authority.visit([&alloc](const auto& a) {
-                return shared_convert(alloc, a);
-            });
-
-            return shared_producer_authority(src.producer_name, std::move(authority));
-         }
-
-      };
-
-      template<>
-      struct shared_converter<shared_producer_authority> {
-         static producer_authority convert (const shared_producer_authority& src) {
-            producer_authority result;
-            result.producer_name = src.producer_name;
-            result.authority = src.authority.visit([](const auto& a) {
-               return shared_convert(a);
-            });
-
-            return result;
-         }
-      };
-   }
-
    struct producer_authority_schedule {
       producer_authority_schedule() = default;
 
@@ -263,6 +239,28 @@ namespace eosio { namespace chain {
       ,producers(producers)
       {}
 
+      auto to_shared(chainbase::allocator<char> alloc) const {
+         auto result = shared_producer_authority_schedule(alloc);
+         result.version = version;
+         result.producers.clear();
+         result.producers.reserve( producers.size() );
+         for( const auto& p : producers ) {
+            result.producers.emplace_back(p.to_shared(alloc));
+         }
+         return result;
+      }
+
+      static auto from_shared( const shared_producer_authority_schedule& src ) {
+         producer_authority_schedule result;
+         result.version = src.version;
+         result.producers.reserve(src.producers.size());
+         for( const auto& p : src.producers ) {
+            result.producers.emplace_back(producer_authority::from_shared(p));
+         }
+
+         return result;
+      }
+
       uint32_t                                       version = 0; ///< sequentially incrementing version number
       vector<producer_authority>                     producers;
 
@@ -284,13 +282,10 @@ namespace eosio { namespace chain {
    /**
     * Block Header Extension Compatibility
     */
-   struct producer_schedule_change_extension : producer_authority_schedule, fc::reflect_init {
+   struct producer_schedule_change_extension : producer_authority_schedule {
 
       static constexpr uint16_t extension_id() { return 1; }
       static constexpr bool     enforce_unique() { return true; }
-      void reflector_init() {
-         static_assert( fc::raw::has_feature_reflector_init_on_unpacked_reflected_types, "producer_schedule_extension expects FC to support reflector_init" );
-      }
 
       producer_schedule_change_extension() = default;
       producer_schedule_change_extension(const producer_schedule_change_extension&) = default;
@@ -301,47 +296,6 @@ namespace eosio { namespace chain {
    };
 
 
-
-   struct shared_producer_authority_schedule {
-      shared_producer_authority_schedule( chainbase::allocator<char> alloc )
-      :producers(alloc){}
-
-      shared_producer_authority_schedule( const shared_producer_authority_schedule& ) = default;
-      shared_producer_authority_schedule( shared_producer_authority_schedule&& ) = default;
-      shared_producer_authority_schedule& operator= ( shared_producer_authority_schedule && ) = default;
-      shared_producer_authority_schedule& operator= ( const shared_producer_authority_schedule & ) = default;
-
-
-      shared_producer_authority_schedule& operator=( const producer_authority_schedule& a ) {
-         version = a.version;
-         producers.clear();
-         producers.reserve( a.producers.size() );
-         for( const auto& p : a.producers ) {
-            producers.emplace_back(detail::shared_convert(producers.get_allocator(), p));
-         }
-         return *this;
-      }
-
-      explicit operator producer_authority_schedule()const {
-         producer_authority_schedule result;
-         result.version = version;
-         result.producers.reserve(producers.size());
-         for( const auto& p : producers ) {
-            result.producers.emplace_back(detail::shared_convert(p));
-         }
-
-         return result;
-      }
-
-      void clear() {
-         version = 0;
-         producers.clear();
-      }
-
-      uint32_t                                       version = 0; ///< sequentially incrementing version number
-      shared_vector<shared_producer_authority>       producers;
-   };
-
    inline bool operator == ( const producer_authority& pa, const shared_producer_authority& pb )
    {
       if(pa.producer_name != pb.producer_name) return false;
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index 94c3aa93832..7e26eab6bb8 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -382,6 +382,9 @@ namespace eosio { namespace chain {
          return ( flags & ~static_cast<F>(field) );
    }
 
+   template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+   template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+
 } }  // eosio::chain
 
 FC_REFLECT_EMPTY( eosio::chain::void_t )
diff --git a/libraries/chain/producer_schedule.cpp b/libraries/chain/producer_schedule.cpp
index 151e9e7e200..2284229a3da 100644
--- a/libraries/chain/producer_schedule.cpp
+++ b/libraries/chain/producer_schedule.cpp
@@ -1,3 +1,7 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE
+ */
 #include <eosio/chain/producer_schedule.hpp>
 
 namespace eosio { namespace chain {
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index f3afa9d44f4..d340de6e0d5 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -222,7 +222,6 @@ class privileged_api : public context_aware_api {
          datastream<const char*> ds( packed_producer_schedule, datalen );
          vector<producer_authority> producers;
 
-//         if ( context.control.is_builtin_activated( builtin_protocol_feature_t::wtmsig_block_signatures )) {
          vector<legacy::producer_key> old_version;
          fc::raw::unpack(ds, old_version);
 

From 3472a1401f4b92623f7b5f32899cf601a03d5d48 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 23 Jul 2019 19:39:38 -0400
Subject: [PATCH 0862/1648] wasm unit test with an imported function as start
 function

---
 unittests/contracts/test_wasts.hpp | 10 ++++++++++
 unittests/wasm_tests.cpp           | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/unittests/contracts/test_wasts.hpp b/unittests/contracts/test_wasts.hpp
index 8c7e4fddcc6..8e03c0ca0a2 100644
--- a/unittests/contracts/test_wasts.hpp
+++ b/unittests/contracts/test_wasts.hpp
@@ -179,6 +179,16 @@ static const char entry_wast_2[] = R"=====(
 )
 )=====";
 
+static const char entry_import_wast[] = R"=====(
+(module
+ (import "env" "abort" (func $abort))
+ (import "env" "eosio_assert" (func $eosio_assert (param i32 i32)))
+ (export "apply" (func $apply))
+ (start $abort)
+ (func $apply (param $0 i64) (param $1 i64) (param $2 i64))
+)
+)=====";
+
 static const char simple_no_memory_wast[] = R"=====(
 (module
  (import "env" "require_auth" (func $require_auth (param i64)))
diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index 940ac04f544..cdbd56c64cb 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -561,6 +561,23 @@ BOOST_FIXTURE_TEST_CASE( check_entry_behavior_2, TESTER ) try {
    BOOST_CHECK_EQUAL(transaction_receipt::executed, receipt.status);
 } FC_LOG_AND_RETHROW()
 
+BOOST_FIXTURE_TEST_CASE( entry_import, TESTER ) try {
+   create_accounts( {N(enterimport)} );
+   produce_block();
+
+   set_code(N(enterimport), entry_import_wast);
+
+   signed_transaction trx;
+   action act;
+   act.account = N(enterimport);
+   act.name = N();
+   act.authorization = vector<permission_level>{{N(enterimport),config::active_name}};
+   trx.actions.push_back(act);
+
+   set_transaction_headers(trx);
+   trx.sign(get_private_key( N(enterimport), "active" ), control->get_chain_id());
+   BOOST_CHECK_THROW(push_transaction(trx), abort_called);
+} FC_LOG_AND_RETHROW()
 
 /**
  * Ensure we can load a wasm w/o memory

From 75b64d934c175130b937444d570a8d4e4adf515d Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 23 Jul 2019 20:01:09 -0400
Subject: [PATCH 0863/1648] remove line unneeded for import entry test case

---
 unittests/contracts/test_wasts.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/unittests/contracts/test_wasts.hpp b/unittests/contracts/test_wasts.hpp
index 8e03c0ca0a2..1f9f3facab6 100644
--- a/unittests/contracts/test_wasts.hpp
+++ b/unittests/contracts/test_wasts.hpp
@@ -182,7 +182,6 @@ static const char entry_wast_2[] = R"=====(
 static const char entry_import_wast[] = R"=====(
 (module
  (import "env" "abort" (func $abort))
- (import "env" "eosio_assert" (func $eosio_assert (param i32 i32)))
  (export "apply" (func $apply))
  (start $abort)
  (func $apply (param $0 i64) (param $1 i64) (param $2 i64))

From 92762762d925010391dd476646cb8af906075188 Mon Sep 17 00:00:00 2001
From: Tengfei Niu <spartucus@users.noreply.github.com>
Date: Wed, 24 Jul 2019 09:17:00 +0800
Subject: [PATCH 0864/1648] Remove unused variable

---
 libraries/chain/wasm_interface.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 896b5818ce9..a4351c86c25 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -295,7 +295,6 @@ class softfloat_api : public context_aware_api {
       float _eosio_f32_copysign( float af, float bf ) {
          float32_t a = to_softfloat32(af);
          float32_t b = to_softfloat32(bf);
-         uint32_t sign_of_a = a.v >> 31;
          uint32_t sign_of_b = b.v >> 31;
          a.v &= ~(1 << 31);             // clear the sign bit
          a.v = a.v | (sign_of_b << 31); // add the sign of b
@@ -458,7 +457,6 @@ class softfloat_api : public context_aware_api {
       double _eosio_f64_copysign( double af, double bf ) {
          float64_t a = to_softfloat64(af);
          float64_t b = to_softfloat64(bf);
-         uint64_t sign_of_a = a.v >> 63;
          uint64_t sign_of_b = b.v >> 63;
          a.v &= ~(uint64_t(1) << 63);             // clear the sign bit
          a.v = a.v | (sign_of_b << 63); // add the sign of b

From cfd7890b825612ecf4b3b3660a56c75de03b6628 Mon Sep 17 00:00:00 2001
From: Zane Reynolds <zane.reynolds@gmail.com>
Date: Wed, 24 Jul 2019 06:05:36 -0400
Subject: [PATCH 0865/1648] Commas go outside the quotes...

---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index d748c03cbf5..b8c294f45c6 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -23,7 +23,7 @@
         {
             "SKIP_PRE_V180": "true",
             "SKIP_V180": "true",
-            "SKIP_V200": "false,"
+            "SKIP_V200": "false"
         }
     },
     "eosio-replay-tests":

From 97c9f57d3fcb37545f1e2e54aefed6b42e1bdabf Mon Sep 17 00:00:00 2001
From: Chris Gundlach <cgundlach@naughtydawgllc.com>
Date: Wed, 24 Jul 2019 08:25:30 -0700
Subject: [PATCH 0866/1648] code formatting

---
 plugins/chain_plugin/chain_plugin.cpp | 62 +++++++++++++--------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index aa81b18c495..e6868ba47df 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1074,46 +1074,46 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
    	reversible_blocks.open( (reversible_dir.parent_path() / std::string("portable-reversible-blocks-").append( now ) ).generic_string().c_str(),
                            std::ios::out | std::ios::binary );
 
-   uint32_t num = 0;
-   uint32_t start = 0;
-   uint32_t end = 0;
-   old_reversible.add_index<reversible_block_index>();
-   new_reversible.add_index<reversible_block_index>();
-   const auto& ubi = old_reversible.get_index<reversible_block_index,by_num>();
-   auto itr = ubi.begin();
-   if( itr != ubi.end() ) {
-      start = itr->blocknum;
-      end = start - 1;
-   }
-   if( truncate_at_block > 0 && start > truncate_at_block ) {
-      ilog( "Did not recover any reversible blocks since the specified block number to stop at (${stop}) is less than first block in the reversible database (${start}).", ("stop", truncate_at_block)("start", start) );
-      return true;
-   }
-      for( ; itr != ubi.end(); ++itr ) {
-         EOS_ASSERT( itr->blocknum == end + 1, gap_in_reversible_blocks_db,
+   	uint32_t num = 0;
+   	uint32_t start = 0;
+   	uint32_t end = 0;
+   	old_reversible.add_index<reversible_block_index>();
+   	new_reversible.add_index<reversible_block_index>();
+   	const auto& ubi = old_reversible.get_index<reversible_block_index,by_num>();
+   	auto itr = ubi.begin();
+   	if( itr != ubi.end() ) {
+      		start = itr->blocknum;
+      		end = start - 1;
+   	}
+   	if( truncate_at_block > 0 && start > truncate_at_block ) {
+      		ilog( "Did not recover any reversible blocks since the specified block number to stop at (${stop}) is less than first block in the reversible database (${start}).", ("stop", truncate_at_block)("start", start) );
+      		return true;
+   	}
+      	for( ; itr != ubi.end(); ++itr ) {
+         	EOS_ASSERT( itr->blocknum == end + 1, gap_in_reversible_blocks_db,
                      "gap in reversible block database between ${end} and ${blocknum}",
                      ("end", end)("blocknum", itr->blocknum)
                    );
-         reversible_blocks.write( itr->packedblock.data(), itr->packedblock.size() );
-         new_reversible.create<reversible_block_object>( [&]( auto& ubo ) {
-            ubo.blocknum = itr->blocknum;
-            ubo.set_block( itr->get_block() ); // get_block and set_block rather than copying the packed data acts as additional validation
+         	reversible_blocks.write( itr->packedblock.data(), itr->packedblock.size() );
+         	new_reversible.create<reversible_block_object>( [&]( auto& ubo ) {
+            	ubo.blocknum = itr->blocknum;
+            	ubo.set_block( itr->get_block() ); // get_block and set_block rather than copying the packed data acts as additional validation
          });
          end = itr->blocknum;
          ++num;
          if( end == truncate_at_block )
             break;
       }
-   if( end == truncate_at_block )
-      ilog( "Stopped recovery of reversible blocks early at specified block number: ${stop}", ("stop", truncate_at_block) );
-
-   if( num == 0 )
-      ilog( "There were no recoverable blocks in the reversible block database" );
-   else if( num == 1 )
-      ilog( "Recovered 1 block from reversible block database: block ${start}", ("start", start) );
-   else
-      ilog( "Recovered ${num} blocks from reversible block database: blocks ${start} to ${end}",
-            ("num", num)("start", start)("end", end) );
+      if( end == truncate_at_block )
+      	ilog( "Stopped recovery of reversible blocks early at specified block number: ${stop}", ("stop", truncate_at_block) );
+
+      if( num == 0 )
+      	ilog( "There were no recoverable blocks in the reversible block database" );
+   	else if( num == 1 )
+      		ilog( "Recovered 1 block from reversible block database: block ${start}", ("start", start) );
+   	else
+      		ilog( "Recovered ${num} blocks from reversible block database: blocks ${start} to ${end}",
+            		("num", num)("start", start)("end", end) );
    } catch( const gap_in_reversible_blocks_db& e ) {
       wlog( "${details}", ("details", e.to_detail_string()) );
    } catch(const std::runtime_error&) {

From 092ac5f9fcdc04a3298b9f6af6b6e3e356607ca1 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Wed, 24 Jul 2019 11:49:39 -0400
Subject: [PATCH 0867/1648] fixes for eos-vm integration and update eos-vm ref

---
 libraries/chain/controller.cpp                |  2 +
 .../eosio/chain/webassembly/eos-vm.hpp        |  4 ++
 libraries/chain/webassembly/eos-vm.cpp        | 38 +++----------------
 libraries/eos-vm                              |  2 +-
 4 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index ed7d517e9ec..8ef04b493f8 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1850,6 +1850,8 @@ struct controller_impl {
                         ("block", *b)("expected_receipt", receipt)
                       );
             const transaction_receipt_header& r = trx_receipts.back();
+            if (!(r == static_cast<const transaction_receipt_header&>(receipt)))
+               wdump((b));
             EOS_ASSERT( r == static_cast<const transaction_receipt_header&>(receipt),
                         block_validate_exception, "receipt does not match",
                         ("producer_receipt", receipt)("validator_receipt", trx_receipts.back()) );
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 1bdc036a8f7..39e1c1645a7 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -7,11 +7,13 @@
 #include <softfloat_types.h>
 
 //eos-vm includes
+/*
 #include <eosio/vm/host_function.hpp>
 namespace eosio { namespace vm {
    template <>
    struct registered_host_functions<eosio::chain::apply_context>;
 } }
+*/
 #include <eosio/vm/backend.hpp>
 
 // eosio specific specializations
@@ -67,6 +69,7 @@ namespace eosio { namespace vm {
 
 }} // ns eosio::vm
 
+#if 0
 namespace eosio { namespace vm {
    template <typename WAlloc, typename Cls, typename Cls2, auto F, typename R, typename Args, size_t... Is>
    auto create_logging_function(std::index_sequence<Is...>) {
@@ -163,6 +166,7 @@ namespace eosio { namespace vm {
       }
    };
 } } // eosio::vm
+#endif
 
 namespace eosio { namespace chain { namespace webassembly { namespace eos_vm_runtime {
 
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 7f1bfebe132..061f55fb929 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -22,42 +22,14 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
 
       void apply(apply_context& context) override {
          auto* alloc = wasm_interface::get_wasm_allocator();
-         alloc->reset();
          _instantiated_module->set_wasm_allocator( alloc );
-         //if (!(const auto& res = _instantiated_module->run_start()))
-         //   EOS_ASSERT(false, wasm_execution_error, "eos-vm start function failure (${s})", ("s", res.to_string()));
-
          _runtime->_bkend = _instantiated_module.get();
-
-         Platform::HardwareTrapType trapType;
-         Platform::CallStack trapCallStack;
-         Uptr trapOperand;
-         trapType = Platform::catchHardwareTraps(trapCallStack,trapOperand, [&]{
-            const auto& res = _instantiated_module->call(&context, "env", "apply",
-                                             context.get_receiver().to_uint64_t(),
-                                             context.get_action().account.to_uint64_t(),
-                                             context.get_action().name.to_uint64_t());
-            //EOS_ASSERT(res, wasm_execution_error, "eos-vm execution failure (${s})", ("s", res.to_string()));
-         });
+	 _runtime->_bkend->initialize(&context);
+	 const auto& res = _runtime->_bkend->call(&context, "env", "apply",
+					     context.get_receiver().to_uint64_t(),
+					     context.get_action().account.to_uint64_t(),
+					     context.get_action().name.to_uint64_t());
          _runtime->_bkend = nullptr;
-	 /* TODO clean this up
-         switch(trapType)
-         {
-         case Platform::HardwareTrapType::none: break;
-         case Platform::HardwareTrapType::accessViolation:
-         {
-            if (alloc->is_in_region(reinterpret_cast<char*>(trapOperand))) { 
-               throw wasm_execution_error();
-            } else {
-               elog("Access violation outside of memory reserved addresses");
-               abort();
-            }
-         }
-         case Platform::HardwareTrapType::stackOverflow: throw wasm_execution_error();
-         case Platform::HardwareTrapType::intDivideByZeroOrOverflow: throw wasm_execution_error();
-         default: Errors::unreachable();
-         };
-	 */
       }
 
    private:
diff --git a/libraries/eos-vm b/libraries/eos-vm
index bb73245839e..7326beb6e7b 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit bb73245839ec839bf28bb7930400e0813825fffa
+Subproject commit 7326beb6e7bdf6c1fb824fdd37ec02fb5c5b0baf

From 0695638b381fd3e005e55f33b7d38fea8810ffa5 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Wed, 24 Jul 2019 13:50:42 -0400
Subject: [PATCH 0868/1648] don't inject and update eos-vm ref

---
 .../eosio/chain/wasm_interface_private.hpp    | 31 ++++++++++---------
 libraries/eos-vm                              |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 225e44dd971..ef727ae6ceb 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -125,8 +125,9 @@ namespace eosio { namespace chain {
             });
             trx_context.pause_billing_timer();
             IR::Module module;
+	    std::vector<U8> bytes = codeobject->code;
             try {
-               Serialization::MemoryInputStream stream((const U8*)codeobject->code.data(), codeobject->code.size());
+               Serialization::MemoryInputStream stream((const U8*)bytes.data(), bytes.size());
                WASM::serialize(stream, module);
                module.userSections.clear();
             } catch(const Serialization::FatalSerializationException& e) {
@@ -135,19 +136,21 @@ namespace eosio { namespace chain {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
 
-            wasm_injections::wasm_binary_injection injector(module);
-            injector.inject();
-
-            std::vector<U8> bytes;
-            try {
-               Serialization::ArrayOutputStream outstream;
-               WASM::serialize(outstream, module);
-               bytes = outstream.getBytes();
-            } catch(const Serialization::FatalSerializationException& e) {
-               EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
-            } catch(const IR::ValidationException& e) {
-               EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
-            }
+            if(vm_type != wasm_interface::vm_type::eos_vm) {
+               wasm_injections::wasm_binary_injection injector(module);
+               injector.inject();
+
+               std::vector<U8> bytes;
+               try {
+                  Serialization::ArrayOutputStream outstream;
+                  WASM::serialize(outstream, module);
+                  bytes = outstream.getBytes();
+               } catch(const Serialization::FatalSerializationException& e) {
+                  EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
+               } catch(const IR::ValidationException& e) {
+                  EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
+               }
+	    }
 
             wasm_instantiation_cache.modify(it, [&](auto& c) {
                c.module = runtime_interface->instantiate_module((const char*)bytes.data(), bytes.size(), parse_initial_memory(module));
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 7326beb6e7b..e67084e17b2 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 7326beb6e7bdf6c1fb824fdd37ec02fb5c5b0baf
+Subproject commit e67084e17b284570e5a13407cb8801722b2cc52a

From 046b7249aeea0565a5663628bc0caa481e16f726 Mon Sep 17 00:00:00 2001
From: Chris Gundlach <cgundlach@naughtydawgllc.com>
Date: Wed, 24 Jul 2019 13:49:14 -0700
Subject: [PATCH 0869/1648] narrowed the scope of the try block as per code
 review

---
 plugins/chain_plugin/chain_plugin.cpp | 32 ++++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index e6868ba47df..8efbcea7516 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1067,8 +1067,14 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
 
    ilog( "Reconstructing '${reversible_dir}' from backed up reversible directory", ("reversible_dir", reversible_dir) );
 
+   optional<chainbase::database> old_reversible; 
    try {
-   	chainbase::database  old_reversible( backup_dir, database::read_only, 0, true );
+	   old_reversible = chainbase::database( backup_dir, database::read_only, 0, true );
+   } catch (const std::runtime_error &) {
+	// since we are allowing for dirty, it must be incompatible
+   	ilog( "Did not recover any reversible blocks since reversible database incompatible");
+	return true;
+   }
    	chainbase::database  new_reversible( reversible_dir, database::read_write, cache_size );
    	std::fstream         reversible_blocks;
    	reversible_blocks.open( (reversible_dir.parent_path() / std::string("portable-reversible-blocks-").append( now ) ).generic_string().c_str(),
@@ -1077,9 +1083,9 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
    	uint32_t num = 0;
    	uint32_t start = 0;
    	uint32_t end = 0;
-   	old_reversible.add_index<reversible_block_index>();
+   	old_reversible->add_index<reversible_block_index>();
    	new_reversible.add_index<reversible_block_index>();
-   	const auto& ubi = old_reversible.get_index<reversible_block_index,by_num>();
+   	const auto& ubi = old_reversible->get_index<reversible_block_index,by_num>();
    	auto itr = ubi.begin();
    	if( itr != ubi.end() ) {
       		start = itr->blocknum;
@@ -1089,6 +1095,8 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
       		ilog( "Did not recover any reversible blocks since the specified block number to stop at (${stop}) is less than first block in the reversible database (${start}).", ("stop", truncate_at_block)("start", start) );
       		return true;
    	}
+
+    try {
       	for( ; itr != ubi.end(); ++itr ) {
          	EOS_ASSERT( itr->blocknum == end + 1, gap_in_reversible_blocks_db,
                      "gap in reversible block database between ${end} and ${blocknum}",
@@ -1104,23 +1112,21 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
          if( end == truncate_at_block )
             break;
       }
-      if( end == truncate_at_block )
-      	ilog( "Stopped recovery of reversible blocks early at specified block number: ${stop}", ("stop", truncate_at_block) );
+   } catch( const gap_in_reversible_blocks_db& e ) {
+      wlog( "${details}", ("details", e.to_detail_string()) );
+   } catch(const std::runtime_error&) {
+   } catch( ... ) {}
 
-      if( num == 0 )
+   if( end == truncate_at_block )
+      ilog( "Stopped recovery of reversible blocks early at specified block number: ${stop}", ("stop", truncate_at_block) );
+
+   if( num == 0 )
       	ilog( "There were no recoverable blocks in the reversible block database" );
    	else if( num == 1 )
       		ilog( "Recovered 1 block from reversible block database: block ${start}", ("start", start) );
    	else
       		ilog( "Recovered ${num} blocks from reversible block database: blocks ${start} to ${end}",
             		("num", num)("start", start)("end", end) );
-   } catch( const gap_in_reversible_blocks_db& e ) {
-      wlog( "${details}", ("details", e.to_detail_string()) );
-   } catch(const std::runtime_error&) {
-   	ilog( "Reversible database incompatible");
-	// since we are allowing for dirty, it must be incompatible
-   } catch( ... ) {}
-
 
    return true;
 }

From 0d88b0b9716c5395fd73b46c65b93672b5fed117 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Wed, 24 Jul 2019 18:29:16 -0400
Subject: [PATCH 0870/1648] address PR feedback from @arhag

---
 libraries/chain/apply_context.cpp             |  4 +-
 libraries/chain/block_header_state.cpp        | 46 +++++++++---------
 libraries/chain/block_state.cpp               | 18 ++-----
 libraries/chain/controller.cpp                | 12 ++---
 .../eosio/chain/block_header_state.hpp        |  1 -
 .../include/eosio/chain/chain_snapshot.hpp    |  7 ++-
 .../eosio/chain/database_header_object.hpp    |  6 +--
 .../include/eosio/chain/producer_schedule.hpp | 48 +++++++++++--------
 libraries/chain/include/eosio/chain/types.hpp | 12 +++++
 libraries/chain/producer_schedule.cpp         |  6 +--
 libraries/chain/protocol_feature_manager.cpp  |  8 ++--
 libraries/chain/wasm_interface.cpp            |  6 ++-
 libraries/testing/tester.cpp                  | 17 ++++---
 plugins/producer_plugin/producer_plugin.cpp   | 17 ++++---
 unittests/producer_schedule_tests.cpp         | 42 ++++++++++++++++
 unittests/protocol_feature_tests.cpp          | 10 ++--
 .../deferred_test/deferred_test.cpp           |  2 +-
 17 files changed, 156 insertions(+), 106 deletions(-)

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index 01c86764d1c..b7f56361993 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -372,8 +372,8 @@ void apply_context::schedule_deferred_transaction( const uint128_t& sender_id, a
                      ("expected", trx_context.id)("actual", context.sender_trx_id)
          );
       } else {
-         FC_ASSERT( trx.transaction_extensions.size() == 0, "invariant failure" );
-         trx.transaction_extensions.emplace_back(
+         emplace_extension(
+            trx.transaction_extensions,
             deferred_transaction_generation_context::extension_id(),
             fc::raw::pack( deferred_transaction_generation_context( trx_context.id, sender_id, receiver ) )
          );
diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index 842053efde8..9771af57d42 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -15,10 +15,6 @@ namespace eosio { namespace chain {
       }
    }
 
-   bool block_header_state::is_active_producer( account_name n )const {
-      return producer_to_last_produced.find(n) != producer_to_last_produced.end();
-   }
-
    producer_authority block_header_state::get_scheduled_producer( block_timestamp_type t )const {
       auto index = t.slot % (active_schedule.producers.size() * config::producer_repetitions);
       index /= config::producer_repetitions;
@@ -193,7 +189,8 @@ namespace eosio { namespace chain {
       h.schedule_version  = active_schedule_version;
 
       if( new_protocol_feature_activations.size() > 0 ) {
-         h.header_extensions.emplace_back(
+         emplace_extension(
+               h.header_extensions,
                protocol_feature_activation::extension_id(),
                fc::raw::pack( protocol_feature_activation{ std::move(new_protocol_feature_activations) } )
          );
@@ -202,7 +199,8 @@ namespace eosio { namespace chain {
       if (new_producers) {
          if ( detail::is_builtin_activated(prev_activated_protocol_features, pfs, builtin_protocol_feature_t::wtmsig_block_signatures) ) {
             // add the header extension to update the block schedule
-            h.header_extensions.emplace_back(
+            emplace_extension(
+                  h.header_extensions,
                   producer_schedule_change_extension::extension_id(),
                   fc::raw::pack( producer_schedule_change_extension( *new_producers ) )
             );
@@ -357,13 +355,14 @@ namespace eosio { namespace chain {
                                  const signer_callback_type& signer
    )&&
    {
-      bool wtmsig_enabled = detail::is_builtin_activated(prev_activated_protocol_features, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
+      auto pfa = prev_activated_protocol_features;
 
       auto result = std::move(*this)._finish_next( h, pfs, validator );
       result.sign( signer );
       h.producer_signature = result.header.producer_signature;
 
       if( !result.additional_signatures.empty() ) {
+         bool wtmsig_enabled = detail::is_builtin_activated(pfa, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
          EOS_ASSERT(wtmsig_enabled, producer_schedule_exception, "Block was signed with multiple signatures before WTMsig block signatures are enabled" );
       }
 
@@ -409,28 +408,27 @@ namespace eosio { namespace chain {
    }
 
    void block_header_state::verify_signee( )const {
-      flat_set<public_key_type> keys;
-      keys.reserve(1 + additional_signatures.size());
-      keys.emplace(fc::crypto::public_key( header.producer_signature, sig_digest(), true ));
+      std::set<public_key_type> keys;
+      auto digest = sig_digest();
+      keys.emplace(fc::crypto::public_key( header.producer_signature, digest, true ));
 
       for (const auto& s: additional_signatures) {
-         auto key = fc::crypto::public_key( s, sig_digest(), true );
-         EOS_ASSERT(keys.find(key) == keys.end(), wrong_signing_key,
-               "block signed by same key twice",
-               ("key", key));
-
-         keys.emplace(std::move(key));
+         auto res = keys.emplace(s, digest, true);
+         EOS_ASSERT(res.second, wrong_signing_key, "block signed by same key twice", ("key", *res.first));
       }
 
-      for (const auto& k: keys) {
-         EOS_ASSERT(producer_authority::key_is_relevant(k, valid_block_signing_authority), wrong_signing_key,
-                    "block signed by unexpected key",
-                    ("signing_key", k)("valid_keys", valid_block_signing_authority));
-      }
+      bool is_satisfied = false;
+      size_t relevant_sig_count = 0;
+
+      std::tie(is_satisfied, relevant_sig_count) = producer_authority::keys_satisfy_and_relevant(keys, valid_block_signing_authority);
+
+      EOS_ASSERT(relevant_sig_count == keys.size(), wrong_signing_key,
+                 "block signed by unexpected key",
+                 ("signing_keys", keys)("valid_keys", valid_block_signing_authority));
 
-      EOS_ASSERT(producer_authority::keys_satisfy(keys, valid_block_signing_authority), wrong_signing_key,
-            "block signatures do not satisfy the block signing authority",
-            ("keys", keys)("authority", valid_block_signing_authority));
+      EOS_ASSERT(is_satisfied, wrong_signing_key,
+                 "block signatures do not satisfy the block signing authority",
+                 ("keys", keys)("authority", valid_block_signing_authority));
    }
 
    /**
diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index 7fb1f96400f..fea31bea05d 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -21,12 +21,7 @@ namespace eosio { namespace chain {
       {
          auto exts = b->validate_and_extract_extensions();
 
-         if ( pfa && exts.count(additional_sigs_eid) > 0 ) {
-            bool wtmsig_enabled = detail::is_builtin_activated(pfa, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
-
-            EOS_ASSERT(wtmsig_enabled, block_validate_exception,
-                       "Block contained additional_block_signatures_extension before activation of WTMsig Block Signatures");
-
+         if ( exts.count(additional_sigs_eid) > 0 ) {
             auto& additional_sigs = exts.lower_bound(additional_sigs_eid)->second.get<additional_block_signatures_extension>();
 
             return std::move(additional_sigs.signatures);
@@ -57,12 +52,12 @@ namespace eosio { namespace chain {
                                                        const protocol_feature_set& pfs,
                                                        Extras&& ... extras )
       {
-         const auto& pfa = cur.prev_activated_protocol_features;
-         bool wtmsig_enabled = pfa && detail::is_builtin_activated(pfa, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
-
+         auto pfa = cur.prev_activated_protocol_features;
          block_header_state result = std::move(cur).finish_next(b, pfs, std::forward<Extras>(extras)...);
 
          if (!result.additional_signatures.empty()) {
+            bool wtmsig_enabled = detail::is_builtin_activated(pfa, pfs, builtin_protocol_feature_t::wtmsig_block_signatures);
+
             EOS_ASSERT(wtmsig_enabled, block_validate_exception,
                        "Block has multiple signatures before activation of WTMsig Block Signatures");
 
@@ -71,10 +66,7 @@ namespace eosio { namespace chain {
             static_assert(fc::reflector<additional_block_signatures_extension>::total_member_count == 1);
             static_assert(std::is_same_v<decltype(additional_block_signatures_extension::signatures), std::vector<signature_type>>);
 
-            b.block_extensions.emplace_back(
-                  additional_sigs_eid,
-                  fc::raw::pack( result.additional_signatures )
-            );
+            emplace_extension(b.block_extensions, additional_sigs_eid, fc::raw::pack( result.additional_signatures ));
          }
 
          return result;
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 417496baaf5..30a5d846a1f 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -2844,15 +2844,9 @@ const producer_authority_schedule& controller::pending_producers()const {
       return my->pending->_block_stage.get<completed_block>()._block_state->pending_schedule.schedule;
 
    if( my->pending->_block_stage.contains<assembled_block>() ) {
-      if (is_builtin_activated(builtin_protocol_feature_t::wtmsig_block_signatures)) {
-         auto exts = my->pending->_block_stage.get<assembled_block>()._unsigned_block->validate_and_extract_header_extensions();
-         if (exts.count(producer_schedule_change_extension::extension_id()))
-            return exts.lower_bound(producer_schedule_change_extension::extension_id())->second.get<producer_schedule_change_extension>();
-      } else {
-         const auto& new_prods_cache = my->pending->_block_stage.get<assembled_block>()._new_producer_authority_cache;
-         if( new_prods_cache ) {
-            return *new_prods_cache;
-         }
+      const auto& new_prods_cache = my->pending->_block_stage.get<assembled_block>()._new_producer_authority_cache;
+      if( new_prods_cache ) {
+         return *new_prods_cache;
       }
    }
 
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 6875d7f800a..784c3156641 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -145,7 +145,6 @@ struct block_header_state : public detail::block_header_state_common {
 
    bool                 has_pending_producers()const { return pending_schedule.schedule.producers.size(); }
    uint32_t             calc_dpos_last_irreversible( account_name producer_of_next_block )const;
-   bool                 is_active_producer( account_name n )const;
 
    producer_authority     get_scheduled_producer( block_timestamp_type t )const;
    const block_id_type&   prev()const { return header.previous; }
diff --git a/libraries/chain/include/eosio/chain/chain_snapshot.hpp b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
index b1ecd520955..e7322b56ace 100644
--- a/libraries/chain/include/eosio/chain/chain_snapshot.hpp
+++ b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
@@ -16,14 +16,13 @@ struct chain_snapshot_header {
     *         - Incompatible with version 1.
     *         - Adds new indices for: protocol_state_object and account_ram_correction_object
     *   3: Updated for v2.0.0 protocol features:
-    *         - WebAuthn keys
-    *   4: Updated chain snapshot for wtmsig block signing protocol feature:
     *         - forwards compatible with version 2
-    *         - the block header state changed to include producer authorities and additional signatures
+    *         - WebAuthn keys
+    *         - wtmsig block siganatures: the block header state changed to include producer authorities and additional signatures
     */
 
    static constexpr uint32_t minimum_compatible_version = 2;
-   static constexpr uint32_t current_version = 4;
+   static constexpr uint32_t current_version = 3;
 
    uint32_t version = current_version;
 
diff --git a/libraries/chain/include/eosio/chain/database_header_object.hpp b/libraries/chain/include/eosio/chain/database_header_object.hpp
index b8625bfae19..7b5348b756d 100644
--- a/libraries/chain/include/eosio/chain/database_header_object.hpp
+++ b/libraries/chain/include/eosio/chain/database_header_object.hpp
@@ -27,11 +27,11 @@ namespace eosio { namespace chain {
           *   - 1 : initial version, prior to this no `database_header_object` existed in the shared memory file but
           *         no changes to its format were made so it can be safely added to existing databases
           *   - 2 : shared_authority now holds shared_key_weights & shared_public_keys
-          *   - 3 : change from producer_key to producer_authority for many in-memory structures
+          *         change from producer_key to producer_authority for many in-memory structures
           */
 
-         static constexpr uint32_t current_version            = 3;
-         static constexpr uint32_t minimum_version            = 3;
+         static constexpr uint32_t current_version            = 2;
+         static constexpr uint32_t minimum_version            = 2;
 
          id_type        id;
          uint32_t       version = current_version;
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index a0862135f66..fb12dab0d58 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -98,27 +98,33 @@ namespace eosio { namespace chain {
     * this authority allows for a weighted threshold multi-sig per-producer
     */
    struct block_signing_authority_v0 {
+      static constexpr std::string_view abi_type_name() { return "block_signing_authority_v0"; }
+
       uint32_t                    threshold = 0;
       vector<key_weight>          keys;
 
-      bool key_is_relevant( const public_key_type& key ) const {
-         return std::find_if(keys.begin(), keys.end(), [&key](const auto& kw){
-            return kw.key == key;
-         }) != keys.end();
+      template<typename Op>
+      void for_each_key( Op op ) const {
+         for (const auto& kw : keys ) {
+            op(kw.key);
+         }
       }
 
-      bool keys_satisfy( const flat_set<public_key_type>& presented_keys ) const {
+      std::pair<bool, size_t> keys_satisfy_and_relevant( const std::set<public_key_type>& presented_keys ) const {
+         size_t num_relevant_keys = 0;
          uint32_t total_weight = 0;
-         for (const auto& kw : keys) {
+         for (const auto& kw : keys ) {
             const auto& iter = presented_keys.find(kw.key);
             if (iter != presented_keys.end()) {
-               total_weight += kw.weight;
-            }
+               ++num_relevant_keys;
 
-            if (total_weight >= threshold)
-               return true;
+               if( total_weight < threshold ) {
+                  total_weight += std::min<uint32_t>(std::numeric_limits<uint32_t>::max() - total_weight, kw.weight);
+               }
+            }
          }
-         return false;
+
+         return {total_weight >= threshold, num_relevant_keys};
       }
 
       auto to_shared(chainbase::allocator<char> alloc) const {
@@ -158,24 +164,26 @@ namespace eosio { namespace chain {
       name                    producer_name;
       block_signing_authority authority;
 
-      static bool key_is_relevant( const public_key_type& key, const block_signing_authority& authority ) {
-         return authority.visit([&key](const auto &a){
-            return a.key_is_relevant(key);
+      template<typename Op>
+      static void for_each_key( const block_signing_authority& authority, Op op ) {
+         authority.visit([&op](const auto &a){
+            a.for_each_key(op);
          });
       }
 
-      bool key_is_relevant( const public_key_type& key ) const {
-         return key_is_relevant(key, authority);
+      template<typename Op>
+      void for_each_key( Op op ) const {
+         for_each_key(authority, op);
       }
 
-      static bool keys_satisfy( const flat_set<public_key_type>& keys, const block_signing_authority& authority ) {
+      static std::pair<bool, size_t> keys_satisfy_and_relevant( const std::set<public_key_type>& keys, const block_signing_authority& authority ) {
          return authority.visit([&keys](const auto &a){
-            return a.keys_satisfy(keys);
+            return a.keys_satisfy_and_relevant(keys);
          });
       }
 
-      bool keys_satisfy( const flat_set<public_key_type>& keys ) const {
-         return keys_satisfy(keys, authority);
+      std::pair<bool, size_t> keys_satisfy_and_relevant( const std::set<public_key_type>& presented_keys ) const {
+         return keys_satisfy_and_relevant(presented_keys, authority);
       }
 
       auto to_shared(chainbase::allocator<char> alloc) const {
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index 7e26eab6bb8..daaf63c234b 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -275,6 +275,18 @@ namespace eosio { namespace chain {
     */
    typedef vector<std::pair<uint16_t,vector<char>>> extensions_type;
 
+   /**
+    * emplace an extension into the extensions type such that it is properly ordered by extension id
+    * this assumes exts is already sorted by extension id
+    */
+   inline auto emplace_extension( extensions_type& exts, uint16_t eid, vector<char>&& data) {
+      auto insert_itr = std::lower_bound(exts.begin(), exts.end(), eid, [](const auto& ext, uint16_t id){
+         return ext.first < id;
+      });
+
+      return exts.emplace(insert_itr, eid, std::move(data));
+   }
+
 
    template<typename Container>
    class end_insert_iterator : public std::iterator< std::output_iterator_tag, void, void, void, void >
diff --git a/libraries/chain/producer_schedule.cpp b/libraries/chain/producer_schedule.cpp
index 2284229a3da..03d4469578f 100644
--- a/libraries/chain/producer_schedule.cpp
+++ b/libraries/chain/producer_schedule.cpp
@@ -11,12 +11,10 @@ fc::variant producer_authority::get_abi_variant() const {
          fc::variant value;
          fc::to_variant(a, value);
 
-         std::string full_type_name = fc::get_typename<std::decay_t<decltype(a)>>::name();
-         auto last_colon = full_type_name.rfind(":");
-         std::string type_name = last_colon == std::string::npos ? std::move(full_type_name): full_type_name.substr(last_colon + 1);
+         fc::variant type = std::string(std::decay_t<decltype(a)>::abi_type_name());
 
          return fc::variants {
-               fc::variant(std::move(type_name)),
+               std::move(type),
                std::move(value)
          };
       });
diff --git a/libraries/chain/protocol_feature_manager.cpp b/libraries/chain/protocol_feature_manager.cpp
index 0ae60d91749..9e944cd4f92 100644
--- a/libraries/chain/protocol_feature_manager.cpp
+++ b/libraries/chain/protocol_feature_manager.cpp
@@ -170,20 +170,20 @@ Enables usage of WebAuthn keys and signatures.
          } )
          (  builtin_protocol_feature_t::wtmsig_block_signatures, builtin_protocol_feature_spec{
             "WTMSIG_BLOCK_SIGNATURES",
-            fc::variant("46d65101388a44ebdbbb152978ac1879e34785a2d57ad050196826734370b995").as<digest_type>(),
+            fc::variant("ab76031cad7a457f4fd5f5fca97a3f03b8a635278e0416f77dcc91eb99a48e10").as<digest_type>(),
             // SHA256 hash of the raw message below within the comment delimiters (do not modify message below).
 /*
 Builtin protocol feature: WTMSIG_BLOCK_SIGNATURES
 
-Allows producers to specify a subset of our auhority structures as the method for signing blocks.
+Allows producers to specify a multisig of weighted keys as the authority for signing blocks.
 
 A valid block header:
 is no longer allowed to have a non-empty `new_producers` field;
-must announce new producer schedules using a block header extension with ID `1`
+must announce new producer schedules using a block header extension with ID `1`.
 
 A valid signed block:
 must continue to have exactly one signature in its `signatures` field;
-and may have additional signatures in a block extension with ID `2`
+and may have additional signatures in a block extension with ID `2`.
 
 Privileged Contracts:
 may continue to use `set_proposed_producers` as they have;
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index d340de6e0d5..cf11f17d2ff 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -183,16 +183,18 @@ class privileged_api : public context_aware_api {
                      "Producer schedule cannot be empty"
          );
 
+         const auto num_supported_key_types = context.db.get<protocol_state_object>().num_supported_key_types;
+
          // check that producers are unique
          std::set<account_name> unique_producers;
          for (const auto& p: producers) {
             EOS_ASSERT( context.is_account(p.producer_name), wasm_execution_error, "producer schedule includes a nonexisting account" );
 
-            p.authority.visit([this, &p](const auto& a) {
+            p.authority.visit([&p, num_supported_key_types](const auto& a) {
                uint32_t sum_weights = 0;
                std::set<public_key_type> unique_keys;
                for (const auto& kw: a.keys ) {
-                  EOS_ASSERT( kw.key.which() < context.db.get<protocol_state_object>().num_supported_key_types, unactivated_key_type,
+                  EOS_ASSERT( kw.key.which() < num_supported_key_types, unactivated_key_type,
                               "Unactivated key type used in proposed producer schedule");
 
                   EOS_ASSERT( kw.key.valid(), wasm_execution_error, "producer schedule includes an invalid key" );
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 343987fe8b2..ab6e39dd3f1 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -337,16 +337,15 @@ namespace eosio { namespace testing {
       auto producer = control->head_block_state()->get_scheduled_producer( control->pending_block_time() );
       vector<private_key_type> signing_keys;
 
-      for ( const auto& bsk : block_signing_private_keys ) {
-         if (producer.key_is_relevant(bsk.first)) {
-            signing_keys.push_back( bsk.second );
+      auto default_active_key = get_public_key( producer.producer_name, "active");
+      producer.for_each_key([&](const public_key_type& key){
+         const auto& iter = block_signing_private_keys.find(key);
+         if(iter != block_signing_private_keys.end()) {
+            signing_keys.push_back(iter->second);
+         } else if (key == default_active_key) {
+            signing_keys.emplace_back( get_private_key( producer.producer_name, "active") );
          }
-      }
-
-      // if the "active" key is relevant or no other keys were found, add the "active" private key
-      if( signing_keys.empty() || producer.key_is_relevant(get_public_key( producer.producer_name, "active") ) ) {
-         signing_keys.emplace_back( get_private_key( producer.producer_name, "active") );
-      }
+      });
 
       control->finalize_block( [&]( digest_type d ) {
          std::vector<signature_type> result;
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 0f00fd2f159..16fd8e3a362 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1304,8 +1304,12 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
    const auto& scheduled_producer = hbs->get_scheduled_producer(block_time);
    auto currrent_watermark_itr = _producer_watermarks.find(scheduled_producer.producer_name);
 
-   auto num_relevant_signatures = std::count_if(_signature_providers.begin(), _signature_providers.end(), [&scheduled_producer](const auto& p){
-      return scheduled_producer.key_is_relevant(p.first);
+   size_t num_relevant_signatures = 0;
+   scheduled_producer.for_each_key([&](const public_key_type& key){
+      const auto& iter = _signature_providers.find(key);
+      if(iter != _signature_providers.end()) {
+         num_relevant_signatures++;
+      }
    });
 
    auto irreversible_block_age = get_irreversible_block_age();
@@ -1818,11 +1822,12 @@ void producer_plugin_impl::produce_block() {
 
    relevant_providers.reserve(_signature_providers.size());
 
-   for (const auto& p : _signature_providers) {
-      if (producer_authority::key_is_relevant(p.first, auth)) {
-         relevant_providers.emplace_back(p.second);
+   producer_authority::for_each_key(auth, [&](const public_key_type& key){
+      const auto& iter = _signature_providers.find(key);
+      if (iter != _signature_providers.end()) {
+         relevant_providers.emplace_back(iter->second);
       }
-   }
+   });
 
    EOS_ASSERT(relevant_providers.size() > 0, producer_priv_key_not_found, "Attempting to produce a block for which we don't have any relevant private keys");
 
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index f1d61a7ba78..a9d7ed82faf 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -681,4 +681,46 @@ BOOST_FIXTURE_TEST_CASE( duplicate_keys_test, TESTER ) try {
    BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
 } FC_LOG_AND_RETHROW()
 
+BOOST_AUTO_TEST_CASE( large_authority_overflow_test ) try {
+
+   block_signing_authority_v0 auth;
+   { // create a large authority that should overflow
+      const size_t pre_overflow_count = 65'537UL; // enough for weights of 0xFFFF to add up to 0xFFFFFFFF
+      auth.keys.reserve(pre_overflow_count + 1);
+
+      for (int i = 0; i < pre_overflow_count; i++) {
+         auto key_str = std::to_string(i) + "_bsk";
+         auth.keys.emplace_back(key_weight{get_public_key(N(alice), key_str), 0xFFFFU});
+      }
+
+      // reduce the last weight by 1 so that its unsatisfiable
+      auth.keys.back().weight = 0xFFFEU;
+
+      // add one last key with a weight of 2 so that its only satisfiable with values that sum to an overflow of 32bit uint
+      auth.keys.emplace_back(key_weight{get_public_key(N(alice), std::to_string(pre_overflow_count) + "_bsk"), 0x0002U});
+
+      auth.threshold = 0xFFFFFFFFUL;
+   }
+
+   std::set<public_key_type> provided_keys;
+   { // construct a set of all keys to provide
+      for( const auto& kw: auth.keys) {
+         provided_keys.emplace(kw.key);
+      }
+   }
+
+   { // prove the naive accumulation overflows
+      uint32_t total = 0;
+      for( const auto& kw: auth.keys) {
+         total += kw.weight;
+      }
+      BOOST_REQUIRE_EQUAL(total, 0x0UL);
+   }
+
+   auto res = auth.keys_satisfy_and_relevant(provided_keys);
+
+   BOOST_REQUIRE_EQUAL(res.first, true);
+   BOOST_REQUIRE_EQUAL(res.second, provided_keys.size());
+} FC_LOG_AND_RETHROW()
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index 4a6d9304227..499bffa84f4 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -1589,7 +1589,8 @@ BOOST_AUTO_TEST_CASE( producer_schedule_change_extension_test ) { try {
 
       // create a bad block that has the producer schedule change extension before the feature upgrade
       auto bad_block = std::make_shared<signed_block>(last_legacy_block->clone());
-      bad_block->header_extensions.emplace_back(
+      emplace_extension(
+              bad_block->header_extensions,
               producer_schedule_change_extension::extension_id(),
               fc::raw::pack(std::make_pair(hbs->active_schedule.version + 1, std::vector<char>{}))
       );
@@ -1635,7 +1636,8 @@ BOOST_AUTO_TEST_CASE( producer_schedule_change_extension_test ) { try {
 
       // create a bad block that has the producer schedule change extension that is valid but not warranted by actions in the block
       auto bad_block = std::make_shared<signed_block>(first_new_block->clone());
-      bad_block->header_extensions.emplace_back(
+      emplace_extension(
+              bad_block->header_extensions,
               producer_schedule_change_extension::extension_id(),
               fc::raw::pack(std::make_pair(hbs->active_schedule.version + 1, std::vector<char>{}))
       );
@@ -1698,7 +1700,7 @@ BOOST_AUTO_TEST_CASE( wtmsig_block_signing_inflight_legacy_test ) { try {
    c.produce_block();
 
    // ensure that the next block is updated to the new schedule
-   BOOST_REQUIRE_EXCEPTION( c.produce_block(), wrong_signing_key, fc_exception_message_is( "block signed by unexpected key" ));
+   BOOST_REQUIRE_EXCEPTION( c.produce_block(), no_block_signatures, fc_exception_message_is( "Signer returned no signatures" ));
    c.control->abort_block();
 
    c.block_signing_private_keys.emplace(get_public_key(N(eosio), "bsk"), get_private_key(N(eosio), "bsk"));
@@ -1734,7 +1736,7 @@ BOOST_AUTO_TEST_CASE( wtmsig_block_signing_inflight_extension_test ) { try {
    c.produce_block();
 
    // ensure that the next block is updated to the new schedule
-   BOOST_REQUIRE_EXCEPTION( c.produce_block(), wrong_signing_key, fc_exception_message_is( "block signed by unexpected key" ));
+   BOOST_REQUIRE_EXCEPTION( c.produce_block(), no_block_signatures, fc_exception_message_is( "Signer returned no signatures" ));
    c.control->abort_block();
 
    c.block_signing_private_keys.emplace(get_public_key(N(eosio), "bsk"), get_private_key(N(eosio), "bsk"));
diff --git a/unittests/test-contracts/deferred_test/deferred_test.cpp b/unittests/test-contracts/deferred_test/deferred_test.cpp
index 1ff307d8426..b4d271af7ce 100644
--- a/unittests/test-contracts/deferred_test/deferred_test.cpp
+++ b/unittests/test-contracts/deferred_test/deferred_test.cpp
@@ -25,7 +25,7 @@ void deferred_test::defercall( name payer, uint64_t sender_id, name contract, ui
       read_transaction( buffer, tx_size );
       auto tx_id = sha256( buffer, tx_size );
       char context_buffer[56];
-      trx.transaction_extensions.emplace_back( (uint16_t)0, std::vector<char>() );
+      emplace_extension(trx.transaction_extensions, (uint16_t)0, std::vector<char>() );
       auto& context_vector = std::get<1>( trx.transaction_extensions.back() );
       context_vector.resize(56);
       datastream ds( context_vector.data(), 56 );

From 8f517ba1929c61e44518d57bf12fe479c07b2fea Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 25 Jul 2019 08:06:15 -0500
Subject: [PATCH 0871/1648] Add tests for duplicates

---
 unittests/unapplied_transaction_queue_tests.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index c1d530c412f..5cb80681a6e 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -78,6 +78,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
 
    // fifo aborted
    q.add_aborted( { trx1, trx2, trx3 } );
+   q.add_aborted( { trx1, trx2, trx3 } ); // duplicates ignored
    BOOST_CHECK( q.size() == 3 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 2 );
@@ -118,7 +119,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    bs2->trxs = { trx3, trx4, trx5 };
    auto bs3 = std::make_shared<block_state>();
    bs3->trxs = { trx6 };
-   q.add_forked( { bs3, bs2, bs1 } );
+   q.add_forked( { bs3, bs2, bs1, bs1 } ); // bs1 duplicate ignored
    BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 5 );

From 964cebe43b2b53a87c88c4887294cb677fcce2ad Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 25 Jul 2019 08:11:14 -0500
Subject: [PATCH 0872/1648] Add clear_applied

---
 .../include/eosio/chain/unapplied_transaction_queue.hpp  | 7 +++++++
 unittests/unapplied_transaction_queue_tests.cpp          | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index eb9275eab5e..65f56b31481 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -111,6 +111,13 @@ class unapplied_transaction_queue {
       return true;
    }
 
+   void clear_applied( const std::vector<transaction_metadata_ptr>& applied_trxs ) {
+      auto& idx = queue.get<by_trx_id>();
+      for( const auto& trx : applied_trxs ) {
+         idx.erase( trx->id() );
+      }
+   }
+
    void add_forked( const branch_type& forked_branch ) {
       if( only_track_persisted ) return;
       // forked_branch is in reverse order
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index 5cb80681a6e..4a69f4954ed 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -89,6 +89,15 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
+   // clear applied
+   q.add_aborted( { trx1, trx2, trx3 } );
+   q.clear_applied( { trx1, trx3, trx4 } );
+   BOOST_CHECK( q.size() == 1 );
+   BOOST_REQUIRE( next( q ) == trx2 );
+   BOOST_CHECK( q.size() == 0 );
+   BOOST_REQUIRE( next( q ) == nullptr );
+   BOOST_CHECK( q.empty() );
+
    // order: persisted, aborted
    q.add_persisted( trx6 );
    q.add_aborted( { trx1, trx2, trx3 } );

From 4ad52ccc4e7196c269bf136317a7e5c2de69d46e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 25 Jul 2019 08:16:09 -0500
Subject: [PATCH 0873/1648] Clear applied on_block to avoid trying to applied
 already applied transactions

---
 plugins/producer_plugin/producer_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index a969f4240c4..1555bd5c149 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -231,6 +231,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
 
       void on_block( const block_state_ptr& bsp ) {
+         _unapplied_transactions.clear_applied( bsp->trxs );
+
          if( bsp->header.timestamp <= _last_signed_block_time ) return;
          if( bsp->header.timestamp <= _start_time ) return;
          if( bsp->block_num <= _last_signed_block_num ) return;

From 8667daae309ff378404dae5d635e8136b55b0df3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 25 Jul 2019 09:27:10 -0500
Subject: [PATCH 0874/1648] No need to track unapplied if not SPECULATIVE

---
 libraries/chain/controller.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 920fd7d3e53..33d7a05d55e 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1962,7 +1962,9 @@ struct controller_impl {
             } // end if exception
          } /// end for each block in branch
 
-         unapplied_branch = std::move( branches.second );
+         if ( read_mode == db_read_mode::SPECULATIVE ) {
+            unapplied_branch = std::move( branches.second );
+         }
 
          ilog("successfully switched fork to new head ${new_head_id}", ("new_head_id", new_head->id));
       } else {

From 607d70de1fc7dab9528a48eb3b264f41450b0453 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 25 Jul 2019 11:14:45 -0400
Subject: [PATCH 0875/1648] address more feedback on PR

---
 libraries/chain/block_header_state.cpp           |  4 ++--
 .../include/eosio/chain/producer_schedule.hpp    | 10 +++++-----
 libraries/chain/include/eosio/chain/types.hpp    |  4 ++--
 plugins/chain_plugin/chain_plugin.cpp            | 10 +++++++++-
 plugins/producer_plugin/producer_plugin.cpp      | 16 ++--------------
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index 9771af57d42..aea87103283 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -424,11 +424,11 @@ namespace eosio { namespace chain {
 
       EOS_ASSERT(relevant_sig_count == keys.size(), wrong_signing_key,
                  "block signed by unexpected key",
-                 ("signing_keys", keys)("valid_keys", valid_block_signing_authority));
+                 ("signing_keys", keys)("authority", valid_block_signing_authority));
 
       EOS_ASSERT(is_satisfied, wrong_signing_key,
                  "block signatures do not satisfy the block signing authority",
-                 ("keys", keys)("authority", valid_block_signing_authority));
+                 ("signing_keys", keys)("authority", valid_block_signing_authority));
    }
 
    /**
diff --git a/libraries/chain/include/eosio/chain/producer_schedule.hpp b/libraries/chain/include/eosio/chain/producer_schedule.hpp
index fb12dab0d58..ec0d5bc79dd 100644
--- a/libraries/chain/include/eosio/chain/producer_schedule.hpp
+++ b/libraries/chain/include/eosio/chain/producer_schedule.hpp
@@ -104,7 +104,7 @@ namespace eosio { namespace chain {
       vector<key_weight>          keys;
 
       template<typename Op>
-      void for_each_key( Op op ) const {
+      void for_each_key( Op&& op ) const {
          for (const auto& kw : keys ) {
             op(kw.key);
          }
@@ -165,15 +165,15 @@ namespace eosio { namespace chain {
       block_signing_authority authority;
 
       template<typename Op>
-      static void for_each_key( const block_signing_authority& authority, Op op ) {
+      static void for_each_key( const block_signing_authority& authority, Op&& op ) {
          authority.visit([&op](const auto &a){
-            a.for_each_key(op);
+            a.for_each_key(std::forward<Op>(op));
          });
       }
 
       template<typename Op>
-      void for_each_key( Op op ) const {
-         for_each_key(authority, op);
+      void for_each_key( Op&& op ) const {
+         for_each_key(authority, std::forward<Op>(op));
       }
 
       static std::pair<bool, size_t> keys_satisfy_and_relevant( const std::set<public_key_type>& keys, const block_signing_authority& authority ) {
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index daaf63c234b..81c8e8b8924 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -280,8 +280,8 @@ namespace eosio { namespace chain {
     * this assumes exts is already sorted by extension id
     */
    inline auto emplace_extension( extensions_type& exts, uint16_t eid, vector<char>&& data) {
-      auto insert_itr = std::lower_bound(exts.begin(), exts.end(), eid, [](const auto& ext, uint16_t id){
-         return ext.first < id;
+      auto insert_itr = std::upper_bound(exts.begin(), exts.end(), eid, [](uint16_t id, const auto& ext){
+         return id < ext.first;
       });
 
       return exts.emplace(insert_itr, eid, std::move(data));
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index c47889f5c48..73e998fa548 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1689,12 +1689,20 @@ read_only::get_producers_result read_only::get_producers( const read_only::get_p
    read_only::get_producers_result result;
 
    for (auto p : db.active_producers().producers) {
-      fc::variant row = fc::mutable_variant_object()
+      auto row = fc::mutable_variant_object()
          ("owner", p.producer_name)
          ("producer_authority", p.authority)
          ("url", "")
          ("total_votes", 0.0f);
 
+      // detect a legacy key and maintain API compatibility for those entries
+      if (p.authority.contains<block_signing_authority_v0>()) {
+         const auto& auth = p.authority.get<block_signing_authority_v0>();
+         if (auth.keys.size() == 1 && auth.keys.back().weight == auth.threshold) {
+            row("producer_key", auth.keys.back().key);
+         }
+      }
+
       result.rows.push_back(row);
    }
 
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 16fd8e3a362..22e0887d949 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -189,9 +189,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       std::vector<chain::digest_type>                           _protocol_features_to_activate;
       bool                                                      _protocol_features_signaled = false; // to mark whether it has been signaled in start_block
 
-      time_point _last_signed_block_time;
       time_point _start_time = fc::time_point::now();
-      uint32_t   _last_signed_block_num = 0;
 
       producer_plugin* _self = nullptr;
       chain_plugin* chain_plug = nullptr;
@@ -231,17 +229,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
 
       void on_block( const block_state_ptr& bsp ) {
-         if( bsp->header.timestamp <= _last_signed_block_time ) return;
          if( bsp->header.timestamp <= _start_time ) return;
-         if( bsp->block_num <= _last_signed_block_num ) return;
-
-         const auto& active_producer_to_signing_key = bsp->active_schedule.producers;
-
-         flat_set<account_name> active_producers;
-         active_producers.reserve(bsp->active_schedule.producers.size());
-         for (const auto& p: bsp->active_schedule.producers) {
-            active_producers.insert(p.producer_name);
-         }
 
          // simplify handling of watermark in on_block
          auto block_producer = bsp->header.producer;
@@ -1412,11 +1400,11 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
    if( chain.is_building_block() ) {
       auto pending_block_time = chain.pending_block_time();
-      auto pending_block_signing_authority = chain.pending_block_signing_authority();
+      const auto& pending_block_signing_authority = chain.pending_block_signing_authority();
       const fc::time_point preprocess_deadline = calculate_block_deadline(block_time);
 
       if (_pending_block_mode == pending_block_mode::producing && pending_block_signing_authority != scheduled_producer.authority) {
-         elog("Block Signing Key is not expected value, reverting to speculative mode! [expected: \"${expected}\", actual: \"${actual\"", ("expected", scheduled_producer.authority)("actual", pending_block_signing_authority));
+         elog("Unexpected block signing authority, reverting to speculative mode! [expected: \"${expected}\", actual: \"${actual\"", ("expected", scheduled_producer.authority)("actual", pending_block_signing_authority));
          _pending_block_mode = pending_block_mode::speculating;
       }
 

From 04821a5d9a7c1250766c843f949633effd16f793 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 25 Jul 2019 10:56:13 -0500
Subject: [PATCH 0876/1648] Add aborted trxs to unapplied_transactions before
 push_block so trxs in aborted that are applied can be removed from
 unapplied_transactions avoiding having to determine they are a duplicate
 later.

---
 plugins/producer_plugin/producer_plugin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 1555bd5c149..59a2e357b84 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -354,11 +354,10 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          auto bsf = chain.create_block_state_future( block );
 
          // abort the pending block
-         vector<transaction_metadata_ptr> aborted_trxs = chain.abort_block();
+         _unapplied_transactions.add_aborted( chain.abort_block() );
 
          // exceptions throw out, make sure we restart our loop
          auto ensure = fc::make_scoped_exit([this, &aborted_trxs](){
-            _unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
             schedule_production_loop();
          });
 

From ecc8cb55ab9220dd10fef2342215a8a25f05211b Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 25 Jul 2019 12:01:35 -0400
Subject: [PATCH 0877/1648] fix some issues with building, merged develop,
 commented out intrinsic log stuff, and updated eos-vm ref

---
 libraries/chain/controller.cpp                | 39 +++++++++++++------
 .../eosio/chain/wasm_interface_private.hpp    |  5 +--
 libraries/eos-vm                              |  2 +-
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 8efb85c65d8..8dcb58942d0 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -214,7 +214,9 @@ struct controller_impl {
    chainbase::database            db;
    chainbase::database            reversible_blocks; ///< a special database to persist blocks that have successfully been applied but are still reversible
    block_log                      blog;
+   /*
    optional<intrinsic_debug_log>  intrinsic_log;
+   */
    optional<pending_state>        pending;
    block_state_ptr                head;
    fork_database                  fork_db;
@@ -288,7 +290,7 @@ struct controller_impl {
         cfg.read_only ? database::read_only : database::read_write,
         cfg.reversible_cache_size, false, cfg.db_map_mode, cfg.db_hugepage_paths ),
     blog( cfg.blocks_dir ),
-    intrinsic_log( cfg.intrinsic_debug_log_path ? *cfg.intrinsic_debug_log_path : optional<intrinsic_debug_log>() ),
+    /*intrinsic_log( cfg.intrinsic_debug_log_path ? *cfg.intrinsic_debug_log_path : optional<intrinsic_debug_log>() ),*/
     fork_db( cfg.state_dir ),
     wasmif( cfg.wasm_runtime, db ),
     resource_limits( db ),
@@ -305,10 +307,11 @@ struct controller_impl {
                             const vector<digest_type>& new_features )
                            { check_protocol_features( timestamp, cur_features, new_features ); }
       );
-
+      /*
       if( intrinsic_log ) {
          intrinsic_log->open();
       }
+      */
 
       set_activation_handler<builtin_protocol_feature_t::preactivate_feature>();
       set_activation_handler<builtin_protocol_feature_t::replace_deferred>();
@@ -613,7 +616,7 @@ struct controller_impl {
       while( db.revision() > head->block_num ) {
          db.undo();
       }
-
+      /*
       if( intrinsic_log && intrinsic_log->last_committed_block_num() > 0
              && head->block_num != intrinsic_log->last_committed_block_num() )
       {
@@ -624,6 +627,7 @@ struct controller_impl {
          fc::remove( intrinsic_log->get_path() );
          intrinsic_log->open();
       }
+      */
 
       protocol_features.init( db );
 
@@ -693,11 +697,10 @@ struct controller_impl {
       if( last_block_num > head->block_num ) {
          replay( shutdown ); // replay any irreversible and reversible blocks ahead of current head
       }
-
+      /*
       if( intrinsic_log ) {
          intrinsic_log->close();
 
-         /*
          // Print intrinsic_log in JSON form
          intrinsic_log->open( intrinsic_debug_log::open_mode::read_only );
          const auto end_itr = intrinsic_log->end_block();
@@ -705,10 +708,10 @@ struct controller_impl {
             dlog( "\n${json}", ("json", fc::json::to_pretty_string(*itr)) );
          }
          intrinsic_log->close();
-         */
 
          intrinsic_log.reset();
       }
+      */
 
       if( shutdown() ) return;
 
@@ -1150,9 +1153,11 @@ struct controller_impl {
 
       transaction_trace_ptr trace;
       if( gtrx.expiration < self.pending_block_time() ) {
+	 /*
          if( intrinsic_log ) {
             intrinsic_log->start_transaction( gtrx.trx_id );
          }
+	 */
          trace = std::make_shared<transaction_trace>();
          trace->id = gtrx.trx_id;
          trace->block_num = self.head_block_num() + 1;
@@ -1173,7 +1178,7 @@ struct controller_impl {
       in_trx_requiring_checks = true;
 
       uint32_t cpu_time_to_bill_us = billed_cpu_time_us;
-
+      /*
       auto abort_transaction_in_intrinsic_log_on_exit = fc::make_scoped_exit(
       [abort_transaction=static_cast<bool>(intrinsic_log), this] {
          if( abort_transaction ) {
@@ -1184,6 +1189,7 @@ struct controller_impl {
       if( intrinsic_log ) {
          intrinsic_log->start_transaction( gtrx.trx_id );
       }
+      */
 
       transaction_context trx_context( self, dtrx, gtrx.trx_id, timer );
       trx_context.leeway =  fc::microseconds(0); // avoid stealing cpu resource
@@ -1226,7 +1232,9 @@ struct controller_impl {
          undo_session.squash();
 
          restore.cancel();
+	 /*
          abort_transaction_in_intrinsic_log_on_exit.cancel();
+	 */
 
          return trace;
       } catch( const disallowed_transaction_extensions_bad_block_exception& ) {
@@ -1257,7 +1265,9 @@ struct controller_impl {
             emit( self.accepted_transaction, trx );
             emit( self.applied_transaction, std::tie(trace, dtrx) );
             undo_session.squash();
+	    /*
             abort_transaction_in_intrinsic_log_on_exit.cancel();
+	    */
             return trace;
          }
          trace->elapsed = fc::time_point::now() - trx_context.start;
@@ -1297,7 +1307,9 @@ struct controller_impl {
          emit( self.applied_transaction, std::tie(trace, dtrx) );
 
          undo_session.squash();
+	 /*
          abort_transaction_in_intrinsic_log_on_exit.cancel();
+	 */
       } else {
          emit( self.accepted_transaction, trx );
          emit( self.applied_transaction, std::tie(trace, dtrx) );
@@ -1423,7 +1435,7 @@ struct controller_impl {
                trx_context.undo();
             } else {
                restore.cancel();
-               abort_transaction_in_intrinsic_log_on_exit.cancel();
+               //abort_transaction_in_intrinsic_log_on_exit.cancel();
                trx_context.squash();
             }
 
@@ -1466,10 +1478,11 @@ struct controller_impl {
       } else {
          pending.emplace( maybe_session(), *head, when, confirm_block_count, new_protocol_feature_activations );
       }
-
+      /*
       if( intrinsic_log ) {
          intrinsic_log->start_block( head->block_num + 1 );
       }
+      */
 
       pending->_block_status = s;
       pending->_producer_block_id = producer_block_id;
@@ -1601,10 +1614,11 @@ struct controller_impl {
       EOS_ASSERT( pending->_block_stage.contains<building_block>(), block_validate_exception, "already called finalize_block");
 
       try {
-
+      /*
       if( intrinsic_log ) {
          intrinsic_log->finish_block();
       }
+      */
 
       auto& pbhs = pending->get_pending_block_header_state();
 
@@ -2050,9 +2064,11 @@ struct controller_impl {
          // in case we want to adapt the intrinsic_log to working during regular operation.
          // In that case, we would also need to add support for popping committed blocks from the intrinsic log
          // and call the appropriate function from controller_impl::pop_block().
+	 /*
          if( intrinsic_log ) {
             intrinsic_log->abort_block();
          }
+	 */
       }
       return applied_trxs;
    }
@@ -2326,11 +2342,12 @@ const protocol_feature_manager& controller::get_protocol_feature_manager()const
 {
    return my->protocol_features;
 }
-
+/*
 optional<intrinsic_debug_log>&  controller::get_intrinsic_debug_log()
 {
    return my->intrinsic_log;
 }
+*/
 
 controller::controller( const controller::config& cfg )
 :my( new controller_impl( cfg, *this, protocol_feature_set{} ) )
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index ef727ae6ceb..c397d298cc0 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -125,7 +125,7 @@ namespace eosio { namespace chain {
             });
             trx_context.pause_billing_timer();
             IR::Module module;
-	    std::vector<U8> bytes = codeobject->code;
+	    std::vector<U8> bytes = {(const U8*)codeobject->code.data(), (const U8*)codeobject->code.data() + codeobject->code.size()};
             try {
                Serialization::MemoryInputStream stream((const U8*)bytes.data(), bytes.size());
                WASM::serialize(stream, module);
@@ -136,11 +136,10 @@ namespace eosio { namespace chain {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
 
-            if(vm_type != wasm_interface::vm_type::eos_vm) {
+            if(vm_type != static_cast<uint8_t>(wasm_interface::vm_type::eos_vm)) {
                wasm_injections::wasm_binary_injection injector(module);
                injector.inject();
 
-               std::vector<U8> bytes;
                try {
                   Serialization::ArrayOutputStream outstream;
                   WASM::serialize(outstream, module);
diff --git a/libraries/eos-vm b/libraries/eos-vm
index e67084e17b2..bf9ad583913 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit e67084e17b284570e5a13407cb8801722b2cc52a
+Subproject commit bf9ad5839133326dd1857544f4aecdbfcf951785

From 96de94abfbac408fd7f1bdf58172b2e00b8f8f5b Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 25 Jul 2019 12:06:01 -0400
Subject: [PATCH 0878/1648] missed some spots

---
 libraries/chain/apply_context.cpp                        | 5 +++--
 libraries/chain/include/eosio/chain/apply_context.hpp    | 2 +-
 libraries/chain/include/eosio/chain/webassembly/wabt.hpp | 6 ++++--
 libraries/chain/include/eosio/chain/webassembly/wavm.hpp | 6 ++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index e17f85b34ef..140cf62adb1 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -34,7 +34,7 @@ apply_context::apply_context(controller& con, transaction_context& trx_ctx, uint
 :control(con)
 ,db(con.mutable_db())
 ,trx_context(trx_ctx)
-,intrinsic_log(con.get_intrinsic_debug_log())
+/*,intrinsic_log(con.get_intrinsic_debug_log())*/
 ,recurse_depth(depth)
 ,first_receiver_action_ordinal(action_ordinal)
 ,action_ordinal(action_ordinal)
@@ -53,11 +53,12 @@ apply_context::apply_context(controller& con, transaction_context& trx_ctx, uint
 void apply_context::exec_one()
 {
    auto start = fc::time_point::now();
-
+   /*
    if( intrinsic_log ) {
       intrinsic_log->start_action( control.get_dynamic_global_properties().global_action_sequence + 1,
                                    receiver, act->account, act->name );
    }
+   */
 
    action_receipt r;
    r.receiver         = receiver;
diff --git a/libraries/chain/include/eosio/chain/apply_context.hpp b/libraries/chain/include/eosio/chain/apply_context.hpp
index d7af2f987f4..0173db45598 100644
--- a/libraries/chain/include/eosio/chain/apply_context.hpp
+++ b/libraries/chain/include/eosio/chain/apply_context.hpp
@@ -562,7 +562,7 @@ class apply_context {
       controller&                     control;
       chainbase::database&            db;  ///< database where state is stored
       transaction_context&            trx_context; ///< transaction context in which the action is running
-      optional<intrinsic_debug_log>&  intrinsic_log;
+      /*optional<intrinsic_debug_log>&  intrinsic_log;*/
 
    private:
       const action*                 act = nullptr; ///< action being applied
diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index 68075a29d10..79de06023da 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -658,10 +658,11 @@ struct intrinsic_function_invoker {
    template<MethodSig Method>
    static Ret wrapper(wabt_apply_instance_vars& vars, Params... params, const TypedValues&, int) {
       class_from_wasm<Cls>::value(vars.ctx).checktime();
-      auto& intrinsic_log = vars.ctx.control.get_intrinsic_debug_log();
+      /*auto& intrinsic_log = vars.ctx.control.get_intrinsic_debug_log();
       if( intrinsic_log ) {
          intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( *vars.memory ) );
       }
+      */
       return (class_from_wasm<Cls>::value(vars.ctx).*Method)(params...);
    }
 
@@ -678,10 +679,11 @@ struct intrinsic_function_invoker<void, MethodSig, Cls, Params...> {
    template<MethodSig Method>
    static void_type wrapper(wabt_apply_instance_vars& vars, Params... params, const TypedValues& args, int offset) {
       class_from_wasm<Cls>::value(vars.ctx).checktime();
-      auto& intrinsic_log = vars.ctx.control.get_intrinsic_debug_log();
+      /*auto& intrinsic_log = vars.ctx.control.get_intrinsic_debug_log();
       if( intrinsic_log ) {
          intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( *vars.memory ) );
       }
+      */
       (class_from_wasm<Cls>::value(vars.ctx).*Method)(params...);
       return void_type();
    }
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index b057d4fd823..58cd7a15458 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -645,10 +645,11 @@ struct intrinsic_function_invoker {
    template<MethodSig Method>
    static Ret wrapper(running_instance_context& ctx, Params... params) {
       class_from_wasm<Cls>::value(*ctx.apply_ctx).checktime();
-      auto& intrinsic_log = ctx.apply_ctx->control.get_intrinsic_debug_log();
+      /*auto& intrinsic_log = ctx.apply_ctx->control.get_intrinsic_debug_log();
       if( intrinsic_log ) {
          intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( ctx.memory ) );
       }
+      */
       return (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
    }
 
@@ -668,10 +669,11 @@ struct intrinsic_function_invoker<WasmSig, void, MethodSig, Cls, Params...> {
    template<MethodSig Method>
    static void_type wrapper(running_instance_context& ctx, Params... params) {
       class_from_wasm<Cls>::value(*ctx.apply_ctx).checktime();
-      auto& intrinsic_log = ctx.apply_ctx->control.get_intrinsic_debug_log();
+      /*auto& intrinsic_log = ctx.apply_ctx->control.get_intrinsic_debug_log();
       if( intrinsic_log ) {
          intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( ctx.memory ) );
       }
+      */
       (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
       return void_type();
    }

From c66bd0a50e4c5119dd9e590e46183137842889e2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 25 Jul 2019 11:10:05 -0500
Subject: [PATCH 0879/1648] Missed removing capture on last commit

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 59a2e357b84..ab7b7bcc9bd 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -357,7 +357,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          _unapplied_transactions.add_aborted( chain.abort_block() );
 
          // exceptions throw out, make sure we restart our loop
-         auto ensure = fc::make_scoped_exit([this, &aborted_trxs](){
+         auto ensure = fc::make_scoped_exit([this](){
             schedule_production_loop();
          });
 

From bcf65d9208078e05b1598dc477cf9f5783e10b32 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 25 Jul 2019 12:16:17 -0400
Subject: [PATCH 0880/1648] last vestiges of intrinsic logger and disable
 building of tools and tests for eos-vm

---
 libraries/CMakeLists.txt                                 | 9 +++++----
 plugins/chain_plugin/chain_plugin.cpp                    | 3 ++-
 ...g_log_tests.cpp => intrinsic_debug_log_tests.cpp.bak} | 0
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename unittests/{intrinsic_debug_log_tests.cpp => intrinsic_debug_log_tests.cpp.bak} (100%)

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 116324a27fc..ad7cc32f7dc 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -16,10 +16,11 @@ set(WITH_EXCEPTIONS ON CACHE BOOL "Build with exceptions enabled" FORCE)
 add_subdirectory( wabt )
 
 set(USE_EXISTING_SOFTFLOAT ON CACHE BOOL "use pre-exisiting softfloat lib")
-set(ENABLE_TESTS OFF)
-set(ENABLE_ADDRESS_SANITIZER OFF)
-set(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER OFF)
-set(ENABLE_PROFILE OFF)
+set(ENABLE_TOOLS OFF CACHE BOOL "Build tools")
+set(ENABLE_TESTS OFF CACHE BOOL "Build tests")
+set(ENABLE_ADDRESS_SANITIZER OFF CACHE BOOL "Use address sanitizer")
+set(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER OFF CACHE BOOL "Use UB sanitizer")
+set(ENABLE_PROFILE OFF CACHE BOOL "Enable for profile builds")
 add_subdirectory( eos-vm )
 
 set(ENABLE_STATIC ON)
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 2e8618ef7eb..dfb13dab984 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -587,10 +587,11 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          else
             my->blocks_dir = bld;
       }
-
+      /*
       if( options.at( "debug-log-intrinsics" ).as<bool>() ) {
          my->chain_config->intrinsic_debug_log_path = app().data_dir() / "intrinsics.log";
       }
+      */
 
       protocol_feature_set pfs;
       {
diff --git a/unittests/intrinsic_debug_log_tests.cpp b/unittests/intrinsic_debug_log_tests.cpp.bak
similarity index 100%
rename from unittests/intrinsic_debug_log_tests.cpp
rename to unittests/intrinsic_debug_log_tests.cpp.bak

From f653e6a1eff2e73e599991d7b7ecf279fd5e1113 Mon Sep 17 00:00:00 2001
From: Chris Gundlach <cgundlach@naughtydawgllc.com>
Date: Thu, 25 Jul 2019 10:10:03 -0700
Subject: [PATCH 0881/1648] code formatting

---
 plugins/chain_plugin/chain_plugin.cpp | 74 +++++++++++++--------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 8efbcea7516..a3274b081b6 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1068,44 +1068,45 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
    ilog( "Reconstructing '${reversible_dir}' from backed up reversible directory", ("reversible_dir", reversible_dir) );
 
    optional<chainbase::database> old_reversible; 
+
    try {
-	   old_reversible = chainbase::database( backup_dir, database::read_only, 0, true );
+      old_reversible = chainbase::database( backup_dir, database::read_only, 0, true );
    } catch (const std::runtime_error &) {
-	// since we are allowing for dirty, it must be incompatible
-   	ilog( "Did not recover any reversible blocks since reversible database incompatible");
-	return true;
+      // since we are allowing for dirty, it must be incompatible
+      ilog( "Did not recover any reversible blocks since reversible database incompatible");
+      return true;
    }
-   	chainbase::database  new_reversible( reversible_dir, database::read_write, cache_size );
-   	std::fstream         reversible_blocks;
-   	reversible_blocks.open( (reversible_dir.parent_path() / std::string("portable-reversible-blocks-").append( now ) ).generic_string().c_str(),
+
+   chainbase::database  new_reversible( reversible_dir, database::read_write, cache_size );
+   std::fstream         reversible_blocks;
+   reversible_blocks.open( (reversible_dir.parent_path() / std::string("portable-reversible-blocks-").append( now ) ).generic_string().c_str(),
                            std::ios::out | std::ios::binary );
 
-   	uint32_t num = 0;
-   	uint32_t start = 0;
-   	uint32_t end = 0;
-   	old_reversible->add_index<reversible_block_index>();
-   	new_reversible.add_index<reversible_block_index>();
-   	const auto& ubi = old_reversible->get_index<reversible_block_index,by_num>();
-   	auto itr = ubi.begin();
-   	if( itr != ubi.end() ) {
-      		start = itr->blocknum;
-      		end = start - 1;
-   	}
-   	if( truncate_at_block > 0 && start > truncate_at_block ) {
-      		ilog( "Did not recover any reversible blocks since the specified block number to stop at (${stop}) is less than first block in the reversible database (${start}).", ("stop", truncate_at_block)("start", start) );
-      		return true;
-   	}
-
-    try {
-      	for( ; itr != ubi.end(); ++itr ) {
-         	EOS_ASSERT( itr->blocknum == end + 1, gap_in_reversible_blocks_db,
+   uint32_t num = 0;
+   uint32_t start = 0;
+   uint32_t end = 0;
+   old_reversible->add_index<reversible_block_index>();
+   new_reversible.add_index<reversible_block_index>();
+   const auto& ubi = old_reversible->get_index<reversible_block_index,by_num>();
+   auto itr = ubi.begin();
+   if( itr != ubi.end() ) {
+      start = itr->blocknum;
+      end = start - 1;
+   }
+   if( truncate_at_block > 0 && start > truncate_at_block ) {
+      ilog( "Did not recover any reversible blocks since the specified block number to stop at (${stop}) is less than first block in the reversible database (${start}).", ("stop", truncate_at_block)("start", start) );
+      return true;
+   }
+   try {
+      for( ; itr != ubi.end(); ++itr ) {
+         EOS_ASSERT( itr->blocknum == end + 1, gap_in_reversible_blocks_db,
                      "gap in reversible block database between ${end} and ${blocknum}",
                      ("end", end)("blocknum", itr->blocknum)
                    );
-         	reversible_blocks.write( itr->packedblock.data(), itr->packedblock.size() );
-         	new_reversible.create<reversible_block_object>( [&]( auto& ubo ) {
-            	ubo.blocknum = itr->blocknum;
-            	ubo.set_block( itr->get_block() ); // get_block and set_block rather than copying the packed data acts as additional validation
+         reversible_blocks.write( itr->packedblock.data(), itr->packedblock.size() );
+         new_reversible.create<reversible_block_object>( [&]( auto& ubo ) {
+            ubo.blocknum = itr->blocknum;
+            ubo.set_block( itr->get_block() ); // get_block and set_block rather than copying the packed data acts as additional validation
          });
          end = itr->blocknum;
          ++num;
@@ -1114,19 +1115,18 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
       }
    } catch( const gap_in_reversible_blocks_db& e ) {
       wlog( "${details}", ("details", e.to_detail_string()) );
-   } catch(const std::runtime_error&) {
    } catch( ... ) {}
 
    if( end == truncate_at_block )
       ilog( "Stopped recovery of reversible blocks early at specified block number: ${stop}", ("stop", truncate_at_block) );
 
    if( num == 0 )
-      	ilog( "There were no recoverable blocks in the reversible block database" );
-   	else if( num == 1 )
-      		ilog( "Recovered 1 block from reversible block database: block ${start}", ("start", start) );
-   	else
-      		ilog( "Recovered ${num} blocks from reversible block database: blocks ${start} to ${end}",
-            		("num", num)("start", start)("end", end) );
+      ilog( "There were no recoverable blocks in the reversible block database" );
+   else if( num == 1 )
+      ilog( "Recovered 1 block from reversible block database: block ${start}", ("start", start) );
+   else
+      ilog( "Recovered ${num} blocks from reversible block database: blocks ${start} to ${end}",
+            ("num", num)("start", start)("end", end) );
 
    return true;
 }

From b533f35b73ac59e236b21e719546d8ee5c5562c8 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 25 Jul 2019 13:24:39 -0500
Subject: [PATCH 0882/1648] Added or fixed test descriptions for integration
 tests.

---
 tests/distributed-transactions-remote-test.py |  2 ++
 tests/distributed-transactions-test.py        | 12 ++++++++++
 tests/launcher_test.py                        |  7 +++---
 tests/nodeos_chainbase_allocation_test.py     |  7 ++++++
 tests/nodeos_forked_chain_test.py             | 23 ++++++++++++++++---
 tests/nodeos_irreversible_mode_test.py        |  7 +++---
 ..._multiple_version_protocol_feature_test.py |  7 ++++++
 tests/nodeos_protocol_feature_test.py         |  7 ++++++
 tests/nodeos_run_remote_test.py               |  2 ++
 tests/nodeos_run_test.py                      |  7 +++---
 tests/nodeos_short_fork_take_over_test.py     |  7 ++++--
 tests/nodeos_startup_catchup.py               |  2 ++
 tests/nodeos_under_min_avail_ram.py           | 21 +++++++++--------
 tests/nodeos_voting_test.py                   |  8 +++++--
 tests/restart-scenarios-test.py               | 18 +++++----------
 tests/validate-dirty-db.py                    |  3 +++
 16 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/tests/distributed-transactions-remote-test.py b/tests/distributed-transactions-remote-test.py
index 9e79b352329..8e98d976e24 100755
--- a/tests/distributed-transactions-remote-test.py
+++ b/tests/distributed-transactions-remote-test.py
@@ -10,8 +10,10 @@
 
 ###############################################################
 # distributed-transactions-remote-test
+#
 #  Tests remote capability of the distributed-transactions-test. Test will setup cluster and pass nodes info to distributed-transactions-test. E.g.
 #  distributed-transactions-remote-test.py -v --clean-run --dump-error-detail
+#
 ###############################################################
 
 Print=Utils.Print
diff --git a/tests/distributed-transactions-test.py b/tests/distributed-transactions-test.py
index 9a02d5e6de4..dac7a64b50b 100755
--- a/tests/distributed-transactions-test.py
+++ b/tests/distributed-transactions-test.py
@@ -7,6 +7,18 @@
 
 import random
 
+###############################################################
+# distributed-transactions-test
+#
+# Performs currency transfers between N accounts sent to http endpoints of
+# N nodes and verifies, after a steady state is reached, that the accounts
+# balances are correct
+# if called with --nodes-file it will will load a json description of nodes
+# that are already running and run distributed test against them (not
+# currently testing this feature)
+#
+###############################################################
+
 Print=Utils.Print
 errorExit=Utils.errorExit
 
diff --git a/tests/launcher_test.py b/tests/launcher_test.py
index bac5ed447a2..19ef3fddc92 100755
--- a/tests/launcher_test.py
+++ b/tests/launcher_test.py
@@ -10,9 +10,10 @@
 import re
 
 ###############################################################
-# nodeos_run_test
-# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
-# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
+# launcher-test
+#
+# Specifically tests using the bios bootstrap script that is created by eosio-launcher
+#
 ###############################################################
 
 Print=Utils.Print
diff --git a/tests/nodeos_chainbase_allocation_test.py b/tests/nodeos_chainbase_allocation_test.py
index 84d69d88b0f..697ada3551e 100755
--- a/tests/nodeos_chainbase_allocation_test.py
+++ b/tests/nodeos_chainbase_allocation_test.py
@@ -12,6 +12,13 @@
 import os
 import filecmp
 
+###############################################################
+# nodeos_chainbase_allocation_test
+#
+# Test snapshot creation and restarting from snapshot
+#
+###############################################################
+
 # Parse command line arguments
 args = TestHelper.parse_args({"-v","--clean-run","--dump-error-details","--leave-running","--keep-logs"})
 Utils.Debug = args.v
diff --git a/tests/nodeos_forked_chain_test.py b/tests/nodeos_forked_chain_test.py
index e4e3bc9469b..1d172cd1c90 100755
--- a/tests/nodeos_forked_chain_test.py
+++ b/tests/nodeos_forked_chain_test.py
@@ -16,9 +16,26 @@
 
 ###############################################################
 # nodeos_forked_chain_test
-# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
-# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
+# 
+# This test sets up 2 producing nodes and one "bridge" node using test_control_api_plugin.
+#   One producing node has 11 of the elected producers and the other has 10 of the elected producers.
+#   All the producers are named in alphabetical order, so that the 11 producers, in the one production node, are
+#       scheduled first, followed by the 10 producers in the other producer node. Each producing node is only connected
+#       to the other producing node via the "bridge" node.
+#   The bridge node has the test_control_api_plugin, which exposes a restful interface that the test script uses to kill
+#       the "bridge" node at a specific producer in the production cycle. This is used to fork the producer network
+#       precisely when the 11 producer node has finished producing and the other producing node is about to produce.
+#   The fork in the producer network results in one fork of the block chain that advances with 10 producers with a LIB
+#      that has advanced, since all of the previous blocks were confirmed and the producer that was scheduled for that
+#      slot produced it, and one with 11 producers with a LIB that has not advanced.  This situation is validated by
+#      the test script.
+#   After both chains are allowed to produce, the "bridge" node is turned back on.
+#   Time is allowed to progress so that the "bridge" node can catchup and both producer nodes to come to consensus
+#   The block log is then checked for both producer nodes to verify that the 10 producer fork is selected and that
+#       both nodes are in agreement on the block log.
+#
 ###############################################################
+
 Print=Utils.Print
 
 from core_symbol import CORE_SYMBOL
@@ -249,7 +266,7 @@ def getMinHeadAndLib(prodNodes):
         blockProducer=node.getBlockProducerByNum(blockNum)
 
 
-    # ***   Identify what the production cycel is   ***
+    # ***   Identify what the production cycle is   ***
 
     productionCycle=[]
     producerToSlot={}
diff --git a/tests/nodeos_irreversible_mode_test.py b/tests/nodeos_irreversible_mode_test.py
index d6316360c70..783d96da9ca 100755
--- a/tests/nodeos_irreversible_mode_test.py
+++ b/tests/nodeos_irreversible_mode_test.py
@@ -15,12 +15,11 @@
 import subprocess
 import shutil
 
-
 ###############################################################
 # nodeos_irreversible_mode_test
-# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
-# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
-# -v --leave-running --clean-run
+#
+# Many smaller tests centered around irreversible mode
+#
 ###############################################################
 
 Print = Utils.Print
diff --git a/tests/nodeos_multiple_version_protocol_feature_test.py b/tests/nodeos_multiple_version_protocol_feature_test.py
index be3324f969e..73978df984a 100755
--- a/tests/nodeos_multiple_version_protocol_feature_test.py
+++ b/tests/nodeos_multiple_version_protocol_feature_test.py
@@ -13,6 +13,13 @@
 from os.path import join, exists
 from datetime import datetime
 
+###############################################################
+# nodeos_multiple_version_protocol_feature_test
+#
+# Test for verifying that older versions of nodeos can work with newer versions of nodeos.
+#
+###############################################################
+
 # Parse command line arguments
 args = TestHelper.parse_args({"-v","--clean-run","--dump-error-details","--leave-running",
                               "--keep-logs", "--alternate-version-labels-file"})
diff --git a/tests/nodeos_protocol_feature_test.py b/tests/nodeos_protocol_feature_test.py
index 98acc405d6b..cced0daa833 100755
--- a/tests/nodeos_protocol_feature_test.py
+++ b/tests/nodeos_protocol_feature_test.py
@@ -11,6 +11,13 @@
 from os.path import join
 from datetime import datetime
 
+###############################################################
+# nodeos_protocol_feature_test
+#
+# Many smaller tests centered around irreversible mode
+#
+###############################################################
+
 # Parse command line arguments
 args = TestHelper.parse_args({"-v","--clean-run","--dump-error-details","--leave-running","--keep-logs"})
 Utils.Debug = args.v
diff --git a/tests/nodeos_run_remote_test.py b/tests/nodeos_run_remote_test.py
index 21e15bb9c72..8b02cabb3e5 100755
--- a/tests/nodeos_run_remote_test.py
+++ b/tests/nodeos_run_remote_test.py
@@ -8,8 +8,10 @@
 
 ###############################################################
 # nodeos_run_remote_test
+#
 #  Tests remote capability of the nodeos_run_test. Test will setup cluster and pass nodes info to nodeos_run_test. E.g.
 #  nodeos_run_remote_test.py -v --clean-run --dump-error-detail
+#
 ###############################################################
 
 Print=Utils.Print
diff --git a/tests/nodeos_run_test.py b/tests/nodeos_run_test.py
index fbe7f8f6d05..90c41dc3485 100755
--- a/tests/nodeos_run_test.py
+++ b/tests/nodeos_run_test.py
@@ -12,8 +12,9 @@
 
 ###############################################################
 # nodeos_run_test
-# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
-# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
+#
+# General test that tests a wide range of general use actions around nodeos and keosd
+#
 ###############################################################
 
 Print=Utils.Print
@@ -244,7 +245,7 @@
         cmdError("FAILURE - transfer failed")
         errorExit("Transfer verification failed. Excepted %s, actual: %s" % (expectedAmount, actualAmount))
 
-    Print("Validating accounts after some user trasactions")
+    Print("Validating accounts after some user transactions")
     accounts=[testeraAccount, currencyAccount, exchangeAccount]
     cluster.validateAccounts(accounts)
 
diff --git a/tests/nodeos_short_fork_take_over_test.py b/tests/nodeos_short_fork_take_over_test.py
index b21172b8766..22b1c1ec7c4 100755
--- a/tests/nodeos_short_fork_take_over_test.py
+++ b/tests/nodeos_short_fork_take_over_test.py
@@ -16,8 +16,11 @@
 
 ###############################################################
 # nodeos_short_fork_take_over_test
-# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
-# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
+#
+# Similar scenario to nodeos_forked_chain_test, except that there are only 3 producers and, after the "bridge" node is
+# shutdown, the second producer node is also shutdown.  Then the "bridge" node is re-started followed by the producer
+# node being started.
+#
 ###############################################################
 Print=Utils.Print
 
diff --git a/tests/nodeos_startup_catchup.py b/tests/nodeos_startup_catchup.py
index 5934750d3a9..1a8c8863e0e 100755
--- a/tests/nodeos_startup_catchup.py
+++ b/tests/nodeos_startup_catchup.py
@@ -17,6 +17,7 @@
 
 ###############################################################
 # nodeos_startup_catchup
+#
 #  Test configures a producing node and <--txn-plugins count> non-producing nodes with the
 #  txn_test_gen_plugin.  Each non-producing node starts generating transactions and sending them
 #  to the producing node.
@@ -26,6 +27,7 @@
 #  4) restart the node
 #  5) the node is allowed to catch up to the producing node
 #  3) Repeat steps 2-5, <--catchup-count - 1> more times
+#
 ###############################################################
 
 Print=Utils.Print
diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index 2c4b79b4e1b..a22382d5bc0 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -13,6 +13,16 @@
 import math
 import re
 
+###############################################################
+# nodeos_under_min_avail_ram
+#
+# Sets up 4 producing nodes using --chain-state-db-guard-size-mb and --chain-state-db-size-mb to verify that nodeos will
+# shutdown safely when --chain-state-db-guard-size-mb is reached and restarts the shutdown nodes, with a higher
+# --chain-state-db-size-mb size, to verify that the node can restart and continue till the guard is reached again. The
+# test both verifies all nodes going down and 1 node at a time.
+#
+###############################################################
+
 Print=Utils.Print
 errorExit=Utils.errorExit
 
@@ -49,12 +59,6 @@ def setName(self, num):
         return retStr
 
 
-###############################################################
-# nodeos_voting_test
-# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
-# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
-###############################################################
-
 args = TestHelper.parse_args({"--dump-error-details","--keep-logs","-v","--leave-running","--clean-run","--wallet-port"})
 Utils.Debug=args.v
 totalNodes=4
@@ -167,9 +171,8 @@ def setName(self, num):
                 if trans is None or not trans[0]:
                     timeOutCount+=1
                     if timeOutCount>=3:
-                       Print("Failed to push create action to eosio contract for %d consecutive times, looks like nodeos already exited." % (timeOutCount))
-                       keepProcessing=False
-                       break
+                       Utils.errorExit("Failed to push create action to eosio contract for %d consecutive times, looks like nodeos already exited." % (timeOutCount))
+
                     Print("Failed to push create action to eosio contract. sleep for 5 seconds")
                     time.sleep(5)
                 else:
diff --git a/tests/nodeos_voting_test.py b/tests/nodeos_voting_test.py
index fad398a860a..a3c157e8027 100755
--- a/tests/nodeos_voting_test.py
+++ b/tests/nodeos_voting_test.py
@@ -13,9 +13,13 @@
 
 ###############################################################
 # nodeos_voting_test
-# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
-# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
+#
+# This test sets up multiple producing nodes, each with multiple producers per node. Different combinations of producers
+# are voted into the production schedule and the block production is analyzed to determine if the correct producers are
+# producing blocks and in the right number and order.
+#
 ###############################################################
+
 class ProducerToNode:
     map={}
 
diff --git a/tests/restart-scenarios-test.py b/tests/restart-scenarios-test.py
index 8d0f8721c10..c8425824d2d 100755
--- a/tests/restart-scenarios-test.py
+++ b/tests/restart-scenarios-test.py
@@ -8,18 +8,12 @@
 import random
 
 ###############################################################
-# Test for different nodes restart scenarios.
-# Nodes can be producing or non-producing.
-# -p <producing nodes count>
-# -c <chain strategy[replay|resync|none]>
-# -s <topology>
-# -d <delay between nodes startup>
-# -v <verbose logging>
-# --kill-sig <kill signal [term|kill]>
-# --kill-count <nodeos instances to kill>
-# --dont-kill <Leave cluster running after test finishes>
-# --dump-error-details <Upon error print etc/eosio/node_*/config.ini and var/lib/node_*/stderr.log to stdout>
-# --keep-logs <Don't delete var/lib/node_* folders upon test completion>
+# restart-scenarios-test
+#
+# Tests restart scenarios for nodeos.  Uses "-c" flag to indicate "replay" (--replay-blockchain), "resync"
+# (--delete-all-blocks), "hardReplay"(--hard-replay-blockchain), and "none" to indicate what kind of restart flag should
+# be used. This is one of the only test that actually verify that nodeos terminates with a good exit status.
+#
 ###############################################################
 
 
diff --git a/tests/validate-dirty-db.py b/tests/validate-dirty-db.py
index afcf2767b73..624ed4e87f6 100755
--- a/tests/validate-dirty-db.py
+++ b/tests/validate-dirty-db.py
@@ -9,7 +9,10 @@
 import signal
 
 ###############################################################
+# validate-dirty-db
+#
 # Test for validating the dirty db flag sticks repeated nodeos restart attempts
+#
 ###############################################################
 
 

From be2d438958d745dd8f002c810597dfae2929c94d Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 25 Jul 2019 13:25:18 -0500
Subject: [PATCH 0883/1648] Adding some time leeway for catchup to occur.

---
 tests/nodeos_startup_catchup.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/nodeos_startup_catchup.py b/tests/nodeos_startup_catchup.py
index 1a8c8863e0e..47cfc2e7b31 100755
--- a/tests/nodeos_startup_catchup.py
+++ b/tests/nodeos_startup_catchup.py
@@ -143,12 +143,13 @@ def waitForNodeStarted(node):
 
     Print("Cycle through catchup scenarios")
     twoRounds=21*2*12
+    twoRoundsTimeout=(twoRounds/2 + 10)  #2 rounds in seconds + some leeway
     for catchup_num in range(0, catchupCount):
         Print("Start catchup node")
         cluster.launchUnstarted(cachePopen=True)
         lastLibNum=lib(node0)
         # verify producer lib is still advancing
-        waitForBlock(node0, lastLibNum+1, timeout=twoRounds/2, blockType=BlockType.lib)
+        waitForBlock(node0, lastLibNum+1, timeout=twoRoundsTimeout, blockType=BlockType.lib)
 
         catchupNode=cluster.getNodes()[-1]
         catchupNodeNum=cluster.getNodes().index(catchupNode)
@@ -157,11 +158,11 @@ def waitForNodeStarted(node):
 
         Print("Verify catchup node %s's LIB is advancing" % (catchupNodeNum))
         # verify lib is advancing (before we wait for it to have to catchup with producer)
-        waitForBlock(catchupNode, lastCatchupLibNum+1, timeout=twoRounds/2, blockType=BlockType.lib)
+        waitForBlock(catchupNode, lastCatchupLibNum+1, timeout=twoRoundsTimeout, blockType=BlockType.lib)
 
         Print("Verify catchup node is advancing to producer")
         numBlocksToCatchup=(lastLibNum-lastCatchupLibNum-1)+twoRounds
-        waitForBlock(catchupNode, lastLibNum, timeout=(numBlocksToCatchup)/2, blockType=BlockType.lib)
+        waitForBlock(catchupNode, lastLibNum, timeout=twoRoundsTimeout, blockType=BlockType.lib)
 
         Print("Shutdown catchup node and validate exit code")
         catchupNode.interruptAndVerifyExitStatus(60)
@@ -173,16 +174,16 @@ def waitForNodeStarted(node):
 
         Print("Verify catchup node is advancing")
         # verify catchup node is advancing to producer
-        waitForBlock(catchupNode, lastCatchupLibNum+1, timeout=twoRounds/2, blockType=BlockType.lib)
+        waitForBlock(catchupNode, lastCatchupLibNum+1, timeout=twoRoundsTimeout, blockType=BlockType.lib)
 
         Print("Verify producer is still advancing LIB")
         lastLibNum=lib(node0)
         # verify producer lib is still advancing
-        node0.waitForBlock(lastLibNum+1, timeout=twoRounds/2, blockType=BlockType.lib)
+        node0.waitForBlock(lastLibNum+1, timeout=twoRoundsTimeout, blockType=BlockType.lib)
 
         Print("Verify catchup node is advancing to producer")
         # verify catchup node is advancing to producer
-        waitForBlock(catchupNode, lastLibNum, timeout=(numBlocksToCatchup)/2, blockType=BlockType.lib)
+        waitForBlock(catchupNode, lastLibNum, timeout=(numBlocksToCatchup/2 + 60), blockType=BlockType.lib)
         catchupNode.interruptAndVerifyExitStatus(60)
         catchupNode.popenProc=None
 

From 34cea56a7f0c0cc0f09205717ecb551b7addc74e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 09:07:31 -0500
Subject: [PATCH 0884/1648] Make unapplied_transaction_queue responsible for
 tracking db_read_mode

---
 .../chain/unapplied_transaction_queue.hpp      | 18 ++++++++++++++----
 plugins/producer_plugin/producer_plugin.cpp    |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 65f56b31481..51689d0353d 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -7,6 +7,7 @@
 
 #include <eosio/chain/transaction_metadata.hpp>
 #include <eosio/chain/block_state.hpp>
+#include <eosio/chain/controller.hpp>
 #include <eosio/chain/exceptions.hpp>
 
 #include <boost/multi_index_container.hpp>
@@ -46,7 +47,7 @@ struct unapplied_transaction {
 
 /**
  * Track unapplied transactions for persisted, forked blocks, and aborted blocks.
- * Persisted to first so that they can be applied in each block until expired.
+ * Persisted are first so that they can be applied in each block until expired.
  */
 class unapplied_transaction_queue {
 
@@ -65,17 +66,25 @@ class unapplied_transaction_queue {
    > unapplied_trx_queue_type;
 
    unapplied_trx_queue_type queue;
+   db_read_mode read_mode = db_read_mode::SPECULATIVE;
    bool only_track_persisted = false;
 
 public:
 
    void set_only_track_persisted( bool v ) {
       if( v ) {
-         FC_ASSERT( empty(), "set_only_track_persisted queue required to be empty" );
+         FC_ASSERT( empty(), "set_only_track_persisted, queue required to be empty" );
       }
       only_track_persisted = v;
    }
 
+   void set_chain_read_mode( db_read_mode mode ) {
+      if( mode != read_mode ) {
+         FC_ASSERT( empty(), "set_chain_read_mode, queue required to be empty" );
+      }
+      read_mode = mode;
+   }
+
    bool empty() const {
       return queue.empty();
    }
@@ -119,7 +128,7 @@ class unapplied_transaction_queue {
    }
 
    void add_forked( const branch_type& forked_branch ) {
-      if( only_track_persisted ) return;
+      if( only_track_persisted || read_mode != db_read_mode::SPECULATIVE ) return;
       // forked_branch is in reverse order
       for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
          const block_state_ptr& bsptr = *ritr;
@@ -132,7 +141,7 @@ class unapplied_transaction_queue {
    }
 
    void add_aborted( std::vector<transaction_metadata_ptr> aborted_trxs ) {
-      if( aborted_trxs.empty() || only_track_persisted ) return;
+      if( only_track_persisted || read_mode != db_read_mode::SPECULATIVE || aborted_trxs.empty() ) return;
       for( auto& trx : aborted_trxs ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
          queue.insert( { std::move( trx ), expiry, trx_enum_type::aborted } );
@@ -140,6 +149,7 @@ class unapplied_transaction_queue {
    }
 
    void add_persisted( const transaction_metadata_ptr& trx ) {
+      if( read_mode != db_read_mode::SPECULATIVE ) return;
       auto itr = queue.get<by_trx_id>().find( trx->id() );
       if( itr == queue.get<by_trx_id>().end() ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index ab7b7bcc9bd..83d073f302b 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -846,6 +846,7 @@ void producer_plugin::plugin_startup()
    ilog("producer plugin:  plugin_startup() begin");
 
    chain::controller& chain = my->chain_plug->chain();
+   my->_unapplied_transactions.set_chain_read_mode( chain.get_read_mode() );
    EOS_ASSERT( my->_producers.empty() || chain.get_read_mode() == chain::db_read_mode::SPECULATIVE, plugin_config_exception,
               "node cannot have any producer-name configured because block production is impossible when read_mode is not \"speculative\"" );
 

From 375232119dc231c01e24256a12fbaea3095f855b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 09:10:57 -0500
Subject: [PATCH 0885/1648] Change abort_block to always return applied
 transactions since unapplied_transaction_queue will determine if they should
 be used or not

---
 libraries/chain/controller.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 33d7a05d55e..097e960d803 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1980,9 +1980,7 @@ struct controller_impl {
    vector<transaction_metadata_ptr> abort_block() {
       vector<transaction_metadata_ptr> applied_trxs;
       if( pending ) {
-         if ( read_mode == db_read_mode::SPECULATIVE ) {
-            applied_trxs = pending->extract_trx_metas();
-         }
+         applied_trxs = pending->extract_trx_metas();
          pending.reset();
          protocol_features.popped_blocks_to( head->block_num );
       }

From 5e0dc6d7062d415f351516782586b117b00ac912 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 26 Jul 2019 12:03:16 -0400
Subject: [PATCH 0886/1648] address more PR feedback

refactored the wtmsig tests so that they are only testing that those authorities work.
added a utility to produce blocks (with a limit) until a set of BPs has been seen
---
 .../state_history_plugin_abi.cpp              |   2 +-
 unittests/fork_test_utilities.cpp             |  47 +++++---
 unittests/fork_test_utilities.hpp             |  12 +-
 unittests/forked_tests.cpp                    |  20 +--
 unittests/producer_schedule_tests.cpp         | 114 +++---------------
 unittests/protocol_feature_tests.cpp          |   7 +-
 6 files changed, 73 insertions(+), 129 deletions(-)

diff --git a/plugins/state_history_plugin/state_history_plugin_abi.cpp b/plugins/state_history_plugin/state_history_plugin_abi.cpp
index 338dc867852..541dc4a6262 100644
--- a/plugins/state_history_plugin/state_history_plugin_abi.cpp
+++ b/plugins/state_history_plugin/state_history_plugin_abi.cpp
@@ -313,7 +313,7 @@ extern const char* const state_history_plugin_abi = R"({
         },
         {
             "name": "block_signing_authority_v0", "fields": [
-                { "type": "uint32", "name": "weight" },
+                { "type": "uint32", "name": "threshold" },
                 { "type": "key_weight[]", "name": "keys" }
             ]
         },
diff --git a/unittests/fork_test_utilities.cpp b/unittests/fork_test_utilities.cpp
index d63404de983..55e4fdf2d4e 100644
--- a/unittests/fork_test_utilities.cpp
+++ b/unittests/fork_test_utilities.cpp
@@ -21,22 +21,39 @@ void push_blocks( tester& from, tester& to, uint32_t block_num_limit ) {
    }
 }
 
-bool produce_empty_blocks_until( tester& t,
-                                 account_name last_producer,
-                                 account_name next_producer,
-                                 uint32_t max_num_blocks_to_produce )
-{
-   auto condition_satisfied = [&t, last_producer, next_producer]() {
-      return t.control->pending_block_producer() == next_producer && t.control->head_block_producer() == last_producer;
-   };
+namespace {
+   template<typename Pred>
+   bool produce_empty_blocks_until( base_tester& t, uint32_t max_num_blocks_to_produce, Pred&& pred) {
+      for( uint32_t blocks_produced = 0;
+           blocks_produced < max_num_blocks_to_produce;
+           t.produce_block(), ++blocks_produced )
+      {
+         if( pred() )
+            return true;
+      }
 
-   for( uint32_t blocks_produced = 0;
-        blocks_produced < max_num_blocks_to_produce;
-        t.produce_block(), ++blocks_produced )
-   {
-      if( condition_satisfied() )
-         return true;
+      return pred();
    }
+}
+
+bool produce_until_transition( base_tester& t,
+                               account_name last_producer,
+                               account_name next_producer,
+                               uint32_t max_num_blocks_to_produce )
+{
+   return produce_empty_blocks_until(t, max_num_blocks_to_produce, [&t, last_producer, next_producer]() {
+      return t.control->pending_block_producer() == next_producer && t.control->head_block_producer() == last_producer;
+   });
+}
 
-   return condition_satisfied();
+bool produce_until_blocks_from( base_tester& t,
+                                const std::set<account_name>& expected_producers,
+                                uint32_t max_num_blocks_to_produce )
+{
+   auto remaining_producers = expected_producers;
+   return produce_empty_blocks_until(t, max_num_blocks_to_produce, [&t, &remaining_producers]() {
+      remaining_producers.erase(t.control->head_block_producer());
+      return remaining_producers.size() == 0;
+   });
 }
+
diff --git a/unittests/fork_test_utilities.hpp b/unittests/fork_test_utilities.hpp
index f5ae33ae718..0739ffc9378 100644
--- a/unittests/fork_test_utilities.hpp
+++ b/unittests/fork_test_utilities.hpp
@@ -15,7 +15,11 @@ public_key_type  get_public_key( name keyname, string role );
 
 void push_blocks( tester& from, tester& to, uint32_t block_num_limit = std::numeric_limits<uint32_t>::max() );
 
-bool produce_empty_blocks_until( tester& t,
-                                 account_name last_producer,
-                                 account_name next_producer,
-                                 uint32_t max_num_blocks_to_produce = std::numeric_limits<uint32_t>::max() );
+bool produce_until_transition( base_tester& t,
+                               account_name last_producer,
+                               account_name next_producer,
+                               uint32_t max_num_blocks_to_produce = std::numeric_limits<uint32_t>::max() );
+
+bool produce_until_blocks_from( base_tester& t,
+                                const std::set<account_name>& expected_producers,
+                                uint32_t max_num_blocks_to_produce = std::numeric_limits<uint32_t>::max() );
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 902d09a62e8..ece1fb09329 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE( fork_with_bad_block ) try {
    auto res = bios.set_producers( {N(a),N(b),N(c),N(d),N(e)} );
 
    // run until the producers are installed and its the start of "a's" round
-   BOOST_REQUIRE( produce_empty_blocks_until( bios, N(e), N(a) ) );
+   BOOST_REQUIRE( produce_until_transition( bios, N(e), N(a) ) );
 
    // sync remote node
    tester remote(setup_policy::none);
@@ -420,14 +420,14 @@ BOOST_AUTO_TEST_CASE( irreversible_mode ) try {
    main.produce_block();
    main.set_producers( {N(producer1), N(producer2)} );
    main.produce_block();
-   BOOST_REQUIRE( produce_empty_blocks_until( main, N(producer1), N(producer2), 26) );
+   BOOST_REQUIRE( produce_until_transition( main, N(producer1), N(producer2), 26) );
 
    main.create_accounts( {N(alice)} );
    main.produce_block();
    auto hbn1 = main.control->head_block_num();
    auto lib1 = main.control->last_irreversible_block_num();
 
-   BOOST_REQUIRE( produce_empty_blocks_until( main, N(producer2), N(producer1), 11) );
+   BOOST_REQUIRE( produce_until_transition( main, N(producer2), N(producer1), 11) );
 
    auto hbn2 = main.control->head_block_num();
    auto lib2 = main.control->last_irreversible_block_num();
@@ -439,8 +439,8 @@ BOOST_AUTO_TEST_CASE( irreversible_mode ) try {
    push_blocks( main, other );
    BOOST_CHECK_EQUAL( other.control->head_block_num(), hbn2 );
 
-   BOOST_REQUIRE( produce_empty_blocks_until( main, N(producer1), N(producer2), 12) );
-   BOOST_REQUIRE( produce_empty_blocks_until( main, N(producer2), N(producer1), 12) );
+   BOOST_REQUIRE( produce_until_transition( main, N(producer1), N(producer2), 12) );
+   BOOST_REQUIRE( produce_until_transition( main, N(producer2), N(producer1), 12) );
 
    auto hbn3 = main.control->head_block_num();
    auto lib3 = main.control->last_irreversible_block_num();
@@ -457,15 +457,15 @@ BOOST_AUTO_TEST_CASE( irreversible_mode ) try {
    auto fork_first_block_id = other.control->head_block_id();
    wlog( "{w}", ("w", fork_first_block_id));
 
-   BOOST_REQUIRE( produce_empty_blocks_until( other, N(producer2), N(producer1), 11) ); // finish producer2's round
+   BOOST_REQUIRE( produce_until_transition( other, N(producer2), N(producer1), 11) ); // finish producer2's round
    BOOST_REQUIRE_EQUAL( other.control->pending_block_producer().to_string(), "producer1" );
 
    // Repeat two more times to ensure other has a longer chain than main
    other.produce_block( fc::milliseconds( 13 * config::block_interval_ms ) ); // skip over producer1's round
-   BOOST_REQUIRE( produce_empty_blocks_until( other, N(producer2), N(producer1), 11) ); // finish producer2's round
+   BOOST_REQUIRE( produce_until_transition( other, N(producer2), N(producer1), 11) ); // finish producer2's round
 
    other.produce_block( fc::milliseconds( 13 * config::block_interval_ms ) ); // skip over producer1's round
-   BOOST_REQUIRE( produce_empty_blocks_until( other, N(producer2), N(producer1), 11) ); // finish producer2's round
+   BOOST_REQUIRE( produce_until_transition( other, N(producer2), N(producer1), 11) ); // finish producer2's round
 
    auto hbn4 = other.control->head_block_num();
    auto lib4 = other.control->last_irreversible_block_num();
@@ -529,9 +529,9 @@ BOOST_AUTO_TEST_CASE( reopen_forkdb ) try {
 
    BOOST_REQUIRE_EQUAL( c1.control->active_producers().version, 1u );
 
-   produce_empty_blocks_until( c1, N(carol), N(alice) );
+   produce_until_transition( c1, N(carol), N(alice) );
    c1.produce_block();
-   produce_empty_blocks_until( c1, N(carol), N(alice) );
+   produce_until_transition( c1, N(carol), N(alice) );
 
    tester c2(setup_policy::none);
 
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index a9d7ed82faf..678d2a50c28 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -437,9 +437,9 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
    BOOST_REQUIRE_EQUAL( c.control->active_producers().version, 1u );
    BOOST_CHECK_EQUAL( true, compare_schedules( sch1, c.control->active_producers() ) );
 
-   produce_empty_blocks_until( c, N(carol), N(alice) );
+   produce_until_transition( c, N(carol), N(alice) );
    c.produce_block();
-   produce_empty_blocks_until( c, N(carol), N(alice) );
+   produce_until_transition( c, N(carol), N(alice) );
 
    res = c.set_producers( {N(alice),N(bob)} );
    vector<producer_authority> sch2 = {
@@ -450,16 +450,16 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
    BOOST_CHECK_EQUAL( true, compare_schedules( sch2, *c.control->proposed_producers() ) );
 
-   produce_empty_blocks_until( c, N(bob), N(carol) );
-   produce_empty_blocks_until( c, N(alice), N(bob) );
+   produce_until_transition( c, N(bob), N(carol) );
+   produce_until_transition( c, N(alice), N(bob) );
    BOOST_CHECK_EQUAL( c.control->pending_producers().version, 2u );
    BOOST_CHECK_EQUAL( c.control->active_producers().version, 1u );
 
-   produce_empty_blocks_until( c, N(carol), N(alice) );
+   produce_until_transition( c, N(carol), N(alice) );
    BOOST_CHECK_EQUAL( c.control->pending_producers().version, 2u );
    BOOST_CHECK_EQUAL( c.control->active_producers().version, 1u );
 
-   produce_empty_blocks_until( c, N(bob), N(carol) );
+   produce_until_transition( c, N(bob), N(carol) );
    BOOST_CHECK_EQUAL( c.control->pending_block_producer(), N(carol) );
    BOOST_REQUIRE_EQUAL( c.control->active_producers().version, 2u );
 
@@ -474,15 +474,15 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
    BOOST_REQUIRE_EQUAL( true, c.control->proposed_producers().valid() );
    BOOST_CHECK_EQUAL( true, compare_schedules( sch1, *c.control->proposed_producers() ) );
 
-   produce_empty_blocks_until( c, N(bob), N(alice) );
-   produce_empty_blocks_until( c, N(alice), N(bob) );
+   produce_until_transition( c, N(bob), N(alice) );
+   produce_until_transition( c, N(alice), N(bob) );
    BOOST_CHECK_EQUAL( c.control->pending_producers().version, 3u );
    BOOST_REQUIRE_EQUAL( c.control->active_producers().version, 2u );
 
-   produce_empty_blocks_until( c, N(bob), N(alice) );
+   produce_until_transition( c, N(bob), N(alice) );
    BOOST_REQUIRE_EQUAL( c.control->active_producers().version, 3u );
 
-   produce_empty_blocks_until( c, N(alice), N(bob) );
+   produce_until_transition( c, N(alice), N(bob) );
    c.produce_blocks(11);
    BOOST_CHECK_EQUAL( c.control->pending_block_producer(), N(bob) );
    c.finish_block();
@@ -499,19 +499,13 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
    BOOST_CHECK_EQUAL( h.producer, N(carol) );
    BOOST_CHECK_EQUAL( h.confirmed,  confirmed );
 
-   produce_empty_blocks_until( c, N(carol), N(alice) );
+   produce_until_transition( c, N(carol), N(alice) );
 
 } FC_LOG_AND_RETHROW()
 
 BOOST_FIXTURE_TEST_CASE( producer_one_of_n_test, TESTER ) try {
    create_accounts( {N(alice),N(bob)} );
-   while (control->head_block_num() < 3) {
-      produce_block();
-   }
-
-   auto compare_schedules = [&]( const vector<producer_authority>& a, const producer_authority_schedule& b ) {
-      return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
-   };
+   produce_block();
 
    vector<producer_authority> sch1 = {
                                  producer_authority{N(alice), block_signing_authority_v0{1, {{get_public_key(N(alice), "bs1"), 1}, {get_public_key(N(alice), "bs2"), 1}}}},
@@ -522,50 +516,15 @@ BOOST_FIXTURE_TEST_CASE( producer_one_of_n_test, TESTER ) try {
    block_signing_private_keys.emplace(get_public_key(N(alice), "bs1"), get_private_key(N(alice), "bs1"));
    block_signing_private_keys.emplace(get_public_key(N(bob),   "bs1"), get_private_key(N(bob),   "bs1"));
 
-   //wdump((fc::json::to_pretty_string(res)));
-   wlog("set producer schedule to [alice,bob]");
-   BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
-   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, *control->proposed_producers() ) );
-   BOOST_CHECK_EQUAL( control->pending_producers().version, 0u );
-   produce_block(); // Starts new block which promotes the proposed schedule to pending
-   BOOST_CHECK_EQUAL( control->pending_producers().version, 1u );
-   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, control->pending_producers() ) );
-   BOOST_CHECK_EQUAL( control->active_producers().version, 0u );
-   produce_block();
-   produce_block(); // Starts new block which promotes the pending schedule to active
-   BOOST_CHECK_EQUAL( control->active_producers().version, 1u );
-   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, control->active_producers() ) );
-   produce_blocks(18);
-
-   // fast forward until the first block of alices round
-   BOOST_REQUIRE_EQUAL( control->head_block_producer(),    N(bob) );
-   BOOST_REQUIRE_EQUAL( control->pending_block_producer(), N(alice) );
-
-   // produce with backup key by listing that in block signing keys
-   block_signing_private_keys.clear();
-   block_signing_private_keys.emplace(get_public_key(N(alice), "bs2"), get_private_key(N(alice), "bs2"));
-   block_signing_private_keys.emplace(get_public_key(N(bob),   "bs2"), get_private_key(N(bob),   "bs2"));
-
-   produce_blocks(config::producer_repetitions, false);
-
-   // check that its bobs turn
-   BOOST_REQUIRE_EQUAL( control->head_block_producer(),    N(alice) );
-   BOOST_REQUIRE_EQUAL( control->pending_block_producer(), N(bob) );
-
-   produce_blocks(config::producer_repetitions, false);
+   BOOST_REQUIRE(produce_until_blocks_from(*this, {N(alice), N(bob)}, 300));
 
    BOOST_REQUIRE_EQUAL( validate(), true );
 } FC_LOG_AND_RETHROW()
 
 BOOST_FIXTURE_TEST_CASE( producer_m_of_n_test, TESTER ) try {
    create_accounts( {N(alice),N(bob)} );
-   while (control->head_block_num() < 3) {
-      produce_block();
-   }
+   produce_block();
 
-   auto compare_schedules = [&]( const vector<producer_authority>& a, const producer_authority_schedule& b ) {
-      return std::equal( a.begin(), a.end(), b.producers.begin(), b.producers.end() );
-   };
 
    vector<producer_authority> sch1 = {
                                  producer_authority{N(alice), block_signing_authority_v0{2, {{get_public_key(N(alice), "bs1"), 1}, {get_public_key(N(alice), "bs2"), 1}}}},
@@ -578,45 +537,14 @@ BOOST_FIXTURE_TEST_CASE( producer_m_of_n_test, TESTER ) try {
    block_signing_private_keys.emplace(get_public_key(N(bob),   "bs1"), get_private_key(N(bob),   "bs1"));
    block_signing_private_keys.emplace(get_public_key(N(bob),   "bs2"), get_private_key(N(bob),   "bs2"));
 
-   //wdump((fc::json::to_pretty_string(res)));
-   wlog("set producer schedule to [alice,bob]");
-   BOOST_REQUIRE_EQUAL( true, control->proposed_producers().valid() );
-   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, *control->proposed_producers() ) );
-   BOOST_CHECK_EQUAL( control->pending_producers().version, 0u );
-   produce_block(); // Starts new block which promotes the proposed schedule to pending
-   BOOST_CHECK_EQUAL( control->pending_producers().version, 1u );
-   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, control->pending_producers() ) );
-   BOOST_CHECK_EQUAL( control->active_producers().version, 0u );
-   produce_block();
-   produce_block(); // Starts new block which promotes the pending schedule to active
-   BOOST_CHECK_EQUAL( control->active_producers().version, 1u );
-   BOOST_CHECK_EQUAL( true, compare_schedules( sch1, control->active_producers() ) );
-   produce_blocks(18);
-
-   // fast forward until the first block of alices round
-   BOOST_REQUIRE_EQUAL( control->head_block_producer(),    N(bob) );
-   BOOST_REQUIRE_EQUAL( control->pending_block_producer(), N(alice) );
-
-   BOOST_REQUIRE_EQUAL( control->head_block_state()->additional_signatures.size(), 1);
-
-   produce_blocks(config::producer_repetitions, false);
-
-   BOOST_REQUIRE_EQUAL( control->head_block_state()->additional_signatures.size(), 1);
-
-      // check that its bobs turn
-   BOOST_REQUIRE_EQUAL( control->head_block_producer(),    N(alice) );
-   BOOST_REQUIRE_EQUAL( control->pending_block_producer(), N(bob) );
-
-   produce_blocks(config::producer_repetitions, false);
+   BOOST_REQUIRE(produce_until_blocks_from(*this, {N(alice), N(bob)}, 300));
 
    BOOST_REQUIRE_EQUAL( validate(), true );
 } FC_LOG_AND_RETHROW()
 
 BOOST_FIXTURE_TEST_CASE( satisfiable_msig_test, TESTER ) try {
    create_accounts( {N(alice),N(bob)} );
-   while (control->head_block_num() < 3) {
-      produce_block();
-   }
+   produce_block();
 
    vector<producer_authority> sch1 = {
            producer_authority{N(alice), block_signing_authority_v0{2, {{get_public_key(N(alice), "bs1"), 1}}}}
@@ -633,10 +561,8 @@ BOOST_FIXTURE_TEST_CASE( satisfiable_msig_test, TESTER ) try {
 } FC_LOG_AND_RETHROW()
 
 BOOST_FIXTURE_TEST_CASE( duplicate_producers_test, TESTER ) try {
-   create_accounts( {N(alice),N(bob)} );
-   while (control->head_block_num() < 3) {
-      produce_block();
-   }
+   create_accounts( {N(alice)} );
+   produce_block();
 
    vector<producer_authority> sch1 = {
            producer_authority{N(alice), block_signing_authority_v0{1, {{get_public_key(N(alice), "bs1"), 1}}}},
@@ -655,9 +581,7 @@ BOOST_FIXTURE_TEST_CASE( duplicate_producers_test, TESTER ) try {
 
 BOOST_FIXTURE_TEST_CASE( duplicate_keys_test, TESTER ) try {
    create_accounts( {N(alice),N(bob)} );
-   while (control->head_block_num() < 3) {
-      produce_block();
-   }
+   produce_block();
 
    vector<producer_authority> sch1 = {
            producer_authority{N(alice), block_signing_authority_v0{2, {{get_public_key(N(alice), "bs1"), 1}, {get_public_key(N(alice), "bs1"), 1}}}}
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index 499bffa84f4..730f58bb227 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -53,8 +53,7 @@ BOOST_AUTO_TEST_CASE( activate_preactivate_feature ) try {
    c.produce_block();
 
    // Now the latest bios contract can be set.
-   c.set_code( config::system_account_name, contracts::before_producer_authority_eosio_bios_wasm() );
-   c.set_abi( config::system_account_name, contracts::before_producer_authority_eosio_bios_abi().data() );
+   c.set_before_producer_authority_bios_contract();
 
    c.produce_block();
 
@@ -769,7 +768,7 @@ BOOST_AUTO_TEST_CASE( disallow_empty_producer_schedule_test ) { try {
    // After activation, it should not be allowed
    c.preactivate_protocol_features( {*d} );
    c.produce_block();
-   BOOST_REQUIRE_EXCEPTION( c.set_producers( {} ),
+   BOOST_REQUIRE_EXCEPTION( c.set_producers_legacy( {} ),
                             wasm_execution_error,
                             fc_exception_message_is( "Producer schedule cannot be empty" ) );
 
@@ -1666,7 +1665,7 @@ BOOST_AUTO_TEST_CASE( producer_schedule_change_extension_test ) { try {
       auto sig_digest = digest_type::hash( std::make_pair(header_bmroot, remote.control->head_block_state()->pending_schedule.schedule_hash) );
       bad_block->producer_signature = remote.get_private_key(N(eosio), "active").sign(sig_digest);
 
-      // ensure it is accepted (but rejected because it doesn't match expected state)
+      // ensure it is rejected because the new_producers field is not null
       BOOST_REQUIRE_EXCEPTION(
          remote.push_block(bad_block), producer_schedule_exception,
          fc_exception_message_is( "Block header contains legacy producer schedule outdated by activation of WTMsig Block Signatures" )

From e9b6775df395157f79229d98a23d9890299efd84 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 11:52:36 -0500
Subject: [PATCH 0887/1648] Modify push_block to take a forked transactions
 callback so that previously applied transactions can be added to the
 unapplied_transaction_queue as they are popped. This allows the transactions
 to be removed from the unapplied_transaction_queue as they are applied in
 apply_block. Before they were added after the apply which would require
 re-attempting to apply them when processing unapplied_tranactions

---
 libraries/chain/controller.cpp                | 28 ++++++++-----------
 .../chain/include/eosio/chain/controller.hpp  |  5 ++--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 097e960d803..df8e6e4768d 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -690,7 +690,7 @@ struct controller_impl {
               pending_head = fork_db.pending_head()
          ) {
             wlog( "applying branch from fork database ending with block: ${id}", ("id", pending_head->id) );
-            maybe_switch_forks( pending_head, controller::block_status::complete );
+            maybe_switch_forks( pending_head, controller::block_status::complete, forked_trxs_callback() );
          }
       }
 
@@ -1820,7 +1820,7 @@ struct controller_impl {
       } );
    }
 
-   branch_type push_block( std::future<block_state_ptr>& block_state_future ) {
+   void push_block( std::future<block_state_ptr>& block_state_future, const forked_trxs_callback& forked_trxs_cb ) {
       controller::block_status s = controller::block_status::complete;
       EOS_ASSERT(!pending, block_validate_exception, "it is not valid to push a block when there is a pending block");
 
@@ -1842,10 +1842,9 @@ struct controller_impl {
          emit( self.accepted_block_header, bsp );
 
          if( read_mode != db_read_mode::IRREVERSIBLE ) {
-            return maybe_switch_forks( fork_db.pending_head(), s );
+            maybe_switch_forks( fork_db.pending_head(), s, forked_trxs_cb );
          } else {
             log_irreversible();
-            return {};
          }
 
       } FC_LOG_AND_RETHROW( )
@@ -1895,15 +1894,14 @@ struct controller_impl {
          } else {
             EOS_ASSERT( read_mode != db_read_mode::IRREVERSIBLE, block_validate_exception,
                         "invariant failure: cannot replay reversible blocks while in irreversible mode" );
-            maybe_switch_forks( bsp, s );
+            maybe_switch_forks( bsp, s, forked_trxs_callback() );
          }
 
       } FC_LOG_AND_RETHROW( )
    }
 
-   branch_type maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s ) {
+   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s, const forked_trxs_callback& forked_trxs_cb ) {
       bool head_changed = true;
-      branch_type unapplied_branch;
       if( new_head->header.previous == head->id ) {
          try {
             apply_block( new_head, s );
@@ -1920,8 +1918,11 @@ struct controller_impl {
          auto branches = fork_db.fetch_branch_from( new_head->id, head->id );
 
          if( branches.second.size() > 0 ) {
-            for( auto itr = branches.second.begin(); itr != branches.second.end(); ++itr ) {
+            // forked branches are in reverse order of how they were applied, signal callback in the order applied
+            for( auto ritr = branches.second.rbegin(), rend = branches.second.rend(); ritr != rend; ++ritr ) {
+               const block_state_ptr& bsptr = *ritr;
                pop_block();
+               forked_trxs_cb( bsptr->trxs );
             }
             EOS_ASSERT( self.head_block_id() == branches.second.back()->header.previous, fork_database_exception,
                      "loss of sync between fork_db and chainbase during fork switch" ); // _should_ never fail
@@ -1944,7 +1945,7 @@ struct controller_impl {
                // Remove the block that threw and all forks built off it.
                fork_db.remove( (*ritr)->id );
 
-               // pop all blocks from the bad fork
+               // pop all blocks from the bad fork, discarding their transactions
                // ritr base is a forward itr to the last block successfully applied
                auto applied_itr = ritr.base();
                for( auto itr = applied_itr; itr != branches.first.end(); ++itr ) {
@@ -1962,10 +1963,6 @@ struct controller_impl {
             } // end if exception
          } /// end for each block in branch
 
-         if ( read_mode == db_read_mode::SPECULATIVE ) {
-            unapplied_branch = std::move( branches.second );
-         }
-
          ilog("successfully switched fork to new head ${new_head_id}", ("new_head_id", new_head->id));
       } else {
          head_changed = false;
@@ -1974,7 +1971,6 @@ struct controller_impl {
       if( head_changed )
          log_irreversible();
 
-      return unapplied_branch;
    } /// push_block
 
    vector<transaction_metadata_ptr> abort_block() {
@@ -2503,10 +2499,10 @@ std::future<block_state_ptr> controller::create_block_state_future( const signed
    return my->create_block_state_future( b );
 }
 
-branch_type controller::push_block( std::future<block_state_ptr>& block_state_future ) {
+void controller::push_block( std::future<block_state_ptr>& block_state_future, const forked_trxs_callback& forked_trxs_cb ) {
    validate_db_available_size();
    validate_reversible_available_size();
-   return my->push_block( block_state_future );
+   my->push_block( block_state_future, forked_trxs_cb );
 }
 
 transaction_trace_ptr controller::push_transaction( const transaction_metadata_ptr& trx, fc::time_point deadline, uint32_t billed_cpu_time_us ) {
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 3a3ff2550f1..f3529d71a59 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -36,6 +36,7 @@ namespace eosio { namespace chain {
    class account_object;
    using resource_limits::resource_limits_manager;
    using apply_handler = std::function<void(apply_context&)>;
+   using forked_trxs_callback = std::function<void(const std::vector<transaction_metadata_ptr>&)>;
 
    class fork_database;
 
@@ -151,9 +152,9 @@ namespace eosio { namespace chain {
 
          /**
           * @param block_state_future provide from call to create_block_state_future
-          * @return branch of unapplied blocks from fork switch
+          * @param cb calls cb with forked applied transactions for each forked block
           */
-         branch_type push_block( std::future<block_state_ptr>& block_state_future );
+         void push_block( std::future<block_state_ptr>& block_state_future, const forked_trxs_callback& cb );
 
          boost::asio::io_context& get_thread_pool();
 

From f8706ea8bd7a458dd996af3fb05f52543fd1f262 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 12:09:52 -0500
Subject: [PATCH 0888/1648] Modified add_forked to take a vector of
 transaction_metadata_ptr instead of a branch_type since each forked block is
 added individually now

---
 .../chain/unapplied_transaction_queue.hpp     | 13 +++----
 .../unapplied_transaction_queue_tests.cpp     | 36 +++++++++++++------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 51689d0353d..a6e785fab67 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -127,16 +127,11 @@ class unapplied_transaction_queue {
       }
    }
 
-   void add_forked( const branch_type& forked_branch ) {
+   void add_forked( const std::vector<transaction_metadata_ptr>& forked_trxs ) {
       if( only_track_persisted || read_mode != db_read_mode::SPECULATIVE ) return;
-      // forked_branch is in reverse order
-      for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
-         const block_state_ptr& bsptr = *ritr;
-         for( auto itr = bsptr->trxs.begin(), end = bsptr->trxs.end(); itr != end; ++itr ) {
-            const auto& trx = *itr;
-            fc::time_point expiry = trx->packed_trx()->expiration();
-            queue.insert( { trx, expiry, trx_enum_type::forked } );
-         }
+      for( const auto& trx : forked_trxs ) {
+         fc::time_point expiry = trx->packed_trx()->expiration();
+         queue.insert( { trx, expiry, trx_enum_type::forked } );
       }
    }
 
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index 4a69f4954ed..d30861f90fb 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -128,7 +128,10 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    bs2->trxs = { trx3, trx4, trx5 };
    auto bs3 = std::make_shared<block_state>();
    bs3->trxs = { trx6 };
-   q.add_forked( { bs3, bs2, bs1, bs1 } ); // bs1 duplicate ignored
+   q.add_forked( bs1->trxs );
+   q.add_forked( bs1->trxs );  // bs1 duplicate ignored
+   q.add_forked( bs2->trxs );
+   q.add_forked( bs3->trxs );
    BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 5 );
@@ -148,9 +151,10 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    // fifo forked
    auto bs4 = std::make_shared<block_state>();
    bs4->trxs = { trx7 };
-   q.add_forked( { bs1 } );
-   q.add_forked( { bs3, bs2 } );
-   q.add_forked( { bs4 } );
+   q.add_forked( bs1->trxs );
+   q.add_forked( bs2->trxs );
+   q.add_forked( bs3->trxs );
+   q.add_forked( bs4->trxs );
    BOOST_CHECK( q.size() == 7 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 6 );
@@ -184,10 +188,14 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    auto bs6 = std::make_shared<block_state>();
    bs5->trxs = { trx11, trx12, trx13 };
    bs6->trxs = { trx11, trx15 };
-   q.add_forked( { bs3, bs2, bs1 } );
-   q.add_forked( { bs4 } );
-   q.add_forked( { bs3, bs2 } ); // dups removed
-   q.add_forked( { bs6, bs5 } );
+   q.add_forked( bs1->trxs );
+   q.add_forked( bs2->trxs );
+   q.add_forked( bs3->trxs );
+   q.add_forked( bs4->trxs );
+   q.add_forked( bs3->trxs ); // dups not added
+   q.add_forked( bs2->trxs ); // dups not added
+   q.add_forked( bs5->trxs );
+   q.add_forked( bs6->trxs );
    BOOST_CHECK_EQUAL( q.size(), 11 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 10 );
@@ -215,12 +223,16 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_CHECK( q.empty() );
 
    // altogether, order fifo: persisted, forked, aborted
-   q.add_forked( { bs3, bs2, bs1 } );
+   q.add_forked( bs1->trxs );
+   q.add_forked( bs2->trxs );
+   q.add_forked( bs3->trxs );
    q.add_persisted( trx16 );
    q.add_aborted( { trx9, trx14 } );
    q.add_persisted( trx8 );
    q.add_aborted( { trx18, trx19 } );
-   q.add_forked( { bs6, bs5, bs4 } );
+   q.add_forked( bs4->trxs);
+   q.add_forked( bs5->trxs );
+   q.add_forked( bs6->trxs );
    BOOST_CHECK( q.size() == 17 );
    BOOST_REQUIRE( next( q ) == trx16 );
    BOOST_CHECK( q.size() == 16 );
@@ -259,7 +271,9 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
-   q.add_forked( { bs3, bs2, bs1 } );
+   q.add_forked( bs1->trxs );
+   q.add_forked( bs2->trxs );
+   q.add_forked( bs3->trxs );
    q.add_aborted( { trx9, trx11 } );
    q.add_persisted( trx8 );
    q.clear();

From 66c77ffb7ed4564746a50c6e278ade5e71f5c785 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 12:10:32 -0500
Subject: [PATCH 0889/1648] push_block now takes a forked_trxs_callback

---
 plugins/producer_plugin/producer_plugin.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 83d073f302b..83718be47d3 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -21,6 +21,7 @@
 
 #include <iostream>
 #include <algorithm>
+#include <functional>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/function_output_iterator.hpp>
@@ -364,7 +365,9 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          // push the new block
          bool except = false;
          try {
-            _unapplied_transactions.add_forked( chain.push_block( bsf ) );
+            chain.push_block( bsf, [this]( const std::vector<transaction_metadata_ptr>& forked_trxs ) {
+               _unapplied_transactions.add_forked( forked_trxs );
+            } );
          } catch ( const guard_exception& e ) {
             chain_plug->handle_guard_exception(e);
             return;

From dc0f76c9a161bc3c631b767b9c05978e731dc4b3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 12:12:58 -0500
Subject: [PATCH 0890/1648] push_block now takes a forked_trxs_callback

---
 libraries/testing/include/eosio/testing/tester.hpp | 10 +++++-----
 libraries/testing/tester.cpp                       | 13 +++++++------
 unittests/block_tests.cpp                          |  2 +-
 unittests/forked_tests.cpp                         |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 27edc7b7cdc..e2556443928 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -425,8 +425,8 @@ namespace eosio { namespace testing {
 
       signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
          auto sb = _produce_block(skip_time, false);
-         auto bs = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bs );
+         auto bsf = validating_node->create_block_state_future( sb );
+         validating_node->push_block( bsf, forked_trxs_callback() );
 
          return sb;
       }
@@ -437,14 +437,14 @@ namespace eosio { namespace testing {
 
       void validate_push_block(const signed_block_ptr& sb) {
          auto bs = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bs );
+         validating_node->push_block( bs, forked_trxs_callback() );
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
          unapplied_transactions.add_aborted( control->abort_block() );
          auto sb = _produce_block(skip_time, true);
-         auto bs = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bs );
+         auto bsf = validating_node->create_block_state_future( sb );
+         validating_node->push_block( bsf, forked_trxs_callback() );
 
          return sb;
       }
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index c8db3c0fa16..09144b23edf 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -224,10 +224,11 @@ namespace eosio { namespace testing {
    }
 
    void base_tester::push_block(signed_block_ptr b) {
-      auto bs = control->create_block_state_future(b);
-      vector<transaction_metadata_ptr> aborted_trxs = control->abort_block();
-      unapplied_transactions.add_forked( control->push_block( bs ) );
-      unapplied_transactions.add_aborted( std::move( aborted_trxs ) );
+      auto bsf = control->create_block_state_future(b);
+      unapplied_transactions.add_aborted( control->abort_block() );
+      control->push_block( bsf, [this]( const std::vector<transaction_metadata_ptr>& forked_trxs ) {
+         unapplied_transactions.add_forked( forked_trxs );
+      } );
 
       auto itr = last_produced_block.find(b->producer);
       if (itr == last_produced_block.end() || block_header::num_from_id(b->id()) > block_header::num_from_id(itr->second)) {
@@ -928,9 +929,9 @@ namespace eosio { namespace testing {
 
             auto block = a.control->fetch_block_by_number(i);
             if( block ) { //&& !b.control->is_known_block(block->id()) ) {
-               auto bs = b.control->create_block_state_future( block );
+               auto bsf = b.control->create_block_state_future( block );
                b.control->abort_block();
-               b.control->push_block(bs); //, eosio::chain::validation_steps::created_block);
+               b.control->push_block(bsf, forked_trxs_callback()); //, eosio::chain::validation_steps::created_block);
             }
          }
       };
diff --git a/unittests/block_tests.cpp b/unittests/block_tests.cpp
index 8b8fe2c11cf..def5657b3a4 100644
--- a/unittests/block_tests.cpp
+++ b/unittests/block_tests.cpp
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(block_with_invalid_tx_test)
    tester validator;
    auto bs = validator.control->create_block_state_future( copy_b );
    validator.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs ), fc::exception ,
+   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs, forked_trxs_callback() ), fc::exception ,
    [] (const fc::exception &e)->bool {
       return e.code() == account_name_exists_exception::code_value ;
    }) ;
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 4352c381820..10564cf4876 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE( forking ) try {
    bad_block.transaction_mroot = bad_block.previous;
    auto bad_block_bs = c.control->create_block_state_future( std::make_shared<signed_block>(std::move(bad_block)) );
    c.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs ), fc::exception,
+   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs, forked_trxs_callback() ), fc::exception,
       [] (const fc::exception &ex)->bool {
          return ex.to_detail_string().find("block not signed by expected key") != std::string::npos;
       });

From 9b8e388c96ce3c59dd7fd74939afcdb36a30a382 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 26 Jul 2019 14:43:20 -0500
Subject: [PATCH 0891/1648] Reverting change, this logic correctly assumes that
 nodeos has shutdown from reaching the min RAM guard.

---
 tests/nodeos_under_min_avail_ram.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index a22382d5bc0..eba761ceb17 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -171,7 +171,9 @@ def setName(self, num):
                 if trans is None or not trans[0]:
                     timeOutCount+=1
                     if timeOutCount>=3:
-                       Utils.errorExit("Failed to push create action to eosio contract for %d consecutive times, looks like nodeos already exited." % (timeOutCount))
+                        Print("Failed to push create action to eosio contract for %d consecutive times, looks like nodeos already exited." % (timeOutCount))
+                        keepProcessing=False
+                        break
 
                     Print("Failed to push create action to eosio contract. sleep for 5 seconds")
                     time.sleep(5)

From 542fe66deb994fac8e70c72091e50bdc713b1071 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 15:57:54 -0500
Subject: [PATCH 0892/1648] Revert back to unapplied_transaction_queue taking a
 branch_type and being responsible for processing it in the correct order

---
 libraries/chain/controller.cpp                | 21 ++++++-----
 .../chain/include/eosio/chain/controller.hpp  |  4 +--
 .../chain/unapplied_transaction_queue.hpp     | 13 ++++---
 .../testing/include/eosio/testing/tester.hpp  |  6 ++--
 libraries/testing/tester.cpp                  |  6 ++--
 plugins/producer_plugin/producer_plugin.cpp   |  4 +--
 unittests/block_tests.cpp                     |  2 +-
 unittests/forked_tests.cpp                    |  2 +-
 .../unapplied_transaction_queue_tests.cpp     | 36 ++++++-------------
 9 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index df8e6e4768d..f083df3b3c3 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -690,7 +690,7 @@ struct controller_impl {
               pending_head = fork_db.pending_head()
          ) {
             wlog( "applying branch from fork database ending with block: ${id}", ("id", pending_head->id) );
-            maybe_switch_forks( pending_head, controller::block_status::complete, forked_trxs_callback() );
+            maybe_switch_forks( pending_head, controller::block_status::complete, forked_branch_callback() );
          }
       }
 
@@ -1820,7 +1820,7 @@ struct controller_impl {
       } );
    }
 
-   void push_block( std::future<block_state_ptr>& block_state_future, const forked_trxs_callback& forked_trxs_cb ) {
+   void push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& forked_branch_cb ) {
       controller::block_status s = controller::block_status::complete;
       EOS_ASSERT(!pending, block_validate_exception, "it is not valid to push a block when there is a pending block");
 
@@ -1842,7 +1842,7 @@ struct controller_impl {
          emit( self.accepted_block_header, bsp );
 
          if( read_mode != db_read_mode::IRREVERSIBLE ) {
-            maybe_switch_forks( fork_db.pending_head(), s, forked_trxs_cb );
+            maybe_switch_forks( fork_db.pending_head(), s, forked_branch_cb );
          } else {
             log_irreversible();
          }
@@ -1894,13 +1894,13 @@ struct controller_impl {
          } else {
             EOS_ASSERT( read_mode != db_read_mode::IRREVERSIBLE, block_validate_exception,
                         "invariant failure: cannot replay reversible blocks while in irreversible mode" );
-            maybe_switch_forks( bsp, s, forked_trxs_callback() );
+            maybe_switch_forks( bsp, s, forked_branch_callback() );
          }
 
       } FC_LOG_AND_RETHROW( )
    }
 
-   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s, const forked_trxs_callback& forked_trxs_cb ) {
+   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s, const forked_branch_callback& forked_branch_cb ) {
       bool head_changed = true;
       if( new_head->header.previous == head->id ) {
          try {
@@ -1918,14 +1918,13 @@ struct controller_impl {
          auto branches = fork_db.fetch_branch_from( new_head->id, head->id );
 
          if( branches.second.size() > 0 ) {
-            // forked branches are in reverse order of how they were applied, signal callback in the order applied
-            for( auto ritr = branches.second.rbegin(), rend = branches.second.rend(); ritr != rend; ++ritr ) {
-               const block_state_ptr& bsptr = *ritr;
+            for( auto itr = branches.second.begin(); itr != branches.second.end(); ++itr ) {
                pop_block();
-               forked_trxs_cb( bsptr->trxs );
             }
             EOS_ASSERT( self.head_block_id() == branches.second.back()->header.previous, fork_database_exception,
                      "loss of sync between fork_db and chainbase during fork switch" ); // _should_ never fail
+
+            if( forked_branch_cb ) forked_branch_cb( branches.second );
          }
 
          for( auto ritr = branches.first.rbegin(); ritr != branches.first.rend(); ++ritr ) {
@@ -2499,10 +2498,10 @@ std::future<block_state_ptr> controller::create_block_state_future( const signed
    return my->create_block_state_future( b );
 }
 
-void controller::push_block( std::future<block_state_ptr>& block_state_future, const forked_trxs_callback& forked_trxs_cb ) {
+void controller::push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& forked_branch_cb ) {
    validate_db_available_size();
    validate_reversible_available_size();
-   my->push_block( block_state_future, forked_trxs_cb );
+   my->push_block( block_state_future, forked_branch_cb );
 }
 
 transaction_trace_ptr controller::push_transaction( const transaction_metadata_ptr& trx, fc::time_point deadline, uint32_t billed_cpu_time_us ) {
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index f3529d71a59..c15e9684998 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -36,7 +36,7 @@ namespace eosio { namespace chain {
    class account_object;
    using resource_limits::resource_limits_manager;
    using apply_handler = std::function<void(apply_context&)>;
-   using forked_trxs_callback = std::function<void(const std::vector<transaction_metadata_ptr>&)>;
+   using forked_branch_callback = std::function<void(const branch_type&)>;
 
    class fork_database;
 
@@ -154,7 +154,7 @@ namespace eosio { namespace chain {
           * @param block_state_future provide from call to create_block_state_future
           * @param cb calls cb with forked applied transactions for each forked block
           */
-         void push_block( std::future<block_state_ptr>& block_state_future, const forked_trxs_callback& cb );
+         void push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& cb );
 
          boost::asio::io_context& get_thread_pool();
 
diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index a6e785fab67..51689d0353d 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -127,11 +127,16 @@ class unapplied_transaction_queue {
       }
    }
 
-   void add_forked( const std::vector<transaction_metadata_ptr>& forked_trxs ) {
+   void add_forked( const branch_type& forked_branch ) {
       if( only_track_persisted || read_mode != db_read_mode::SPECULATIVE ) return;
-      for( const auto& trx : forked_trxs ) {
-         fc::time_point expiry = trx->packed_trx()->expiration();
-         queue.insert( { trx, expiry, trx_enum_type::forked } );
+      // forked_branch is in reverse order
+      for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
+         const block_state_ptr& bsptr = *ritr;
+         for( auto itr = bsptr->trxs.begin(), end = bsptr->trxs.end(); itr != end; ++itr ) {
+            const auto& trx = *itr;
+            fc::time_point expiry = trx->packed_trx()->expiration();
+            queue.insert( { trx, expiry, trx_enum_type::forked } );
+         }
       }
    }
 
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index e2556443928..c6331c2bba8 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -426,7 +426,7 @@ namespace eosio { namespace testing {
       signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
          auto sb = _produce_block(skip_time, false);
          auto bsf = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bsf, forked_trxs_callback() );
+         validating_node->push_block( bsf, forked_branch_callback() );
 
          return sb;
       }
@@ -437,14 +437,14 @@ namespace eosio { namespace testing {
 
       void validate_push_block(const signed_block_ptr& sb) {
          auto bs = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bs, forked_trxs_callback() );
+         validating_node->push_block( bs, forked_branch_callback() );
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
          unapplied_transactions.add_aborted( control->abort_block() );
          auto sb = _produce_block(skip_time, true);
          auto bsf = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bsf, forked_trxs_callback() );
+         validating_node->push_block( bsf, forked_branch_callback() );
 
          return sb;
       }
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 09144b23edf..4b942fbc125 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -226,8 +226,8 @@ namespace eosio { namespace testing {
    void base_tester::push_block(signed_block_ptr b) {
       auto bsf = control->create_block_state_future(b);
       unapplied_transactions.add_aborted( control->abort_block() );
-      control->push_block( bsf, [this]( const std::vector<transaction_metadata_ptr>& forked_trxs ) {
-         unapplied_transactions.add_forked( forked_trxs );
+      control->push_block( bsf, [this]( const branch_type& forked_branch ) {
+         unapplied_transactions.add_forked( forked_branch );
       } );
 
       auto itr = last_produced_block.find(b->producer);
@@ -931,7 +931,7 @@ namespace eosio { namespace testing {
             if( block ) { //&& !b.control->is_known_block(block->id()) ) {
                auto bsf = b.control->create_block_state_future( block );
                b.control->abort_block();
-               b.control->push_block(bsf, forked_trxs_callback()); //, eosio::chain::validation_steps::created_block);
+               b.control->push_block(bsf, forked_branch_callback()); //, eosio::chain::validation_steps::created_block);
             }
          }
       };
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 83718be47d3..3051a0945c8 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -365,8 +365,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          // push the new block
          bool except = false;
          try {
-            chain.push_block( bsf, [this]( const std::vector<transaction_metadata_ptr>& forked_trxs ) {
-               _unapplied_transactions.add_forked( forked_trxs );
+            chain.push_block( bsf, [this]( const branch_type& forked_branch ) {
+               _unapplied_transactions.add_forked( forked_branch );
             } );
          } catch ( const guard_exception& e ) {
             chain_plug->handle_guard_exception(e);
diff --git a/unittests/block_tests.cpp b/unittests/block_tests.cpp
index def5657b3a4..873b5d2333f 100644
--- a/unittests/block_tests.cpp
+++ b/unittests/block_tests.cpp
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(block_with_invalid_tx_test)
    tester validator;
    auto bs = validator.control->create_block_state_future( copy_b );
    validator.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs, forked_trxs_callback() ), fc::exception ,
+   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs, forked_branch_callback() ), fc::exception ,
    [] (const fc::exception &e)->bool {
       return e.code() == account_name_exists_exception::code_value ;
    }) ;
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 10564cf4876..f25b7854295 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE( forking ) try {
    bad_block.transaction_mroot = bad_block.previous;
    auto bad_block_bs = c.control->create_block_state_future( std::make_shared<signed_block>(std::move(bad_block)) );
    c.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs, forked_trxs_callback() ), fc::exception,
+   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs, forked_branch_callback() ), fc::exception,
       [] (const fc::exception &ex)->bool {
          return ex.to_detail_string().find("block not signed by expected key") != std::string::npos;
       });
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index d30861f90fb..fc02680c2f5 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -128,10 +128,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    bs2->trxs = { trx3, trx4, trx5 };
    auto bs3 = std::make_shared<block_state>();
    bs3->trxs = { trx6 };
-   q.add_forked( bs1->trxs );
-   q.add_forked( bs1->trxs );  // bs1 duplicate ignored
-   q.add_forked( bs2->trxs );
-   q.add_forked( bs3->trxs );
+   q.add_forked( { bs3, bs2, bs1, bs1 } ); // bs1 duplicate ignored
    BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 5 );
@@ -151,10 +148,9 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    // fifo forked
    auto bs4 = std::make_shared<block_state>();
    bs4->trxs = { trx7 };
-   q.add_forked( bs1->trxs );
-   q.add_forked( bs2->trxs );
-   q.add_forked( bs3->trxs );
-   q.add_forked( bs4->trxs );
+   q.add_forked( { bs1 } );
+   q.add_forked( { bs3, bs2 } );
+   q.add_forked( { bs4 } );
    BOOST_CHECK( q.size() == 7 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 6 );
@@ -188,14 +184,10 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    auto bs6 = std::make_shared<block_state>();
    bs5->trxs = { trx11, trx12, trx13 };
    bs6->trxs = { trx11, trx15 };
-   q.add_forked( bs1->trxs );
-   q.add_forked( bs2->trxs );
-   q.add_forked( bs3->trxs );
-   q.add_forked( bs4->trxs );
-   q.add_forked( bs3->trxs ); // dups not added
-   q.add_forked( bs2->trxs ); // dups not added
-   q.add_forked( bs5->trxs );
-   q.add_forked( bs6->trxs );
+   q.add_forked( { bs3, bs2, bs1 } );
+   q.add_forked( { bs4 } );
+   q.add_forked( { bs3, bs2 } ); // dups ignored
+   q.add_forked( { bs6, bs5 } );
    BOOST_CHECK_EQUAL( q.size(), 11 );
    BOOST_REQUIRE( next( q ) == trx1 );
    BOOST_CHECK( q.size() == 10 );
@@ -223,16 +215,12 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_CHECK( q.empty() );
 
    // altogether, order fifo: persisted, forked, aborted
-   q.add_forked( bs1->trxs );
-   q.add_forked( bs2->trxs );
-   q.add_forked( bs3->trxs );
+   q.add_forked( { bs3, bs2, bs1 } );
    q.add_persisted( trx16 );
    q.add_aborted( { trx9, trx14 } );
    q.add_persisted( trx8 );
    q.add_aborted( { trx18, trx19 } );
-   q.add_forked( bs4->trxs);
-   q.add_forked( bs5->trxs );
-   q.add_forked( bs6->trxs );
+   q.add_forked( { bs6, bs5, bs4 } );
    BOOST_CHECK( q.size() == 17 );
    BOOST_REQUIRE( next( q ) == trx16 );
    BOOST_CHECK( q.size() == 16 );
@@ -271,9 +259,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_REQUIRE( next( q ) == nullptr );
    BOOST_CHECK( q.empty() );
 
-   q.add_forked( bs1->trxs );
-   q.add_forked( bs2->trxs );
-   q.add_forked( bs3->trxs );
+   q.add_forked( { bs3, bs2, bs1 } );
    q.add_aborted( { trx9, trx11 } );
    q.add_persisted( trx8 );
    q.clear();

From 36a6fd32a0622a43d41bd2a4dea17c7cc5cd3a26 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 16:26:51 -0500
Subject: [PATCH 0893/1648] Use an enum for processing mode of
 unapplied_transaction_queue. Set mode from producer_plugin.

---
 .../chain/unapplied_transaction_queue.hpp     | 32 +++++++++----------
 plugins/producer_plugin/producer_plugin.cpp   |  8 +++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index 51689d0353d..b3abd024954 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -7,7 +7,6 @@
 
 #include <eosio/chain/transaction_metadata.hpp>
 #include <eosio/chain/block_state.hpp>
-#include <eosio/chain/controller.hpp>
 #include <eosio/chain/exceptions.hpp>
 
 #include <boost/multi_index_container.hpp>
@@ -50,7 +49,14 @@ struct unapplied_transaction {
  * Persisted are first so that they can be applied in each block until expired.
  */
 class unapplied_transaction_queue {
+public:
+   enum class process_mode {
+      non_speculative,           // HEAD, READ_ONLY, IRREVERSIBLE
+      speculative_non_producer,  // will never produce
+      speculative_producer       // can produce
+   };
 
+private:
    struct by_trx_id;
    struct by_type;
    struct by_expiry;
@@ -66,23 +72,15 @@ class unapplied_transaction_queue {
    > unapplied_trx_queue_type;
 
    unapplied_trx_queue_type queue;
-   db_read_mode read_mode = db_read_mode::SPECULATIVE;
-   bool only_track_persisted = false;
+   process_mode mode = process_mode::speculative_producer;
 
 public:
 
-   void set_only_track_persisted( bool v ) {
-      if( v ) {
-         FC_ASSERT( empty(), "set_only_track_persisted, queue required to be empty" );
-      }
-      only_track_persisted = v;
-   }
-
-   void set_chain_read_mode( db_read_mode mode ) {
-      if( mode != read_mode ) {
-         FC_ASSERT( empty(), "set_chain_read_mode, queue required to be empty" );
+   void set_mode( process_mode new_mode ) {
+      if( new_mode != mode ) {
+         FC_ASSERT( empty(), "set_mode, queue required to be empty" );
       }
-      read_mode = mode;
+      mode = new_mode;
    }
 
    bool empty() const {
@@ -128,7 +126,7 @@ class unapplied_transaction_queue {
    }
 
    void add_forked( const branch_type& forked_branch ) {
-      if( only_track_persisted || read_mode != db_read_mode::SPECULATIVE ) return;
+      if( mode == process_mode::non_speculative || mode == process_mode::speculative_non_producer ) return;
       // forked_branch is in reverse order
       for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
          const block_state_ptr& bsptr = *ritr;
@@ -141,7 +139,7 @@ class unapplied_transaction_queue {
    }
 
    void add_aborted( std::vector<transaction_metadata_ptr> aborted_trxs ) {
-      if( only_track_persisted || read_mode != db_read_mode::SPECULATIVE || aborted_trxs.empty() ) return;
+      if( mode == process_mode::non_speculative || mode == process_mode::speculative_non_producer ) return;
       for( auto& trx : aborted_trxs ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
          queue.insert( { std::move( trx ), expiry, trx_enum_type::aborted } );
@@ -149,7 +147,7 @@ class unapplied_transaction_queue {
    }
 
    void add_persisted( const transaction_metadata_ptr& trx ) {
-      if( read_mode != db_read_mode::SPECULATIVE ) return;
+      if( mode == process_mode::non_speculative ) return;
       auto itr = queue.get<by_trx_id>().find( trx->id() );
       if( itr == queue.get<by_trx_id>().end() ) {
          fc::time_point expiry = trx->packed_trx()->expiration();
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 3051a0945c8..972ccbb1f9f 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -724,8 +724,6 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
    my->_options = &options;
    LOAD_VALUE_SET(options, "producer-name", my->_producers)
 
-   my->_unapplied_transactions.set_only_track_persisted( my->_producers.empty() );
-
    if( options.count("private-key") )
    {
       const std::vector<std::string> key_id_to_wif_pair_strings = options["private-key"].as<std::vector<std::string>>();
@@ -849,13 +847,17 @@ void producer_plugin::plugin_startup()
    ilog("producer plugin:  plugin_startup() begin");
 
    chain::controller& chain = my->chain_plug->chain();
-   my->_unapplied_transactions.set_chain_read_mode( chain.get_read_mode() );
    EOS_ASSERT( my->_producers.empty() || chain.get_read_mode() == chain::db_read_mode::SPECULATIVE, plugin_config_exception,
               "node cannot have any producer-name configured because block production is impossible when read_mode is not \"speculative\"" );
 
    EOS_ASSERT( my->_producers.empty() || chain.get_validation_mode() == chain::validation_mode::FULL, plugin_config_exception,
               "node cannot have any producer-name configured because block production is not safe when validation_mode is not \"full\"" );
 
+   unapplied_transaction_queue::process_mode unapplied_mode =
+         (chain.get_read_mode() != chain::db_read_mode::SPECULATIVE) ? unapplied_transaction_queue::process_mode::non_speculative :
+            my->_producers.empty() ? unapplied_transaction_queue::process_mode::speculative_non_producer :
+               unapplied_transaction_queue::process_mode::speculative_producer;
+   my->_unapplied_transactions.set_mode( unapplied_mode );
 
    my->_accepted_block_connection.emplace(chain.accepted_block.connect( [this]( const auto& bsp ){ my->on_block( bsp ); } ));
    my->_irreversible_block_connection.emplace(chain.irreversible_block.connect( [this]( const auto& bsp ){ my->on_irreversible_block( bsp->block ); } ));

From 10e725e737a5513d84ce68f0a08341df4c4b3917 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 16:31:03 -0500
Subject: [PATCH 0894/1648] Remove unneeded include

---
 plugins/producer_plugin/producer_plugin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 972ccbb1f9f..e7083958c3f 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -21,7 +21,6 @@
 
 #include <iostream>
 #include <algorithm>
-#include <functional>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/function_output_iterator.hpp>

From a58363cfa805ee8f15d61d61ac148435b2d2e3be Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 22:26:58 -0500
Subject: [PATCH 0895/1648] Move unapplied_transaction_queue::set_mode to
 plugin_initialize

---
 plugins/producer_plugin/producer_plugin.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index e7083958c3f..c5e315a03cb 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -723,6 +723,13 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
    my->_options = &options;
    LOAD_VALUE_SET(options, "producer-name", my->_producers)
 
+   chain::controller& chain = my->chain_plug->chain();
+   unapplied_transaction_queue::process_mode unapplied_mode =
+      (chain.get_read_mode() != chain::db_read_mode::SPECULATIVE) ? unapplied_transaction_queue::process_mode::non_speculative :
+         my->_producers.empty() ? unapplied_transaction_queue::process_mode::speculative_non_producer :
+            unapplied_transaction_queue::process_mode::speculative_producer;
+   my->_unapplied_transactions.set_mode( unapplied_mode );
+
    if( options.count("private-key") )
    {
       const std::vector<std::string> key_id_to_wif_pair_strings = options["private-key"].as<std::vector<std::string>>();
@@ -852,12 +859,6 @@ void producer_plugin::plugin_startup()
    EOS_ASSERT( my->_producers.empty() || chain.get_validation_mode() == chain::validation_mode::FULL, plugin_config_exception,
               "node cannot have any producer-name configured because block production is not safe when validation_mode is not \"full\"" );
 
-   unapplied_transaction_queue::process_mode unapplied_mode =
-         (chain.get_read_mode() != chain::db_read_mode::SPECULATIVE) ? unapplied_transaction_queue::process_mode::non_speculative :
-            my->_producers.empty() ? unapplied_transaction_queue::process_mode::speculative_non_producer :
-               unapplied_transaction_queue::process_mode::speculative_producer;
-   my->_unapplied_transactions.set_mode( unapplied_mode );
-
    my->_accepted_block_connection.emplace(chain.accepted_block.connect( [this]( const auto& bsp ){ my->on_block( bsp ); } ));
    my->_irreversible_block_connection.emplace(chain.irreversible_block.connect( [this]( const auto& bsp ){ my->on_irreversible_block( bsp->block ); } ));
 

From 9723af53fe159df8d2ae1c6814cca1e6b85fe3a8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 26 Jul 2019 22:34:23 -0500
Subject: [PATCH 0896/1648] add to front of incoming_transaction_queue when
 block time/net exhausted so it will be the first one next time around

---
 plugins/producer_plugin/producer_plugin.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index c5e315a03cb..1ea43305bec 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -406,13 +406,22 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             return trx->packed_trx()->get_unprunable_size() + trx->packed_trx()->get_prunable_size() + sizeof( *trx );
          }
 
+         void add_size( const transaction_metadata_ptr& trx ) {
+            auto size = calc_size( trx );
+            EOS_ASSERT( size_in_bytes + size < max_incoming_transaction_queue_size, tx_resource_exhaustion, "Transaction exceeded producer resource limit" );
+            size_in_bytes += size;
+         }
+
       public:
          void set_max_incoming_transaction_queue_size( uint64_t v ) { max_incoming_transaction_queue_size = v; }
 
          void add( const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next ) {
-            auto size = calc_size( trx );
-            EOS_ASSERT( size_in_bytes + size < max_incoming_transaction_queue_size, tx_resource_exhaustion, "Transaction exceeded producer resource limit" );
-            size_in_bytes += size;
+            add_size( trx );
+            _incoming_transactions.emplace_back( trx, persist_until_expired, std::move( next ) );
+         }
+
+         void add_front( const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next ) {
+            add_size( trx );
             _incoming_transactions.emplace_back( trx, persist_until_expired, std::move( next ) );
          }
 
@@ -514,7 +523,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             auto trace = chain.push_transaction( trx, deadline );
             if( trace->except ) {
                if( failure_is_subjective( *trace->except, deadline_is_subjective )) {
-                  _pending_incoming_transactions.add( trx, persist_until_expired, next );
+                  _pending_incoming_transactions.add_front( trx, persist_until_expired, next );
                   if( _pending_block_mode == pending_block_mode::producing ) {
                      fc_dlog( _trx_trace_log, "[TRX_TRACE] Block ${block_num} for producer ${prod} COULD NOT FIT, tx: ${txid} RETRYING ",
                               ("block_num", chain.head_block_num() + 1)

From 22149228bf84fb6904098898781bd11da6677e90 Mon Sep 17 00:00:00 2001
From: Robert Dewilder <robert.dewilder@gmail.com>
Date: Sat, 27 Jul 2019 06:53:04 +0000
Subject: [PATCH 0897/1648] Added explicit cast of std::chrono::duration to
 nanoseconds when building handshake message Fixes
 https://github.com/EOSIO/eos/issues/7575

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 959910e125f..d4f9a7f8d67 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3160,11 +3160,12 @@ namespace eosio {
 
    // call from connection strand
    void connection::populate_handshake( handshake_message& hello ) {
+      namespace sc = std::chrono;
       hello.network_version = net_version_base + net_version;
       hello.chain_id = my_impl->chain_id;
       hello.node_id = my_impl->node_id;
       hello.key = my_impl->get_authentication_key();
-      hello.time = std::chrono::system_clock::now().time_since_epoch().count();
+      hello.time = sc::duration_cast<sc::nanoseconds>(sc::system_clock::now().time_since_epoch()).count();
       hello.token = fc::sha256::hash(hello.time);
       hello.sig = my_impl->sign_compact(hello.key, hello.token);
       // If we couldn't sign, don't send a token.

From 575dff68e7b9b622b9171033fb1cd3a222edbecf Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 29 Jul 2019 09:22:08 -0500
Subject: [PATCH 0898/1648] emplace_front since that is the whole point

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 1ea43305bec..1b0486237e6 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -422,7 +422,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
          void add_front( const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next ) {
             add_size( trx );
-            _incoming_transactions.emplace_back( trx, persist_until_expired, std::move( next ) );
+            _incoming_transactions.emplace_front( trx, persist_until_expired, std::move( next ) );
          }
 
          auto pop_front() {

From 3b8395944704e7312ae220b4380211d6d50aa84b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 29 Jul 2019 12:42:22 -0400
Subject: [PATCH 0899/1648] Ported CI/CD code from eos:trav-poc (release/1.8.x
 base) as-is

---
 .cicd/.helpers                 | 49 +++++++++++++++++
 .cicd/amazonlinux-2.dockerfile | 82 ++++++++++++++++++++++++++++
 .cicd/base-images.yml          | 38 +++++++++++++
 .cicd/centos-7.dockerfile      | 97 ++++++++++++++++++++++++++++++++++
 .cicd/generate-base-images.sh  |  6 +++
 .cicd/pipeline.yml             | 87 ++++++++++++++++++++++++++++++
 .cicd/travis-build.sh          | 23 ++++++++
 .cicd/trigger-travis.sh        | 17 ++++++
 .cicd/ubuntu-16.04.dockerfile  | 93 ++++++++++++++++++++++++++++++++
 .cicd/ubuntu-18.04.dockerfile  | 69 ++++++++++++++++++++++++
 .travis.yml                    | 54 +++++++++++++++++++
 11 files changed, 615 insertions(+)
 create mode 100644 .cicd/.helpers
 create mode 100644 .cicd/amazonlinux-2.dockerfile
 create mode 100644 .cicd/base-images.yml
 create mode 100644 .cicd/centos-7.dockerfile
 create mode 100755 .cicd/generate-base-images.sh
 create mode 100644 .cicd/pipeline.yml
 create mode 100755 .cicd/travis-build.sh
 create mode 100755 .cicd/trigger-travis.sh
 create mode 100644 .cicd/ubuntu-16.04.dockerfile
 create mode 100644 .cicd/ubuntu-18.04.dockerfile
 create mode 100644 .travis.yml

diff --git a/.cicd/.helpers b/.cicd/.helpers
new file mode 100644
index 00000000000..511b50d7456
--- /dev/null
+++ b/.cicd/.helpers
@@ -0,0 +1,49 @@
+DRYRUN=${DRYRUN:-false}
+VERBOSE=${VERBOSE:-true}
+export PROJECT_NAME="eosio"
+
+# Set IMAGE_TAG using arg (generate-base-images.sh) or env (travis.yml)
+( [[ $(uname) != 'Darwin' ]] && [[ -z $IMAGE_TAG ]] && [[ -z $1 ]] ) && echo "You must provide the distro IMAGE_TAG name (example: ubuntu-18.04) as argument \$1 or set it within your ENV" && exit 1
+export IMAGE_TAG=${IMAGE_TAG:-$1}
+
+function execute() {
+  $VERBOSE && echo "--- Executing: $@"
+  $DRYRUN || "$@"
+}
+
+function determine-hash() {
+    # Determine the sha1 hash of all dockerfiles in the .cicd directory.
+    [[ -z $1 ]] && echo "Please provide the files to be hashed (wildcards supported)" && exit 1
+    echo "Obtaining Hash of files from $1..."
+    # Collect all files, hash them, then hash those.
+    HASHES=()
+    for FILE in $(find $1 -type f); do
+        HASH=$(sha1sum $FILE | sha1sum | awk '{ print $1 }')
+        HASHES=($HASH "${HASHES[*]}")
+        echo "$FILE - $HASH"
+    done
+    export DETERMINED_HASH=$(echo ${HASHES[*]} | sha1sum | awk '{ print $1 }')
+    export HASHED_IMAGE_TAG="${IMAGE_TAG}-${DETERMINED_HASH}"
+}
+
+function generate_docker_image() {
+    # If we cannot pull the image, we build and push it first.
+    docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
+    cd ./.cicd
+    docker build -t $FULL_TAG -f ./${IMAGE_TAG}.dockerfile .
+    docker push $FULL_TAG
+    cd -
+}
+
+function docker_tag_exists() {
+    ORG_REPO=$(echo $1 | cut -d: -f1)
+    TAG=$(echo $1 | cut -d: -f2)
+    EXISTS=$(curl -s -H "Authorization: Bearer $(curl -sSL "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${ORG_REPO}:pull" | jq --raw-output .token)" "https://registry.hub.docker.com/v2/${ORG_REPO}/manifests/$TAG")
+    ( [[ $EXISTS =~ '404 page not found' ]] || [[ $EXISTS =~ 'manifest unknown' ]] ) && return 1 || return 0
+}
+
+if [[ $(uname) != 'Darwin' ]]; then # Darwin doesn't need hash (yet)
+    determine-hash ".cicd/${IMAGE_TAG}.dockerfile"
+    [[ -z $DETERMINED_HASH ]] && echo "DETERMINED_HASH empty! (check determine-hash function)" && exit 1
+    export FULL_TAG="eosio/producer:${PROJECT_NAME}-$HASHED_IMAGE_TAG"
+fi
\ No newline at end of file
diff --git a/.cicd/amazonlinux-2.dockerfile b/.cicd/amazonlinux-2.dockerfile
new file mode 100644
index 00000000000..5bdc15d98c5
--- /dev/null
+++ b/.cicd/amazonlinux-2.dockerfile
@@ -0,0 +1,82 @@
+FROM amazonlinux:2
+
+# YUM dependencies.
+RUN yum update -y \
+  && yum install -y which git sudo procps-ng util-linux autoconf automake \
+  libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
+  libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
+  graphviz clang patch
+
+# Build appropriate version of CMake.
+RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz \
+  && tar -xzf cmake-3.13.2.tar.gz \
+  && cd cmake-3.13.2 \
+  && ./bootstrap --prefix=/usr/local \
+  && make -j$(nproc) \
+  && make install \
+  && cd .. \
+  && rm -f cmake-3.13.2.tar.gz
+
+# Build appropriate version of LLVM.
+RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm \
+  && cd llvm \
+  && mkdir build \
+  && cd build \
+  && cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd /
+
+# Build appropriate version of Boost.
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 \
+  && tar -xjf boost_1_70_0.tar.bz2 \
+  && cd boost_1_70_0 \
+  && ./bootstrap.sh --prefix=/usr/local \
+  && ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install \
+  && cd .. \
+  && rm -f boost_1_70_0.tar.bz2    
+
+# Build appropriate version of MongoDB.
+RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz \
+  && tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz \
+  && rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz
+
+# Build appropriate version of MongoDB C Driver. 
+RUN curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz \
+  && tar -xzf mongo-c-driver-1.13.0.tar.gz \
+  && cd mongo-c-driver-1.13.0 \
+  && mkdir -p build \
+  && cd build \
+  && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd / \
+  && rm -rf mongo-c-driver-1.13.0.tar.gz
+
+# Build appropriate version of MongoDB C++ driver.
+RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz \
+  && tar -xzf mongo-cxx-driver-r3.4.0.tar.gz \
+  && cd mongo-cxx-driver-r3.4.0 \
+  && sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
+  && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
+  && cd build \
+  && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd / \
+  && rm -f mongo-cxx-driver-r3.4.0.tar.gz
+
+ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
+
+# CCACHE
+RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm \
+  && yum install -y ccache-3.3.4-1.el7.x86_64.rpm
+
+# PRE_COMMANDS: Executed pre-cmake
+# CMAKE_EXTRAS: Executed right before the cmake path (on the end)
+ENV PRE_COMMANDS="export PATH=/usr/lib64/ccache:$PATH &&"
+ENV CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
+
+CMD bash -c "$PRE_COMMANDS ccache -s && \
+    mkdir /workdir/build && cd /workdir/build && cmake -DCMAKE_BUILD_TYPE='Release' -DCORE_SYMBOL_NAME='SYS' -DOPENSSL_ROOT_DIR='/usr/include/openssl' -DBUILD_MONGO_DB_PLUGIN=true $CMAKE_EXTRAS /workdir && make -j $(getconf _NPROCESSORS_ONLN) && \
+    ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"
\ No newline at end of file
diff --git a/.cicd/base-images.yml b/.cicd/base-images.yml
new file mode 100644
index 00000000000..3a8ae02ccfb
--- /dev/null
+++ b/.cicd/base-images.yml
@@ -0,0 +1,38 @@
+env:
+  BUILD_TIMEOUT: 120
+  TEST_TIMEOUT: 60
+  TIMEOUT: 120
+
+steps:
+
+  - label: ":aws: Amazon_Linux 2 - Build"
+    command:
+      - ".cicd/generate-base-images.sh amazonlinux-2"
+    agents:
+      queue: "automation-eos-dockerhub-image-builder-fleet"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_AMAZON_LINUX_2
+
+  - label: ":centos: CentOS 7.6 - Build"
+    command:
+      - ".cicd/generate-base-images.sh centos-7"
+    agents:
+      queue: "automation-eos-dockerhub-image-builder-fleet"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_CENTOS_7
+
+  - label: ":ubuntu: Ubuntu 16.04 - Build"
+    command:
+      - ".cicd/generate-base-images.sh ubuntu-16.04"
+    agents:
+      queue: "automation-eos-dockerhub-image-builder-fleet"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_UBUNTU_16
+
+  - label: ":ubuntu: Ubuntu 18.04 - Build"
+    command:
+      - ".cicd/generate-base-images.sh ubuntu-18.04"
+    agents:
+      queue: "automation-eos-dockerhub-image-builder-fleet"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_UBUNTU_18
diff --git a/.cicd/centos-7.dockerfile b/.cicd/centos-7.dockerfile
new file mode 100644
index 00000000000..a0a342c8857
--- /dev/null
+++ b/.cicd/centos-7.dockerfile
@@ -0,0 +1,97 @@
+FROM centos:7
+
+# YUM dependencies.
+RUN yum update -y \
+  && yum --enablerepo=extras install -y centos-release-scl \
+  && yum --enablerepo=extras install -y devtoolset-8 \
+  && yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
+  graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
+  python python-devel rh-python36 gettext-devel file libusbx-devel \
+  libcurl-devel patch 
+
+# Build appropriate version of CMake.
+RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz \
+  && source /opt/rh/devtoolset-8/enable \
+  && source /opt/rh/rh-python36/enable \
+  && tar -xzf cmake-3.13.2.tar.gz \
+  && cd cmake-3.13.2 \
+  && ./bootstrap --prefix=/usr/local \
+  && make -j$(nproc) \
+  && make install \
+  && cd .. \
+  && rm -f cmake-3.13.2.tar.gz
+
+# Build appropriate version of LLVM.
+RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm \
+  && source /opt/rh/devtoolset-8/enable \
+  && source /opt/rh/rh-python36/enable \
+  && cd llvm \
+  && mkdir build \
+  && cd build \
+  && cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd /
+
+# Build appropriate version of Boost.
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 \
+  && source /opt/rh/devtoolset-8/enable \
+  && source /opt/rh/rh-python36/enable \
+  && tar -xjf boost_1_70_0.tar.bz2 \
+  && cd boost_1_70_0 \
+  && ./bootstrap.sh --prefix=/usr/local \
+  && ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install \
+  && cd .. \
+  && rm -f boost_1_70_0.tar.bz2    
+
+# Build appropriate version of MongoDB.
+RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz \
+  && tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz \
+  && rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz
+
+# Build appropriate version of MongoDB C Driver. 
+RUN curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz \
+  && source /opt/rh/devtoolset-8/enable \
+  && source /opt/rh/rh-python36/enable \
+  && tar -xzf mongo-c-driver-1.13.0.tar.gz \
+  && cd mongo-c-driver-1.13.0 \
+  && mkdir -p build \
+  && cd build \
+  && cmake --DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd / \
+  && rm -rf mongo-c-driver-1.13.0.tar.gz
+
+# Build appropriate version of MongoDB C++ driver.
+RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz \
+  && source /opt/rh/devtoolset-8/enable \
+  && source /opt/rh/rh-python36/enable \
+  && tar -xzf mongo-cxx-driver-r3.4.0.tar.gz \
+  && cd mongo-cxx-driver-r3.4.0 \
+  && sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
+  && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
+  && cd build \
+  && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd / \
+  && rm -f mongo-cxx-driver-r3.4.0.tar.gz
+
+ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
+
+# CCACHE
+RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm \
+  && yum install -y ccache-3.3.4-1.el7.x86_64.rpm
+## Needed as devtoolset uses c++ and it's not in ccache by default
+RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
+## We need to tell ccache to actually use devtoolset-8 instead of the default system one (ccache resets anything set in PATH when it launches)
+ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
+
+# PRE_COMMANDS: Executed pre-cmake
+# CMAKE_EXTRAS: Executed right before the cmake path (on the end)
+ENV PRE_COMMANDS="source /opt/rh/devtoolset-8/enable && source /opt/rh/rh-python36/enable && export PATH=/usr/lib64/ccache:$PATH &&"
+
+CMD bash -c "$PRE_COMMANDS ccache -s && \
+    mkdir /workdir/build && cd /workdir/build && cmake -DCMAKE_BUILD_TYPE='Release' -DCORE_SYMBOL_NAME='SYS' -DOPENSSL_ROOT_DIR='/usr/include/openssl' -DBUILD_MONGO_DB_PLUGIN=true $CMAKE_EXTRAS /workdir && make -j $(getconf _NPROCESSORS_ONLN) && \
+    ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"
\ No newline at end of file
diff --git a/.cicd/generate-base-images.sh b/.cicd/generate-base-images.sh
new file mode 100755
index 00000000000..86fff371438
--- /dev/null
+++ b/.cicd/generate-base-images.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -eo pipefail
+cd $( dirname "${BASH_SOURCE[0]}" )/.. # Ensure we're in the repo root and not inside of scripts
+. ./.cicd/.helpers
+echo "Looking for $FULL_TAG"
+docker_tag_exists $FULL_TAG && echo "$FULL_TAG already exists" || generate_docker_image
diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
new file mode 100644
index 00000000000..2403f3f1046
--- /dev/null
+++ b/.cicd/pipeline.yml
@@ -0,0 +1,87 @@
+env:
+  BUILD_TIMEOUT: 120
+  TEST_TIMEOUT: 60
+  TIMEOUT: 120
+  VERBOSE: true
+
+steps:
+  - wait
+
+  - label: ":webhook: Trigger Travis CI Build"
+    command: |
+      . ./.cicd/trigger-travis.sh
+    agents:
+      queue: "automation-eos-builder-fleet"
+
+  - trigger: "eosio-base-images-beta"
+    label: ":docker: Ensure base images exist"
+    build:
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+
+  - wait
+
+  - label: ":aws: Amazon_Linux 2 - Build"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    plugins:
+      - docker#v3.2.0:
+          debug: $DEBUG
+          image: "eosio/producer:eosio-amazonlinux-2-1c266e25276ad1f1147a4df5c12921968079c49b"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_AMAZON_LINUX_2
+
+  - label: ":centos: CentOS 7.6 - Build"
+    command:
+      - ""
+    agents:
+      queue: "automation-eos-builder-fleet"
+    plugins:
+      - docker#v3.2.0:
+          debug: $DEBUG
+          image: "eosio/producer:eosio-centos-7-d45789dfb1a5b830a62381afd205b34d3d7c2d63"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_CENTOS_7
+
+  - label: ":ubuntu: Ubuntu 16.04 - Build"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    plugins:
+      - docker#v3.2.0:
+          debug: $DEBUG
+          image: "eosio/producer:eosio-ubuntu-16.04-4f430ef21e359ef2581c25255c99e5411adfaed9"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_UBUNTU_16
+
+  - label: ":ubuntu: Ubuntu 18.04 - Build"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    plugins:
+      - docker#v3.2.0:
+          debug: $DEBUG
+          image: "eosio/producer:eosio-ubuntu-18.04-14091ac0e5618b0ea5ce026cd75b648efbde4be7"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_UBUNTU_18
+
+  - label: ":darwin: macOS 10.14 - Build"
+    command:
+      - "brew install git graphviz libtool gmp llvm@4 pkgconfig python python@2 doxygen libusb openssl boost@1.70 cmake"
+      - "git clone $BUILDKITE_REPO eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && mkdir build && cd build && cmake .. && make -j$(getconf _NPROCESSORS_ONLN)"
+      - "cd eos/build && ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: 10.14.4_6C_14G_40G
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew"
+          modify-cpu: 12
+          modify-ram: 24
+          always-pull: true
+          debug: true
+          wait-network: true
+    agents:
+      - "queue=mac-anka-large-node-fleet"
+    timeout: $BUILD_TIMEOUT
+    skip: $SKIP_MOJAVE
+    
\ No newline at end of file
diff --git a/.cicd/travis-build.sh b/.cicd/travis-build.sh
new file mode 100755
index 00000000000..d12ba8ebb05
--- /dev/null
+++ b/.cicd/travis-build.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -eo pipefail
+cd $( dirname "${BASH_SOURCE[0]}" )/.. # Ensure we're in the repo root and not inside of scripts
+. ./.cicd/.helpers
+
+CPU_CORES=$(getconf _NPROCESSORS_ONLN)
+if [[ "$(uname)" == Darwin ]]; then
+    echo 'Detected Darwin, building natively.'
+    [[ -d eos ]] && cd eos
+    [[ ! -d build ]] && mkdir build
+    cd build
+    echo \$PATH
+    ccache -s
+    echo '$ cmake ..'
+    cmake ..
+    echo "$ make -j $CPU_CORES"
+    make -j $CPU_CORES
+    echo 'Running unit tests.'
+    echo "$ ctest -j $CPU_CORES -LE _tests --output-on-failure -T Test"
+    ctest -j $CPU_CORES -LE _tests --output-on-failure -T Test # run unit tests
+else # linux
+    execute docker run --rm -v $(pwd):/workdir -v /usr/lib/ccache -v $HOME/.ccache:/opt/.ccache -e CCACHE_DIR=/opt/.ccache $FULL_TAG
+fi
\ No newline at end of file
diff --git a/.cicd/trigger-travis.sh b/.cicd/trigger-travis.sh
new file mode 100755
index 00000000000..dcc5b63cbc1
--- /dev/null
+++ b/.cicd/trigger-travis.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -eo pipefail
+echo '+++ :gear: Configuring Travis CI Build'
+[[ -z $TRIGGER_TRAVIS_API_KEY ]] && (echo '+++ :no_entry: ERROR: Travis CI API key not found!' && exit 1)
+TRAVIS_MESSAGE="$BUILDKITE_MESSAGE - $(echo $BUILDKITE_BUILD_URL | grep -oe 'buildkite.*')"
+[[ -z $BODY ]] && BODY="$(jq -nc '{"request":{"branch":env.BUILDKITE_BRANCH,"message":env.TRAVIS_MESSAGE}}')"
+echo 'Configuration:'
+echo "$BODY" | jq
+echo 'This configuration is derived from the BUILDKITE_BRANCH and BUILDKITE_MESSAGE variables set for this build.'
+echo '+++ :tractor: Triggering Travis CI Build'
+export RESULT="$(curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $TRIGGER_TRAVIS_API_KEY" -d "$BODY" https://api.travis-ci.org/repo/EOSIO%2feosio.contracts/requests)"
+echo 'API Response:'
+echo "$RESULT" | jq 2>/dev/null || echo "$RESULT"
+if [[ "$(echo $RESULT | jq -r '.["@type"]')" != "pending" ]]; then
+    echo '+++ :no_entry: ERROR: Failed to trigger Travis API!'
+    exit 1
+fi
\ No newline at end of file
diff --git a/.cicd/ubuntu-16.04.dockerfile b/.cicd/ubuntu-16.04.dockerfile
new file mode 100644
index 00000000000..e83384cea65
--- /dev/null
+++ b/.cicd/ubuntu-16.04.dockerfile
@@ -0,0 +1,93 @@
+FROM ubuntu:16.04
+
+# APT-GET dependencies.
+RUN apt-get update && apt-get upgrade -y \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git automake \
+  libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev \
+  python2.7 python2.7-dev python3 python3-dev autoconf libtool curl zlib1g-dev \
+  sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config
+
+# Build appropriate version of CMake.
+RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz \
+  && tar -xzf cmake-3.13.2.tar.gz \
+  && cd cmake-3.13.2 \
+  && ./bootstrap --prefix=/usr/local \
+  && make -j$(nproc) \
+  && make install \
+  && cd .. \
+  && rm -f cmake-3.13.2.tar.gz
+
+# Build appropriate version of Clang.
+RUN mkdir -p /root/tmp && cd /root/tmp && git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8             && cd clang8 && git checkout 18e41dc             && cd tools             && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git             && cd lld && git checkout d60a035 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git             && cd polly && git checkout 1bc06e5 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang             && git checkout a03da8b             && cd tools && mkdir extra && cd extra             && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git             && cd clang-tools-extra && git checkout 6b34834 && cd ..             && cd ../../../../projects             && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git             && cd libcxx && git checkout 1853712 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git             && cd libcxxabi && git checkout d7338a4 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git             && cd libunwind && git checkout 57f6739 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git             && cd compiler-rt && git checkout 5bc7979 && cd ../             && cd /root/tmp/clang8             && mkdir build && cd build             && cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=all -DCMAKE_BUILD_TYPE=Release ..             && make -j$(nproc)             && make install \
+  && cd / && rm -rf /root/tmp/clang8
+
+COPY ./pinned_toolchain.cmake /tmp/pinned_toolchain.cmake
+
+# # Build appropriate version of LLVM.
+RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm \
+  && cd llvm \
+  && mkdir build \
+  && cd build \
+  && cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/pinned_toolchain.cmake' .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd /
+
+# Build appropriate version of Boost.
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 \
+  && tar -xjf boost_1_70_0.tar.bz2 \
+  && cd boost_1_70_0 \
+  && ./bootstrap.sh --with-toolset=clang --prefix=/usr/local \
+  && ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install \
+  && cd .. \
+  && rm -f boost_1_70_0.tar.bz2    
+
+# Build appropriate version of MongoDB.
+RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz \
+  && tar -xzf mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz \
+  && rm -f mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz
+
+# Build appropriate version of MongoDB C Driver. 
+RUN curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz \
+  && tar -xzf mongo-c-driver-1.13.0.tar.gz \
+  && cd mongo-c-driver-1.13.0 \
+  && mkdir -p build \
+  && cd build \
+  && cmake --DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DCMAKE_TOOLCHAIN_FILE='/tmp/pinned_toolchain.cmake' .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd / \
+  && rm -rf mongo-c-driver-1.13.0.tar.gz
+
+# Build appropriate version of MongoDB C++ driver.
+RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz \
+  && tar -xzf mongo-cxx-driver-r3.4.0.tar.gz \
+  && cd mongo-cxx-driver-r3.4.0 \
+  && sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
+  && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
+  && cd build \
+  && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/pinned_toolchain.cmake' .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd / \
+  && rm -f mongo-cxx-driver-r3.4.0.tar.gz
+
+ENV PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1604-3.6.3/bin
+
+# Build appropriate version of ccache.
+RUN curl -LO https://github.com/ccache/ccache/releases/download/v3.4.1/ccache-3.4.1.tar.gz \
+  && tar -xzf ccache-3.4.1.tar.gz \
+  && cd ccache-3.4.1 \
+  && ./configure \
+  && make \
+  && make install \
+  && cd / && rm -rf ccache-3.4.1/
+
+# PRE_COMMANDS: Executed pre-cmake
+# CMAKE_EXTRAS: Executed right before the cmake path (on the end)
+ENV PRE_COMMANDS="export PATH=/usr/lib/ccache:$PATH &&"
+ENV CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE='/tmp/pinned_toolchain.cmake' -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+
+CMD bash -c "$PRE_COMMANDS ccache -s && \
+    mkdir /workdir/build && cd /workdir/build && cmake -DCMAKE_BUILD_TYPE='Release' -DCORE_SYMBOL_NAME='SYS' -DOPENSSL_ROOT_DIR='/usr/include/openssl' -DBUILD_MONGO_DB_PLUGIN=true $CMAKE_EXTRAS /workdir && make -j $(getconf _NPROCESSORS_ONLN) && \
+    ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"
\ No newline at end of file
diff --git a/.cicd/ubuntu-18.04.dockerfile b/.cicd/ubuntu-18.04.dockerfile
new file mode 100644
index 00000000000..1561eccfc2b
--- /dev/null
+++ b/.cicd/ubuntu-18.04.dockerfile
@@ -0,0 +1,69 @@
+FROM ubuntu:18.04
+
+# APT-GET dependencies.
+RUN apt-get update && apt-get upgrade -y \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y git make \
+  bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
+  autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
+  autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
+  libcurl4-gnutls-dev pkg-config patch llvm-4.0 clang ccache
+
+# Build appropriate version of CMake.
+RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz \
+  && tar -xzf cmake-3.13.2.tar.gz \
+  && cd cmake-3.13.2 \
+  && ./bootstrap --prefix=/usr/local \
+  && make -j$(nproc) \
+  && make install \
+  && cd .. \
+  && rm -f cmake-3.13.2.tar.gz
+
+# Build appropriate version of Boost.
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 \
+  && tar -xjf boost_1_70_0.tar.bz2 \
+  && cd boost_1_70_0 \
+  && ./bootstrap.sh --prefix=/usr/local \
+  && ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -j$(nproc) install \
+  && cd .. \
+  && rm -f boost_1_70_0.tar.bz2     
+
+# Build appropriate version of MongoDB.
+RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz \
+  && tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz \
+  && rm -f mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz
+
+# Build appropriate version of MongoDB C Driver. 
+RUN curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz \
+  && tar -xzf mongo-c-driver-1.13.0.tar.gz \
+  && cd mongo-c-driver-1.13.0 \
+  && mkdir -p build \
+  && cd build \
+  && cmake --DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd / \
+  && rm -rf mongo-c-driver-1.13.0.tar.gz
+
+# Build appropriate version of MongoDB C++ driver.
+RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz \
+  && tar -xzf mongo-cxx-driver-r3.4.0.tar.gz \
+  && cd mongo-cxx-driver-r3.4.0 \
+  && sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
+  && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
+  && cd build \
+  && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
+  && make -j$(nproc) \
+  && make install \
+  && cd / \
+  && rm -f mongo-cxx-driver-r3.4.0.tar.gz
+
+ENV PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1804-4.1.1/bin
+
+# PRE_COMMANDS: Executed pre-cmake
+# CMAKE_EXTRAS: Executed right before the cmake path (on the end)
+ENV PRE_COMMANDS="export PATH=/usr/lib/ccache:$PATH &&"
+ENV CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
+
+CMD bash -c "$PRE_COMMANDS ccache -s && \
+    mkdir /workdir/build && cd /workdir/build && cmake -DCMAKE_BUILD_TYPE='Release' -DCORE_SYMBOL_NAME='SYS' -DOPENSSL_ROOT_DIR='/usr/include/openssl' -DBUILD_MONGO_DB_PLUGIN=true $CMAKE_EXTRAS /workdir && make -j $(getconf _NPROCESSORS_ONLN) && \
+    ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000000..168d4071571
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,54 @@
+language: cpp
+git:
+  depth: false # prevent git describe failure when executing the appbase version.cmake.in
+cache:
+  ccache: true
+  directories:
+    - $HOME/Library/Caches/Homebrew
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+      services: docker
+      env:
+        - IMAGE_TAG='ubuntu-18.04'
+    - os: linux
+      dist: xenial
+      services: docker
+      env:
+        - IMAGE_TAG='ubuntu-16.04'
+    - os: linux
+      dist: xenial
+      services: docker
+      env:
+        - IMAGE_TAG='amazonlinux-2'
+    - os: linux
+      dist: xenial
+      services: docker
+      env: 
+        - IMAGE_TAG='centos-7'
+    - os: osx
+      osx_image: xcode10.2
+      addons:
+        homebrew:
+          update: true
+          packages:
+            - graphviz
+            - libtool
+            - gmp
+            - llvm@4
+            - pkgconfig
+            - python
+            - python@2
+            - doxygen
+            - libusb
+            - openssl
+            - boost@1.70
+            - ccache
+      env: 
+        - PATH="/usr/local/opt/ccache/libexec:$PATH"
+script: |
+  ./.cicd/travis-build.sh
+notifications:
+  webhooks:
+    secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=

From e684ca34e629decdca2fb1565e6da0b17158f518 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 29 Jul 2019 14:39:41 -0400
Subject: [PATCH 0900/1648] Maybe if I commit, GitHub will let me pull request


From e59dc89c484618623d67a70d1171ce79d4eb2454 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 29 Jul 2019 17:04:39 -0400
Subject: [PATCH 0901/1648] remove injection for eos-vm and update eos-vm ref

---
 .../chain/include/eosio/chain/wasm_interface_private.hpp   | 7 ++++---
 libraries/chain/wasm_interface.cpp                         | 2 +-
 libraries/eos-vm                                           | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index c397d298cc0..dfe564a284d 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -15,6 +15,7 @@
 #include "Runtime/Intrinsics.h"
 #include "Platform/Platform.h"
 #include "WAST/WAST.h"
+
 #include "IR/Validate.h"
 
 #include <eosio/vm/allocator.hpp>
@@ -98,7 +99,7 @@ namespace eosio { namespace chain {
       }
 
       const std::unique_ptr<wasm_instantiated_module_interface>& get_instantiated_module( const digest_type& code_hash, const uint8_t& vm_type,
-                                                                                 const uint8_t& vm_version, transaction_context& trx_context )
+                                                                                 const uint8_t& vm_version, transaction_context& trx_context, bool inject )
       {
          wasm_cache_index::iterator it = wasm_instantiation_cache.find(
                                              boost::make_tuple(code_hash, vm_type, vm_version) );
@@ -135,8 +136,7 @@ namespace eosio { namespace chain {
             } catch(const IR::ValidationException& e) {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
-
-            if(vm_type != static_cast<uint8_t>(wasm_interface::vm_type::eos_vm)) {
+            if(inject) {
                wasm_injections::wasm_binary_injection injector(module);
                injector.inject();
 
@@ -160,6 +160,7 @@ namespace eosio { namespace chain {
 
       bool is_shutting_down = false;
       std::unique_ptr<wasm_runtime_interface> runtime_interface;
+      wasm_interface::vm_type runtime;
 
       typedef boost::multi_index_container<
          wasm_cache_entry,
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 69a1d77344d..74098e3fc99 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -76,7 +76,7 @@ namespace eosio { namespace chain {
    }
 
    void wasm_interface::apply( const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, apply_context& context ) {
-      my->get_instantiated_module(code_hash, vm_type, vm_version, context.trx_context)->apply(context);
+      my->get_instantiated_module(code_hash, vm_type, vm_version, context.trx_context, my->runtime != wasm_interface::vm_type::eos_vm)->apply(context);
    }
 
    void wasm_interface::exit() {
diff --git a/libraries/eos-vm b/libraries/eos-vm
index bf9ad583913..78b9bc87f79 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit bf9ad5839133326dd1857544f4aecdbfcf951785
+Subproject commit 78b9bc87f79c2088ef5a1ff61bf704b8f211a34f

From d59f46aadf23401341c8228ee75d72062c35b5ab Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 29 Jul 2019 17:33:45 -0400
Subject: [PATCH 0902/1648] just totally disable injection for now

---
 .../chain/include/eosio/chain/wasm_interface_private.hpp      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index dfe564a284d..e5ccee2085d 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -136,10 +136,10 @@ namespace eosio { namespace chain {
             } catch(const IR::ValidationException& e) {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
-            if(inject) {
+            if(false && inject) {
                wasm_injections::wasm_binary_injection injector(module);
                injector.inject();
-
+               std::cout << "INJECTING!!!!!!!!!!!!\n";
                try {
                   Serialization::ArrayOutputStream outstream;
                   WASM::serialize(outstream, module);

From 88712d65499f8af916d1c8dc6e070fcf768d1bce Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 29 Jul 2019 17:38:10 -0400
Subject: [PATCH 0903/1648] fix producer_plugin watermark tracking (watermark
 should never decrease, consider unapplied blocks in fork database)

---
 plugins/producer_plugin/producer_plugin.cpp | 63 ++++++++++++---------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index a528bf21223..16cb9d00ea5 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -189,8 +189,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       std::vector<chain::digest_type>                           _protocol_features_to_activate;
       bool                                                      _protocol_features_signaled = false; // to mark whether it has been signaled in start_block
 
-      time_point _start_time = fc::time_point::now();
-
       producer_plugin* _self = nullptr;
       chain_plugin* chain_plug = nullptr;
 
@@ -206,6 +204,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       pending_snapshot_index                                   _pending_snapshot_index;
 
       fc::optional<scoped_connection>                          _accepted_block_connection;
+      fc::optional<scoped_connection>                          _accepted_block_header_connection;
       fc::optional<scoped_connection>                          _irreversible_block_connection;
 
       /*
@@ -227,20 +226,29 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       // path to write the snapshots to
       bfs::path _snapshots_dir;
 
+      void consider_new_watermark( account_name producer, uint32_t block_num ) {
+         auto itr = _producer_watermarks.find( producer );
+         if( itr != _producer_watermarks.end() ) {
+            itr->second = std::max( itr->second, block_num );
+         } else if( _producers.count( producer ) > 0 ) {
+            _producer_watermarks.emplace( producer, block_num );
+         }
+      }
+
+      std::optional<uint32_t> get_watermark( account_name producer ) const {
+         auto itr = _producer_watermarks.find( producer );
+
+         if( itr == _producer_watermarks.end() ) return {};
+
+         return itr->second;
+      }
 
       void on_block( const block_state_ptr& bsp ) {
          _unapplied_transactions.clear_applied( bsp->trxs );
+      }
 
-         if( bsp->header.timestamp <= _start_time ) return;
-
-         // simplify handling of watermark in on_block
-         auto block_producer = bsp->header.producer;
-         auto watermark_itr = _producer_watermarks.find( block_producer );
-         if( watermark_itr != _producer_watermarks.end() ) {
-            watermark_itr->second = bsp->block_num;
-         } else if( _producers.count( block_producer ) > 0 ) {
-            _producer_watermarks.emplace( block_producer, bsp->block_num );
-         }
+      void on_block_header( const block_state_ptr& bsp ) {
+         consider_new_watermark( bsp->header.producer, bsp->block_num );
       }
 
       void on_irreversible_block( const signed_block_ptr& lib ) {
@@ -835,6 +843,7 @@ void producer_plugin::plugin_startup()
               "node cannot have any producer-name configured because block production is not safe when validation_mode is not \"full\"" );
 
    my->_accepted_block_connection.emplace(chain.accepted_block.connect( [this]( const auto& bsp ){ my->on_block( bsp ); } ));
+   my->_accepted_block_header_connection.emplace(chain.accepted_block_header.connect( [this]( const auto& bsp ){ my->on_block_header( bsp ); } ));
    my->_irreversible_block_connection.emplace(chain.irreversible_block.connect( [this]( const auto& bsp ){ my->on_irreversible_block( bsp->block ); } ));
 
    const auto lib_num = chain.last_irreversible_block_num();
@@ -872,6 +881,7 @@ void producer_plugin::plugin_shutdown() {
       my->_thread_pool->stop();
    }
    my->_accepted_block_connection.reset();
+   my->_accepted_block_header_connection.reset();
    my->_irreversible_block_connection.reset();
 }
 
@@ -1226,9 +1236,9 @@ optional<fc::time_point> producer_plugin_impl::calculate_next_block_time(const a
    // disqualify this producer for longer but it is assumed they will wake up, determine that they
    // are disqualified for longer due to skipped blocks and re-caculate their next block with better
    // information then
-   auto current_watermark_itr = _producer_watermarks.find(producer_name);
-   if (current_watermark_itr != _producer_watermarks.end()) {
-      auto watermark = current_watermark_itr->second;
+   auto current_watermark = get_watermark(producer_name);
+   if (current_watermark) {
+      auto watermark = *current_watermark;
       auto block_num = chain.head_block_state()->block_num;
       if (chain.is_building_block()) {
          ++block_num;
@@ -1306,7 +1316,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
    // Not our turn
    const auto& scheduled_producer = hbs->get_scheduled_producer(block_time);
-   auto currrent_watermark_itr = _producer_watermarks.find(scheduled_producer.producer_name);
+   auto current_watermark = get_watermark(scheduled_producer.producer_name);
 
    size_t num_relevant_signatures = 0;
    scheduled_producer.for_each_key([&](const public_key_type& key){
@@ -1336,14 +1346,12 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
    if (_pending_block_mode == pending_block_mode::producing) {
       // determine if our watermark excludes us from producing at this point
-      if (currrent_watermark_itr != _producer_watermarks.end()) {
-         if (currrent_watermark_itr->second >= hbs->block_num + 1) {
-            elog("Not producing block because \"${producer}\" signed a BFT confirmation OR block at a higher block number (${watermark}) than the current fork's head (${head_block_num})",
-                ("producer", scheduled_producer.producer_name)
-                ("watermark", currrent_watermark_itr->second)
-                ("head_block_num", hbs->block_num));
-            _pending_block_mode = pending_block_mode::speculating;
-         }
+      if (current_watermark && *current_watermark >= hbs->block_num + 1) {
+         elog("Not producing block because \"${producer}\" signed a block at a higher block number (${watermark}) than the current fork's head (${head_block_num})",
+             ("producer", scheduled_producer.producer_name)
+             ("watermark", *current_watermark)
+             ("head_block_num", hbs->block_num));
+         _pending_block_mode = pending_block_mode::speculating;
       }
    }
 
@@ -1363,8 +1371,8 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          //    confirmations to make sure we don't double sign after a crash TODO: make these watermarks durable?
          // 3) if it is a producer on this node where this node knows the last block it produced, safely set it -UNLESS-
          // 4) the producer on this node's last watermark is higher (meaning on a different fork)
-         if (currrent_watermark_itr != _producer_watermarks.end()) {
-            auto watermark = currrent_watermark_itr->second;
+         if (current_watermark) {
+            auto watermark = *current_watermark;
             if (watermark < hbs->block_num) {
                blocks_to_confirm = (uint16_t)(std::min<uint32_t>(std::numeric_limits<uint16_t>::max(), (uint32_t)(hbs->block_num - watermark)));
             }
@@ -1856,7 +1864,8 @@ void producer_plugin_impl::produce_block() {
    chain.commit_block();
 
    block_state_ptr new_bs = chain.head_block_state();
-   _producer_watermarks[new_bs->header.producer] = chain.head_block_num();
+
+   consider_new_watermark( new_bs->header.producer, new_bs->block_num );
 
    ilog("Produced block ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, lib: ${lib}, confirmed: ${confs}]",
         ("p",new_bs->header.producer)("id",fc::variant(new_bs->id).as_string().substr(0,16))

From f5cdb51bb1566a83b031e65024c5514f9fbb9315 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 29 Jul 2019 18:27:39 -0400
Subject: [PATCH 0904/1648] remove redundant consider_new_watermark

---
 plugins/producer_plugin/producer_plugin.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 16cb9d00ea5..151891e67f1 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1865,8 +1865,6 @@ void producer_plugin_impl::produce_block() {
 
    block_state_ptr new_bs = chain.head_block_state();
 
-   consider_new_watermark( new_bs->header.producer, new_bs->block_num );
-
    ilog("Produced block ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, lib: ${lib}, confirmed: ${confs}]",
         ("p",new_bs->header.producer)("id",fc::variant(new_bs->id).as_string().substr(0,16))
         ("n",new_bs->block_num)("t",new_bs->header.timestamp)

From 7f91be053697804aa2ccc0dfed7801b3d04e582e Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 29 Jul 2019 20:39:11 -0400
Subject: [PATCH 0905/1648] return flat_multimap from
 transaction::validate_and_extract_extensions

---
 libraries/chain/apply_context.cpp                 | 10 +++++++---
 libraries/chain/block_header.cpp                  |  6 +-----
 .../chain/include/eosio/chain/transaction.hpp     |  4 ++--
 libraries/chain/transaction.cpp                   | 15 +++++++--------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index b7f56361993..02c964b0dee 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -355,10 +355,14 @@ void apply_context::schedule_deferred_transaction( const uint128_t& sender_id, a
    if( control.is_builtin_activated( builtin_protocol_feature_t::no_duplicate_deferred_id ) ) {
       auto exts = trx.validate_and_extract_extensions();
       if( exts.size() > 0 ) {
-         EOS_ASSERT( exts.size() == 1, invalid_transaction_extension,
-                     "only one extension is currently supported for deferred transactions"
+         auto itr = exts.lower_bound( deferred_transaction_generation_context::extension_id() );
+
+         EOS_ASSERT( exts.size() == 1 && itr != exts.end(), invalid_transaction_extension,
+                     "only the deferred_transaction_generation_context extension is currently supported for deferred transactions"
          );
-         const auto& context = exts.front().get<deferred_transaction_generation_context>();
+
+         const auto& context = itr->second.get<deferred_transaction_generation_context>();
+
          EOS_ASSERT( context.sender == receiver, ill_formed_deferred_transaction_generation_context,
                      "deferred transaction generaction context contains mismatching sender",
                      ("expected", receiver)("actual", context.sender)
diff --git a/libraries/chain/block_header.cpp b/libraries/chain/block_header.cpp
index 36cb86004b8..aecc27da098 100644
--- a/libraries/chain/block_header.cpp
+++ b/libraries/chain/block_header.cpp
@@ -29,12 +29,8 @@ namespace eosio { namespace chain {
    }
 
    flat_multimap<uint16_t, block_header_extensions> block_header::validate_and_extract_header_extensions()const {
-      using block_header_extensions_t = block_header_extension_types::block_header_extensions_t;
       using decompose_t = block_header_extension_types::decompose_t;
 
-      static_assert( std::is_same<block_header_extensions_t, block_header_extensions>::value,
-                     "block_header_extensions is not setup as expected" );
-
       flat_multimap<uint16_t, block_header_extensions> results;
 
       uint16_t id_type_lower_bound = 0;
@@ -52,7 +48,7 @@ namespace eosio { namespace chain {
             std::forward_as_tuple()
          );
 
-         auto match = decompose_t::extract<block_header_extensions_t>( id, e.second, iter->second );
+         auto match = decompose_t::extract<block_header_extensions>( id, e.second, iter->second );
          EOS_ASSERT( match, invalid_block_header_extension,
                      "Block header extension with id type ${id} is not supported",
                      ("id", id)
diff --git a/libraries/chain/include/eosio/chain/transaction.hpp b/libraries/chain/include/eosio/chain/transaction.hpp
index 6322d4aa2c5..d86a0ebfae7 100644
--- a/libraries/chain/include/eosio/chain/transaction.hpp
+++ b/libraries/chain/include/eosio/chain/transaction.hpp
@@ -99,7 +99,7 @@ namespace eosio { namespace chain {
                                                      bool allow_duplicate_keys = false) const;
 
       uint32_t total_actions()const { return context_free_actions.size() + actions.size(); }
-      
+
       account_name first_authorizer()const {
          for( const auto& a : actions ) {
             for( const auto& u : a.authorization )
@@ -108,7 +108,7 @@ namespace eosio { namespace chain {
          return account_name();
       }
 
-      vector<eosio::chain::transaction_extensions> validate_and_extract_extensions()const;
+      flat_multimap<uint16_t, eosio::chain::transaction_extensions> validate_and_extract_extensions()const;
    };
 
    struct signed_transaction : public transaction
diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index 1c8bddfcca7..7ff6957e048 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -144,14 +144,10 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
    return sig_cpu_usage;
 } FC_CAPTURE_AND_RETHROW() }
 
-vector<transaction_extensions> transaction::validate_and_extract_extensions()const {
-   using transaction_extensions_t = transaction_extension_types::transaction_extensions_t;
+flat_multimap<uint16_t, transaction_extensions> transaction::validate_and_extract_extensions()const {
    using decompose_t = transaction_extension_types::decompose_t;
 
-   static_assert( std::is_same<transaction_extensions_t, eosio::chain::transaction_extensions>::value,
-                  "transaction_extensions is not setup as expected" );
-
-   vector<transaction_extensions_t> results;
+   flat_multimap<uint16_t, eosio::chain::transaction_extensions> results;
 
    uint16_t id_type_lower_bound = 0;
 
@@ -163,9 +159,12 @@ vector<transaction_extensions> transaction::validate_and_extract_extensions()con
                   "Transaction extensions are not in the correct order (ascending id types required)"
       );
 
-      results.emplace_back();
+      auto iter = results.emplace(std::piecewise_construct,
+         std::forward_as_tuple(id),
+         std::forward_as_tuple()
+      );
 
-      auto match = decompose_t::extract<transaction_extensions_t>( id, e.second, results.back() );
+      auto match = decompose_t::extract<eosio::chain::transaction_extensions>( id, e.second, iter->second );
       EOS_ASSERT( match, invalid_transaction_extension,
                   "Transaction extension with id type ${id} is not supported",
                   ("id", id)

From 265b529c67dbab75d0e680887297fda12c69af89 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 30 Jul 2019 07:46:10 -0500
Subject: [PATCH 0906/1648] Use producer thread pool for sig recovery

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index a528bf21223..ca7bbb9f5a5 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -418,7 +418,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                   });
                };
 
-         transaction_metadata::start_recover_keys( trx, chain.get_thread_pool(), chain.get_chain_id(),
+         transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(), chain.get_chain_id(),
                   max_trx_cpu_usage, std::move( after_sig_recovery ) );
       }
 

From fbf03859f0b9632ea7edd950671ff6fedfe6092a Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 30 Jul 2019 09:47:17 -0400
Subject: [PATCH 0907/1648] add softfloat only injection mode

refactor the injection code to offer a softfloat only injection mode along with its classical "full" injection that includes checktime & depth checking
---
 .../eosio/chain/wasm_eosio_injection.hpp      | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp b/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
index 2d93bad31d8..eed15e4b3ab 100644
--- a/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
@@ -677,9 +677,6 @@ namespace eosio { namespace chain { namespace wasm_injections {
    };
 
    struct pre_op_injectors : wasm_ops::op_types<pass_injector> {
-      using call_t            = wasm_ops::call                    <call_depth_check_and_insert_checktime>;
-      using call_indirect_t   = wasm_ops::call_indirect           <call_depth_check_and_insert_checktime>;
-      
       // float binops 
       using f32_add_t         = wasm_ops::f32_add                 <f32_binop_injector<wasm_ops::f32_add_code>>;
       using f32_sub_t         = wasm_ops::f32_sub                 <f32_binop_injector<wasm_ops::f32_sub_code>>;
@@ -752,12 +749,19 @@ namespace eosio { namespace chain { namespace wasm_injections {
       using f64_convert_u_i64 = wasm_ops::f64_convert_u_i64       <i64_convert_f64_injector<wasm_ops::f64_convert_u_i64_code>>;
    }; // pre_op_injectors
 
+   struct pre_op_full_injectors : pre_op_injectors {
+      using call_t            = wasm_ops::call                    <call_depth_check_and_insert_checktime>;
+      using call_indirect_t   = wasm_ops::call_indirect           <call_depth_check_and_insert_checktime>;
+   };
 
    struct post_op_injectors : wasm_ops::op_types<pass_injector> {
-      using loop_t   = wasm_ops::loop        <checktime_injection>;
       using call_t   = wasm_ops::call        <fix_call_index>;
    };
 
+   struct post_op_full_injectors : post_op_injectors {
+      using loop_t   = wasm_ops::loop        <checktime_injection>;
+   };
+
    template <typename ... Visitors>
    struct module_injectors {
       static void inject( IR::Module& m ) {
@@ -773,7 +777,9 @@ namespace eosio { namespace chain { namespace wasm_injections {
       }
    };
  
-   // inherit from this class and define your own injectors 
+   // "full injection" gives checktime & depth counting along with softfloat injection.
+   // Otherwise you'll just get softfloat injection
+   template<bool full_injection>
    class wasm_binary_injection {
       using standard_module_injectors = module_injectors< max_memory_injection_visitor >;
 
@@ -789,10 +795,11 @@ namespace eosio { namespace chain { namespace wasm_injections {
          void inject() {
             _module_injectors.inject( *_module );
             // inject checktime first
-            injector_utils::add_import<ResultType::none>( *_module, u8"checktime", checktime_injection::chktm_idx );
+            if constexpr (full_injection)
+               injector_utils::add_import<ResultType::none>( *_module, u8"checktime", checktime_injection::chktm_idx );
 
             for ( auto& fd : _module->functions.defs ) {
-               wasm_ops::EOSIO_OperatorDecoderStream<pre_op_injectors> pre_decoder(fd.code);
+               wasm_ops::EOSIO_OperatorDecoderStream<typename std::conditional<full_injection, pre_op_full_injectors, pre_op_injectors>::type> pre_decoder(fd.code);
                wasm_ops::instruction_stream pre_code(fd.code.size()*2);
 
                while ( pre_decoder ) {
@@ -810,12 +817,14 @@ namespace eosio { namespace chain { namespace wasm_injections {
                fd.code = pre_code.get();
             }
             for ( auto& fd : _module->functions.defs ) {
-               wasm_ops::EOSIO_OperatorDecoderStream<post_op_injectors> post_decoder(fd.code);
+               wasm_ops::EOSIO_OperatorDecoderStream<typename std::conditional<full_injection, post_op_full_injectors, post_op_injectors>::type> post_decoder(fd.code);
                wasm_ops::instruction_stream post_code(fd.code.size()*2);
 
-               wasm_ops::op_types<>::call_t chktm; 
-               chktm.field = injector_utils::injected_index_mapping.find(checktime_injection::chktm_idx)->second;
-               chktm.pack(&post_code);
+               if constexpr (full_injection) {
+                  wasm_ops::op_types<>::call_t chktm;
+                  chktm.field = injector_utils::injected_index_mapping.find(checktime_injection::chktm_idx)->second;
+                  chktm.pack(&post_code);
+               }
 
                while ( post_decoder ) {
                   auto op = post_decoder.decodeOp();
@@ -834,8 +843,7 @@ namespace eosio { namespace chain { namespace wasm_injections {
          }
       private:
          IR::Module* _module;
-         static std::string op_string;
-         static standard_module_injectors _module_injectors;
+         standard_module_injectors _module_injectors;
    };
 
 }}} // namespace wasm_constraints, chain, eosio

From 90109fb2f6221bd0b0ab130f3186d90c93562d37 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 30 Jul 2019 11:04:16 -0400
Subject: [PATCH 0908/1648] set wabt & wavm injection to be full injection

---
 libraries/chain/include/eosio/chain/wasm_interface_private.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 45f70460b02..973e0a67efa 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -123,7 +123,7 @@ namespace eosio { namespace chain {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
 
-            wasm_injections::wasm_binary_injection injector(module);
+            wasm_injections::wasm_binary_injection<true> injector(module);
             injector.inject();
 
             std::vector<U8> bytes;

From 7a084347167d752c4a9509e79ebad809f398bf75 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 30 Jul 2019 10:28:32 -0500
Subject: [PATCH 0909/1648] Revert to 1.8.1 version of signature recovery

---
 libraries/chain/controller.cpp                |  8 +--
 .../eosio/chain/transaction_metadata.hpp      | 21 +++----
 libraries/chain/transaction_metadata.cpp      | 62 +++++++------------
 plugins/net_plugin/net_plugin.cpp             |  6 +-
 plugins/producer_plugin/producer_plugin.cpp   | 19 +++---
 unittests/misc_tests.cpp                      | 20 +++---
 6 files changed, 60 insertions(+), 76 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 80d848ee8ca..e7588e5b5d9 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1311,8 +1311,9 @@ struct controller_impl {
          // call recover keys so that trx->sig_cpu_usage is set correctly
          const fc::microseconds sig_cpu_usage =
                check_auth ? std::get<0>( trx->recover_keys( chain_id ) ) : fc::microseconds();
-         const std::shared_ptr<flat_set<public_key_type>> recovered_keys =
-               check_auth ? std::get<1>( trx->recover_keys( chain_id ) ) : nullptr;
+         const flat_set<public_key_type>& recovered_keys =
+               check_auth ? std::get<1>( trx->recover_keys( chain_id ) ) : flat_set<public_key_type>();
+
          if( !explicit_billed_cpu_time ) {
             fc::microseconds already_consumed_time( EOS_PERCENT(sig_cpu_usage.count(), conf.sig_cpu_bill_pct) );
 
@@ -1346,10 +1347,9 @@ struct controller_impl {
             trx_context.delay = fc::seconds(trn.delay_sec);
 
             if( check_auth ) {
-               EOS_ASSERT( recovered_keys, missing_auth_exception, "recovered_keys should never be null" );
                authorization.check_authorization(
                        trn.actions,
-                       *recovered_keys,
+                       recovered_keys,
                        {},
                        trx_context.delay,
                        [&trx_context](){ trx_context.checktime(); },
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index dfda13efa42..7862fbe6967 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -16,9 +16,9 @@ namespace eosio { namespace chain {
 
 class transaction_metadata;
 using transaction_metadata_ptr = std::shared_ptr<transaction_metadata>;
-using signing_keys_future_value_type = std::tuple<chain_id_type, fc::microseconds, std::shared_ptr<flat_set<public_key_type>>>;
+using signing_keys_future_value_type = std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>;
 using signing_keys_future_type = std::shared_future<signing_keys_future_value_type>;
-using recovery_keys_type = std::pair<fc::microseconds, std::shared_ptr<flat_set<public_key_type>>>;
+using recovery_keys_type = std::pair<fc::microseconds, const flat_set<public_key_type>&>;
 
 /**
  *  This data structure should store context-free cached data about a transaction such as
@@ -28,8 +28,7 @@ class transaction_metadata {
    private:
       const packed_transaction_ptr                               _packed_trx;
       const transaction_id_type                                  _id;
-      mutable std::mutex                                         _signing_keys_future_mtx;
-      mutable signing_keys_future_type                           _signing_keys_future;
+      signing_keys_future_type                                   _signing_keys_future;
 
    public:
       bool                                                       accepted = false;  // not thread safe
@@ -62,15 +61,13 @@ class transaction_metadata {
       const packed_transaction_ptr& packed_trx()const { return _packed_trx; }
       const transaction_id_type& id()const { return _id; }
 
-      // can be called from any thread. It is recommended that next() immediately post to application thread for
-      // future processing since next() will be called from the thread_pool.
-      static void start_recover_keys( const transaction_metadata_ptr& mtrx, boost::asio::io_context& thread_pool,
-                          const chain_id_type& chain_id, fc::microseconds time_limit,
-                          std::function<void()> next = std::function<void()>() );
+      // must be called from main application thread
+      static signing_keys_future_type
+      start_recover_keys( const transaction_metadata_ptr& mtrx, boost::asio::io_context& thread_pool,
+                          const chain_id_type& chain_id, fc::microseconds time_limit );
 
-      // start_recover_keys can be called first to begin key recovery
-      // if time_limit of start_recover_keys exceeded (or any other exception) then this can throw
-      recovery_keys_type recover_keys( const chain_id_type& chain_id ) const;
+      // start_recover_keys must be called first
+      recovery_keys_type recover_keys( const chain_id_type& chain_id );
 };
 
 } } // eosio::chain
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index 9e973a83142..0c8a6cbe8a0 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -4,66 +4,50 @@
 
 namespace eosio { namespace chain {
 
-recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chain_id ) const {
+recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chain_id ) {
    // Unlikely for more than one chain_id to be used in one nodeos instance
-   std::unique_lock<std::mutex> g( _signing_keys_future_mtx );
    if( _signing_keys_future.valid() ) {
-      const signing_keys_future_value_type& sig_keys = _signing_keys_future.get();
+      const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = _signing_keys_future.get();
       if( std::get<0>( sig_keys ) == chain_id ) {
-         return std::make_pair( std::get<1>( sig_keys ), std::get<2>( sig_keys ) );
+         return std::make_pair( std::get<1>( sig_keys ), std::cref( std::get<2>( sig_keys ) ) );
       }
    }
 
-   g.unlock();
    // shared_keys_future not created or different chain_id
-   dlog( "recovering keys in recover_keys" );
-   auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
-   const signed_transaction& trn = _packed_trx->get_signed_transaction();
-   fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, fc::time_point::maximum(), *recovered_pub_keys );
-
-   g.lock();
    std::promise<signing_keys_future_value_type> p;
+   flat_set<public_key_type> recovered_pub_keys;
+   const signed_transaction& trn = _packed_trx->get_signed_transaction();
+   fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, fc::time_point::maximum(), recovered_pub_keys );
    p.set_value( std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ) ) );
    _signing_keys_future = p.get_future().share();
 
-   const signing_keys_future_value_type& sig_keys = _signing_keys_future.get();
-   return std::make_pair( std::get<1>( sig_keys ), std::get<2>( sig_keys ) );
+   const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = _signing_keys_future.get();
+   return std::make_pair( std::get<1>( sig_keys ), std::cref( std::get<2>( sig_keys ) ) );
 }
 
-void transaction_metadata::start_recover_keys( const transaction_metadata_ptr& mtrx,
-                                               boost::asio::io_context& thread_pool,
-                                               const chain_id_type& chain_id,
-                                               fc::microseconds time_limit,
-                                               std::function<void()> next )
+signing_keys_future_type transaction_metadata::start_recover_keys( const transaction_metadata_ptr& mtrx,
+                                                                   boost::asio::io_context& thread_pool,
+                                                                   const chain_id_type& chain_id,
+                                                                   fc::microseconds time_limit )
 {
-   std::unique_lock<std::mutex> g( mtrx->_signing_keys_future_mtx );
-   if( mtrx->_signing_keys_future.valid() && std::get<0>( mtrx->_signing_keys_future.get() ) == chain_id ) { // already created
-      g.unlock();
-      if( next ) next();
-      return;
-   }
+   if( mtrx->_signing_keys_future.valid() && std::get<0>( mtrx->_signing_keys_future.get() ) == chain_id ) // already created
+      return mtrx->_signing_keys_future;
 
    std::weak_ptr<transaction_metadata> mtrx_wp = mtrx;
-   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_wp, next{std::move(next)}]() mutable {
-      auto recovered_pub_keys = std::make_shared<flat_set<public_key_type>>();
+   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_wp]() {
+      fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
+                                fc::time_point::maximum() : fc::time_point::now() + time_limit;
+      auto mtrx = mtrx_wp.lock();
       fc::microseconds cpu_usage;
-      try {
-         fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
-                                   fc::time_point::maximum() : fc::time_point::now() + time_limit;
-
-         transaction_metadata_ptr mtrx = mtrx_wp.lock(); // if mtrx no longer exists then no signing_keys_future to get results
-         if( mtrx ) {
-            const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
-            cpu_usage = trn.get_signature_keys( chain_id, deadline, *recovered_pub_keys );
-         }
-      } catch( ... ) {
-         if( next ) next();
-         throw;
+      flat_set<public_key_type> recovered_pub_keys;
+      if( mtrx ) {
+         const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
+         cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
       }
-      if( next ) next();
       return std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ));
    } );
 
+   return mtrx->_signing_keys_future;
 }
 
 
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d4f9a7f8d67..2271f65bd3f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2813,8 +2813,9 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( ptrx->packed_trx() );
-      my_impl->chain_plug->accept_transaction( ptrx,
-            [weak = weak_from_this(), ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+      app().post( priority::low, [ptrx{std::move(ptrx)}, weak = weak_from_this()]() {
+         my_impl->chain_plug->accept_transaction( ptrx,
+            [weak, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2844,6 +2845,7 @@ namespace eosio {
                conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx() );
             }
          });
+        });
       });
    }
 
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index ca7bbb9f5a5..d3db743d005 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -411,15 +411,16 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
 
-         auto after_sig_recovery =
-               [self = this, trx, persist_until_expired, next{std::move(next)}]() mutable {
-                  app().post(priority::low, [self, trx{std::move(trx)}, persist_until_expired, next{std::move(next)}]() {
-                     self->process_incoming_transaction_async( trx, persist_until_expired, next );
-                  });
-               };
-
-         transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(), chain.get_chain_id(),
-                  max_trx_cpu_usage, std::move( after_sig_recovery ) );
+         signing_keys_future_type future = transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
+                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ) );
+         boost::asio::post( _thread_pool->get_executor(), [self = this, future, trx, persist_until_expired, next]() {
+            if( future.valid() )
+               future.wait();
+            app().post(priority::low, [self, trx, persist_until_expired, next]() {
+               self->process_incoming_transaction_async( trx, persist_until_expired, next );
+            });
+         });
+
       }
 
       void process_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index c687e38a2d9..5dea78adeb6 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -850,29 +850,29 @@ BOOST_AUTO_TEST_CASE(transaction_metadata_test) { try {
       transaction_metadata::start_recover_keys( mtrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
 
       auto keys = mtrx->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys.second->size());
-      BOOST_CHECK_EQUAL(public_key, *keys.second->begin());
+      BOOST_CHECK_EQUAL(1u, keys.second.size());
+      BOOST_CHECK_EQUAL(public_key, *keys.second.begin());
 
       // again
       auto keys2 = mtrx->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys2.second->size());
-      BOOST_CHECK_EQUAL(public_key, *keys2.second->begin());
+      BOOST_CHECK_EQUAL(1u, keys2.second.size());
+      BOOST_CHECK_EQUAL(public_key, *keys2.second.begin());
 
       auto keys3 = mtrx2->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys3.second->size());
-      BOOST_CHECK_EQUAL(public_key, *keys3.second->begin());
+      BOOST_CHECK_EQUAL(1u, keys3.second.size());
+      BOOST_CHECK_EQUAL(public_key, *keys3.second.begin());
 
       // recover keys without first calling start_recover_keys
       transaction_metadata_ptr mtrx4 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::none) );
       transaction_metadata_ptr mtrx5 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::zlib) );
 
       auto keys4 = mtrx4->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys4.second->size());
-      BOOST_CHECK_EQUAL(public_key, *keys4.second->begin());
+      BOOST_CHECK_EQUAL(1u, keys4.second.size());
+      BOOST_CHECK_EQUAL(public_key, *keys4.second.begin());
 
       auto keys5 = mtrx5->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys5.second->size());
-      BOOST_CHECK_EQUAL(public_key, *keys5.second->begin());
+      BOOST_CHECK_EQUAL(1u, keys5.second.size());
+      BOOST_CHECK_EQUAL(public_key, *keys5.second.begin());
 
       thread_pool.stop();
 

From 8042e833ce7908e6db5c8fff2a070bb0d7b26228 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 30 Jul 2019 10:50:16 -0500
Subject: [PATCH 0910/1648] Fix compiler error

---
 plugins/mongo_db_plugin/mongo_db_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index 84eb735c214..1254c517826 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -771,10 +771,10 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
    }
 
    fc::variant signing_keys;
-   std::shared_ptr<flat_set<public_key_type>> keys;
+   flat_set<public_key_type> keys;
    std::tie( std::ignore, keys ) = t->recover_keys( *chain_id );
-   if( !keys->empty() ) {
-      signing_keys = *keys;
+   if( !keys.empty() ) {
+      signing_keys = keys;
    }
 
    if( signing_keys.get_type() == fc::variant::array_type && signing_keys.get_array().size() > 0) {

From a70daca0bd59d78e7a81c7f2f508e50a231c6a25 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 30 Jul 2019 12:05:20 -0400
Subject: [PATCH 0911/1648] consistent names for the extension types

---
 libraries/chain/block_header.cpp                           | 6 +++---
 libraries/chain/include/eosio/chain/block_header.hpp       | 6 +++---
 libraries/chain/include/eosio/chain/block_header_state.hpp | 2 +-
 libraries/chain/include/eosio/chain/transaction.hpp        | 6 +++---
 libraries/chain/transaction.cpp                            | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libraries/chain/block_header.cpp b/libraries/chain/block_header.cpp
index aecc27da098..e436254fef4 100644
--- a/libraries/chain/block_header.cpp
+++ b/libraries/chain/block_header.cpp
@@ -28,10 +28,10 @@ namespace eosio { namespace chain {
       return result;
    }
 
-   flat_multimap<uint16_t, block_header_extensions> block_header::validate_and_extract_header_extensions()const {
+   flat_multimap<uint16_t, block_header_extension> block_header::validate_and_extract_header_extensions()const {
       using decompose_t = block_header_extension_types::decompose_t;
 
-      flat_multimap<uint16_t, block_header_extensions> results;
+      flat_multimap<uint16_t, block_header_extension> results;
 
       uint16_t id_type_lower_bound = 0;
 
@@ -48,7 +48,7 @@ namespace eosio { namespace chain {
             std::forward_as_tuple()
          );
 
-         auto match = decompose_t::extract<block_header_extensions>( id, e.second, iter->second );
+         auto match = decompose_t::extract<block_header_extension>( id, e.second, iter->second );
          EOS_ASSERT( match, invalid_block_header_extension,
                      "Block header extension with id type ${id} is not supported",
                      ("id", id)
diff --git a/libraries/chain/include/eosio/chain/block_header.hpp b/libraries/chain/include/eosio/chain/block_header.hpp
index bc622b38fb6..286ecf528c1 100644
--- a/libraries/chain/include/eosio/chain/block_header.hpp
+++ b/libraries/chain/include/eosio/chain/block_header.hpp
@@ -10,7 +10,7 @@ namespace eosio { namespace chain {
    namespace detail {
       template<typename... Ts>
       struct block_header_extension_types {
-         using block_header_extensions_t = fc::static_variant< Ts... >;
+         using block_header_extension_t = fc::static_variant< Ts... >;
          using decompose_t = decompose< Ts... >;
       };
    }
@@ -20,7 +20,7 @@ namespace eosio { namespace chain {
       producer_schedule_change_extension
    >;
 
-   using block_header_extensions = block_header_extension_types::block_header_extensions_t;
+   using block_header_extension = block_header_extension_types::block_header_extension_t;
 
    struct block_header
    {
@@ -67,7 +67,7 @@ namespace eosio { namespace chain {
       uint32_t          block_num() const { return num_from_id(previous) + 1; }
       static uint32_t   num_from_id(const block_id_type& id);
 
-      flat_multimap<uint16_t, block_header_extensions> validate_and_extract_header_extensions()const;
+      flat_multimap<uint16_t, block_header_extension> validate_and_extract_header_extensions()const;
    };
 
 
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index 784c3156641..956d66ba422 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -123,7 +123,7 @@ struct block_header_state : public detail::block_header_state_common {
 
    /// this data is redundant with the data stored in header, but it acts as a cache that avoids
    /// duplication of work
-   flat_multimap<uint16_t, block_header_extensions> header_exts;
+   flat_multimap<uint16_t, block_header_extension> header_exts;
 
    block_header_state() = default;
 
diff --git a/libraries/chain/include/eosio/chain/transaction.hpp b/libraries/chain/include/eosio/chain/transaction.hpp
index d86a0ebfae7..a6b50b4075b 100644
--- a/libraries/chain/include/eosio/chain/transaction.hpp
+++ b/libraries/chain/include/eosio/chain/transaction.hpp
@@ -31,7 +31,7 @@ namespace eosio { namespace chain {
    namespace detail {
       template<typename... Ts>
       struct transaction_extension_types {
-         using transaction_extensions_t = fc::static_variant< Ts... >;
+         using transaction_extension_t = fc::static_variant< Ts... >;
          using decompose_t = decompose< Ts... >;
       };
    }
@@ -40,7 +40,7 @@ namespace eosio { namespace chain {
       deferred_transaction_generation_context
    >;
 
-   using transaction_extensions = transaction_extension_types::transaction_extensions_t;
+   using transaction_extension = transaction_extension_types::transaction_extension_t;
 
    /**
     *  The transaction header contains the fixed-sized data
@@ -108,7 +108,7 @@ namespace eosio { namespace chain {
          return account_name();
       }
 
-      flat_multimap<uint16_t, eosio::chain::transaction_extensions> validate_and_extract_extensions()const;
+      flat_multimap<uint16_t, transaction_extension> validate_and_extract_extensions()const;
    };
 
    struct signed_transaction : public transaction
diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index 7ff6957e048..4d3f712ba99 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -144,10 +144,10 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
    return sig_cpu_usage;
 } FC_CAPTURE_AND_RETHROW() }
 
-flat_multimap<uint16_t, transaction_extensions> transaction::validate_and_extract_extensions()const {
+flat_multimap<uint16_t, transaction_extension> transaction::validate_and_extract_extensions()const {
    using decompose_t = transaction_extension_types::decompose_t;
 
-   flat_multimap<uint16_t, eosio::chain::transaction_extensions> results;
+   flat_multimap<uint16_t, transaction_extension> results;
 
    uint16_t id_type_lower_bound = 0;
 
@@ -164,7 +164,7 @@ flat_multimap<uint16_t, transaction_extensions> transaction::validate_and_extrac
          std::forward_as_tuple()
       );
 
-      auto match = decompose_t::extract<eosio::chain::transaction_extensions>( id, e.second, iter->second );
+      auto match = decompose_t::extract<transaction_extension>( id, e.second, iter->second );
       EOS_ASSERT( match, invalid_transaction_extension,
                   "Transaction extension with id type ${id} is not supported",
                   ("id", id)

From 897e0022b36e093a87f76e25e33af2a4cb6bcf02 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Tue, 30 Jul 2019 16:26:59 -0400
Subject: [PATCH 0912/1648] Update for the changes to eos-vm in
 host-functions.hpp

---
 .../eosio/chain/webassembly/eos-vm.hpp        | 52 +++++++------------
 libraries/eos-vm                              |  2 +-
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 39e1c1645a7..57bd22d8e41 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -18,31 +18,23 @@ namespace eosio { namespace vm {
 
 // eosio specific specializations
 namespace eosio { namespace vm {
-   template <>
-   struct reduce_type<chain::name> {
-      typedef uint64_t type;
-   };
 
-   template <typename S, typename Args, typename T, typename WAlloc>
-   constexpr auto get_value(WAlloc*, T&& val) 
-         -> std::enable_if_t<std::is_same_v<i64_const_t, T> && std::is_same_v<chain::name, std::decay_t<S>>, S> {
-      return std::move(chain::name{(uint64_t)val.data.ui});
-   } 
+   template<>
+   struct wasm_type_converter<eosio::chain::name> {
+      static auto from_wasm(uint64_t val) {
+         return eosio::chain::name{val};
+      }
+      static auto to_wasm(eosio::chain::name val) {
+         return val.to_uint64_t();
+      }
+   };
 
-   // we can clean these up if we go with custom vms
-   template <typename T>
-   struct reduce_type<eosio::chain::array_ptr<T>> {
-      typedef uint32_t type;
+   template<typename T>
+   struct wasm_type_converter<eosio::chain::array_ptr<T>> {
+      static auto from_wasm(T* ptr) {
+         return eosio::chain::array_ptr<T>(ptr);
+      }
    };
-   
-   template <typename S, typename Args, typename T, typename WAlloc>
-   constexpr auto get_value(WAlloc* walloc, T&& val) 
-         -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
-         std::is_same_v< eosio::chain::array_ptr<typename S::type>, S> &&
-         !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
-      using ptr_ty = typename S::type;
-      return eosio::chain::array_ptr<ptr_ty>((ptr_ty*)((walloc->template get_base_ptr<char>())+val.data.ui));
-   }
 
    template <typename Ctx>
    struct construct_derived<eosio::chain::transaction_context, Ctx> {
@@ -54,18 +46,12 @@ namespace eosio { namespace vm {
       static auto &value(eosio::chain::apply_context& ctx) { return ctx; }
    };
 
-   template <>
-   struct reduce_type<eosio::chain::null_terminated_ptr> {
-      typedef uint32_t type;
+   template<>
+   struct wasm_type_converter<eosio::chain::null_terminated_ptr> {
+      static auto from_wasm(char* ptr) {
+         return eosio::chain::null_terminated_ptr{ ptr };
+      }
    };
-   
-   template <typename S, typename Args, typename T, typename WAlloc>
-   constexpr auto get_value(WAlloc* walloc, T&& val) 
-         -> std::enable_if_t<std::is_same_v<i32_const_t, T> && 
-         std::is_same_v< eosio::chain::null_terminated_ptr, S> &&
-         !std::is_lvalue_reference_v<S> && !std::is_pointer_v<S>, S> {
-      return eosio::chain::null_terminated_ptr((char*)(walloc->template get_base_ptr<uint8_t>()+val.data.ui));
-   }
 
 }} // ns eosio::vm
 
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 78b9bc87f79..81131d0beee 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 78b9bc87f79c2088ef5a1ff61bf704b8f211a34f
+Subproject commit 81131d0beee01784c6ec692296961a6280e34eff

From d4aca744ce014347132ff4d00531e68e27654365 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 31 Jul 2019 09:54:11 -0500
Subject: [PATCH 0913/1648] Call accept_transaction on net thread

---
 plugins/net_plugin/net_plugin.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2271f65bd3f..96e04d1e082 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2813,9 +2813,8 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( ptrx->packed_trx() );
-      app().post( priority::low, [ptrx{std::move(ptrx)}, weak = weak_from_this()]() {
          my_impl->chain_plug->accept_transaction( ptrx,
-            [weak, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak = weak_from_this(), ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2845,7 +2844,6 @@ namespace eosio {
                conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx() );
             }
          });
-        });
       });
    }
 

From 76a81f29b6ae289f20fe30213e2b0c92992ebb66 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 31 Jul 2019 12:48:49 -0500
Subject: [PATCH 0914/1648] Revert "Call accept_transaction on net thread"

This reverts commit d4aca744ce014347132ff4d00531e68e27654365.
---
 plugins/net_plugin/net_plugin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 96e04d1e082..2271f65bd3f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2813,8 +2813,9 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( ptrx->packed_trx() );
+      app().post( priority::low, [ptrx{std::move(ptrx)}, weak = weak_from_this()]() {
          my_impl->chain_plug->accept_transaction( ptrx,
-            [weak = weak_from_this(), ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2844,6 +2845,7 @@ namespace eosio {
                conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx() );
             }
          });
+        });
       });
    }
 

From e75d3b86b33f05ad655e94f974385bf3da3a2c72 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 31 Jul 2019 15:11:25 -0500
Subject: [PATCH 0915/1648] Cache transaction id on packed_transaction instead
 of transaction_metadata

---
 libraries/chain/include/eosio/chain/transaction.hpp      | 7 ++++---
 .../chain/include/eosio/chain/transaction_metadata.hpp   | 9 +++------
 libraries/chain/transaction.cpp                          | 2 ++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction.hpp b/libraries/chain/include/eosio/chain/transaction.hpp
index 6322d4aa2c5..7eaea9b0604 100644
--- a/libraries/chain/include/eosio/chain/transaction.hpp
+++ b/libraries/chain/include/eosio/chain/transaction.hpp
@@ -150,14 +150,14 @@ namespace eosio { namespace chain {
       packed_transaction& operator=(packed_transaction&&) = default;
 
       explicit packed_transaction(const signed_transaction& t, compression_type _compression = compression_type::none)
-      :signatures(t.signatures), compression(_compression), unpacked_trx(t)
+      :signatures(t.signatures), compression(_compression), unpacked_trx(t), trx_id(unpacked_trx.id())
       {
          local_pack_transaction();
          local_pack_context_free_data();
       }
 
       explicit packed_transaction(signed_transaction&& t, compression_type _compression = compression_type::none)
-      :signatures(t.signatures), compression(_compression), unpacked_trx(std::move(t))
+      :signatures(t.signatures), compression(_compression), unpacked_trx(std::move(t)), trx_id(unpacked_trx.id())
       {
          local_pack_transaction();
          local_pack_context_free_data();
@@ -173,7 +173,7 @@ namespace eosio { namespace chain {
 
       digest_type packed_digest()const;
 
-      transaction_id_type id()const { return unpacked_trx.id(); }
+      const transaction_id_type& id()const { return trx_id; }
       bytes               get_raw_transaction()const;
 
       time_point_sec                expiration()const { return unpacked_trx.expiration; }
@@ -204,6 +204,7 @@ namespace eosio { namespace chain {
    private:
       // cache unpacked trx, for thread safety do not modify after construction
       signed_transaction                      unpacked_trx;
+      transaction_id_type                     trx_id;
    };
 
    using packed_transaction_ptr = std::shared_ptr<packed_transaction>;
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 7862fbe6967..44fbff3b335 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -27,7 +27,6 @@ using recovery_keys_type = std::pair<fc::microseconds, const flat_set<public_key
 class transaction_metadata {
    private:
       const packed_transaction_ptr                               _packed_trx;
-      const transaction_id_type                                  _id;
       signing_keys_future_type                                   _signing_keys_future;
 
    public:
@@ -42,14 +41,12 @@ class transaction_metadata {
       transaction_metadata operator=(transaction_metadata&&) = delete;
 
       explicit transaction_metadata( const signed_transaction& t, uint32_t max_variable_sig_size = UINT32_MAX, packed_transaction::compression_type c = packed_transaction::compression_type::none )
-            : _packed_trx( std::make_shared<packed_transaction>( t, c ) )
-            , _id( t.id() ) {
+            : _packed_trx( std::make_shared<packed_transaction>( t, c ) ) {
          check_variable_sig_size(max_variable_sig_size);
       }
 
       explicit transaction_metadata( const packed_transaction_ptr& ptrx, uint32_t max_variable_sig_size = UINT32_MAX )
-            : _packed_trx( ptrx )
-            , _id( ptrx->id() ) {
+            : _packed_trx( ptrx ) {
          check_variable_sig_size(max_variable_sig_size);
       }
 
@@ -59,7 +56,7 @@ class transaction_metadata {
       }
 
       const packed_transaction_ptr& packed_trx()const { return _packed_trx; }
-      const transaction_id_type& id()const { return _id; }
+      const transaction_id_type& id()const { return _packed_trx->id(); }
 
       // must be called from main application thread
       static signing_keys_future_type
diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index 1c8bddfcca7..0d24558e793 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -366,6 +366,7 @@ packed_transaction::packed_transaction( transaction&& t, vector<signature_type>&
 ,compression(_compression)
 ,packed_context_free_data(std::move(packed_cfd))
 ,unpacked_trx(std::move(t), signatures, {})
+,trx_id(unpacked_trx.id())
 {
    local_pack_transaction();
    if( !packed_context_free_data.empty() ) {
@@ -396,6 +397,7 @@ void packed_transaction::local_unpack_transaction(vector<bytes>&& context_free_d
          default:
             EOS_THROW( unknown_transaction_compression, "Unknown transaction compression algorithm" );
       }
+      trx_id = unpacked_trx.id();
    } FC_CAPTURE_AND_RETHROW( (compression) )
 }
 

From 924254008f467613b057b51cc330d6c0b758dc86 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 31 Jul 2019 16:03:54 -0500
Subject: [PATCH 0916/1648] Add next() method to start_recover_keys, have
 producer provide it for processing incoming transaction after signature
 recovery

---
 .../eosio/chain/transaction_metadata.hpp      |  3 ++-
 libraries/chain/transaction_metadata.cpp      | 21 +++++++++++++------
 plugins/producer_plugin/producer_plugin.cpp   | 10 +++------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index 44fbff3b335..fd470a695f1 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -61,7 +61,8 @@ class transaction_metadata {
       // must be called from main application thread
       static signing_keys_future_type
       start_recover_keys( const transaction_metadata_ptr& mtrx, boost::asio::io_context& thread_pool,
-                          const chain_id_type& chain_id, fc::microseconds time_limit );
+                          const chain_id_type& chain_id, fc::microseconds time_limit,
+                          std::function<void()> next = std::function<void()>() );
 
       // start_recover_keys must be called first
       recovery_keys_type recover_keys( const chain_id_type& chain_id );
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index 0c8a6cbe8a0..08c0c626497 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -28,22 +28,31 @@ recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chai
 signing_keys_future_type transaction_metadata::start_recover_keys( const transaction_metadata_ptr& mtrx,
                                                                    boost::asio::io_context& thread_pool,
                                                                    const chain_id_type& chain_id,
-                                                                   fc::microseconds time_limit )
+                                                                   fc::microseconds time_limit,
+                                                                   std::function<void()> next )
 {
-   if( mtrx->_signing_keys_future.valid() && std::get<0>( mtrx->_signing_keys_future.get() ) == chain_id ) // already created
+   if( mtrx->_signing_keys_future.valid() && std::get<0>( mtrx->_signing_keys_future.get() ) == chain_id ) {// already created
+      if( next ) next();
       return mtrx->_signing_keys_future;
+   }
 
    std::weak_ptr<transaction_metadata> mtrx_wp = mtrx;
-   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_wp]() {
+   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_wp, next{std::move(next)}]() {
       fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
                                 fc::time_point::maximum() : fc::time_point::now() + time_limit;
       auto mtrx = mtrx_wp.lock();
       fc::microseconds cpu_usage;
       flat_set<public_key_type> recovered_pub_keys;
-      if( mtrx ) {
-         const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
-         cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
+      try {
+         if( mtrx ) {
+            const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
+            cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
+         }
+      } catch( ... ) {
+         if( next ) next();
+         throw;
       }
+      if( next ) next();
       return std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ));
    } );
 
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index d3db743d005..9c8a1366caa 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -412,15 +412,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
 
          signing_keys_future_type future = transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
-                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ) );
-         boost::asio::post( _thread_pool->get_executor(), [self = this, future, trx, persist_until_expired, next]() {
-            if( future.valid() )
-               future.wait();
-            app().post(priority::low, [self, trx, persist_until_expired, next]() {
-               self->process_incoming_transaction_async( trx, persist_until_expired, next );
+                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ), [self = this, trx, persist_until_expired, next{std::move(next)}]() {
+            app().post(priority::low, [self, trx, persist_until_expired, next{std::move(next)}]() mutable {
+               self->process_incoming_transaction_async( trx, persist_until_expired, std::move(next) );
             });
          });
-
       }
 
       void process_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {

From 2129de695ff219d4d0e2658866bfac6d0442183b Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Wed, 31 Jul 2019 18:10:12 -0400
Subject: [PATCH 0917/1648] Fixes for cmake softfloat

---
 .../eosio/chain/wasm_interface_private.hpp    | 38 +++++++++++++------
 libraries/eos-vm                              |  2 +-
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index e5ccee2085d..a1dd1410354 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -20,6 +20,8 @@
 
 #include <eosio/vm/allocator.hpp>
 
+#include <fstream>
+
 using namespace fc;
 using namespace eosio::chain::webassembly;
 using namespace eosio::vm;
@@ -126,35 +128,49 @@ namespace eosio { namespace chain {
             });
             trx_context.pause_billing_timer();
             IR::Module module;
-	    std::vector<U8> bytes = {(const U8*)codeobject->code.data(), (const U8*)codeobject->code.data() + codeobject->code.size()};
+            std::vector<U8> bytes = {
+                (const U8*)codeobject->code.data(),
+                (const U8*)codeobject->code.data() + codeobject->code.size()};
             try {
-               Serialization::MemoryInputStream stream((const U8*)bytes.data(), bytes.size());
+               Serialization::MemoryInputStream stream((const U8*)bytes.data(),
+                                                       bytes.size());
                WASM::serialize(stream, module);
                module.userSections.clear();
-            } catch(const Serialization::FatalSerializationException& e) {
+            } catch (const Serialization::FatalSerializationException& e) {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
-            } catch(const IR::ValidationException& e) {
+            } catch (const IR::ValidationException& e) {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
-            if(false && inject) {
+            if (false && inject) {
                wasm_injections::wasm_binary_injection injector(module);
                injector.inject();
-               std::cout << "INJECTING!!!!!!!!!!!!\n";
                try {
                   Serialization::ArrayOutputStream outstream;
                   WASM::serialize(outstream, module);
                   bytes = outstream.getBytes();
-               } catch(const Serialization::FatalSerializationException& e) {
-                  EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
-               } catch(const IR::ValidationException& e) {
-                  EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
+               } catch (const Serialization::FatalSerializationException& e) {
+                  EOS_ASSERT(false, wasm_serialization_error,
+                             e.message.c_str());
+               } catch (const IR::ValidationException& e) {
+                  EOS_ASSERT(false, wasm_serialization_error,
+                             e.message.c_str());
                }
-	    }
+            }
 
             wasm_instantiation_cache.modify(it, [&](auto& c) {
                c.module = runtime_interface->instantiate_module((const char*)bytes.data(), bytes.size(), parse_initial_memory(module));
             });
+            std::ofstream outfile("out2.wasm");
+            if (codeobject) {
+               outfile.write(codeobject->code.data(), codeobject->code.size());
+            }
+
+         }
+         std::ofstream outfile("out.wasm");
+         if (codeobject) {
+            outfile.write(codeobject->code.data(), codeobject->code.size());
          }
+         outfile.close();
          return it->module;
       }
 
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 78b9bc87f79..949c3f03758 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 78b9bc87f79c2088ef5a1ff61bf704b8f211a34f
+Subproject commit 949c3f037589ea70bd338b61fce07c573bf5a1f7

From b729691ea0a875a8d6ace6f4763d73580cd573d9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 31 Jul 2019 20:06:25 -0500
Subject: [PATCH 0918/1648] Use future to wait on key recovery instead of
 continue by next

---
 plugins/producer_plugin/producer_plugin.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 9c8a1366caa..f5f56665551 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -412,8 +412,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
 
          signing_keys_future_type future = transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
-                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ), [self = this, trx, persist_until_expired, next{std::move(next)}]() {
-            app().post(priority::low, [self, trx, persist_until_expired, next{std::move(next)}]() mutable {
+                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ) );
+         boost::asio::post( _thread_pool->get_executor(), [self = this, future, trx, persist_until_expired, next{std::move(next)}]() mutable {
+            if( future.valid() )
+               future.wait();
+            app().post(priority::low, [self, trx, persist_until_expired, next{std::move(next)}]() {
                self->process_incoming_transaction_async( trx, persist_until_expired, std::move(next) );
             });
          });

From 09a9eed23a09c126e3f1c39814f8f9b393a015ae Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 1 Aug 2019 16:32:41 +0800
Subject: [PATCH 0919/1648] Remove redundant include

---
 libraries/chain/include/eosio/chain/fixed_bytes.hpp | 2 --
 tests/chain_plugin_tests.cpp                        | 1 -
 2 files changed, 3 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/fixed_bytes.hpp b/libraries/chain/include/eosio/chain/fixed_bytes.hpp
index d1a4099153a..df659935bda 100644
--- a/libraries/chain/include/eosio/chain/fixed_bytes.hpp
+++ b/libraries/chain/include/eosio/chain/fixed_bytes.hpp
@@ -6,8 +6,6 @@
 
 #include <eosio/chain/types.hpp>
 
-// #include <fc/exception/exception.hpp>
-
 #include <array>
 #include <algorithm>
 #include <functional>
diff --git a/tests/chain_plugin_tests.cpp b/tests/chain_plugin_tests.cpp
index edc6d2620da..a6e119a5b06 100644
--- a/tests/chain_plugin_tests.cpp
+++ b/tests/chain_plugin_tests.cpp
@@ -15,7 +15,6 @@
 
 #include <contracts.hpp>
 
-#include <fc/io/fstream.hpp>
 #include <fc/io/fstream.hpp>
 
 #include <Runtime/Runtime.h>

From 315fb1fa0edc3ca8ab59bad9c7dfb8ee97a52429 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 1 Aug 2019 16:33:09 +0800
Subject: [PATCH 0920/1648] more2 to next_key

---
 plugins/chain_plugin/chain_plugin.cpp         |  2 +-
 .../eosio/chain_plugin/chain_plugin.hpp       |  8 ++---
 tests/get_table_tests.cpp                     | 36 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index e94d9f2203d..5672c97e660 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1480,7 +1480,7 @@ string convert_to_string(const chain::key256_t& source, const string& key_type,
          memcpy(val._hash, byte_array.data(), byte_array.size() );
          return std::string(val);
       }
-      EOS_ASSERT( false, chain_type_exception, "Incompatible key_type and encode_type for key256_t more2" );
+      EOS_ASSERT( false, chain_type_exception, "Incompatible key_type and encode_type for key256_t next_key" );
      
    } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} source '${source}' to string.", ("desc", desc)("source",source) )
 }
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 611c6591508..80006c0b347 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -308,7 +308,7 @@ class read_only {
    struct get_table_rows_result {
       vector<fc::variant> rows; ///< one row per item, either encoded as hex String or JSON object
       bool                more = false; ///< true if last element in data is not the end and sizeof data() < limit
-      string              more2; ///< fill lower_bound with this value to fetch more rows
+      string              next_key; ///< fill lower_bound with this value to fetch more rows
    };
 
    get_table_rows_result get_table_rows( const get_table_rows_params& params )const;
@@ -497,7 +497,7 @@ class read_only {
             }
             if( itr != end_itr ) {
                result.more = true;
-               result.more2 = convert_to_string(itr->secondary_key, p.key_type, p.encode_type, "more2 - next lower bound");
+               result.next_key = convert_to_string(itr->secondary_key, p.key_type, p.encode_type, "next_key - next lower bound");
             }
          };
 
@@ -572,7 +572,7 @@ class read_only {
             }
             if( itr != end_itr ) {
                result.more = true;
-               result.more2 = convert_to_string(itr->primary_key, p.key_type, p.encode_type, "more2 - next lower bound");
+               result.next_key = convert_to_string(itr->primary_key, p.key_type, p.encode_type, "next_key - next lower bound");
             }
          };
 
@@ -756,7 +756,7 @@ FC_REFLECT(eosio::chain_apis::read_only::get_block_header_state_params, (block_n
 FC_REFLECT( eosio::chain_apis::read_write::push_transaction_results, (transaction_id)(processed) )
 
 FC_REFLECT( eosio::chain_apis::read_only::get_table_rows_params, (json)(code)(scope)(table)(table_key)(lower_bound)(upper_bound)(limit)(key_type)(index_position)(encode_type)(reverse)(show_payer) )
-FC_REFLECT( eosio::chain_apis::read_only::get_table_rows_result, (rows)(more)(more2) );
+FC_REFLECT( eosio::chain_apis::read_only::get_table_rows_result, (rows)(more)(next_key) );
 
 FC_REFLECT( eosio::chain_apis::read_only::get_table_by_scope_params, (code)(table)(lower_bound)(upper_bound)(limit)(reverse) )
 FC_REFLECT( eosio::chain_apis::read_only::get_table_by_scope_result_row, (code)(scope)(table)(payer)(count));
diff --git a/tests/get_table_tests.cpp b/tests/get_table_tests.cpp
index 34f4e10c04e..bdacd23e4c2 100644
--- a/tests/get_table_tests.cpp
+++ b/tests/get_table_tests.cpp
@@ -493,7 +493,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    //       "secldouble": "0x00000000000000000000000000c00140"
    //     }
    //   "more": false,
-   //   "more2": ""
+   //   "next_key": ""
    // }
    // For hashobjs table (secondary index is on sec256 and sec160):
    // {
@@ -515,7 +515,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    //     }
    //   ],
    //   "more": false,
-   //   "more2": ""
+   //   "next_key": ""
    // }
 
 
@@ -536,8 +536,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
 
    auto res_1 = plugin.get_table_rows(params);
    BOOST_TEST(res_1.rows[0].get_object()["key"].as<uint64_t>() == 0);
-   BOOST_TEST(res_1.more2 == "1");
-   params.lower_bound = res_1.more2;
+   BOOST_TEST(res_1.next_key == "1");
+   params.lower_bound = res_1.next_key;
    auto more2_res_1 = plugin.get_table_rows(params);
    BOOST_TEST(more2_res_1.rows[0].get_object()["key"].as<uint64_t>() == 1);
    
@@ -549,8 +549,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
 
    auto res_2 = plugin.get_table_rows(params);
    BOOST_TEST(res_2.rows[0].get_object()["sec64"].as<uint64_t>() == 5);
-   BOOST_TEST(res_2.more2 == "7");
-   params.lower_bound = res_2.more2;
+   BOOST_TEST(res_2.next_key == "7");
+   params.lower_bound = res_2.next_key;
    auto more2_res_2 = plugin.get_table_rows(params);
    BOOST_TEST(more2_res_2.rows[0].get_object()["sec64"].as<uint64_t>() == 7);
 
@@ -562,8 +562,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    auto res_3 = plugin.get_table_rows(params);
    chain::uint128_t sec128_expected_value = 5;
    BOOST_CHECK(res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == sec128_expected_value);
-   BOOST_TEST(res_3.more2 == "0x07000000000000000000000000000000");
-   params.lower_bound = res_3.more2;
+   BOOST_TEST(res_3.next_key == "0x07000000000000000000000000000000");
+   params.lower_bound = res_3.next_key;
    auto more2_res_3 = plugin.get_table_rows(params);
    chain::uint128_t more2_sec128_expected_value = 7;
    BOOST_CHECK(more2_res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == more2_sec128_expected_value);
@@ -577,8 +577,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    float64_t secdouble_expected_value = ui64_to_f64(5);
    double secdouble_res_value = res_4.rows[0].get_object()["secdouble"].as<double>();
    BOOST_CHECK(*reinterpret_cast<float64_t*>(&secdouble_res_value) == secdouble_expected_value);
-   BOOST_TEST(res_4.more2 == "7.00000000000000000");
-   params.lower_bound = res_4.more2;
+   BOOST_TEST(res_4.next_key == "7.00000000000000000");
+   params.lower_bound = res_4.next_key;
    auto more2_res_4 = plugin.get_table_rows(params);
    float64_t more2_secdouble_expected_value = ui64_to_f64(7);
    double more2_secdouble_res_value = more2_res_4.rows[0].get_object()["secdouble"].as<double>();
@@ -593,8 +593,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    float128_t secldouble_expected_value = ui64_to_f128(5);
    chain::uint128_t secldouble_res_value =  res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
    BOOST_TEST(*reinterpret_cast<float128_t*>(&secldouble_res_value) == secldouble_expected_value);
-   BOOST_TEST(res_5.more2 == "0x00000000000000000000000000c00140");
-   params.lower_bound = res_5.more2;
+   BOOST_TEST(res_5.next_key == "0x00000000000000000000000000c00140");
+   params.lower_bound = res_5.next_key;
    auto more2_res_5 = plugin.get_table_rows(params);
    float128_t more2_secldouble_expected_value = ui64_to_f128(7);
    chain::uint128_t more2_secldouble_res_value =  more2_res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
@@ -612,8 +612,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    checksum256_type sec256_res_value = res_6.rows[0].get_object()["sec256"].as<checksum256_type>();
    BOOST_TEST(sec256_res_value == sec256_expected_value);
    BOOST_TEST(res_6.rows[0].get_object()["hash_input"].as<string>() == std::string("thirdinput"));
-   BOOST_TEST(res_6.more2 == "3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
-   params.lower_bound = res_6.more2;
+   BOOST_TEST(res_6.next_key == "3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
+   params.lower_bound = res_6.next_key;
    auto more2_res_6 = plugin.get_table_rows(params);
    checksum256_type more2_sec256_expected_value = checksum256_type::hash(std::string("secondinput"));
    checksum256_type more2_sec256_res_value = more2_res_6.rows[0].get_object()["sec256"].as<checksum256_type>();
@@ -630,8 +630,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    checksum256_type i256_res_value = res_7.rows[0].get_object()["sec256"].as<checksum256_type>();
    BOOST_TEST(i256_res_value == i256_expected_value);
    BOOST_TEST(res_7.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
-   BOOST_TEST(res_7.more2 == "0x3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
-   params.lower_bound = res_7.more2;
+   BOOST_TEST(res_7.next_key == "0x3cb93a80b47b9d70c5296be3817d34b48568893b31468e3a76337bb7d3d0c264");
+   params.lower_bound = res_7.next_key;
    auto more2_res_7 = plugin.get_table_rows(params);
    checksum256_type more2_i256_expected_value = checksum256_type::hash(std::string("secondinput"));
    checksum256_type more2_i256_res_value = more2_res_7.rows[0].get_object()["sec256"].as<checksum256_type>();
@@ -648,8 +648,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    ripemd160 sec160_res_value = res_8.rows[0].get_object()["sec160"].as<ripemd160>();
    BOOST_TEST(sec160_res_value == sec160_expected_value);
    BOOST_TEST(res_8.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
-   BOOST_TEST(res_8.more2 == "fb9d03d3012dc2a6c7b319f914542e3423550c2a");
-   params.lower_bound = res_8.more2;
+   BOOST_TEST(res_8.next_key == "fb9d03d3012dc2a6c7b319f914542e3423550c2a");
+   params.lower_bound = res_8.next_key;
    auto more2_res_8 = plugin.get_table_rows(params);
    ripemd160 more2_sec160_expected_value = ripemd160::hash(std::string("secondinput"));
    ripemd160 more2_sec160_res_value = more2_res_8.rows[0].get_object()["sec160"].as<ripemd160>();

From dd2aa08676e75100eb04d84e4203c37d8b53e6e6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 1 Aug 2019 08:43:58 -0500
Subject: [PATCH 0921/1648] Use packed_transaction instead of
 transaction_metadata where possible

---
 plugins/net_plugin/net_plugin.cpp | 35 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2271f65bd3f..5b8a5fd5468 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -184,7 +184,7 @@ namespace eosio {
       explicit dispatch_manager(boost::asio::io_context& io_context)
       : strand( io_context ) {}
 
-      void bcast_transaction(const transaction_metadata_ptr& trx);
+      void bcast_transaction(const packed_transaction& trx);
       void rejected_transaction(const transaction_id_type& msg, uint32_t head_blk_num);
       void bcast_block(const block_state_ptr& bs);
       void bcast_notice( const block_id_type& id );
@@ -192,7 +192,7 @@ namespace eosio {
 
       void recv_block(const connection_ptr& conn, const block_id_type& msg, uint32_t bnum);
       void expire_blocks( uint32_t bnum );
-      void recv_transaction(const connection_ptr& conn, const transaction_metadata_ptr& txn);
+      void recv_transaction(const connection_ptr& conn, const packed_transaction_ptr& txn);
       void recv_notice(const connection_ptr& conn, const notice_message& msg, bool generated);
 
       void retry_fetch(const connection_ptr& conn);
@@ -2006,9 +2006,8 @@ namespace eosio {
       fc_dlog( logger, "rejected block ${id}", ("id", id) );
    }
 
-   void dispatch_manager::bcast_transaction(const transaction_metadata_ptr& ptrx) {
-      const auto& id = ptrx->id();
-      const packed_transaction& trx = *ptrx->packed_trx();
+   void dispatch_manager::bcast_transaction(const packed_transaction& trx) {
+      const auto& id = trx.id();
       time_point_sec trx_expiration = trx.expiration();
       node_transaction_state nts = {id, trx_expiration, 0, 0};
 
@@ -2033,8 +2032,8 @@ namespace eosio {
       } );
    }
 
-   void dispatch_manager::recv_transaction(const connection_ptr& c, const transaction_metadata_ptr& txn) {
-      node_transaction_state nts = {txn->id(), txn->packed_trx()->expiration(), 0, c->connection_id};
+   void dispatch_manager::recv_transaction(const connection_ptr& c, const packed_transaction_ptr& txn) {
+      node_transaction_state nts = {txn->id(), txn->expiration(), 0, c->connection_id};
       add_peer_txn( nts );
    }
 
@@ -2801,21 +2800,21 @@ namespace eosio {
          return;
       }
 
-      auto ptrx = std::make_shared<transaction_metadata>( trx, my_impl->chain_plug->chain().configured_subjective_signature_length_limit() );
-      const auto& tid = ptrx->id();
+      const auto& tid = trx->id();
       peer_dlog( this, "received packed_transaction ${id}", ("id", tid) );
 
       bool have_trx = my_impl->dispatcher->have_txn( tid );
-      my_impl->dispatcher->recv_transaction( shared_from_this(), ptrx );
+      my_impl->dispatcher->recv_transaction( shared_from_this(), trx );
       if( have_trx ) {
          fc_dlog( logger, "got a duplicate transaction - dropping ${id}", ("id", tid) );
          return;
       }
 
-      trx_in_progress_size += calc_trx_size( ptrx->packed_trx() );
-      app().post( priority::low, [ptrx{std::move(ptrx)}, weak = weak_from_this()]() {
+      trx_in_progress_size += calc_trx_size( trx );
+      auto ptrx = std::make_shared<transaction_metadata>( trx, my_impl->chain_plug->chain().configured_subjective_signature_length_limit() );
+      app().post( priority::low, [trx, ptrx{std::move(ptrx)}, weak = weak_from_this()]() {
          my_impl->chain_plug->accept_transaction( ptrx,
-            [weak, ptrx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak, trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2832,17 +2831,17 @@ namespace eosio {
             }
          }
 
-         boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, weak{std::move(weak)}, ptrx{std::move(ptrx)}]() {
+         boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, weak{std::move(weak)}, trx]() {
             if( accepted ) {
-               my_impl->dispatcher->bcast_transaction( ptrx );
+               my_impl->dispatcher->bcast_transaction( *trx );
             } else {
                uint32_t head_blk_num = 0;
                std::tie( std::ignore, head_blk_num, std::ignore, std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
-               my_impl->dispatcher->rejected_transaction( ptrx->id(), head_blk_num );
+               my_impl->dispatcher->rejected_transaction( trx->id(), head_blk_num );
             }
             connection_ptr conn = weak.lock();
             if( conn ) {
-               conn->trx_in_progress_size -= calc_trx_size( ptrx->packed_trx() );
+               conn->trx_in_progress_size -= calc_trx_size( trx );
             }
          });
         });
@@ -3081,7 +3080,7 @@ namespace eosio {
             dispatcher->rejected_transaction(id, head_blk_num);
          } else {
             fc_dlog( logger, "signaled ACK, trx-id = ${id}", ("id", id) );
-            dispatcher->bcast_transaction(results.second);
+            dispatcher->bcast_transaction(*results.second->packed_trx());
          }
       });
    }

From cda7273e14d693db7b22dfb643503d4532116772 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 1 Aug 2019 09:13:27 -0500
Subject: [PATCH 0922/1648] Switch from transaction_metadata to
 packed_transaction as incoming transaction interface

---
 .../include/eosio/chain/plugin_interface.hpp  |  4 ++--
 plugins/chain_plugin/chain_plugin.cpp         | 18 +++++----------
 .../eosio/chain_plugin/chain_plugin.hpp       |  3 +--
 plugins/net_plugin/net_plugin.cpp             |  5 ++--
 plugins/producer_plugin/producer_plugin.cpp   | 23 +++++++++++--------
 .../txn_test_gen_plugin.cpp                   |  2 +-
 6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/plugins/chain_interface/include/eosio/chain/plugin_interface.hpp b/plugins/chain_interface/include/eosio/chain/plugin_interface.hpp
index cdec12008ef..8870853f691 100644
--- a/plugins/chain_interface/include/eosio/chain/plugin_interface.hpp
+++ b/plugins/chain_interface/include/eosio/chain/plugin_interface.hpp
@@ -43,13 +43,13 @@ namespace eosio { namespace chain { namespace plugin_interface {
    namespace incoming {
       namespace channels {
          using block                 = channel_decl<struct block_tag, signed_block_ptr>;
-         using transaction           = channel_decl<struct transaction_tag, transaction_metadata_ptr>;
+         using transaction           = channel_decl<struct transaction_tag, packed_transaction_ptr>;
       }
 
       namespace methods {
          // synchronously push a block/trx to a single provider
          using block_sync            = method_decl<chain_plugin_interface, void(const signed_block_ptr&), first_provider_policy>;
-         using transaction_async     = method_decl<chain_plugin_interface, void(const transaction_metadata_ptr&, bool, next_function<transaction_trace_ptr>), first_provider_policy>;
+         using transaction_async     = method_decl<chain_plugin_interface, void(const packed_transaction_ptr&, bool, next_function<transaction_trace_ptr>), first_provider_policy>;
       }
    }
 
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index f2af45155d2..8bacb52f284 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1004,12 +1004,8 @@ void chain_plugin::accept_block(const signed_block_ptr& block ) {
    my->incoming_block_sync_method(block);
 }
 
-void chain_plugin::accept_transaction(const chain::packed_transaction& trx, next_function<chain::transaction_trace_ptr> next) {
-   my->incoming_transaction_async_method(std::make_shared<transaction_metadata>(std::make_shared<packed_transaction>(trx)), false, std::forward<decltype(next)>(next));
-}
-
-void chain_plugin::accept_transaction(const chain::transaction_metadata_ptr& trx, next_function<chain::transaction_trace_ptr> next) {
-   my->incoming_transaction_async_method(trx, false, std::forward<decltype(next)>(next));
+void chain_plugin::accept_transaction(const chain::packed_transaction_ptr& trx, next_function<chain::transaction_trace_ptr> next) {
+   my->incoming_transaction_async_method(trx, false, std::move(next));
 }
 
 bool chain_plugin::block_is_on_preferred_chain(const block_id_type& block_id) {
@@ -1900,13 +1896,12 @@ void read_write::push_transaction(const read_write::push_transaction_params& par
    try {
       auto pretty_input = std::make_shared<packed_transaction>();
       auto resolver = make_resolver(this, abi_serializer_max_time);
-      transaction_metadata_ptr ptrx;
       try {
          abi_serializer::from_variant(params, *pretty_input, resolver, abi_serializer_max_time);
-         ptrx = std::make_shared<transaction_metadata>( pretty_input, db.configured_subjective_signature_length_limit() );
       } EOS_RETHROW_EXCEPTIONS(chain::packed_transaction_type_exception, "Invalid packed transaction")
 
-      app().get_method<incoming::methods::transaction_async>()(ptrx, true, [this, next](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& result) -> void{
+      app().get_method<incoming::methods::transaction_async>()(pretty_input, true,
+            [this, next](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& result) -> void {
          if (result.contains<fc::exception_ptr>()) {
             next(result.get<fc::exception_ptr>());
          } else {
@@ -2016,13 +2011,12 @@ void read_write::send_transaction(const read_write::send_transaction_params& par
    try {
       auto pretty_input = std::make_shared<packed_transaction>();
       auto resolver = make_resolver(this, abi_serializer_max_time);
-      transaction_metadata_ptr ptrx;
       try {
          abi_serializer::from_variant(params, *pretty_input, resolver, abi_serializer_max_time);
-         ptrx = std::make_shared<transaction_metadata>( pretty_input, db.configured_subjective_signature_length_limit() );
       } EOS_RETHROW_EXCEPTIONS(chain::packed_transaction_type_exception, "Invalid packed transaction")
 
-      app().get_method<incoming::methods::transaction_async>()(ptrx, true, [this, next](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& result) -> void{
+      app().get_method<incoming::methods::transaction_async>()(pretty_input, true,
+            [this, next](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& result) -> void {
          if (result.contains<fc::exception_ptr>()) {
             next(result.get<fc::exception_ptr>());
          } else {
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 2bec70dd477..9cef3365d72 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -688,8 +688,7 @@ class chain_plugin : public plugin<chain_plugin> {
    chain_apis::read_write get_read_write_api() { return chain_apis::read_write(chain(), get_abi_serializer_max_time()); }
 
    void accept_block( const chain::signed_block_ptr& block );
-   void accept_transaction(const chain::packed_transaction& trx, chain::plugin_interface::next_function<chain::transaction_trace_ptr> next);
-   void accept_transaction(const chain::transaction_metadata_ptr& trx, chain::plugin_interface::next_function<chain::transaction_trace_ptr> next);
+   void accept_transaction(const chain::packed_transaction_ptr& trx, chain::plugin_interface::next_function<chain::transaction_trace_ptr> next);
 
    bool block_is_on_preferred_chain(const chain::block_id_type& block_id);
 
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5b8a5fd5468..84e0ebf370b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2811,9 +2811,8 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( trx );
-      auto ptrx = std::make_shared<transaction_metadata>( trx, my_impl->chain_plug->chain().configured_subjective_signature_length_limit() );
-      app().post( priority::low, [trx, ptrx{std::move(ptrx)}, weak = weak_from_this()]() {
-         my_impl->chain_plug->accept_transaction( ptrx,
+      app().post( priority::low, [trx, weak = weak_from_this()]() {
+         my_impl->chain_plug->accept_transaction( trx,
             [weak, trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          bool accepted = false;
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index f5f56665551..9ad03614777 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -406,18 +406,19 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       incoming_transaction_queue _pending_incoming_transactions;
 
-      void on_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
+      void on_incoming_transaction_async(const packed_transaction_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {
          chain::controller& chain = chain_plug->chain();
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
 
-         signing_keys_future_type future = transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
+         auto ptrx = std::make_shared<transaction_metadata>( trx, chain.configured_subjective_signature_length_limit() );
+         signing_keys_future_type future = transaction_metadata::start_recover_keys( ptrx, _thread_pool->get_executor(),
                 chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ) );
-         boost::asio::post( _thread_pool->get_executor(), [self = this, future, trx, persist_until_expired, next{std::move(next)}]() mutable {
+         boost::asio::post( _thread_pool->get_executor(), [self = this, future, ptrx, persist_until_expired, next{std::move(next)}]() mutable {
             if( future.valid() )
                future.wait();
-            app().post(priority::low, [self, trx, persist_until_expired, next{std::move(next)}]() {
-               self->process_incoming_transaction_async( trx, persist_until_expired, std::move(next) );
+            app().post(priority::low, [self, ptrx, persist_until_expired, next{std::move(next)}]() {
+               self->process_incoming_transaction_async( ptrx, persist_until_expired, std::move(next) );
             });
          });
       }
@@ -790,23 +791,27 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
                   "No such directory '${dir}'", ("dir", my->_snapshots_dir.generic_string()) );
    }
 
-   my->_incoming_block_subscription = app().get_channel<incoming::channels::block>().subscribe([this](const signed_block_ptr& block){
+   my->_incoming_block_subscription = app().get_channel<incoming::channels::block>().subscribe(
+         [this](const signed_block_ptr& block) {
       try {
          my->on_incoming_block(block);
       } FC_LOG_AND_DROP();
    });
 
-   my->_incoming_transaction_subscription = app().get_channel<incoming::channels::transaction>().subscribe([this](const transaction_metadata_ptr& trx){
+   my->_incoming_transaction_subscription = app().get_channel<incoming::channels::transaction>().subscribe(
+         [this](const packed_transaction_ptr& trx) {
       try {
          my->on_incoming_transaction_async(trx, false, [](const auto&){});
       } FC_LOG_AND_DROP();
    });
 
-   my->_incoming_block_sync_provider = app().get_method<incoming::methods::block_sync>().register_provider([this](const signed_block_ptr& block){
+   my->_incoming_block_sync_provider = app().get_method<incoming::methods::block_sync>().register_provider(
+         [this](const signed_block_ptr& block) {
       my->on_incoming_block(block);
    });
 
-   my->_incoming_transaction_async_provider = app().get_method<incoming::methods::transaction_async>().register_provider([this](const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) -> void {
+   my->_incoming_transaction_async_provider = app().get_method<incoming::methods::transaction_async>().register_provider(
+         [this](const packed_transaction_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) -> void {
       return my->on_incoming_transaction_async(trx, persist_until_expired, next );
    });
 
diff --git a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
index 08289ee477b..eb5546c952d 100644
--- a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
+++ b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
@@ -111,7 +111,7 @@ struct txn_test_gen_plugin_impl {
       chain_plugin& cp = app().get_plugin<chain_plugin>();
 
       for (size_t i = 0; i < trxs->size(); ++i) {
-         cp.accept_transaction( packed_transaction(trxs->at(i)), [=](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& result){
+         cp.accept_transaction( std::make_shared<packed_transaction>(trxs->at(i)), [=](const fc::static_variant<fc::exception_ptr, transaction_trace_ptr>& result){
             if (result.contains<fc::exception_ptr>()) {
                next(result.get<fc::exception_ptr>());
             } else {

From c04f0dceb9fc031552e2bf9e2f827bb5d77a4278 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 1 Aug 2019 10:13:28 -0400
Subject: [PATCH 0923/1648] Variable default

---
 scripts/helpers/general.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh
index 34e2488ef83..37244e42415 100755
--- a/scripts/helpers/general.sh
+++ b/scripts/helpers/general.sh
@@ -79,7 +79,7 @@ function set_system_vars() {
         export DISK_TOTAL=$(( DISK_TOTAL_KB / 1048576 ))
         export DISK_AVAIL=$(( DISK_AVAIL_KB / 1048576 ))
     fi
-    export JOBS=$(( MEM_GIG > CPU_CORES ? CPU_CORES : MEM_GIG ))
+    export JOBS=${JOBS:-$(( MEM_GIG > CPU_CORES ? CPU_CORES : MEM_GIG ))}
 }
 
 function install-package() {

From 9345ef131ecf1329ec5db78fb62d1b018f8996f9 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 1 Aug 2019 10:56:25 -0400
Subject: [PATCH 0924/1648] add a serialized-equivalent of the
 global_properties_object that was stored in snapshots of version 2 and
 earlier.

When reading a snapshot of a version that overlaps with this range, specialize the parsing of that section such that those legacy versions can be up-converted immediately to the current version which supports a pending producer schedule composed of producer_authorities
---
 libraries/chain/controller.cpp                | 20 +++++++++++++-
 .../eosio/chain/global_property_object.hpp    | 27 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 80d848ee8ca..f5ef8d1999e 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -863,7 +863,7 @@ struct controller_impl {
          snapshot_head_block = head->block_num;
       }
 
-      controller_index_set::walk_indices([this, &snapshot]( auto utils ){
+      controller_index_set::walk_indices([this, &snapshot, &header]( auto utils ){
          using value_t = typename decltype(utils)::index_t::value_type;
 
          // skip the table_id_object as its inlined with contract tables section
@@ -876,6 +876,23 @@ struct controller_impl {
             return;
          }
 
+         // special case for in-place upgrade of global_property_object
+         if (std::is_same<value_t, global_property_object>::value) {
+            using v2 = legacy::snapshot_global_property_object_v2;
+
+            if (std::clamp(header.version, v2::minimum_version, v2::maximum_version) == header.version ) {
+               snapshot->read_section<global_property_object>([this]( auto &section ) {
+                  v2 legacy_global_properties;
+                  section.read_row(legacy_global_properties, db);
+
+                  db.create<global_property_object>([&](auto& gpo ){
+                     gpo.initalize_from(legacy_global_properties);
+                  });
+               });
+               return; // early out to avoid default processing
+            }
+         }
+
          snapshot->read_section<value_t>([this]( auto& section ) {
             bool more = !section.empty();
             while(more) {
@@ -884,6 +901,7 @@ struct controller_impl {
                });
             }
          });
+
       });
 
       read_contract_tables_from_snapshot(snapshot);
diff --git a/libraries/chain/include/eosio/chain/global_property_object.hpp b/libraries/chain/include/eosio/chain/global_property_object.hpp
index 99b4e8ba3dd..7114a3bc4c9 100644
--- a/libraries/chain/include/eosio/chain/global_property_object.hpp
+++ b/libraries/chain/include/eosio/chain/global_property_object.hpp
@@ -9,6 +9,7 @@
 #include <eosio/chain/types.hpp>
 #include <eosio/chain/block_timestamp.hpp>
 #include <eosio/chain/chain_config.hpp>
+#include <eosio/chain/chain_snapshot.hpp>
 #include <eosio/chain/producer_schedule.hpp>
 #include <eosio/chain/incremental_merkle.hpp>
 #include <eosio/chain/snapshot.hpp>
@@ -17,6 +18,22 @@
 
 namespace eosio { namespace chain {
 
+   /**
+    * a fc::raw::unpack compatible version of the old global_property_object structure stored in
+    * version 2 snapshots and before
+    */
+   namespace legacy {
+      struct snapshot_global_property_object_v2 {
+         static constexpr uint32_t minimum_version = 0;
+         static constexpr uint32_t maximum_version = 2;
+         static_assert(chain_snapshot_header::minimum_compatible_version <= maximum_version, "snapshot_global_property_object_v2 is no longer needed");
+
+         optional<block_num_type>         proposed_schedule_block_num;
+         producer_schedule_type           proposed_schedule;
+         chain_config                     configuration;
+      };
+   }
+
    /**
     * @class global_property_object
     * @brief Maintains global state information about block producer schedules and chain configuration parameters
@@ -32,6 +49,12 @@ namespace eosio { namespace chain {
       optional<block_num_type>            proposed_schedule_block_num;
       shared_producer_authority_schedule  proposed_schedule;
       chain_config                        configuration;
+
+      void initalize_from( const legacy::snapshot_global_property_object_v2& legacy ) {
+         proposed_schedule_block_num = legacy.proposed_schedule_block_num;
+         proposed_schedule = producer_authority_schedule(legacy.proposed_schedule).to_shared(proposed_schedule.producers.get_allocator());
+         configuration = legacy.configuration;
+      }
    };
 
 
@@ -101,6 +124,10 @@ FC_REFLECT(eosio::chain::global_property_object,
             (proposed_schedule_block_num)(proposed_schedule)(configuration)
           )
 
+FC_REFLECT(eosio::chain::legacy::snapshot_global_property_object_v2,
+            (proposed_schedule_block_num)(proposed_schedule)(configuration)
+          )
+
 FC_REFLECT(eosio::chain::snapshot_global_property_object,
             (proposed_schedule_block_num)(proposed_schedule)(configuration)
           )

From 08734296405ceb6db07fe02c94930d9285fa9a8c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 1 Aug 2019 13:52:01 -0500
Subject: [PATCH 0925/1648] Refactor transaction signature recovery to create
 transaction_metadata with recovered keys

---
 libraries/chain/controller.cpp                | 45 +++++++-----
 libraries/chain/fork_database.cpp             |  2 +-
 .../eosio/chain/transaction_metadata.hpp      | 53 ++++++++------
 libraries/chain/transaction_metadata.cpp      | 73 ++++++-------------
 libraries/testing/tester.cpp                  | 12 +--
 plugins/net_plugin/net_plugin.cpp             |  2 +-
 plugins/producer_plugin/producer_plugin.cpp   | 18 +++--
 unittests/misc_tests.cpp                      | 50 +++++--------
 .../unapplied_transaction_queue_tests.cpp     |  2 +-
 9 files changed, 119 insertions(+), 138 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index e7588e5b5d9..71dea08a5f7 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1129,7 +1129,7 @@ struct controller_impl {
 
       signed_transaction dtrx;
       fc::raw::unpack(ds,static_cast<transaction&>(dtrx) );
-      transaction_metadata_ptr trx = std::make_shared<transaction_metadata>( dtrx );
+      transaction_metadata_ptr trx = transaction_metadata::create_no_recover_keys( packed_transaction( dtrx ) );
       trx->accepted = true;
       trx->scheduled = true;
 
@@ -1308,11 +1308,7 @@ struct controller_impl {
       try {
          auto start = fc::time_point::now();
          const bool check_auth = !self.skip_auth_check() && !trx->implicit;
-         // call recover keys so that trx->sig_cpu_usage is set correctly
-         const fc::microseconds sig_cpu_usage =
-               check_auth ? std::get<0>( trx->recover_keys( chain_id ) ) : fc::microseconds();
-         const flat_set<public_key_type>& recovered_keys =
-               check_auth ? std::get<1>( trx->recover_keys( chain_id ) ) : flat_set<public_key_type>();
+         const fc::microseconds sig_cpu_usage = trx->signature_cpu_usage();
 
          if( !explicit_billed_cpu_time ) {
             fc::microseconds already_consumed_time( EOS_PERCENT(sig_cpu_usage.count(), conf.sig_cpu_bill_pct) );
@@ -1349,7 +1345,7 @@ struct controller_impl {
             if( check_auth ) {
                authorization.check_authorization(
                        trn.actions,
-                       recovered_keys,
+                       trx->recovered_keys(),
                        {},
                        trx_context.delay,
                        [&trx_context](){ trx_context.checktime(); },
@@ -1536,7 +1532,7 @@ struct controller_impl {
          }
 
          try {
-            auto onbtrx = std::make_shared<transaction_metadata>( get_on_block_transaction() );
+            transaction_metadata_ptr onbtrx = transaction_metadata::create_no_recover_keys( packed_transaction( get_on_block_transaction() ) );
             onbtrx->implicit = true;
             auto reset_in_trx_requiring_checks = fc::make_scoped_exit([old_value=in_trx_requiring_checks,this](){
                   in_trx_requiring_checks = old_value;
@@ -1735,16 +1731,25 @@ struct controller_impl {
          auto producer_block_id = b->id();
          start_block( b->timestamp, b->confirmed, new_protocol_feature_activations, s, producer_block_id);
 
-         std::vector<transaction_metadata_ptr> packed_transactions;
-         packed_transactions.reserve( b->transactions.size() );
-         for( const auto& receipt : b->transactions ) {
-            if( receipt.trx.contains<packed_transaction>()) {
-               auto& pt = receipt.trx.get<packed_transaction>();
-               auto mtrx = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( pt ) );
-               if( !self.skip_auth_check() ) {
-                  transaction_metadata::start_recover_keys( mtrx, thread_pool.get_executor(), chain_id, microseconds::maximum() );
+         std::vector<recover_keys_future> trx_futures;
+         std::vector<transaction_metadata_ptr> trx_metas;
+         const bool skip_auth_checks = self.skip_auth_check();
+         if( skip_auth_checks ) {
+            trx_metas.reserve( b->transactions.size() );
+            for( const auto& receipt : b->transactions ) {
+               if( receipt.trx.contains<packed_transaction>()) {
+                  auto& pt = receipt.trx.get<packed_transaction>();
+                  trx_metas.emplace_back( transaction_metadata::create_no_recover_keys( pt ) );
+               }
+            }
+         } else {
+            trx_futures.reserve( b->transactions.size() );
+            for( const auto& receipt : b->transactions ) {
+               if( receipt.trx.contains<packed_transaction>()) {
+                  auto ptrx = std::make_shared<packed_transaction>( receipt.trx.get<packed_transaction>() );
+                  auto fut = transaction_metadata::start_recover_keys( ptrx, thread_pool.get_executor(), chain_id, microseconds::maximum() );
+                  trx_futures.emplace_back( std::move( fut ) );
                }
-               packed_transactions.emplace_back( std::move( mtrx ) );
             }
          }
 
@@ -1755,7 +1760,11 @@ struct controller_impl {
             const auto& trx_receipts = pending->_block_stage.get<building_block>()._pending_trx_receipts;
             auto num_pending_receipts = trx_receipts.size();
             if( receipt.trx.contains<packed_transaction>() ) {
-               trace = push_transaction( packed_transactions.at(packed_idx++), fc::time_point::maximum(), receipt.cpu_usage_us, true );
+               if( skip_auth_checks ) {
+                  trace = push_transaction( trx_metas.at( packed_idx++ ), fc::time_point::maximum(), receipt.cpu_usage_us, true );
+               } else {
+                  trace = push_transaction( trx_futures.at( packed_idx++ ).get(), fc::time_point::maximum(), receipt.cpu_usage_us, true );
+               }
             } else if( receipt.trx.contains<transaction_id_type>() ) {
                trace = push_scheduled_transaction( receipt.trx.get<transaction_id_type>(), fc::time_point::maximum(), receipt.cpu_usage_us, true );
             } else {
diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
index 7db7adad0f0..cce19ebf41c 100644
--- a/libraries/chain/fork_database.cpp
+++ b/libraries/chain/fork_database.cpp
@@ -128,7 +128,7 @@ namespace eosio { namespace chain {
                for( const auto& receipt : s.block->transactions ) {
                   if( receipt.trx.contains<packed_transaction>() ) {
                      const auto& pt = receipt.trx.get<packed_transaction>();
-                     s.trxs.push_back( std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>(pt) ) );
+                     s.trxs.push_back( transaction_metadata::create_no_recover_keys( pt ) );
                   }
                }
                s.header_exts = s.block->validate_and_extract_header_extensions();
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index fd470a695f1..b9f78b8b796 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -16,9 +16,8 @@ namespace eosio { namespace chain {
 
 class transaction_metadata;
 using transaction_metadata_ptr = std::shared_ptr<transaction_metadata>;
-using signing_keys_future_value_type = std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>;
-using signing_keys_future_type = std::shared_future<signing_keys_future_value_type>;
-using recovery_keys_type = std::pair<fc::microseconds, const flat_set<public_key_type>&>;
+using recover_keys_next = std::function<void(std::tuple<transaction_metadata_ptr, std::exception_ptr>)>;
+using recover_keys_future = std::shared_future<transaction_metadata_ptr>;
 
 /**
  *  This data structure should store context-free cached data about a transaction such as
@@ -27,45 +26,55 @@ using recovery_keys_type = std::pair<fc::microseconds, const flat_set<public_key
 class transaction_metadata {
    private:
       const packed_transaction_ptr                               _packed_trx;
-      signing_keys_future_type                                   _signing_keys_future;
+      const fc::microseconds                                     _sig_cpu_usage;
+      const flat_set<public_key_type>                            _recovered_pub_keys;
 
    public:
       bool                                                       accepted = false;  // not thread safe
       bool                                                       implicit = false;  // not thread safe
       bool                                                       scheduled = false; // not thread safe
 
+   private:
+      struct private_type{};
+
       transaction_metadata() = delete;
       transaction_metadata(const transaction_metadata&) = delete;
       transaction_metadata(transaction_metadata&&) = delete;
       transaction_metadata operator=(transaction_metadata&) = delete;
       transaction_metadata operator=(transaction_metadata&&) = delete;
 
-      explicit transaction_metadata( const signed_transaction& t, uint32_t max_variable_sig_size = UINT32_MAX, packed_transaction::compression_type c = packed_transaction::compression_type::none )
-            : _packed_trx( std::make_shared<packed_transaction>( t, c ) ) {
-         check_variable_sig_size(max_variable_sig_size);
-      }
-
-      explicit transaction_metadata( const packed_transaction_ptr& ptrx, uint32_t max_variable_sig_size = UINT32_MAX )
-            : _packed_trx( ptrx ) {
-         check_variable_sig_size(max_variable_sig_size);
-      }
-
-      void check_variable_sig_size(uint32_t max) {
-         for(const signature_type& sig : _packed_trx->get_signed_transaction().signatures)
-            EOS_ASSERT(sig.variable_size() <= max, sig_variable_size_limit_exception, "signature variable length component size (${s}) greater than subjective maximum (${m})", ("s", sig.variable_size())("m", max));
+      static void check_variable_sig_size(const packed_transaction_ptr& trx, uint32_t max) {
+         for(const signature_type& sig : trx->get_signed_transaction().signatures)
+            EOS_ASSERT(sig.variable_size() <= max, sig_variable_size_limit_exception,
+                  "signature variable length component size (${s}) greater than subjective maximum (${m})", ("s", sig.variable_size())("m", max));
       }
 
+   public:
       const packed_transaction_ptr& packed_trx()const { return _packed_trx; }
       const transaction_id_type& id()const { return _packed_trx->id(); }
+      fc::microseconds signature_cpu_usage()const { return _sig_cpu_usage; }
+      const flat_set<public_key_type>& recovered_keys()const { return _recovered_pub_keys; }
 
       // must be called from main application thread
-      static signing_keys_future_type
-      start_recover_keys( const transaction_metadata_ptr& mtrx, boost::asio::io_context& thread_pool,
+      static recover_keys_future
+      start_recover_keys( const packed_transaction_ptr& trx, boost::asio::io_context& thread_pool,
                           const chain_id_type& chain_id, fc::microseconds time_limit,
-                          std::function<void()> next = std::function<void()>() );
+                          uint32_t max_variable_sig_size = UINT32_MAX,
+                          recover_keys_next = recover_keys_next() );
+
+      static transaction_metadata_ptr
+      create_no_recover_keys( const packed_transaction& trx ) {
+         return std::make_shared<transaction_metadata>(
+               private_type(), std::make_shared<packed_transaction>( trx ), fc::microseconds(), flat_set<public_key_type>() );
+      }
+
+      explicit transaction_metadata( const private_type& pt, const packed_transaction_ptr& ptrx,
+            fc::microseconds sig_cpu_usage, flat_set<public_key_type> recovered_pub_keys )
+         : _packed_trx( ptrx )
+         , _sig_cpu_usage( sig_cpu_usage )
+         , _recovered_pub_keys( std::move( recovered_pub_keys ) ) {
+      }
 
-      // start_recover_keys must be called first
-      recovery_keys_type recover_keys( const chain_id_type& chain_id );
 };
 
 } } // eosio::chain
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index 08c0c626497..54f23b4030a 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -4,60 +4,31 @@
 
 namespace eosio { namespace chain {
 
-recovery_keys_type transaction_metadata::recover_keys( const chain_id_type& chain_id ) {
-   // Unlikely for more than one chain_id to be used in one nodeos instance
-   if( _signing_keys_future.valid() ) {
-      const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = _signing_keys_future.get();
-      if( std::get<0>( sig_keys ) == chain_id ) {
-         return std::make_pair( std::get<1>( sig_keys ), std::cref( std::get<2>( sig_keys ) ) );
-      }
-   }
-
-   // shared_keys_future not created or different chain_id
-   std::promise<signing_keys_future_value_type> p;
-   flat_set<public_key_type> recovered_pub_keys;
-   const signed_transaction& trn = _packed_trx->get_signed_transaction();
-   fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, fc::time_point::maximum(), recovered_pub_keys );
-   p.set_value( std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ) ) );
-   _signing_keys_future = p.get_future().share();
-
-   const std::tuple<chain_id_type, fc::microseconds, flat_set<public_key_type>>& sig_keys = _signing_keys_future.get();
-   return std::make_pair( std::get<1>( sig_keys ), std::cref( std::get<2>( sig_keys ) ) );
-}
-
-signing_keys_future_type transaction_metadata::start_recover_keys( const transaction_metadata_ptr& mtrx,
-                                                                   boost::asio::io_context& thread_pool,
-                                                                   const chain_id_type& chain_id,
-                                                                   fc::microseconds time_limit,
-                                                                   std::function<void()> next )
+recover_keys_future transaction_metadata::start_recover_keys( const packed_transaction_ptr& trx,
+                                                              boost::asio::io_context& thread_pool,
+                                                              const chain_id_type& chain_id,
+                                                              fc::microseconds time_limit,
+                                                              uint32_t max_variable_sig_size,
+                                                              recover_keys_next next )
 {
-   if( mtrx->_signing_keys_future.valid() && std::get<0>( mtrx->_signing_keys_future.get() ) == chain_id ) {// already created
-      if( next ) next();
-      return mtrx->_signing_keys_future;
-   }
-
-   std::weak_ptr<transaction_metadata> mtrx_wp = mtrx;
-   mtrx->_signing_keys_future = async_thread_pool( thread_pool, [time_limit, chain_id, mtrx_wp, next{std::move(next)}]() {
-      fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
-                                fc::time_point::maximum() : fc::time_point::now() + time_limit;
-      auto mtrx = mtrx_wp.lock();
-      fc::microseconds cpu_usage;
-      flat_set<public_key_type> recovered_pub_keys;
-      try {
-         if( mtrx ) {
-            const signed_transaction& trn = mtrx->_packed_trx->get_signed_transaction();
-            cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
+   return async_thread_pool( thread_pool,
+      [trx, chain_id, time_limit, max_variable_sig_size, next{std::move( next )}]() {
+         try {
+            fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
+                                      fc::time_point::maximum() : fc::time_point::now() + time_limit;
+            check_variable_sig_size( trx, max_variable_sig_size );
+            const signed_transaction& trn = trx->get_signed_transaction();
+            flat_set<public_key_type> recovered_pub_keys;
+            fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
+            auto mtrx = std::make_shared<transaction_metadata>( private_type(), trx, cpu_usage, std::move( recovered_pub_keys ) );
+            if( next ) next( std::make_tuple( mtrx, nullptr ) );
+            return mtrx;
+         } catch( ... ) {
+            if( next ) next( std::make_tuple( nullptr, std::current_exception() ) );
+            throw;
          }
-      } catch( ... ) {
-         if( next ) next();
-         throw;
       }
-      if( next ) next();
-      return std::make_tuple( chain_id, cpu_usage, std::move( recovered_pub_keys ));
-   } );
-
-   return mtrx->_signing_keys_future;
+   );
 }
 
-
 } } // eosio::chain
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index e7e8ee6af57..bc0dc42f6c2 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -482,12 +482,12 @@ namespace eosio { namespace testing {
       if( !control->is_building_block() )
          _start_block(control->head_block_time() + fc::microseconds(config::block_interval_us));
 
-      auto mtrx = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>(trx) );
+      auto ptrx = std::make_shared<packed_transaction>(trx);
       auto time_limit = deadline == fc::time_point::maximum() ?
             fc::microseconds::maximum() :
             fc::microseconds( deadline - fc::time_point::now() );
-      transaction_metadata::start_recover_keys( mtrx, control->get_thread_pool(), control->get_chain_id(), time_limit );
-      auto r = control->push_transaction( mtrx, deadline, billed_cpu_time_us );
+      auto fut = transaction_metadata::start_recover_keys( ptrx, control->get_thread_pool(), control->get_chain_id(), time_limit );
+      auto r = control->push_transaction( fut.get(), deadline, billed_cpu_time_us );
       if( r->except_ptr ) std::rethrow_exception( r->except_ptr );
       if( r->except ) throw *r->except;
       return r;
@@ -510,9 +510,9 @@ namespace eosio { namespace testing {
       auto time_limit = deadline == fc::time_point::maximum() ?
             fc::microseconds::maximum() :
             fc::microseconds( deadline - fc::time_point::now() );
-      auto mtrx = std::make_shared<transaction_metadata>(trx, UINT32_MAX, c);
-      transaction_metadata::start_recover_keys( mtrx, control->get_thread_pool(), control->get_chain_id(), time_limit );
-      auto r = control->push_transaction( mtrx, deadline, billed_cpu_time_us );
+      auto ptrx = std::make_shared<packed_transaction>( trx, c );
+      auto fut = transaction_metadata::start_recover_keys( ptrx, control->get_thread_pool(), control->get_chain_id(), time_limit );
+      auto r = control->push_transaction( fut.get(), deadline, billed_cpu_time_us );
       if (no_throw) return r;
       if( r->except_ptr ) std::rethrow_exception( r->except_ptr );
       if( r->except)  throw *r->except;
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 84e0ebf370b..45674b00ac1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2830,7 +2830,7 @@ namespace eosio {
             }
          }
 
-         boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, weak{std::move(weak)}, trx]() {
+         boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, weak{std::move(weak)}, trx{std::move(trx)}]() mutable {
             if( accepted ) {
                my_impl->dispatcher->bcast_transaction( *trx );
             } else {
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 9ad03614777..8e448fed5a6 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -411,15 +411,17 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
 
-         auto ptrx = std::make_shared<transaction_metadata>( trx, chain.configured_subjective_signature_length_limit() );
-         signing_keys_future_type future = transaction_metadata::start_recover_keys( ptrx, _thread_pool->get_executor(),
-                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ) );
-         boost::asio::post( _thread_pool->get_executor(), [self = this, future, ptrx, persist_until_expired, next{std::move(next)}]() mutable {
-            if( future.valid() )
+         auto future = transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
+                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ), chain.configured_subjective_signature_length_limit() );
+         boost::asio::post( _thread_pool->get_executor(), [self = this, future, persist_until_expired, next{std::move(next)}]() mutable {
+            if( future.valid() ) {
                future.wait();
-            app().post(priority::low, [self, ptrx, persist_until_expired, next{std::move(next)}]() {
-               self->process_incoming_transaction_async( ptrx, persist_until_expired, std::move(next) );
-            });
+               app().post( priority::low, [self, future{std::move(future)}, persist_until_expired, next{std::move( next )}]() {
+                  try {
+                     self->process_incoming_transaction_async( future.get(), persist_until_expired, std::move( next ) );
+                  } CATCH_AND_CALL(next);
+               } );
+            }
          });
       }
 
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 5dea78adeb6..20a7a3ed602 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -832,47 +832,37 @@ BOOST_AUTO_TEST_CASE(transaction_metadata_test) { try {
       packed_transaction pkt(trx, packed_transaction::compression_type::none);
       packed_transaction pkt2(trx, packed_transaction::compression_type::zlib);
 
-      transaction_metadata_ptr mtrx = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::none) );
-      transaction_metadata_ptr mtrx2 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::zlib) );
+      packed_transaction_ptr ptrx = std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::none);
+      packed_transaction_ptr ptrx2 = std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::zlib);
 
       BOOST_CHECK_EQUAL(trx.id(), pkt.id());
       BOOST_CHECK_EQUAL(trx.id(), pkt2.id());
-      BOOST_CHECK_EQUAL(trx.id(), mtrx->id());
-      BOOST_CHECK_EQUAL(trx.id(), mtrx2->id());
+      BOOST_CHECK_EQUAL(trx.id(), ptrx->id());
+      BOOST_CHECK_EQUAL(trx.id(), ptrx2->id());
 
       named_thread_pool thread_pool( "misc", 5 );
 
-      transaction_metadata::start_recover_keys( mtrx, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
-      transaction_metadata::start_recover_keys( mtrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
+      auto fut = transaction_metadata::start_recover_keys( ptrx, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
+      auto fut2 = transaction_metadata::start_recover_keys( ptrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
 
       // no-op
-      transaction_metadata::start_recover_keys( mtrx, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
-      transaction_metadata::start_recover_keys( mtrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
+      transaction_metadata::start_recover_keys( ptrx, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
+      transaction_metadata::start_recover_keys( ptrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
 
-      auto keys = mtrx->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys.second.begin());
+      auto mtrx = fut.get();
+      const auto& keys = mtrx->recovered_keys( );
+      BOOST_CHECK_EQUAL(1u, keys.size());
+      BOOST_CHECK_EQUAL(public_key, *keys.begin());
 
       // again
-      auto keys2 = mtrx->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys2.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys2.second.begin());
-
-      auto keys3 = mtrx2->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys3.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys3.second.begin());
-
-      // recover keys without first calling start_recover_keys
-      transaction_metadata_ptr mtrx4 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::none) );
-      transaction_metadata_ptr mtrx5 = std::make_shared<transaction_metadata>( std::make_shared<packed_transaction>( trx, packed_transaction::compression_type::zlib) );
-
-      auto keys4 = mtrx4->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys4.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys4.second.begin());
-
-      auto keys5 = mtrx5->recover_keys( test.control->get_chain_id() );
-      BOOST_CHECK_EQUAL(1u, keys5.second.size());
-      BOOST_CHECK_EQUAL(public_key, *keys5.second.begin());
+      const auto& keys2 = mtrx->recovered_keys();
+      BOOST_CHECK_EQUAL(1u, keys2.size());
+      BOOST_CHECK_EQUAL(public_key, *keys2.begin());
+
+      auto mtrx2 = fut2.get();
+      const auto& keys3 = mtrx2->recovered_keys();
+      BOOST_CHECK_EQUAL(1u, keys3.size());
+      BOOST_CHECK_EQUAL(public_key, *keys3.begin());
 
       thread_pool.stop();
 
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index fc02680c2f5..149c80d2ff6 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -20,7 +20,7 @@ auto unique_trx_meta_data() {
    account_name creator = config::system_account_name;
    trx.actions.emplace_back( vector<permission_level>{{creator,config::active_name}},
                              onerror{ nextid, "test", 4 });
-   return std::make_shared<transaction_metadata>( trx );
+   return transaction_metadata::create_no_recover_keys( packed_transaction( trx ) );
 }
 
 auto next( unapplied_transaction_queue& q ) {

From 90a856aaabed9839528fe020ff7fdac7ec93bd61 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 1 Aug 2019 14:15:59 -0500
Subject: [PATCH 0926/1648] Update mongo_db_plugin for new signature recovery
 mechanism

---
 plugins/mongo_db_plugin/mongo_db_plugin.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index 1254c517826..5edc7f7274a 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -771,10 +771,15 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
    }
 
    fc::variant signing_keys;
-   flat_set<public_key_type> keys;
-   std::tie( std::ignore, keys ) = t->recover_keys( *chain_id );
+   const flat_set<public_key_type>& keys = t->recovered_keys();
    if( !keys.empty() ) {
       signing_keys = keys;
+   } else {
+      flat_set<public_key_type> pub_keys;
+      trx.get_signature_keys( *chain_id, fc::time_point::maximum(), pub_keys, false );
+      if( !pub_keys.empty() ) {
+         signing_keys = pub_keys;
+      }
    }
 
    if( signing_keys.get_type() == fc::variant::array_type && signing_keys.get_array().size() > 0) {

From 930005bd7ad790371c147f1d145725d23cbf886d Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 1 Aug 2019 15:58:11 -0400
Subject: [PATCH 0927/1648] changes for replay failure

---
 libraries/chain/webassembly/eos-vm.cpp | 20 ++++++++++++++------
 libraries/eos-vm                       |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 061f55fb929..9532e27f0bc 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -22,13 +22,21 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
 
       void apply(apply_context& context) override {
          auto* alloc = wasm_interface::get_wasm_allocator();
-         _instantiated_module->set_wasm_allocator( alloc );
+         _instantiated_module->set_wasm_allocator(alloc);
          _runtime->_bkend = _instantiated_module.get();
-	 _runtime->_bkend->initialize(&context);
-	 const auto& res = _runtime->_bkend->call(&context, "env", "apply",
-					     context.get_receiver().to_uint64_t(),
-					     context.get_action().account.to_uint64_t(),
-					     context.get_action().name.to_uint64_t());
+         _runtime->_bkend->initialize(&context);
+         // clamp WASM memory to maximum_linear_memory/wasm_page_size
+         auto& module = _runtime->_bkend->get_module();
+         if (module.memories.size() && 
+               ((module.memories.at(0).limits.maximum > wasm_constraints::maximum_linear_memory / wasm_constraints::wasm_page_size) 
+               || !module.memories.at(0).limits.flags)) {
+            module.memories.at(0).limits.flags = true;
+            module.memories.at(0).limits.maximum = wasm_constraints::maximum_linear_memory / wasm_constraints::wasm_page_size;
+         }
+         const auto& res = _runtime->_bkend->call(
+             &context, "env", "apply", context.get_receiver().to_uint64_t(),
+             context.get_action().account.to_uint64_t(),
+             context.get_action().name.to_uint64_t());
          _runtime->_bkend = nullptr;
       }
 
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 949c3f03758..8ee33148fb1 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 949c3f037589ea70bd338b61fce07c573bf5a1f7
+Subproject commit 8ee33148fb17f71f93ed9f8afc99b44180e735bc

From b734e56e41b2875eb48e491feef6af3a6e8ea9e5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 1 Aug 2019 15:23:06 -0500
Subject: [PATCH 0928/1648] Use start_recover_keys next

---
 plugins/producer_plugin/producer_plugin.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 8e448fed5a6..e64a324b548 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -411,18 +411,19 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
 
-         auto future = transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
-                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ), chain.configured_subjective_signature_length_limit() );
-         boost::asio::post( _thread_pool->get_executor(), [self = this, future, persist_until_expired, next{std::move(next)}]() mutable {
-            if( future.valid() ) {
-               future.wait();
-               app().post( priority::low, [self, future{std::move(future)}, persist_until_expired, next{std::move( next )}]() {
+         transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
+                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ), chain.configured_subjective_signature_length_limit(),
+           [self = this, persist_until_expired, next{std::move(next)}](std::tuple<transaction_metadata_ptr, std::exception_ptr> trx_tuple) mutable {
+               app().post( priority::low, [self, trx_tuple{std::move(trx_tuple)}, persist_until_expired, next{std::move( next )}]() {
                   try {
-                     self->process_incoming_transaction_async( future.get(), persist_until_expired, std::move( next ) );
+                     if( std::get<1>( trx_tuple ) ) {
+                        std::rethrow_exception( std::get<1>( trx_tuple ) );
+                     } else {
+                        self->process_incoming_transaction_async( std::get<0>( trx_tuple ), persist_until_expired, std::move( next ) );
+                     }
                   } CATCH_AND_CALL(next);
                } );
-            }
-         });
+           } );
       }
 
       void process_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {

From b641fba312b7effc689b5b36928ba3cc3c9c80a1 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 1 Aug 2019 16:41:14 -0400
Subject: [PATCH 0929/1648] replace conditional with conditional_t

saves a few bucks
---
 libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp b/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
index eed15e4b3ab..4a94c2be9aa 100644
--- a/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
@@ -799,7 +799,7 @@ namespace eosio { namespace chain { namespace wasm_injections {
                injector_utils::add_import<ResultType::none>( *_module, u8"checktime", checktime_injection::chktm_idx );
 
             for ( auto& fd : _module->functions.defs ) {
-               wasm_ops::EOSIO_OperatorDecoderStream<typename std::conditional<full_injection, pre_op_full_injectors, pre_op_injectors>::type> pre_decoder(fd.code);
+               wasm_ops::EOSIO_OperatorDecoderStream<std::conditional_t<full_injection, pre_op_full_injectors, pre_op_injectors>> pre_decoder(fd.code);
                wasm_ops::instruction_stream pre_code(fd.code.size()*2);
 
                while ( pre_decoder ) {
@@ -817,7 +817,7 @@ namespace eosio { namespace chain { namespace wasm_injections {
                fd.code = pre_code.get();
             }
             for ( auto& fd : _module->functions.defs ) {
-               wasm_ops::EOSIO_OperatorDecoderStream<typename std::conditional<full_injection, post_op_full_injectors, post_op_injectors>::type> post_decoder(fd.code);
+               wasm_ops::EOSIO_OperatorDecoderStream<std::conditional_t<full_injection, post_op_full_injectors, post_op_injectors>> post_decoder(fd.code);
                wasm_ops::instruction_stream post_code(fd.code.size()*2);
 
                if constexpr (full_injection) {

From 41b2a06494d6d96eb5c3c12072579c46fc6dc51d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 1 Aug 2019 17:12:46 -0500
Subject: [PATCH 0930/1648] Use future instead of shared_future and remove next
 method which is not as performant

---
 .../eosio/chain/transaction_metadata.hpp      | 38 +++++++++----------
 libraries/chain/transaction_metadata.cpp      | 27 +++++--------
 plugins/producer_plugin/producer_plugin.cpp   | 19 +++++-----
 3 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index b9f78b8b796..b25adfd42ff 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -16,8 +16,7 @@ namespace eosio { namespace chain {
 
 class transaction_metadata;
 using transaction_metadata_ptr = std::shared_ptr<transaction_metadata>;
-using recover_keys_next = std::function<void(std::tuple<transaction_metadata_ptr, std::exception_ptr>)>;
-using recover_keys_future = std::shared_future<transaction_metadata_ptr>;
+using recover_keys_future = std::future<transaction_metadata_ptr>;
 
 /**
  *  This data structure should store context-free cached data about a transaction such as
@@ -37,12 +36,6 @@ class transaction_metadata {
    private:
       struct private_type{};
 
-      transaction_metadata() = delete;
-      transaction_metadata(const transaction_metadata&) = delete;
-      transaction_metadata(transaction_metadata&&) = delete;
-      transaction_metadata operator=(transaction_metadata&) = delete;
-      transaction_metadata operator=(transaction_metadata&&) = delete;
-
       static void check_variable_sig_size(const packed_transaction_ptr& trx, uint32_t max) {
          for(const signature_type& sig : trx->get_signed_transaction().signatures)
             EOS_ASSERT(sig.variable_size() <= max, sig_variable_size_limit_exception,
@@ -50,6 +43,21 @@ class transaction_metadata {
       }
 
    public:
+      // creation of tranaction_metadata should restricted to start_recover_keys and create_no_recover_keys below, public for make_shared
+      explicit transaction_metadata( const private_type& pt, const packed_transaction_ptr& ptrx,
+                                     fc::microseconds sig_cpu_usage, flat_set<public_key_type> recovered_pub_keys )
+         : _packed_trx( ptrx )
+         , _sig_cpu_usage( sig_cpu_usage )
+         , _recovered_pub_keys( std::move( recovered_pub_keys ) ) {
+      }
+
+      transaction_metadata() = delete;
+      transaction_metadata(const transaction_metadata&) = delete;
+      transaction_metadata(transaction_metadata&&) = delete;
+      transaction_metadata operator=(transaction_metadata&) = delete;
+      transaction_metadata operator=(transaction_metadata&&) = delete;
+
+
       const packed_transaction_ptr& packed_trx()const { return _packed_trx; }
       const transaction_id_type& id()const { return _packed_trx->id(); }
       fc::microseconds signature_cpu_usage()const { return _sig_cpu_usage; }
@@ -59,20 +67,12 @@ class transaction_metadata {
       static recover_keys_future
       start_recover_keys( const packed_transaction_ptr& trx, boost::asio::io_context& thread_pool,
                           const chain_id_type& chain_id, fc::microseconds time_limit,
-                          uint32_t max_variable_sig_size = UINT32_MAX,
-                          recover_keys_next = recover_keys_next() );
+                          uint32_t max_variable_sig_size = UINT32_MAX );
 
       static transaction_metadata_ptr
       create_no_recover_keys( const packed_transaction& trx ) {
-         return std::make_shared<transaction_metadata>(
-               private_type(), std::make_shared<packed_transaction>( trx ), fc::microseconds(), flat_set<public_key_type>() );
-      }
-
-      explicit transaction_metadata( const private_type& pt, const packed_transaction_ptr& ptrx,
-            fc::microseconds sig_cpu_usage, flat_set<public_key_type> recovered_pub_keys )
-         : _packed_trx( ptrx )
-         , _sig_cpu_usage( sig_cpu_usage )
-         , _recovered_pub_keys( std::move( recovered_pub_keys ) ) {
+         return std::make_shared<transaction_metadata>( private_type(),
+               std::make_shared<packed_transaction>( trx ), fc::microseconds(), flat_set<public_key_type>() );
       }
 
 };
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index 54f23b4030a..c09a79939cf 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -8,25 +8,16 @@ recover_keys_future transaction_metadata::start_recover_keys( const packed_trans
                                                               boost::asio::io_context& thread_pool,
                                                               const chain_id_type& chain_id,
                                                               fc::microseconds time_limit,
-                                                              uint32_t max_variable_sig_size,
-                                                              recover_keys_next next )
+                                                              uint32_t max_variable_sig_size )
 {
-   return async_thread_pool( thread_pool,
-      [trx, chain_id, time_limit, max_variable_sig_size, next{std::move( next )}]() {
-         try {
-            fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
-                                      fc::time_point::maximum() : fc::time_point::now() + time_limit;
-            check_variable_sig_size( trx, max_variable_sig_size );
-            const signed_transaction& trn = trx->get_signed_transaction();
-            flat_set<public_key_type> recovered_pub_keys;
-            fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
-            auto mtrx = std::make_shared<transaction_metadata>( private_type(), trx, cpu_usage, std::move( recovered_pub_keys ) );
-            if( next ) next( std::make_tuple( mtrx, nullptr ) );
-            return mtrx;
-         } catch( ... ) {
-            if( next ) next( std::make_tuple( nullptr, std::current_exception() ) );
-            throw;
-         }
+   return async_thread_pool( thread_pool, [trx, chain_id, time_limit, max_variable_sig_size]() {
+         fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
+                                   fc::time_point::maximum() : fc::time_point::now() + time_limit;
+         check_variable_sig_size( trx, max_variable_sig_size );
+         const signed_transaction& trn = trx->get_signed_transaction();
+         flat_set<public_key_type> recovered_pub_keys;
+         fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
+         return std::make_shared<transaction_metadata>( private_type(), trx, cpu_usage, std::move( recovered_pub_keys ) );
       }
    );
 }
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index e64a324b548..d093248f2ed 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -411,19 +411,18 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          const auto max_trx_time_ms = _max_transaction_time_ms.load();
          fc::microseconds max_trx_cpu_usage = max_trx_time_ms < 0 ? fc::microseconds::maximum() : fc::milliseconds( max_trx_time_ms );
 
-         transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
-                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ), chain.configured_subjective_signature_length_limit(),
-           [self = this, persist_until_expired, next{std::move(next)}](std::tuple<transaction_metadata_ptr, std::exception_ptr> trx_tuple) mutable {
-               app().post( priority::low, [self, trx_tuple{std::move(trx_tuple)}, persist_until_expired, next{std::move( next )}]() {
+         auto future = transaction_metadata::start_recover_keys( trx, _thread_pool->get_executor(),
+                chain.get_chain_id(), fc::microseconds( max_trx_cpu_usage ), chain.configured_subjective_signature_length_limit() );
+         boost::asio::post( _thread_pool->get_executor(), [self = this, future{std::move(future)}, persist_until_expired, next{std::move(next)}]() mutable {
+            if( future.valid() ) {
+               future.wait();
+               app().post( priority::low, [self, future{std::move(future)}, persist_until_expired, next{std::move( next )}]() mutable {
                   try {
-                     if( std::get<1>( trx_tuple ) ) {
-                        std::rethrow_exception( std::get<1>( trx_tuple ) );
-                     } else {
-                        self->process_incoming_transaction_async( std::get<0>( trx_tuple ), persist_until_expired, std::move( next ) );
-                     }
+                     self->process_incoming_transaction_async( future.get(), persist_until_expired, std::move( next ) );
                   } CATCH_AND_CALL(next);
                } );
-           } );
+            }
+         });
       }
 
       void process_incoming_transaction_async(const transaction_metadata_ptr& trx, bool persist_until_expired, next_function<transaction_trace_ptr> next) {

From eb0922a16e20fd3694605c6ece03f85753561bfe Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 2 Aug 2019 11:17:06 +0800
Subject: [PATCH 0931/1648] Add row size check for get_table_tests

---
 tests/get_table_tests.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/get_table_tests.cpp b/tests/get_table_tests.cpp
index bdacd23e4c2..d3bbf8b3e48 100644
--- a/tests/get_table_tests.cpp
+++ b/tests/get_table_tests.cpp
@@ -535,10 +535,12 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    params.lower_bound = "0";
 
    auto res_1 = plugin.get_table_rows(params);
+   BOOST_REQUIRE(res_1.rows.size() > 0);
    BOOST_TEST(res_1.rows[0].get_object()["key"].as<uint64_t>() == 0);
    BOOST_TEST(res_1.next_key == "1");
    params.lower_bound = res_1.next_key;
    auto more2_res_1 = plugin.get_table_rows(params);
+   BOOST_REQUIRE(more2_res_1.rows.size() > 0);
    BOOST_TEST(more2_res_1.rows[0].get_object()["key"].as<uint64_t>() == 1);
    
 
@@ -548,10 +550,12 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    params.lower_bound = "5";
 
    auto res_2 = plugin.get_table_rows(params);
+   BOOST_REQUIRE(res_2.rows.size() > 0);
    BOOST_TEST(res_2.rows[0].get_object()["sec64"].as<uint64_t>() == 5);
    BOOST_TEST(res_2.next_key == "7");
    params.lower_bound = res_2.next_key;
    auto more2_res_2 = plugin.get_table_rows(params);
+   BOOST_REQUIRE(more2_res_2.rows.size() > 0);
    BOOST_TEST(more2_res_2.rows[0].get_object()["sec64"].as<uint64_t>() == 7);
 
    // i128 secondary key type
@@ -561,11 +565,13 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
 
    auto res_3 = plugin.get_table_rows(params);
    chain::uint128_t sec128_expected_value = 5;
+   BOOST_REQUIRE(res_3.rows.size() > 0);
    BOOST_CHECK(res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == sec128_expected_value);
    BOOST_TEST(res_3.next_key == "0x07000000000000000000000000000000");
    params.lower_bound = res_3.next_key;
    auto more2_res_3 = plugin.get_table_rows(params);
    chain::uint128_t more2_sec128_expected_value = 7;
+   BOOST_REQUIRE(more2_res_3.rows.size() > 0);
    BOOST_CHECK(more2_res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == more2_sec128_expected_value);
 
    // float64 secondary key type
@@ -575,12 +581,14 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
 
    auto res_4 = plugin.get_table_rows(params);
    float64_t secdouble_expected_value = ui64_to_f64(5);
+   BOOST_REQUIRE(res_4.rows.size() > 0);
    double secdouble_res_value = res_4.rows[0].get_object()["secdouble"].as<double>();
    BOOST_CHECK(*reinterpret_cast<float64_t*>(&secdouble_res_value) == secdouble_expected_value);
    BOOST_TEST(res_4.next_key == "7.00000000000000000");
    params.lower_bound = res_4.next_key;
    auto more2_res_4 = plugin.get_table_rows(params);
    float64_t more2_secdouble_expected_value = ui64_to_f64(7);
+   BOOST_REQUIRE(more2_res_4.rows.size() > 0);
    double more2_secdouble_res_value = more2_res_4.rows[0].get_object()["secdouble"].as<double>();
    BOOST_CHECK(*reinterpret_cast<float64_t*>(&more2_secdouble_res_value) == more2_secdouble_expected_value);
 
@@ -591,12 +599,14 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
 
    auto res_5 = plugin.get_table_rows(params);
    float128_t secldouble_expected_value = ui64_to_f128(5);
+   BOOST_REQUIRE(res_5.rows.size() > 0);
    chain::uint128_t secldouble_res_value =  res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
    BOOST_TEST(*reinterpret_cast<float128_t*>(&secldouble_res_value) == secldouble_expected_value);
    BOOST_TEST(res_5.next_key == "0x00000000000000000000000000c00140");
    params.lower_bound = res_5.next_key;
    auto more2_res_5 = plugin.get_table_rows(params);
    float128_t more2_secldouble_expected_value = ui64_to_f128(7);
+   BOOST_REQUIRE(more2_res_5.rows.size() > 0);
    chain::uint128_t more2_secldouble_res_value =  more2_res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
    BOOST_TEST(*reinterpret_cast<float128_t*>(&more2_secldouble_res_value) == more2_secldouble_expected_value);
 
@@ -609,6 +619,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
 
    auto res_6 = plugin.get_table_rows(params);
    checksum256_type sec256_expected_value = checksum256_type::hash(std::string("thirdinput"));
+   BOOST_REQUIRE(res_6.rows.size() > 0);
    checksum256_type sec256_res_value = res_6.rows[0].get_object()["sec256"].as<checksum256_type>();
    BOOST_TEST(sec256_res_value == sec256_expected_value);
    BOOST_TEST(res_6.rows[0].get_object()["hash_input"].as<string>() == std::string("thirdinput"));
@@ -616,6 +627,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    params.lower_bound = res_6.next_key;
    auto more2_res_6 = plugin.get_table_rows(params);
    checksum256_type more2_sec256_expected_value = checksum256_type::hash(std::string("secondinput"));
+   BOOST_REQUIRE(more2_res_6.rows.size() > 0);
    checksum256_type more2_sec256_res_value = more2_res_6.rows[0].get_object()["sec256"].as<checksum256_type>();
    BOOST_TEST(more2_sec256_res_value == more2_sec256_expected_value);
    BOOST_TEST(more2_res_6.rows[0].get_object()["hash_input"].as<string>() == std::string("secondinput"));
@@ -627,6 +639,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
 
    auto res_7 = plugin.get_table_rows(params);
    checksum256_type i256_expected_value = checksum256_type::hash(std::string("thirdinput"));
+   BOOST_REQUIRE(res_7.rows.size() > 0);
    checksum256_type i256_res_value = res_7.rows[0].get_object()["sec256"].as<checksum256_type>();
    BOOST_TEST(i256_res_value == i256_expected_value);
    BOOST_TEST(res_7.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
@@ -634,6 +647,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    params.lower_bound = res_7.next_key;
    auto more2_res_7 = plugin.get_table_rows(params);
    checksum256_type more2_i256_expected_value = checksum256_type::hash(std::string("secondinput"));
+   BOOST_REQUIRE(more2_res_7.rows.size() > 0);
    checksum256_type more2_i256_res_value = more2_res_7.rows[0].get_object()["sec256"].as<checksum256_type>();
    BOOST_TEST(more2_i256_res_value == more2_i256_expected_value);
    BOOST_TEST(more2_res_7.rows[0].get_object()["hash_input"].as<string>() == "secondinput");
@@ -645,6 +659,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
 
    auto res_8 = plugin.get_table_rows(params);
    ripemd160 sec160_expected_value = ripemd160::hash(std::string("thirdinput"));
+   BOOST_REQUIRE(res_8.rows.size() > 0);
    ripemd160 sec160_res_value = res_8.rows[0].get_object()["sec160"].as<ripemd160>();
    BOOST_TEST(sec160_res_value == sec160_expected_value);
    BOOST_TEST(res_8.rows[0].get_object()["hash_input"].as<string>() == "thirdinput");
@@ -652,6 +667,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    params.lower_bound = res_8.next_key;
    auto more2_res_8 = plugin.get_table_rows(params);
    ripemd160 more2_sec160_expected_value = ripemd160::hash(std::string("secondinput"));
+   BOOST_REQUIRE(more2_res_8.rows.size() > 0);
    ripemd160 more2_sec160_res_value = more2_res_8.rows[0].get_object()["sec160"].as<ripemd160>();
    BOOST_TEST(more2_sec160_res_value == more2_sec160_expected_value);
    BOOST_TEST(more2_res_8.rows[0].get_object()["hash_input"].as<string>() == "secondinput");

From d410b2dd1818a9628f66bd7aa37f3130521270db Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Fri, 2 Aug 2019 11:17:50 +0800
Subject: [PATCH 0932/1648] Use boost multiprecision uint128_t to convert input

---
 plugins/chain_plugin/chain_plugin.cpp         | 22 +++++++++++++++++--
 .../eosio/chain_plugin/chain_plugin.hpp       |  5 ++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 5672c97e660..2ad0c6eddd2 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1443,6 +1443,16 @@ uint64_t convert_to_type(const string& str, const string& desc) {
    }
 }
 
+template<>
+uint128_t convert_to_type(const string& str, const string& desc) {
+   uint128_t val;
+   try {
+      auto bmp = boost::multiprecision::uint128_t(str);
+      val = *reinterpret_cast<uint128_t*>(&bmp);
+   } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} string '${str}' to uint128_t type.", ("desc", desc)("str",str) )
+   return val;
+}
+
 template<>
 double convert_to_type(const string& str, const string& desc) {
    double val{};
@@ -1552,8 +1562,16 @@ read_only::get_table_rows_result read_only::get_table_rows( const read_only::get
          });
       }
       else if (p.key_type == chain_apis::float128) {
-         return get_table_rows_by_seckey<index_long_double_index, uint128_t>(p, abi, [](uint128_t v)->float128_t{
-            return *reinterpret_cast<float128_t *>(&v);
+         if ( p.encode_type == chain_apis::hex) {
+            return get_table_rows_by_seckey<index_long_double_index, uint128_t>(p, abi, [](uint128_t v)->float128_t{
+               return *reinterpret_cast<float128_t *>(&v);
+            });
+         }
+         return get_table_rows_by_seckey<index_long_double_index, double>(p, abi, [](double v)->float128_t{
+            float64_t f = *(float64_t *)&v;
+            float128_t f128;
+            f64_to_f128M(f, &f128);
+            return f128;
          });
       }
       else if (p.key_type == chain_apis::sha256) {
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 80006c0b347..7febdfd3d2a 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -56,7 +56,7 @@ struct permission {
 template<typename>
 struct resolver_factory;
 
-// see specializations for uint64_t and double in source file
+// see specializations for uint64_t, uint128_t and double in source file
 template<typename Type>
 Type convert_to_type(const string& str, const string& desc) {
    try {
@@ -67,6 +67,9 @@ Type convert_to_type(const string& str, const string& desc) {
 template<>
 uint64_t convert_to_type(const string& str, const string& desc);
 
+template<>
+uint128_t convert_to_type(const string& str, const string& desc);
+
 template<>
 double convert_to_type(const string& str, const string& desc);
 

From fd9ea142e9feb648fa01605f011f8958eb102fe7 Mon Sep 17 00:00:00 2001
From: Aaron Fu <aaron.fu@block.one>
Date: Fri, 2 Aug 2019 16:46:03 +0800
Subject: [PATCH 0933/1648] fix bug to make sed -i work properly on Mac

---
 plugins/eosio-make_new_plugin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/eosio-make_new_plugin.sh b/plugins/eosio-make_new_plugin.sh
index 241edbf73c9..77937ee47e0 100755
--- a/plugins/eosio-make_new_plugin.sh
+++ b/plugins/eosio-make_new_plugin.sh
@@ -9,13 +9,13 @@ fi
 pluginName=$1
 
 echo Copying template...
-cp -r template_plugin $pluginName
+cp -R template_plugin $pluginName
 
 echo Renaming files/directories...
 mv $pluginName/include/eosio/template_plugin $pluginName/include/eosio/$pluginName
 for file in `find $pluginName -type f -name '*template_plugin*'`; do mv $file `sed s/template_plugin/$pluginName/g <<< $file`; done;
 
 echo Renaming in files...
-find $pluginName -type f -exec sed -i "s/template_plugin/$pluginName/g" {} \;
+for file in `find $pluginName -type f`; do sed -i.bak -e "s/template_plugin/$pluginName/g" "$file" && rm "$file.bak"; done
 
 echo "Done! $pluginName is ready. Don't forget to add it to CMakeLists.txt!"

From f79176a0c80d4f319112e33343f6192e358e24a3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 2 Aug 2019 11:12:59 -0500
Subject: [PATCH 0934/1648] Change producer thread pool from 2 to 4 for test

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index d093248f2ed..18cc6194252 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -621,7 +621,7 @@ void producer_plugin::set_program_options(
           "ratio between incoming transations and deferred transactions when both are exhausted")
          ("incoming-transaction-queue-size-mb", bpo::value<uint16_t>()->default_value( 1024 ),
           "Maximum size (in MiB) of the incoming transaction queue. Exceeding this value will subjectively drop transaction with resource exhaustion.")
-         ("producer-threads", bpo::value<uint16_t>()->default_value(config::default_controller_thread_pool_size),
+         ("producer-threads", bpo::value<uint16_t>()->default_value(config::default_controller_thread_pool_size+2),
           "Number of worker threads in producer thread pool")
          ("snapshots-dir", bpo::value<bfs::path>()->default_value("snapshots"),
           "the location of the snapshots directory (absolute path or relative to application data dir)")

From 4a35741bc62ab7a0d7ce86c69874facd89264ddb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 2 Aug 2019 12:25:10 -0500
Subject: [PATCH 0935/1648] revert back to default

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 18cc6194252..d093248f2ed 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -621,7 +621,7 @@ void producer_plugin::set_program_options(
           "ratio between incoming transations and deferred transactions when both are exhausted")
          ("incoming-transaction-queue-size-mb", bpo::value<uint16_t>()->default_value( 1024 ),
           "Maximum size (in MiB) of the incoming transaction queue. Exceeding this value will subjectively drop transaction with resource exhaustion.")
-         ("producer-threads", bpo::value<uint16_t>()->default_value(config::default_controller_thread_pool_size+2),
+         ("producer-threads", bpo::value<uint16_t>()->default_value(config::default_controller_thread_pool_size),
           "Number of worker threads in producer thread pool")
          ("snapshots-dir", bpo::value<bfs::path>()->default_value("snapshots"),
           "the location of the snapshots directory (absolute path or relative to application data dir)")

From c051008c19dfb76a2c603fa81ec93a72a97fbd58 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 2 Aug 2019 12:35:23 -0500
Subject: [PATCH 0936/1648] Make implicit and scheduled const as they never
 change

---
 libraries/chain/controller.cpp                |  9 +++---
 libraries/chain/fork_database.cpp             |  2 +-
 .../eosio/chain/transaction_metadata.hpp      | 29 ++++++++++++++-----
 .../unapplied_transaction_queue_tests.cpp     |  2 +-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 71dea08a5f7..e4fe1137cab 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1129,9 +1129,8 @@ struct controller_impl {
 
       signed_transaction dtrx;
       fc::raw::unpack(ds,static_cast<transaction&>(dtrx) );
-      transaction_metadata_ptr trx = transaction_metadata::create_no_recover_keys( packed_transaction( dtrx ) );
+      transaction_metadata_ptr trx = transaction_metadata::create_no_recover_keys( packed_transaction( dtrx ), transaction_metadata::trx_type::scheduled );
       trx->accepted = true;
-      trx->scheduled = true;
 
       transaction_trace_ptr trace;
       if( gtrx.expiration < self.pending_block_time() ) {
@@ -1532,8 +1531,8 @@ struct controller_impl {
          }
 
          try {
-            transaction_metadata_ptr onbtrx = transaction_metadata::create_no_recover_keys( packed_transaction( get_on_block_transaction() ) );
-            onbtrx->implicit = true;
+            transaction_metadata_ptr onbtrx =
+                  transaction_metadata::create_no_recover_keys( packed_transaction( get_on_block_transaction() ), transaction_metadata::trx_type::implicit );
             auto reset_in_trx_requiring_checks = fc::make_scoped_exit([old_value=in_trx_requiring_checks,this](){
                   in_trx_requiring_checks = old_value;
                });
@@ -1739,7 +1738,7 @@ struct controller_impl {
             for( const auto& receipt : b->transactions ) {
                if( receipt.trx.contains<packed_transaction>()) {
                   auto& pt = receipt.trx.get<packed_transaction>();
-                  trx_metas.emplace_back( transaction_metadata::create_no_recover_keys( pt ) );
+                  trx_metas.emplace_back( transaction_metadata::create_no_recover_keys( pt, transaction_metadata::trx_type::input ) );
                }
             }
          } else {
diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
index cce19ebf41c..86f67d546bd 100644
--- a/libraries/chain/fork_database.cpp
+++ b/libraries/chain/fork_database.cpp
@@ -128,7 +128,7 @@ namespace eosio { namespace chain {
                for( const auto& receipt : s.block->transactions ) {
                   if( receipt.trx.contains<packed_transaction>() ) {
                      const auto& pt = receipt.trx.get<packed_transaction>();
-                     s.trxs.push_back( transaction_metadata::create_no_recover_keys( pt ) );
+                     s.trxs.push_back( transaction_metadata::create_no_recover_keys( pt, transaction_metadata::trx_type::input ) );
                   }
                }
                s.header_exts = s.block->validate_and_extract_header_extensions();
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index b25adfd42ff..fc17ef64a2a 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -23,15 +23,22 @@ using recover_keys_future = std::future<transaction_metadata_ptr>;
  *  packed/unpacked/compressed and recovered keys
  */
 class transaction_metadata {
+   public:
+      enum class trx_type {
+         input,
+         implicit,
+         scheduled
+      };
+
    private:
       const packed_transaction_ptr                               _packed_trx;
       const fc::microseconds                                     _sig_cpu_usage;
       const flat_set<public_key_type>                            _recovered_pub_keys;
 
    public:
+      const bool                                                 implicit;
+      const bool                                                 scheduled;
       bool                                                       accepted = false;  // not thread safe
-      bool                                                       implicit = false;  // not thread safe
-      bool                                                       scheduled = false; // not thread safe
 
    private:
       struct private_type{};
@@ -43,12 +50,15 @@ class transaction_metadata {
       }
 
    public:
-      // creation of tranaction_metadata should restricted to start_recover_keys and create_no_recover_keys below, public for make_shared
+      // creation of tranaction_metadata restricted to start_recover_keys and create_no_recover_keys below, public for make_shared
       explicit transaction_metadata( const private_type& pt, const packed_transaction_ptr& ptrx,
-                                     fc::microseconds sig_cpu_usage, flat_set<public_key_type> recovered_pub_keys )
+                                     fc::microseconds sig_cpu_usage, flat_set<public_key_type> recovered_pub_keys,
+                                     bool _implicit = false, bool _scheduled = false)
          : _packed_trx( ptrx )
          , _sig_cpu_usage( sig_cpu_usage )
-         , _recovered_pub_keys( std::move( recovered_pub_keys ) ) {
+         , _recovered_pub_keys( std::move( recovered_pub_keys ) )
+         , implicit( _implicit )
+         , scheduled( _scheduled ) {
       }
 
       transaction_metadata() = delete;
@@ -63,16 +73,19 @@ class transaction_metadata {
       fc::microseconds signature_cpu_usage()const { return _sig_cpu_usage; }
       const flat_set<public_key_type>& recovered_keys()const { return _recovered_pub_keys; }
 
-      // must be called from main application thread
+      /// Thread safe.
+      /// @returns transaction_metadata_ptr or exception via future
       static recover_keys_future
       start_recover_keys( const packed_transaction_ptr& trx, boost::asio::io_context& thread_pool,
                           const chain_id_type& chain_id, fc::microseconds time_limit,
                           uint32_t max_variable_sig_size = UINT32_MAX );
 
+      /// @returns constructed transaction_metadata with no key recovery (sig_cpu_usage=0, recovered_pub_keys=empty)
       static transaction_metadata_ptr
-      create_no_recover_keys( const packed_transaction& trx ) {
+      create_no_recover_keys( const packed_transaction& trx, trx_type t ) {
          return std::make_shared<transaction_metadata>( private_type(),
-               std::make_shared<packed_transaction>( trx ), fc::microseconds(), flat_set<public_key_type>() );
+               std::make_shared<packed_transaction>( trx ), fc::microseconds(), flat_set<public_key_type>(),
+                     t == trx_type::implicit, t == trx_type::scheduled );
       }
 
 };
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index 149c80d2ff6..b35b894bdcf 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -20,7 +20,7 @@ auto unique_trx_meta_data() {
    account_name creator = config::system_account_name;
    trx.actions.emplace_back( vector<permission_level>{{creator,config::active_name}},
                              onerror{ nextid, "test", 4 });
-   return transaction_metadata::create_no_recover_keys( packed_transaction( trx ) );
+   return transaction_metadata::create_no_recover_keys( packed_transaction( trx ), transaction_metadata::trx_type::input );
 }
 
 auto next( unapplied_transaction_queue& q ) {

From a3e4df61c0e2e348311a5cc737878b5acbf49901 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Fri, 2 Aug 2019 14:18:42 -0400
Subject: [PATCH 0937/1648] general cleanup and fix for develop merge

---
 libraries/chain/controller.cpp                    |  2 --
 .../chain/include/eosio/chain/wasm_interface.hpp  |  6 +++---
 .../eosio/chain/wasm_interface_private.hpp        | 15 ++-------------
 libraries/chain/wasm_interface.cpp                |  8 ++++----
 unittests/CMakeLists.txt                          |  1 -
 unittests/api_tests.cpp                           |  1 -
 6 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index e5c96f172a1..14a71422124 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1851,8 +1851,6 @@ struct controller_impl {
                         ("block", *b)("expected_receipt", receipt)
                       );
             const transaction_receipt_header& r = trx_receipts.back();
-            if (!(r == static_cast<const transaction_receipt_header&>(receipt)))
-               wdump((b));
             EOS_ASSERT( r == static_cast<const transaction_receipt_header&>(receipt),
                         block_validate_exception, "receipt does not match",
                         ("producer_receipt", receipt)("validator_receipt", trx_receipts.back()) );
diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index ee124f9bca4..bed4081e9e8 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -75,7 +75,7 @@ namespace eosio { namespace chain {
          enum class vm_type {
             wavm,
             wabt,
-	    eos_vm
+            eos_vm
          };
 
          wasm_interface(vm_type vm, const chainbase::database& db);
@@ -87,8 +87,8 @@ namespace eosio { namespace chain {
          //validates code -- does a WASM validation pass and checks the wasm against EOSIO specific constraints
          static void validate(const controller& control, const bytes& code);
 	 
-	 //get the wasm_allocator used for the linear memory for wasm
-	 static vm::wasm_allocator* get_wasm_allocator();
+         //get the wasm_allocator used for the linear memory for wasm
+	      static vm::wasm_allocator* get_wasm_allocator();
 
          //indicate that a particular code probably won't be used after given block_num
          void code_block_num_last_used(const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, const uint32_t& block_num);
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index a1dd1410354..0bd0adf449e 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -101,7 +101,7 @@ namespace eosio { namespace chain {
       }
 
       const std::unique_ptr<wasm_instantiated_module_interface>& get_instantiated_module( const digest_type& code_hash, const uint8_t& vm_type,
-                                                                                 const uint8_t& vm_version, transaction_context& trx_context, bool inject )
+                                                                                 const uint8_t& vm_version, transaction_context& trx_context )
       {
          wasm_cache_index::iterator it = wasm_instantiation_cache.find(
                                              boost::make_tuple(code_hash, vm_type, vm_version) );
@@ -141,7 +141,7 @@ namespace eosio { namespace chain {
             } catch (const IR::ValidationException& e) {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
-            if (false && inject) {
+            if (false) {
                wasm_injections::wasm_binary_injection injector(module);
                injector.inject();
                try {
@@ -160,23 +160,12 @@ namespace eosio { namespace chain {
             wasm_instantiation_cache.modify(it, [&](auto& c) {
                c.module = runtime_interface->instantiate_module((const char*)bytes.data(), bytes.size(), parse_initial_memory(module));
             });
-            std::ofstream outfile("out2.wasm");
-            if (codeobject) {
-               outfile.write(codeobject->code.data(), codeobject->code.size());
-            }
-
-         }
-         std::ofstream outfile("out.wasm");
-         if (codeobject) {
-            outfile.write(codeobject->code.data(), codeobject->code.size());
          }
-         outfile.close();
          return it->module;
       }
 
       bool is_shutting_down = false;
       std::unique_ptr<wasm_runtime_interface> runtime_interface;
-      wasm_interface::vm_type runtime;
 
       typedef boost::multi_index_container<
          wasm_cache_entry,
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index a205b48bf68..3a0e45dc9c2 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -76,7 +76,7 @@ namespace eosio { namespace chain {
    }
 
    void wasm_interface::apply( const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, apply_context& context ) {
-      my->get_instantiated_module(code_hash, vm_type, vm_version, context.trx_context, my->runtime != wasm_interface::vm_type::eos_vm)->apply(context);
+      my->get_instantiated_module(code_hash, vm_type, vm_version, context.trx_context)->apply(context);
    }
 
    void wasm_interface::exit() {
@@ -226,7 +226,7 @@ class privileged_api : public context_aware_api {
          return context.control.set_proposed_producers( std::move(producers) );
       }
 
-      int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, size_t datalen) {
+      int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, uint32_t datalen) {
          datastream<const char*> ds( packed_producer_schedule, datalen );
          vector<producer_authority> producers;
 
@@ -243,7 +243,7 @@ class privileged_api : public context_aware_api {
          return set_proposed_producers_common(std::move(producers));
       }
 
-      int64_t set_proposed_producers_ex( uint64_t packed_producer_format, array_ptr<char> packed_producer_schedule, size_t datalen) {
+      int64_t set_proposed_producers_ex( uint64_t packed_producer_format, array_ptr<char> packed_producer_schedule, uint32_t datalen) {
          if (packed_producer_format == 0) {
             return set_proposed_producers(packed_producer_schedule, datalen);
          } else if (packed_producer_format == 1) {
@@ -257,7 +257,7 @@ class privileged_api : public context_aware_api {
          }
       }
 
-      uint32_t get_blockchain_parameters_packed( array_ptr<char> packed_blockchain_parameters, size_t buffer_size) {
+      uint32_t get_blockchain_parameters_packed( array_ptr<char> packed_blockchain_parameters, uint32_t buffer_size) {
          auto& gpo = context.control.get_global_properties();
 
          auto s = fc::raw::pack_size( gpo.configuration );
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 296228d0e16..ed870052639 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -33,7 +33,6 @@ find_package(LLVM 4.0 REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
-add_definitions(-DNON_VALIDATING_TEST)
 add_subdirectory(contracts)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contracts.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/contracts.hpp ESCAPE_QUOTES)
 
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 577693ec140..4447838761f 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -116,7 +116,6 @@ FC_REFLECT( u128_action, (values) )
 FC_REFLECT( cf_action, (payload)(cfd_idx) )
 FC_REFLECT( dtt_action, (payer)(deferred_account)(deferred_action)(permission_name)(delay_sec) )
 FC_REFLECT( invalid_access_action, (code)(val)(index)(store) )
-#define NON_VALIDATING_TEST 1
 
 #ifdef NON_VALIDATING_TEST
 #define TESTER tester

From e05e5f717101f9026a01f25db93c376c0a0504ea Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 5 Aug 2019 10:38:23 -0400
Subject: [PATCH 0938/1648] Restore spoonincode's original db_modes_test.sh in
 favor of db_modes_test.py

---
 tests/CMakeLists.txt   |   4 +-
 tests/db_modes_test.py | 132 -----------------------------------------
 tests/db_modes_test.sh | 101 +++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 134 deletions(-)
 delete mode 100755 tests/db_modes_test.py
 create mode 100755 tests/db_modes_test.sh

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f310972626e..deb137f03d5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -49,7 +49,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_multiple_version_protocol_feat
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/consensus-validation-malicious-producers.py ${CMAKE_CURRENT_BINARY_DIR}/consensus-validation-malicious-producers.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/validate-dirty-db.py ${CMAKE_CURRENT_BINARY_DIR}/validate-dirty-db.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/launcher_test.py ${CMAKE_CURRENT_BINARY_DIR}/launcher_test.py COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.py ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.sh ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/prod_preactivation_test.py ${CMAKE_CURRENT_BINARY_DIR}/prod_preactivation_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-label.sh ${CMAKE_CURRENT_BINARY_DIR}/version-label.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_producer_watermark_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_producer_watermark_test.py COPYONLY)
@@ -89,7 +89,7 @@ add_test(NAME validate_dirty_db_test COMMAND tests/validate-dirty-db.py -v --cle
 set_property(TEST validate_dirty_db_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME launcher_test COMMAND tests/launcher_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST launcher_test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME db_modes_test COMMAND tests/db_modes_test.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST db_modes_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME version-label-test COMMAND tests/version-label.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
diff --git a/tests/db_modes_test.py b/tests/db_modes_test.py
deleted file mode 100755
index f26ee5029a6..00000000000
--- a/tests/db_modes_test.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env python3
-
-# This test is intended to verify that switching between DB modes "just works". Addtionally
-# it tries to make sure the dirty bit behaves as expected even in heap mode.
-
-from testUtils import Utils
-
-import decimal
-import re
-import os
-import signal
-import time
-import subprocess
-import shlex
-import tempfile
-import socket
-import sys
-
-errorExit=Utils.errorExit
-
-nodeosCmd="./programs/nodeos/nodeos -d {} --config-dir {} \
---chain-state-db-size-mb 8 --chain-state-db-guard-size-mb 0 --reversible-blocks-db-size-mb 1 \
---reversible-blocks-db-guard-size-mb 0 -e -peosio --plugin eosio::chain_api_plugin"
-
-cleosPath="./programs/cleos/cleos"
-port=8888
-
-def run_and_kill(extraCmd="", killsig=signal.SIGTERM, preCmd=""):
-    global port
-    port = 8888
-    print("looking for free ports")
-    tries = 200
-    while (tries > 0):
-        try:
-            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            server_address = ('127.0.0.1', port)
-            sock.bind(server_address)
-            sock.close()
-            time.sleep(1)
-            tries = 0
-        except:
-            tries = tries - 1
-            port = port + 1
-    # now start nodeos
-    time.sleep(5)
-    cmdArr= preCmd + nodeosCmd + " --http-server-address=127.0.0.1:" + str(port) + extraCmd
-    print("port %d is free now, start to run nodeosCmd with extra parameter \"%s\"" % (port, extraCmd))
-    proc=subprocess.Popen(cmdArr, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, preexec_fn=os.setsid)
-    tries = 30
-    ok = False
-    getInfoCmd = cleosPath + " -u http://127.0.0.1:" + str(port) + "/ get info"
-    while (tries > 0):
-        time.sleep(1)
-        reply = Utils.checkOutput(getInfoCmd, ignoreError=True)
-        if reply.find("server_version") != -1:
-            ok = True
-            time.sleep(1)
-            break
-        tries = tries - 1
-    if ok is True:
-        os.killpg(os.getpgid(proc.pid), killsig)
-    print("got result %d, killed with signal %d" % (ok, killsig))
-    return ok
-
-print("=== db_modes_test.py starts ===")
-
-tempdir = tempfile.mkdtemp()
-nodeosCmd = nodeosCmd.format(tempdir, tempdir)
-
-print("nodeosCmd is %s" % (nodeosCmd))
-
-#new chain with mapped mode
-if run_and_kill(" --delete-all-blocks") != True:
-    errorExit("Failed in new chain with mapped mode")
-
-#use previous DB with heap mode
-if run_and_kill(" --database-map-mode heap") != True:
-    errorExit("Failed in restart heap mode")
-
-#test locked mode if max locked memory is unlimited
-ulimits = Utils.checkOutput('ulimit -a', ignoreError=True).split("\n")
-for row in ulimits:
-    if row.find("max locked memory") != -1:
-        print("output of ulimit -a is: %s:" % (row))
-        if row.find("unlimited") != -1:
-            if run_and_kill(" --database-map-mode locked") != True:
-                errorExit("Failed in restart with locked mode")
-        else:
-            print("skip default locked mode test because max locked memory is not unlimited")
-        break
-
-#locked mode should fail when it's not possible to lock anything
-if run_and_kill(" --database-map-mode locked", preCmd="ulimit -l 0; ") != False:
-    errorExit("Test Failed in locked mode with ulimit -l 0")
-
-#But shouldn't result in the dirty flag staying set; so next launch should run
-if run_and_kill("") != True:
-    errorExit("Failed in restart heap mode")
-
-#Try killing with hard KILL
-if run_and_kill("", killsig=signal.SIGKILL) != True:
-    errorExit("Failed in restart & hardkill in heap mode")
-
-#should be dirty now
-if run_and_kill("") != False:
-    errorExit("dirty flag test failed")
-
-#should also still be dirty in heap mode
-if run_and_kill(" --database-map-mode heap") != False:
-    errorExit("dirty flag test failed")
-
-#start over again! but this time start with heap mode
-if run_and_kill(" --delete-all-blocks --database-map-mode heap") != True:
-    errorExit("Failed in restart heap mode with --delete-all-blocks")
-
-#Then switch back to mapped
-if run_and_kill("") != True:
-    errorExit("Failed in restart mapped mode")
-
-#try killing it while in heap mode
-if run_and_kill(" --database-map-mode heap", killsig=signal.SIGKILL) != True:
-    errorExit("Failed in restart heap mode and hardkill")
-
-#should be dirty if we run in either mode node
-if run_and_kill(" --database-map-mode heap") != False:
-    errorExit("dirty flag test failed in heap mode")
-
-if run_and_kill("") != False:
-    errorExit("dirty flag test failed in mapped mode")
-
-print("=== db_modes_test.py finished successfully ===")
-
diff --git a/tests/db_modes_test.sh b/tests/db_modes_test.sh
new file mode 100755
index 00000000000..f29b8ffcb51
--- /dev/null
+++ b/tests/db_modes_test.sh
@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+
+# This test is intended to verify that switching between DB modes "just works". Addtionally
+# it tries to make sure the dirty bit behaves as expected even in heap mode.
+
+set -euo pipefail
+
+VERBOSE=0
+TEST_LOCKED_MODE=0
+
+while getopts ":lv" opt; do
+   case ${opt} in
+      l)
+         TEST_LOCKED_MODE=1
+         ;;
+      v)
+         VERBOSE=1
+         set -o xtrace
+         ;;
+      \?)
+         echo "Use -v for verbose; -l to enable test of locked mode"
+         exit 1;
+         ;;
+      :)
+         echo "Invalid option"
+         exit 1;
+         ;;
+   esac
+done
+
+EOSIO_STUFF_DIR=$(mktemp -d)
+trap "rm -rf $EOSIO_STUFF_DIR" EXIT
+NODEOS_LAUNCH_PARAMS="./programs/nodeos/nodeos -d $EOSIO_STUFF_DIR --config-dir $EOSIO_STUFF_DIR \
+--chain-state-db-size-mb 8 --chain-state-db-guard-size-mb 0 --reversible-blocks-db-size-mb 1 \
+--reversible-blocks-db-guard-size-mb 0 -e -peosio"
+
+run_nodeos() {
+   if (( $VERBOSE == 0 )); then
+      $NODEOS_LAUNCH_PARAMS --http-server-address '' --p2p-listen-endpoint '' "$@" 2>/dev/null &
+   else
+      $NODEOS_LAUNCH_PARAMS --http-server-address '' --p2p-listen-endpoint '' "$@" &
+   fi
+}
+
+run_expect_success() {
+   run_nodeos "$@"
+   local NODEOS_PID=$!
+   sleep 5
+   kill $NODEOS_PID
+   wait $NODEOS_PID
+}
+
+run_and_kill() {
+   run_nodeos "$@"
+   local NODEOS_PID=$!
+   sleep 5
+   kill -KILL $NODEOS_PID
+   ! wait $NODEOS_PID
+}
+
+run_expect_failure() {
+   run_nodeos "$@"
+   local NODEOS_PID=$!
+   MYPID=$$
+   (sleep 10; kill -ALRM $MYPID) & local TIMER_PID=$!
+   trap "kill $NODEOS_PID; wait $NODEOS_PID; exit 1" ALRM
+   sleep 5
+   if wait $NODEOS_PID; then exit 1; fi
+   kill $TIMER_PID
+   trap ALRM
+}
+
+#new chain with mapped mode
+run_expect_success --delete-all-blocks
+#use previous DB with heap mode
+run_expect_success --database-map-mode heap
+#test lock mode if enabled
+if (( $TEST_LOCKED_MODE == 1 )); then
+   run_expect_success --database-map-mode locked
+fi
+#locked mode should fail when it's not possible to lock anything
+ulimit -l 0
+run_expect_failure --database-map-mode locked
+#But shouldn't result in the dirty flag staying set; so next launch should run
+run_expect_success
+#Try killing with KILL
+run_and_kill
+#should be dirty now
+run_expect_failure
+#should also still be dirty in heap mode
+run_expect_failure --database-map-mode heap
+
+#start over again! but this time start with heap mode
+run_expect_success --delete-all-blocks  --database-map-mode heap
+#Then switch back to mapped
+run_expect_success
+#try killing it while in heap mode
+run_and_kill --database-map-mode heap
+#should be dirty if we run in either mode node
+run_expect_failure --database-map-mode heap
+run_expect_failure

From 911b3b349ee4398dfafa2c4e06a658c6ff53b669 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 5 Aug 2019 10:38:42 -0400
Subject: [PATCH 0939/1648] Fix db_modes_test by doubling the timeout

---
 tests/db_modes_test.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/db_modes_test.sh b/tests/db_modes_test.sh
index f29b8ffcb51..dc04e3d7d63 100755
--- a/tests/db_modes_test.sh
+++ b/tests/db_modes_test.sh
@@ -45,7 +45,7 @@ run_nodeos() {
 run_expect_success() {
    run_nodeos "$@"
    local NODEOS_PID=$!
-   sleep 5
+   sleep 10
    kill $NODEOS_PID
    wait $NODEOS_PID
 }
@@ -53,7 +53,7 @@ run_expect_success() {
 run_and_kill() {
    run_nodeos "$@"
    local NODEOS_PID=$!
-   sleep 5
+   sleep 10
    kill -KILL $NODEOS_PID
    ! wait $NODEOS_PID
 }
@@ -62,9 +62,9 @@ run_expect_failure() {
    run_nodeos "$@"
    local NODEOS_PID=$!
    MYPID=$$
-   (sleep 10; kill -ALRM $MYPID) & local TIMER_PID=$!
+   (sleep 20; kill -ALRM $MYPID) & local TIMER_PID=$!
    trap "kill $NODEOS_PID; wait $NODEOS_PID; exit 1" ALRM
-   sleep 5
+   sleep 10
    if wait $NODEOS_PID; then exit 1; fi
    kill $TIMER_PID
    trap ALRM

From 6f4365703286d5bf142df910deca27324f9c4985 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 5 Aug 2019 10:39:39 -0400
Subject: [PATCH 0940/1648] Move db_modes_test from non-parallelizable test
 group to parallelizable test group

---
 tests/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index deb137f03d5..160077c2b21 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -90,7 +90,6 @@ set_property(TEST validate_dirty_db_test PROPERTY LABELS nonparallelizable_tests
 add_test(NAME launcher_test COMMAND tests/launcher_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST launcher_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST db_modes_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME version-label-test COMMAND tests/version-label.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # Long running tests

From b87d298b1fe0f648e02b4e3bb982e068366e5d0b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 5 Aug 2019 12:06:06 -0400
Subject: [PATCH 0941/1648] python does not have ++, use +=1

---
 tests/nodeos_under_min_avail_ram.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index eba761ceb17..598d0c2c1b1 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -202,7 +202,8 @@ def setName(self, num):
                 allDone=False
         if not allDone:
             time.sleep(5)
-        if ++count>5:
+        count+=1
+        if count>5:
             Utils.cmdError("All Nodes should have died")
             errorExit("Failure - All Nodes should have died")
 

From 10e1a6541d872394c5f9aa4cc702dc0a6d2dfe4e Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 5 Aug 2019 13:52:14 -0400
Subject: [PATCH 0942/1648] Give db_modes_test the highest cost so ctest runs
 it first in the parallel test group

---
 tests/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 160077c2b21..fd1e7cbd112 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -90,6 +90,7 @@ set_property(TEST validate_dirty_db_test PROPERTY LABELS nonparallelizable_tests
 add_test(NAME launcher_test COMMAND tests/launcher_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST launcher_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_tests_properties(db_modes_test PROPERTIES COST 6000)
 add_test(NAME version-label-test COMMAND tests/version-label.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # Long running tests

From e9b47e26e17bb638e566b43a79abcabc4e0409fc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 5 Aug 2019 17:05:28 -0400
Subject: [PATCH 0943/1648] Optimize unpacking of packed_transaction and
 signed_block from network

---
 plugins/net_plugin/net_plugin.cpp | 57 ++++++++++++++++---------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 45674b00ac1..8adbae8a734 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -728,11 +728,11 @@ namespace eosio {
       void handle_message( const request_message& msg );
       void handle_message( const sync_request_message& msg );
       void handle_message( const signed_block& msg ) = delete; // signed_block_ptr overload used instead
-      void handle_message( const signed_block_ptr& msg );
+      void handle_message( const block_id_type& id, signed_block_ptr msg );
       void handle_message( const packed_transaction& msg ) = delete; // packed_transaction_ptr overload used instead
-      void handle_message( const packed_transaction_ptr& msg );
+      void handle_message( packed_transaction_ptr msg );
 
-      void process_signed_block( const signed_block_ptr& msg );
+      void process_signed_block( const block_id_type& id, signed_block_ptr msg );
 
       fc::optional<fc::variant_object> _logger_variant;
       const fc::variant_object& get_logger_variant()  {
@@ -772,16 +772,11 @@ namespace eosio {
       }
 
       void operator()( signed_block&& msg ) const {
-         // continue call to handle_message on connection strand
-         shared_ptr<signed_block> ptr = std::make_shared<signed_block>( std::move( msg ) );
-         c->handle_message( ptr );
+         EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should call handle_message" );
       }
 
       void operator()( packed_transaction&& msg ) const {
-         // continue call to handle_message on connection strand
-         fc_dlog( logger, "handle packed_transaction" );
-         shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>( std::move( msg ) );
-         c->handle_message( ptr );
+         EOS_ASSERT( false, plugin_config_exception, "operator()(packed_transaction&&) should call handle_message" );
       }
 
       void operator()( const handshake_message& msg ) const {
@@ -2409,6 +2404,7 @@ namespace eosio {
    bool connection::process_next_message( uint32_t message_length ) {
       try {
          // if next message is a block we already have, exit early
+         auto ds = pending_message_buffer.create_datastream();
          auto peek_ds = pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
@@ -2427,19 +2423,25 @@ namespace eosio {
                pending_message_buffer.advance_read_ptr( message_length );
                return true;
             }
-         }
 
-         auto ds = pending_message_buffer.create_datastream();
-         net_message msg;
-         fc::raw::unpack( ds, msg );
-         msg_handler m( shared_from_this() );
-         if( msg.contains<signed_block>() ) {
-            m( std::move( msg.get<signed_block>() ) );
-         } else if( msg.contains<packed_transaction>() ) {
-            m( std::move( msg.get<packed_transaction>() ) );
+            fc::raw::unpack( ds, which ); // throw away
+            shared_ptr<signed_block> ptr = std::make_shared<signed_block>();
+            fc::raw::unpack( ds, *ptr );
+            handle_message( blk_id, std::move( ptr ) );
+
+         } else if( which == packed_transaction_which ) {
+            fc::raw::unpack( ds, which ); // throw away
+            shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>();
+            fc::raw::unpack( ds, *ptr );
+            handle_message( std::move( ptr ) );
+
          } else {
+            net_message msg;
+            fc::raw::unpack( ds, msg );
+            msg_handler m( shared_from_this() );
             msg.visit( m );
          }
+
       } catch( const fc::exception& e ) {
          fc_elog( logger, "Exception in handling message from ${p}: ${s}",
                   ("p", peer_name())("s", e.to_detail_string()) );
@@ -2794,7 +2796,7 @@ namespace eosio {
              trx->get_signatures().size() * sizeof(signature_type);
    }
 
-   void connection::handle_message( const packed_transaction_ptr& trx ) {
+   void connection::handle_message( packed_transaction_ptr trx ) {
       if( my_impl->db_read_mode == eosio::db_read_mode::READ_ONLY ) {
          fc_dlog( logger, "got a txn in read-only mode - dropping" );
          return;
@@ -2811,9 +2813,9 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( trx );
-      app().post( priority::low, [trx, weak = weak_from_this()]() {
+      app().post( priority::low, [trx{std::move(trx)}, weak = weak_from_this()]() {
          my_impl->chain_plug->accept_transaction( trx,
-            [weak, trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak, trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) mutable {
          // next (this lambda) called from application thread
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2848,18 +2850,17 @@ namespace eosio {
    }
 
    // called from connection strand
-   void connection::handle_message( const signed_block_ptr& ptr ) {
-      app().post(priority::high, [ptr, weak = weak_from_this()] {
+   void connection::handle_message( const block_id_type& id, signed_block_ptr ptr ) {
+      app().post(priority::high, [ptr{std::move(ptr)}, id, weak = weak_from_this()] {
          connection_ptr c = weak.lock();
-         if( c ) c->process_signed_block( ptr );
+         if( c ) c->process_signed_block( id, std::move( ptr ) );
       });
-      my_impl->dispatcher->bcast_notice( ptr->id() );
+      my_impl->dispatcher->bcast_notice( id );
    }
 
    // called from application thread
-   void connection::process_signed_block( const signed_block_ptr& msg ) {
+   void connection::process_signed_block( const block_id_type& blk_id, signed_block_ptr msg ) {
       controller& cc = my_impl->chain_plug->chain();
-      block_id_type blk_id = msg->id();
       uint32_t blk_num = msg->block_num();
       // use c in this method instead of this to highlight that all methods called on c-> must be thread safe
       connection_ptr c = shared_from_this();

From 48e08fb12633c9f0381fddb417efba52f427836e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 5 Aug 2019 17:28:46 -0400
Subject: [PATCH 0944/1648] Remove recv_transaction and save a shared_ptr
 create now that recv_transaction only calls add_peer_txn

---
 plugins/net_plugin/net_plugin.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8adbae8a734..53c9ec5e049 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -192,7 +192,6 @@ namespace eosio {
 
       void recv_block(const connection_ptr& conn, const block_id_type& msg, uint32_t bnum);
       void expire_blocks( uint32_t bnum );
-      void recv_transaction(const connection_ptr& conn, const packed_transaction_ptr& txn);
       void recv_notice(const connection_ptr& conn, const notice_message& msg, bool generated);
 
       void retry_fetch(const connection_ptr& conn);
@@ -2027,11 +2026,6 @@ namespace eosio {
       } );
    }
 
-   void dispatch_manager::recv_transaction(const connection_ptr& c, const packed_transaction_ptr& txn) {
-      node_transaction_state nts = {txn->id(), txn->expiration(), 0, c->connection_id};
-      add_peer_txn( nts );
-   }
-
    void dispatch_manager::rejected_transaction(const transaction_id_type& id, uint32_t head_blk_num) {
       fc_dlog( logger, "not sending rejected transaction ${tid}", ("tid", id) );
       // keep rejected transaction around for awhile so we don't broadcast it
@@ -2806,7 +2800,9 @@ namespace eosio {
       peer_dlog( this, "received packed_transaction ${id}", ("id", tid) );
 
       bool have_trx = my_impl->dispatcher->have_txn( tid );
-      my_impl->dispatcher->recv_transaction( shared_from_this(), trx );
+      node_transaction_state nts = {tid, trx->expiration(), 0, connection_id};
+      my_impl->dispatcher->add_peer_txn( nts );
+
       if( have_trx ) {
          fc_dlog( logger, "got a duplicate transaction - dropping ${id}", ("id", tid) );
          return;

From ec95ff6470d7005d5692cc15610e16d019498a8c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 5 Aug 2019 17:42:05 -0400
Subject: [PATCH 0945/1648] Remove unneeded connection shared_ptr copy

---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 53c9ec5e049..0c4c56c9f83 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2910,8 +2910,8 @@ namespace eosio {
       }
 
       if( reason == no_reason ) {
-         boost::asio::post( my_impl->thread_pool->get_executor(), [dispatcher = my_impl->dispatcher.get(), c, msg]() {
-            dispatcher->add_peer_block( msg->id(), c->connection_id );
+         boost::asio::post( my_impl->thread_pool->get_executor(), [dispatcher = my_impl->dispatcher.get(), cid=c->connection_id, blk_id, msg]() {
+            dispatcher->add_peer_block( blk_id, cid );
             dispatcher->update_txns_block_num( msg );
          });
          c->strand.post( [sync_master = my_impl->sync_master.get(), dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {

From 038689c1813ab6d9813782e2a0b7e59053e0c403 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 6 Aug 2019 08:49:38 -0400
Subject: [PATCH 0946/1648] Remove unneeded shared_from_this() call

---
 plugins/net_plugin/net_plugin.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0c4c56c9f83..79a5dedfe5f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2408,11 +2408,10 @@ namespace eosio {
 
             block_id_type blk_id = bh.id();
             if( my_impl->dispatcher->have_block( blk_id ) ) {
-               connection_ptr c = shared_from_this();
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}",
-                        ("p", c->peer_name())("num", block_header::num_from_id( blk_id )) );
-               c->consecutive_rejected_blocks = 0;
-               c->cancel_wait();
+                        ("p", peer_name())("num", block_header::num_from_id( blk_id )) );
+               consecutive_rejected_blocks = 0;
+               cancel_wait();
 
                pending_message_buffer.advance_read_ptr( message_length );
                return true;

From a8d4beea4483bf53a77e3fe6b3f4029366e517e7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 6 Aug 2019 09:07:13 -0400
Subject: [PATCH 0947/1648] Remove unneeded chain_plug from sync_manager

---
 plugins/net_plugin/net_plugin.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 79a5dedfe5f..35906c776b7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -149,8 +149,6 @@ namespace eosio {
       connection_ptr sync_source;
       std::atomic<stages> sync_state;
 
-      chain_plugin* chain_plug = nullptr;
-
    private:
       constexpr static auto stage_str( stages s );
       void set_state( stages s );
@@ -1360,8 +1358,6 @@ namespace eosio {
       ,sync_source()
       ,sync_state(in_sync)
    {
-      chain_plug = app().find_plugin<chain_plugin>();
-      EOS_ASSERT( chain_plug, chain::missing_chain_plugin_exception, ""  );
    }
 
    constexpr auto sync_manager::stage_str(stages s) {

From 1f6527f854545368948aa927a542ec82baadfbc0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 6 Aug 2019 17:13:32 -0400
Subject: [PATCH 0948/1648] Make handle_guard_exception & log_guard_exception
 static

---
 plugins/chain_plugin/chain_plugin.cpp                         | 4 ++--
 .../chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index f2af45155d2..50a36d4d225 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1238,7 +1238,7 @@ fc::microseconds chain_plugin::get_abi_serializer_max_time() const {
    return my->abi_serializer_max_time_ms;
 }
 
-void chain_plugin::log_guard_exception(const chain::guard_exception&e ) const {
+void chain_plugin::log_guard_exception(const chain::guard_exception&e ) {
    if (e.code() == chain::database_guard_exception::code_value) {
       elog("Database has reached an unsafe level of usage, shutting down to avoid corrupting the database.  "
            "Please increase the value set for \"chain-state-db-size-mb\" and restart the process!");
@@ -1250,7 +1250,7 @@ void chain_plugin::log_guard_exception(const chain::guard_exception&e ) const {
    dlog("Details: ${details}", ("details", e.to_detail_string()));
 }
 
-void chain_plugin::handle_guard_exception(const chain::guard_exception& e) const {
+void chain_plugin::handle_guard_exception(const chain::guard_exception& e) {
    log_guard_exception(e);
 
    elog("database chain::guard_exception, quiting..."); // log string searched for in: tests/nodeos_under_min_avail_ram.py
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 2bec70dd477..122b7c8e826 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -716,12 +716,12 @@ class chain_plugin : public plugin<chain_plugin> {
    chain::chain_id_type get_chain_id() const;
    fc::microseconds get_abi_serializer_max_time() const;
 
-   void handle_guard_exception(const chain::guard_exception& e) const;
+   static void handle_guard_exception(const chain::guard_exception& e);
    void do_hard_replay(const variables_map& options);
 
    static void handle_db_exhaustion();
 private:
-   void log_guard_exception(const chain::guard_exception& e) const;
+   static void log_guard_exception(const chain::guard_exception& e);
 
    unique_ptr<class chain_plugin_impl> my;
 };

From cb02261d4bb970592edaa20d974ad8a03d2c35d3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 6 Aug 2019 17:37:01 -0400
Subject: [PATCH 0949/1648] Add missing handling of guard exception by using a
 custom LOG_AND_DROP macro

---
 plugins/producer_plugin/producer_plugin.cpp | 60 ++++++++++++---------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 151891e67f1..7d0def2024f 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -44,6 +44,28 @@ using std::vector;
 using std::deque;
 using boost::signals2::scoped_connection;
 
+#undef FC_LOG_AND_DROP
+#define LOG_AND_DROP()  \
+   catch ( const guard_exception& e ) { \
+      chain_plugin::handle_guard_exception(e); \
+   } catch ( boost::interprocess::bad_alloc& ) { \
+      chain_plugin::handle_db_exhaustion(); \
+   } catch( fc::exception& er ) { \
+      wlog( "${details}", ("details",er.to_detail_string()) ); \
+   } catch( const std::exception& e ) {  \
+      fc::exception fce( \
+                FC_LOG_MESSAGE( warn, "std::exception: ${what}: ",("what",e.what()) ), \
+                fc::std_exception_code,\
+                BOOST_CORE_TYPEID(e).name(), \
+                e.what() ) ; \
+      wlog( "${details}", ("details",fce.to_detail_string()) ); \
+   } catch( ... ) {  \
+      fc::unhandled_exception e( \
+                FC_LOG_MESSAGE( warn, "unknown: ",  ), \
+                std::current_exception() ); \
+      wlog( "${details}", ("details",e.to_detail_string()) ); \
+   }
+
 const fc::string logger_name("producer_plugin");
 fc::logger _log;
 
@@ -342,7 +364,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                _unapplied_transactions.add_forked( forked_branch );
             } );
          } catch ( const guard_exception& e ) {
-            chain_plug->handle_guard_exception(e);
+            chain_plugin::handle_guard_exception(e);
             return;
          } catch( const fc::exception& e ) {
             elog((e.to_detail_string()));
@@ -521,7 +543,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             }
 
          } catch ( const guard_exception& e ) {
-            chain_plug->handle_guard_exception(e);
+            chain_plugin::handle_guard_exception(e);
          } catch ( boost::interprocess::bad_alloc& ) {
             chain_plugin::handle_db_exhaustion();
          } CATCH_AND_CALL(send_response);
@@ -703,6 +725,7 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
 { try {
    my->chain_plug = app().find_plugin<chain_plugin>();
    EOS_ASSERT( my->chain_plug, plugin_config_exception, "chain_plugin not found" );
+   chain_plugin* chain_plug = my->chain_plug;
    my->_options = &options;
    LOAD_VALUE_SET(options, "producer-name", my->_producers)
 
@@ -801,13 +824,13 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
    my->_incoming_block_subscription = app().get_channel<incoming::channels::block>().subscribe([this](const signed_block_ptr& block){
       try {
          my->on_incoming_block(block);
-      } FC_LOG_AND_DROP();
+      } LOG_AND_DROP();
    });
 
    my->_incoming_transaction_subscription = app().get_channel<incoming::channels::transaction>().subscribe([this](const transaction_metadata_ptr& trx){
       try {
          my->on_incoming_transaction_async(trx, false, [](const auto&){});
-      } FC_LOG_AND_DROP();
+      } LOG_AND_DROP();
    });
 
    my->_incoming_block_sync_provider = app().get_method<incoming::methods::block_sync>().register_provider([this](const signed_block_ptr& block){
@@ -1420,7 +1443,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
       }
 
       chain.start_block( block_time, blocks_to_confirm, features_to_activate );
-   } FC_LOG_AND_DROP();
+   } LOG_AND_DROP();
 
    if( chain.is_building_block() ) {
       auto pending_block_time = chain.pending_block_time();
@@ -1516,10 +1539,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                      itr = _unapplied_transactions.erase( itr );
                      continue;
                   }
-               } catch( const guard_exception& e ) {
-                  chain_plug->handle_guard_exception( e );
-                  return start_block_result::failed;
-               } FC_LOG_AND_DROP();
+               } LOG_AND_DROP();
                ++itr;
             }
 
@@ -1623,10 +1643,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                   } else {
                      num_applied++;
                   }
-               } catch ( const guard_exception& e ) {
-                  chain_plug->handle_guard_exception(e);
-                  return start_block_result::failed;
-               } FC_LOG_AND_DROP();
+               } LOG_AND_DROP();
 
                _incoming_trx_weight += _incoming_defer_ratio;
                if (!orig_pending_txn_size) _incoming_trx_weight = 0.0;
@@ -1664,6 +1681,9 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
             return start_block_result::succeeded;
          }
 
+      } catch ( const guard_exception& e ) {
+         chain_plugin::handle_guard_exception(e);
+         return start_block_result::failed;
       } catch ( boost::interprocess::bad_alloc& ) {
          chain_plugin::handle_db_exhaustion();
          return start_block_result::failed;
@@ -1788,17 +1808,9 @@ bool producer_plugin_impl::maybe_produce_block() {
    });
 
    try {
-      try {
-         produce_block();
-         return true;
-      } catch ( const guard_exception& e ) {
-         chain_plug->handle_guard_exception(e);
-         return false;
-      } FC_LOG_AND_DROP();
-   } catch ( boost::interprocess::bad_alloc&) {
-      chain_plugin::handle_db_exhaustion();
-      return false;
-   }
+      produce_block();
+      return true;
+   } LOG_AND_DROP();
 
    fc_dlog(_log, "Aborting block due to produce_block error");
    chain::controller& chain = chain_plug->chain();

From be9217b24f5fc046d0a279ac8ec2f3a569cd0a8d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 7 Aug 2019 09:43:23 -0400
Subject: [PATCH 0950/1648] Handle std::alloc for #6979

---
 libraries/chain/controller.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 80d848ee8ca..eb27b6e5870 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -350,7 +350,10 @@ struct controller_impl {
    template<typename Signal, typename Arg>
    void emit( const Signal& s, Arg&& a ) {
       try {
-        s(std::forward<Arg>(a));
+         s( std::forward<Arg>( a ));
+      } catch (std::bad_alloc& e) {
+         wlog( "std::bad_alloc" );
+         throw e;
       } catch (boost::interprocess::bad_alloc& e) {
          wlog( "bad alloc" );
          throw e;
@@ -1543,13 +1546,17 @@ struct controller_impl {
                });
             in_trx_requiring_checks = true;
             push_transaction( onbtrx, fc::time_point::maximum(), self.get_global_properties().configuration.min_transaction_cpu_usage, true );
-         } catch( const boost::interprocess::bad_alloc& e  ) {
+         } catch( const std::bad_alloc& e ) {
+            elog( "on block transaction failed due to a std::bad_alloc" );
+            throw;
+         } catch( const boost::interprocess::bad_alloc& e ) {
             elog( "on block transaction failed due to a bad allocation" );
             throw;
          } catch( const fc::exception& e ) {
             wlog( "on block transaction failed, but shouldn't impact block generation, system contract needs update" );
             edump((e.to_detail_string()));
          } catch( ... ) {
+            elog( "on block transaction failed due to unknown exception" );
          }
 
          clear_expired_input_transactions();

From 8716ed2b4be3e3a25c9cd8248f682efb3c76fcf4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 7 Aug 2019 09:43:44 -0400
Subject: [PATCH 0951/1648] Add handling for std::alloc

---
 plugins/producer_plugin/producer_plugin.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 7d0def2024f..9c6be6fe25b 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -48,6 +48,9 @@ using boost::signals2::scoped_connection;
 #define LOG_AND_DROP()  \
    catch ( const guard_exception& e ) { \
       chain_plugin::handle_guard_exception(e); \
+   } catch ( const std::bad_alloc& ) { \
+      elog( "std::bad_alloc" ); \
+      throw; \
    } catch ( boost::interprocess::bad_alloc& ) { \
       chain_plugin::handle_db_exhaustion(); \
    } catch( fc::exception& er ) { \

From 2572d17d30080151ea83cef6331d747e9029037d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 7 Aug 2019 10:10:36 -0400
Subject: [PATCH 0952/1648] Updated comments to better describe behaviour

---
 unittests/misc_tests.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 20a7a3ed602..96d080a97b1 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -845,16 +845,16 @@ BOOST_AUTO_TEST_CASE(transaction_metadata_test) { try {
       auto fut = transaction_metadata::start_recover_keys( ptrx, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
       auto fut2 = transaction_metadata::start_recover_keys( ptrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
 
-      // no-op
+      // start another key reovery on same packed_transaction, creates a new future with transaction_metadata, should not interfere with above
       transaction_metadata::start_recover_keys( ptrx, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
       transaction_metadata::start_recover_keys( ptrx2, thread_pool.get_executor(), test.control->get_chain_id(), fc::microseconds::maximum() );
 
       auto mtrx = fut.get();
-      const auto& keys = mtrx->recovered_keys( );
+      const auto& keys = mtrx->recovered_keys();
       BOOST_CHECK_EQUAL(1u, keys.size());
       BOOST_CHECK_EQUAL(public_key, *keys.begin());
 
-      // again
+      // again, can be called multiple times, current implementation it is just an attribute of transaction_metadata
       const auto& keys2 = mtrx->recovered_keys();
       BOOST_CHECK_EQUAL(1u, keys2.size());
       BOOST_CHECK_EQUAL(public_key, *keys2.begin());

From 92fd0c1c2ad005080c21d5c790474cbfa2b74145 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 7 Aug 2019 13:57:43 -0400
Subject: [PATCH 0953/1648] Don't bother creating transaction_metadata objects
 as they will be created as needed in apply_block

---
 libraries/chain/fork_database.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
index 86f67d546bd..bd98202922e 100644
--- a/libraries/chain/fork_database.cpp
+++ b/libraries/chain/fork_database.cpp
@@ -125,12 +125,8 @@ namespace eosio { namespace chain {
             for( uint32_t i = 0, n = size.value; i < n; ++i ) {
                block_state s;
                fc::raw::unpack( ds, s );
-               for( const auto& receipt : s.block->transactions ) {
-                  if( receipt.trx.contains<packed_transaction>() ) {
-                     const auto& pt = receipt.trx.get<packed_transaction>();
-                     s.trxs.push_back( transaction_metadata::create_no_recover_keys( pt, transaction_metadata::trx_type::input ) );
-                  }
-               }
+               // do not populate transaction_metadatas, they will be created as needed in apply_block with appropriate key recovery
+               s.trxs.clear(); // not part of fc_reflect, so should be empty here
                s.header_exts = s.block->validate_and_extract_header_extensions();
                my->add( std::make_shared<block_state>( move( s ) ), false, true, validator );
             }

From 46ed0b992a185c3c6926dfcd0596e55da993453a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 7 Aug 2019 13:58:44 -0400
Subject: [PATCH 0954/1648] Use cached transaction_metadata in apply_block if
 available

---
 libraries/chain/controller.cpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index e4fe1137cab..5f07956b8f9 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1730,10 +1730,13 @@ struct controller_impl {
          auto producer_block_id = b->id();
          start_block( b->timestamp, b->confirmed, new_protocol_feature_activations, s, producer_block_id);
 
+         const bool existing_trxs_metas = !bsp->trxs.empty();
          std::vector<recover_keys_future> trx_futures;
          std::vector<transaction_metadata_ptr> trx_metas;
          const bool skip_auth_checks = self.skip_auth_check();
-         if( skip_auth_checks ) {
+         if( existing_trxs_metas ) {
+            trx_metas = std::move( bsp->trxs );
+         } else if( skip_auth_checks ) {
             trx_metas.reserve( b->transactions.size() );
             for( const auto& receipt : b->transactions ) {
                if( receipt.trx.contains<packed_transaction>()) {
@@ -1759,7 +1762,7 @@ struct controller_impl {
             const auto& trx_receipts = pending->_block_stage.get<building_block>()._pending_trx_receipts;
             auto num_pending_receipts = trx_receipts.size();
             if( receipt.trx.contains<packed_transaction>() ) {
-               if( skip_auth_checks ) {
+               if( skip_auth_checks || existing_trxs_metas ) {
                   trace = push_transaction( trx_metas.at( packed_idx++ ), fc::time_point::maximum(), receipt.cpu_usage_us, true );
                } else {
                   trace = push_transaction( trx_futures.at( packed_idx++ ).get(), fc::time_point::maximum(), receipt.cpu_usage_us, true );
@@ -1799,18 +1802,9 @@ struct controller_impl {
          EOS_ASSERT( producer_block_id == ab._id, block_validate_exception, "Block ID does not match",
                      ("producer_block_id",producer_block_id)("validator_block_id",ab._id) );
 
-         auto bsp = std::make_shared<block_state>(
-                        std::move( ab._pending_block_header_state ),
-                        b,
-                        std::move( ab._trx_metas ),
-                        protocol_features.get_protocol_feature_set(),
-                        []( block_timestamp_type timestamp,
-                            const flat_set<digest_type>& cur_features,
-                            const vector<digest_type>& new_features )
-                        {}, // validation of any new protocol features should have already occurred prior to apply_block
-                        true // signature should have already been verified (assuming untrusted) prior to apply_block
-                    );
-
+         // create completed block with existing block_state along with newly created transaction_metadata as
+         // the newly created may contain recovered keys
+         bsp->trxs = std::move( ab._trx_metas );
          pending->_block_stage = completed_block{ bsp };
 
          commit_block(false);

From 32b82081a988827d9f9c54d91f5ecefb14501051 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 7 Aug 2019 15:48:05 -0400
Subject: [PATCH 0955/1648] Test with calling accept_transaction on net thread

---
 plugins/net_plugin/net_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 45674b00ac1..ac78011c602 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2811,9 +2811,9 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( trx );
-      app().post( priority::low, [trx, weak = weak_from_this()]() {
+//      app().post( priority::low, [trx, weak = weak_from_this()]() {
          my_impl->chain_plug->accept_transaction( trx,
-            [weak, trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak = weak_from_this(), trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2843,7 +2843,7 @@ namespace eosio {
                conn->trx_in_progress_size -= calc_trx_size( trx );
             }
          });
-        });
+//        });
       });
    }
 

From a3028d15c239f0372cbbd45be17a6fae1100d374 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 7 Aug 2019 17:23:02 -0400
Subject: [PATCH 0956/1648] Revert "Test with calling accept_transaction on net
 thread"

This reverts commit 32b82081a988827d9f9c54d91f5ecefb14501051.
---
 plugins/net_plugin/net_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ac78011c602..45674b00ac1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2811,9 +2811,9 @@ namespace eosio {
       }
 
       trx_in_progress_size += calc_trx_size( trx );
-//      app().post( priority::low, [trx, weak = weak_from_this()]() {
+      app().post( priority::low, [trx, weak = weak_from_this()]() {
          my_impl->chain_plug->accept_transaction( trx,
-            [weak = weak_from_this(), trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
+            [weak, trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) {
          // next (this lambda) called from application thread
          bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
@@ -2843,7 +2843,7 @@ namespace eosio {
                conn->trx_in_progress_size -= calc_trx_size( trx );
             }
          });
-//        });
+        });
       });
    }
 

From e13fd02dc4074af13770102dd6cd435a681dcc5a Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 7 Aug 2019 20:49:13 -0400
Subject: [PATCH 0957/1648] unit test ensuring that OOB table init allowed on
 set code; fails on action

Out of bound table elements are accepted during setcode but then fail later when the wasm module is actually instantiated when an action is executed. This is arguably the correct behavior when viewed from the standpoint of the wasm spec. However, it's probably not what we intended -- OOB memory init is caught during setcode.

Regardless, this goof isn't really a problem. But, this goof is now consensus. So add a unit test for this goofy behavior.
---
 unittests/contracts/test_wasts.hpp | 32 +++++++++++++++++++++++++
 unittests/wasm_tests.cpp           | 38 ++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/unittests/contracts/test_wasts.hpp b/unittests/contracts/test_wasts.hpp
index 1f9f3facab6..7929f9c4d32 100644
--- a/unittests/contracts/test_wasts.hpp
+++ b/unittests/contracts/test_wasts.hpp
@@ -439,6 +439,38 @@ static const char table_checker_small_wast[] = R"=====(
 )
 )=====";
 
+static const char table_init_oob_wast[] = R"=====(
+(module
+ (type $mahsig (func (param i64) (param i64) (param i64)))
+ (table 1024 anyfunc)
+ (export "apply" (func $apply))
+ (func $apply (param $0 i64) (param $1 i64) (param $2 i64)
+ )
+ (elem (i32.const 1024) $apply)
+)
+)=====";
+
+static const char table_init_oob_smaller_wast[] = R"=====(
+(module
+ (type $mahsig (func (param i64) (param i64) (param i64)))
+ (table 620 anyfunc)
+ (export "apply" (func $apply))
+ (func $apply (param $0 i64) (param $1 i64) (param $2 i64)
+ )
+ (elem (i32.const 700) $apply)
+)
+)=====";
+
+static const char table_init_oob_no_table_wast[] = R"=====(
+(module
+ (type $mahsig (func (param i64) (param i64) (param i64)))
+ (export "apply" (func $apply))
+ (func $apply (param $0 i64) (param $1 i64) (param $2 i64)
+ )
+ (elem (i32.const 0) $apply)
+)
+)=====";
+
 static const char global_protection_none_get_wast[] = R"=====(
 (module
  (export "apply" (func $apply))
diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index cdbd56c64cb..6fac820d6fd 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -686,6 +686,44 @@ BOOST_FIXTURE_TEST_CASE( table_init_tests, TESTER ) try {
 
 } FC_LOG_AND_RETHROW()
 
+BOOST_FIXTURE_TEST_CASE( table_init_oob, TESTER ) try {
+   create_accounts( {N(tableinitoob)} );
+   produce_block();
+
+   signed_transaction trx;
+   trx.actions.emplace_back(vector<permission_level>{{N(tableinitoob),config::active_name}}, N(tableinitoob), N(), bytes{});
+   trx.actions[0].authorization = vector<permission_level>{{N(tableinitoob),config::active_name}};
+
+    auto pushit_and_expect_fail = [&]() {
+      produce_block();
+      trx.signatures.clear();
+      set_transaction_headers(trx);
+      trx.sign(get_private_key(N(tableinitoob), "active"), control->get_chain_id());
+      
+      //the unspecified_exception_code comes from WAVM, which manages to throw a WAVM specific exception
+      // up to where exec_one captures it and doesn't understand it
+      BOOST_CHECK_EXCEPTION(push_transaction(trx), fc::exception, [](auto& e) {
+         return e.code() == unspecified_exception_code || e.code() == wasm_execution_error::code_value;
+      });
+   };
+
+   set_code(N(tableinitoob), table_init_oob_wast);
+   produce_block();
+
+   pushit_and_expect_fail();
+   //make sure doing it again didn't lodge something funky in to a cache
+   pushit_and_expect_fail();
+
+   set_code(N(tableinitoob), table_init_oob_smaller_wast);
+   produce_block();
+   pushit_and_expect_fail();
+   pushit_and_expect_fail();
+
+   //an elem w/o a table is a setcode fail though
+   BOOST_CHECK_THROW(set_code(N(tableinitoob), table_init_oob_no_table_wast), eosio::chain::wasm_exception);
+
+} FC_LOG_AND_RETHROW()
+
 BOOST_FIXTURE_TEST_CASE( memory_init_border, TESTER ) try {
    produce_blocks(2);
 

From 005bcec35604378a11d9558c55f7495f07a4040a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 10:54:57 -0400
Subject: [PATCH 0958/1648] Add std::_Exit() for bad_alloc handling

---
 plugins/chain_plugin/chain_plugin.cpp              | 14 ++++++++++++++
 .../include/eosio/chain_plugin/chain_plugin.hpp    |  1 +
 2 files changed, 15 insertions(+)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 50a36d4d225..18166d3a630 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1264,6 +1264,12 @@ void chain_plugin::handle_db_exhaustion() {
    std::_Exit(1);
 }
 
+void chain_plugin::handle_bad_alloc() {
+   elog("std::bad_alloc - memory exhausted");
+   //return -2 -- it's what programs/nodeos/main.cpp reports for std::exception
+   std::_Exit(-2);
+}
+
 namespace chain_apis {
 
 const string read_only::KEYi64 = "i64";
@@ -1893,6 +1899,8 @@ void read_write::push_block(read_write::push_block_params&& params, next_functio
       next(read_write::push_block_results{});
    } catch ( boost::interprocess::bad_alloc& ) {
       chain_plugin::handle_db_exhaustion();
+   } catch ( const std::bad_alloc& ) {
+      chain_plugin::handle_bad_alloc();
    } CATCH_AND_CALL(next);
 }
 
@@ -1974,6 +1982,8 @@ void read_write::push_transaction(const read_write::push_transaction_params& par
       });
    } catch ( boost::interprocess::bad_alloc& ) {
       chain_plugin::handle_db_exhaustion();
+   } catch ( const std::bad_alloc& ) {
+      chain_plugin::handle_bad_alloc();
    } CATCH_AND_CALL(next);
 }
 
@@ -2008,6 +2018,8 @@ void read_write::push_transactions(const read_write::push_transactions_params& p
       push_recurse(this, 0, params_copy, result, next);
    } catch ( boost::interprocess::bad_alloc& ) {
       chain_plugin::handle_db_exhaustion();
+   } catch ( const std::bad_alloc& ) {
+      chain_plugin::handle_bad_alloc();
    } CATCH_AND_CALL(next);
 }
 
@@ -2043,6 +2055,8 @@ void read_write::send_transaction(const read_write::send_transaction_params& par
       });
    } catch ( boost::interprocess::bad_alloc& ) {
       chain_plugin::handle_db_exhaustion();
+   } catch ( const std::bad_alloc& ) {
+      chain_plugin::handle_bad_alloc();
    } CATCH_AND_CALL(next);
 }
 
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 122b7c8e826..bfc2e7cf55f 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -720,6 +720,7 @@ class chain_plugin : public plugin<chain_plugin> {
    void do_hard_replay(const variables_map& options);
 
    static void handle_db_exhaustion();
+   static void handle_bad_alloc();
 private:
    static void log_guard_exception(const chain::guard_exception& e);
 

From b38471dbcf6c0d97280bb11cd7bd91a5695e07b5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 10:56:09 -0400
Subject: [PATCH 0959/1648] Add handling of bad_alloc and return of failed if
 app quit during start_block

---
 plugins/producer_plugin/producer_plugin.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 9c6be6fe25b..31f4bb85818 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -49,8 +49,7 @@ using boost::signals2::scoped_connection;
    catch ( const guard_exception& e ) { \
       chain_plugin::handle_guard_exception(e); \
    } catch ( const std::bad_alloc& ) { \
-      elog( "std::bad_alloc" ); \
-      throw; \
+      chain_plugin::handle_bad_alloc(); \
    } catch ( boost::interprocess::bad_alloc& ) { \
       chain_plugin::handle_db_exhaustion(); \
    } catch( fc::exception& er ) { \
@@ -372,9 +371,10 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          } catch( const fc::exception& e ) {
             elog((e.to_detail_string()));
             except = true;
+         } catch ( const std::bad_alloc& ) {
+            chain_plugin::handle_bad_alloc();
          } catch ( boost::interprocess::bad_alloc& ) {
             chain_plugin::handle_db_exhaustion();
-            return;
          }
 
          if( except ) {
@@ -549,6 +549,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             chain_plugin::handle_guard_exception(e);
          } catch ( boost::interprocess::bad_alloc& ) {
             chain_plugin::handle_db_exhaustion();
+         } catch ( std::bad_alloc& ) {
+            chain_plugin::handle_bad_alloc();
          } CATCH_AND_CALL(send_response);
       }
 
@@ -1666,6 +1668,8 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
          }
 
+         if( app().is_quiting() ) // db guard exception above in LOG_AND_DROP could have called app().quit()
+            return start_block_result::failed;
          if (exhausted || preprocess_deadline <= fc::time_point::now()) {
             return start_block_result::exhausted;
          } else {
@@ -1687,9 +1691,10 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
       } catch ( const guard_exception& e ) {
          chain_plugin::handle_guard_exception(e);
          return start_block_result::failed;
+      } catch ( std::bad_alloc& ) {
+         chain_plugin::handle_bad_alloc();
       } catch ( boost::interprocess::bad_alloc& ) {
          chain_plugin::handle_db_exhaustion();
-         return start_block_result::failed;
       }
 
    }

From 30d2762235e94ae3f8314a75b25ef62e863667b2 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 8 Aug 2019 16:14:03 -0400
Subject: [PATCH 0960/1648] when WAVM throws exception during module
 instantiation, rethrow eosio exception

---
 libraries/chain/webassembly/wavm.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/webassembly/wavm.cpp b/libraries/chain/webassembly/wavm.cpp
index b84205b7882..604465e5023 100644
--- a/libraries/chain/webassembly/wavm.cpp
+++ b/libraries/chain/webassembly/wavm.cpp
@@ -144,12 +144,17 @@ std::unique_ptr<wasm_instantiated_module_interface> wavm_runtime::instantiate_mo
       EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
    }
 
-   eosio::chain::webassembly::common::root_resolver resolver;
-   LinkResult link_result = linkModule(*module, resolver);
-   ModuleInstance *instance = instantiateModule(*module, std::move(link_result.resolvedImports));
-   EOS_ASSERT(instance != nullptr, wasm_exception, "Fail to Instantiate WAVM Module");
+   try {
+      eosio::chain::webassembly::common::root_resolver resolver;
+      LinkResult link_result = linkModule(*module, resolver);
+      ModuleInstance *instance = instantiateModule(*module, std::move(link_result.resolvedImports));
+      EOS_ASSERT(instance != nullptr, wasm_exception, "Fail to Instantiate WAVM Module");
 
-   return std::make_unique<wavm_instantiated_module>(instance, std::move(module), initial_memory);
+      return std::make_unique<wavm_instantiated_module>(instance, std::move(module), initial_memory);
+   }
+   catch(const Runtime::Exception& e) {
+      EOS_THROW(wasm_execution_error, "Failed to stand up WAVM instance: ${m}", ("m", describeExceptionCause(e.cause)));
+   }
 }
 
 void wavm_runtime::immediately_exit_currently_running_module() {

From fc17f10c29a61c8b632de8cfbef2218b5de3086a Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 8 Aug 2019 16:15:21 -0400
Subject: [PATCH 0961/1648] no longer consider unspecified exceptions
 acceptable for table_init_oob

---
 unittests/wasm_tests.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index 6fac820d6fd..a1f98646394 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -702,9 +702,7 @@ BOOST_FIXTURE_TEST_CASE( table_init_oob, TESTER ) try {
       
       //the unspecified_exception_code comes from WAVM, which manages to throw a WAVM specific exception
       // up to where exec_one captures it and doesn't understand it
-      BOOST_CHECK_EXCEPTION(push_transaction(trx), fc::exception, [](auto& e) {
-         return e.code() == unspecified_exception_code || e.code() == wasm_execution_error::code_value;
-      });
+      BOOST_CHECK_THROW(push_transaction(trx), eosio::chain::wasm_execution_error);
    };
 
    set_code(N(tableinitoob), table_init_oob_wast);

From ebc92806fa22592f28015a2763a4ebd71c320bfb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 17:11:22 -0400
Subject: [PATCH 0962/1648] Use c-file functions for read/write of block log
 instead of fstream

---
 libraries/chain/block_log.cpp | 258 ++++++++++++++++++++++++++--------
 1 file changed, 200 insertions(+), 58 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index d979b087fbf..1d8bc80f802 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -7,6 +7,8 @@
 #include <fstream>
 #include <fc/bitutil.hpp>
 #include <fc/io/raw.hpp>
+#include <cstdio>
+#include <stdio.h>
 
 #define LOG_READ  (std::ios::in | std::ios::binary)
 #define LOG_WRITE (std::ios::out | std::ios::binary | std::ios::app)
@@ -27,14 +29,155 @@ namespace eosio { namespace chain {
    namespace detail {
       using unique_file = std::unique_ptr<FILE, decltype(&fclose)>;
 
+      class cfile_datastream;
+
+      class cfile {
+      public:
+         explicit cfile()
+         : _file(nullptr, &fclose)
+         {}
+
+         void set_file_path( fc::path file_path ) {
+            _file_path = std::move( file_path );
+         }
+
+         fc::path get_file_path() const {
+            return _file_path;
+         }
+
+         bool is_open() const { return _open; }
+
+         size_t file_size() const {
+            return fc::file_size( _file_path );
+         }
+
+         void open_for_append() {
+            _file.reset( fopen( _file_path.generic_string().c_str(), "ab+" ) );
+            if( !_file ) {
+               throw std::runtime_error( "cfile unable to open: " +  _file_path.generic_string() );
+            }
+            _open = true;
+         }
+
+         void open_for_rw() {
+            _file.reset( fopen( _file_path.generic_string().c_str(), "rb+" ) );
+            if( !_file ) {
+               throw std::runtime_error( "cfile unable to open: " +  _file_path.generic_string() );
+            }
+            _open = true;
+         }
+
+         uint64_t tellp() const {
+            return ftell( _file.get() );
+         }
+
+         uint64_t tellg() const {
+            fpos_t pos;
+            if( 0 != ::fgetpos( _file.get(), &pos ) ) {
+               throw std::runtime_error( "cfile: " + _file_path.generic_string() + " unable to fgetpos" );
+            }
+            return pos;
+         }
+
+         void seek( long loc ) {
+            if( 0 != fseek( _file.get(), loc, SEEK_SET ) ) {
+               throw std::runtime_error( "cfile: " + _file_path.generic_string() +
+                  " unable to SEEK_SET to: " + std::to_string(loc) );
+            }
+         }
+
+         void seek_end( long loc ) {
+            if( 0 != fseek( _file.get(), loc, SEEK_END ) ) {
+               throw std::runtime_error( "cfile: " + _file_path.generic_string() +
+                  " unable to SEEK_END to: " + std::to_string(loc) );
+            }
+         }
+
+         void read( char* d, size_t n ) {
+            size_t result = fread( d, 1, n, _file.get() );
+            if( result != n ) {
+               throw std::runtime_error( "cfile: " + _file_path.generic_string() +
+                  " unable to read " + std::to_string( n ) + " only read " + std::to_string( result ) );
+            }
+         }
+
+         void write( const char* d, size_t n ) {
+            size_t result = fwrite( d, 1, n, _file.get() );
+            if( result != n ) {
+               throw std::runtime_error( "cfile: " + _file_path.generic_string() +
+                  " unable to write " + std::to_string( n ) + " only wrote " + std::to_string( result ) );
+            }
+         }
+
+         void flush() {
+            if( 0 != fflush( _file.get() ) ) {
+               throw std::runtime_error( "cfile: " + _file_path.generic_string() + " unable to flush file." );
+            }
+         }
+
+         void close() {
+            _file.reset();
+            _open = false;
+         }
+
+         void remove() {
+            if( _open ) {
+               throw std::runtime_error( "cfile: " + _file_path.generic_string() + " Unable to remove as file is open" );
+            }
+            fc::remove_all( _file_path );
+         }
+
+         cfile_datastream create_datastream();
+
+      private:
+         bool          _open = false;
+         fc::path      _file_path;
+         unique_file   _file;
+      };
+
+      /*
+       *  @brief datastream adapter that adapts cfile for use with fc unpack
+       *
+       *  This class supports unpack functionality but not pack.
+       */
+      class cfile_datastream {
+      public:
+         explicit cfile_datastream( cfile& cf ) : cf(cf) {}
+
+         void skip( size_t s ) {
+            std::vector<char> d( s );
+            read( &d[0], s );
+         }
+
+         bool read( char* d, size_t s ) {
+            cf.read( d, s );
+            return true;
+         }
+
+         bool get( unsigned char& c ) {
+            char cc;
+            cf.read(&cc, 1);
+            c = cc;
+            return true;
+         }
+
+         bool get( char& c ) { return read(&c, 1); }
+
+      private:
+         cfile& cf;
+      };
+
+      inline cfile_datastream cfile::create_datastream() {
+         return cfile_datastream(*this);
+      }
+
+
       class block_log_impl {
          public:
             signed_block_ptr         head;
             block_id_type            head_id;
-            std::fstream             block_stream;
-            std::fstream             index_stream;
-            fc::path                 block_file;
-            fc::path                 index_file;
+            cfile                    block_file;
+            cfile                    index_file;
             bool                     open_files = false;
             bool                     genesis_written_to_block_log = false;
             uint32_t                 version = 0;
@@ -48,10 +191,10 @@ namespace eosio { namespace chain {
             void reopen();
 
             void close() {
-               if( block_stream.is_open() )
-                  block_stream.close();
-               if( index_stream.is_open() )
-                  index_stream.close();
+               if( block_file.is_open() )
+                  block_file.close();
+               if( index_file.is_open() )
+                  index_file.close();
                open_files = false;
             }
       };
@@ -61,13 +204,13 @@ namespace eosio { namespace chain {
 
          // open to create files if they don't exist
          //ilog("Opening block log at ${path}", ("path", my->block_file.generic_string()));
-         block_stream.open(block_file.generic_string().c_str(), LOG_WRITE);
-         index_stream.open(index_file.generic_string().c_str(), LOG_WRITE);
+         block_file.open_for_append();
+         index_file.open_for_append();
 
          close();
 
-         block_stream.open(block_file.generic_string().c_str(), LOG_RW);
-         index_stream.open(index_file.generic_string().c_str(), LOG_RW);
+         block_file.open_for_rw();
+         index_file.open_for_rw();
 
          open_files = true;
       }
@@ -129,8 +272,6 @@ namespace eosio { namespace chain {
 
    block_log::block_log(const fc::path& data_dir)
    :my(new detail::block_log_impl()) {
-      my->block_stream.exceptions(std::fstream::failbit | std::fstream::badbit);
-      my->index_stream.exceptions(std::fstream::failbit | std::fstream::badbit);
       open(data_dir);
    }
 
@@ -152,8 +293,8 @@ namespace eosio { namespace chain {
       if (!fc::is_directory(data_dir))
          fc::create_directories(data_dir);
 
-      my->block_file = data_dir / "blocks.log";
-      my->index_file = data_dir / "blocks.index";
+      my->block_file.set_file_path( data_dir / "blocks.log" );
+      my->index_file.set_file_path( data_dir / "blocks.index" );
 
       my->reopen();
 
@@ -175,14 +316,14 @@ namespace eosio { namespace chain {
        *  - If the index file head is not in the log file, delete the index and replay.
        *  - If the index file head is in the log, but not up to date, replay from index head.
        */
-      auto log_size = fc::file_size(my->block_file);
-      auto index_size = fc::file_size(my->index_file);
+      auto log_size = my->block_file.file_size();
+      auto index_size = my->index_file.file_size();
 
       if (log_size) {
          ilog("Log is nonempty");
-         my->block_stream.seekg( 0 );
+         my->block_file.seek( 0 );
          my->version = 0;
-         my->block_stream.read( (char*)&my->version, sizeof(my->version) );
+         my->block_file.read( (char*)&my->version, sizeof(my->version) );
          EOS_ASSERT( my->version > 0, block_log_exception, "Block log was not setup properly" );
          EOS_ASSERT( my->version >= min_supported_version && my->version <= max_supported_version, block_log_unsupported_version,
                  "Unsupported version of block log. Block log version is ${version} while code supports version(s) [${min},${max}]",
@@ -192,7 +333,7 @@ namespace eosio { namespace chain {
          my->genesis_written_to_block_log = true; // Assume it was constructed properly.
          if (my->version > 1){
             my->first_block_num = 0;
-            my->block_stream.read( (char*)&my->first_block_num, sizeof(my->first_block_num) );
+            my->block_file.read( (char*)&my->first_block_num, sizeof(my->first_block_num) );
             EOS_ASSERT(my->first_block_num > 0, block_log_exception, "Block log is malformed, first recorded block number is 0 but must be greater than or equal to 1");
          } else {
             my->first_block_num = 1;
@@ -208,12 +349,12 @@ namespace eosio { namespace chain {
          if (index_size) {
             ilog("Index is nonempty");
             uint64_t block_pos;
-            my->block_stream.seekg(-sizeof(uint64_t), std::ios::end);
-            my->block_stream.read((char*)&block_pos, sizeof(block_pos));
+            my->block_file.seek_end(-sizeof(uint64_t));
+            my->block_file.read((char*)&block_pos, sizeof(block_pos));
 
             uint64_t index_pos;
-            my->index_stream.seekg(-sizeof(uint64_t), std::ios::end);
-            my->index_stream.read((char*)&index_pos, sizeof(index_pos));
+            my->index_file.seek_end(-sizeof(uint64_t));
+            my->index_file.read((char*)&index_pos, sizeof(index_pos));
 
             if (block_pos < index_pos) {
                ilog("block_pos < index_pos, close and reopen index_stream");
@@ -229,7 +370,7 @@ namespace eosio { namespace chain {
       } else if (index_size) {
          ilog("Index is nonempty, remove and recreate it");
          my->close();
-         fc::remove_all(my->index_file);
+         my->index_file.remove();
          my->reopen();
       }
    }
@@ -240,18 +381,18 @@ namespace eosio { namespace chain {
 
          my->check_open_files();
 
-         my->block_stream.seekp(0, std::ios::end);
-         my->index_stream.seekp(0, std::ios::end);
-         uint64_t pos = my->block_stream.tellp();
-         EOS_ASSERT(my->index_stream.tellp() == sizeof(uint64_t) * (b->block_num() - my->first_block_num),
+         my->block_file.seek_end(0);
+         my->index_file.seek_end(0);
+         uint64_t pos = my->block_file.tellp();
+         EOS_ASSERT(my->index_file.tellp() == sizeof(uint64_t) * (b->block_num() - my->first_block_num),
                    block_log_append_fail,
                    "Append to index file occuring at wrong position.",
-                   ("position", (uint64_t) my->index_stream.tellp())
+                   ("position", (uint64_t) my->index_file.tellp())
                    ("expected", (b->block_num() - my->first_block_num) * sizeof(uint64_t)));
          auto data = fc::raw::pack(*b);
-         my->block_stream.write(data.data(), data.size());
-         my->block_stream.write((char*)&pos, sizeof(pos));
-         my->index_stream.write((char*)&pos, sizeof(pos));
+         my->block_file.write(data.data(), data.size());
+         my->block_file.write((char*)&pos, sizeof(pos));
+         my->index_file.write((char*)&pos, sizeof(pos));
          my->head = b;
          my->head_id = b->id();
 
@@ -263,30 +404,30 @@ namespace eosio { namespace chain {
    }
 
    void block_log::flush() {
-      my->block_stream.flush();
-      my->index_stream.flush();
+      my->block_file.flush();
+      my->index_file.flush();
    }
 
    void block_log::reset( const genesis_state& gs, const signed_block_ptr& first_block, uint32_t first_block_num ) {
       my->close();
 
-      fc::remove_all(my->block_file);
-      fc::remove_all(my->index_file);
+      my->block_file.remove();
+      my->index_file.remove();
 
       my->reopen();
 
       auto data = fc::raw::pack(gs);
       my->version = 0; // version of 0 is invalid; it indicates that the genesis was not properly written to the block log
       my->first_block_num = first_block_num;
-      my->block_stream.seekp(0, std::ios::end);
-      my->block_stream.write((char*)&my->version, sizeof(my->version));
-      my->block_stream.write((char*)&my->first_block_num, sizeof(my->first_block_num));
-      my->block_stream.write(data.data(), data.size());
+      my->block_file.seek_end(0);
+      my->block_file.write((char*)&my->version, sizeof(my->version));
+      my->block_file.write((char*)&my->first_block_num, sizeof(my->first_block_num));
+      my->block_file.write(data.data(), data.size());
       my->genesis_written_to_block_log = true;
 
       // append a totem to indicate the division between blocks and header
       auto totem = npos;
-      my->block_stream.write((char*)&totem, sizeof(totem));
+      my->block_file.write((char*)&totem, sizeof(totem));
 
       if (first_block) {
          append(first_block);
@@ -295,24 +436,25 @@ namespace eosio { namespace chain {
          my->head_id = {};
       }
 
-      auto pos = my->block_stream.tellp();
+      auto pos = my->block_file.tellp();
 
       static_assert( block_log::max_supported_version > 0, "a version number of zero is not supported" );
       my->version = block_log::max_supported_version;
-      my->block_stream.seekp( 0 );
-      my->block_stream.write( (char*)&my->version, sizeof(my->version) );
-      my->block_stream.seekp( pos );
+      my->block_file.seek( 0 );
+      my->block_file.write( (char*)&my->version, sizeof(my->version) );
+      my->block_file.seek( pos );
       flush();
    }
 
    std::pair<signed_block_ptr, uint64_t> block_log::read_block(uint64_t pos)const {
       my->check_open_files();
 
-      my->block_stream.seekg(pos);
+      my->block_file.seek(pos);
       std::pair<signed_block_ptr,uint64_t> result;
       result.first = std::make_shared<signed_block>();
-      fc::raw::unpack(my->block_stream, *result.first);
-      result.second = uint64_t(my->block_stream.tellg()) + 8;
+      auto ds = my->block_file.create_datastream();
+      fc::raw::unpack(ds, *result.first);
+      result.second = uint64_t(my->block_file.tellg()) + 8;
       return result;
    }
 
@@ -333,9 +475,9 @@ namespace eosio { namespace chain {
       my->check_open_files();
       if (!(my->head && block_num <= block_header::num_from_id(my->head_id) && block_num >= my->first_block_num))
          return npos;
-      my->index_stream.seekg(sizeof(uint64_t) * (block_num - my->first_block_num));
+      my->index_file.seek(sizeof(uint64_t) * (block_num - my->first_block_num));
       uint64_t pos;
-      my->index_stream.read((char*)&pos, sizeof(pos));
+      my->index_file.read((char*)&pos, sizeof(pos));
       return pos;
    }
 
@@ -345,12 +487,12 @@ namespace eosio { namespace chain {
       uint64_t pos;
 
       // Check that the file is not empty
-      my->block_stream.seekg(0, std::ios::end);
-      if (my->block_stream.tellg() <= sizeof(pos))
+      my->block_file.seek_end(0);
+      if (my->block_file.tellg() <= sizeof(pos))
          return {};
 
-      my->block_stream.seekg(-sizeof(pos), std::ios::end);
-      my->block_stream.read((char*)&pos, sizeof(pos));
+      my->block_file.seek_end(-sizeof(pos));
+      my->block_file.read((char*)&pos, sizeof(pos));
       if (pos != npos) {
          return read_block(pos).first;
       } else {
@@ -370,14 +512,14 @@ namespace eosio { namespace chain {
       ilog("Reconstructing Block Log Index...");
       my->close();
 
-      fc::remove_all(my->index_file);
+      my->index_file.remove();
 
       my->reopen();
 
 
       my->close();
 
-      block_log::construct_index(my->block_file, my->index_file);
+      block_log::construct_index(my->block_file.get_file_path(), my->index_file.get_file_path());
 
       my->reopen();
    } // construct_index

From 24581637cb4d97a2e5a62ed076c1079cc03318f4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 17:19:05 -0400
Subject: [PATCH 0963/1648] Add logs for timing

---
 libraries/chain/block_log.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 1d8bc80f802..3128324a730 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -377,6 +377,7 @@ namespace eosio { namespace chain {
 
    uint64_t block_log::append(const signed_block_ptr& b) {
       try {
+         elog( "start append" );
          EOS_ASSERT( my->genesis_written_to_block_log, block_log_append_fail, "Cannot append to block log until the genesis is first written" );
 
          my->check_open_files();
@@ -389,15 +390,20 @@ namespace eosio { namespace chain {
                    "Append to index file occuring at wrong position.",
                    ("position", (uint64_t) my->index_file.tellp())
                    ("expected", (b->block_num() - my->first_block_num) * sizeof(uint64_t)));
+         elog( "before pack" );
          auto data = fc::raw::pack(*b);
+         elog( "after pack, before write" );
          my->block_file.write(data.data(), data.size());
          my->block_file.write((char*)&pos, sizeof(pos));
          my->index_file.write((char*)&pos, sizeof(pos));
          my->head = b;
          my->head_id = b->id();
 
+         elog( "after write, before flush" );
          flush();
+         elog( "after flush" );
 
+         elog( "end append" );
          return pos;
       }
       FC_LOG_AND_RETHROW()

From 01be54999589693a0757053a31c6b7e5ef773a1a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 17:36:09 -0400
Subject: [PATCH 0964/1648] Fix type mismatch

---
 libraries/chain/block_log.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 3128324a730..6dd38e812dc 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -67,11 +67,11 @@ namespace eosio { namespace chain {
             _open = true;
          }
 
-         uint64_t tellp() const {
+         long tellp() const {
             return ftell( _file.get() );
          }
 
-         uint64_t tellg() const {
+         long tellg() const {
             fpos_t pos;
             if( 0 != ::fgetpos( _file.get(), &pos ) ) {
                throw std::runtime_error( "cfile: " + _file_path.generic_string() + " unable to fgetpos" );

From 4fd85944fda1f04ce4400369649f5fce014ff11d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 17:59:54 -0400
Subject: [PATCH 0965/1648] Make tellg same as tellp

---
 libraries/chain/block_log.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 6dd38e812dc..c7acfa0758b 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -72,11 +72,12 @@ namespace eosio { namespace chain {
          }
 
          long tellg() const {
-            fpos_t pos;
-            if( 0 != ::fgetpos( _file.get(), &pos ) ) {
-               throw std::runtime_error( "cfile: " + _file_path.generic_string() + " unable to fgetpos" );
-            }
-            return pos;
+            return tellp();
+//            fpos_t pos;
+//            if( 0 != ::fgetpos( _file.get(), &pos ) ) {
+//               throw std::runtime_error( "cfile: " + _file_path.generic_string() + " unable to fgetpos" );
+//            }
+//            return pos;
          }
 
          void seek( long loc ) {

From 4ec2c55280a325d5a62c0f19a2148775173f04e6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 20:26:01 -0400
Subject: [PATCH 0966/1648] Remove extra logging

---
 libraries/chain/block_log.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index c7acfa0758b..29c396baf1d 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -378,7 +378,6 @@ namespace eosio { namespace chain {
 
    uint64_t block_log::append(const signed_block_ptr& b) {
       try {
-         elog( "start append" );
          EOS_ASSERT( my->genesis_written_to_block_log, block_log_append_fail, "Cannot append to block log until the genesis is first written" );
 
          my->check_open_files();
@@ -391,20 +390,15 @@ namespace eosio { namespace chain {
                    "Append to index file occuring at wrong position.",
                    ("position", (uint64_t) my->index_file.tellp())
                    ("expected", (b->block_num() - my->first_block_num) * sizeof(uint64_t)));
-         elog( "before pack" );
          auto data = fc::raw::pack(*b);
-         elog( "after pack, before write" );
          my->block_file.write(data.data(), data.size());
          my->block_file.write((char*)&pos, sizeof(pos));
          my->index_file.write((char*)&pos, sizeof(pos));
          my->head = b;
          my->head_id = b->id();
 
-         elog( "after write, before flush" );
          flush();
-         elog( "after flush" );
 
-         elog( "end append" );
          return pos;
       }
       FC_LOG_AND_RETHROW()

From 4ed6785a92c4874e19c35a87294a9e4e0296e9dc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 20:38:12 -0400
Subject: [PATCH 0967/1648] Remove tellg as it was not needed. Also read_block
 no longer returns a pair as .second was not used.

---
 libraries/chain/block_log.cpp                 | 23 +++++--------------
 .../chain/include/eosio/chain/block_log.hpp   |  2 +-
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 29c396baf1d..a9d487d17d3 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -71,15 +71,6 @@ namespace eosio { namespace chain {
             return ftell( _file.get() );
          }
 
-         long tellg() const {
-            return tellp();
-//            fpos_t pos;
-//            if( 0 != ::fgetpos( _file.get(), &pos ) ) {
-//               throw std::runtime_error( "cfile: " + _file_path.generic_string() + " unable to fgetpos" );
-//            }
-//            return pos;
-         }
-
          void seek( long loc ) {
             if( 0 != fseek( _file.get(), loc, SEEK_SET ) ) {
                throw std::runtime_error( "cfile: " + _file_path.generic_string() +
@@ -447,15 +438,13 @@ namespace eosio { namespace chain {
       flush();
    }
 
-   std::pair<signed_block_ptr, uint64_t> block_log::read_block(uint64_t pos)const {
+   signed_block_ptr block_log::read_block(uint64_t pos)const {
       my->check_open_files();
 
       my->block_file.seek(pos);
-      std::pair<signed_block_ptr,uint64_t> result;
-      result.first = std::make_shared<signed_block>();
+      signed_block_ptr result = std::make_shared<signed_block>();
       auto ds = my->block_file.create_datastream();
-      fc::raw::unpack(ds, *result.first);
-      result.second = uint64_t(my->block_file.tellg()) + 8;
+      fc::raw::unpack(ds, *result);
       return result;
    }
 
@@ -464,7 +453,7 @@ namespace eosio { namespace chain {
          signed_block_ptr b;
          uint64_t pos = get_block_pos(block_num);
          if (pos != npos) {
-            b = read_block(pos).first;
+            b = read_block(pos);
             EOS_ASSERT(b->block_num() == block_num, reversible_blocks_exception,
                       "Wrong block was read from block log.", ("returned", b->block_num())("expected", block_num));
          }
@@ -489,13 +478,13 @@ namespace eosio { namespace chain {
 
       // Check that the file is not empty
       my->block_file.seek_end(0);
-      if (my->block_file.tellg() <= sizeof(pos))
+      if (my->block_file.tellp() <= sizeof(pos))
          return {};
 
       my->block_file.seek_end(-sizeof(pos));
       my->block_file.read((char*)&pos, sizeof(pos));
       if (pos != npos) {
-         return read_block(pos).first;
+         return read_block(pos);
       } else {
          return {};
       }
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index c0684d566a6..095cc73c511 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -46,7 +46,7 @@ namespace eosio { namespace chain {
          void flush();
          void reset( const genesis_state& gs, const signed_block_ptr& genesis_block, uint32_t first_block_num = 1 );
 
-         std::pair<signed_block_ptr, uint64_t> read_block(uint64_t file_pos)const;
+         signed_block_ptr read_block(uint64_t file_pos)const;
          signed_block_ptr read_block_by_num(uint32_t block_num)const;
          signed_block_ptr read_block_by_id(const block_id_type& id)const {
             return read_block_by_num(block_header::num_from_id(id));

From 0332b9d5f70a75bf5bc3dd9711a1ce538aff23fb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 8 Aug 2019 22:43:51 -0400
Subject: [PATCH 0968/1648] Improve logging

---
 plugins/producer_plugin/producer_plugin.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index d093248f2ed..db736a5d90e 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -304,8 +304,9 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
       void on_incoming_block(const signed_block_ptr& block) {
          auto id = block->id();
+         auto blk_num = block->block_num();
 
-         fc_dlog(_log, "received incoming block ${id}", ("id", id));
+         fc_dlog(_log, "received incoming block ${n} ${id}", ("n", blk_num)("id", id));
 
          EOS_ASSERT( block->timestamp < (fc::time_point::now() + fc::seconds( 7 )), block_from_the_future,
                      "received a block from the future, ignoring it: ${id}", ("id", id) );
@@ -354,11 +355,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          }
 
 
-         if( fc::time_point::now() - block->timestamp < fc::minutes(5) || (block->block_num() % 1000 == 0) ) {
+         if( fc::time_point::now() - block->timestamp < fc::minutes(5) || (blk_num % 1000 == 0) ) {
             ilog("Received block ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, lib: ${lib}, conf: ${confs}, latency: ${latency} ms]",
-                 ("p",block->producer)("id",fc::variant(block->id()).as_string().substr(8,16))
-                 ("n",block_header::num_from_id(block->id()))("t",block->timestamp)
-                 ("count",block->transactions.size())("lib",chain.last_irreversible_block_num())("confs", block->confirmed)("latency", (fc::time_point::now() - block->timestamp).count()/1000 ) );
+                 ("p",block->producer)("id",id.str().substr(8,16))("n",blk_num)("t",block->timestamp)
+                 ("count",block->transactions.size())("lib",chain.last_irreversible_block_num())
+                 ("confs", block->confirmed)("latency", (fc::time_point::now() - block->timestamp).count()/1000 ) );
          }
       }
 
@@ -1300,7 +1301,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
    if( chain.get_read_mode() == chain::db_read_mode::READ_ONLY )
       return start_block_result::waiting;
 
-   fc_dlog(_log, "Starting block at ${time}", ("time", fc::time_point::now()));
+   fc_dlog(_log, "Starting block ${n} at ${time}", ("n", chain.head_block_num())("time", fc::time_point::now()));
 
    const auto& hbs = chain.head_block_state();
 
@@ -1732,9 +1733,9 @@ void producer_plugin_impl::schedule_production_loop() {
             [&chain,weak_this,cid=++_timer_corelation_id](const boost::system::error_code& ec) {
                auto self = weak_this.lock();
                if( self && ec != boost::asio::error::operation_aborted && cid == self->_timer_corelation_id ) {
-                  fc_dlog( _log, "Produce block timer running at ${time}", ("time", fc::time_point::now()) );
                   // pending_block_state expected, but can't assert inside async_wait
                   auto block_num = chain.is_building_block() ? chain.head_block_num() + 1 : 0;
+                  fc_dlog( _log, "Produce block timer for ${num} running at ${time}", ("num", block_num)("time", fc::time_point::now()) );
                   auto res = self->maybe_produce_block();
                   fc_dlog( _log, "Producing Block #${num} returned: ${res}", ("num", block_num)( "res", res ) );
                }
@@ -1866,7 +1867,7 @@ void producer_plugin_impl::produce_block() {
    _producer_watermarks[new_bs->header.producer] = chain.head_block_num();
 
    ilog("Produced block ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, lib: ${lib}, confirmed: ${confs}]",
-        ("p",new_bs->header.producer)("id",fc::variant(new_bs->id).as_string().substr(0,16))
+        ("p",new_bs->header.producer)("id",new_bs->id.str().substr(0,16))
         ("n",new_bs->block_num)("t",new_bs->header.timestamp)
         ("count",new_bs->block->transactions.size())("lib",chain.last_irreversible_block_num())("confs", new_bs->header.confirmed));
 

From 5b0f6c75c0d804e341e953236bd8e92a3d9132b9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 9 Aug 2019 08:42:16 -0400
Subject: [PATCH 0969/1648] Report correct block num

---
 plugins/producer_plugin/producer_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index db736a5d90e..e5ec7a5782d 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1301,10 +1301,10 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
    if( chain.get_read_mode() == chain::db_read_mode::READ_ONLY )
       return start_block_result::waiting;
 
-   fc_dlog(_log, "Starting block ${n} at ${time}", ("n", chain.head_block_num())("time", fc::time_point::now()));
-
    const auto& hbs = chain.head_block_state();
 
+   fc_dlog(_log, "Starting block ${n} at ${time}", ("n", hbs->block_num + 1)("time", fc::time_point::now()));
+
    //Schedule for the next second's tick regardless of chain state
    // If we would wait less than 50ms (1/10 of block_interval), wait for the whole block interval.
    const fc::time_point now = fc::time_point::now();

From bb1a38a372adf7b8d79522a28d45e9a15af34692 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 9 Aug 2019 13:55:37 -0400
Subject: [PATCH 0970/1648] (appbase) update to get non-option fix & unique_ptr
 tweak

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index 4b95cd33659..f34a3b402b0 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit 4b95cd33659e18bd4f6ea2327202cfa20b09c658
+Subproject commit f34a3b402b0f93d41df850032abdfaca7335172f

From b8ad56affd3df6c72a424fe684c45e0fd20f9adb Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 9 Aug 2019 13:49:39 -0500
Subject: [PATCH 0971/1648] Added another version 2 snapshot to test having a
 pending production schedule.

---
 unittests/snapshots.hpp.in                     |   1 +
 unittests/snapshots/CMakeLists.txt             |   2 ++
 unittests/snapshots/snap_v2_prod_sched.bin.gz  | Bin 0 -> 12897 bytes
 unittests/snapshots/snap_v2_prod_sched.json.gz | Bin 0 -> 38593 bytes
 4 files changed, 3 insertions(+)
 create mode 100644 unittests/snapshots/snap_v2_prod_sched.bin.gz
 create mode 100644 unittests/snapshots/snap_v2_prod_sched.json.gz

diff --git a/unittests/snapshots.hpp.in b/unittests/snapshots.hpp.in
index 291c452199f..aeddec62c19 100644
--- a/unittests/snapshots.hpp.in
+++ b/unittests/snapshots.hpp.in
@@ -15,6 +15,7 @@ namespace eosio {
       struct snapshots {
          // v2
          MAKE_READ_SNAPSHOT(snap_v2)
+         MAKE_READ_SNAPSHOT(snap_v2_prod_sched)
       };
    } /// eosio::testing
 }  /// eosio
diff --git a/unittests/snapshots/CMakeLists.txt b/unittests/snapshots/CMakeLists.txt
index f22b0f72d2e..8b7b147e494 100644
--- a/unittests/snapshots/CMakeLists.txt
+++ b/unittests/snapshots/CMakeLists.txt
@@ -1,2 +1,4 @@
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v2.bin.gz ${CMAKE_CURRENT_BINARY_DIR}/snap_v2.bin.gz COPYONLY )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v2.json.gz  ${CMAKE_CURRENT_BINARY_DIR}/snap_v2.json.gz  COPYONLY )
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v2_prod_sched.bin.gz ${CMAKE_CURRENT_BINARY_DIR}/snap_v2_prod_sched.bin.gz COPYONLY )
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v2_prod_sched.json.gz  ${CMAKE_CURRENT_BINARY_DIR}/snap_v2_prod_sched.json.gz  COPYONLY )
diff --git a/unittests/snapshots/snap_v2_prod_sched.bin.gz b/unittests/snapshots/snap_v2_prod_sched.bin.gz
new file mode 100644
index 0000000000000000000000000000000000000000..3516218f2164746d0331542e99b3301daf6a8cf1
GIT binary patch
literal 12897
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

literal 0
HcmV?d00001

diff --git a/unittests/snapshots/snap_v2_prod_sched.json.gz b/unittests/snapshots/snap_v2_prod_sched.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6975eedea85b4c042eabd8501428f906c2bb25b2
GIT binary patch
literal 38593
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

literal 0
HcmV?d00001


From f4c76bf6c74b9ecdf1ed130ecfdbfb5b675f5800 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Fri, 9 Aug 2019 16:37:27 -0400
Subject: [PATCH 0972/1648] New branch for eos-vm JIT.

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 8ee33148fb1..8c7c492d616 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 8ee33148fb17f71f93ed9f8afc99b44180e735bc
+Subproject commit 8c7c492d616053cc7404d43eb006c39911488d73

From 753f8b57571fa541d0203ba0f6e226c7b2735b3e Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 9 Aug 2019 17:44:22 -0400
Subject: [PATCH 0973/1648] (chainbase sync) fix build with boost 1.71

---
 libraries/chainbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chainbase b/libraries/chainbase
index b8985af27b8..c6fa8ac0eaf 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit b8985af27b8f66985aeef27879c3d2f92c8cb741
+Subproject commit c6fa8ac0eaf00dc365b7d2d7c26608273c2cbb0d

From fd3e6f942ff13c005cb1cab2dd49c5915edf3c30 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 12 Aug 2019 11:28:47 -0500
Subject: [PATCH 0974/1648] Move cfile to fc

---
 libraries/chain/block_log.cpp | 153 +++-------------------------------
 libraries/fc                  |   2 +-
 2 files changed, 11 insertions(+), 144 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index a9d487d17d3..75b3934060b 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -6,13 +6,15 @@
 #include <eosio/chain/exceptions.hpp>
 #include <fstream>
 #include <fc/bitutil.hpp>
+#include <fc/io/cfile.hpp>
 #include <fc/io/raw.hpp>
-#include <cstdio>
-#include <stdio.h>
+
 
 #define LOG_READ  (std::ios::in | std::ios::binary)
 #define LOG_WRITE (std::ios::out | std::ios::binary | std::ios::app)
 #define LOG_RW ( std::ios::in | std::ios::out | std::ios::binary )
+#define LOG_WRITE_C "ab+"
+#define LOG_RW_C "rb+"
 
 namespace eosio { namespace chain {
 
@@ -29,147 +31,12 @@ namespace eosio { namespace chain {
    namespace detail {
       using unique_file = std::unique_ptr<FILE, decltype(&fclose)>;
 
-      class cfile_datastream;
-
-      class cfile {
-      public:
-         explicit cfile()
-         : _file(nullptr, &fclose)
-         {}
-
-         void set_file_path( fc::path file_path ) {
-            _file_path = std::move( file_path );
-         }
-
-         fc::path get_file_path() const {
-            return _file_path;
-         }
-
-         bool is_open() const { return _open; }
-
-         size_t file_size() const {
-            return fc::file_size( _file_path );
-         }
-
-         void open_for_append() {
-            _file.reset( fopen( _file_path.generic_string().c_str(), "ab+" ) );
-            if( !_file ) {
-               throw std::runtime_error( "cfile unable to open: " +  _file_path.generic_string() );
-            }
-            _open = true;
-         }
-
-         void open_for_rw() {
-            _file.reset( fopen( _file_path.generic_string().c_str(), "rb+" ) );
-            if( !_file ) {
-               throw std::runtime_error( "cfile unable to open: " +  _file_path.generic_string() );
-            }
-            _open = true;
-         }
-
-         long tellp() const {
-            return ftell( _file.get() );
-         }
-
-         void seek( long loc ) {
-            if( 0 != fseek( _file.get(), loc, SEEK_SET ) ) {
-               throw std::runtime_error( "cfile: " + _file_path.generic_string() +
-                  " unable to SEEK_SET to: " + std::to_string(loc) );
-            }
-         }
-
-         void seek_end( long loc ) {
-            if( 0 != fseek( _file.get(), loc, SEEK_END ) ) {
-               throw std::runtime_error( "cfile: " + _file_path.generic_string() +
-                  " unable to SEEK_END to: " + std::to_string(loc) );
-            }
-         }
-
-         void read( char* d, size_t n ) {
-            size_t result = fread( d, 1, n, _file.get() );
-            if( result != n ) {
-               throw std::runtime_error( "cfile: " + _file_path.generic_string() +
-                  " unable to read " + std::to_string( n ) + " only read " + std::to_string( result ) );
-            }
-         }
-
-         void write( const char* d, size_t n ) {
-            size_t result = fwrite( d, 1, n, _file.get() );
-            if( result != n ) {
-               throw std::runtime_error( "cfile: " + _file_path.generic_string() +
-                  " unable to write " + std::to_string( n ) + " only wrote " + std::to_string( result ) );
-            }
-         }
-
-         void flush() {
-            if( 0 != fflush( _file.get() ) ) {
-               throw std::runtime_error( "cfile: " + _file_path.generic_string() + " unable to flush file." );
-            }
-         }
-
-         void close() {
-            _file.reset();
-            _open = false;
-         }
-
-         void remove() {
-            if( _open ) {
-               throw std::runtime_error( "cfile: " + _file_path.generic_string() + " Unable to remove as file is open" );
-            }
-            fc::remove_all( _file_path );
-         }
-
-         cfile_datastream create_datastream();
-
-      private:
-         bool          _open = false;
-         fc::path      _file_path;
-         unique_file   _file;
-      };
-
-      /*
-       *  @brief datastream adapter that adapts cfile for use with fc unpack
-       *
-       *  This class supports unpack functionality but not pack.
-       */
-      class cfile_datastream {
-      public:
-         explicit cfile_datastream( cfile& cf ) : cf(cf) {}
-
-         void skip( size_t s ) {
-            std::vector<char> d( s );
-            read( &d[0], s );
-         }
-
-         bool read( char* d, size_t s ) {
-            cf.read( d, s );
-            return true;
-         }
-
-         bool get( unsigned char& c ) {
-            char cc;
-            cf.read(&cc, 1);
-            c = cc;
-            return true;
-         }
-
-         bool get( char& c ) { return read(&c, 1); }
-
-      private:
-         cfile& cf;
-      };
-
-      inline cfile_datastream cfile::create_datastream() {
-         return cfile_datastream(*this);
-      }
-
-
       class block_log_impl {
          public:
             signed_block_ptr         head;
             block_id_type            head_id;
-            cfile                    block_file;
-            cfile                    index_file;
+            fc::cfile                block_file;
+            fc::cfile                index_file;
             bool                     open_files = false;
             bool                     genesis_written_to_block_log = false;
             uint32_t                 version = 0;
@@ -196,13 +63,13 @@ namespace eosio { namespace chain {
 
          // open to create files if they don't exist
          //ilog("Opening block log at ${path}", ("path", my->block_file.generic_string()));
-         block_file.open_for_append();
-         index_file.open_for_append();
+         block_file.open( LOG_WRITE_C );
+         index_file.open( LOG_WRITE_C );
 
          close();
 
-         block_file.open_for_rw();
-         index_file.open_for_rw();
+         block_file.open( LOG_RW_C );
+         index_file.open( LOG_RW_C );
 
          open_files = true;
       }
diff --git a/libraries/fc b/libraries/fc
index 0732c19245f..1e5604c2b6d 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 0732c19245fad322b8785f9d43efda2117066490
+Subproject commit 1e5604c2b6da7f04ac167634cf696dec63ab3083

From c898ca554b2a233ff073c8d8d9f2e64abaf1c02c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 12 Aug 2019 11:31:57 -0500
Subject: [PATCH 0975/1648] Remove unused variable

---
 plugins/producer_plugin/producer_plugin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index c482ff0682c..e77bcff1991 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -734,7 +734,6 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
 { try {
    my->chain_plug = app().find_plugin<chain_plugin>();
    EOS_ASSERT( my->chain_plug, plugin_config_exception, "chain_plugin not found" );
-   chain_plugin* chain_plug = my->chain_plug;
    my->_options = &options;
    LOAD_VALUE_SET(options, "producer-name", my->_producers)
 

From ac2b96fb67a0c28378118091475f4dd1f387913c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 12 Aug 2019 11:57:12 -0500
Subject: [PATCH 0976/1648] Add similar fix as #7640 (untested)

---
 libraries/chain/block_log.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 75b3934060b..0271376442c 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -16,6 +16,14 @@
 #define LOG_WRITE_C "ab+"
 #define LOG_RW_C "rb+"
 
+#ifndef _WIN32
+#define FC_FOPEN(p, m) fopen(p, m)
+#else
+#define FC_CAT(s1, s2) s1 ## s2
+#define FC_PREL(s) FC_CAT(L, s)
+#define FC_FOPEN(p, m) _wfopen(p, FC_PREL(m))
+#endif
+
 namespace eosio { namespace chain {
 
    const uint32_t block_log::min_supported_version = 1;
@@ -600,7 +608,7 @@ namespace eosio { namespace chain {
 
    uint32_t detail::reverse_iterator::open(const fc::path& block_file_name) {
       _block_file_name = block_file_name.generic_string();
-      _file.reset(fopen(_block_file_name.c_str(), "r"));
+      _file.reset( FC_FOPEN(_block_file_name.c_str(), "r"));
       EOS_ASSERT( _file, block_log_exception, "Could not open Block log file at '${blocks_log}'", ("blocks_log", _block_file_name) );
       _end_of_buffer_position = _unset_position;
 
@@ -728,7 +736,7 @@ namespace eosio { namespace chain {
 
    void detail::index_writer::prepare_buffer() {
       if (_file == nullptr) {
-         _file.reset(fopen(_block_index_name.c_str(), "w"));
+         _file.reset(FC_FOPEN(_block_index_name.c_str(), "w"));
          EOS_ASSERT( _file, block_log_exception, "Could not open Block index file at '${blocks_index}'", ("blocks_index", _block_index_name) );
          // allocate 8 bytes for each block position to store
          const auto full_file_size = buffer_location_to_file_location(_blocks_expected);

From 14aee95e8e32d92cf5b7b94daa318ff2bf2e47f9 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Mon, 12 Aug 2019 15:11:06 -0400
Subject: [PATCH 0977/1648] Update eos-vm

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 8c7c492d616..9a9d1ac7470 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 8c7c492d616053cc7404d43eb006c39911488d73
+Subproject commit 9a9d1ac74708f633940fbca13e5f5860e7134c34

From 9fb0e77f1ccb4ddc7298b72fe472228388cab63d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 12 Aug 2019 14:33:24 -0500
Subject: [PATCH 0978/1648] Removed remove() and file_size() from cfile

---
 libraries/chain/block_log.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 0271376442c..d18162294c2 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -163,6 +163,9 @@ namespace eosio { namespace chain {
       my->block_file.set_file_path( data_dir / "blocks.log" );
       my->index_file.set_file_path( data_dir / "blocks.index" );
 
+      auto log_size = fc::file_size( my->block_file.get_file_path() );
+      auto index_size = fc::file_size( my->index_file.get_file_path() );
+
       my->reopen();
 
       /* On startup of the block log, there are several states the log file and the index file can be
@@ -183,8 +186,6 @@ namespace eosio { namespace chain {
        *  - If the index file head is not in the log file, delete the index and replay.
        *  - If the index file head is in the log, but not up to date, replay from index head.
        */
-      auto log_size = my->block_file.file_size();
-      auto index_size = my->index_file.file_size();
 
       if (log_size) {
          ilog("Log is nonempty");
@@ -237,7 +238,7 @@ namespace eosio { namespace chain {
       } else if (index_size) {
          ilog("Index is nonempty, remove and recreate it");
          my->close();
-         my->index_file.remove();
+         fc::remove_all( my->index_file.get_file_path() );
          my->reopen();
       }
    }
@@ -278,8 +279,8 @@ namespace eosio { namespace chain {
    void block_log::reset( const genesis_state& gs, const signed_block_ptr& first_block, uint32_t first_block_num ) {
       my->close();
 
-      my->block_file.remove();
-      my->index_file.remove();
+      fc::remove_all( my->block_file.get_file_path() );
+      fc::remove_all( my->index_file.get_file_path() );
 
       my->reopen();
 
@@ -377,7 +378,7 @@ namespace eosio { namespace chain {
       ilog("Reconstructing Block Log Index...");
       my->close();
 
-      my->index_file.remove();
+      fc::remove_all( my->index_file.get_file_path() );
 
       my->reopen();
 

From 32080a89c785e231a20a289186b36c1c61ead93c Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 13 Aug 2019 08:48:03 -0500
Subject: [PATCH 0979/1648] Added test for snapshot version 2 with pending
 producer schedule.

---
 unittests/snapshot_tests.cpp | 57 ++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index e7cf449b119..230ba553335 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -4,6 +4,7 @@
  */
 #include <sstream>
 
+#include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/snapshot.hpp>
 #include <eosio/testing/tester.hpp>
 
@@ -384,4 +385,60 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot
    }
 }
 
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, snapshot_suites)
+{
+   tester chain(setup_policy::preactivate_feature_and_new_bios);
+   auto block = chain.produce_block();
+   BOOST_REQUIRE_EQUAL(block->block_num(), 3); // ensure that test setup stays consistent with original snapshot setup
+   chain.create_account(N(snapshot));
+   block = chain.produce_block();
+   BOOST_REQUIRE_EQUAL(block->block_num(), 4);
+
+   const auto& gpo = chain.control->get_global_properties();
+   BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.version, 0);
+   BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.producers.size(), 0);
+
+   auto res = chain.set_producers_legacy( {N(snapshot)} );
+   block = chain.produce_block();
+   BOOST_REQUIRE_EQUAL(block->block_num(), 5);
+   chain.control->abort_block();
+   ///< End deterministic code to generate blockchain for comparison
+   auto base_integrity_value = chain.control->calculate_integrity_hash();
+
+   BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.version, 1);
+   BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.producers.size(), 1);
+   BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.producers[0].producer_name.to_string(), "snapshot");
+
+   static_assert(chain_snapshot_header::minimum_compatible_version <= 2, "version 2 unit test is no longer needed.  Please clean up data files");
+   auto v2 = SNAPSHOT_SUITE::template load_from_file<snapshots::snap_v2_prod_sched>();
+   snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
+   auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();
+   if (std::is_same_v<SNAPSHOT_SUITE, variant_snapshot_suite> && v2_integrity_value.str() != base_integrity_value.str()) {
+      // create a latest snapshot
+      auto latest_writer = SNAPSHOT_SUITE::get_writer();
+      chain.control->write_snapshot(latest_writer);
+      auto chain_latest = SNAPSHOT_SUITE::finalize(latest_writer);
+      auto latest_writer2 = SNAPSHOT_SUITE::get_writer();
+      v2_tester.control->write_snapshot(latest_writer2);
+      auto v2_tester_latest = SNAPSHOT_SUITE::finalize(latest_writer2);
+      print_variant_diff(chain_latest, v2_tester_latest);
+      BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
+   }
+   const auto& v2_gpo = v2_tester.control->get_global_properties();
+   BOOST_REQUIRE_EQUAL(v2_gpo.proposed_schedule.version, 1);
+   BOOST_REQUIRE_EQUAL(v2_gpo.proposed_schedule.producers.size(), 1);
+   BOOST_REQUIRE_EQUAL(v2_gpo.proposed_schedule.producers[0].producer_name.to_string(), "snapshot");
+
+   // produce block
+   auto new_block = chain.produce_block();
+   // undo the auto-pending from tester
+   chain.control->abort_block();
+
+   auto integrity_value = chain.control->calculate_integrity_hash();
+
+   // push that block to all sub testers and validate the integrity of the database after it.
+   v2_tester.push_block(new_block);
+   BOOST_REQUIRE_EQUAL(integrity_value.str(), v2_tester.control->calculate_integrity_hash().str());
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 037f1289b53de4c0069dbd22eabf5a660203a074 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 13 Aug 2019 09:41:48 -0500
Subject: [PATCH 0980/1648] Remove unneded constructor and helper method. Made
 non-thread safe attributes private.

---
 libraries/chain/block_state.cpp               | 41 +------------------
 .../chain/include/eosio/chain/block_state.hpp | 25 +++++------
 2 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index fea31bea05d..8c319bada65 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -72,30 +72,6 @@ namespace eosio { namespace chain {
          return result;
       }
 
-      /**
-       * Given a pending block header state, wrap the promotion to a block header state such that additional signatures
-       * can be extraced from the provided complete signed block and passed into the block header state promotion
-       *
-       * This cleans up lifetime issues involved with accessing activated protocol features and moving from the
-       * pending block header state
-       *
-       * @param cur the pending block header state to promote
-       * @param b the signed block complete with extensions and signatures
-       * @param pfs protocol feature set for digest access
-       * @param extras all the remaining parameters that pass through
-       * @return the block header state
-       */
-      template<typename ...Extras>
-      block_header_state promote_pending(pending_block_header_state&& cur,
-                                         const signed_block_ptr& b,
-                                         const protocol_feature_set& pfs,
-                                         Extras&& ... extras)
-      {
-
-         auto additional_signatures = extract_additional_signatures(b, pfs, cur.prev_activated_protocol_features);
-         return std::move(cur).finish_next( *b, std::move(additional_signatures), pfs, std::forward<Extras>(extras)... );
-      }
-
    }
 
    block_state::block_state( const block_header_state& prev,
@@ -121,22 +97,7 @@ namespace eosio { namespace chain {
                            )
    :block_header_state( inject_additional_signatures( std::move(cur), *b, pfs, validator, signer ) )
    ,block( std::move(b) )
-   ,trxs( std::move(trx_metas) )
-   {}
-
-
-   block_state::block_state( pending_block_header_state&& cur,
-                             const signed_block_ptr& b,
-                             vector<transaction_metadata_ptr>&& trx_metas,
-                             const protocol_feature_set& pfs,
-                             const std::function<void( block_timestamp_type,
-                                                       const flat_set<digest_type>&,
-                                                       const vector<digest_type>& )>& validator,
-                             bool skip_validate_signee
-                           )
-   :block_header_state( promote_pending(std::move(cur), b, pfs, validator, skip_validate_signee ) )
-   ,block( b )
-   ,trxs( std::move(trx_metas) )
+   ,cached_trxs( std::move(trx_metas) )
    {}
 
 } } /// eosio::chain
diff --git a/libraries/chain/include/eosio/chain/block_state.hpp b/libraries/chain/include/eosio/chain/block_state.hpp
index c0ac2c4dcd4..8f6e20fc480 100644
--- a/libraries/chain/include/eosio/chain/block_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_state.hpp
@@ -31,27 +31,28 @@ namespace eosio { namespace chain {
                    const signer_callback_type& signer
                 );
 
-      block_state( pending_block_header_state&& cur,
-                   const signed_block_ptr& b, // signed block
-                   vector<transaction_metadata_ptr>&& trx_metas,
-                   const protocol_feature_set& pfs,
-                   const std::function<void( block_timestamp_type,
-                                             const flat_set<digest_type>&,
-                                             const vector<digest_type>& )>& validator,
-                   bool skip_validate_signee
-                 );
-
       block_state() = default;
 
+
+      signed_block_ptr                                    block;
+
+   private: // internal use only, not thread safe
+      friend struct fc::reflector<block_state>;
+      friend bool block_state_is_valid( const block_state& ); // work-around for multi-index access
+      friend struct controller_impl;
+      friend class  fork_database;
+      friend struct fork_database_impl;
+      friend class  unapplied_transaction_queue;
+      friend struct pending_state;
+
       bool is_valid()const { return validated; }
 
 
-      signed_block_ptr                                    block;
       bool                                                validated = false;
 
       /// this data is redundant with the data stored in block, but facilitates
       /// recapturing transactions when we pop a block
-      vector<transaction_metadata_ptr>                    trxs;
+      vector<transaction_metadata_ptr>                    cached_trxs;
    };
 
    using block_state_ptr = std::shared_ptr<block_state>;

From 36b1c41921eff81b55baffda516652f05556f50e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 13 Aug 2019 09:42:44 -0500
Subject: [PATCH 0981/1648] Safer determination of cached transaction_metadata
 usage

---
 libraries/chain/controller.cpp | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 5f07956b8f9..74e6ffe51f8 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -178,7 +178,7 @@ struct pending_state {
       if( _block_stage.contains<assembled_block>() )
          return std::move( _block_stage.get<assembled_block>()._trx_metas );
 
-      return std::move( _block_stage.get<completed_block>()._block_state->trxs );
+      return std::move( _block_stage.get<completed_block>()._block_state->cached_trxs );
    }
 
    bool is_protocol_feature_activated( const digest_type& feature_digest )const {
@@ -1730,13 +1730,16 @@ struct controller_impl {
          auto producer_block_id = b->id();
          start_block( b->timestamp, b->confirmed, new_protocol_feature_activations, s, producer_block_id);
 
-         const bool existing_trxs_metas = !bsp->trxs.empty();
+         const bool existing_trxs_metas = !bsp->cached_trxs.empty();
+         const bool pub_keys_recovered = existing_trxs_metas && !bsp->cached_trxs[0]->recovered_keys().empty();
+         const bool skip_auth_checks = self.skip_auth_check();
          std::vector<recover_keys_future> trx_futures;
          std::vector<transaction_metadata_ptr> trx_metas;
-         const bool skip_auth_checks = self.skip_auth_check();
-         if( existing_trxs_metas ) {
-            trx_metas = std::move( bsp->trxs );
+         bool use_bsp_cached = false, use_trx_metas = false;
+         if( pub_keys_recovered || (skip_auth_checks && existing_trxs_metas) ) {
+            use_bsp_cached = true;
          } else if( skip_auth_checks ) {
+            use_trx_metas = true;
             trx_metas.reserve( b->transactions.size() );
             for( const auto& receipt : b->transactions ) {
                if( receipt.trx.contains<packed_transaction>()) {
@@ -1762,11 +1765,10 @@ struct controller_impl {
             const auto& trx_receipts = pending->_block_stage.get<building_block>()._pending_trx_receipts;
             auto num_pending_receipts = trx_receipts.size();
             if( receipt.trx.contains<packed_transaction>() ) {
-               if( skip_auth_checks || existing_trxs_metas ) {
-                  trace = push_transaction( trx_metas.at( packed_idx++ ), fc::time_point::maximum(), receipt.cpu_usage_us, true );
-               } else {
-                  trace = push_transaction( trx_futures.at( packed_idx++ ).get(), fc::time_point::maximum(), receipt.cpu_usage_us, true );
-               }
+               const auto& trx_meta = ( use_bsp_cached ? bsp->cached_trxs.at( packed_idx++ )
+                                                       : ( use_trx_metas ? trx_metas.at( packed_idx++ )
+                                                                         : trx_futures.at( packed_idx++ ).get() ) );
+               trace = push_transaction( trx_meta, fc::time_point::maximum(), receipt.cpu_usage_us, true );
             } else if( receipt.trx.contains<transaction_id_type>() ) {
                trace = push_scheduled_transaction( receipt.trx.get<transaction_id_type>(), fc::time_point::maximum(), receipt.cpu_usage_us, true );
             } else {
@@ -1802,9 +1804,10 @@ struct controller_impl {
          EOS_ASSERT( producer_block_id == ab._id, block_validate_exception, "Block ID does not match",
                      ("producer_block_id",producer_block_id)("validator_block_id",ab._id) );
 
-         // create completed block with existing block_state along with newly created transaction_metadata as
-         // the newly created may contain recovered keys
-         bsp->trxs = std::move( ab._trx_metas );
+         if( !use_bsp_cached ) {
+            bsp->cached_trxs = std::move( ab._trx_metas );
+         }
+         // create completed_block with the existing block_state as we just verified it is the same as assembled_block
          pending->_block_stage = completed_block{ bsp };
 
          commit_block(false);

From 22557a135dc6aa288056ff9890f8f13d79f76726 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 13 Aug 2019 09:44:51 -0500
Subject: [PATCH 0982/1648] Hard code block_state validated as true since all
 singaled blocks are validated

---
 plugins/mongo_db_plugin/mongo_db_plugin.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index 5edc7f7274a..7c85d936841 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -942,7 +942,7 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
       auto block_state_doc = bsoncxx::builder::basic::document{};
       block_state_doc.append( kvp( "block_num", b_int32{static_cast<int32_t>(block_num)} ),
                               kvp( "block_id", block_id_str ),
-                              kvp( "validated", b_bool{bs->validated} ) );
+                              kvp( "validated", b_bool{true} ) );
 
       const chain::block_header_state& bhs = *bs;
 
@@ -1026,7 +1026,6 @@ void mongo_db_plugin_impl::_process_irreversible_block(const chain::block_state_
       }
 
       auto update_doc = make_document( kvp( "$set", make_document( kvp( "irreversible", b_bool{true} ),
-                                                                   kvp( "validated", b_bool{bs->validated} ),
                                                                    kvp( "updatedAt", b_date{now} ) ) ) );
 
       _blocks.update_one( make_document( kvp( "_id", ir_block->view()["_id"].get_oid() ) ), update_doc.view() );
@@ -1041,7 +1040,6 @@ void mongo_db_plugin_impl::_process_irreversible_block(const chain::block_state_
       }
 
       auto update_doc = make_document( kvp( "$set", make_document( kvp( "irreversible", b_bool{true} ),
-                                                                   kvp( "validated", b_bool{bs->validated} ),
                                                                    kvp( "updatedAt", b_date{now} ) ) ) );
 
       _block_states.update_one( make_document( kvp( "_id", ir_block->view()["_id"].get_oid() ) ), update_doc.view() );

From b9efa66b776f43feb464bcc039c7113d802bbc72 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 13 Aug 2019 09:45:36 -0500
Subject: [PATCH 0983/1648] Update for private block_state attributes

---
 libraries/chain/fork_database.cpp             | 10 ++-
 .../chain/unapplied_transaction_queue.hpp     | 12 ++--
 plugins/producer_plugin/producer_plugin.cpp   |  2 +-
 .../unapplied_transaction_queue_tests.cpp     | 67 +++++++++++++++----
 4 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp
index bd98202922e..5fe1c05118e 100644
--- a/libraries/chain/fork_database.cpp
+++ b/libraries/chain/fork_database.cpp
@@ -5,6 +5,7 @@
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/mem_fun.hpp>
+#include <boost/multi_index/global_fun.hpp>
 #include <boost/multi_index/composite_key.hpp>
 #include <fc/io/fstream.hpp>
 #include <fstream>
@@ -18,13 +19,17 @@ namespace eosio { namespace chain {
    const uint32_t fork_database::min_supported_version = 1;
    const uint32_t fork_database::max_supported_version = 1;
 
+   // work around block_state::is_valid being private
+   inline bool block_state_is_valid( const block_state& bs ) {
+      return bs.is_valid();
+   }
+
    /**
     * History:
     * Version 1: initial version of the new refactored fork database portable format
     */
 
    struct by_block_id;
-   struct by_block_num;
    struct by_lib_block_num;
    struct by_prev;
    typedef multi_index_container<
@@ -34,7 +39,7 @@ namespace eosio { namespace chain {
          ordered_non_unique< tag<by_prev>, const_mem_fun<block_header_state, const block_id_type&, &block_header_state::prev> >,
          ordered_unique< tag<by_lib_block_num>,
             composite_key< block_state,
-               member<block_state,                        bool,          &block_state::validated>,
+               global_fun<const block_state&,            bool,          &block_state_is_valid>,
                member<detail::block_header_state_common, uint32_t,      &detail::block_header_state_common::dpos_irreversible_blocknum>,
                member<detail::block_header_state_common, uint32_t,      &detail::block_header_state_common::block_num>,
                member<block_header_state,                block_id_type, &block_header_state::id>
@@ -126,7 +131,6 @@ namespace eosio { namespace chain {
                block_state s;
                fc::raw::unpack( ds, s );
                // do not populate transaction_metadatas, they will be created as needed in apply_block with appropriate key recovery
-               s.trxs.clear(); // not part of fc_reflect, so should be empty here
                s.header_exts = s.block->validate_and_extract_header_extensions();
                my->add( std::make_shared<block_state>( move( s ) ), false, true, validator );
             }
diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index b3abd024954..da9b783e350 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -118,10 +118,14 @@ class unapplied_transaction_queue {
       return true;
    }
 
-   void clear_applied( const std::vector<transaction_metadata_ptr>& applied_trxs ) {
+   void clear_applied( const block_state_ptr& bs ) {
+      if( empty() ) return;
       auto& idx = queue.get<by_trx_id>();
-      for( const auto& trx : applied_trxs ) {
-         idx.erase( trx->id() );
+      for( const auto& receipt : bs->block->transactions ) {
+         if( receipt.trx.contains<packed_transaction>() ) {
+            const auto& pt = receipt.trx.get<packed_transaction>();
+            idx.erase( pt.id() );
+         }
       }
    }
 
@@ -130,7 +134,7 @@ class unapplied_transaction_queue {
       // forked_branch is in reverse order
       for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
          const block_state_ptr& bsptr = *ritr;
-         for( auto itr = bsptr->trxs.begin(), end = bsptr->trxs.end(); itr != end; ++itr ) {
+         for( auto itr = bsptr->cached_trxs.begin(), end = bsptr->cached_trxs.end(); itr != end; ++itr ) {
             const auto& trx = *itr;
             fc::time_point expiry = trx->packed_trx()->expiration();
             queue.insert( { trx, expiry, trx_enum_type::forked } );
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index d093248f2ed..5e5a4fd798d 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -229,7 +229,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
 
 
       void on_block( const block_state_ptr& bsp ) {
-         _unapplied_transactions.clear_applied( bsp->trxs );
+         _unapplied_transactions.clear_applied( bsp );
 
          if( bsp->header.timestamp <= _start_time ) return;
 
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index b35b894bdcf..7e0430760c4 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -3,6 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #include <boost/test/unit_test.hpp>
+#include <eosio/testing/tester.hpp>
 #include <eosio/chain/unapplied_transaction_queue.hpp>
 #include <eosio/chain/contract_types.hpp>
 
@@ -33,6 +34,52 @@ auto next( unapplied_transaction_queue& q ) {
    return trx;
 }
 
+auto create_test_block_state( std::vector<transaction_metadata_ptr> trx_metas ) {
+   signed_block_ptr block = std::make_shared<signed_block>();
+   for( auto& trx_meta : trx_metas ) {
+      block->transactions.emplace_back( *trx_meta->packed_trx() );
+   }
+
+   block->producer = eosio::chain::config::system_account_name;
+
+   auto priv_key = eosio::testing::base_tester::get_private_key( block->producer, "active" );
+   auto pub_key  = eosio::testing::base_tester::get_public_key( block->producer, "active" );
+
+   auto prev = std::make_shared<block_state>();
+   auto header_bmroot = digest_type::hash( std::make_pair( block->digest(), prev->blockroot_merkle.get_root() ) );
+   auto sig_digest = digest_type::hash( std::make_pair(header_bmroot, prev->pending_schedule.schedule_hash) );
+   block->producer_signature = priv_key.sign( sig_digest );
+
+   vector<private_key_type> signing_keys;
+   signing_keys.emplace_back( std::move( priv_key ) );
+
+   auto signer = [&]( digest_type d ) {
+      std::vector<signature_type> result;
+      result.reserve(signing_keys.size());
+      for (const auto& k: signing_keys)
+         result.emplace_back(k.sign(d));
+      return result;
+   };
+   pending_block_header_state pbhs;
+   pbhs.producer = block->producer;
+   producer_authority_schedule schedule = { 0, { producer_authority{block->producer, block_signing_authority_v0{ 1, {{pub_key, 1}} } } } };
+   pbhs.active_schedule = schedule;
+   pbhs.valid_block_signing_authority = block_signing_authority_v0{ 1, {{pub_key, 1}} };
+   auto bsp = std::make_shared<block_state>(
+         std::move( pbhs ),
+         std::move( block ),
+         std::move( trx_metas ),
+         protocol_feature_set(),
+         []( block_timestamp_type timestamp,
+             const flat_set<digest_type>& cur_features,
+             const vector<digest_type>& new_features )
+         {},
+         signer
+   );
+
+   return bsp;
+}
+
 BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
 
    unapplied_transaction_queue q;
@@ -91,7 +138,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
 
    // clear applied
    q.add_aborted( { trx1, trx2, trx3 } );
-   q.clear_applied( { trx1, trx3, trx4 } );
+   q.clear_applied( create_test_block_state( { trx1, trx3, trx4 } ) );
    BOOST_CHECK( q.size() == 1 );
    BOOST_REQUIRE( next( q ) == trx2 );
    BOOST_CHECK( q.size() == 0 );
@@ -122,12 +169,9 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_CHECK( q.empty() );
 
    // fifo forked, one fork
-   auto bs1 = std::make_shared<block_state>();
-   bs1->trxs = { trx1, trx2 };
-   auto bs2 = std::make_shared<block_state>();
-   bs2->trxs = { trx3, trx4, trx5 };
-   auto bs3 = std::make_shared<block_state>();
-   bs3->trxs = { trx6 };
+   auto bs1 = create_test_block_state( { trx1, trx2 } );
+   auto bs2 = create_test_block_state( { trx3, trx4, trx5 } );
+   auto bs3 = create_test_block_state( { trx6 } );
    q.add_forked( { bs3, bs2, bs1, bs1 } ); // bs1 duplicate ignored
    BOOST_CHECK( q.size() == 6 );
    BOOST_REQUIRE( next( q ) == trx1 );
@@ -146,8 +190,7 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    BOOST_CHECK( q.empty() );
 
    // fifo forked
-   auto bs4 = std::make_shared<block_state>();
-   bs4->trxs = { trx7 };
+   auto bs4 = create_test_block_state( { trx7 } );
    q.add_forked( { bs1 } );
    q.add_forked( { bs3, bs2 } );
    q.add_forked( { bs4 } );
@@ -180,10 +223,8 @@ BOOST_AUTO_TEST_CASE( unapplied_transaction_queue_test ) try {
    auto trx19 = unique_trx_meta_data();
 
    // fifo forked, multi forks
-   auto bs5 = std::make_shared<block_state>();
-   auto bs6 = std::make_shared<block_state>();
-   bs5->trxs = { trx11, trx12, trx13 };
-   bs6->trxs = { trx11, trx15 };
+   auto bs5 = create_test_block_state( { trx11, trx12, trx13 } );
+   auto bs6 = create_test_block_state( { trx11, trx15 } );
    q.add_forked( { bs3, bs2, bs1 } );
    q.add_forked( { bs4 } );
    q.add_forked( { bs3, bs2 } ); // dups ignored

From 2abae50f25fffc73ca71f7316d5d7512f98fc09f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 13 Aug 2019 12:14:50 -0500
Subject: [PATCH 0984/1648] Track if public keys were recovered on block_state

---
 libraries/chain/block_state.cpp                     |  3 ++-
 libraries/chain/controller.cpp                      | 10 +++++-----
 libraries/chain/include/eosio/chain/block_state.hpp | 13 ++++++++++++-
 .../eosio/chain/unapplied_transaction_queue.hpp     |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index 8c319bada65..8a616ff305b 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -97,7 +97,8 @@ namespace eosio { namespace chain {
                            )
    :block_header_state( inject_additional_signatures( std::move(cur), *b, pfs, validator, signer ) )
    ,block( std::move(b) )
-   ,cached_trxs( std::move(trx_metas) )
+   ,_pub_keys_recovered( true ) // called by produce_block so signature recovery of trxs must have been done
+   ,_cached_trxs( std::move(trx_metas) )
    {}
 
 } } /// eosio::chain
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index f0cf0bbe9e2..263b970adb7 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -178,7 +178,7 @@ struct pending_state {
       if( _block_stage.contains<assembled_block>() )
          return std::move( _block_stage.get<assembled_block>()._trx_metas );
 
-      return std::move( _block_stage.get<completed_block>()._block_state->cached_trxs );
+      return _block_stage.get<completed_block>()._block_state->extract_trxs_metas();
    }
 
    bool is_protocol_feature_activated( const digest_type& feature_digest )const {
@@ -1737,8 +1737,8 @@ struct controller_impl {
          auto producer_block_id = b->id();
          start_block( b->timestamp, b->confirmed, new_protocol_feature_activations, s, producer_block_id);
 
-         const bool existing_trxs_metas = !bsp->cached_trxs.empty();
-         const bool pub_keys_recovered = existing_trxs_metas && !bsp->cached_trxs[0]->recovered_keys().empty();
+         const bool existing_trxs_metas = !bsp->trxs_metas().empty();
+         const bool pub_keys_recovered = bsp->is_pub_keys_recovered();
          const bool skip_auth_checks = self.skip_auth_check();
          std::vector<recover_keys_future> trx_futures;
          std::vector<transaction_metadata_ptr> trx_metas;
@@ -1772,7 +1772,7 @@ struct controller_impl {
             const auto& trx_receipts = pending->_block_stage.get<building_block>()._pending_trx_receipts;
             auto num_pending_receipts = trx_receipts.size();
             if( receipt.trx.contains<packed_transaction>() ) {
-               const auto& trx_meta = ( use_bsp_cached ? bsp->cached_trxs.at( packed_idx++ )
+               const auto& trx_meta = ( use_bsp_cached ? bsp->trxs_metas().at( packed_idx++ )
                                                        : ( use_trx_metas ? trx_metas.at( packed_idx++ )
                                                                          : trx_futures.at( packed_idx++ ).get() ) );
                trace = push_transaction( trx_meta, fc::time_point::maximum(), receipt.cpu_usage_us, true );
@@ -1812,7 +1812,7 @@ struct controller_impl {
                      ("producer_block_id",producer_block_id)("validator_block_id",ab._id) );
 
          if( !use_bsp_cached ) {
-            bsp->cached_trxs = std::move( ab._trx_metas );
+            bsp->set_trxs_metas( std::move( ab._trx_metas ), !skip_auth_checks );
          }
          // create completed_block with the existing block_state as we just verified it is the same as assembled_block
          pending->_block_stage = completed_block{ bsp };
diff --git a/libraries/chain/include/eosio/chain/block_state.hpp b/libraries/chain/include/eosio/chain/block_state.hpp
index 8f6e20fc480..112a7e56be7 100644
--- a/libraries/chain/include/eosio/chain/block_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_state.hpp
@@ -46,13 +46,24 @@ namespace eosio { namespace chain {
       friend struct pending_state;
 
       bool is_valid()const { return validated; }
+      bool is_pub_keys_recovered()const { return _pub_keys_recovered; }
 
+      vector<transaction_metadata_ptr> extract_trxs_metas() {
+         _pub_keys_recovered = false;
+         return std::move( _cached_trxs );
+      }
+      void set_trxs_metas( vector<transaction_metadata_ptr>&& trxs_metas, bool keys_recovered ) {
+         _pub_keys_recovered = keys_recovered;
+         _cached_trxs = std::move( trxs_metas );
+      }
+      const vector<transaction_metadata_ptr>& trxs_metas()const { return _cached_trxs; }
 
       bool                                                validated = false;
 
+      bool                                                _pub_keys_recovered = false;
       /// this data is redundant with the data stored in block, but facilitates
       /// recapturing transactions when we pop a block
-      vector<transaction_metadata_ptr>                    cached_trxs;
+      vector<transaction_metadata_ptr>                    _cached_trxs;
    };
 
    using block_state_ptr = std::shared_ptr<block_state>;
diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index da9b783e350..e72885a32d0 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -134,7 +134,7 @@ class unapplied_transaction_queue {
       // forked_branch is in reverse order
       for( auto ritr = forked_branch.rbegin(), rend = forked_branch.rend(); ritr != rend; ++ritr ) {
          const block_state_ptr& bsptr = *ritr;
-         for( auto itr = bsptr->cached_trxs.begin(), end = bsptr->cached_trxs.end(); itr != end; ++itr ) {
+         for( auto itr = bsptr->trxs_metas().begin(), end = bsptr->trxs_metas().end(); itr != end; ++itr ) {
             const auto& trx = *itr;
             fc::time_point expiry = trx->packed_trx()->expiration();
             queue.insert( { trx, expiry, trx_enum_type::forked } );

From 92382a07f5d42ac71431613725a9fae1ffc708a0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 13 Aug 2019 12:28:12 -0500
Subject: [PATCH 0985/1648] clear() moved from vector to place in known state

---
 libraries/chain/include/eosio/chain/block_state.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/block_state.hpp b/libraries/chain/include/eosio/chain/block_state.hpp
index 112a7e56be7..8f26ba02f56 100644
--- a/libraries/chain/include/eosio/chain/block_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_state.hpp
@@ -50,7 +50,9 @@ namespace eosio { namespace chain {
 
       vector<transaction_metadata_ptr> extract_trxs_metas() {
          _pub_keys_recovered = false;
-         return std::move( _cached_trxs );
+         auto result = std::move( _cached_trxs );
+         _cached_trxs.clear();
+         return result;
       }
       void set_trxs_metas( vector<transaction_metadata_ptr>&& trxs_metas, bool keys_recovered ) {
          _pub_keys_recovered = keys_recovered;

From 411f7d3c554e29aa91cc71a7075fd206e13739e1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 13 Aug 2019 13:23:30 -0500
Subject: [PATCH 0986/1648] Update to fc with cfile

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index 1e5604c2b6d..ff8686c4a0a 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 1e5604c2b6da7f04ac167634cf696dec63ab3083
+Subproject commit ff8686c4a0a6c32b6a6318fc2b280b9f6f143c16

From 3b12f1b6f1b1d876470eca0ba2bcea09dbde13d5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 13 Aug 2019 14:50:13 -0500
Subject: [PATCH 0987/1648] Call file_size after reopen otherwise file may not
 exist

---
 libraries/chain/block_log.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index d18162294c2..2a8fb7d2d6c 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -163,9 +163,6 @@ namespace eosio { namespace chain {
       my->block_file.set_file_path( data_dir / "blocks.log" );
       my->index_file.set_file_path( data_dir / "blocks.index" );
 
-      auto log_size = fc::file_size( my->block_file.get_file_path() );
-      auto index_size = fc::file_size( my->index_file.get_file_path() );
-
       my->reopen();
 
       /* On startup of the block log, there are several states the log file and the index file can be
@@ -186,6 +183,8 @@ namespace eosio { namespace chain {
        *  - If the index file head is not in the log file, delete the index and replay.
        *  - If the index file head is in the log, but not up to date, replay from index head.
        */
+      auto log_size = fc::file_size( my->block_file.get_file_path() );
+      auto index_size = fc::file_size( my->index_file.get_file_path() );
 
       if (log_size) {
          ilog("Log is nonempty");

From 2a6f974b5dc224b1a9f9d4e32dab0eedf40cf626 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 13 Aug 2019 18:01:22 -0400
Subject: [PATCH 0988/1648] remove the incorrect license header from the code
 base

resolves EOSIO/eos#7684
---
 libraries/chain/abi_serializer.cpp                        | 4 ----
 libraries/chain/asset.cpp                                 | 4 ----
 libraries/chain/authorization_manager.cpp                 | 5 -----
 libraries/chain/block.cpp                                 | 4 ----
 libraries/chain/block_header.cpp                          | 4 ----
 libraries/chain/block_log.cpp                             | 4 ----
 libraries/chain/chain_config.cpp                          | 5 -----
 libraries/chain/chain_id_type.cpp                         | 5 -----
 libraries/chain/eosio_contract.cpp                        | 4 ----
 libraries/chain/genesis_intrinsics.cpp                    | 5 -----
 libraries/chain/genesis_state.cpp                         | 5 -----
 libraries/chain/genesis_state_root_key.cpp.in             | 5 -----
 libraries/chain/include/eosio/chain/abi_def.hpp           | 4 ----
 libraries/chain/include/eosio/chain/abi_serializer.hpp    | 4 ----
 libraries/chain/include/eosio/chain/account_object.hpp    | 4 ----
 libraries/chain/include/eosio/chain/action.hpp            | 4 ----
 libraries/chain/include/eosio/chain/action_receipt.hpp    | 4 ----
 libraries/chain/include/eosio/chain/apply_context.hpp     | 4 ----
 libraries/chain/include/eosio/chain/asset.hpp             | 4 ----
 libraries/chain/include/eosio/chain/authority.hpp         | 4 ----
 libraries/chain/include/eosio/chain/authority_checker.hpp | 4 ----
 .../chain/include/eosio/chain/authorization_manager.hpp   | 4 ----
 libraries/chain/include/eosio/chain/block_log.hpp         | 4 ----
 libraries/chain/include/eosio/chain/block_state.hpp       | 4 ----
 .../chain/include/eosio/chain/block_summary_object.hpp    | 4 ----
 libraries/chain/include/eosio/chain/chain_config.hpp      | 4 ----
 libraries/chain/include/eosio/chain/chain_id_type.hpp     | 4 ----
 libraries/chain/include/eosio/chain/chain_snapshot.hpp    | 4 ----
 libraries/chain/include/eosio/chain/code_object.hpp       | 4 ----
 libraries/chain/include/eosio/chain/config.hpp            | 4 ----
 .../chain/include/eosio/chain/contract_table_objects.hpp  | 4 ----
 libraries/chain/include/eosio/chain/core_symbol.hpp.in    | 6 ++----
 .../chain/include/eosio/chain/database_header_object.hpp  | 4 ----
 libraries/chain/include/eosio/chain/database_utils.hpp    | 4 ----
 libraries/chain/include/eosio/chain/eosio_contract.hpp    | 4 ----
 libraries/chain/include/eosio/chain/exceptions.hpp        | 4 ----
 libraries/chain/include/eosio/chain/fixed_key.hpp         | 4 ----
 .../include/eosio/chain/generated_transaction_object.hpp  | 4 ----
 .../chain/include/eosio/chain/genesis_intrinsics.hpp      | 5 -----
 libraries/chain/include/eosio/chain/genesis_state.hpp     | 5 -----
 .../chain/include/eosio/chain/global_property_object.hpp  | 4 ----
 .../chain/include/eosio/chain/multi_index_includes.hpp    | 5 -----
 libraries/chain/include/eosio/chain/parallel_markers.hpp  | 4 ----
 .../chain/include/eosio/chain/permission_link_object.hpp  | 4 ----
 libraries/chain/include/eosio/chain/permission_object.hpp | 4 ----
 libraries/chain/include/eosio/chain/protocol.hpp          | 4 ----
 .../include/eosio/chain/protocol_feature_activation.hpp   | 4 ----
 .../include/eosio/chain/protocol_feature_manager.hpp      | 4 ----
 .../chain/include/eosio/chain/protocol_state_object.hpp   | 4 ----
 .../chain/include/eosio/chain/reversible_block_object.hpp | 5 -----
 libraries/chain/include/eosio/chain/snapshot.hpp          | 4 ----
 libraries/chain/include/eosio/chain/symbol.hpp            | 4 ----
 libraries/chain/include/eosio/chain/thread_utils.hpp      | 4 ----
 libraries/chain/include/eosio/chain/trace.hpp             | 4 ----
 libraries/chain/include/eosio/chain/transaction.hpp       | 4 ----
 .../chain/include/eosio/chain/transaction_metadata.hpp    | 4 ----
 .../chain/include/eosio/chain/transaction_object.hpp      | 4 ----
 libraries/chain/include/eosio/chain/types.hpp             | 4 ----
 .../include/eosio/chain/unapplied_transaction_queue.hpp   | 5 -----
 libraries/chain/include/eosio/chain/wast_to_wasm.hpp      | 4 ----
 .../chain/include/eosio/chain/whitelisted_intrinsics.hpp  | 5 -----
 libraries/chain/producer_schedule.cpp                     | 4 ----
 libraries/chain/protocol_feature_activation.cpp           | 5 -----
 libraries/chain/protocol_feature_manager.cpp              | 5 -----
 libraries/chain/protocol_state_object.cpp                 | 4 ----
 libraries/chain/thread_utils.cpp                          | 5 -----
 libraries/chain/trace.cpp                                 | 4 ----
 libraries/chain/transaction.cpp                           | 4 ----
 libraries/chain/wast_to_wasm.cpp                          | 4 ----
 libraries/chain/whitelisted_intrinsics.cpp                | 4 ----
 libraries/fc                                              | 2 +-
 libraries/version/include/eosio/version/version.hpp       | 5 -----
 libraries/version/src/version.cpp                         | 5 -----
 libraries/version/src/version_impl.cpp.in                 | 2 --
 libraries/version/src/version_impl.hpp                    | 5 -----
 plugins/chain_api_plugin/chain_api_plugin.cpp             | 4 ----
 .../include/eosio/chain_api_plugin/chain_api_plugin.hpp   | 4 ----
 .../include/eosio/chain/plugin_interface.hpp              | 4 ----
 plugins/chain_plugin/chain_plugin.cpp                     | 4 ----
 .../include/eosio/chain_plugin/chain_plugin.hpp           | 4 ----
 plugins/db_size_api_plugin/db_size_api_plugin.cpp         | 4 ----
 .../eosio/db_size_api_plugin/db_size_api_plugin.hpp       | 4 ----
 plugins/faucet_testnet_plugin/faucet_testnet_plugin.cpp   | 4 ----
 .../eosio/faucet_testnet_plugin/faucet_testnet_plugin.hpp | 4 ----
 plugins/history_api_plugin/history_api_plugin.cpp         | 4 ----
 .../eosio/history_api_plugin/history_api_plugin.hpp       | 5 -----
 .../history_plugin/account_control_history_object.hpp     | 4 ----
 .../include/eosio/history_plugin/history_plugin.hpp       | 4 ----
 .../eosio/history_plugin/public_key_history_object.hpp    | 4 ----
 plugins/http_client_plugin/http_client_plugin.cpp         | 4 ----
 .../eosio/http_client_plugin/http_client_plugin.hpp       | 4 ----
 plugins/http_plugin/http_plugin.cpp                       | 4 ----
 .../http_plugin/include/eosio/http_plugin/http_plugin.hpp | 4 ----
 .../include/eosio/login_plugin/login_plugin.hpp           | 4 ----
 plugins/login_plugin/login_plugin.cpp                     | 4 ----
 .../include/eosio/mongo_db_plugin/bson.hpp                | 4 ----
 .../include/eosio/mongo_db_plugin/mongo_db_plugin.hpp     | 4 ----
 plugins/mongo_db_plugin/mongo_db_plugin.cpp               | 4 ----
 .../include/eosio/net_api_plugin/net_api_plugin.hpp       | 4 ----
 plugins/net_api_plugin/net_api_plugin.cpp                 | 4 ----
 .../net_plugin/include/eosio/net_plugin/net_plugin.hpp    | 4 ----
 plugins/net_plugin/include/eosio/net_plugin/protocol.hpp  | 4 ----
 plugins/net_plugin/net_plugin.cpp                         | 4 ----
 .../eosio/producer_api_plugin/producer_api_plugin.hpp     | 4 ----
 plugins/producer_api_plugin/producer_api_plugin.cpp       | 4 ----
 .../include/eosio/producer_plugin/producer_plugin.hpp     | 5 -----
 plugins/producer_plugin/producer_plugin.cpp               | 4 ----
 .../eosio/state_history_plugin/state_history_log.hpp      | 4 ----
 .../eosio/state_history_plugin/state_history_plugin.hpp   | 4 ----
 .../state_history_plugin/state_history_serialization.hpp  | 4 ----
 plugins/state_history_plugin/state_history_plugin.cpp     | 5 -----
 .../include/eosio/template_plugin/template_plugin.hpp     | 4 ----
 plugins/template_plugin/template_plugin.cpp               | 4 ----
 .../test_control_api_plugin/test_control_api_plugin.hpp   | 4 ----
 .../test_control_api_plugin/test_control_api_plugin.cpp   | 4 ----
 .../eosio/test_control_plugin/test_control_plugin.hpp     | 4 ----
 plugins/test_control_plugin/test_control_plugin.cpp       | 4 ----
 .../eosio/txn_test_gen_plugin/txn_test_gen_plugin.hpp     | 4 ----
 plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp       | 4 ----
 .../include/eosio/wallet_api_plugin/wallet_api_plugin.hpp | 4 ----
 plugins/wallet_api_plugin/wallet_api_plugin.cpp           | 4 ----
 .../wallet_plugin/include/eosio/wallet_plugin/wallet.hpp  | 4 ----
 .../include/eosio/wallet_plugin/wallet_api.hpp            | 4 ----
 .../include/eosio/wallet_plugin/wallet_manager.hpp        | 4 ----
 .../include/eosio/wallet_plugin/wallet_plugin.hpp         | 4 ----
 plugins/wallet_plugin/se_wallet.cpp                       | 4 ----
 plugins/wallet_plugin/wallet.cpp                          | 4 ----
 plugins/wallet_plugin/wallet_manager.cpp                  | 4 ----
 plugins/wallet_plugin/wallet_plugin.cpp                   | 4 ----
 plugins/wallet_plugin/yubihsm_wallet.cpp                  | 4 ----
 programs/cleos/config.hpp.in                              | 4 +---
 programs/cleos/help_text.cpp.in                           | 4 ----
 programs/cleos/help_text.hpp                              | 4 ----
 programs/cleos/httpc.hpp                                  | 4 ----
 programs/cleos/localize.hpp                               | 4 ----
 programs/cleos/main.cpp                                   | 8 --------
 programs/eosio-launcher/config.hpp.in                     | 3 ---
 programs/eosio-launcher/main.cpp                          | 5 -----
 programs/keosd/config.hpp.in                              | 3 ---
 programs/keosd/main.cpp                                   | 4 ----
 programs/nodeos/config.hpp.in                             | 3 ---
 tests/chain_plugin_tests.cpp                              | 4 ----
 tests/get_table_tests.cpp                                 | 4 ----
 tests/main.cpp                                            | 4 ----
 tests/wallet_tests.cpp                                    | 4 ----
 unittests/abi_tests.cpp                                   | 4 ----
 unittests/api_tests.cpp                                   | 4 ----
 unittests/block_tests.cpp                                 | 4 ----
 unittests/block_timestamp_tests.cpp                       | 4 ----
 unittests/bootseq_tests.cpp                               | 4 ----
 unittests/contracts.hpp.in                                | 4 ----
 unittests/currency_tests.cpp                              | 4 ----
 unittests/database_tests.cpp                              | 4 ----
 unittests/delay_tests.cpp                                 | 4 ----
 unittests/eosio.token_tests.cpp                           | 4 ----
 unittests/eosio_system_tester.hpp                         | 4 ----
 unittests/fork_test_utilities.cpp                         | 4 ----
 unittests/fork_test_utilities.hpp                         | 4 ----
 unittests/forked_tests.cpp                                | 4 ----
 unittests/main.cpp                                        | 4 ----
 unittests/message_buffer_tests.cpp                        | 4 ----
 unittests/misc_tests.cpp                                  | 4 ----
 unittests/payloadless_tests.cpp                           | 4 ----
 unittests/producer_schedule_tests.cpp                     | 4 ----
 unittests/protocol_feature_tests.cpp                      | 4 ----
 unittests/ram_tests.cpp                                   | 4 ----
 unittests/resource_limits_test.cpp                        | 4 ----
 unittests/snapshot_tests.cpp                              | 4 ----
 unittests/snapshots.hpp.in                                | 4 ----
 unittests/special_accounts_tests.cpp                      | 4 ----
 unittests/test-contracts/asserter/asserter.cpp            | 4 ----
 unittests/test-contracts/asserter/asserter.hpp            | 4 ----
 unittests/test-contracts/deferred_test/deferred_test.cpp  | 4 ----
 unittests/test-contracts/deferred_test/deferred_test.hpp  | 4 ----
 .../test-contracts/get_sender_test/get_sender_test.cpp    | 4 ----
 .../test-contracts/get_sender_test/get_sender_test.hpp    | 4 ----
 .../test-contracts/integration_test/integration_test.cpp  | 4 ----
 .../test-contracts/integration_test/integration_test.hpp  | 4 ----
 unittests/test-contracts/noop/noop.cpp                    | 4 ----
 unittests/test-contracts/noop/noop.hpp                    | 4 ----
 unittests/test-contracts/payloadless/payloadless.cpp      | 5 -----
 unittests/test-contracts/payloadless/payloadless.hpp      | 4 ----
 unittests/test-contracts/proxy/proxy.cpp                  | 4 ----
 unittests/test-contracts/proxy/proxy.hpp                  | 4 ----
 .../ram_restrictions_test/ram_restrictions_test.cpp       | 4 ----
 .../ram_restrictions_test/ram_restrictions_test.hpp       | 4 ----
 unittests/test-contracts/reject_all/reject_all.cpp        | 4 ----
 .../restrict_action_test/restrict_action_test.cpp         | 4 ----
 .../restrict_action_test/restrict_action_test.hpp         | 4 ----
 unittests/test-contracts/snapshot_test/snapshot_test.cpp  | 4 ----
 unittests/test-contracts/snapshot_test/snapshot_test.hpp  | 4 ----
 unittests/test-contracts/test_api/test_action.cpp         | 4 ----
 unittests/test-contracts/test_api/test_api.cpp            | 4 ----
 unittests/test-contracts/test_api/test_api.hpp            | 4 ----
 unittests/test-contracts/test_api/test_api_common.hpp     | 4 ----
 unittests/test-contracts/test_api/test_chain.cpp          | 4 ----
 unittests/test-contracts/test_api/test_checktime.cpp      | 4 ----
 unittests/test-contracts/test_api/test_crypto.cpp         | 4 ----
 unittests/test-contracts/test_api/test_datastream.cpp     | 4 ----
 unittests/test-contracts/test_api/test_permission.cpp     | 4 ----
 unittests/test-contracts/test_api/test_print.cpp          | 4 ----
 unittests/test-contracts/test_api/test_transaction.cpp    | 4 ----
 unittests/test-contracts/test_api/test_types.cpp          | 4 ----
 unittests/test-contracts/test_api_db/test_api_db.cpp      | 4 ----
 unittests/test-contracts/test_api_db/test_api_db.hpp      | 4 ----
 .../test_api_multi_index/test_api_multi_index.cpp         | 4 ----
 .../test_api_multi_index/test_api_multi_index.hpp         | 4 ----
 .../test-contracts/test_ram_limit/test_ram_limit.cpp      | 4 ----
 unittests/unapplied_transaction_queue_tests.cpp           | 4 ----
 unittests/wasm_tests.cpp                                  | 4 ----
 unittests/whitelist_blacklist_tests.cpp                   | 4 ----
 211 files changed, 4 insertions(+), 862 deletions(-)

diff --git a/libraries/chain/abi_serializer.cpp b/libraries/chain/abi_serializer.cpp
index 30c88c22e07..4a029b193ea 100644
--- a/libraries/chain/abi_serializer.cpp
+++ b/libraries/chain/abi_serializer.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/chain/contract_types.hpp>
 #include <eosio/chain/authority.hpp>
diff --git a/libraries/chain/asset.cpp b/libraries/chain/asset.cpp
index 580156f6d21..7176f9dcc2e 100644
--- a/libraries/chain/asset.cpp
+++ b/libraries/chain/asset.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/asset.hpp>
 #include <boost/rational.hpp>
 #include <fc/reflect/variant.hpp>
diff --git a/libraries/chain/authorization_manager.cpp b/libraries/chain/authorization_manager.cpp
index 19284c6e6b8..9e76ff63bf3 100644
--- a/libraries/chain/authorization_manager.cpp
+++ b/libraries/chain/authorization_manager.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/authorization_manager.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/chain/permission_object.hpp>
diff --git a/libraries/chain/block.cpp b/libraries/chain/block.cpp
index 0f43874f77d..91c93f6c359 100644
--- a/libraries/chain/block.cpp
+++ b/libraries/chain/block.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/block.hpp>
 
 namespace eosio { namespace chain {
diff --git a/libraries/chain/block_header.cpp b/libraries/chain/block_header.cpp
index e436254fef4..0efc7728a1f 100644
--- a/libraries/chain/block_header.cpp
+++ b/libraries/chain/block_header.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/block.hpp>
 #include <eosio/chain/merkle.hpp>
 #include <fc/io/raw.hpp>
diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index d979b087fbf..776963c6d5e 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/block_log.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <fstream>
diff --git a/libraries/chain/chain_config.cpp b/libraries/chain/chain_config.cpp
index 35c77f8325d..5aa72c2b9b1 100644
--- a/libraries/chain/chain_config.cpp
+++ b/libraries/chain/chain_config.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/chain_config.hpp>
 #include <eosio/chain/exceptions.hpp>
 
diff --git a/libraries/chain/chain_id_type.cpp b/libraries/chain/chain_id_type.cpp
index 634d4623c98..bd0b4226b84 100644
--- a/libraries/chain/chain_id_type.cpp
+++ b/libraries/chain/chain_id_type.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/chain_id_type.hpp>
 #include <eosio/chain/exceptions.hpp>
 
diff --git a/libraries/chain/eosio_contract.cpp b/libraries/chain/eosio_contract.cpp
index 887d00c9077..ccb85a82ac2 100644
--- a/libraries/chain/eosio_contract.cpp
+++ b/libraries/chain/eosio_contract.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/eosio_contract.hpp>
 #include <eosio/chain/contract_table_objects.hpp>
 
diff --git a/libraries/chain/genesis_intrinsics.cpp b/libraries/chain/genesis_intrinsics.cpp
index be6077acbb1..8a0c13ec165 100644
--- a/libraries/chain/genesis_intrinsics.cpp
+++ b/libraries/chain/genesis_intrinsics.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/genesis_intrinsics.hpp>
 
 namespace eosio { namespace chain {
diff --git a/libraries/chain/genesis_state.cpp b/libraries/chain/genesis_state.cpp
index 23d8986e5bd..3a6e1650b70 100644
--- a/libraries/chain/genesis_state.cpp
+++ b/libraries/chain/genesis_state.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/genesis_state.hpp>
 
 // these are required to serialize a genesis_state
diff --git a/libraries/chain/genesis_state_root_key.cpp.in b/libraries/chain/genesis_state_root_key.cpp.in
index 11bbde26397..91c751519ef 100644
--- a/libraries/chain/genesis_state_root_key.cpp.in
+++ b/libraries/chain/genesis_state_root_key.cpp.in
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/genesis_state.hpp>
 
 namespace eosio { namespace chain {
diff --git a/libraries/chain/include/eosio/chain/abi_def.hpp b/libraries/chain/include/eosio/chain/abi_def.hpp
index 9b1d211d623..34b0312be57 100644
--- a/libraries/chain/include/eosio/chain/abi_def.hpp
+++ b/libraries/chain/include/eosio/chain/abi_def.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/abi_serializer.hpp b/libraries/chain/include/eosio/chain/abi_serializer.hpp
index 79c6d472942..df67be86ad1 100644
--- a/libraries/chain/include/eosio/chain/abi_serializer.hpp
+++ b/libraries/chain/include/eosio/chain/abi_serializer.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/abi_def.hpp>
 #include <eosio/chain/trace.hpp>
diff --git a/libraries/chain/include/eosio/chain/account_object.hpp b/libraries/chain/include/eosio/chain/account_object.hpp
index 235c3b91284..8c8da161a24 100644
--- a/libraries/chain/include/eosio/chain/account_object.hpp
+++ b/libraries/chain/include/eosio/chain/account_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/database_utils.hpp>
 #include <eosio/chain/authority.hpp>
diff --git a/libraries/chain/include/eosio/chain/action.hpp b/libraries/chain/include/eosio/chain/action.hpp
index 9912e2f31b7..1e593447955 100644
--- a/libraries/chain/include/eosio/chain/action.hpp
+++ b/libraries/chain/include/eosio/chain/action.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/action_receipt.hpp b/libraries/chain/include/eosio/chain/action_receipt.hpp
index 17fe4f46713..78ef25c7c00 100644
--- a/libraries/chain/include/eosio/chain/action_receipt.hpp
+++ b/libraries/chain/include/eosio/chain/action_receipt.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/apply_context.hpp b/libraries/chain/include/eosio/chain/apply_context.hpp
index d553de77b8b..8b1cf7d6844 100644
--- a/libraries/chain/include/eosio/chain/apply_context.hpp
+++ b/libraries/chain/include/eosio/chain/apply_context.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/controller.hpp>
 #include <eosio/chain/transaction.hpp>
diff --git a/libraries/chain/include/eosio/chain/asset.hpp b/libraries/chain/include/eosio/chain/asset.hpp
index f75420cbb52..dd427e3976d 100644
--- a/libraries/chain/include/eosio/chain/asset.hpp
+++ b/libraries/chain/include/eosio/chain/asset.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/authority.hpp b/libraries/chain/include/eosio/chain/authority.hpp
index 882d7be0799..492fd9b404f 100644
--- a/libraries/chain/include/eosio/chain/authority.hpp
+++ b/libraries/chain/include/eosio/chain/authority.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <chainbase/chainbase.hpp>
 #include <eosio/chain/transaction.hpp>
diff --git a/libraries/chain/include/eosio/chain/authority_checker.hpp b/libraries/chain/include/eosio/chain/authority_checker.hpp
index f23404288df..e90bd5a49c3 100644
--- a/libraries/chain/include/eosio/chain/authority_checker.hpp
+++ b/libraries/chain/include/eosio/chain/authority_checker.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/authorization_manager.hpp b/libraries/chain/include/eosio/chain/authorization_manager.hpp
index 3e9ffd0bb42..2d67cc7adab 100644
--- a/libraries/chain/include/eosio/chain/authorization_manager.hpp
+++ b/libraries/chain/include/eosio/chain/authorization_manager.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index c0684d566a6..451f8294633 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <fc/filesystem.hpp>
 #include <eosio/chain/block.hpp>
diff --git a/libraries/chain/include/eosio/chain/block_state.hpp b/libraries/chain/include/eosio/chain/block_state.hpp
index 8f26ba02f56..6385500e5d2 100644
--- a/libraries/chain/include/eosio/chain/block_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_state.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/block_header_state.hpp>
diff --git a/libraries/chain/include/eosio/chain/block_summary_object.hpp b/libraries/chain/include/eosio/chain/block_summary_object.hpp
index 0bb24ee7976..7ec03910a1f 100644
--- a/libraries/chain/include/eosio/chain/block_summary_object.hpp
+++ b/libraries/chain/include/eosio/chain/block_summary_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/types.hpp>
 
diff --git a/libraries/chain/include/eosio/chain/chain_config.hpp b/libraries/chain/include/eosio/chain/chain_config.hpp
index 37b73cb51fe..9e83b09779f 100644
--- a/libraries/chain/include/eosio/chain/chain_config.hpp
+++ b/libraries/chain/include/eosio/chain/chain_config.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/chain_id_type.hpp b/libraries/chain/include/eosio/chain/chain_id_type.hpp
index 59ab8f248b0..d5bc99322b8 100644
--- a/libraries/chain/include/eosio/chain/chain_id_type.hpp
+++ b/libraries/chain/include/eosio/chain/chain_id_type.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <fc/crypto/sha256.hpp>
diff --git a/libraries/chain/include/eosio/chain/chain_snapshot.hpp b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
index e7322b56ace..e29b2591d03 100644
--- a/libraries/chain/include/eosio/chain/chain_snapshot.hpp
+++ b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/exceptions.hpp>
diff --git a/libraries/chain/include/eosio/chain/code_object.hpp b/libraries/chain/include/eosio/chain/code_object.hpp
index 3309704a335..043d9855d9b 100644
--- a/libraries/chain/include/eosio/chain/code_object.hpp
+++ b/libraries/chain/include/eosio/chain/code_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/database_utils.hpp>
 #include <boost/tuple/tuple_io.hpp>
diff --git a/libraries/chain/include/eosio/chain/config.hpp b/libraries/chain/include/eosio/chain/config.hpp
index 32f423beebe..746fc06fc2c 100644
--- a/libraries/chain/include/eosio/chain/config.hpp
+++ b/libraries/chain/include/eosio/chain/config.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/wasm_interface.hpp>
 #include <fc/time.hpp>
diff --git a/libraries/chain/include/eosio/chain/contract_table_objects.hpp b/libraries/chain/include/eosio/chain/contract_table_objects.hpp
index fb02fb5e1e0..baf549a2b13 100644
--- a/libraries/chain/include/eosio/chain/contract_table_objects.hpp
+++ b/libraries/chain/include/eosio/chain/contract_table_objects.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/database_utils.hpp>
diff --git a/libraries/chain/include/eosio/chain/core_symbol.hpp.in b/libraries/chain/include/eosio/chain/core_symbol.hpp.in
index c07f1ae267d..bb15ae8189d 100644
--- a/libraries/chain/include/eosio/chain/core_symbol.hpp.in
+++ b/libraries/chain/include/eosio/chain/core_symbol.hpp.in
@@ -1,8 +1,6 @@
-/** @file 
- *    @copyright defined in eos/LICENSE 
- *
+/**  
  * \warning This file is machine generated. DO NOT EDIT.  See core_symbol.hpp.in for changes.
  */
 
 #define CORE_SYMBOL SY(4,${CORE_SYMBOL_NAME})
-#define CORE_SYMBOL_NAME "${CORE_SYMBOL_NAME}"
\ No newline at end of file
+#define CORE_SYMBOL_NAME "${CORE_SYMBOL_NAME}"
diff --git a/libraries/chain/include/eosio/chain/database_header_object.hpp b/libraries/chain/include/eosio/chain/database_header_object.hpp
index 7b5348b756d..41dade55734 100644
--- a/libraries/chain/include/eosio/chain/database_header_object.hpp
+++ b/libraries/chain/include/eosio/chain/database_header_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/types.hpp>
 
diff --git a/libraries/chain/include/eosio/chain/database_utils.hpp b/libraries/chain/include/eosio/chain/database_utils.hpp
index 19de97bd3da..52f8a42cd68 100644
--- a/libraries/chain/include/eosio/chain/database_utils.hpp
+++ b/libraries/chain/include/eosio/chain/database_utils.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/eosio_contract.hpp b/libraries/chain/include/eosio/chain/eosio_contract.hpp
index 1bf9163827e..df881f5462c 100644
--- a/libraries/chain/include/eosio/chain/eosio_contract.hpp
+++ b/libraries/chain/include/eosio/chain/eosio_contract.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/exceptions.hpp b/libraries/chain/include/eosio/chain/exceptions.hpp
index 6d8e6682177..b6ddb73ca7e 100644
--- a/libraries/chain/include/eosio/chain/exceptions.hpp
+++ b/libraries/chain/include/eosio/chain/exceptions.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <fc/exception/exception.hpp>
diff --git a/libraries/chain/include/eosio/chain/fixed_key.hpp b/libraries/chain/include/eosio/chain/fixed_key.hpp
index 5dd90f901ad..f2a48162c99 100644
--- a/libraries/chain/include/eosio/chain/fixed_key.hpp
+++ b/libraries/chain/include/eosio/chain/fixed_key.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <array>
diff --git a/libraries/chain/include/eosio/chain/generated_transaction_object.hpp b/libraries/chain/include/eosio/chain/generated_transaction_object.hpp
index 74e07a4d9e9..a93e65296e4 100644
--- a/libraries/chain/include/eosio/chain/generated_transaction_object.hpp
+++ b/libraries/chain/include/eosio/chain/generated_transaction_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/config.hpp>
 #include <eosio/chain/database_utils.hpp>
diff --git a/libraries/chain/include/eosio/chain/genesis_intrinsics.hpp b/libraries/chain/include/eosio/chain/genesis_intrinsics.hpp
index bd736d6a285..10eb4f8858a 100644
--- a/libraries/chain/include/eosio/chain/genesis_intrinsics.hpp
+++ b/libraries/chain/include/eosio/chain/genesis_intrinsics.hpp
@@ -1,8 +1,3 @@
-
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <vector>
diff --git a/libraries/chain/include/eosio/chain/genesis_state.hpp b/libraries/chain/include/eosio/chain/genesis_state.hpp
index 364f505629e..5e5b643a1b5 100644
--- a/libraries/chain/include/eosio/chain/genesis_state.hpp
+++ b/libraries/chain/include/eosio/chain/genesis_state.hpp
@@ -1,8 +1,3 @@
-
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/chain_config.hpp>
diff --git a/libraries/chain/include/eosio/chain/global_property_object.hpp b/libraries/chain/include/eosio/chain/global_property_object.hpp
index 99b4e8ba3dd..e5104414771 100644
--- a/libraries/chain/include/eosio/chain/global_property_object.hpp
+++ b/libraries/chain/include/eosio/chain/global_property_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <fc/uint128.hpp>
 #include <fc/array.hpp>
diff --git a/libraries/chain/include/eosio/chain/multi_index_includes.hpp b/libraries/chain/include/eosio/chain/multi_index_includes.hpp
index 2bb5485194c..3fbc55a2a1d 100644
--- a/libraries/chain/include/eosio/chain/multi_index_includes.hpp
+++ b/libraries/chain/include/eosio/chain/multi_index_includes.hpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #pragma once
 
 #include <boost/multi_index_container.hpp>
diff --git a/libraries/chain/include/eosio/chain/parallel_markers.hpp b/libraries/chain/include/eosio/chain/parallel_markers.hpp
index 7436f970630..349bc90d352 100644
--- a/libraries/chain/include/eosio/chain/parallel_markers.hpp
+++ b/libraries/chain/include/eosio/chain/parallel_markers.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <boost/range/combine.hpp>
diff --git a/libraries/chain/include/eosio/chain/permission_link_object.hpp b/libraries/chain/include/eosio/chain/permission_link_object.hpp
index ee5b1287b18..acd6f45e33f 100644
--- a/libraries/chain/include/eosio/chain/permission_link_object.hpp
+++ b/libraries/chain/include/eosio/chain/permission_link_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/authority.hpp>
 
diff --git a/libraries/chain/include/eosio/chain/permission_object.hpp b/libraries/chain/include/eosio/chain/permission_object.hpp
index 335ce754907..d323a1ef899 100644
--- a/libraries/chain/include/eosio/chain/permission_object.hpp
+++ b/libraries/chain/include/eosio/chain/permission_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/authority.hpp>
 #include <eosio/chain/database_utils.hpp>
diff --git a/libraries/chain/include/eosio/chain/protocol.hpp b/libraries/chain/include/eosio/chain/protocol.hpp
index 389e9c08723..ab03127c12b 100644
--- a/libraries/chain/include/eosio/chain/protocol.hpp
+++ b/libraries/chain/include/eosio/chain/protocol.hpp
@@ -1,6 +1,2 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/block.hpp>
diff --git a/libraries/chain/include/eosio/chain/protocol_feature_activation.hpp b/libraries/chain/include/eosio/chain/protocol_feature_activation.hpp
index 03ab31be131..8201b76115e 100644
--- a/libraries/chain/include/eosio/chain/protocol_feature_activation.hpp
+++ b/libraries/chain/include/eosio/chain/protocol_feature_activation.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp b/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
index 37890fb0b6a..81d22c15b0e 100644
--- a/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
+++ b/libraries/chain/include/eosio/chain/protocol_feature_manager.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/protocol_state_object.hpp b/libraries/chain/include/eosio/chain/protocol_state_object.hpp
index dfbb4373a8a..dc0eabd1f1b 100644
--- a/libraries/chain/include/eosio/chain/protocol_state_object.hpp
+++ b/libraries/chain/include/eosio/chain/protocol_state_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/reversible_block_object.hpp b/libraries/chain/include/eosio/chain/reversible_block_object.hpp
index c493a4915e2..690d3c1953c 100644
--- a/libraries/chain/include/eosio/chain/reversible_block_object.hpp
+++ b/libraries/chain/include/eosio/chain/reversible_block_object.hpp
@@ -1,8 +1,3 @@
-
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/types.hpp>
 #include <eosio/chain/authority.hpp>
diff --git a/libraries/chain/include/eosio/chain/snapshot.hpp b/libraries/chain/include/eosio/chain/snapshot.hpp
index 499fbe29960..618e8d36088 100644
--- a/libraries/chain/include/eosio/chain/snapshot.hpp
+++ b/libraries/chain/include/eosio/chain/snapshot.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/database_utils.hpp>
diff --git a/libraries/chain/include/eosio/chain/symbol.hpp b/libraries/chain/include/eosio/chain/symbol.hpp
index de4a37514a6..1faa3038921 100644
--- a/libraries/chain/include/eosio/chain/symbol.hpp
+++ b/libraries/chain/include/eosio/chain/symbol.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <fc/exception/exception.hpp>
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/thread_utils.hpp b/libraries/chain/include/eosio/chain/thread_utils.hpp
index b3aea3085f5..3ec462d5402 100644
--- a/libraries/chain/include/eosio/chain/thread_utils.hpp
+++ b/libraries/chain/include/eosio/chain/thread_utils.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #pragma once
 
 #include <fc/optional.hpp>
diff --git a/libraries/chain/include/eosio/chain/trace.hpp b/libraries/chain/include/eosio/chain/trace.hpp
index 0db1be762ff..a7a069bde38 100644
--- a/libraries/chain/include/eosio/chain/trace.hpp
+++ b/libraries/chain/include/eosio/chain/trace.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/action.hpp>
diff --git a/libraries/chain/include/eosio/chain/transaction.hpp b/libraries/chain/include/eosio/chain/transaction.hpp
index 42648c05b84..a9d523a9e0a 100644
--- a/libraries/chain/include/eosio/chain/transaction.hpp
+++ b/libraries/chain/include/eosio/chain/transaction.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/action.hpp>
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index fc17ef64a2a..a4bdd469510 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/transaction.hpp>
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/include/eosio/chain/transaction_object.hpp b/libraries/chain/include/eosio/chain/transaction_object.hpp
index cf87e11b5e9..d43b449be48 100644
--- a/libraries/chain/include/eosio/chain/transaction_object.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <fc/io/raw.hpp>
 
diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp
index 81c8e8b8924..6f259f73b02 100644
--- a/libraries/chain/include/eosio/chain/types.hpp
+++ b/libraries/chain/include/eosio/chain/types.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/name.hpp>
 #include <eosio/chain/chain_id_type.hpp>
diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index e72885a32d0..cea2b586d8c 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #pragma once
 
 #include <eosio/chain/transaction_metadata.hpp>
diff --git a/libraries/chain/include/eosio/chain/wast_to_wasm.hpp b/libraries/chain/include/eosio/chain/wast_to_wasm.hpp
index 1493f2f99f7..eb478d7653a 100644
--- a/libraries/chain/include/eosio/chain/wast_to_wasm.hpp
+++ b/libraries/chain/include/eosio/chain/wast_to_wasm.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <vector>
 #include <string>
diff --git a/libraries/chain/include/eosio/chain/whitelisted_intrinsics.hpp b/libraries/chain/include/eosio/chain/whitelisted_intrinsics.hpp
index 96fbf2e2195..3997993d77c 100644
--- a/libraries/chain/include/eosio/chain/whitelisted_intrinsics.hpp
+++ b/libraries/chain/include/eosio/chain/whitelisted_intrinsics.hpp
@@ -1,8 +1,3 @@
-
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/libraries/chain/producer_schedule.cpp b/libraries/chain/producer_schedule.cpp
index 03d4469578f..23aa205273f 100644
--- a/libraries/chain/producer_schedule.cpp
+++ b/libraries/chain/producer_schedule.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/producer_schedule.hpp>
 
 namespace eosio { namespace chain {
diff --git a/libraries/chain/protocol_feature_activation.cpp b/libraries/chain/protocol_feature_activation.cpp
index b0b7a563073..ca6f689d744 100644
--- a/libraries/chain/protocol_feature_activation.cpp
+++ b/libraries/chain/protocol_feature_activation.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/protocol_feature_activation.hpp>
 #include <eosio/chain/exceptions.hpp>
 
diff --git a/libraries/chain/protocol_feature_manager.cpp b/libraries/chain/protocol_feature_manager.cpp
index 9e944cd4f92..d61a7fe25c4 100644
--- a/libraries/chain/protocol_feature_manager.cpp
+++ b/libraries/chain/protocol_feature_manager.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/protocol_feature_manager.hpp>
 #include <eosio/chain/protocol_state_object.hpp>
 #include <eosio/chain/exceptions.hpp>
diff --git a/libraries/chain/protocol_state_object.cpp b/libraries/chain/protocol_state_object.cpp
index 7009ee57874..142df3b1319 100644
--- a/libraries/chain/protocol_state_object.cpp
+++ b/libraries/chain/protocol_state_object.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/protocol_state_object.hpp>
 
 namespace eosio { namespace chain {
diff --git a/libraries/chain/thread_utils.cpp b/libraries/chain/thread_utils.cpp
index 1d8a2707c14..88f49e4228c 100644
--- a/libraries/chain/thread_utils.cpp
+++ b/libraries/chain/thread_utils.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
-
 #include <eosio/chain/thread_utils.hpp>
 #include <fc/log/logger_config.hpp>
 
diff --git a/libraries/chain/trace.cpp b/libraries/chain/trace.cpp
index 44a7ba94cfd..7ce555d8a11 100644
--- a/libraries/chain/trace.cpp
+++ b/libraries/chain/trace.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/trace.hpp>
 
 namespace eosio { namespace chain {
diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index 36102723ba4..1c4a96935be 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <fc/io/raw.hpp>
 #include <fc/bitutil.hpp>
 #include <fc/smart_ref_impl.hpp>
diff --git a/libraries/chain/wast_to_wasm.cpp b/libraries/chain/wast_to_wasm.cpp
index 09add7a0b6e..0527d57f604 100644
--- a/libraries/chain/wast_to_wasm.cpp
+++ b/libraries/chain/wast_to_wasm.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/wast_to_wasm.hpp>
 #include <Inline/BasicTypes.h>
 #include <IR/Module.h>
diff --git a/libraries/chain/whitelisted_intrinsics.cpp b/libraries/chain/whitelisted_intrinsics.cpp
index 6a4756bf502..cd3974d1ce5 100644
--- a/libraries/chain/whitelisted_intrinsics.cpp
+++ b/libraries/chain/whitelisted_intrinsics.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/whitelisted_intrinsics.hpp>
 #include <eosio/chain/exceptions.hpp>
 
diff --git a/libraries/fc b/libraries/fc
index 0732c19245f..e49b3bc4180 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 0732c19245fad322b8785f9d43efda2117066490
+Subproject commit e49b3bc418038c085216cca03d452b1c788d6252
diff --git a/libraries/version/include/eosio/version/version.hpp b/libraries/version/include/eosio/version/version.hpp
index d9bf85f709d..5934abdcb53 100644
--- a/libraries/version/include/eosio/version/version.hpp
+++ b/libraries/version/include/eosio/version/version.hpp
@@ -1,8 +1,3 @@
-/**
- *  @file version.hpp
- *  @copyright defined in eos/LICENSE
- */
-
 #pragma once
 
 #include <string> // std::string
diff --git a/libraries/version/src/version.cpp b/libraries/version/src/version.cpp
index 16a23995969..f391c78ead3 100644
--- a/libraries/version/src/version.cpp
+++ b/libraries/version/src/version.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file version.cpp
- *  @copyright defined in eos/LICENSE
- */
-
 #include "version_impl.hpp"
 
 namespace eosio { namespace version {
diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 6a45c1dff1f..67d44c2ccc4 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -1,6 +1,4 @@
 /**
- *  @file version_impl.cpp.in
- *  @copyright defined in eos/LICENSE
  *  \warning This file is machine generated. DO NOT EDIT.  See version_impl.cpp.in for changes.
  */
 
diff --git a/libraries/version/src/version_impl.hpp b/libraries/version/src/version_impl.hpp
index 8266383a417..54ffae1b5d1 100644
--- a/libraries/version/src/version_impl.hpp
+++ b/libraries/version/src/version_impl.hpp
@@ -1,8 +1,3 @@
-/**
- *  @file version_impl.hpp
- *  @copyright defined in eos/LICENSE
- */
-
 #pragma once
 
 #include <string> // std::string
diff --git a/plugins/chain_api_plugin/chain_api_plugin.cpp b/plugins/chain_api_plugin/chain_api_plugin.cpp
index 3a591eedbb5..334d560baae 100644
--- a/plugins/chain_api_plugin/chain_api_plugin.cpp
+++ b/plugins/chain_api_plugin/chain_api_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain_api_plugin/chain_api_plugin.hpp>
 #include <eosio/chain/exceptions.hpp>
 
diff --git a/plugins/chain_api_plugin/include/eosio/chain_api_plugin/chain_api_plugin.hpp b/plugins/chain_api_plugin/include/eosio/chain_api_plugin/chain_api_plugin.hpp
index 9a854cf0b56..d2064aef4e7 100644
--- a/plugins/chain_api_plugin/include/eosio/chain_api_plugin/chain_api_plugin.hpp
+++ b/plugins/chain_api_plugin/include/eosio/chain_api_plugin/chain_api_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain_plugin/chain_plugin.hpp>
 #include <eosio/http_plugin/http_plugin.hpp>
diff --git a/plugins/chain_interface/include/eosio/chain/plugin_interface.hpp b/plugins/chain_interface/include/eosio/chain/plugin_interface.hpp
index 8870853f691..44ef1860c60 100644
--- a/plugins/chain_interface/include/eosio/chain/plugin_interface.hpp
+++ b/plugins/chain_interface/include/eosio/chain/plugin_interface.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <appbase/channel.hpp>
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index a911ca2cf1a..35038f15072 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain_plugin/chain_plugin.hpp>
 #include <eosio/chain/fork_database.hpp>
 #include <eosio/chain/block_log.hpp>
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 5c8161ecb46..71581bb4ae8 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 #include <eosio/chain/asset.hpp>
diff --git a/plugins/db_size_api_plugin/db_size_api_plugin.cpp b/plugins/db_size_api_plugin/db_size_api_plugin.cpp
index 8c6df9566fe..1f5cff033b8 100644
--- a/plugins/db_size_api_plugin/db_size_api_plugin.cpp
+++ b/plugins/db_size_api_plugin/db_size_api_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <fc/variant.hpp>
 #include <fc/io/json.hpp>
 #include <eosio/db_size_api_plugin/db_size_api_plugin.hpp>
diff --git a/plugins/db_size_api_plugin/include/eosio/db_size_api_plugin/db_size_api_plugin.hpp b/plugins/db_size_api_plugin/include/eosio/db_size_api_plugin/db_size_api_plugin.hpp
index 54a2d8ef63b..76495b23381 100644
--- a/plugins/db_size_api_plugin/include/eosio/db_size_api_plugin/db_size_api_plugin.hpp
+++ b/plugins/db_size_api_plugin/include/eosio/db_size_api_plugin/db_size_api_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/http_plugin/http_plugin.hpp>
diff --git a/plugins/faucet_testnet_plugin/faucet_testnet_plugin.cpp b/plugins/faucet_testnet_plugin/faucet_testnet_plugin.cpp
index 32db7146f6d..c4ddba45425 100644
--- a/plugins/faucet_testnet_plugin/faucet_testnet_plugin.cpp
+++ b/plugins/faucet_testnet_plugin/faucet_testnet_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/faucet_testnet_plugin/faucet_testnet_plugin.hpp>
 #include <eosio/chain_plugin/chain_plugin.hpp>
 
diff --git a/plugins/faucet_testnet_plugin/include/eosio/faucet_testnet_plugin/faucet_testnet_plugin.hpp b/plugins/faucet_testnet_plugin/include/eosio/faucet_testnet_plugin/faucet_testnet_plugin.hpp
index f59b1ef9bb3..237347df985 100644
--- a/plugins/faucet_testnet_plugin/include/eosio/faucet_testnet_plugin/faucet_testnet_plugin.hpp
+++ b/plugins/faucet_testnet_plugin/include/eosio/faucet_testnet_plugin/faucet_testnet_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 #include <eosio/http_plugin/http_plugin.hpp>
diff --git a/plugins/history_api_plugin/history_api_plugin.cpp b/plugins/history_api_plugin/history_api_plugin.cpp
index d76dd7fd44b..b5155c68f7e 100644
--- a/plugins/history_api_plugin/history_api_plugin.cpp
+++ b/plugins/history_api_plugin/history_api_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/history_api_plugin/history_api_plugin.hpp>
 #include <eosio/chain/exceptions.hpp>
 
diff --git a/plugins/history_api_plugin/include/eosio/history_api_plugin/history_api_plugin.hpp b/plugins/history_api_plugin/include/eosio/history_api_plugin/history_api_plugin.hpp
index 5e6dd936e24..557ac1b48b1 100644
--- a/plugins/history_api_plugin/include/eosio/history_api_plugin/history_api_plugin.hpp
+++ b/plugins/history_api_plugin/include/eosio/history_api_plugin/history_api_plugin.hpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #pragma once
 #include <eosio/history_plugin/history_plugin.hpp>
 #include <eosio/chain_plugin/chain_plugin.hpp>
diff --git a/plugins/history_plugin/include/eosio/history_plugin/account_control_history_object.hpp b/plugins/history_plugin/include/eosio/history_plugin/account_control_history_object.hpp
index 5005c279f5a..29529876440 100644
--- a/plugins/history_plugin/include/eosio/history_plugin/account_control_history_object.hpp
+++ b/plugins/history_plugin/include/eosio/history_plugin/account_control_history_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <chainbase/chainbase.hpp>
diff --git a/plugins/history_plugin/include/eosio/history_plugin/history_plugin.hpp b/plugins/history_plugin/include/eosio/history_plugin/history_plugin.hpp
index 4cfb2588e46..0bbeda361be 100644
--- a/plugins/history_plugin/include/eosio/history_plugin/history_plugin.hpp
+++ b/plugins/history_plugin/include/eosio/history_plugin/history_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 
diff --git a/plugins/history_plugin/include/eosio/history_plugin/public_key_history_object.hpp b/plugins/history_plugin/include/eosio/history_plugin/public_key_history_object.hpp
index 2e8e37f0049..052f74c5a54 100644
--- a/plugins/history_plugin/include/eosio/history_plugin/public_key_history_object.hpp
+++ b/plugins/history_plugin/include/eosio/history_plugin/public_key_history_object.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <chainbase/chainbase.hpp>
diff --git a/plugins/http_client_plugin/http_client_plugin.cpp b/plugins/http_client_plugin/http_client_plugin.cpp
index cb9d7c8e580..60811ff44ba 100644
--- a/plugins/http_client_plugin/http_client_plugin.cpp
+++ b/plugins/http_client_plugin/http_client_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/http_client_plugin/http_client_plugin.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/plugins/http_client_plugin/include/eosio/http_client_plugin/http_client_plugin.hpp b/plugins/http_client_plugin/include/eosio/http_client_plugin/http_client_plugin.hpp
index 95803bed1f8..0b6303dbc22 100644
--- a/plugins/http_client_plugin/include/eosio/http_client_plugin/http_client_plugin.hpp
+++ b/plugins/http_client_plugin/include/eosio/http_client_plugin/http_client_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 #include <fc/network/http/http_client.hpp>
diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index 6bb609c980c..492c7425241 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/http_plugin/http_plugin.hpp>
 #ifdef BOOST_ASIO_HAS_LOCAL_SOCKETS
 #include <eosio/http_plugin/local_endpoint.hpp>
diff --git a/plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp b/plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp
index 5b84a18f3ac..5c81279fe62 100644
--- a/plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp
+++ b/plugins/http_plugin/include/eosio/http_plugin/http_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 #include <fc/exception/exception.hpp>
diff --git a/plugins/login_plugin/include/eosio/login_plugin/login_plugin.hpp b/plugins/login_plugin/include/eosio/login_plugin/login_plugin.hpp
index 29c2660c6f3..ae8023a652f 100644
--- a/plugins/login_plugin/include/eosio/login_plugin/login_plugin.hpp
+++ b/plugins/login_plugin/include/eosio/login_plugin/login_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain_plugin/chain_plugin.hpp>
 #include <eosio/http_plugin/http_plugin.hpp>
diff --git a/plugins/login_plugin/login_plugin.cpp b/plugins/login_plugin/login_plugin.cpp
index 374a04b25dc..5d1903c0933 100644
--- a/plugins/login_plugin/login_plugin.cpp
+++ b/plugins/login_plugin/login_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/authorization_manager.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/login_plugin/login_plugin.hpp>
diff --git a/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp b/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp
index 4eb21748fb2..984c5fd8b75 100644
--- a/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp
+++ b/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/bson.hpp
@@ -1,7 +1,3 @@
-/**
- *   @file
- *   @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <bsoncxx/builder/basic/document.hpp>
diff --git a/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/mongo_db_plugin.hpp b/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/mongo_db_plugin.hpp
index 3b636651056..8dfbf09bff1 100644
--- a/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/mongo_db_plugin.hpp
+++ b/plugins/mongo_db_plugin/include/eosio/mongo_db_plugin/mongo_db_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain_plugin/chain_plugin.hpp>
diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index 7c85d936841..3d65af55ccc 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/mongo_db_plugin/mongo_db_plugin.hpp>
 #include <eosio/mongo_db_plugin/bson.hpp>
 #include <eosio/chain/eosio_contract.hpp>
diff --git a/plugins/net_api_plugin/include/eosio/net_api_plugin/net_api_plugin.hpp b/plugins/net_api_plugin/include/eosio/net_api_plugin/net_api_plugin.hpp
index 3c7e1e232ac..25e4a539278 100644
--- a/plugins/net_api_plugin/include/eosio/net_api_plugin/net_api_plugin.hpp
+++ b/plugins/net_api_plugin/include/eosio/net_api_plugin/net_api_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/net_plugin/net_plugin.hpp>
diff --git a/plugins/net_api_plugin/net_api_plugin.cpp b/plugins/net_api_plugin/net_api_plugin.cpp
index 315ea2816e9..17d6af921d5 100644
--- a/plugins/net_api_plugin/net_api_plugin.cpp
+++ b/plugins/net_api_plugin/net_api_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/net_api_plugin/net_api_plugin.hpp>
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/chain/transaction.hpp>
diff --git a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
index 2be1553543b..b7b3516e18f 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 #include <eosio/chain_plugin/chain_plugin.hpp>
diff --git a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
index 0d96e979222..1a81610c383 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/block.hpp>
 #include <eosio/chain/types.hpp>
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 45674b00ac1..5eb66ffc48f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/types.hpp>
 
 #include <eosio/net_plugin/net_plugin.hpp>
diff --git a/plugins/producer_api_plugin/include/eosio/producer_api_plugin/producer_api_plugin.hpp b/plugins/producer_api_plugin/include/eosio/producer_api_plugin/producer_api_plugin.hpp
index 137ef7b0703..fa63fef0c68 100644
--- a/plugins/producer_api_plugin/include/eosio/producer_api_plugin/producer_api_plugin.hpp
+++ b/plugins/producer_api_plugin/include/eosio/producer_api_plugin/producer_api_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/producer_plugin/producer_plugin.hpp>
diff --git a/plugins/producer_api_plugin/producer_api_plugin.cpp b/plugins/producer_api_plugin/producer_api_plugin.cpp
index b513ae6a442..bd3feb1e9bb 100644
--- a/plugins/producer_api_plugin/producer_api_plugin.cpp
+++ b/plugins/producer_api_plugin/producer_api_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/producer_api_plugin/producer_api_plugin.hpp>
 #include <eosio/chain/exceptions.hpp>
 
diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
index 839de9ac01d..6ebff8d4016 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #pragma once
 
 #include <eosio/chain_plugin/chain_plugin.hpp>
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 33319abb0ba..0f26273c176 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/producer_plugin/producer_plugin.hpp>
 #include <eosio/chain/plugin_interface.hpp>
 #include <eosio/chain/global_property_object.hpp>
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
index 8343ad8d36e..350b6c84dfc 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <boost/filesystem.hpp>
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_plugin.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_plugin.hpp
index a682b205e00..66f8de30b53 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_plugin.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 
diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index 96e1bb76662..2ce588766d0 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/account_object.hpp>
diff --git a/plugins/state_history_plugin/state_history_plugin.cpp b/plugins/state_history_plugin/state_history_plugin.cpp
index 90150b3d0cd..040c4678da9 100644
--- a/plugins/state_history_plugin/state_history_plugin.cpp
+++ b/plugins/state_history_plugin/state_history_plugin.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include <eosio/chain/config.hpp>
 #include <eosio/state_history_plugin/state_history_log.hpp>
 #include <eosio/state_history_plugin/state_history_serialization.hpp>
diff --git a/plugins/template_plugin/include/eosio/template_plugin/template_plugin.hpp b/plugins/template_plugin/include/eosio/template_plugin/template_plugin.hpp
index 3217b3b1640..a0acd5745f4 100644
--- a/plugins/template_plugin/include/eosio/template_plugin/template_plugin.hpp
+++ b/plugins/template_plugin/include/eosio/template_plugin/template_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 
diff --git a/plugins/template_plugin/template_plugin.cpp b/plugins/template_plugin/template_plugin.cpp
index d8a738c30bc..13085f3beb2 100644
--- a/plugins/template_plugin/template_plugin.cpp
+++ b/plugins/template_plugin/template_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/template_plugin/template_plugin.hpp>
 
 namespace eosio {
diff --git a/plugins/test_control_api_plugin/include/eosio/test_control_api_plugin/test_control_api_plugin.hpp b/plugins/test_control_api_plugin/include/eosio/test_control_api_plugin/test_control_api_plugin.hpp
index b9c165b8993..df536f4336e 100644
--- a/plugins/test_control_api_plugin/include/eosio/test_control_api_plugin/test_control_api_plugin.hpp
+++ b/plugins/test_control_api_plugin/include/eosio/test_control_api_plugin/test_control_api_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/test_control_plugin/test_control_plugin.hpp>
 #include <eosio/http_plugin/http_plugin.hpp>
diff --git a/plugins/test_control_api_plugin/test_control_api_plugin.cpp b/plugins/test_control_api_plugin/test_control_api_plugin.cpp
index a932a27cad9..0bac41fa1c0 100644
--- a/plugins/test_control_api_plugin/test_control_api_plugin.cpp
+++ b/plugins/test_control_api_plugin/test_control_api_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/test_control_api_plugin/test_control_api_plugin.hpp>
 #include <eosio/chain/exceptions.hpp>
 
diff --git a/plugins/test_control_plugin/include/eosio/test_control_plugin/test_control_plugin.hpp b/plugins/test_control_plugin/include/eosio/test_control_plugin/test_control_plugin.hpp
index 96badb10c83..df28318fce2 100644
--- a/plugins/test_control_plugin/include/eosio/test_control_plugin/test_control_plugin.hpp
+++ b/plugins/test_control_plugin/include/eosio/test_control_plugin/test_control_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 #include <eosio/chain_plugin/chain_plugin.hpp>
diff --git a/plugins/test_control_plugin/test_control_plugin.cpp b/plugins/test_control_plugin/test_control_plugin.cpp
index 16d2b7d7c8a..3ec82e722b9 100644
--- a/plugins/test_control_plugin/test_control_plugin.cpp
+++ b/plugins/test_control_plugin/test_control_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/test_control_plugin/test_control_plugin.hpp>
 #include <fc/optional.hpp>
 #include <atomic>
diff --git a/plugins/txn_test_gen_plugin/include/eosio/txn_test_gen_plugin/txn_test_gen_plugin.hpp b/plugins/txn_test_gen_plugin/include/eosio/txn_test_gen_plugin/txn_test_gen_plugin.hpp
index ebfe3bfb77c..8afee7e0907 100644
--- a/plugins/txn_test_gen_plugin/include/eosio/txn_test_gen_plugin/txn_test_gen_plugin.hpp
+++ b/plugins/txn_test_gen_plugin/include/eosio/txn_test_gen_plugin/txn_test_gen_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 #include <eosio/http_plugin/http_plugin.hpp>
diff --git a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
index eb5546c952d..6e5b8b32d9a 100644
--- a/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
+++ b/plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/txn_test_gen_plugin/txn_test_gen_plugin.hpp>
 #include <eosio/chain_plugin/chain_plugin.hpp>
 #include <eosio/chain/wast_to_wasm.hpp>
diff --git a/plugins/wallet_api_plugin/include/eosio/wallet_api_plugin/wallet_api_plugin.hpp b/plugins/wallet_api_plugin/include/eosio/wallet_api_plugin/wallet_api_plugin.hpp
index 611eed638d9..e3ba9dbe1b1 100644
--- a/plugins/wallet_api_plugin/include/eosio/wallet_api_plugin/wallet_api_plugin.hpp
+++ b/plugins/wallet_api_plugin/include/eosio/wallet_api_plugin/wallet_api_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/wallet_plugin/wallet_plugin.hpp>
diff --git a/plugins/wallet_api_plugin/wallet_api_plugin.cpp b/plugins/wallet_api_plugin/wallet_api_plugin.cpp
index 1750150885c..235aa515e38 100644
--- a/plugins/wallet_api_plugin/wallet_api_plugin.cpp
+++ b/plugins/wallet_api_plugin/wallet_api_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/wallet_api_plugin/wallet_api_plugin.hpp>
 #include <eosio/wallet_plugin/wallet_manager.hpp>
 #include <eosio/chain/exceptions.hpp>
diff --git a/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet.hpp b/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet.hpp
index 900577d082c..92f2c0e2276 100644
--- a/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet.hpp
+++ b/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_api.hpp b/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_api.hpp
index 61929b04733..bdca3ee93e1 100644
--- a/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_api.hpp
+++ b/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_api.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/types.hpp>
diff --git a/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_manager.hpp b/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_manager.hpp
index e61fb7b7617..07323a27158 100644
--- a/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_manager.hpp
+++ b/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_manager.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <eosio/chain/transaction.hpp>
 #include <eosio/wallet_plugin/wallet_api.hpp>
diff --git a/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_plugin.hpp b/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_plugin.hpp
index c23911fa6fb..17ddc7aea69 100644
--- a/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_plugin.hpp
+++ b/plugins/wallet_plugin/include/eosio/wallet_plugin/wallet_plugin.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <appbase/application.hpp>
 #include <fc/variant.hpp>
diff --git a/plugins/wallet_plugin/se_wallet.cpp b/plugins/wallet_plugin/se_wallet.cpp
index 64c8d0a46ba..84cda429e88 100644
--- a/plugins/wallet_plugin/se_wallet.cpp
+++ b/plugins/wallet_plugin/se_wallet.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/wallet_plugin/se_wallet.hpp>
 #include <eosio/wallet_plugin/macos_user_auth.h>
 #include <eosio/chain/exceptions.hpp>
diff --git a/plugins/wallet_plugin/wallet.cpp b/plugins/wallet_plugin/wallet.cpp
index a40027cb0a9..6c64de75491 100644
--- a/plugins/wallet_plugin/wallet.cpp
+++ b/plugins/wallet_plugin/wallet.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/wallet_plugin/wallet.hpp>
 
 #include <algorithm>
diff --git a/plugins/wallet_plugin/wallet_manager.cpp b/plugins/wallet_plugin/wallet_manager.cpp
index 43fa37bc61a..304fdccceb8 100644
--- a/plugins/wallet_plugin/wallet_manager.cpp
+++ b/plugins/wallet_plugin/wallet_manager.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <appbase/application.hpp>
 #include <eosio/wallet_plugin/wallet_manager.hpp>
 #include <eosio/wallet_plugin/wallet.hpp>
diff --git a/plugins/wallet_plugin/wallet_plugin.cpp b/plugins/wallet_plugin/wallet_plugin.cpp
index cfd435390a6..1b1d6aa602b 100644
--- a/plugins/wallet_plugin/wallet_plugin.cpp
+++ b/plugins/wallet_plugin/wallet_plugin.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/wallet_plugin/wallet_plugin.hpp>
 #include <eosio/wallet_plugin/wallet_manager.hpp>
 #include <eosio/wallet_plugin/yubihsm_wallet.hpp>
diff --git a/plugins/wallet_plugin/yubihsm_wallet.cpp b/plugins/wallet_plugin/yubihsm_wallet.cpp
index 7b8cb4ef481..3078d9eae84 100644
--- a/plugins/wallet_plugin/yubihsm_wallet.cpp
+++ b/plugins/wallet_plugin/yubihsm_wallet.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <appbase/application.hpp>
 
 #include <eosio/wallet_plugin/yubihsm_wallet.hpp>
diff --git a/programs/cleos/config.hpp.in b/programs/cleos/config.hpp.in
index 3441d9cd42d..6f424f3cb4b 100644
--- a/programs/cleos/config.hpp.in
+++ b/programs/cleos/config.hpp.in
@@ -1,6 +1,4 @@
-/** @file 
- *    @copyright defined in eos/LICENSE 
- *
+/** 
  * \warning This file is machine generated. DO NOT EDIT.  See config.hpp.in for changes.
  */
 #pragma once
diff --git a/programs/cleos/help_text.cpp.in b/programs/cleos/help_text.cpp.in
index 0d4d6cf1046..75a60800977 100644
--- a/programs/cleos/help_text.cpp.in
+++ b/programs/cleos/help_text.cpp.in
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "help_text.hpp"
 #include "localize.hpp"
 #include <regex>
diff --git a/programs/cleos/help_text.hpp b/programs/cleos/help_text.hpp
index dbae493d714..d632d77a40a 100644
--- a/programs/cleos/help_text.hpp
+++ b/programs/cleos/help_text.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 #include <fc/exception/exception.hpp>
 
diff --git a/programs/cleos/httpc.hpp b/programs/cleos/httpc.hpp
index beb1f0f95b5..5f8e5566f22 100644
--- a/programs/cleos/httpc.hpp
+++ b/programs/cleos/httpc.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include "config.hpp"
diff --git a/programs/cleos/localize.hpp b/programs/cleos/localize.hpp
index ea15ea3009b..c15a12a5006 100644
--- a/programs/cleos/localize.hpp
+++ b/programs/cleos/localize.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <libintl.h>
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 2a59f8b6d9c..38eb1f395f5 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -1,11 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- *  @defgroup eosclienttool EOSIO Command Line Client Reference
- *  @brief Tool for sending transactions and querying state from @ref nodeos
- *  @ingroup eosclienttool
- */
-
 /**
   @defgroup eosclienttool
 
diff --git a/programs/eosio-launcher/config.hpp.in b/programs/eosio-launcher/config.hpp.in
index f733308dc1b..e3681d96b1a 100644
--- a/programs/eosio-launcher/config.hpp.in
+++ b/programs/eosio-launcher/config.hpp.in
@@ -1,7 +1,4 @@
 /**
- *  @file
- *  @copyright defined in eos/LICENSE
- *
  * \warning This file is machine generated. DO NOT EDIT.  See config.hpp.in for changes.
  */
 #pragma once
diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index d6bca57f09f..50833a0970f 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- *  @brief launch testnet nodes
- **/
 #include <string>
 #include <vector>
 #include <math.h>
diff --git a/programs/keosd/config.hpp.in b/programs/keosd/config.hpp.in
index 370f88db1a9..41c520e235c 100644
--- a/programs/keosd/config.hpp.in
+++ b/programs/keosd/config.hpp.in
@@ -1,7 +1,4 @@
 /**
- *  @file
- *  @copyright defined in eos/LICENSE
- *
  * \warning This file is machine generated. DO NOT EDIT.  See config.hpp.in for changes.
  */
 #pragma once
diff --git a/programs/keosd/main.cpp b/programs/keosd/main.cpp
index a5764c06958..dd7aa6a040e 100644
--- a/programs/keosd/main.cpp
+++ b/programs/keosd/main.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <appbase/application.hpp>
 
 #include <eosio/http_plugin/http_plugin.hpp>
diff --git a/programs/nodeos/config.hpp.in b/programs/nodeos/config.hpp.in
index 821477e3270..9e79e718fa5 100644
--- a/programs/nodeos/config.hpp.in
+++ b/programs/nodeos/config.hpp.in
@@ -1,7 +1,4 @@
 /**
- *  @file
- *  @copyright defined in eos/LICENSE
- *
  * \warning This file is machine generated. DO NOT EDIT.  See config.hpp.in for changes.
  */
 #pragma once
diff --git a/tests/chain_plugin_tests.cpp b/tests/chain_plugin_tests.cpp
index a6e119a5b06..5336baab7f4 100644
--- a/tests/chain_plugin_tests.cpp
+++ b/tests/chain_plugin_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/tests/get_table_tests.cpp b/tests/get_table_tests.cpp
index 91fca59ef3b..6833641f1cb 100644
--- a/tests/get_table_tests.cpp
+++ b/tests/get_table_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/tests/main.cpp b/tests/main.cpp
index 0644ce80545..eb7cbf7cae7 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <cstdlib>
 #include <iostream>
 #include <boost/test/included/unit_test.hpp>
diff --git a/tests/wallet_tests.cpp b/tests/wallet_tests.cpp
index 2f5956cf126..64a9fe0db4a 100644
--- a/tests/wallet_tests.cpp
+++ b/tests/wallet_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/genesis_state.hpp>
 #include <eosio/wallet_plugin/wallet.hpp>
 #include <eosio/wallet_plugin/wallet_manager.hpp>
diff --git a/unittests/abi_tests.cpp b/unittests/abi_tests.cpp
index 4e4e3103e50..c039882d294 100644
--- a/unittests/abi_tests.cpp
+++ b/unittests/abi_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <algorithm>
 #include <vector>
 #include <iterator>
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index fb2eb7671cb..6cef8f37e2f 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file api_tests.cpp
- *  @copyright defined in eos/LICENSE
- */
 #include <algorithm>
 #include <random>
 #include <iostream>
diff --git a/unittests/block_tests.cpp b/unittests/block_tests.cpp
index 873b5d2333f..7926455ffbc 100644
--- a/unittests/block_tests.cpp
+++ b/unittests/block_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <boost/test/unit_test.hpp>
 #include <eosio/testing/tester.hpp>
 
diff --git a/unittests/block_timestamp_tests.cpp b/unittests/block_timestamp_tests.cpp
index 81e513189f9..71ea0105f32 100644
--- a/unittests/block_timestamp_tests.cpp
+++ b/unittests/block_timestamp_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/block_timestamp.hpp>
 
 #include <boost/test/unit_test.hpp>
diff --git a/unittests/bootseq_tests.cpp b/unittests/bootseq_tests.cpp
index 0bc6050846d..5673db3e936 100644
--- a/unittests/bootseq_tests.cpp
+++ b/unittests/bootseq_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/testing/tester.hpp>
 
diff --git a/unittests/contracts.hpp.in b/unittests/contracts.hpp.in
index 3611de0deec..be9197419b3 100644
--- a/unittests/contracts.hpp.in
+++ b/unittests/contracts.hpp.in
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #pragma once
 
 #include <eosio/testing/tester.hpp>
diff --git a/unittests/currency_tests.cpp b/unittests/currency_tests.cpp
index e77d9830df9..7bad1b92194 100644
--- a/unittests/currency_tests.cpp
+++ b/unittests/currency_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #include <boost/test/unit_test.hpp>
diff --git a/unittests/database_tests.cpp b/unittests/database_tests.cpp
index b5edae97e10..e2d047d4e88 100644
--- a/unittests/database_tests.cpp
+++ b/unittests/database_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/testing/tester.hpp>
 
diff --git a/unittests/delay_tests.cpp b/unittests/delay_tests.cpp
index 2d6f77c7ee9..8d5874c7a8f 100644
--- a/unittests/delay_tests.cpp
+++ b/unittests/delay_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <eosio/chain/generated_transaction_object.hpp>
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/testing/tester_network.hpp>
diff --git a/unittests/eosio.token_tests.cpp b/unittests/eosio.token_tests.cpp
index 258720dd4bb..beee6506c26 100644
--- a/unittests/eosio.token_tests.cpp
+++ b/unittests/eosio.token_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/testing/tester.hpp>
 
diff --git a/unittests/eosio_system_tester.hpp b/unittests/eosio_system_tester.hpp
index 7958318ac07..44c06f18332 100644
--- a/unittests/eosio_system_tester.hpp
+++ b/unittests/eosio_system_tester.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/chain/abi_serializer.hpp>
diff --git a/unittests/fork_test_utilities.cpp b/unittests/fork_test_utilities.cpp
index 55e4fdf2d4e..8ede804daf2 100644
--- a/unittests/fork_test_utilities.cpp
+++ b/unittests/fork_test_utilities.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "fork_test_utilities.hpp"
 
 private_key_type get_private_key( name keyname, string role ) {
diff --git a/unittests/fork_test_utilities.hpp b/unittests/fork_test_utilities.hpp
index 0739ffc9378..6e228d519e8 100644
--- a/unittests/fork_test_utilities.hpp
+++ b/unittests/fork_test_utilities.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/testing/tester.hpp>
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index 3bcc72a42a4..a1ac5c68705 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/testing/tester.hpp>
diff --git a/unittests/main.cpp b/unittests/main.cpp
index cb26aeb625b..e51899278da 100644
--- a/unittests/main.cpp
+++ b/unittests/main.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <cstdlib>
 
 #include <iostream>
diff --git a/unittests/message_buffer_tests.cpp b/unittests/message_buffer_tests.cpp
index f810a80d2be..a499aa0d3f3 100644
--- a/unittests/message_buffer_tests.cpp
+++ b/unittests/message_buffer_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <iostream>
 
 #include <boost/test/unit_test.hpp>
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 96d080a97b1..72f59ed97d6 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/chain/asset.hpp>
 #include <eosio/chain/authority.hpp>
 #include <eosio/chain/authority_checker.hpp>
diff --git a/unittests/payloadless_tests.cpp b/unittests/payloadless_tests.cpp
index c9519e0ed71..4e4e3ca16cc 100644
--- a/unittests/payloadless_tests.cpp
+++ b/unittests/payloadless_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #include <boost/test/unit_test.hpp>
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index 678d2a50c28..5ff5e4cc390 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/testing/tester.hpp>
 
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index 730f58bb227..a777a2f8ba4 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/chain/resource_limits.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
diff --git a/unittests/ram_tests.cpp b/unittests/ram_tests.cpp
index ce4c4ab416a..bacf4c656bd 100644
--- a/unittests/ram_tests.cpp
+++ b/unittests/ram_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file api_tests.cpp
- *  @copyright defined in eos/LICENSE
- */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #include <boost/test/unit_test.hpp>
diff --git a/unittests/resource_limits_test.cpp b/unittests/resource_limits_test.cpp
index 9040c5bdc5f..67b79dd0162 100644
--- a/unittests/resource_limits_test.cpp
+++ b/unittests/resource_limits_test.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file api_tests.cpp
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <algorithm>
 
 #include <eosio/chain/config.hpp>
diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index e7cf449b119..c85c9ac1c0c 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <sstream>
 
 #include <eosio/chain/snapshot.hpp>
diff --git a/unittests/snapshots.hpp.in b/unittests/snapshots.hpp.in
index 291c452199f..32fd960e4b5 100644
--- a/unittests/snapshots.hpp.in
+++ b/unittests/snapshots.hpp.in
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #pragma once
 
 #define MAKE_READ_SNAPSHOT(NAME) \
diff --git a/unittests/special_accounts_tests.cpp b/unittests/special_accounts_tests.cpp
index 2d7c142daaf..34f06836daa 100644
--- a/unittests/special_accounts_tests.cpp
+++ b/unittests/special_accounts_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <algorithm>
 #include <iterator>
 #include <vector>
diff --git a/unittests/test-contracts/asserter/asserter.cpp b/unittests/test-contracts/asserter/asserter.cpp
index 3402e9d9940..f8710e4c556 100644
--- a/unittests/test-contracts/asserter/asserter.cpp
+++ b/unittests/test-contracts/asserter/asserter.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "asserter.hpp"
 
 using namespace eosio;
diff --git a/unittests/test-contracts/asserter/asserter.hpp b/unittests/test-contracts/asserter/asserter.hpp
index 625dc2e4cd7..2261a96e237 100644
--- a/unittests/test-contracts/asserter/asserter.hpp
+++ b/unittests/test-contracts/asserter/asserter.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/deferred_test/deferred_test.cpp b/unittests/test-contracts/deferred_test/deferred_test.cpp
index b4d271af7ce..57a2109a946 100644
--- a/unittests/test-contracts/deferred_test/deferred_test.cpp
+++ b/unittests/test-contracts/deferred_test/deferred_test.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "deferred_test.hpp"
 #include <eosio/transaction.hpp>
 #include <eosio/datastream.hpp>
diff --git a/unittests/test-contracts/deferred_test/deferred_test.hpp b/unittests/test-contracts/deferred_test/deferred_test.hpp
index ba7b5c26730..f5a322337e4 100644
--- a/unittests/test-contracts/deferred_test/deferred_test.hpp
+++ b/unittests/test-contracts/deferred_test/deferred_test.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/get_sender_test/get_sender_test.cpp b/unittests/test-contracts/get_sender_test/get_sender_test.cpp
index a3574dfae4c..5f89aa228cf 100644
--- a/unittests/test-contracts/get_sender_test/get_sender_test.cpp
+++ b/unittests/test-contracts/get_sender_test/get_sender_test.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "get_sender_test.hpp"
 #include <eosio/transaction.hpp>
 
diff --git a/unittests/test-contracts/get_sender_test/get_sender_test.hpp b/unittests/test-contracts/get_sender_test/get_sender_test.hpp
index 632c2905326..0e001437e11 100644
--- a/unittests/test-contracts/get_sender_test/get_sender_test.hpp
+++ b/unittests/test-contracts/get_sender_test/get_sender_test.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/integration_test/integration_test.cpp b/unittests/test-contracts/integration_test/integration_test.cpp
index ec8543caafb..061fbce8798 100644
--- a/unittests/test-contracts/integration_test/integration_test.cpp
+++ b/unittests/test-contracts/integration_test/integration_test.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "integration_test.hpp"
 
 using namespace eosio;
diff --git a/unittests/test-contracts/integration_test/integration_test.hpp b/unittests/test-contracts/integration_test/integration_test.hpp
index cbdc02295b2..408b469a535 100644
--- a/unittests/test-contracts/integration_test/integration_test.hpp
+++ b/unittests/test-contracts/integration_test/integration_test.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/noop/noop.cpp b/unittests/test-contracts/noop/noop.cpp
index 94fd344495f..564749e56a9 100644
--- a/unittests/test-contracts/noop/noop.cpp
+++ b/unittests/test-contracts/noop/noop.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "noop.hpp"
 
 using namespace eosio;
diff --git a/unittests/test-contracts/noop/noop.hpp b/unittests/test-contracts/noop/noop.hpp
index f6966c1ef1a..5065c951f9a 100644
--- a/unittests/test-contracts/noop/noop.hpp
+++ b/unittests/test-contracts/noop/noop.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/payloadless/payloadless.cpp b/unittests/test-contracts/payloadless/payloadless.cpp
index 70939590e50..16637efa2b4 100644
--- a/unittests/test-contracts/payloadless/payloadless.cpp
+++ b/unittests/test-contracts/payloadless/payloadless.cpp
@@ -1,8 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-
 #include "payloadless.hpp"
 
 using namespace eosio;
diff --git a/unittests/test-contracts/payloadless/payloadless.hpp b/unittests/test-contracts/payloadless/payloadless.hpp
index 0a4e88affa1..945a0d74177 100644
--- a/unittests/test-contracts/payloadless/payloadless.hpp
+++ b/unittests/test-contracts/payloadless/payloadless.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/proxy/proxy.cpp b/unittests/test-contracts/proxy/proxy.cpp
index c9fc324cad5..41ef9b96c8a 100644
--- a/unittests/test-contracts/proxy/proxy.cpp
+++ b/unittests/test-contracts/proxy/proxy.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "proxy.hpp"
 #include <eosio/transaction.hpp>
 
diff --git a/unittests/test-contracts/proxy/proxy.hpp b/unittests/test-contracts/proxy/proxy.hpp
index b913143fed2..eb0c336ac5f 100644
--- a/unittests/test-contracts/proxy/proxy.hpp
+++ b/unittests/test-contracts/proxy/proxy.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.cpp b/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.cpp
index d24cdbdbc24..95752f81c9c 100644
--- a/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.cpp
+++ b/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "ram_restrictions_test.hpp"
 #include <eosio/transaction.hpp>
 
diff --git a/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.hpp b/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.hpp
index 34a988fe5d5..df8d6f9aee6 100644
--- a/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.hpp
+++ b/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/reject_all/reject_all.cpp b/unittests/test-contracts/reject_all/reject_all.cpp
index 40f26fd827b..ae9a3765384 100644
--- a/unittests/test-contracts/reject_all/reject_all.cpp
+++ b/unittests/test-contracts/reject_all/reject_all.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosio/eosio.hpp>
 
 using namespace eosio;
diff --git a/unittests/test-contracts/restrict_action_test/restrict_action_test.cpp b/unittests/test-contracts/restrict_action_test/restrict_action_test.cpp
index 5c8f2b596b5..a21c13e6cc3 100644
--- a/unittests/test-contracts/restrict_action_test/restrict_action_test.cpp
+++ b/unittests/test-contracts/restrict_action_test/restrict_action_test.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "restrict_action_test.hpp"
 #include <eosio/transaction.hpp>
 
diff --git a/unittests/test-contracts/restrict_action_test/restrict_action_test.hpp b/unittests/test-contracts/restrict_action_test/restrict_action_test.hpp
index f5ab48e385b..e17d5c4b226 100644
--- a/unittests/test-contracts/restrict_action_test/restrict_action_test.hpp
+++ b/unittests/test-contracts/restrict_action_test/restrict_action_test.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/snapshot_test/snapshot_test.cpp b/unittests/test-contracts/snapshot_test/snapshot_test.cpp
index 84e28e53ec7..c8b74b1b25b 100644
--- a/unittests/test-contracts/snapshot_test/snapshot_test.cpp
+++ b/unittests/test-contracts/snapshot_test/snapshot_test.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "snapshot_test.hpp"
 
 using namespace eosio;
diff --git a/unittests/test-contracts/snapshot_test/snapshot_test.hpp b/unittests/test-contracts/snapshot_test/snapshot_test.hpp
index dce23efb538..b134f4a4bee 100644
--- a/unittests/test-contracts/snapshot_test/snapshot_test.hpp
+++ b/unittests/test-contracts/snapshot_test/snapshot_test.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/test_api/test_action.cpp b/unittests/test-contracts/test_api/test_action.cpp
index 65a8d31554c..1b20249fc0e 100644
--- a/unittests/test-contracts/test_api/test_action.cpp
+++ b/unittests/test-contracts/test_api/test_action.cpp
@@ -1,7 +1,3 @@
-/**
- * @file action_test.cpp
- * @copyright defined in eos/LICENSE
- */
 #include <eosiolib/action.hpp>
 #include <eosiolib/chain.h>
 #include <eosiolib/crypto.h>
diff --git a/unittests/test-contracts/test_api/test_api.cpp b/unittests/test-contracts/test_api/test_api.cpp
index 417c89a5da4..5c8b7f90060 100644
--- a/unittests/test-contracts/test_api/test_api.cpp
+++ b/unittests/test-contracts/test_api/test_api.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosiolib/eosio.hpp>
 #include <eosiolib/transaction.hpp>
 
diff --git a/unittests/test-contracts/test_api/test_api.hpp b/unittests/test-contracts/test_api/test_api.hpp
index bbcf9965352..ff6c44d2d48 100644
--- a/unittests/test-contracts/test_api/test_api.hpp
+++ b/unittests/test-contracts/test_api/test_api.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <string>
diff --git a/unittests/test-contracts/test_api/test_api_common.hpp b/unittests/test-contracts/test_api/test_api_common.hpp
index bfad0146b46..1b4ef7db137 100644
--- a/unittests/test-contracts/test_api/test_api_common.hpp
+++ b/unittests/test-contracts/test_api/test_api_common.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosiolib/serialize.hpp>
diff --git a/unittests/test-contracts/test_api/test_chain.cpp b/unittests/test-contracts/test_api/test_chain.cpp
index b9e35f870ee..28cfa2ac485 100644
--- a/unittests/test-contracts/test_api/test_chain.cpp
+++ b/unittests/test-contracts/test_api/test_chain.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosiolib/action.h>
 #include <eosiolib/chain.h>
 #include <eosiolib/eosio.hpp>
diff --git a/unittests/test-contracts/test_api/test_checktime.cpp b/unittests/test-contracts/test_api/test_checktime.cpp
index 4475f9fb873..4a14544125e 100644
--- a/unittests/test-contracts/test_api/test_checktime.cpp
+++ b/unittests/test-contracts/test_api/test_checktime.cpp
@@ -1,7 +1,3 @@
-/**
- * @file
- * @copyright defined in eos/LICENSE
- */
 #include <vector>
 
 #include <eosiolib/crypto.h>
diff --git a/unittests/test-contracts/test_api/test_crypto.cpp b/unittests/test-contracts/test_api/test_crypto.cpp
index c310b2a2778..f81e68ce015 100644
--- a/unittests/test-contracts/test_api/test_crypto.cpp
+++ b/unittests/test-contracts/test_api/test_crypto.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosiolib/crypto.h>
 #include <eosiolib/eosio.hpp>
 #include <eosiolib/print.hpp>
diff --git a/unittests/test-contracts/test_api/test_datastream.cpp b/unittests/test-contracts/test_api/test_datastream.cpp
index ca0e00982f6..e81dbf7c1c7 100644
--- a/unittests/test-contracts/test_api/test_datastream.cpp
+++ b/unittests/test-contracts/test_api/test_datastream.cpp
@@ -1,7 +1,3 @@
-/**
- * @file action_test.cpp
- * @copyright defined in eos/LICENSE.txt
- */
 #include <cmath>
 
 #include <eosiolib/eosio.hpp>
diff --git a/unittests/test-contracts/test_api/test_permission.cpp b/unittests/test-contracts/test_api/test_permission.cpp
index 7650d8f40cd..c078a65be8e 100644
--- a/unittests/test-contracts/test_api/test_permission.cpp
+++ b/unittests/test-contracts/test_api/test_permission.cpp
@@ -1,7 +1,3 @@
-/**
- * @file action_test.cpp
- * @copyright defined in eos/LICENSE
- */
 #include <limits>
 
 #include <eosiolib/action.hpp>
diff --git a/unittests/test-contracts/test_api/test_print.cpp b/unittests/test-contracts/test_api/test_print.cpp
index c0b5ab07e00..3b1f89b3199 100644
--- a/unittests/test-contracts/test_api/test_print.cpp
+++ b/unittests/test-contracts/test_api/test_print.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosiolib/eosio.hpp>
 
 #include "test_api.hpp"
diff --git a/unittests/test-contracts/test_api/test_transaction.cpp b/unittests/test-contracts/test_api/test_transaction.cpp
index 535f9896e9b..801a06b26d9 100644
--- a/unittests/test-contracts/test_api/test_transaction.cpp
+++ b/unittests/test-contracts/test_api/test_transaction.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosiolib/action.hpp>
 #include <eosiolib/crypto.h>
 #include <eosiolib/transaction.hpp>
diff --git a/unittests/test-contracts/test_api/test_types.cpp b/unittests/test-contracts/test_api/test_types.cpp
index a74026c33fc..0ba34a5e1af 100644
--- a/unittests/test-contracts/test_api/test_types.cpp
+++ b/unittests/test-contracts/test_api/test_types.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <eosiolib/eosio.hpp>
 
 #include "test_api.hpp"
diff --git a/unittests/test-contracts/test_api_db/test_api_db.cpp b/unittests/test-contracts/test_api_db/test_api_db.cpp
index 7ab5ddf9ce5..1c3bc358d77 100644
--- a/unittests/test-contracts/test_api_db/test_api_db.cpp
+++ b/unittests/test-contracts/test_api_db/test_api_db.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "test_api_db.hpp"
 
 using namespace eosio;
diff --git a/unittests/test-contracts/test_api_db/test_api_db.hpp b/unittests/test-contracts/test_api_db/test_api_db.hpp
index 9487434d518..6196e9db103 100644
--- a/unittests/test-contracts/test_api_db/test_api_db.hpp
+++ b/unittests/test-contracts/test_api_db/test_api_db.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/test_api_multi_index/test_api_multi_index.cpp b/unittests/test-contracts/test_api_multi_index/test_api_multi_index.cpp
index 72e7d4e6a5b..14a819932d9 100644
--- a/unittests/test-contracts/test_api_multi_index/test_api_multi_index.cpp
+++ b/unittests/test-contracts/test_api_multi_index/test_api_multi_index.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include "test_api_multi_index.hpp"
 
 using namespace eosio;
diff --git a/unittests/test-contracts/test_api_multi_index/test_api_multi_index.hpp b/unittests/test-contracts/test_api_multi_index/test_api_multi_index.hpp
index 73f48ea8e4c..03253e3fa67 100644
--- a/unittests/test-contracts/test_api_multi_index/test_api_multi_index.hpp
+++ b/unittests/test-contracts/test_api_multi_index/test_api_multi_index.hpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #pragma once
 
 #include <eosio/eosio.hpp>
diff --git a/unittests/test-contracts/test_ram_limit/test_ram_limit.cpp b/unittests/test-contracts/test_ram_limit/test_ram_limit.cpp
index 0bc9c72c052..a7ea39e31ed 100644
--- a/unittests/test-contracts/test_ram_limit/test_ram_limit.cpp
+++ b/unittests/test-contracts/test_ram_limit/test_ram_limit.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
 #include <utility>
 #include <vector>
 #include <string>
diff --git a/unittests/unapplied_transaction_queue_tests.cpp b/unittests/unapplied_transaction_queue_tests.cpp
index 7e0430760c4..bad4628d4fa 100644
--- a/unittests/unapplied_transaction_queue_tests.cpp
+++ b/unittests/unapplied_transaction_queue_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <boost/test/unit_test.hpp>
 #include <eosio/testing/tester.hpp>
 #include <eosio/chain/unapplied_transaction_queue.hpp>
diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index a1f98646394..6b5d641f953 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <array>
 #include <utility>
 
diff --git a/unittests/whitelist_blacklist_tests.cpp b/unittests/whitelist_blacklist_tests.cpp
index 2fbf0864d2b..274269beccc 100644
--- a/unittests/whitelist_blacklist_tests.cpp
+++ b/unittests/whitelist_blacklist_tests.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
 #include <eosio/chain/generated_transaction_object.hpp>
 #include <eosio/testing/tester.hpp>
 #include <eosio/testing/tester_network.hpp>

From 940c0d7c2b7a4ada558a5b7e4054e8c4873b07b3 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Tue, 13 Aug 2019 18:03:09 -0400
Subject: [PATCH 0989/1648] Update eos-vm

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 9a9d1ac7470..f9efbd67ad3 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 9a9d1ac74708f633940fbca13e5f5860e7134c34
+Subproject commit f9efbd67ad3d331e867f17515c399f4fd4d19363

From b536b265f9273ea6a9a24d9c88cfc8c18f8fcfb4 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 13 Aug 2019 18:06:09 -0400
Subject: [PATCH 0990/1648] found more incorrect headers

---
 libraries/fc                     | 2 +-
 programs/eosio-blocklog/main.cpp | 4 ----
 programs/nodeos/main.cpp         | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/libraries/fc b/libraries/fc
index e49b3bc4180..9150e7294b8 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit e49b3bc418038c085216cca03d452b1c788d6252
+Subproject commit 9150e7294b8dce4d5daded08b2c56bc2b2ae5586
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 33fdf10bed9..712bcffa705 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eosio/LICENSE.txt
- */
 #include <memory>
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/chain/block_log.hpp>
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 64e6abf9993..4e599d7b039 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -1,7 +1,3 @@
-/**
- *  @file
- *  @copyright defined in eosio/LICENSE.txt
- */
 #include <appbase/application.hpp>
 
 #include <eosio/chain_plugin/chain_plugin.hpp>

From d2410d4cfa9d9eafe3e482dbf01c0b759fddcee4 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 13 Aug 2019 18:19:15 -0400
Subject: [PATCH 0991/1648] update fc

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index 9150e7294b8..c9e0e66bcc3 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 9150e7294b8dce4d5daded08b2c56bc2b2ae5586
+Subproject commit c9e0e66bcc314caa91d6a135f0d569390e423864

From 7c90551ce27772794998a2002d6515773d2c457e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 14 Aug 2019 07:10:57 -0500
Subject: [PATCH 0992/1648] Better assert message. Move datastream construction
 cloer to use

---
 plugins/net_plugin/net_plugin.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 35906c776b7..740a9a28724 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -756,24 +756,22 @@ namespace eosio {
       explicit msg_handler( const connection_ptr& conn) : c(conn) {}
 
       void operator()( const signed_block& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should be called" );
+         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
       }
       void operator()( signed_block& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should be called" );
+         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
       }
       void operator()( const packed_transaction& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "operator()(packed_transaction&&) should be called" );
+         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
       }
       void operator()( packed_transaction& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "operator()(packed_transaction&&) should be called" );
+         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
       }
-
       void operator()( signed_block&& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "operator()(signed_block&&) should call handle_message" );
+         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
       }
-
       void operator()( packed_transaction&& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "operator()(packed_transaction&&) should call handle_message" );
+         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
       }
 
       void operator()( const handshake_message& msg ) const {
@@ -2394,7 +2392,6 @@ namespace eosio {
    bool connection::process_next_message( uint32_t message_length ) {
       try {
          // if next message is a block we already have, exit early
-         auto ds = pending_message_buffer.create_datastream();
          auto peek_ds = pending_message_buffer.create_peek_datastream();
          unsigned_int which{};
          fc::raw::unpack( peek_ds, which );
@@ -2413,18 +2410,21 @@ namespace eosio {
                return true;
             }
 
+            auto ds = pending_message_buffer.create_datastream();
             fc::raw::unpack( ds, which ); // throw away
             shared_ptr<signed_block> ptr = std::make_shared<signed_block>();
             fc::raw::unpack( ds, *ptr );
             handle_message( blk_id, std::move( ptr ) );
 
          } else if( which == packed_transaction_which ) {
+            auto ds = pending_message_buffer.create_datastream();
             fc::raw::unpack( ds, which ); // throw away
             shared_ptr<packed_transaction> ptr = std::make_shared<packed_transaction>();
             fc::raw::unpack( ds, *ptr );
             handle_message( std::move( ptr ) );
 
          } else {
+            auto ds = pending_message_buffer.create_datastream();
             net_message msg;
             fc::raw::unpack( ds, msg );
             msg_handler m( shared_from_this() );

From 40a8be81c082c07038551b67da5adc23636bccd0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 14 Aug 2019 09:33:21 -0500
Subject: [PATCH 0993/1648] Remove duplicate code via templated operator()

---
 plugins/net_plugin/net_plugin.cpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 740a9a28724..d81f5bc35a7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -755,22 +755,8 @@ namespace eosio {
       connection_ptr c;
       explicit msg_handler( const connection_ptr& conn) : c(conn) {}
 
-      void operator()( const signed_block& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
-      }
-      void operator()( signed_block& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
-      }
-      void operator()( const packed_transaction& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
-      }
-      void operator()( packed_transaction& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
-      }
-      void operator()( signed_block&& msg ) const {
-         EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
-      }
-      void operator()( packed_transaction&& msg ) const {
+      template<typename T>
+      void operator()( const T& ) const {
          EOS_ASSERT( false, plugin_config_exception, "Not implemented, call handle_message directly instead" );
       }
 

From db75d9ae2cf7ab190454916df159ab4ee501b5b6 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 14 Aug 2019 16:06:37 -0400
Subject: [PATCH 0994/1648] rename checktime_timer to platform_timer

---
 libraries/chain/CMakeLists.txt                   | 12 ++++++------
 libraries/chain/controller.cpp                   |  4 ++--
 .../eosio/chain/checktime_timer_accuracy.hpp     |  8 --------
 .../{checktime_timer.hpp => platform_timer.hpp}  | 14 +++++++-------
 .../eosio/chain/platform_timer_accuracy.hpp      |  8 ++++++++
 .../include/eosio/chain/transaction_context.hpp  |  8 ++++----
 ..._accuracy.cpp => platform_timer_accuracy.cpp} |  6 +++---
 ...back.cpp => platform_timer_asio_fallback.cpp} | 14 +++++++-------
 ..._timer_macos.cpp => platform_timer_macos.cpp} | 16 ++++++++--------
 ..._timer_posix.cpp => platform_timer_posix.cpp} | 14 +++++++-------
 ..._posix_test.c => platform_timer_posix_test.c} |  0
 libraries/chain/transaction_context.cpp          |  2 +-
 12 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100755 libraries/chain/include/eosio/chain/checktime_timer_accuracy.hpp
 rename libraries/chain/include/eosio/chain/{checktime_timer.hpp => platform_timer.hpp} (59%)
 create mode 100755 libraries/chain/include/eosio/chain/platform_timer_accuracy.hpp
 rename libraries/chain/{checktime_timer_accuracy.cpp => platform_timer_accuracy.cpp} (94%)
 rename libraries/chain/{checktime_timer_asio_fallback.cpp => platform_timer_asio_fallback.cpp} (87%)
 rename libraries/chain/{checktime_timer_macos.cpp => platform_timer_macos.cpp} (89%)
 rename libraries/chain/{checktime_timer_posix.cpp => platform_timer_posix.cpp} (85%)
 rename libraries/chain/{checktime_timer_posix_test.c => platform_timer_posix_test.c} (100%)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index f52e3145201..039bb8d3124 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -6,13 +6,13 @@ file(GLOB HEADERS "include/eosio/chain/*.hpp"
                   "${CMAKE_CURRENT_BINARY_DIR}/include/eosio/chain/core_symbol.hpp" )
 
 if(APPLE AND UNIX)
-   set(CHECKTIME_TIMER_IMPL checktime_timer_macos.cpp)
+   set(PLATFORM_TIMER_IMPL platform_timer_macos.cpp)
 else()
-   try_run(POSIX_TIMER_TEST_RUN_RESULT POSIX_TIMER_TEST_COMPILE_RESULT ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/checktime_timer_posix_test.c)
+   try_run(POSIX_TIMER_TEST_RUN_RESULT POSIX_TIMER_TEST_COMPILE_RESULT ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/platform_timer_posix_test.c)
    if(POSIX_TIMER_TEST_RUN_RESULT EQUAL 0)
-      set(CHECKTIME_TIMER_IMPL checktime_timer_posix.cpp)
+      set(PLATFORM_TIMER_IMPL platform_timer_posix.cpp)
    else()
-      set(CHECKTIME_TIMER_IMPL checktime_timer_asio_fallback.cpp)
+      set(PLATFORM_TIMER_IMPL platform_timer_asio_fallback.cpp)
    endif()
 endif()
 
@@ -63,8 +63,8 @@ add_library( eosio_chain
              genesis_intrinsics.cpp
              whitelisted_intrinsics.cpp
              thread_utils.cpp
-             checktime_timer_accuracy.cpp
-             ${CHECKTIME_TIMER_IMPL}
+             platform_timer_accuracy.cpp
+             ${PLATFORM_TIMER_IMPL}
              ${HEADERS}
              )
 
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 09885bb656a..6a236e111ba 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -24,7 +24,7 @@
 #include <eosio/chain/resource_limits.hpp>
 #include <eosio/chain/chain_snapshot.hpp>
 #include <eosio/chain/thread_utils.hpp>
-#include <eosio/chain/checktime_timer.hpp>
+#include <eosio/chain/platform_timer.hpp>
 
 #include <chainbase/chainbase.hpp>
 #include <fc/io/json.hpp>
@@ -230,7 +230,7 @@ struct controller_impl {
    bool                           trusted_producer_light_validation = false;
    uint32_t                       snapshot_head_block = 0;
    named_thread_pool              thread_pool;
-   checktime_timer                timer;
+   platform_timer                timer;
 
    typedef pair<scope_name,action_name>                   handler_key;
    map< account_name, map<handler_key, apply_handler> >   apply_handlers;
diff --git a/libraries/chain/include/eosio/chain/checktime_timer_accuracy.hpp b/libraries/chain/include/eosio/chain/checktime_timer_accuracy.hpp
deleted file mode 100755
index 5cc3c7237e5..00000000000
--- a/libraries/chain/include/eosio/chain/checktime_timer_accuracy.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-namespace eosio { namespace chain {
-
-struct checktime_timer;
-void compute_and_print_timer_accuracy(checktime_timer& t);
-
-}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/checktime_timer.hpp b/libraries/chain/include/eosio/chain/platform_timer.hpp
similarity index 59%
rename from libraries/chain/include/eosio/chain/checktime_timer.hpp
rename to libraries/chain/include/eosio/chain/platform_timer.hpp
index ea820b0aace..203054907e7 100644
--- a/libraries/chain/include/eosio/chain/checktime_timer.hpp
+++ b/libraries/chain/include/eosio/chain/platform_timer.hpp
@@ -6,9 +6,9 @@
 
 namespace eosio { namespace chain {
 
-struct checktime_timer {
-   checktime_timer();
-   ~checktime_timer();
+struct platform_timer {
+   platform_timer();
+   ~platform_timer();
 
    void start(fc::time_point tp);
    void stop();
@@ -21,13 +21,13 @@ struct checktime_timer {
    fc::fwd<impl,fwd_size> my;
 };
 
-struct checktime_timer_scoped_stop {
-   checktime_timer_scoped_stop(checktime_timer& t) : _timer(t) {}
-   ~checktime_timer_scoped_stop() {
+struct platform_timer_scoped_stop {
+   platform_timer_scoped_stop(platform_timer& t) : _timer(t) {}
+   ~platform_timer_scoped_stop() {
       _timer.stop();
    }
 private:
-   checktime_timer& _timer;
+   platform_timer& _timer;
 };
 
 }}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/platform_timer_accuracy.hpp b/libraries/chain/include/eosio/chain/platform_timer_accuracy.hpp
new file mode 100755
index 00000000000..cc83b6a554f
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/platform_timer_accuracy.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace eosio { namespace chain {
+
+struct platform_timer;
+void compute_and_print_timer_accuracy(platform_timer& t);
+
+}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index 7bbe0e66b09..ecb9a8bb5e1 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <eosio/chain/controller.hpp>
 #include <eosio/chain/trace.hpp>
-#include <eosio/chain/checktime_timer.hpp>
+#include <eosio/chain/platform_timer.hpp>
 #include <signal.h>
 
 namespace eosio { namespace chain {
@@ -15,7 +15,7 @@ namespace eosio { namespace chain {
          transaction_context( controller& c,
                               const signed_transaction& t,
                               const transaction_id_type& trx_id,
-                              checktime_timer& timer,
+                              platform_timer& timer,
                               fc::time_point start = fc::time_point::now() );
 
          void init_for_implicit_trx( uint64_t initial_net_usage = 0 );
@@ -128,8 +128,8 @@ namespace eosio { namespace chain {
          fc::microseconds              billed_time;
          fc::microseconds              billing_timer_duration_limit;
 
-         checktime_timer&              deadline_timer;
-         checktime_timer_scoped_stop   timer_stopper;
+         platform_timer&              deadline_timer;
+         platform_timer_scoped_stop   timer_stopper;
    };
 
 } }
diff --git a/libraries/chain/checktime_timer_accuracy.cpp b/libraries/chain/platform_timer_accuracy.cpp
similarity index 94%
rename from libraries/chain/checktime_timer_accuracy.cpp
rename to libraries/chain/platform_timer_accuracy.cpp
index e432dea2d1f..94a69c89440 100755
--- a/libraries/chain/checktime_timer_accuracy.cpp
+++ b/libraries/chain/platform_timer_accuracy.cpp
@@ -1,5 +1,5 @@
-#include <eosio/chain/checktime_timer_accuracy.hpp>
-#include <eosio/chain/checktime_timer.hpp>
+#include <eosio/chain/platform_timer_accuracy.hpp>
+#include <eosio/chain/platform_timer.hpp>
 
 #include <fc/time.hpp>
 #include <fc/log/logger.hpp>
@@ -18,7 +18,7 @@ namespace eosio { namespace chain {
 
 namespace bacc = boost::accumulators;
 
-void compute_and_print_timer_accuracy(checktime_timer& timer) {
+void compute_and_print_timer_accuracy(platform_timer& timer) {
    static std::mutex m;
    static bool once_is_enough;
 
diff --git a/libraries/chain/checktime_timer_asio_fallback.cpp b/libraries/chain/platform_timer_asio_fallback.cpp
similarity index 87%
rename from libraries/chain/checktime_timer_asio_fallback.cpp
rename to libraries/chain/platform_timer_asio_fallback.cpp
index 9d1cb7d454b..47c9b4b4f0b 100644
--- a/libraries/chain/checktime_timer_asio_fallback.cpp
+++ b/libraries/chain/platform_timer_asio_fallback.cpp
@@ -1,5 +1,5 @@
-#include <eosio/chain/checktime_timer.hpp>
-#include <eosio/chain/checktime_timer_accuracy.hpp>
+#include <eosio/chain/platform_timer.hpp>
+#include <eosio/chain/platform_timer_accuracy.hpp>
 
 #include <fc/fwd_impl.hpp>
 #include <fc/log/logger_config.hpp> //set_os_thread_name()
@@ -17,11 +17,11 @@ static unsigned refcount;
 static std::thread checktime_thread;
 static std::unique_ptr<boost::asio::io_service> checktime_ios;
 
-struct checktime_timer::impl {
+struct platform_timer::impl {
    std::unique_ptr<boost::asio::high_resolution_timer> timer;
 };
 
-checktime_timer::checktime_timer() {
+platform_timer::platform_timer() {
    static_assert(sizeof(impl) <= fwd_size);
 
    std::lock_guard guard(timer_ref_mutex);
@@ -44,7 +44,7 @@ checktime_timer::checktime_timer() {
    //compute_and_print_timer_accuracy(*this);
 }
 
-checktime_timer::~checktime_timer() {
+platform_timer::~platform_timer() {
    stop();
    if(std::lock_guard guard(timer_ref_mutex); --refcount == 0) {
       checktime_ios->stop();
@@ -53,7 +53,7 @@ checktime_timer::~checktime_timer() {
    }
 }
 
-void checktime_timer::start(fc::time_point tp) {
+void platform_timer::start(fc::time_point tp) {
    if(tp == fc::time_point::maximum()) {
       expired = 0;
       return;
@@ -80,7 +80,7 @@ void checktime_timer::start(fc::time_point tp) {
    }
 }
 
-void checktime_timer::stop() {
+void platform_timer::stop() {
    if(expired)
       return;
 
diff --git a/libraries/chain/checktime_timer_macos.cpp b/libraries/chain/platform_timer_macos.cpp
similarity index 89%
rename from libraries/chain/checktime_timer_macos.cpp
rename to libraries/chain/platform_timer_macos.cpp
index 5a1b6dd9910..670de808c90 100755
--- a/libraries/chain/checktime_timer_macos.cpp
+++ b/libraries/chain/platform_timer_macos.cpp
@@ -1,5 +1,5 @@
-#include <eosio/chain/checktime_timer.hpp>
-#include <eosio/chain/checktime_timer_accuracy.hpp>
+#include <eosio/chain/platform_timer.hpp>
+#include <eosio/chain/platform_timer_accuracy.hpp>
 
 #include <fc/time.hpp>
 #include <fc/fwd_impl.hpp>
@@ -13,20 +13,20 @@
 
 namespace eosio { namespace chain {
 
-//a kqueue & thread is shared for all checktime_timer_macos instances
+//a kqueue & thread is shared for all platform_timer_macos instances
 static std::mutex timer_ref_mutex;
 static unsigned next_timerid;
 static unsigned refcount;
 static int kqueue_fd;
 static std::thread kevent_thread;
 
-struct checktime_timer::impl {
+struct platform_timer::impl {
    uint64_t timerid;
 
    constexpr static uint64_t quit_event_id = 1;
 };
 
-checktime_timer::checktime_timer() {
+platform_timer::platform_timer() {
    static_assert(sizeof(impl) <= fwd_size);
 
    std::lock_guard guard(timer_ref_mutex);
@@ -64,7 +64,7 @@ checktime_timer::checktime_timer() {
    compute_and_print_timer_accuracy(*this);
 }
 
-checktime_timer::~checktime_timer() {
+platform_timer::~platform_timer() {
    stop();
    if(std::lock_guard guard(timer_ref_mutex); --refcount == 0) {
       struct kevent64_s signal_quit_event;
@@ -76,7 +76,7 @@ checktime_timer::~checktime_timer() {
    }
 }
 
-void checktime_timer::start(fc::time_point tp) {
+void platform_timer::start(fc::time_point tp) {
    if(tp == fc::time_point::maximum()) {
       expired = 0;
       return;
@@ -94,7 +94,7 @@ void checktime_timer::start(fc::time_point tp) {
    }
 }
 
-void checktime_timer::stop() {
+void platform_timer::stop() {
    if(expired)
       return;
 
diff --git a/libraries/chain/checktime_timer_posix.cpp b/libraries/chain/platform_timer_posix.cpp
similarity index 85%
rename from libraries/chain/checktime_timer_posix.cpp
rename to libraries/chain/platform_timer_posix.cpp
index 8b1ccd3a1d6..edf4ca806eb 100644
--- a/libraries/chain/checktime_timer_posix.cpp
+++ b/libraries/chain/platform_timer_posix.cpp
@@ -1,5 +1,5 @@
-#include <eosio/chain/checktime_timer.hpp>
-#include <eosio/chain/checktime_timer_accuracy.hpp>
+#include <eosio/chain/platform_timer.hpp>
+#include <eosio/chain/platform_timer_accuracy.hpp>
 
 #include <fc/time.hpp>
 #include <fc/fwd_impl.hpp>
@@ -12,7 +12,7 @@
 
 namespace eosio { namespace chain {
 
-struct checktime_timer::impl {
+struct platform_timer::impl {
    timer_t timerid;
 
    static void sig_handler(int, siginfo_t* si, void*) {
@@ -20,7 +20,7 @@ struct checktime_timer::impl {
    }
 };
 
-checktime_timer::checktime_timer() {
+platform_timer::platform_timer() {
    static_assert(sizeof(impl) <= fwd_size);
 
    static bool initialized;
@@ -45,11 +45,11 @@ checktime_timer::checktime_timer() {
    compute_and_print_timer_accuracy(*this);
 }
 
-checktime_timer::~checktime_timer() {
+platform_timer::~platform_timer() {
    timer_delete(my->timerid);
 }
 
-void checktime_timer::start(fc::time_point tp) {
+void platform_timer::start(fc::time_point tp) {
    if(tp == fc::time_point::maximum()) {
       expired = 0;
       return;
@@ -65,7 +65,7 @@ void checktime_timer::start(fc::time_point tp) {
    }
 }
 
-void checktime_timer::stop() {
+void platform_timer::stop() {
    if(expired)
       return;
    struct itimerspec disable = {{0, 0}, {0, 0}};
diff --git a/libraries/chain/checktime_timer_posix_test.c b/libraries/chain/platform_timer_posix_test.c
similarity index 100%
rename from libraries/chain/checktime_timer_posix_test.c
rename to libraries/chain/platform_timer_posix_test.c
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index 10732fba6a0..4bce198c915 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -24,7 +24,7 @@ namespace eosio { namespace chain {
    transaction_context::transaction_context( controller& c,
                                              const signed_transaction& t,
                                              const transaction_id_type& trx_id,
-                                             checktime_timer& tmr,
+                                             platform_timer& tmr,
                                              fc::time_point s )
    :control(c)
    ,trx(t)

From 13b745289486e9df42b76cc3760a30e88da86f05 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 14 Aug 2019 18:00:24 -0400
Subject: [PATCH 0995/1648] instead of using timer directly, have trx_context
 take a transaction_checktime_timer

transaction_checktime_timer bundles up some of the RAII-lacking problems of the previous code -- no longer does transaction_context need to bundle its own scoped exit that stops the timer, and transaction_context can be assured when it is given the transaction_checktimer_timer that the "expired" value is initialized
---
 libraries/chain/controller.cpp                | 11 ++++---
 .../include/eosio/chain/platform_timer.hpp    |  9 ------
 .../eosio/chain/transaction_context.hpp       | 23 +++++++++++--
 libraries/chain/transaction_context.cpp       | 32 ++++++++++++++-----
 4 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 6a236e111ba..ac23c6807e7 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -230,7 +230,7 @@ struct controller_impl {
    bool                           trusted_producer_light_validation = false;
    uint32_t                       snapshot_head_block = 0;
    named_thread_pool              thread_pool;
-   platform_timer                timer;
+   platform_timer                 timer;
 
    typedef pair<scope_name,action_name>                   handler_key;
    map< account_name, map<handler_key, apply_handler> >   apply_handlers;
@@ -1024,7 +1024,8 @@ struct controller_impl {
          etrx.set_reference_block( self.head_block_id() );
       }
 
-      transaction_context trx_context( self, etrx, etrx.id(), timer, start );
+      transaction_checktime_timer trx_timer(timer);
+      transaction_context trx_context( self, etrx, etrx.id(), std::move(trx_timer), start );
       trx_context.deadline = deadline;
       trx_context.explicit_billed_cpu_time = explicit_billed_cpu_time;
       trx_context.billed_cpu_time_us = billed_cpu_time_us;
@@ -1147,7 +1148,8 @@ struct controller_impl {
 
       uint32_t cpu_time_to_bill_us = billed_cpu_time_us;
 
-      transaction_context trx_context( self, dtrx, gtrx.trx_id, timer );
+      transaction_checktime_timer trx_timer(timer);
+      transaction_context trx_context( self, dtrx, gtrx.trx_id, std::move(trx_timer) );
       trx_context.leeway =  fc::microseconds(0); // avoid stealing cpu resource
       trx_context.deadline = deadline;
       trx_context.explicit_billed_cpu_time = explicit_billed_cpu_time;
@@ -1315,7 +1317,8 @@ struct controller_impl {
          }
 
          const signed_transaction& trn = trx->packed_trx()->get_signed_transaction();
-         transaction_context trx_context(self, trn, trx->id(), timer, start);
+         transaction_checktime_timer trx_timer(timer);
+         transaction_context trx_context(self, trn, trx->id(), std::move(trx_timer), start);
          if ((bool)subjective_cpu_leeway && pending->_block_status == controller::block_status::incomplete) {
             trx_context.leeway = *subjective_cpu_leeway;
          }
diff --git a/libraries/chain/include/eosio/chain/platform_timer.hpp b/libraries/chain/include/eosio/chain/platform_timer.hpp
index 203054907e7..90a3f8400ac 100644
--- a/libraries/chain/include/eosio/chain/platform_timer.hpp
+++ b/libraries/chain/include/eosio/chain/platform_timer.hpp
@@ -21,13 +21,4 @@ struct platform_timer {
    fc::fwd<impl,fwd_size> my;
 };
 
-struct platform_timer_scoped_stop {
-   platform_timer_scoped_stop(platform_timer& t) : _timer(t) {}
-   ~platform_timer_scoped_stop() {
-      _timer.stop();
-   }
-private:
-   platform_timer& _timer;
-};
-
 }}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index ecb9a8bb5e1..31fec506ceb 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -6,6 +6,24 @@
 
 namespace eosio { namespace chain {
 
+   struct transaction_checktime_timer {
+      public:
+         transaction_checktime_timer() = delete;
+         transaction_checktime_timer(const transaction_checktime_timer&) = delete;
+         transaction_checktime_timer(transaction_checktime_timer&&) = default;
+         ~transaction_checktime_timer();
+
+         void start(fc::time_point tp);
+         void stop();
+
+         volatile sig_atomic_t& expired;
+      private:
+         platform_timer& _timer;
+
+         transaction_checktime_timer(platform_timer& timer);
+         friend controller_impl;
+   };
+
    class transaction_context {
       private:
          void init( uint64_t initial_net_usage);
@@ -15,7 +33,7 @@ namespace eosio { namespace chain {
          transaction_context( controller& c,
                               const signed_transaction& t,
                               const transaction_id_type& trx_id,
-                              platform_timer& timer,
+                              transaction_checktime_timer&& timer,
                               fc::time_point start = fc::time_point::now() );
 
          void init_for_implicit_trx( uint64_t initial_net_usage = 0 );
@@ -128,8 +146,7 @@ namespace eosio { namespace chain {
          fc::microseconds              billed_time;
          fc::microseconds              billing_timer_duration_limit;
 
-         platform_timer&              deadline_timer;
-         platform_timer_scoped_stop   timer_stopper;
+         transaction_checktime_timer   transaction_timer;
    };
 
 } }
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index 4bce198c915..f40d7877a78 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -21,10 +21,27 @@
 
 namespace eosio { namespace chain {
 
+   transaction_checktime_timer::transaction_checktime_timer(platform_timer& timer)
+         : expired(timer.expired), _timer(timer) {
+      expired = 0;
+   }
+
+   void transaction_checktime_timer::start(fc::time_point tp) {
+      _timer.start(tp);
+   }
+
+   void transaction_checktime_timer::stop() {
+      _timer.stop();
+   }
+
+   transaction_checktime_timer::~transaction_checktime_timer() {
+      stop();
+   }
+
    transaction_context::transaction_context( controller& c,
                                              const signed_transaction& t,
                                              const transaction_id_type& trx_id,
-                                             platform_timer& tmr,
+                                             transaction_checktime_timer&& tmr,
                                              fc::time_point s )
    :control(c)
    ,trx(t)
@@ -34,8 +51,7 @@ namespace eosio { namespace chain {
    ,start(s)
    ,net_usage(trace->net_usage)
    ,pseudo_start(s)
-   ,deadline_timer(tmr)
-   ,timer_stopper(tmr)
+   ,transaction_timer(std::move(tmr))
    {
       if (!c.skip_db_sessions()) {
          undo_session = c.mutable_db().start_undo_session(true);
@@ -157,9 +173,9 @@ namespace eosio { namespace chain {
          add_net_usage( initial_net_usage );  // Fail early if current net usage is already greater than the calculated limit
 
       if(control.skip_trx_checks())
-         deadline_timer.start(fc::time_point::maximum());
+         transaction_timer.start(fc::time_point::maximum());
       else
-         deadline_timer.start(_deadline);
+         transaction_timer.start(_deadline);
 
       checktime(); // Fail early if deadline has already been exceeded
 
@@ -344,7 +360,7 @@ namespace eosio { namespace chain {
    }
 
    void transaction_context::checktime()const {
-      if(BOOST_LIKELY(deadline_timer.expired == false))
+      if(BOOST_LIKELY(transaction_timer.expired == false))
          return;
 
       auto now = fc::time_point::now();
@@ -381,7 +397,7 @@ namespace eosio { namespace chain {
       billed_time = now - pseudo_start;
       deadline_exception_code = deadline_exception::code_value; // Other timeout exceptions cannot be thrown while billable timer is paused.
       pseudo_start = fc::time_point();
-      deadline_timer.stop();
+      transaction_timer.stop();
    }
 
    void transaction_context::resume_billing_timer() {
@@ -396,7 +412,7 @@ namespace eosio { namespace chain {
          _deadline = deadline;
          deadline_exception_code = deadline_exception::code_value;
       }
-      deadline_timer.start(_deadline);
+      transaction_timer.start(_deadline);
    }
 
    void transaction_context::validate_cpu_usage_to_bill( int64_t billed_us, bool check_minimum )const {

From 858379c0bde422386ab3f4546f20ebf2361facfe Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 14 Aug 2019 18:04:11 -0400
Subject: [PATCH 0996/1648] restore ordering of a transaction_context check
 pre-branch change

---
 libraries/chain/transaction_context.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index f40d7877a78..ce216063962 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -172,13 +172,13 @@ namespace eosio { namespace chain {
       if( initial_net_usage > 0 )
          add_net_usage( initial_net_usage );  // Fail early if current net usage is already greater than the calculated limit
 
+      checktime(); // Fail early if deadline has already been exceeded
+
       if(control.skip_trx_checks())
          transaction_timer.start(fc::time_point::maximum());
       else
          transaction_timer.start(_deadline);
 
-      checktime(); // Fail early if deadline has already been exceeded
-
       is_initialized = true;
    }
 

From 33b93bd62bfc8d45c7825ed78a39c42ad852c824 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 15 Aug 2019 09:17:51 -0500
Subject: [PATCH 0997/1648] Use fc::cfile instead of std::fstream

---
 .../state_history_log.hpp                     | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
index 350b6c84dfc..3bf19eb012a 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_log.hpp
@@ -8,6 +8,7 @@
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/chain/types.hpp>
 #include <fc/log/logger.hpp>
+#include <fc/io/cfile.hpp>
 
 namespace eosio {
 
@@ -47,8 +48,8 @@ class state_history_log {
    const char* const    name = "";
    std::string          log_filename;
    std::string          index_filename;
-   std::fstream         log;
-   std::fstream         index;
+   fc::cfile            log;
+   fc::cfile            index;
    uint32_t             _begin_block = 0;
    uint32_t             _end_block   = 0;
    chain::block_id_type last_block_id;
@@ -104,16 +105,16 @@ class state_history_log {
 
       if (block_num < _end_block)
          truncate(block_num);
-      log.seekg(0, std::ios_base::end);
-      uint64_t pos = log.tellg();
+      log.seek_end(0);
+      uint64_t pos = log.tellp();
       write_header(header);
       write_payload(log);
-      uint64_t end = log.tellg();
+      uint64_t end = log.tellp();
       EOS_ASSERT(end == pos + state_history_log_header_serial_size + header.payload_size, chain::plugin_exception,
                  "wrote payload with incorrect size to ${name}.log", ("name", name));
       log.write((char*)&pos, sizeof(pos));
 
-      index.seekg(0, std::ios_base::end);
+      index.seek_end(0);
       index.write((char*)&pos, sizeof(pos));
       if (_begin_block == _end_block)
          _begin_block = block_num;
@@ -121,11 +122,11 @@ class state_history_log {
       last_block_id = header.block_id;
    }
 
-   // returns stream positioned at payload
-   std::fstream& get_entry(uint32_t block_num, state_history_log_header& header) {
+   // returns cfile positioned at payload
+   fc::cfile& get_entry(uint32_t block_num, state_history_log_header& header) {
       EOS_ASSERT(block_num >= _begin_block && block_num < _end_block, chain::plugin_exception,
                  "read non-existing block in ${name}.log", ("name", name));
-      log.seekg(get_pos(block_num));
+      log.seek(get_pos(block_num));
       read_header(header);
       return log;
    }
@@ -140,13 +141,13 @@ class state_history_log {
    bool get_last_block(uint64_t size) {
       state_history_log_header header;
       uint64_t                 suffix;
-      log.seekg(size - sizeof(suffix));
+      log.seek(size - sizeof(suffix));
       log.read((char*)&suffix, sizeof(suffix));
       if (suffix > size || suffix + state_history_log_header_serial_size > size) {
          elog("corrupt ${name}.log (2)", ("name", name));
          return false;
       }
-      log.seekg(suffix);
+      log.seek(suffix);
       read_header(header, false);
       if (!is_ship(header.magic) || !is_ship_supported_version(header.magic) ||
           suffix + state_history_log_header_serial_size + header.payload_size + sizeof(suffix) != size) {
@@ -170,7 +171,7 @@ class state_history_log {
          state_history_log_header header;
          if (pos + state_history_log_header_serial_size > size)
             break;
-         log.seekg(pos);
+         log.seek(pos);
          read_header(header, false);
          uint64_t suffix;
          if (!is_ship(header.magic) || !is_ship_supported_version(header.magic) || header.payload_size > size ||
@@ -179,7 +180,7 @@ class state_history_log {
                        "${name}.log has an unsupported version", ("name", name));
             break;
          }
-         log.seekg(pos + state_history_log_header_serial_size + header.payload_size);
+         log.seek(pos + state_history_log_header_serial_size + header.payload_size);
          log.read((char*)&suffix, sizeof(suffix));
          if (suffix != pos)
             break;
@@ -191,17 +192,18 @@ class state_history_log {
       }
       log.flush();
       boost::filesystem::resize_file(log_filename, pos);
-      log.sync();
+      log.flush();
       EOS_ASSERT(get_last_block(pos), chain::plugin_exception, "recover ${name}.log failed", ("name", name));
    }
 
    void open_log() {
-      log.open(log_filename, std::ios_base::binary | std::ios_base::in | std::ios_base::out | std::ios_base::app);
-      log.seekg(0, std::ios_base::end);
-      uint64_t size = log.tellg();
+      log.set_file_path( log_filename );
+      log.open( "a+b" ); // std::ios_base::binary | std::ios_base::in | std::ios_base::out | std::ios_base::app
+      log.seek_end(0);
+      uint64_t size = log.tellp();
       if (size >= state_history_log_header_serial_size) {
          state_history_log_header header;
-         log.seekg(0);
+         log.seek(0);
          read_header(header, false);
          EOS_ASSERT(is_ship(header.magic) && is_ship_supported_version(header.magic) &&
                         state_history_log_header_serial_size + header.payload_size + sizeof(uint64_t) <= size,
@@ -218,30 +220,31 @@ class state_history_log {
    }
 
    void open_index() {
-      index.open(index_filename, std::ios_base::binary | std::ios_base::in | std::ios_base::out | std::ios_base::app);
-      index.seekg(0, std::ios_base::end);
-      if (index.tellg() == (static_cast<int>(_end_block) - _begin_block) * sizeof(uint64_t))
+      index.set_file_path( index_filename );
+      index.open( "a+b" ); // std::ios_base::binary | std::ios_base::in | std::ios_base::out | std::ios_base::app
+      index.seek_end(0);
+      if (index.tellp() == (static_cast<int>(_end_block) - _begin_block) * sizeof(uint64_t))
          return;
       ilog("Regenerate ${name}.index", ("name", name));
       index.close();
-      index.open(index_filename, std::ios_base::binary | std::ios_base::in | std::ios_base::out | std::ios_base::trunc);
+      index.open( "w+b" ); // std::ios_base::binary | std::ios_base::in | std::ios_base::out | std::ios_base::trunc
 
-      log.seekg(0, std::ios_base::end);
-      uint64_t size      = log.tellg();
+      log.seek_end(0);
+      uint64_t size      = log.tellp();
       uint64_t pos       = 0;
       uint32_t num_found = 0;
       while (pos < size) {
          state_history_log_header header;
          EOS_ASSERT(pos + state_history_log_header_serial_size <= size, chain::plugin_exception,
                     "corrupt ${name}.log (6)", ("name", name));
-         log.seekg(pos);
+         log.seek(pos);
          read_header(header, false);
          uint64_t suffix_pos = pos + state_history_log_header_serial_size + header.payload_size;
          uint64_t suffix;
          EOS_ASSERT(is_ship(header.magic) && is_ship_supported_version(header.magic) &&
                         suffix_pos + sizeof(suffix) <= size,
                     chain::plugin_exception, "corrupt ${name}.log (7)", ("name", name));
-         log.seekg(suffix_pos);
+         log.seek(suffix_pos);
          log.read((char*)&suffix, sizeof(suffix));
          // ilog("block ${b} at ${pos}-${end} suffix=${suffix} file_size=${fs}",
          //      ("b", header.block_num)("pos", pos)("end", suffix_pos + sizeof(suffix))("suffix", suffix)("fs", size));
@@ -258,7 +261,7 @@ class state_history_log {
 
    uint64_t get_pos(uint32_t block_num) {
       uint64_t pos;
-      index.seekg((block_num - _begin_block) * sizeof(pos));
+      index.seek((block_num - _begin_block) * sizeof(pos));
       index.read((char*)&pos, sizeof(pos));
       return pos;
    }
@@ -269,22 +272,22 @@ class state_history_log {
       uint64_t num_removed = 0;
       if (block_num <= _begin_block) {
          num_removed = _end_block - _begin_block;
-         log.seekg(0);
-         index.seekg(0);
+         log.seek(0);
+         index.seek(0);
          boost::filesystem::resize_file(log_filename, 0);
          boost::filesystem::resize_file(index_filename, 0);
          _begin_block = _end_block = 0;
       } else {
          num_removed  = _end_block - block_num;
          uint64_t pos = get_pos(block_num);
-         log.seekg(0);
-         index.seekg(0);
+         log.seek(0);
+         index.seek(0);
          boost::filesystem::resize_file(log_filename, pos);
          boost::filesystem::resize_file(index_filename, (block_num - _begin_block) * sizeof(uint64_t));
          _end_block = block_num;
       }
-      log.sync();
-      index.sync();
+      log.flush();
+      index.flush();
       ilog("fork or replay: removed ${n} blocks from ${name}.log", ("n", num_removed)("name", name));
    }
 }; // state_history_log

From 7c7563ad12467563c21c03cf5147a389ccf6a9d5 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 15 Aug 2019 09:18:05 -0500
Subject: [PATCH 0998/1648] Moved validation outside of conditional check.

---
 unittests/snapshot_tests.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index 230ba553335..f2e4e01cee9 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -413,6 +413,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
    auto v2 = SNAPSHOT_SUITE::template load_from_file<snapshots::snap_v2_prod_sched>();
    snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
    auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();
+
+   // take advantage of variant compare to possibly identify where snapshot disparities come from
    if (std::is_same_v<SNAPSHOT_SUITE, variant_snapshot_suite> && v2_integrity_value.str() != base_integrity_value.str()) {
       // create a latest snapshot
       auto latest_writer = SNAPSHOT_SUITE::get_writer();
@@ -422,8 +424,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
       v2_tester.control->write_snapshot(latest_writer2);
       auto v2_tester_latest = SNAPSHOT_SUITE::finalize(latest_writer2);
       print_variant_diff(chain_latest, v2_tester_latest);
-      BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
    }
+   BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
+
    const auto& v2_gpo = v2_tester.control->get_global_properties();
    BOOST_REQUIRE_EQUAL(v2_gpo.proposed_schedule.version, 1);
    BOOST_REQUIRE_EQUAL(v2_gpo.proposed_schedule.producers.size(), 1);

From f0b29aa43ca24352b77c5262b24054a839878785 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 16 Aug 2019 09:11:29 -0500
Subject: [PATCH 0999/1648] Fix #7767 - node never identified its peer is done
 syncying

---
 plugins/net_plugin/net_plugin.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 555f1bc47ab..07c6953a3be 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1667,7 +1667,13 @@ namespace eosio {
          if (msg.known_blocks.ids.size() == 0) {
             fc_elog( logger,"got a catch up with ids size = 0" );
          } else {
-            verify_catchup(c, msg.known_blocks.pending, msg.known_blocks.ids.back());
+            const block_id_type& id = msg.known_blocks.ids.back();
+            if( !my_impl->dispatcher->have_block( id ) ) {
+               verify_catchup( c, msg.known_blocks.pending, id );
+            } else {
+               // we already have the block, so update peer with our view of the world
+               c->send_handshake();
+            }
          }
       } else if (msg.known_blocks.mode == last_irr_catch_up) {
          {

From 139252cdc6da94c3cd0597c3ba58a989aed6d305 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 16 Aug 2019 09:28:49 -0500
Subject: [PATCH 1000/1648] Close acceptor after shutdown of thread pool so it
 is safe to access from application thread

---
 plugins/net_plugin/net_plugin.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 07c6953a3be..8d5ddb2cc68 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3414,12 +3414,6 @@ namespace eosio {
                my->keepalive_timer->cancel();
          }
 
-         if( my->acceptor ) {
-            boost::system::error_code ec;
-            my->acceptor->cancel( ec );
-            my->acceptor->close( ec );
-         }
-
          {
             fc_ilog( logger, "close ${s} connections", ("s", my->connections.size()) );
             std::lock_guard<std::shared_mutex> g( my->connections_mtx );
@@ -3433,6 +3427,13 @@ namespace eosio {
          if( my->thread_pool ) {
             my->thread_pool->stop();
          }
+
+         if( my->acceptor ) {
+            boost::system::error_code ec;
+            my->acceptor->cancel( ec );
+            my->acceptor->close( ec );
+         }
+
          app().post( 0, [me = my](){} ); // keep my pointer alive until queue is drained
          fc_ilog( logger, "exit shutdown" );
       }

From 2b07926b3c982e0cf6f152c4b08f55142ade525e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 16 Aug 2019 09:44:56 -0500
Subject: [PATCH 1001/1648] #7766 - report peer address on close

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8d5ddb2cc68..7be660bfa71 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -957,7 +957,8 @@ namespace eosio {
       self->sent_handshake_count = 0;
       self->node_id = fc::sha256();
       my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
-      fc_dlog( logger, "closed, canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
+      fc_ilog( logger, "closing '${a}', ${p}", ("a", self->peer_address())("p", self->peer_name()) );
+      fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();
       {
          std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );

From 1658ebcbc69d7108d54a74bf3d579c2a3a353b9e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 16 Aug 2019 19:44:17 -0500
Subject: [PATCH 1002/1648] Clear trx_in_progress_size when closing a
 connection.

---
 plugins/net_plugin/net_plugin.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7be660bfa71..7626f18cf99 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -941,6 +941,7 @@ namespace eosio {
       self->connecting = false;
       self->syncing = false;
       self->consecutive_rejected_blocks = 0;
+      self->trx_in_progress_size = 0;
       ++self->consecutive_immediate_connection_close;
       bool has_last_req = false;
       {
@@ -2274,6 +2275,8 @@ namespace eosio {
             {
                fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
                         ("p", peer_name()) );
+               fc_elog( logger, "  write_queue ${s} bytes", ("s", write_queue_size) );
+               fc_elog( logger, "  max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
                close( false );
                return;
             }

From a0d26467564bca5f7a7c40064910b482ff34365a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 19 Aug 2019 07:32:46 -0500
Subject: [PATCH 1003/1648] Handle ready delay timer error

---
 plugins/net_plugin/net_plugin.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7626f18cf99..2fbf324d588 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2288,7 +2288,13 @@ namespace eosio {
                if( ec == boost::asio::error::operation_aborted ) return;
                auto conn = weak_conn.lock();
                if( !conn ) return;
-               conn->start_read_message();
+               if( !ec ) {
+                  conn->start_read_message();
+               } else {
+                  fc_elog( logger, "Read delay timer error: ${e}, closing connection: ${p}",
+                           ("e", ec.message())("p",conn->peer_name()) );
+                  close( conn );
+               }
             } ) );
             return;
          }

From c23a7d3a6538bc96b9d5c7aeefdd538033b60b0d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 19 Aug 2019 08:08:23 -0500
Subject: [PATCH 1004/1648] Fix cherry-pick merge issue

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 2fbf324d588..f0272410b67 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2293,7 +2293,7 @@ namespace eosio {
                } else {
                   fc_elog( logger, "Read delay timer error: ${e}, closing connection: ${p}",
                            ("e", ec.message())("p",conn->peer_name()) );
-                  close( conn );
+                  conn->close();
                }
             } ) );
             return;

From 7834cdc60179cba6cbeae40474e96dbe38cec846 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 14 Jun 2019 13:57:39 -0400
Subject: [PATCH 1005/1648] just remove some obviously unneeded stuff

---
 .../wasm-jit/Source/Runtime/LLVMEmitIR.cpp    | 515 +-----------------
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 127 +----
 2 files changed, 19 insertions(+), 623 deletions(-)

diff --git a/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp b/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
index 2c002c497ea..415220de633 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
@@ -199,53 +199,23 @@ namespace LLVMJIT
 		// Bounds checks and converts a memory operation I32 address operand to a LLVM pointer.
 		llvm::Value* coerceByteIndexToPointer(llvm::Value* byteIndex,U32 offset,llvm::Type* memoryType)
 		{
-			if(HAS_64BIT_ADDRESS_SPACE)
-			{
-				// On a 64 bit runtime, if the address is 32-bits, zext it to 64-bits.
-				// This is crucial for security, as LLVM will otherwise implicitly sign extend it to 64-bits in the GEP below,
-				// interpreting it as a signed offset and allowing access to memory outside the sandboxed memory range.
-				// There are no 'far addresses' in a 32 bit runtime.
-				if(sizeof(Uptr) != 4) { byteIndex = irBuilder.CreateZExt(byteIndex,llvmI64Type); }
-
-				// Add the offset to the byte index.
-				if(offset)
-				{
-					byteIndex = irBuilder.CreateAdd(byteIndex,irBuilder.CreateZExt(emitLiteral(offset),llvmI64Type));
-				}
 
-				// If HAS_64BIT_ADDRESS_SPACE, the memory has enough virtual address space allocated to
-				// ensure that any 32-bit byte index + 32-bit offset will fall within the virtual address sandbox,
-				// so no explicit bounds check is necessary.
-			}
-			else
-			{
-				// Add the offset to the byte index using a LLVM intrinsic that returns a carry bit if the add overflowed.
-				llvm::Value* overflowed = emitLiteral(false);
-				if(offset)
-				{
-					auto offsetByteIndexWithOverflow = irBuilder.CreateCall(
-						getLLVMIntrinsic({llvmI32Type},llvm::Intrinsic::uadd_with_overflow),
-						{byteIndex,emitLiteral(U32(offset))}
-						);
-					byteIndex = irBuilder.CreateExtractValue(offsetByteIndexWithOverflow,{0});
-					overflowed = irBuilder.CreateExtractValue(offsetByteIndexWithOverflow,{1});
-				}
+         // On a 64 bit runtime, if the address is 32-bits, zext it to 64-bits.
+         // This is crucial for security, as LLVM will otherwise implicitly sign extend it to 64-bits in the GEP below,
+         // interpreting it as a signed offset and allowing access to memory outside the sandboxed memory range.
+         // There are no 'far addresses' in a 32 bit runtime.
+         byteIndex = irBuilder.CreateZExt(byteIndex,llvmI64Type);
 
-				// Check that the offset didn't overflow, and that the final byte index is within the virtual address space
-				// allocated for the memory.
-				emitConditionalTrapIntrinsic(
-					irBuilder.CreateOr(
-						overflowed,
-						irBuilder.CreateICmpUGT(
-							byteIndex,
-							irBuilder.CreateSub(
-								moduleContext.defaultMemoryEndOffset,
-								emitLiteral(Uptr(memoryType->getPrimitiveSizeInBits() / 8) - 1)
-								)
-							)
-						),
-					"wavmIntrinsics.accessViolationTrap",FunctionType::get(),{});
-			}
+         // Add the offset to the byte index.
+         if(offset)
+         {
+            byteIndex = irBuilder.CreateAdd(byteIndex,irBuilder.CreateZExt(emitLiteral(offset),llvmI64Type));
+         }
+
+         // If HAS_64BIT_ADDRESS_SPACE, the memory has enough virtual address space allocated to
+         // ensure that any 32-bit byte index + 32-bit offset will fall within the virtual address sandbox,
+         // so no explicit bounds check is necessary.
+      
 
 			// Cast the pointer to the appropriate type.
 			auto bytePointer = irBuilder.CreateInBoundsGEP(moduleContext.defaultMemoryBase,byteIndex);
@@ -971,461 +941,6 @@ namespace LLVMJIT
 		EMIT_INT_UNARY_OP(trunc_s_f64,emitRuntimeIntrinsic("wavmIntrinsics.floatToSignedInt",FunctionType::get(asResultType(type),{ValueType::f64}),{operand}))
 		EMIT_INT_UNARY_OP(trunc_u_f32,emitRuntimeIntrinsic("wavmIntrinsics.floatToUnsignedInt",FunctionType::get(asResultType(type),{ValueType::f32}),{operand}))
 		EMIT_INT_UNARY_OP(trunc_u_f64,emitRuntimeIntrinsic("wavmIntrinsics.floatToUnsignedInt",FunctionType::get(asResultType(type),{ValueType::f64}),{operand}))
-
-		#if ENABLE_SIMD_PROTOTYPE
-		llvm::Value* emitAnyTrue(llvm::Value* boolVector)
-		{
-			const Uptr numLanes = boolVector->getType()->getVectorNumElements();
-			llvm::Value* result = nullptr;
-			for(Uptr laneIndex = 0;laneIndex < numLanes;++laneIndex)
-			{
-				llvm::Value* scalar = irBuilder.CreateExtractElement(boolVector,laneIndex);
-				result = result ? irBuilder.CreateOr(result,scalar) : scalar;
-			}
-			return result;
-		}
-		llvm::Value* emitAllTrue(llvm::Value* boolVector)
-		{
-			const Uptr numLanes = boolVector->getType()->getVectorNumElements();
-			llvm::Value* result = nullptr;
-			for(Uptr laneIndex = 0;laneIndex < numLanes;++laneIndex)
-			{
-				llvm::Value* scalar = irBuilder.CreateExtractElement(boolVector,laneIndex);
-				result = result ? irBuilder.CreateAnd(result,scalar) : scalar;
-			}
-			return result;
-		}
-
-		llvm::Value* unimplemented()
-		{
-			Errors::unreachable();
-		}
-
-		#define EMIT_SIMD_SPLAT(vectorType,coerceScalar,numLanes) \
-			void vectorType##_splat(NoImm) \
-			{ \
-				auto scalar = pop(); \
-				push(irBuilder.CreateVectorSplat(numLanes,coerceScalar)); \
-			}
-		EMIT_SIMD_SPLAT(i8x16,irBuilder.CreateTrunc(scalar,llvmI8Type),16)
-		EMIT_SIMD_SPLAT(i16x8,irBuilder.CreateTrunc(scalar,llvmI16Type),8)
-		EMIT_SIMD_SPLAT(i32x4,scalar,4) 
-		EMIT_SIMD_SPLAT(i64x2,scalar,2)
-		EMIT_SIMD_SPLAT(f32x4,scalar,4)
-		EMIT_SIMD_SPLAT(f64x2,scalar,2)
-
-		EMIT_STORE_OP(v128,store,value->getType(),4,identityConversion)
-		EMIT_LOAD_OP(v128,load,llvmI64x2Type,4,identityConversion)
-
-		#define EMIT_SIMD_BINARY_OP(name,llvmType,emitCode) \
-			void name(NoImm) \
-			{ \
-				auto right = irBuilder.CreateBitCast(pop(),llvmType); SUPPRESS_UNUSED(right); \
-				auto left = irBuilder.CreateBitCast(pop(),llvmType); SUPPRESS_UNUSED(left); \
-				push(emitCode); \
-			}
-		#define EMIT_SIMD_UNARY_OP(name,llvmType,emitCode) \
-			void name(NoImm) \
-			{ \
-				auto operand = irBuilder.CreateBitCast(pop(),llvmType); SUPPRESS_UNUSED(operand); \
-				push(emitCode); \
-			}
-		#define EMIT_SIMD_INT_BINARY_OP(name,emitCode) \
-			EMIT_SIMD_BINARY_OP(i8x16##_##name,llvmI8x16Type,emitCode) \
-			EMIT_SIMD_BINARY_OP(i16x8##_##name,llvmI16x8Type,emitCode) \
-			EMIT_SIMD_BINARY_OP(i32x4##_##name,llvmI32x4Type,emitCode) \
-			EMIT_SIMD_BINARY_OP(i64x2##_##name,llvmI64x2Type,emitCode)
-		#define EMIT_SIMD_FP_BINARY_OP(name,emitCode) \
-			EMIT_SIMD_BINARY_OP(f32x4##_##name,llvmF32x4Type,emitCode) \
-			EMIT_SIMD_BINARY_OP(f64x2##_##name,llvmF64x2Type,emitCode)
-		#define EMIT_SIMD_INT_UNARY_OP(name,emitCode) \
-			EMIT_SIMD_UNARY_OP(i8x16##_##name,llvmI8x16Type,emitCode) \
-			EMIT_SIMD_UNARY_OP(i16x8##_##name,llvmI16x8Type,emitCode) \
-			EMIT_SIMD_UNARY_OP(i32x4##_##name,llvmI32x4Type,emitCode) \
-			EMIT_SIMD_UNARY_OP(i64x2##_##name,llvmI64x2Type,emitCode)
-		#define EMIT_SIMD_FP_UNARY_OP(name,emitCode) \
-			EMIT_SIMD_UNARY_OP(f32x4##_##name,llvmF32x4Type,emitCode) \
-			EMIT_SIMD_UNARY_OP(f64x2##_##name,llvmF64x2Type,emitCode)
-		EMIT_SIMD_INT_BINARY_OP(add,irBuilder.CreateAdd(left,right))
-		EMIT_SIMD_INT_BINARY_OP(sub,irBuilder.CreateSub(left,right))
-
-		EMIT_SIMD_INT_BINARY_OP(shl,irBuilder.CreateShl(left,right))
-		EMIT_SIMD_INT_BINARY_OP(shr_s,irBuilder.CreateAShr(left,right))
-		EMIT_SIMD_INT_BINARY_OP(shr_u,irBuilder.CreateLShr(left,right))
-		EMIT_SIMD_INT_BINARY_OP(mul,irBuilder.CreateMul(left,right))
-		EMIT_SIMD_INT_BINARY_OP(div_s,irBuilder.CreateSDiv(left,right))
-		EMIT_SIMD_INT_BINARY_OP(div_u,irBuilder.CreateUDiv(left,right))
-
-		EMIT_SIMD_INT_BINARY_OP(eq,irBuilder.CreateICmpEQ(left,right))
-		EMIT_SIMD_INT_BINARY_OP(ne,irBuilder.CreateICmpNE(left,right))
-		EMIT_SIMD_INT_BINARY_OP(lt_s,irBuilder.CreateICmpSLT(left,right))
-		EMIT_SIMD_INT_BINARY_OP(lt_u,irBuilder.CreateICmpULT(left,right))
-		EMIT_SIMD_INT_BINARY_OP(le_s,irBuilder.CreateICmpSLE(left,right))
-		EMIT_SIMD_INT_BINARY_OP(le_u,irBuilder.CreateICmpULE(left,right))
-		EMIT_SIMD_INT_BINARY_OP(gt_s,irBuilder.CreateICmpSGT(left,right))
-		EMIT_SIMD_INT_BINARY_OP(gt_u,irBuilder.CreateICmpUGT(left,right))
-		EMIT_SIMD_INT_BINARY_OP(ge_s,irBuilder.CreateICmpSGE(left,right))
-		EMIT_SIMD_INT_BINARY_OP(ge_u,irBuilder.CreateICmpUGE(left,right))
-
-		EMIT_SIMD_INT_UNARY_OP(neg,irBuilder.CreateNeg(operand))
-
-		EMIT_SIMD_BINARY_OP(i8x16_add_saturate_s,llvmI8x16Type,unimplemented())
-		EMIT_SIMD_BINARY_OP(i8x16_add_saturate_u,llvmI16x8Type,unimplemented())
-		EMIT_SIMD_BINARY_OP(i8x16_sub_saturate_s,llvmI8x16Type,unimplemented())
-		EMIT_SIMD_BINARY_OP(i8x16_sub_saturate_u,llvmI16x8Type,unimplemented())
-		EMIT_SIMD_BINARY_OP(i16x8_add_saturate_s,llvmI8x16Type,unimplemented())
-		EMIT_SIMD_BINARY_OP(i16x8_add_saturate_u,llvmI16x8Type,unimplemented())
-		EMIT_SIMD_BINARY_OP(i16x8_sub_saturate_s,llvmI8x16Type,unimplemented())
-		EMIT_SIMD_BINARY_OP(i16x8_sub_saturate_u,llvmI16x8Type,unimplemented())
-
-		EMIT_SIMD_UNARY_OP(i32x4_trunc_s_f32x4_sat,llvmF32x4Type,unimplemented());
-		EMIT_SIMD_UNARY_OP(i32x4_trunc_u_f32x4_sat,llvmF32x4Type,unimplemented());
-		EMIT_SIMD_UNARY_OP(i64x2_trunc_s_f64x2_sat,llvmF64x2Type,unimplemented());
-		EMIT_SIMD_UNARY_OP(i64x2_trunc_u_f64x2_sat,llvmF64x2Type,unimplemented());
-
-		EMIT_SIMD_FP_BINARY_OP(add,irBuilder.CreateFAdd(left,right))
-		EMIT_SIMD_FP_BINARY_OP(sub,irBuilder.CreateFSub(left,right))
-		EMIT_SIMD_FP_BINARY_OP(mul,irBuilder.CreateFMul(left,right))
-		EMIT_SIMD_FP_BINARY_OP(div,irBuilder.CreateFDiv(left,right))
-			
-		EMIT_SIMD_FP_BINARY_OP(eq,irBuilder.CreateFCmpOEQ(left,right))
-		EMIT_SIMD_FP_BINARY_OP(ne,irBuilder.CreateFCmpUNE(left,right))
-		EMIT_SIMD_FP_BINARY_OP(lt,irBuilder.CreateFCmpOLT(left,right))
-		EMIT_SIMD_FP_BINARY_OP(le,irBuilder.CreateFCmpOLE(left,right))
-		EMIT_SIMD_FP_BINARY_OP(gt,irBuilder.CreateFCmpOGT(left,right))
-		EMIT_SIMD_FP_BINARY_OP(ge,irBuilder.CreateFCmpOGE(left,right))
-		EMIT_SIMD_FP_BINARY_OP(min,unimplemented());
-		EMIT_SIMD_FP_BINARY_OP(max,unimplemented());
-
-		EMIT_SIMD_FP_UNARY_OP(neg,irBuilder.CreateFNeg(operand))
-		EMIT_SIMD_FP_UNARY_OP(abs,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::fabs),llvm::ArrayRef<llvm::Value*>({operand})))
-		EMIT_SIMD_FP_UNARY_OP(sqrt,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::sqrt),llvm::ArrayRef<llvm::Value*>({operand})))
-
-		EMIT_SIMD_UNARY_OP(f32x4_convert_s_i32x4,llvmI32x4Type,irBuilder.CreateSIToFP(operand,llvmF32x4Type));
-		EMIT_SIMD_UNARY_OP(f32x4_convert_u_i32x4,llvmI32x4Type,irBuilder.CreateUIToFP(operand,llvmF32x4Type));
-		EMIT_SIMD_UNARY_OP(f64x2_convert_s_i64x2,llvmI64x2Type,irBuilder.CreateSIToFP(operand,llvmF64x2Type));
-		EMIT_SIMD_UNARY_OP(f64x2_convert_u_i64x2,llvmI64x2Type,irBuilder.CreateUIToFP(operand,llvmF64x2Type));
-
-		EMIT_SIMD_UNARY_OP(i8x16_any_true,llvmI8x16Type,emitAnyTrue(operand))
-		EMIT_SIMD_UNARY_OP(i16x8_any_true,llvmI16x8Type,emitAnyTrue(operand))
-		EMIT_SIMD_UNARY_OP(i32x4_any_true,llvmI32x4Type,emitAnyTrue(operand))
-		EMIT_SIMD_UNARY_OP(i64x2_any_true,llvmI64x2Type,emitAnyTrue(operand))
-
-		EMIT_SIMD_UNARY_OP(i8x16_all_true,llvmI8x16Type,emitAllTrue(operand))
-		EMIT_SIMD_UNARY_OP(i16x8_all_true,llvmI16x8Type,emitAllTrue(operand))
-		EMIT_SIMD_UNARY_OP(i32x4_all_true,llvmI32x4Type,emitAllTrue(operand))
-		EMIT_SIMD_UNARY_OP(i64x2_all_true,llvmI64x2Type,emitAllTrue(operand))
-
-		void v128_and(NoImm)
-		{
-			auto right = pop();
-			auto left = irBuilder.CreateBitCast(pop(),right->getType());
-			push(irBuilder.CreateAnd(left,right));
-		}
-		void v128_or(NoImm)
-		{
-			auto right = pop();
-			auto left = irBuilder.CreateBitCast(pop(),right->getType());
-			push(irBuilder.CreateOr(left,right));
-		}
-		void v128_xor(NoImm)
-		{
-			auto right = pop();
-			auto left = irBuilder.CreateBitCast(pop(),right->getType());
-			push(irBuilder.CreateXor(left,right));
-		}
-		void v128_not(NoImm)
-		{
-			auto operand = pop();
-			push(irBuilder.CreateNot(operand));
-		}
-
-		#define EMIT_SIMD_EXTRACT_LANE_OP(name,llvmType,numLanes,coerceScalar) \
-			void name(LaneIndexImm<numLanes> imm) \
-			{ \
-				auto operand = irBuilder.CreateBitCast(pop(),llvmType); \
-				auto scalar = irBuilder.CreateExtractElement(operand,imm.laneIndex); \
-				push(coerceScalar); \
-			}
-		EMIT_SIMD_EXTRACT_LANE_OP(i8x16_extract_lane_s,llvmI8x16Type,16,irBuilder.CreateSExt(scalar,llvmI32Type))
-		EMIT_SIMD_EXTRACT_LANE_OP(i8x16_extract_lane_u,llvmI8x16Type,16,irBuilder.CreateZExt(scalar,llvmI32Type))
-		EMIT_SIMD_EXTRACT_LANE_OP(i16x8_extract_lane_s,llvmI16x8Type,8,irBuilder.CreateSExt(scalar,llvmI32Type))
-		EMIT_SIMD_EXTRACT_LANE_OP(i16x8_extract_lane_u,llvmI16x8Type,8,irBuilder.CreateZExt(scalar,llvmI32Type))
-		EMIT_SIMD_EXTRACT_LANE_OP(i32x4_extract_lane,llvmI32x4Type,4,scalar)
-		EMIT_SIMD_EXTRACT_LANE_OP(i64x2_extract_lane,llvmI64x2Type,2,scalar)
-
-		EMIT_SIMD_EXTRACT_LANE_OP(f32x4_extract_lane,llvmF32x4Type,4,scalar)
-		EMIT_SIMD_EXTRACT_LANE_OP(f64x2_extract_lane,llvmF64x2Type,2,scalar)
-		
-		#define EMIT_SIMD_REPLACE_LANE_OP(typePrefix,llvmType,numLanes,coerceScalar) \
-			void typePrefix##_replace_lane(LaneIndexImm<numLanes> imm) \
-			{ \
-				auto vector = irBuilder.CreateBitCast(pop(),llvmType); \
-				auto scalar = pop(); \
-				push(irBuilder.CreateInsertElement(vector,coerceScalar,imm.laneIndex)); \
-			}
-
-		EMIT_SIMD_REPLACE_LANE_OP(i8x16,llvmI8x16Type,16,irBuilder.CreateTrunc(scalar,llvmI8Type))
-		EMIT_SIMD_REPLACE_LANE_OP(i16x8,llvmI16x8Type,8,irBuilder.CreateTrunc(scalar,llvmI16Type))
-		EMIT_SIMD_REPLACE_LANE_OP(i32x4,llvmI32x4Type,4,scalar)
-		EMIT_SIMD_REPLACE_LANE_OP(i64x2,llvmI64x2Type,2,scalar)
-
-		EMIT_SIMD_REPLACE_LANE_OP(f32x4,llvmF32x4Type,4,scalar)
-		EMIT_SIMD_REPLACE_LANE_OP(f64x2,llvmF64x2Type,2,scalar)
-
-		void v8x16_shuffle(ShuffleImm<16> imm)
-		{
-			auto right = irBuilder.CreateBitCast(pop(),llvmI8x16Type);
-			auto left = irBuilder.CreateBitCast(pop(),llvmI8x16Type);
-			unsigned int laneIndices[16];
-			for(Uptr laneIndex = 0;laneIndex < 16;++laneIndex)
-			{
-				laneIndices[laneIndex] = imm.laneIndices[laneIndex];
-			}
-			push(irBuilder.CreateShuffleVector(left,right,llvm::ArrayRef<unsigned int>(laneIndices,16)));
-		}
-		
-		void v128_const(LiteralImm<V128> imm)
-		{
-			push(llvm::ConstantVector::get({emitLiteral(imm.value.u64[0]),emitLiteral(imm.value.u64[1])}));
-		}
-
-		void v128_bitselect(NoImm)
-		{
-			auto mask = irBuilder.CreateBitCast(pop(),llvmI64x2Type);
-			auto falseValue = irBuilder.CreateBitCast(pop(),llvmI64x2Type);
-			auto trueValue = irBuilder.CreateBitCast(pop(),llvmI64x2Type);
-			push(irBuilder.CreateOr(
-				irBuilder.CreateAnd(trueValue,mask),
-				irBuilder.CreateAnd(falseValue,irBuilder.CreateNot(mask))
-				));
-		}
-		#endif
-
-		#if ENABLE_THREADING_PROTOTYPE
-		void is_lock_free(NoImm)
-		{
-			auto numBytes = pop();
-			push(emitRuntimeIntrinsic(
-				"wavmIntrinsics.isLockFree",
-				FunctionType::get(ResultType::i32,{ValueType::i32}),
-				{numBytes}));
-		}
-		void wake(AtomicLoadOrStoreImm<2>)
-		{
-			auto numWaiters = pop();
-			auto address = pop();
-			auto defaultMemoryObjectAsI64 = emitLiteral(reinterpret_cast<U64>(moduleContext.moduleInstance->defaultMemory));
-			push(emitRuntimeIntrinsic(
-				"wavmIntrinsics.wake",
-				FunctionType::get(ResultType::i32,{ValueType::i32,ValueType::i32,ValueType::i64}),
-				{address,numWaiters,defaultMemoryObjectAsI64}));
-		}
-		void i32_wait(AtomicLoadOrStoreImm<2>)
-		{
-			auto timeout = pop();
-			auto expectedValue = pop();
-			auto address = pop();
-			auto defaultMemoryObjectAsI64 = emitLiteral(reinterpret_cast<U64>(moduleContext.moduleInstance->defaultMemory));
-			push(emitRuntimeIntrinsic(
-				"wavmIntrinsics.wait",
-				FunctionType::get(ResultType::i32,{ValueType::i32,ValueType::i32,ValueType::f64,ValueType::i64}),
-				{address,expectedValue,timeout,defaultMemoryObjectAsI64}));
-		}
-		void i64_wait(AtomicLoadOrStoreImm<3>)
-		{
-			auto timeout = pop();
-			auto expectedValue = pop();
-			auto address = pop();
-			auto defaultMemoryObjectAsI64 = emitLiteral(reinterpret_cast<U64>(moduleContext.moduleInstance->defaultMemory));
-			push(emitRuntimeIntrinsic(
-				"wavmIntrinsics.wait",
-				FunctionType::get(ResultType::i32,{ValueType::i32,ValueType::i64,ValueType::f64,ValueType::i64}),
-				{address,expectedValue,timeout,defaultMemoryObjectAsI64}));
-		}
-
-		void launch_thread(LaunchThreadImm)
-		{
-			WAVM_ASSERT_THROW(moduleContext.moduleInstance->defaultTable);
-			auto errorFunctionIndex = pop();
-			auto argument = pop();
-			auto functionIndex = pop();
-			auto defaultTableAsI64 = emitLiteral(reinterpret_cast<U64>(moduleContext.moduleInstance->defaultTable));
-			emitRuntimeIntrinsic(
-				"wavmIntrinsics.launchThread",
-				FunctionType::get(ResultType::none,{ValueType::i32,ValueType::i32,ValueType::i32,ValueType::i64}),
-				{functionIndex,argument,errorFunctionIndex,defaultTableAsI64});
-		}
-		
-		void trapIfMisalignedAtomic(llvm::Value* address,U32 naturalAlignmentLog2)
-		{
-			if(naturalAlignmentLog2 > 0)
-			{
-				emitConditionalTrapIntrinsic(
-					irBuilder.CreateICmpNE(
-						typedZeroConstants[(Uptr)ValueType::i32],
-						irBuilder.CreateAnd(address,emitLiteral((U32(1) << naturalAlignmentLog2) - 1))),
-					"wavmIntrinsics.misalignedAtomicTrap",
-					FunctionType::get(ResultType::none,{ValueType::i32}),
-					{address});
-			}
-		}
-
-		EMIT_UNARY_OP(i32,extend_s_i8,irBuilder.CreateSExt(irBuilder.CreateTrunc(operand,llvmI8Type),llvmI32Type))
-		EMIT_UNARY_OP(i32,extend_s_i16,irBuilder.CreateSExt(irBuilder.CreateTrunc(operand,llvmI16Type),llvmI32Type))
-		EMIT_UNARY_OP(i64,extend_s_i8,irBuilder.CreateSExt(irBuilder.CreateTrunc(operand,llvmI8Type),llvmI64Type))
-		EMIT_UNARY_OP(i64,extend_s_i16,irBuilder.CreateSExt(irBuilder.CreateTrunc(operand,llvmI16Type),llvmI64Type))
-
-		#define EMIT_ATOMIC_LOAD_OP(valueTypeId,name,llvmMemoryType,naturalAlignmentLog2,conversionOp) \
-			void valueTypeId##_##name(AtomicLoadOrStoreImm<naturalAlignmentLog2> imm) \
-			{ \
-				auto byteIndex = pop(); \
-				trapIfMisalignedAtomic(byteIndex,naturalAlignmentLog2); \
-				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
-				auto load = irBuilder.CreateLoad(pointer); \
-				load->setAlignment(1<<imm.alignmentLog2); \
-				load->setVolatile(true); \
-				load->setAtomic(llvm::AtomicOrdering::SequentiallyConsistent); \
-				push(conversionOp(load,asLLVMType(ValueType::valueTypeId))); \
-			}
-		#define EMIT_ATOMIC_STORE_OP(valueTypeId,name,llvmMemoryType,naturalAlignmentLog2,conversionOp) \
-			void valueTypeId##_##name(AtomicLoadOrStoreImm<naturalAlignmentLog2> imm) \
-			{ \
-				auto value = pop(); \
-				auto byteIndex = pop(); \
-				trapIfMisalignedAtomic(byteIndex,naturalAlignmentLog2); \
-				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
-				auto memoryValue = conversionOp(value,llvmMemoryType); \
-				auto store = irBuilder.CreateStore(memoryValue,pointer); \
-				store->setVolatile(true); \
-				store->setAlignment(1<<imm.alignmentLog2); \
-				store->setAtomic(llvm::AtomicOrdering::SequentiallyConsistent); \
-			}
-		EMIT_ATOMIC_LOAD_OP(i32,atomic_load,llvmI32Type,2,identityConversion)
-		EMIT_ATOMIC_LOAD_OP(i64,atomic_load,llvmI64Type,3,identityConversion)
-		EMIT_ATOMIC_LOAD_OP(f32,atomic_load,llvmF32Type,2,identityConversion)
-		EMIT_ATOMIC_LOAD_OP(f64,atomic_load,llvmF64Type,3,identityConversion)
-
-		EMIT_ATOMIC_LOAD_OP(i32,atomic_load8_s,llvmI8Type,0,irBuilder.CreateSExt)
-		EMIT_ATOMIC_LOAD_OP(i32,atomic_load8_u,llvmI8Type,0,irBuilder.CreateZExt)
-		EMIT_ATOMIC_LOAD_OP(i32,atomic_load16_s,llvmI16Type,1,irBuilder.CreateSExt)
-		EMIT_ATOMIC_LOAD_OP(i32,atomic_load16_u,llvmI16Type,1,irBuilder.CreateZExt)
-		EMIT_ATOMIC_LOAD_OP(i64,atomic_load8_s,llvmI8Type,0,irBuilder.CreateSExt)
-		EMIT_ATOMIC_LOAD_OP(i64,atomic_load8_u,llvmI8Type,0,irBuilder.CreateZExt)
-		EMIT_ATOMIC_LOAD_OP(i64,atomic_load16_s,llvmI16Type,1,irBuilder.CreateSExt)
-		EMIT_ATOMIC_LOAD_OP(i64,atomic_load16_u,llvmI16Type,1,irBuilder.CreateZExt)
-		EMIT_ATOMIC_LOAD_OP(i64,atomic_load32_s,llvmI32Type,2,irBuilder.CreateSExt)
-		EMIT_ATOMIC_LOAD_OP(i64,atomic_load32_u,llvmI32Type,2,irBuilder.CreateZExt)
-
-		EMIT_ATOMIC_STORE_OP(i32,atomic_store,llvmI32Type,2,identityConversion)
-		EMIT_ATOMIC_STORE_OP(i64,atomic_store,llvmI64Type,3,identityConversion)
-		EMIT_ATOMIC_STORE_OP(f32,atomic_store,llvmF32Type,2,identityConversion)
-		EMIT_ATOMIC_STORE_OP(f64,atomic_store,llvmF64Type,3,identityConversion)
-			
-		EMIT_ATOMIC_STORE_OP(i32,atomic_store8,llvmI8Type,0,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_STORE_OP(i32,atomic_store16,llvmI16Type,1,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_STORE_OP(i64,atomic_store8,llvmI8Type,0,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_STORE_OP(i64,atomic_store16,llvmI16Type,1,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_STORE_OP(i64,atomic_store32,llvmI32Type,2,irBuilder.CreateTrunc)
-
-		#define EMIT_ATOMIC_CMPXCHG(valueTypeId,name,llvmMemoryType,naturalAlignmentLog2,memoryToValueConversion,valueToMemoryConversion) \
-			void valueTypeId##_##name(AtomicLoadOrStoreImm<naturalAlignmentLog2> imm) \
-			{ \
-				auto replacementValue = valueToMemoryConversion(pop(),llvmMemoryType); \
-				auto expectedValue = valueToMemoryConversion(pop(),llvmMemoryType); \
-				auto byteIndex = pop(); \
-				trapIfMisalignedAtomic(byteIndex,naturalAlignmentLog2); \
-				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
-				auto atomicCmpXchg = irBuilder.CreateAtomicCmpXchg( \
-					pointer, \
-					expectedValue, \
-					replacementValue, \
-					llvm::AtomicOrdering::SequentiallyConsistent, \
-					llvm::AtomicOrdering::SequentiallyConsistent); \
-				atomicCmpXchg->setVolatile(true); \
-				auto previousValue = irBuilder.CreateExtractValue(atomicCmpXchg,{0}); \
-				push(memoryToValueConversion(previousValue,asLLVMType(ValueType::valueTypeId))); \
-			}
-
-		EMIT_ATOMIC_CMPXCHG(i32,atomic_rmw8_u_cmpxchg,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_CMPXCHG(i32,atomic_rmw16_u_cmpxchg,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_CMPXCHG(i32,atomic_rmw_cmpxchg,llvmI32Type,2,identityConversion,identityConversion)
-			
-		EMIT_ATOMIC_CMPXCHG(i64,atomic_rmw8_u_cmpxchg,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_CMPXCHG(i64,atomic_rmw16_u_cmpxchg,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_CMPXCHG(i64,atomic_rmw32_u_cmpxchg,llvmI32Type,2,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_CMPXCHG(i64,atomic_rmw_cmpxchg,llvmI64Type,3,identityConversion,identityConversion)
-			
-		#define EMIT_ATOMIC_RMW(valueTypeId,name,rmwOpId,llvmMemoryType,naturalAlignmentLog2,memoryToValueConversion,valueToMemoryConversion) \
-			void valueTypeId##_##name(AtomicLoadOrStoreImm<naturalAlignmentLog2> imm) \
-			{ \
-				auto value = valueToMemoryConversion(pop(),llvmMemoryType); \
-				auto byteIndex = pop(); \
-				trapIfMisalignedAtomic(byteIndex,naturalAlignmentLog2); \
-				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
-				auto atomicRMW = irBuilder.CreateAtomicRMW( \
-					llvm::AtomicRMWInst::BinOp::rmwOpId, \
-					pointer, \
-					value, \
-					llvm::AtomicOrdering::SequentiallyConsistent); \
-				atomicRMW->setVolatile(true); \
-				push(memoryToValueConversion(atomicRMW,asLLVMType(ValueType::valueTypeId))); \
-			}
-
-		EMIT_ATOMIC_RMW(i32,atomic_rmw8_u_xchg,Xchg,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw16_u_xchg,Xchg,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw_xchg,Xchg,llvmI32Type,2,identityConversion,identityConversion)
-
-		EMIT_ATOMIC_RMW(i64,atomic_rmw8_u_xchg,Xchg,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw16_u_xchg,Xchg,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw32_u_xchg,Xchg,llvmI32Type,2,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw_xchg,Xchg,llvmI64Type,3,identityConversion,identityConversion)
-
-		EMIT_ATOMIC_RMW(i32,atomic_rmw8_u_add,Add,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw16_u_add,Add,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw_add,Add,llvmI32Type,2,identityConversion,identityConversion)
-
-		EMIT_ATOMIC_RMW(i64,atomic_rmw8_u_add,Add,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw16_u_add,Add,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw32_u_add,Add,llvmI32Type,2,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw_add,Add,llvmI64Type,3,identityConversion,identityConversion)
-			
-		EMIT_ATOMIC_RMW(i32,atomic_rmw8_u_sub,Sub,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw16_u_sub,Sub,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw_sub,Sub,llvmI32Type,2,identityConversion,identityConversion)
-
-		EMIT_ATOMIC_RMW(i64,atomic_rmw8_u_sub,Sub,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw16_u_sub,Sub,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw32_u_sub,Sub,llvmI32Type,2,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw_sub,Sub,llvmI64Type,3,identityConversion,identityConversion)
-			
-		EMIT_ATOMIC_RMW(i32,atomic_rmw8_u_and,And,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw16_u_and,And,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw_and,And,llvmI32Type,2,identityConversion,identityConversion)
-
-		EMIT_ATOMIC_RMW(i64,atomic_rmw8_u_and,And,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw16_u_and,And,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw32_u_and,And,llvmI32Type,2,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw_and,And,llvmI64Type,3,identityConversion,identityConversion)
-			
-		EMIT_ATOMIC_RMW(i32,atomic_rmw8_u_or,Or,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw16_u_or,Or,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw_or,Or,llvmI32Type,2,identityConversion,identityConversion)
-
-		EMIT_ATOMIC_RMW(i64,atomic_rmw8_u_or,Or,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw16_u_or,Or,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw32_u_or,Or,llvmI32Type,2,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw_or,Or,llvmI64Type,3,identityConversion,identityConversion)
-			
-		EMIT_ATOMIC_RMW(i32,atomic_rmw8_u_xor,Xor,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw16_u_xor,Xor,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i32,atomic_rmw_xor,Xor,llvmI32Type,2,identityConversion,identityConversion)
-
-		EMIT_ATOMIC_RMW(i64,atomic_rmw8_u_xor,Xor,llvmI8Type,0,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw16_u_xor,Xor,llvmI16Type,1,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw32_u_xor,Xor,llvmI32Type,2,irBuilder.CreateZExt,irBuilder.CreateTrunc)
-		EMIT_ATOMIC_RMW(i64,atomic_rmw_xor,Xor,llvmI64Type,3,identityConversion,identityConversion)
-		#endif
 	};
 	
 	// A do-nothing visitor used to decode past unreachable operators (but supporting logging, and passing the end operator through).
diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index 18cf2f4cfb1..9616de8d5f8 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -40,15 +40,6 @@ namespace LLVMJIT
 	llvm::Type* llvmVoidType;
 	llvm::Type* llvmBoolType;
 	llvm::Type* llvmI8PtrType;
-	
-	#if ENABLE_SIMD_PROTOTYPE
-	llvm::Type* llvmI8x16Type;
-	llvm::Type* llvmI16x8Type;
-	llvm::Type* llvmI32x4Type;
-	llvm::Type* llvmI64x2Type;
-	llvm::Type* llvmF32x4Type;
-	llvm::Type* llvmF64x2Type;
-	#endif
 
 	llvm::Constant* typedZeroConstants[(Uptr)ValueType::num];
 	
@@ -227,9 +218,6 @@ namespace LLVMJIT
 		{
 			if(handleIsValid)
 				compileLayer->removeModuleSet(handle);
-			#ifdef _WIN64
-				if(pdataCopy) { Platform::deregisterSEHUnwindInfo(reinterpret_cast<Uptr>(pdataCopy)); }
-			#endif
 		}
 
 		void compile(llvm::Module* llvmModule);
@@ -274,10 +262,6 @@ namespace LLVMJIT
 		};
 
 		std::vector<LoadedObject> loadedObjects;
-
-		#ifdef _WIN32
-			U8* pdataCopy;
-		#endif
 	};
 
 	// The JIT compilation unit for a WebAssembly module instance.
@@ -317,11 +301,7 @@ namespace LLVMJIT
 
 		void notifySymbolLoaded(const char* name,Uptr baseAddress,Uptr numBytes,std::map<U32,U32>&& offsetToOpIndexMap) override
 		{
-			#if defined(_WIN32) && !defined(_WIN64)
-				WAVM_ASSERT_THROW(!strcmp(name,"_invokeThunk"));
-			#else
-				WAVM_ASSERT_THROW(!strcmp(name,"invokeThunk"));
-			#endif
+			WAVM_ASSERT_THROW(!strcmp(name,"invokeThunk"));
 			symbol = new JITSymbol(functionType,baseAddress,numBytes,std::move(offsetToOpIndexMap));
 		}
 	};
@@ -336,25 +316,6 @@ namespace LLVMJIT
 	
 	static std::map<std::string,const char*> runtimeSymbolMap =
 	{
-		#ifdef _WIN32
-			// the LLVM X86 code generator calls __chkstk when allocating more than 4KB of stack space
-			{"__chkstk","__chkstk"},
-			#ifndef _WIN64
-			{"__aullrem","_aullrem"},
-			{"__allrem","_allrem"},
-			{"__aulldiv","_aulldiv"},
-			{"__alldiv","_alldiv"},
-			#endif
-		#endif
-		#ifdef __arm__
-		{"__aeabi_uidiv","__aeabi_uidiv"},
-		{"__aeabi_idiv","__aeabi_idiv"},
-		{"__aeabi_idivmod","__aeabi_idivmod"},
-		{"__aeabi_uldiv","__aeabi_uldiv"},
-		{"__aeabi_uldivmod","__aeabi_uldivmod"},
-		{"__aeabi_unwind_cpp_pr0","__aeabi_unwind_cpp_pr0"},
-		{"__aeabi_unwind_cpp_pr1","__aeabi_unwind_cpp_pr1"},
-		#endif
 	};
 
 	NullResolver NullResolver::singleton;
@@ -388,55 +349,6 @@ namespace LLVMJIT
 			
 			// Make a copy of the loaded object info for use by the finalizer.
 			jitUnit->loadedObjects.push_back({object,loadedObject});
-
-			#ifdef _WIN64
-				// On Windows, look for .pdata and .xdata sections containing information about how to unwind the stack.
-				// This needs to be done before the below emitAndFinalize call, which will incorrectly apply relocations to the unwind info.
-				
-				// Find the pdata section.
-				llvm::object::SectionRef pdataSection;
-				for(auto section : object->sections())
-				{
-					llvm::StringRef sectionName;
-					if(!section.getName(sectionName))
-					{
-						if(sectionName == ".pdata") { pdataSection = section; break; }
-					}
-				}
-
-				// Pass the pdata section to the platform to register unwind info.
-				if(pdataSection.getObject())
-				{
-					const Uptr imageBaseAddress = reinterpret_cast<Uptr>(jitUnit->memoryManager.getImageBaseAddress());
-					const Uptr pdataSectionLoadAddress = (Uptr)loadedObject->getSectionLoadAddress(pdataSection);
-					
-					// The LLVM COFF dynamic loader doesn't handle the image-relative relocations used by the pdata section,
-					// and overwrites those values with o: https://github.com/llvm-mirror/llvm/blob/e84d8c12d5157a926db15976389f703809c49aa5/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.h#L96
-					// This works around that by making a copy of the pdata section and doing the pdata relocations manually.
-					jitUnit->pdataCopy = new U8[pdataSection.getSize()];
-					memcpy(jitUnit->pdataCopy,reinterpret_cast<U8*>(pdataSectionLoadAddress),pdataSection.getSize());
-
-					for(auto pdataRelocIt : pdataSection.relocations())
-					{
-						// Only handle type 3 (IMAGE_REL_AMD64_ADDR32NB).
-						if(pdataRelocIt.getType() != 3) { Errors::unreachable(); }
-
-						const auto symbol = pdataRelocIt.getSymbol();
-						const U64 symbolAddress = symbol->getAddress().get();
-						const llvm::object::section_iterator symbolSection = symbol->getSection().get();
-						U32* valueToRelocate = (U32*)(jitUnit->pdataCopy + pdataRelocIt.getOffset());
-						const U64 relocatedValue64 =
-							+ (symbolAddress - symbolSection->getAddress())
-							+ loadedObject->getSectionLoadAddress(*symbolSection)
-							+ *valueToRelocate
-							- imageBaseAddress;
-						if(relocatedValue64 > UINT32_MAX) { Errors::unreachable(); }
-						*valueToRelocate = (U32)relocatedValue64;
-					}
-
-					Platform::registerSEHUnwindInfo(imageBaseAddress,reinterpret_cast<Uptr>(jitUnit->pdataCopy),pdataSection.getSize());
-				}
-			#endif
 		}
 
 	}
@@ -605,11 +517,7 @@ namespace LLVMJIT
 
 	bool getFunctionIndexFromExternalName(const char* externalName,Uptr& outFunctionDefIndex)
 	{
-		#if defined(_WIN32) && !defined(_WIN64)
-			const char wasmFuncPrefix[] = "_wasmFunc";
-		#else
-			const char wasmFuncPrefix[] = "wasmFunc";
-		#endif
+		const char wasmFuncPrefix[] = "wasmFunc";
 		const Uptr numPrefixChars = sizeof(wasmFuncPrefix) - 1;
 		if(!strncmp(externalName,wasmFuncPrefix,numPrefixChars))
 		{
@@ -729,19 +637,9 @@ namespace LLVMJIT
 		llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr);
 
 		auto targetTriple = llvm::sys::getProcessTriple();
-		#ifdef __APPLE__
-			// Didn't figure out exactly why, but this works around a problem with the MacOS dynamic loader. Without it,
-			// our symbols can't be found in the JITed object file.
-			targetTriple += "-elf";
-		#endif
+
 		targetMachine = llvm::EngineBuilder().selectTarget(
-			llvm::Triple(targetTriple),"","",
-			#if defined(_WIN32) && !defined(_WIN64)
-				// Use SSE2 instead of the FPU on x86 for more control over how intermediate results are rounded.
-				llvm::SmallVector<std::string,1>({"+sse2"})
-			#else
-				llvm::SmallVector<std::string,0>()
-			#endif
+			llvm::Triple(targetTriple),"","",llvm::SmallVector<std::string,0>()
 			);
 
 		llvmI8Type = llvm::Type::getInt8Ty(context);
@@ -753,15 +651,6 @@ namespace LLVMJIT
 		llvmVoidType = llvm::Type::getVoidTy(context);
 		llvmBoolType = llvm::Type::getInt1Ty(context);
 		llvmI8PtrType = llvmI8Type->getPointerTo();
-		
-		#if ENABLE_SIMD_PROTOTYPE
-		llvmI8x16Type = llvm::VectorType::get(llvmI8Type,16);
-		llvmI16x8Type = llvm::VectorType::get(llvmI16Type,8);
-		llvmI32x4Type = llvm::VectorType::get(llvmI32Type,4);
-		llvmI64x2Type = llvm::VectorType::get(llvmI64Type,2);
-		llvmF32x4Type = llvm::VectorType::get(llvmF32Type,4);
-		llvmF64x2Type = llvm::VectorType::get(llvmF64Type,2);
-		#endif
 
 		llvmResultTypes[(Uptr)ResultType::none] = llvm::Type::getVoidTy(context);
 		llvmResultTypes[(Uptr)ResultType::i32] = llvmI32Type;
@@ -769,19 +658,11 @@ namespace LLVMJIT
 		llvmResultTypes[(Uptr)ResultType::f32] = llvmF32Type;
 		llvmResultTypes[(Uptr)ResultType::f64] = llvmF64Type;
 
-		#if ENABLE_SIMD_PROTOTYPE
-		llvmResultTypes[(Uptr)ResultType::v128] = llvmI64x2Type;
-		#endif
-
 		// Create zero constants of each type.
 		typedZeroConstants[(Uptr)ValueType::any] = nullptr;
 		typedZeroConstants[(Uptr)ValueType::i32] = emitLiteral((U32)0);
 		typedZeroConstants[(Uptr)ValueType::i64] = emitLiteral((U64)0);
 		typedZeroConstants[(Uptr)ValueType::f32] = emitLiteral((F32)0.0f);
 		typedZeroConstants[(Uptr)ValueType::f64] = emitLiteral((F64)0.0);
-
-		#if ENABLE_SIMD_PROTOTYPE
-		typedZeroConstants[(Uptr)ValueType::v128] = llvm::ConstantVector::get({typedZeroConstants[(Uptr)ValueType::i64],typedZeroConstants[(Uptr)ValueType::i64]});
-		#endif
 	}
 }

From 955be7d2e269afb22cb1dc1cc352c8770f0f20cc Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sat, 15 Jun 2019 19:28:31 -0400
Subject: [PATCH 1006/1648] update to compile with llvm8 (and maybe 6/7)

---
 .../wasm-jit/Source/Runtime/CMakeLists.txt    |   4 +-
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 271 ++++--------------
 libraries/wasm-jit/Source/Runtime/LLVMJIT.h   |  31 +-
 tests/CMakeLists.txt                          |   2 +-
 unittests/CMakeLists.txt                      |   2 +-
 5 files changed, 69 insertions(+), 241 deletions(-)

diff --git a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
index 34a14336a86..8a846f98907 100644
--- a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories(${WAVM_INCLUDE_DIR}/Runtime)
 add_library(Runtime STATIC ${Sources} ${PublicHeaders})
 
 # Find an installed build of LLVM
-find_package(LLVM 4.0 REQUIRED CONFIG)
+find_package(LLVM REQUIRED CONFIG)
 
 # Include the LLVM headers
 include_directories(${LLVM_INCLUDE_DIRS})
@@ -34,7 +34,7 @@ add_definitions(-DRUNTIME_API=DLL_EXPORT)
 target_include_directories( Runtime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../chain/include )
 
 # Link against the LLVM libraries
-llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF)
+llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
 target_link_libraries(Runtime Platform Logging IR ${LLVM_LIBS})
 
 install(TARGETS Runtime 
diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index 9616de8d5f8..6de30f75882 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -21,9 +21,34 @@
 	#define PRINT_DISASSEMBLY 0
 #endif
 
-#if PRINT_DISASSEMBLY
 #include "llvm-c/Disassembler.h"
-#endif
+void disassembleFunction(U8* bytes,Uptr numBytes)
+{
+   LLVMDisasmContextRef disasmRef = LLVMCreateDisasm(llvm::sys::getProcessTriple().c_str(),nullptr,0,nullptr,nullptr);
+
+   U8* nextByte = bytes;
+   Uptr numBytesRemaining = numBytes;
+   while(numBytesRemaining)
+   {
+      char instructionBuffer[256];
+      const Uptr numInstructionBytes = LLVMDisasmInstruction(
+         disasmRef,
+         nextByte,
+         numBytesRemaining,
+         reinterpret_cast<Uptr>(nextByte),
+         instructionBuffer,
+         sizeof(instructionBuffer)
+         );
+      WAVM_ASSERT_THROW(numInstructionBytes > 0);
+      WAVM_ASSERT_THROW(numInstructionBytes <= numBytesRemaining);
+      numBytesRemaining -= numInstructionBytes;
+      nextByte += numInstructionBytes;
+
+      printf("\t\t%s\n",instructionBuffer);
+   };
+
+   LLVMDisasmDispose(disasmRef);
+}
 
 namespace LLVMJIT
 {
@@ -85,29 +110,14 @@ namespace LLVMJIT
 		, codeSection({0})
 		, readOnlySection({0})
 		, readWriteSection({0})
-		, hasRegisteredEHFrames(false)
 		{}
 		virtual ~UnitMemoryManager() override
 		{
-			// Deregister the exception handling frame info.
-			if(hasRegisteredEHFrames)
-			{
-				hasRegisteredEHFrames = false;
-            llvm::RTDyldMemoryManager::deregisterEHFrames(ehFramesAddr,ehFramesLoadAddr,ehFramesNumBytes);
-			}
-
 			// Decommit the image pages, but leave them reserved to catch any references to them that might erroneously remain.
 			if(numAllocatedImagePages)
 				Platform::decommitVirtualPages(imageBaseAddress,numAllocatedImagePages);
 		}
 		
-		void registerEHFrames(U8* addr, U64 loadAddr,uintptr_t numBytes) override
-		{
-		}
-		void deregisterEHFrames(U8* addr, U64 loadAddr,uintptr_t numBytes) override
-		{
-		}
-		
 		virtual bool needsToReserveAllocationSpace() override { return true; }
 		virtual void reserveAllocationSpace(uintptr_t numCodeBytes,U32 codeAlignment,uintptr_t numReadOnlyBytes,U32 readOnlyAlignment,uintptr_t numReadWriteBytes,U32 readWriteAlignment) override
 		{
@@ -147,11 +157,6 @@ namespace LLVMJIT
 			if(readWriteSection.numPages && !Platform::setVirtualPageAccess(readWriteSection.baseAddress,readWriteSection.numPages,Platform::MemoryAccess::ReadWrite)) { return false; }
 			return true;
 		}
-		virtual void invalidateInstructionCache()
-		{
-			// Invalidate the instruction cache for the whole image.
-			llvm::sys::Memory::InvalidateInstructionCache(imageBaseAddress,numAllocatedImagePages << Platform::getPageSizeLog2());
-		}
 
 		U8* getImageBaseAddress() const { return imageBaseAddress; }
 
@@ -171,11 +176,6 @@ namespace LLVMJIT
 		Section readOnlySection;
 		Section readWriteSection;
 
-		bool hasRegisteredEHFrames;
-		U8* ehFramesAddr;
-		U64 ehFramesLoadAddr;
-		Uptr ehFramesNumBytes;
-
 		U8* allocateBytes(Uptr numBytes,Uptr alignment,Section& section)
 		{
 			WAVM_ASSERT_THROW(section.baseAddress);
@@ -206,62 +206,48 @@ namespace LLVMJIT
 	{
 		JITUnit(bool inShouldLogMetrics = true)
 		: shouldLogMetrics(inShouldLogMetrics)
-		#ifdef _WIN32
-			, pdataCopy(nullptr)
-		#endif
 		{
-			objectLayer = llvm::make_unique<ObjectLayer>(NotifyLoadedFunctor(this),NotifyFinalizedFunctor(this));
+			objectLayer = llvm::make_unique<llvm::orc::LegacyRTDyldObjectLinkingLayer>(ES,[](llvm::orc::VModuleKey K) {
+                           return llvm::orc::LegacyRTDyldObjectLinkingLayer::Resources{
+                              std::make_shared<UnitMemoryManager>(), std::make_shared<llvm::orc::NullResolver>()
+                              };
+                       },
+                       [](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
+                          //nothing to do
+                       },
+                       [this](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
+                           for(auto symbolSizePair : llvm::object::computeSymbolSizes(Obj)) {
+                              auto symbol = symbolSizePair.first;
+                              auto name = symbol.getName();
+                              auto address = symbol.getAddress();
+                              if(symbol.getType() && symbol.getType().get() == llvm::object::SymbolRef::ST_Function && name && address) {
+                                 Uptr loadedAddress = Uptr(*address);
+                                 auto symbolSection = symbol.getSection();
+                                 if(symbolSection)
+                                    loadedAddress += (Uptr)o.getSectionLoadAddress(*symbolSection.get());
+                                 //printf(">>> %s 0x%lX\n", symbolSizePair.first.getName()->data(), loadedAddress);
+                                 std::map<U32,U32> offsetToOpIndexMap;
+                                 notifySymbolLoaded(name->data(), loadedAddress, 0, std::move(offsetToOpIndexMap));
+                                 //disassembleFunction((U8*)loadedAddress, symbolSizePair.second);
+                              }
+                           }
+                       }
+                       );
 			objectLayer->setProcessAllSections(true);
 			compileLayer = llvm::make_unique<CompileLayer>(*objectLayer,llvm::orc::SimpleCompiler(*targetMachine));
 		}
-		~JITUnit()
-		{
-			if(handleIsValid)
-				compileLayer->removeModuleSet(handle);
-		}
 
 		void compile(llvm::Module* llvmModule);
 
 		virtual void notifySymbolLoaded(const char* name,Uptr baseAddress,Uptr numBytes,std::map<U32,U32>&& offsetToOpIndexMap) = 0;
 
 	private:
-		
-		// Functor that receives notifications when an object produced by the JIT is loaded.
-		struct NotifyLoadedFunctor
-		{
-			JITUnit* jitUnit;
-			NotifyLoadedFunctor(JITUnit* inJITUnit): jitUnit(inJITUnit) {}
-			void operator()(
-				const llvm::orc::ObjectLinkingLayerBase::ObjSetHandleT& objectSetHandle,
-				const std::vector<std::unique_ptr<llvm::object::OwningBinary<llvm::object::ObjectFile>>>& objectSet,
-				const std::vector<std::unique_ptr<llvm::RuntimeDyld::LoadedObjectInfo>>& loadedObjects
-				);
-		};
-		
-		// Functor that receives notifications when an object produced by the JIT is finalized.
-		struct NotifyFinalizedFunctor
-		{
-			JITUnit* jitUnit;
-			NotifyFinalizedFunctor(JITUnit* inJITUnit): jitUnit(inJITUnit) {}
-			void operator()(const llvm::orc::ObjectLinkingLayerBase::ObjSetHandleT& objectSetHandle);
-		};
-		typedef llvm::orc::ObjectLinkingLayer<NotifyLoadedFunctor> ObjectLayer;
-		typedef llvm::orc::IRCompileLayer<ObjectLayer> CompileLayer;
+		typedef llvm::orc::LegacyIRCompileLayer<llvm::orc::LegacyRTDyldObjectLinkingLayer, llvm::orc::SimpleCompiler> CompileLayer;
 
-		UnitMemoryManager memoryManager;
-		std::unique_ptr<ObjectLayer> objectLayer;
+      llvm::orc::ExecutionSession ES;
+		std::unique_ptr<llvm::orc::LegacyRTDyldObjectLinkingLayer> objectLayer;
 		std::unique_ptr<CompileLayer> compileLayer;
-		CompileLayer::ModuleSetHandleT handle;
-		bool handleIsValid = false;
 		bool shouldLogMetrics;
-
-		struct LoadedObject
-		{
-			llvm::object::ObjectFile* object;
-			llvm::RuntimeDyld::LoadedObjectInfo* loadedObject;
-		};
-
-		std::vector<LoadedObject> loadedObjects;
 	};
 
 	// The JIT compilation unit for a WebAssembly module instance.
@@ -305,129 +291,6 @@ namespace LLVMJIT
 			symbol = new JITSymbol(functionType,baseAddress,numBytes,std::move(offsetToOpIndexMap));
 		}
 	};
-	
-	// Used to override LLVM's default behavior of looking up unresolved symbols in DLL exports.
-	struct NullResolver : llvm::JITSymbolResolver
-	{
-		static NullResolver singleton;
-		virtual llvm::JITSymbol findSymbol(const std::string& name) override;
-		virtual llvm::JITSymbol findSymbolInLogicalDylib(const std::string& name) override;
-	};
-	
-	static std::map<std::string,const char*> runtimeSymbolMap =
-	{
-	};
-
-	NullResolver NullResolver::singleton;
-	llvm::JITSymbol NullResolver::findSymbol(const std::string& name)
-	{
-		// Allow some intrinsics used by LLVM
-		auto runtimeSymbolNameIt = runtimeSymbolMap.find(name);
-		if(runtimeSymbolNameIt != runtimeSymbolMap.end())
-		{
-			const char* lookupName = runtimeSymbolNameIt->second;
-			void *addr = llvm::sys::DynamicLibrary::SearchForAddressOfSymbol(lookupName);
-			if(!addr) { Errors::fatalf("LLVM generated code references undefined external symbol: %s\n",lookupName); }
-			return llvm::JITSymbol(reinterpret_cast<Uptr>(addr),llvm::JITSymbolFlags::None);
-		}
-
-		Errors::fatalf("LLVM generated code references disallowed external symbol: %s\n",name.c_str());
-	}
-	llvm::JITSymbol NullResolver::findSymbolInLogicalDylib(const std::string& name) { return llvm::JITSymbol(nullptr); }
-
-	void JITUnit::NotifyLoadedFunctor::operator()(
-		const llvm::orc::ObjectLinkingLayerBase::ObjSetHandleT& objectSetHandle,
-		const std::vector<std::unique_ptr<llvm::object::OwningBinary<llvm::object::ObjectFile>>>& objectSet,
-		const std::vector<std::unique_ptr<llvm::RuntimeDyld::LoadedObjectInfo>>& loadedObjects
-		)
-	{
-		WAVM_ASSERT_THROW(objectSet.size() == loadedObjects.size());
-		for(Uptr objectIndex = 0;objectIndex < loadedObjects.size();++objectIndex)
-		{
-			llvm::object::ObjectFile* object = objectSet[objectIndex].get()->getBinary();
-			llvm::RuntimeDyld::LoadedObjectInfo* loadedObject = loadedObjects[objectIndex].get();
-			
-			// Make a copy of the loaded object info for use by the finalizer.
-			jitUnit->loadedObjects.push_back({object,loadedObject});
-		}
-
-	}
-
-	#if PRINT_DISASSEMBLY
-	void disassembleFunction(U8* bytes,Uptr numBytes)
-	{
-		LLVMDisasmContextRef disasmRef = LLVMCreateDisasm(llvm::sys::getProcessTriple().c_str(),nullptr,0,nullptr,nullptr);
-
-		U8* nextByte = bytes;
-		Uptr numBytesRemaining = numBytes;
-		while(numBytesRemaining)
-		{
-			char instructionBuffer[256];
-			const Uptr numInstructionBytes = LLVMDisasmInstruction(
-				disasmRef,
-				nextByte,
-				numBytesRemaining,
-				reinterpret_cast<Uptr>(nextByte),
-				instructionBuffer,
-				sizeof(instructionBuffer)
-				);
-			WAVM_ASSERT_THROW(numInstructionBytes > 0);
-			WAVM_ASSERT_THROW(numInstructionBytes <= numBytesRemaining);
-			numBytesRemaining -= numInstructionBytes;
-			nextByte += numInstructionBytes;
-
-			Log::printf(Log::Category::debug,"\t\t%s\n",instructionBuffer);
-		};
-
-		LLVMDisasmDispose(disasmRef);
-	}
-	#endif
-
-	void JITUnit::NotifyFinalizedFunctor::operator()(const llvm::orc::ObjectLinkingLayerBase::ObjSetHandleT& objectSetHandle)
-	{
-		for(Uptr objectIndex = 0;objectIndex < jitUnit->loadedObjects.size();++objectIndex)
-		{
-			llvm::object::ObjectFile* object = jitUnit->loadedObjects[objectIndex].object;
-			llvm::RuntimeDyld::LoadedObjectInfo* loadedObject = jitUnit->loadedObjects[objectIndex].loadedObject;
-
-			// Iterate over the functions in the loaded object.
-			for(auto symbolSizePair : llvm::object::computeSymbolSizes(*object))
-			{
-				auto symbol = symbolSizePair.first;
-				auto name = symbol.getName();
-				auto address = symbol.getAddress();
-				if(	symbol.getType() && symbol.getType().get() == llvm::object::SymbolRef::ST_Function
-				&&	name
-				&&	address)
-				{
-					// Compute the address the functions was loaded at.
-					WAVM_ASSERT_THROW(*address <= UINTPTR_MAX);
-					Uptr loadedAddress = Uptr(*address);
-					auto symbolSection = symbol.getSection();
-					if(symbolSection)
-					{
-						loadedAddress += (Uptr)loadedObject->getSectionLoadAddress(*symbolSection.get());
-					}
-
-					#if PRINT_DISASSEMBLY
-					Log::printf(Log::Category::error,"Disassembly for function %s\n",name.get().data());
-					disassembleFunction(reinterpret_cast<U8*>(loadedAddress),Uptr(symbolSizePair.second));
-					#endif
-
-					std::map<U32,U32> offsetToOpIndexMap;
-					// Notify the JIT unit that the symbol was loaded.
-					WAVM_ASSERT_THROW(symbolSizePair.second <= UINTPTR_MAX);
-					jitUnit->notifySymbolLoaded(
-						name->data(),loadedAddress,
-						Uptr(symbolSizePair.second),
-						std::move(offsetToOpIndexMap)
-						);
-				}
-			}
-		}
-
-		jitUnit->loadedObjects.clear();
-	}
 
 	static Uptr printedModuleId = 0;
 
@@ -470,29 +333,15 @@ namespace LLVMJIT
 		for(auto functionIt = llvmModule->begin();functionIt != llvmModule->end();++functionIt)
 		{ fpm->run(*functionIt); }
 		delete fpm;
-		
-		if(shouldLogMetrics)
-		{
-			Timing::logRatePerSecond("Optimized LLVM module",optimizationTimer,(F64)llvmModule->size(),"functions");
-		}
 
 		if(DUMP_OPTIMIZED_MODULE) { printModule(llvmModule,"llvmOptimizedDump"); }
 
 		// Pass the module to the JIT compiler.
 		Timing::Timer machineCodeTimer;
-		handle = compileLayer->addModuleSet(
-			std::vector<llvm::Module*>{llvmModule},
-			&memoryManager,
-			&NullResolver::singleton);
-		handleIsValid = true;
-		compileLayer->emitAndFinalize(handle);
-
-		if(shouldLogMetrics)
-		{
-			Timing::logRatePerSecond("Generated machine code",machineCodeTimer,(F64)llvmModule->size(),"functions");
-		}
-
-		delete llvmModule;
+      llvm::orc::VModuleKey K = ES.allocateVModule();
+      std::unique_ptr<llvm::Module> xxx(llvmModule);
+		auto zzz = compileLayer->addModule(K, std::move(xxx));
+		auto xxxx = compileLayer->emitAndFinalize(K);
 	}
 
 	void instantiateModule(const IR::Module& module,ModuleInstance* moduleInstance)
diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.h b/libraries/wasm-jit/Source/Runtime/LLVMJIT.h
index cad02a101ed..d77a6b00de2 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.h
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.h
@@ -5,31 +5,13 @@
 #include "RuntimePrivate.h"
 #include "Intrinsics.h"
 
-#ifdef _WIN32
-	#pragma warning(push)
-	#pragma warning (disable:4267)
-	#pragma warning (disable:4800)
-	#pragma warning (disable:4291)
-	#pragma warning (disable:4244)
-	#pragma warning (disable:4351)
-	#pragma warning (disable:4065)
-	#pragma warning (disable:4624)
-	#pragma warning (disable:4245)	// conversion from 'int' to 'unsigned int', signed/unsigned mismatch
-	#pragma warning(disable:4146) // unary minus operator applied to unsigned type, result is still unsigned
-	#pragma warning(disable:4458) // declaration of 'x' hides class member
-	#pragma warning(disable:4510) // default constructor could not be generated
-	#pragma warning(disable:4610) // struct can never be instantiated - user defined constructor required
-	#pragma warning(disable:4324) // structure was padded due to alignment specifier
-	#pragma warning(disable:4702) // unreachable code
-#endif
-
 #include "llvm/Analysis/Passes.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
 #include "llvm/ExecutionEngine/Orc/CompileUtils.h"
 #include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
 #include "llvm/ExecutionEngine/Orc/LambdaResolver.h"
-#include "llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h"
+#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/IRBuilder.h"
@@ -49,17 +31,14 @@
 #include "llvm/Support/DynamicLibrary.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/IR/DIBuilder.h"
+#include "llvm/Transforms/InstCombine/InstCombine.h"
+#include "llvm/Transforms/Utils.h"
+#include "llvm/ExecutionEngine/Orc/NullResolver.h"
+#include "llvm/ExecutionEngine/Orc/Core.h"
 #include <cctype>
 #include <string>
 #include <vector>
 
-#ifdef _WIN32
-	#undef and
-	#undef or
-	#undef xor
-	#pragma warning(pop)
-#endif
-
 namespace LLVMJIT
 {
 	// The global LLVM context.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fd1e7cbd112..c0a1b89c66a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ if( GPERFTOOLS_FOUND )
     list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-find_package(LLVM 4.0 REQUIRED CONFIG)
+find_package(LLVM REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index ed870052639..eff12feb89e 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -29,7 +29,7 @@ if( GPERFTOOLS_FOUND )
    list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-find_package(LLVM 4.0 REQUIRED CONFIG)
+find_package(LLVM REQUIRED CONFIG)
 
 link_directories(${LLVM_LIBRARY_DIR})
 

From 3a73b73f135fbf87efcf9606f8eaac70af9305bb Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 15 Aug 2019 19:59:08 -0400
Subject: [PATCH 1007/1648] llvm7 shims

---
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index 6de30f75882..8b803aa6168 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -5,6 +5,14 @@
 #include "RuntimePrivate.h"
 #include "IR/Validate.h"
 
+#if LLVM_VERSION_MAJOR == 7
+namespace llvm { namespace orc {
+   using LegacyRTDyldObjectLinkingLayer = RTDyldObjectLinkingLayer;
+   template<typename A, typename B>
+   using LegacyIRCompileLayer = IRCompileLayer<A, B>;
+}}
+#endif
+
 #ifdef _DEBUG
 	// This needs to be 1 to allow debuggers such as Visual Studio to place breakpoints and step through the JITed code.
 	#define USE_WRITEABLE_JIT_CODE_PAGES 1

From 63223d02bba82e7744b23daa6ae5064665dd2fea Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 15 Aug 2019 20:26:16 -0400
Subject: [PATCH 1008/1648] only disallow RW section on Linux

---
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index 8b803aa6168..dcbdfd7b738 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -129,8 +129,12 @@ namespace LLVMJIT
 		virtual bool needsToReserveAllocationSpace() override { return true; }
 		virtual void reserveAllocationSpace(uintptr_t numCodeBytes,U32 codeAlignment,uintptr_t numReadOnlyBytes,U32 readOnlyAlignment,uintptr_t numReadWriteBytes,U32 readWriteAlignment) override
 		{
+			//in llvm7+ it's signaling unwinding frames as being R/W on macos. This appears to be due to Mach-O not supporting read-only data sections?
+			//Let's only clutch in this safety guard for Linux
+#ifndef __APPLE__
 			if(numReadWriteBytes)
 				 Runtime::causeException(Exception::Cause::outOfMemory);
+#endif
 			// Calculate the number of pages to be used by each section.
 			codeSection.numPages = shrAndRoundUp(numCodeBytes,Platform::getPageSizeLog2());
 			readOnlySection.numPages = shrAndRoundUp(numReadOnlyBytes,Platform::getPageSizeLog2());

From dd4d8bc461a52a1a3d8bc423273e7fc4132f198b Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 16 Aug 2019 09:13:31 -0400
Subject: [PATCH 1009/1648] clean up some variable names from old cherry-pick

---
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index dcbdfd7b738..3f64a74c6f7 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -351,9 +351,9 @@ namespace LLVMJIT
 		// Pass the module to the JIT compiler.
 		Timing::Timer machineCodeTimer;
       llvm::orc::VModuleKey K = ES.allocateVModule();
-      std::unique_ptr<llvm::Module> xxx(llvmModule);
-		auto zzz = compileLayer->addModule(K, std::move(xxx));
-		auto xxxx = compileLayer->emitAndFinalize(K);
+      std::unique_ptr<llvm::Module> mod(llvmModule);
+		WAVM_ASSERT_THROW(!compileLayer->addModule(K, std::move(mod)));
+		WAVM_ASSERT_THROW(!compileLayer->emitAndFinalize(K));
 	}
 
 	void instantiateModule(const IR::Module& module,ModuleInstance* moduleInstance)

From 849796e41337698f905550a6793f6487b535cdc2 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 16 Aug 2019 10:59:40 -0400
Subject: [PATCH 1010/1648] on macos, recent llvm prefixes a _ on function
 names

this is standard operating procedure on macos
---
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index 3f64a74c6f7..17d77245f99 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -299,7 +299,12 @@ namespace LLVMJIT
 
 		void notifySymbolLoaded(const char* name,Uptr baseAddress,Uptr numBytes,std::map<U32,U32>&& offsetToOpIndexMap) override
 		{
-			WAVM_ASSERT_THROW(!strcmp(name,"invokeThunk"));
+#ifndef __APPLE__
+			const char thunkPrefix[] = "invokeThunk";
+#else
+			const char thunkPrefix[] = "_invokeThunk";
+#endif
+			WAVM_ASSERT_THROW(!strcmp(name,thunkPrefix));
 			symbol = new JITSymbol(functionType,baseAddress,numBytes,std::move(offsetToOpIndexMap));
 		}
 	};
@@ -378,7 +383,11 @@ namespace LLVMJIT
 
 	bool getFunctionIndexFromExternalName(const char* externalName,Uptr& outFunctionDefIndex)
 	{
+#ifndef __APPLE__
 		const char wasmFuncPrefix[] = "wasmFunc";
+#else
+		const char wasmFuncPrefix[] = "_wasmFunc";
+#endif
 		const Uptr numPrefixChars = sizeof(wasmFuncPrefix) - 1;
 		if(!strncmp(externalName,wasmFuncPrefix,numPrefixChars))
 		{

From c2dcd535fb3c305c4cd80585dfd5f8ba1d08c932 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 16 Aug 2019 13:01:03 -0400
Subject: [PATCH 1011/1648] build script upgrades for llvm7+ (sans RHEL7)

---
 scripts/.build_vars                   |  2 +-
 scripts/eosio_build_amazonlinux2_deps |  4 ++-
 scripts/eosio_build_darwin_deps       |  2 +-
 scripts/eosio_build_ubuntu.sh         |  4 +--
 scripts/helpers/eosio.sh              | 44 +++++++++------------------
 5 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index 6663f9d86fc..8e85e5ac675 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -37,7 +37,7 @@ export BOOST_ROOT=${BOOST_LOCATION:-${SRC_DIR}/boost_${BOOST_VERSION}}
 export BOOST_LINK_LOCATION=${OPT_DIR}/boost
 
 # LLVM
-export LLVM_VERSION=release_40
+export LLVM_VERSION=release_80
 export LLVM_ROOT=${OPT_DIR}/llvm
 export LLVM_DIR=${LLVM_ROOT}/lib/cmake/llvm
 
diff --git a/scripts/eosio_build_amazonlinux2_deps b/scripts/eosio_build_amazonlinux2_deps
index 4017586125e..5e059a7bfce 100755
--- a/scripts/eosio_build_amazonlinux2_deps
+++ b/scripts/eosio_build_amazonlinux2_deps
@@ -20,4 +20,6 @@ libedit-devel,rpm -qa
 doxygen,rpm -qa
 graphviz,rpm -qa
 clang,rpm -qa
-patch,rpm -qa
\ No newline at end of file
+patch,rpm -qa
+llvm-devel,rpm -qa
+llvm-static,rpm -qa
\ No newline at end of file
diff --git a/scripts/eosio_build_darwin_deps b/scripts/eosio_build_darwin_deps
index b2cf9a8c6f5..a0f4204748c 100755
--- a/scripts/eosio_build_darwin_deps
+++ b/scripts/eosio_build_darwin_deps
@@ -4,7 +4,7 @@ libtool,/usr/local/bin/glibtool
 automake,/usr/local/bin/automake
 wget,/usr/local/bin/wget
 gmp,/usr/local/opt/gmp/include/gmpxx.h
-llvm@4,/usr/local/opt/llvm@4
+llvm@7,/usr/local/opt/llvm@7
 pkgconfig,/usr/local/bin/pkg-config
 python,/usr/local/opt/python3
 python@2,/usr/local/opt/python2
diff --git a/scripts/eosio_build_ubuntu.sh b/scripts/eosio_build_ubuntu.sh
index 6912919cc1e..a447d59fa48 100755
--- a/scripts/eosio_build_ubuntu.sh
+++ b/scripts/eosio_build_ubuntu.sh
@@ -11,11 +11,9 @@ echo "Disk space available: ${DISK_AVAIL}G"
 [[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install EOSIO." && exit 1
 
 # system clang and build essential for Ubuntu 18 (16 too old)
-( [[ $PIN_COMPILER == false ]] && [[ $VERSION_ID == "18.04" ]] ) && EXTRA_DEPS=(clang,dpkg\ -s)
+( [[ $PIN_COMPILER == false ]] && [[ $VERSION_ID == "18.04" ]] ) && EXTRA_DEPS=(clang,dpkg\ -s llvm-7-dev,dpkg\ -s)
 # We install clang8 for Ubuntu 16, but we still need something to compile cmake, boost, etc + pinned 18 still needs something to build source
 ( [[ $VERSION_ID == "16.04" ]] || ( $PIN_COMPILER && [[ $VERSION_ID == "18.04" ]] ) ) && ensure-build-essential
-# Ensure packages exist
-([[ $PIN_COMPILER == false ]] && [[ $BUILD_CLANG == false ]]) && EXTRA_DEPS+=(llvm-4.0,dpkg\ -s)
 $ENABLE_COVERAGE_TESTING && EXTRA_DEPS+=(lcov,dpkg\ -s)
 ensure-apt-packages "${REPO_ROOT}/scripts/eosio_build_ubuntu_deps" $(echo ${EXTRA_DEPS[@]})
 echo ""
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index c11acdc8b9a..d9d29ea40f8 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -269,35 +269,21 @@ function ensure-boost() {
 }
 
 function ensure-llvm() {
-    echo "${COLOR_CYAN}[Ensuring LLVM 4 support]${COLOR_NC}"
-    if [[ ! -d $LLVM_ROOT ]]; then
-        if [[ $ARCH == "Darwin" ]]; then # Handle brew installed llvm@4
-	        execute ln -s /usr/local/opt/llvm@4 $LLVM_ROOT
-	        echo " - LLVM successfully linked from /usr/local/opt/llvm@4 to ${LLVM_ROOT}"
-        else
-            if $PIN_COMPILER || $BUILD_CLANG; then
-                CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX='${LLVM_ROOT}' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' .."
-            else
-                if [[ $NAME == "Ubuntu" ]]; then
-                    execute ln -s /usr/lib/llvm-4.0 $LLVM_ROOT
-                    echo " - LLVM successfully linked from /usr/lib/llvm-4.0 to ${LLVM_ROOT}"
-                    return 0
-                fi
-                CMAKE_FLAGS="-G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX=${LLVM_ROOT} -DLLVM_TARGETS_TO_BUILD='host' -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release .."
-            fi
-            execute bash -c "cd ${OPT_DIR} \
-            && git clone --depth 1 --single-branch --branch $LLVM_VERSION https://github.com/llvm-mirror/llvm.git llvm && cd llvm \
-            && mkdir build \
-            && cd build \
-            && ${CMAKE} ${CMAKE_FLAGS} \
-            && make -j${JOBS} \
-            && make install"
-            echo " - LLVM successfully installed @ ${LLVM_ROOT}"
-            echo ""
-        fi
-    else
-        echo " - LLVM found @ ${LLVM_ROOT}."
-        echo ""
+    if $PIN_COMPILER || $BUILD_CLANG; then
+        LLVM_TEMP_DIR=$(mktemp -d)
+        trap "rm -rf '$LLVM_TEMP_DIR'" EXIT
+        execute bash -c "cd '$LLVM_TEMP_DIR' \
+        && git clone --depth 1 --single-branch --branch $LLVM_VERSION https://github.com/llvm-mirror/llvm.git llvm && cd llvm \
+        && mkdir build && cd build \
+        && ${CMAKE} -DCMAKE_INSTALL_PREFIX='${LLVM_ROOT}' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. \
+        && make -j${JOBS} install"
+        echo " - LLVM successfully installed @ ${LLVM_ROOT}"
+    elif [[ $ARCH == "Darwin" ]]; then
+        execute ln -sf /usr/local/opt/llvm@7 $LLVM_ROOT
+    elif [[ $NAME == "Ubuntu" ]]; then
+        execute ln -sf /usr/lib/llvm-7 $LLVM_ROOT
+    elif [[ $NAME == "Amazon Linux" ]]; then
+        execute unlink $LLVM_ROOT || true
     fi
 }
 

From 0324902e70d40d914fa8fe74f3ae5aacd74045d3 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 18 Aug 2019 19:56:04 -0400
Subject: [PATCH 1012/1648] workaround for LLVM <7.1 ABI compat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

LLVM 7.0 & 7.0.1 suffer from an ABI incompatibility between GCC & Clang. If LLVM is built with GCC (as is the case for system-provided LLVMs in RHEL, Ubuntu, etc) using LLVM with a GCC compiled binary will result in a runtime fault. For more information see LLVM bug 39427

This workaround detects when Clang is being used to compile EOSIO with LLVM < 7.1 and compiles a “shim” with g++ to call the troublesome function that suffers from the ABI incompatibility. This workaround is operating under the assumption that LLVM 7.0 or 7.0.1 was compiled with g++ which it will be for any of EOSIO’s supported distros.
---
 CMakeModules/CMakeASM-LLVMWARInformation.cmake     |  9 +++++++++
 .../CMakeDetermineASM-LLVMWARCompiler.cmake        |  6 ++++++
 CMakeModules/CMakeTestASM-LLVMWARCompiler.cmake    |  5 +++++
 libraries/wasm-jit/Include/Runtime/llvmWARshim.h   |  9 +++++++++
 libraries/wasm-jit/Source/Runtime/CMakeLists.txt   | 14 +++++++++++---
 libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp   |  7 ++++---
 libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp  | 12 ++++++++++++
 .../wasm-jit/Source/Runtime/llvmWARshim.llvmwar    |  1 +
 8 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100755 CMakeModules/CMakeASM-LLVMWARInformation.cmake
 create mode 100755 CMakeModules/CMakeDetermineASM-LLVMWARCompiler.cmake
 create mode 100755 CMakeModules/CMakeTestASM-LLVMWARCompiler.cmake
 create mode 100644 libraries/wasm-jit/Include/Runtime/llvmWARshim.h
 create mode 100644 libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp
 create mode 120000 libraries/wasm-jit/Source/Runtime/llvmWARshim.llvmwar

diff --git a/CMakeModules/CMakeASM-LLVMWARInformation.cmake b/CMakeModules/CMakeASM-LLVMWARInformation.cmake
new file mode 100755
index 00000000000..a94bfa5bfb0
--- /dev/null
+++ b/CMakeModules/CMakeASM-LLVMWARInformation.cmake
@@ -0,0 +1,9 @@
+# These trio of files implement a workaround for LLVM bug 39427
+
+set(ASM_DIALECT "-LLVMWAR")
+set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS llvmwar)
+
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "g++ -x c++ -O3 --std=c++11 <DEFINES> <INCLUDES> <FLAGS> -c -o <OBJECT> <SOURCE>")
+
+include(CMakeASMInformation)
+set(ASM_DIALECT)
diff --git a/CMakeModules/CMakeDetermineASM-LLVMWARCompiler.cmake b/CMakeModules/CMakeDetermineASM-LLVMWARCompiler.cmake
new file mode 100755
index 00000000000..b424ff97858
--- /dev/null
+++ b/CMakeModules/CMakeDetermineASM-LLVMWARCompiler.cmake
@@ -0,0 +1,6 @@
+# These trio of files implement a workaround for LLVM bug 39427
+
+set(ASM_DIALECT "-LLVMWAR")
+set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT "g++")
+include(CMakeDetermineASMCompiler)
+set(ASM_DIALECT)
diff --git a/CMakeModules/CMakeTestASM-LLVMWARCompiler.cmake b/CMakeModules/CMakeTestASM-LLVMWARCompiler.cmake
new file mode 100755
index 00000000000..de20fb5064f
--- /dev/null
+++ b/CMakeModules/CMakeTestASM-LLVMWARCompiler.cmake
@@ -0,0 +1,5 @@
+# These trio of files implement a workaround for LLVM bug 39427
+
+set(ASM_DIALECT "-LLVMWAR")
+include(CMakeTestASMCompiler)
+set(ASM_DIALECT)
diff --git a/libraries/wasm-jit/Include/Runtime/llvmWARshim.h b/libraries/wasm-jit/Include/Runtime/llvmWARshim.h
new file mode 100644
index 00000000000..56f9e352cbe
--- /dev/null
+++ b/libraries/wasm-jit/Include/Runtime/llvmWARshim.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <llvm/IR/IRBuilder.h>
+
+namespace LLVMJIT {
+
+llvm::Value* CreateInBoundsGEPWAR(llvm::IRBuilder<>& irBuilder, llvm::Value* Ptr, llvm::Value* v1, llvm::Value* v2 = nullptr);
+
+}
\ No newline at end of file
diff --git a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
index 8a846f98907..6591fa4a2ae 100644
--- a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Find an installed build of LLVM
+find_package(LLVM REQUIRED CONFIG)
+
+if(LLVM_VERSION VERSION_LESS 7.1 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	enable_language(ASM-LLVMWAR)
+	set(LLVM_SHIM_FILE llvmWARshim.llvmwar)
+else()
+	set(LLVM_SHIM_FILE llvmWARshim.cpp)
+endif()
+
 set(Sources
 	Intrinsics.cpp
 	Linker.cpp
@@ -12,6 +22,7 @@ set(Sources
 	Table.cpp
 	Threads.cpp
 	WAVMIntrinsics.cpp
+	${LLVM_SHIM_FILE}
   )
 set(PublicHeaders
 	${WAVM_INCLUDE_DIR}/Runtime/Intrinsics.h
@@ -22,9 +33,6 @@ include_directories(${WAVM_INCLUDE_DIR}/Runtime)
 
 add_library(Runtime STATIC ${Sources} ${PublicHeaders})
 
-# Find an installed build of LLVM
-find_package(LLVM REQUIRED CONFIG)
-
 # Include the LLVM headers
 include_directories(${LLVM_INCLUDE_DIRS})
 add_definitions(${LLVM_DEFINITIONS})
diff --git a/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp b/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
index 415220de633..f7986dc691d 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
@@ -3,6 +3,7 @@
 #include "Inline/Timing.h"
 #include "IR/Operators.h"
 #include "IR/OperatorPrinter.h"
+#include "Runtime/llvmWARshim.h"
 #include "Logging/Logging.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -218,7 +219,7 @@ namespace LLVMJIT
       
 
 			// Cast the pointer to the appropriate type.
-			auto bytePointer = irBuilder.CreateInBoundsGEP(moduleContext.defaultMemoryBase,byteIndex);
+			auto bytePointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultMemoryBase, byteIndex);
             
 			return irBuilder.CreatePointerCast(bytePointer,memoryType->getPointerTo());
 		}
@@ -636,7 +637,7 @@ namespace LLVMJIT
 				"wavmIntrinsics.indirectCallIndexOutOfBounds",FunctionType::get(),{});
 
 			// Load the type for this table entry.
-			auto functionTypePointerPointer = irBuilder.CreateInBoundsGEP(moduleContext.defaultTablePointer,{functionIndexZExt,emitLiteral((U32)0)});
+			auto functionTypePointerPointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultTablePointer, functionIndexZExt, emitLiteral((U32)0));
 			auto functionTypePointer = irBuilder.CreateLoad(functionTypePointerPointer);
 			auto llvmCalleeType = emitLiteralPointer(calleeType,llvmI8PtrType);
 			
@@ -651,7 +652,7 @@ namespace LLVMJIT
 				);
 
 			// Call the function loaded from the table.
-			auto functionPointerPointer = irBuilder.CreateInBoundsGEP(moduleContext.defaultTablePointer,{functionIndexZExt,emitLiteral((U32)1)});
+			auto functionPointerPointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultTablePointer, functionIndexZExt, emitLiteral((U32)1));
 			auto functionPointer = irBuilder.CreateLoad(irBuilder.CreatePointerCast(functionPointerPointer,functionPointerType));
 			auto result = irBuilder.CreateCall(functionPointer,llvm::ArrayRef<llvm::Value*>(llvmArgs,calleeType->parameters.size()));
 
diff --git a/libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp b/libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp
new file mode 100644
index 00000000000..723ea39a029
--- /dev/null
+++ b/libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp
@@ -0,0 +1,12 @@
+#include "Runtime/llvmWARshim.h"
+
+namespace LLVMJIT {
+
+llvm::Value* CreateInBoundsGEPWAR(llvm::IRBuilder<>& irBuilder, llvm::Value* Ptr, llvm::Value* v1, llvm::Value* v2) {
+   if(!v2)
+      return irBuilder.CreateInBoundsGEP(Ptr, v1);
+   else
+      return irBuilder.CreateInBoundsGEP(Ptr, {v1, v2});
+}
+
+}
\ No newline at end of file
diff --git a/libraries/wasm-jit/Source/Runtime/llvmWARshim.llvmwar b/libraries/wasm-jit/Source/Runtime/llvmWARshim.llvmwar
new file mode 120000
index 00000000000..1e2596579da
--- /dev/null
+++ b/libraries/wasm-jit/Source/Runtime/llvmWARshim.llvmwar
@@ -0,0 +1 @@
+llvmWARshim.cpp
\ No newline at end of file

From 5419d14171bc32242eac893940e212cfe1a0d802 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 18 Aug 2019 21:38:32 -0400
Subject: [PATCH 1013/1648] cmake tweaks for llvm7 & wavm

---
 CMakeLists.txt                                   | 2 +-
 libraries/wasm-jit/Source/Runtime/CMakeLists.txt | 4 ++++
 tests/CMakeLists.txt                             | 4 ----
 unittests/CMakeLists.txt                         | 4 ----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6511e342f4f..f964b5eaaf3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 
 if (UNIX AND APPLE)
-   list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/llvm@4" "/usr/local/opt/gettext")
+   list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/llvm@7" "/usr/local/opt/gettext")
 endif()
 
 include( GNUInstallDirs )
diff --git a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
index 6591fa4a2ae..6c3ef9c9e82 100644
--- a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Find an installed build of LLVM
 find_package(LLVM REQUIRED CONFIG)
 
+if(LLVM_VERSION_MAJOR VERSION_LESS 7 OR LLVM_VERSION_MAJOR VERSION_GREATER 9)
+	message(FATAL_ERROR "WAVM requires an LLVM version 7.0 to 9.0")
+endif()
+
 if(LLVM_VERSION VERSION_LESS 7.1 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	enable_language(ASM-LLVMWAR)
 	set(LLVM_SHIM_FILE llvmWARshim.llvmwar)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c0a1b89c66a..8f14356bab0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,10 +6,6 @@ if( GPERFTOOLS_FOUND )
     list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-find_package(LLVM REQUIRED CONFIG)
-
-link_directories(${LLVM_LIBRARY_DIR})
-
 include_directories( "${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include" )
 
 file(GLOB UNIT_TESTS "*.cpp")
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index eff12feb89e..7ff6ade4f20 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -29,10 +29,6 @@ if( GPERFTOOLS_FOUND )
    list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-find_package(LLVM REQUIRED CONFIG)
-
-link_directories(${LLVM_LIBRARY_DIR})
-
 add_subdirectory(contracts)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contracts.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/contracts.hpp ESCAPE_QUOTES)
 

From 71eb6f82018fcc1d64ccfd8a0b3a62bf68690052 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 19 Aug 2019 14:17:01 -0400
Subject: [PATCH 1014/1648] updates to EosioTester.cmakes for LLVM 7+

---
 CMakeLists.txt                                |  7 +++++
 CMakeModules/EosioTester.cmake.in             | 31 ++-----------------
 CMakeModules/EosioTesterBuild.cmake.in        | 31 ++-----------------
 .../wasm-jit/Source/Runtime/CMakeLists.txt    |  7 -----
 4 files changed, 13 insertions(+), 63 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f964b5eaaf3..f26266ec320 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,13 @@ set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 # the pthread dependency through fc.
 find_package(Boost 1.67 REQUIRED COMPONENTS program_options unit_test_framework)
 
+# WAVM requires LLVM, but move the check up here to a central location so that the EosioTester.cmakes
+# can be created with the exact version found
+find_package(LLVM REQUIRED CONFIG)
+if(LLVM_VERSION_MAJOR VERSION_LESS 7 OR LLVM_VERSION_MAJOR VERSION_GREATER 9)
+	message(FATAL_ERROR "EOSIO requires an LLVM version 7.0 to 9.0")
+endif()
+
 if( APPLE AND UNIX )
 # Apple Specific Options Here
     message( STATUS "Configuring EOSIO on macOS" )
diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index a3cc2342bf9..47ef8b44383 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -20,8 +20,8 @@ if( GPERFTOOLS_FOUND )
     list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-find_package(LLVM 4.0 REQUIRED CONFIG)
-
+find_package(LLVM @LLVM_VERSION@ EXACT REQUIRED CONFIG)
+llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
 link_directories(${LLVM_LIBRARY_DIR})
 
 set( CMAKE_CXX_STANDARD 17 )
@@ -77,7 +77,7 @@ find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
 macro(add_eosio_test_executable test_name)
    add_executable( ${test_name} ${ARGN} )
    target_link_libraries( ${test_name}
-       ${LLVM}
+       ${LLVM_LIBS}
        ${libtester}
        ${libchain}
        ${libfc}
@@ -96,31 +96,6 @@ macro(add_eosio_test_executable test_name)
        ${libsecp256k1}
        ${GMP_LIBRARIES}
 
-       LLVMX86Disassembler
-       LLVMX86AsmParser
-       LLVMX86AsmPrinter
-       LLVMX86CodeGen
-
-       LLVMSelectionDAG
-
-       LLVMDebugInfoDWARF
-       LLVMAsmPrinter
-       LLVMMCParser
-       LLVMX86Info
-
-       LLVMOrcJIT
-       LLVMExecutionEngine
-
-       LLVMCodeGen
-       LLVMScalarOpts
-       LLVMTransformUtils
-
-       LLVMipo
-       LLVMAnalysis
-       LLVMTarget
-       LLVMMC
-       LLVMCore
-       LLVMSupport
        ${Boost_FILESYSTEM_LIBRARY}
        ${Boost_SYSTEM_LIBRARY}
        ${Boost_CHRONO_LIBRARY}
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index a1ea88182a9..118db06e1fa 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -18,8 +18,8 @@ if( GPERFTOOLS_FOUND )
     list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-find_package(LLVM 4.0 REQUIRED CONFIG)
-
+find_package(LLVM @LLVM_VERSION@ EXACT REQUIRED CONFIG)
+llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
 link_directories(${LLVM_LIBRARY_DIR})
 
 set( CMAKE_CXX_STANDARD 17 )
@@ -76,7 +76,7 @@ find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
 macro(add_eosio_test_executable test_name)
    add_executable( ${test_name} ${ARGN} )
    target_link_libraries( ${test_name}
-       ${LLVM}
+       ${LLVM_LIBS}
        ${libtester}
        ${libchain}
        ${libfc}
@@ -95,31 +95,6 @@ macro(add_eosio_test_executable test_name)
        ${libsecp256k1}
        ${GMP_LIBRARIES}
 
-       LLVMX86Disassembler
-       LLVMX86AsmParser
-       LLVMX86AsmPrinter
-       LLVMX86CodeGen
-
-       LLVMSelectionDAG
-
-       LLVMDebugInfoDWARF
-       LLVMAsmPrinter
-       LLVMMCParser
-       LLVMX86Info
-
-       LLVMOrcJIT
-       LLVMExecutionEngine
-
-       LLVMCodeGen
-       LLVMScalarOpts
-       LLVMTransformUtils
-
-       LLVMipo
-       LLVMAnalysis
-       LLVMTarget
-       LLVMMC
-       LLVMCore
-       LLVMSupport
        ${Boost_FILESYSTEM_LIBRARY}
        ${Boost_SYSTEM_LIBRARY}
        ${Boost_CHRONO_LIBRARY}
diff --git a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
index 6c3ef9c9e82..b8016437563 100644
--- a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
@@ -1,10 +1,3 @@
-# Find an installed build of LLVM
-find_package(LLVM REQUIRED CONFIG)
-
-if(LLVM_VERSION_MAJOR VERSION_LESS 7 OR LLVM_VERSION_MAJOR VERSION_GREATER 9)
-	message(FATAL_ERROR "WAVM requires an LLVM version 7.0 to 9.0")
-endif()
-
 if(LLVM_VERSION VERSION_LESS 7.1 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	enable_language(ASM-LLVMWAR)
 	set(LLVM_SHIM_FILE llvmWARshim.llvmwar)

From 41a1b7d28e56779ed8be3213f66111c6d07946ec Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Tue, 20 Aug 2019 15:28:21 -0400
Subject: [PATCH 1015/1648] Update to combined jit/interpreter.

---
 .../include/eosio/chain/wasm_interface.hpp    |  5 +++--
 .../eosio/chain/wasm_interface_private.hpp    |  4 +++-
 .../eosio/chain/webassembly/eos-vm.hpp        |  4 +++-
 libraries/chain/wasm_interface.cpp            |  2 ++
 libraries/chain/webassembly/eos-vm.cpp        | 20 ++++++++++++-------
 libraries/eos-vm                              |  2 +-
 plugins/chain_plugin/chain_plugin.cpp         |  2 +-
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index bed4081e9e8..2007e65573f 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -75,7 +75,8 @@ namespace eosio { namespace chain {
          enum class vm_type {
             wavm,
             wabt,
-            eos_vm
+            eos_vm,
+            eos_vm_jit
          };
 
          wasm_interface(vm_type vm, const chainbase::database& db);
@@ -113,4 +114,4 @@ namespace eosio{ namespace chain {
    std::istream& operator>>(std::istream& in, wasm_interface::vm_type& runtime);
 }}
 
-FC_REFLECT_ENUM( eosio::chain::wasm_interface::vm_type, (wavm)(wabt)(eos_vm) )
+FC_REFLECT_ENUM( eosio::chain::wasm_interface::vm_type, (wavm)(wabt)(eos_vm)(eos_vm_jit) )
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 0bd0adf449e..5cb6640991a 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -51,7 +51,9 @@ namespace eosio { namespace chain {
          else if(vm == wasm_interface::vm_type::wabt)
             runtime_interface = std::make_unique<webassembly::wabt_runtime::wabt_runtime>();
          else if(vm == wasm_interface::vm_type::eos_vm)
-            runtime_interface = std::make_unique<webassembly::eos_vm_runtime::eos_vm_runtime>();
+            runtime_interface = std::make_unique<webassembly::eos_vm_runtime::eos_vm_runtime<eosio::vm::interpreter>>();
+         else if(vm == wasm_interface::vm_type::eos_vm_jit)
+            runtime_interface = std::make_unique<webassembly::eos_vm_runtime::eos_vm_runtime<eosio::vm::jit>>();
          else
             EOS_THROW(wasm_exception, "wasm_interface_impl fall through");
       }
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 39e1c1645a7..0e0194e680a 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -174,6 +174,7 @@ using namespace fc;
 using namespace eosio::vm;
 using namespace eosio::chain::webassembly::common;
 
+template<typename Backend>
 class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
    public:
       eos_vm_runtime();
@@ -188,8 +189,9 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
       // todo: managing this will get more complicated with sync calls;
       //       immediately_exit_currently_running_module() should probably
       //       move from wasm_runtime_interface to wasm_instantiated_module_interface.
-      backend<apply_context>* _bkend = nullptr;  // non owning pointer to allow for immediate exit
+      backend<apply_context, Backend>* _bkend = nullptr;  // non owning pointer to allow for immediate exit
 
+   template<typename Impl>
    friend class eos_vm_instantiated_module;
 };
 
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 3a0e45dc9c2..f38a2766c1b 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -2049,6 +2049,8 @@ std::istream& operator>>(std::istream& in, wasm_interface::vm_type& runtime) {
       runtime = eosio::chain::wasm_interface::vm_type::wabt;
    else if (s == "eos-vm")
       runtime = eosio::chain::wasm_interface::vm_type::eos_vm;
+   else if (s == "eos-vm-jit")
+      runtime = eosio::chain::wasm_interface::vm_type::eos_vm_jit;
    else
       in.setstate(std::ios_base::failbit);
    return in;
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 9532e27f0bc..d28d4f2a5f3 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -11,12 +11,12 @@ using namespace eosio::vm;
 
 namespace wasm_constraints = eosio::chain::wasm_constraints;
 
-using backend_t = backend<apply_context>;
-
+template<typename Impl>
 class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
+      using backend_t = backend<apply_context, Impl>;
    public:
       
-      eos_vm_instantiated_module(eos_vm_runtime* runtime, std::unique_ptr<backend_t> mod) :
+      eos_vm_instantiated_module(eos_vm_runtime<Impl>* runtime, std::unique_ptr<backend_t> mod) :
          _runtime(runtime),
          _instantiated_module(std::move(mod)) {}
 
@@ -41,20 +41,26 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
       }
 
    private:
-      eos_vm_runtime*            _runtime;
+      eos_vm_runtime<Impl>*            _runtime;
       std::unique_ptr<backend_t> _instantiated_module;
 };
 
-eos_vm_runtime::eos_vm_runtime() {}
+template<typename Impl>
+eos_vm_runtime<Impl>::eos_vm_runtime() {}
 
-std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
+template<typename Impl>
+std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime<Impl>::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
+   using backend_t = backend<apply_context, Impl>;
    std::ofstream mf("temp.wasm");
    mf.write((char*)code_bytes, code_size);
    mf.close();
    wasm_code_ptr code((uint8_t*)code_bytes, 0);
    std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size);
    registered_host_functions<apply_context>::resolve(bkend->get_module());
-   return std::make_unique<eos_vm_instantiated_module>(this, std::move(bkend));
+   return std::make_unique<eos_vm_instantiated_module<Impl>>(this, std::move(bkend));
 }
 
+template class eos_vm_runtime<eosio::vm::interpreter>;
+template class eos_vm_runtime<eosio::vm::jit>;
+
 }}}}
diff --git a/libraries/eos-vm b/libraries/eos-vm
index f9efbd67ad3..67ce1200547 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit f9efbd67ad3d331e867f17515c399f4fd4d19363
+Subproject commit 67ce1200547269fbd6f6211208897e06ee1980a8
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 93b2d0d620c..f4362f111f3 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -192,7 +192,7 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
          ("protocol-features-dir", bpo::value<bfs::path>()->default_value("protocol_features"),
           "the location of the protocol_features directory (absolute path or relative to application config dir)")
          ("checkpoint", bpo::value<vector<string>>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.")
-         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("wavm/wabt/eos-vm"), "Override default WASM runtime")
+         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("wavm/wabt/eos-vm/eos-vm"), "Override default WASM runtime")
          ("abi-serializer-max-time-ms", bpo::value<uint32_t>()->default_value(config::default_abi_serializer_max_time_ms),
           "Override default maximum ABI serialization time allowed in ms")
          ("chain-state-db-size-mb", bpo::value<uint64_t>()->default_value(config::default_state_size / (1024  * 1024)), "Maximum size (in MiB) of the chain state database")

From 0954b8edf975b390b13c270645b7045088d0cdfc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 14 Aug 2019 08:19:02 -0500
Subject: [PATCH 1016/1648] emit accepted block before updating block_log lib
 since accepted block does not depend on lib and we should ship out block as
 soon as possible

---
 libraries/chain/controller.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 8e72a43b387..1cea3ac8862 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1654,11 +1654,11 @@ struct controller_impl {
             });
          }
 
+         emit( self.accepted_block, bsp );
+
          if( add_to_fork_db ) {
             log_irreversible();
          }
-
-         emit( self.accepted_block, bsp );
       } catch (...) {
          // dont bother resetting pending, instead abort the block
          reset_pending_on_exit.cancel();

From 63ff4f8f253b71a0260fb88823d5f3c24aee8e44 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 20 Aug 2019 11:45:10 -0500
Subject: [PATCH 1017/1648] Optimize getting block id from block log

---
 libraries/chain/block_log.cpp                 | 27 +++++++++++++++++++
 libraries/chain/controller.cpp                | 14 +++++-----
 .../chain/include/eosio/chain/block_log.hpp   |  3 +++
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index d16a84213a7..5b8a93cc92d 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -319,6 +319,14 @@ namespace eosio { namespace chain {
       return result;
    }
 
+   void block_log::read_block_header(block_header& bh, uint64_t pos)const {
+      my->check_open_files();
+
+      my->block_file.seek(pos);
+      auto ds = my->block_file.create_datastream();
+      fc::raw::unpack(ds, bh);
+   }
+
    signed_block_ptr block_log::read_block_by_num(uint32_t block_num)const {
       try {
          signed_block_ptr b;
@@ -332,6 +340,21 @@ namespace eosio { namespace chain {
       } FC_LOG_AND_RETHROW()
    }
 
+   block_id_type block_log::read_block_id_by_num(uint32_t block_num)const {
+      try {
+         signed_block_ptr b;
+         uint64_t pos = get_block_pos(block_num);
+         if (pos != npos) {
+            block_header bh;
+            read_block_header(bh, pos);
+            EOS_ASSERT(b->block_num() == block_num, reversible_blocks_exception,
+                       "Wrong block header was read from block log.", ("returned", b->block_num())("expected", block_num));
+            return bh.id();
+         }
+         return {};
+      } FC_LOG_AND_RETHROW()
+   }
+
    uint64_t block_log::get_block_pos(uint32_t block_num) const {
       my->check_open_files();
       if (!(my->head && block_num <= block_header::num_from_id(my->head_id) && block_num >= my->first_block_num))
@@ -365,6 +388,10 @@ namespace eosio { namespace chain {
       return my->head;
    }
 
+   const block_id_type&    block_log::head_id()const {
+      return my->head_id;
+   }
+
    uint32_t block_log::first_block_num() const {
       return my->first_block_num;
    }
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 1cea3ac8862..a4397ece63f 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -377,7 +377,7 @@ struct controller_impl {
       auto root_id = fork_db.root()->id;
 
       if( log_head ) {
-         EOS_ASSERT( root_id == log_head->id(), fork_database_exception, "fork database root does not match block log head" );
+         EOS_ASSERT( root_id == blog.head_id(), fork_database_exception, "fork database root does not match block log head" );
       } else {
          EOS_ASSERT( fork_db.root()->block_num == lib_num, fork_database_exception,
                      "empty block log expects the first appended block to build off a block that is not the fork database root" );
@@ -2697,12 +2697,12 @@ block_id_type controller::last_irreversible_block_id() const {
    if( block_header::num_from_id(tapos_block_summary.block_id) == lib_num )
       return tapos_block_summary.block_id;
 
-   auto signed_blk = my->blog.read_block_by_num( lib_num );
+   auto id = my->blog.read_block_id_by_num( lib_num );
 
-   EOS_ASSERT( BOOST_LIKELY( signed_blk != nullptr ), unknown_block_exception,
+   EOS_ASSERT( BOOST_LIKELY( id != block_id_type() ), unknown_block_exception,
                "Could not find block: ${block}", ("block", lib_num) );
 
-   return signed_blk->id();
+   return id;
 }
 
 const dynamic_global_property_object& controller::get_dynamic_global_properties()const {
@@ -2768,12 +2768,12 @@ block_id_type controller::get_block_id_for_num( uint32_t block_num )const { try
       }
    }
 
-   auto signed_blk = my->blog.read_block_by_num(block_num);
+   auto id = my->blog.read_block_id_by_num(block_num);
 
-   EOS_ASSERT( BOOST_LIKELY( signed_blk != nullptr ), unknown_block_exception,
+   EOS_ASSERT( BOOST_LIKELY( id != block_id_type() ), unknown_block_exception,
                "Could not find block: ${block}", ("block", block_num) );
 
-   return signed_blk->id();
+   return id;
 } FC_CAPTURE_AND_RETHROW( (block_num) ) }
 
 sha256 controller::calculate_integrity_hash()const { try {
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index 93cdde1e822..9cf525628f2 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -43,7 +43,9 @@ namespace eosio { namespace chain {
          void reset( const genesis_state& gs, const signed_block_ptr& genesis_block, uint32_t first_block_num = 1 );
 
          signed_block_ptr read_block(uint64_t file_pos)const;
+         void             read_block_header(block_header& bh, uint64_t file_pos)const;
          signed_block_ptr read_block_by_num(uint32_t block_num)const;
+         block_id_type    read_block_id_by_num(uint32_t block_num)const;
          signed_block_ptr read_block_by_id(const block_id_type& id)const {
             return read_block_by_num(block_header::num_from_id(id));
          }
@@ -54,6 +56,7 @@ namespace eosio { namespace chain {
          uint64_t get_block_pos(uint32_t block_num) const;
          signed_block_ptr        read_head()const;
          const signed_block_ptr& head()const;
+         const block_id_type&    head_id()const;
          uint32_t                first_block_num() const;
 
          static const uint64_t npos = std::numeric_limits<uint64_t>::max();

From 7c92091dc4ca555ce4c87ed6f517d9eca901d143 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 20 Aug 2019 13:49:47 -0500
Subject: [PATCH 1018/1648] Fix read_block_id_by_num to use block_header

---
 libraries/chain/block_log.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 5b8a93cc92d..d9c971e7447 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -342,13 +342,12 @@ namespace eosio { namespace chain {
 
    block_id_type block_log::read_block_id_by_num(uint32_t block_num)const {
       try {
-         signed_block_ptr b;
          uint64_t pos = get_block_pos(block_num);
          if (pos != npos) {
             block_header bh;
             read_block_header(bh, pos);
-            EOS_ASSERT(b->block_num() == block_num, reversible_blocks_exception,
-                       "Wrong block header was read from block log.", ("returned", b->block_num())("expected", block_num));
+            EOS_ASSERT(bh.block_num() == block_num, reversible_blocks_exception,
+                       "Wrong block header was read from block log.", ("returned", bh.block_num())("expected", block_num));
             return bh.id();
          }
          return {};

From 2a284a132f80b0c03259bec8a559555ae502d069 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 14 Aug 2019 20:55:07 -0500
Subject: [PATCH 1019/1648] Do not reconnect immediately if sent a go_away
 message.

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f0272410b67..e22c6e79cbd 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2199,6 +2199,7 @@ namespace eosio {
                      return true;
                   } );
                   if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count)) {
+                     fc_dlog( logger, "Accepted new connection: " + paddr_str );
                      if( new_connection->start_session()) {
                         std::lock_guard<std::shared_mutex> g_unique( connections_mtx );
                         connections.insert( new_connection );
@@ -2630,7 +2631,7 @@ namespace eosio {
          node_id = msg.node_id;
       }
       flush_queues();
-      close();
+      close( false );
    }
 
    void connection::handle_message( const time_message& msg ) {

From bf2368ff18da52d772d8ffc7b0daa74a7e8cc0c2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 14 Aug 2019 22:50:16 -0500
Subject: [PATCH 1020/1648] No need to process accept_transaction next as it
 comes through transaction_ack

---
 plugins/net_plugin/net_plugin.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e22c6e79cbd..f2776f9d64b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -179,7 +179,7 @@ namespace eosio {
       : strand( io_context ) {}
 
       void bcast_transaction(const packed_transaction& trx);
-      void rejected_transaction(const transaction_id_type& msg, uint32_t head_blk_num);
+      void rejected_transaction(const packed_transaction_ptr& trx, uint32_t head_blk_num);
       void bcast_block(const block_state_ptr& bs);
       void bcast_notice( const block_id_type& id );
       void rejected_block(const block_id_type& id);
@@ -2010,11 +2010,13 @@ namespace eosio {
       } );
    }
 
-   void dispatch_manager::rejected_transaction(const transaction_id_type& id, uint32_t head_blk_num) {
-      fc_dlog( logger, "not sending rejected transaction ${tid}", ("tid", id) );
+   void dispatch_manager::rejected_transaction(const packed_transaction_ptr& trx, uint32_t head_blk_num) {
+      fc_dlog( logger, "not sending rejected transaction ${tid}", ("tid", trx->id()) );
       // keep rejected transaction around for awhile so we don't broadcast it
       // update its block number so it will be purged when current block number is lib
-      update_txns_block_num( id, head_blk_num );
+      if( trx->expiration() > fc::time_point::now() ) { // no need to update blk_num if already expired
+         update_txns_block_num( trx->id(), head_blk_num );
+      }
    }
 
    // called from connection strand
@@ -2821,20 +2823,21 @@ namespace eosio {
                fc_elog( logger, "bad packed_transaction : ${m}", ("m", trace->except->what()));
             }
          }
-
+/* this comes through the transaction_ack channel
          boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, weak{std::move(weak)}, trx{std::move(trx)}]() mutable {
             if( accepted ) {
                my_impl->dispatcher->bcast_transaction( *trx );
             } else {
                uint32_t head_blk_num = 0;
                std::tie( std::ignore, head_blk_num, std::ignore, std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
-               my_impl->dispatcher->rejected_transaction( trx->id(), head_blk_num );
+               my_impl->dispatcher->rejected_transaction( trx, head_blk_num );
             }
             connection_ptr conn = weak.lock();
             if( conn ) {
                conn->trx_in_progress_size -= calc_trx_size( trx );
             }
          });
+         */
         });
       });
    }
@@ -3067,7 +3070,7 @@ namespace eosio {
 
             uint32_t head_blk_num = 0;
             std::tie( std::ignore, head_blk_num, std::ignore, std::ignore, std::ignore, std::ignore ) = get_chain_info();
-            dispatcher->rejected_transaction(id, head_blk_num);
+            dispatcher->rejected_transaction(results.second->packed_trx(), head_blk_num);
          } else {
             fc_dlog( logger, "signaled ACK, trx-id = ${id}", ("id", id) );
             dispatcher->bcast_transaction(*results.second->packed_trx());

From 1a880889daa11fb6d50ab2d24c8f0845fe3376e6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 19 Aug 2019 15:55:19 -0500
Subject: [PATCH 1021/1648] Remove commented out uneeded code

---
 plugins/net_plugin/net_plugin.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f2776f9d64b..01173947448 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2823,21 +2823,6 @@ namespace eosio {
                fc_elog( logger, "bad packed_transaction : ${m}", ("m", trace->except->what()));
             }
          }
-/* this comes through the transaction_ack channel
-         boost::asio::post( my_impl->thread_pool->get_executor(), [accepted, weak{std::move(weak)}, trx{std::move(trx)}]() mutable {
-            if( accepted ) {
-               my_impl->dispatcher->bcast_transaction( *trx );
-            } else {
-               uint32_t head_blk_num = 0;
-               std::tie( std::ignore, head_blk_num, std::ignore, std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
-               my_impl->dispatcher->rejected_transaction( trx, head_blk_num );
-            }
-            connection_ptr conn = weak.lock();
-            if( conn ) {
-               conn->trx_in_progress_size -= calc_trx_size( trx );
-            }
-         });
-         */
         });
       });
    }

From 9aee3f7cb8b279d2827e0ff0670275ec95e6f8c7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 19 Aug 2019 21:22:56 -0500
Subject: [PATCH 1022/1648] Add back in correct trx_in_progress_size reduction

---
 plugins/net_plugin/net_plugin.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 01173947448..99c90c720e9 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2809,20 +2809,20 @@ namespace eosio {
          my_impl->chain_plug->accept_transaction( trx,
             [weak, trx](const static_variant<fc::exception_ptr, transaction_trace_ptr>& result) mutable {
          // next (this lambda) called from application thread
-         bool accepted = false;
          if (result.contains<fc::exception_ptr>()) {
             fc_dlog( logger, "bad packed_transaction : ${m}", ("m", result.get<fc::exception_ptr>()->what()) );
          } else {
             const transaction_trace_ptr& trace = result.get<transaction_trace_ptr>();
-            if (!trace->except) {
+            if( !trace->except ) {
                fc_dlog( logger, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
-               accepted = true;
-            }
-
-            if( !accepted ) {
+            } else {
                fc_elog( logger, "bad packed_transaction : ${m}", ("m", trace->except->what()));
             }
          }
+         connection_ptr conn = weak.lock();
+         if( conn ) {
+            conn->trx_in_progress_size -= calc_trx_size( trx );
+         }
         });
       });
    }

From a143d8b649ef368d13acdc66f9a745e0e13ff776 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 21 Aug 2019 21:25:59 -0500
Subject: [PATCH 1023/1648] Change accepted log level to info from debug

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 99c90c720e9..22136cdaba4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2201,7 +2201,7 @@ namespace eosio {
                      return true;
                   } );
                   if( from_addr < max_nodes_per_host && (max_client_count == 0 || visitors < max_client_count)) {
-                     fc_dlog( logger, "Accepted new connection: " + paddr_str );
+                     fc_ilog( logger, "Accepted new connection: " + paddr_str );
                      if( new_connection->start_session()) {
                         std::lock_guard<std::shared_mutex> g_unique( connections_mtx );
                         connections.insert( new_connection );

From 84090d3b54c63da817a4ad618ffcdbc6ce93eb13 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 22 Aug 2019 06:27:52 -0500
Subject: [PATCH 1024/1648] Add "round-trip" testing for v2 snapshot with
 pending producers include this additional instance in the final test that
 appends a block and ensures that integrity is maintained

---
 unittests/snapshot_tests.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index f2e4e01cee9..2779bb5813c 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -413,19 +413,27 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
    auto v2 = SNAPSHOT_SUITE::template load_from_file<snapshots::snap_v2_prod_sched>();
    snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
    auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();
+   BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
+
+   // create a latest version snapshot from the loaded v2 snapthos
+   auto latest_from_v2_writer = SNAPSHOT_SUITE::get_writer();
+   v2_tester.control->write_snapshot(latest_from_v2_writer);
+   auto latest_from_v2 = SNAPSHOT_SUITE::finalize(latest_from_v2_writer);
+
+   // load the latest snapshot in a new tester and compare integrity
+   snapshotted_tester latest_from_v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(latest_from_v2), 1);
+   auto latest_from_v2_integrity_value = latest_from_v2_tester.control->calculate_integrity_hash();
+   BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), latest_from_v2_integrity_value.str());
+
 
    // take advantage of variant compare to possibly identify where snapshot disparities come from
-   if (std::is_same_v<SNAPSHOT_SUITE, variant_snapshot_suite> && v2_integrity_value.str() != base_integrity_value.str()) {
+   if (std::is_same_v<SNAPSHOT_SUITE, variant_snapshot_suite> && latest_from_v2_integrity_value.str() != base_integrity_value.str()) {
       // create a latest snapshot
       auto latest_writer = SNAPSHOT_SUITE::get_writer();
       chain.control->write_snapshot(latest_writer);
       auto chain_latest = SNAPSHOT_SUITE::finalize(latest_writer);
-      auto latest_writer2 = SNAPSHOT_SUITE::get_writer();
-      v2_tester.control->write_snapshot(latest_writer2);
-      auto v2_tester_latest = SNAPSHOT_SUITE::finalize(latest_writer2);
-      print_variant_diff(chain_latest, v2_tester_latest);
+      print_variant_diff(chain_latest, latest_from_v2);
    }
-   BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
 
    const auto& v2_gpo = v2_tester.control->get_global_properties();
    BOOST_REQUIRE_EQUAL(v2_gpo.proposed_schedule.version, 1);
@@ -442,6 +450,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
    // push that block to all sub testers and validate the integrity of the database after it.
    v2_tester.push_block(new_block);
    BOOST_REQUIRE_EQUAL(integrity_value.str(), v2_tester.control->calculate_integrity_hash().str());
+
+   latest_from_v2_tester.push_block(new_block);
+   BOOST_REQUIRE_EQUAL(integrity_value.str(), latest_from_v2_tester.control->calculate_integrity_hash().str());
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 0a2507426c459a4511a51fc5e36eb0e6be7a05d7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 14 Aug 2019 07:01:23 -0500
Subject: [PATCH 1025/1648] Additional debug logging

---
 plugins/producer_plugin/producer_plugin.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index e333cb85e26..84989a5ee83 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1680,13 +1680,16 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
             _incoming_trx_weight = 0.0;
 
             if (!_pending_incoming_transactions.empty()) {
-               fc_dlog(_log, "Processing ${n} pending transactions", ("n", _pending_incoming_transactions.size()));
+               size_t processed = 0;
+               fc_dlog(_log, "Processing ${n} pending transactions", ("n", orig_pending_txn_size));
                while (orig_pending_txn_size && _pending_incoming_transactions.size()) {
                   if (preprocess_deadline <= fc::time_point::now()) return start_block_result::exhausted;
                   auto e = _pending_incoming_transactions.pop_front();
                   --orig_pending_txn_size;
                   process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
+                  ++processed;
                }
+               fc_dlog(_log, "Processed ${n} pending transactions, S{p} left", ("n", processed)("p", _pending_incoming_transactions.size()));
             }
             return start_block_result::succeeded;
          }

From 00f5465d017f20c01f93a9c41d33326faf18ec65 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 14 Aug 2019 19:56:31 -0500
Subject: [PATCH 1026/1648] Fix log message

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 84989a5ee83..fa9d9816419 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1689,7 +1689,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                   process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
                   ++processed;
                }
-               fc_dlog(_log, "Processed ${n} pending transactions, S{p} left", ("n", processed)("p", _pending_incoming_transactions.size()));
+               fc_dlog(_log, "Processed ${n} pending transactions, ${p} left", ("n", processed)("p", _pending_incoming_transactions.size()));
             }
             return start_block_result::succeeded;
          }

From 353a50e35d3c14d81ec71d9a97be665bf3eed5b3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 16 Aug 2019 11:39:43 -0500
Subject: [PATCH 1027/1648] Do not indicate exhausted if only went past
 scheduled trx deadline'

---
 plugins/producer_plugin/producer_plugin.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index fa9d9816419..3c808fdd8fd 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1597,7 +1597,6 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                   continue; // do not allow schedule and execute in same block
                }
                if( scheduled_trx_deadline <= fc::time_point::now() ) {
-                  exhausted = true;
                   break;
                }
 
@@ -1625,7 +1624,6 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                }
 
                if (scheduled_trx_deadline <= fc::time_point::now()) {
-                  exhausted = true;
                   break;
                }
 

From 09fbc9fe7cb0a37e84336d8b4e52a02c768aec79 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 16 Aug 2019 11:56:52 -0500
Subject: [PATCH 1028/1648] Do not wake up a block earily as that just causes a
 block to get started that is aborted.

---
 plugins/producer_plugin/producer_plugin.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 3c808fdd8fd..f115fcad3e1 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1322,12 +1322,6 @@ fc::time_point producer_plugin_impl::calculate_block_deadline( const fc::time_po
    return block_time + fc::microseconds(last_block ? _last_block_time_offset_us : _produce_time_offset_us);
 }
 
-enum class tx_category {
-   PERSISTED,
-   UNEXPIRED_UNPERSISTED
-};
-
-
 producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
    chain::controller& chain = chain_plug->chain();
 
@@ -1787,9 +1781,8 @@ void producer_plugin_impl::schedule_delayed_production_loop(const std::weak_ptr<
    for (const auto&p: _producers) {
       auto next_producer_block_time = calculate_next_block_time(p, current_block_time);
       if (next_producer_block_time) {
-         auto producer_wake_up_time = *next_producer_block_time - fc::microseconds(config::block_interval_us);
+         auto producer_wake_up_time = *next_producer_block_time;
          if (wake_up_time) {
-            // wake up with a full block interval to the deadline
             wake_up_time = std::min<fc::time_point>(*wake_up_time, producer_wake_up_time);
          } else {
             wake_up_time = producer_wake_up_time;

From d478d31f1fe854f4eff0b82b456317254c8714a3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 16 Aug 2019 14:23:31 -0500
Subject: [PATCH 1029/1648] Produce block immediately when exhausted without
 going through timer

---
 plugins/producer_plugin/producer_plugin.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index f115fcad3e1..a09b20c083a 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1330,8 +1330,6 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
    const auto& hbs = chain.head_block_state();
 
-   fc_dlog(_log, "Starting block ${n} at ${time}", ("n", hbs->block_num + 1)("time", fc::time_point::now()));
-
    //Schedule for the next second's tick regardless of chain state
    // If we would wait less than 50ms (1/10 of block_interval), wait for the whole block interval.
    const fc::time_point now = fc::time_point::now();
@@ -1339,8 +1337,11 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
    _pending_block_mode = pending_block_mode::producing;
 
-   // Not our turn
    const auto& scheduled_producer = hbs->get_scheduled_producer(block_time);
+
+   fc_dlog(_log, "Starting block ${n} at ${time} producer ${p}",
+           ("n", hbs->block_num + 1)("time", now)("p", scheduled_producer.producer_name));
+
    auto current_watermark = get_watermark(scheduled_producer.producer_name);
 
    size_t num_relevant_signatures = 0;
@@ -1745,9 +1746,13 @@ void producer_plugin_impl::schedule_production_loop() {
          auto expect_time = chain.pending_block_time() - fc::microseconds(config::block_interval_us);
          // ship this block off up to 1 block time earlier or immediately
          if (fc::time_point::now() >= expect_time) {
-            _timer.expires_from_now( boost::posix_time::microseconds( 0 ));
-            fc_dlog(_log, "Scheduling Block Production on Exhausted Block #${num} immediately",
+            // produce block immediately
+            fc_dlog(_log, "Completing Block Production on Exhausted Block #${num} immediately",
                           ("num", chain.head_block_num()+1));
+            fc_dlog( _log, "Produce block for ${num} running at ${time}", ("num", chain.head_block_num()+1)("time", fc::time_point::now()) );
+            auto res = maybe_produce_block();
+            fc_dlog( _log, "Producing Block #${num} returned: ${res}", ("num", chain.head_block_num()+1)( "res", res ) );
+            return;
          } else {
             _timer.expires_at(epoch + boost::posix_time::microseconds(expect_time.time_since_epoch().count()));
             fc_dlog(_log, "Scheduling Block Production on Exhausted Block #${num} at ${time}",

From 815149bd3f43e8070123f8345ac5a3ce0abd2878 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 21 Aug 2019 10:21:15 -0500
Subject: [PATCH 1030/1648] Add # to debug output

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index a09b20c083a..26fbe9982b3 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1339,7 +1339,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
    const auto& scheduled_producer = hbs->get_scheduled_producer(block_time);
 
-   fc_dlog(_log, "Starting block ${n} at ${time} producer ${p}",
+   fc_dlog(_log, "Starting block #${n} at ${time} producer ${p}",
            ("n", hbs->block_num + 1)("time", now)("p", scheduled_producer.producer_name));
 
    auto current_watermark = get_watermark(scheduled_producer.producer_name);

From cb3f304309649a244e11be3934eddbbd36a8123d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 22 Aug 2019 09:26:12 -0500
Subject: [PATCH 1031/1648] Restore default logging if logging.json is removed
 when SIGHUP.

---
 programs/nodeos/main.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 4e599d7b039..5eac9d29bac 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -23,7 +23,11 @@ void configure_logging(const bfs::path& config_path)
 {
    try {
       try {
-         fc::configure_logging(config_path);
+         if( fc::exists( config_path ) ) {
+            fc::configure_logging( config_path );
+         } else {
+            fc::configure_logging( fc::logging_config::default_config() );
+         }
       } catch (...) {
          elog("Error reloading logging.json");
          throw;
@@ -44,9 +48,12 @@ void configure_logging(const bfs::path& config_path)
 void logging_conf_handler()
 {
    auto config_path = app().get_logging_conf();
-   ilog("Received HUP.  Reloading logging configuration from ${p}.", ("p", config_path.string()));
-   if(fc::exists(config_path))
-      ::detail::configure_logging(config_path);
+   if( fc::exists( config_path ) ) {
+      ilog( "Received HUP.  Reloading logging configuration from ${p}.", ("p", config_path.string()) );
+   } else {
+      ilog( "Received HUP.  No log config found at ${p}, setting to default.", ("p", config_path.string()) );
+   }
+   ::detail::configure_logging( config_path );
    fc::log_config::initialize_appenders( app().get_io_service() );
 }
 

From 51e68790b27a4bf1a7f51b79f7d99255cc327e1d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 22 Aug 2019 11:16:32 -0500
Subject: [PATCH 1032/1648] Update to fc with default config for non-specified
 loggers

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index c9e0e66bcc3..c9e7389ba1f 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit c9e0e66bcc314caa91d6a135f0d569390e423864
+Subproject commit c9e7389ba1f0d8bd4fe4dbbfe97863c722f8e564

From d6d31aa52ab831a0654d69284e56dda04f1ad6a0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 22 Aug 2019 11:20:12 -0500
Subject: [PATCH 1033/1648] Change peer_ilog to peer_dlog for some log messages
 now that the default is info level if not specified.

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f0272410b67..93deca55c32 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2487,11 +2487,11 @@ namespace eosio {
    }
 
    void connection::handle_message( const chain_size_message& msg ) {
-      peer_ilog(this, "received chain_size_message");
+      peer_dlog(this, "received chain_size_message");
    }
 
    void connection::handle_message( const handshake_message& msg ) {
-      peer_ilog( this, "received handshake_message" );
+      peer_dlog( this, "received handshake_message" );
       if( !is_valid( msg ) ) {
          peer_elog( this, "bad handshake message");
          enqueue( go_away_message( fatal_other ) );
@@ -2634,7 +2634,7 @@ namespace eosio {
    }
 
    void connection::handle_message( const time_message& msg ) {
-      peer_ilog( this, "received time_message" );
+      peer_dlog( this, "received time_message" );
       /* We've already lost however many microseconds it took to dispatch
        * the message, but it can't be helped.
        */
@@ -2670,7 +2670,7 @@ namespace eosio {
       // peer tells us about one or more blocks or txns. When done syncing, forward on
       // notices of previously unknown blocks or txns,
       //
-      peer_ilog( this, "received notice_message" );
+      peer_dlog( this, "received notice_message" );
       connecting = false;
       if( msg.known_blocks.ids.size() > 1 ) {
          fc_elog( logger, "Invalid notice_message, known_blocks.ids.size ${s}, closing connection: ${p}",
@@ -2733,11 +2733,11 @@ namespace eosio {
 
       switch (msg.req_blocks.mode) {
       case catch_up :
-         peer_ilog( this, "received request_message:catch_up" );
+         peer_dlog( this, "received request_message:catch_up" );
          blk_send_branch();
          break;
       case normal :
-         peer_ilog( this, "received request_message:normal" );
+         peer_dlog( this, "received request_message:normal" );
          if( !msg.req_blocks.ids.empty() ) {
             blk_send( msg.req_blocks.ids.back() );
          }
@@ -2876,7 +2876,7 @@ namespace eosio {
       }
 
       fc::microseconds age( fc::time_point::now() - msg->timestamp);
-      peer_ilog( c, "received signed_block : #${n} block age in secs = ${age}",
+      peer_dlog( c, "received signed_block : #${n} block age in secs = ${age}",
                  ("n", blk_num)( "age", age.to_seconds() ) );
 
       go_away_reason reason = fatal_other;

From cb05450a6253caed927ca41e2e40388271f0514a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 22 Aug 2019 11:59:38 -0500
Subject: [PATCH 1034/1648] Revert "Produce block immediately when exhausted
 without going through timer"

This reverts commit d478d31f1fe854f4eff0b82b456317254c8714a3.
---
 plugins/producer_plugin/producer_plugin.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 26fbe9982b3..5a12b8ac3a0 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1337,6 +1337,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
    _pending_block_mode = pending_block_mode::producing;
 
+   // Not our turn
    const auto& scheduled_producer = hbs->get_scheduled_producer(block_time);
 
    fc_dlog(_log, "Starting block #${n} at ${time} producer ${p}",
@@ -1746,13 +1747,9 @@ void producer_plugin_impl::schedule_production_loop() {
          auto expect_time = chain.pending_block_time() - fc::microseconds(config::block_interval_us);
          // ship this block off up to 1 block time earlier or immediately
          if (fc::time_point::now() >= expect_time) {
-            // produce block immediately
-            fc_dlog(_log, "Completing Block Production on Exhausted Block #${num} immediately",
+            _timer.expires_from_now( boost::posix_time::microseconds( 0 ));
+            fc_dlog(_log, "Scheduling Block Production on Exhausted Block #${num} immediately",
                           ("num", chain.head_block_num()+1));
-            fc_dlog( _log, "Produce block for ${num} running at ${time}", ("num", chain.head_block_num()+1)("time", fc::time_point::now()) );
-            auto res = maybe_produce_block();
-            fc_dlog( _log, "Producing Block #${num} returned: ${res}", ("num", chain.head_block_num()+1)( "res", res ) );
-            return;
          } else {
             _timer.expires_at(epoch + boost::posix_time::microseconds(expect_time.time_since_epoch().count()));
             fc_dlog(_log, "Scheduling Block Production on Exhausted Block #${num} at ${time}",

From 357e30c76554ce899f2c7ee3da208ce03d5b9555 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 20 Aug 2019 09:28:48 -0400
Subject: [PATCH 1035/1648] callback support for the checktime timer

---
 .../include/eosio/chain/platform_timer.hpp    | 19 +++++++++++++++++++
 .../eosio/chain/transaction_context.hpp       |  9 +++++++--
 .../chain/platform_timer_asio_fallback.cpp    |  1 +
 libraries/chain/platform_timer_macos.cpp      |  9 ++++++---
 libraries/chain/platform_timer_posix.cpp      |  6 ++++--
 libraries/chain/transaction_context.cpp       |  7 ++++++-
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/platform_timer.hpp b/libraries/chain/include/eosio/chain/platform_timer.hpp
index 90a3f8400ac..c927d8228ef 100644
--- a/libraries/chain/include/eosio/chain/platform_timer.hpp
+++ b/libraries/chain/include/eosio/chain/platform_timer.hpp
@@ -2,6 +2,8 @@
 #include <fc/time.hpp>
 #include <fc/fwd.hpp>
 
+#include <eosio/chain/exceptions.hpp>
+
 #include <signal.h>
 
 namespace eosio { namespace chain {
@@ -13,12 +15,29 @@ struct platform_timer {
    void start(fc::time_point tp);
    void stop();
 
+   /* Sets a callback for when timer expires. Be aware this could might fire from a signal handling context and/or
+      on any particular thread. Only a single callback can be registered at once; trying to register more will
+      result in an exception. Setting to nullptr is allowed as a "no callback" hint */
+   void set_expiry_callback(void(*func)(void*), void* user) {
+      EOS_ASSERT(!(func && _expiration_callback), misc_exception, "Setting a platform_timer callback when one already exists");
+      _expiration_callback = func;
+      _expiration_callback_data = user;
+   }
+
    volatile sig_atomic_t expired = 1;
 
 private:
    struct impl;
    constexpr static size_t fwd_size = 8;
    fc::fwd<impl,fwd_size> my;
+
+   void call_expiration_callback() {
+      if(_expiration_callback)
+         _expiration_callback(_expiration_callback_data);
+   }
+
+   void(*_expiration_callback)(void*) = nullptr;
+   void* _expiration_callback_data;
 };
 
 }}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index 31fec506ceb..25689d0191f 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -16,6 +16,11 @@ namespace eosio { namespace chain {
          void start(fc::time_point tp);
          void stop();
 
+         /* Sets a callback for when timer expires. Be aware this could might fire from a signal handling context and/or
+            on any particular thread. Only a single callback can be registered at once; trying to register more will
+            result in an exception. */
+         void set_expiry_callback(void(*func)(void*), void* user);
+
          volatile sig_atomic_t& expired;
       private:
          platform_timer& _timer;
@@ -125,6 +130,8 @@ namespace eosio { namespace chain {
          int64_t                       billed_cpu_time_us = 0;
          bool                          explicit_billed_cpu_time = false;
 
+         transaction_checktime_timer   transaction_timer;
+
       private:
          bool                          is_initialized = false;
 
@@ -145,8 +152,6 @@ namespace eosio { namespace chain {
          fc::time_point                pseudo_start;
          fc::microseconds              billed_time;
          fc::microseconds              billing_timer_duration_limit;
-
-         transaction_checktime_timer   transaction_timer;
    };
 
 } }
diff --git a/libraries/chain/platform_timer_asio_fallback.cpp b/libraries/chain/platform_timer_asio_fallback.cpp
index 47c9b4b4f0b..79bc975de50 100644
--- a/libraries/chain/platform_timer_asio_fallback.cpp
+++ b/libraries/chain/platform_timer_asio_fallback.cpp
@@ -76,6 +76,7 @@ void platform_timer::start(fc::time_point tp) {
          if(ec)
             return;
          expired = 1;
+         call_expiration_callback();
       });
    }
 }
diff --git a/libraries/chain/platform_timer_macos.cpp b/libraries/chain/platform_timer_macos.cpp
index 670de808c90..545a683bae0 100755
--- a/libraries/chain/platform_timer_macos.cpp
+++ b/libraries/chain/platform_timer_macos.cpp
@@ -47,8 +47,11 @@ platform_timer::platform_timer() {
             struct kevent64_s anEvent;
             int c = kevent64(kqueue_fd, NULL, 0, &anEvent, 1, 0, NULL);
 
-            if(c == 1 && anEvent.filter == EVFILT_TIMER)
-               *(sig_atomic_t*)(anEvent.udata) = 1;
+            if(c == 1 && anEvent.filter == EVFILT_TIMER) {
+               platform_timer* self = (platform_timer*)anEvent.udata;
+               self->expired = 1;
+               self->call_expiration_callback();
+            }
             else if(c == 1 && anEvent.filter == EVFILT_USER)
                return;
             else if(c == -1 && errno == EINTR)
@@ -86,7 +89,7 @@ void platform_timer::start(fc::time_point tp) {
       expired = 1;
    else {
       struct kevent64_s aTimerEvent;
-      EV_SET64(&aTimerEvent, my->timerid, EVFILT_TIMER, EV_ADD|EV_ENABLE|EV_ONESHOT, NOTE_USECONDS|NOTE_CRITICAL, (int)x.count(), (uint64_t)&expired, 0, 0);
+      EV_SET64(&aTimerEvent, my->timerid, EVFILT_TIMER, EV_ADD|EV_ENABLE|EV_ONESHOT, NOTE_USECONDS|NOTE_CRITICAL, (int)x.count(), (uint64_t)this, 0, 0);
 
       expired = 0;
       if(kevent64(kqueue_fd, &aTimerEvent, 1, NULL, 0, KEVENT_FLAG_IMMEDIATE, NULL) != 0)
diff --git a/libraries/chain/platform_timer_posix.cpp b/libraries/chain/platform_timer_posix.cpp
index edf4ca806eb..d47bd1f025a 100644
--- a/libraries/chain/platform_timer_posix.cpp
+++ b/libraries/chain/platform_timer_posix.cpp
@@ -16,7 +16,9 @@ struct platform_timer::impl {
    timer_t timerid;
 
    static void sig_handler(int, siginfo_t* si, void*) {
-      *(sig_atomic_t*)(si->si_value.sival_ptr) = 1;
+      platform_timer* self = (platform_timer*)si->si_value.sival_ptr;
+      self->expired = 1;
+      self->call_expiration_callback();
    }
 };
 
@@ -38,7 +40,7 @@ platform_timer::platform_timer() {
    struct sigevent se;
    se.sigev_notify = SIGEV_SIGNAL;
    se.sigev_signo = SIGRTMIN;
-   se.sigev_value.sival_ptr = (void*)&expired;
+   se.sigev_value.sival_ptr = (void*)this;
 
    FC_ASSERT(timer_create(CLOCK_REALTIME, &se, &my->timerid) == 0, "failed to create timer");
 
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index ce216063962..0370c37cfe9 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -34,8 +34,13 @@ namespace eosio { namespace chain {
       _timer.stop();
    }
 
+   void transaction_checktime_timer::set_expiry_callback(void(*func)(void*), void* user) {
+      _timer.set_expiry_callback(func, user);
+   }
+
    transaction_checktime_timer::~transaction_checktime_timer() {
       stop();
+      _timer.set_expiry_callback(nullptr, nullptr);
    }
 
    transaction_context::transaction_context( controller& c,
@@ -49,9 +54,9 @@ namespace eosio { namespace chain {
    ,undo_session()
    ,trace(std::make_shared<transaction_trace>())
    ,start(s)
+   ,transaction_timer(std::move(tmr))
    ,net_usage(trace->net_usage)
    ,pseudo_start(s)
-   ,transaction_timer(std::move(tmr))
    {
       if (!c.skip_db_sessions()) {
          undo_session = c.mutable_db().start_undo_session(true);

From 0eaeee781985980995ce65d1cff3b49a9a2225c9 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Thu, 22 Aug 2019 17:53:55 -0400
Subject: [PATCH 1036/1648] Hardcode initial eosio abi: #7794

---
 libraries/chain/CMakeLists.txt                |   1 +
 libraries/chain/controller.cpp                |   5 +-
 libraries/chain/eosio_contract_abi_bin.cpp    | 190 ++++++++++++++++++
 .../chain/include/eosio/chain/abi_def.hpp     |   2 +
 4 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 libraries/chain/eosio_contract_abi_bin.cpp

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 26662668ae2..66a357946ff 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -33,6 +33,7 @@ add_library( eosio_chain
              transaction_context.cpp
              eosio_contract.cpp
              eosio_contract_abi.cpp
+             eosio_contract_abi_bin.cpp
              chain_config.cpp
              chain_id_type.cpp
              genesis_state.cpp
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index bdf35d1421f..c16d477eb88 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -933,7 +933,10 @@ struct controller_impl {
          a.creation_date = conf.genesis.initial_timestamp;
 
          if( name == config::system_account_name ) {
-            a.set_abi(eosio_contract_abi(abi_def()));
+            // The initial eosio ABI value affects consensus; see  https://github.com/EOSIO/eos/issues/7794
+            // TODO: This doesn't charge RAM; a fix requires a consensus upgrade.
+            a.abi.resize(sizeof(eosio_abi_bin));
+            memcpy(a.abi.data(), eosio_abi_bin, sizeof(eosio_abi_bin));
          }
       });
       db.create<account_metadata_object>([&](auto & a) {
diff --git a/libraries/chain/eosio_contract_abi_bin.cpp b/libraries/chain/eosio_contract_abi_bin.cpp
new file mode 100644
index 00000000000..68a34ee5584
--- /dev/null
+++ b/libraries/chain/eosio_contract_abi_bin.cpp
@@ -0,0 +1,190 @@
+namespace eosio { namespace chain {
+
+// Initial value for eosio ABI. This value affects consensus; if different
+// nodeos versions have different versions of the initial eosio ABI, then
+// they could potentially fork. See https://github.com/EOSIO/eos/issues/7794
+//
+// This is a capture of the ABI produced by versions 1.7 and 1.8.
+
+unsigned char eosio_abi_bin[2132] = {
+   0x0e, 0x65, 0x6f, 0x73, 0x69, 0x6f, 0x3a, 0x3a, 0x61, 0x62, 0x69, 0x2f,
+   0x31, 0x2e, 0x30, 0x07, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+   0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x0f, 0x70,
+   0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61,
+   0x6d, 0x65, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x0b, 0x61, 0x63, 0x74, 0x69,
+   0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+   0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x04,
+   0x6e, 0x61, 0x6d, 0x65, 0x13, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+   0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65,
+   0x0b, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x32, 0x35, 0x36,
+   0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x74, 0x79,
+   0x70, 0x65, 0x0b, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x32,
+   0x35, 0x36, 0x0b, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x74, 0x79,
+   0x70, 0x65, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x16, 0x10, 0x70,
+   0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x65,
+   0x76, 0x65, 0x6c, 0x00, 0x02, 0x05, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x0c,
+   0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+   0x0a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x0f,
+   0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6e,
+   0x61, 0x6d, 0x65, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x04,
+   0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x0c, 0x61, 0x63, 0x63,
+   0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x04, 0x6e, 0x61,
+   0x6d, 0x65, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61,
+   0x6d, 0x65, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61,
+   0x74, 0x69, 0x6f, 0x6e, 0x12, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
+   0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x5b, 0x5d, 0x04,
+   0x64, 0x61, 0x74, 0x61, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x09, 0x65,
+   0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x02, 0x04, 0x74,
+   0x79, 0x70, 0x65, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x04, 0x64,
+   0x61, 0x74, 0x61, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x12, 0x74, 0x72,
+   0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x65,
+   0x61, 0x64, 0x65, 0x72, 0x00, 0x06, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72,
+   0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x70,
+   0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x73, 0x65, 0x63, 0x0d, 0x72, 0x65, 0x66,
+   0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x06, 0x75,
+   0x69, 0x6e, 0x74, 0x31, 0x36, 0x10, 0x72, 0x65, 0x66, 0x5f, 0x62, 0x6c,
+   0x6f, 0x63, 0x6b, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x06, 0x75,
+   0x69, 0x6e, 0x74, 0x33, 0x32, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x6e, 0x65,
+   0x74, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x77, 0x6f, 0x72, 0x64,
+   0x73, 0x09, 0x76, 0x61, 0x72, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x10,
+   0x6d, 0x61, 0x78, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x73, 0x61, 0x67,
+   0x65, 0x5f, 0x6d, 0x73, 0x05, 0x75, 0x69, 0x6e, 0x74, 0x38, 0x09, 0x64,
+   0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x65, 0x63, 0x09, 0x76, 0x61, 0x72,
+   0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x0b, 0x74, 0x72, 0x61, 0x6e, 0x73,
+   0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x74, 0x72, 0x61, 0x6e, 0x73,
+   0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65,
+   0x72, 0x03, 0x14, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x66,
+   0x72, 0x65, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x08,
+   0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5b, 0x5d, 0x07, 0x61, 0x63, 0x74,
+   0x69, 0x6f, 0x6e, 0x73, 0x08, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5b,
+   0x5d, 0x16, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+   0x6e, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+   0x0b, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5b, 0x5d,
+   0x0c, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x72, 0x5f, 0x6b, 0x65,
+   0x79, 0x00, 0x02, 0x0d, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x72,
+   0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+   0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x11, 0x62, 0x6c, 0x6f, 0x63, 0x6b,
+   0x5f, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x6b, 0x65, 0x79,
+   0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x11,
+   0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x72, 0x5f, 0x73, 0x63, 0x68,
+   0x65, 0x64, 0x75, 0x6c, 0x65, 0x00, 0x02, 0x07, 0x76, 0x65, 0x72, 0x73,
+   0x69, 0x6f, 0x6e, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x09, 0x70,
+   0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x72, 0x73, 0x0e, 0x70, 0x72, 0x6f,
+   0x64, 0x75, 0x63, 0x65, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x5b, 0x5d, 0x0c,
+   0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+   0x00, 0x09, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+   0x06, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x08, 0x70, 0x72, 0x6f, 0x64,
+   0x75, 0x63, 0x65, 0x72, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+   0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72,
+   0x6d, 0x65, 0x64, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x36, 0x08, 0x70,
+   0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x0d, 0x62, 0x6c, 0x6f, 0x63,
+   0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x11, 0x74, 0x72,
+   0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x72,
+   0x6f, 0x6f, 0x74, 0x0b, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d,
+   0x32, 0x35, 0x36, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d,
+   0x72, 0x6f, 0x6f, 0x74, 0x0b, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75,
+   0x6d, 0x32, 0x35, 0x36, 0x10, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c,
+   0x65, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x06, 0x75, 0x69,
+   0x6e, 0x74, 0x33, 0x32, 0x0d, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x72, 0x6f,
+   0x64, 0x75, 0x63, 0x65, 0x72, 0x73, 0x12, 0x70, 0x72, 0x6f, 0x64, 0x75,
+   0x63, 0x65, 0x72, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65,
+   0x3f, 0x11, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x65, 0x78, 0x74,
+   0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x0b, 0x65, 0x78, 0x74, 0x65,
+   0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5b, 0x5d, 0x0a, 0x6b, 0x65, 0x79, 0x5f,
+   0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x00, 0x02, 0x03, 0x6b, 0x65, 0x79,
+   0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x06,
+   0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x0b, 0x77, 0x65, 0x69, 0x67, 0x68,
+   0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x17, 0x70, 0x65, 0x72, 0x6d, 0x69,
+   0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x5f,
+   0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x00, 0x02, 0x0a, 0x70, 0x65, 0x72,
+   0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x70, 0x65, 0x72, 0x6d,
+   0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c,
+   0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x0b, 0x77, 0x65, 0x69, 0x67,
+   0x68, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x0b, 0x77, 0x61, 0x69, 0x74,
+   0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x00, 0x02, 0x08, 0x77, 0x61,
+   0x69, 0x74, 0x5f, 0x73, 0x65, 0x63, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x33,
+   0x32, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x0b, 0x77, 0x65, 0x69,
+   0x67, 0x68, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x09, 0x61, 0x75, 0x74,
+   0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x00, 0x04, 0x09, 0x74, 0x68, 0x72,
+   0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x33,
+   0x32, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x0c, 0x6b, 0x65, 0x79, 0x5f, 0x77,
+   0x65, 0x69, 0x67, 0x68, 0x74, 0x5b, 0x5d, 0x08, 0x61, 0x63, 0x63, 0x6f,
+   0x75, 0x6e, 0x74, 0x73, 0x19, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
+   0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x5f, 0x77, 0x65,
+   0x69, 0x67, 0x68, 0x74, 0x5b, 0x5d, 0x05, 0x77, 0x61, 0x69, 0x74, 0x73,
+   0x0d, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74,
+   0x5b, 0x5d, 0x0a, 0x6e, 0x65, 0x77, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+   0x74, 0x00, 0x04, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x0c,
+   0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+   0x04, 0x6e, 0x61, 0x6d, 0x65, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+   0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72,
+   0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x06, 0x61,
+   0x63, 0x74, 0x69, 0x76, 0x65, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72,
+   0x69, 0x74, 0x79, 0x07, 0x73, 0x65, 0x74, 0x63, 0x6f, 0x64, 0x65, 0x00,
+   0x04, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x0c, 0x61, 0x63,
+   0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x06, 0x76,
+   0x6d, 0x74, 0x79, 0x70, 0x65, 0x05, 0x75, 0x69, 0x6e, 0x74, 0x38, 0x09,
+   0x76, 0x6d, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x05, 0x75, 0x69,
+   0x6e, 0x74, 0x38, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x05, 0x62, 0x79, 0x74,
+   0x65, 0x73, 0x06, 0x73, 0x65, 0x74, 0x61, 0x62, 0x69, 0x00, 0x02, 0x07,
+   0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x0c, 0x61, 0x63, 0x63, 0x6f,
+   0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x03, 0x61, 0x62, 0x69,
+   0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74,
+   0x65, 0x61, 0x75, 0x74, 0x68, 0x00, 0x04, 0x07, 0x61, 0x63, 0x63, 0x6f,
+   0x75, 0x6e, 0x74, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f,
+   0x6e, 0x61, 0x6d, 0x65, 0x0a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
+   0x69, 0x6f, 0x6e, 0x0f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69,
+   0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x06, 0x70, 0x61, 0x72, 0x65,
+   0x6e, 0x74, 0x0f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
+   0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x04, 0x61, 0x75, 0x74, 0x68, 0x09,
+   0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x0a, 0x64, 0x65,
+   0x6c, 0x65, 0x74, 0x65, 0x61, 0x75, 0x74, 0x68, 0x00, 0x02, 0x07, 0x61,
+   0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75,
+   0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x0a, 0x70, 0x65, 0x72, 0x6d,
+   0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x0f, 0x70, 0x65, 0x72, 0x6d, 0x69,
+   0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x08, 0x6c,
+   0x69, 0x6e, 0x6b, 0x61, 0x75, 0x74, 0x68, 0x00, 0x04, 0x07, 0x61, 0x63,
+   0x63, 0x6f, 0x75, 0x6e, 0x74, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+   0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x0c,
+   0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+   0x04, 0x74, 0x79, 0x70, 0x65, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+   0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x0b, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72,
+   0x65, 0x6d, 0x65, 0x6e, 0x74, 0x0f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73,
+   0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x0a, 0x75, 0x6e,
+   0x6c, 0x69, 0x6e, 0x6b, 0x61, 0x75, 0x74, 0x68, 0x00, 0x03, 0x07, 0x61,
+   0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75,
+   0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x04, 0x63, 0x6f, 0x64, 0x65,
+   0x0c, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d,
+   0x65, 0x04, 0x74, 0x79, 0x70, 0x65, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x6f,
+   0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x0b, 0x63, 0x61, 0x6e, 0x63, 0x65,
+   0x6c, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x00, 0x02, 0x0e, 0x63, 0x61, 0x6e,
+   0x63, 0x65, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x10,
+   0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6c,
+   0x65, 0x76, 0x65, 0x6c, 0x06, 0x74, 0x72, 0x78, 0x5f, 0x69, 0x64, 0x13,
+   0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+   0x69, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x07, 0x6f, 0x6e, 0x65, 0x72,
+   0x72, 0x6f, 0x72, 0x00, 0x02, 0x09, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72,
+   0x5f, 0x69, 0x64, 0x07, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x08,
+   0x73, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x78, 0x05, 0x62, 0x79, 0x74,
+   0x65, 0x73, 0x07, 0x6f, 0x6e, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x00, 0x01,
+   0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x0c, 0x62, 0x6c, 0x6f, 0x63,
+   0x6b, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x0a, 0x00, 0x40, 0x9e,
+   0x9a, 0x22, 0x64, 0xb8, 0x9a, 0x0a, 0x6e, 0x65, 0x77, 0x61, 0x63, 0x63,
+   0x6f, 0x75, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x40, 0x25, 0x8a, 0xb2,
+   0xc2, 0x07, 0x73, 0x65, 0x74, 0x63, 0x6f, 0x64, 0x65, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0xb8, 0x63, 0xb2, 0xc2, 0x06, 0x73, 0x65, 0x74, 0x61, 0x62,
+   0x69, 0x00, 0x00, 0x40, 0xcb, 0xda, 0xa8, 0x6c, 0x52, 0xd5, 0x0a, 0x75,
+   0x70, 0x64, 0x61, 0x74, 0x65, 0x61, 0x75, 0x74, 0x68, 0x00, 0x00, 0x40,
+   0xcb, 0xda, 0xa8, 0xac, 0xa2, 0x4a, 0x0a, 0x64, 0x65, 0x6c, 0x65, 0x74,
+   0x65, 0x61, 0x75, 0x74, 0x68, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x6b, 0x03,
+   0xa7, 0x8b, 0x08, 0x6c, 0x69, 0x6e, 0x6b, 0x61, 0x75, 0x74, 0x68, 0x00,
+   0x00, 0x40, 0xcb, 0xda, 0xc0, 0xe9, 0xe2, 0xd4, 0x0a, 0x75, 0x6e, 0x6c,
+   0x69, 0x6e, 0x6b, 0x61, 0x75, 0x74, 0x68, 0x00, 0x00, 0xbc, 0x89, 0x2a,
+   0x45, 0x85, 0xa6, 0x41, 0x0b, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x64,
+   0x65, 0x6c, 0x61, 0x79, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xd2, 0x7b, 0xd5,
+   0xa4, 0x07, 0x6f, 0x6e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x22, 0x1a, 0xcf, 0xa4, 0x07, 0x6f, 0x6e, 0x62, 0x6c, 0x6f,
+   0x63, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+} } /// eosio::chain
diff --git a/libraries/chain/include/eosio/chain/abi_def.hpp b/libraries/chain/include/eosio/chain/abi_def.hpp
index 34b0312be57..dcace005520 100644
--- a/libraries/chain/include/eosio/chain/abi_def.hpp
+++ b/libraries/chain/include/eosio/chain/abi_def.hpp
@@ -125,6 +125,8 @@ struct abi_def {
 abi_def eosio_contract_abi(const abi_def& eosio_system_abi);
 vector<type_def> common_type_defs();
 
+extern unsigned char eosio_abi_bin[2132];
+
 } } /// namespace eosio::chain
 
 namespace fc {

From e3a240e181c70569a9dcc6e294c32609bb1a087b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 26 Aug 2019 13:16:09 -0500
Subject: [PATCH 1037/1648] Move unapplied_transaction_queue to controller

---
 libraries/chain/controller.cpp                |  7 +++
 .../chain/include/eosio/chain/controller.hpp  |  3 ++
 plugins/producer_plugin/producer_plugin.cpp   | 43 +++++++++----------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c16d477eb88..29065766539 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -25,6 +25,7 @@
 #include <eosio/chain/chain_snapshot.hpp>
 #include <eosio/chain/thread_utils.hpp>
 #include <eosio/chain/platform_timer.hpp>
+#include <eosio/chain/unapplied_transaction_queue.hpp>
 
 #include <chainbase/chainbase.hpp>
 #include <fc/io/json.hpp>
@@ -217,6 +218,7 @@ struct controller_impl {
    chainbase::database            db;
    chainbase::database            reversible_blocks; ///< a special database to persist blocks that have successfully been applied but are still reversible
    block_log                      blog;
+   unapplied_transaction_queue    unapplied_transactions;
    optional<pending_state>        pending;
    block_state_ptr                head;
    fork_database                  fork_db;
@@ -2554,6 +2556,11 @@ boost::asio::io_context& controller::get_thread_pool() {
    return my->thread_pool.get_executor();
 }
 
+unapplied_transaction_queue& controller::unapplied_transaction_queue() {
+   return my->unapplied_transactions;
+}
+
+
 std::future<block_state_ptr> controller::create_block_state_future( const signed_block_ptr& b ) {
    return my->create_block_state_future( b );
 }
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index b57100fa2fa..c08d6675c99 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -20,6 +20,7 @@ namespace boost { namespace asio {
 namespace eosio { namespace chain {
 
    class authorization_manager;
+   class unapplied_transaction_queue;
 
    namespace resource_limits {
       class resource_limits_manager;
@@ -158,6 +159,8 @@ namespace eosio { namespace chain {
 
          boost::asio::io_context& get_thread_pool();
 
+         unapplied_transaction_queue& unapplied_transaction_queue();
+
          const chainbase::database& db()const;
 
          const fork_database& fork_db()const;
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index e333cb85e26..d4a50b717bc 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -19,7 +19,6 @@
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/map.hpp>
-#include <boost/function_output_iterator.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/hashed_index.hpp>
@@ -195,7 +194,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       boost::asio::deadline_timer                               _timer;
       std::map<chain::account_name, uint32_t>                   _producer_watermarks;
       pending_block_mode                                        _pending_block_mode;
-      unapplied_transaction_queue                               _unapplied_transactions;
       fc::optional<named_thread_pool>                           _thread_pool;
 
       std::atomic<int32_t>                                      _max_transaction_time_ms; // modified by app thread, read by net_plugin thread pool
@@ -264,7 +262,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       }
 
       void on_block( const block_state_ptr& bsp ) {
-         _unapplied_transactions.clear_applied( bsp );
+         chain::controller& chain = chain_plug->chain();
+         chain.unapplied_transaction_queue().clear_applied( bsp );
       }
 
       void on_block_header( const block_state_ptr& bsp ) {
@@ -349,7 +348,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          auto bsf = chain.create_block_state_future( block );
 
          // abort the pending block
-         _unapplied_transactions.add_aborted( chain.abort_block() );
+         chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
 
          // exceptions throw out, make sure we restart our loop
          auto ensure = fc::make_scoped_exit([this](){
@@ -359,8 +358,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          // push the new block
          bool except = false;
          try {
-            chain.push_block( bsf, [this]( const branch_type& forked_branch ) {
-               _unapplied_transactions.add_forked( forked_branch );
+            chain.push_block( bsf, [&chain]( const branch_type& forked_branch ) {
+               chain.unapplied_transaction_queue().add_forked( forked_branch );
             } );
          } catch ( const guard_exception& e ) {
             chain_plugin::handle_guard_exception(e);
@@ -540,7 +539,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                if( persist_until_expired ) {
                   // if this trx didnt fail/soft-fail and the persist flag is set, store its ID so that we can
                   // ensure its applied to all future speculative blocks as well.
-                  _unapplied_transactions.add_persisted( trx );
+                  chain.unapplied_transaction_queue().add_persisted( trx );
                }
                send_response( trace );
             }
@@ -738,7 +737,7 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
       (chain.get_read_mode() != chain::db_read_mode::SPECULATIVE) ? unapplied_transaction_queue::process_mode::non_speculative :
          my->_producers.empty() ? unapplied_transaction_queue::process_mode::speculative_non_producer :
             unapplied_transaction_queue::process_mode::speculative_producer;
-   my->_unapplied_transactions.set_mode( unapplied_mode );
+   chain.unapplied_transaction_queue().set_mode( unapplied_mode );
 
    if( options.count("private-key") )
    {
@@ -932,7 +931,7 @@ void producer_plugin::resume() {
    //
    if (my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      my->_unapplied_transactions.add_aborted( chain.abort_block() );
+      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 }
@@ -971,7 +970,7 @@ void producer_plugin::update_runtime_options(const runtime_options& options) {
 
    if (check_speculating && my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      my->_unapplied_transactions.add_aborted( chain.abort_block() );
+      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 
@@ -1047,7 +1046,7 @@ producer_plugin::integrity_hash_information producer_plugin::get_integrity_hash(
 
    if (chain.is_building_block()) {
       // abort the pending block
-      my->_unapplied_transactions.add_aborted( chain.abort_block() );
+      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
    } else {
       reschedule.cancel();
    }
@@ -1076,7 +1075,7 @@ void producer_plugin::create_snapshot(producer_plugin::next_function<producer_pl
 
       if (chain.is_building_block()) {
          // abort the pending block
-         my->_unapplied_transactions.add_aborted( chain.abort_block() );
+         chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
       } else {
          reschedule.cancel();
       }
@@ -1413,7 +1412,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          blocks_to_confirm = (uint16_t)(std::min<uint32_t>(blocks_to_confirm, (uint32_t)(hbs->block_num - hbs->dpos_irreversible_blocknum)));
       }
 
-      _unapplied_transactions.add_aborted( chain.abort_block() );
+      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
 
       auto features_to_activate = chain.get_preactivated_protocol_features();
       if( _pending_block_mode == pending_block_mode::producing && _protocol_features_to_activate.size() > 0 ) {
@@ -1470,8 +1469,8 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
       // remove all expired transactions
       size_t num_expired_persistent = 0;
       size_t num_expired_other = 0;
-      size_t orig_count = _unapplied_transactions.size();
-      exhausted = !_unapplied_transactions.clear_expired( pending_block_time, preprocess_deadline,
+      size_t orig_count = chain.unapplied_transaction_queue().size();
+      exhausted = !chain.unapplied_transaction_queue().clear_expired( pending_block_time, preprocess_deadline,
                      [&num_expired_persistent, &num_expired_other, pbm = _pending_block_mode,
                       &chain, has_producers = !_producers.empty()]( const transaction_id_type& txid, trx_enum_type trx_type ) {
                if( trx_type == trx_enum_type::persisted ) {
@@ -1508,13 +1507,13 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          size_t orig_pending_txn_size = _pending_incoming_transactions.size();
 
          // Processing unapplied transactions...
-         if( !_unapplied_transactions.empty() ) {
+         if( !chain.unapplied_transaction_queue().empty() ) {
             int num_applied = 0, num_failed = 0, num_processed = 0;
-            auto unapplied_trxs_size = _unapplied_transactions.size();
+            auto unapplied_trxs_size = chain.unapplied_transaction_queue().size();
             auto itr     = (_pending_block_mode == pending_block_mode::producing) ?
-                  _unapplied_transactions.begin() : _unapplied_transactions.persisted_begin();
+                           chain.unapplied_transaction_queue().begin() : chain.unapplied_transaction_queue().persisted_begin();
             auto end_itr = (_pending_block_mode == pending_block_mode::producing) ?
-                  _unapplied_transactions.end()   : _unapplied_transactions.persisted_end();
+                           chain.unapplied_transaction_queue().end()   : chain.unapplied_transaction_queue().persisted_end();
             while( itr != end_itr ) {
                if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
                if( exhausted ) break;
@@ -1539,12 +1538,12 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                      } else {
                         // this failed our configured maximum transaction time, we don't want to replay it
                         ++num_failed;
-                        itr = _unapplied_transactions.erase( itr );
+                        itr = chain.unapplied_transaction_queue().erase( itr );
                         continue;
                      }
                   } else {
                      ++num_applied;
-                     itr = _unapplied_transactions.erase( itr );
+                     itr = chain.unapplied_transaction_queue().erase( itr );
                      continue;
                   }
                } LOG_AND_DROP();
@@ -1825,7 +1824,7 @@ bool producer_plugin_impl::maybe_produce_block() {
 
    fc_dlog(_log, "Aborting block due to produce_block error");
    chain::controller& chain = chain_plug->chain();
-   _unapplied_transactions.add_aborted( chain.abort_block() );
+   chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
    return false;
 }
 

From a7f6f497b34c35440b06c2f1a6c3b3e729ff0c81 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 26 Aug 2019 14:01:26 -0500
Subject: [PATCH 1038/1648] Check unapplied_transaction_queue in apply_block

---
 libraries/chain/controller.cpp                | 35 ++++++++++---------
 .../chain/unapplied_transaction_queue.hpp     |  6 ++++
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 29065766539..4d8f9359c25 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1766,27 +1766,28 @@ struct controller_impl {
          const bool existing_trxs_metas = !bsp->trxs_metas().empty();
          const bool pub_keys_recovered = bsp->is_pub_keys_recovered();
          const bool skip_auth_checks = self.skip_auth_check();
-         std::vector<recover_keys_future> trx_futures;
-         std::vector<transaction_metadata_ptr> trx_metas;
+         std::vector<std::tuple<transaction_metadata_ptr, recover_keys_future>> trx_metas;
          bool use_bsp_cached = false, use_trx_metas = false;
          if( pub_keys_recovered || (skip_auth_checks && existing_trxs_metas) ) {
             use_bsp_cached = true;
-         } else if( skip_auth_checks ) {
+         } else {
             use_trx_metas = true;
             trx_metas.reserve( b->transactions.size() );
             for( const auto& receipt : b->transactions ) {
                if( receipt.trx.contains<packed_transaction>()) {
                   auto& pt = receipt.trx.get<packed_transaction>();
-                  trx_metas.emplace_back( transaction_metadata::create_no_recover_keys( pt, transaction_metadata::trx_type::input ) );
-               }
-            }
-         } else {
-            trx_futures.reserve( b->transactions.size() );
-            for( const auto& receipt : b->transactions ) {
-               if( receipt.trx.contains<packed_transaction>()) {
-                  auto ptrx = std::make_shared<packed_transaction>( receipt.trx.get<packed_transaction>() );
-                  auto fut = transaction_metadata::start_recover_keys( ptrx, thread_pool.get_executor(), chain_id, microseconds::maximum() );
-                  trx_futures.emplace_back( std::move( fut ) );
+                  const transaction_metadata_ptr& trx_meta_ptr = unapplied_transactions.get_trx( pt.id() );
+                  if( trx_meta_ptr ) {
+                     trx_metas.emplace_back( trx_meta_ptr, recover_keys_future{} );
+                  } else if ( skip_auth_checks ) {
+                     trx_metas.emplace_back(
+                           transaction_metadata::create_no_recover_keys( pt, transaction_metadata::trx_type::input ),
+                           recover_keys_future{} );
+                  } else {
+                     auto ptrx = std::make_shared<packed_transaction>( pt );
+                     auto fut = transaction_metadata::start_recover_keys( ptrx, thread_pool.get_executor(), chain_id, microseconds::maximum() );
+                     trx_metas.emplace_back( transaction_metadata_ptr{}, std::move( fut ) );
+                  }
                }
             }
          }
@@ -1798,10 +1799,12 @@ struct controller_impl {
             const auto& trx_receipts = pending->_block_stage.get<building_block>()._pending_trx_receipts;
             auto num_pending_receipts = trx_receipts.size();
             if( receipt.trx.contains<packed_transaction>() ) {
-               const auto& trx_meta = ( use_bsp_cached ? bsp->trxs_metas().at( packed_idx++ )
-                                                       : ( use_trx_metas ? trx_metas.at( packed_idx++ )
-                                                                         : trx_futures.at( packed_idx++ ).get() ) );
+               const auto& trx_meta = ( use_bsp_cached ? bsp->trxs_metas().at( packed_idx )
+                                                       : ( !!std::get<0>( trx_metas.at( packed_idx ) ) ?
+                                                             std::get<0>( trx_metas.at( packed_idx ) )
+                                                             : std::get<1>( trx_metas.at( packed_idx ) ).get() ) );
                trace = push_transaction( trx_meta, fc::time_point::maximum(), receipt.cpu_usage_us, true );
+               ++packed_idx;
             } else if( receipt.trx.contains<transaction_id_type>() ) {
                trace = push_scheduled_transaction( receipt.trx.get<transaction_id_type>(), fc::time_point::maximum(), receipt.cpu_usage_us, true );
             } else {
diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index cea2b586d8c..d052e2a3614 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -100,6 +100,12 @@ class unapplied_transaction_queue {
       return itr->trx_type == trx_enum_type::persisted;
    }
 
+   transaction_metadata_ptr get_trx( const transaction_id_type& id ) const {
+      auto itr = queue.get<by_trx_id>().find( id );
+      if( itr == queue.get<by_trx_id>().end() ) return {};
+      return itr->trx_meta;
+   }
+
    template <typename Func>
    bool clear_expired( const time_point& pending_block_time, const time_point& deadline, Func&& callback ) {
       auto& persisted_by_expiry = queue.get<by_expiry>();

From 4e5c7da34722d3a1d31d57b9d09371165541aa77 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 27 Aug 2019 08:13:51 -0500
Subject: [PATCH 1039/1648] Changed last_irreversible_block_num to call
 get_block_id_for_num and optimized get_block_id_for_num to check
 tapos_block_summary first

---
 libraries/chain/controller.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index aa9e8cc5dfa..de04d7f77af 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -2713,17 +2713,8 @@ uint32_t controller::last_irreversible_block_num() const {
 
 block_id_type controller::last_irreversible_block_id() const {
    auto lib_num = last_irreversible_block_num();
-   const auto& tapos_block_summary = db().get<block_summary_object>((uint16_t)lib_num);
 
-   if( block_header::num_from_id(tapos_block_summary.block_id) == lib_num )
-      return tapos_block_summary.block_id;
-
-   auto id = my->blog.read_block_id_by_num( lib_num );
-
-   EOS_ASSERT( BOOST_LIKELY( id != block_id_type() ), unknown_block_exception,
-               "Could not find block: ${block}", ("block", lib_num) );
-
-   return id;
+   return get_block_id_for_num( lib_num );
 }
 
 const dynamic_global_property_object& controller::get_dynamic_global_properties()const {
@@ -2771,6 +2762,11 @@ block_state_ptr controller::fetch_block_state_by_number( uint32_t block_num )con
 } FC_CAPTURE_AND_RETHROW( (block_num) ) }
 
 block_id_type controller::get_block_id_for_num( uint32_t block_num )const { try {
+   const auto& tapos_block_summary = db().get<block_summary_object>((uint16_t)block_num);
+
+   if( block_header::num_from_id(tapos_block_summary.block_id) == block_num )
+      return tapos_block_summary.block_id;
+
    const auto& blog_head = my->blog.head();
 
    bool find_in_blog = (blog_head && block_num <= blog_head->block_num());

From af13a22e79e10ca4545255205b8a3d2c1bb31a5a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 27 Aug 2019 08:42:19 -0500
Subject: [PATCH 1040/1648] Disable sig recovery cache

---
 libraries/chain/transaction.cpp | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index 1c4a96935be..b24a21ebd35 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -95,15 +95,15 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
 { try {
    using boost::adaptors::transformed;
 
-   constexpr size_t recovery_cache_size = 10000;
-   static recovery_cache_type recovery_cache;
-   static std::mutex cache_mtx;
+//   constexpr size_t recovery_cache_size = 10000;
+//   static recovery_cache_type recovery_cache;
+//   static std::mutex cache_mtx;
 
    auto start = fc::time_point::now();
    recovered_pub_keys.clear();
    const digest_type digest = sig_digest(chain_id, cfd);
 
-   std::unique_lock<std::mutex> lock(cache_mtx, std::defer_lock);
+//   std::unique_lock<std::mutex> lock(cache_mtx, std::defer_lock);
    fc::microseconds sig_cpu_usage;
    for(const signature_type& sig : signatures) {
       auto now = fc::time_point::now();
@@ -111,20 +111,20 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
                   ("time", now - start)("now", now)("deadline", deadline)("start", start) );
       public_key_type recov;
       const auto& tid = id();
-      lock.lock();
-      recovery_cache_type::index<by_sig>::type::iterator it = recovery_cache.get<by_sig>().find( sig );
-      if( it == recovery_cache.get<by_sig>().end() || it->trx_id != tid ) {
-         lock.unlock();
+//      lock.lock();
+//      recovery_cache_type::index<by_sig>::type::iterator it = recovery_cache.get<by_sig>().find( sig );
+//      if( it == recovery_cache.get<by_sig>().end() || it->trx_id != tid ) {
+//         lock.unlock();
          recov = public_key_type( sig, digest );
          fc::microseconds cpu_usage = fc::time_point::now() - start;
-         lock.lock();
-         recovery_cache.emplace_back( cached_pub_key{tid, recov, sig, cpu_usage} ); //could fail on dup signatures; not a problem
+//         lock.lock();
+//         recovery_cache.emplace_back( cached_pub_key{tid, recov, sig, cpu_usage} ); //could fail on dup signatures; not a problem
          sig_cpu_usage += cpu_usage;
-      } else {
-         recov = it->pub_key;
-         sig_cpu_usage += it->cpu_usage;
-      }
-      lock.unlock();
+//      } else {
+//         recov = it->pub_key;
+//         sig_cpu_usage += it->cpu_usage;
+//      }
+//      lock.unlock();
       bool successful_insertion = false;
       std::tie(std::ignore, successful_insertion) = recovered_pub_keys.insert(recov);
       EOS_ASSERT( allow_duplicate_keys || successful_insertion, tx_duplicate_sig,
@@ -132,10 +132,10 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
                   ("key", recov) );
    }
 
-   lock.lock();
-   while ( recovery_cache.size() > recovery_cache_size )
-      recovery_cache.erase( recovery_cache.begin());
-   lock.unlock();
+//   lock.lock();
+//   while ( recovery_cache.size() > recovery_cache_size )
+//      recovery_cache.erase( recovery_cache.begin());
+//   lock.unlock();
 
    return sig_cpu_usage;
 } FC_CAPTURE_AND_RETHROW() }

From 52c4243b0080b944386e640ffd0eef39fdf8e1a6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 27 Aug 2019 09:24:21 -0500
Subject: [PATCH 1041/1648] Correct cpu_usage calculation when more than one
 signature

---
 libraries/chain/transaction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index 1c4a96935be..faff3bed055 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -116,7 +116,7 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
       if( it == recovery_cache.get<by_sig>().end() || it->trx_id != tid ) {
          lock.unlock();
          recov = public_key_type( sig, digest );
-         fc::microseconds cpu_usage = fc::time_point::now() - start;
+         fc::microseconds cpu_usage = fc::time_point::now() - start - sig_cpu_usage;
          lock.lock();
          recovery_cache.emplace_back( cached_pub_key{tid, recov, sig, cpu_usage} ); //could fail on dup signatures; not a problem
          sig_cpu_usage += cpu_usage;

From 258d88642fde2109f2026a876fff7603e8f5488f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 27 Aug 2019 09:54:37 -0500
Subject: [PATCH 1042/1648] Use calculation that avoids possible negative
 values

---
 libraries/chain/transaction.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index faff3bed055..1df990b45e9 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -105,10 +105,11 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
 
    std::unique_lock<std::mutex> lock(cache_mtx, std::defer_lock);
    fc::microseconds sig_cpu_usage;
+   const auto digest_time = fc::time_point::now() - start;
    for(const signature_type& sig : signatures) {
-      auto now = fc::time_point::now();
-      EOS_ASSERT( now < deadline, tx_cpu_usage_exceeded, "transaction signature verification executed for too long ${time}us",
-                  ("time", now - start)("now", now)("deadline", deadline)("start", start) );
+      auto sig_start = fc::time_point::now();
+      EOS_ASSERT( sig_start < deadline, tx_cpu_usage_exceeded, "transaction signature verification executed for too long ${time}us",
+                  ("time", sig_start - start)("now", sig_start)("deadline", deadline)("start", start) );
       public_key_type recov;
       const auto& tid = id();
       lock.lock();
@@ -116,7 +117,7 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
       if( it == recovery_cache.get<by_sig>().end() || it->trx_id != tid ) {
          lock.unlock();
          recov = public_key_type( sig, digest );
-         fc::microseconds cpu_usage = fc::time_point::now() - start - sig_cpu_usage;
+         fc::microseconds cpu_usage = fc::time_point::now() - sig_start;
          lock.lock();
          recovery_cache.emplace_back( cached_pub_key{tid, recov, sig, cpu_usage} ); //could fail on dup signatures; not a problem
          sig_cpu_usage += cpu_usage;
@@ -137,7 +138,7 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
       recovery_cache.erase( recovery_cache.begin());
    lock.unlock();
 
-   return sig_cpu_usage;
+   return sig_cpu_usage + digest_time;
 } FC_CAPTURE_AND_RETHROW() }
 
 flat_multimap<uint16_t, transaction_extension> transaction::validate_and_extract_extensions()const {

From 350136fa10c8c4713b8e3ffde17a6c79af798285 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 27 Aug 2019 10:31:16 -0500
Subject: [PATCH 1043/1648] Remove sig cpu time equal test as digest time is
 now calculated each time and therefore can differ.

---
 unittests/misc_tests.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 72f59ed97d6..6e465674092 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -712,10 +712,6 @@ BOOST_AUTO_TEST_CASE(transaction_test) { try {
    BOOST_CHECK(cpu_time1 > fc::microseconds(0));
    BOOST_CHECK(cpu_time2 > fc::microseconds(0));
 
-   // verify that hitting cache still indicates same billable time
-   // if we remove cache so that the second is a real time calculation then remove this check
-   BOOST_CHECK(cpu_time1 == cpu_time2);
-
    // pack
    uint32_t pack_size = fc::raw::pack_size( pkt );
    vector<char> buf(pack_size);

From f0424ed52b6ab5144d96b40e56ac34b9e5ee61e6 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 27 Aug 2019 12:10:06 -0400
Subject: [PATCH 1044/1648] add IMPORTANT file and update README

---
 IMPORTANT | 27 +++++++++++++++++++++++++++
 README.md |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 IMPORTANT

diff --git a/IMPORTANT b/IMPORTANT
new file mode 100644
index 00000000000..ed433799c63
--- /dev/null
+++ b/IMPORTANT
@@ -0,0 +1,27 @@
+# Important Notice
+
+We (block.one and its affiliates) make available EOSIO and other software, updates, patches and documentation (collectively, Software) on a voluntary basis as a member of the EOSIO community.  A condition of you accessing any Software, websites, articles, media, publications, documents or other material (collectively, Material) is your acceptance of the terms of this important notice.
+
+## Software
+We are not responsible for ensuring the overall performance of Software or any related applications.  Any test results or performance figures are indicative and will not reflect performance under all conditions.  Software may contain components that are open sourced and subject to their own licenses; you are responsible for ensuring your compliance with those licenses.
+
+We make no representation, warranty, guarantee or undertaking in respect of Software, whether expressed or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement.  In no event shall we be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the Software or the use or other dealings in the Software.
+
+Wallets and related components are complex software that require the highest levels of security. If incorrectly built or used, they may compromise users’ private keys and digital assets. Wallet applications and related components should undergo thorough security evaluations before being used. Only experienced developers should work with such Software.
+
+Material is not made available to any person or entity that is the subject of sanctions administered or enforced by any country or government or otherwise designated on any list of prohibited or restricted parties (including but not limited to the lists maintained by the United Nations Security Council, the U.S. Government, the European Union or its Member States, or other applicable government authority) or organized or resident in a country or territory that is the subject of country-wide or territory-wide sanctions.  You represent and warrant that neither you nor any party having a direct or indirect beneficial interest in you or on whose behalf you are acting as agent or nominee is such a person or entity and you will comply with all applicable import, re-import, sanctions, anti-boycott, export, and re-export control laws and regulations.  If this is not accurate or you do not agree, then you must immediately cease accessing our Material and delete all copies of Software.
+
+Any person using or offering Software in connection with providing software, goods or services to third parties shall advise such third parties of this important notice, including all limitations, restrictions and exclusions of liability.
+
+## Trademarks
+Block.one, EOSIO, EOS, the heptahedron and associated logos and related marks are our trademarks.  Other trademarks referenced in Material are the property of their respective owners.
+
+## Third parties
+Any reference in Material to any third party or third-party product, resource or service is not an endorsement or recommendation by Block.one.  We are not responsible for, and disclaim any and all responsibility and liability for, your use of or reliance on any of these resources. Third-party resources may be updated, changed or terminated at any time, so information in Material may be out of date or inaccurate.
+
+## Forward-looking statements
+Please note that in making statements expressing Block.one’s vision, we do not guarantee anything, and all aspects of our vision are subject to change at any time and in all respects at Block.one’s sole discretion, with or without notice. We call these “forward-looking statements”, which includes statements on our website and in other Material, other than statements of historical facts, such as statements regarding EOSIO’s development, expected performance, and future features, or our business strategy, plans, prospects, developments and objectives. These statements are only predictions and reflect Block.one’s current beliefs and expectations with respect to future events; they are based on assumptions and are subject to risk, uncertainties and change at any time.
+
+We operate in a rapidly changing environment and new risks emerge from time to time. Given these risks and uncertainties, you are cautioned not to rely on these forward-looking statements. Actual results, performance or events may differ materially from what is predicted in the forward-looking statements. Some of the factors that could cause actual results, performance or events to differ materially from the forward-looking statements include, without limitation: technical feasibility and barriers; market trends and volatility; continued availability of capital, financing and personnel; product acceptance; the commercial success of any new products or technologies; competition; government regulation and laws; and general economic, market or business conditions.
+
+All statements are valid only as of the date of first posting and Block.one is under no obligation to, and expressly disclaims any obligation to, update or alter any statements, whether as a result of new information, subsequent events or otherwise.  Nothing in any Material constitutes technological, financial, investment, legal or other advice, either in general or with regard to any particular situation or implementation. Please consult with experts in appropriate areas before implementing or utilizing anything contained in Material.
diff --git a/README.md b/README.md
index 788c14bf56b..c68e051b017 100644
--- a/README.md
+++ b/README.md
@@ -107,4 +107,6 @@ Instructions detailing the process of getting the software, building it, running
 
 ## Important
 
-See LICENSE for copyright and license terms.  Block.one makes its contribution on a voluntary basis as a member of the EOSIO community and is not responsible for ensuring the overall performance of the software or any related applications.  We make no representation, warranty, guarantee or undertaking in respect of the software or any related documentation, whether expressed or implied, including but not limited to the warranties or merchantability, fitness for a particular purpose and noninfringement. In no event shall we be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or documentation or the use or other dealings in the software or documentation.  Any test results or performance figures are indicative and will not reflect performance under all conditions.  Any reference to any third party or third-party product, service or other resource is not an endorsement or recommendation by Block.one.  We are not responsible, and disclaim any and all responsibility and liability, for your use of or reliance on any of these resources. Third-party resources may be updated, changed or terminated at any time, so the information here may be out of date or inaccurate.
+See [LICENSE](./LICENSE) for copyright and license terms.
+
+All repositories and other materials are provided subject to the terms of this [IMPORTANT](./IMPORTANT) notice and you must familiarize yourself with its terms.  The notice contains important information, limitations and restrictions relating to our software, publications, trademarks, third-party resources, and forward-looking statements.  By accessing any of our repositories and other materials, you accept and agree to the terms of the notice.

From 7ea2f487dd79430d1add41115554488937ae2d22 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 27 Aug 2019 13:24:49 -0500
Subject: [PATCH 1045/1648] Completely remove uneeded signature recovery cache.
 The signature recovery is cached on the transaction_metadata object so this
 is no longer needed.

---
 libraries/chain/transaction.cpp | 69 ++-------------------------------
 1 file changed, 3 insertions(+), 66 deletions(-)

diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index b24a21ebd35..ee51d639304 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -1,14 +1,8 @@
 #include <fc/io/raw.hpp>
 #include <fc/bitutil.hpp>
-#include <fc/smart_ref_impl.hpp>
 #include <algorithm>
-#include <mutex>
 
 #include <boost/range/adaptor/transformed.hpp>
-#include <boost/multi_index_container.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
-#include <boost/multi_index/hashed_index.hpp>
-#include <boost/multi_index/member.hpp>
 #include <boost/iostreams/filtering_stream.hpp>
 #include <boost/iostreams/device/back_inserter.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
@@ -19,33 +13,6 @@
 
 namespace eosio { namespace chain {
 
-using namespace boost::multi_index;
-
-struct cached_pub_key {
-   transaction_id_type trx_id;
-   public_key_type pub_key;
-   signature_type sig;
-   fc::microseconds cpu_usage;
-   cached_pub_key(const cached_pub_key&) = delete;
-   cached_pub_key() = delete;
-   cached_pub_key& operator=(const cached_pub_key&) = delete;
-   cached_pub_key(cached_pub_key&&) = default;
-};
-struct by_sig{};
-
-typedef multi_index_container<
-   cached_pub_key,
-   indexed_by<
-      sequenced<>,
-      hashed_unique<
-         tag<by_sig>,
-         member<cached_pub_key,
-                signature_type,
-                &cached_pub_key::sig>
-      >
-   >
-> recovery_cache_type;
-
 void deferred_transaction_generation_context::reflector_init() {
       static_assert( fc::raw::has_feature_reflector_init_on_unpacked_reflected_types,
                      "deferred_transaction_generation_context expects FC to support reflector_init" );
@@ -93,51 +60,21 @@ fc::microseconds transaction::get_signature_keys( const vector<signature_type>&
       const chain_id_type& chain_id, fc::time_point deadline, const vector<bytes>& cfd,
       flat_set<public_key_type>& recovered_pub_keys, bool allow_duplicate_keys)const
 { try {
-   using boost::adaptors::transformed;
-
-//   constexpr size_t recovery_cache_size = 10000;
-//   static recovery_cache_type recovery_cache;
-//   static std::mutex cache_mtx;
-
    auto start = fc::time_point::now();
    recovered_pub_keys.clear();
    const digest_type digest = sig_digest(chain_id, cfd);
 
-//   std::unique_lock<std::mutex> lock(cache_mtx, std::defer_lock);
-   fc::microseconds sig_cpu_usage;
    for(const signature_type& sig : signatures) {
       auto now = fc::time_point::now();
       EOS_ASSERT( now < deadline, tx_cpu_usage_exceeded, "transaction signature verification executed for too long ${time}us",
                   ("time", now - start)("now", now)("deadline", deadline)("start", start) );
-      public_key_type recov;
-      const auto& tid = id();
-//      lock.lock();
-//      recovery_cache_type::index<by_sig>::type::iterator it = recovery_cache.get<by_sig>().find( sig );
-//      if( it == recovery_cache.get<by_sig>().end() || it->trx_id != tid ) {
-//         lock.unlock();
-         recov = public_key_type( sig, digest );
-         fc::microseconds cpu_usage = fc::time_point::now() - start;
-//         lock.lock();
-//         recovery_cache.emplace_back( cached_pub_key{tid, recov, sig, cpu_usage} ); //could fail on dup signatures; not a problem
-         sig_cpu_usage += cpu_usage;
-//      } else {
-//         recov = it->pub_key;
-//         sig_cpu_usage += it->cpu_usage;
-//      }
-//      lock.unlock();
-      bool successful_insertion = false;
-      std::tie(std::ignore, successful_insertion) = recovered_pub_keys.insert(recov);
+      auto[ itr, successful_insertion ] = recovered_pub_keys.emplace( sig, digest );
       EOS_ASSERT( allow_duplicate_keys || successful_insertion, tx_duplicate_sig,
                   "transaction includes more than one signature signed using the same key associated with public key: ${key}",
-                  ("key", recov) );
+                  ("key", *itr ) );
    }
 
-//   lock.lock();
-//   while ( recovery_cache.size() > recovery_cache_size )
-//      recovery_cache.erase( recovery_cache.begin());
-//   lock.unlock();
-
-   return sig_cpu_usage;
+   return fc::time_point::now() - start;
 } FC_CAPTURE_AND_RETHROW() }
 
 flat_multimap<uint16_t, transaction_extension> transaction::validate_and_extract_extensions()const {

From f0a8e52768ddecc952fc2364200471df26f21b7a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 27 Aug 2019 13:25:26 -0500
Subject: [PATCH 1046/1648] Remove test for expected sig recovery time to be
 the same since a cache is no longer used and times will differ.

---
 unittests/misc_tests.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 72f59ed97d6..6e465674092 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -712,10 +712,6 @@ BOOST_AUTO_TEST_CASE(transaction_test) { try {
    BOOST_CHECK(cpu_time1 > fc::microseconds(0));
    BOOST_CHECK(cpu_time2 > fc::microseconds(0));
 
-   // verify that hitting cache still indicates same billable time
-   // if we remove cache so that the second is a real time calculation then remove this check
-   BOOST_CHECK(cpu_time1 == cpu_time2);
-
    // pack
    uint32_t pack_size = fc::raw::pack_size( pkt );
    vector<char> buf(pack_size);

From c072a014ed0018b6ebea00c4cb00b0730f28b1dd Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 27 Aug 2019 15:41:48 -0400
Subject: [PATCH 1047/1648] double check if a timer callback is active after
 double buffering the callback pointers

---
 .../include/eosio/chain/platform_timer.hpp      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/platform_timer.hpp b/libraries/chain/include/eosio/chain/platform_timer.hpp
index c927d8228ef..01360641aa3 100644
--- a/libraries/chain/include/eosio/chain/platform_timer.hpp
+++ b/libraries/chain/include/eosio/chain/platform_timer.hpp
@@ -17,11 +17,12 @@ struct platform_timer {
 
    /* Sets a callback for when timer expires. Be aware this could might fire from a signal handling context and/or
       on any particular thread. Only a single callback can be registered at once; trying to register more will
-      result in an exception. Setting to nullptr is allowed as a "no callback" hint */
+      result in an exception. Setting to nullptr disables any current set callback */
    void set_expiry_callback(void(*func)(void*), void* user) {
-      EOS_ASSERT(!(func && _expiration_callback), misc_exception, "Setting a platform_timer callback when one already exists");
+      EOS_ASSERT(!(func && __atomic_load_n(&_callback_enabled, __ATOMIC_CONSUME)), misc_exception, "Setting a platform_timer callback when one already exists");
       _expiration_callback = func;
       _expiration_callback_data = user;
+      __atomic_store_n(&_callback_enabled, !!_expiration_callback, __ATOMIC_RELEASE);
    }
 
    volatile sig_atomic_t expired = 1;
@@ -32,11 +33,17 @@ struct platform_timer {
    fc::fwd<impl,fwd_size> my;
 
    void call_expiration_callback() {
-      if(_expiration_callback)
-         _expiration_callback(_expiration_callback_data);
+      if(__atomic_load_n(&_callback_enabled, __ATOMIC_CONSUME)) {
+         void(*cb)(void*) = _expiration_callback;
+         void* cb_data = _expiration_callback_data;
+         if(__atomic_load_n(&_callback_enabled, __ATOMIC_CONSUME))
+            cb(cb_data);
+      }
    }
 
-   void(*_expiration_callback)(void*) = nullptr;
+   bool _callback_enabled = false;
+   static_assert(__atomic_always_lock_free(sizeof(_callback_enabled), 0), "eosio requires an always lock free bool type");
+   void(*_expiration_callback)(void*);
    void* _expiration_callback_data;
 };
 

From 2f1f1a5f0d9169d939e9c1325c4000100db7a892 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 28 Aug 2019 11:26:37 -0400
Subject: [PATCH 1048/1648] rename IMPORTANT to IMPORTANT.md; add link to
 LICENSE file in CONTRIBUTING.md

---
 CONTRIBUTING.md           | 2 +-
 IMPORTANT => IMPORTANT.md | 0
 README.md                 | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename IMPORTANT => IMPORTANT.md (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 40ecbf9cea8..256e871d7a9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -100,7 +100,7 @@ Examples of unacceptable behavior include:
 
 ## Contributor License & Acknowledgments
 
-Whenever you make a contribution to this project, you license your contribution under the same terms as set out in LICENSE, and you represent and warrant that you have the right to license your contribution under those terms.  Whenever you make a contribution to this project, you also certify in the terms of the Developer’s Certificate of Origin set out below:
+Whenever you make a contribution to this project, you license your contribution under the same terms as set out in [LICENSE](./LICENSE), and you represent and warrant that you have the right to license your contribution under those terms.  Whenever you make a contribution to this project, you also certify in the terms of the Developer’s Certificate of Origin set out below:
 
 ```
 Developer Certificate of Origin
diff --git a/IMPORTANT b/IMPORTANT.md
similarity index 100%
rename from IMPORTANT
rename to IMPORTANT.md
diff --git a/README.md b/README.md
index c68e051b017..bcfc75421c4 100644
--- a/README.md
+++ b/README.md
@@ -109,4 +109,4 @@ Instructions detailing the process of getting the software, building it, running
 
 See [LICENSE](./LICENSE) for copyright and license terms.
 
-All repositories and other materials are provided subject to the terms of this [IMPORTANT](./IMPORTANT) notice and you must familiarize yourself with its terms.  The notice contains important information, limitations and restrictions relating to our software, publications, trademarks, third-party resources, and forward-looking statements.  By accessing any of our repositories and other materials, you accept and agree to the terms of the notice.
+All repositories and other materials are provided subject to the terms of this [IMPORTANT](./IMPORTANT.md) notice and you must familiarize yourself with its terms.  The notice contains important information, limitations and restrictions relating to our software, publications, trademarks, third-party resources, and forward-looking statements.  By accessing any of our repositories and other materials, you accept and agree to the terms of the notice.

From 93c2c1af4a17f21d77855d33850ecbf678a5b75c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 28 Aug 2019 11:08:07 -0500
Subject: [PATCH 1049/1648] Encapsulate unapplied_transaction_queue addition of
 aborted transactions and forked transactions back into controller

---
 libraries/chain/controller.cpp                | 29 +++++++-------
 .../chain/include/eosio/chain/controller.hpp  |  8 ++--
 .../testing/include/eosio/testing/tester.hpp  | 12 +++---
 libraries/testing/tester.cpp                  | 11 +++---
 plugins/producer_plugin/producer_plugin.cpp   | 39 +++++++------------
 unittests/block_tests.cpp                     | 14 +++----
 unittests/forked_tests.cpp                    | 14 +++----
 7 files changed, 56 insertions(+), 71 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index b492e9e6f75..f3cb51981a5 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -701,7 +701,7 @@ struct controller_impl {
               pending_head = fork_db.pending_head()
          ) {
             wlog( "applying branch from fork database ending with block: ${id}", ("id", pending_head->id) );
-            maybe_switch_forks( pending_head, controller::block_status::complete, forked_branch_callback() );
+            maybe_switch_forks( pending_head, controller::block_status::complete );
          }
       }
 
@@ -1677,6 +1677,7 @@ struct controller_impl {
             });
          }
 
+         unapplied_transactions.clear_applied( bsp );
          emit( self.accepted_block, bsp );
 
          if( add_to_fork_db ) {
@@ -1883,7 +1884,7 @@ struct controller_impl {
       } );
    }
 
-   void push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& forked_branch_cb ) {
+   void push_block( std::future<block_state_ptr>& block_state_future ) {
       controller::block_status s = controller::block_status::complete;
       EOS_ASSERT(!pending, block_validate_exception, "it is not valid to push a block when there is a pending block");
 
@@ -1905,7 +1906,7 @@ struct controller_impl {
          emit( self.accepted_block_header, bsp );
 
          if( read_mode != db_read_mode::IRREVERSIBLE ) {
-            maybe_switch_forks( fork_db.pending_head(), s, forked_branch_cb );
+            maybe_switch_forks( fork_db.pending_head(), s );
          } else {
             log_irreversible();
          }
@@ -1958,13 +1959,13 @@ struct controller_impl {
          } else {
             EOS_ASSERT( read_mode != db_read_mode::IRREVERSIBLE, block_validate_exception,
                         "invariant failure: cannot replay reversible blocks while in irreversible mode" );
-            maybe_switch_forks( bsp, s, forked_branch_callback() );
+            maybe_switch_forks( bsp, s );
          }
 
       } FC_LOG_AND_RETHROW( )
    }
 
-   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s, const forked_branch_callback& forked_branch_cb ) {
+   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s ) {
       bool head_changed = true;
       if( new_head->header.previous == head->id ) {
          try {
@@ -1986,9 +1987,9 @@ struct controller_impl {
                pop_block();
             }
             EOS_ASSERT( self.head_block_id() == branches.second.back()->header.previous, fork_database_exception,
-                     "loss of sync between fork_db and chainbase during fork switch" ); // _should_ never fail
+                        "loss of sync between fork_db and chainbase during fork switch" ); // _should_ never fail
 
-            if( forked_branch_cb ) forked_branch_cb( branches.second );
+            unapplied_transactions.add_forked( branches.second );
          }
 
          for( auto ritr = branches.first.rbegin(); ritr != branches.first.rend(); ++ritr ) {
@@ -2036,14 +2037,12 @@ struct controller_impl {
 
    } /// push_block
 
-   vector<transaction_metadata_ptr> abort_block() {
-      vector<transaction_metadata_ptr> applied_trxs;
+   void abort_block() {
       if( pending ) {
-         applied_trxs = pending->extract_trx_metas();
+         unapplied_transactions.add_aborted( pending->extract_trx_metas() );
          pending.reset();
          protocol_features.popped_blocks_to( head->block_num );
       }
-      return applied_trxs;
    }
 
    checksum256_type calculate_action_merkle() {
@@ -2551,8 +2550,8 @@ void controller::commit_block() {
    my->commit_block(true);
 }
 
-vector<transaction_metadata_ptr> controller::abort_block() {
-   return my->abort_block();
+void controller::abort_block() {
+   my->abort_block();
 }
 
 boost::asio::io_context& controller::get_thread_pool() {
@@ -2568,10 +2567,10 @@ std::future<block_state_ptr> controller::create_block_state_future( const signed
    return my->create_block_state_future( b );
 }
 
-void controller::push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& forked_branch_cb ) {
+void controller::push_block( std::future<block_state_ptr>& block_state_future ) {
    validate_db_available_size();
    validate_reversible_available_size();
-   my->push_block( block_state_future, forked_branch_cb );
+   my->push_block( block_state_future );
 }
 
 transaction_trace_ptr controller::push_transaction( const transaction_metadata_ptr& trx, fc::time_point deadline, uint32_t billed_cpu_time_us ) {
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index c08d6675c99..4419dfe00d9 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -37,7 +37,6 @@ namespace eosio { namespace chain {
    class account_object;
    using resource_limits::resource_limits_manager;
    using apply_handler = std::function<void(apply_context&)>;
-   using forked_branch_callback = std::function<void(const branch_type&)>;
 
    class fork_database;
 
@@ -130,9 +129,9 @@ namespace eosio { namespace chain {
                            const vector<digest_type>& new_protocol_feature_activations );
 
          /**
-          * @return transactions applied in aborted block
+          * Aborts current block if one is pending and captures applied transactions
           */
-         vector<transaction_metadata_ptr> abort_block();
+         void abort_block();
 
          /**
           *
@@ -153,9 +152,8 @@ namespace eosio { namespace chain {
 
          /**
           * @param block_state_future provide from call to create_block_state_future
-          * @param cb calls cb with forked applied transactions for each forked block
           */
-         void push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& cb );
+         void push_block( std::future<block_state_ptr>& block_state_future );
 
          boost::asio::io_context& get_thread_pool();
 
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 4aab7510774..4c82fe9d723 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -129,7 +129,6 @@ namespace eosio { namespace testing {
           * @return
           */
          vector<transaction_id_type> get_scheduled_transactions() const;
-         unapplied_transaction_queue& get_unapplied_transaction_queue() { return unapplied_transactions; }
 
          transaction_trace_ptr    push_transaction( packed_transaction& trx, fc::time_point deadline = fc::time_point::maximum(), uint32_t billed_cpu_time_us = DEFAULT_BILLED_CPU_TIME_US );
          transaction_trace_ptr    push_transaction( signed_transaction& trx, fc::time_point deadline = fc::time_point::maximum(), uint32_t billed_cpu_time_us = DEFAULT_BILLED_CPU_TIME_US, bool no_throw = false );
@@ -328,7 +327,6 @@ namespace eosio { namespace testing {
          controller::config                            cfg;
          map<transaction_id_type, transaction_receipt> chain_transactions;
          map<account_name, block_id_type>              last_produced_block;
-         unapplied_transaction_queue                   unapplied_transactions;
 
       public:
          vector<digest_type>                           protocol_features_to_be_activated_wo_preactivation;
@@ -353,7 +351,7 @@ namespace eosio { namespace testing {
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-         unapplied_transactions.add_aborted( control->abort_block() );
+         control->abort_block();
          return _produce_block(skip_time, true);
       }
 
@@ -434,7 +432,7 @@ namespace eosio { namespace testing {
       signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
          auto sb = _produce_block(skip_time, false);
          auto bsf = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bsf, forked_branch_callback() );
+         validating_node->push_block( bsf );
 
          return sb;
       }
@@ -445,14 +443,14 @@ namespace eosio { namespace testing {
 
       void validate_push_block(const signed_block_ptr& sb) {
          auto bs = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bs, forked_branch_callback() );
+         validating_node->push_block( bs );
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-         unapplied_transactions.add_aborted( control->abort_block() );
+         control->abort_block();
          auto sb = _produce_block(skip_time, true);
          auto bsf = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bsf, forked_branch_callback() );
+         validating_node->push_block( bsf );
 
          return sb;
       }
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index bc0dc42f6c2..03e14392074 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -253,10 +253,8 @@ namespace eosio { namespace testing {
 
    void base_tester::push_block(signed_block_ptr b) {
       auto bsf = control->create_block_state_future(b);
-      unapplied_transactions.add_aborted( control->abort_block() );
-      control->push_block( bsf, [this]( const branch_type& forked_branch ) {
-         unapplied_transactions.add_forked( forked_branch );
-      } );
+      control->abort_block();
+      control->push_block( bsf );
 
       auto itr = last_produced_block.find(b->producer);
       if (itr == last_produced_block.end() || block_header::num_from_id(b->id()) > block_header::num_from_id(itr->second)) {
@@ -268,6 +266,7 @@ namespace eosio { namespace testing {
       auto head = control->head_block_state();
       auto head_time = control->head_block_time();
       auto next_time = head_time + skip_time;
+      auto& unapplied_transactions = control->unapplied_transaction_queue();
 
       if( !control->is_building_block() || control->pending_block_time() != next_time ) {
          _start_block( next_time );
@@ -309,7 +308,7 @@ namespace eosio { namespace testing {
          last_produced_block_num = std::max(control->last_irreversible_block_num(), block_header::num_from_id(itr->second));
       }
 
-      unapplied_transactions.add_aborted( control->abort_block() );
+      control->abort_block();
 
       vector<digest_type> feature_to_be_activated;
       // First add protocol features to be activated WITHOUT preactivation
@@ -966,7 +965,7 @@ namespace eosio { namespace testing {
             if( block ) { //&& !b.control->is_known_block(block->id()) ) {
                auto bsf = b.control->create_block_state_future( block );
                b.control->abort_block();
-               b.control->push_block(bsf, forked_branch_callback()); //, eosio::chain::validation_steps::created_block);
+               b.control->push_block(bsf); //, eosio::chain::validation_steps::created_block);
             }
          }
       };
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 7208d1db4a9..1f870f18169 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -221,7 +221,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       transaction_id_with_expiry_index                         _blacklisted_transactions;
       pending_snapshot_index                                   _pending_snapshot_index;
 
-      fc::optional<scoped_connection>                          _accepted_block_connection;
       fc::optional<scoped_connection>                          _accepted_block_header_connection;
       fc::optional<scoped_connection>                          _irreversible_block_connection;
 
@@ -261,11 +260,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          return itr->second;
       }
 
-      void on_block( const block_state_ptr& bsp ) {
-         chain::controller& chain = chain_plug->chain();
-         chain.unapplied_transaction_queue().clear_applied( bsp );
-      }
-
       void on_block_header( const block_state_ptr& bsp ) {
          consider_new_watermark( bsp->header.producer, bsp->block_num );
       }
@@ -348,7 +342,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          auto bsf = chain.create_block_state_future( block );
 
          // abort the pending block
-         chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+         chain.abort_block();
 
          // exceptions throw out, make sure we restart our loop
          auto ensure = fc::make_scoped_exit([this](){
@@ -358,9 +352,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          // push the new block
          bool except = false;
          try {
-            chain.push_block( bsf, [&chain]( const branch_type& forked_branch ) {
-               chain.unapplied_transaction_queue().add_forked( forked_branch );
-            } );
+            chain.push_block( bsf );
          } catch ( const guard_exception& e ) {
             chain_plugin::handle_guard_exception(e);
             return;
@@ -872,7 +864,6 @@ void producer_plugin::plugin_startup()
    EOS_ASSERT( my->_producers.empty() || chain.get_validation_mode() == chain::validation_mode::FULL, plugin_config_exception,
               "node cannot have any producer-name configured because block production is not safe when validation_mode is not \"full\"" );
 
-   my->_accepted_block_connection.emplace(chain.accepted_block.connect( [this]( const auto& bsp ){ my->on_block( bsp ); } ));
    my->_accepted_block_header_connection.emplace(chain.accepted_block_header.connect( [this]( const auto& bsp ){ my->on_block_header( bsp ); } ));
    my->_irreversible_block_connection.emplace(chain.irreversible_block.connect( [this]( const auto& bsp ){ my->on_irreversible_block( bsp->block ); } ));
 
@@ -910,7 +901,6 @@ void producer_plugin::plugin_shutdown() {
    if( my->_thread_pool ) {
       my->_thread_pool->stop();
    }
-   my->_accepted_block_connection.reset();
    my->_accepted_block_header_connection.reset();
    my->_irreversible_block_connection.reset();
 }
@@ -931,7 +921,7 @@ void producer_plugin::resume() {
    //
    if (my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+      chain.abort_block();
       my->schedule_production_loop();
    }
 }
@@ -970,7 +960,7 @@ void producer_plugin::update_runtime_options(const runtime_options& options) {
 
    if (check_speculating && my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+      chain.abort_block();
       my->schedule_production_loop();
    }
 
@@ -1046,7 +1036,7 @@ producer_plugin::integrity_hash_information producer_plugin::get_integrity_hash(
 
    if (chain.is_building_block()) {
       // abort the pending block
-      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+      chain.abort_block();
    } else {
       reschedule.cancel();
    }
@@ -1075,7 +1065,7 @@ void producer_plugin::create_snapshot(producer_plugin::next_function<producer_pl
 
       if (chain.is_building_block()) {
          // abort the pending block
-         chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+         chain.abort_block();
       } else {
          reschedule.cancel();
       }
@@ -1408,7 +1398,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          blocks_to_confirm = (uint16_t)(std::min<uint32_t>(blocks_to_confirm, (uint32_t)(hbs->block_num - hbs->dpos_irreversible_blocknum)));
       }
 
-      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+      chain.abort_block();
 
       auto features_to_activate = chain.get_preactivated_protocol_features();
       if( _pending_block_mode == pending_block_mode::producing && _protocol_features_to_activate.size() > 0 ) {
@@ -1501,15 +1491,16 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
       try {
          size_t orig_pending_txn_size = _pending_incoming_transactions.size();
+         unapplied_transaction_queue& unapplied = chain.unapplied_transaction_queue();
 
          // Processing unapplied transactions...
-         if( !chain.unapplied_transaction_queue().empty() ) {
+         if( !unapplied.empty() ) {
             int num_applied = 0, num_failed = 0, num_processed = 0;
-            auto unapplied_trxs_size = chain.unapplied_transaction_queue().size();
+            auto unapplied_trxs_size = unapplied.size();
             auto itr     = (_pending_block_mode == pending_block_mode::producing) ?
-                           chain.unapplied_transaction_queue().begin() : chain.unapplied_transaction_queue().persisted_begin();
+                           unapplied.begin() : unapplied.persisted_begin();
             auto end_itr = (_pending_block_mode == pending_block_mode::producing) ?
-                           chain.unapplied_transaction_queue().end()   : chain.unapplied_transaction_queue().persisted_end();
+                           unapplied.end()   : unapplied.persisted_end();
             while( itr != end_itr ) {
                if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
                if( exhausted ) break;
@@ -1534,12 +1525,12 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                      } else {
                         // this failed our configured maximum transaction time, we don't want to replay it
                         ++num_failed;
-                        itr = chain.unapplied_transaction_queue().erase( itr );
+                        itr = unapplied.erase( itr );
                         continue;
                      }
                   } else {
                      ++num_applied;
-                     itr = chain.unapplied_transaction_queue().erase( itr );
+                     itr = unapplied.erase( itr );
                      continue;
                   }
                } LOG_AND_DROP();
@@ -1820,7 +1811,7 @@ bool producer_plugin_impl::maybe_produce_block() {
 
    fc_dlog(_log, "Aborting block due to produce_block error");
    chain::controller& chain = chain_plug->chain();
-   chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+   chain.abort_block();
    return false;
 }
 
diff --git a/unittests/block_tests.cpp b/unittests/block_tests.cpp
index 7926455ffbc..c3d3e8ebcdf 100644
--- a/unittests/block_tests.cpp
+++ b/unittests/block_tests.cpp
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(block_with_invalid_tx_test)
    tester validator;
    auto bs = validator.control->create_block_state_future( copy_b );
    validator.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs, forked_branch_callback() ), fc::exception ,
+   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs ), fc::exception ,
    [] (const fc::exception &e)->bool {
       return e.code() == account_name_exists_exception::code_value ;
    }) ;
@@ -217,11 +217,11 @@ BOOST_FIXTURE_TEST_CASE( abort_block_transactions, validating_tester) { try {
 
       control->get_account( a ); // throws if it does not exist
 
-      vector<transaction_metadata_ptr> unapplied_trxs = control->abort_block();
+      control->abort_block();
 
-      // verify transaction returned from abort_block()
-      BOOST_REQUIRE_EQUAL( 1,  unapplied_trxs.size() );
-      BOOST_REQUIRE_EQUAL( trx.id(), unapplied_trxs.at(0)->id() );
+      // verify transaction added to unapplied in abort_block()
+      BOOST_REQUIRE_EQUAL( 1,  control->unapplied_transaction_queue().size() );
+      BOOST_REQUIRE( control->unapplied_transaction_queue().get_trx( trx.id() ) != nullptr );
 
       // account does not exist block was aborted which had transaction
       BOOST_REQUIRE_EXCEPTION(control->get_account( a ), fc::exception,
@@ -268,9 +268,9 @@ BOOST_FIXTURE_TEST_CASE( abort_block_transactions_tester, validating_tester) { t
 
       control->get_account( a ); // throws if it does not exist
 
-      vector<transaction_metadata_ptr> unapplied_trxs = control->abort_block(); // should be empty now
+      control->abort_block();
 
-      BOOST_REQUIRE_EQUAL( 0,  unapplied_trxs.size() );
+      BOOST_REQUIRE_EQUAL( 0,  control->unapplied_transaction_queue().size() ); // should be empty now
 
    } FC_LOG_AND_RETHROW() }
 
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index a1ac5c68705..b114d1fd872 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE( forking ) try {
    bad_block.transaction_mroot = bad_block.previous;
    auto bad_block_bs = c.control->create_block_state_future( std::make_shared<signed_block>(std::move(bad_block)) );
    c.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs, forked_branch_callback() ), fc::exception,
+   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs ), fc::exception,
       [] (const fc::exception &ex)->bool {
          return ex.to_detail_string().find("block signed by unexpected key") != std::string::npos;
       });
@@ -638,12 +638,12 @@ BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
    }
 
    // verify transaction on fork is reported by push_block in order
-   BOOST_REQUIRE_EQUAL( 3, c.get_unapplied_transaction_queue().size() );
-   BOOST_REQUIRE_EQUAL( trace1->id, c.get_unapplied_transaction_queue().begin()->id() );
-   c.get_unapplied_transaction_queue().erase( c.get_unapplied_transaction_queue().begin() );
-   BOOST_REQUIRE_EQUAL( trace2->id, c.get_unapplied_transaction_queue().begin()->id() );
-   c.get_unapplied_transaction_queue().erase( c.get_unapplied_transaction_queue().begin() );
-   BOOST_REQUIRE_EQUAL( trace3->id, c.get_unapplied_transaction_queue().begin()->id() );
+   BOOST_REQUIRE_EQUAL( 3, c.control->unapplied_transaction_queue().size() );
+   BOOST_REQUIRE_EQUAL( trace1->id, c.control->unapplied_transaction_queue().begin()->id() );
+   c.control->unapplied_transaction_queue().erase( c.control->unapplied_transaction_queue().begin() );
+   BOOST_REQUIRE_EQUAL( trace2->id, c.control->unapplied_transaction_queue().begin()->id() );
+   c.control->unapplied_transaction_queue().erase( c.control->unapplied_transaction_queue().begin() );
+   BOOST_REQUIRE_EQUAL( trace3->id, c.control->unapplied_transaction_queue().begin()->id() );
 
 } FC_LOG_AND_RETHROW()
 

From 8c2f9f5b55ab1ae20640f97df0c246362cdc4456 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 28 Aug 2019 12:13:49 -0500
Subject: [PATCH 1050/1648] Verify recovered keys exist if not skipping auth
 check before reusing transaction_metadata

---
 libraries/chain/controller.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index f3cb51981a5..9b171e825e8 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1778,9 +1778,9 @@ struct controller_impl {
                if( receipt.trx.contains<packed_transaction>()) {
                   auto& pt = receipt.trx.get<packed_transaction>();
                   const transaction_metadata_ptr& trx_meta_ptr = unapplied_transactions.get_trx( pt.id() );
-                  if( trx_meta_ptr ) {
+                  if( trx_meta_ptr && ( skip_auth_checks || !trx_meta_ptr->recovered_keys().empty() ) ) {
                      trx_metas.emplace_back( trx_meta_ptr, recover_keys_future{} );
-                  } else if ( skip_auth_checks ) {
+                  } else if( skip_auth_checks ) {
                      trx_metas.emplace_back(
                            transaction_metadata::create_no_recover_keys( pt, transaction_metadata::trx_type::input ),
                            recover_keys_future{} );

From 8e173fe9fd944be00836684aa0493aaf27c8a7a7 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 28 Aug 2019 12:31:43 -0500
Subject: [PATCH 1051/1648] Avoid some shared_ptr copies

---
 libraries/chain/controller.cpp                              | 3 ++-
 .../chain/include/eosio/chain/transaction_metadata.hpp      | 6 +++---
 libraries/chain/transaction_metadata.cpp                    | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 9b171e825e8..bbc8bb365a2 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1786,7 +1786,8 @@ struct controller_impl {
                            recover_keys_future{} );
                   } else {
                      auto ptrx = std::make_shared<packed_transaction>( pt );
-                     auto fut = transaction_metadata::start_recover_keys( ptrx, thread_pool.get_executor(), chain_id, microseconds::maximum() );
+                     auto fut = transaction_metadata::start_recover_keys(
+                           std::move( ptrx ), thread_pool.get_executor(), chain_id, microseconds::maximum() );
                      trx_metas.emplace_back( transaction_metadata_ptr{}, std::move( fut ) );
                   }
                }
diff --git a/libraries/chain/include/eosio/chain/transaction_metadata.hpp b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
index a4bdd469510..945dd9af5e7 100644
--- a/libraries/chain/include/eosio/chain/transaction_metadata.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_metadata.hpp
@@ -47,10 +47,10 @@ class transaction_metadata {
 
    public:
       // creation of tranaction_metadata restricted to start_recover_keys and create_no_recover_keys below, public for make_shared
-      explicit transaction_metadata( const private_type& pt, const packed_transaction_ptr& ptrx,
+      explicit transaction_metadata( const private_type& pt, packed_transaction_ptr ptrx,
                                      fc::microseconds sig_cpu_usage, flat_set<public_key_type> recovered_pub_keys,
                                      bool _implicit = false, bool _scheduled = false)
-         : _packed_trx( ptrx )
+         : _packed_trx( std::move( ptrx ) )
          , _sig_cpu_usage( sig_cpu_usage )
          , _recovered_pub_keys( std::move( recovered_pub_keys ) )
          , implicit( _implicit )
@@ -72,7 +72,7 @@ class transaction_metadata {
       /// Thread safe.
       /// @returns transaction_metadata_ptr or exception via future
       static recover_keys_future
-      start_recover_keys( const packed_transaction_ptr& trx, boost::asio::io_context& thread_pool,
+      start_recover_keys( packed_transaction_ptr trx, boost::asio::io_context& thread_pool,
                           const chain_id_type& chain_id, fc::microseconds time_limit,
                           uint32_t max_variable_sig_size = UINT32_MAX );
 
diff --git a/libraries/chain/transaction_metadata.cpp b/libraries/chain/transaction_metadata.cpp
index c09a79939cf..00a9e2c329a 100644
--- a/libraries/chain/transaction_metadata.cpp
+++ b/libraries/chain/transaction_metadata.cpp
@@ -4,20 +4,20 @@
 
 namespace eosio { namespace chain {
 
-recover_keys_future transaction_metadata::start_recover_keys( const packed_transaction_ptr& trx,
+recover_keys_future transaction_metadata::start_recover_keys( packed_transaction_ptr trx,
                                                               boost::asio::io_context& thread_pool,
                                                               const chain_id_type& chain_id,
                                                               fc::microseconds time_limit,
                                                               uint32_t max_variable_sig_size )
 {
-   return async_thread_pool( thread_pool, [trx, chain_id, time_limit, max_variable_sig_size]() {
+   return async_thread_pool( thread_pool, [trx{std::move(trx)}, chain_id, time_limit, max_variable_sig_size]() mutable {
          fc::time_point deadline = time_limit == fc::microseconds::maximum() ?
                                    fc::time_point::maximum() : fc::time_point::now() + time_limit;
          check_variable_sig_size( trx, max_variable_sig_size );
          const signed_transaction& trn = trx->get_signed_transaction();
          flat_set<public_key_type> recovered_pub_keys;
          fc::microseconds cpu_usage = trn.get_signature_keys( chain_id, deadline, recovered_pub_keys );
-         return std::make_shared<transaction_metadata>( private_type(), trx, cpu_usage, std::move( recovered_pub_keys ) );
+         return std::make_shared<transaction_metadata>( private_type(), std::move( trx ), cpu_usage, std::move( recovered_pub_keys ) );
       }
    );
 }

From 551601be626a5597267837a61e416d4ac8b66053 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Wed, 28 Aug 2019 13:42:42 -0400
Subject: [PATCH 1052/1648] Use the correct code size when instantiating a
 module.

---
 libraries/chain/webassembly/eos-vm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index d28d4f2a5f3..02219f4484d 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -54,7 +54,7 @@ std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime<Impl>::instan
    std::ofstream mf("temp.wasm");
    mf.write((char*)code_bytes, code_size);
    mf.close();
-   wasm_code_ptr code((uint8_t*)code_bytes, 0);
+   wasm_code_ptr code((uint8_t*)code_bytes, code_size);
    std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size);
    registered_host_functions<apply_context>::resolve(bkend->get_module());
    return std::make_unique<eos_vm_instantiated_module<Impl>>(this, std::move(bkend));

From 44d72572b3b011d65b66850291ab80b9b0be4cf3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 28 Aug 2019 15:26:44 -0500
Subject: [PATCH 1053/1648] Remove unused var

---
 libraries/chain/controller.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index bbc8bb365a2..348aab87635 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1768,11 +1768,10 @@ struct controller_impl {
          const bool pub_keys_recovered = bsp->is_pub_keys_recovered();
          const bool skip_auth_checks = self.skip_auth_check();
          std::vector<std::tuple<transaction_metadata_ptr, recover_keys_future>> trx_metas;
-         bool use_bsp_cached = false, use_trx_metas = false;
+         bool use_bsp_cached = false;
          if( pub_keys_recovered || (skip_auth_checks && existing_trxs_metas) ) {
             use_bsp_cached = true;
          } else {
-            use_trx_metas = true;
             trx_metas.reserve( b->transactions.size() );
             for( const auto& receipt : b->transactions ) {
                if( receipt.trx.contains<packed_transaction>()) {

From f959c5a2d729f345a596e0b0e03ea78eb5c48843 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 28 Aug 2019 17:52:58 -0400
Subject: [PATCH 1054/1648] refactor platform timer callback "thread" safety
 further

---
 .../include/eosio/chain/platform_timer.hpp    | 36 ++++++++++++++-----
 .../eosio/chain/transaction_context.hpp       |  4 +--
 libraries/chain/transaction_context.cpp       |  6 ++--
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/platform_timer.hpp b/libraries/chain/include/eosio/chain/platform_timer.hpp
index 01360641aa3..d10842a4cb8 100644
--- a/libraries/chain/include/eosio/chain/platform_timer.hpp
+++ b/libraries/chain/include/eosio/chain/platform_timer.hpp
@@ -4,6 +4,8 @@
 
 #include <eosio/chain/exceptions.hpp>
 
+#include <atomic>
+
 #include <signal.h>
 
 namespace eosio { namespace chain {
@@ -18,11 +20,22 @@ struct platform_timer {
    /* Sets a callback for when timer expires. Be aware this could might fire from a signal handling context and/or
       on any particular thread. Only a single callback can be registered at once; trying to register more will
       result in an exception. Setting to nullptr disables any current set callback */
-   void set_expiry_callback(void(*func)(void*), void* user) {
-      EOS_ASSERT(!(func && __atomic_load_n(&_callback_enabled, __ATOMIC_CONSUME)), misc_exception, "Setting a platform_timer callback when one already exists");
+   void set_expiration_callback(void(*func)(void*), void* user) {
+      callback_state current_state;
+      while((current_state = _callback_state.load(std::memory_order_acquire)) == READING) {} //wait for call_expiration_callback() to be done with it
+      if(func)
+         EOS_ASSERT(current_state == UNSET, misc_exception, "Setting a platform_timer callback when one already exists");
+      if(!func && current_state == UNSET)
+         return;
+
+      //prepare for loading in new values by moving from UNSET->WRITING
+      while(!atomic_compare_exchange_strong(&_callback_state, &current_state, WRITING))
+         current_state = UNSET;
       _expiration_callback = func;
       _expiration_callback_data = user;
-      __atomic_store_n(&_callback_enabled, !!_expiration_callback, __ATOMIC_RELEASE);
+
+      //finally go WRITING->SET
+      _callback_state.store(func ? SET : UNSET, std::memory_order_release);
    }
 
    volatile sig_atomic_t expired = 1;
@@ -32,17 +45,24 @@ struct platform_timer {
    constexpr static size_t fwd_size = 8;
    fc::fwd<impl,fwd_size> my;
 
+   enum callback_state {
+      UNSET,
+      READING,
+      WRITING,
+      SET
+   };
+
    void call_expiration_callback() {
-      if(__atomic_load_n(&_callback_enabled, __ATOMIC_CONSUME)) {
+      callback_state state_is_SET = SET;
+      if(atomic_compare_exchange_strong(&_callback_state, &state_is_SET, READING)) {
          void(*cb)(void*) = _expiration_callback;
          void* cb_data = _expiration_callback_data;
-         if(__atomic_load_n(&_callback_enabled, __ATOMIC_CONSUME))
-            cb(cb_data);
+         _callback_state.store(SET, std::memory_order_release);
+         cb(cb_data);
       }
    }
 
-   bool _callback_enabled = false;
-   static_assert(__atomic_always_lock_free(sizeof(_callback_enabled), 0), "eosio requires an always lock free bool type");
+   std::atomic<callback_state> _callback_state = UNSET;
    void(*_expiration_callback)(void*);
    void* _expiration_callback_data;
 };
diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index 25689d0191f..8268eaaaa40 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -18,8 +18,8 @@ namespace eosio { namespace chain {
 
          /* Sets a callback for when timer expires. Be aware this could might fire from a signal handling context and/or
             on any particular thread. Only a single callback can be registered at once; trying to register more will
-            result in an exception. */
-         void set_expiry_callback(void(*func)(void*), void* user);
+            result in an exception. Use nullptr to disable a previously set callback. */
+         void set_expiration_callback(void(*func)(void*), void* user);
 
          volatile sig_atomic_t& expired;
       private:
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index 0370c37cfe9..5f7cb9fce93 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -34,13 +34,13 @@ namespace eosio { namespace chain {
       _timer.stop();
    }
 
-   void transaction_checktime_timer::set_expiry_callback(void(*func)(void*), void* user) {
-      _timer.set_expiry_callback(func, user);
+   void transaction_checktime_timer::set_expiration_callback(void(*func)(void*), void* user) {
+      _timer.set_expiration_callback(func, user);
    }
 
    transaction_checktime_timer::~transaction_checktime_timer() {
       stop();
-      _timer.set_expiry_callback(nullptr, nullptr);
+      _timer.set_expiration_callback(nullptr, nullptr);
    }
 
    transaction_context::transaction_context( controller& c,

From c79c76968c04e34788fc92d739c1121f83204374 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 29 Aug 2019 15:40:57 -0400
Subject: [PATCH 1055/1648] further simplification to timer callbacks

---
 .../include/eosio/chain/platform_timer.hpp    | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/platform_timer.hpp b/libraries/chain/include/eosio/chain/platform_timer.hpp
index d10842a4cb8..a5874e685cb 100644
--- a/libraries/chain/include/eosio/chain/platform_timer.hpp
+++ b/libraries/chain/include/eosio/chain/platform_timer.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <fc/time.hpp>
 #include <fc/fwd.hpp>
+#include <fc/scoped_exit.hpp>
 
 #include <eosio/chain/exceptions.hpp>
 
@@ -21,21 +22,16 @@ struct platform_timer {
       on any particular thread. Only a single callback can be registered at once; trying to register more will
       result in an exception. Setting to nullptr disables any current set callback */
    void set_expiration_callback(void(*func)(void*), void* user) {
-      callback_state current_state;
-      while((current_state = _callback_state.load(std::memory_order_acquire)) == READING) {} //wait for call_expiration_callback() to be done with it
-      if(func)
-         EOS_ASSERT(current_state == UNSET, misc_exception, "Setting a platform_timer callback when one already exists");
-      if(!func && current_state == UNSET)
-         return;
+      bool expect_false = false;
+      while(!atomic_compare_exchange_strong(&_callback_variables_busy, &expect_false, true))
+         expect_false = false;
+      auto reset_busy = fc::make_scoped_exit([this]() {
+         _callback_variables_busy.store(false, std::memory_order_release);
+      });
+      EOS_ASSERT(!(func && _expiration_callback), misc_exception, "Setting a platform_timer callback when one already exists");
 
-      //prepare for loading in new values by moving from UNSET->WRITING
-      while(!atomic_compare_exchange_strong(&_callback_state, &current_state, WRITING))
-         current_state = UNSET;
       _expiration_callback = func;
       _expiration_callback_data = user;
-
-      //finally go WRITING->SET
-      _callback_state.store(func ? SET : UNSET, std::memory_order_release);
    }
 
    volatile sig_atomic_t expired = 1;
@@ -45,25 +41,19 @@ struct platform_timer {
    constexpr static size_t fwd_size = 8;
    fc::fwd<impl,fwd_size> my;
 
-   enum callback_state {
-      UNSET,
-      READING,
-      WRITING,
-      SET
-   };
-
    void call_expiration_callback() {
-      callback_state state_is_SET = SET;
-      if(atomic_compare_exchange_strong(&_callback_state, &state_is_SET, READING)) {
+      bool expect_false = false;
+      if(atomic_compare_exchange_strong(&_callback_variables_busy, &expect_false, true)) {
          void(*cb)(void*) = _expiration_callback;
          void* cb_data = _expiration_callback_data;
-         _callback_state.store(SET, std::memory_order_release);
-         cb(cb_data);
+         _callback_variables_busy.store(false, std::memory_order_release);
+         if(cb)
+            cb(cb_data);
       }
    }
 
-   std::atomic<callback_state> _callback_state = UNSET;
-   void(*_expiration_callback)(void*);
+   std::atomic_bool _callback_variables_busy = false;
+   void(*_expiration_callback)(void*) = nullptr;
    void* _expiration_callback_data;
 };
 

From d13e7fc00a2fcef259c06c3ec7bd1ebfd22fc7f7 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Fri, 30 Aug 2019 10:55:38 -0400
Subject: [PATCH 1056/1648] Fixes for the unit tests. - base_tester should use
 eos-vm when it's specified on the command line - Add a tester option for
 eos-vm-jit - Translate some exceptions coming out of eos-vm - Handle
 checktime

---
 .../eosio/chain/transaction_context.hpp       |  2 ++
 libraries/chain/webassembly/eos-vm.cpp        | 27 ++++++++++++++++---
 .../testing/include/eosio/testing/tester.hpp  |  2 ++
 libraries/testing/tester.cpp                  |  4 +++
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index 7bbe0e66b09..c8a978838fe 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -121,7 +121,9 @@ namespace eosio { namespace chain {
 
          fc::microseconds              initial_objective_duration_limit;
          fc::microseconds              objective_duration_limit;
+   public: // <-- HACK for eos-vm
          fc::time_point                _deadline = fc::time_point::maximum();
+   private:
          int64_t                       deadline_exception_code = block_cpu_usage_exceeded::code_value;
          int64_t                       billing_timer_exception_code = block_cpu_usage_exceeded::code_value;
          fc::time_point                pseudo_start;
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 02219f4484d..95346ff316a 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -1,5 +1,6 @@
 #include <eosio/chain/webassembly/eos-vm.hpp>
 #include <eosio/chain/apply_context.hpp>
+#include <eosio/chain/transaction_context.hpp>
 #include <eosio/chain/wasm_eosio_constraints.hpp>
 #include <fstream>
 //eos-vm includes
@@ -33,10 +34,28 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
             module.memories.at(0).limits.flags = true;
             module.memories.at(0).limits.maximum = wasm_constraints::maximum_linear_memory / wasm_constraints::wasm_page_size;
          }
-         const auto& res = _runtime->_bkend->call(
-             &context, "env", "apply", context.get_receiver().to_uint64_t(),
-             context.get_action().account.to_uint64_t(),
-             context.get_action().name.to_uint64_t());
+         auto fn = [&]() {
+            const auto& res = _runtime->_bkend->call(
+                &context, "env", "apply", context.get_receiver().to_uint64_t(),
+                context.get_action().account.to_uint64_t(),
+                context.get_action().name.to_uint64_t());
+         };
+         try {
+            if (context.trx_context._deadline == fc::time_point::maximum())
+               fn();
+            else {
+               watchdog wd(std::chrono::microseconds((context.trx_context._deadline - fc::time_point::now()).count()));
+               _runtime->_bkend->timed_run(wd, fn);
+            }
+         } catch(eosio::vm::timeout_exception&) {
+            // FIXME: just loop until checktime triggers, in case we got here first
+            while(true) context.trx_context.checktime();
+         } catch(eosio::vm::wasm_memory_exception& e) {
+            FC_THROW_EXCEPTION(wasm_execution_error, "access violation");
+         } catch(eosio::vm::exception& e) {
+            // FIXME: Do better translation
+            FC_THROW_EXCEPTION(wasm_execution_error, "something went wrong...");
+         }
          _runtime->_bkend = nullptr;
       }
 
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 4b433b21f6f..ca021094079 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -402,6 +402,8 @@ namespace eosio { namespace testing {
                vcfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
             else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--eos-vm"))
                vcfg.wasm_runtime = chain::wasm_interface::vm_type::eos_vm;
+            else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--eos-vm-jit"))
+               vcfg.wasm_runtime = chain::wasm_interface::vm_type::eos_vm_jit;
          }
          return vcfg;
       }
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index e7e8ee6af57..e5672e6cc22 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -167,6 +167,10 @@ namespace eosio { namespace testing {
             cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
          else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
             cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
+         else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--eos-vm"))
+            cfg.wasm_runtime = chain::wasm_interface::vm_type::eos_vm;
+         else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--eos-vm-jit"))
+            cfg.wasm_runtime = chain::wasm_interface::vm_type::eos_vm_jit;
       }
 
       open(nullptr);

From 056966d4de6885f8995d71ae857a3b5e6b426e68 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Fri, 30 Aug 2019 11:00:06 -0400
Subject: [PATCH 1057/1648] Update eos-vm to assert-invalid.

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 67ce1200547..229cc21c07f 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 67ce1200547269fbd6f6211208897e06ee1980a8
+Subproject commit 229cc21c07f8024a6adf6b47d5b8327104f90042

From d4b7f323f7700c940faab485d4519b4e7b497a3a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 30 Aug 2019 14:14:56 -0500
Subject: [PATCH 1058/1648] Revert "Encapsulate unapplied_transaction_queue
 addition of aborted transactions and forked transactions back into
 controller"

This reverts commit 93c2c1af4a17f21d77855d33850ecbf678a5b75c.
---
 libraries/chain/controller.cpp                | 29 +++++++-------
 .../chain/include/eosio/chain/controller.hpp  |  8 ++--
 .../testing/include/eosio/testing/tester.hpp  | 12 +++---
 libraries/testing/tester.cpp                  | 11 +++---
 plugins/producer_plugin/producer_plugin.cpp   | 39 ++++++++++++-------
 unittests/block_tests.cpp                     | 14 +++----
 unittests/forked_tests.cpp                    | 14 +++----
 7 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 348aab87635..61ce4778420 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -701,7 +701,7 @@ struct controller_impl {
               pending_head = fork_db.pending_head()
          ) {
             wlog( "applying branch from fork database ending with block: ${id}", ("id", pending_head->id) );
-            maybe_switch_forks( pending_head, controller::block_status::complete );
+            maybe_switch_forks( pending_head, controller::block_status::complete, forked_branch_callback() );
          }
       }
 
@@ -1677,7 +1677,6 @@ struct controller_impl {
             });
          }
 
-         unapplied_transactions.clear_applied( bsp );
          emit( self.accepted_block, bsp );
 
          if( add_to_fork_db ) {
@@ -1884,7 +1883,7 @@ struct controller_impl {
       } );
    }
 
-   void push_block( std::future<block_state_ptr>& block_state_future ) {
+   void push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& forked_branch_cb ) {
       controller::block_status s = controller::block_status::complete;
       EOS_ASSERT(!pending, block_validate_exception, "it is not valid to push a block when there is a pending block");
 
@@ -1906,7 +1905,7 @@ struct controller_impl {
          emit( self.accepted_block_header, bsp );
 
          if( read_mode != db_read_mode::IRREVERSIBLE ) {
-            maybe_switch_forks( fork_db.pending_head(), s );
+            maybe_switch_forks( fork_db.pending_head(), s, forked_branch_cb );
          } else {
             log_irreversible();
          }
@@ -1959,13 +1958,13 @@ struct controller_impl {
          } else {
             EOS_ASSERT( read_mode != db_read_mode::IRREVERSIBLE, block_validate_exception,
                         "invariant failure: cannot replay reversible blocks while in irreversible mode" );
-            maybe_switch_forks( bsp, s );
+            maybe_switch_forks( bsp, s, forked_branch_callback() );
          }
 
       } FC_LOG_AND_RETHROW( )
    }
 
-   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s ) {
+   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s, const forked_branch_callback& forked_branch_cb ) {
       bool head_changed = true;
       if( new_head->header.previous == head->id ) {
          try {
@@ -1987,9 +1986,9 @@ struct controller_impl {
                pop_block();
             }
             EOS_ASSERT( self.head_block_id() == branches.second.back()->header.previous, fork_database_exception,
-                        "loss of sync between fork_db and chainbase during fork switch" ); // _should_ never fail
+                     "loss of sync between fork_db and chainbase during fork switch" ); // _should_ never fail
 
-            unapplied_transactions.add_forked( branches.second );
+            if( forked_branch_cb ) forked_branch_cb( branches.second );
          }
 
          for( auto ritr = branches.first.rbegin(); ritr != branches.first.rend(); ++ritr ) {
@@ -2037,12 +2036,14 @@ struct controller_impl {
 
    } /// push_block
 
-   void abort_block() {
+   vector<transaction_metadata_ptr> abort_block() {
+      vector<transaction_metadata_ptr> applied_trxs;
       if( pending ) {
-         unapplied_transactions.add_aborted( pending->extract_trx_metas() );
+         applied_trxs = pending->extract_trx_metas();
          pending.reset();
          protocol_features.popped_blocks_to( head->block_num );
       }
+      return applied_trxs;
    }
 
    checksum256_type calculate_action_merkle() {
@@ -2550,8 +2551,8 @@ void controller::commit_block() {
    my->commit_block(true);
 }
 
-void controller::abort_block() {
-   my->abort_block();
+vector<transaction_metadata_ptr> controller::abort_block() {
+   return my->abort_block();
 }
 
 boost::asio::io_context& controller::get_thread_pool() {
@@ -2567,10 +2568,10 @@ std::future<block_state_ptr> controller::create_block_state_future( const signed
    return my->create_block_state_future( b );
 }
 
-void controller::push_block( std::future<block_state_ptr>& block_state_future ) {
+void controller::push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& forked_branch_cb ) {
    validate_db_available_size();
    validate_reversible_available_size();
-   my->push_block( block_state_future );
+   my->push_block( block_state_future, forked_branch_cb );
 }
 
 transaction_trace_ptr controller::push_transaction( const transaction_metadata_ptr& trx, fc::time_point deadline, uint32_t billed_cpu_time_us ) {
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 4419dfe00d9..c08d6675c99 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -37,6 +37,7 @@ namespace eosio { namespace chain {
    class account_object;
    using resource_limits::resource_limits_manager;
    using apply_handler = std::function<void(apply_context&)>;
+   using forked_branch_callback = std::function<void(const branch_type&)>;
 
    class fork_database;
 
@@ -129,9 +130,9 @@ namespace eosio { namespace chain {
                            const vector<digest_type>& new_protocol_feature_activations );
 
          /**
-          * Aborts current block if one is pending and captures applied transactions
+          * @return transactions applied in aborted block
           */
-         void abort_block();
+         vector<transaction_metadata_ptr> abort_block();
 
          /**
           *
@@ -152,8 +153,9 @@ namespace eosio { namespace chain {
 
          /**
           * @param block_state_future provide from call to create_block_state_future
+          * @param cb calls cb with forked applied transactions for each forked block
           */
-         void push_block( std::future<block_state_ptr>& block_state_future );
+         void push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& cb );
 
          boost::asio::io_context& get_thread_pool();
 
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 4c82fe9d723..4aab7510774 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -129,6 +129,7 @@ namespace eosio { namespace testing {
           * @return
           */
          vector<transaction_id_type> get_scheduled_transactions() const;
+         unapplied_transaction_queue& get_unapplied_transaction_queue() { return unapplied_transactions; }
 
          transaction_trace_ptr    push_transaction( packed_transaction& trx, fc::time_point deadline = fc::time_point::maximum(), uint32_t billed_cpu_time_us = DEFAULT_BILLED_CPU_TIME_US );
          transaction_trace_ptr    push_transaction( signed_transaction& trx, fc::time_point deadline = fc::time_point::maximum(), uint32_t billed_cpu_time_us = DEFAULT_BILLED_CPU_TIME_US, bool no_throw = false );
@@ -327,6 +328,7 @@ namespace eosio { namespace testing {
          controller::config                            cfg;
          map<transaction_id_type, transaction_receipt> chain_transactions;
          map<account_name, block_id_type>              last_produced_block;
+         unapplied_transaction_queue                   unapplied_transactions;
 
       public:
          vector<digest_type>                           protocol_features_to_be_activated_wo_preactivation;
@@ -351,7 +353,7 @@ namespace eosio { namespace testing {
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-         control->abort_block();
+         unapplied_transactions.add_aborted( control->abort_block() );
          return _produce_block(skip_time, true);
       }
 
@@ -432,7 +434,7 @@ namespace eosio { namespace testing {
       signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
          auto sb = _produce_block(skip_time, false);
          auto bsf = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bsf );
+         validating_node->push_block( bsf, forked_branch_callback() );
 
          return sb;
       }
@@ -443,14 +445,14 @@ namespace eosio { namespace testing {
 
       void validate_push_block(const signed_block_ptr& sb) {
          auto bs = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bs );
+         validating_node->push_block( bs, forked_branch_callback() );
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
-         control->abort_block();
+         unapplied_transactions.add_aborted( control->abort_block() );
          auto sb = _produce_block(skip_time, true);
          auto bsf = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bsf );
+         validating_node->push_block( bsf, forked_branch_callback() );
 
          return sb;
       }
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 03e14392074..bc0dc42f6c2 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -253,8 +253,10 @@ namespace eosio { namespace testing {
 
    void base_tester::push_block(signed_block_ptr b) {
       auto bsf = control->create_block_state_future(b);
-      control->abort_block();
-      control->push_block( bsf );
+      unapplied_transactions.add_aborted( control->abort_block() );
+      control->push_block( bsf, [this]( const branch_type& forked_branch ) {
+         unapplied_transactions.add_forked( forked_branch );
+      } );
 
       auto itr = last_produced_block.find(b->producer);
       if (itr == last_produced_block.end() || block_header::num_from_id(b->id()) > block_header::num_from_id(itr->second)) {
@@ -266,7 +268,6 @@ namespace eosio { namespace testing {
       auto head = control->head_block_state();
       auto head_time = control->head_block_time();
       auto next_time = head_time + skip_time;
-      auto& unapplied_transactions = control->unapplied_transaction_queue();
 
       if( !control->is_building_block() || control->pending_block_time() != next_time ) {
          _start_block( next_time );
@@ -308,7 +309,7 @@ namespace eosio { namespace testing {
          last_produced_block_num = std::max(control->last_irreversible_block_num(), block_header::num_from_id(itr->second));
       }
 
-      control->abort_block();
+      unapplied_transactions.add_aborted( control->abort_block() );
 
       vector<digest_type> feature_to_be_activated;
       // First add protocol features to be activated WITHOUT preactivation
@@ -965,7 +966,7 @@ namespace eosio { namespace testing {
             if( block ) { //&& !b.control->is_known_block(block->id()) ) {
                auto bsf = b.control->create_block_state_future( block );
                b.control->abort_block();
-               b.control->push_block(bsf); //, eosio::chain::validation_steps::created_block);
+               b.control->push_block(bsf, forked_branch_callback()); //, eosio::chain::validation_steps::created_block);
             }
          }
       };
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 1f870f18169..7208d1db4a9 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -221,6 +221,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       transaction_id_with_expiry_index                         _blacklisted_transactions;
       pending_snapshot_index                                   _pending_snapshot_index;
 
+      fc::optional<scoped_connection>                          _accepted_block_connection;
       fc::optional<scoped_connection>                          _accepted_block_header_connection;
       fc::optional<scoped_connection>                          _irreversible_block_connection;
 
@@ -260,6 +261,11 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          return itr->second;
       }
 
+      void on_block( const block_state_ptr& bsp ) {
+         chain::controller& chain = chain_plug->chain();
+         chain.unapplied_transaction_queue().clear_applied( bsp );
+      }
+
       void on_block_header( const block_state_ptr& bsp ) {
          consider_new_watermark( bsp->header.producer, bsp->block_num );
       }
@@ -342,7 +348,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          auto bsf = chain.create_block_state_future( block );
 
          // abort the pending block
-         chain.abort_block();
+         chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
 
          // exceptions throw out, make sure we restart our loop
          auto ensure = fc::make_scoped_exit([this](){
@@ -352,7 +358,9 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          // push the new block
          bool except = false;
          try {
-            chain.push_block( bsf );
+            chain.push_block( bsf, [&chain]( const branch_type& forked_branch ) {
+               chain.unapplied_transaction_queue().add_forked( forked_branch );
+            } );
          } catch ( const guard_exception& e ) {
             chain_plugin::handle_guard_exception(e);
             return;
@@ -864,6 +872,7 @@ void producer_plugin::plugin_startup()
    EOS_ASSERT( my->_producers.empty() || chain.get_validation_mode() == chain::validation_mode::FULL, plugin_config_exception,
               "node cannot have any producer-name configured because block production is not safe when validation_mode is not \"full\"" );
 
+   my->_accepted_block_connection.emplace(chain.accepted_block.connect( [this]( const auto& bsp ){ my->on_block( bsp ); } ));
    my->_accepted_block_header_connection.emplace(chain.accepted_block_header.connect( [this]( const auto& bsp ){ my->on_block_header( bsp ); } ));
    my->_irreversible_block_connection.emplace(chain.irreversible_block.connect( [this]( const auto& bsp ){ my->on_irreversible_block( bsp->block ); } ));
 
@@ -901,6 +910,7 @@ void producer_plugin::plugin_shutdown() {
    if( my->_thread_pool ) {
       my->_thread_pool->stop();
    }
+   my->_accepted_block_connection.reset();
    my->_accepted_block_header_connection.reset();
    my->_irreversible_block_connection.reset();
 }
@@ -921,7 +931,7 @@ void producer_plugin::resume() {
    //
    if (my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      chain.abort_block();
+      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 }
@@ -960,7 +970,7 @@ void producer_plugin::update_runtime_options(const runtime_options& options) {
 
    if (check_speculating && my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      chain.abort_block();
+      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 
@@ -1036,7 +1046,7 @@ producer_plugin::integrity_hash_information producer_plugin::get_integrity_hash(
 
    if (chain.is_building_block()) {
       // abort the pending block
-      chain.abort_block();
+      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
    } else {
       reschedule.cancel();
    }
@@ -1065,7 +1075,7 @@ void producer_plugin::create_snapshot(producer_plugin::next_function<producer_pl
 
       if (chain.is_building_block()) {
          // abort the pending block
-         chain.abort_block();
+         chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
       } else {
          reschedule.cancel();
       }
@@ -1398,7 +1408,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          blocks_to_confirm = (uint16_t)(std::min<uint32_t>(blocks_to_confirm, (uint32_t)(hbs->block_num - hbs->dpos_irreversible_blocknum)));
       }
 
-      chain.abort_block();
+      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
 
       auto features_to_activate = chain.get_preactivated_protocol_features();
       if( _pending_block_mode == pending_block_mode::producing && _protocol_features_to_activate.size() > 0 ) {
@@ -1491,16 +1501,15 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
 
       try {
          size_t orig_pending_txn_size = _pending_incoming_transactions.size();
-         unapplied_transaction_queue& unapplied = chain.unapplied_transaction_queue();
 
          // Processing unapplied transactions...
-         if( !unapplied.empty() ) {
+         if( !chain.unapplied_transaction_queue().empty() ) {
             int num_applied = 0, num_failed = 0, num_processed = 0;
-            auto unapplied_trxs_size = unapplied.size();
+            auto unapplied_trxs_size = chain.unapplied_transaction_queue().size();
             auto itr     = (_pending_block_mode == pending_block_mode::producing) ?
-                           unapplied.begin() : unapplied.persisted_begin();
+                           chain.unapplied_transaction_queue().begin() : chain.unapplied_transaction_queue().persisted_begin();
             auto end_itr = (_pending_block_mode == pending_block_mode::producing) ?
-                           unapplied.end()   : unapplied.persisted_end();
+                           chain.unapplied_transaction_queue().end()   : chain.unapplied_transaction_queue().persisted_end();
             while( itr != end_itr ) {
                if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
                if( exhausted ) break;
@@ -1525,12 +1534,12 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                      } else {
                         // this failed our configured maximum transaction time, we don't want to replay it
                         ++num_failed;
-                        itr = unapplied.erase( itr );
+                        itr = chain.unapplied_transaction_queue().erase( itr );
                         continue;
                      }
                   } else {
                      ++num_applied;
-                     itr = unapplied.erase( itr );
+                     itr = chain.unapplied_transaction_queue().erase( itr );
                      continue;
                   }
                } LOG_AND_DROP();
@@ -1811,7 +1820,7 @@ bool producer_plugin_impl::maybe_produce_block() {
 
    fc_dlog(_log, "Aborting block due to produce_block error");
    chain::controller& chain = chain_plug->chain();
-   chain.abort_block();
+   chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
    return false;
 }
 
diff --git a/unittests/block_tests.cpp b/unittests/block_tests.cpp
index c3d3e8ebcdf..7926455ffbc 100644
--- a/unittests/block_tests.cpp
+++ b/unittests/block_tests.cpp
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(block_with_invalid_tx_test)
    tester validator;
    auto bs = validator.control->create_block_state_future( copy_b );
    validator.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs ), fc::exception ,
+   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs, forked_branch_callback() ), fc::exception ,
    [] (const fc::exception &e)->bool {
       return e.code() == account_name_exists_exception::code_value ;
    }) ;
@@ -217,11 +217,11 @@ BOOST_FIXTURE_TEST_CASE( abort_block_transactions, validating_tester) { try {
 
       control->get_account( a ); // throws if it does not exist
 
-      control->abort_block();
+      vector<transaction_metadata_ptr> unapplied_trxs = control->abort_block();
 
-      // verify transaction added to unapplied in abort_block()
-      BOOST_REQUIRE_EQUAL( 1,  control->unapplied_transaction_queue().size() );
-      BOOST_REQUIRE( control->unapplied_transaction_queue().get_trx( trx.id() ) != nullptr );
+      // verify transaction returned from abort_block()
+      BOOST_REQUIRE_EQUAL( 1,  unapplied_trxs.size() );
+      BOOST_REQUIRE_EQUAL( trx.id(), unapplied_trxs.at(0)->id() );
 
       // account does not exist block was aborted which had transaction
       BOOST_REQUIRE_EXCEPTION(control->get_account( a ), fc::exception,
@@ -268,9 +268,9 @@ BOOST_FIXTURE_TEST_CASE( abort_block_transactions_tester, validating_tester) { t
 
       control->get_account( a ); // throws if it does not exist
 
-      control->abort_block();
+      vector<transaction_metadata_ptr> unapplied_trxs = control->abort_block(); // should be empty now
 
-      BOOST_REQUIRE_EQUAL( 0,  control->unapplied_transaction_queue().size() ); // should be empty now
+      BOOST_REQUIRE_EQUAL( 0,  unapplied_trxs.size() );
 
    } FC_LOG_AND_RETHROW() }
 
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index b114d1fd872..a1ac5c68705 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE( forking ) try {
    bad_block.transaction_mroot = bad_block.previous;
    auto bad_block_bs = c.control->create_block_state_future( std::make_shared<signed_block>(std::move(bad_block)) );
    c.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs ), fc::exception,
+   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs, forked_branch_callback() ), fc::exception,
       [] (const fc::exception &ex)->bool {
          return ex.to_detail_string().find("block signed by unexpected key") != std::string::npos;
       });
@@ -638,12 +638,12 @@ BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
    }
 
    // verify transaction on fork is reported by push_block in order
-   BOOST_REQUIRE_EQUAL( 3, c.control->unapplied_transaction_queue().size() );
-   BOOST_REQUIRE_EQUAL( trace1->id, c.control->unapplied_transaction_queue().begin()->id() );
-   c.control->unapplied_transaction_queue().erase( c.control->unapplied_transaction_queue().begin() );
-   BOOST_REQUIRE_EQUAL( trace2->id, c.control->unapplied_transaction_queue().begin()->id() );
-   c.control->unapplied_transaction_queue().erase( c.control->unapplied_transaction_queue().begin() );
-   BOOST_REQUIRE_EQUAL( trace3->id, c.control->unapplied_transaction_queue().begin()->id() );
+   BOOST_REQUIRE_EQUAL( 3, c.get_unapplied_transaction_queue().size() );
+   BOOST_REQUIRE_EQUAL( trace1->id, c.get_unapplied_transaction_queue().begin()->id() );
+   c.get_unapplied_transaction_queue().erase( c.get_unapplied_transaction_queue().begin() );
+   BOOST_REQUIRE_EQUAL( trace2->id, c.get_unapplied_transaction_queue().begin()->id() );
+   c.get_unapplied_transaction_queue().erase( c.get_unapplied_transaction_queue().begin() );
+   BOOST_REQUIRE_EQUAL( trace3->id, c.get_unapplied_transaction_queue().begin()->id() );
 
 } FC_LOG_AND_RETHROW()
 

From ba24da05aff56ece47bcdb0de76173fde4226fda Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 30 Aug 2019 14:15:23 -0500
Subject: [PATCH 1059/1648] Revert "Move unapplied_transaction_queue to
 controller"

This reverts commit e3a240e181c70569a9dcc6e294c32609bb1a087b.
---
 libraries/chain/controller.cpp                |  7 ---
 .../chain/include/eosio/chain/controller.hpp  |  3 --
 plugins/producer_plugin/producer_plugin.cpp   | 43 ++++++++++---------
 3 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 61ce4778420..24ba2aa191d 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -25,7 +25,6 @@
 #include <eosio/chain/chain_snapshot.hpp>
 #include <eosio/chain/thread_utils.hpp>
 #include <eosio/chain/platform_timer.hpp>
-#include <eosio/chain/unapplied_transaction_queue.hpp>
 
 #include <chainbase/chainbase.hpp>
 #include <fc/io/json.hpp>
@@ -218,7 +217,6 @@ struct controller_impl {
    chainbase::database            db;
    chainbase::database            reversible_blocks; ///< a special database to persist blocks that have successfully been applied but are still reversible
    block_log                      blog;
-   unapplied_transaction_queue    unapplied_transactions;
    optional<pending_state>        pending;
    block_state_ptr                head;
    fork_database                  fork_db;
@@ -2559,11 +2557,6 @@ boost::asio::io_context& controller::get_thread_pool() {
    return my->thread_pool.get_executor();
 }
 
-unapplied_transaction_queue& controller::unapplied_transaction_queue() {
-   return my->unapplied_transactions;
-}
-
-
 std::future<block_state_ptr> controller::create_block_state_future( const signed_block_ptr& b ) {
    return my->create_block_state_future( b );
 }
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index c08d6675c99..b57100fa2fa 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -20,7 +20,6 @@ namespace boost { namespace asio {
 namespace eosio { namespace chain {
 
    class authorization_manager;
-   class unapplied_transaction_queue;
 
    namespace resource_limits {
       class resource_limits_manager;
@@ -159,8 +158,6 @@ namespace eosio { namespace chain {
 
          boost::asio::io_context& get_thread_pool();
 
-         unapplied_transaction_queue& unapplied_transaction_queue();
-
          const chainbase::database& db()const;
 
          const fork_database& fork_db()const;
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 7208d1db4a9..5a12b8ac3a0 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/map.hpp>
+#include <boost/function_output_iterator.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/hashed_index.hpp>
@@ -194,6 +195,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       boost::asio::deadline_timer                               _timer;
       std::map<chain::account_name, uint32_t>                   _producer_watermarks;
       pending_block_mode                                        _pending_block_mode;
+      unapplied_transaction_queue                               _unapplied_transactions;
       fc::optional<named_thread_pool>                           _thread_pool;
 
       std::atomic<int32_t>                                      _max_transaction_time_ms; // modified by app thread, read by net_plugin thread pool
@@ -262,8 +264,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       }
 
       void on_block( const block_state_ptr& bsp ) {
-         chain::controller& chain = chain_plug->chain();
-         chain.unapplied_transaction_queue().clear_applied( bsp );
+         _unapplied_transactions.clear_applied( bsp );
       }
 
       void on_block_header( const block_state_ptr& bsp ) {
@@ -348,7 +349,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          auto bsf = chain.create_block_state_future( block );
 
          // abort the pending block
-         chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+         _unapplied_transactions.add_aborted( chain.abort_block() );
 
          // exceptions throw out, make sure we restart our loop
          auto ensure = fc::make_scoped_exit([this](){
@@ -358,8 +359,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          // push the new block
          bool except = false;
          try {
-            chain.push_block( bsf, [&chain]( const branch_type& forked_branch ) {
-               chain.unapplied_transaction_queue().add_forked( forked_branch );
+            chain.push_block( bsf, [this]( const branch_type& forked_branch ) {
+               _unapplied_transactions.add_forked( forked_branch );
             } );
          } catch ( const guard_exception& e ) {
             chain_plugin::handle_guard_exception(e);
@@ -539,7 +540,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                if( persist_until_expired ) {
                   // if this trx didnt fail/soft-fail and the persist flag is set, store its ID so that we can
                   // ensure its applied to all future speculative blocks as well.
-                  chain.unapplied_transaction_queue().add_persisted( trx );
+                  _unapplied_transactions.add_persisted( trx );
                }
                send_response( trace );
             }
@@ -737,7 +738,7 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
       (chain.get_read_mode() != chain::db_read_mode::SPECULATIVE) ? unapplied_transaction_queue::process_mode::non_speculative :
          my->_producers.empty() ? unapplied_transaction_queue::process_mode::speculative_non_producer :
             unapplied_transaction_queue::process_mode::speculative_producer;
-   chain.unapplied_transaction_queue().set_mode( unapplied_mode );
+   my->_unapplied_transactions.set_mode( unapplied_mode );
 
    if( options.count("private-key") )
    {
@@ -931,7 +932,7 @@ void producer_plugin::resume() {
    //
    if (my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+      my->_unapplied_transactions.add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 }
@@ -970,7 +971,7 @@ void producer_plugin::update_runtime_options(const runtime_options& options) {
 
    if (check_speculating && my->_pending_block_mode == pending_block_mode::speculating) {
       chain::controller& chain = my->chain_plug->chain();
-      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+      my->_unapplied_transactions.add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 
@@ -1046,7 +1047,7 @@ producer_plugin::integrity_hash_information producer_plugin::get_integrity_hash(
 
    if (chain.is_building_block()) {
       // abort the pending block
-      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+      my->_unapplied_transactions.add_aborted( chain.abort_block() );
    } else {
       reschedule.cancel();
    }
@@ -1075,7 +1076,7 @@ void producer_plugin::create_snapshot(producer_plugin::next_function<producer_pl
 
       if (chain.is_building_block()) {
          // abort the pending block
-         chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+         my->_unapplied_transactions.add_aborted( chain.abort_block() );
       } else {
          reschedule.cancel();
       }
@@ -1408,7 +1409,7 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          blocks_to_confirm = (uint16_t)(std::min<uint32_t>(blocks_to_confirm, (uint32_t)(hbs->block_num - hbs->dpos_irreversible_blocknum)));
       }
 
-      chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+      _unapplied_transactions.add_aborted( chain.abort_block() );
 
       auto features_to_activate = chain.get_preactivated_protocol_features();
       if( _pending_block_mode == pending_block_mode::producing && _protocol_features_to_activate.size() > 0 ) {
@@ -1465,8 +1466,8 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
       // remove all expired transactions
       size_t num_expired_persistent = 0;
       size_t num_expired_other = 0;
-      size_t orig_count = chain.unapplied_transaction_queue().size();
-      exhausted = !chain.unapplied_transaction_queue().clear_expired( pending_block_time, preprocess_deadline,
+      size_t orig_count = _unapplied_transactions.size();
+      exhausted = !_unapplied_transactions.clear_expired( pending_block_time, preprocess_deadline,
                      [&num_expired_persistent, &num_expired_other, pbm = _pending_block_mode,
                       &chain, has_producers = !_producers.empty()]( const transaction_id_type& txid, trx_enum_type trx_type ) {
                if( trx_type == trx_enum_type::persisted ) {
@@ -1503,13 +1504,13 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          size_t orig_pending_txn_size = _pending_incoming_transactions.size();
 
          // Processing unapplied transactions...
-         if( !chain.unapplied_transaction_queue().empty() ) {
+         if( !_unapplied_transactions.empty() ) {
             int num_applied = 0, num_failed = 0, num_processed = 0;
-            auto unapplied_trxs_size = chain.unapplied_transaction_queue().size();
+            auto unapplied_trxs_size = _unapplied_transactions.size();
             auto itr     = (_pending_block_mode == pending_block_mode::producing) ?
-                           chain.unapplied_transaction_queue().begin() : chain.unapplied_transaction_queue().persisted_begin();
+                  _unapplied_transactions.begin() : _unapplied_transactions.persisted_begin();
             auto end_itr = (_pending_block_mode == pending_block_mode::producing) ?
-                           chain.unapplied_transaction_queue().end()   : chain.unapplied_transaction_queue().persisted_end();
+                  _unapplied_transactions.end()   : _unapplied_transactions.persisted_end();
             while( itr != end_itr ) {
                if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
                if( exhausted ) break;
@@ -1534,12 +1535,12 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                      } else {
                         // this failed our configured maximum transaction time, we don't want to replay it
                         ++num_failed;
-                        itr = chain.unapplied_transaction_queue().erase( itr );
+                        itr = _unapplied_transactions.erase( itr );
                         continue;
                      }
                   } else {
                      ++num_applied;
-                     itr = chain.unapplied_transaction_queue().erase( itr );
+                     itr = _unapplied_transactions.erase( itr );
                      continue;
                   }
                } LOG_AND_DROP();
@@ -1820,7 +1821,7 @@ bool producer_plugin_impl::maybe_produce_block() {
 
    fc_dlog(_log, "Aborting block due to produce_block error");
    chain::controller& chain = chain_plug->chain();
-   chain.unapplied_transaction_queue().add_aborted( chain.abort_block() );
+   _unapplied_transactions.add_aborted( chain.abort_block() );
    return false;
 }
 

From 6a65287b7ccf5d56352261b86384081f1d8019ff Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 30 Aug 2019 14:57:36 -0500
Subject: [PATCH 1060/1648] Pass lambda to push_block for access to
 unapplied_transaction_queue cache in apply_block

---
 libraries/chain/controller.cpp                | 34 +++++++++++--------
 .../chain/include/eosio/chain/controller.hpp  |  7 +++-
 .../testing/include/eosio/testing/tester.hpp  |  6 ++--
 libraries/testing/tester.cpp                  |  4 ++-
 plugins/producer_plugin/producer_plugin.cpp   |  2 ++
 unittests/block_tests.cpp                     |  2 +-
 unittests/forked_tests.cpp                    |  2 +-
 7 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 24ba2aa191d..2b8f2c6a998 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -394,7 +394,7 @@ struct controller_impl {
 
          for( auto bitr = branch.rbegin(); bitr != branch.rend(); ++bitr ) {
             if( read_mode == db_read_mode::IRREVERSIBLE ) {
-               apply_block( *bitr, controller::block_status::complete );
+               apply_block( *bitr, controller::block_status::complete, trx_meta_cache_lookup{} );
                head = (*bitr);
                fork_db.mark_valid( head );
             }
@@ -699,7 +699,7 @@ struct controller_impl {
               pending_head = fork_db.pending_head()
          ) {
             wlog( "applying branch from fork database ending with block: ${id}", ("id", pending_head->id) );
-            maybe_switch_forks( pending_head, controller::block_status::complete, forked_branch_callback() );
+            maybe_switch_forks( pending_head, controller::block_status::complete, forked_branch_callback{}, trx_meta_cache_lookup{} );
          }
       }
 
@@ -1752,7 +1752,7 @@ struct controller_impl {
       }
    }
 
-   void apply_block( const block_state_ptr& bsp, controller::block_status s )
+   void apply_block( const block_state_ptr& bsp, controller::block_status s, const trx_meta_cache_lookup& trx_lookup )
    { try {
       try {
          const signed_block_ptr& b = bsp->block;
@@ -1773,7 +1773,7 @@ struct controller_impl {
             for( const auto& receipt : b->transactions ) {
                if( receipt.trx.contains<packed_transaction>()) {
                   auto& pt = receipt.trx.get<packed_transaction>();
-                  const transaction_metadata_ptr& trx_meta_ptr = unapplied_transactions.get_trx( pt.id() );
+                  const transaction_metadata_ptr& trx_meta_ptr = trx_lookup( pt.id() );
                   if( trx_meta_ptr && ( skip_auth_checks || !trx_meta_ptr->recovered_keys().empty() ) ) {
                      trx_metas.emplace_back( trx_meta_ptr, recover_keys_future{} );
                   } else if( skip_auth_checks ) {
@@ -1881,7 +1881,9 @@ struct controller_impl {
       } );
    }
 
-   void push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& forked_branch_cb ) {
+   void push_block( std::future<block_state_ptr>& block_state_future,
+                    const forked_branch_callback& forked_branch_cb, const trx_meta_cache_lookup& trx_lookup )
+   {
       controller::block_status s = controller::block_status::complete;
       EOS_ASSERT(!pending, block_validate_exception, "it is not valid to push a block when there is a pending block");
 
@@ -1903,7 +1905,7 @@ struct controller_impl {
          emit( self.accepted_block_header, bsp );
 
          if( read_mode != db_read_mode::IRREVERSIBLE ) {
-            maybe_switch_forks( fork_db.pending_head(), s, forked_branch_cb );
+            maybe_switch_forks( fork_db.pending_head(), s, forked_branch_cb, trx_lookup );
          } else {
             log_irreversible();
          }
@@ -1942,7 +1944,7 @@ struct controller_impl {
          emit( self.accepted_block_header, bsp );
 
          if( s == controller::block_status::irreversible ) {
-            apply_block( bsp, s );
+            apply_block( bsp, s, trx_meta_cache_lookup{} );
             head = bsp;
 
             // On replay, log_irreversible is not called and so no irreversible_block signal is emittted.
@@ -1956,17 +1958,19 @@ struct controller_impl {
          } else {
             EOS_ASSERT( read_mode != db_read_mode::IRREVERSIBLE, block_validate_exception,
                         "invariant failure: cannot replay reversible blocks while in irreversible mode" );
-            maybe_switch_forks( bsp, s, forked_branch_callback() );
+            maybe_switch_forks( bsp, s, forked_branch_callback{}, trx_meta_cache_lookup{} );
          }
 
       } FC_LOG_AND_RETHROW( )
    }
 
-   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s, const forked_branch_callback& forked_branch_cb ) {
+   void maybe_switch_forks( const block_state_ptr& new_head, controller::block_status s,
+                            const forked_branch_callback& forked_branch_cb, const trx_meta_cache_lookup& trx_lookup )
+   {
       bool head_changed = true;
       if( new_head->header.previous == head->id ) {
          try {
-            apply_block( new_head, s );
+            apply_block( new_head, s, trx_lookup );
             fork_db.mark_valid( new_head );
             head = new_head;
          } catch ( const fc::exception& e ) {
@@ -1993,7 +1997,7 @@ struct controller_impl {
             optional<fc::exception> except;
             try {
                apply_block( *ritr, (*ritr)->is_valid() ? controller::block_status::validated
-                                                       : controller::block_status::complete );
+                                                       : controller::block_status::complete, trx_lookup );
                fork_db.mark_valid( *ritr );
                head = *ritr;
             } catch (const fc::exception& e) {
@@ -2017,7 +2021,7 @@ struct controller_impl {
 
                // re-apply good blocks
                for( auto ritr = branches.second.rbegin(); ritr != branches.second.rend(); ++ritr ) {
-                  apply_block( *ritr, controller::block_status::validated /* we previously validated these blocks*/ );
+                  apply_block( *ritr, controller::block_status::validated /* we previously validated these blocks*/, trx_lookup );
                   head = *ritr;
                }
                throw *except;
@@ -2561,10 +2565,12 @@ std::future<block_state_ptr> controller::create_block_state_future( const signed
    return my->create_block_state_future( b );
 }
 
-void controller::push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& forked_branch_cb ) {
+void controller::push_block( std::future<block_state_ptr>& block_state_future,
+                             const forked_branch_callback& forked_branch_cb, const trx_meta_cache_lookup& trx_lookup )
+{
    validate_db_available_size();
    validate_reversible_available_size();
-   my->push_block( block_state_future, forked_branch_cb );
+   my->push_block( block_state_future, forked_branch_cb, trx_lookup );
 }
 
 transaction_trace_ptr controller::push_transaction( const transaction_metadata_ptr& trx, fc::time_point deadline, uint32_t billed_cpu_time_us ) {
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index b57100fa2fa..2561c30916f 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -37,6 +37,8 @@ namespace eosio { namespace chain {
    using resource_limits::resource_limits_manager;
    using apply_handler = std::function<void(apply_context&)>;
    using forked_branch_callback = std::function<void(const branch_type&)>;
+   // lookup transaction_metadata via supplied function to avoid re-creation
+   using trx_meta_cache_lookup = std::function<transaction_metadata_ptr( const transaction_id_type&)>;
 
    class fork_database;
 
@@ -153,8 +155,11 @@ namespace eosio { namespace chain {
          /**
           * @param block_state_future provide from call to create_block_state_future
           * @param cb calls cb with forked applied transactions for each forked block
+          * @param trx_lookup user provided lookup function for externally cached transaction_metadata
           */
-         void push_block( std::future<block_state_ptr>& block_state_future, const forked_branch_callback& cb );
+         void push_block( std::future<block_state_ptr>& block_state_future,
+                          const forked_branch_callback& cb,
+                          const trx_meta_cache_lookup& trx_lookup );
 
          boost::asio::io_context& get_thread_pool();
 
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 4aab7510774..0cb969d82f5 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -434,7 +434,7 @@ namespace eosio { namespace testing {
       signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
          auto sb = _produce_block(skip_time, false);
          auto bsf = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bsf, forked_branch_callback() );
+         validating_node->push_block( bsf, forked_branch_callback{}, trx_meta_cache_lookup{} );
 
          return sb;
       }
@@ -445,14 +445,14 @@ namespace eosio { namespace testing {
 
       void validate_push_block(const signed_block_ptr& sb) {
          auto bs = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bs, forked_branch_callback() );
+         validating_node->push_block( bs, forked_branch_callback{}, trx_meta_cache_lookup{} );
       }
 
       signed_block_ptr produce_empty_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
          unapplied_transactions.add_aborted( control->abort_block() );
          auto sb = _produce_block(skip_time, true);
          auto bsf = validating_node->create_block_state_future( sb );
-         validating_node->push_block( bsf, forked_branch_callback() );
+         validating_node->push_block( bsf, forked_branch_callback{}, trx_meta_cache_lookup{} );
 
          return sb;
       }
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index bc0dc42f6c2..a793571ed91 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -256,6 +256,8 @@ namespace eosio { namespace testing {
       unapplied_transactions.add_aborted( control->abort_block() );
       control->push_block( bsf, [this]( const branch_type& forked_branch ) {
          unapplied_transactions.add_forked( forked_branch );
+      }, [this]( const transaction_id_type& id ) {
+         return unapplied_transactions.get_trx( id );
       } );
 
       auto itr = last_produced_block.find(b->producer);
@@ -966,7 +968,7 @@ namespace eosio { namespace testing {
             if( block ) { //&& !b.control->is_known_block(block->id()) ) {
                auto bsf = b.control->create_block_state_future( block );
                b.control->abort_block();
-               b.control->push_block(bsf, forked_branch_callback()); //, eosio::chain::validation_steps::created_block);
+               b.control->push_block(bsf, forked_branch_callback{}, trx_meta_cache_lookup{}); //, eosio::chain::validation_steps::created_block);
             }
          }
       };
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 5a12b8ac3a0..1448831a587 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -361,6 +361,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          try {
             chain.push_block( bsf, [this]( const branch_type& forked_branch ) {
                _unapplied_transactions.add_forked( forked_branch );
+            }, [this]( const transaction_id_type& id ) {
+               return _unapplied_transactions.get_trx( id );
             } );
          } catch ( const guard_exception& e ) {
             chain_plugin::handle_guard_exception(e);
diff --git a/unittests/block_tests.cpp b/unittests/block_tests.cpp
index 7926455ffbc..023907ce3e6 100644
--- a/unittests/block_tests.cpp
+++ b/unittests/block_tests.cpp
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(block_with_invalid_tx_test)
    tester validator;
    auto bs = validator.control->create_block_state_future( copy_b );
    validator.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs, forked_branch_callback() ), fc::exception ,
+   BOOST_REQUIRE_EXCEPTION(validator.control->push_block( bs, forked_branch_callback{}, trx_meta_cache_lookup{} ), fc::exception ,
    [] (const fc::exception &e)->bool {
       return e.code() == account_name_exists_exception::code_value ;
    }) ;
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index a1ac5c68705..b26a1668ebe 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE( forking ) try {
    bad_block.transaction_mroot = bad_block.previous;
    auto bad_block_bs = c.control->create_block_state_future( std::make_shared<signed_block>(std::move(bad_block)) );
    c.control->abort_block();
-   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs, forked_branch_callback() ), fc::exception,
+   BOOST_REQUIRE_EXCEPTION(c.control->push_block( bad_block_bs, forked_branch_callback{}, trx_meta_cache_lookup{} ), fc::exception,
       [] (const fc::exception &ex)->bool {
          return ex.to_detail_string().find("block signed by unexpected key") != std::string::npos;
       });

From 0b00226d387a256d3d448db740f763f72ffb85cf Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 30 Aug 2019 16:33:43 -0500
Subject: [PATCH 1061/1648] Check for optional trx_lookup function

---
 libraries/chain/controller.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 2b8f2c6a998..72566980f41 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1773,9 +1773,9 @@ struct controller_impl {
             for( const auto& receipt : b->transactions ) {
                if( receipt.trx.contains<packed_transaction>()) {
                   auto& pt = receipt.trx.get<packed_transaction>();
-                  const transaction_metadata_ptr& trx_meta_ptr = trx_lookup( pt.id() );
+                  transaction_metadata_ptr trx_meta_ptr = trx_lookup ? trx_lookup( pt.id() ) : transaction_metadata_ptr{};
                   if( trx_meta_ptr && ( skip_auth_checks || !trx_meta_ptr->recovered_keys().empty() ) ) {
-                     trx_metas.emplace_back( trx_meta_ptr, recover_keys_future{} );
+                     trx_metas.emplace_back( std::move( trx_meta_ptr ), recover_keys_future{} );
                   } else if( skip_auth_checks ) {
                      trx_metas.emplace_back(
                            transaction_metadata::create_no_recover_keys( pt, transaction_metadata::trx_type::input ),

From 2d4e4c769f52ff40267080846040b932adf4586a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 30 Aug 2019 13:52:26 -0500
Subject: [PATCH 1062/1648] Only request_message for our head greater than
 msg.head when we suspect they are on a fork

---
 plugins/net_plugin/net_plugin.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a2e19a1d0c9..d1020bb4888 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1616,10 +1616,12 @@ namespace eosio {
             c->enqueue( note );
          }
          c->syncing = true;
-         request_message req;
-         req.req_blocks.mode = catch_up;
-         req.req_trx.mode = none;
-         c->enqueue( req );
+         if( cc.get_block_id_for_num( msg.head_num ) != msg.head_id ) {
+            request_message req;
+            req.req_blocks.mode = catch_up;
+            req.req_trx.mode = none;
+            c->enqueue( req );
+         }
          return;
       }
       c->syncing = false;

From 5bfc29970440133f56a1987ae4d3ce3841815bdb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 3 Sep 2019 07:45:29 -0500
Subject: [PATCH 1063/1648] Modify #7836 bandwidth fix for develop branch. Also
 change one block related app post from low to medium since it deals with
 blocks.

---
 plugins/net_plugin/net_plugin.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d1020bb4888..e49ac8f38d1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1017,7 +1017,7 @@ namespace eosio {
 
    void connection::blk_send( const block_id_type& blkid ) {
       connection_wptr weak = shared_from_this();
-      app().post( priority::low, [blkid, weak{std::move(weak)}]() {
+      app().post( priority::medium, [blkid, weak{std::move(weak)}]() {
          connection_ptr c = weak.lock();
          if( !c ) return;
          try {
@@ -1238,7 +1238,7 @@ namespace eosio {
    void connection::enqueue_block( const signed_block_ptr& sb, bool trigger_send, bool to_sync_queue) {
       fc_dlog( logger, "enqueue block ${num}", ("num", sb->block_num()) );
       verify_strand_in_this_thread( strand, __func__, __LINE__ );
-      enqueue_buffer( create_send_buffer( sb ), trigger_send, priority::low, no_reason, to_sync_queue);
+      enqueue_buffer( create_send_buffer( sb ), trigger_send, priority::medium, no_reason, to_sync_queue);
    }
 
    void connection::enqueue_buffer( const std::shared_ptr<std::vector<char>>& send_buffer,
@@ -1616,12 +1616,18 @@ namespace eosio {
             c->enqueue( note );
          }
          c->syncing = true;
-         if( cc.get_block_id_for_num( msg.head_num ) != msg.head_id ) {
-            request_message req;
-            req.req_blocks.mode = catch_up;
-            req.req_trx.mode = none;
-            c->enqueue( req );
-         }
+         app().post( priority::medium, [chain_plug = my_impl->chain_plug, c,
+                                        msg_head_num = msg.head_num, msg_head_id = msg.head_id]() {
+            controller& cc = chain_plug->chain();
+            if( cc.get_block_id_for_num( msg_head_num ) != msg_head_id ) {
+               c->strand.post( [c]() {
+                  request_message req;
+                  req.req_blocks.mode = catch_up;
+                  req.req_trx.mode = none;
+                  c->enqueue( req );
+               } );
+            }
+         } );
          return;
       }
       c->syncing = false;

From a18489b3b0220bac8ff0970bee3048c04939f8b2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 3 Sep 2019 08:05:12 -0500
Subject: [PATCH 1064/1648] Update comment for new behavior

---
 plugins/net_plugin/net_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e49ac8f38d1..91c5b4c4d72 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1559,6 +1559,8 @@ namespace eosio {
       //
       // 3  my head block num < peer head block num - update sync state and send a catchup request
       // 4  my head block num >= peer block num send a notice catchup if this is not the first generation
+      //    4.1 if peer appears to be on a different fork ( our_id_for( msg.head_num ) != msg.head_id )
+      //        then request peer's blocks
       //
       //-----------------------------
 

From dfc505b1ea7789ce6124f6a4ed118b9270a0aa1b Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 3 Sep 2019 11:22:03 -0400
Subject: [PATCH 1065/1648] Fix newline additions.

---
 tests/bash-bats/eosio_build.sh        | 2 +-
 tests/bash-bats/eosio_build_darwin.sh | 2 +-
 tests/bash-bats/eosio_uninstall.sh    | 2 +-
 tests/bash-bats/helpers/general.sh    | 2 +-
 tests/bash-bats/modules/cmake.sh      | 2 +-
 unittests/CMakeLists.txt              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/bash-bats/eosio_build.sh b/tests/bash-bats/eosio_build.sh
index c2338f96694..53ca8dbe94f 100644
--- a/tests/bash-bats/eosio_build.sh
+++ b/tests/bash-bats/eosio_build.sh
@@ -77,4 +77,4 @@ TEST_LABEL="[eosio_build]"
     [[ ! -z $(echo "${output}" | grep "Invalid Option!") ]] || exit
     run bash -c "./$SCRIPT_LOCATION -h"
     [[ ! -z $(echo "${output}" | grep "Usage:") ]] || exit
-}
+}
\ No newline at end of file
diff --git a/tests/bash-bats/eosio_build_darwin.sh b/tests/bash-bats/eosio_build_darwin.sh
index b7791f9d112..e5c063ca4e2 100644
--- a/tests/bash-bats/eosio_build_darwin.sh
+++ b/tests/bash-bats/eosio_build_darwin.sh
@@ -39,4 +39,4 @@ export TEST_LABEL="[eosio_build_darwin]"
     [[ ! -z $(echo "${output}" | grep "Starting EOSIO Build") ]] || exit
     [[ ! -z $(echo "${output}" | grep " --with-iostreams --with-date_time") ]] || exit # BOOST
     [[ ! -z $(echo "${output}" | grep "EOSIO has been successfully built") ]] || exit
-}
+}
\ No newline at end of file
diff --git a/tests/bash-bats/eosio_uninstall.sh b/tests/bash-bats/eosio_uninstall.sh
index 4942693cff9..753832aee33 100644
--- a/tests/bash-bats/eosio_uninstall.sh
+++ b/tests/bash-bats/eosio_uninstall.sh
@@ -70,4 +70,4 @@ rm -rf $VAR_DIR/log
 rm -rf $ETC_DIR
 rm -rf $LIB_DIR
 rm -rf $MONGODB_LOG_DIR
-rm -rf $MONGODB_DATA_DIR
+rm -rf $MONGODB_DATA_DIR
\ No newline at end of file
diff --git a/tests/bash-bats/helpers/general.sh b/tests/bash-bats/helpers/general.sh
index 1a03c29ead3..e553e07bd32 100644
--- a/tests/bash-bats/helpers/general.sh
+++ b/tests/bash-bats/helpers/general.sh
@@ -21,4 +21,4 @@ fi
 if [[ ! -d "tests" ]] && [[ ! -f "README.md" ]]; then
   echo "You must navigate into the root directory to execute tests..." >&3
   exit 1
-fi
+fi
\ No newline at end of file
diff --git a/tests/bash-bats/modules/cmake.sh b/tests/bash-bats/modules/cmake.sh
index e9be5319ce9..e726fce9dc3 100755
--- a/tests/bash-bats/modules/cmake.sh
+++ b/tests/bash-bats/modules/cmake.sh
@@ -40,4 +40,4 @@ load ../helpers/functions
         [[ ! -z $(echo "${output}" | grep "Executing: bash -c ${BIN_DIR}/cmake") ]] || exit
         [[ ! -z $(echo "${output}" | grep "CMAKE successfully installed") ]] || exit
     fi
-}
+}
\ No newline at end of file
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index b9e571819c2..ed870052639 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -111,4 +111,4 @@ if(ENABLE_COVERAGE_TESTING)
     COMMAND ;
     COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
   )
-endif()
\ No newline at end of file
+endif()

From 9f63111f85f76efb59bb599fe77bc9edbbb3100c Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 3 Sep 2019 11:27:57 -0400
Subject: [PATCH 1066/1648] Fix newline additions.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 380ced3fb51..bcfc75421c4 100644
--- a/README.md
+++ b/README.md
@@ -109,4 +109,4 @@ Instructions detailing the process of getting the software, building it, running
 
 See [LICENSE](./LICENSE) for copyright and license terms.
 
-All repositories and other materials are provided subject to the terms of this [IMPORTANT](./IMPORTANT.md) notice and you must familiarize yourself with its terms.  The notice contains important information, limitations and restrictions relating to our software, publications, trademarks, third-party resources, and forward-looking statements.  By accessing any of our repositories and other materials, you accept and agree to the terms of the notice.
\ No newline at end of file
+All repositories and other materials are provided subject to the terms of this [IMPORTANT](./IMPORTANT.md) notice and you must familiarize yourself with its terms.  The notice contains important information, limitations and restrictions relating to our software, publications, trademarks, third-party resources, and forward-looking statements.  By accessing any of our repositories and other materials, you accept and agree to the terms of the notice.

From 5a85cf6c718088b31b4b94a91b600777d0cbc586 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 3 Sep 2019 11:32:52 -0400
Subject: [PATCH 1067/1648] Removed old files.

---
 .cicd/.helpers                 | 49 -----------------
 .cicd/amazonlinux-2.dockerfile | 82 ----------------------------
 .cicd/base-images.yml          | 38 -------------
 .cicd/centos-7.dockerfile      | 97 ----------------------------------
 .cicd/travis-build.sh          | 23 --------
 .cicd/trigger-travis.sh        | 17 ------
 .cicd/ubuntu-16.04.dockerfile  | 93 --------------------------------
 .cicd/ubuntu-18.04.dockerfile  | 69 ------------------------
 8 files changed, 468 deletions(-)
 delete mode 100644 .cicd/.helpers
 delete mode 100644 .cicd/amazonlinux-2.dockerfile
 delete mode 100644 .cicd/base-images.yml
 delete mode 100644 .cicd/centos-7.dockerfile
 delete mode 100755 .cicd/travis-build.sh
 delete mode 100755 .cicd/trigger-travis.sh
 delete mode 100644 .cicd/ubuntu-16.04.dockerfile
 delete mode 100644 .cicd/ubuntu-18.04.dockerfile

diff --git a/.cicd/.helpers b/.cicd/.helpers
deleted file mode 100644
index 511b50d7456..00000000000
--- a/.cicd/.helpers
+++ /dev/null
@@ -1,49 +0,0 @@
-DRYRUN=${DRYRUN:-false}
-VERBOSE=${VERBOSE:-true}
-export PROJECT_NAME="eosio"
-
-# Set IMAGE_TAG using arg (generate-base-images.sh) or env (travis.yml)
-( [[ $(uname) != 'Darwin' ]] && [[ -z $IMAGE_TAG ]] && [[ -z $1 ]] ) && echo "You must provide the distro IMAGE_TAG name (example: ubuntu-18.04) as argument \$1 or set it within your ENV" && exit 1
-export IMAGE_TAG=${IMAGE_TAG:-$1}
-
-function execute() {
-  $VERBOSE && echo "--- Executing: $@"
-  $DRYRUN || "$@"
-}
-
-function determine-hash() {
-    # Determine the sha1 hash of all dockerfiles in the .cicd directory.
-    [[ -z $1 ]] && echo "Please provide the files to be hashed (wildcards supported)" && exit 1
-    echo "Obtaining Hash of files from $1..."
-    # Collect all files, hash them, then hash those.
-    HASHES=()
-    for FILE in $(find $1 -type f); do
-        HASH=$(sha1sum $FILE | sha1sum | awk '{ print $1 }')
-        HASHES=($HASH "${HASHES[*]}")
-        echo "$FILE - $HASH"
-    done
-    export DETERMINED_HASH=$(echo ${HASHES[*]} | sha1sum | awk '{ print $1 }')
-    export HASHED_IMAGE_TAG="${IMAGE_TAG}-${DETERMINED_HASH}"
-}
-
-function generate_docker_image() {
-    # If we cannot pull the image, we build and push it first.
-    docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-    cd ./.cicd
-    docker build -t $FULL_TAG -f ./${IMAGE_TAG}.dockerfile .
-    docker push $FULL_TAG
-    cd -
-}
-
-function docker_tag_exists() {
-    ORG_REPO=$(echo $1 | cut -d: -f1)
-    TAG=$(echo $1 | cut -d: -f2)
-    EXISTS=$(curl -s -H "Authorization: Bearer $(curl -sSL "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${ORG_REPO}:pull" | jq --raw-output .token)" "https://registry.hub.docker.com/v2/${ORG_REPO}/manifests/$TAG")
-    ( [[ $EXISTS =~ '404 page not found' ]] || [[ $EXISTS =~ 'manifest unknown' ]] ) && return 1 || return 0
-}
-
-if [[ $(uname) != 'Darwin' ]]; then # Darwin doesn't need hash (yet)
-    determine-hash ".cicd/${IMAGE_TAG}.dockerfile"
-    [[ -z $DETERMINED_HASH ]] && echo "DETERMINED_HASH empty! (check determine-hash function)" && exit 1
-    export FULL_TAG="eosio/producer:${PROJECT_NAME}-$HASHED_IMAGE_TAG"
-fi
\ No newline at end of file
diff --git a/.cicd/amazonlinux-2.dockerfile b/.cicd/amazonlinux-2.dockerfile
deleted file mode 100644
index 5bdc15d98c5..00000000000
--- a/.cicd/amazonlinux-2.dockerfile
+++ /dev/null
@@ -1,82 +0,0 @@
-FROM amazonlinux:2
-
-# YUM dependencies.
-RUN yum update -y \
-  && yum install -y which git sudo procps-ng util-linux autoconf automake \
-  libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
-  libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
-  graphviz clang patch
-
-# Build appropriate version of CMake.
-RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz \
-  && tar -xzf cmake-3.13.2.tar.gz \
-  && cd cmake-3.13.2 \
-  && ./bootstrap --prefix=/usr/local \
-  && make -j$(nproc) \
-  && make install \
-  && cd .. \
-  && rm -f cmake-3.13.2.tar.gz
-
-# Build appropriate version of LLVM.
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm \
-  && cd llvm \
-  && mkdir build \
-  && cd build \
-  && cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd /
-
-# Build appropriate version of Boost.
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 \
-  && tar -xjf boost_1_70_0.tar.bz2 \
-  && cd boost_1_70_0 \
-  && ./bootstrap.sh --prefix=/usr/local \
-  && ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install \
-  && cd .. \
-  && rm -f boost_1_70_0.tar.bz2    
-
-# Build appropriate version of MongoDB.
-RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz \
-  && tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz \
-  && rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz
-
-# Build appropriate version of MongoDB C Driver. 
-RUN curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz \
-  && tar -xzf mongo-c-driver-1.13.0.tar.gz \
-  && cd mongo-c-driver-1.13.0 \
-  && mkdir -p build \
-  && cd build \
-  && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd / \
-  && rm -rf mongo-c-driver-1.13.0.tar.gz
-
-# Build appropriate version of MongoDB C++ driver.
-RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz \
-  && tar -xzf mongo-cxx-driver-r3.4.0.tar.gz \
-  && cd mongo-cxx-driver-r3.4.0 \
-  && sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
-  && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
-  && cd build \
-  && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd / \
-  && rm -f mongo-cxx-driver-r3.4.0.tar.gz
-
-ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
-
-# CCACHE
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm \
-  && yum install -y ccache-3.3.4-1.el7.x86_64.rpm
-
-# PRE_COMMANDS: Executed pre-cmake
-# CMAKE_EXTRAS: Executed right before the cmake path (on the end)
-ENV PRE_COMMANDS="export PATH=/usr/lib64/ccache:$PATH &&"
-ENV CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
-
-CMD bash -c "$PRE_COMMANDS ccache -s && \
-    mkdir /workdir/build && cd /workdir/build && cmake -DCMAKE_BUILD_TYPE='Release' -DCORE_SYMBOL_NAME='SYS' -DOPENSSL_ROOT_DIR='/usr/include/openssl' -DBUILD_MONGO_DB_PLUGIN=true $CMAKE_EXTRAS /workdir && make -j $(getconf _NPROCESSORS_ONLN) && \
-    ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"
\ No newline at end of file
diff --git a/.cicd/base-images.yml b/.cicd/base-images.yml
deleted file mode 100644
index 3a8ae02ccfb..00000000000
--- a/.cicd/base-images.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-env:
-  BUILD_TIMEOUT: 120
-  TEST_TIMEOUT: 60
-  TIMEOUT: 120
-
-steps:
-
-  - label: ":aws: Amazon_Linux 2 - Build"
-    command:
-      - ".cicd/generate-base-images.sh amazonlinux-2"
-    agents:
-      queue: "automation-eos-dockerhub-image-builder-fleet"
-    timeout: $BUILD_TIMEOUT
-    skip: $SKIP_AMAZON_LINUX_2
-
-  - label: ":centos: CentOS 7.6 - Build"
-    command:
-      - ".cicd/generate-base-images.sh centos-7"
-    agents:
-      queue: "automation-eos-dockerhub-image-builder-fleet"
-    timeout: $BUILD_TIMEOUT
-    skip: $SKIP_CENTOS_7
-
-  - label: ":ubuntu: Ubuntu 16.04 - Build"
-    command:
-      - ".cicd/generate-base-images.sh ubuntu-16.04"
-    agents:
-      queue: "automation-eos-dockerhub-image-builder-fleet"
-    timeout: $BUILD_TIMEOUT
-    skip: $SKIP_UBUNTU_16
-
-  - label: ":ubuntu: Ubuntu 18.04 - Build"
-    command:
-      - ".cicd/generate-base-images.sh ubuntu-18.04"
-    agents:
-      queue: "automation-eos-dockerhub-image-builder-fleet"
-    timeout: $BUILD_TIMEOUT
-    skip: $SKIP_UBUNTU_18
diff --git a/.cicd/centos-7.dockerfile b/.cicd/centos-7.dockerfile
deleted file mode 100644
index a0a342c8857..00000000000
--- a/.cicd/centos-7.dockerfile
+++ /dev/null
@@ -1,97 +0,0 @@
-FROM centos:7
-
-# YUM dependencies.
-RUN yum update -y \
-  && yum --enablerepo=extras install -y centos-release-scl \
-  && yum --enablerepo=extras install -y devtoolset-8 \
-  && yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
-  graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
-  python python-devel rh-python36 gettext-devel file libusbx-devel \
-  libcurl-devel patch 
-
-# Build appropriate version of CMake.
-RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz \
-  && source /opt/rh/devtoolset-8/enable \
-  && source /opt/rh/rh-python36/enable \
-  && tar -xzf cmake-3.13.2.tar.gz \
-  && cd cmake-3.13.2 \
-  && ./bootstrap --prefix=/usr/local \
-  && make -j$(nproc) \
-  && make install \
-  && cd .. \
-  && rm -f cmake-3.13.2.tar.gz
-
-# Build appropriate version of LLVM.
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm \
-  && source /opt/rh/devtoolset-8/enable \
-  && source /opt/rh/rh-python36/enable \
-  && cd llvm \
-  && mkdir build \
-  && cd build \
-  && cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd /
-
-# Build appropriate version of Boost.
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 \
-  && source /opt/rh/devtoolset-8/enable \
-  && source /opt/rh/rh-python36/enable \
-  && tar -xjf boost_1_70_0.tar.bz2 \
-  && cd boost_1_70_0 \
-  && ./bootstrap.sh --prefix=/usr/local \
-  && ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install \
-  && cd .. \
-  && rm -f boost_1_70_0.tar.bz2    
-
-# Build appropriate version of MongoDB.
-RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz \
-  && tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz \
-  && rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz
-
-# Build appropriate version of MongoDB C Driver. 
-RUN curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz \
-  && source /opt/rh/devtoolset-8/enable \
-  && source /opt/rh/rh-python36/enable \
-  && tar -xzf mongo-c-driver-1.13.0.tar.gz \
-  && cd mongo-c-driver-1.13.0 \
-  && mkdir -p build \
-  && cd build \
-  && cmake --DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd / \
-  && rm -rf mongo-c-driver-1.13.0.tar.gz
-
-# Build appropriate version of MongoDB C++ driver.
-RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz \
-  && source /opt/rh/devtoolset-8/enable \
-  && source /opt/rh/rh-python36/enable \
-  && tar -xzf mongo-cxx-driver-r3.4.0.tar.gz \
-  && cd mongo-cxx-driver-r3.4.0 \
-  && sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
-  && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
-  && cd build \
-  && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd / \
-  && rm -f mongo-cxx-driver-r3.4.0.tar.gz
-
-ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
-
-# CCACHE
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm \
-  && yum install -y ccache-3.3.4-1.el7.x86_64.rpm
-## Needed as devtoolset uses c++ and it's not in ccache by default
-RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
-## We need to tell ccache to actually use devtoolset-8 instead of the default system one (ccache resets anything set in PATH when it launches)
-ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
-
-# PRE_COMMANDS: Executed pre-cmake
-# CMAKE_EXTRAS: Executed right before the cmake path (on the end)
-ENV PRE_COMMANDS="source /opt/rh/devtoolset-8/enable && source /opt/rh/rh-python36/enable && export PATH=/usr/lib64/ccache:$PATH &&"
-
-CMD bash -c "$PRE_COMMANDS ccache -s && \
-    mkdir /workdir/build && cd /workdir/build && cmake -DCMAKE_BUILD_TYPE='Release' -DCORE_SYMBOL_NAME='SYS' -DOPENSSL_ROOT_DIR='/usr/include/openssl' -DBUILD_MONGO_DB_PLUGIN=true $CMAKE_EXTRAS /workdir && make -j $(getconf _NPROCESSORS_ONLN) && \
-    ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"
\ No newline at end of file
diff --git a/.cicd/travis-build.sh b/.cicd/travis-build.sh
deleted file mode 100755
index d12ba8ebb05..00000000000
--- a/.cicd/travis-build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-cd $( dirname "${BASH_SOURCE[0]}" )/.. # Ensure we're in the repo root and not inside of scripts
-. ./.cicd/.helpers
-
-CPU_CORES=$(getconf _NPROCESSORS_ONLN)
-if [[ "$(uname)" == Darwin ]]; then
-    echo 'Detected Darwin, building natively.'
-    [[ -d eos ]] && cd eos
-    [[ ! -d build ]] && mkdir build
-    cd build
-    echo \$PATH
-    ccache -s
-    echo '$ cmake ..'
-    cmake ..
-    echo "$ make -j $CPU_CORES"
-    make -j $CPU_CORES
-    echo 'Running unit tests.'
-    echo "$ ctest -j $CPU_CORES -LE _tests --output-on-failure -T Test"
-    ctest -j $CPU_CORES -LE _tests --output-on-failure -T Test # run unit tests
-else # linux
-    execute docker run --rm -v $(pwd):/workdir -v /usr/lib/ccache -v $HOME/.ccache:/opt/.ccache -e CCACHE_DIR=/opt/.ccache $FULL_TAG
-fi
\ No newline at end of file
diff --git a/.cicd/trigger-travis.sh b/.cicd/trigger-travis.sh
deleted file mode 100755
index dcc5b63cbc1..00000000000
--- a/.cicd/trigger-travis.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-echo '+++ :gear: Configuring Travis CI Build'
-[[ -z $TRIGGER_TRAVIS_API_KEY ]] && (echo '+++ :no_entry: ERROR: Travis CI API key not found!' && exit 1)
-TRAVIS_MESSAGE="$BUILDKITE_MESSAGE - $(echo $BUILDKITE_BUILD_URL | grep -oe 'buildkite.*')"
-[[ -z $BODY ]] && BODY="$(jq -nc '{"request":{"branch":env.BUILDKITE_BRANCH,"message":env.TRAVIS_MESSAGE}}')"
-echo 'Configuration:'
-echo "$BODY" | jq
-echo 'This configuration is derived from the BUILDKITE_BRANCH and BUILDKITE_MESSAGE variables set for this build.'
-echo '+++ :tractor: Triggering Travis CI Build'
-export RESULT="$(curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $TRIGGER_TRAVIS_API_KEY" -d "$BODY" https://api.travis-ci.org/repo/EOSIO%2feosio.contracts/requests)"
-echo 'API Response:'
-echo "$RESULT" | jq 2>/dev/null || echo "$RESULT"
-if [[ "$(echo $RESULT | jq -r '.["@type"]')" != "pending" ]]; then
-    echo '+++ :no_entry: ERROR: Failed to trigger Travis API!'
-    exit 1
-fi
\ No newline at end of file
diff --git a/.cicd/ubuntu-16.04.dockerfile b/.cicd/ubuntu-16.04.dockerfile
deleted file mode 100644
index e83384cea65..00000000000
--- a/.cicd/ubuntu-16.04.dockerfile
+++ /dev/null
@@ -1,93 +0,0 @@
-FROM ubuntu:16.04
-
-# APT-GET dependencies.
-RUN apt-get update && apt-get upgrade -y \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git automake \
-  libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev \
-  python2.7 python2.7-dev python3 python3-dev autoconf libtool curl zlib1g-dev \
-  sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config
-
-# Build appropriate version of CMake.
-RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz \
-  && tar -xzf cmake-3.13.2.tar.gz \
-  && cd cmake-3.13.2 \
-  && ./bootstrap --prefix=/usr/local \
-  && make -j$(nproc) \
-  && make install \
-  && cd .. \
-  && rm -f cmake-3.13.2.tar.gz
-
-# Build appropriate version of Clang.
-RUN mkdir -p /root/tmp && cd /root/tmp && git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8             && cd clang8 && git checkout 18e41dc             && cd tools             && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git             && cd lld && git checkout d60a035 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git             && cd polly && git checkout 1bc06e5 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang             && git checkout a03da8b             && cd tools && mkdir extra && cd extra             && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git             && cd clang-tools-extra && git checkout 6b34834 && cd ..             && cd ../../../../projects             && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git             && cd libcxx && git checkout 1853712 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git             && cd libcxxabi && git checkout d7338a4 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git             && cd libunwind && git checkout 57f6739 && cd ../             && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git             && cd compiler-rt && git checkout 5bc7979 && cd ../             && cd /root/tmp/clang8             && mkdir build && cd build             && cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=all -DCMAKE_BUILD_TYPE=Release ..             && make -j$(nproc)             && make install \
-  && cd / && rm -rf /root/tmp/clang8
-
-COPY ./pinned_toolchain.cmake /tmp/pinned_toolchain.cmake
-
-# # Build appropriate version of LLVM.
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm \
-  && cd llvm \
-  && mkdir build \
-  && cd build \
-  && cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/pinned_toolchain.cmake' .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd /
-
-# Build appropriate version of Boost.
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 \
-  && tar -xjf boost_1_70_0.tar.bz2 \
-  && cd boost_1_70_0 \
-  && ./bootstrap.sh --with-toolset=clang --prefix=/usr/local \
-  && ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install \
-  && cd .. \
-  && rm -f boost_1_70_0.tar.bz2    
-
-# Build appropriate version of MongoDB.
-RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz \
-  && tar -xzf mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz \
-  && rm -f mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz
-
-# Build appropriate version of MongoDB C Driver. 
-RUN curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz \
-  && tar -xzf mongo-c-driver-1.13.0.tar.gz \
-  && cd mongo-c-driver-1.13.0 \
-  && mkdir -p build \
-  && cd build \
-  && cmake --DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DCMAKE_TOOLCHAIN_FILE='/tmp/pinned_toolchain.cmake' .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd / \
-  && rm -rf mongo-c-driver-1.13.0.tar.gz
-
-# Build appropriate version of MongoDB C++ driver.
-RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz \
-  && tar -xzf mongo-cxx-driver-r3.4.0.tar.gz \
-  && cd mongo-cxx-driver-r3.4.0 \
-  && sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
-  && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
-  && cd build \
-  && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/pinned_toolchain.cmake' .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd / \
-  && rm -f mongo-cxx-driver-r3.4.0.tar.gz
-
-ENV PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1604-3.6.3/bin
-
-# Build appropriate version of ccache.
-RUN curl -LO https://github.com/ccache/ccache/releases/download/v3.4.1/ccache-3.4.1.tar.gz \
-  && tar -xzf ccache-3.4.1.tar.gz \
-  && cd ccache-3.4.1 \
-  && ./configure \
-  && make \
-  && make install \
-  && cd / && rm -rf ccache-3.4.1/
-
-# PRE_COMMANDS: Executed pre-cmake
-# CMAKE_EXTRAS: Executed right before the cmake path (on the end)
-ENV PRE_COMMANDS="export PATH=/usr/lib/ccache:$PATH &&"
-ENV CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE='/tmp/pinned_toolchain.cmake' -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
-
-CMD bash -c "$PRE_COMMANDS ccache -s && \
-    mkdir /workdir/build && cd /workdir/build && cmake -DCMAKE_BUILD_TYPE='Release' -DCORE_SYMBOL_NAME='SYS' -DOPENSSL_ROOT_DIR='/usr/include/openssl' -DBUILD_MONGO_DB_PLUGIN=true $CMAKE_EXTRAS /workdir && make -j $(getconf _NPROCESSORS_ONLN) && \
-    ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"
\ No newline at end of file
diff --git a/.cicd/ubuntu-18.04.dockerfile b/.cicd/ubuntu-18.04.dockerfile
deleted file mode 100644
index 1561eccfc2b..00000000000
--- a/.cicd/ubuntu-18.04.dockerfile
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM ubuntu:18.04
-
-# APT-GET dependencies.
-RUN apt-get update && apt-get upgrade -y \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y git make \
-  bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
-  autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
-  autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
-  libcurl4-gnutls-dev pkg-config patch llvm-4.0 clang ccache
-
-# Build appropriate version of CMake.
-RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz \
-  && tar -xzf cmake-3.13.2.tar.gz \
-  && cd cmake-3.13.2 \
-  && ./bootstrap --prefix=/usr/local \
-  && make -j$(nproc) \
-  && make install \
-  && cd .. \
-  && rm -f cmake-3.13.2.tar.gz
-
-# Build appropriate version of Boost.
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 \
-  && tar -xjf boost_1_70_0.tar.bz2 \
-  && cd boost_1_70_0 \
-  && ./bootstrap.sh --prefix=/usr/local \
-  && ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -j$(nproc) install \
-  && cd .. \
-  && rm -f boost_1_70_0.tar.bz2     
-
-# Build appropriate version of MongoDB.
-RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz \
-  && tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz \
-  && rm -f mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz
-
-# Build appropriate version of MongoDB C Driver. 
-RUN curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz \
-  && tar -xzf mongo-c-driver-1.13.0.tar.gz \
-  && cd mongo-c-driver-1.13.0 \
-  && mkdir -p build \
-  && cd build \
-  && cmake --DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd / \
-  && rm -rf mongo-c-driver-1.13.0.tar.gz
-
-# Build appropriate version of MongoDB C++ driver.
-RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz \
-  && tar -xzf mongo-cxx-driver-r3.4.0.tar.gz \
-  && cd mongo-cxx-driver-r3.4.0 \
-  && sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp \
-  && sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt \
-  && cd build \
-  && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
-  && make -j$(nproc) \
-  && make install \
-  && cd / \
-  && rm -f mongo-cxx-driver-r3.4.0.tar.gz
-
-ENV PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1804-4.1.1/bin
-
-# PRE_COMMANDS: Executed pre-cmake
-# CMAKE_EXTRAS: Executed right before the cmake path (on the end)
-ENV PRE_COMMANDS="export PATH=/usr/lib/ccache:$PATH &&"
-ENV CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
-
-CMD bash -c "$PRE_COMMANDS ccache -s && \
-    mkdir /workdir/build && cd /workdir/build && cmake -DCMAKE_BUILD_TYPE='Release' -DCORE_SYMBOL_NAME='SYS' -DOPENSSL_ROOT_DIR='/usr/include/openssl' -DBUILD_MONGO_DB_PLUGIN=true $CMAKE_EXTRAS /workdir && make -j $(getconf _NPROCESSORS_ONLN) && \
-    ctest -j$(getconf _NPROCESSORS_ONLN) -LE _tests --output-on-failure -T Test"

From 92ce3b38bb8dc9280f0c3139958251f980b6bd52 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 30 Aug 2019 08:12:47 -0500
Subject: [PATCH 1068/1648] Chain id block log addition for version 3.

---
 libraries/chain/block_log.cpp                 | 209 +++++++++++++-----
 .../chain/include/eosio/chain/block_log.hpp   |  12 +-
 programs/eosio-blocklog/main.cpp              |   4 +-
 3 files changed, 162 insertions(+), 63 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index d9c971e7447..f039b0386a9 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -29,8 +29,10 @@ namespace eosio { namespace chain {
     * Version 1: complete block log from genesis
     * Version 2: adds optional partial block log, cannot be used for replay without snapshot
     *            this is in the form of an first_block_num that is written immediately after the version
+    * Version 3: improvement on version 2 to not require the genesis state be provided when not starting
+    *            from block 1
     */
-   const uint32_t block_log::max_supported_version = 2;
+   const uint32_t block_log::max_supported_version = 3;
 
    namespace detail {
       using unique_file = std::unique_ptr<FILE, decltype(&fclose)>;
@@ -60,9 +62,23 @@ namespace eosio { namespace chain {
                   index_file.close();
                open_files = false;
             }
+
+            template<typename T>
+            void reset( const T& t, const signed_block_ptr& genesis_block, uint32_t first_block_num );
+
+            void write( const genesis_state& gs );
+
+            void write( const chain_id_type& chain_id );
+
+            void flush();
+
+            uint64_t append(const signed_block_ptr& b);
+
+            template <typename ChainContext, typename Lambda>
+            static fc::optional<ChainContext> extract_chain_context( const fc::path& data_dir, Lambda&& lambda );
       };
 
-      void block_log_impl::reopen() {
+      void detail::block_log_impl::reopen() {
          close();
 
          // open to create files if they don't exist
@@ -104,7 +120,7 @@ namespace eosio { namespace chain {
          constexpr static int64_t       _unset_position                   = -1;
          constexpr static uint32_t      _buf_len                          = 1U << 24;
          constexpr static uint64_t      _position_size                    = sizeof(_current_position_in_file);
-         constexpr static int           _blknum_offset_from_pos           = 14; //offset from start of block to 4 byte block number, valid for the only allowed versions (1 & 2)
+         constexpr static int           _blknum_offset_from_pos           = 14; //offset from start of block to 4 byte block number, valid for the only allowed versions
       };
 
       constexpr uint64_t buffer_location_to_file_location(uint32_t buffer_location) { return buffer_location << 3; }
@@ -188,9 +204,9 @@ namespace eosio { namespace chain {
          my->version = 0;
          my->block_file.read( (char*)&my->version, sizeof(my->version) );
          EOS_ASSERT( my->version > 0, block_log_exception, "Block log was not setup properly" );
-         EOS_ASSERT( my->version >= min_supported_version && my->version <= max_supported_version, block_log_unsupported_version,
-                 "Unsupported version of block log. Block log version is ${version} while code supports version(s) [${min},${max}]",
-                 ("version", my->version)("min", block_log::min_supported_version)("max", block_log::max_supported_version) );
+         EOS_ASSERT( is_supported_version(my->version), block_log_unsupported_version,
+                     "Unsupported version of block log. Block log version is ${version} while code supports version(s) [${min},${max}]",
+                     ("version", my->version)("min", block_log::min_supported_version)("max", block_log::max_supported_version) );
 
 
          my->genesis_written_to_block_log = true; // Assume it was constructed properly.
@@ -220,7 +236,7 @@ namespace eosio { namespace chain {
             my->index_file.read((char*)&index_pos, sizeof(index_pos));
 
             if (block_pos < index_pos) {
-               ilog("block_pos < index_pos, close and reopen index_stream");
+               ilog("block_pos < index_pos, close and reopen index_file");
                construct_index();
             } else if (block_pos > index_pos) {
                ilog("Index is incomplete");
@@ -239,25 +255,29 @@ namespace eosio { namespace chain {
    }
 
    uint64_t block_log::append(const signed_block_ptr& b) {
+      return my->append(b);
+   }
+
+   uint64_t detail::block_log_impl::append(const signed_block_ptr& b) {
       try {
-         EOS_ASSERT( my->genesis_written_to_block_log, block_log_append_fail, "Cannot append to block log until the genesis is first written" );
+         EOS_ASSERT( genesis_written_to_block_log, block_log_append_fail, "Cannot append to block log until the genesis is first written" );
 
-         my->check_open_files();
+         check_open_files();
 
-         my->block_file.seek_end(0);
-         my->index_file.seek_end(0);
-         uint64_t pos = my->block_file.tellp();
-         EOS_ASSERT(my->index_file.tellp() == sizeof(uint64_t) * (b->block_num() - my->first_block_num),
+         block_file.seek_end(0);
+         index_file.seek_end(0);
+         uint64_t pos = block_file.tellp();
+         EOS_ASSERT(index_file.tellp() == sizeof(uint64_t) * (b->block_num() - first_block_num),
                    block_log_append_fail,
                    "Append to index file occuring at wrong position.",
-                   ("position", (uint64_t) my->index_file.tellp())
-                   ("expected", (b->block_num() - my->first_block_num) * sizeof(uint64_t)));
+                   ("position", (uint64_t) index_file.tellp())
+                   ("expected", (b->block_num() - first_block_num) * sizeof(uint64_t)));
          auto data = fc::raw::pack(*b);
-         my->block_file.write(data.data(), data.size());
-         my->block_file.write((char*)&pos, sizeof(pos));
-         my->index_file.write((char*)&pos, sizeof(pos));
-         my->head = b;
-         my->head_id = b->id();
+         block_file.write(data.data(), data.size());
+         block_file.write((char*)&pos, sizeof(pos));
+         index_file.write((char*)&pos, sizeof(pos));
+         head = b;
+         head_id = b->id();
 
          flush();
 
@@ -267,48 +287,73 @@ namespace eosio { namespace chain {
    }
 
    void block_log::flush() {
-      my->block_file.flush();
-      my->index_file.flush();
+      my->flush();
    }
 
-   void block_log::reset( const genesis_state& gs, const signed_block_ptr& first_block, uint32_t first_block_num ) {
-      my->close();
+   void detail::block_log_impl::flush() {
+      block_file.flush();
+      index_file.flush();
+   }
 
-      fc::remove_all( my->block_file.get_file_path() );
-      fc::remove_all( my->index_file.get_file_path() );
+   template<typename T>
+   void detail::block_log_impl::reset( const T& t, const signed_block_ptr& first_block, uint32_t first_bnum ) {
+      close();
 
-      my->reopen();
+      fc::remove_all( block_file.get_file_path() );
+      fc::remove_all( index_file.get_file_path() );
 
-      auto data = fc::raw::pack(gs);
-      my->version = 0; // version of 0 is invalid; it indicates that the genesis was not properly written to the block log
-      my->first_block_num = first_block_num;
-      my->block_file.seek_end(0);
-      my->block_file.write((char*)&my->version, sizeof(my->version));
-      my->block_file.write((char*)&my->first_block_num, sizeof(my->first_block_num));
-      my->block_file.write(data.data(), data.size());
-      my->genesis_written_to_block_log = true;
+      reopen();
+
+      version = 0; // version of 0 is invalid; it indicates that subsequent data was not properly written to the block log
+      first_block_num = first_bnum;
+
+      block_file.seek_end(0);
+      block_file.write((char*)&version, sizeof(version));
+      block_file.write((char*)&first_block_num, sizeof(first_block_num));
+
+      write(t);
+      genesis_written_to_block_log = true;
 
       // append a totem to indicate the division between blocks and header
-      auto totem = npos;
-      my->block_file.write((char*)&totem, sizeof(totem));
+      auto totem = block_log::npos;
+      block_file.write((char*)&totem, sizeof(totem));
 
       if (first_block) {
          append(first_block);
       } else {
-         my->head.reset();
-         my->head_id = {};
+         head.reset();
+         head_id = {};
       }
 
-      auto pos = my->block_file.tellp();
+      auto pos = block_file.tellp();
 
       static_assert( block_log::max_supported_version > 0, "a version number of zero is not supported" );
-      my->version = block_log::max_supported_version;
-      my->block_file.seek( 0 );
-      my->block_file.write( (char*)&my->version, sizeof(my->version) );
-      my->block_file.seek( pos );
+
+      // going back to write correct version to indicate that all block log header data writes completed successfully
+      version = block_log::max_supported_version;
+      block_file.seek( 0 );
+      block_file.write( (char*)&version, sizeof(version) );
+      block_file.seek( pos );
       flush();
    }
 
+   void block_log::reset( const genesis_state& gs, const signed_block_ptr& first_block ) {
+      my->reset(gs, first_block, 1);
+   }
+
+   void block_log::reset( const chain_id_type& chain_id, const signed_block_ptr& first_block, uint32_t first_block_num ) {
+      my->reset(chain_id, first_block, first_block_num);
+   }
+
+   void detail::block_log_impl::write( const genesis_state& gs ) {
+      auto data = fc::raw::pack(gs);
+      block_file.write(data.data(), data.size());
+   }
+
+   void detail::block_log_impl::write( const chain_id_type& chain_id ) {
+      block_file << chain_id;
+   }
+
    signed_block_ptr block_log::read_block(uint64_t pos)const {
       my->check_open_files();
 
@@ -477,7 +522,7 @@ namespace eosio { namespace chain {
       uint32_t version = 0;
       old_block_stream.read( (char*)&version, sizeof(version) );
       EOS_ASSERT( version > 0, block_log_exception, "Block log was not setup properly" );
-      EOS_ASSERT( version >= min_supported_version && version <= max_supported_version, block_log_unsupported_version,
+      EOS_ASSERT( is_supported_version(version), block_log_unsupported_version,
                  "Unsupported version of block log. Block log version is ${version} while code supports version(s) [${min},${max}]",
                  ("version", version)("min", block_log::min_supported_version)("max", block_log::max_supported_version) );
 
@@ -489,11 +534,19 @@ namespace eosio { namespace chain {
          new_block_stream.write( (char*)&first_block_num, sizeof(first_block_num) );
       }
 
-      genesis_state gs;
-      fc::raw::unpack(old_block_stream, gs);
+      if (contains_genesis_state(version, first_block_num)) {
+         genesis_state gs;
+         fc::raw::unpack(old_block_stream, gs);
+
+         auto data = fc::raw::pack( gs );
+         new_block_stream.write( data.data(), data.size() );
+      }
+      else if (contains_chain_id(version, first_block_num)) {
+         chain_id_type chain_id;
+         old_block_stream >> chain_id;
 
-      auto data = fc::raw::pack( gs );
-      new_block_stream.write( data.data(), data.size() );
+         new_block_stream << chain_id;
+      }
 
       if (version != 1) {
          auto expected_totem = npos;
@@ -599,28 +652,53 @@ namespace eosio { namespace chain {
       return backup_dir;
    }
 
-   genesis_state block_log::extract_genesis_state( const fc::path& data_dir ) {
+   template <typename ChainContext, typename Lambda>
+   fc::optional<ChainContext> detail::block_log_impl::extract_chain_context( const fc::path& data_dir, Lambda&& lambda ) {
       EOS_ASSERT( fc::is_directory(data_dir) && fc::is_regular_file(data_dir / "blocks.log"), block_log_not_found,
-                 "Block log not found in '${blocks_dir}'", ("blocks_dir", data_dir)          );
+                  "Block log not found in '${blocks_dir}'", ("blocks_dir", data_dir)          );
 
       std::fstream  block_stream;
       block_stream.open( (data_dir / "blocks.log").generic_string().c_str(), LOG_READ );
 
       uint32_t version = 0;
       block_stream.read( (char*)&version, sizeof(version) );
-      EOS_ASSERT( version > 0, block_log_exception, "Block log was not setup properly." );
-      EOS_ASSERT( version >= min_supported_version && version <= max_supported_version, block_log_unsupported_version,
-                 "Unsupported version of block log. Block log version is ${version} while code supports version(s) [${min},${max}]",
-                 ("version", version)("min", block_log::min_supported_version)("max", block_log::max_supported_version) );
+      EOS_ASSERT( version >= block_log::min_supported_version && version <= block_log::max_supported_version, block_log_unsupported_version,
+                  "Unsupported version of block log. Block log version is ${version} while code supports version(s) [${min},${max}]",
+                  ("version", version)("min", block_log::min_supported_version)("max", block_log::max_supported_version) );
 
       uint32_t first_block_num = 1;
       if (version != 1) {
          block_stream.read ( (char*)&first_block_num, sizeof(first_block_num) );
       }
 
-      genesis_state gs;
-      fc::raw::unpack(block_stream, gs);
-      return gs;
+      return lambda(block_stream, version, first_block_num);
+   }
+
+   fc::optional<genesis_state> block_log::extract_genesis_state( const fc::path& data_dir ) {
+      return detail::block_log_impl::extract_chain_context<genesis_state>(data_dir, [](std::fstream& block_stream, uint32_t version, uint32_t first_block_num ) -> fc::optional<genesis_state> {
+         if (contains_genesis_state(version, first_block_num)) {
+            genesis_state gs;
+            fc::raw::unpack(block_stream, gs);
+            return gs;
+         }
+
+         // current versions only have a genesis state if they start with block number 1
+         return fc::optional<genesis_state>();
+      });
+   }
+
+   chain_id_type block_log::extract_chain_id( const fc::path& data_dir ) {
+      return *(detail::block_log_impl::extract_chain_context<chain_id_type>(data_dir, [](std::fstream& block_stream, uint32_t version, uint32_t first_block_num ) -> fc::optional<chain_id_type> {
+         // supported versions either contain a genesis state, or else the chain id only
+         if (contains_genesis_state(version, first_block_num)) {
+            genesis_state gs;
+            fc::raw::unpack(block_stream, gs);
+            return gs.compute_chain_id();
+         }
+         chain_id_type chain_id;
+         fc::raw::unpack(block_stream, chain_id);
+         return chain_id;
+      }));
    }
 
    detail::reverse_iterator::reverse_iterator()
@@ -638,7 +716,8 @@ namespace eosio { namespace chain {
       _version = 0;
       auto size = fread((char*)&_version, sizeof(_version), 1, _file.get());
       EOS_ASSERT( size == 1, block_log_exception, "Block log file at '${blocks_log}' could not be read.", ("file", _block_file_name) );
-      EOS_ASSERT( _version == 1 || _version == 2, block_log_unsupported_version, "block log version ${v} is not supported", ("v", _version));
+      EOS_ASSERT( block_log::is_supported_version(_version), block_log_unsupported_version,
+                  "block log version ${v} is not supported", ("v", _version));
       if (_version == 1) {
          _first_block_num = 1;
       }
@@ -809,4 +888,16 @@ namespace eosio { namespace chain {
          _start_of_buffer_position = _end_of_buffer_position - _max_buffer_length;
       }
    }
+
+   bool block_log::contains_genesis_state(uint32_t version, uint32_t first_block_num) {
+      return version <= 2 || first_block_num == 1;
+   }
+
+   bool block_log::contains_chain_id(uint32_t version, uint32_t first_block_num) {
+      return version >= 3 && first_block_num > 1;
+   }
+
+   bool block_log::is_supported_version(uint32_t version) {
+      return std::clamp(version, min_supported_version, max_supported_version) == version;
+   }
 } } /// eosio::chain
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index 9cf525628f2..e8e24103595 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -40,7 +40,8 @@ namespace eosio { namespace chain {
 
          uint64_t append(const signed_block_ptr& b);
          void flush();
-         void reset( const genesis_state& gs, const signed_block_ptr& genesis_block, uint32_t first_block_num = 1 );
+         void reset( const genesis_state& gs, const signed_block_ptr& genesis_block );
+         void reset( const chain_id_type& chain_id, const signed_block_ptr& genesis_block, uint32_t first_block_num );
 
          signed_block_ptr read_block(uint64_t file_pos)const;
          void             read_block_header(block_header& bh, uint64_t file_pos)const;
@@ -66,10 +67,17 @@ namespace eosio { namespace chain {
 
          static fc::path repair_log( const fc::path& data_dir, uint32_t truncate_at_block = 0 );
 
-         static genesis_state extract_genesis_state( const fc::path& data_dir );
+         static fc::optional<genesis_state> extract_genesis_state( const fc::path& data_dir );
+
+         static chain_id_type extract_chain_id( const fc::path& data_dir );
 
          static void construct_index(const fc::path& block_file_name, const fc::path& index_file_name);
 
+         static bool contains_genesis_state(uint32_t version, uint32_t first_block_num);
+
+         static bool contains_chain_id(uint32_t version, uint32_t first_block_num);
+
+         static bool is_supported_version(uint32_t version);
       private:
          void open(const fc::path& data_dir);
          void construct_index();
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 712bcffa705..ffef2283b57 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -219,7 +219,7 @@ struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end
    }
    void find_block_pos(uint32_t n);
    bfs::path block_file_name, index_file_name;        //full pathname for blocks.log and blocks.index
-   uint32_t version = 0;                              //blocklog version (1 or 2)
+   uint32_t version = 0;                              //blocklog version
    uint32_t first_block = 0;                          //first block in blocks.log
    uint32_t last_block = 0;                          //last block in blocks.log
    FILE* blk_in = nullptr;                            //C style files for reading blocks.log and blocks.index
@@ -243,7 +243,7 @@ trim_data::trim_data(bfs::path block_dir) {
    auto size = fread((void*)&version,sizeof(version), 1, blk_in);
    EOS_ASSERT( size == 1, block_log_unsupported_version, "invalid format for file ${file}", ("file",block_file_name.string()));
    cout << "block log version= " << version << '\n';
-   EOS_ASSERT( version == 1 || version == 2, block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
+   EOS_ASSERT( block_log::is_supported_version(version), block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
    if (version == 1) {
       first_block = 1;
    }

From caae21982ba5acf93d88ea6114f2dc61b3a86a8e Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 30 Aug 2019 09:28:37 -0500
Subject: [PATCH 1069/1648] Added chain id to snapshot and support for version
 upgrade.

---
 libraries/chain/controller.cpp                | 24 +++++++++++------
 .../include/eosio/chain/chain_snapshot.hpp    |  1 +
 .../eosio/chain/global_property_object.hpp    |  8 ++++--
 plugins/chain_plugin/chain_plugin.cpp         | 27 ++++++++++++++++---
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index de04d7f77af..520eec0e753 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -530,7 +530,15 @@ struct controller_impl {
          } else {
             read_from_snapshot( snapshot, 0, std::numeric_limits<uint32_t>::max() );
             lib_num = head->block_num;
-            blog.reset( conf.genesis, signed_block_ptr(), lib_num + 1 );
+            if (lib_num == 0) {
+               EOS_ASSERT( conf.genesis, plugin_config_exception,
+                           "Snapshot controller head at block number 0, but genesis state was not provided."
+                           " Must pass \"--genesis-json\" to provide the genesis state." );
+               blog.reset( *conf.genesis, signed_block_ptr() );
+            }
+            else {
+               blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
+            }
          }
       } else {
          if( db.revision() < 1 || !fork_db.head() ) {
@@ -573,7 +581,7 @@ struct controller_impl {
             } else {
                lib_num = fork_db.root()->block_num;
                if( first_block_num != (lib_num + 1) ) {
-                  blog.reset( conf.genesis, signed_block_ptr(), lib_num + 1 );
+                  blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
                }
             }
 
@@ -794,10 +802,6 @@ struct controller_impl {
          section.add_row(chain_snapshot_header(), db);
       });
 
-      snapshot->write_section<genesis_state>([this]( auto &section ){
-         section.add_row(conf.genesis, db);
-      });
-
       snapshot->write_section<block_state>([this]( auto &section ){
          section.template add_row<block_header_state>(*fork_db.head(), db);
       });
@@ -889,7 +893,7 @@ struct controller_impl {
                   section.read_row(legacy_global_properties, db);
 
                   db.create<global_property_object>([&](auto& gpo ){
-                     gpo.initalize_from(legacy_global_properties);
+                     gpo.initalize_from(legacy_global_properties, chain_id);
                   });
                });
                return; // early out to avoid default processing
@@ -904,7 +908,6 @@ struct controller_impl {
                });
             }
          });
-
       });
 
       read_contract_tables_from_snapshot(snapshot);
@@ -916,6 +919,10 @@ struct controller_impl {
       db.create<database_header_object>([](const auto& header){
          // nothing to do
       });
+
+      const auto& gpo = db.get<global_property_object>();
+      // ensure chain_id is populated from global_property_object's chain_id
+      chain_id = gpo.chain_id;
    }
 
    sha256 calculate_integrity_hash() const {
@@ -978,6 +985,7 @@ struct controller_impl {
       conf.genesis.initial_configuration.validate();
       db.create<global_property_object>([&](auto& gpo ){
          gpo.configuration = conf.genesis.initial_configuration;
+         gpo.chain_id = chain_id;
       });
 
       db.create<protocol_state_object>([&](auto& pso ){
diff --git a/libraries/chain/include/eosio/chain/chain_snapshot.hpp b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
index e29b2591d03..d170a12d369 100644
--- a/libraries/chain/include/eosio/chain/chain_snapshot.hpp
+++ b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
@@ -15,6 +15,7 @@ struct chain_snapshot_header {
     *         - forwards compatible with version 2
     *         - WebAuthn keys
     *         - wtmsig block siganatures: the block header state changed to include producer authorities and additional signatures
+    *         - removed genesis_state
     */
 
    static constexpr uint32_t minimum_compatible_version = 2;
diff --git a/libraries/chain/include/eosio/chain/global_property_object.hpp b/libraries/chain/include/eosio/chain/global_property_object.hpp
index 10817ff3b3b..ba5bb060b83 100644
--- a/libraries/chain/include/eosio/chain/global_property_object.hpp
+++ b/libraries/chain/include/eosio/chain/global_property_object.hpp
@@ -45,11 +45,13 @@ namespace eosio { namespace chain {
       optional<block_num_type>            proposed_schedule_block_num;
       shared_producer_authority_schedule  proposed_schedule;
       chain_config                        configuration;
+      chain_id_type                       chain_id;
 
-      void initalize_from( const legacy::snapshot_global_property_object_v2& legacy ) {
+      void initalize_from( const legacy::snapshot_global_property_object_v2& legacy, const chain_id_type& chain_id_val ) {
          proposed_schedule_block_num = legacy.proposed_schedule_block_num;
          proposed_schedule = producer_authority_schedule(legacy.proposed_schedule).to_shared(proposed_schedule.producers.get_allocator());
          configuration = legacy.configuration;
+         chain_id = chain_id_val;
       }
    };
 
@@ -67,6 +69,7 @@ namespace eosio { namespace chain {
       optional<block_num_type>            proposed_schedule_block_num;
       producer_authority_schedule         proposed_schedule;
       chain_config                        configuration;
+      chain_id_type                       chain_id;
    };
 
    namespace detail {
@@ -76,13 +79,14 @@ namespace eosio { namespace chain {
          using snapshot_type = snapshot_global_property_object;
 
          static snapshot_global_property_object to_snapshot_row( const global_property_object& value, const chainbase::database& ) {
-            return {value.proposed_schedule_block_num, producer_authority_schedule::from_shared(value.proposed_schedule), value.configuration};
+            return {value.proposed_schedule_block_num, producer_authority_schedule::from_shared(value.proposed_schedule), value.configuration, value.chain_id};
          }
 
          static void from_snapshot_row( snapshot_global_property_object&& row, global_property_object& value, chainbase::database& ) {
             value.proposed_schedule_block_num = row.proposed_schedule_block_num;
             value.proposed_schedule = row.proposed_schedule.to_shared(value.proposed_schedule.producers.get_allocator());
             value.configuration = row.configuration;
+            value.chain_id = row.chain_id;
          }
       };
    }
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 35038f15072..5c8d1ac93af 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -680,7 +680,13 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          genesis_state gs;
 
          if( fc::exists( my->blocks_dir / "blocks.log" )) {
-            gs = block_log::extract_genesis_state( my->blocks_dir );
+            const auto extracted_genesis_state = block_log::extract_genesis_state( my->blocks_dir );
+            if( extracted_genesis_state ) {
+               gs = *extracted_genesis_state;
+            } else {
+               wlog( "No genesis state was in blocks.log found at '${p}'. Using default genesis state.",
+                     ("p", (my->blocks_dir / "blocks.log").generic_string()));
+            }
          } else {
             wlog( "No blocks.log found at '${p}'. Using default genesis state.",
                   ("p", (my->blocks_dir / "blocks.log").generic_string()));
@@ -779,9 +785,24 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          auto infile = std::ifstream(my->snapshot_path->generic_string(), (std::ios::in | std::ios::binary));
          auto reader = std::make_shared<istream_snapshot_reader>(infile);
          reader->validate();
-         reader->read_section<genesis_state>([this]( auto &section ){
-            section.read_row(my->chain_config->genesis);
+         chain_snapshot_header header;
+         reader->read_section<chain_snapshot_header>([&header]( auto& section ){
+            section.read_row(header);
+            header.validate();
          });
+
+         const auto version = header.version;
+
+         using v2 = legacy::snapshot_global_property_object_v2;
+         if (std::clamp(version, v2::minimum_version, v2::maximum_version) == version ) {
+            my->chain_config->genesis.emplace();
+            reader->read_section<genesis_state>([this]( auto &section ){
+               section.read_row(*my->chain_config->genesis);
+            });
+            my->chain_id = my->chain_config->genesis->compute_chain_id();
+            my->chain_id_source = "snapshot";
+         }
+
          infile.close();
 
          EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,

From 8aa074321233b385d4fd12ef6be12044058a0470 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 30 Aug 2019 09:30:02 -0500
Subject: [PATCH 1070/1648] Added chain id as parameter, made genesis state
 optional, and added more validation.

---
 libraries/chain/controller.cpp                |  46 +++---
 .../include/eosio/chain/chain_id_type.hpp     |   7 +
 .../chain/include/eosio/chain/controller.hpp  |   4 +-
 plugins/chain_plugin/chain_plugin.cpp         | 151 ++++++++++++++++--
 4 files changed, 169 insertions(+), 39 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 520eec0e753..66fe3b09520 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -225,7 +225,7 @@ struct controller_impl {
    authorization_manager          authorization;
    protocol_feature_manager       protocol_features;
    controller::config             conf;
-   const chain_id_type            chain_id; // read by thread_pool threads
+   chain_id_type                  chain_id; // read by thread_pool threads, value will not be changed after initialization/snapshot
    optional<fc::time_point>       replay_head_time;
    db_read_mode                   read_mode = db_read_mode::SPECULATIVE;
    bool                           in_trx_requiring_checks = false; ///< if true, checks that are normally skipped on replay (e.g. auth checks) cannot be skipped
@@ -281,7 +281,7 @@ struct controller_impl {
       apply_handlers[receiver][make_pair(contract,action)] = v;
    }
 
-   controller_impl( const controller::config& cfg, controller& s, protocol_feature_set&& pfs  )
+   controller_impl( const controller::config& cfg, const fc::optional<chain_id_type>& cfg_chain_id, controller& s, protocol_feature_set&& pfs  )
    :self(s),
     db( cfg.state_dir,
         cfg.read_only ? database::read_only : database::read_write,
@@ -296,10 +296,12 @@ struct controller_impl {
     authorization( s, db ),
     protocol_features( std::move(pfs) ),
     conf( cfg ),
-    chain_id( cfg.genesis.compute_chain_id() ),
     read_mode( cfg.read_mode ),
     thread_pool( "chain", cfg.thread_pool_size )
    {
+      if (cfg_chain_id) {
+         chain_id = *cfg_chain_id;
+      }
 
       fork_db.open( [this]( block_timestamp_type timestamp,
                             const flat_set<digest_type>& cur_features,
@@ -431,16 +433,18 @@ struct controller_impl {
     */
    void initialize_blockchain_state() {
       wlog( "Initializing new blockchain with genesis state" );
-      producer_authority_schedule initial_schedule = { 0, { producer_authority{config::system_account_name, block_signing_authority_v0{ 1, {{conf.genesis.initial_key, 1}} } } } };
-      legacy::producer_schedule_type initial_legacy_schedule{ 0, {{config::system_account_name, conf.genesis.initial_key}} };
+      EOS_ASSERT( conf.genesis, plugin_config_exception,
+                  "unexpected error: should not be initializing blockchain state without a valid genesis state." );
+      producer_authority_schedule initial_schedule = { 0, { producer_authority{config::system_account_name, block_signing_authority_v0{ 1, {{conf.genesis->initial_key, 1}} } } } };
+      legacy::producer_schedule_type initial_legacy_schedule{ 0, {{config::system_account_name, conf.genesis->initial_key}} };
 
       block_header_state genheader;
       genheader.active_schedule                = initial_schedule;
       genheader.pending_schedule.schedule      = initial_schedule;
       // NOTE: if wtmsig block signatures are enabled at genesis time this should be the hash of a producer authority schedule
       genheader.pending_schedule.schedule_hash = fc::sha256::hash(initial_legacy_schedule);
-      genheader.header.timestamp               = conf.genesis.initial_timestamp;
-      genheader.header.action_mroot            = conf.genesis.compute_chain_id();
+      genheader.header.timestamp               = conf.genesis->initial_timestamp;
+      genheader.header.action_mroot            = conf.genesis->compute_chain_id();
       genheader.id                             = genheader.header.id();
       genheader.block_num                      = genheader.header.block_num();
 
@@ -564,7 +568,7 @@ struct controller_impl {
                );
                lib_num = blog.head()->block_num();
             } else {
-               blog.reset( conf.genesis, head->block );
+               blog.reset( *conf.genesis, head->block );
             }
          } else {
             lib_num = fork_db.root()->block_num;
@@ -839,8 +843,7 @@ struct controller_impl {
          header.validate();
       });
 
-
-      { /// load an upgrade the block header state
+      { /// load and upgrade the block header state
          block_header_state head_header_state;
          using v2 = legacy::snapshot_block_header_state_v2;
 
@@ -868,6 +871,7 @@ struct controller_impl {
          fork_db.reset( head_header_state );
          head = fork_db.head();
          snapshot_head_block = head->block_num;
+
       }
 
       controller_index_set::walk_indices([this, &snapshot, &header]( auto utils ){
@@ -937,7 +941,7 @@ struct controller_impl {
    void create_native_account( account_name name, const authority& owner, const authority& active, bool is_privileged = false ) {
       db.create<account_object>([&](auto& a) {
          a.name = name;
-         a.creation_date = conf.genesis.initial_timestamp;
+         a.creation_date = conf.genesis->initial_timestamp;
 
          if( name == config::system_account_name ) {
             // The initial eosio ABI value affects consensus; see  https://github.com/EOSIO/eos/issues/7794
@@ -952,9 +956,9 @@ struct controller_impl {
       });
 
       const auto& owner_permission  = authorization.create_permission(name, config::owner_name, 0,
-                                                                      owner, conf.genesis.initial_timestamp );
+                                                                      owner, conf.genesis->initial_timestamp );
       const auto& active_permission = authorization.create_permission(name, config::active_name, owner_permission.id,
-                                                                      active, conf.genesis.initial_timestamp );
+                                                                      active, conf.genesis->initial_timestamp );
 
       resource_limits.initialize_account(name);
 
@@ -982,9 +986,9 @@ struct controller_impl {
          bs.block_id = head->id;
       });
 
-      conf.genesis.initial_configuration.validate();
+      conf.genesis->initial_configuration.validate();
       db.create<global_property_object>([&](auto& gpo ){
-         gpo.configuration = conf.genesis.initial_configuration;
+         gpo.configuration = conf.genesis->initial_configuration;
          gpo.chain_id = chain_id;
       });
 
@@ -1000,7 +1004,7 @@ struct controller_impl {
       authorization.initialize_database();
       resource_limits.initialize_database();
 
-      authority system_auth(conf.genesis.initial_key);
+      authority system_auth(conf.genesis->initial_key);
       create_native_account( config::system_account_name, system_auth, system_auth, true );
 
       auto empty_authority = authority(1, {}, {});
@@ -1014,12 +1018,12 @@ struct controller_impl {
                                                                              config::majority_producers_permission_name,
                                                                              active_permission.id,
                                                                              active_producers_authority,
-                                                                             conf.genesis.initial_timestamp );
+                                                                             conf.genesis->initial_timestamp );
       const auto& minority_permission     = authorization.create_permission( config::producers_account_name,
                                                                              config::minority_producers_permission_name,
                                                                              majority_permission.id,
                                                                              active_producers_authority,
-                                                                             conf.genesis.initial_timestamp );
+                                                                             conf.genesis->initial_timestamp );
    }
 
    // The returned scoped_exit should not exceed the lifetime of the pending which existed when make_block_restore_point was called.
@@ -2320,12 +2324,12 @@ const protocol_feature_manager& controller::get_protocol_feature_manager()const
 }
 
 controller::controller( const controller::config& cfg )
-:my( new controller_impl( cfg, *this, protocol_feature_set{} ) )
+:my( new controller_impl( cfg, fc::optional<chain_id_type>(), *this, protocol_feature_set{} ) )
 {
 }
 
-controller::controller( const config& cfg, protocol_feature_set&& pfs )
-:my( new controller_impl( cfg, *this, std::move(pfs) ) )
+controller::controller( const config& cfg, const fc::optional<chain_id_type>& chain_id, protocol_feature_set&& pfs )
+:my( new controller_impl( cfg, chain_id, *this, std::move(pfs) ) )
 {
 }
 
diff --git a/libraries/chain/include/eosio/chain/chain_id_type.hpp b/libraries/chain/include/eosio/chain/chain_id_type.hpp
index d5bc99322b8..9e09fbc9812 100644
--- a/libraries/chain/include/eosio/chain/chain_id_type.hpp
+++ b/libraries/chain/include/eosio/chain/chain_id_type.hpp
@@ -13,6 +13,8 @@ namespace eosio {
       class read_only;
    }
 
+   class chain_plugin;
+
 namespace chain {
 
    struct chain_id_type : public fc::sha256 {
@@ -40,9 +42,14 @@ namespace chain {
          friend T fc::variant::as()const;
 
          friend class eosio::chain_apis::read_only;
+         friend class chain_plugin;
 
          friend class eosio::net_plugin_impl;
          friend struct eosio::handshake_message;
+         friend class block_log;
+         friend struct controller_impl;
+         friend class global_property_object;
+         friend struct snapshot_global_property_object;
    };
 
 } }  // namespace eosio::chain
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index b57100fa2fa..89622c8c7e2 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -79,7 +79,7 @@ namespace eosio { namespace chain {
             uint32_t                 maximum_variable_signature_length = chain::config::default_max_variable_signature_length;
             bool                     disable_all_subjective_mitigations = false; //< for testing purposes only
 
-            genesis_state            genesis;
+            optional<genesis_state>  genesis;
             wasm_interface::vm_type  wasm_runtime = chain::config::default_wasm_runtime;
 
             db_read_mode             read_mode              = db_read_mode::SPECULATIVE;
@@ -100,7 +100,7 @@ namespace eosio { namespace chain {
          };
 
          explicit controller( const config& cfg );
-         controller( const config& cfg, protocol_feature_set&& pfs );
+         controller( const config& cfg, const fc::optional<chain_id_type>& chain_id, protocol_feature_set&& pfs );
          ~controller();
 
          void add_indices();
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 5c8d1ac93af..89ff7c13d02 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -10,6 +10,7 @@
 #include <eosio/chain/reversible_block_object.hpp>
 #include <eosio/chain/controller.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
+#include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/snapshot.hpp>
 
 #include <eosio/chain/eosio_contract.hpp>
@@ -108,6 +109,7 @@ using namespace eosio;
 using namespace eosio::chain;
 using namespace eosio::chain::config;
 using namespace eosio::chain::plugin_interface;
+using namespace eosio::chain::legacy;
 using vm_type = wasm_interface::vm_type;
 using fc::flat_map;
 
@@ -136,6 +138,7 @@ class chain_plugin_impl {
    fc::optional<controller::config> chain_config;
    fc::optional<controller>         chain;
    fc::optional<chain_id_type>      chain_id;
+   std::string                      chain_id_source;
    //txn_msg_rate_limits              rate_limits;
    fc::optional<vm_type>            wasm_runtime;
    fc::microseconds                 abi_serializer_max_time_ms;
@@ -258,6 +261,7 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
 
    cli.add_options()
          ("genesis-json", bpo::value<bfs::path>(), "File to read Genesis State from")
+         ("chain-id", bpo::value<string>(), "chain_id for the blockchain")
          ("genesis-timestamp", bpo::value<string>(), "override the initial timestamp in the Genesis State file")
          ("print-genesis-json", bpo::bool_switch()->default_value(false),
           "extract genesis_state from blocks.log as JSON, print to console, and exit")
@@ -818,32 +822,90 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                         plugin_config_exception,
                         "Specified genesis file '${genesis}' does not exist.",
                         ("genesis", genesis_path.generic_string()));
-            auto genesis_file = fc::json::from_file( genesis_path ).as<genesis_state>();
-            EOS_ASSERT( my->chain_config->genesis == genesis_file, plugin_config_exception,
-                        "Genesis state provided via command line arguments does not match the existing genesis state in the snapshot. "
-                        "It is not necessary to provide a genesis state argument when loading a snapshot."
-                      );
+            const auto genesis_file = fc::json::from_file( genesis_path ).as<genesis_state>();
+            if (my->chain_config->genesis) {
+               EOS_ASSERT( *my->chain_config->genesis == genesis_file, plugin_config_exception,
+                           "Genesis state provided via command line arguments does not match the existing genesis state in the ${source}. "
+                           "It is not necessary to provide a genesis state argument when loading a snapshot.", ("source", my->chain_id_source)
+               );
+            }
+            else {
+               if( my->chain_id ) {
+                  ilog("REMOVE chain id: ${ci}, genesis chain id: ${gci}", ("ci", *my->chain_id)("gci",genesis_file.compute_chain_id()));
+                  EOS_ASSERT( *my->chain_id == genesis_file.compute_chain_id(), plugin_config_exception,
+                              "Genesis state's chain id provided via command line arguments does not match the chain id in the ${source}. "
+                              "It is not necessary to provide a genesis state argument when loading a snapshot.", ("source", my->chain_id_source)
+                  );
+               }
+               else {
+                  my->chain_id = genesis_file.compute_chain_id();
+                  my->chain_id_source = "genesis json";
+               }
+            }
          }
+
+         if( options.count( "chain-id" ) ) {
+            auto ci = options.at( "chain-id" );
+            ilog("chain-id");
+            ilog("chain-id passed ${ci}",("ci", ci.as<string>()));
+            auto get_chain_id = [chain_id=ci.as<string>()]() {
+               try {
+                  ilog("chain-id: ${ci}",("ci", chain_id));
+                  return fc::json::from_string(chain_id).as<chain_id_type>();
+               } catch ( fc::exception& e ) {
+                  elog("Malformed chain id");
+                  throw e;
+               }};
+            const chain_id_type passed_chain_id = get_chain_id();
+            if( my->chain_id ) {
+               ilog("REMOVE chain id: ${ci}, passed_chain_id: ${gci}", ("ci", *my->chain_id)("gci",passed_chain_id));
+               EOS_ASSERT( *my->chain_id == passed_chain_id, plugin_config_exception,
+                           "chain id provided via command line arguments does not match the existing chain id in the ${source}. "
+                           "It is not necessary to provide a chain id argument when loading a snapshot.", ("source", my->chain_id_source)
+               );
+            }
+            else {
+               my->chain_id = passed_chain_id;
+               my->chain_id_source = "chain id command line parameter";
+            }
+         }
+
          auto shared_mem_path = my->chain_config->state_dir / "shared_memory.bin";
          EOS_ASSERT( !fc::exists(shared_mem_path),
                  plugin_config_exception,
                  "Snapshot can only be used to initialize an empty database." );
 
          if( fc::is_regular_file( my->blocks_dir / "blocks.log" )) {
-            auto log_genesis = block_log::extract_genesis_state(my->blocks_dir);
-            EOS_ASSERT( log_genesis.compute_chain_id() == my->chain_config->genesis.compute_chain_id(),
-                    plugin_config_exception,
-                    "Genesis information in blocks.log does not match genesis information in the snapshot");
+            const auto log_chain_id = block_log::extract_chain_id(my->blocks_dir);
+            if( my->chain_id ) {
+               EOS_ASSERT( log_chain_id == *my->chain_id,
+                           plugin_config_exception,
+                           "Chain id in blocks.log does not match chain id in the snapshot");
+            }
+            else {
+               my->chain_id = log_chain_id;
+               my->chain_id_source = "block log";
+            }
          }
 
+         if (my->chain_id) {
+            ilog("chain id set to: ${ci} by ${source}", ("ci", my->chain_id)("source", my->chain_id_source));
+         }
       } else {
          bfs::path genesis_file;
          bool genesis_timestamp_specified = false;
          fc::optional<genesis_state> existing_genesis;
 
          if( fc::exists( my->blocks_dir / "blocks.log" ) ) {
-            my->chain_config->genesis = block_log::extract_genesis_state( my->blocks_dir );
-            existing_genesis = my->chain_config->genesis;
+            existing_genesis = block_log::extract_genesis_state( my->blocks_dir );
+            EOS_ASSERT( existing_genesis,
+                        plugin_config_exception,
+                        "Specified genesis file '${genesis}' does not contain a genesis state (truncated block log).  "
+                        "Truncated block logs can only be used with snapshots.",
+                        ("genesis", genesis_file.generic_string()));
+            my->chain_config->genesis = *existing_genesis;
+            my->chain_id = existing_genesis->compute_chain_id();
+            my->chain_id_source = "block log";
          }
 
          if( options.count( "genesis-json" )) {
@@ -858,13 +920,53 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                        ("genesis", genesis_file.generic_string()));
 
             my->chain_config->genesis = fc::json::from_file( genesis_file ).as<genesis_state>();
+            const auto chain_id_from_gs = my->chain_config->genesis->compute_chain_id();
+            if ( !my->chain_id ) {
+               my->chain_id = chain_id_from_gs;
+               my->chain_id_source = "genesis-json";
+            }
+         }
+         else if( !my->chain_id ) {
+            my->chain_config->genesis.emplace();
+            // will handle setting the my->chain_id below
          }
 
          if( options.count( "genesis-timestamp" ) ) {
-            my->chain_config->genesis.initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
+            my->chain_config->genesis->initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
             genesis_timestamp_specified = true;
          }
 
+         if( options.count( "chain-id" )) {
+            auto get_chain_id = [chain_id=options.at( "chain-id" ).as<string>()]() {
+               try {
+                  ilog("chain-id: ${ci}",("ci", chain_id));
+                  return fc::json::from_string(chain_id).as<chain_id_type>();
+               } catch ( fc::exception& e ) {
+                  elog("Malformed chain id");
+                  throw e;
+               }};
+            const chain_id_type passed_chain_id = get_chain_id();
+            if (my->chain_id) {
+               ilog("REMOVE chain id: ${ci}, passed_chain_id: ${gci}", ("ci", *my->chain_id)("gci",passed_chain_id));
+               EOS_ASSERT( *my->chain_id == passed_chain_id, plugin_config_exception,
+                           "chain id provided via command line arguments does not match the existing chain id in the ${source}. "
+                           "Providing a chain id argument is not required.", ("source", my->chain_id_source)
+               );
+            }
+            else {
+               EOS_ASSERT( my->chain_config->genesis, plugin_config_exception,
+                           "Must provide \"--genesis-json\" option since no existing block log."
+               );
+               ilog("REMOVE my->chain_config->genesis->compute_chain_id(): ${ci}, passed_chain_id: ${gci}", ("ci", my->chain_config->genesis->compute_chain_id())("gci",passed_chain_id));
+               EOS_ASSERT( my->chain_config->genesis->compute_chain_id() == passed_chain_id, plugin_config_exception,
+                           "chain id provided via command line arguments does not match the existing chain id in the default genesis state. "
+                           "Providing a chain id argument is not required."
+               );
+               my->chain_id = passed_chain_id;
+               my->chain_id_source = "chain id command line parameter";
+            }
+         }
+
          if( !existing_genesis ) {
             if( !genesis_file.empty() ) {
                if( genesis_timestamp_specified ) {
@@ -879,12 +981,19 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             } else {
                wlog( "Starting up fresh blockchain with default genesis state." );
             }
+
+            if( !my->chain_id ) {
+               my->chain_id = my->chain_config->genesis->compute_chain_id();
+               my->chain_id_source = "default genesis state";
+            }
          } else {
             EOS_ASSERT( my->chain_config->genesis == *existing_genesis, plugin_config_exception,
                         "Genesis state provided via command line arguments does not match the existing genesis state in blocks.log. "
                         "It is not necessary to provide genesis state arguments when a blocks.log file already exists."
-                      );
+            );
          }
+
+         ilog("chain id set to: ${ci} by ${source}", ("ci", my->chain_id)("source", my->chain_id_source));
       }
 
       if ( options.count("read-mode") ) {
@@ -901,8 +1010,18 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          my->chain_config->db_hugepage_paths = options.at("database-hugepage-path").as<std::vector<std::string>>();
 #endif
 
-      my->chain.emplace( *my->chain_config, std::move(pfs) );
-      my->chain_id.emplace( my->chain->get_chain_id());
+      my->chain.emplace( *my->chain_config, my->chain_id, std::move(pfs) );
+      auto actual_chain_id = my->chain->get_chain_id();
+      if( !my->chain_id ) {
+         my->chain_id.emplace( actual_chain_id);
+         ilog("chain id now set to: ${ci}", ("ci", my->chain_id));
+      }
+      else {
+         EOS_ASSERT( *my->chain_id == actual_chain_id, plugin_config_exception,
+                     "chain id provided via command line arguments does not match the existing chain id in the ${source}. "
+                     "Providing a chain id argument is not required.", ("source", my->chain_id_source)
+         );
+      }
 
       // set up method providers
       my->get_block_by_number_provider = app().get_method<methods::get_block_by_number>().register_provider(
@@ -990,7 +1109,7 @@ void chain_plugin::plugin_startup()
    }
 
    ilog("Blockchain started; head block is #${num}, genesis timestamp is ${ts}",
-        ("num", my->chain->head_block_num())("ts", (std::string)my->chain_config->genesis.initial_timestamp));
+        ("num", my->chain->head_block_num())("ts", (std::string)my->chain_config->genesis->initial_timestamp));
 
    my->chain_config.reset();
 } FC_CAPTURE_AND_RETHROW() }

From 6bb24961ba9407d1e2beed1311d20cac71dcf850 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 30 Aug 2019 09:31:43 -0500
Subject: [PATCH 1071/1648] Test support for chain id addition.

---
 libraries/testing/include/eosio/testing/tester.hpp | 11 ++++++-----
 libraries/testing/tester.cpp                       |  7 ++++---
 unittests/whitelist_blacklist_tests.cpp            |  5 +++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 4aab7510774..d91c9a8125c 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -392,8 +392,9 @@ namespace eosio { namespace testing {
          vcfg.reversible_guard_size = 0;
          vcfg.contracts_console = false;
 
-         vcfg.genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-         vcfg.genesis.initial_key = get_public_key( config::system_account_name, "active" );
+         vcfg.genesis.emplace();
+         vcfg.genesis->initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
+         vcfg.genesis->initial_key = get_public_key( config::system_account_name, "active" );
 
          for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
             if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
@@ -409,7 +410,7 @@ namespace eosio { namespace testing {
 
          vcfg.trusted_producers = trusted_producers;
 
-         validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set());
+         validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
          validating_node->add_indices();
          validating_node->startup( []() { return false; } );
 
@@ -424,7 +425,7 @@ namespace eosio { namespace testing {
          vcfg.blocks_dir = vcfg.blocks_dir.parent_path() / std::string("v_").append( vcfg.blocks_dir.filename().generic_string() );
          vcfg.state_dir  = vcfg.state_dir.parent_path() / std::string("v_").append( vcfg.state_dir.filename().generic_string() );
 
-         validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set());
+         validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
          validating_node->add_indices();
          validating_node->startup( []() { return false; } );
 
@@ -474,7 +475,7 @@ namespace eosio { namespace testing {
                hbh.producer == vn_hbh.producer;
 
         validating_node.reset();
-        validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set());
+        validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
         validating_node->add_indices();
         validating_node->startup( []() { return false; } );
 
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index bc0dc42f6c2..a1fa89f09e7 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -159,8 +159,9 @@ namespace eosio { namespace testing {
       cfg.contracts_console = true;
       cfg.read_mode = read_mode;
 
-      cfg.genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-      cfg.genesis.initial_key = get_public_key( config::system_account_name, "active" );
+      cfg.genesis.emplace();
+      cfg.genesis->initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
+      cfg.genesis->initial_key = get_public_key( config::system_account_name, "active" );
 
       for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
          if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
@@ -233,7 +234,7 @@ namespace eosio { namespace testing {
    }
 
    void base_tester::open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot ) {
-      control.reset( new controller(cfg, std::move(pfs)) );
+      control.reset( new controller(cfg, fc::optional<chain_id_type>(cfg.genesis->compute_chain_id()), std::move(pfs)) );
       control->add_indices();
       control->startup( []() { return false; }, snapshot);
       chain_transactions.clear();
diff --git a/unittests/whitelist_blacklist_tests.cpp b/unittests/whitelist_blacklist_tests.cpp
index 274269beccc..68a9c7919c3 100644
--- a/unittests/whitelist_blacklist_tests.cpp
+++ b/unittests/whitelist_blacklist_tests.cpp
@@ -35,8 +35,9 @@ class whitelist_blacklist_tester {
          cfg.reversible_guard_size = 0;
          cfg.contracts_console = true;
 
-         cfg.genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-         cfg.genesis.initial_key = base_tester::get_public_key( config::system_account_name, "active" );
+         cfg.genesis.emplace();
+         cfg.genesis->initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
+         cfg.genesis->initial_key = base_tester::get_public_key( config::system_account_name, "active" );
 
          for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
             if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))

From 95d07cc1492d5bf37d119d300a225da8e0777f9e Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 30 Aug 2019 10:04:32 -0500
Subject: [PATCH 1072/1648] Added ability to remove command line flags for
 relaunch in test framework.

---
 tests/Node.py                                 |  4 ++--
 tests/nodeos_irreversible_mode_test.py        | 10 +++++-----
 ..._multiple_version_protocol_feature_test.py |  4 ++--
 tests/nodeos_protocol_feature_test.py         |  4 ++--
 tests/nodeos_under_min_avail_ram.py           | 20 +++++++++----------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/Node.py b/tests/Node.py
index 9b3539d2a47..580db1eaccc 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1346,7 +1346,7 @@ def getNextCleanProductionCycle(self, trans):
     # TBD: make nodeId an internal property
     # pylint: disable=too-many-locals
     # If nodeosPath is equal to None, it will use the existing nodeos path
-    def relaunch(self, nodeId, chainArg=None, newChain=False, timeout=Utils.systemWaitTimeout, addOrSwapFlags=None, cachePopen=False, nodeosPath=None):
+    def relaunch(self, nodeId, chainArg=None, newChain=False, timeout=Utils.systemWaitTimeout, addSwapRemoveFlags=None, cachePopen=False, nodeosPath=None):
 
         assert(self.pid is None)
         assert(self.killed)
@@ -1358,7 +1358,7 @@ def relaunch(self, nodeId, chainArg=None, newChain=False, timeout=Utils.systemWa
         splittedCmd=self.cmd.split()
         if nodeosPath: splittedCmd[0] = nodeosPath
         myCmd=" ".join(splittedCmd)
-        toAddOrSwap=copy.deepcopy(addOrSwapFlags) if addOrSwapFlags is not None else {}
+        toAddOrSwap=copy.deepcopy(addSwapRemoveFlags) if addSwapRemoveFlags is not None else {}
         if not newChain:
             skip=False
             swapValue=None
diff --git a/tests/nodeos_irreversible_mode_test.py b/tests/nodeos_irreversible_mode_test.py
index 783d96da9ca..65afd2cf173 100755
--- a/tests/nodeos_irreversible_mode_test.py
+++ b/tests/nodeos_irreversible_mode_test.py
@@ -138,8 +138,8 @@ def confirmHeadLibAndForkDbHeadOfSpecMode(nodeToTest, headLibAndForkDbHeadBefore
       assert forkDbHead == forkDbHeadBeforeSwitchMode, \
          "Fork db head ({}) should be equal to fork db head before switch mode ({}) ".format(forkDbHead, forkDbHeadBeforeSwitchMode)
 
-def relaunchNode(node: Node, nodeId, chainArg="", addOrSwapFlags=None, relaunchAssertMessage="Fail to relaunch"):
-   isRelaunchSuccess = node.relaunch(nodeId, chainArg=chainArg, addOrSwapFlags=addOrSwapFlags, timeout=relaunchTimeout, cachePopen=True)
+def relaunchNode(node: Node, nodeId, chainArg="", addSwapRemoveFlags=None, relaunchAssertMessage="Fail to relaunch"):
+   isRelaunchSuccess = node.relaunch(nodeId, chainArg=chainArg, addSwapRemoveFlags=addSwapRemoveFlags, timeout=relaunchTimeout, cachePopen=True)
    time.sleep(1) # Give a second to replay or resync if needed
    assert isRelaunchSuccess, relaunchAssertMessage
    return isRelaunchSuccess
@@ -252,7 +252,7 @@ def switchIrrToSpecMode(nodeIdOfNodeToTest, nodeToTest):
 
       # Kill and relaunch in speculative mode
       nodeToTest.kill(signal.SIGTERM)
-      relaunchNode(nodeToTest, nodeIdOfNodeToTest, addOrSwapFlags={"--read-mode": "speculative"})
+      relaunchNode(nodeToTest, nodeIdOfNodeToTest, addSwapRemoveFlags={"--read-mode": "speculative"})
 
       # Ensure the node condition is as expected after relaunch
       confirmHeadLibAndForkDbHeadOfSpecMode(nodeToTest, headLibAndForkDbHeadBeforeSwitchMode)
@@ -287,7 +287,7 @@ def switchIrrToSpecModeWithConnectedToProdNode(nodeIdOfNodeToTest, nodeToTest):
          # Kill and relaunch in irreversible mode
          nodeToTest.kill(signal.SIGTERM)
          waitForBlksProducedAndLibAdvanced() # Wait for some blks to be produced and lib advance)
-         relaunchNode(nodeToTest, nodeIdOfNodeToTest, addOrSwapFlags={"--read-mode": "speculative"})
+         relaunchNode(nodeToTest, nodeIdOfNodeToTest, addSwapRemoveFlags={"--read-mode": "speculative"})
 
          # Ensure the node condition is as expected after relaunch
          ensureHeadLibAndForkDbHeadIsAdvancing(nodeToTest)
@@ -353,7 +353,7 @@ def switchToSpecModeWithIrrModeSnapshot(nodeIdOfNodeToTest, nodeToTest):
          # Start from clean data dir, recover back up blocks, and then relaunch with irreversible snapshot
          removeState(nodeIdOfNodeToTest)
          recoverBackedupBlksDir(nodeIdOfNodeToTest) # this function will delete the existing blocks dir first
-         relaunchNode(nodeToTest, nodeIdOfNodeToTest, chainArg=" --snapshot {}".format(getLatestSnapshot(nodeIdOfNodeToTest)), addOrSwapFlags={"--read-mode": "speculative"})
+         relaunchNode(nodeToTest, nodeIdOfNodeToTest, chainArg=" --snapshot {}".format(getLatestSnapshot(nodeIdOfNodeToTest)), addSwapRemoveFlags={"--read-mode": "speculative"})
          confirmHeadLibAndForkDbHeadOfSpecMode(nodeToTest)
          # Ensure it automatically replays "reversible blocks", i.e. head lib and fork db should be the same
          headLibAndForkDbHeadAfterRelaunch = getHeadLibAndForkDbHead(nodeToTest)
diff --git a/tests/nodeos_multiple_version_protocol_feature_test.py b/tests/nodeos_multiple_version_protocol_feature_test.py
index 73978df984a..64dcb33bbb4 100755
--- a/tests/nodeos_multiple_version_protocol_feature_test.py
+++ b/tests/nodeos_multiple_version_protocol_feature_test.py
@@ -36,10 +36,10 @@
 cluster=Cluster(walletd=True)
 cluster.setWalletMgr(walletMgr)
 
-def restartNode(node: Node, nodeId, chainArg=None, addOrSwapFlags=None, nodeosPath=None):
+def restartNode(node: Node, nodeId, chainArg=None, addSwapRemoveFlags=None, nodeosPath=None):
     if not node.killed:
         node.kill(signal.SIGTERM)
-    isRelaunchSuccess = node.relaunch(nodeId, chainArg, addOrSwapFlags=addOrSwapFlags,
+    isRelaunchSuccess = node.relaunch(nodeId, chainArg, addSwapRemoveFlags=addSwapRemoveFlags,
                                       timeout=5, cachePopen=True, nodeosPath=nodeosPath)
     assert isRelaunchSuccess, "Fail to relaunch"
 
diff --git a/tests/nodeos_protocol_feature_test.py b/tests/nodeos_protocol_feature_test.py
index cced0daa833..ed38e9d24cd 100755
--- a/tests/nodeos_protocol_feature_test.py
+++ b/tests/nodeos_protocol_feature_test.py
@@ -30,10 +30,10 @@
 
 # The following test case will test the Protocol Feature JSON reader of the blockchain
 
-def restartNode(node: Node, nodeId, chainArg=None, addOrSwapFlags=None):
+def restartNode(node: Node, nodeId, chainArg=None, addSwapRemoveFlags=None):
     if not node.killed:
         node.kill(signal.SIGTERM)
-    isRelaunchSuccess = node.relaunch(nodeId, chainArg, addOrSwapFlags=addOrSwapFlags, timeout=5, cachePopen=True)
+    isRelaunchSuccess = node.relaunch(nodeId, chainArg, addSwapRemoveFlags=addSwapRemoveFlags, timeout=5, cachePopen=True)
     assert isRelaunchSuccess, "Fail to relaunch"
 
 walletMgr=WalletMgr(True)
diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index 598d0c2c1b1..e19ecf6cdd5 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -217,21 +217,21 @@ def setName(self, num):
     Print("all nodes exited with expected reason database_guard_exception")
 
     Print("relaunch nodes with new capacity")
-    addOrSwapFlags={}
+    addSwapRemoveFlags={}
     maxRAMValue+=2
     currentMinimumMaxRAM=maxRAMValue
     enabledStaleProduction=False
     for i in range(numNodes):
-        addOrSwapFlags[maxRAMFlag]=str(maxRAMValue)
-        #addOrSwapFlags["--max-irreversible-block-age"]=str(-1)
+        addSwapRemoveFlags[maxRAMFlag]=str(maxRAMValue)
+        #addSwapRemoveFlags["--max-irreversible-block-age"]=str(-1)
         nodeIndex=numNodes-i-1
         if not enabledStaleProduction:
-            addOrSwapFlags["--enable-stale-production"]=""   # just enable stale production for the first node
+            addSwapRemoveFlags["--enable-stale-production"]=""   # just enable stale production for the first node
             enabledStaleProduction=True
-        if not nodes[nodeIndex].relaunch(nodeIndex, "", newChain=False, addOrSwapFlags=addOrSwapFlags):
+        if not nodes[nodeIndex].relaunch(nodeIndex, "", newChain=False, addSwapRemoveFlags=addSwapRemoveFlags):
             Utils.cmdError("Failed to restart node0 with new capacity %s" % (maxRAMValue))
             errorExit("Failure - Node should have restarted")
-        addOrSwapFlags={}
+        addSwapRemoveFlags={}
         maxRAMValue=currentMinimumMaxRAM+30
 
     time.sleep(20)
@@ -285,16 +285,16 @@ def setName(self, num):
             errorExit("Failure - Node should be alive")
 
     Print("relaunch node with even more capacity")
-    addOrSwapFlags={}
+    addSwapRemoveFlags={}
 
     time.sleep(10)
     maxRAMValue=currentMinimumMaxRAM+5
     currentMinimumMaxRAM=maxRAMValue
-    addOrSwapFlags[maxRAMFlag]=str(maxRAMValue)
-    if not nodes[len(nodes)-1].relaunch(nodeIndex, "", newChain=False, addOrSwapFlags=addOrSwapFlags):
+    addSwapRemoveFlags[maxRAMFlag]=str(maxRAMValue)
+    if not nodes[len(nodes)-1].relaunch(nodeIndex, "", newChain=False, addSwapRemoveFlags=addSwapRemoveFlags):
         Utils.cmdError("Failed to restart node %d with new capacity %s" % (numNodes-1, maxRAMValue))
         errorExit("Failure - Node should have restarted")
-    addOrSwapFlags={}
+    addSwapRemoveFlags={}
 
     time.sleep(10)
     allDone=True

From e86f561306de5bd5cf869bc3f02674d2c64770ae Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 30 Aug 2019 20:48:43 -0500
Subject: [PATCH 1073/1648] Missed adding chain_id to reflection for
 global_property_object.

---
 .../chain/include/eosio/chain/global_property_object.hpp      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/global_property_object.hpp b/libraries/chain/include/eosio/chain/global_property_object.hpp
index ba5bb060b83..57d6c745fe2 100644
--- a/libraries/chain/include/eosio/chain/global_property_object.hpp
+++ b/libraries/chain/include/eosio/chain/global_property_object.hpp
@@ -121,7 +121,7 @@ CHAINBASE_SET_INDEX_TYPE(eosio::chain::dynamic_global_property_object,
                          eosio::chain::dynamic_global_property_multi_index)
 
 FC_REFLECT(eosio::chain::global_property_object,
-            (proposed_schedule_block_num)(proposed_schedule)(configuration)
+            (proposed_schedule_block_num)(proposed_schedule)(configuration)(chain_id)
           )
 
 FC_REFLECT(eosio::chain::legacy::snapshot_global_property_object_v2,
@@ -129,7 +129,7 @@ FC_REFLECT(eosio::chain::legacy::snapshot_global_property_object_v2,
           )
 
 FC_REFLECT(eosio::chain::snapshot_global_property_object,
-            (proposed_schedule_block_num)(proposed_schedule)(configuration)
+            (proposed_schedule_block_num)(proposed_schedule)(configuration)(chain_id)
           )
 
 FC_REFLECT(eosio::chain::dynamic_global_property_object,

From b278bdd9e1956291c5cbd0508b770500aec26761 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 30 Aug 2019 21:17:17 -0500
Subject: [PATCH 1074/1648] Changed snapshot to only use chain id from genesis,
 if chain_id not passed in.

---
 .../testing/include/eosio/testing/tester.hpp  |  8 +++----
 libraries/testing/tester.cpp                  | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index d91c9a8125c..08c021e0649 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -100,13 +100,13 @@ namespace eosio { namespace testing {
          virtual ~base_tester() {};
 
          void              init(const setup_policy policy = setup_policy::full, db_read_mode read_mode = db_read_mode::SPECULATIVE);
-         void              init(controller::config config, const snapshot_reader_ptr& snapshot = nullptr);
-         void              init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot = nullptr);
+         void              init(controller::config config, const snapshot_reader_ptr& snapshot = nullptr, const fc::optional<chain_id_type>& chain_id = fc::optional<chain_id_type>());
+         void              init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot = nullptr, const fc::optional<chain_id_type>& chain_id = fc::optional<chain_id_type>());
          void              execute_setup_policy(const setup_policy policy);
 
          void              close();
-         void              open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot);
-         void              open( const snapshot_reader_ptr& snapshot);
+         void              open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id = fc::optional<chain_id_type>());
+         void              open( const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id = fc::optional<chain_id_type>());
          bool              is_same_chain( base_tester& other );
 
          virtual signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) ) = 0;
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index a1fa89f09e7..1a211c489f5 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -174,14 +174,14 @@ namespace eosio { namespace testing {
       execute_setup_policy(policy);
    }
 
-   void base_tester::init(controller::config config, const snapshot_reader_ptr& snapshot) {
+   void base_tester::init(controller::config config, const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id) {
       cfg = config;
-      open(snapshot);
+      open(snapshot, chain_id);
    }
 
-   void base_tester::init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot) {
+   void base_tester::init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id) {
       cfg = config;
-      open(std::move(pfs), snapshot);
+      open(std::move(pfs), snapshot, chain_id);
    }
 
    void base_tester::execute_setup_policy(const setup_policy policy) {
@@ -229,12 +229,20 @@ namespace eosio { namespace testing {
       chain_transactions.clear();
    }
 
-   void base_tester::open( const snapshot_reader_ptr& snapshot ) {
-      open( make_protocol_feature_set(), snapshot );
+   void base_tester::open( const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id ) {
+      open( make_protocol_feature_set(), snapshot, chain_id );
    }
 
-   void base_tester::open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot ) {
-      control.reset( new controller(cfg, fc::optional<chain_id_type>(cfg.genesis->compute_chain_id()), std::move(pfs)) );
+   void base_tester::open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id ) {
+      fc::optional<chain_id_type> control_chain_id;
+      if (chain_id)  {
+         cfg.genesis = fc::optional<genesis_state>();
+         control_chain_id = chain_id;
+      }
+      else if (cfg.genesis) {
+         control_chain_id = cfg.genesis->compute_chain_id();
+      }
+      control.reset( new controller(cfg, control_chain_id, std::move(pfs)) );
       control->add_indices();
       control->startup( []() { return false; }, snapshot);
       chain_transactions.clear();

From ab28e4a66281b56eddadcdbacc205a2daf396b3a Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 3 Sep 2019 13:13:00 -0500
Subject: [PATCH 1075/1648] Added tests to verify genesis state is required for
 starting without a snapshot and only chain_id is required for snapshots.

---
 .../testing/include/eosio/testing/tester.hpp  |   3 +
 unittests/snapshot_tests.cpp                  | 391 +++++++++++-------
 2 files changed, 252 insertions(+), 142 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 08c021e0649..212faa2e55f 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -410,6 +410,7 @@ namespace eosio { namespace testing {
 
          vcfg.trusted_producers = trusted_producers;
 
+         FC_ASSERT(vcfg.genesis, "Should have a valid genesis_state");
          validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
          validating_node->add_indices();
          validating_node->startup( []() { return false; } );
@@ -425,6 +426,7 @@ namespace eosio { namespace testing {
          vcfg.blocks_dir = vcfg.blocks_dir.parent_path() / std::string("v_").append( vcfg.blocks_dir.filename().generic_string() );
          vcfg.state_dir  = vcfg.state_dir.parent_path() / std::string("v_").append( vcfg.state_dir.filename().generic_string() );
 
+         FC_ASSERT(vcfg.genesis, "Should have a valid genesis_state");
          validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
          validating_node->add_indices();
          validating_node->startup( []() { return false; } );
@@ -475,6 +477,7 @@ namespace eosio { namespace testing {
                hbh.producer == vn_hbh.producer;
 
         validating_node.reset();
+        FC_ASSERT(vcfg.genesis, "Should have a valid genesis_state");
         validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
         validating_node->add_indices();
         validating_node->startup( []() { return false; } );
diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index ef008df3051..9726eaad43a 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -14,39 +14,66 @@ using namespace eosio;
 using namespace testing;
 using namespace chain;
 
+chainbase::bfs::path get_parent_path(chainbase::bfs::path blocks_dir, int ordinal) {
+   chainbase::bfs::path leaf_dir = blocks_dir.filename();
+   if (leaf_dir.generic_string() == std::string("blocks")) {
+      blocks_dir = blocks_dir.parent_path();
+      leaf_dir = blocks_dir.filename();
+      try {
+         auto ordinal_for_config = boost::lexical_cast<int>(leaf_dir.generic_string());
+         blocks_dir = blocks_dir.parent_path();
+      }
+      catch(const boost::bad_lexical_cast& ) {
+         // no extra ordinal directory added to path
+      }
+   }
+   return blocks_dir / std::to_string(ordinal);
+}
+
+controller::config copy_config(const controller::config& config, int ordinal) {
+   controller::config copied_config = config;
+   auto parent_path = get_parent_path(config.blocks_dir, ordinal);
+   copied_config.blocks_dir = parent_path / config.blocks_dir.filename().generic_string();
+   copied_config.state_dir = parent_path / config.state_dir.filename().generic_string();
+   return copied_config;
+}
+
+controller::config copy_config_and_files(const controller::config& config, int ordinal) {
+   controller::config copied_config = copy_config(config, ordinal);
+   fc::create_directories(copied_config.blocks_dir);
+   fc::copy(config.blocks_dir / "blocks.log", copied_config.blocks_dir / "blocks.log");
+   fc::copy(config.blocks_dir / config::reversible_blocks_dir_name, copied_config.blocks_dir / config::reversible_blocks_dir_name );
+   return copied_config;
+}
+
 class snapshotted_tester : public base_tester {
 public:
-   snapshotted_tester(controller::config config, const snapshot_reader_ptr& snapshot, int ordinal) {
-      FC_ASSERT(config.blocks_dir.filename().generic_string() != "."
-         && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config");
-
-      controller::config copied_config = config;
-      copied_config.blocks_dir =
-              config.blocks_dir.parent_path() / std::to_string(ordinal).append(config.blocks_dir.filename().generic_string());
-      copied_config.state_dir =
-              config.state_dir.parent_path() / std::to_string(ordinal).append(config.state_dir.filename().generic_string());
+   enum config_file_handling { dont_copy_config_files, copy_config_files };
+   snapshotted_tester(controller::config config, const snapshot_reader_ptr& snapshot, int ordinal,
+           config_file_handling copy_files_from_config = config_file_handling::dont_copy_config_files) {
+      FC_ASSERT(config.genesis, "Must pass in chain_id if config does not have genesis");
+      _init(config, snapshot, ordinal, fc::optional<chain_id_type>(config.genesis->compute_chain_id()), copy_files_from_config);
+   }
 
-      init(copied_config, snapshot);
+   snapshotted_tester(controller::config config, const snapshot_reader_ptr& snapshot, int ordinal,
+                      const fc::optional<chain_id_type>& chain_id,
+                      config_file_handling copy_files_from_config = config_file_handling::dont_copy_config_files) {
+      _init(config, snapshot, ordinal, chain_id, copy_files_from_config);
    }
 
-   snapshotted_tester(controller::config config, const snapshot_reader_ptr& snapshot, int ordinal, int copy_block_log_from_ordinal) {
+   void _init(controller::config config, const snapshot_reader_ptr& snapshot, int ordinal,
+             const fc::optional<chain_id_type>& chain_id,
+             config_file_handling copy_files_from_config = config_file_handling::dont_copy_config_files) {
       FC_ASSERT(config.blocks_dir.filename().generic_string() != "."
-         && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config");
-
-      controller::config copied_config = config;
-      copied_config.blocks_dir =
-              config.blocks_dir.parent_path() / std::to_string(ordinal).append(config.blocks_dir.filename().generic_string());
-      copied_config.state_dir =
-              config.state_dir.parent_path() / std::to_string(ordinal).append(config.state_dir.filename().generic_string());
+                && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config");
 
-      // create a copy of the desired block log and reversible
-      auto block_log_path = config.blocks_dir.parent_path() / std::to_string(copy_block_log_from_ordinal).append(config.blocks_dir.filename().generic_string());
-      fc::create_directories(copied_config.blocks_dir);
-      fc::copy(block_log_path / "blocks.log", copied_config.blocks_dir / "blocks.log");
-      fc::copy(block_log_path / config::reversible_blocks_dir_name, copied_config.blocks_dir / config::reversible_blocks_dir_name );
+      controller::config copied_config = (copy_files_from_config == copy_config_files)
+                                         ? copy_config_and_files(config, ordinal) : copy_config(config, ordinal);
 
-      init(copied_config, snapshot);
+      copied_config.genesis = fc::optional<genesis_state>();
+      init(copied_config, snapshot, chain_id);
    }
+
    signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
       return _produce_block(skip_time, false);
    }
@@ -157,6 +184,103 @@ BOOST_AUTO_TEST_SUITE(snapshot_tests)
 
 using snapshot_suites = boost::mpl::list<variant_snapshot_suite, buffered_snapshot_suite>;
 
+namespace {
+   void variant_diff_helper(const fc::variant& lhs, const fc::variant& rhs, std::function<void(const std::string&, const fc::variant&, const fc::variant&)>&& out){
+      if (lhs.get_type() != rhs.get_type()) {
+         out("", lhs, rhs);
+      } else if (lhs.is_object() ) {
+         const auto& l_obj = lhs.get_object();
+         const auto& r_obj = rhs.get_object();
+         static const std::string sep = ".";
+
+         // test keys from LHS
+         std::set<std::string_view> keys;
+         for (const auto& entry: l_obj) {
+            const auto& l_val = entry.value();
+            const auto& r_iter = r_obj.find(entry.key());
+            if (r_iter == r_obj.end()) {
+               out(sep + entry.key(), l_val, fc::variant());
+            } else {
+               const auto& r_val = r_iter->value();
+               variant_diff_helper(l_val, r_val, [&out, &entry](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
+                  out(sep + entry.key() + path, lhs, rhs);
+               });
+            }
+
+            keys.insert(entry.key());
+         }
+
+         // print keys in RHS that were not tested
+         for (const auto& entry: r_obj) {
+            if (keys.find(entry.key()) != keys.end()) {
+               continue;
+            }
+            const auto& r_val = entry.value();
+            out(sep + entry.key(), fc::variant(), r_val);
+         }
+      } else if (lhs.is_array()) {
+         const auto& l_arr = lhs.get_array();
+         const auto& r_arr = rhs.get_array();
+
+         // diff common
+         auto common_count = std::min(l_arr.size(), r_arr.size());
+         for (size_t idx = 0; idx < common_count; idx++) {
+            const auto& l_val = l_arr.at(idx);
+            const auto& r_val = r_arr.at(idx);
+            variant_diff_helper(l_val, r_val, [&](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
+               out( std::string("[") + std::to_string(idx) + std::string("]") + path, lhs, rhs);
+            });
+         }
+
+         // print lhs additions
+         for (size_t idx = common_count; idx < lhs.size(); idx++) {
+            const auto& l_val = l_arr.at(idx);
+            out( std::string("[") + std::to_string(idx) + std::string("]"), l_val, fc::variant());
+         }
+
+         // print rhs additions
+         for (size_t idx = common_count; idx < rhs.size(); idx++) {
+            const auto& r_val = r_arr.at(idx);
+            out( std::string("[") + std::to_string(idx) + std::string("]"), fc::variant(), r_val);
+         }
+
+      } else if (!(lhs == rhs)) {
+         out("", lhs, rhs);
+      }
+   }
+
+   void print_variant_diff(const fc::variant& lhs, const fc::variant& rhs) {
+      variant_diff_helper(lhs, rhs, [](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
+         std::cout << path << std::endl;
+         if (!lhs.is_null()) {
+            std::cout << " < " << fc::json::to_pretty_string(lhs) << std::endl;
+         }
+
+         if (!rhs.is_null()) {
+            std::cout << " > " << fc::json::to_pretty_string(rhs) << std::endl;
+         }
+      });
+   }
+
+   template <typename SNAPSHOT_SUITE>
+   void verify_integrity_hash(const controller& lhs, const controller& rhs) {
+      const auto lhs_integrity_hash = lhs.calculate_integrity_hash();
+      const auto rhs_integrity_hash = rhs.calculate_integrity_hash();
+      if (std::is_same_v<SNAPSHOT_SUITE, variant_snapshot_suite> && lhs_integrity_hash.str() != rhs_integrity_hash.str()) {
+         auto lhs_latest_writer = SNAPSHOT_SUITE::get_writer();
+         lhs.write_snapshot(lhs_latest_writer);
+         auto lhs_latest = SNAPSHOT_SUITE::finalize(lhs_latest_writer);
+
+         auto rhs_latest_writer = SNAPSHOT_SUITE::get_writer();
+         rhs.write_snapshot(rhs_latest_writer);
+         auto rhs_latest = SNAPSHOT_SUITE::finalize(rhs_latest_writer);
+
+         print_variant_diff(lhs_latest, rhs_latest);
+      }
+      BOOST_REQUIRE_EQUAL(lhs_integrity_hash.str(), rhs_integrity_hash.str());
+   }
+}
+
 BOOST_AUTO_TEST_CASE_TEMPLATE(test_exhaustive_snapshot, SNAPSHOT_SUITE, snapshot_suites)
 {
    tester chain;
@@ -204,6 +328,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_exhaustive_snapshot, SNAPSHOT_SUITE, snapshot
 BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapshot_suites)
 {
    tester chain;
+   const chainbase::bfs::path parent_path = chain.get_config().blocks_dir.parent_path();
 
    chain.create_account(N(snapshot));
    chain.produce_blocks(1);
@@ -226,7 +351,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
    }
 
    chain.control->abort_block();
-   auto expected_pre_integrity_hash = chain.control->calculate_integrity_hash();
 
    // create a new snapshot child
    auto writer = SNAPSHOT_SUITE::get_writer();
@@ -234,8 +358,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
    auto snapshot = SNAPSHOT_SUITE::finalize(writer);
 
    // create a new child at this snapshot
-   snapshotted_tester snap_chain(chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), 1);
-   BOOST_REQUIRE_EQUAL(expected_pre_integrity_hash.str(), snap_chain.control->calculate_integrity_hash().str());
+   int ordinal = 1;
+   snapshotted_tester snap_chain(chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++);
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
 
    // push more blocks to build up a block log
    for (int itr = 0; itr < post_snapshot_block_count; itr++) {
@@ -250,91 +375,83 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
 
    // verify the hash at the end
    chain.control->abort_block();
-   auto expected_post_integrity_hash = chain.control->calculate_integrity_hash();
-   BOOST_REQUIRE_EQUAL(expected_post_integrity_hash.str(), snap_chain.control->calculate_integrity_hash().str());
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
 
    // replay the block log from the snapshot child, from the snapshot
-   snapshotted_tester replay_chain(chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), 2, 1);
-   BOOST_REQUIRE_EQUAL(expected_post_integrity_hash.str(), snap_chain.control->calculate_integrity_hash().str());
-}
-
-namespace {
-   void variant_diff_helper(const fc::variant& lhs, const fc::variant& rhs, std::function<void(const std::string&, const fc::variant&, const fc::variant&)>&& out){
-      if (lhs.get_type() != rhs.get_type()) {
-         out("", lhs, rhs);
-      } else if (lhs.is_object() ) {
-         const auto& l_obj = lhs.get_object();
-         const auto& r_obj = rhs.get_object();
-         static const std::string sep = ".";
-
-         // test keys from LHS
-         std::set<std::string_view> keys;
-         for (const auto& entry: l_obj) {
-            const auto& l_val = entry.value();
-            const auto& r_iter = r_obj.find(entry.key());
-            if (r_iter == r_obj.end()) {
-               out(sep + entry.key(), l_val, fc::variant());
-            } else {
-               const auto& r_val = r_iter->value();
-               variant_diff_helper(l_val, r_val, [&out, &entry](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
-                  out(sep + entry.key() + path, lhs, rhs);
-               });
-            }
-
-            keys.insert(entry.key());
-         }
-
-         // print keys in RHS that were not tested
-         for (const auto& entry: r_obj) {
-            if (keys.find(entry.key()) != keys.end()) {
-               continue;
-            }
-            const auto& r_val = entry.value();
-            out(sep + entry.key(), fc::variant(), r_val);
-         }
-      } else if (lhs.is_array()) {
-         const auto& l_arr = lhs.get_array();
-         const auto& r_arr = rhs.get_array();
+   using config_file_handling = snapshotted_tester::config_file_handling;
+   chain_id_type chain_id = chain.control->get_chain_id();
+   snapshotted_tester replay_chain(snap_chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++, chain_id, config_file_handling::copy_config_files);
+   const auto replay_head = replay_chain.control->head_block_num();
+   auto snap_head = snap_chain.control->head_block_num();
+   BOOST_REQUIRE_EQUAL(replay_head, snap_chain.control->last_irreversible_block_num());
+   for (auto block_num = replay_head + 1; block_num <= snap_head; ++block_num) {
+      auto block = snap_chain.control->fetch_block_by_number(block_num);
+      replay_chain.push_block(block);
+   }
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *replay_chain.control);
 
-         // diff common
-         auto common_count = std::min(l_arr.size(), r_arr.size());
-         for (size_t idx = 0; idx < common_count; idx++) {
-            const auto& l_val = l_arr.at(idx);
-            const auto& r_val = r_arr.at(idx);
-            variant_diff_helper(l_val, r_val, [&](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
-               out( std::string("[") + std::to_string(idx) + std::string("]") + path, lhs, rhs);
-            });
-         }
+   auto block = chain.produce_block();
+   chain.control->abort_block();
+   snap_chain.push_block(block);
+   replay_chain.push_block(block);
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *replay_chain.control);
+
+   snapshotted_tester replay2_chain(snap_chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++, chain_id, config_file_handling::copy_config_files);
+   const auto replay2_head = replay2_chain.control->head_block_num();
+   snap_head = snap_chain.control->head_block_num();
+   BOOST_REQUIRE_EQUAL(replay2_head, snap_chain.control->last_irreversible_block_num());
+   for (auto block_num = replay2_head + 1; block_num <= snap_head; ++block_num) {
+      auto block = snap_chain.control->fetch_block_by_number(block_num);
+      replay2_chain.push_block(block);
+   }
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *replay2_chain.control);
+
+   // verifies that chain's block_log has a genesis_state (and blocks starting at 1)
+   controller::config copied_config = copy_config_and_files(chain.get_config(), ordinal++);
+   tester from_block_log_chain(copied_config);
+   const auto from_block_log_head = from_block_log_chain.control->head_block_num();
+   BOOST_REQUIRE_EQUAL(from_block_log_head, snap_chain.control->last_irreversible_block_num());
+   for (auto block_num = from_block_log_head + 1; block_num <= snap_head; ++block_num) {
+      auto block = snap_chain.control->fetch_block_by_number(block_num);
+      from_block_log_chain.push_block(block);
+   }
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *from_block_log_chain.control);
+
+   // verifies that snap_chain's block_log does not have a genesis_state
+   copied_config = copy_config_and_files(snap_chain.get_config(), ordinal++);
+   copied_config.genesis.emplace(*chain.get_config().genesis);
+   try {
+      tester from_chain_id_block_log_chain(copied_config);
+      BOOST_FAIL("Should not be able to create new tester chain with block_log that does not start at block 1 "
+                 "(and thus does not have a genesis state)");
+   }
+   catch(const block_log_exception& ble) {
+      BOOST_REQUIRE_EQUAL("block log does not start with genesis block", ble.top_message());
+   }
 
-         // print lhs additions
-         for (size_t idx = common_count; idx < lhs.size(); idx++) {
-            const auto& l_val = l_arr.at(idx);
-            out( std::string("[") + std::to_string(idx) + std::string("]"), l_val, fc::variant());
-         }
+}
 
-         // print rhs additions
-         for (size_t idx = common_count; idx < rhs.size(); idx++) {
-            const auto& r_val = r_arr.at(idx);
-            out( std::string("[") + std::to_string(idx) + std::string("]"), fc::variant(), r_val);
-         }
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_chain_id_in_snapshot, SNAPSHOT_SUITE, snapshot_suites)
+{
+   tester chain;
+   const chainbase::bfs::path parent_path = chain.get_config().blocks_dir.parent_path();
 
-      } else if (!(lhs == rhs)) {
-         out("", lhs, rhs);
-      }
-   }
+   chain.create_account(N(snapshot));
+   chain.produce_blocks(1);
+   chain.set_code(N(snapshot), contracts::snapshot_test_wasm());
+   chain.set_abi(N(snapshot), contracts::snapshot_test_abi().data());
+   chain.produce_blocks(1);
+   chain.control->abort_block();
 
-   void print_variant_diff(const fc::variant& lhs, const fc::variant& rhs) {
-      variant_diff_helper(lhs, rhs, [](const std::string& path, const fc::variant& lhs, const fc::variant& rhs){
-         std::cout << path << std::endl;
-         if (!lhs.is_null()) {
-            std::cout << " < " << fc::json::to_pretty_string(lhs) << std::endl;
-         }
+   // create a new snapshot child
+   auto writer = SNAPSHOT_SUITE::get_writer();
+   chain.control->write_snapshot(writer);
+   auto snapshot = SNAPSHOT_SUITE::finalize(writer);
 
-         if (!rhs.is_null()) {
-            std::cout << " > " << fc::json::to_pretty_string(rhs) << std::endl;
-         }
-      });
-   }
+   snapshotted_tester snap_chain(chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), 0, fc::optional<chain_id_type>());
+   BOOST_REQUIRE_EQUAL(chain.control->get_chain_id(), snap_chain.control->get_chain_id());
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
 }
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot_suites)
@@ -349,48 +466,37 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot
    chain.set_abi(N(snapshot), contracts::snapshot_test_abi().data());
    chain.produce_blocks(1);
    chain.control->abort_block();
-   ///< End deterministic code to generate blockchain for comparison
-   auto base_integrity_value = chain.control->calculate_integrity_hash();
-
-   // create a latest snapshot
-   auto base_writer = SNAPSHOT_SUITE::get_writer();
-   chain.control->write_snapshot(base_writer);
-   auto base = SNAPSHOT_SUITE::finalize(base_writer);
 
    {
       static_assert(chain_snapshot_header::minimum_compatible_version <= 2, "version 2 unit test is no longer needed.  Please clean up data files");
       auto v2 = SNAPSHOT_SUITE::template load_from_file<snapshots::snap_v2>();
-      snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
-      auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();
-      BOOST_CHECK_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
+      int ordinal = 0;
+      snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), ordinal++);
+      verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *v2_tester.control);
 
       // create a latest snapshot
       auto latest_writer = SNAPSHOT_SUITE::get_writer();
       v2_tester.control->write_snapshot(latest_writer);
       auto latest = SNAPSHOT_SUITE::finalize(latest_writer);
 
-      if (std::is_same_v<SNAPSHOT_SUITE, variant_snapshot_suite> && v2_integrity_value.str() != base_integrity_value.str()) {
-         print_variant_diff(base, latest);
-      }
-
       // load the latest snapshot
-      snapshotted_tester latest_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(latest), 1);
-      auto latest_integrity_value = latest_tester.control->calculate_integrity_hash();
-
-      BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), latest_integrity_value.str());
+      snapshotted_tester latest_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(latest), ordinal++);
+      verify_integrity_hash<SNAPSHOT_SUITE>(*v2_tester.control, *latest_tester.control);
    }
 }
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, snapshot_suites)
 {
    tester chain(setup_policy::preactivate_feature_and_new_bios);
+   BOOST_REQUIRE_EQUAL(chain.get_config().genesis->compute_chain_id(), chain.control->get_chain_id());
+   const auto& gpo = chain.control->get_global_properties();
+   BOOST_REQUIRE_EQUAL(gpo.chain_id, chain.control->get_chain_id());
    auto block = chain.produce_block();
    BOOST_REQUIRE_EQUAL(block->block_num(), 3); // ensure that test setup stays consistent with original snapshot setup
    chain.create_account(N(snapshot));
    block = chain.produce_block();
    BOOST_REQUIRE_EQUAL(block->block_num(), 4);
 
-   const auto& gpo = chain.control->get_global_properties();
    BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.version, 0);
    BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.producers.size(), 0);
 
@@ -399,7 +505,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
    BOOST_REQUIRE_EQUAL(block->block_num(), 5);
    chain.control->abort_block();
    ///< End deterministic code to generate blockchain for comparison
-   auto base_integrity_value = chain.control->calculate_integrity_hash();
 
    BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.version, 1);
    BOOST_REQUIRE_EQUAL(gpo.proposed_schedule.producers.size(), 1);
@@ -407,9 +512,17 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
 
    static_assert(chain_snapshot_header::minimum_compatible_version <= 2, "version 2 unit test is no longer needed.  Please clean up data files");
    auto v2 = SNAPSHOT_SUITE::template load_from_file<snapshots::snap_v2_prod_sched>();
-   snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), 0);
-   auto v2_integrity_value = v2_tester.control->calculate_integrity_hash();
-   BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), base_integrity_value.str());
+   int ordinal = 0;
+
+   ////////////////////////////////////////////////////////////////////////
+   // Verify that the controller doesn't get the chain_id from the snapshot
+   ////////////////////////////////////////////////////////////////////////
+
+   fc::optional<chain_id_type> chain_id = chain.control->get_chain_id();
+   snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), ordinal++, chain_id);
+   BOOST_REQUIRE_EQUAL(*chain_id, v2_tester.control->get_chain_id());
+   BOOST_REQUIRE_EQUAL(chain.control->get_chain_id(), v2_tester.control->get_chain_id());
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *v2_tester.control);
 
    // create a latest version snapshot from the loaded v2 snapthos
    auto latest_from_v2_writer = SNAPSHOT_SUITE::get_writer();
@@ -417,19 +530,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
    auto latest_from_v2 = SNAPSHOT_SUITE::finalize(latest_from_v2_writer);
 
    // load the latest snapshot in a new tester and compare integrity
-   snapshotted_tester latest_from_v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(latest_from_v2), 1);
-   auto latest_from_v2_integrity_value = latest_from_v2_tester.control->calculate_integrity_hash();
-   BOOST_REQUIRE_EQUAL(v2_integrity_value.str(), latest_from_v2_integrity_value.str());
-
-
-   // take advantage of variant compare to possibly identify where snapshot disparities come from
-   if (std::is_same_v<SNAPSHOT_SUITE, variant_snapshot_suite> && latest_from_v2_integrity_value.str() != base_integrity_value.str()) {
-      // create a latest snapshot
-      auto latest_writer = SNAPSHOT_SUITE::get_writer();
-      chain.control->write_snapshot(latest_writer);
-      auto chain_latest = SNAPSHOT_SUITE::finalize(latest_writer);
-      print_variant_diff(chain_latest, latest_from_v2);
-   }
+   snapshotted_tester latest_from_v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(latest_from_v2), ordinal++);
+   verify_integrity_hash<SNAPSHOT_SUITE>(*v2_tester.control, *latest_from_v2_tester.control);
 
    const auto& v2_gpo = v2_tester.control->get_global_properties();
    BOOST_REQUIRE_EQUAL(v2_gpo.proposed_schedule.version, 1);
@@ -445,10 +547,15 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
 
    // push that block to all sub testers and validate the integrity of the database after it.
    v2_tester.push_block(new_block);
-   BOOST_REQUIRE_EQUAL(integrity_value.str(), v2_tester.control->calculate_integrity_hash().str());
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *v2_tester.control);
 
    latest_from_v2_tester.push_block(new_block);
-   BOOST_REQUIRE_EQUAL(integrity_value.str(), latest_from_v2_tester.control->calculate_integrity_hash().str());
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *latest_from_v2_tester.control);
+
+   // test passing in an invalid chain_id
+   snapshotted_tester v2_tester2(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), ordinal++, fc::optional<chain_id_type>());
+   BOOST_REQUIRE(chain.control->get_chain_id() != v2_tester2.control->get_chain_id());
+   BOOST_REQUIRE(chain.control->calculate_integrity_hash().str() != v2_tester2.control->calculate_integrity_hash().str());
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 26a199017c1c92cc0d5db6d078cd7a201e94af2f Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 3 Sep 2019 14:45:30 -0400
Subject: [PATCH 1076/1648] centos7 build script support for llvm7+ changes

at the moment just build llvm8 from source, pending scl getting llvm-toolset-7.0 still
---
 scripts/helpers/eosio.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index d9d29ea40f8..527c31b53b1 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -269,13 +269,16 @@ function ensure-boost() {
 }
 
 function ensure-llvm() {
-    if $PIN_COMPILER || $BUILD_CLANG; then
+    if $PIN_COMPILER || $BUILD_CLANG || [[ $NAME == "CentOS Linux" ]]; then
         LLVM_TEMP_DIR=$(mktemp -d)
+	if $PIN_COMPILER || $BUILD_CLANG; then
+		local LLVM_PINNED_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread"
+	fi
         trap "rm -rf '$LLVM_TEMP_DIR'" EXIT
         execute bash -c "cd '$LLVM_TEMP_DIR' \
         && git clone --depth 1 --single-branch --branch $LLVM_VERSION https://github.com/llvm-mirror/llvm.git llvm && cd llvm \
         && mkdir build && cd build \
-        && ${CMAKE} -DCMAKE_INSTALL_PREFIX='${LLVM_ROOT}' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. \
+        && ${CMAKE} -DCMAKE_INSTALL_PREFIX='${LLVM_ROOT}' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release $LLVM_PINNED_CMAKE_ARGS .. \
         && make -j${JOBS} install"
         echo " - LLVM successfully installed @ ${LLVM_ROOT}"
     elif [[ $ARCH == "Darwin" ]]; then

From a3b3374b10ee0e2606e5b389f2ac874bf38fe6e9 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 3 Sep 2019 14:51:09 -0400
Subject: [PATCH 1077/1648] whitespace cleanup on eosio.sh

---
 scripts/helpers/eosio.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 527c31b53b1..5eec8b20e37 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -271,9 +271,9 @@ function ensure-boost() {
 function ensure-llvm() {
     if $PIN_COMPILER || $BUILD_CLANG || [[ $NAME == "CentOS Linux" ]]; then
         LLVM_TEMP_DIR=$(mktemp -d)
-	if $PIN_COMPILER || $BUILD_CLANG; then
-		local LLVM_PINNED_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread"
-	fi
+        if $PIN_COMPILER || $BUILD_CLANG; then
+            local LLVM_PINNED_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread"
+        fi
         trap "rm -rf '$LLVM_TEMP_DIR'" EXIT
         execute bash -c "cd '$LLVM_TEMP_DIR' \
         && git clone --depth 1 --single-branch --branch $LLVM_VERSION https://github.com/llvm-mirror/llvm.git llvm && cd llvm \

From d805cd7754c870d3ba030e025cb49d3bdcfff824 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 3 Sep 2019 14:51:39 -0400
Subject: [PATCH 1078/1648] added automation-basic-builder-fleet to generate

---
 .cicd/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 5d14823fc12..737228805f7 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -4,7 +4,7 @@ steps:
   - label: ":pipeline: Generate Pipeline Steps"  
     command: "./.cicd/generate-pipeline.sh | buildkite-agent pipeline upload"
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "automation-basic-builder-fleet"
     timeout: ${TIMEOUT:-10}
   
   - wait

From dcd48af34b89df139275dfe535339175aa552f76 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Tue, 3 Sep 2019 16:28:30 -0400
Subject: [PATCH 1079/1648] Add alignment for pointers, references, and
 array_ptr.

---
 .../eosio/chain/webassembly/eos-vm.hpp        | 73 ++++++++++++++++++-
 libraries/eos-vm                              |  2 +-
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 77d56104138..c211a1df229 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -19,6 +19,35 @@ namespace eosio { namespace vm {
 // eosio specific specializations
 namespace eosio { namespace vm {
 
+   template <typename T, std::size_t Align>
+   struct aligned_array_wrapper {
+      static_assert(Align % alignof(T) == 0, "Must align to at least the alignment of T");
+      aligned_array_wrapper(void* ptr, uint32_t size) : ptr(ptr), size(size) {
+         if (reinterpret_cast<std::uintptr_t>(ptr) % Align != 0) {
+            copy.reset(new std::remove_cv_t<T>[size]);
+            memcpy( copy.get(), ptr, sizeof(T) * size );
+         }
+      }
+      ~aligned_array_wrapper() {
+         if constexpr (!std::is_const_v<T>)
+            if (copy)
+               memcpy( ptr, copy.get(), sizeof(T) * size);
+      }
+      constexpr operator T*() const {
+         if (copy)
+            return copy.get();
+         else
+            return static_cast<T*>(ptr);
+      }
+      constexpr operator eosio::chain::array_ptr<T>() const {
+        return eosio::chain::array_ptr<T>{static_cast<T*>(*this)};
+      }
+
+      void* ptr;
+      std::unique_ptr<std::remove_cv_t<T>[]> copy = nullptr;
+      std::size_t size;
+   };
+
    template<>
    struct wasm_type_converter<eosio::chain::name> {
       static auto from_wasm(uint64_t val) {
@@ -29,10 +58,50 @@ namespace eosio { namespace vm {
       }
    };
 
+   template<typename T>
+   struct wasm_type_converter<T*> {
+      static auto from_wasm(void* val) {
+         return eosio::vm::aligned_ptr_wrapper<T, alignof(T)>{val};
+      }
+   };
+
+   template<typename T>
+   struct wasm_type_converter<T&> {
+      static auto from_wasm(void* val) {
+         return eosio::vm::aligned_ref_wrapper<T, alignof(T)>{val};
+      }
+   };
+
    template<typename T>
    struct wasm_type_converter<eosio::chain::array_ptr<T>> {
-      static auto from_wasm(T* ptr) {
-         return eosio::chain::array_ptr<T>(ptr);
+      static auto from_wasm(void* ptr, uint32_t size) {
+        return aligned_array_wrapper<T, alignof(T)>(ptr, size);
+      }
+   };
+
+   template<>
+   struct wasm_type_converter<eosio::chain::array_ptr<char>> {
+      static auto from_wasm(void* ptr, uint32_t /*size*/) {
+         return eosio::chain::array_ptr<char>((char*)ptr);
+      }
+      // memcpy/memmove
+      static auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t /*size*/) {
+         return eosio::chain::array_ptr<char>((char*)ptr);
+      }
+      // memset
+      static auto from_wasm(void* ptr, int /*val*/, uint32_t /*size*/) {
+         return eosio::chain::array_ptr<char>((char*)ptr);
+      }
+   };
+
+   template<>
+   struct wasm_type_converter<eosio::chain::array_ptr<const char>> {
+      static auto from_wasm(void* ptr, uint32_t /*size*/) {
+         return eosio::chain::array_ptr<const char>((char*)ptr);
+      }
+      // memcmp
+      static auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t /*size*/) {
+         return eosio::chain::array_ptr<const char>((char*)ptr);
       }
    };
 
diff --git a/libraries/eos-vm b/libraries/eos-vm
index b4dbadc2532..faaa21e0db0 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit b4dbadc253262ccb6d8af7b07c1bdfa94cf03b3b
+Subproject commit faaa21e0db0b477a7a7e5d195994bd60b49432e1

From 4f21c004c769f5a755610ff7cb09f970889f5d62 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 3 Sep 2019 16:39:30 -0400
Subject: [PATCH 1080/1648] Remove verbose output on serial tests. Remove mongo
 dependency on Travis.

---
 .cicd/build.sh         | 2 +-
 scripts/serial-test.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 53272cc4853..acb07c798c8 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -5,7 +5,7 @@ mkdir -p $BUILD_DIR
 CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true"
 if [[ $(uname) == 'Darwin' ]]; then
     # You can't use chained commands in execute
-    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && ./$CICD_DIR/platforms/macos-10.14.sh
+    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
     ( [[ ! $PINNED == false || $UNPINNED == true ]] ) && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
     cmake $CMAKE_EXTRAS ..
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index 338d255fd15..84c8729009d 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -30,7 +30,7 @@ if [[ -z "$TEST" ]]; then # run all serial tests
         # run tests
         set +e # defer ctest error handling to end
         echo '$ ctest -L nonparallelizable_tests --output-on-failure -T Test'
-        ctest -L nonparallelizable_tests -V --output-on-failure -T Test
+        ctest -L nonparallelizable_tests --output-on-failure -T Test
         EXIT_STATUS=$?
         echo 'Done running non-parallelizable tests.'
     else

From b2b4696c1d617e9618b8f140d56dde8abf847782 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 3 Sep 2019 16:10:25 -0500
Subject: [PATCH 1081/1648] Deprecate network-version-match option as it is
 needlessly restrictive

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 91c5b4c4d72..3a5e5b31a0e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3210,7 +3210,7 @@ namespace eosio {
          ( "connection-cleanup-period", bpo::value<int>()->default_value(def_conn_retry_wait), "number of seconds to wait before cleaning up dead connections")
          ( "max-cleanup-time-msec", bpo::value<int>()->default_value(10), "max connection cleanup time per cleanup call in millisec")
          ( "network-version-match", bpo::value<bool>()->default_value(false),
-           "True to require exact match of peer network version.")
+           "DEPRECATED, needless restriction. True to require exact match of peer network version.")
          ( "net-threads", bpo::value<uint16_t>()->default_value(my->thread_pool_size),
            "Number of worker threads in net_plugin thread pool" )
          ( "sync-fetch-span", bpo::value<uint32_t>()->default_value(def_sync_fetch_span), "number of blocks to retrieve in a chunk from any individual peer during synchronization")

From 3ed5d0941426f4a2f95cd145a825de0addbb293f Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 3 Sep 2019 17:17:47 -0400
Subject: [PATCH 1082/1648] Fix Mojave package builder step label

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 3020d818461..ad62d3364db 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -327,7 +327,7 @@ cat <<EOF
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
-  - label: ":darwin: Mojave - Package Builder"
+  - label: ":darwin: macOS 10.14 - Package Builder"
     command:
       - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"

From d41f80e992597337e5dd1ae3d6444671900968ef Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 3 Sep 2019 17:18:21 -0400
Subject: [PATCH 1083/1648] Move "Ubuntu 18.04 - Contract Builder" step to end

---
 .cicd/generate-pipeline.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ad62d3364db..2f3d1860834 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -274,17 +274,6 @@ cat <<EOF
 
   - wait
 
-  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
-    command:
-      - "./.cicd/installation-build.sh"
-    env:
-      IMAGE_TAG: "ubuntu-18.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
-
   - label: ":centos: CentOS 7.6 - Package Builder"
     command:
       - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
@@ -346,6 +335,15 @@ cat <<EOF
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
 
+  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
+    command: "./.cicd/installation-build.sh"
+    env:
+      IMAGE_TAG: "ubuntu-18.04"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
 
 EOF
 IFS=$oIFS
\ No newline at end of file

From bb7aaeb756abb4c7c1967d6ad65080f5f4cb3390 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 3 Sep 2019 17:19:57 -0400
Subject: [PATCH 1084/1648] Move "Git Submodule Regression Check" YAML into
 generate-pipeline.sh

---
 .cicd/generate-pipeline.sh |  8 ++++++++
 .cicd/pipeline.yml         | 11 +----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 2f3d1860834..411cabfe96b 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -345,5 +345,13 @@ cat <<EOF
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
 
+  - wait
+
+  - label: ":git: Git Submodule Regression Check"
+    command: "./.cicd/submodule-regression-check.sh"
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: ${TIMEOUT:-5}
+
 EOF
 IFS=$oIFS
\ No newline at end of file
diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 737228805f7..50cf1a713d7 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -5,13 +5,4 @@ steps:
     command: "./.cicd/generate-pipeline.sh | buildkite-agent pipeline upload"
     agents:
       queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-  
-  - wait
-
-  - label: ":git: Git Submodule Regression Check"
-    command:
-      - "./.cicd/submodule-regression-check.sh"
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-5}
+    timeout: ${TIMEOUT:-10}
\ No newline at end of file

From d29042c391f3d87a8578c0512fd2275055a674e8 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 3 Sep 2019 17:20:49 -0400
Subject: [PATCH 1085/1648] Created "Brew Updater" step

---
 .cicd/generate-pipeline.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 411cabfe96b..c085b8487bd 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -353,5 +353,14 @@ cat <<EOF
       queue: "automation-basic-builder-fleet"
     timeout: ${TIMEOUT:-5}
 
+  - label: ":beer: Brew Updater"
+    command: |
+      buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
+      buildkite-agent artifact upload eosio.rb
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: "${TIMEOUT:-5}"
+    skip: ${SKIP_MOJAVE}${SKIP_PACKAGE_BUILDER}
+
 EOF
 IFS=$oIFS
\ No newline at end of file

From f59a2867aff3cc502d685d442054fc641cabcac0 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 3 Sep 2019 20:26:25 -0400
Subject: [PATCH 1086/1648] Add mac script back.

---
 .cicd/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index acb07c798c8..4acfd81ead7 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -5,7 +5,7 @@ mkdir -p $BUILD_DIR
 CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true"
 if [[ $(uname) == 'Darwin' ]]; then
     # You can't use chained commands in execute
-    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" && ./$CICD_DIR/platforms/macos-10.14.sh
     ( [[ ! $PINNED == false || $UNPINNED == true ]] ) && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
     cmake $CMAKE_EXTRAS ..

From ce1bc144e67c5753758bda0a1ea9ce42b5afb5dd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Sep 2019 08:40:00 -0500
Subject: [PATCH 1087/1648] Switch to head_catchup instead of in_sync from
 lib_catchup

---
 plugins/net_plugin/net_plugin.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 91c5b4c4d72..f1c9d4ab67e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1738,7 +1738,6 @@ namespace eosio {
       }
       if( state == head_catchup ) {
          fc_dlog( logger, "sync_manager in head_catchup state" );
-         set_state( in_sync );
          sync_source.reset();
          g_sync.unlock();
 
@@ -1766,12 +1765,15 @@ namespace eosio {
             set_state( head_catchup );
             g_sync.unlock();
          } else {
+            g_sync.lock();
+            set_state( in_sync );
+            g_sync.unlock();
             send_handshakes();
          }
       } else if( state == lib_catchup ) {
          if( blk_num == sync_known_lib_num ) {
             fc_dlog( logger, "All caught up with last known last irreversible block resending handshake" );
-            set_state( in_sync );
+            set_state( head_catchup );
             g_sync.unlock();
             send_handshakes();
          } else if( blk_num == sync_last_requested_num ) {

From dae7e51818ea1303395b97894dfcdefcdb3503ac Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Sep 2019 09:16:16 -0500
Subject: [PATCH 1088/1648] Log warning if network-version-match is set to true

---
 plugins/net_plugin/net_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3a5e5b31a0e..781ead8b2ee 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3239,6 +3239,8 @@ namespace eosio {
          peer_log_format = options.at( "peer-log-format" ).as<string>();
 
          my->network_version_match = options.at( "network-version-match" ).as<bool>();
+         if( my->network_version_match )
+            wlog( "network-version-match is DEPRECATED as it is a needless restriction" );
 
          my->sync_master.reset( new sync_manager( options.at( "sync-fetch-span" ).as<uint32_t>()));
 

From b29a602ee00cc2e8553d0e4acfe30b32f88fa7bb Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Wed, 4 Sep 2019 10:33:52 -0400
Subject: [PATCH 1089/1648] Add checking of pointers

---
 .../eosio/chain/webassembly/eos-vm.hpp        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index c211a1df229..2033936975d 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -23,6 +23,7 @@ namespace eosio { namespace vm {
    struct aligned_array_wrapper {
       static_assert(Align % alignof(T) == 0, "Must align to at least the alignment of T");
       aligned_array_wrapper(void* ptr, uint32_t size) : ptr(ptr), size(size) {
+         validate_ptr<T>(ptr, size);
          if (reinterpret_cast<std::uintptr_t>(ptr) % Align != 0) {
             copy.reset(new std::remove_cv_t<T>[size]);
             memcpy( copy.get(), ptr, sizeof(T) * size );
@@ -81,26 +82,31 @@ namespace eosio { namespace vm {
 
    template<>
    struct wasm_type_converter<eosio::chain::array_ptr<char>> {
-      static auto from_wasm(void* ptr, uint32_t /*size*/) {
+      static auto from_wasm(void* ptr, uint32_t size) {
+         validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<char>((char*)ptr);
       }
       // memcpy/memmove
-      static auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t /*size*/) {
+      static auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t size) {
+         validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<char>((char*)ptr);
       }
       // memset
-      static auto from_wasm(void* ptr, int /*val*/, uint32_t /*size*/) {
+      static auto from_wasm(void* ptr, int /*val*/, uint32_t size) {
+         validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<char>((char*)ptr);
       }
    };
 
    template<>
    struct wasm_type_converter<eosio::chain::array_ptr<const char>> {
-      static auto from_wasm(void* ptr, uint32_t /*size*/) {
+      static auto from_wasm(void* ptr, uint32_t size) {
+         validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<const char>((char*)ptr);
       }
       // memcmp
-      static auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t /*size*/) {
+      static auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t size) {
+         validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<const char>((char*)ptr);
       }
    };
@@ -117,8 +123,9 @@ namespace eosio { namespace vm {
 
    template<>
    struct wasm_type_converter<eosio::chain::null_terminated_ptr> {
-      static auto from_wasm(char* ptr) {
-         return eosio::chain::null_terminated_ptr{ ptr };
+      static auto from_wasm(void* ptr) {
+         validate_c_str(ptr);
+         return eosio::chain::null_terminated_ptr{ static_cast<char*>(ptr) };
       }
    };
 

From bc17197ce416ea64862854379971cb268b815a49 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Sep 2019 11:52:49 -0500
Subject: [PATCH 1090/1648] Add debug of handle signed block message. Fixed
 lambda.

---
 plugins/net_plugin/net_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f1c9d4ab67e..8682131dc21 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2841,9 +2841,9 @@ namespace eosio {
 
    // called from connection strand
    void connection::handle_message( const block_id_type& id, signed_block_ptr ptr ) {
-      app().post(priority::high, [ptr{std::move(ptr)}, id, weak = weak_from_this()] {
-         connection_ptr c = weak.lock();
-         if( c ) c->process_signed_block( id, std::move( ptr ) );
+      peer_dlog( this, "received signed_block ${id}", ("id", id) );
+      app().post(priority::high, [ptr{std::move(ptr)}, id, c = shared_from_this()]() mutable {
+         c->process_signed_block( id, std::move( ptr ) );
       });
       my_impl->dispatcher->bcast_notice( id );
    }

From fa3f529dc9abbfab4e648d5dc8826ae8ebe524d8 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Wed, 4 Sep 2019 13:35:09 -0400
Subject: [PATCH 1091/1648] Update eos-vm.  Fixes early replay failures.

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index faaa21e0db0..2be40fad06f 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit faaa21e0db0b477a7a7e5d195994bd60b49432e1
+Subproject commit 2be40fad06f3e5d22548e9dbafd39778508aa98f

From e2431f7672948f17633b189ceeccdfeb23716982 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Wed, 4 Sep 2019 13:47:27 -0500
Subject: [PATCH 1092/1648] Fix setting chain_id before genesis-timestamp is
 set.

---
 plugins/chain_plugin/chain_plugin.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 89ff7c13d02..3d258221fa8 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -891,6 +891,9 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          if (my->chain_id) {
             ilog("chain id set to: ${ci} by ${source}", ("ci", my->chain_id)("source", my->chain_id_source));
          }
+         if (my->chain_config->genesis) {
+            ilog("genesis set to: ${ci}", ("ci", *my->chain_config->genesis));
+         }
       } else {
          bfs::path genesis_file;
          bool genesis_timestamp_specified = false;
@@ -908,7 +911,8 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             my->chain_id_source = "block log";
          }
 
-         if( options.count( "genesis-json" )) {
+         const bool genesis_provided = options.count( "genesis-json" );
+         if( genesis_provided ) {
             genesis_file = options.at( "genesis-json" ).as<bfs::path>();
             if( genesis_file.is_relative()) {
                genesis_file = bfs::current_path() / genesis_file;
@@ -920,11 +924,6 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                        ("genesis", genesis_file.generic_string()));
 
             my->chain_config->genesis = fc::json::from_file( genesis_file ).as<genesis_state>();
-            const auto chain_id_from_gs = my->chain_config->genesis->compute_chain_id();
-            if ( !my->chain_id ) {
-               my->chain_id = chain_id_from_gs;
-               my->chain_id_source = "genesis-json";
-            }
          }
          else if( !my->chain_id ) {
             my->chain_config->genesis.emplace();
@@ -936,6 +935,13 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             genesis_timestamp_specified = true;
          }
 
+         if ( (genesis_provided || genesis_timestamp_specified) &&
+              !my->chain_id ) {
+            const auto chain_id_from_gs = my->chain_config->genesis->compute_chain_id();
+            my->chain_id = chain_id_from_gs;
+            my->chain_id_source = "genesis-json";
+         }
+
          if( options.count( "chain-id" )) {
             auto get_chain_id = [chain_id=options.at( "chain-id" ).as<string>()]() {
                try {
@@ -994,6 +1000,9 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          }
 
          ilog("chain id set to: ${ci} by ${source}", ("ci", my->chain_id)("source", my->chain_id_source));
+         if (my->chain_config->genesis) {
+            ilog("genesis set to: ${ci}", ("ci", *my->chain_config->genesis));
+         }
       }
 
       if ( options.count("read-mode") ) {

From 843329a34c312136c018d8f9512292efd2e7563a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Sep 2019 14:35:26 -0500
Subject: [PATCH 1093/1648] Remove syncing with other peer check as there is
 race condition on determination

---
 plugins/net_plugin/net_plugin.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8682131dc21..59d6807336b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2841,7 +2841,7 @@ namespace eosio {
 
    // called from connection strand
    void connection::handle_message( const block_id_type& id, signed_block_ptr ptr ) {
-      peer_dlog( this, "received signed_block ${id}", ("id", id) );
+      peer_dlog( this, "received signed_block ${id}", ("id", ptr->block_num() ) );
       app().post(priority::high, [ptr{std::move(ptr)}, id, c = shared_from_this()]() mutable {
          c->process_signed_block( id, std::move( ptr ) );
       });
@@ -2859,9 +2859,6 @@ namespace eosio {
       if( !c->socket_is_open() )
          return;
 
-      if( my_impl->sync_master->block_while_syncing_with_other_peer(c) )
-         return;
-
       try {
          if( cc.fetch_block_by_id(blk_id) ) {
             c->strand.post( [sync_master = my_impl->sync_master.get(),

From 736c664319c3944a6ca70f6a998a3be9a00fe807 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Sep 2019 14:47:02 -0500
Subject: [PATCH 1094/1648] Add const

---
 libraries/chain/controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 72566980f41..c7b4fe748bf 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1772,7 +1772,7 @@ struct controller_impl {
             trx_metas.reserve( b->transactions.size() );
             for( const auto& receipt : b->transactions ) {
                if( receipt.trx.contains<packed_transaction>()) {
-                  auto& pt = receipt.trx.get<packed_transaction>();
+                  const auto& pt = receipt.trx.get<packed_transaction>();
                   transaction_metadata_ptr trx_meta_ptr = trx_lookup ? trx_lookup( pt.id() ) : transaction_metadata_ptr{};
                   if( trx_meta_ptr && ( skip_auth_checks || !trx_meta_ptr->recovered_keys().empty() ) ) {
                      trx_metas.emplace_back( std::move( trx_meta_ptr ), recover_keys_future{} );

From 07d8e46892ec159232e6892b171e00da1e1e2f60 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 4 Sep 2019 15:47:14 -0400
Subject: [PATCH 1095/1648] added versions to platform files

---
 .cicd/platforms/amazon_linux-2-unpinned.dockerfile | 1 +
 .cicd/platforms/amazon_linux-2.dockerfile          | 1 +
 .cicd/platforms/centos-7.6-unpinned.dockerfile     | 1 +
 .cicd/platforms/centos-7.6.dockerfile              | 1 +
 .cicd/platforms/macos-10.14.sh                     | 1 +
 .cicd/platforms/ubuntu-16.04.dockerfile            | 1 +
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile   | 1 +
 .cicd/platforms/ubuntu-18.04.dockerfile            | 1 +
 8 files changed, 8 insertions(+)

diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
index 4f5be999930..4c6d1e3db36 100644
--- a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
@@ -1,4 +1,5 @@
 FROM amazonlinux:2.0.20190508
+ENV VERSION 1
 # install dependencies.
 RUN yum update -y && \
     yum install -y which git sudo procps-ng util-linux autoconf automake \
diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/amazon_linux-2.dockerfile
index 7886e0cdfc4..3f930fcb4de 100644
--- a/.cicd/platforms/amazon_linux-2.dockerfile
+++ b/.cicd/platforms/amazon_linux-2.dockerfile
@@ -1,4 +1,5 @@
 FROM amazonlinux:2.0.20190508
+ENV VERSION 1
 # install dependencies.
 RUN yum update -y && \
     yum install -y which git sudo procps-ng util-linux autoconf automake \
diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile
index b129c613400..cb6bdbb369c 100644
--- a/.cicd/platforms/centos-7.6-unpinned.dockerfile
+++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile
@@ -1,4 +1,5 @@
 FROM centos:7.6.1810
+ENV VERSION 1
 # install dependencies.
 RUN yum update -y && \
     yum --enablerepo=extras install -y centos-release-scl && \
diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/centos-7.6.dockerfile
index 8fd3d25376e..9dc0fc25265 100644
--- a/.cicd/platforms/centos-7.6.dockerfile
+++ b/.cicd/platforms/centos-7.6.dockerfile
@@ -1,4 +1,5 @@
 FROM centos:7.6.1810
+ENV VERSION 1
 # install dependencies.
 RUN yum update -y && \
     yum --enablerepo=extras install -y centos-release-scl && \
diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index 900b8ca0a99..0be904d60c0 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+VERSION=1
 brew update
 brew install git boost@1.70 cmake python@2 python libtool libusb graphviz automake wget gmp llvm@4 pkgconfig doxygen openssl || true
 # install clang from source
diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile
index a325a97586e..6bfbe1b1769 100644
--- a/.cicd/platforms/ubuntu-16.04.dockerfile
+++ b/.cicd/platforms/ubuntu-16.04.dockerfile
@@ -1,4 +1,5 @@
 FROM ubuntu:16.04
+ENV VERSION 1
 # install dependencies.
 RUN apt-get update && apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git automake \
diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index 79daf269c19..fe682400ea9 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -1,4 +1,5 @@
 FROM ubuntu:18.04
+ENV VERSION 1
 # install dependencies.
 RUN apt-get update && apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y git make \
diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile
index ddbeeaed970..02544dfa051 100644
--- a/.cicd/platforms/ubuntu-18.04.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04.dockerfile
@@ -1,4 +1,5 @@
 FROM ubuntu:18.04
+ENV VERSION 1
 # install dependencies.
 RUN apt-get update && apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y git make \

From 31a7d240e2158cd0c823c49cced8c66ba524c720 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Sep 2019 16:19:30 -0500
Subject: [PATCH 1096/1648] Revert switch to head_catchup instead of in_sync.
 Remove unneeded locks around atomic set_state()

---
 plugins/net_plugin/net_plugin.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 59d6807336b..8e5fb070a91 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1761,19 +1761,15 @@ namespace eosio {
          } );
 
          if( set_state_to_head_catchup ) {
-            g_sync.lock();
             set_state( head_catchup );
-            g_sync.unlock();
          } else {
-            g_sync.lock();
             set_state( in_sync );
-            g_sync.unlock();
             send_handshakes();
          }
       } else if( state == lib_catchup ) {
          if( blk_num == sync_known_lib_num ) {
             fc_dlog( logger, "All caught up with last known last irreversible block resending handshake" );
-            set_state( head_catchup );
+            set_state( in_sync );
             g_sync.unlock();
             send_handshakes();
          } else if( blk_num == sync_last_requested_num ) {

From 9e658cae2fb5884b49175b92ef30c9d70825c1d8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Sep 2019 20:08:12 -0500
Subject: [PATCH 1097/1648] Do not switch to in_sync until in_sync

---
 plugins/net_plugin/net_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8e5fb070a91..b8bf7afd873 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1768,9 +1768,9 @@ namespace eosio {
          }
       } else if( state == lib_catchup ) {
          if( blk_num == sync_known_lib_num ) {
-            fc_dlog( logger, "All caught up with last known last irreversible block resending handshake" );
-            set_state( in_sync );
             g_sync.unlock();
+            fc_dlog( logger, "All caught up with last known last irreversible block resending handshake" );
+            // stay in lib_catchup           set_state( in_sync );
             send_handshakes();
          } else if( blk_num == sync_last_requested_num ) {
             request_next_chunk( std::move( g_sync) );

From 7270b5cc69efc79ab8d1096d74cd33835958decc Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 5 Sep 2019 07:43:44 -0500
Subject: [PATCH 1098/1648] Revert in_sync change as logic depends on it. Do
 not update fork_head_num if in lib_catchup.

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b8bf7afd873..197b01fe454 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1648,11 +1648,6 @@ namespace eosio {
          return true;
       } );
       if( req.req_blocks.mode == catch_up ) {
-         {
-            std::lock_guard<std::mutex> g_conn( c->conn_mtx );
-            c->fork_head = id;
-            c->fork_head_num = num;
-         }
          std::lock_guard<std::mutex> g( sync_mtx );
          fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} "
                           "target LIB = ${lib} next_expected = ${ne}",
@@ -1661,6 +1656,11 @@ namespace eosio {
          if( sync_state == lib_catchup )
             return false;
          set_state( head_catchup );
+         {
+            std::lock_guard<std::mutex> g_conn( c->conn_mtx );
+            c->fork_head = id;
+            c->fork_head_num = num;
+         }
       } else {
          std::lock_guard<std::mutex> g_conn( c->conn_mtx );
          c->fork_head = block_id_type();
@@ -1768,9 +1768,9 @@ namespace eosio {
          }
       } else if( state == lib_catchup ) {
          if( blk_num == sync_known_lib_num ) {
-            g_sync.unlock();
             fc_dlog( logger, "All caught up with last known last irreversible block resending handshake" );
-            // stay in lib_catchup           set_state( in_sync );
+            set_state( in_sync );
+            g_sync.unlock();
             send_handshakes();
          } else if( blk_num == sync_last_requested_num ) {
             request_next_chunk( std::move( g_sync) );

From 86d3dfb044f2dffd2e21044fcb850a6430491970 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 5 Sep 2019 09:09:53 -0500
Subject: [PATCH 1099/1648] Added setting chain_config->genesis when available,
 to allow handling of corner case where snapshot is provided, but the head is
 not set.

---
 plugins/chain_plugin/chain_plugin.cpp | 29 +++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 3d258221fa8..2e471f5e95f 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -838,6 +838,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                   );
                }
                else {
+                  my->chain_config->genesis.emplace(genesis_file);
                   my->chain_id = genesis_file.compute_chain_id();
                   my->chain_id_source = "genesis json";
                }
@@ -876,9 +877,33 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                  "Snapshot can only be used to initialize an empty database." );
 
          if( fc::is_regular_file( my->blocks_dir / "blocks.log" )) {
-            const auto log_chain_id = block_log::extract_chain_id(my->blocks_dir);
+            fc::optional<chain_id_type> log_chain_id;
+            auto log_genesis = block_log::extract_genesis_state(my->blocks_dir);
+            if (log_genesis) {
+               if (my->chain_config->genesis) {
+                  // using chain_id_source to distinguish if the snapshot provided the genesis state we are comparing to
+                  // or if it was a passed in command line parameter
+                  EOS_ASSERT( log_genesis == *my->chain_config->genesis, plugin_config_exception,
+                              "Genesis state provided via block log does not match the existing genesis state in the "
+                              "${source}. ${extra}", ("source", my->chain_id_source)
+                                      ("extra", (my->chain_id_source == "snapshot" ?
+                                                 "Block log and snapshot genesis state are inconsistent." :
+                                                 "It is not necessary to provide genesis state argument when providing a block log."))
+                  );
+               }
+               else {
+                  my->chain_config->genesis = log_genesis;
+               }
+               log_chain_id.emplace(my->chain_config->genesis->compute_chain_id());
+            }
+
+            // if the genesis state did not exist in the
+            if (!log_chain_id) {
+               log_chain_id.emplace(block_log::extract_chain_id(my->blocks_dir));
+            }
+
             if( my->chain_id ) {
-               EOS_ASSERT( log_chain_id == *my->chain_id,
+               EOS_ASSERT( *log_chain_id == *my->chain_id,
                            plugin_config_exception,
                            "Chain id in blocks.log does not match chain id in the snapshot");
             }

From 656dd26a9426c3709dea60539b8d056fda56c796 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 5 Sep 2019 10:13:49 -0400
Subject: [PATCH 1100/1648] Add $SKIP_MAC to "Brew Updater" step

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c085b8487bd..f83c598d8be 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -360,7 +360,7 @@ cat <<EOF
     agents:
       queue: "automation-basic-builder-fleet"
     timeout: "${TIMEOUT:-5}"
-    skip: ${SKIP_MOJAVE}${SKIP_PACKAGE_BUILDER}
+    skip: ${SKIP_MOJAVE}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
 
 EOF
 IFS=$oIFS
\ No newline at end of file

From 0e4b964e19c8dc631201b70ee6faad40a51ba378 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 5 Sep 2019 10:14:34 -0400
Subject: [PATCH 1101/1648] Increase timeout of "Ubuntu 18.04 - Contract
 Builder" step from 10 to 30 minutes

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index f83c598d8be..896b5cc7146 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -342,7 +342,7 @@ cat <<EOF
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
+    timeout: ${TIMEOUT:-30}
     skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
 
   - wait

From ee04a1c1c342b8f4ec9987514a6b525f1c18f847 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 5 Sep 2019 11:55:34 -0400
Subject: [PATCH 1102/1648] Set contract builder to use unpinned image. This
 matches existing contracts pipeline.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 896b5cc7146..7190b85a861 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -338,7 +338,7 @@ cat <<EOF
   - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
     command: "./.cicd/installation-build.sh"
     env:
-      IMAGE_TAG: "ubuntu-18.04"
+      IMAGE_TAG: "ubuntu-18.04-unpinned"
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "automation-eos-builder-fleet"

From c59032d880a106c23a6bc675b6da6c851c36a5a5 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 5 Sep 2019 13:01:51 -0400
Subject: [PATCH 1103/1648] change behavior of recover_key to better support
 variable length keys

---
 libraries/chain/controller.cpp                |  2 +-
 .../chain/include/eosio/chain/config.hpp      |  1 +
 libraries/chain/wasm_interface.cpp            | 26 +++++++++++++++----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c7b4fe748bf..b11232498ba 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -981,7 +981,7 @@ struct controller_impl {
       });
 
       db.create<protocol_state_object>([&](auto& pso ){
-         pso.num_supported_key_types = 2;
+         pso.num_supported_key_types = config::genesis_num_supported_key_types;
          for( const auto& i : genesis_intrinsics ) {
             add_intrinsic_to_whitelist( pso.whitelisted_intrinsics, i );
          }
diff --git a/libraries/chain/include/eosio/chain/config.hpp b/libraries/chain/include/eosio/chain/config.hpp
index 746fc06fc2c..37bbde84999 100644
--- a/libraries/chain/include/eosio/chain/config.hpp
+++ b/libraries/chain/include/eosio/chain/config.hpp
@@ -38,6 +38,7 @@ const static name eosio_code_name { N(eosio.code) };
 const static int      block_interval_ms = 500;
 const static int      block_interval_us = block_interval_ms*1000;
 const static uint64_t block_timestamp_epoch = 946684800000ll; // epoch is year 2000.
+const static uint32_t genesis_num_supported_key_types = 2;
 
 /** Percentages are fixed point with a denominator of 10,000 */
 const static int percent_100 = 10000;
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 3fa821b9871..51adb231836 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -803,19 +803,35 @@ class crypto_api : public context_aware_api {
                         array_ptr<char> pub, size_t publen ) {
          fc::crypto::signature s;
          datastream<const char*> ds( sig, siglen );
-         datastream<char*> pubds( pub, publen );
-
          fc::raw::unpack(ds, s);
 
          EOS_ASSERT(s.which() < context.db.get<protocol_state_object>().num_supported_key_types, unactivated_signature_type,
-           "Unactivated signature type used during recover_key");
+                    "Unactivated signature type used during recover_key");
 
          if(context.control.is_producing_block())
             EOS_ASSERT(s.variable_size() <= context.control.configured_subjective_signature_length_limit(),
                        sig_variable_size_limit_exception, "signature variable length component size greater than subjective maximum");
 
-         fc::raw::pack( pubds, fc::crypto::public_key( s, digest, false ) );
-         return pubds.tellp();
+
+         auto recovered = fc::crypto::public_key(s, digest, false);
+
+         // the key types newer than the first 2 may be varible in length
+         if (s.which() > config::genesis_num_supported_key_types ) {
+            EOS_ASSERT(publen >= 33, wasm_execution_error,
+                       "destination buffer must at least be able to hold an ECC public key");
+            auto packed_pubkey = fc::raw::pack(recovered);
+            auto copy_size = std::min<size_t>(publen, packed_pubkey.size());
+            memcpy(pub, packed_pubkey.data(), copy_size);
+            return packed_pubkey.size();
+         } else {
+            // legacy behavior, key types 0 and 1 always pack to 33 bytes.
+            // this will do one less copy for those keys while maintaining the rules of
+            //    [0..33) dest sizes: assert (asserts in fc::raw::pack)
+            //    [33..inf) dest sizes: return packed size (always 33)
+            datastream<char*> out_ds( pub, publen );
+            fc::raw::pack(out_ds, recovered);
+            return out_ds.tellp();
+         }
       }
 
       template<class Encoder> auto encode(char* data, size_t datalen) {

From 959789cfdb47e96639d7c3028b65f6318e4634f9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 5 Sep 2019 12:40:16 -0500
Subject: [PATCH 1104/1648] Remove unused method
 block_while_syncing_with_other_peer

---
 plugins/net_plugin/net_plugin.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 197b01fe454..67a454cc930 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -157,7 +157,6 @@ namespace eosio {
       explicit sync_manager( uint32_t span );
       static void send_handshakes();
       bool syncing_with_peer() const { return sync_state == lib_catchup; }
-      bool block_while_syncing_with_other_peer( const connection_ptr& c ) const;
       void sync_reset_lib_num( const connection_ptr& conn );
       void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
       void rejected_block( const connection_ptr& c, uint32_t blk_num );
@@ -1359,14 +1358,6 @@ namespace eosio {
       sync_state = newstate;
    }
 
-   bool sync_manager::block_while_syncing_with_other_peer( const connection_ptr& c ) const {
-      if( syncing_with_peer() ) {
-         std::lock_guard<std::mutex> g( sync_mtx );
-         return c != sync_source;
-      }
-      return false;
-   }
-
    void sync_manager::sync_reset_lib_num(const connection_ptr& c) {
       std::unique_lock<std::mutex> g( sync_mtx );
       if( sync_state == in_sync ) {

From dbdb19e058260c24cc2ada07e036f45ae0b587f1 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 5 Sep 2019 14:25:18 -0400
Subject: [PATCH 1105/1648] whitespace only changes for WAVM LLVM uplift

---
 .../wasm-jit/Source/Runtime/LLVMEmitIR.cpp    |  34 +++---
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 110 +++++++++---------
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp b/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
index f7986dc691d..bb567113ca7 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
@@ -201,26 +201,26 @@ namespace LLVMJIT
 		llvm::Value* coerceByteIndexToPointer(llvm::Value* byteIndex,U32 offset,llvm::Type* memoryType)
 		{
 
-         // On a 64 bit runtime, if the address is 32-bits, zext it to 64-bits.
-         // This is crucial for security, as LLVM will otherwise implicitly sign extend it to 64-bits in the GEP below,
-         // interpreting it as a signed offset and allowing access to memory outside the sandboxed memory range.
-         // There are no 'far addresses' in a 32 bit runtime.
-         byteIndex = irBuilder.CreateZExt(byteIndex,llvmI64Type);
-
-         // Add the offset to the byte index.
-         if(offset)
-         {
-            byteIndex = irBuilder.CreateAdd(byteIndex,irBuilder.CreateZExt(emitLiteral(offset),llvmI64Type));
-         }
-
-         // If HAS_64BIT_ADDRESS_SPACE, the memory has enough virtual address space allocated to
-         // ensure that any 32-bit byte index + 32-bit offset will fall within the virtual address sandbox,
-         // so no explicit bounds check is necessary.
-      
+			// On a 64 bit runtime, if the address is 32-bits, zext it to 64-bits.
+			// This is crucial for security, as LLVM will otherwise implicitly sign extend it to 64-bits in the GEP below,
+			// interpreting it as a signed offset and allowing access to memory outside the sandboxed memory range.
+			// There are no 'far addresses' in a 32 bit runtime.
+			byteIndex = irBuilder.CreateZExt(byteIndex,llvmI64Type);
+
+			// Add the offset to the byte index.
+			if(offset)
+			{
+				byteIndex = irBuilder.CreateAdd(byteIndex,irBuilder.CreateZExt(emitLiteral(offset),llvmI64Type));
+			}
+
+			// If HAS_64BIT_ADDRESS_SPACE, the memory has enough virtual address space allocated to
+			// ensure that any 32-bit byte index + 32-bit offset will fall within the virtual address sandbox,
+			// so no explicit bounds check is necessary.
+		
 
 			// Cast the pointer to the appropriate type.
 			auto bytePointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultMemoryBase, byteIndex);
-            
+
 			return irBuilder.CreatePointerCast(bytePointer,memoryType->getPointerTo());
 		}
 
diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index 17d77245f99..cfe158e4a39 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -7,9 +7,9 @@
 
 #if LLVM_VERSION_MAJOR == 7
 namespace llvm { namespace orc {
-   using LegacyRTDyldObjectLinkingLayer = RTDyldObjectLinkingLayer;
-   template<typename A, typename B>
-   using LegacyIRCompileLayer = IRCompileLayer<A, B>;
+	using LegacyRTDyldObjectLinkingLayer = RTDyldObjectLinkingLayer;
+	template<typename A, typename B>
+	using LegacyIRCompileLayer = IRCompileLayer<A, B>;
 }}
 #endif
 
@@ -32,30 +32,30 @@ namespace llvm { namespace orc {
 #include "llvm-c/Disassembler.h"
 void disassembleFunction(U8* bytes,Uptr numBytes)
 {
-   LLVMDisasmContextRef disasmRef = LLVMCreateDisasm(llvm::sys::getProcessTriple().c_str(),nullptr,0,nullptr,nullptr);
-
-   U8* nextByte = bytes;
-   Uptr numBytesRemaining = numBytes;
-   while(numBytesRemaining)
-   {
-      char instructionBuffer[256];
-      const Uptr numInstructionBytes = LLVMDisasmInstruction(
-         disasmRef,
-         nextByte,
-         numBytesRemaining,
-         reinterpret_cast<Uptr>(nextByte),
-         instructionBuffer,
-         sizeof(instructionBuffer)
-         );
-      WAVM_ASSERT_THROW(numInstructionBytes > 0);
-      WAVM_ASSERT_THROW(numInstructionBytes <= numBytesRemaining);
-      numBytesRemaining -= numInstructionBytes;
-      nextByte += numInstructionBytes;
-
-      printf("\t\t%s\n",instructionBuffer);
-   };
-
-   LLVMDisasmDispose(disasmRef);
+	LLVMDisasmContextRef disasmRef = LLVMCreateDisasm(llvm::sys::getProcessTriple().c_str(),nullptr,0,nullptr,nullptr);
+
+	U8* nextByte = bytes;
+	Uptr numBytesRemaining = numBytes;
+	while(numBytesRemaining)
+	{
+		char instructionBuffer[256];
+		const Uptr numInstructionBytes = LLVMDisasmInstruction(
+			disasmRef,
+			nextByte,
+			numBytesRemaining,
+			reinterpret_cast<Uptr>(nextByte),
+			instructionBuffer,
+			sizeof(instructionBuffer)
+			);
+		WAVM_ASSERT_THROW(numInstructionBytes > 0);
+		WAVM_ASSERT_THROW(numInstructionBytes <= numBytesRemaining);
+		numBytesRemaining -= numInstructionBytes;
+		nextByte += numInstructionBytes;
+
+		printf("\t\t%s\n",instructionBuffer);
+	};
+
+	LLVMDisasmDispose(disasmRef);
 }
 
 namespace LLVMJIT
@@ -220,31 +220,31 @@ namespace LLVMJIT
 		: shouldLogMetrics(inShouldLogMetrics)
 		{
 			objectLayer = llvm::make_unique<llvm::orc::LegacyRTDyldObjectLinkingLayer>(ES,[](llvm::orc::VModuleKey K) {
-                           return llvm::orc::LegacyRTDyldObjectLinkingLayer::Resources{
-                              std::make_shared<UnitMemoryManager>(), std::make_shared<llvm::orc::NullResolver>()
-                              };
-                       },
-                       [](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
-                          //nothing to do
-                       },
-                       [this](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
-                           for(auto symbolSizePair : llvm::object::computeSymbolSizes(Obj)) {
-                              auto symbol = symbolSizePair.first;
-                              auto name = symbol.getName();
-                              auto address = symbol.getAddress();
-                              if(symbol.getType() && symbol.getType().get() == llvm::object::SymbolRef::ST_Function && name && address) {
-                                 Uptr loadedAddress = Uptr(*address);
-                                 auto symbolSection = symbol.getSection();
-                                 if(symbolSection)
-                                    loadedAddress += (Uptr)o.getSectionLoadAddress(*symbolSection.get());
-                                 //printf(">>> %s 0x%lX\n", symbolSizePair.first.getName()->data(), loadedAddress);
-                                 std::map<U32,U32> offsetToOpIndexMap;
-                                 notifySymbolLoaded(name->data(), loadedAddress, 0, std::move(offsetToOpIndexMap));
-                                 //disassembleFunction((U8*)loadedAddress, symbolSizePair.second);
-                              }
-                           }
-                       }
-                       );
+									return llvm::orc::LegacyRTDyldObjectLinkingLayer::Resources{
+										std::make_shared<UnitMemoryManager>(), std::make_shared<llvm::orc::NullResolver>()
+									};
+							  },
+							  [](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
+									//nothing to do
+							  },
+							  [this](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
+									for(auto symbolSizePair : llvm::object::computeSymbolSizes(Obj)) {
+										auto symbol = symbolSizePair.first;
+										auto name = symbol.getName();
+										auto address = symbol.getAddress();
+										if(symbol.getType() && symbol.getType().get() == llvm::object::SymbolRef::ST_Function && name && address) {
+											Uptr loadedAddress = Uptr(*address);
+											auto symbolSection = symbol.getSection();
+											if(symbolSection)
+												loadedAddress += (Uptr)o.getSectionLoadAddress(*symbolSection.get());
+											//printf(">>> %s 0x%lX\n", symbolSizePair.first.getName()->data(), loadedAddress);
+											std::map<U32,U32> offsetToOpIndexMap;
+											notifySymbolLoaded(name->data(), loadedAddress, 0, std::move(offsetToOpIndexMap));
+											//disassembleFunction((U8*)loadedAddress, symbolSizePair.second);
+										}
+									}
+							  }
+							  );
 			objectLayer->setProcessAllSections(true);
 			compileLayer = llvm::make_unique<CompileLayer>(*objectLayer,llvm::orc::SimpleCompiler(*targetMachine));
 		}
@@ -256,7 +256,7 @@ namespace LLVMJIT
 	private:
 		typedef llvm::orc::LegacyIRCompileLayer<llvm::orc::LegacyRTDyldObjectLinkingLayer, llvm::orc::SimpleCompiler> CompileLayer;
 
-      llvm::orc::ExecutionSession ES;
+		llvm::orc::ExecutionSession ES;
 		std::unique_ptr<llvm::orc::LegacyRTDyldObjectLinkingLayer> objectLayer;
 		std::unique_ptr<CompileLayer> compileLayer;
 		bool shouldLogMetrics;
@@ -355,8 +355,8 @@ namespace LLVMJIT
 
 		// Pass the module to the JIT compiler.
 		Timing::Timer machineCodeTimer;
-      llvm::orc::VModuleKey K = ES.allocateVModule();
-      std::unique_ptr<llvm::Module> mod(llvmModule);
+		llvm::orc::VModuleKey K = ES.allocateVModule();
+		std::unique_ptr<llvm::Module> mod(llvmModule);
 		WAVM_ASSERT_THROW(!compileLayer->addModule(K, std::move(mod)));
 		WAVM_ASSERT_THROW(!compileLayer->emitAndFinalize(K));
 	}

From e32fb6253ea57cbba3fabf8fc4c21fcca3522343 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 5 Sep 2019 15:05:00 -0400
Subject: [PATCH 1106/1648] fix possible WAVM disasm memory leak (not clutched
 in normally)

---
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index cfe158e4a39..56fd7da3eb3 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -47,8 +47,8 @@ void disassembleFunction(U8* bytes,Uptr numBytes)
 			instructionBuffer,
 			sizeof(instructionBuffer)
 			);
-		WAVM_ASSERT_THROW(numInstructionBytes > 0);
-		WAVM_ASSERT_THROW(numInstructionBytes <= numBytesRemaining);
+		if(numInstructionBytes == 0 || numInstructionBytes > numBytesRemaining);
+			break;
 		numBytesRemaining -= numInstructionBytes;
 		nextByte += numInstructionBytes;
 

From d6548c6e6a019406be99d5b9e25b6c795f765ae0 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 5 Sep 2019 16:03:00 -0500
Subject: [PATCH 1107/1648] Improved comment.

---
 libraries/chain/include/eosio/chain/chain_snapshot.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/chain_snapshot.hpp b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
index d170a12d369..a92e9be8695 100644
--- a/libraries/chain/include/eosio/chain/chain_snapshot.hpp
+++ b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
@@ -15,7 +15,7 @@ struct chain_snapshot_header {
     *         - forwards compatible with version 2
     *         - WebAuthn keys
     *         - wtmsig block siganatures: the block header state changed to include producer authorities and additional signatures
-    *         - removed genesis_state
+    *         - removed genesis_state and added chain ID to global_property_object
     */
 
    static constexpr uint32_t minimum_compatible_version = 2;

From 213cadd9df595e62e3e5fd4df48001941e58cc2f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 6 Sep 2019 09:38:28 -0400
Subject: [PATCH 1108/1648] Ensure release flag is added to all builds.

---
 .cicd/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 4acfd81ead7..2688b65413a 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 . ./.cicd/helpers/general.sh
 mkdir -p $BUILD_DIR
-CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true"
+CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_BUILD_TYPE='Release'"
 if [[ $(uname) == 'Darwin' ]]; then
     # You can't use chained commands in execute
     [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" && ./$CICD_DIR/platforms/macos-10.14.sh
@@ -34,7 +34,7 @@ else # Linux
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
     fi
-    BUILD_COMMANDS="cmake $CMAKE_EXTRAS -DCMAKE_BUILD_TYPE='Release' .. && make -j$JOBS"
+    BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
     # Docker Commands
     if [[ $BUILDKITE == true ]]; then
         # Generate Base Images

From e8894369d8d5925333d82d3ac89ef5c6c4b759e7 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 6 Sep 2019 09:46:15 -0400
Subject: [PATCH 1109/1648] fixed off by one, thanks @arhag

---
 libraries/chain/wasm_interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 51adb231836..99940d112a3 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -816,7 +816,7 @@ class crypto_api : public context_aware_api {
          auto recovered = fc::crypto::public_key(s, digest, false);
 
          // the key types newer than the first 2 may be varible in length
-         if (s.which() > config::genesis_num_supported_key_types ) {
+         if (s.which() >= config::genesis_num_supported_key_types ) {
             EOS_ASSERT(publen >= 33, wasm_execution_error,
                        "destination buffer must at least be able to hold an ECC public key");
             auto packed_pubkey = fc::raw::pack(recovered);

From 5236a085045a77a42bb59e90844b930693317310 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 5 Sep 2019 21:57:25 -0400
Subject: [PATCH 1110/1648] update cicd docker files for llvm7+

---
 .cicd/platforms/amazon_linux-2-unpinned.dockerfile | 12 +-----------
 .cicd/platforms/amazon_linux-2.dockerfile          |  6 +++---
 .cicd/platforms/centos-7.6-unpinned.dockerfile     |  4 ++--
 .cicd/platforms/centos-7.6.dockerfile              |  6 +++---
 .cicd/platforms/macos-10.14.sh                     |  2 +-
 .cicd/platforms/ubuntu-16.04.dockerfile            |  6 +++---
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile   |  2 +-
 .cicd/platforms/ubuntu-18.04.dockerfile            |  6 +++---
 8 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
index 4c6d1e3db36..ffbcbf6f7aa 100644
--- a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
@@ -5,7 +5,7 @@ RUN yum update -y && \
     yum install -y which git sudo procps-ng util-linux autoconf automake \
     libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
     libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
-    graphviz clang patch
+    graphviz clang patch llvm-devel llvm-static
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
@@ -15,16 +15,6 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     make install && \
     cd / && \
     rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
-# build llvm
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm && \
-    cd llvm && \
-    mkdir build && \
-    cd build && \
-    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd / && \
-    rm -rf /llvm
 # build boost
 RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \
     tar -xjf boost_1_70_0.tar.bz2 && \
diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/amazon_linux-2.dockerfile
index 3f930fcb4de..95164fe7167 100644
--- a/.cicd/platforms/amazon_linux-2.dockerfile
+++ b/.cicd/platforms/amazon_linux-2.dockerfile
@@ -32,12 +32,12 @@ RUN git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.
     cd / && \
     rm -rf /clang8
 COPY ./.cicd/helpers/clang.make /tmp/clang.cmake
-# build llvm
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm && \
+# build llvm8
+RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
     cd llvm && \
     mkdir build && \
     cd build && \
-    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' .. && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. && \
     make -j$(nproc) && \
     make install && \
     cd / && \
diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile
index cb6bdbb369c..f4434ffe9c1 100644
--- a/.cicd/platforms/centos-7.6-unpinned.dockerfile
+++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile
@@ -19,8 +19,8 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     make install && \
     cd / && \
     rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
-# build llvm
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm && \
+# build llvm8
+RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
     source /opt/rh/devtoolset-8/enable && \
     source /opt/rh/rh-python36/enable && \
     cd llvm && \
diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/centos-7.6.dockerfile
index 9dc0fc25265..af419eb3dc9 100644
--- a/.cicd/platforms/centos-7.6.dockerfile
+++ b/.cicd/platforms/centos-7.6.dockerfile
@@ -40,12 +40,12 @@ RUN git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.
     cd / && \
     rm -rf /clang8
 COPY ./.cicd/helpers/clang.make /tmp/clang.cmake
-# build llvm
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm && \
+# build llvm8
+RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
     cd llvm && \
     mkdir build && \
     cd build && \
-    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' .. && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. && \
     make -j$(nproc) && \
     make install && \
     cd / && \
diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index 0be904d60c0..2ce55823d45 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 VERSION=1
 brew update
-brew install git boost@1.70 cmake python@2 python libtool libusb graphviz automake wget gmp llvm@4 pkgconfig doxygen openssl || true
+brew install git boost@1.70 cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl || true
 # install clang from source
 if [[ ! $PINNED == false || $UNPINNED == true ]]; then
     git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8
diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile
index 6bfbe1b1769..bd38895f2ff 100644
--- a/.cicd/platforms/ubuntu-16.04.dockerfile
+++ b/.cicd/platforms/ubuntu-16.04.dockerfile
@@ -32,12 +32,12 @@ RUN git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.
     cd / && \
     rm -rf /clang8
 COPY ./.cicd/helpers/clang.make /tmp/clang.cmake
-# build llvm
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm && \
+# build llvm8
+RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
     cd llvm && \
     mkdir build && \
     cd build && \
-    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' .. && \
+    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. && \
     make -j$(nproc) && \
     make install && \
     cd / && \
diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index fe682400ea9..738a78f280b 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && apt-get upgrade -y && \
     bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
     autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
-    libcurl4-gnutls-dev pkg-config patch llvm-4.0 clang ccache
+    libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile
index 02544dfa051..9475df6e5b2 100644
--- a/.cicd/platforms/ubuntu-18.04.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04.dockerfile
@@ -33,12 +33,12 @@ RUN git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.
     cd / && \
     rm -rf /clang8
 COPY ./.cicd/helpers/clang.make /tmp/clang.cmake
-# build llvm
-RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git llvm && \
+# build llvm8
+RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
     cd llvm && \
     mkdir build && \
     cd build && \
-    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' .. && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. && \
     make -j$(nproc) && \
     make install && \
     cd / && \

From 223a4b6d86ca36678f7bd86a7067d5c983e3c1ea Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Fri, 6 Sep 2019 10:58:01 -0400
Subject: [PATCH 1111/1648] Cleanup

---
 .../eosio/chain/webassembly/eos-vm.hpp        | 188 +++---------------
 libraries/chain/webassembly/eos-vm.cpp        |  17 +-
 libraries/eos-vm                              |   2 +-
 3 files changed, 45 insertions(+), 162 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 2033936975d..92a24b5a346 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -7,48 +7,11 @@
 #include <softfloat_types.h>
 
 //eos-vm includes
-/*
-#include <eosio/vm/host_function.hpp>
-namespace eosio { namespace vm {
-   template <>
-   struct registered_host_functions<eosio::chain::apply_context>;
-} }
-*/
 #include <eosio/vm/backend.hpp>
 
 // eosio specific specializations
 namespace eosio { namespace vm {
 
-   template <typename T, std::size_t Align>
-   struct aligned_array_wrapper {
-      static_assert(Align % alignof(T) == 0, "Must align to at least the alignment of T");
-      aligned_array_wrapper(void* ptr, uint32_t size) : ptr(ptr), size(size) {
-         validate_ptr<T>(ptr, size);
-         if (reinterpret_cast<std::uintptr_t>(ptr) % Align != 0) {
-            copy.reset(new std::remove_cv_t<T>[size]);
-            memcpy( copy.get(), ptr, sizeof(T) * size );
-         }
-      }
-      ~aligned_array_wrapper() {
-         if constexpr (!std::is_const_v<T>)
-            if (copy)
-               memcpy( ptr, copy.get(), sizeof(T) * size);
-      }
-      constexpr operator T*() const {
-         if (copy)
-            return copy.get();
-         else
-            return static_cast<T*>(ptr);
-      }
-      constexpr operator eosio::chain::array_ptr<T>() const {
-        return eosio::chain::array_ptr<T>{static_cast<T*>(*this)};
-      }
-
-      void* ptr;
-      std::unique_ptr<std::remove_cv_t<T>[]> copy = nullptr;
-      std::size_t size;
-   };
-
    template<>
    struct wasm_type_converter<eosio::chain::name> {
       static auto from_wasm(uint64_t val) {
@@ -60,52 +23,65 @@ namespace eosio { namespace vm {
    };
 
    template<typename T>
-   struct wasm_type_converter<T*> {
-      static auto from_wasm(void* val) {
+   struct wasm_type_converter<T*> : linear_memory_access {
+      auto from_wasm(void* val) {
+         validate_ptr<T>(val, 1);
          return eosio::vm::aligned_ptr_wrapper<T, alignof(T)>{val};
       }
    };
 
+   template<>
+   struct wasm_type_converter<char*> : linear_memory_access {
+      void* to_wasm(char* val) {
+         validate_ptr<char>(val, 1);
+         return val;
+      }
+   };
+
    template<typename T>
-   struct wasm_type_converter<T&> {
-      static auto from_wasm(void* val) {
-         return eosio::vm::aligned_ref_wrapper<T, alignof(T)>{val};
+   struct wasm_type_converter<T&> : linear_memory_access {
+      auto from_wasm(uint32_t val) {
+         EOS_VM_ASSERT( val != 0, wasm_memory_exception, "references cannot be created for null pointers" );
+         void* ptr = get_ptr(val);
+         validate_ptr<T>(ptr, 1);
+         return eosio::vm::aligned_ref_wrapper<T, alignof(T)>{ptr};
       }
    };
 
    template<typename T>
-   struct wasm_type_converter<eosio::chain::array_ptr<T>> {
-      static auto from_wasm(void* ptr, uint32_t size) {
-        return aligned_array_wrapper<T, alignof(T)>(ptr, size);
+   struct wasm_type_converter<eosio::chain::array_ptr<T>> : linear_memory_access {
+      auto from_wasm(void* ptr, uint32_t size) {
+         validate_ptr<T>(ptr, size);
+         return aligned_array_wrapper<T, alignof(T)>(ptr, size);
       }
    };
 
    template<>
-   struct wasm_type_converter<eosio::chain::array_ptr<char>> {
-      static auto from_wasm(void* ptr, uint32_t size) {
+   struct wasm_type_converter<eosio::chain::array_ptr<char>> : linear_memory_access {
+      auto from_wasm(void* ptr, uint32_t size) {
          validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<char>((char*)ptr);
       }
       // memcpy/memmove
-      static auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t size) {
+      auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t size) {
          validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<char>((char*)ptr);
       }
       // memset
-      static auto from_wasm(void* ptr, int /*val*/, uint32_t size) {
+      auto from_wasm(void* ptr, int /*val*/, uint32_t size) {
          validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<char>((char*)ptr);
       }
    };
 
    template<>
-   struct wasm_type_converter<eosio::chain::array_ptr<const char>> {
-      static auto from_wasm(void* ptr, uint32_t size) {
+   struct wasm_type_converter<eosio::chain::array_ptr<const char>> : linear_memory_access {
+      auto from_wasm(void* ptr, uint32_t size) {
          validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<const char>((char*)ptr);
       }
       // memcmp
-      static auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t size) {
+      auto from_wasm(void* ptr, eosio::chain::array_ptr<const char> /*src*/, uint32_t size) {
          validate_ptr<char>(ptr, size);
          return eosio::chain::array_ptr<const char>((char*)ptr);
       }
@@ -122,8 +98,8 @@ namespace eosio { namespace vm {
    };
 
    template<>
-   struct wasm_type_converter<eosio::chain::null_terminated_ptr> {
-      static auto from_wasm(void* ptr) {
+   struct wasm_type_converter<eosio::chain::null_terminated_ptr> : linear_memory_access {
+      auto from_wasm(void* ptr) {
          validate_c_str(ptr);
          return eosio::chain::null_terminated_ptr{ static_cast<char*>(ptr) };
       }
@@ -131,105 +107,6 @@ namespace eosio { namespace vm {
 
 }} // ns eosio::vm
 
-#if 0
-namespace eosio { namespace vm {
-   template <typename WAlloc, typename Cls, typename Cls2, auto F, typename R, typename Args, size_t... Is>
-   auto create_logging_function(std::index_sequence<Is...>) {
-      return std::function<void(Cls*, WAlloc*, operand_stack&)>{ [](Cls* self, WAlloc* walloc, operand_stack& os) {
-         size_t i = sizeof...(Is) - 1;
-         auto& intrinsic_log = self->control.get_intrinsic_debug_log();
-	 /*
-         if (intrinsic_log) {
-            eosio::chain::digest_type::encoder enc;
-            enc.write(walloc->template get_base_ptr<char>(), walloc->get_current_page() * 64 * 1024);
-            intrinsic_log->record_intrinsic(
-               eosio::chain::calc_arguments_hash(
-                  get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                        walloc, get_value<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
-                                       os.get_back(i - Is)))...),
-               enc.result());
-         }
-	 */
-         if constexpr (!std::is_same_v<R, void>) {
-            if constexpr (std::is_same_v<Cls2, std::nullptr_t>) {
-               R res = std::invoke(F, get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                                            walloc, std::move(os.get_back(i - Is).get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
-               os.trim(sizeof...(Is));
-               os.push(resolve_result<R>(std::move(res), walloc));
-            } else {
-               R res = std::invoke(F, construct_derived<Cls2, Cls>::value(*self),
-                                   get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                                         walloc, std::move(os.get_back(i - Is).get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
-               os.trim(sizeof...(Is));
-               os.push(resolve_result<R>(std::move(res), walloc));
-            }
-         } else {
-            if constexpr (std::is_same_v<Cls2, std::nullptr_t>) {
-               std::invoke(F, get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                                    walloc, std::move(os.get_back(i - Is).get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
-            } else {
-               std::invoke(F, construct_derived<Cls2, Cls>::value(*self),
-                           get_value<typename std::tuple_element<Is, Args>::type, Args>(
-                                 walloc, std::move(os.get_back(i - Is).get<to_wasm_t<typename std::tuple_element<Is, Args>::type>>()))...);
-            }
-            os.trim(sizeof...(Is));
-         }
-      } };
-   }
-
-   template <>
-   struct registered_host_functions<eosio::chain::apply_context> {
-      using Cls = eosio::chain::apply_context;
-
-      template <typename WAlloc>
-      struct mappings {
-         std::unordered_map<std::pair<std::string, std::string>, uint32_t, host_func_pair_hash> named_mapping;
-         std::vector<host_function>                                                             host_functions;
-         std::vector<std::function<void(Cls*, WAlloc*, operand_stack&)>>                        functions;
-         size_t                                                                                 current_index = 0;
-      };
-
-      template <typename WAlloc>
-      static mappings<WAlloc>& get_mappings() {
-         static mappings<WAlloc> _mappings;
-         return _mappings;
-      }
-
-      template <typename Cls2, auto Func, typename WAlloc>
-      static void add(const std::string& mod, const std::string& name) {
-         using deduced_full_ts                         = decltype(get_args_full(Func));
-         using deduced_ts                              = decltype(get_args(Func));
-         using res_t                                   = typename decltype(get_return_t(Func))::type;
-         static constexpr auto is                      = std::make_index_sequence<std::tuple_size<deduced_ts>::value>();
-         auto&                 current_mappings        = get_mappings<WAlloc>();
-         current_mappings.named_mapping[{ mod, name }] = current_mappings.current_index++;
-         current_mappings.functions.push_back(create_logging_function<WAlloc, Cls, Cls2, Func, res_t, deduced_full_ts>(is));
-      }
-
-      template <typename Module>
-      static void resolve(Module& mod) {
-         decltype(mod.import_functions) imports          = { mod.allocator, mod.get_imported_functions_size() };
-         auto&                          current_mappings = get_mappings<wasm_allocator>();
-         for (int i = 0; i < mod.imports.size(); i++) {
-            std::string mod_name =
-                  std::string((char*)mod.imports[i].module_str.raw(), mod.imports[i].module_str.size());
-            std::string fn_name = std::string((char*)mod.imports[i].field_str.raw(), mod.imports[i].field_str.size());
-            EOS_WB_ASSERT(current_mappings.named_mapping.count({ mod_name, fn_name }), wasm_link_exception,
-                          "no mapping for imported function");
-            imports[i] = current_mappings.named_mapping[{ mod_name, fn_name }];
-         }
-         mod.import_functions = std::move(imports);
-      }
-
-      template <typename Execution_Context>
-      void operator()(Cls* host, Execution_Context& ctx, uint32_t index) {
-         const auto& _func = get_mappings<wasm_allocator>().functions[index];
-         std::invoke(_func, host, ctx.get_wasm_allocator(), ctx.get_operand_stack());
-      }
-   };
-} } // eosio::vm
-#endif
-
 namespace eosio { namespace chain { namespace webassembly { namespace eos_vm_runtime {
 
 using namespace fc;
@@ -242,10 +119,7 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
       eos_vm_runtime();
       std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) override;
 
-      void immediately_exit_currently_running_module() override {
-         if (_bkend)
-            _bkend->exit({});
-      }
+      void immediately_exit_currently_running_module() override;
 
    private:
       // todo: managing this will get more complicated with sync calls;
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 95346ff316a..2ff7dad4ea7 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -67,16 +67,25 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
 template<typename Impl>
 eos_vm_runtime<Impl>::eos_vm_runtime() {}
 
+template<typename Impl>
+void eos_vm_runtime<Impl>::immediately_exit_currently_running_module() {
+   throw wasm_exit{};
+}
+
 template<typename Impl>
 std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime<Impl>::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
    using backend_t = backend<apply_context, Impl>;
    std::ofstream mf("temp.wasm");
    mf.write((char*)code_bytes, code_size);
    mf.close();
-   wasm_code_ptr code((uint8_t*)code_bytes, code_size);
-   std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size);
-   registered_host_functions<apply_context>::resolve(bkend->get_module());
-   return std::make_unique<eos_vm_instantiated_module<Impl>>(this, std::move(bkend));
+   try {
+      wasm_code_ptr code((uint8_t*)code_bytes, code_size);
+      std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size);
+      registered_host_functions<apply_context>::resolve(bkend->get_module());
+      return std::make_unique<eos_vm_instantiated_module<Impl>>(this, std::move(bkend));
+   } catch(eosio::vm::exception& e) {
+      FC_THROW_EXCEPTION(wasm_execution_error, "Error building eos-vm interp: ${e}", ("e", e.what()));
+   }
 }
 
 template class eos_vm_runtime<eosio::vm::interpreter>;
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 2be40fad06f..ee3746b378f 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 2be40fad06f3e5d22548e9dbafd39778508aa98f
+Subproject commit ee3746b378f17af92b4aecceef53b6bbc38caa8a

From e010ecfdaa6a1ede8aad071ff86bd4c0352ca7a9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 6 Sep 2019 14:14:28 -0400
Subject: [PATCH 1112/1648] Pinned Mac builds should install Boost from source.
 Unpinned should install from brew.

---
 .cicd/platforms/macos-10.14.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index 0be904d60c0..c1196d49f2e 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -2,9 +2,9 @@
 set -eo pipefail
 VERSION=1
 brew update
-brew install git boost@1.70 cmake python@2 python libtool libusb graphviz automake wget gmp llvm@4 pkgconfig doxygen openssl || true
-# install clang from source
+brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@4 pkgconfig doxygen openssl || true
 if [[ ! $PINNED == false || $UNPINNED == true ]]; then
+    # install clang from source
     git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8
     cd clang8
     git checkout 18e41dc
@@ -49,6 +49,17 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then
     sudo make install
     cd ../..
     rm -rf clang8
+    # install boost from source
+    curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2
+    tar -xjf boost_1_70_0.tar.bz2
+    cd boost_1_70_0
+    ./bootstrap.sh --with-toolset=clang --prefix=/usr/local
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
+    cd ..
+    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0  
+else
+    # install boost from brew
+    brew install boost || true
 fi
 # install mongoDB
 cd ~

From ec702ebfe4abc7a77b97e354b583511879b734ff Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 6 Sep 2019 13:59:43 -0500
Subject: [PATCH 1113/1648] Add output of build info on nodeos startup

---
 programs/nodeos/main.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 5eac9d29bac..05c8943027b 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -5,6 +5,8 @@
 #include <eosio/net_plugin/net_plugin.hpp>
 #include <eosio/producer_plugin/producer_plugin.hpp>
 
+#include <chainbase/environment.hpp>
+
 #include <fc/log/logger_config.hpp>
 #include <fc/log/appender.hpp>
 #include <fc/exception/exception.hpp>
@@ -82,6 +84,8 @@ int main(int argc, char** argv)
 {
    try {
       app().set_version(eosio::nodeos::config::version);
+      std::stringstream ss_env;
+      ss_env << chainbase::environment();
 
       auto root = fc::app_path();
       app().set_default_data_dir(root / "eosio" / nodeos::config::node_executable_name / "data" );
@@ -100,6 +104,7 @@ int main(int argc, char** argv)
       ilog("${name} version ${ver}", ("name", nodeos::config::node_executable_name)("ver", app().version_string()));
       ilog("${name} using configuration file ${c}", ("name", nodeos::config::node_executable_name)("c", app().full_config_file_path().string()));
       ilog("${name} data directory is ${d}", ("name", nodeos::config::node_executable_name)("d", app().data_dir().string()));
+      ilog("${name} build:\n${e}", ("name", nodeos::config::node_executable_name)("e", ss_env.str()));
       app().startup();
       app().set_thread_priority_max();
       app().exec();

From ddf59c69b0fa830b64ddb62d6070399b60d1f320 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 6 Sep 2019 15:55:24 -0400
Subject: [PATCH 1114/1648] Pinned Mac builds should install Boost from source.
 Unpinned should install from brew.

---
 .cicd/platforms/macos-10.14.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index c1196d49f2e..ca8231ffe7e 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -54,7 +54,7 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then
     tar -xjf boost_1_70_0.tar.bz2
     cd boost_1_70_0
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local
-    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
+    sudo ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
     cd ..
     rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0  
 else

From 27003c8207ec1a42a7de0d4a9e1c224819cdacb8 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 6 Sep 2019 16:31:38 -0400
Subject: [PATCH 1115/1648] Replace SKIP_MOJAVE with SKIP_MACOS_10_14.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 7190b85a861..d33a0e681d6 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -360,7 +360,7 @@ cat <<EOF
     agents:
       queue: "automation-basic-builder-fleet"
     timeout: "${TIMEOUT:-5}"
-    skip: ${SKIP_MOJAVE}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
+    skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
 
 EOF
 IFS=$oIFS
\ No newline at end of file

From d8ce767f1991d9e5b39dcf63dcbaf41823f4d406 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 6 Sep 2019 16:50:45 -0400
Subject: [PATCH 1116/1648] Pinned Mac builds should install Boost from source.
 Unpinned should install from brew.

---
 .cicd/platforms/macos-10.14.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index ca8231ffe7e..2f4d70614f4 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -56,7 +56,7 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local
     sudo ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
     cd ..
-    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0  
+    sudo rm -rf boost_1_70_0.tar.bz2 boost_1_70_0  
 else
     # install boost from brew
     brew install boost || true

From 80576fa1a8d8a0f188106c50e9c75ac24538948c Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 6 Sep 2019 16:55:34 -0400
Subject: [PATCH 1117/1648] added unit test for partial behavior and adjusted
 API tests to be compatible with webauthn signatures and keys.  This is a WIP
 as we can now do some better testing for webauthn semantics but it needs
 cleaned up.   This also fixes a compilation bug introduced by accident into
 the test contracts

---
 unittests/api_tests.cpp                       |  58 +++++++++++++++++-
 .../deferred_test/deferred_test.cpp           |   2 +-
 .../test-contracts/test_api/test_api.cpp      |   1 +
 .../test-contracts/test_api/test_api.hpp      |   1 +
 .../test-contracts/test_api/test_api.wasm     | Bin 69134 -> 69566 bytes
 .../test-contracts/test_api/test_crypto.cpp   |  58 +++++++++++++-----
 6 files changed, 101 insertions(+), 19 deletions(-)

diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 6cef8f37e2f..fc0bd86a571 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -5,6 +5,7 @@
 #include <iterator>
 #include <sstream>
 #include <numeric>
+#include <string>
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -1738,11 +1739,16 @@ BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
 
 		produce_block();
 
-      auto payload   = fc::raw::pack( trx.sig_digest( control->get_chain_id() ) );
+      vector<char> payload(8192);
+      datastream<char*> payload_ds(payload.data(), payload.size());
+
+      auto hash   = trx.sig_digest( control->get_chain_id() );
       auto pk     = fc::raw::pack( get_public_key( N(testapi), "active" ) );
       auto sigs   = fc::raw::pack( signatures );
-      payload.insert( payload.end(), pk.begin(), pk.end() );
-      payload.insert( payload.end(), sigs.begin(), sigs.end() );
+      fc::raw::pack(payload_ds,  hash, (uint32_t)pk.size(), (uint32_t)sigs.size() );
+      payload_ds.write(pk.data(), pk.size() );
+      payload_ds.write(sigs.data(), sigs.size());
+      payload.resize(payload_ds.tellp());
 
       //No Error Here
       CALL_TEST_FUNCTION( *this, "test_crypto", "test_recover_key", payload );
@@ -1754,6 +1760,52 @@ BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
                              crypto_api_exception, fc_exception_message_is("Error expected key different than recovered key") );
 	}
 
+	{
+		signed_transaction trx;
+
+      auto pl = vector<permission_level>{{N(testapi), config::active_name}};
+
+      action act(pl, test_api_action<TEST_METHOD("test_crypto", "test_recover_key_partial")>{});
+
+      // construct a mock WebAuthN pubkey and signature, as it is the only type that would be variable-sized
+		using namespace fc::crypto;
+		const auto priv_r1 = r1::private_key::generate();
+      const auto pub_r1 = priv_r1.get_public_key();
+      const auto origin_hash = fc::sha256::hash(std::string("fctesting.invalid"));
+      auto hash   = trx.sig_digest( control->get_chain_id() );
+
+      auto pubkey = public_key_type(webauthn::public_key(pub_r1.serialize(), webauthn::public_key::user_presence_t::USER_PRESENCE_NONE, "fctesting.invalid"));
+      std::string json = "{\"origin\":\"https://fctesting.invalid\",\"type\":\"webauthn.get\",\"challenge\":\"" + fc::base64url_encode(hash.data(), hash.data_size()) + "\"}";
+      std::vector<uint8_t> auth_data(37);
+      memcpy(auth_data.data(), origin_hash.data(), sizeof(origin_hash));
+
+      //webauthn signature is sha256(auth_data || client_data_hash)
+      auto client_data_hash = fc::sha256::hash(json);
+      fc::sha256::encoder e;
+      e.write((char*)auth_data.data(), auth_data.size());
+      e.write(client_data_hash.data(), client_data_hash.data_size());
+      auto sig = priv_r1.sign_compact(e.result());
+
+      char serialized_sig[4096];
+      datastream<char*> sig_ds(serialized_sig, sizeof(serialized_sig));
+      fc::raw::pack(sig_ds, sig);
+      fc::raw::pack(sig_ds, auth_data);
+      fc::raw::pack(sig_ds, json);
+      auto serialized_sig_size = sig_ds.tellp();
+
+      vector<char> payload(8192);
+      datastream<char*> payload_ds(payload.data(), payload.size());
+      auto pk     = fc::raw::pack( pubkey );
+      fc::raw::pack(payload_ds,  hash, (uint32_t)pk.size(), (uint32_t)serialized_sig_size-1 );
+      payload_ds.write(pk.data(), pk.size() );
+      payload_ds.write(serialized_sig, serialized_sig_size-1);
+      payload.resize(payload_ds.tellp());
+
+      //No Error Here
+      produce_block();
+      CALL_TEST_FUNCTION( *this, "test_crypto", "test_recover_key_partial", payload );
+      return;
+	}
 
 
    CALL_TEST_FUNCTION( *this, "test_crypto", "test_sha1", {} );
diff --git a/unittests/test-contracts/deferred_test/deferred_test.cpp b/unittests/test-contracts/deferred_test/deferred_test.cpp
index 57a2109a946..d70720b18bf 100644
--- a/unittests/test-contracts/deferred_test/deferred_test.cpp
+++ b/unittests/test-contracts/deferred_test/deferred_test.cpp
@@ -21,7 +21,7 @@ void deferred_test::defercall( name payer, uint64_t sender_id, name contract, ui
       read_transaction( buffer, tx_size );
       auto tx_id = sha256( buffer, tx_size );
       char context_buffer[56];
-      emplace_extension(trx.transaction_extensions, (uint16_t)0, std::vector<char>() );
+      trx.transaction_extensions.emplace_back( (uint16_t)0, std::vector<char>() );
       auto& context_vector = std::get<1>( trx.transaction_extensions.back() );
       context_vector.resize(56);
       datastream ds( context_vector.data(), 56 );
diff --git a/unittests/test-contracts/test_api/test_api.cpp b/unittests/test-contracts/test_api/test_api.cpp
index 5c8b7f90060..f7d66ae8de3 100644
--- a/unittests/test-contracts/test_api/test_api.cpp
+++ b/unittests/test-contracts/test_api/test_api.cpp
@@ -88,6 +88,7 @@ extern "C" {
 
       //test crypto
       WASM_TEST_HANDLER( test_crypto, test_recover_key              );
+      WASM_TEST_HANDLER( test_crypto, test_recover_key_partial      );
       WASM_TEST_HANDLER( test_crypto, test_recover_key_assert_true  );
       WASM_TEST_HANDLER( test_crypto, test_recover_key_assert_false );
       WASM_TEST_HANDLER( test_crypto, test_sha1                     );
diff --git a/unittests/test-contracts/test_api/test_api.hpp b/unittests/test-contracts/test_api/test_api.hpp
index ff6c44d2d48..0fff16cf778 100644
--- a/unittests/test-contracts/test_api/test_api.hpp
+++ b/unittests/test-contracts/test_api/test_api.hpp
@@ -128,6 +128,7 @@ struct test_multi_index {
 
 struct test_crypto {
    static void test_recover_key();
+   static void test_recover_key_partial();
    static void test_recover_key_assert_true();
    static void test_recover_key_assert_false();
    static void test_sha1();
diff --git a/unittests/test-contracts/test_api/test_api.wasm b/unittests/test-contracts/test_api/test_api.wasm
index 9d81f87f7aab5ab1300c99930bf976dda3a8d430..3394c64d0e1b9c9a56dd389fddd25f3fdce3d3a4 100755
GIT binary patch
delta 10609
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

delta 10356
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

diff --git a/unittests/test-contracts/test_api/test_crypto.cpp b/unittests/test-contracts/test_api/test_crypto.cpp
index f81e68ce015..0bc540160e1 100644
--- a/unittests/test-contracts/test_api/test_crypto.cpp
+++ b/unittests/test-contracts/test_api/test_crypto.cpp
@@ -182,32 +182,60 @@ extern "C" {
 
 }
 
-struct sig_hash_key {
+struct sig_hash_key_header {
    capi_checksum256 hash;
-   capi_public_key pk;
-   capi_signature sig;
+   uint32_t         pk_len;
+   uint32_t         sig_len;
+
+   auto pk_base() const {
+      return ((const char *)this) + 40;
+   }
+
+   auto sig_base() const {
+      return ((const char *)this) + 40 + pk_len;
+   }
 };
 
 void test_crypto::test_recover_key_assert_true() {
-   sig_hash_key sh;
-   read_action_data( (char*)&sh, sizeof(sh) );
-   assert_recover_key( &sh.hash, (const char*)&sh.sig, sizeof(sh.sig), (const char*)&sh.pk, sizeof(sh.pk) );
+   char buffer[action_data_size()];
+   read_action_data( buffer, action_data_size() );
+   auto sh = (const sig_hash_key_header*)buffer;
+
+   assert_recover_key( &sh->hash, sh->sig_base(), sh->sig_len, sh->pk_base(), sh->pk_len );
 }
 
 void test_crypto::test_recover_key_assert_false() {
-   sig_hash_key sh;
-   read_action_data( (char*)&sh, sizeof(sh) );
-   assert_recover_key( &sh.hash, (const char*)&sh.sig, sizeof(sh.sig), (const char*)&sh.pk, sizeof(sh.pk) );
+   char buffer[action_data_size()];
+   read_action_data( buffer, action_data_size() );
+   auto sh = (const sig_hash_key_header*)buffer;
+
+   assert_recover_key( &sh->hash, sh->sig_base(), sh->sig_len, sh->pk_base(), sh->pk_len );
    eosio_assert( false, "should have thrown an error" );
 }
 
 void test_crypto::test_recover_key() {
-   sig_hash_key sh;
-   read_action_data( (char*)&sh, sizeof(sh) );
-   capi_public_key pk;
-   recover_key( &sh.hash, (const char*)&sh.sig, sizeof(sh.sig), pk.data, sizeof(pk) );
-   for ( uint32_t i=0; i < sizeof(pk); i++ )
-      if ( pk.data[i] != sh.pk.data[i] )
+   char buffer[action_data_size()];
+   read_action_data( buffer, action_data_size() );
+   auto sh = (const sig_hash_key_header*)buffer;
+
+   char recovered[sh->pk_len];
+   auto result = recover_key( &sh->hash, sh->sig_base(), sh->sig_len, recovered, sh->pk_len );
+   eosio_assert(result == sh->pk_len, "public key does not match");
+   for ( uint32_t i=0; i < sh->pk_len; i++ )
+      if ( recovered[i] != sh->pk_base()[i] )
+         eosio_assert( false, "public key does not match" );
+}
+
+void test_crypto::test_recover_key_partial() {
+   char buffer[action_data_size()];
+   read_action_data( buffer, action_data_size() );
+   auto sh = (const sig_hash_key_header*)buffer;
+
+   char recovered[sh->pk_len];
+   auto result = recover_key( &sh->hash, sh->sig_base(), sh->sig_len, recovered, sh->pk_len );
+   eosio_assert(result > sh->pk_len, "recovered key is not longer than provided key");
+   for ( uint32_t i=0; i < sh->pk_len; i++ )
+      if ( recovered[i] != sh->pk_base()[i] )
          eosio_assert( false, "public key does not match" );
 }
 

From 08cf2dd12f80beb241e0ec796f9cda0b1b9c49aa Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Fri, 6 Sep 2019 18:03:04 -0400
Subject: [PATCH 1118/1648] Test that we accept more than just 0 and 1 as the
 flags for limits type.

---
 libraries/eos-vm                   |  2 +-
 unittests/contracts/test_wasts.hpp | 11 ++++++++++-
 unittests/wasm_tests.cpp           | 22 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index ee3746b378f..438706c337e 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit ee3746b378f17af92b4aecceef53b6bbc38caa8a
+Subproject commit 438706c337e15287a68dabced25055df6ba2d85f
diff --git a/unittests/contracts/test_wasts.hpp b/unittests/contracts/test_wasts.hpp
index 1f9f3facab6..0967b08b2e4 100644
--- a/unittests/contracts/test_wasts.hpp
+++ b/unittests/contracts/test_wasts.hpp
@@ -733,4 +733,13 @@ static const char depth_assert_wasm_float[] = R"=====(
  (global $$depth (mut i64) (i64.const ${MAX_DEPTH}))
  (global $$mcfloaty (mut f64) (f64.const 3.14))
 )
-)=====";
\ No newline at end of file
+)=====";
+
+static const std::vector<uint8_t> varuint_memory_flags{
+  0x00, 'a', 's', 'm', 0x01, 0x00, 0x00, 0x00,
+  0x01, 0x07, 0x01, 0x60, 0x03, 0x7e, 0x7e, 0x7e, 0x00, // types
+  0x03, 0x02, 0x01, 0x00, // functions
+  0x04, 0x08, 0x01, 0x70, 0x80, 0x02, 0x80, 0x80, 0x80, 0x00, // memory with flags varuint(0x80 0x02) -> 0x2
+  0x07, 0x09, 0x01, 0x05, 'a', 'p', 'p', 'l', 'y', 0x00, 0x00, // exports
+  0x0a, 0x04, 0x01, 0x02, 0x00, 0x0b // code
+};
diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index cdbd56c64cb..c975f98b64f 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -1811,6 +1811,28 @@ BOOST_FIXTURE_TEST_CASE( depth_tests, TESTER ) try {
 
 } FC_LOG_AND_RETHROW()
 
+
+BOOST_FIXTURE_TEST_CASE( varuint_memory_flags_tests, TESTER ) try {
+   produce_block();
+   create_accounts( {N(memflags)} );
+   produce_block();
+
+   set_code(N(memflags), varuint_memory_flags);
+   produce_block();
+
+   signed_transaction trx;
+   action act;
+   act.account = N(memflags);
+   act.name = N();
+   act.authorization = vector<permission_level>{{N(memflags),config::active_name}};
+   trx.actions.push_back(act);
+   set_transaction_headers(trx);
+   trx.sign(get_private_key( N(memflags), "active" ), control->get_chain_id());
+   push_transaction(trx);
+   produce_block();
+} FC_LOG_AND_RETHROW()
+
+
 // TODO: restore net_usage_tests
 #if 0
 BOOST_FIXTURE_TEST_CASE(net_usage_tests, tester ) try {

From 5913a862096ce1f84ccab060af60a10a25dd90cd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 9 Sep 2019 07:10:50 -0500
Subject: [PATCH 1119/1648] Set cleos to use deflaut log level of debug since
 it uses debug for some output

---
 programs/cleos/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 38eb1f395f5..39d9e0311b5 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -2383,6 +2383,7 @@ int main( int argc, char** argv ) {
    setlocale(LC_ALL, "");
    bindtextdomain(locale_domain, locale_path);
    textdomain(locale_domain);
+   fc::logger::get(DEFAULT_LOGGER).set_log_level(fc::log_level::debug);
    context = eosio::client::http::create_http_context();
    wallet_url = default_wallet_url;
 

From d8e555afa57a410eb5fa369555839090f429d182 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Mon, 9 Sep 2019 10:54:03 -0400
Subject: [PATCH 1120/1648] Removed flags from Boost install step.

---
 .cicd/platforms/macos-10.14.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index 2f4d70614f4..be31bdbe1ab 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -53,8 +53,8 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then
     curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2
     tar -xjf boost_1_70_0.tar.bz2
     cd boost_1_70_0
-    ./bootstrap.sh --with-toolset=clang --prefix=/usr/local
-    sudo ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
+    ./bootstrap.sh --prefix=/usr/local
+    sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
     cd ..
     sudo rm -rf boost_1_70_0.tar.bz2 boost_1_70_0  
 else

From 4b762d3276747caede06ac680d8c551b9649ecb8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 9 Sep 2019 10:31:52 -0500
Subject: [PATCH 1121/1648] Add option to chain_plugin --print-build-info that
 prints prettified JSON build info. Removed always printing of info from
 nodeos main.cpp.

---
 plugins/chain_plugin/chain_plugin.cpp | 16 ++++++++++++++++
 programs/nodeos/main.cpp              |  5 -----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 35038f15072..9335e3032bb 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -14,6 +14,8 @@
 
 #include <eosio/chain/eosio_contract.hpp>
 
+#include <chainbase/environment.hpp>
+
 #include <boost/signals2/connection.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
@@ -23,6 +25,13 @@
 #include <signal.h>
 #include <cstdlib>
 
+// reflect chainbase::environment for --print-build-info option
+FC_REFLECT_ENUM( chainbase::environment::os_t,
+                 (OS_LINUX)(OS_MACOS)(OS_WINDOWS)(OS_OTHER) )
+FC_REFLECT_ENUM( chainbase::environment::arch_t,
+                 (ARCH_X86_64)(ARCH_ARM)(ARCH_RISCV)(ARCH_OTHER) )
+FC_REFLECT(chainbase::environment, (debug)(os)(arch)(boost_version)(compiler) )
+
 namespace eosio {
 
 //declare operator<< and validate funciton for read_mode in the same namespace as read_mode itself
@@ -263,6 +272,8 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
           "extract genesis_state from blocks.log as JSON, print to console, and exit")
          ("extract-genesis-json", bpo::value<bfs::path>(),
           "extract genesis_state from blocks.log as JSON, write into specified file, and exit")
+         ("print-build-info", bpo::bool_switch()->default_value(false),
+          "print build environment information to console as JSON and exit")
          ("fix-reversible-blocks", bpo::bool_switch()->default_value(false),
           "recovers reversible block database if that database is in a bad state")
          ("force-all-checks", bpo::bool_switch()->default_value(false),
@@ -567,6 +578,11 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
 
       my->chain_config = controller::config();
 
+      if( options.at( "print-build-info" ).as<bool>() ) {
+         ilog( "Build environment JSON:\n${e}", ("e", json::to_pretty_string( chainbase::environment() )) );
+         EOS_THROW( node_management_success, "reported build environment information" );
+      }
+
       LOAD_VALUE_SET( options, "sender-bypass-whiteblacklist", my->chain_config->sender_bypass_whiteblacklist );
       LOAD_VALUE_SET( options, "actor-whitelist", my->chain_config->actor_whitelist );
       LOAD_VALUE_SET( options, "actor-blacklist", my->chain_config->actor_blacklist );
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 05c8943027b..5eac9d29bac 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -5,8 +5,6 @@
 #include <eosio/net_plugin/net_plugin.hpp>
 #include <eosio/producer_plugin/producer_plugin.hpp>
 
-#include <chainbase/environment.hpp>
-
 #include <fc/log/logger_config.hpp>
 #include <fc/log/appender.hpp>
 #include <fc/exception/exception.hpp>
@@ -84,8 +82,6 @@ int main(int argc, char** argv)
 {
    try {
       app().set_version(eosio::nodeos::config::version);
-      std::stringstream ss_env;
-      ss_env << chainbase::environment();
 
       auto root = fc::app_path();
       app().set_default_data_dir(root / "eosio" / nodeos::config::node_executable_name / "data" );
@@ -104,7 +100,6 @@ int main(int argc, char** argv)
       ilog("${name} version ${ver}", ("name", nodeos::config::node_executable_name)("ver", app().version_string()));
       ilog("${name} using configuration file ${c}", ("name", nodeos::config::node_executable_name)("c", app().full_config_file_path().string()));
       ilog("${name} data directory is ${d}", ("name", nodeos::config::node_executable_name)("d", app().data_dir().string()));
-      ilog("${name} build:\n${e}", ("name", nodeos::config::node_executable_name)("e", ss_env.str()));
       app().startup();
       app().set_thread_priority_max();
       app().exec();

From 8b21e2c62a2f4702b77cdf24cd88c26e146f7f8e Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 9 Sep 2019 14:03:16 -0400
Subject: [PATCH 1122/1648] refactor mock webauthn code to the tester library,
 clean up test code

---
 .../testing/include/eosio/testing/tester.hpp  | 64 ++++++++++++++++++-
 libraries/testing/tester.cpp                  |  2 +
 unittests/api_tests.cpp                       | 56 +++++-----------
 .../test-contracts/test_api/test_crypto.cpp   | 11 ++--
 4 files changed, 86 insertions(+), 47 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 0cb969d82f5..a69a5313194 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -84,6 +84,59 @@ namespace eosio { namespace testing {
 
    protocol_feature_set make_protocol_feature_set(const subjective_restriction_map& custom_subjective_restrictions = {});
 
+   namespace mock {
+      using namespace fc::crypto;
+      struct webauthn_private_key {
+         explicit webauthn_private_key(r1::private_key&& priv_key)
+         :priv_key(std::move(priv_key))
+         {
+         }
+
+         webauthn_private_key(webauthn_private_key&&) = default;
+         webauthn_private_key(const webauthn_private_key&) = default;
+
+         static auto regenerate(const fc::sha256& secret) {
+            return webauthn_private_key(r1::private_key::regenerate(secret));
+         }
+
+         public_key get_public_key(webauthn::public_key::user_presence_t presence = webauthn::public_key::user_presence_t::USER_PRESENCE_NONE) const {
+            return public_key_type(webauthn::public_key(priv_key.get_public_key().serialize(), presence, _origin));
+         }
+
+         signature sign( const sha256& digest, bool = true) const {
+            auto json = std::string("{\"origin\":\"https://") +
+                        _origin +
+                        "\",\"type\":\"webauthn.get\",\"challenge\":\"" +
+                        fc::base64url_encode(digest.data(), digest.data_size()) +
+                        "\"}";
+            std::vector<uint8_t> auth_data(37);
+            memcpy(auth_data.data(), _origin_hash.data(), sizeof(_origin_hash));
+
+            auto client_data_hash = fc::sha256::hash(json);
+            fc::sha256::encoder e;
+            e.write((char*)auth_data.data(), auth_data.size());
+            e.write(client_data_hash.data(), client_data_hash.data_size());
+            auto sig = priv_key.sign_compact(e.result());
+
+            char serialized_sig[4096];
+            datastream<char*> sig_ds(serialized_sig, sizeof(serialized_sig));
+            fc::raw::pack(sig_ds, (uint8_t)signature::storage_type::position<webauthn::signature>());
+            fc::raw::pack(sig_ds, sig);
+            fc::raw::pack(sig_ds, auth_data);
+            fc::raw::pack(sig_ds, json);
+            sig_ds.seekp(0);
+
+            signature ret;
+            fc::raw::unpack(sig_ds, ret);
+            return ret;
+         }
+
+         r1::private_key priv_key;
+         static const std::string _origin;
+         static const fc::sha256 _origin_hash;
+      };
+   }
+
    /**
     *  @class tester
     *  @brief provides utility function to simplify the creation of unit tests
@@ -223,12 +276,17 @@ namespace eosio { namespace testing {
          }
 
          template< typename KeyType = fc::ecc::private_key_shim >
-         static private_key_type get_private_key( name keyname, string role = "owner" ) {
-            return private_key_type::regenerate<KeyType>(fc::sha256::hash(keyname.to_string()+role));
+         static auto get_private_key( name keyname, string role = "owner" ) {
+            auto secret = fc::sha256::hash(keyname.to_string() + role);
+            if constexpr (std::is_same_v<KeyType, mock::webauthn_private_key>) {
+               return mock::webauthn_private_key::regenerate(secret);
+            } else {
+               return private_key_type::regenerate<KeyType>(secret);
+            }
          }
 
          template< typename KeyType = fc::ecc::private_key_shim >
-         static public_key_type get_public_key( name keyname, string role = "owner" ) {
+         static auto get_public_key( name keyname, string role = "owner" ) {
             return get_private_key<KeyType>( keyname, role ).get_public_key();
          }
 
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index a793571ed91..0707cd573d9 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -1169,6 +1169,8 @@ namespace eosio { namespace testing {
       return match;
    }
 
+   const std::string mock::webauthn_private_key::_origin = "mock.webauthn.invalid";
+   const sha256 mock::webauthn_private_key::_origin_hash = fc::sha256::hash(mock::webauthn_private_key::_origin);
 } }  /// eosio::testing
 
 std::ostream& operator<<( std::ostream& osm, const fc::variant& v ) {
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index fc0bd86a571..55bd26cae93 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -1724,27 +1724,26 @@ BOOST_FIXTURE_TEST_CASE(multi_index_tests, TESTER) { try {
  * crypto_tests test cases
  *************************************************************************************/
 BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
-   produce_blocks(1000);
+   produce_block();
    create_account(N(testapi) );
-   produce_blocks(1000);
+   produce_block();
    set_code(N(testapi), contracts::test_api_wasm() );
-   produce_blocks(1000);
+   produce_block();
 	{
 		signed_transaction trx;
 
       auto pl = vector<permission_level>{{N(testapi), config::active_name}};
 
       action act(pl, test_api_action<TEST_METHOD("test_crypto", "test_recover_key")>{});
-		auto signatures = trx.sign(get_private_key(N(testapi), "active"), control->get_chain_id());
-
-		produce_block();
+      const auto priv_key = get_private_key(N(testapi), "active" );
+      const auto pub_key = priv_key.get_public_key();
+      auto hash = trx.sig_digest( control->get_chain_id() );
+      auto sig = priv_key.sign(hash);
 
+      auto pk     = fc::raw::pack( pub_key );
+      auto sigs   = fc::raw::pack( sig );
       vector<char> payload(8192);
       datastream<char*> payload_ds(payload.data(), payload.size());
-
-      auto hash   = trx.sig_digest( control->get_chain_id() );
-      auto pk     = fc::raw::pack( get_public_key( N(testapi), "active" ) );
-      auto sigs   = fc::raw::pack( signatures );
       fc::raw::pack(payload_ds,  hash, (uint32_t)pk.size(), (uint32_t)sigs.size() );
       payload_ds.write(pk.data(), pk.size() );
       payload_ds.write(sigs.data(), sigs.size());
@@ -1752,7 +1751,6 @@ BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
 
       //No Error Here
       CALL_TEST_FUNCTION( *this, "test_crypto", "test_recover_key", payload );
-      return;
       // Error Here
       CALL_TEST_FUNCTION( *this, "test_crypto", "test_recover_key_assert_true", payload );
       payload[payload.size()-1] = 0;
@@ -1768,41 +1766,21 @@ BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
       action act(pl, test_api_action<TEST_METHOD("test_crypto", "test_recover_key_partial")>{});
 
       // construct a mock WebAuthN pubkey and signature, as it is the only type that would be variable-sized
-		using namespace fc::crypto;
-		const auto priv_r1 = r1::private_key::generate();
-      const auto pub_r1 = priv_r1.get_public_key();
-      const auto origin_hash = fc::sha256::hash(std::string("fctesting.invalid"));
-      auto hash   = trx.sig_digest( control->get_chain_id() );
-
-      auto pubkey = public_key_type(webauthn::public_key(pub_r1.serialize(), webauthn::public_key::user_presence_t::USER_PRESENCE_NONE, "fctesting.invalid"));
-      std::string json = "{\"origin\":\"https://fctesting.invalid\",\"type\":\"webauthn.get\",\"challenge\":\"" + fc::base64url_encode(hash.data(), hash.data_size()) + "\"}";
-      std::vector<uint8_t> auth_data(37);
-      memcpy(auth_data.data(), origin_hash.data(), sizeof(origin_hash));
-
-      //webauthn signature is sha256(auth_data || client_data_hash)
-      auto client_data_hash = fc::sha256::hash(json);
-      fc::sha256::encoder e;
-      e.write((char*)auth_data.data(), auth_data.size());
-      e.write(client_data_hash.data(), client_data_hash.data_size());
-      auto sig = priv_r1.sign_compact(e.result());
-
-      char serialized_sig[4096];
-      datastream<char*> sig_ds(serialized_sig, sizeof(serialized_sig));
-      fc::raw::pack(sig_ds, sig);
-      fc::raw::pack(sig_ds, auth_data);
-      fc::raw::pack(sig_ds, json);
-      auto serialized_sig_size = sig_ds.tellp();
+		const auto priv_key = get_private_key<mock::webauthn_private_key>(N(testapi), "active" );
+      const auto pub_key = priv_key.get_public_key();
+      auto hash  = trx.sig_digest( control->get_chain_id() );
+      auto sig = priv_key.sign(hash);
 
+      auto pk     = fc::raw::pack( pub_key );
+      auto sigs   = fc::raw::pack( sig );
       vector<char> payload(8192);
       datastream<char*> payload_ds(payload.data(), payload.size());
-      auto pk     = fc::raw::pack( pubkey );
-      fc::raw::pack(payload_ds,  hash, (uint32_t)pk.size(), (uint32_t)serialized_sig_size-1 );
+      fc::raw::pack(payload_ds,  hash, (uint32_t)pk.size(), (uint32_t)sigs.size() );
       payload_ds.write(pk.data(), pk.size() );
-      payload_ds.write(serialized_sig, serialized_sig_size-1);
+      payload_ds.write(sigs.data(), sigs.size());
       payload.resize(payload_ds.tellp());
 
       //No Error Here
-      produce_block();
       CALL_TEST_FUNCTION( *this, "test_crypto", "test_recover_key_partial", payload );
       return;
 	}
diff --git a/unittests/test-contracts/test_api/test_crypto.cpp b/unittests/test-contracts/test_api/test_crypto.cpp
index 0bc540160e1..e20bfe2a3d2 100644
--- a/unittests/test-contracts/test_api/test_crypto.cpp
+++ b/unittests/test-contracts/test_api/test_crypto.cpp
@@ -231,12 +231,13 @@ void test_crypto::test_recover_key_partial() {
    read_action_data( buffer, action_data_size() );
    auto sh = (const sig_hash_key_header*)buffer;
 
-   char recovered[sh->pk_len];
-   auto result = recover_key( &sh->hash, sh->sig_base(), sh->sig_len, recovered, sh->pk_len );
-   eosio_assert(result > sh->pk_len, "recovered key is not longer than provided key");
-   for ( uint32_t i=0; i < sh->pk_len; i++ )
+   auto recover_size = std::max<uint32_t>(sh->pk_len / 2, 33);
+   char recovered[recover_size];
+   auto result = recover_key( &sh->hash, sh->sig_base(), sh->sig_len, recovered, recover_size );
+   eosio_assert(result == sh->pk_len, "recoverable key is not as long as provided key");
+   for ( uint32_t i=0; i < recover_size; i++ )
       if ( recovered[i] != sh->pk_base()[i] )
-         eosio_assert( false, "public key does not match" );
+         eosio_assert( false, "partial public key does not match" );
 }
 
 void test_crypto::test_sha1() {

From 6692987e52326b9efa960dea4f9b599a64f386fa Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Mon, 9 Sep 2019 15:18:02 -0400
Subject: [PATCH 1123/1648] fix whitespace in the code touched

---
 unittests/api_tests.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 55bd26cae93..f07fe1c07c4 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -1729,8 +1729,8 @@ BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
    produce_block();
    set_code(N(testapi), contracts::test_api_wasm() );
    produce_block();
-	{
-		signed_transaction trx;
+   {
+      signed_transaction trx;
 
       auto pl = vector<permission_level>{{N(testapi), config::active_name}};
 
@@ -1756,17 +1756,17 @@ BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
       payload[payload.size()-1] = 0;
       BOOST_CHECK_EXCEPTION( CALL_TEST_FUNCTION( *this, "test_crypto", "test_recover_key_assert_false", payload ),
                              crypto_api_exception, fc_exception_message_is("Error expected key different than recovered key") );
-	}
+   }
 
-	{
-		signed_transaction trx;
+   {
+      signed_transaction trx;
 
       auto pl = vector<permission_level>{{N(testapi), config::active_name}};
 
       action act(pl, test_api_action<TEST_METHOD("test_crypto", "test_recover_key_partial")>{});
 
       // construct a mock WebAuthN pubkey and signature, as it is the only type that would be variable-sized
-		const auto priv_key = get_private_key<mock::webauthn_private_key>(N(testapi), "active" );
+      const auto priv_key = get_private_key<mock::webauthn_private_key>(N(testapi), "active" );
       const auto pub_key = priv_key.get_public_key();
       auto hash  = trx.sig_digest( control->get_chain_id() );
       auto sig = priv_key.sign(hash);
@@ -1783,7 +1783,7 @@ BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
       //No Error Here
       CALL_TEST_FUNCTION( *this, "test_crypto", "test_recover_key_partial", payload );
       return;
-	}
+   }
 
 
    CALL_TEST_FUNCTION( *this, "test_crypto", "test_sha1", {} );

From 4fb8e3fb38ce17fef82312ee3024dfb56d21cce2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 9 Sep 2019 14:45:47 -0500
Subject: [PATCH 1124/1648] Add --extract-build-info option

---
 plugins/chain_plugin/chain_plugin.cpp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 9335e3032bb..aa846083147 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -274,6 +274,8 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
           "extract genesis_state from blocks.log as JSON, write into specified file, and exit")
          ("print-build-info", bpo::bool_switch()->default_value(false),
           "print build environment information to console as JSON and exit")
+         ("extract-build-info", bpo::value<bfs::path>(),
+          "extract build environment information as JSON, write into specified file, and exit")
          ("fix-reversible-blocks", bpo::bool_switch()->default_value(false),
           "recovers reversible block database if that database is in a bad state")
          ("force-all-checks", bpo::bool_switch()->default_value(false),
@@ -578,8 +580,25 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
 
       my->chain_config = controller::config();
 
-      if( options.at( "print-build-info" ).as<bool>() ) {
-         ilog( "Build environment JSON:\n${e}", ("e", json::to_pretty_string( chainbase::environment() )) );
+      if( options.at( "print-build-info" ).as<bool>() || options.count( "extract-build-info") ) {
+         if( options.at( "print-build-info" ).as<bool>() ) {
+            ilog( "Build environment JSON:\n${e}", ("e", json::to_pretty_string( chainbase::environment() )) );
+         }
+         if( options.count( "extract-build-info") ) {
+            auto p = options.at( "extract-build-info" ).as<bfs::path>();
+
+            if( p.is_relative()) {
+               p = bfs::current_path() / p;
+            }
+
+            EOS_ASSERT( fc::json::save_to_file( chainbase::environment(), p, true ), misc_exception,
+                        "Error occurred while writing build info JSON to '${path}'",
+                        ("path", p.generic_string())
+            );
+
+            ilog( "Saved build info JSON to '${path}'", ("path", p.generic_string()) );
+         }
+
          EOS_THROW( node_management_success, "reported build environment information" );
       }
 

From b7e678bca75cac0bcf2b1e89e03c18497413a9e0 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 9 Sep 2019 14:44:30 -0400
Subject: [PATCH 1125/1648] Create "release-build-test"

---
 tests/release-build.sh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100755 tests/release-build.sh

diff --git a/tests/release-build.sh b/tests/release-build.sh
new file mode 100755
index 00000000000..deec2d3bb04
--- /dev/null
+++ b/tests/release-build.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+# test name
+echo ''
+echo '                         ##### Release Build Test #####'
+echo ''
+# environment
+[[ -z "$EOSIO_ROOT" && $(git --version) ]] && export EOSIO_ROOT="$(git rev-parse --show-toplevel)"
+[[ -z "$EOSIO_ROOT" ]] && export EOSIO_ROOT="$(echo $(pwd)/ | grep -ioe '.*/eos/' -e '.*/eosio/' -e '.*/build/' | sed 's,/build/,/,')"
+[[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
+# test
+./nodeos --config-dir $(pwd)/config --data-dir $(pwd)/data & # run nodeos in background
+sleep 10
+kill $! # kill nodeos gracefully, by PID
+if [[ "$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')" == '00' ]]; then
+    echo 'pass'
+    exit 0
+fi
+echo 'FAIL'
+exit 1
\ No newline at end of file

From f904309fc1f9c917e60d0bbf4492bdf0fe526958 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 9 Sep 2019 17:02:32 -0400
Subject: [PATCH 1126/1648] Add test name, purpose, and description

---
 tests/release-build.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index deec2d3bb04..4e8a702d3eb 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -1,8 +1,15 @@
 #!/bin/bash
 set -e
-# test name
+# test name and purpose
 echo ''
-echo '                         ##### Release Build Test #####'
+echo '                        ##### Release Build Test #####'
+echo ''
+echo 'The purpose of this test is to ensure that nodeos was built without debugging'
+echo 'symbols. Debugging symbols enable software engineers to inspect and control a'
+echo 'running program with a debugging tool, but they significantly slow down'
+echo 'performance-critical applications like nodeos. Anyone intending to build and'
+echo 'install nodeos from source should perform a "release build," which excludes'
+echo 'debugging symbols to generate faster and lighter binaries.'
 echo ''
 # environment
 [[ -z "$EOSIO_ROOT" && $(git --version) ]] && export EOSIO_ROOT="$(git rev-parse --show-toplevel)"

From 5e13ae3235cd169e666d860c2219817ab3eb54dd Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 9 Sep 2019 17:06:08 -0400
Subject: [PATCH 1127/1648] Add descriptive pass/fail statements

---
 tests/release-build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 4e8a702d3eb..79c24e11b47 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -20,8 +20,8 @@ echo ''
 sleep 10
 kill $! # kill nodeos gracefully, by PID
 if [[ "$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')" == '00' ]]; then
-    echo 'pass'
+    echo 'PASS: Debug byte not set.'
     exit 0
 fi
-echo 'FAIL'
+echo 'FAIL: Debug byte is set!'
 exit 1
\ No newline at end of file

From 38660c6ad3e375662ef5077f96e1e13d94056e43 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 9 Sep 2019 17:12:31 -0400
Subject: [PATCH 1128/1648] Print debug byte on failure

---
 tests/release-build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 79c24e11b47..ef0135ebc6b 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -19,9 +19,11 @@ echo ''
 ./nodeos --config-dir $(pwd)/config --data-dir $(pwd)/data & # run nodeos in background
 sleep 10
 kill $! # kill nodeos gracefully, by PID
-if [[ "$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')" == '00' ]]; then
+export DEBUG_BYTE="$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')"
+if [[ "$DEBUG_BYTE" == '00' ]]; then
     echo 'PASS: Debug byte not set.'
     exit 0
 fi
 echo 'FAIL: Debug byte is set!'
+echo "Debug Byte = 0x$DEBUG_BYTE"
 exit 1
\ No newline at end of file

From 54ef8f6cc982bdd22ff6b3d53e0be71cb6e0e57c Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 9 Sep 2019 17:32:12 -0400
Subject: [PATCH 1129/1648] Print first kB of shared_memory.bin on failure

---
 tests/release-build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index ef0135ebc6b..836022bb5d8 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -26,4 +26,7 @@ if [[ "$DEBUG_BYTE" == '00' ]]; then
 fi
 echo 'FAIL: Debug byte is set!'
 echo "Debug Byte = 0x$DEBUG_BYTE"
+echo 'First kilobyte of shared_memory.bin:'
+echo '$ xxd -l 1024 shared_memory.bin'
+xxd -l 1024 data/state/shared_memory.bin
 exit 1
\ No newline at end of file

From e59ccac45444d7601392150612af2021e9630cef Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 9 Sep 2019 17:33:13 -0400
Subject: [PATCH 1130/1648] Print useful error message if nodeos binary is not
 found

---
 tests/release-build.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 836022bb5d8..7cbaae31d91 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -14,6 +14,16 @@ echo ''
 # environment
 [[ -z "$EOSIO_ROOT" && $(git --version) ]] && export EOSIO_ROOT="$(git rev-parse --show-toplevel)"
 [[ -z "$EOSIO_ROOT" ]] && export EOSIO_ROOT="$(echo $(pwd)/ | grep -ioe '.*/eos/' -e '.*/eosio/' -e '.*/build/' | sed 's,/build/,/,')"
+if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/nodeos/nodeos" ]]; then
+    echo 'ERROR: nodeos binary not found!'
+    echo 'Looked in the following places:'
+    echo "$ ls -la $EOSIO_ROOT/build/bin"
+    ls -la $EOSIO_ROOT/build/bin
+    echo "$ ls -la $EOSIO_ROOT/build/programs/nodeos"
+    ls -la $EOSIO_ROOT/build/programs/nodeos
+    echo "Release Build Test not run because test conditions were not met."
+    exit 1
+fi
 [[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
 # test
 ./nodeos --config-dir $(pwd)/config --data-dir $(pwd)/data & # run nodeos in background
@@ -29,4 +39,4 @@ echo "Debug Byte = 0x$DEBUG_BYTE"
 echo 'First kilobyte of shared_memory.bin:'
 echo '$ xxd -l 1024 shared_memory.bin'
 xxd -l 1024 data/state/shared_memory.bin
-exit 1
\ No newline at end of file
+exit 2
\ No newline at end of file

From 435c473f93cf25a0cc63932798fee0fa74ad1080 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:00:04 -0400
Subject: [PATCH 1131/1648] Clearer comments

---
 tests/release-build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 7cbaae31d91..ddebdace42a 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -25,10 +25,11 @@ if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/no
     exit 1
 fi
 [[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
-# test
+# setup
 ./nodeos --config-dir $(pwd)/config --data-dir $(pwd)/data & # run nodeos in background
 sleep 10
 kill $! # kill nodeos gracefully, by PID
+# test
 export DEBUG_BYTE="$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')"
 if [[ "$DEBUG_BYTE" == '00' ]]; then
     echo 'PASS: Debug byte not set.'

From c92f7ea3607a6fb85c8dd53ae57762e0650bb497 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:02:56 -0400
Subject: [PATCH 1132/1648] Print useful error if shared_memory.bin is not
 found

---
 tests/release-build.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index ddebdace42a..f02d2106529 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -29,6 +29,14 @@ fi
 ./nodeos --config-dir $(pwd)/config --data-dir $(pwd)/data & # run nodeos in background
 sleep 10
 kill $! # kill nodeos gracefully, by PID
+if [[ ! -f data/state/shared_memory.bin ]]; then
+    echo 'ERROR: nodeos state not found!'
+    echo 'Looked for shared_memory.bin in the following places:'
+    echo "$ ls -la $(pwd)/data/state"
+    ls -la $(pwd)/data/state
+    echo "Release Build Test not run because test setup failed."
+    exit 2
+fi
 # test
 export DEBUG_BYTE="$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')"
 if [[ "$DEBUG_BYTE" == '00' ]]; then
@@ -40,4 +48,4 @@ echo "Debug Byte = 0x$DEBUG_BYTE"
 echo 'First kilobyte of shared_memory.bin:'
 echo '$ xxd -l 1024 shared_memory.bin'
 xxd -l 1024 data/state/shared_memory.bin
-exit 2
\ No newline at end of file
+exit 3
\ No newline at end of file

From 0014fc5c7cd749c0f087f285be134843498006f7 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:06:13 -0400
Subject: [PATCH 1133/1648] Use quotes in case paths have spaces

---
 tests/release-build.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index f02d2106529..9f3025c2424 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -17,23 +17,23 @@ echo ''
 if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/nodeos/nodeos" ]]; then
     echo 'ERROR: nodeos binary not found!'
     echo 'Looked in the following places:'
-    echo "$ ls -la $EOSIO_ROOT/build/bin"
-    ls -la $EOSIO_ROOT/build/bin
-    echo "$ ls -la $EOSIO_ROOT/build/programs/nodeos"
-    ls -la $EOSIO_ROOT/build/programs/nodeos
+    echo "$ ls -la \"$EOSIO_ROOT/build/bin\""
+    ls -la "$EOSIO_ROOT/build/bin"
+    echo "$ ls -la \"$EOSIO_ROOT/build/programs/nodeos\""
+    ls -la "$EOSIO_ROOT/build/programs/nodeos"
     echo "Release Build Test not run because test conditions were not met."
     exit 1
 fi
 [[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
 # setup
-./nodeos --config-dir $(pwd)/config --data-dir $(pwd)/data & # run nodeos in background
+./nodeos --config-dir "$(pwd)/config" --data-dir "$(pwd)/data" & # run nodeos in background
 sleep 10
 kill $! # kill nodeos gracefully, by PID
 if [[ ! -f data/state/shared_memory.bin ]]; then
     echo 'ERROR: nodeos state not found!'
     echo 'Looked for shared_memory.bin in the following places:'
-    echo "$ ls -la $(pwd)/data/state"
-    ls -la $(pwd)/data/state
+    echo "$ ls -la \"$(pwd)/data/state\""
+    ls -la "$(pwd)/data/state"
     echo "Release Build Test not run because test setup failed."
     exit 2
 fi

From fd5f697986b97af4cabaed20e3820e5ab70d5738 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:07:36 -0400
Subject: [PATCH 1134/1648] Better strings

---
 tests/release-build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 9f3025c2424..29c09abed7a 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -21,7 +21,7 @@ if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/no
     ls -la "$EOSIO_ROOT/build/bin"
     echo "$ ls -la \"$EOSIO_ROOT/build/programs/nodeos\""
     ls -la "$EOSIO_ROOT/build/programs/nodeos"
-    echo "Release Build Test not run because test conditions were not met."
+    echo 'Release build test not run.'
     exit 1
 fi
 [[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
@@ -34,7 +34,7 @@ if [[ ! -f data/state/shared_memory.bin ]]; then
     echo 'Looked for shared_memory.bin in the following places:'
     echo "$ ls -la \"$(pwd)/data/state\""
     ls -la "$(pwd)/data/state"
-    echo "Release Build Test not run because test setup failed."
+    echo 'Release build test not run.'
     exit 2
 fi
 # test

From 810766add071a51c59192d5235929a09b47552a5 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:11:16 -0400
Subject: [PATCH 1135/1648] Remove "set -e"

---
 tests/release-build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 29c09abed7a..39daa610af5 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 # test name and purpose
 echo ''
 echo '                        ##### Release Build Test #####'

From 26192b4d27406ca2caddabea5b5258232e03f5fa Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:14:05 -0400
Subject: [PATCH 1136/1648] Even clearer comments

---
 tests/release-build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 39daa610af5..919982481fc 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -10,7 +10,7 @@ echo 'performance-critical applications like nodeos. Anyone intending to build a
 echo 'install nodeos from source should perform a "release build," which excludes'
 echo 'debugging symbols to generate faster and lighter binaries.'
 echo ''
-# environment
+# find nodeos
 [[ -z "$EOSIO_ROOT" && $(git --version) ]] && export EOSIO_ROOT="$(git rev-parse --show-toplevel)"
 [[ -z "$EOSIO_ROOT" ]] && export EOSIO_ROOT="$(echo $(pwd)/ | grep -ioe '.*/eos/' -e '.*/eosio/' -e '.*/build/' | sed 's,/build/,/,')"
 if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/nodeos/nodeos" ]]; then
@@ -24,8 +24,8 @@ if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/no
     exit 1
 fi
 [[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
-# setup
-./nodeos --config-dir "$(pwd)/config" --data-dir "$(pwd)/data" & # run nodeos in background
+# run nodeos to generate state files
+./nodeos --config-dir "$(pwd)/config" --data-dir "$(pwd)/data" &
 sleep 10
 kill $! # kill nodeos gracefully, by PID
 if [[ ! -f data/state/shared_memory.bin ]]; then
@@ -36,7 +36,7 @@ if [[ ! -f data/state/shared_memory.bin ]]; then
     echo 'Release build test not run.'
     exit 2
 fi
-# test
+# test state files for debug flag
 export DEBUG_BYTE="$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')"
 if [[ "$DEBUG_BYTE" == '00' ]]; then
     echo 'PASS: Debug byte not set.'

From c5cb12815958f3397e266c42f1ac64eae624789a Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:21:08 -0400
Subject: [PATCH 1137/1648] Clean up after nodeos on test pass

---
 tests/release-build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 919982481fc..1b5ba514b54 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -40,6 +40,7 @@ fi
 export DEBUG_BYTE="$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')"
 if [[ "$DEBUG_BYTE" == '00' ]]; then
     echo 'PASS: Debug byte not set.'
+    rm -rf config data
     exit 0
 fi
 echo 'FAIL: Debug byte is set!'

From a66af5468404a242f4f8a0656a9b7bc0fb495b32 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:22:07 -0400
Subject: [PATCH 1138/1648] Clean up after nodeos on test fail

---
 tests/release-build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 1b5ba514b54..0c00522e31b 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -34,6 +34,7 @@ if [[ ! -f data/state/shared_memory.bin ]]; then
     echo "$ ls -la \"$(pwd)/data/state\""
     ls -la "$(pwd)/data/state"
     echo 'Release build test not run.'
+    rm -rf config data
     exit 2
 fi
 # test state files for debug flag
@@ -48,4 +49,5 @@ echo "Debug Byte = 0x$DEBUG_BYTE"
 echo 'First kilobyte of shared_memory.bin:'
 echo '$ xxd -l 1024 shared_memory.bin'
 xxd -l 1024 data/state/shared_memory.bin
+rm -rf config data
 exit 3
\ No newline at end of file

From 0fab02281aa9b9550201d13940191c66658f989b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:27:11 -0400
Subject: [PATCH 1139/1648] Silence nodeos

---
 tests/release-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 0c00522e31b..06dc93d4189 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -25,7 +25,7 @@ if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/no
 fi
 [[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
 # run nodeos to generate state files
-./nodeos --config-dir "$(pwd)/config" --data-dir "$(pwd)/data" &
+./nodeos --config-dir "$(pwd)/config" --data-dir "$(pwd)/data" 1>/dev/null 2>/dev/null &
 sleep 10
 kill $! # kill nodeos gracefully, by PID
 if [[ ! -f data/state/shared_memory.bin ]]; then

From afd078da45c2afba0c670284d9f98fd5a05b3046 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:29:22 -0400
Subject: [PATCH 1140/1648] Add space after test result

---
 tests/release-build.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 06dc93d4189..bb0d651cc55 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -15,6 +15,7 @@ echo ''
 [[ -z "$EOSIO_ROOT" ]] && export EOSIO_ROOT="$(echo $(pwd)/ | grep -ioe '.*/eos/' -e '.*/eosio/' -e '.*/build/' | sed 's,/build/,/,')"
 if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/nodeos/nodeos" ]]; then
     echo 'ERROR: nodeos binary not found!'
+    echo ''
     echo 'Looked in the following places:'
     echo "$ ls -la \"$EOSIO_ROOT/build/bin\""
     ls -la "$EOSIO_ROOT/build/bin"
@@ -30,6 +31,7 @@ sleep 10
 kill $! # kill nodeos gracefully, by PID
 if [[ ! -f data/state/shared_memory.bin ]]; then
     echo 'ERROR: nodeos state not found!'
+    echo ''
     echo 'Looked for shared_memory.bin in the following places:'
     echo "$ ls -la \"$(pwd)/data/state\""
     ls -la "$(pwd)/data/state"
@@ -41,11 +43,13 @@ fi
 export DEBUG_BYTE="$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')"
 if [[ "$DEBUG_BYTE" == '00' ]]; then
     echo 'PASS: Debug byte not set.'
+    echo ''
     rm -rf config data
     exit 0
 fi
 echo 'FAIL: Debug byte is set!'
 echo "Debug Byte = 0x$DEBUG_BYTE"
+echo ''
 echo 'First kilobyte of shared_memory.bin:'
 echo '$ xxd -l 1024 shared_memory.bin'
 xxd -l 1024 data/state/shared_memory.bin

From eb8518df05f7ea807537e7ad01b1b4b8eee09678 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 01:37:51 -0400
Subject: [PATCH 1141/1648] Add release-build-test to non-parallelizable test
 group

---
 tests/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8f14356bab0..23785b3ea36 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -47,6 +47,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/validate-dirty-db.py ${CMAKE_CURRENT_
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/launcher_test.py ${CMAKE_CURRENT_BINARY_DIR}/launcher_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/db_modes_test.sh ${CMAKE_CURRENT_BINARY_DIR}/db_modes_test.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/prod_preactivation_test.py ${CMAKE_CURRENT_BINARY_DIR}/prod_preactivation_test.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/release-build.sh ${CMAKE_CURRENT_BINARY_DIR}/release-build.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-label.sh ${CMAKE_CURRENT_BINARY_DIR}/version-label.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_producer_watermark_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_producer_watermark_test.py COPYONLY)
 
@@ -87,6 +88,8 @@ add_test(NAME launcher_test COMMAND tests/launcher_test.py -v --clean-run --dump
 set_property(TEST launcher_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_tests_properties(db_modes_test PROPERTIES COST 6000)
+add_test(NAME release-build-test COMMAND tests/release-build.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST release-build-test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME version-label-test COMMAND tests/version-label.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # Long running tests

From e9b58f3084251afc8f1d01c6943e025331c872ba Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 10 Sep 2019 12:29:15 -0400
Subject: [PATCH 1142/1648] Fix artifacts not being uploaded on failing tests.

---
 .cicd/test.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cicd/test.sh b/.cicd/test.sh
index a0f3dd73361..c2284b4e855 100755
--- a/.cicd/test.sh
+++ b/.cicd/test.sh
@@ -5,11 +5,13 @@ set -eo pipefail
 # tests
 if [[ $(uname) == 'Darwin' ]]; then # macOS
     export PATH=$PATH:~/mongodb/bin
+    set +e # defer error handling to end
     ./"$@"
     EXIT_STATUS=$?
 else # Linux
     . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$IMAGE_TAG.dockerfile
     echo "$ docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) $FULL_TAG bash -c \"$MOUNTED_DIR/$@\""
+    set +e # defer error handling to end
     eval docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) $FULL_TAG bash -c \"$MOUNTED_DIR/$@\"
     EXIT_STATUS=$?
 fi

From 9ed3f2a8e986684ffc854e6d74c769c805d590ca Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Tue, 10 Sep 2019 12:36:45 -0400
Subject: [PATCH 1143/1648] revert api tests to direct access of intrinsics
 with little CDT library support to fix integration issues caused by wrappers

---
 unittests/api_tests.cpp                       |   1 -
 .../test-contracts/test_api/test_crypto.cpp   | 350 +++++++++---------
 2 files changed, 172 insertions(+), 179 deletions(-)

diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index f07fe1c07c4..768c7f0e9ca 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -1782,7 +1782,6 @@ BOOST_FIXTURE_TEST_CASE(crypto_tests, TESTER) { try {
 
       //No Error Here
       CALL_TEST_FUNCTION( *this, "test_crypto", "test_recover_key_partial", payload );
-      return;
    }
 
 
diff --git a/unittests/test-contracts/test_api/test_crypto.cpp b/unittests/test-contracts/test_api/test_crypto.cpp
index e20bfe2a3d2..799c169c4fe 100644
--- a/unittests/test-contracts/test_api/test_crypto.cpp
+++ b/unittests/test-contracts/test_api/test_crypto.cpp
@@ -6,21 +6,21 @@
 
 #define WASM_TEST_FAIL 1
 
-static const char test1[] = "abc";
-static const unsigned char test1_ok_1[] = {
+static constexpr char test1[] = "abc";
+static constexpr unsigned char test1_ok_1[] = {
    0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81,
    0x6a, 0xba, 0x3e, 0x25, 0x71, 0x78, 0x50,
    0xc2, 0x6c, 0x9c, 0xd0, 0xd8, 0x9d
 };
 
-static const unsigned char test1_ok_256[] = { 
-  0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea,
-  0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23,
-  0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c,
-  0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad
+static constexpr unsigned char test1_ok_256[] = {
+   0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea,
+   0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23,
+   0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c,
+   0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad
 };
 
-static const unsigned char test1_ok_512[] = {
+static constexpr unsigned char test1_ok_512[] = {
    0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 
    0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31, 
    0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, 
@@ -31,27 +31,27 @@ static const unsigned char test1_ok_512[] = {
    0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f
 };
 
-static const unsigned char test1_ok_ripe[] = {
+static constexpr unsigned char test1_ok_ripe[] = {
    0x8e, 0xb2, 0x08, 0xf7, 0xe0, 0x5d, 0x98, 0x7a, 
    0x9b, 0x04, 0x4a, 0x8e, 0x98, 0xc6, 0xb0, 0x87, 
    0xf1, 0x5a, 0x0b, 0xfc
 };
 
-const char test2[] = "";
-static const unsigned char test2_ok_1[] = {
+static constexpr char test2[] = "";
+static constexpr unsigned char test2_ok_1[] = {
    0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b,
    0x0d, 0x32, 0x55, 0xbf, 0xef, 0x95, 0x60,
    0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09
 };
 
-const unsigned char test2_ok_256[] = { 
-  0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14,
-  0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24,
-  0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c,
-  0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55
+static constexpr unsigned char test2_ok_256[] = {
+   0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14,
+   0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24,
+   0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c,
+   0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55
 };
 
-const unsigned char test2_ok_512[] = {
+static constexpr unsigned char test2_ok_512[] = {
    0xcf, 0x83, 0xe1, 0x35, 0x7e, 0xef, 0xb8, 0xbd, 
    0xf1, 0x54, 0x28, 0x50, 0xd6, 0x6d, 0x80, 0x07, 
    0xd6, 0x20, 0xe4, 0x05, 0x0b, 0x57, 0x15, 0xdc, 
@@ -62,27 +62,27 @@ const unsigned char test2_ok_512[] = {
    0xa5, 0x38, 0x32, 0x7a, 0xf9, 0x27, 0xda, 0x3e
 };
 
-const unsigned char test2_ok_ripe[] = {
+static constexpr unsigned char test2_ok_ripe[] = {
    0x9c, 0x11, 0x85, 0xa5, 0xc5, 0xe9, 0xfc, 0x54, 
    0x61, 0x28, 0x08, 0x97, 0x7e, 0xe8, 0xf5, 0x48, 
    0xb2, 0x25, 0x8d, 0x31
 };
 
-static const char test3[] = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
-static const unsigned char test3_ok_1[] = {
+static constexpr char test3[] = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
+static constexpr unsigned char test3_ok_1[] = {
    0x84, 0x98, 0x3e, 0x44, 0x1c, 0x3b, 0xd2,
    0x6e, 0xba, 0xae, 0x4a, 0xa1, 0xf9, 0x51,
    0x29, 0xe5, 0xe5, 0x46, 0x70, 0xf1
 };
 
-static const unsigned char test3_ok_256[] = { 
-  0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8,
-  0xe5, 0xc0, 0x26, 0x93, 0x0c, 0x3e, 0x60, 0x39,
-  0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67,
-  0xf6, 0xec, 0xed, 0xd4, 0x19, 0xdb, 0x06, 0xc1
+static constexpr unsigned char test3_ok_256[] = {
+   0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8,
+   0xe5, 0xc0, 0x26, 0x93, 0x0c, 0x3e, 0x60, 0x39,
+   0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67,
+   0xf6, 0xec, 0xed, 0xd4, 0x19, 0xdb, 0x06, 0xc1
 };
 
-static const unsigned char test3_ok_512[] = {
+static constexpr unsigned char test3_ok_512[] = {
    0x20, 0x4a, 0x8f, 0xc6, 0xdd, 0xa8, 0x2f, 0x0a, 
    0x0c, 0xed, 0x7b, 0xeb, 0x8e, 0x08, 0xa4, 0x16, 
    0x57, 0xc1, 0x6e, 0xf4, 0x68, 0xb2, 0x28, 0xa8, 
@@ -93,27 +93,27 @@ static const unsigned char test3_ok_512[] = {
    0x54, 0xec, 0x63, 0x12, 0x38, 0xca, 0x34, 0x45
 };
 
-static const unsigned char test3_ok_ripe[] = {
+static constexpr unsigned char test3_ok_ripe[] = {
    0x12, 0xa0, 0x53, 0x38, 0x4a, 0x9c, 0x0c, 0x88, 
    0xe4, 0x05, 0xa0, 0x6c, 0x27, 0xdc, 0xf4, 0x9a, 
    0xda, 0x62, 0xeb, 0x2b
 };
 
-static const char test4[] = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu";
-static const unsigned char test4_ok_1[] = {
+static constexpr char test4[] = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu";
+static constexpr unsigned char test4_ok_1[] = {
    0xa4, 0x9b, 0x24, 0x46, 0xa0, 0x2c, 0x64,
    0x5b, 0xf4, 0x19, 0xf9, 0x95, 0xb6, 0x70,
    0x91, 0x25, 0x3a, 0x04, 0xa2, 0x59
 };
 
-static const unsigned char test4_ok_256[] = {
-  0xcf, 0x5b, 0x16, 0xa7, 0x78, 0xaf, 0x83, 0x80,
-  0x03, 0x6c, 0xe5, 0x9e, 0x7b, 0x04, 0x92, 0x37,
-  0x0b, 0x24, 0x9b, 0x11, 0xe8, 0xf0, 0x7a, 0x51,
-  0xaf, 0xac, 0x45, 0x03, 0x7a, 0xfe, 0xe9, 0xd1
+static constexpr unsigned char test4_ok_256[] = {
+   0xcf, 0x5b, 0x16, 0xa7, 0x78, 0xaf, 0x83, 0x80,
+   0x03, 0x6c, 0xe5, 0x9e, 0x7b, 0x04, 0x92, 0x37,
+   0x0b, 0x24, 0x9b, 0x11, 0xe8, 0xf0, 0x7a, 0x51,
+   0xaf, 0xac, 0x45, 0x03, 0x7a, 0xfe, 0xe9, 0xd1
 };
 
-static const unsigned char test4_ok_512[] = {
+static constexpr unsigned char test4_ok_512[] = {
    0x8e, 0x95, 0x9b, 0x75, 0xda, 0xe3, 0x13, 0xda, 
    0x8c, 0xf4, 0xf7, 0x28, 0x14, 0xfc, 0x14, 0x3f, 
    0x8f, 0x77, 0x79, 0xc6, 0xeb, 0x9f, 0x7f, 0xa1, 
@@ -124,27 +124,27 @@ static const unsigned char test4_ok_512[] = {
    0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9, 0x09
 };
 
-static const unsigned char test4_ok_ripe[] = {
+static constexpr unsigned char test4_ok_ripe[] = {
    0x6f, 0x3f, 0xa3, 0x9b, 0x6b, 0x50, 0x3c, 0x38, 
    0x4f, 0x91, 0x9a, 0x49, 0xa7, 0xaa, 0x5c, 0x2c, 
    0x08, 0xbd, 0xfb, 0x45
 };
 
-static const char test5[] = "message digest";
-static const unsigned char test5_ok_1[] = {
+static constexpr char test5[] = "message digest";
+static constexpr unsigned char test5_ok_1[] = {
    0xc1, 0x22, 0x52, 0xce, 0xda, 0x8b, 0xe8,
    0x99, 0x4d, 0x5f, 0xa0, 0x29, 0x0a, 0x47,
    0x23, 0x1c, 0x1d, 0x16, 0xaa, 0xe3
 };
 
-static const unsigned char test5_ok_256[] = { 
-  0xf7, 0x84, 0x6f, 0x55, 0xcf, 0x23, 0xe1, 0x4e,
-  0xeb, 0xea, 0xb5, 0xb4, 0xe1, 0x55, 0x0c, 0xad,
-  0x5b, 0x50, 0x9e, 0x33, 0x48, 0xfb, 0xc4, 0xef,
-  0xa3, 0xa1, 0x41, 0x3d, 0x39, 0x3c, 0xb6, 0x50
+static constexpr unsigned char test5_ok_256[] = {
+   0xf7, 0x84, 0x6f, 0x55, 0xcf, 0x23, 0xe1, 0x4e,
+   0xeb, 0xea, 0xb5, 0xb4, 0xe1, 0x55, 0x0c, 0xad,
+   0x5b, 0x50, 0x9e, 0x33, 0x48, 0xfb, 0xc4, 0xef,
+   0xa3, 0xa1, 0x41, 0x3d, 0x39, 0x3c, 0xb6, 0x50
 };
 
-static const unsigned char test5_ok_512[] = {
+static constexpr unsigned char test5_ok_512[] = {
    0x10, 0x7d, 0xbf, 0x38, 0x9d, 0x9e, 0x9f, 0x71, 
    0xa3, 0xa9, 0x5f, 0x6c, 0x05, 0x5b, 0x92, 0x51, 
    0xbc, 0x52, 0x68, 0xc2, 0xbe, 0x16, 0xd6, 0xc1, 
@@ -155,31 +155,29 @@ static const unsigned char test5_ok_512[] = {
    0x6d, 0xe6, 0x66, 0x87, 0xbb, 0x42, 0x0e, 0x7c
 };
 
-static const unsigned char test5_ok_ripe[] = {
+static constexpr unsigned char test5_ok_ripe[] = {
    0x5d, 0x06, 0x89, 0xef, 0x49, 0xd2, 0xfa, 0xe5, 
    0x72, 0xb8, 0x81, 0xb1, 0x23, 0xa8, 0x5f, 0xfa,
    0x21, 0x59, 0x5f, 0x36
 };
 
 extern "C" {
-  uint32_t my_strlen( const char *str ) {
-    uint32_t len = 0;
-    while(str[len]) ++len;
-    return len;
-  }
-
-  bool my_memcmp( void *s1, void *s2, uint32_t n )
-  {
-    unsigned char *c1 = (unsigned char *)s1;
-    unsigned char *c2 = (unsigned char *)s2;
-    for (uint32_t i = 0; i < n; ++i) {
-      if ( c1[i] != c2[i] ) {
-        return false;
-      }
-    }
-    return true;
-  }
+   uint32_t my_strlen( const char *str ) {
+   uint32_t len = 0;
+   while(str[len]) ++len;
+      return len;
+   }
 
+   bool my_memcmp( void *s1, void *s2, uint32_t n )
+   {
+      unsigned char *c1 = (unsigned char *)s1;
+      unsigned char *c2 = (unsigned char *)s2;
+      for (uint32_t i = 0; i < n; ++i) {
+         if ( c1[i] != c2[i] ) {
+            return false;
+         }
+      }
+   }
 }
 
 struct sig_hash_key_header {
@@ -241,207 +239,203 @@ void test_crypto::test_recover_key_partial() {
 }
 
 void test_crypto::test_sha1() {
-   eosio::checksum160 tmp;
+   unsigned char tmp[20];
 
-   tmp = eosio::sha1( test1, my_strlen(test1) );
-   eosio_assert( my_memcmp((void *)test1_ok_1, &tmp, sizeof(eosio::checksum160)), "sha1 test1" );
+   ::sha1( test1, my_strlen(test1), (capi_checksum160*)tmp );
+   eosio_assert(  my_memcmp((void *)test1_ok_1, &tmp, sizeof(tmp)), "sha1 test1" );
 
-   tmp = eosio::sha1( test3, my_strlen(test3) );
-   eosio_assert( my_memcmp((void *)test3_ok_1, &tmp, sizeof(eosio::checksum160)), "sha1 test3" );
+   ::sha1( test3, my_strlen(test3), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test3_ok_1, &tmp, sizeof(tmp)), "sha1 test3" );
 
-   tmp = eosio::sha1( test4, my_strlen(test4) );
-   eosio_assert( my_memcmp((void *)test4_ok_1, &tmp, sizeof(eosio::checksum160)), "sha1 test4" );
+   ::sha1( test4, my_strlen(test4), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test4_ok_1, &tmp, sizeof(tmp)), "sha1 test4" );
 
-   tmp = eosio::sha1( test5, my_strlen(test5) );
-   eosio_assert( my_memcmp((void *)test5_ok_1, &tmp, sizeof(eosio::checksum160)), "sha1 test5" );
+   ::sha1( test5, my_strlen(test5), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test5_ok_1, &tmp, sizeof(tmp)), "sha1 test5" );
 }
 
 void test_crypto::test_sha256() {
-  eosio::checksum256 tmp;
+   unsigned char tmp[32];
 
-  tmp = eosio::sha256( test1, my_strlen(test1) );
-  eosio_assert( my_memcmp((void *)test1_ok_256, &tmp, sizeof(eosio::checksum256)), "sha256 test1" );
+   ::sha256( test1, my_strlen(test1), (capi_checksum256*)tmp);
+   eosio_assert( my_memcmp((void *)test1_ok_256, &tmp, sizeof(tmp)), "sha256 test1" );
 
-  tmp = eosio::sha256( test3, my_strlen(test3) );
-  eosio_assert( my_memcmp((void *)test3_ok_256, &tmp, sizeof(eosio::checksum256)), "sha256 test3" );
+   ::sha256( test3, my_strlen(test3), (capi_checksum256*)tmp);
+   eosio_assert( my_memcmp((void *)test3_ok_256, &tmp, sizeof(tmp)), "sha256 test3" );
 
-  tmp = eosio::sha256( test4, my_strlen(test4) );
-  eosio_assert( my_memcmp((void *)test4_ok_256, &tmp, sizeof(eosio::checksum256)), "sha256 test4" );
+   ::sha256( test4, my_strlen(test4), (capi_checksum256*)tmp);
+   eosio_assert( my_memcmp((void *)test4_ok_256, &tmp, sizeof(tmp)), "sha256 test4" );
 
-  tmp = eosio::sha256( test5, my_strlen(test5) );
-  eosio_assert( my_memcmp((void *)test5_ok_256, &tmp, sizeof(eosio::checksum256)), "sha256 test5" );
+   ::sha256( test5, my_strlen(test5), (capi_checksum256*)tmp);
+   eosio_assert( my_memcmp((void *)test5_ok_256, &tmp, sizeof(tmp)), "sha256 test5" );
 }
 
 void test_crypto::test_sha512() {
-  eosio::checksum512 tmp;
+   unsigned char tmp[64];
 
-  tmp = eosio::sha512( test1, my_strlen(test1) );
-  eosio_assert( my_memcmp((void *)test1_ok_512, &tmp, sizeof(eosio::checksum512)), "sha512 test1" );
+   ::sha512( test1, my_strlen(test1), (capi_checksum512*)tmp );
+   eosio_assert( my_memcmp((void *)test1_ok_512, &tmp, sizeof(tmp)), "sha512 test1" );
 
-  tmp = eosio::sha512( test3, my_strlen(test3) );
-  eosio_assert( my_memcmp((void *)test3_ok_512, &tmp, sizeof(eosio::checksum512)), "sha512 test3" );
+   ::sha512( test3, my_strlen(test3), (capi_checksum512*)tmp );
+   eosio_assert( my_memcmp((void *)test3_ok_512, &tmp, sizeof(tmp)), "sha512 test3" );
 
-  tmp = eosio::sha512( test4, my_strlen(test4) );
-  eosio_assert( my_memcmp((void *)test4_ok_512, &tmp, sizeof(eosio::checksum512)), "sha512 test4" );
+   ::sha512( test4, my_strlen(test4), (capi_checksum512*)tmp );
+   eosio_assert( my_memcmp((void *)test4_ok_512, &tmp, sizeof(tmp)), "sha512 test4" );
 
-  tmp = eosio::sha512( test5, my_strlen(test5) );
-  eosio_assert( my_memcmp((void *)test5_ok_512, &tmp, sizeof(eosio::checksum512)), "sha512 test5" );
+   ::sha512( test5, my_strlen(test5), (capi_checksum512*)tmp );
+   eosio_assert( my_memcmp((void *)test5_ok_512, &tmp, sizeof(tmp)), "sha512 test5" );
 }
 
 void test_crypto::test_ripemd160() {
-  eosio::checksum160 tmp;
+   unsigned char tmp[20];
 
-  tmp = eosio::ripemd160( test1, my_strlen(test1) );
-  eosio_assert( my_memcmp((void *)test1_ok_ripe, &tmp, sizeof(eosio::checksum160)), "ripemd160 test1" );
+   ::ripemd160( test1, my_strlen(test1), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test1_ok_ripe, &tmp, sizeof(tmp)), "ripemd160 test1" );
 
-  tmp = eosio::ripemd160( test3, my_strlen(test3) );
-  eosio_assert( my_memcmp((void *)test3_ok_ripe, &tmp, sizeof(eosio::checksum160)), "ripemd160 test3" );
+   ::ripemd160( test3, my_strlen(test3), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test3_ok_ripe, &tmp, sizeof(tmp)), "ripemd160 test3" );
 
-  tmp = eosio::ripemd160( test4, my_strlen(test4) );
-  eosio_assert( my_memcmp((void *)test4_ok_ripe, &tmp, sizeof(eosio::checksum160)), "ripemd160 test4" );
+   ::ripemd160( test4, my_strlen(test4), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test4_ok_ripe, &tmp, sizeof(tmp)), "ripemd160 test4" );
 
-  tmp = eosio::ripemd160( test5, my_strlen(test5) );
-  eosio_assert( my_memcmp((void *)test5_ok_ripe, &tmp, sizeof(eosio::checksum160)), "ripemd160 test5" );
+   ::ripemd160( test5, my_strlen(test5), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test5_ok_ripe, &tmp, sizeof(tmp)), "ripemd160 test5" );
 }
 
 void test_crypto::sha256_null() {
-  eosio::checksum256 tmp;
-  tmp = eosio::sha256( nullptr, 100);
-  eosio_assert( false, "should've thrown an error" );
+   unsigned char tmp[32];
+   ::sha256( nullptr, 100, (capi_checksum256*)tmp);
+   eosio_assert( false, "should've thrown an error" );
 }
 
 void test_crypto::sha1_no_data() {
-  eosio::checksum160 tmp;
-
-  tmp = eosio::sha1( test2, my_strlen(test2) );
-  eosio_assert( my_memcmp((void *)test2_ok_1, &tmp, sizeof(eosio::checksum160)), "sha1 test2" );
+   unsigned char tmp[20];
+   ::sha1( test2, my_strlen(test2), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test2_ok_1, &tmp, sizeof(tmp)), "sha1 test2" );
 }
 
 void test_crypto::sha256_no_data() {
-  eosio::checksum256 tmp;
-
-  tmp = eosio::sha256( test2, my_strlen(test2) );
-  eosio_assert( my_memcmp((void *)test2_ok_256, &tmp, sizeof(eosio::checksum256)), "sha256 test2" );
+   unsigned char tmp[32];
+   ::sha256( test2, my_strlen(test2), (capi_checksum256*)tmp );
+   eosio_assert( my_memcmp((void *)test2_ok_256, &tmp, sizeof(tmp)), "sha256 test2" );
 }
 
 void test_crypto::sha512_no_data() {
-  eosio::checksum512 tmp;
-
-  tmp = eosio::sha512( test2, my_strlen(test2) );
-  eosio_assert( my_memcmp((void *)test2_ok_512, &tmp, sizeof(eosio::checksum512)), "sha512 test2" );
+   unsigned char tmp[64];
+   ::sha512( test2, my_strlen(test2), (capi_checksum512*)tmp );
+   eosio_assert( my_memcmp((void *)test2_ok_512, &tmp, sizeof(tmp)), "sha512 test2" );
 }
 
 void test_crypto::ripemd160_no_data() {
-  eosio::checksum160 tmp;
-
-  tmp = eosio::ripemd160( test2, my_strlen(test2) );
-  eosio_assert( my_memcmp((void *)test2_ok_ripe, &tmp, sizeof(eosio::checksum160)), "ripemd160 test2" );
+   unsigned char tmp[20];
+   ::ripemd160( test2, my_strlen(test2), (capi_checksum160*)tmp );
+   eosio_assert( my_memcmp((void *)test2_ok_ripe, &tmp, sizeof(tmp)), "ripemd160 test2" );
 }
 
 
 void test_crypto::assert_sha256_false() {
-  eosio::checksum256 tmp;
+   unsigned char tmp[32];
 
-  tmp = eosio::sha256( test1, my_strlen(test1) );
-  tmp.data()[0] ^= (uint64_t)(-1);
-  assert_sha256( test1, my_strlen(test1), tmp );
-   
-  eosio_assert( false, "should have failed" );
+   ::sha256( test1, my_strlen(test1), (capi_checksum256*)tmp );
+   tmp[0] ^= (uint64_t)(-1);
+   assert_sha256( test1, my_strlen(test1), tmp );
+
+   eosio_assert( false, "should have failed" );
 }
 
 void test_crypto::assert_sha256_true() {
-  eosio::checksum256 tmp;
-
-  tmp = eosio::sha256( test1, my_strlen(test1) );
-  assert_sha256( test1, my_strlen(test1), tmp );
-
-  tmp = eosio::sha256( test3, my_strlen(test3) );
-  assert_sha256( test3, my_strlen(test3), tmp );
-
-  tmp = eosio::sha256( test4, my_strlen(test4) );
-  assert_sha256( test4, my_strlen(test4), tmp );
-
-  tmp = eosio::sha256( test5, my_strlen(test5) );
-  assert_sha256( test5, my_strlen(test5), tmp );
+   unsigned char tmp[32];
+   
+   ::sha256( test1, my_strlen(test1), (capi_checksum256*)tmp );
+   assert_sha256( test1, my_strlen(test1), tmp );
+   
+   ::sha256( test3, my_strlen(test3), (capi_checksum256*)tmp );
+   assert_sha256( test3, my_strlen(test3), tmp );
+   
+   ::sha256( test4, my_strlen(test4), (capi_checksum256*)tmp );
+   assert_sha256( test4, my_strlen(test4), tmp );
+   
+   ::sha256( test5, my_strlen(test5), (capi_checksum256*)tmp );
+   assert_sha256( test5, my_strlen(test5), tmp );
 }
 
 void test_crypto::assert_sha1_false() {
-  eosio::checksum160 tmp;
+   unsigned char tmp[20];
 
-  tmp = eosio::sha1( test1, my_strlen(test1) );
-  tmp.data()[0] ^= (uint64_t)(-1);
-  assert_sha1( test1, my_strlen(test1), tmp );
+   ::sha1( test1, my_strlen(test1), (capi_checksum160*)tmp );
+   tmp[0] ^= (uint64_t)(-1);
+   assert_sha1( test1, my_strlen(test1), tmp );
    
-  eosio_assert( false, "should have failed" );
+   eosio_assert( false, "should have failed" );
 }
 
 
 void test_crypto::assert_sha1_true() {
-  eosio::checksum160 tmp;
+   unsigned char tmp[20];
 
-  tmp = eosio::sha1( test1, my_strlen(test1) );
-  assert_sha1( test1, my_strlen(test1), tmp );
+   ::sha1( test1, my_strlen(test1), (capi_checksum160*)tmp );
+   assert_sha1( test1, my_strlen(test1), tmp );
 
-  tmp = eosio::sha1( test3, my_strlen(test3) );
-  assert_sha1( test3, my_strlen(test3), tmp );
+   ::sha1( test3, my_strlen(test3), (capi_checksum160*)tmp );
+   assert_sha1( test3, my_strlen(test3), tmp );
 
-  tmp = eosio::sha1( test4, my_strlen(test4) );
-  assert_sha1( test4, my_strlen(test4), tmp );
+   ::sha1( test4, my_strlen(test4), (capi_checksum160*)tmp);
+   assert_sha1( test4, my_strlen(test4), tmp );
 
-  tmp = eosio::sha1( test5, my_strlen(test5) );
-  assert_sha1( test5, my_strlen(test5), tmp );
+   ::sha1( test5, my_strlen(test5), (capi_checksum160*)tmp);
+   assert_sha1( test5, my_strlen(test5), tmp );
 }
 
 void test_crypto::assert_sha512_false() { 
-  eosio::checksum512 tmp;
+   unsigned char tmp[64];
 
-  tmp = eosio::sha512( test1, my_strlen(test1) );
-  tmp.data()[0] ^= (uint64_t)(-1);
-  assert_sha512( test1, my_strlen(test1), tmp );
+   ::sha512( test1, my_strlen(test1), (capi_checksum512*)tmp);
+   tmp[0] ^= (uint64_t)(-1);
+   assert_sha512( test1, my_strlen(test1), tmp );
    
-  eosio_assert(false, "should have failed");
+   eosio_assert(false, "should have failed");
 }
 
 
 void test_crypto::assert_sha512_true() {
-  eosio::checksum512 tmp;
+   unsigned char tmp[64];
 
-  tmp = eosio::sha512( test1, my_strlen(test1) );
-  assert_sha512( test1, my_strlen(test1), tmp );
+   ::sha512( test1, my_strlen(test1), (capi_checksum512*)tmp);
+   assert_sha512( test1, my_strlen(test1), tmp );
 
-  tmp = eosio::sha512( test3, my_strlen(test3) );
-  assert_sha512( test3, my_strlen(test3), tmp );
+   ::sha512( test3, my_strlen(test3), (capi_checksum512*)tmp);
+   assert_sha512( test3, my_strlen(test3), tmp );
 
-  tmp = eosio::sha512( test4, my_strlen(test4) );
-  assert_sha512( test4, my_strlen(test4), tmp );
+   ::sha512( test4, my_strlen(test4), (capi_checksum512*)tmp);
+   assert_sha512( test4, my_strlen(test4), tmp );
 
-  tmp = eosio::sha512( test5, my_strlen(test5) );
-  assert_sha512( test5, my_strlen(test5), tmp );
+   ::sha512( test5, my_strlen(test5), (capi_checksum512*)tmp);
+   assert_sha512( test5, my_strlen(test5), tmp );
 }
 
 void test_crypto::assert_ripemd160_false() {
-  eosio::checksum160 tmp;
+   unsigned char tmp[20];
 
-  tmp = eosio::ripemd160( test1, my_strlen(test1) );
-  tmp.data()[0] ^= (uint64_t)(-1);
-  assert_ripemd160( test1, my_strlen(test1), tmp );
+   ::ripemd160( test1, my_strlen(test1), (capi_checksum160*)tmp);
+   tmp[0] ^= (uint64_t)(-1);
+   assert_ripemd160( test1, my_strlen(test1), tmp );
    
-  eosio_assert( false, "should have failed" );
+   eosio_assert( false, "should have failed" );
 }
 
 
 void test_crypto::assert_ripemd160_true() {
-  eosio::checksum160 tmp;
+   unsigned char tmp[20];
 
-  tmp = eosio::ripemd160( test1, my_strlen(test1) );
-  assert_ripemd160( test1, my_strlen(test1), tmp );
+   ::ripemd160( test1, my_strlen(test1), (capi_checksum160*)tmp);
+   assert_ripemd160( test1, my_strlen(test1), tmp );
 
-  tmp = eosio::ripemd160( test3, my_strlen(test3) );
-  assert_ripemd160( test3, my_strlen(test3), tmp );
+   ::ripemd160( test3, my_strlen(test3), (capi_checksum160*)tmp);
+   assert_ripemd160( test3, my_strlen(test3), tmp );
 
-  tmp = eosio::ripemd160( test4, my_strlen(test4) );
-  assert_ripemd160( test4, my_strlen(test4), tmp );
+   ::ripemd160( test4, my_strlen(test4), (capi_checksum160*)tmp);
+   assert_ripemd160( test4, my_strlen(test4), tmp );
 
-  tmp = eosio::ripemd160( test5, my_strlen(test5) );
-  assert_ripemd160( test5, my_strlen(test5), tmp );
+   ::ripemd160( test5, my_strlen(test5), (capi_checksum160*)tmp);
+   assert_ripemd160( test5, my_strlen(test5), tmp );
 }

From fa326293413a8393468505c4de0d9405e9472c34 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 12:36:36 -0400
Subject: [PATCH 1144/1648] Fix line endings in Ubuntu dockerfiles

---
 .cicd/platforms/ubuntu-16.04.dockerfile          | 3 ++-
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile | 3 ++-
 .cicd/platforms/ubuntu-18.04.dockerfile          | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile
index bd38895f2ff..303bacddbd2 100644
--- a/.cicd/platforms/ubuntu-16.04.dockerfile
+++ b/.cicd/platforms/ubuntu-16.04.dockerfile
@@ -1,7 +1,8 @@
 FROM ubuntu:16.04
 ENV VERSION 1
 # install dependencies.
-RUN apt-get update && apt-get upgrade -y && \
+RUN apt-get update && \
+    apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git automake \
     libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev \
     python2.7 python2.7-dev python3 python3-dev autoconf libtool curl zlib1g-dev \
diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index 738a78f280b..0b40d227674 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -1,7 +1,8 @@
 FROM ubuntu:18.04
 ENV VERSION 1
 # install dependencies.
-RUN apt-get update && apt-get upgrade -y && \
+RUN apt-get update && \
+    apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y git make \
     bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile
index 9475df6e5b2..5286238454f 100644
--- a/.cicd/platforms/ubuntu-18.04.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04.dockerfile
@@ -1,7 +1,8 @@
 FROM ubuntu:18.04
 ENV VERSION 1
 # install dependencies.
-RUN apt-get update && apt-get upgrade -y && \
+RUN apt-get update && \
+    apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y git make \
     bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \

From 9d6bd481575d480c183c78800c3c277c57cc3d46 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 12:40:30 -0400
Subject: [PATCH 1145/1648] Install vim-common on base images to get xxd for
 hex dumps

---
 .cicd/platforms/amazon_linux-2-unpinned.dockerfile | 2 +-
 .cicd/platforms/amazon_linux-2.dockerfile          | 2 +-
 .cicd/platforms/centos-7.6-unpinned.dockerfile     | 2 +-
 .cicd/platforms/centos-7.6.dockerfile              | 2 +-
 .cicd/platforms/ubuntu-16.04.dockerfile            | 2 +-
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile   | 2 +-
 .cicd/platforms/ubuntu-18.04.dockerfile            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
index ffbcbf6f7aa..2791331e05e 100644
--- a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
@@ -5,7 +5,7 @@ RUN yum update -y && \
     yum install -y which git sudo procps-ng util-linux autoconf automake \
     libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
     libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
-    graphviz clang patch llvm-devel llvm-static
+    graphviz clang patch llvm-devel llvm-static vim-common
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/amazon_linux-2.dockerfile
index 95164fe7167..99f900bf29c 100644
--- a/.cicd/platforms/amazon_linux-2.dockerfile
+++ b/.cicd/platforms/amazon_linux-2.dockerfile
@@ -5,7 +5,7 @@ RUN yum update -y && \
     yum install -y which git sudo procps-ng util-linux autoconf automake \
     libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
     libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
-    graphviz patch gcc gcc-c++
+    graphviz patch gcc gcc-c++ vim-common
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile
index f4434ffe9c1..548d62870f1 100644
--- a/.cicd/platforms/centos-7.6-unpinned.dockerfile
+++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile
@@ -7,7 +7,7 @@ RUN yum update -y && \
     yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
     graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
     python python-devel rh-python36 gettext-devel file libusbx-devel \
-    libcurl-devel patch
+    libcurl-devel patch vim-common
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     source /opt/rh/devtoolset-8/enable && \
diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/centos-7.6.dockerfile
index af419eb3dc9..bad3bcc97c5 100644
--- a/.cicd/platforms/centos-7.6.dockerfile
+++ b/.cicd/platforms/centos-7.6.dockerfile
@@ -7,7 +7,7 @@ RUN yum update -y && \
     yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
     graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
     python python-devel rh-python36 gettext-devel file libusbx-devel \
-    libcurl-devel patch
+    libcurl-devel patch vim-common
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     source /opt/rh/devtoolset-8/enable && \
diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile
index 303bacddbd2..aced0745dcf 100644
--- a/.cicd/platforms/ubuntu-16.04.dockerfile
+++ b/.cicd/platforms/ubuntu-16.04.dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git automake \
     libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev \
     python2.7 python2.7-dev python3 python3-dev autoconf libtool curl zlib1g-dev \
-    sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config apt-transport-https
+    sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config apt-transport-https vim-common
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index 0b40d227674..0494ceee3cf 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \
     bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
     autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
-    libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache
+    libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache vim-common
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile
index 5286238454f..90785906843 100644
--- a/.cicd/platforms/ubuntu-18.04.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04.dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \
     bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
     autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
-    libcurl4-gnutls-dev pkg-config patch ccache
+    libcurl4-gnutls-dev pkg-config patch ccache vim-common
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \

From f57a38d11c2aff51f4d2e6c62a90d5d58e6c826c Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 12:54:31 -0400
Subject: [PATCH 1146/1648] Print useful error message if hex dump tool is not
 found

---
 tests/release-build.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index bb0d651cc55..945fc583956 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -10,6 +10,13 @@ echo 'performance-critical applications like nodeos. Anyone intending to build a
 echo 'install nodeos from source should perform a "release build," which excludes'
 echo 'debugging symbols to generate faster and lighter binaries.'
 echo ''
+# check for xxd
+if ! $(xxd --version 2>/dev/null); then
+    echo 'ERROR: Test requires xxd, but xxd was not found in your PATH!'
+    echo ''
+    echo 'The xxd hex dump tool can be installed as part of the vim-common package on most operating systems.'
+    exit 1
+fi
 # find nodeos
 [[ -z "$EOSIO_ROOT" && $(git --version) ]] && export EOSIO_ROOT="$(git rev-parse --show-toplevel)"
 [[ -z "$EOSIO_ROOT" ]] && export EOSIO_ROOT="$(echo $(pwd)/ | grep -ioe '.*/eos/' -e '.*/eosio/' -e '.*/build/' | sed 's,/build/,/,')"
@@ -22,7 +29,7 @@ if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/no
     echo "$ ls -la \"$EOSIO_ROOT/build/programs/nodeos\""
     ls -la "$EOSIO_ROOT/build/programs/nodeos"
     echo 'Release build test not run.'
-    exit 1
+    exit 2
 fi
 [[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
 # run nodeos to generate state files
@@ -37,7 +44,7 @@ if [[ ! -f data/state/shared_memory.bin ]]; then
     ls -la "$(pwd)/data/state"
     echo 'Release build test not run.'
     rm -rf config data
-    exit 2
+    exit 3
 fi
 # test state files for debug flag
 export DEBUG_BYTE="$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')"
@@ -54,4 +61,4 @@ echo 'First kilobyte of shared_memory.bin:'
 echo '$ xxd -l 1024 shared_memory.bin'
 xxd -l 1024 data/state/shared_memory.bin
 rm -rf config data
-exit 3
\ No newline at end of file
+exit 4
\ No newline at end of file

From d9c1cb018e29ec3d9abe276ad85c64cc88ebc745 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 13:44:16 -0400
Subject: [PATCH 1147/1648] Install jq on base-images for parsing nodeos output

---
 .cicd/platforms/amazon_linux-2-unpinned.dockerfile | 2 +-
 .cicd/platforms/amazon_linux-2.dockerfile          | 2 +-
 .cicd/platforms/centos-7.6-unpinned.dockerfile     | 3 ++-
 .cicd/platforms/centos-7.6.dockerfile              | 3 ++-
 .cicd/platforms/ubuntu-16.04.dockerfile            | 2 +-
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile   | 2 +-
 .cicd/platforms/ubuntu-18.04.dockerfile            | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
index 2791331e05e..3a4110c69f6 100644
--- a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
@@ -5,7 +5,7 @@ RUN yum update -y && \
     yum install -y which git sudo procps-ng util-linux autoconf automake \
     libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
     libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
-    graphviz clang patch llvm-devel llvm-static vim-common
+    graphviz clang patch llvm-devel llvm-static vim-common jq
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/amazon_linux-2.dockerfile
index 99f900bf29c..6cdaddf0d7c 100644
--- a/.cicd/platforms/amazon_linux-2.dockerfile
+++ b/.cicd/platforms/amazon_linux-2.dockerfile
@@ -5,7 +5,7 @@ RUN yum update -y && \
     yum install -y which git sudo procps-ng util-linux autoconf automake \
     libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
     libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
-    graphviz patch gcc gcc-c++ vim-common
+    graphviz patch gcc gcc-c++ vim-common jq
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile
index 548d62870f1..613da74ad7d 100644
--- a/.cicd/platforms/centos-7.6-unpinned.dockerfile
+++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile
@@ -2,12 +2,13 @@ FROM centos:7.6.1810
 ENV VERSION 1
 # install dependencies.
 RUN yum update -y && \
+    yum install -y epel-release && \
     yum --enablerepo=extras install -y centos-release-scl && \
     yum --enablerepo=extras install -y devtoolset-8 && \
     yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
     graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
     python python-devel rh-python36 gettext-devel file libusbx-devel \
-    libcurl-devel patch vim-common
+    libcurl-devel patch vim-common jq
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     source /opt/rh/devtoolset-8/enable && \
diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/centos-7.6.dockerfile
index bad3bcc97c5..6e42a57f688 100644
--- a/.cicd/platforms/centos-7.6.dockerfile
+++ b/.cicd/platforms/centos-7.6.dockerfile
@@ -2,12 +2,13 @@ FROM centos:7.6.1810
 ENV VERSION 1
 # install dependencies.
 RUN yum update -y && \
+    yum install -y epel-release && \
     yum --enablerepo=extras install -y centos-release-scl && \
     yum --enablerepo=extras install -y devtoolset-8 && \
     yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
     graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
     python python-devel rh-python36 gettext-devel file libusbx-devel \
-    libcurl-devel patch vim-common
+    libcurl-devel patch vim-common jq
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     source /opt/rh/devtoolset-8/enable && \
diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile
index aced0745dcf..8dc07bc2228 100644
--- a/.cicd/platforms/ubuntu-16.04.dockerfile
+++ b/.cicd/platforms/ubuntu-16.04.dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git automake \
     libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev \
     python2.7 python2.7-dev python3 python3-dev autoconf libtool curl zlib1g-dev \
-    sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config apt-transport-https vim-common
+    sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config apt-transport-https vim-common jq
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index 0494ceee3cf..cb7473ca98a 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \
     bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
     autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
-    libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache vim-common
+    libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache vim-common jq
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \
diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile
index 90785906843..20072008e6d 100644
--- a/.cicd/platforms/ubuntu-18.04.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04.dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \
     bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
     autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
-    libcurl4-gnutls-dev pkg-config patch ccache vim-common
+    libcurl4-gnutls-dev pkg-config patch ccache vim-common jq
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \

From 630459d453637a5988cdcf79244d5957d7f36f23 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 13:57:28 -0400
Subject: [PATCH 1148/1648] Parse JSON build info instead of hexadecimal
 shared_memory.bin

---
 tests/release-build.sh | 43 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 945fc583956..899b30eb775 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -10,13 +10,6 @@ echo 'performance-critical applications like nodeos. Anyone intending to build a
 echo 'install nodeos from source should perform a "release build," which excludes'
 echo 'debugging symbols to generate faster and lighter binaries.'
 echo ''
-# check for xxd
-if ! $(xxd --version 2>/dev/null); then
-    echo 'ERROR: Test requires xxd, but xxd was not found in your PATH!'
-    echo ''
-    echo 'The xxd hex dump tool can be installed as part of the vim-common package on most operating systems.'
-    exit 1
-fi
 # find nodeos
 [[ -z "$EOSIO_ROOT" && $(git --version) ]] && export EOSIO_ROOT="$(git rev-parse --show-toplevel)"
 [[ -z "$EOSIO_ROOT" ]] && export EOSIO_ROOT="$(echo $(pwd)/ | grep -ioe '.*/eos/' -e '.*/eosio/' -e '.*/build/' | sed 's,/build/,/,')"
@@ -29,36 +22,28 @@ if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/no
     echo "$ ls -la \"$EOSIO_ROOT/build/programs/nodeos\""
     ls -la "$EOSIO_ROOT/build/programs/nodeos"
     echo 'Release build test not run.'
-    exit 2
+    exit 1
 fi
 [[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
 # run nodeos to generate state files
-./nodeos --config-dir "$(pwd)/config" --data-dir "$(pwd)/data" 1>/dev/null 2>/dev/null &
-sleep 10
-kill $! # kill nodeos gracefully, by PID
-if [[ ! -f data/state/shared_memory.bin ]]; then
-    echo 'ERROR: nodeos state not found!'
+./nodeos --extract-build-info build-info.json 1>/dev/null 2>/dev/null
+if [[ ! -f build-info.json ]]; then
+    echo 'ERROR: Build info JSON file not found!'
     echo ''
-    echo 'Looked for shared_memory.bin in the following places:'
-    echo "$ ls -la \"$(pwd)/data/state\""
-    ls -la "$(pwd)/data/state"
+    echo 'Looked in the following places:'
+    echo "$ ls -la \"$(pwd)\""
+    ls -la "$(pwd)"
     echo 'Release build test not run.'
-    rm -rf config data
-    exit 3
+    exit 2
 fi
 # test state files for debug flag
-export DEBUG_BYTE="$(xxd -seek 9 -l 1 data/state/shared_memory.bin | awk '{print $2}')"
-if [[ "$DEBUG_BYTE" == '00' ]]; then
-    echo 'PASS: Debug byte not set.'
+if [[ "$(cat build-info.json | jq .debug)" == 'false' ]]; then
+    echo 'PASS: Debug flag is not set.'
     echo ''
-    rm -rf config data
     exit 0
 fi
-echo 'FAIL: Debug byte is set!'
-echo "Debug Byte = 0x$DEBUG_BYTE"
+echo 'FAIL: Debug flag is set!'
 echo ''
-echo 'First kilobyte of shared_memory.bin:'
-echo '$ xxd -l 1024 shared_memory.bin'
-xxd -l 1024 data/state/shared_memory.bin
-rm -rf config data
-exit 4
\ No newline at end of file
+echo '$ cat build-info.json | jq .'
+cat build-info.json | jq .
+exit 3
\ No newline at end of file

From e1ea4c1b1df5b3a50205489682ee1289592f09ff Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 14:15:09 -0400
Subject: [PATCH 1149/1648] Move release-build-test from non-parallelizable
 test group to parallelizable test group

---
 tests/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 23785b3ea36..68ea2e96b24 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -89,7 +89,6 @@ set_property(TEST launcher_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME db_modes_test COMMAND tests/db_modes_test.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_tests_properties(db_modes_test PROPERTIES COST 6000)
 add_test(NAME release-build-test COMMAND tests/release-build.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST release-build-test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME version-label-test COMMAND tests/version-label.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # Long running tests

From f8b7a6795c63d1461040ee6fe8eb2bf3dc551d2d Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Tue, 10 Sep 2019 14:51:46 -0400
Subject: [PATCH 1150/1648] Remove ccache from CMakeLists.txt to hopefully fix
 cicd build.

---
 CMakeLists.txt | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6427d9e3737..6511e342f4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,18 +34,6 @@ else()
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 endif()
 
-find_program(CCACHE_PROGRAM ccache)
-find_program(SCCACHE_PROGRAM ccache)
-if (SCCACHE_PROGRAM)
-   message(STATUS "EOSIO found sccache")
-   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${SCCACHE_PROGRAM}")
-   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${SCCACHE_PROGRAM}")
-elseif (CCACHE_PROGRAM)
-   message(STATUS "EOSIO found ccache")
-   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}")
-endif()
-
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )
 set( KEY_STORE_EXECUTABLE_NAME keosd )

From 3ce6373ca5dd2a37e4ab7c41820309e257dcdd3d Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 15:14:02 -0400
Subject: [PATCH 1151/1648] Install jq on Anka base-image, too

---
 .cicd/platforms/macos-10.14.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index c2c0862bf64..fe124319d19 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 VERSION=1
 brew update
-brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl || true
+brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl jq || :
 if [[ ! $PINNED == false || $UNPINNED == true ]]; then
     # install clang from source
     git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8

From 789e413cde234e641c42aae15e3910fc6d97da63 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 15:15:54 -0400
Subject: [PATCH 1152/1648] Print useful error message if jq is not found

---
 tests/release-build.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 899b30eb775..19eec3b54ab 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -10,6 +10,12 @@ echo 'performance-critical applications like nodeos. Anyone intending to build a
 echo 'install nodeos from source should perform a "release build," which excludes'
 echo 'debugging symbols to generate faster and lighter binaries.'
 echo ''
+# check for jq
+if ! $(jq --version 1>/dev/null); then
+    echo 'ERROR: Test requires jq, but jq was not found in your PATH!'
+    echo ''
+    exit 1
+fi
 # find nodeos
 [[ -z "$EOSIO_ROOT" && $(git --version) ]] && export EOSIO_ROOT="$(git rev-parse --show-toplevel)"
 [[ -z "$EOSIO_ROOT" ]] && export EOSIO_ROOT="$(echo $(pwd)/ | grep -ioe '.*/eos/' -e '.*/eosio/' -e '.*/build/' | sed 's,/build/,/,')"

From bbf90d9bb298742eab6c025d3942d9155b92b0c7 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 16:43:28 -0400
Subject: [PATCH 1153/1648] Simplify comments

---
 .cicd/generate-pipeline.sh | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d33a0e681d6..b7025ec43bc 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
 set -eo pipefail
+# environment
 . ./.cicd/helpers/general.sh
 export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
 export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
-# Use files in platforms dir as source of truth for what platforms we need to generate steps for
 export PLATFORMS_JSON_ARRAY='[]'
+# read .cicd/platforms
 for FILE in $(ls $CICD_DIR/platforms); do
-    # Ability to skip mac or linux by not even creating the json block
+    # skip mac or linux by not even creating the json block
     ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
     ( [[ $SKIP_LINUX == true ]] &&    [[ ! $FILE =~ 'macos' ]] ) && continue
-    # Prevent using both platform files (only use unpinned or pinned)
+    # use pinned or unpinned, not both sets of platform files
     if [[ $PINNED == false || $UNPINNED == true ]] && [[ ! $FILE =~ 'macos' ]]; then
         export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true}
         export SKIP_PACKAGE_BUILDER=${SKIP_PACKAGE_BUILDER:-true}
@@ -48,9 +49,8 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 oIFS="$IFS"
 IFS=$'' 
-nIFS=$IFS # Needed to fix array splitting (\n won't work)
-###################
-# Anka Ensure Tag #
+nIFS=$IFS # fix array splitting (\n won't work)
+# base-image steps
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     if [[ $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
     cat <<EOF
@@ -76,8 +76,7 @@ EOF
     fi
 done
 echo "  - wait"; echo ""
-###############
-# BUILD STEPS #
+# build steps
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
         cat <<EOF
@@ -121,8 +120,7 @@ EOF
     fi
 done
 echo "  - wait"; echo ""
-##############
-# UNIT TESTS #
+# parallel tests
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
         cat <<EOF
@@ -163,8 +161,7 @@ EOF
 EOF
     fi
 done
-################
-# SERIAL TESTS #
+# serial tests
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     IFS=$oIFS
     SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
@@ -209,8 +206,7 @@ EOF
     done
     IFS=$nIFS
 done
-#############
-# LRT TESTS #
+# long-running tests
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     IFS=$oIFS
     LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
@@ -256,6 +252,7 @@ EOF
     done
     IFS=$nIFS
 done
+# pipeline tail
 cat <<EOF
 
   - wait:

From 73c58a8f1c2148eb2a1b3948f354c8e3428b0c5a Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 16:55:00 -0400
Subject: [PATCH 1154/1648] Add $RUNS for loop

---
 .cicd/generate-pipeline.sh | 238 +++++++++++++++++++------------------
 1 file changed, 121 insertions(+), 117 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index b7025ec43bc..c1d95721168 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -5,6 +5,7 @@ set -eo pipefail
 export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
 export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
 export PLATFORMS_JSON_ARRAY='[]'
+[[ -z "$RUNS" ]] && export RUNS='1'
 # read .cicd/platforms
 for FILE in $(ls $CICD_DIR/platforms); do
     # skip mac or linux by not even creating the json block
@@ -120,137 +121,140 @@ EOF
     fi
 done
 echo "  - wait"; echo ""
-# parallel tests
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/parallel-test.sh"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
-
-EOF
-    else
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
-
-EOF
-    fi
-done
-# serial tests
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    IFS=$oIFS
-    SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
-    for TEST_NAME in $SERIAL_TESTS; do
+# tests
+for RUN in $(seq 1 $RUNS); do
+    # parallel tests
+    echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
         if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
             cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-20}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+        command:
+        - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+        - "./.cicd/test.sh scripts/parallel-test.sh"
+        env:
+        IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+        BUILDKITE_AGENT_ACCESS_TOKEN:
+        agents:
+        queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-10}
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
 
 EOF
         else
             cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+        command:
+        - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+        - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+        - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
+        plugins:
+        - chef/anka#v0.5.1:
+            no-volume: true
+            inherit-environment-vars: true
+            vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+            vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+            always-pull: true
+            debug: true
+            wait-network: true
+        timeout: ${TIMEOUT:-20}
+        agents:
+        - "queue=mac-anka-node-fleet"
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+
 EOF
         fi
     done
-    IFS=$nIFS
-done
-# long-running tests
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    IFS=$oIFS
-    LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
-    for TEST_NAME in $LR_TESTS; do
-        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    # serial tests
+    echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+        IFS=$oIFS
+        SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
+        for TEST_NAME in $SERIAL_TESTS; do
+            if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+                cat <<EOF
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+        command:
+        - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+        - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+        env:
+        IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+        BUILDKITE_AGENT_ACCESS_TOKEN:
+        agents:
+        queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-20}
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
 
 EOF
-        else
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+            else
+                cat <<EOF
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+        command:
+        - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+        - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+        - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+        plugins:
+        - chef/anka#v0.5.1:
+            no-volume: true
+            inherit-environment-vars: true
+            vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+            vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+            always-pull: true
+            debug: true
+            wait-network: true
+        timeout: ${TIMEOUT:-20}
+        agents:
+        - "queue=mac-anka-node-fleet"
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+EOF
+            fi
+        done
+        IFS=$nIFS
+    done
+    # long-running tests
+    echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+        IFS=$oIFS
+        LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
+        for TEST_NAME in $LR_TESTS; do
+            if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+                cat <<EOF
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+        command:
+        - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+        - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+        env:
+        IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+        BUILDKITE_AGENT_ACCESS_TOKEN:
+        agents:
+        queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-180}
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
-        fi
+            else
+                cat <<EOF
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+        command:
+        - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+        - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+        - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+        plugins:
+        - chef/anka#v0.5.1:
+            no-volume: true
+            inherit-environment-vars: true
+            vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+            vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+            always-pull: true
+            debug: true
+            wait-network: true
+        timeout: ${TIMEOUT:-180}
+        agents:
+        - "queue=mac-anka-node-fleet"
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+
+EOF
+            fi
+        done
+        IFS=$nIFS
     done
-    IFS=$nIFS
 done
 # pipeline tail
 cat <<EOF

From bd920ed0ba683eb93b2c990c9cf151cc7da5da12 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 16:57:50 -0400
Subject: [PATCH 1155/1648] Add wait step between test batches

---
 .cicd/generate-pipeline.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c1d95721168..a373dcc3d10 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -255,6 +255,10 @@ EOF
         done
         IFS=$nIFS
     done
+    if [[ "$RUN" != "$RUNS" ]]; then
+        echo '  - wait'
+        echo ''
+    fi
 done
 # pipeline tail
 cat <<EOF

From a4ada851fdea784490528c72b59c5259879dfbae Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 17:04:19 -0400
Subject: [PATCH 1156/1648] Clearer strings

---
 .cicd/generate-pipeline.sh | 44 ++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index a373dcc3d10..cbad3ffcfea 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -19,14 +19,14 @@ for FILE in $(ls $CICD_DIR/platforms); do
     else
         [[ $FILE =~ 'unpinned' ]] && continue
     fi
-    export FILE_NAME=$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')
-    export PLATFORM_NAME=$(echo $FILE_NAME | cut -d- -f1 | sed 's/os/OS/g')
-    export PLATFORM_NAME_UPCASE=$(echo $PLATFORM_NAME | tr a-z A-Z)
-    export VERSION_MAJOR=$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f1)
-    [[ $(echo $FILE_NAME | cut -d- -f2) =~ '.' ]] && export VERSION_MINOR="_$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f2)" || export VERSION_MINOR=''
-    export VERSION_FULL=$(echo $FILE_NAME | cut -d- -f2)
+    export FILE_NAME="$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')"
+    export PLATFORM_NAME="$(echo $FILE_NAME | cut -d- -f1 | sed 's/os/OS/g')"
+    export PLATFORM_NAME_UPCASE="$(echo $PLATFORM_NAME | tr a-z A-Z)"
+    export VERSION_MAJOR="$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f1)"
+    [[ "$(echo $FILE_NAME | cut -d- -f2)" =~ '.' ]] && export VERSION_MINOR="_$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f2)" || export VERSION_MINOR=''
+    export VERSION_FULL="$(echo $FILE_NAME | cut -d- -f2)"
     OLDIFS=$IFS
-    IFS="_"
+    IFS='_'
     set $PLATFORM_NAME
     IFS=$OLDIFS
     export PLATFORM_NAME_FULL="$(capitalize $1)$( [[ ! -z $2 ]] && echo "_$(capitalize $2)" || true ) $VERSION_FULL"
@@ -52,8 +52,8 @@ oIFS="$IFS"
 IFS=$'' 
 nIFS=$IFS # fix array splitting (\n won't work)
 # base-image steps
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
+    if [[ "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
     cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
     command:
@@ -76,10 +76,11 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
 EOF
     fi
 done
-echo "  - wait"; echo ""
+echo '  - wait'
+echo ''
 # build steps
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
+    if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
         cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
     command:
@@ -120,12 +121,13 @@ EOF
 EOF
     fi
 done
-echo "  - wait"; echo ""
+echo '  - wait'
+echo ''
 # tests
 for RUN in $(seq 1 $RUNS); do
     # parallel tests
-    echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+    echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
+        if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
             cat <<EOF
     - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
         command:
@@ -165,11 +167,11 @@ EOF
         fi
     done
     # serial tests
-    echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
         IFS=$oIFS
-        SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
+        SERIAL_TESTS="$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')"
         for TEST_NAME in $SERIAL_TESTS; do
-            if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+            if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
                 cat <<EOF
     - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
         command:
@@ -210,11 +212,11 @@ EOF
         IFS=$nIFS
     done
     # long-running tests
-    echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
         IFS=$oIFS
-        LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
+        LR_TESTS="$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')"
         for TEST_NAME in $LR_TESTS; do
-            if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+            if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
                 cat <<EOF
     - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
         command:

From d1e7235e662b721d54a4c593fedfa22ec66b7e08 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Tue, 10 Sep 2019 17:05:42 -0400
Subject: [PATCH 1157/1648] Remove extra space

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index cbad3ffcfea..d1dd810ea71 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -10,7 +10,7 @@ export PLATFORMS_JSON_ARRAY='[]'
 for FILE in $(ls $CICD_DIR/platforms); do
     # skip mac or linux by not even creating the json block
     ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
-    ( [[ $SKIP_LINUX == true ]] &&    [[ ! $FILE =~ 'macos' ]] ) && continue
+    ( [[ $SKIP_LINUX == true ]] && [[ ! $FILE =~ 'macos' ]] ) && continue
     # use pinned or unpinned, not both sets of platform files
     if [[ $PINNED == false || $UNPINNED == true ]] && [[ ! $FILE =~ 'macos' ]]; then
         export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true}

From bf1cfd8b0d6cfe7ec1c273fc462b433fd55efce0 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 11 Sep 2019 14:18:34 -0400
Subject: [PATCH 1158/1648] promote read-only disablement log from net_plugin
 to warn level

---
 plugins/net_plugin/net_plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6299cd7eeac..c8cc8d4a38b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3311,6 +3311,13 @@ namespace eosio {
 
       my->dispatcher.reset( new dispatch_manager( my_impl->thread_pool->get_executor() ) );
 
+      chain::controller&cc = my->chain_plug->chain();
+      my->db_read_mode = cc.get_read_mode();
+      if( my->db_read_mode == chain::db_read_mode::READ_ONLY && my->p2p_address.size() ) {
+         my->p2p_address.clear();
+         fc_wlog( logger, "node in read-only mode disabling incoming p2p connections" );
+      }
+
       tcp::endpoint listen_endpoint;
       if( my->p2p_address.size() > 0 ) {
          auto host = my->p2p_address.substr( 0, my->p2p_address.find( ':' ));
@@ -3361,7 +3368,6 @@ namespace eosio {
          fc_ilog( logger, "starting listener, max clients is ${mc}",("mc",my->max_client_count) );
          my->start_listen_loop();
       }
-      chain::controller&cc = my->chain_plug->chain();
       {
          cc.accepted_block.connect( [my = my]( const block_state_ptr& s ) {
             my->on_accepted_block( s );
@@ -3374,12 +3380,6 @@ namespace eosio {
       my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
             boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
 
-      my->db_read_mode = cc.get_read_mode();
-      if( my->db_read_mode == chain::db_read_mode::READ_ONLY ) {
-         my->max_nodes_per_host = 0;
-         fc_ilog( logger, "node in read-only mode setting max_nodes_per_host to 0 to prevent connections" );
-      }
-
       my->start_monitors();
 
       my->update_chain_info();

From a979e1baeb441a080696d42c498ecc41b054e248 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 11 Sep 2019 14:33:13 -0400
Subject: [PATCH 1159/1648] print unix socket path when there is an error
 starting unix socket server

---
 plugins/http_plugin/http_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index 492c7425241..fcbb847bfdc 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -580,13 +580,13 @@ namespace eosio {
             });
             my->unix_server.start_accept();
          } catch ( const fc::exception& e ){
-            fc_elog( logger, "unix socket service failed to start: ${e}", ("e", e.to_detail_string()) );
+            fc_elog( logger, "unix socket service (${path}) failed to start: ${e}", ("e", e.to_detail_string())("path",my->unix_endpoint->path()) );
             throw;
          } catch ( const std::exception& e ){
-            fc_elog( logger, "unix socket service failed to start: ${e}", ("e", e.what()) );
+            fc_elog( logger, "unix socket service (${path}) failed to start: ${e}", ("e", e.what())("path",my->unix_endpoint->path()) );
             throw;
          } catch (...) {
-            fc_elog( logger, "error thrown from unix socket io service" );
+            fc_elog( logger, "error thrown from unix socket (${path}) io service", ("path",my->unix_endpoint->path()) );
             throw;
          }
       }

From 2746e121ea2cf15f0ffdd68bc272c9822d105d2d Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 14:42:57 -0400
Subject: [PATCH 1160/1648] Fix YAML whitespace

---
 .cicd/generate-pipeline.sh | 177 ++++++++++++++++++-------------------
 1 file changed, 86 insertions(+), 91 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d1dd810ea71..1b46fceec27 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -59,8 +59,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
       - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-    agents:
-      - "queue=mac-anka-templater-fleet"
+    agents: "queue=mac-anka-templater-fleet"
     env:
       REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
       REPO_COMMIT: $BUILDKITE_COMMIT
@@ -114,8 +113,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-large-node-fleet"
+    agents: "queue=mac-anka-large-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
 
 EOF
@@ -129,39 +127,38 @@ for RUN in $(seq 1 $RUNS); do
     echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
         if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
             cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-        command:
-        - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-        - "./.cicd/test.sh scripts/parallel-test.sh"
-        env:
-        IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-        BUILDKITE_AGENT_ACCESS_TOKEN:
-        agents:
-        queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-10}
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/parallel-test.sh"
+    env:
+    IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+    BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
 
 EOF
         else
             cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-        command:
-        - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-        - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-        - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
-        plugins:
-        - chef/anka#v0.5.1:
-            no-volume: true
-            inherit-environment-vars: true
-            vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-            vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-            always-pull: true
-            debug: true
-            wait-network: true
-        timeout: ${TIMEOUT:-20}
-        agents:
-        - "queue=mac-anka-node-fleet"
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-20}
+    agents: "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
 
 EOF
         fi
@@ -173,39 +170,38 @@ EOF
         for TEST_NAME in $SERIAL_TESTS; do
             if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
                 cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-        command:
-        - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-        - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-        env:
-        IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-        BUILDKITE_AGENT_ACCESS_TOKEN:
-        agents:
-        queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-20}
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+    env:
+    IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+    BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-20}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
 
 EOF
             else
                 cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-        command:
-        - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-        - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-        - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-        plugins:
-        - chef/anka#v0.5.1:
-            no-volume: true
-            inherit-environment-vars: true
-            vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-            vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-            always-pull: true
-            debug: true
-            wait-network: true
-        timeout: ${TIMEOUT:-20}
-        agents:
-        - "queue=mac-anka-node-fleet"
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-20}
+    agents: "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
 EOF
             fi
         done
@@ -218,39 +214,38 @@ EOF
         for TEST_NAME in $LR_TESTS; do
             if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
                 cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-        command:
-        - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-        - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-        env:
-        IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-        BUILDKITE_AGENT_ACCESS_TOKEN:
-        agents:
-        queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-180}
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+    env:
+    IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+    BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-180}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
             else
                 cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-        command:
-        - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-        - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-        - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-        plugins:
-        - chef/anka#v0.5.1:
-            no-volume: true
-            inherit-environment-vars: true
-            vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-            vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-            always-pull: true
-            debug: true
-            wait-network: true
-        timeout: ${TIMEOUT:-180}
-        agents:
-        - "queue=mac-anka-node-fleet"
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-180}
+    agents: "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
             fi

From 8d29f0653f803ceb7615f0f016d9138dbeae68ff Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 14:57:21 -0400
Subject: [PATCH 1161/1648] Fix YAML spacing, round 2

---
 .cicd/generate-pipeline.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 1b46fceec27..5957fb5cf92 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -132,8 +132,8 @@ for RUN in $(seq 1 $RUNS); do
       - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/parallel-test.sh"
     env:
-    IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-    BUILDKITE_AGENT_ACCESS_TOKEN:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-10}
@@ -175,8 +175,8 @@ EOF
       - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
     env:
-    IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-    BUILDKITE_AGENT_ACCESS_TOKEN:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-20}
@@ -219,8 +219,8 @@ EOF
       - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
-    IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-    BUILDKITE_AGENT_ACCESS_TOKEN:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}

From 413b047e256c43e98bf77fa575ce37e591b5c573 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 15:17:37 -0400
Subject: [PATCH 1162/1648] Switch YAML to four-space to match BASH source file
 for consistent editor configuration

---
 .cicd/generate-pipeline.sh | 446 ++++++++++++++++++-------------------
 1 file changed, 223 insertions(+), 223 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 5957fb5cf92..e9e56b0b49b 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -55,22 +55,22 @@ nIFS=$IFS # fix array splitting (\n won't work)
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
     cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
-    command:
-      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-    agents: "queue=mac-anka-templater-fleet"
-    env:
-      REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-      REPO_COMMIT: $BUILDKITE_COMMIT
-      TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
-      TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
-      PINNED: $PINNED
-      UNPINNED: $UNPINNED
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
-      PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
-    timeout: ${TIMEOUT:-320}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
+        command:
+            - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
+            - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
+        agents: "queue=mac-anka-templater-fleet"
+        env:
+            REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+            REPO_COMMIT: $BUILDKITE_COMMIT
+            TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
+            TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
+            PINNED: $PINNED
+            UNPINNED: $UNPINNED
+            TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
+            PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
+        timeout: ${TIMEOUT:-320}
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
 
 EOF
     fi
@@ -81,40 +81,40 @@ echo ''
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
         cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
-    command:
-      - "./.cicd/build.sh"
-      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
+        command:
+            - "./.cicd/build.sh"
+            - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
+        env:
+            IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+            BUILDKITE_AGENT_ACCESS_TOKEN:
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-180}
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
 
 EOF
     else
         cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && ./.cicd/build.sh"
-      - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          modify-cpu: 12
-          modify-ram: 24
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-180}
-    agents: "queue=mac-anka-large-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
+        command:
+            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+            - "cd eos && ./.cicd/build.sh"
+            - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
+        plugins:
+            - chef/anka#v0.5.1:
+                no-volume: true
+                inherit-environment-vars: true
+                vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+                vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+                modify-cpu: 12
+                modify-ram: 24
+                always-pull: true
+                debug: true
+                wait-network: true
+        timeout: ${TIMEOUT:-180}
+        agents: "queue=mac-anka-large-node-fleet"
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
 
 EOF
     fi
@@ -127,38 +127,38 @@ for RUN in $(seq 1 $RUNS); do
     echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
         if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
             cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/parallel-test.sh"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+        command:
+            - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+            - "./.cicd/test.sh scripts/parallel-test.sh"
+        env:
+            IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+            BUILDKITE_AGENT_ACCESS_TOKEN:
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-10}
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
 
 EOF
         else
             cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-20}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+        command:
+            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+            - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+            - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
+        plugins:
+            - chef/anka#v0.5.1:
+                no-volume: true
+                inherit-environment-vars: true
+                vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+                vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+                always-pull: true
+                debug: true
+                wait-network: true
+        timeout: ${TIMEOUT:-20}
+        agents: "queue=mac-anka-node-fleet"
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
 
 EOF
         fi
@@ -170,38 +170,38 @@ EOF
         for TEST_NAME in $SERIAL_TESTS; do
             if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
                 cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-20}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+        command:
+            - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+            - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+        env:
+            IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+            BUILDKITE_AGENT_ACCESS_TOKEN:
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-20}
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
 
 EOF
             else
                 cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-20}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+        command:
+            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+            - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+            - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+        plugins:
+            - chef/anka#v0.5.1:
+                no-volume: true
+                inherit-environment-vars: true
+                vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+                vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+                always-pull: true
+                debug: true
+                wait-network: true
+        timeout: ${TIMEOUT:-20}
+        agents: "queue=mac-anka-node-fleet"
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
 EOF
             fi
         done
@@ -214,38 +214,38 @@ EOF
         for TEST_NAME in $LR_TESTS; do
             if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
                 cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+        command:
+            - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+            - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+        env:
+            IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+            BUILDKITE_AGENT_ACCESS_TOKEN:
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-180}
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
             else
                 cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-180}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+        command:
+            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+            - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+            - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+        plugins:
+            - chef/anka#v0.5.1:
+                no-volume: true
+                inherit-environment-vars: true
+                vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+                vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+                always-pull: true
+                debug: true
+                wait-network: true
+        timeout: ${TIMEOUT:-180}
+        agents: "queue=mac-anka-node-fleet"
+        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
             fi
@@ -260,109 +260,109 @@ done
 # pipeline tail
 cat <<EOF
 
-  - wait:
-    continue_on_failure: true
+    - wait:
+        continue_on_failure: true
 
-  - label: ":bar_chart: Test Metrics"
-    command: |
-      echo '+++ :compression: Extracting Test Metrics Code'
-      tar -zxf .cicd/metrics/test-metrics.tar.gz
-      echo '+++ :javascript: Running test-metrics.js'
-      node --max-old-space-size=32768 test-metrics.js
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    soft_fail: true
+    - label: ":bar_chart: Test Metrics"
+        command: |
+            echo '+++ :compression: Extracting Test Metrics Code'
+            tar -zxf .cicd/metrics/test-metrics.tar.gz
+            echo '+++ :javascript: Running test-metrics.js'
+            node --max-old-space-size=32768 test-metrics.js
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-10}
+        soft_fail: true
 
-  - wait
+    - wait
 
-  - label: ":centos: CentOS 7.6 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "centos-7.6"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "el7" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "rpm"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+    - label: ":centos: CentOS 7.6 - Package Builder"
+        command:
+            - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+            - "./.cicd/package.sh"
+        env:
+            IMAGE_TAG: "centos-7.6"
+            BUILDKITE_AGENT_ACCESS_TOKEN:
+            OS: "el7" # OS and PKGTYPE required for lambdas
+            PKGTYPE: "rpm"
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-10}
+        skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
-  - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "ubuntu-16.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "deb"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+    - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
+        command:
+            - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+            - "./.cicd/package.sh"
+        env:
+            IMAGE_TAG: "ubuntu-16.04"
+            BUILDKITE_AGENT_ACCESS_TOKEN:
+            OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
+            PKGTYPE: "deb"
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-10}
+        skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
-  - label: ":ubuntu: Ubuntu 18.04 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "ubuntu-18.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "deb"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+    - label: ":ubuntu: Ubuntu 18.04 - Package Builder"
+        command:
+            - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+            - "./.cicd/package.sh"
+        env:
+            IMAGE_TAG: "ubuntu-18.04"
+            BUILDKITE_AGENT_ACCESS_TOKEN:
+            OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
+            PKGTYPE: "deb"
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-10}
+        skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
-  - label: ":darwin: macOS 10.14 - Package Builder"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/package.sh"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: 10.14.4_6C_14G_40G
-          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
-          always-pull: true
-          debug: true
-          wait-network: true
-    agents:
-      - "queue=mac-anka-node-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
+    - label: ":darwin: macOS 10.14 - Package Builder"
+        command:
+            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
+            - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
+            - "cd eos && ./.cicd/package.sh"
+        plugins:
+            - chef/anka#v0.5.1:
+                no-volume: true
+                inherit-environment-vars: true
+                vm-name: 10.14.4_6C_14G_40G
+                vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+                always-pull: true
+                debug: true
+                wait-network: true
+        agents:
+            - "queue=mac-anka-node-fleet"
+        timeout: ${TIMEOUT:-10}
+        skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
 
-  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
-    command: "./.cicd/installation-build.sh"
-    env:
-      IMAGE_TAG: "ubuntu-18.04-unpinned"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-30}
-    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
+    - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
+        command: "./.cicd/installation-build.sh"
+        env:
+            IMAGE_TAG: "ubuntu-18.04-unpinned"
+            BUILDKITE_AGENT_ACCESS_TOKEN:
+        agents:
+            queue: "automation-eos-builder-fleet"
+        timeout: ${TIMEOUT:-30}
+        skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
 
-  - wait
+    - wait
 
-  - label: ":git: Git Submodule Regression Check"
-    command: "./.cicd/submodule-regression-check.sh"
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-5}
+    - label: ":git: Git Submodule Regression Check"
+        command: "./.cicd/submodule-regression-check.sh"
+        agents:
+            queue: "automation-basic-builder-fleet"
+        timeout: ${TIMEOUT:-5}
 
-  - label: ":beer: Brew Updater"
-    command: |
-      buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
-      buildkite-agent artifact upload eosio.rb
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: "${TIMEOUT:-5}"
-    skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
+    - label: ":beer: Brew Updater"
+        command: |
+            buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
+            buildkite-agent artifact upload eosio.rb
+        agents:
+            queue: "automation-basic-builder-fleet"
+        timeout: "${TIMEOUT:-5}"
+        skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
 
 EOF
 IFS=$oIFS
\ No newline at end of file

From 4448571cf17ef77e687567e61413fe7e155e60d7 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 15:19:12 -0400
Subject: [PATCH 1163/1648] Revert "Switch YAML to four-space to match BASH
 source file for consistent editor configuration"

This reverts commit 413b047e256c43e98bf77fa575ce37e591b5c573.
---
 .cicd/generate-pipeline.sh | 446 ++++++++++++++++++-------------------
 1 file changed, 223 insertions(+), 223 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index e9e56b0b49b..5957fb5cf92 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -55,22 +55,22 @@ nIFS=$IFS # fix array splitting (\n won't work)
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
     cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
-        command:
-            - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-            - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-        agents: "queue=mac-anka-templater-fleet"
-        env:
-            REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-            REPO_COMMIT: $BUILDKITE_COMMIT
-            TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
-            TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
-            PINNED: $PINNED
-            UNPINNED: $UNPINNED
-            TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
-            PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
-        timeout: ${TIMEOUT:-320}
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
+    command:
+      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
+      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
+    agents: "queue=mac-anka-templater-fleet"
+    env:
+      REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+      REPO_COMMIT: $BUILDKITE_COMMIT
+      TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
+      TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
+      PINNED: $PINNED
+      UNPINNED: $UNPINNED
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
+      PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
+    timeout: ${TIMEOUT:-320}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
 
 EOF
     fi
@@ -81,40 +81,40 @@ echo ''
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
         cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
-        command:
-            - "./.cicd/build.sh"
-            - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-        env:
-            IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-            BUILDKITE_AGENT_ACCESS_TOKEN:
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-180}
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
+    command:
+      - "./.cicd/build.sh"
+      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-180}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
 
 EOF
     else
         cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
-        command:
-            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-            - "cd eos && ./.cicd/build.sh"
-            - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-        plugins:
-            - chef/anka#v0.5.1:
-                no-volume: true
-                inherit-environment-vars: true
-                vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-                vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-                modify-cpu: 12
-                modify-ram: 24
-                always-pull: true
-                debug: true
-                wait-network: true
-        timeout: ${TIMEOUT:-180}
-        agents: "queue=mac-anka-large-node-fleet"
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && ./.cicd/build.sh"
+      - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          modify-cpu: 12
+          modify-ram: 24
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-180}
+    agents: "queue=mac-anka-large-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
 
 EOF
     fi
@@ -127,38 +127,38 @@ for RUN in $(seq 1 $RUNS); do
     echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
         if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
             cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-        command:
-            - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-            - "./.cicd/test.sh scripts/parallel-test.sh"
-        env:
-            IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-            BUILDKITE_AGENT_ACCESS_TOKEN:
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-10}
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/parallel-test.sh"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
 
 EOF
         else
             cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-        command:
-            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-            - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-            - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
-        plugins:
-            - chef/anka#v0.5.1:
-                no-volume: true
-                inherit-environment-vars: true
-                vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-                vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-                always-pull: true
-                debug: true
-                wait-network: true
-        timeout: ${TIMEOUT:-20}
-        agents: "queue=mac-anka-node-fleet"
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-20}
+    agents: "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
 
 EOF
         fi
@@ -170,38 +170,38 @@ EOF
         for TEST_NAME in $SERIAL_TESTS; do
             if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
                 cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-        command:
-            - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-            - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-        env:
-            IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-            BUILDKITE_AGENT_ACCESS_TOKEN:
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-20}
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-20}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
 
 EOF
             else
                 cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-        command:
-            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-            - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-            - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-        plugins:
-            - chef/anka#v0.5.1:
-                no-volume: true
-                inherit-environment-vars: true
-                vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-                vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-                always-pull: true
-                debug: true
-                wait-network: true
-        timeout: ${TIMEOUT:-20}
-        agents: "queue=mac-anka-node-fleet"
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-20}
+    agents: "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
 EOF
             fi
         done
@@ -214,38 +214,38 @@ EOF
         for TEST_NAME in $LR_TESTS; do
             if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
                 cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-        command:
-            - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-            - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-        env:
-            IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-            BUILDKITE_AGENT_ACCESS_TOKEN:
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-180}
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-180}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
             else
                 cat <<EOF
-    - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-        command:
-            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-            - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-            - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-        plugins:
-            - chef/anka#v0.5.1:
-                no-volume: true
-                inherit-environment-vars: true
-                vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-                vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-                always-pull: true
-                debug: true
-                wait-network: true
-        timeout: ${TIMEOUT:-180}
-        agents: "queue=mac-anka-node-fleet"
-        skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-180}
+    agents: "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
             fi
@@ -260,109 +260,109 @@ done
 # pipeline tail
 cat <<EOF
 
-    - wait:
-        continue_on_failure: true
+  - wait:
+    continue_on_failure: true
 
-    - label: ":bar_chart: Test Metrics"
-        command: |
-            echo '+++ :compression: Extracting Test Metrics Code'
-            tar -zxf .cicd/metrics/test-metrics.tar.gz
-            echo '+++ :javascript: Running test-metrics.js'
-            node --max-old-space-size=32768 test-metrics.js
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-10}
-        soft_fail: true
+  - label: ":bar_chart: Test Metrics"
+    command: |
+      echo '+++ :compression: Extracting Test Metrics Code'
+      tar -zxf .cicd/metrics/test-metrics.tar.gz
+      echo '+++ :javascript: Running test-metrics.js'
+      node --max-old-space-size=32768 test-metrics.js
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    soft_fail: true
 
-    - wait
+  - wait
 
-    - label: ":centos: CentOS 7.6 - Package Builder"
-        command:
-            - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-            - "./.cicd/package.sh"
-        env:
-            IMAGE_TAG: "centos-7.6"
-            BUILDKITE_AGENT_ACCESS_TOKEN:
-            OS: "el7" # OS and PKGTYPE required for lambdas
-            PKGTYPE: "rpm"
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-10}
-        skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+  - label: ":centos: CentOS 7.6 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "centos-7.6"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "el7" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "rpm"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
-    - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
-        command:
-            - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-            - "./.cicd/package.sh"
-        env:
-            IMAGE_TAG: "ubuntu-16.04"
-            BUILDKITE_AGENT_ACCESS_TOKEN:
-            OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
-            PKGTYPE: "deb"
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-10}
-        skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+  - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "ubuntu-16.04"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "deb"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
-    - label: ":ubuntu: Ubuntu 18.04 - Package Builder"
-        command:
-            - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-            - "./.cicd/package.sh"
-        env:
-            IMAGE_TAG: "ubuntu-18.04"
-            BUILDKITE_AGENT_ACCESS_TOKEN:
-            OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
-            PKGTYPE: "deb"
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-10}
-        skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+  - label: ":ubuntu: Ubuntu 18.04 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "ubuntu-18.04"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "deb"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
-    - label: ":darwin: macOS 10.14 - Package Builder"
-        command:
-            - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
-            - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
-            - "cd eos && ./.cicd/package.sh"
-        plugins:
-            - chef/anka#v0.5.1:
-                no-volume: true
-                inherit-environment-vars: true
-                vm-name: 10.14.4_6C_14G_40G
-                vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
-                always-pull: true
-                debug: true
-                wait-network: true
-        agents:
-            - "queue=mac-anka-node-fleet"
-        timeout: ${TIMEOUT:-10}
-        skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
+  - label: ":darwin: macOS 10.14 - Package Builder"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/package.sh"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: 10.14.4_6C_14G_40G
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+          always-pull: true
+          debug: true
+          wait-network: true
+    agents:
+      - "queue=mac-anka-node-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
 
-    - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
-        command: "./.cicd/installation-build.sh"
-        env:
-            IMAGE_TAG: "ubuntu-18.04-unpinned"
-            BUILDKITE_AGENT_ACCESS_TOKEN:
-        agents:
-            queue: "automation-eos-builder-fleet"
-        timeout: ${TIMEOUT:-30}
-        skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
+  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
+    command: "./.cicd/installation-build.sh"
+    env:
+      IMAGE_TAG: "ubuntu-18.04-unpinned"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-30}
+    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
 
-    - wait
+  - wait
 
-    - label: ":git: Git Submodule Regression Check"
-        command: "./.cicd/submodule-regression-check.sh"
-        agents:
-            queue: "automation-basic-builder-fleet"
-        timeout: ${TIMEOUT:-5}
+  - label: ":git: Git Submodule Regression Check"
+    command: "./.cicd/submodule-regression-check.sh"
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: ${TIMEOUT:-5}
 
-    - label: ":beer: Brew Updater"
-        command: |
-            buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
-            buildkite-agent artifact upload eosio.rb
-        agents:
-            queue: "automation-basic-builder-fleet"
-        timeout: "${TIMEOUT:-5}"
-        skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
+  - label: ":beer: Brew Updater"
+    command: |
+      buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
+      buildkite-agent artifact upload eosio.rb
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: "${TIMEOUT:-5}"
+    skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
 
 EOF
 IFS=$oIFS
\ No newline at end of file

From 0487902e6022834698868522d167a3ae5bfa95e5 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Wed, 11 Sep 2019 15:22:57 -0400
Subject: [PATCH 1164/1648] Update eos-vm submodule

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 438706c337e..684bb3e43f4 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 438706c337e15287a68dabced25055df6ba2d85f
+Subproject commit 684bb3e43f43c3ae0ef9bec506a51e893b805b85

From cd5e4df5853fb718155833d9a56b31f93d6dc725 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 15:35:41 -0400
Subject: [PATCH 1165/1648] Fix misaligned cat

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 5957fb5cf92..4d842f79ad2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -54,7 +54,7 @@ nIFS=$IFS # fix array splitting (\n won't work)
 # base-image steps
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
-    cat <<EOF
+        cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
     command:
       - "git clone git@github.com:EOSIO/mac-anka-fleet.git"

From 310666f6a925c6f9c28f4191f77a5aa6e5fa8e11 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 15:37:45 -0400
Subject: [PATCH 1166/1648] Put wait step at top of YAML

---
 .cicd/generate-pipeline.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4d842f79ad2..8ff6e44e47e 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -51,6 +51,9 @@ done
 oIFS="$IFS"
 IFS=$'' 
 nIFS=$IFS # fix array splitting (\n won't work)
+# start with a wait step
+echo '  - wait'
+echo ''
 # base-image steps
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
@@ -72,11 +75,11 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     timeout: ${TIMEOUT:-320}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
 
+  - wait
+
 EOF
     fi
 done
-echo '  - wait'
-echo ''
 # build steps
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then

From 0044fa7002f9a0ffcb9361d985fb93555b29c73b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 15:40:46 -0400
Subject: [PATCH 1167/1648] Add space after macOS serial tests in YAML

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 8ff6e44e47e..c74183c941b 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -205,6 +205,7 @@ EOF
     timeout: ${TIMEOUT:-20}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+
 EOF
             fi
         done

From f71ea02db6f552aa57c37f4b6aaa0f40fa2bb132 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 15:44:28 -0400
Subject: [PATCH 1168/1648] Use comments to break up blocks of YAML, to help
 with debugging

---
 .cicd/generate-pipeline.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c74183c941b..05ebc33174f 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -55,6 +55,7 @@ nIFS=$IFS # fix array splitting (\n won't work)
 echo '  - wait'
 echo ''
 # base-image steps
+echo '    # base-images'
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
         cat <<EOF
@@ -81,6 +82,7 @@ EOF
     fi
 done
 # build steps
+echo '    # builds'
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
         cat <<EOF
@@ -127,6 +129,7 @@ echo ''
 # tests
 for RUN in $(seq 1 $RUNS); do
     # parallel tests
+    echo '    # parallel tests'
     echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
         if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
             cat <<EOF
@@ -167,6 +170,7 @@ EOF
         fi
     done
     # serial tests
+    echo '    # serial tests'
     echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
         IFS=$oIFS
         SERIAL_TESTS="$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')"
@@ -212,6 +216,7 @@ EOF
         IFS=$nIFS
     done
     # long-running tests
+    echo '    # long-running tests'
     echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
         IFS=$oIFS
         LR_TESTS="$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')"
@@ -280,6 +285,7 @@ cat <<EOF
 
   - wait
 
+    # packaging
   - label: ":centos: CentOS 7.6 - Package Builder"
     command:
       - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"

From 14ed18cc354835abe8e955d43573812802959c38 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 15:50:04 -0400
Subject: [PATCH 1169/1648] Print run group index in YAML comment

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 05ebc33174f..0a2e69fd957 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -128,6 +128,7 @@ echo '  - wait'
 echo ''
 # tests
 for RUN in $(seq 1 $RUNS); do
+    echo "    # run group $RUN of $RUNS"
     # parallel tests
     echo '    # parallel tests'
     echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do

From e6e959157ebc6cc194e46bfe7007959d6bc345ac Mon Sep 17 00:00:00 2001
From: zreyn <zane.reynolds@block.one>
Date: Wed, 11 Sep 2019 16:09:40 -0400
Subject: [PATCH 1170/1648] Update docker builder tag

Updates the builder image used in docker builds (which contains updated LLVM)
---
 pipeline.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index b8c294f45c6..a870d04a9ca 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -14,7 +14,7 @@
     {
         "environment":
         {
-            "BUILDER_TAG": "v1.8.0"
+            "BUILDER_TAG": "v2.0.0"
         }
     },
     "eosio-sync-tests":

From 59ae46f2cbee6d5971ee81cd3218ab35aa436fe3 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 16:42:24 -0400
Subject: [PATCH 1171/1648] Fix IFS so FOR loop works

---
 .cicd/generate-pipeline.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 0a2e69fd957..38b206c80fd 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -49,7 +49,7 @@ for FILE in $(ls $CICD_DIR/platforms); do
         }]')
 done
 oIFS="$IFS"
-IFS=$'' 
+IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)
 # start with a wait step
 echo '  - wait'
@@ -127,7 +127,9 @@ done
 echo '  - wait'
 echo ''
 # tests
+IFS=$oIFS
 for RUN in $(seq 1 $RUNS); do
+    IFS=$''
     echo "    # run group $RUN of $RUNS"
     # parallel tests
     echo '    # parallel tests'
@@ -262,6 +264,7 @@ EOF
         done
         IFS=$nIFS
     done
+    IFS=$oIFS
     if [[ "$RUN" != "$RUNS" ]]; then
         echo '  - wait'
         echo ''

From 11c2185e3a5403657c63e63c6b82a26bd65a0fbd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 11 Sep 2019 13:43:47 -0500
Subject: [PATCH 1172/1648] Keep producer_plugin impl alive until app queue
 drained

---
 plugins/producer_plugin/producer_plugin.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 1448831a587..2f8d3145712 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -913,9 +913,8 @@ void producer_plugin::plugin_shutdown() {
    if( my->_thread_pool ) {
       my->_thread_pool->stop();
    }
-   my->_accepted_block_connection.reset();
-   my->_accepted_block_header_connection.reset();
-   my->_irreversible_block_connection.reset();
+
+   app().post( 0, [me = my](){} ); // keep my pointer alive until queue is drained
 }
 
 void producer_plugin::handle_sighup() {

From 8fc6ef3fd12c13ad82b72ba2e214972b57eae910 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 16:42:45 -0400
Subject: [PATCH 1173/1648] Remove extra space

---
 .cicd/generate-pipeline.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 38b206c80fd..32bda923ef0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -272,7 +272,6 @@ EOF
 done
 # pipeline tail
 cat <<EOF
-
   - wait:
     continue_on_failure: true
 

From 64ebb343f08feeeae3c25366a4aff03d0d7372d2 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 17:20:46 -0400
Subject: [PATCH 1174/1648] Update test purpose, description, and outputs with
 swatanabe-b1's feedback

---
 tests/release-build.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 19eec3b54ab..f5a88333d3e 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 # test name and purpose
 echo ''
-echo '                        ##### Release Build Test #####'
+echo '                         ##### Release Build Test #####'
 echo ''
-echo 'The purpose of this test is to ensure that nodeos was built without debugging'
-echo 'symbols. Debugging symbols enable software engineers to inspect and control a'
-echo 'running program with a debugging tool, but they significantly slow down'
-echo 'performance-critical applications like nodeos. Anyone intending to build and'
-echo 'install nodeos from source should perform a "release build," which excludes'
-echo 'debugging symbols to generate faster and lighter binaries.'
+echo '    The purpose of this test is to ensure that nodeos was built with compiler'
+echo 'optimizations enabled. While there is no way to programmatically determine that'
+echo 'given one binary, we do set a debug flag in nodeos when it is built with'
+echo 'asserts. This test checks that debug flag. Anyone intending to build and install'
+echo 'nodeos from source should perform a "release build" which excludes asserts and'
+echo 'debugging symbols, and performs compiler optimizations.'
 echo ''
 # check for jq
 if ! $(jq --version 1>/dev/null); then

From 712bd678fcdd8b7ecd1347e40f1d8be1e2ed8448 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 12 Sep 2019 05:56:32 -0500
Subject: [PATCH 1175/1648] forgot to copy updated wasm back

---
 .../test-contracts/test_api/test_api.wasm     | Bin 69566 -> 65251 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/unittests/test-contracts/test_api/test_api.wasm b/unittests/test-contracts/test_api/test_api.wasm
index 3394c64d0e1b9c9a56dd389fddd25f3fdce3d3a4..c8a1968754c7e7f15d92e913fda8178a039a14a8 100755
GIT binary patch
delta 17528
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
A^#A|>

delta 20926
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
Vc$*>bU6ePr3Ja3rwQHax{V!vd0RjL3


From 48b306ab80b22db150ea31e66106d34ecf8a42b5 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 12 Sep 2019 10:32:51 -0400
Subject: [PATCH 1176/1648] Use relative paths instead of absolute paths with
 EOSIO_ROOT

---
 tests/release-build.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index f5a88333d3e..366efc3da3e 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -17,20 +17,18 @@ if ! $(jq --version 1>/dev/null); then
     exit 1
 fi
 # find nodeos
-[[ -z "$EOSIO_ROOT" && $(git --version) ]] && export EOSIO_ROOT="$(git rev-parse --show-toplevel)"
-[[ -z "$EOSIO_ROOT" ]] && export EOSIO_ROOT="$(echo $(pwd)/ | grep -ioe '.*/eos/' -e '.*/eosio/' -e '.*/build/' | sed 's,/build/,/,')"
-if [[ ! -f "$EOSIO_ROOT/build/bin/nodeos" && ! -f "$EOSIO_ROOT/build/programs/nodeos/nodeos" ]]; then
+[[ $(git --version) ]] && cd "$(git rev-parse --show-toplevel)/build/programs/nodeos" || cd "$(dirname "${BASH_SOURCE[0]}")/../programs/nodeos"
+if [[ ! -f nodeos ]]; then
     echo 'ERROR: nodeos binary not found!'
     echo ''
     echo 'Looked in the following places:'
-    echo "$ ls -la \"$EOSIO_ROOT/build/bin\""
-    ls -la "$EOSIO_ROOT/build/bin"
-    echo "$ ls -la \"$EOSIO_ROOT/build/programs/nodeos\""
-    ls -la "$EOSIO_ROOT/build/programs/nodeos"
+    echo '$ ls -la "$(git rev-parse --show-toplevel)/build/programs/nodeos"'
+    ls -la "$(git rev-parse --show-toplevel)/build/programs/nodeos"
+    echo '$ ls -la "$(dirname "${BASH_SOURCE[0]}")/../programs/nodeos"'
+    ls -la "$(dirname "${BASH_SOURCE[0]}")/../programs/nodeos"
     echo 'Release build test not run.'
     exit 1
 fi
-[[ -f "$EOSIO_ROOT/build/bin/nodeos" ]] && cd "$EOSIO_ROOT/build/bin" || cd "$EOSIO_ROOT/build/programs/nodeos"
 # run nodeos to generate state files
 ./nodeos --extract-build-info build-info.json 1>/dev/null 2>/dev/null
 if [[ ! -f build-info.json ]]; then

From be6dc1f869f19f415c328343992ef197119ca899 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 12 Sep 2019 11:31:23 -0400
Subject: [PATCH 1177/1648] Better error message when nodeos is not found

---
 tests/release-build.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 366efc3da3e..51604ea731e 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -21,11 +21,14 @@ fi
 if [[ ! -f nodeos ]]; then
     echo 'ERROR: nodeos binary not found!'
     echo ''
-    echo 'Looked in the following places:'
-    echo '$ ls -la "$(git rev-parse --show-toplevel)/build/programs/nodeos"'
-    ls -la "$(git rev-parse --show-toplevel)/build/programs/nodeos"
-    echo '$ ls -la "$(dirname "${BASH_SOURCE[0]}")/../programs/nodeos"'
-    ls -la "$(dirname "${BASH_SOURCE[0]}")/../programs/nodeos"
+    echo 'I looked here...'
+    echo "$ ls -la \"$(pwd)/programs/nodeos\""
+    ls -la "$(pwd)/programs/nodeos"
+    echo '...which I derived from one of these paths:'
+    echo '$ echo "$(git rev-parse --show-toplevel)/build"'
+    echo "$(git rev-parse --show-toplevel)/build"
+    echo '$ echo "$(dirname "${BASH_SOURCE[0]}")/.."'
+    echo "$(dirname "${BASH_SOURCE[0]}")/.."
     echo 'Release build test not run.'
     exit 1
 fi

From bd6dff178dbdc993691e72edbb3cde655f9d7c2c Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 12 Sep 2019 11:37:54 -0400
Subject: [PATCH 1178/1648] Don't forget to delete build-info.json when the
 test is done

---
 tests/release-build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/release-build.sh b/tests/release-build.sh
index 51604ea731e..4238df85e3b 100755
--- a/tests/release-build.sh
+++ b/tests/release-build.sh
@@ -47,10 +47,12 @@ fi
 if [[ "$(cat build-info.json | jq .debug)" == 'false' ]]; then
     echo 'PASS: Debug flag is not set.'
     echo ''
+    rm build-info.json
     exit 0
 fi
 echo 'FAIL: Debug flag is set!'
 echo ''
 echo '$ cat build-info.json | jq .'
 cat build-info.json | jq .
+rm build-info.json
 exit 3
\ No newline at end of file

From c779fe305170865e074e634cae24887a79029f03 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Thu, 12 Sep 2019 12:01:04 -0400
Subject: [PATCH 1179/1648] Use the existing checktime implementation for
 eos-vm.

---
 .../eosio/chain/transaction_context.hpp       |  2 -
 libraries/chain/webassembly/eos-vm.cpp        | 42 +++++++++++++++----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index 5205e9e19cf..8268eaaaa40 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -146,9 +146,7 @@ namespace eosio { namespace chain {
 
          fc::microseconds              initial_objective_duration_limit;
          fc::microseconds              objective_duration_limit;
-   public: // <-- HACK for eos-vm
          fc::time_point                _deadline = fc::time_point::maximum();
-   private:
          int64_t                       deadline_exception_code = block_cpu_usage_exceeded::code_value;
          int64_t                       billing_timer_exception_code = block_cpu_usage_exceeded::code_value;
          fc::time_point                pseudo_start;
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 2ff7dad4ea7..02a157872bf 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -12,6 +12,37 @@ using namespace eosio::vm;
 
 namespace wasm_constraints = eosio::chain::wasm_constraints;
 
+namespace {
+
+  struct checktime_watchdog {
+     checktime_watchdog(transaction_checktime_timer& timer) : _timer(timer) {}
+     template<typename F>
+     struct guard {
+        guard(transaction_checktime_timer& timer, F&& func)
+           : _timer(timer), _func(static_cast<F&&>(func)) {
+           _timer.set_expiration_callback(&callback, this);
+        }
+        ~guard() {
+           // FIXME: This works correctly only if the callback is invoked by a signal
+           // handler in the current thread.
+           _timer.set_expiration_callback(nullptr, nullptr);
+        }
+        static void callback(void* data) {
+           guard* self = static_cast<guard*>(data);
+           self->_func();
+        }
+        transaction_checktime_timer& _timer;
+        F _func;
+     };
+     template<typename F>
+     guard<F> scoped_run(F&& func) {
+        return guard{_timer, static_cast<F&&>(func)};
+     }
+     transaction_checktime_timer& _timer;
+  };
+
+}
+
 template<typename Impl>
 class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
       using backend_t = backend<apply_context, Impl>;
@@ -41,15 +72,10 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
                 context.get_action().name.to_uint64_t());
          };
          try {
-            if (context.trx_context._deadline == fc::time_point::maximum())
-               fn();
-            else {
-               watchdog wd(std::chrono::microseconds((context.trx_context._deadline - fc::time_point::now()).count()));
-               _runtime->_bkend->timed_run(wd, fn);
-            }
+            checktime_watchdog wd(context.trx_context.transaction_timer);
+            _runtime->_bkend->timed_run(wd, fn);
          } catch(eosio::vm::timeout_exception&) {
-            // FIXME: just loop until checktime triggers, in case we got here first
-            while(true) context.trx_context.checktime();
+            context.trx_context.checktime();
          } catch(eosio::vm::wasm_memory_exception& e) {
             FC_THROW_EXCEPTION(wasm_execution_error, "access violation");
          } catch(eosio::vm::exception& e) {

From 9c15a99bcc928b940a6b9b1040fefdabb7bedffd Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Thu, 12 Sep 2019 13:15:04 -0400
Subject: [PATCH 1180/1648] one more time at committing the wasm

---
 .../test-contracts/test_api/test_api.wasm     | Bin 65251 -> 65095 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/unittests/test-contracts/test_api/test_api.wasm b/unittests/test-contracts/test_api/test_api.wasm
index c8a1968754c7e7f15d92e913fda8178a039a14a8..70740888e587c3157d7e060d124b4f24bf1b5295 100755
GIT binary patch
delta 5791
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
RxIXyNx58|7&KL76{{?}FQnmm9

delta 6122
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


From afd3b21dc8f5ae678413461514f1c66b2be9e8fc Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Thu, 12 Sep 2019 13:47:34 -0400
Subject: [PATCH 1181/1648] Re-enable injection for wabt and wavm.

---
 .../chain/include/eosio/chain/wasm_interface_private.hpp   | 4 +---
 libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp | 1 +
 .../include/eosio/chain/webassembly/runtime_interface.hpp  | 7 ++++++-
 libraries/chain/include/eosio/chain/webassembly/wabt.hpp   | 1 +
 libraries/chain/include/eosio/chain/webassembly/wavm.hpp   | 1 +
 libraries/chain/webassembly/eos-vm.cpp                     | 5 +++++
 libraries/chain/webassembly/wabt.cpp                       | 7 +++++++
 libraries/chain/webassembly/wavm.cpp                       | 6 ++++++
 8 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index cce09c4f3b4..2dbd63a7872 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -143,9 +143,7 @@ namespace eosio { namespace chain {
             } catch (const IR::ValidationException& e) {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
-            if (false) {
-               wasm_injections::wasm_binary_injection<false> injector(module);
-               injector.inject();
+            if (runtime_interface->inject_module(module)) {
                try {
                   Serialization::ArrayOutputStream outstream;
                   WASM::serialize(outstream, module);
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 92a24b5a346..9c050d0b9a8 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -117,6 +117,7 @@ template<typename Backend>
 class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
    public:
       eos_vm_runtime();
+      bool inject_module(IR::Module&) override;
       std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) override;
 
       void immediately_exit_currently_running_module() override;
diff --git a/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp b/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
index 2a9b8119b67..2f7ac8aad50 100644
--- a/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
@@ -2,6 +2,10 @@
 #include <vector>
 #include <memory>
 
+namespace IR {
+  struct Module;
+}
+
 namespace eosio { namespace chain {
 
 class apply_context;
@@ -15,6 +19,7 @@ class wasm_instantiated_module_interface {
 
 class wasm_runtime_interface {
    public:
+      virtual bool inject_module(IR::Module& module) = 0;
       virtual std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) = 0;
 
       //immediately exit the currently running wasm_instantiated_module_interface. Yep, this assumes only one can possibly run at a time.
@@ -23,4 +28,4 @@ class wasm_runtime_interface {
       virtual ~wasm_runtime_interface();
 };
 
-}}
\ No newline at end of file
+}}
diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index 79de06023da..ecac8b5fdfb 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -50,6 +50,7 @@ struct intrinsic_registrator {
 class wabt_runtime : public eosio::chain::wasm_runtime_interface {
    public:
       wabt_runtime();
+      bool inject_module(IR::Module&) override;
       std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) override;
 
       void immediately_exit_currently_running_module() override;
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 58cd7a15458..45a9af67d12 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -20,6 +20,7 @@ class wavm_runtime : public eosio::chain::wasm_runtime_interface {
    public:
       wavm_runtime();
       ~wavm_runtime();
+      bool inject_module(IR::Module&) override;
       std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) override;
 
       void immediately_exit_currently_running_module() override;
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 02a157872bf..e3682695e5f 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -98,6 +98,11 @@ void eos_vm_runtime<Impl>::immediately_exit_currently_running_module() {
    throw wasm_exit{};
 }
 
+template<typename Impl>
+bool eos_vm_runtime<Impl>::inject_module(IR::Module& module) {
+   return false;
+}
+
 template<typename Impl>
 std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime<Impl>::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
    using backend_t = backend<apply_context, Impl>;
diff --git a/libraries/chain/webassembly/wabt.cpp b/libraries/chain/webassembly/wabt.cpp
index 394b1640d8d..a73617e199a 100644
--- a/libraries/chain/webassembly/wabt.cpp
+++ b/libraries/chain/webassembly/wabt.cpp
@@ -1,6 +1,7 @@
 #include <eosio/chain/webassembly/wabt.hpp>
 #include <eosio/chain/apply_context.hpp>
 #include <eosio/chain/wasm_eosio_constraints.hpp>
+#include <eosio/chain/wasm_eosio_injection.hpp>
 
 //wabt includes
 #include <src/interp.h>
@@ -73,6 +74,12 @@ class wabt_instantiated_module : public wasm_instantiated_module_interface {
 
 wabt_runtime::wabt_runtime() {}
 
+bool wabt_runtime::inject_module(IR::Module& module) {
+   wasm_injections::wasm_binary_injection<true> injector(module);
+   injector.inject();
+   return true;
+}
+
 std::unique_ptr<wasm_instantiated_module_interface> wabt_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) {
    std::unique_ptr<interp::Environment> env = std::make_unique<interp::Environment>();
    for(auto it = intrinsic_registrator::get_map().begin() ; it != intrinsic_registrator::get_map().end(); ++it) {
diff --git a/libraries/chain/webassembly/wavm.cpp b/libraries/chain/webassembly/wavm.cpp
index 3133dc43e66..c0481c7cb86 100644
--- a/libraries/chain/webassembly/wavm.cpp
+++ b/libraries/chain/webassembly/wavm.cpp
@@ -133,6 +133,12 @@ wavm_runtime::wavm_runtime() {
 wavm_runtime::~wavm_runtime() {
 }
 
+bool wavm_runtime::inject_module(IR::Module& module) {
+   wasm_injections::wasm_binary_injection<true> injector(module);
+   injector.inject();
+   return true;
+}
+
 std::unique_ptr<wasm_instantiated_module_interface> wavm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) {
    std::unique_ptr<Module> module = std::make_unique<Module>();
    try {

From 36f887e29bed8d95367f343163d4a5b43014f3f3 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 12 Sep 2019 15:41:12 -0400
Subject: [PATCH 1182/1648] Rename RUNS variable to ROUNDS to avoid confusion
 when writing about multiple test-stability runs

---
 .cicd/generate-pipeline.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 32bda923ef0..9508cd1e1f5 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -5,7 +5,7 @@ set -eo pipefail
 export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
 export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
 export PLATFORMS_JSON_ARRAY='[]'
-[[ -z "$RUNS" ]] && export RUNS='1'
+[[ -z "$ROUNDS" ]] && export ROUNDS='1'
 # read .cicd/platforms
 for FILE in $(ls $CICD_DIR/platforms); do
     # skip mac or linux by not even creating the json block
@@ -128,9 +128,9 @@ echo '  - wait'
 echo ''
 # tests
 IFS=$oIFS
-for RUN in $(seq 1 $RUNS); do
+for ROUND in $(seq 1 $ROUNDS); do
     IFS=$''
-    echo "    # run group $RUN of $RUNS"
+    echo "    # round $ROUND of $ROUNDS"
     # parallel tests
     echo '    # parallel tests'
     echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
@@ -265,7 +265,7 @@ EOF
         IFS=$nIFS
     done
     IFS=$oIFS
-    if [[ "$RUN" != "$RUNS" ]]; then
+    if [[ "$ROUND" != "$ROUNDS" ]]; then
         echo '  - wait'
         echo ''
     fi

From 2ede7b842bf9e6b53018718a255a58a0d07649df Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 12 Sep 2019 15:53:11 -0400
Subject: [PATCH 1183/1648] updated eos-vm to handle atomic issue

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 684bb3e43f4..30b173b1b01 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 684bb3e43f43c3ae0ef9bec506a51e893b805b85
+Subproject commit 30b173b1b0141621af28854638a88275b05a501f

From ce47af29fd39ba3754ac04e37a1ab56a2c041951 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 12 Sep 2019 16:51:30 -0400
Subject: [PATCH 1184/1648] Don't wait between base-image steps, wait after
 them

---
 .cicd/generate-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 9508cd1e1f5..1e11060236e 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -76,11 +76,11 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     timeout: ${TIMEOUT:-320}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
 
-  - wait
-
 EOF
     fi
 done
+echo '  - wait'
+echo ''
 # build steps
 echo '    # builds'
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do

From 712cb85cf646b9a25ce0b8c1ac1a0f5b76e53e7b Mon Sep 17 00:00:00 2001
From: Justin Brown <justin.brown@block.one>
Date: Thu, 12 Sep 2019 18:57:29 -0400
Subject: [PATCH 1185/1648] adds support for builder priority queues

---
 .cicd/generate-pipeline.sh | 74 +++++++++++++++++++++++++++++---------
 .cicd/pipeline.yml         |  7 ++--
 2 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d33a0e681d6..e0c67f404e6 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -5,6 +5,10 @@ export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::
 export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
 # Use files in platforms dir as source of truth for what platforms we need to generate steps for
 export PLATFORMS_JSON_ARRAY='[]'
+LINUX_CONCURRENCY=8
+MAC_CONCURRENCY=2
+LINUX_CONCURRENCY_GROUP='eos-scheduled-build'
+MAC_CONCURRENCY_GROUP='eos-scheduled-build-mac'
 for FILE in $(ls $CICD_DIR/platforms); do
     # Ability to skip mac or linux by not even creating the json block
     ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
@@ -75,11 +79,14 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
 EOF
     fi
 done
+BUILDKITE_AGENT_QUEUE="automation-eks-eos-builder-fleet"
 echo "  - wait"; echo ""
 ###############
 # BUILD STEPS #
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+        CONCURRENCY=$LINUX_CONCURRENCY
+        CONCURRENCY_GROUP=$LINUX_CONCURRENCY_GROUP
         cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
     command:
@@ -89,12 +96,13 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
-
 EOF
     else
+        CONCURRENCY=$MAC_CONCURRENCY
+        CONCURRENCY_GROUP=$MAC_CONCURRENCY_GROUP
         cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
     command:
@@ -116,15 +124,23 @@ EOF
     agents:
       - "queue=mac-anka-large-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
-
+EOF
+    fi
+    if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+        cat <<EOF
+    concurrency: ${CONCURRENCY}
+    concurrency_group: ${CONCURRENCY_GROUP}
 EOF
     fi
 done
+echo
 echo "  - wait"; echo ""
 ##############
 # UNIT TESTS #
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+        CONCURRENCY=$LINUX_CONCURRENCY
+        CONCURRENCY_GROUP=$LINUX_CONCURRENCY_GROUP
         cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
     command:
@@ -134,12 +150,13 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
-
 EOF
     else
+        CONCURRENCY=$MAC_CONCURRENCY
+        CONCURRENCY_GROUP=$MAC_CONCURRENCY_GROUP
         cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
     command:
@@ -159,9 +176,15 @@ EOF
     agents:
       - "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
-
 EOF
     fi
+    if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+        cat <<EOF
+    concurrency: ${CONCURRENCY}
+    concurrency_group: ${CONCURRENCY_GROUP}
+EOF
+    fi
+    echo
 done
 ################
 # SERIAL TESTS #
@@ -170,6 +193,8 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
     for TEST_NAME in $SERIAL_TESTS; do
         if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+            CONCURRENCY=$LINUX_CONCURRENCY
+            CONCURRENCY_GROUP=$LINUX_CONCURRENCY_GROUP
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
@@ -179,12 +204,13 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-20}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
-
 EOF
         else
+            CONCURRENCY=$MAC_CONCURRENCY
+            CONCURRENCY_GROUP=$MAC_CONCURRENCY_GROUP
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
@@ -206,6 +232,13 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
 EOF
         fi
+        if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+            cat <<EOF
+    concurrency: ${CONCURRENCY}
+    concurrency_group: ${CONCURRENCY_GROUP}
+EOF
+        fi
+        echo
     done
     IFS=$nIFS
 done
@@ -216,6 +249,8 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
     for TEST_NAME in $LR_TESTS; do
         if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+            CONCURRENCY=$LINUX_CONCURRENCY
+            CONCURRENCY_GROUP=$LINUX_CONCURRENCY_GROUP
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
@@ -225,12 +260,13 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
-
 EOF
         else
+            CONCURRENCY=$MAC_CONCURRENCY
+            CONCURRENCY_GROUP=$MAC_CONCURRENCY_GROUP
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
@@ -250,9 +286,15 @@ EOF
     agents:
       - "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
-
 EOF
         fi
+        if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+           cat <<EOF
+    concurrency: ${CONCURRENCY}
+    concurrency_group: ${CONCURRENCY_GROUP}
+EOF
+        fi
+        echo
     done
     IFS=$nIFS
 done
@@ -268,7 +310,7 @@ cat <<EOF
       echo '+++ :javascript: Running test-metrics.js'
       node --max-old-space-size=32768 test-metrics.js
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     soft_fail: true
 
@@ -284,7 +326,7 @@ cat <<EOF
       OS: "el7" # OS and PKGTYPE required for lambdas
       PKGTYPE: "rpm"
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
@@ -298,7 +340,7 @@ cat <<EOF
       OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
       PKGTYPE: "deb"
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
@@ -312,7 +354,7 @@ cat <<EOF
       OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
       PKGTYPE: "deb"
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
@@ -341,7 +383,7 @@ cat <<EOF
       IMAGE_TAG: "ubuntu-18.04-unpinned"
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "automation-eos-builder-fleet"
+      queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-30}
     skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
 
diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 50cf1a713d7..900aea633e0 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -1,8 +1,11 @@
 steps:
   - wait
 
-  - label: ":pipeline: Generate Pipeline Steps"  
-    command: "./.cicd/generate-pipeline.sh | buildkite-agent pipeline upload"
+  - label: ":pipeline: Generate Pipeline Steps"
+    command:
+      - "./.cicd/generate-pipeline.sh > generated-pipeline.yml"
+      - "buildkite-agent pipeline upload < generated-pipeline.yml"
+      - "buildkite-agent artifact upload generated-pipeline.yml"
     agents:
       queue: "automation-basic-builder-fleet"
     timeout: ${TIMEOUT:-10}
\ No newline at end of file

From b9936f26b5a08cba48d3c208364ed99061ce8b7b Mon Sep 17 00:00:00 2001
From: Justin Brown <justin.brown@block.one>
Date: Thu, 12 Sep 2019 20:59:39 -0400
Subject: [PATCH 1186/1648] adds fix for unpinned builds on 18.04

---
 .cicd/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 2688b65413a..cbe2eb50785 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -32,7 +32,7 @@ else # Linux
         PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/devtoolset-8/enable && source /opt/rh/rh-python36/enable && export PATH=/usr/lib64/ccache:\\\$PATH"
     elif [[ $IMAGE_TAG == 'ubuntu-18.04-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
-        CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
+        CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DLLVM_DIR='/usr/lib/llvm-7'"
     fi
     BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
     # Docker Commands

From 1ea7de9b546bfaf67cce8b04a12c9d875d5b419c Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 12 Sep 2019 21:15:03 -0400
Subject: [PATCH 1187/1648] Remove LLVM 6 to fix unpinned builds on non-Ubuntu
 hosts

---
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index cb7473ca98a..2878b837213 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -8,6 +8,9 @@ RUN apt-get update && \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
     autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
     libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache vim-common jq
+# remove llvm-6
+RUN apt purge libllvm6* && \
+    apt purge llvm-6*
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \

From 4c6fd95bf94614d6fe2b9350ba344f8f87d56a8b Mon Sep 17 00:00:00 2001
From: Justin Brown <justin.brown@block.one>
Date: Thu, 12 Sep 2019 21:27:02 -0400
Subject: [PATCH 1188/1648] Revert "Remove LLVM 6 to fix unpinned builds on
 non-Ubuntu hosts"

This reverts commit 1ea7de9b546bfaf67cce8b04a12c9d875d5b419c.
---
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index 2878b837213..cb7473ca98a 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -8,9 +8,6 @@ RUN apt-get update && \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
     autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
     libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache vim-common jq
-# remove llvm-6
-RUN apt purge libllvm6* && \
-    apt purge llvm-6*
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \

From 3bbb66a720d7da35aa99dff2dc496a7587d2e678 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 12 Sep 2019 21:27:42 -0400
Subject: [PATCH 1189/1648] Don't forget to suppress prompts in unattended
 environments

---
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index 2878b837213..019134f44e7 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -9,8 +9,7 @@ RUN apt-get update && \
     autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
     libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache vim-common jq
 # remove llvm-6
-RUN apt purge libllvm6* && \
-    apt purge llvm-6*
+RUN apt purge -y llvm-6* libllvm6*
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \

From 9af03d835eda272ba844bc73c0978699180124e3 Mon Sep 17 00:00:00 2001
From: Justin Brown <justin.brown@block.one>
Date: Thu, 12 Sep 2019 21:27:57 -0400
Subject: [PATCH 1190/1648] corrects path to llvm

---
 .cicd/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index cbe2eb50785..22a8e825006 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -32,7 +32,7 @@ else # Linux
         PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/devtoolset-8/enable && source /opt/rh/rh-python36/enable && export PATH=/usr/lib64/ccache:\\\$PATH"
     elif [[ $IMAGE_TAG == 'ubuntu-18.04-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
-        CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DLLVM_DIR='/usr/lib/llvm-7'"
+        CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DLLVM_DIR='/usr/lib/llvm-7/lib/cmake/llvm'"
     fi
     BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
     # Docker Commands

From eb2b45218c6af58df0573cefb93de434b2588303 Mon Sep 17 00:00:00 2001
From: Bart Wyatt <bart.wyatt@block.one>
Date: Fri, 13 Sep 2019 08:31:03 -0400
Subject: [PATCH 1191/1648] fix erroneous removal of return

---
 .../test-contracts/test_api/test_api.wasm     | Bin 65095 -> 70317 bytes
 .../test-contracts/test_api/test_crypto.cpp   |   1 +
 2 files changed, 1 insertion(+)

diff --git a/unittests/test-contracts/test_api/test_api.wasm b/unittests/test-contracts/test_api/test_api.wasm
index 70740888e587c3157d7e060d124b4f24bf1b5295..5fd5ff870c31a5c1f981d91ba652ec3261e0982d 100755
GIT binary patch
delta 12096
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
COR*OK

delta 6967
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

diff --git a/unittests/test-contracts/test_api/test_crypto.cpp b/unittests/test-contracts/test_api/test_crypto.cpp
index 799c169c4fe..bc2ff120e15 100644
--- a/unittests/test-contracts/test_api/test_crypto.cpp
+++ b/unittests/test-contracts/test_api/test_crypto.cpp
@@ -177,6 +177,7 @@ extern "C" {
             return false;
          }
       }
+      return true;
    }
 }
 

From 81a2a671073dbac888fc4e65e9607bb87d3a9037 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Thu, 12 Sep 2019 16:40:08 -0400
Subject: [PATCH 1192/1648] Add eos-vm to ctest and fix submodule commit.

---
 libraries/eos-vm         | 2 +-
 unittests/CMakeLists.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 30b173b1b01..98a34860743 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 30b173b1b0141621af28854638a88275b05a501f
+Subproject commit 98a34860743ff586dfefc587a5a66be4717352aa
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index ed870052639..c9ff85727ce 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -62,6 +62,8 @@ foreach(TEST_SUITE ${UNIT_TESTS}) # create an independent target for each test s
     # to run unit_test with all log from blockchain displayed, put "--verbose" after "--", i.e. "unit_test -- --verbose"
     add_test(NAME ${TRIMMED_SUITE_NAME}_unit_test_wavm COMMAND unit_test --run_test=${SUITE_NAME} --report_level=detailed --color_output --catch_system_errors=no -- --wavm)
     add_test(NAME ${TRIMMED_SUITE_NAME}_unit_test_wabt COMMAND unit_test --run_test=${SUITE_NAME} --report_level=detailed --color_output -- --wabt)
+    add_test(NAME ${TRIMMED_SUITE_NAME}_unit_test_eos_vm COMMAND unit_test --run_test=${SUITE_NAME} --report_level=detailed --color_output --catch_system_errors=no -- --eos-vm)
+    add_test(NAME ${TRIMMED_SUITE_NAME}_unit_test_eos_vm_jit COMMAND unit_test --run_test=${SUITE_NAME} --report_level=detailed --color_output --catch_system_errors=no -- --eos-vm-jit)
     # build list of tests to run during coverage testing
     if(NOT "" STREQUAL "${ctest_tests}")
       set(ctest_tests "${ctest_tests}|${TRIMMED_SUITE_NAME}_unit_test_wavm|${TRIMMED_SUITE_NAME}_unit_test_wabt")

From defa00696763a4a4035b372fac9f2b1138803b07 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 13:35:03 -0400
Subject: [PATCH 1193/1648] Create trigger for LRTs.

---
 .cicd/generate-lrt-pipeline.sh | 143 +++++++++++++++++++++++++++++++++
 .cicd/lrts.yml                 |   9 +++
 .cicd/pipeline.yml             |  14 +++-
 3 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 .cicd/generate-lrt-pipeline.sh
 create mode 100644 .cicd/lrts.yml

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
new file mode 100644
index 00000000000..a92ee64981e
--- /dev/null
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -0,0 +1,143 @@
+#!/bin/bash
+set -eo pipefail
+. ./.cicd/helpers/general.sh
+export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
+export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
+# Use files in platforms dir as source of truth for what platforms we need to generate steps for
+export PLATFORMS_JSON_ARRAY='[]'
+for FILE in $(ls $CICD_DIR/platforms); do
+    # Ability to skip mac or linux by not even creating the json block
+    ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
+    ( [[ $SKIP_LINUX == true ]] &&    [[ ! $FILE =~ 'macos' ]] ) && continue
+    # Prevent using both platform files (only use unpinned or pinned)
+    if [[ $PINNED == false || $UNPINNED == true ]] && [[ ! $FILE =~ 'macos' ]]; then
+        export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true}
+        export SKIP_PACKAGE_BUILDER=${SKIP_PACKAGE_BUILDER:-true}
+        [[ ! $FILE =~ 'unpinned' ]] && continue
+    else
+        [[ $FILE =~ 'unpinned' ]] && continue
+    fi
+    export FILE_NAME=$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')
+    export PLATFORM_NAME=$(echo $FILE_NAME | cut -d- -f1 | sed 's/os/OS/g')
+    export PLATFORM_NAME_UPCASE=$(echo $PLATFORM_NAME | tr a-z A-Z)
+    export VERSION_MAJOR=$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f1)
+    [[ $(echo $FILE_NAME | cut -d- -f2) =~ '.' ]] && export VERSION_MINOR="_$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f2)" || export VERSION_MINOR=''
+    export VERSION_FULL=$(echo $FILE_NAME | cut -d- -f2)
+    OLDIFS=$IFS
+    IFS="_"
+    set $PLATFORM_NAME
+    IFS=$OLDIFS
+    export PLATFORM_NAME_FULL="$(capitalize $1)$( [[ ! -z $2 ]] && echo "_$(capitalize $2)" || true ) $VERSION_FULL"
+    [[ $FILE_NAME =~ 'amazon' ]] && export ICON=':aws:'
+    [[ $FILE_NAME =~ 'ubuntu' ]] && export ICON=':ubuntu:'
+    [[ $FILE_NAME =~ 'centos' ]] && export ICON=':centos:'
+    [[ $FILE_NAME =~ 'macos' ]] && export ICON=':darwin:'
+    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$FILE # returns HASHED_IMAGE_TAG, etc
+    export PLATFORMS_JSON_ARRAY=$(echo $PLATFORMS_JSON_ARRAY | jq -c '. += [{ 
+        "FILE_NAME": env.FILE_NAME, 
+        "PLATFORM_NAME": env.PLATFORM_NAME,
+        "PLATFORM_NAME_UPCASE": env.PLATFORM_NAME_UPCASE,
+        "VERSION_MAJOR": env.VERSION_MAJOR,
+        "VERSION_MINOR": env.VERSION_MINOR,
+        "VERSION_FULL": env.VERSION_FULL,
+        "PLATFORM_NAME_FULL": env.PLATFORM_NAME_FULL,
+        "DOCKERHUB_FULL_TAG": env.FULL_TAG,
+        "HASHED_IMAGE_TAG": env.HASHED_IMAGE_TAG,
+        "ICON": env.ICON
+        }]')
+done
+oIFS="$IFS"
+IFS=$'' 
+nIFS=$IFS # Needed to fix array splitting (\n won't work)
+###################
+# Anka Ensure Tag #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    if [[ $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+    cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
+    command:
+      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
+      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
+    agents:
+      - "queue=mac-anka-templater-fleet"
+    env:
+      REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+      REPO_COMMIT: $BUILDKITE_COMMIT
+      TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
+      TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
+      PINNED: $PINNED
+      UNPINNED: $UNPINNED
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
+      PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
+    timeout: ${TIMEOUT:-320}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
+
+EOF
+    fi
+done
+echo "  - wait"; echo ""
+#############
+# LRT TESTS #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    IFS=$oIFS
+    LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
+    for TEST_NAME in $LR_TESTS; do
+        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-180}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+
+EOF
+        else
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-180}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+
+EOF
+        fi
+    done
+    IFS=$nIFS
+done
+cat <<EOF
+
+  - wait:
+    continue_on_failure: true
+
+  - label: ":bar_chart: Test Metrics"
+    command: |
+      echo '+++ :compression: Extracting Test Metrics Code'
+      tar -zxf .cicd/metrics/test-metrics.tar.gz
+      echo '+++ :javascript: Running test-metrics.js'
+      node --max-old-space-size=32768 test-metrics.js
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    soft_fail: true
+
+EOF
+IFS=$oIFS
\ No newline at end of file
diff --git a/.cicd/lrts.yml b/.cicd/lrts.yml
new file mode 100644
index 00000000000..7efcf3296c1
--- /dev/null
+++ b/.cicd/lrts.yml
@@ -0,0 +1,9 @@
+steps:
+  - wait
+
+  - label: ":pipeline: Generate Pipeline Steps"  
+    command: "./.cicd/generate-lrt-pipeline.sh | buildkite-agent pipeline upload"
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    
\ No newline at end of file
diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 900aea633e0..77ad63507e9 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -8,4 +8,16 @@ steps:
       - "buildkite-agent artifact upload generated-pipeline.yml"
     agents:
       queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-10}
\ No newline at end of file
+    timeout: ${TIMEOUT:-10}
+
+  - label: ":pipeline: Trigger LRTs"
+    trigger: "eosio-lrts"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+    skip: ${SKIP_LONG_RUNNING_TESTS:-false}

From 4abf858bd09dc0e6e7a07ce6d0ecafef8c80d8ce Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 13:35:19 -0400
Subject: [PATCH 1194/1648] Create trigger for LRTs.

---
 .cicd/generate-lrt-pipeline.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .cicd/generate-lrt-pipeline.sh

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
old mode 100644
new mode 100755

From 9279b695704a7ff7fe672d690baca50779f43cc9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 13:37:59 -0400
Subject: [PATCH 1195/1648] Create trigger for LRTs.

---
 .cicd/pipeline.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 77ad63507e9..30aa19b5842 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -20,4 +20,3 @@ steps:
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
-    skip: ${SKIP_LONG_RUNNING_TESTS:-false}

From 3e04af13f56c79427abe5724c34b9da9cbd4fed9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 14:07:53 -0400
Subject: [PATCH 1196/1648] Remove LRT steps from generate-pipeline in favor of
 triggering eosio-lrt pipeline.

---
 .cicd/pipeline.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 30aa19b5842..99c2aa488ca 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -9,14 +9,3 @@ steps:
     agents:
       queue: "automation-basic-builder-fleet"
     timeout: ${TIMEOUT:-10}
-
-  - label: ":pipeline: Trigger LRTs"
-    trigger: "eosio-lrts"
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-      env:
-        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
-        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
-        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"

From bd7be1edb5994a64da147dbc7cd06a74d42b39ca Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 11 Sep 2019 13:59:30 -0400
Subject: [PATCH 1197/1648] Eliminate second "Pipeline Upload " step

---
 .cicd/lrts.yml | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .cicd/lrts.yml

diff --git a/.cicd/lrts.yml b/.cicd/lrts.yml
deleted file mode 100644
index 7efcf3296c1..00000000000
--- a/.cicd/lrts.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-steps:
-  - wait
-
-  - label: ":pipeline: Generate Pipeline Steps"  
-    command: "./.cicd/generate-lrt-pipeline.sh | buildkite-agent pipeline upload"
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    
\ No newline at end of file

From ca85cb779b76b6c8ad69037fc54eed9cef52d07f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 14:13:00 -0400
Subject: [PATCH 1198/1648] Fix triggered slug.

---
 .cicd/generate-pipeline.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d0c15ba9f97..fa1363cbc16 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -317,6 +317,18 @@ EOF
 done
 # pipeline tail
 cat <<EOF
+
+  - label: ":pipeline: Trigger LRTs"
+    trigger: "eosio-lrt"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+
   - wait:
     continue_on_failure: true
 

From 52fb312c69a3730f611119f8da324e8511f84629 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 14:56:44 -0400
Subject: [PATCH 1199/1648] Remove LRT skip defaulting to true.

---
 .cicd/generate-lrt-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index a92ee64981e..41bc605f7b0 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -94,7 +94,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS}
 
 EOF
         else
@@ -116,7 +116,7 @@ EOF
     timeout: ${TIMEOUT:-180}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS}
 
 EOF
         fi

From 6355998379be8d7dc0da2df454830d6ffdef523f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 15:27:09 -0400
Subject: [PATCH 1200/1648] Testing containing trigger steps to same
 generate-pipeline.sh.

---
 .cicd/generate-lrt-pipeline.sh | 256 ++++++++++++++++++++++++++++++++-
 .cicd/generate-pipeline.sh     |  13 ++
 2 files changed, 264 insertions(+), 5 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 41bc605f7b0..fee92d8eccd 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -46,6 +46,19 @@ for FILE in $(ls $CICD_DIR/platforms); do
         "ICON": env.ICON
         }]')
 done
+# Triggered LRT
+if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
+    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+        export SKIP_BUILD=false
+        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+    fi
+    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
+    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
+    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+    export SKIP_CONTRACT_BUILDER=true
+fi
 oIFS="$IFS"
 IFS=$'' 
 nIFS=$IFS # Needed to fix array splitting (\n won't work)
@@ -76,6 +89,139 @@ EOF
     fi
 done
 echo "  - wait"; echo ""
+###############
+# BUILD STEPS #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+        cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
+    command:
+      - "./.cicd/build.sh"
+      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-180}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+
+EOF
+    else
+        cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && ./.cicd/build.sh"
+      - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          modify-cpu: 12
+          modify-ram: 24
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-180}
+    agents:
+      - "queue=mac-anka-large-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+
+EOF
+    fi
+done
+echo "  - wait"; echo ""
+##############
+# UNIT TESTS #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+        cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/parallel-test.sh"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+
+EOF
+    else
+        cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-20}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+
+EOF
+    fi
+done
+################
+# SERIAL TESTS #
+echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
+    IFS=$oIFS
+    SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
+    for TEST_NAME in $SERIAL_TESTS; do
+        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-20}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+
+EOF
+        else
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+    timeout: ${TIMEOUT:-20}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+EOF
+        fi
+    done
+    IFS=$nIFS
+done
 #############
 # LRT TESTS #
 echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
@@ -86,7 +232,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -94,7 +240,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
         else
@@ -102,7 +248,7 @@ EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
       - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} && tar -xzf build.tar.gz"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     plugins:
       - chef/anka#v0.5.1:
@@ -116,8 +262,7 @@ EOF
     timeout: ${TIMEOUT:-180}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS}
-
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
         fi
     done
@@ -125,6 +270,17 @@ EOF
 done
 cat <<EOF
 
+  - label: ":pipeline: Trigger LRTs"
+    trigger: "eosio-lrt"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+
   - wait:
     continue_on_failure: true
 
@@ -139,5 +295,95 @@ cat <<EOF
     timeout: ${TIMEOUT:-10}
     soft_fail: true
 
+  - wait
+
+  - label: ":centos: CentOS 7.6 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "centos-7.6"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "el7" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "rpm"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+
+  - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "ubuntu-16.04"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "deb"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+
+  - label: ":ubuntu: Ubuntu 18.04 - Package Builder"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "./.cicd/package.sh"
+    env:
+      IMAGE_TAG: "ubuntu-18.04"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+      OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
+      PKGTYPE: "deb"
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+
+  - label: ":darwin: macOS 10.14 - Package Builder"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/package.sh"
+    plugins:
+      - chef/anka#v0.5.1:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: 10.14.4_6C_14G_40G
+          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
+          always-pull: true
+          debug: true
+          wait-network: true
+    agents:
+      - "queue=mac-anka-node-fleet"
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
+
+  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
+    command: "./.cicd/installation-build.sh"
+    env:
+      IMAGE_TAG: "ubuntu-18.04-unpinned"
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "automation-eos-builder-fleet"
+    timeout: ${TIMEOUT:-30}
+    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
+
+  - wait
+
+  - label: ":git: Git Submodule Regression Check"
+    command: "./.cicd/submodule-regression-check.sh"
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: ${TIMEOUT:-5}
+
+  - label: ":beer: Brew Updater"
+    command: |
+      buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
+      buildkite-agent artifact upload eosio.rb
+    agents:
+      queue: "automation-basic-builder-fleet"
+    timeout: "${TIMEOUT:-5}"
+    skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
+
 EOF
 IFS=$oIFS
\ No newline at end of file
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index fa1363cbc16..08c75c1fe06 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -51,6 +51,19 @@ for FILE in $(ls $CICD_DIR/platforms); do
         "ICON": env.ICON
         }]')
 done
+# Triggered LRT
+if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
+    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+        export SKIP_BUILD=false
+        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+    fi
+    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
+    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
+    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+    export SKIP_CONTRACT_BUILDER=true
+fi
 oIFS="$IFS"
 IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)

From 2fe09121b5d2dab53d90f5269c42544916cb32ab Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 15:50:25 -0400
Subject: [PATCH 1201/1648] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index fee92d8eccd..633c891fdb1 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -48,6 +48,7 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
+    echo "slug matched"
     if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
@@ -268,6 +269,7 @@ EOF
     done
     IFS=$nIFS
 done
+
 cat <<EOF
 
   - label: ":pipeline: Trigger LRTs"

From 63bc73426a5eefd35111c2f6ecaa6356ec801681 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 15:53:17 -0400
Subject: [PATCH 1202/1648] Revert "Debugging."

This reverts commit 86385352448a48c7a1d46669cd40ad1294023fb5.
---
 .cicd/generate-lrt-pipeline.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 633c891fdb1..fee92d8eccd 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -48,7 +48,6 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    echo "slug matched"
     if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
@@ -269,7 +268,6 @@ EOF
     done
     IFS=$nIFS
 done
-
 cat <<EOF
 
   - label: ":pipeline: Trigger LRTs"

From 0ff6084728a22816639c3f92c4635f4acc8e5fd1 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 15:59:58 -0400
Subject: [PATCH 1203/1648] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 8 ++++----
 .cicd/generate-pipeline.sh     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index fee92d8eccd..48573b14cf2 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -52,10 +52,10 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=${SKIP_BUILD:-true}
-    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
-    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
-    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
+    export SKIP_BUILD=true
+    export SKIP_UNIT_TESTS=true
+    export SKIP_SERIAL_TESTS=true
+    export SKIP_LONG_RUNNING_TESTS=false
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
 fi
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 08c75c1fe06..b59175ba718 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -57,10 +57,10 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=${SKIP_BUILD:-true}
-    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
-    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
-    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
+    export SKIP_BUILD=true
+    export SKIP_UNIT_TESTS=true
+    export SKIP_SERIAL_TESTS=true
+    export SKIP_LONG_RUNNING_TESTS=false
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
 fi

From 35b7a03ac1d012a9b6a2d8b0141f405fa9fc7046 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:02:15 -0400
Subject: [PATCH 1204/1648] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 48573b14cf2..86bd160463b 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -57,7 +57,7 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     export SKIP_SERIAL_TESTS=true
     export SKIP_LONG_RUNNING_TESTS=false
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    export SKIP_CONTRACT_BUILDER=true
+    # export SKIP_CONTRACT_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$'' 

From 0bb42931412a723d7f32461ccad69b8882d4d027 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:09:32 -0400
Subject: [PATCH 1205/1648] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 86bd160463b..344d3d263d6 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -57,7 +57,8 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     export SKIP_SERIAL_TESTS=true
     export SKIP_LONG_RUNNING_TESTS=false
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    # export SKIP_CONTRACT_BUILDER=true
+    export SKIP_CONTRACT_BUILDER=true
+    export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$'' 

From ff90b801f5cb0e86ea6c6390e40151810e98aa9e Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:16:29 -0400
Subject: [PATCH 1206/1648] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 344d3d263d6..1a941d5af06 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -48,17 +48,17 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export SKIP_BUILD=false
-        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
-    fi
+    # if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+    #     export SKIP_BUILD=false
+    #     export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+    # fi
     export SKIP_BUILD=true
-    export SKIP_UNIT_TESTS=true
-    export SKIP_SERIAL_TESTS=true
-    export SKIP_LONG_RUNNING_TESTS=false
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    export SKIP_CONTRACT_BUILDER=true
-    export SKIP_PACKAGE_BUILDER=true
+    # export SKIP_UNIT_TESTS=true
+    # export SKIP_SERIAL_TESTS=true
+    # export SKIP_LONG_RUNNING_TESTS=false
+    # export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+    # export SKIP_CONTRACT_BUILDER=true
+    # export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$'' 
@@ -105,7 +105,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
 EOF
     else
@@ -129,7 +129,7 @@ EOF
     timeout: ${TIMEOUT:-180}
     agents:
       - "queue=mac-anka-large-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
 EOF
     fi

From 420973d69ddf2e8737d0b360de1e1b6c77ab3d05 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:32:47 -0400
Subject: [PATCH 1207/1648] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 20 ++++++++++----------
 .cicd/generate-pipeline.sh     |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 1a941d5af06..e3c14e30e63 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -48,15 +48,15 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    # if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-    #     export SKIP_BUILD=false
-    #     export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
-    # fi
+    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+        export SKIP_BUILD=false
+        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+    fi
     export SKIP_BUILD=true
     # export SKIP_UNIT_TESTS=true
     # export SKIP_SERIAL_TESTS=true
     # export SKIP_LONG_RUNNING_TESTS=false
-    # export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     # export SKIP_CONTRACT_BUILDER=true
     # export SKIP_PACKAGE_BUILDER=true
 fi
@@ -150,7 +150,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-10}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
     else
@@ -172,7 +172,7 @@ EOF
     timeout: ${TIMEOUT:-20}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
     fi
@@ -195,7 +195,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-20}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 
 EOF
         else
@@ -217,7 +217,7 @@ EOF
     timeout: ${TIMEOUT:-20}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
         fi
     done
@@ -263,7 +263,7 @@ EOF
     timeout: ${TIMEOUT:-180}
     agents:
       - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
         fi
     done
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index b59175ba718..bba901e3174 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -341,6 +341,7 @@ cat <<EOF
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+        SKIP_BUILD: "true"
 
   - wait:
     continue_on_failure: true

From 0e925b42ae663b20a28ffdab4a97814d624f6206 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:35:49 -0400
Subject: [PATCH 1208/1648] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index e3c14e30e63..fb7e59762d6 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -52,10 +52,10 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=true
-    # export SKIP_UNIT_TESTS=true
-    # export SKIP_SERIAL_TESTS=true
-    # export SKIP_LONG_RUNNING_TESTS=false
+    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
+    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
+    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     # export SKIP_CONTRACT_BUILDER=true
     # export SKIP_PACKAGE_BUILDER=true

From 664d7e2eaf9dba6030c5d42b704e33bc208a8a65 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:38:29 -0400
Subject: [PATCH 1209/1648] Debugging.

---
 .cicd/generate-lrt-pipeline.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index fb7e59762d6..86883bc58d3 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -241,7 +241,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
     agents:
       queue: "automation-eos-builder-fleet"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
         else
@@ -281,6 +281,7 @@ cat <<EOF
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+        SKIP_BUILD: "true"
 
   - wait:
     continue_on_failure: true

From 6748ec5a09fe0495fa659921e843d34e06c9aaf8 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 16:58:52 -0400
Subject: [PATCH 1210/1648] Add logic to only trigger if not already triggered.

---
 .cicd/generate-lrt-pipeline.sh | 13 ++++++---
 .cicd/generate-pipeline.sh     | 50 ++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 86883bc58d3..cf55e1bf350 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -57,8 +57,8 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
     export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    # export SKIP_CONTRACT_BUILDER=true
-    # export SKIP_PACKAGE_BUILDER=true
+    export SKIP_CONTRACT_BUILDER=true
+    export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$'' 
@@ -269,8 +269,10 @@ EOF
     done
     IFS=$nIFS
 done
-cat <<EOF
-
+#############
+# LRT TESTS #
+if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+    cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
     build:
@@ -283,6 +285,9 @@ cat <<EOF
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
 
+EOF
+fi
+cat <<EOF
   - wait:
     continue_on_failure: true
 
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index bba901e3174..ed27eecc6f2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -57,12 +57,13 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=true
-    export SKIP_UNIT_TESTS=true
-    export SKIP_SERIAL_TESTS=true
-    export SKIP_LONG_RUNNING_TESTS=false
+    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
+    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
+    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
+    export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$''
@@ -115,7 +116,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
 EOF
     else
@@ -139,8 +140,10 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents: "queue=mac-anka-large-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_BUILD}
+    agents:
+      - "queue=mac-anka-large-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
+
 EOF
     fi
     if [ "$BUILDKITE_SOURCE" = 'schedule' ]; then
@@ -175,7 +178,7 @@ for ROUND in $(seq 1 $ROUNDS); do
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
         else
@@ -197,8 +200,10 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-20}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_UNIT_TESTS}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
+
 EOF
         fi
         if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
@@ -229,7 +234,7 @@ EOF
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-20}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 
 EOF
             else
@@ -251,9 +256,9 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-20}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_SERIAL_TESTS}
-
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
             if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
@@ -286,7 +291,7 @@ EOF
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 
 EOF
             else
@@ -308,8 +313,9 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents: "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_LONG_RUNNING_TESTS:-true}
+    agents:
+      - "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
             if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
@@ -328,9 +334,10 @@ EOF
         echo ''
     fi
 done
-# pipeline tail
-cat <<EOF
-
+#############
+# LRT TESTS #
+if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+    cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
     build:
@@ -343,6 +350,9 @@ cat <<EOF
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
 
+EOF
+fi
+cat <<EOF
   - wait:
     continue_on_failure: true
 

From 4ee5f53c3ed975fc12f78111ee9ed7ffbc8eeda7 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 17:05:09 -0400
Subject: [PATCH 1211/1648] Add logic to only trigger if not already triggered.

---
 .cicd/generate-lrt-pipeline.sh | 4 ++--
 .cicd/generate-pipeline.sh     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index cf55e1bf350..5a73f977c86 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -233,7 +233,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -249,7 +249,7 @@ EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
       - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     plugins:
       - chef/anka#v0.5.1:
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ed27eecc6f2..18e1bbeebee 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -283,7 +283,7 @@ EOF
                 cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -301,7 +301,7 @@ EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
       - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     plugins:
       - chef/anka#v0.5.1:
@@ -336,7 +336,7 @@ EOF
 done
 #############
 # LRT TESTS #
-if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 98f91359ee36a65e5944909b8d31e6f9eb0bac58 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 17:09:01 -0400
Subject: [PATCH 1212/1648] Add logic to only trigger if not already triggered.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 18e1bbeebee..4e0be60c2be 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -336,7 +336,7 @@ EOF
 done
 #############
 # LRT TESTS #
-if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 5797e558ef8e674dc733d7f99d7bfde4aa49378f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 17:10:03 -0400
Subject: [PATCH 1213/1648] Add logic to only trigger if not already triggered.

---
 .cicd/generate-lrt-pipeline.sh | 8 ++++----
 .cicd/generate-pipeline.sh     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 5a73f977c86..8e5ada0a9f5 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -233,7 +233,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -269,9 +269,9 @@ EOF
     done
     IFS=$nIFS
 done
-#############
-# LRT TESTS #
-if [[ ! -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+###############
+# TRIGGER LRT #
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4e0be60c2be..4607d9dd6d0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -283,7 +283,7 @@ EOF
                 cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
@@ -334,9 +334,9 @@ EOF
         echo ''
     fi
 done
-#############
-# LRT TESTS #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
+###############
+# TRIGGER LRT #
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From f5db605ecb33f11ee790ad4ea74e413d5665029a Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 11 Sep 2019 17:43:43 -0400
Subject: [PATCH 1214/1648] Adjust trigger logic.

---
 .cicd/generate-lrt-pipeline.sh | 6 ++----
 .cicd/generate-pipeline.sh     | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 8e5ada0a9f5..62a4001c99e 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -49,14 +49,12 @@ done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
     export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
     export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
     export SKIP_PACKAGE_BUILDER=true
 fi
@@ -271,7 +269,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4607d9dd6d0..bf7d4fb30b9 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -54,14 +54,12 @@ done
 # Triggered LRT
 if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
     if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export SKIP_BUILD=false
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
-    export SKIP_BUILD=${SKIP_BUILD:-true}
+    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
     export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
     export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
     export SKIP_CONTRACT_BUILDER=true
     export SKIP_PACKAGE_BUILDER=true
 fi
@@ -336,7 +334,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $SKIP_LONG_RUNNING_TESTS == false ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From c2865fa2eccd0d2b981fb64f148448b2aaabc329 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 09:26:10 -0400
Subject: [PATCH 1215/1648] Adjust trigger logic.

---
 .cicd/generate-lrt-pipeline.sh | 2 +-
 .cicd/generate-pipeline.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index 62a4001c99e..c321a02d6e4 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -269,7 +269,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index bf7d4fb30b9..e20a5cb0ddb 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -334,7 +334,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 6aaeaf8ce1a21017e1471176df8c173ee3acb3ea Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 09:30:43 -0400
Subject: [PATCH 1216/1648] Adjust trigger logic.

---
 .cicd/generate-lrt-pipeline.sh | 2 +-
 .cicd/generate-pipeline.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index c321a02d6e4..e1410f34789 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -269,7 +269,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index e20a5cb0ddb..eafae4a78e9 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -334,7 +334,7 @@ EOF
 done
 ###############
 # TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID || $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 57be1bff1c067ab306e9177764b20a447976e0a3 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 09:54:14 -0400
Subject: [PATCH 1217/1648] Adjust trigger logic.

---
 .cicd/generate-lrt-pipeline.sh | 2 +-
 .cicd/generate-pipeline.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
index e1410f34789..f2124055c2d 100755
--- a/.cicd/generate-lrt-pipeline.sh
+++ b/.cicd/generate-lrt-pipeline.sh
@@ -231,7 +231,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index eafae4a78e9..72b204248d2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -281,7 +281,7 @@ EOF
                 cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' /${BUILD_SOURCE} && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)

From 3fc1fcbb377914d843bdc5082200d88e2fbdacd4 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:21:36 -0400
Subject: [PATCH 1218/1648] Removed separate script in favor of conditional
 logic in  generate-pipeline.sh.

---
 .cicd/generate-lrt-pipeline.sh | 394 ---------------------------------
 1 file changed, 394 deletions(-)
 delete mode 100755 .cicd/generate-lrt-pipeline.sh

diff --git a/.cicd/generate-lrt-pipeline.sh b/.cicd/generate-lrt-pipeline.sh
deleted file mode 100755
index f2124055c2d..00000000000
--- a/.cicd/generate-lrt-pipeline.sh
+++ /dev/null
@@ -1,394 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-. ./.cicd/helpers/general.sh
-export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
-export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
-# Use files in platforms dir as source of truth for what platforms we need to generate steps for
-export PLATFORMS_JSON_ARRAY='[]'
-for FILE in $(ls $CICD_DIR/platforms); do
-    # Ability to skip mac or linux by not even creating the json block
-    ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
-    ( [[ $SKIP_LINUX == true ]] &&    [[ ! $FILE =~ 'macos' ]] ) && continue
-    # Prevent using both platform files (only use unpinned or pinned)
-    if [[ $PINNED == false || $UNPINNED == true ]] && [[ ! $FILE =~ 'macos' ]]; then
-        export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true}
-        export SKIP_PACKAGE_BUILDER=${SKIP_PACKAGE_BUILDER:-true}
-        [[ ! $FILE =~ 'unpinned' ]] && continue
-    else
-        [[ $FILE =~ 'unpinned' ]] && continue
-    fi
-    export FILE_NAME=$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')
-    export PLATFORM_NAME=$(echo $FILE_NAME | cut -d- -f1 | sed 's/os/OS/g')
-    export PLATFORM_NAME_UPCASE=$(echo $PLATFORM_NAME | tr a-z A-Z)
-    export VERSION_MAJOR=$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f1)
-    [[ $(echo $FILE_NAME | cut -d- -f2) =~ '.' ]] && export VERSION_MINOR="_$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f2)" || export VERSION_MINOR=''
-    export VERSION_FULL=$(echo $FILE_NAME | cut -d- -f2)
-    OLDIFS=$IFS
-    IFS="_"
-    set $PLATFORM_NAME
-    IFS=$OLDIFS
-    export PLATFORM_NAME_FULL="$(capitalize $1)$( [[ ! -z $2 ]] && echo "_$(capitalize $2)" || true ) $VERSION_FULL"
-    [[ $FILE_NAME =~ 'amazon' ]] && export ICON=':aws:'
-    [[ $FILE_NAME =~ 'ubuntu' ]] && export ICON=':ubuntu:'
-    [[ $FILE_NAME =~ 'centos' ]] && export ICON=':centos:'
-    [[ $FILE_NAME =~ 'macos' ]] && export ICON=':darwin:'
-    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$FILE # returns HASHED_IMAGE_TAG, etc
-    export PLATFORMS_JSON_ARRAY=$(echo $PLATFORMS_JSON_ARRAY | jq -c '. += [{ 
-        "FILE_NAME": env.FILE_NAME, 
-        "PLATFORM_NAME": env.PLATFORM_NAME,
-        "PLATFORM_NAME_UPCASE": env.PLATFORM_NAME_UPCASE,
-        "VERSION_MAJOR": env.VERSION_MAJOR,
-        "VERSION_MINOR": env.VERSION_MINOR,
-        "VERSION_FULL": env.VERSION_FULL,
-        "PLATFORM_NAME_FULL": env.PLATFORM_NAME_FULL,
-        "DOCKERHUB_FULL_TAG": env.FULL_TAG,
-        "HASHED_IMAGE_TAG": env.HASHED_IMAGE_TAG,
-        "ICON": env.ICON
-        }]')
-done
-# Triggered LRT
-if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
-    fi
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
-    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
-    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
-    export SKIP_CONTRACT_BUILDER=true
-    export SKIP_PACKAGE_BUILDER=true
-fi
-oIFS="$IFS"
-IFS=$'' 
-nIFS=$IFS # Needed to fix array splitting (\n won't work)
-###################
-# Anka Ensure Tag #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-    cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
-    command:
-      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-    agents:
-      - "queue=mac-anka-templater-fleet"
-    env:
-      REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-      REPO_COMMIT: $BUILDKITE_COMMIT
-      TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
-      TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
-      PINNED: $PINNED
-      UNPINNED: $UNPINNED
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
-      PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
-    timeout: ${TIMEOUT:-320}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
-
-EOF
-    fi
-done
-echo "  - wait"; echo ""
-###############
-# BUILD STEPS #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
-    command:
-      - "./.cicd/build.sh"
-      - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
-
-EOF
-    else
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && ./.cicd/build.sh"
-      - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          modify-cpu: 12
-          modify-ram: 24
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-large-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
-
-EOF
-    fi
-done
-echo "  - wait"; echo ""
-##############
-# UNIT TESTS #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/parallel-test.sh"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
-
-EOF
-    else
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
-
-EOF
-    fi
-done
-################
-# SERIAL TESTS #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    IFS=$oIFS
-    SERIAL_TESTS=$(cat tests/CMakeLists.txt | grep nonparallelizable_tests | grep -v "^#" | awk -F" " '{ print $2 }')
-    for TEST_NAME in $SERIAL_TESTS; do
-        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-20}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
-
-EOF
-        else
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
-EOF
-        fi
-    done
-    IFS=$nIFS
-done
-#############
-# LRT TESTS #
-echo $PLATFORMS_JSON_ARRAY | jq -cr ".[]" | while read -r PLATFORM_JSON; do
-    IFS=$oIFS
-    LR_TESTS=$(cat tests/CMakeLists.txt | grep long_running_tests | grep -v "^#" | awk -F" " '{ print $2 }')
-    for TEST_NAME in $LR_TESTS; do
-        if [[ ! $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) =~ 'macos' ]]; then
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
-      - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-    env:
-      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-180}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
-
-EOF
-        else
-            cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
-          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
-          always-pull: true
-          debug: true
-          wait-network: true
-    timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-node-fleet"
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
-EOF
-        fi
-    done
-    IFS=$nIFS
-done
-###############
-# TRIGGER LRT #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
-    cat <<EOF
-  - label: ":pipeline: Trigger LRTs"
-    trigger: "eosio-lrt"
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-      env:
-        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
-        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
-        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
-        SKIP_BUILD: "true"
-
-EOF
-fi
-cat <<EOF
-  - wait:
-    continue_on_failure: true
-
-  - label: ":bar_chart: Test Metrics"
-    command: |
-      echo '+++ :compression: Extracting Test Metrics Code'
-      tar -zxf .cicd/metrics/test-metrics.tar.gz
-      echo '+++ :javascript: Running test-metrics.js'
-      node --max-old-space-size=32768 test-metrics.js
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    soft_fail: true
-
-  - wait
-
-  - label: ":centos: CentOS 7.6 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "centos-7.6"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "el7" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "rpm"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
-
-  - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "ubuntu-16.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "deb"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
-
-  - label: ":ubuntu: Ubuntu 18.04 - Package Builder"
-    command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
-      - "./.cicd/package.sh"
-    env:
-      IMAGE_TAG: "ubuntu-18.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-      OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
-      PKGTYPE: "deb"
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
-
-  - label: ":darwin: macOS 10.14 - Package Builder"
-    command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
-      - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
-      - "cd eos && ./.cicd/package.sh"
-    plugins:
-      - chef/anka#v0.5.1:
-          no-volume: true
-          inherit-environment-vars: true
-          vm-name: 10.14.4_6C_14G_40G
-          vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
-          always-pull: true
-          debug: true
-          wait-network: true
-    agents:
-      - "queue=mac-anka-node-fleet"
-    timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
-
-  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
-    command: "./.cicd/installation-build.sh"
-    env:
-      IMAGE_TAG: "ubuntu-18.04-unpinned"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    agents:
-      queue: "automation-eos-builder-fleet"
-    timeout: ${TIMEOUT:-30}
-    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
-
-  - wait
-
-  - label: ":git: Git Submodule Regression Check"
-    command: "./.cicd/submodule-regression-check.sh"
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-5}
-
-  - label: ":beer: Brew Updater"
-    command: |
-      buildkite-agent artifact download eosio.rb . --step ':darwin: macOS 10.14 - Package Builder'
-      buildkite-agent artifact upload eosio.rb
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: "${TIMEOUT:-5}"
-    skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
-
-EOF
-IFS=$oIFS
\ No newline at end of file

From 03b6258f641a124c86539422ad0310fbbb92b84f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:22:31 -0400
Subject: [PATCH 1219/1648] Removed vars in favor of Terraform applying at
 pipeline level.

---
 .cicd/generate-pipeline.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 72b204248d2..f29d5273f17 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -57,11 +57,6 @@ if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
         export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
     fi
     export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
-    export SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-true}
-    export SKIP_SERIAL_TESTS=${SKIP_SERIAL_TESTS:-true}
-    export SKIP_LONG_RUNNING_TESTS=${SKIP_LONG_RUNNING_TESTS:-false}
-    export SKIP_CONTRACT_BUILDER=true
-    export SKIP_PACKAGE_BUILDER=true
 fi
 oIFS="$IFS"
 IFS=$''

From 5976484a8bdb71187abd2d9ddcd262b384d543ea Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:27:54 -0400
Subject: [PATCH 1220/1648] Logic prep for only triggering on PRs.

---
 .cicd/generate-pipeline.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index f29d5273f17..96f595cf04f 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -327,9 +327,10 @@ EOF
         echo ''
     fi
 done
-###############
-# TRIGGER LRT #
+#####################
+# TRIGGERS ON PR #
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
+# if [[ $BUILDKITE_PULL_REQUEST ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
@@ -343,6 +344,17 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosi
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
 
+  - label: ":pipeline: Trigger LRTs"
+    trigger: "eos-multiversion-tests"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
+        BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+
 EOF
 fi
 cat <<EOF

From 3506d39ae0b76339d1e04280af1a54d2306f86e8 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:36:33 -0400
Subject: [PATCH 1221/1648] Logic prep for only triggering on PRs.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 96f595cf04f..ad60cb46585 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -330,7 +330,7 @@ done
 #####################
 # TRIGGERS ON PR #
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
-# if [[ $BUILDKITE_PULL_REQUEST ]]; then
+# if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 5707017945ef2f799ff708b63e2782306add304a Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:46:13 -0400
Subject: [PATCH 1222/1648] Switch logic to run on PRs.

---
 .cicd/generate-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ad60cb46585..36552440dc3 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -329,8 +329,8 @@ EOF
 done
 #####################
 # TRIGGERS ON PR #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
-# if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST ]]; then
+# if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 00db51d5f77001f2977b264425e9c0947f41721b Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:48:43 -0400
Subject: [PATCH 1223/1648] Switch logic to run on PRs.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 36552440dc3..4db9519bb64 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -330,7 +330,7 @@ done
 #####################
 # TRIGGERS ON PR #
 # if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST ]]; then
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From 04970a494fec2ae67f0a006103bbdbdc7211d755 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:52:37 -0400
Subject: [PATCH 1224/1648] Remove slug check in favor of only using trigger
 check.

---
 .cicd/generate-pipeline.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4db9519bb64..b2f7089d665 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -52,12 +52,10 @@ for FILE in $(ls $CICD_DIR/platforms); do
         }]')
 done
 # Triggered LRT
-if [[ ${BUILDKITE_PIPELINE_SLUG} == "eosio-lrt" ]]; then
-    if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-        export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
-    fi
-    export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+    export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
 fi
+export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
 oIFS="$IFS"
 IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)

From b150508ead5a456f109395c2c1f2939af36b1153 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:55:17 -0400
Subject: [PATCH 1225/1648] Remove old if statement.

---
 .cicd/generate-pipeline.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index b2f7089d665..91c5449383e 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -325,9 +325,8 @@ EOF
         echo ''
     fi
 done
-#####################
+##################
 # TRIGGERS ON PR #
-# if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PIPELINE_SLUG != "eosio-lrt" ]]; then
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"

From 2d05d36098a191467fffd2cd7e1d36ff55e6cb50 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 10:57:41 -0400
Subject: [PATCH 1226/1648] Fix multiversion trigger label.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 91c5449383e..6f3eb6a6afc 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -341,7 +341,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
 
-  - label: ":pipeline: Trigger LRTs"
+  - label: ":pipeline: Trigger Multiversion"
     trigger: "eos-multiversion-tests"
     build:
       message: "${BUILDKITE_MESSAGE}"

From 0787091c69ea86e055ed7748c7d641a3213f75c6 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 11:11:30 -0400
Subject: [PATCH 1227/1648] Pass pinned/unpinned variable for LRTs triggered by
 eosio-unnpinned pipeline.

---
 .cicd/generate-pipeline.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 6f3eb6a6afc..5c6d554d233 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -340,6 +340,8 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
+        PINNED: "${PINNED}"
+        UNPINNED: "${UNPINNED}"
 
   - label: ":pipeline: Trigger Multiversion"
     trigger: "eos-multiversion-tests"

From 804002c12c5afd534c10ee0f20109bbfc82a921a Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 11:15:21 -0400
Subject: [PATCH 1228/1648] Remove newline.

---
 .cicd/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 99c2aa488ca..900aea633e0 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -8,4 +8,4 @@ steps:
       - "buildkite-agent artifact upload generated-pipeline.yml"
     agents:
       queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-10}
+    timeout: ${TIMEOUT:-10}
\ No newline at end of file

From 1e25597a675ffece0590387772f8458e19dc34cb Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 11:58:04 -0400
Subject: [PATCH 1229/1648] Multiversion shouldn't be called on unpinned build
 trigger.

---
 .cicd/generate-pipeline.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 5c6d554d233..2e413f5a41d 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -325,8 +325,8 @@ EOF
         echo ''
     fi
 done
-##################
-# TRIGGERS ON PR #
+#############
+# LRT ON PR #
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
@@ -343,6 +343,13 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         PINNED: "${PINNED}"
         UNPINNED: "${UNPINNED}"
 
+EOF
+fi
+######################
+# MULTIVERSION ON PR #
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
+    if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
+    cat <<EOF
   - label: ":pipeline: Trigger Multiversion"
     trigger: "eos-multiversion-tests"
     build:
@@ -355,6 +362,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
 
 EOF
+    fi
 fi
 cat <<EOF
   - wait:

From 59534020cb98a09404e44bc4018a94de596dc651 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 14:30:32 -0400
Subject: [PATCH 1230/1648] Trigger multiversion async so we don't wait for it.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 2e413f5a41d..75da523a881 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -352,6 +352,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
     cat <<EOF
   - label: ":pipeline: Trigger Multiversion"
     trigger: "eos-multiversion-tests"
+    async: true
     build:
       message: "${BUILDKITE_MESSAGE}"
       commit: "${BUILDKITE_COMMIT}"

From 5eb4efff0368263895fb9f5eb8a6dbe070e9d615 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 16:45:03 -0400
Subject: [PATCH 1231/1648] Set LRTs as async as well.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 75da523a881..4e147432ab2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -331,6 +331,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"
+    async: true
     build:
       message: "${BUILDKITE_MESSAGE}"
       commit: "${BUILDKITE_COMMIT}"

From dc8c6259159c545d3db0288d48b6539cdbb6ca46 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 16:45:35 -0400
Subject: [PATCH 1232/1648] Unpinned builds don't need to run LRTs on every PR.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 4e147432ab2..d14aa73e933 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -328,6 +328,7 @@ done
 #############
 # LRT ON PR #
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
+    if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
   - label: ":pipeline: Trigger LRTs"
     trigger: "eosio-lrt"

From dc9d1c408faeadba4200d308b67e566b34246e15 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Sep 2019 16:52:15 -0400
Subject: [PATCH 1233/1648] Unpinned builds don't need to run LRTs on every PR.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d14aa73e933..223e5d15292 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -346,6 +346,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
         UNPINNED: "${UNPINNED}"
 
 EOF
+    fi
 fi
 ######################
 # MULTIVERSION ON PR #

From 4eca0e7dfc3355fc8866b2da9a339a6cbbc65361 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 10:19:35 -0400
Subject: [PATCH 1234/1648] Concurrency attempt.

---
 .cicd/generate-pipeline.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 223e5d15292..79677d10d82 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -51,7 +51,7 @@ for FILE in $(ls $CICD_DIR/platforms); do
         "ICON": env.ICON
         }]')
 done
-# Triggered LRT
+# set build source whether triggered or not
 if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
     export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
 fi
@@ -137,7 +137,7 @@ EOF
 
 EOF
     fi
-    if [ "$BUILDKITE_SOURCE" = 'schedule' ]; then
+    if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
         cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -197,7 +197,7 @@ EOF
 
 EOF
         fi
-        if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+        if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
             cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -252,7 +252,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
-            if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -309,7 +309,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
-            if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -330,7 +330,7 @@ done
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
-  - label: ":pipeline: Trigger LRTs"
+  - label: ":pipeline: Trigger Long Running Tests"
     trigger: "eosio-lrt"
     async: true
     build:
@@ -353,7 +353,7 @@ fi
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
     if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
-  - label: ":pipeline: Trigger Multiversion"
+  - label: ":pipeline: Trigger Multiversion Test"
     trigger: "eos-multiversion-tests"
     async: true
     build:

From 7bff72d24fce0d6f8747e3d4acc2feabfaf31dba Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 10:21:51 -0400
Subject: [PATCH 1235/1648] Concurrency attempt.

---
 .cicd/generate-pipeline.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 79677d10d82..c5a0bf467d0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -137,7 +137,7 @@ EOF
 
 EOF
     fi
-    if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+    if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
         cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -197,7 +197,7 @@ EOF
 
 EOF
         fi
-        if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+        if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
             cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -252,7 +252,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -309,7 +309,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' | "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}

From 80762d1cf7216ecc17282267f8fc7bdc28c3b1bf Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 10:40:03 -0400
Subject: [PATCH 1236/1648] Trigger builds don't conflict with scheduled
 concurrency groups.

---
 .cicd/generate-pipeline.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c5a0bf467d0..72db88c01e2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -52,10 +52,12 @@ for FILE in $(ls $CICD_DIR/platforms); do
         }]')
 done
 # set build source whether triggered or not
-if [[ -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-    export BUILD_SOURCE="--build \$BUILDKITE_BUILD_ID"
+if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
+    export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}"
+    LINUX_CONCURRENCY_GROUP="eos-trigger-linux-${BUILDKITE_BUILD_NUMBER}"
+    MAC_CONCURRENCY_GROUP="eos-trigger-mac"
 fi
-export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}
 oIFS="$IFS"
 IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)

From 76e763e4c12f14b5daf549940606bf7525ee6563 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:00:10 -0400
Subject: [PATCH 1237/1648] Fix BUILD_SOURCE on triggered builds.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 72db88c01e2..f112320231f 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -53,7 +53,7 @@ for FILE in $(ls $CICD_DIR/platforms); do
 done
 # set build source whether triggered or not
 if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
-    export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID}"
+    export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID"
     LINUX_CONCURRENCY_GROUP="eos-trigger-linux-${BUILDKITE_BUILD_NUMBER}"
     MAC_CONCURRENCY_GROUP="eos-trigger-mac"
 fi

From d9a380708d27eabe577eed0ba966a944c6c5a0bf Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Fri, 13 Sep 2019 11:16:24 -0400
Subject: [PATCH 1238/1648] Update eos-vm

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 98a34860743..3a25cc10506 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 98a34860743ff586dfefc587a5a66be4717352aa
+Subproject commit 3a25cc10506be4a09b87066382d9cf8b5c9c77c5

From 7618963982bc13372451109c3a5055052c9ab0f4 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:26:53 -0400
Subject: [PATCH 1239/1648] Only one concurrency group for Linux.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index f112320231f..d723c43e98e 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -54,7 +54,7 @@ done
 # set build source whether triggered or not
 if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
     export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID"
-    LINUX_CONCURRENCY_GROUP="eos-trigger-linux-${BUILDKITE_BUILD_NUMBER}"
+    LINUX_CONCURRENCY_GROUP="eos-trigger-linux"
     MAC_CONCURRENCY_GROUP="eos-trigger-mac"
 fi
 export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}

From d802cbee12be7a08e9bc60f9799758d3bba3ae5f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:27:08 -0400
Subject: [PATCH 1240/1648] Empty commit.


From 1296499681b8ca60954f651bb9235f4b4857f561 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:45:59 -0400
Subject: [PATCH 1241/1648] Remove concurrency and trigger on PR in favor of
 triggering post PR.

---
 .cicd/generate-pipeline.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d723c43e98e..d7653386238 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -51,13 +51,15 @@ for FILE in $(ls $CICD_DIR/platforms); do
         "ICON": env.ICON
         }]')
 done
-# set build source whether triggered or not
+# set build_source whether triggered or not
 if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
     export BUILD_SOURCE="--build \$BUILDKITE_TRIGGERED_FROM_BUILD_ID"
-    LINUX_CONCURRENCY_GROUP="eos-trigger-linux"
-    MAC_CONCURRENCY_GROUP="eos-trigger-mac"
 fi
 export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}
+# set trigger_job if master/release/develop branch and webhook
+if [[ $BUILDKITE_BRANCH =~ ^release/[0-9].[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ ]]; then
+    [[ $BUILDKITE_SOURCE == 'webhook' ]] && export TRIGGER_JOB=true
+fi
 oIFS="$IFS"
 IFS=$''
 nIFS=$IFS # fix array splitting (\n won't work)
@@ -139,7 +141,7 @@ EOF
 
 EOF
     fi
-    if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+    if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
         cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -199,7 +201,7 @@ EOF
 
 EOF
         fi
-        if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+        if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
             cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -254,7 +256,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -311,7 +313,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' || "$BUILDKITE_SOURCE" == 'trigger_job' ]]; then
+            if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -327,9 +329,8 @@ EOF
         echo ''
     fi
 done
-#############
-# LRT ON PR #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
+# trigger eosio-lrt post pr
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
     if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
   - label: ":pipeline: Trigger Long Running Tests"
@@ -350,9 +351,8 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false
 EOF
     fi
 fi
-######################
-# MULTIVERSION ON PR #
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $BUILDKITE_PULL_REQUEST != "false" ]]; then
+# trigger multiversion post pr
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
     if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
     cat <<EOF
   - label: ":pipeline: Trigger Multiversion Test"

From ae747ce93d923e25788447835b474d7b393806bb Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 11:52:26 -0400
Subject: [PATCH 1242/1648] Finish resetting source checks for concurrency.

---
 .cicd/generate-pipeline.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d7653386238..30704505915 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -141,7 +141,7 @@ EOF
 
 EOF
     fi
-    if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
+    if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
         cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -201,7 +201,7 @@ EOF
 
 EOF
         fi
-        if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
+        if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
             cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -256,7 +256,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
+            if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}
@@ -313,7 +313,7 @@ EOF
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi
-            if [[ "$BUILDKITE_SOURCE" == 'schedule' ]]; then
+            if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
                 cat <<EOF
     concurrency: ${CONCURRENCY}
     concurrency_group: ${CONCURRENCY_GROUP}

From b6e1c1d1ddd535bdbdd8eab9fb0e669d308e62dc Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 12:34:12 -0400
Subject: [PATCH 1243/1648] Fix mac queues being moved around.

---
 .cicd/generate-pipeline.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 30704505915..a5738e74a55 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -135,8 +135,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-large-node-fleet"
+    agents: "queue=mac-anka-large-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
 EOF
@@ -195,8 +194,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
+    agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
@@ -251,8 +249,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-20}
-    agents:
-      - "queue=mac-anka-node-fleet"
+    agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
@@ -308,8 +305,7 @@ EOF
           debug: true
           wait-network: true
     timeout: ${TIMEOUT:-180}
-    agents:
-      - "queue=mac-anka-node-fleet"
+    agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi

From b6aeaf137d2f80dc5ab80723e548135abd09c0da Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 13 Sep 2019 11:47:06 -0500
Subject: [PATCH 1244/1648] Reverted all changes to chain_plugin.

---
 plugins/chain_plugin/chain_plugin.cpp | 228 +++-----------------------
 1 file changed, 27 insertions(+), 201 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 2e471f5e95f..ad21e212c17 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -10,7 +10,6 @@
 #include <eosio/chain/reversible_block_object.hpp>
 #include <eosio/chain/controller.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
-#include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/snapshot.hpp>
 
 #include <eosio/chain/eosio_contract.hpp>
@@ -109,7 +108,6 @@ using namespace eosio;
 using namespace eosio::chain;
 using namespace eosio::chain::config;
 using namespace eosio::chain::plugin_interface;
-using namespace eosio::chain::legacy;
 using vm_type = wasm_interface::vm_type;
 using fc::flat_map;
 
@@ -138,7 +136,7 @@ class chain_plugin_impl {
    fc::optional<controller::config> chain_config;
    fc::optional<controller>         chain;
    fc::optional<chain_id_type>      chain_id;
-   std::string                      chain_id_source;
+   fc::optional<genesis_state>      genesis;
    //txn_msg_rate_limits              rate_limits;
    fc::optional<vm_type>            wasm_runtime;
    fc::microseconds                 abi_serializer_max_time_ms;
@@ -261,7 +259,6 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
 
    cli.add_options()
          ("genesis-json", bpo::value<bfs::path>(), "File to read Genesis State from")
-         ("chain-id", bpo::value<string>(), "chain_id for the blockchain")
          ("genesis-timestamp", bpo::value<string>(), "override the initial timestamp in the Genesis State file")
          ("print-genesis-json", bpo::bool_switch()->default_value(false),
           "extract genesis_state from blocks.log as JSON, print to console, and exit")
@@ -684,13 +681,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          genesis_state gs;
 
          if( fc::exists( my->blocks_dir / "blocks.log" )) {
-            const auto extracted_genesis_state = block_log::extract_genesis_state( my->blocks_dir );
-            if( extracted_genesis_state ) {
-               gs = *extracted_genesis_state;
-            } else {
-               wlog( "No genesis state was in blocks.log found at '${p}'. Using default genesis state.",
-                     ("p", (my->blocks_dir / "blocks.log").generic_string()));
-            }
+            gs = block_log::extract_genesis_state( my->blocks_dir );
          } else {
             wlog( "No blocks.log found at '${p}'. Using default genesis state.",
                   ("p", (my->blocks_dir / "blocks.log").generic_string()));
@@ -786,90 +777,18 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                      "Cannot load snapshot, ${name} does not exist", ("name", my->snapshot_path->generic_string()) );
 
          // recover genesis information from the snapshot
+         // used for validation code below
          auto infile = std::ifstream(my->snapshot_path->generic_string(), (std::ios::in | std::ios::binary));
          auto reader = std::make_shared<istream_snapshot_reader>(infile);
          reader->validate();
-         chain_snapshot_header header;
-         reader->read_section<chain_snapshot_header>([&header]( auto& section ){
-            section.read_row(header);
-            header.validate();
-         });
-
-         const auto version = header.version;
-
-         using v2 = legacy::snapshot_global_property_object_v2;
-         if (std::clamp(version, v2::minimum_version, v2::maximum_version) == version ) {
-            my->chain_config->genesis.emplace();
-            reader->read_section<genesis_state>([this]( auto &section ){
-               section.read_row(*my->chain_config->genesis);
-            });
-            my->chain_id = my->chain_config->genesis->compute_chain_id();
-            my->chain_id_source = "snapshot";
-         }
-
          infile.close();
 
          EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,
                  plugin_config_exception,
                  "--snapshot is incompatible with --genesis-timestamp as the snapshot contains genesis information");
-
-         if( options.count( "genesis-json" )) {
-            auto genesis_path = options.at( "genesis-json" ).as<bfs::path>();
-            if( genesis_path.is_relative() ) {
-               genesis_path = bfs::current_path() / genesis_path;
-            }
-            EOS_ASSERT( fc::is_regular_file( genesis_path ),
-                        plugin_config_exception,
-                        "Specified genesis file '${genesis}' does not exist.",
-                        ("genesis", genesis_path.generic_string()));
-            const auto genesis_file = fc::json::from_file( genesis_path ).as<genesis_state>();
-            if (my->chain_config->genesis) {
-               EOS_ASSERT( *my->chain_config->genesis == genesis_file, plugin_config_exception,
-                           "Genesis state provided via command line arguments does not match the existing genesis state in the ${source}. "
-                           "It is not necessary to provide a genesis state argument when loading a snapshot.", ("source", my->chain_id_source)
-               );
-            }
-            else {
-               if( my->chain_id ) {
-                  ilog("REMOVE chain id: ${ci}, genesis chain id: ${gci}", ("ci", *my->chain_id)("gci",genesis_file.compute_chain_id()));
-                  EOS_ASSERT( *my->chain_id == genesis_file.compute_chain_id(), plugin_config_exception,
-                              "Genesis state's chain id provided via command line arguments does not match the chain id in the ${source}. "
-                              "It is not necessary to provide a genesis state argument when loading a snapshot.", ("source", my->chain_id_source)
-                  );
-               }
-               else {
-                  my->chain_config->genesis.emplace(genesis_file);
-                  my->chain_id = genesis_file.compute_chain_id();
-                  my->chain_id_source = "genesis json";
-               }
-            }
-         }
-
-         if( options.count( "chain-id" ) ) {
-            auto ci = options.at( "chain-id" );
-            ilog("chain-id");
-            ilog("chain-id passed ${ci}",("ci", ci.as<string>()));
-            auto get_chain_id = [chain_id=ci.as<string>()]() {
-               try {
-                  ilog("chain-id: ${ci}",("ci", chain_id));
-                  return fc::json::from_string(chain_id).as<chain_id_type>();
-               } catch ( fc::exception& e ) {
-                  elog("Malformed chain id");
-                  throw e;
-               }};
-            const chain_id_type passed_chain_id = get_chain_id();
-            if( my->chain_id ) {
-               ilog("REMOVE chain id: ${ci}, passed_chain_id: ${gci}", ("ci", *my->chain_id)("gci",passed_chain_id));
-               EOS_ASSERT( *my->chain_id == passed_chain_id, plugin_config_exception,
-                           "chain id provided via command line arguments does not match the existing chain id in the ${source}. "
-                           "It is not necessary to provide a chain id argument when loading a snapshot.", ("source", my->chain_id_source)
-               );
-            }
-            else {
-               my->chain_id = passed_chain_id;
-               my->chain_id_source = "chain id command line parameter";
-            }
-         }
+         EOS_ASSERT( options.count( "genesis-json" ) == 0,
+                     plugin_config_exception,
+                     "--snapshot is incompatible with --genesis-json as the snapshot contains genesis information");
 
          auto shared_mem_path = my->chain_config->state_dir / "shared_memory.bin";
          EOS_ASSERT( !fc::exists(shared_mem_path),
@@ -877,67 +796,31 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                  "Snapshot can only be used to initialize an empty database." );
 
          if( fc::is_regular_file( my->blocks_dir / "blocks.log" )) {
-            fc::optional<chain_id_type> log_chain_id;
             auto log_genesis = block_log::extract_genesis_state(my->blocks_dir);
             if (log_genesis) {
-               if (my->chain_config->genesis) {
-                  // using chain_id_source to distinguish if the snapshot provided the genesis state we are comparing to
-                  // or if it was a passed in command line parameter
-                  EOS_ASSERT( log_genesis == *my->chain_config->genesis, plugin_config_exception,
-                              "Genesis state provided via block log does not match the existing genesis state in the "
-                              "${source}. ${extra}", ("source", my->chain_id_source)
-                                      ("extra", (my->chain_id_source == "snapshot" ?
-                                                 "Block log and snapshot genesis state are inconsistent." :
-                                                 "It is not necessary to provide genesis state argument when providing a block log."))
-                  );
-               }
-               else {
-                  my->chain_config->genesis = log_genesis;
-               }
-               log_chain_id.emplace(my->chain_config->genesis->compute_chain_id());
-            }
+               if ()
 
-            // if the genesis state did not exist in the
-            if (!log_chain_id) {
-               log_chain_id.emplace(block_log::extract_chain_id(my->blocks_dir));
-            }
-
-            if( my->chain_id ) {
-               EOS_ASSERT( *log_chain_id == *my->chain_id,
-                           plugin_config_exception,
-                           "Chain id in blocks.log does not match chain id in the snapshot");
             }
             else {
-               my->chain_id = log_chain_id;
-               my->chain_id_source = "block log";
+
             }
+            FIX
+            EOS_ASSERT( log_genesis.compute_chain_id() == my->chain_config->genesis.compute_chain_id(),
+                    plugin_config_exception,
+                    "Genesis information in blocks.log does not match genesis information in the snapshot");
          }
 
-         if (my->chain_id) {
-            ilog("chain id set to: ${ci} by ${source}", ("ci", my->chain_id)("source", my->chain_id_source));
-         }
-         if (my->chain_config->genesis) {
-            ilog("genesis set to: ${ci}", ("ci", *my->chain_config->genesis));
-         }
       } else {
          bfs::path genesis_file;
          bool genesis_timestamp_specified = false;
          fc::optional<genesis_state> existing_genesis;
 
          if( fc::exists( my->blocks_dir / "blocks.log" ) ) {
-            existing_genesis = block_log::extract_genesis_state( my->blocks_dir );
-            EOS_ASSERT( existing_genesis,
-                        plugin_config_exception,
-                        "Specified genesis file '${genesis}' does not contain a genesis state (truncated block log).  "
-                        "Truncated block logs can only be used with snapshots.",
-                        ("genesis", genesis_file.generic_string()));
-            my->chain_config->genesis = *existing_genesis;
-            my->chain_id = existing_genesis->compute_chain_id();
-            my->chain_id_source = "block log";
+            my->chain_config->genesis = block_log::extract_genesis_state( my->blocks_dir );
+            existing_genesis = my->chain_config->genesis;
          }
 
-         const bool genesis_provided = options.count( "genesis-json" );
-         if( genesis_provided ) {
+         if( options.count( "genesis-json" )) {
             genesis_file = options.at( "genesis-json" ).as<bfs::path>();
             if( genesis_file.is_relative()) {
                genesis_file = bfs::current_path() / genesis_file;
@@ -949,54 +832,17 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                        ("genesis", genesis_file.generic_string()));
 
             my->chain_config->genesis = fc::json::from_file( genesis_file ).as<genesis_state>();
-         }
-         else if( !my->chain_id ) {
-            my->chain_config->genesis.emplace();
-            // will handle setting the my->chain_id below
-         }
 
-         if( options.count( "genesis-timestamp" ) ) {
-            my->chain_config->genesis->initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
-            genesis_timestamp_specified = true;
-         }
-
-         if ( (genesis_provided || genesis_timestamp_specified) &&
-              !my->chain_id ) {
-            const auto chain_id_from_gs = my->chain_config->genesis->compute_chain_id();
-            my->chain_id = chain_id_from_gs;
-            my->chain_id_source = "genesis-json";
-         }
-
-         if( options.count( "chain-id" )) {
-            auto get_chain_id = [chain_id=options.at( "chain-id" ).as<string>()]() {
-               try {
-                  ilog("chain-id: ${ci}",("ci", chain_id));
-                  return fc::json::from_string(chain_id).as<chain_id_type>();
-               } catch ( fc::exception& e ) {
-                  elog("Malformed chain id");
-                  throw e;
-               }};
-            const chain_id_type passed_chain_id = get_chain_id();
-            if (my->chain_id) {
-               ilog("REMOVE chain id: ${ci}, passed_chain_id: ${gci}", ("ci", *my->chain_id)("gci",passed_chain_id));
-               EOS_ASSERT( *my->chain_id == passed_chain_id, plugin_config_exception,
-                           "chain id provided via command line arguments does not match the existing chain id in the ${source}. "
-                           "Providing a chain id argument is not required.", ("source", my->chain_id_source)
-               );
-            }
-            else {
-               EOS_ASSERT( my->chain_config->genesis, plugin_config_exception,
-                           "Must provide \"--genesis-json\" option since no existing block log."
-               );
-               ilog("REMOVE my->chain_config->genesis->compute_chain_id(): ${ci}, passed_chain_id: ${gci}", ("ci", my->chain_config->genesis->compute_chain_id())("gci",passed_chain_id));
-               EOS_ASSERT( my->chain_config->genesis->compute_chain_id() == passed_chain_id, plugin_config_exception,
-                           "chain id provided via command line arguments does not match the existing chain id in the default genesis state. "
-                           "Providing a chain id argument is not required."
-               );
-               my->chain_id = passed_chain_id;
-               my->chain_id_source = "chain id command line parameter";
+            if( options.count( "genesis-timestamp" ) ) {
+               my->chain_config->genesis.initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
+               genesis_timestamp_specified = true;
             }
          }
+         else {
+            EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,
+                        plugin_config_exception,
+                        "--genesis-timestamp is only valid if also passed in with --genesis-json");
+         }
 
          if( !existing_genesis ) {
             if( !genesis_file.empty() ) {
@@ -1012,21 +858,11 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             } else {
                wlog( "Starting up fresh blockchain with default genesis state." );
             }
-
-            if( !my->chain_id ) {
-               my->chain_id = my->chain_config->genesis->compute_chain_id();
-               my->chain_id_source = "default genesis state";
-            }
          } else {
             EOS_ASSERT( my->chain_config->genesis == *existing_genesis, plugin_config_exception,
                         "Genesis state provided via command line arguments does not match the existing genesis state in blocks.log. "
                         "It is not necessary to provide genesis state arguments when a blocks.log file already exists."
-            );
-         }
-
-         ilog("chain id set to: ${ci} by ${source}", ("ci", my->chain_id)("source", my->chain_id_source));
-         if (my->chain_config->genesis) {
-            ilog("genesis set to: ${ci}", ("ci", *my->chain_config->genesis));
+                      );
          }
       }
 
@@ -1044,18 +880,8 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          my->chain_config->db_hugepage_paths = options.at("database-hugepage-path").as<std::vector<std::string>>();
 #endif
 
-      my->chain.emplace( *my->chain_config, my->chain_id, std::move(pfs) );
-      auto actual_chain_id = my->chain->get_chain_id();
-      if( !my->chain_id ) {
-         my->chain_id.emplace( actual_chain_id);
-         ilog("chain id now set to: ${ci}", ("ci", my->chain_id));
-      }
-      else {
-         EOS_ASSERT( *my->chain_id == actual_chain_id, plugin_config_exception,
-                     "chain id provided via command line arguments does not match the existing chain id in the ${source}. "
-                     "Providing a chain id argument is not required.", ("source", my->chain_id_source)
-         );
-      }
+      my->chain.emplace( *my->chain_config, std::move(pfs) );
+      my->chain_id.emplace( my->chain->get_chain_id());
 
       // set up method providers
       my->get_block_by_number_provider = app().get_method<methods::get_block_by_number>().register_provider(
@@ -1143,7 +969,7 @@ void chain_plugin::plugin_startup()
    }
 
    ilog("Blockchain started; head block is #${num}, genesis timestamp is ${ts}",
-        ("num", my->chain->head_block_num())("ts", (std::string)my->chain_config->genesis->initial_timestamp));
+        ("num", my->chain->head_block_num())("ts", (std::string)my->chain_config->genesis.initial_timestamp));
 
    my->chain_config.reset();
 } FC_CAPTURE_AND_RETHROW() }

From 0681d326259cc0cc4a691dfb2ac89a928ed94a0f Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 13 Sep 2019 11:47:31 -0500
Subject: [PATCH 1245/1648] Changes from PR to remove storage of optional
 genesis in controller.

---
 libraries/chain/controller.cpp                | 264 ++++++++++--------
 .../include/eosio/chain/chain_id_type.hpp     |   1 +
 .../chain/include/eosio/chain/controller.hpp  |  10 +-
 plugins/chain_plugin/chain_plugin.cpp         |  80 ++++--
 4 files changed, 213 insertions(+), 142 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 66fe3b09520..97a937811b9 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -281,7 +281,7 @@ struct controller_impl {
       apply_handlers[receiver][make_pair(contract,action)] = v;
    }
 
-   controller_impl( const controller::config& cfg, const fc::optional<chain_id_type>& cfg_chain_id, controller& s, protocol_feature_set&& pfs  )
+   controller_impl( const controller::config& cfg, controller& s, protocol_feature_set&& pfs  )
    :self(s),
     db( cfg.state_dir,
         cfg.read_only ? database::read_only : database::read_write,
@@ -299,10 +299,6 @@ struct controller_impl {
     read_mode( cfg.read_mode ),
     thread_pool( "chain", cfg.thread_pool_size )
    {
-      if (cfg_chain_id) {
-         chain_id = *cfg_chain_id;
-      }
-
       fork_db.open( [this]( block_timestamp_type timestamp,
                             const flat_set<digest_type>& cur_features,
                             const vector<digest_type>& new_features )
@@ -431,20 +427,18 @@ struct controller_impl {
    /**
     *  Sets fork database head to the genesis state.
     */
-   void initialize_blockchain_state() {
+   void initialize_blockchain_state(const genesis_state& genesis) {
       wlog( "Initializing new blockchain with genesis state" );
-      EOS_ASSERT( conf.genesis, plugin_config_exception,
-                  "unexpected error: should not be initializing blockchain state without a valid genesis state." );
-      producer_authority_schedule initial_schedule = { 0, { producer_authority{config::system_account_name, block_signing_authority_v0{ 1, {{conf.genesis->initial_key, 1}} } } } };
-      legacy::producer_schedule_type initial_legacy_schedule{ 0, {{config::system_account_name, conf.genesis->initial_key}} };
+      producer_authority_schedule initial_schedule = { 0, { producer_authority{config::system_account_name, block_signing_authority_v0{ 1, {{genesis.initial_key, 1}} } } } };
+      legacy::producer_schedule_type initial_legacy_schedule{ 0, {{config::system_account_name, genesis.initial_key}} };
 
       block_header_state genheader;
       genheader.active_schedule                = initial_schedule;
       genheader.pending_schedule.schedule      = initial_schedule;
       // NOTE: if wtmsig block signatures are enabled at genesis time this should be the hash of a producer authority schedule
       genheader.pending_schedule.schedule_hash = fc::sha256::hash(initial_legacy_schedule);
-      genheader.header.timestamp               = conf.genesis->initial_timestamp;
-      genheader.header.action_mroot            = conf.genesis->compute_chain_id();
+      genheader.header.timestamp               = genesis.initial_timestamp;
+      genheader.header.action_mroot            = genesis.compute_chain_id();
       genheader.id                             = genheader.header.id();
       genheader.block_num                      = genheader.header.block_num();
 
@@ -453,7 +447,7 @@ struct controller_impl {
       head->activated_protocol_features = std::make_shared<protocol_feature_activation_set>();
       head->block = std::make_shared<signed_block>(genheader.header);
       db.set_revision( head->block_num );
-      initialize_database();
+      initialize_database(genesis);
    }
 
    void replay(std::function<bool()> shutdown) {
@@ -523,79 +517,92 @@ struct controller_impl {
       }
    }
 
-   void init(std::function<bool()> shutdown, const snapshot_reader_ptr& snapshot) {
-      // Setup state if necessary (or in the default case stay with already loaded state):
-      uint32_t lib_num = 1u;
-      if( snapshot ) {
+   void startup(std::function<bool()> shutdown, const snapshot_reader_ptr& snapshot) {
+      EOS_ASSERT( snapshot, snapshot_exception, "No snapshot reader provided" );
+      ilog( "Starting initialization from snapshot, this may take a significant amount of time" );
+      try {
          snapshot->validate();
          if( blog.head() ) {
-            lib_num = blog.head()->block_num();
-            read_from_snapshot( snapshot, blog.first_block_num(), lib_num );
+            read_from_snapshot( snapshot, blog.first_block_num(), blog.head()->block_num() );
          } else {
             read_from_snapshot( snapshot, 0, std::numeric_limits<uint32_t>::max() );
-            lib_num = head->block_num;
-            if (lib_num == 0) {
-               EOS_ASSERT( conf.genesis, plugin_config_exception,
-                           "Snapshot controller head at block number 0, but genesis state was not provided."
-                           " Must pass \"--genesis-json\" to provide the genesis state." );
-               blog.reset( *conf.genesis, signed_block_ptr() );
-            }
-            else {
-               blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
-            }
+            const uint32_t lib_num = head->block_num;
+            EOS_ASSERT( lib_num > 0, snapshot_exception,
+                        "Snapshot indicates controller head at block number 0, but that is not allowed. "
+                        "Snapshot is invalid." );
+            blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
+         }
+         init(shutdown);
+      } catch (boost::interprocess::bad_alloc& e) {
+         elog( "db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );
+         throw e;
+      }
+
+      const auto hash = calculate_integrity_hash();
+      ilog( "database initialized with hash: ${hash}", ("hash", hash) );
+
+      ilog( "Finished initialization from snapshot" );
+   }
+
+   void startup(std::function<bool()> shutdown, const genesis_state& genesis) {
+      EOS_ASSERT( db.revision() < 1, database_exception, "This version of controller::startup only works with a fresh state database." );
+
+      if( fork_db.head() ) {
+         if( read_mode == db_read_mode::IRREVERSIBLE && fork_db.head()->id != fork_db.root()->id ) {
+            fork_db.rollback_head_to_root();
          }
+         wlog( "No existing chain state. Initializing fresh blockchain state." );
       } else {
-         if( db.revision() < 1 || !fork_db.head() ) {
-            if( fork_db.head() ) {
-               if( read_mode == db_read_mode::IRREVERSIBLE && fork_db.head()->id != fork_db.root()->id ) {
-                  fork_db.rollback_head_to_root();
-               }
-               wlog( "No existing chain state. Initializing fresh blockchain state." );
-            } else {
-               EOS_ASSERT( db.revision() < 1, database_exception,
-                           "No existing fork database despite existing chain state. Replay required." );
-               wlog( "No existing chain state or fork database. Initializing fresh blockchain state and resetting fork database.");
-            }
-            initialize_blockchain_state(); // sets head to genesis state
+         wlog( "No existing chain state or fork database. Initializing fresh blockchain state and resetting fork database.");
+      }
+      initialize_blockchain_state(genesis); // sets head to genesis state
 
-            if( !fork_db.head() ) {
-               fork_db.reset( *head );
-            }
+      if( !fork_db.head() ) {
+         fork_db.reset( *head );
+      }
 
-            if( blog.head() ) {
-               EOS_ASSERT( blog.first_block_num() == 1, block_log_exception,
-                           "block log does not start with genesis block"
-               );
-               lib_num = blog.head()->block_num();
-            } else {
-               blog.reset( *conf.genesis, head->block );
-            }
-         } else {
-            lib_num = fork_db.root()->block_num;
-            auto first_block_num = blog.first_block_num();
-            if( blog.head() ) {
-               EOS_ASSERT( first_block_num <= lib_num && lib_num <= blog.head()->block_num(),
-                           block_log_exception,
-                           "block log does not contain last irreversible block",
-                           ("block_log_first_num", first_block_num)
-                           ("block_log_last_num", blog.head()->block_num())
-                           ("fork_db_lib", lib_num)
-               );
-               lib_num = blog.head()->block_num();
-            } else {
-               lib_num = fork_db.root()->block_num;
-               if( first_block_num != (lib_num + 1) ) {
-                  blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
-               }
-            }
+      if( blog.head() ) {
+         EOS_ASSERT( blog.first_block_num() == 1, block_log_exception,
+                     "block log does not start with genesis block"
+         );
+      } else {
+         blog.reset( genesis, head->block );
+      }
+      init(shutdown);
+   }
 
-            if( read_mode == db_read_mode::IRREVERSIBLE && fork_db.head()->id != fork_db.root()->id ) {
-               fork_db.rollback_head_to_root();
-            }
-            head = fork_db.head();
+   void startup(std::function<bool()> shutdown) {
+      EOS_ASSERT( db.revision() >= 1, database_exception, "This version of controller::startup does not work with a fresh state database." );
+      EOS_ASSERT( fork_db.head(), fork_database_exception, "No existing fork database despite existing chain state. Replay required." );
+
+      chain_id = db.get<global_property_object>().chain_id;
+      uint32_t lib_num = fork_db.root()->block_num;
+      auto first_block_num = blog.first_block_num();
+      if( blog.head() ) {
+         EOS_ASSERT( first_block_num <= lib_num && lib_num <= blog.head()->block_num(),
+                     block_log_exception,
+                     "block log does not contain last irreversible block",
+                     ("block_log_first_num", first_block_num)
+                     ("block_log_last_num", blog.head()->block_num())
+                     ("fork_db_lib", lib_num)
+         );
+         lib_num = blog.head()->block_num();
+      } else {
+         if( first_block_num != (lib_num + 1) ) {
+            blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
          }
       }
 
+      if( read_mode == db_read_mode::IRREVERSIBLE && fork_db.head()->id != fork_db.root()->id ) {
+         fork_db.rollback_head_to_root();
+      }
+      head = fork_db.head();
+
+      init(shutdown);
+   }
+
+   void init(std::function<bool()> shutdown) {
+      uint32_t lib_num = (blog.head() ? blog.head()->block_num() : fork_db.root()->block_num);
       // check database version
       const auto& header_idx = db.get_index<database_header_multi_index>().indices().get<by_id>();
 
@@ -692,8 +699,6 @@ struct controller_impl {
          // else no checks needed since fork_db will be completely reset on replay anyway
       }
 
-      bool report_integrity_hash = !!snapshot || (lib_num > head->block_num);
-
       if( last_block_num > head->block_num ) {
          replay( shutdown ); // replay any irreversible and reversible blocks ahead of current head
       }
@@ -714,11 +719,6 @@ struct controller_impl {
             maybe_switch_forks( pending_head, controller::block_status::complete, forked_branch_callback() );
          }
       }
-
-      if( report_integrity_hash ) {
-         const auto hash = calculate_integrity_hash();
-         ilog( "database initialized with hash: ${hash}", ("hash", hash) );
-      }
    }
 
    ~controller_impl() {
@@ -836,6 +836,19 @@ struct controller_impl {
       resource_limits.add_to_snapshot(snapshot);
    }
 
+   static fc::optional<genesis_state> extract_legacy_genesis_state( const snapshot_reader_ptr& snapshot, uint32_t version ) {
+      fc::optional<genesis_state> genesis;
+      using v2 = legacy::snapshot_global_property_object_v2;
+
+      if (std::clamp(version, v2::minimum_version, v2::maximum_version) == version ) {
+         genesis.emplace();
+         snapshot->read_section<genesis_state>([&genesis=*genesis]( auto &section ){
+            section.read_row(genesis);
+         });
+      }
+      return genesis;
+   }
+
    void read_from_snapshot( const snapshot_reader_ptr& snapshot, uint32_t blog_start, uint32_t blog_end ) {
       chain_snapshot_header header;
       snapshot->read_section<chain_snapshot_header>([this, &header]( auto &section ){
@@ -892,12 +905,16 @@ struct controller_impl {
             using v2 = legacy::snapshot_global_property_object_v2;
 
             if (std::clamp(header.version, v2::minimum_version, v2::maximum_version) == header.version ) {
-               snapshot->read_section<global_property_object>([this]( auto &section ) {
+               fc::optional<genesis_state> genesis = extract_legacy_genesis_state(snapshot, header.version);
+               EOS_ASSERT( genesis, snapshot_exception,
+                           "Snapshot indicates chain_snapshot_header version 2, but does not contain a genesis_state. "
+                           "It must be corrupted.");
+               snapshot->read_section<global_property_object>([&db=this->db,gs_chain_id=genesis->compute_chain_id()]( auto &section ) {
                   v2 legacy_global_properties;
                   section.read_row(legacy_global_properties, db);
 
-                  db.create<global_property_object>([&](auto& gpo ){
-                     gpo.initalize_from(legacy_global_properties, chain_id);
+                  db.create<global_property_object>([&legacy_global_properties,&gs_chain_id](auto& gpo ){
+                     gpo.initalize_from(legacy_global_properties, gs_chain_id);
                   });
                });
                return; // early out to avoid default processing
@@ -938,10 +955,10 @@ struct controller_impl {
       return enc.result();
    }
 
-   void create_native_account( account_name name, const authority& owner, const authority& active, bool is_privileged = false ) {
+   void create_native_account( const genesis_state& genesis, account_name name, const authority& owner, const authority& active, bool is_privileged = false ) {
       db.create<account_object>([&](auto& a) {
          a.name = name;
-         a.creation_date = conf.genesis->initial_timestamp;
+         a.creation_date = genesis.initial_timestamp;
 
          if( name == config::system_account_name ) {
             // The initial eosio ABI value affects consensus; see  https://github.com/EOSIO/eos/issues/7794
@@ -956,9 +973,9 @@ struct controller_impl {
       });
 
       const auto& owner_permission  = authorization.create_permission(name, config::owner_name, 0,
-                                                                      owner, conf.genesis->initial_timestamp );
+                                                                      owner, genesis.initial_timestamp );
       const auto& active_permission = authorization.create_permission(name, config::active_name, owner_permission.id,
-                                                                      active, conf.genesis->initial_timestamp );
+                                                                      active, genesis.initial_timestamp );
 
       resource_limits.initialize_account(name);
 
@@ -971,7 +988,7 @@ struct controller_impl {
       resource_limits.verify_account_ram_usage(name);
    }
 
-   void initialize_database() {
+   void initialize_database(const genesis_state& genesis) {
       // create the database header sigil
       db.create<database_header_object>([&]( auto& header ){
          // nothing to do for now
@@ -986,9 +1003,10 @@ struct controller_impl {
          bs.block_id = head->id;
       });
 
-      conf.genesis->initial_configuration.validate();
-      db.create<global_property_object>([&](auto& gpo ){
-         gpo.configuration = conf.genesis->initial_configuration;
+      genesis.initial_configuration.validate();
+      chain_id = genesis.compute_chain_id();
+      db.create<global_property_object>([&genesis,&chain_id=this->chain_id](auto& gpo ){
+         gpo.configuration = genesis.initial_configuration;
          gpo.chain_id = chain_id;
       });
 
@@ -1004,26 +1022,26 @@ struct controller_impl {
       authorization.initialize_database();
       resource_limits.initialize_database();
 
-      authority system_auth(conf.genesis->initial_key);
-      create_native_account( config::system_account_name, system_auth, system_auth, true );
+      authority system_auth(genesis.initial_key);
+      create_native_account( genesis, config::system_account_name, system_auth, system_auth, true );
 
       auto empty_authority = authority(1, {}, {});
       auto active_producers_authority = authority(1, {}, {});
       active_producers_authority.accounts.push_back({{config::system_account_name, config::active_name}, 1});
 
-      create_native_account( config::null_account_name, empty_authority, empty_authority );
-      create_native_account( config::producers_account_name, empty_authority, active_producers_authority );
+      create_native_account( genesis, config::null_account_name, empty_authority, empty_authority );
+      create_native_account( genesis, config::producers_account_name, empty_authority, active_producers_authority );
       const auto& active_permission       = authorization.get_permission({config::producers_account_name, config::active_name});
       const auto& majority_permission     = authorization.create_permission( config::producers_account_name,
                                                                              config::majority_producers_permission_name,
                                                                              active_permission.id,
                                                                              active_producers_authority,
-                                                                             conf.genesis->initial_timestamp );
+                                                                             genesis.initial_timestamp );
       const auto& minority_permission     = authorization.create_permission( config::producers_account_name,
                                                                              config::minority_producers_permission_name,
                                                                              majority_permission.id,
                                                                              active_producers_authority,
-                                                                             conf.genesis->initial_timestamp );
+                                                                             genesis.initial_timestamp );
    }
 
    // The returned scoped_exit should not exceed the lifetime of the pending which existed when make_block_restore_point was called.
@@ -2324,12 +2342,12 @@ const protocol_feature_manager& controller::get_protocol_feature_manager()const
 }
 
 controller::controller( const controller::config& cfg )
-:my( new controller_impl( cfg, fc::optional<chain_id_type>(), *this, protocol_feature_set{} ) )
+:my( new controller_impl( cfg, *this, protocol_feature_set{} ) )
 {
 }
 
-controller::controller( const config& cfg, const fc::optional<chain_id_type>& chain_id, protocol_feature_set&& pfs )
-:my( new controller_impl( cfg, chain_id, *this, std::move(pfs) ) )
+controller::controller( const config& cfg, protocol_feature_set&& pfs )
+:my( new controller_impl( cfg, *this, std::move(pfs) ) )
 {
 }
 
@@ -2348,19 +2366,15 @@ void controller::add_indices() {
 }
 
 void controller::startup( std::function<bool()> shutdown, const snapshot_reader_ptr& snapshot ) {
-   if( snapshot ) {
-      ilog( "Starting initialization from snapshot, this may take a significant amount of time" );
-   }
-   try {
-      my->init(shutdown, snapshot);
-   } catch (boost::interprocess::bad_alloc& e) {
-      if ( snapshot )
-         elog( "db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );
-      throw e;
-   }
-   if( snapshot ) {
-      ilog( "Finished initialization from snapshot" );
-   }
+   my->startup(shutdown, snapshot);
+}
+
+void controller::startup( std::function<bool()> shutdown, const genesis_state& genesis ) {
+   my->startup(shutdown, genesis);
+}
+
+void controller::startup( std::function<bool()> shutdown ) {
+   my->startup(shutdown);
 }
 
 const chainbase::database& controller::db()const { return my->db; }
@@ -3126,6 +3140,28 @@ fc::optional<uint64_t> controller::convert_exception_to_error_code( const fc::ex
    return e_ptr->error_code;
 }
 
+chain_id_type controller::extract_chain_id(const snapshot_reader_ptr& snapshot) {
+   chain_snapshot_header header;
+   snapshot->read_section<chain_snapshot_header>([&header]( auto &section ){
+      section.read_row(header);
+      header.validate();
+   });
+
+   // check if this is a legacy version of the snapshot, which has a genesis state instead of chain id
+   fc::optional<genesis_state> genesis = controller_impl::extract_legacy_genesis_state(snapshot, header.version);
+   if (genesis) {
+      return genesis->compute_chain_id();
+   }
+
+   chain_id_type chain_id;
+   snapshot->read_section<global_property_object>([&chain_id]( auto &section ){
+      snapshot_global_property_object global_properties;
+      section.read_row(global_properties);
+      chain_id = global_properties.chain_id;
+   });
+   return chain_id;
+}
+
 /// Protocol feature activation handlers:
 
 template<>
diff --git a/libraries/chain/include/eosio/chain/chain_id_type.hpp b/libraries/chain/include/eosio/chain/chain_id_type.hpp
index 9e09fbc9812..1fb1ac70a94 100644
--- a/libraries/chain/include/eosio/chain/chain_id_type.hpp
+++ b/libraries/chain/include/eosio/chain/chain_id_type.hpp
@@ -47,6 +47,7 @@ namespace chain {
          friend class eosio::net_plugin_impl;
          friend struct eosio::handshake_message;
          friend class block_log;
+         friend class controller;
          friend struct controller_impl;
          friend class global_property_object;
          friend struct snapshot_global_property_object;
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 89622c8c7e2..ca01b0fc48e 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -79,7 +79,6 @@ namespace eosio { namespace chain {
             uint32_t                 maximum_variable_signature_length = chain::config::default_max_variable_signature_length;
             bool                     disable_all_subjective_mitigations = false; //< for testing purposes only
 
-            optional<genesis_state>  genesis;
             wasm_interface::vm_type  wasm_runtime = chain::config::default_wasm_runtime;
 
             db_read_mode             read_mode              = db_read_mode::SPECULATIVE;
@@ -100,11 +99,13 @@ namespace eosio { namespace chain {
          };
 
          explicit controller( const config& cfg );
-         controller( const config& cfg, const fc::optional<chain_id_type>& chain_id, protocol_feature_set&& pfs );
+         controller( const config& cfg, protocol_feature_set&& pfs );
          ~controller();
 
          void add_indices();
-         void startup( std::function<bool()> shutdown, const snapshot_reader_ptr& snapshot = nullptr );
+         void startup( std::function<bool()> shutdown, const snapshot_reader_ptr& snapshot);
+         void startup( std::function<bool()> shutdown, const genesis_state& genesis);
+         void startup( std::function<bool()> shutdown);
 
          void preactivate_feature( const digest_type& feature_digest );
 
@@ -322,6 +323,8 @@ namespace eosio { namespace chain {
             return pretty_output;
          }
 
+      static chain_id_type extract_chain_id(const snapshot_reader_ptr& snapshot);
+
       private:
          friend class apply_context;
          friend class transaction_context;
@@ -347,7 +350,6 @@ FC_REFLECT( eosio::chain::controller::config,
             (force_all_checks)
             (disable_replay_opts)
             (contracts_console)
-            (genesis)
             (wasm_runtime)
             (resource_greylist)
             (trusted_producers)
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index ad21e212c17..cfbed8fe8f9 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -678,17 +678,23 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
       my->chain_config->maximum_variable_signature_length = options.at( "maximum-variable-signature-length" ).as<uint32_t>();
 
       if( options.count( "extract-genesis-json" ) || options.at( "print-genesis-json" ).as<bool>()) {
-         genesis_state gs;
+         fc::optional<genesis_state> gs;
 
          if( fc::exists( my->blocks_dir / "blocks.log" )) {
             gs = block_log::extract_genesis_state( my->blocks_dir );
+            EOS_ASSERT( gs,
+                        plugin_config_exception,
+                        "Block log at '${path}' does not contain a genesis state, it only has the chain-id.",
+                        ("path", (my->blocks_dir / "blocks.log").generic_string())
+            );
          } else {
             wlog( "No blocks.log found at '${p}'. Using default genesis state.",
                   ("p", (my->blocks_dir / "blocks.log").generic_string()));
+            gs.emplace();
          }
 
          if( options.at( "print-genesis-json" ).as<bool>()) {
-            ilog( "Genesis JSON:\n${genesis}", ("genesis", json::to_pretty_string( gs )));
+            ilog( "Genesis JSON:\n${genesis}", ("genesis", json::to_pretty_string( *gs )));
          }
 
          if( options.count( "extract-genesis-json" )) {
@@ -698,7 +704,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                p = bfs::current_path() / p;
             }
 
-            EOS_ASSERT( fc::json::save_to_file( gs, p, true ),
+            EOS_ASSERT( fc::json::save_to_file( *gs, p, true ),
                         misc_exception,
                         "Error occurred while writing genesis JSON to '${path}'",
                         ("path", p.generic_string())
@@ -781,6 +787,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          auto infile = std::ifstream(my->snapshot_path->generic_string(), (std::ios::in | std::ios::binary));
          auto reader = std::make_shared<istream_snapshot_reader>(infile);
          reader->validate();
+         my->chain_id = controller::extract_chain_id(reader);
          infile.close();
 
          EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,
@@ -798,16 +805,17 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          if( fc::is_regular_file( my->blocks_dir / "blocks.log" )) {
             auto log_genesis = block_log::extract_genesis_state(my->blocks_dir);
             if (log_genesis) {
-               if ()
-
+               my->genesis = log_genesis;
+               EOS_ASSERT( my->genesis->compute_chain_id() == *my->chain_id,
+                           plugin_config_exception,
+                           "snapshot chain id does not match the chain id from the genesis state in the block log.");
             }
             else {
-
+               auto block_log_chain_id = block_log::extract_chain_id(my->blocks_dir);
+               EOS_ASSERT( block_log_chain_id == *my->chain_id,
+                           plugin_config_exception,
+                           "snapshot chain id does not match the chain id in the block log.");
             }
-            FIX
-            EOS_ASSERT( log_genesis.compute_chain_id() == my->chain_config->genesis.compute_chain_id(),
-                    plugin_config_exception,
-                    "Genesis information in blocks.log does not match genesis information in the snapshot");
          }
 
       } else {
@@ -816,8 +824,14 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          fc::optional<genesis_state> existing_genesis;
 
          if( fc::exists( my->blocks_dir / "blocks.log" ) ) {
-            my->chain_config->genesis = block_log::extract_genesis_state( my->blocks_dir );
-            existing_genesis = my->chain_config->genesis;
+            my->genesis = block_log::extract_genesis_state( my->blocks_dir );
+            existing_genesis = my->genesis;
+            if (my->genesis) {
+               my->chain_id = my->genesis->compute_chain_id();
+            }
+            else {
+               my->chain_id = block_log::extract_chain_id( my->blocks_dir );
+            }
          }
 
          if( options.count( "genesis-json" )) {
@@ -831,10 +845,10 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                        "Specified genesis file '${genesis}' does not exist.",
                        ("genesis", genesis_file.generic_string()));
 
-            my->chain_config->genesis = fc::json::from_file( genesis_file ).as<genesis_state>();
+            my->genesis = fc::json::from_file( genesis_file ).as<genesis_state>();
 
             if( options.count( "genesis-timestamp" ) ) {
-               my->chain_config->genesis.initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
+               my->genesis->initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
                genesis_timestamp_specified = true;
             }
          }
@@ -844,7 +858,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                         "--genesis-timestamp is only valid if also passed in with --genesis-json");
          }
 
-         if( !existing_genesis ) {
+         if( !existing_genesis && !my->chain_id ) {
             if( !genesis_file.empty() ) {
                if( genesis_timestamp_specified ) {
                   ilog( "Using genesis state provided in '${genesis}' but with adjusted genesis timestamp",
@@ -853,16 +867,26 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                   ilog( "Using genesis state provided in '${genesis}'", ("genesis", genesis_file.generic_string()));
                }
                wlog( "Starting up fresh blockchain with provided genesis state." );
-            } else if( genesis_timestamp_specified ) {
-               wlog( "Starting up fresh blockchain with default genesis state but with adjusted genesis timestamp." );
             } else {
                wlog( "Starting up fresh blockchain with default genesis state." );
+               my->genesis.emplace();
             }
+            my->chain_id = my->genesis->compute_chain_id();
          } else {
-            EOS_ASSERT( my->chain_config->genesis == *existing_genesis, plugin_config_exception,
-                        "Genesis state provided via command line arguments does not match the existing genesis state in blocks.log. "
-                        "It is not necessary to provide genesis state arguments when a blocks.log file already exists."
-                      );
+            if (existing_genesis) {
+               EOS_ASSERT( *my->genesis == *existing_genesis, plugin_config_exception,
+                           "Genesis state provided via command line arguments does not match the existing genesis state"
+                           " in blocks.log. It is not necessary to provide genesis state arguments when a blocks.log "
+                           "file already exists."
+               );
+            }
+            else if (my->genesis) {
+               EOS_ASSERT( my->genesis->compute_chain_id() == *my->chain_id, plugin_config_exception,
+                           "Genesis state, provided via command line arguments, has a chain_id that does not match the "
+                           "existing chain id in blocks.log. It is not necessary to provide genesis state arguments "
+                           "when a blocks.log file already exists."
+               );
+            }
          }
       }
 
@@ -881,7 +905,6 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
 #endif
 
       my->chain.emplace( *my->chain_config, std::move(pfs) );
-      my->chain_id.emplace( my->chain->get_chain_id());
 
       // set up method providers
       my->get_block_by_number_provider = app().get_method<methods::get_block_by_number>().register_provider(
@@ -954,9 +977,13 @@ void chain_plugin::plugin_startup()
          auto reader = std::make_shared<istream_snapshot_reader>(infile);
          my->chain->startup(shutdown, reader);
          infile.close();
+      } else if (my->chain->db().revision() < 1) {
+         my->chain->startup(shutdown, *my->genesis);
       } else {
          my->chain->startup(shutdown);
       }
+      // ensure that our cached id is set to the chain's actual id
+      my->chain_id = my->chain->get_chain_id();
    } catch (const database_guard_exception& e) {
       log_guard_exception(e);
       // make sure to properly close the db
@@ -968,8 +995,13 @@ void chain_plugin::plugin_startup()
       ilog("starting chain in read/write mode");
    }
 
-   ilog("Blockchain started; head block is #${num}, genesis timestamp is ${ts}",
-        ("num", my->chain->head_block_num())("ts", (std::string)my->chain_config->genesis.initial_timestamp));
+   if (my->genesis) {
+      ilog("Blockchain started; head block is #${num}, genesis timestamp is ${ts}",
+           ("num", my->chain->head_block_num())("ts", (std::string)my->genesis->initial_timestamp));
+   }
+   else {
+      ilog("Blockchain started; head block is #${num}", ("num", my->chain->head_block_num()));
+   }
 
    my->chain_config.reset();
 } FC_CAPTURE_AND_RETHROW() }

From 643150774c2948b8d0f32946d7790d7e80498720 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 13 Sep 2019 11:47:45 -0500
Subject: [PATCH 1246/1648] Test framework refactoring for 3 startup methods.

---
 .../testing/include/eosio/testing/tester.hpp  | 152 +++++++++++++++---
 libraries/testing/tester.cpp                  |  81 +++++++---
 2 files changed, 186 insertions(+), 47 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 212faa2e55f..c31fbfc4643 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -100,13 +100,23 @@ namespace eosio { namespace testing {
          virtual ~base_tester() {};
 
          void              init(const setup_policy policy = setup_policy::full, db_read_mode read_mode = db_read_mode::SPECULATIVE);
-         void              init(controller::config config, const snapshot_reader_ptr& snapshot = nullptr, const fc::optional<chain_id_type>& chain_id = fc::optional<chain_id_type>());
-         void              init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot = nullptr, const fc::optional<chain_id_type>& chain_id = fc::optional<chain_id_type>());
+         void              init(controller::config config, const snapshot_reader_ptr& snapshot);
+         void              init(controller::config config, const genesis_state& genesis);
+         void              init(controller::config config);
+         void              init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot);
+         void              init(controller::config config, protocol_feature_set&& pfs, const genesis_state& genesis);
+         void              init(controller::config config, protocol_feature_set&& pfs);
          void              execute_setup_policy(const setup_policy policy);
 
          void              close();
-         void              open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id = fc::optional<chain_id_type>());
-         void              open( const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id = fc::optional<chain_id_type>());
+         template <typename Lambda>
+         void              open( protocol_feature_set&& pfs, Lambda lambda );
+         void              open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot );
+         void              open( protocol_feature_set&& pfs, const genesis_state& genesis );
+         void              open( protocol_feature_set&& pfs );
+         void              open( const snapshot_reader_ptr& snapshot );
+         void              open( const genesis_state& genesis );
+         void              open();
          bool              is_same_chain( base_tester& other );
 
          virtual signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) ) = 0;
@@ -308,6 +318,10 @@ namespace eosio { namespace testing {
             return cfg;
          }
 
+         fc::optional<genesis_state> get_genesis() const {
+            return genesis;
+         }
+
          void schedule_protocol_features_wo_preactivation(const vector<digest_type> feature_digests);
          void preactivate_protocol_features(const vector<digest_type> feature_digests);
          void preactivate_all_builtin_protocol_features();
@@ -326,6 +340,7 @@ namespace eosio { namespace testing {
          std::map<chain::public_key_type, chain::private_key_type> block_signing_private_keys;
       protected:
          controller::config                            cfg;
+         fc::optional<genesis_state>                   genesis;
          map<transaction_id_type, transaction_receipt> chain_transactions;
          map<account_name, block_id_type>              last_produced_block;
          unapplied_transaction_queue                   unapplied_transactions;
@@ -340,12 +355,42 @@ namespace eosio { namespace testing {
          init(policy, read_mode);
       }
 
+      tester(controller::config config, const genesis_state& genesis) {
+         init(config, genesis);
+      }
+
       tester(controller::config config) {
          init(config);
       }
 
-      tester(controller::config config, protocol_feature_set&& pfs) {
-         init(config, std::move(pfs));
+      tester(controller::config config, protocol_feature_set&& pfs, const genesis_state& genesis) {
+         init(config, std::move(pfs), genesis);
+      }
+
+      tester(const fc::temp_directory& tempdir, bool use_genesis) {
+         auto def_conf = default_config(tempdir);
+         cfg = def_conf.first;
+
+         if (use_genesis) {
+            init(cfg, def_conf.second);
+         }
+         else {
+            init(cfg);
+         }
+      }
+
+      template <typename Lambda>
+      tester(const fc::temp_directory& tempdir, Lambda conf_edit, bool use_genesis) {
+         auto def_conf = default_config(tempdir);
+         cfg = def_conf.first;
+         conf_edit(cfg);
+
+         if (use_genesis) {
+            init(cfg, def_conf.second);
+         }
+         else {
+            init(cfg);
+         }
       }
 
       signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
@@ -362,6 +407,30 @@ namespace eosio { namespace testing {
       }
 
       bool validate() { return true; }
+
+
+      static std::pair<controller::config, genesis_state> default_config(const fc::temp_directory& tempdir) {
+         controller::config cfg;
+         cfg.blocks_dir      = tempdir.path() / config::default_blocks_dir_name;
+         cfg.state_dir  = tempdir.path() / config::default_state_dir_name;
+         cfg.state_size = 1024*1024*8;
+         cfg.state_guard_size = 0;
+         cfg.reversible_cache_size = 1024*1024*8;
+         cfg.reversible_guard_size = 0;
+         cfg.contracts_console = false;
+
+         genesis_state genesis;
+         genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
+         genesis.initial_key = get_public_key( config::system_account_name, "active" );
+
+         for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
+            if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
+               cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
+            else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
+               cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
+         }
+         return {cfg, genesis};
+      }
    };
 
    class validating_tester : public base_tester {
@@ -382,7 +451,7 @@ namespace eosio { namespace testing {
       }
       controller::config vcfg;
 
-      static controller::config default_config(fc::temp_directory& tempdir) {
+      static std::pair<controller::config, genesis_state> default_config(const fc::temp_directory& tempdir) {
          controller::config vcfg;
          vcfg.blocks_dir      = tempdir.path() / std::string("v_").append(config::default_blocks_dir_name);
          vcfg.state_dir  = tempdir.path() /  std::string("v_").append(config::default_state_dir_name);
@@ -392,9 +461,9 @@ namespace eosio { namespace testing {
          vcfg.reversible_guard_size = 0;
          vcfg.contracts_console = false;
 
-         vcfg.genesis.emplace();
-         vcfg.genesis->initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-         vcfg.genesis->initial_key = get_public_key( config::system_account_name, "active" );
+         genesis_state genesis;
+         genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
+         genesis.initial_key = get_public_key( config::system_account_name, "active" );
 
          for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
             if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
@@ -402,36 +471,68 @@ namespace eosio { namespace testing {
             else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
                vcfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
          }
-         return vcfg;
+         return {vcfg, genesis};
       }
 
       validating_tester(const flat_set<account_name>& trusted_producers = flat_set<account_name>()) {
-         vcfg = default_config(tempdir);
+         auto def_conf = default_config(tempdir);
 
+         vcfg = def_conf.first;
          vcfg.trusted_producers = trusted_producers;
 
-         FC_ASSERT(vcfg.genesis, "Should have a valid genesis_state");
-         validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
-         validating_node->add_indices();
-         validating_node->startup( []() { return false; } );
+         validating_node = create_validating_node(vcfg, def_conf.second, true);
 
          init();
       }
 
-      validating_tester(controller::config config) {
-         FC_ASSERT( config.blocks_dir.filename().generic_string() != "."
-                    && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config" );
+      static void config_validator(controller::config& vcfg) {
+         FC_ASSERT( vcfg.blocks_dir.filename().generic_string() != "."
+                    && vcfg.state_dir.filename().generic_string() != ".", "invalid path names in controller::config" );
 
-         vcfg = config;
          vcfg.blocks_dir = vcfg.blocks_dir.parent_path() / std::string("v_").append( vcfg.blocks_dir.filename().generic_string() );
          vcfg.state_dir  = vcfg.state_dir.parent_path() / std::string("v_").append( vcfg.state_dir.filename().generic_string() );
+      }
 
-         FC_ASSERT(vcfg.genesis, "Should have a valid genesis_state");
-         validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
+      static unique_ptr<controller> create_validating_node(controller::config vcfg, const genesis_state& genesis, bool use_genesis) {
+         unique_ptr<controller> validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set());
          validating_node->add_indices();
-         validating_node->startup( []() { return false; } );
+         if (use_genesis) {
+            validating_node->startup( []() { return false; }, genesis );
+         }
+         else {
+            validating_node->startup( []() { return false; } );
+         }
+         return validating_node;
+      }
 
-         init(config);
+      validating_tester(const fc::temp_directory& tempdir, bool use_genesis) {
+         auto def_conf = default_config(tempdir);
+         vcfg = def_conf.first;
+         config_validator(vcfg);
+         validating_node = create_validating_node(vcfg, def_conf.second, use_genesis);
+
+         if (use_genesis) {
+            init(def_conf.first, def_conf.second);
+         }
+         else {
+            init(def_conf.first);
+         }
+      }
+
+      template <typename Lambda>
+      validating_tester(const fc::temp_directory& tempdir, Lambda conf_edit, bool use_genesis) {
+         auto def_conf = default_config(tempdir);
+         conf_edit(def_conf.first);
+         vcfg = def_conf.first;
+         config_validator(vcfg);
+         validating_node = create_validating_node(vcfg, def_conf.second, use_genesis);
+
+         if (use_genesis) {
+            init(def_conf.first, def_conf.second);
+         }
+         else {
+            init(def_conf.first);
+         }
       }
 
       signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
@@ -477,8 +578,7 @@ namespace eosio { namespace testing {
                hbh.producer == vn_hbh.producer;
 
         validating_node.reset();
-        FC_ASSERT(vcfg.genesis, "Should have a valid genesis_state");
-        validating_node = std::make_unique<controller>(vcfg, fc::optional<chain_id_type>(vcfg.genesis->compute_chain_id()), make_protocol_feature_set());
+        validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set());
         validating_node->add_indices();
         validating_node->startup( []() { return false; } );
 
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 1a211c489f5..7c433c74edc 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -159,9 +159,9 @@ namespace eosio { namespace testing {
       cfg.contracts_console = true;
       cfg.read_mode = read_mode;
 
-      cfg.genesis.emplace();
-      cfg.genesis->initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-      cfg.genesis->initial_key = get_public_key( config::system_account_name, "active" );
+      genesis_state genesis;
+      genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
+      genesis.initial_key = get_public_key( config::system_account_name, "active" );
 
       for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
          if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
@@ -170,18 +170,38 @@ namespace eosio { namespace testing {
             cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
       }
 
-      open(nullptr);
+      open(genesis);
       execute_setup_policy(policy);
    }
 
-   void base_tester::init(controller::config config, const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id) {
+   void base_tester::init(controller::config config, const snapshot_reader_ptr& snapshot) {
       cfg = config;
-      open(snapshot, chain_id);
+      open(snapshot);
    }
 
-   void base_tester::init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id) {
+   void base_tester::init(controller::config config, const genesis_state& genesis) {
       cfg = config;
-      open(std::move(pfs), snapshot, chain_id);
+      open(genesis);
+   }
+
+   void base_tester::init(controller::config config) {
+      cfg = config;
+      open();
+   }
+
+   void base_tester::init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot) {
+      cfg = config;
+      open(std::move(pfs), snapshot);
+   }
+
+   void base_tester::init(controller::config config, protocol_feature_set&& pfs, const genesis_state& genesis) {
+      cfg = config;
+      open(std::move(pfs), genesis);
+   }
+
+   void base_tester::init(controller::config config, protocol_feature_set&& pfs) {
+      cfg = config;
+      open(std::move(pfs));
    }
 
    void base_tester::execute_setup_policy(const setup_policy policy) {
@@ -229,22 +249,23 @@ namespace eosio { namespace testing {
       chain_transactions.clear();
    }
 
-   void base_tester::open( const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id ) {
-      open( make_protocol_feature_set(), snapshot, chain_id );
+   void base_tester::open( const snapshot_reader_ptr& snapshot ) {
+      open( make_protocol_feature_set(), snapshot );
    }
 
-   void base_tester::open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot, const fc::optional<chain_id_type>& chain_id ) {
-      fc::optional<chain_id_type> control_chain_id;
-      if (chain_id)  {
-         cfg.genesis = fc::optional<genesis_state>();
-         control_chain_id = chain_id;
-      }
-      else if (cfg.genesis) {
-         control_chain_id = cfg.genesis->compute_chain_id();
-      }
-      control.reset( new controller(cfg, control_chain_id, std::move(pfs)) );
+   void base_tester::open( const genesis_state& genesis ) {
+      open( make_protocol_feature_set(), genesis );
+   }
+
+   void base_tester::open() {
+      open( make_protocol_feature_set() );
+   }
+
+   template <typename Lambda>
+   void base_tester::open( protocol_feature_set&& pfs, Lambda lambda ) {
+      control.reset( new controller(cfg, std::move(pfs)) );
       control->add_indices();
-      control->startup( []() { return false; }, snapshot);
+      lambda();
       chain_transactions.clear();
       control->accepted_block.connect([this]( const block_state_ptr& block_state ){
         FC_ASSERT( block_state->block );
@@ -260,6 +281,24 @@ namespace eosio { namespace testing {
       });
    }
 
+   void base_tester::open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot ) {
+      open(std::move(pfs), [&snapshot,&control=this->control]() {
+         control->startup([]() { return false; }, snapshot );
+      });
+   }
+
+   void base_tester::open( protocol_feature_set&& pfs, const genesis_state& genesis ) {
+      open(std::move(pfs), [&genesis,&control=this->control]() {
+         control->startup( []() { return false; }, genesis );
+      });
+   }
+
+   void base_tester::open( protocol_feature_set&& pfs ) {
+      open(std::move(pfs), [&control=this->control]() {
+         control->startup( []() { return false; } );
+      });
+   }
+
    void base_tester::push_block(signed_block_ptr b) {
       auto bsf = control->create_block_state_future(b);
       unapplied_transactions.add_aborted( control->abort_block() );

From d68f163d6061d209372b21337b98090ccb02d116 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 13 Sep 2019 11:49:31 -0500
Subject: [PATCH 1247/1648] Specific test changes based off of tester changes.

---
 unittests/api_tests.cpp                 |  6 +--
 unittests/auth_tests.cpp                |  2 +-
 unittests/forked_tests.cpp              |  2 +-
 unittests/producer_schedule_tests.cpp   |  2 +-
 unittests/protocol_feature_tests.cpp    | 12 +++---
 unittests/snapshot_tests.cpp            | 51 +++++++++----------------
 unittests/whitelist_blacklist_tests.cpp | 45 ++++++----------------
 7 files changed, 41 insertions(+), 79 deletions(-)

diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index 6cef8f37e2f..21c8d775dba 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -588,7 +588,7 @@ BOOST_FIXTURE_TEST_CASE(require_notice_tests, TESTER) { try {
 
 BOOST_AUTO_TEST_CASE(ram_billing_in_notify_tests) { try {
    fc::temp_directory tempdir;
-   validating_tester chain( validating_tester::default_config(tempdir) );
+   validating_tester chain( tempdir, true );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
 
    chain.produce_blocks(2);
@@ -1317,9 +1317,7 @@ BOOST_FIXTURE_TEST_CASE(deferred_transaction_tests, TESTER) { try {
 
 BOOST_AUTO_TEST_CASE(more_deferred_transaction_tests) { try {
    fc::temp_directory tempdir;
-   auto cfg = validating_tester::default_config(tempdir);
-   cfg.contracts_console = true;
-   validating_tester chain( cfg );
+   validating_tester chain( tempdir, true );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
 
    const auto& pfm = chain.control->get_protocol_feature_manager();
diff --git a/unittests/auth_tests.cpp b/unittests/auth_tests.cpp
index 471bc361e7f..3bc01bc18bc 100644
--- a/unittests/auth_tests.cpp
+++ b/unittests/auth_tests.cpp
@@ -373,7 +373,7 @@ BOOST_AUTO_TEST_CASE( any_auth ) { try {
 BOOST_AUTO_TEST_CASE(no_double_billing) {
 try {
    fc::temp_directory tempdir;
-   validating_tester chain( validating_tester::default_config(tempdir) );
+   validating_tester chain( tempdir, true );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
 
    chain.produce_block();
diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index a1ac5c68705..3b516fdae6e 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -563,7 +563,7 @@ BOOST_AUTO_TEST_CASE( reopen_forkdb ) try {
 
    c1.close();
 
-   c1.open( nullptr );
+   c1.open();
 
 } FC_LOG_AND_RETHROW()
 
diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index 5ff5e4cc390..acb3f3f5312 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -325,7 +325,7 @@ BOOST_FIXTURE_TEST_CASE( producer_schedule_reduction, tester ) try {
 
 BOOST_AUTO_TEST_CASE( empty_producer_schedule_has_no_effect ) try {
    fc::temp_directory tempdir;
-   validating_tester c( validating_tester::default_config(tempdir) );
+   validating_tester c( tempdir, true );
    c.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
 
    c.create_accounts( {N(alice),N(bob),N(carol)} );
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index a777a2f8ba4..d97b1f1ced8 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE( activate_and_restart ) try {
    BOOST_CHECK( c.control->is_builtin_activated( builtin_protocol_feature_t::preactivate_feature ) );
 
    c.close();
-   c.open( std::move( pfs ), nullptr );
+   c.open( std::move( pfs ) );
 
    BOOST_CHECK_EQUAL( head_block_num, c.control->head_block_num() );
 
@@ -266,7 +266,7 @@ BOOST_AUTO_TEST_CASE( subjective_restrictions_test ) try {
 
    auto restart_with_new_pfs = [&c]( protocol_feature_set&& pfs ) {
       c.close();
-      c.open(std::move(pfs), nullptr);
+      c.open(std::move(pfs));
    };
 
    auto get_builtin_digest = [&pfm]( builtin_protocol_feature_t codename ) -> digest_type {
@@ -408,7 +408,7 @@ BOOST_AUTO_TEST_CASE( replace_deferred_test ) try {
    c.close();
    auto cfg = c.get_config();
    cfg.disable_all_subjective_mitigations = true;
-   c.init( cfg, nullptr );
+   c.init( cfg );
 
    BOOST_CHECK_EQUAL( c.control->get_resource_limits_manager().get_account_ram_usage( N(alice) ), alice_ram_usage0 );
 
@@ -451,7 +451,7 @@ BOOST_AUTO_TEST_CASE( replace_deferred_test ) try {
 
    c.close();
    cfg.disable_all_subjective_mitigations = false;
-   c.init( cfg, nullptr );
+   c.init( cfg );
 
    const auto& pfm = c.control->get_protocol_feature_manager();
 
@@ -1176,7 +1176,7 @@ BOOST_AUTO_TEST_CASE( ram_restrictions_test ) { try {
    c.close();
    auto cfg = c.get_config();
    cfg.disable_all_subjective_mitigations = true;
-   c.init( cfg, nullptr );
+   c.init( cfg );
 
    c.produce_block();
 
@@ -1201,7 +1201,7 @@ BOOST_AUTO_TEST_CASE( ram_restrictions_test ) { try {
    // Re-enable the subjective mitigation
    c.close();
    cfg.disable_all_subjective_mitigations = false;
-   c.init( cfg, nullptr );
+   c.init( cfg );
 
    c.produce_block();
 
diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index 9726eaad43a..bb1d544d10c 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -1,5 +1,6 @@
 #include <sstream>
 
+#include <eosio/chain/block_log.hpp>
 #include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/snapshot.hpp>
 #include <eosio/testing/tester.hpp>
@@ -51,27 +52,13 @@ class snapshotted_tester : public base_tester {
    enum config_file_handling { dont_copy_config_files, copy_config_files };
    snapshotted_tester(controller::config config, const snapshot_reader_ptr& snapshot, int ordinal,
            config_file_handling copy_files_from_config = config_file_handling::dont_copy_config_files) {
-      FC_ASSERT(config.genesis, "Must pass in chain_id if config does not have genesis");
-      _init(config, snapshot, ordinal, fc::optional<chain_id_type>(config.genesis->compute_chain_id()), copy_files_from_config);
-   }
-
-   snapshotted_tester(controller::config config, const snapshot_reader_ptr& snapshot, int ordinal,
-                      const fc::optional<chain_id_type>& chain_id,
-                      config_file_handling copy_files_from_config = config_file_handling::dont_copy_config_files) {
-      _init(config, snapshot, ordinal, chain_id, copy_files_from_config);
-   }
-
-   void _init(controller::config config, const snapshot_reader_ptr& snapshot, int ordinal,
-             const fc::optional<chain_id_type>& chain_id,
-             config_file_handling copy_files_from_config = config_file_handling::dont_copy_config_files) {
       FC_ASSERT(config.blocks_dir.filename().generic_string() != "."
                 && config.state_dir.filename().generic_string() != ".", "invalid path names in controller::config");
 
       controller::config copied_config = (copy_files_from_config == copy_config_files)
                                          ? copy_config_and_files(config, ordinal) : copy_config(config, ordinal);
 
-      copied_config.genesis = fc::optional<genesis_state>();
-      init(copied_config, snapshot, chain_id);
+      init(copied_config, snapshot);
    }
 
    signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) )override {
@@ -379,8 +366,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
 
    // replay the block log from the snapshot child, from the snapshot
    using config_file_handling = snapshotted_tester::config_file_handling;
-   chain_id_type chain_id = chain.control->get_chain_id();
-   snapshotted_tester replay_chain(snap_chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++, chain_id, config_file_handling::copy_config_files);
+   snapshotted_tester replay_chain(snap_chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++, config_file_handling::copy_config_files);
    const auto replay_head = replay_chain.control->head_block_num();
    auto snap_head = snap_chain.control->head_block_num();
    BOOST_REQUIRE_EQUAL(replay_head, snap_chain.control->last_irreversible_block_num());
@@ -397,7 +383,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *replay_chain.control);
 
-   snapshotted_tester replay2_chain(snap_chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++, chain_id, config_file_handling::copy_config_files);
+   snapshotted_tester replay2_chain(snap_chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++, config_file_handling::copy_config_files);
    const auto replay2_head = replay2_chain.control->head_block_num();
    snap_head = snap_chain.control->head_block_num();
    BOOST_REQUIRE_EQUAL(replay2_head, snap_chain.control->last_irreversible_block_num());
@@ -409,7 +395,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
 
    // verifies that chain's block_log has a genesis_state (and blocks starting at 1)
    controller::config copied_config = copy_config_and_files(chain.get_config(), ordinal++);
-   tester from_block_log_chain(copied_config);
+   auto genesis = chain::block_log::extract_genesis_state(chain.get_config().blocks_dir);
+   BOOST_REQUIRE(genesis);
+   tester from_block_log_chain(copied_config, *genesis);
    const auto from_block_log_head = from_block_log_chain.control->head_block_num();
    BOOST_REQUIRE_EQUAL(from_block_log_head, snap_chain.control->last_irreversible_block_num());
    for (auto block_num = from_block_log_head + 1; block_num <= snap_head; ++block_num) {
@@ -420,14 +408,13 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
 
    // verifies that snap_chain's block_log does not have a genesis_state
    copied_config = copy_config_and_files(snap_chain.get_config(), ordinal++);
-   copied_config.genesis.emplace(*chain.get_config().genesis);
    try {
       tester from_chain_id_block_log_chain(copied_config);
       BOOST_FAIL("Should not be able to create new tester chain with block_log that does not start at block 1 "
                  "(and thus does not have a genesis state)");
    }
-   catch(const block_log_exception& ble) {
-      BOOST_REQUIRE_EQUAL("block log does not start with genesis block", ble.top_message());
+   catch(const database_exception& ble) {
+      BOOST_REQUIRE_EQUAL("This version of controller::startup does not work with a fresh state database.", ble.top_message());
    }
 
 }
@@ -449,7 +436,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_chain_id_in_snapshot, SNAPSHOT_SUITE, snapsho
    chain.control->write_snapshot(writer);
    auto snapshot = SNAPSHOT_SUITE::finalize(writer);
 
-   snapshotted_tester snap_chain(chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), 0, fc::optional<chain_id_type>());
+   snapshotted_tester snap_chain(chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), 0);
    BOOST_REQUIRE_EQUAL(chain.control->get_chain_id(), snap_chain.control->get_chain_id());
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
 }
@@ -488,7 +475,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot
 BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, snapshot_suites)
 {
    tester chain(setup_policy::preactivate_feature_and_new_bios);
-   BOOST_REQUIRE_EQUAL(chain.get_config().genesis->compute_chain_id(), chain.control->get_chain_id());
+   auto genesis = chain::block_log::extract_genesis_state(chain.get_config().blocks_dir);
+   BOOST_REQUIRE(genesis);
+   BOOST_REQUIRE_EQUAL(genesis->compute_chain_id(), chain.control->get_chain_id());
    const auto& gpo = chain.control->get_global_properties();
    BOOST_REQUIRE_EQUAL(gpo.chain_id, chain.control->get_chain_id());
    auto block = chain.produce_block();
@@ -515,12 +504,13 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
    int ordinal = 0;
 
    ////////////////////////////////////////////////////////////////////////
-   // Verify that the controller doesn't get the chain_id from the snapshot
+   // Verify that the controller gets its chain_id from the snapshot
    ////////////////////////////////////////////////////////////////////////
 
-   fc::optional<chain_id_type> chain_id = chain.control->get_chain_id();
-   snapshotted_tester v2_tester(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), ordinal++, chain_id);
-   BOOST_REQUIRE_EQUAL(*chain_id, v2_tester.control->get_chain_id());
+   auto reader = SNAPSHOT_SUITE::get_reader(v2);
+   snapshotted_tester v2_tester(chain.get_config(), reader, ordinal++);
+   auto chain_id = chain::controller::extract_chain_id(reader);
+   BOOST_REQUIRE_EQUAL(chain_id, v2_tester.control->get_chain_id());
    BOOST_REQUIRE_EQUAL(chain.control->get_chain_id(), v2_tester.control->get_chain_id());
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *v2_tester.control);
 
@@ -551,11 +541,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
 
    latest_from_v2_tester.push_block(new_block);
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *latest_from_v2_tester.control);
-
-   // test passing in an invalid chain_id
-   snapshotted_tester v2_tester2(chain.get_config(), SNAPSHOT_SUITE::get_reader(v2), ordinal++, fc::optional<chain_id_type>());
-   BOOST_REQUIRE(chain.control->get_chain_id() != v2_tester2.control->get_chain_id());
-   BOOST_REQUIRE(chain.control->calculate_integrity_hash().str() != v2_tester2.control->calculate_integrity_hash().str());
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/unittests/whitelist_blacklist_tests.cpp b/unittests/whitelist_blacklist_tests.cpp
index 68a9c7919c3..dcbcb1ba14a 100644
--- a/unittests/whitelist_blacklist_tests.cpp
+++ b/unittests/whitelist_blacklist_tests.cpp
@@ -25,42 +25,17 @@ class whitelist_blacklist_tester {
    public:
       whitelist_blacklist_tester() {}
 
-      static controller::config get_default_chain_configuration( const fc::path& p ) {
-         controller::config cfg;
-         cfg.blocks_dir = p / config::default_blocks_dir_name;
-         cfg.state_dir  = p / config::default_state_dir_name;
-         cfg.state_size = 1024*1024*8;
-         cfg.state_guard_size = 0;
-         cfg.reversible_cache_size = 1024*1024*8;
-         cfg.reversible_guard_size = 0;
-         cfg.contracts_console = true;
-
-         cfg.genesis.emplace();
-         cfg.genesis->initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-         cfg.genesis->initial_key = base_tester::get_public_key( config::system_account_name, "active" );
-
-         for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
-            if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
-               cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
-            else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
-               cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
-         }
-
-         return cfg;
-      }
-
       void init( bool bootstrap = true ) {
          FC_ASSERT( !chain, "chain is already up" );
 
-         auto cfg = get_default_chain_configuration( tempdir.path() );
-         cfg.sender_bypass_whiteblacklist = sender_bypass_whiteblacklist;
-         cfg.actor_whitelist = actor_whitelist;
-         cfg.actor_blacklist = actor_blacklist;
-         cfg.contract_whitelist = contract_whitelist;
-         cfg.contract_blacklist = contract_blacklist;
-         cfg.action_blacklist = action_blacklist;
-
-         chain.emplace(cfg);
+         chain.emplace(tempdir, [&](controller::config& cfg) {
+            cfg.sender_bypass_whiteblacklist = sender_bypass_whiteblacklist;
+            cfg.actor_whitelist = actor_whitelist;
+            cfg.actor_blacklist = actor_blacklist;
+            cfg.contract_whitelist = contract_whitelist;
+            cfg.contract_blacklist = contract_blacklist;
+            cfg.action_blacklist = action_blacklist;
+         }, !shutdown_called);
          wdump((last_produced_block));
          chain->set_last_produced_block_map( last_produced_block );
 
@@ -86,6 +61,7 @@ class whitelist_blacklist_tester {
          last_produced_block = chain->get_last_produced_block_map();
          wdump((last_produced_block));
          chain.reset();
+         shutdown_called = true;
       }
 
       transaction_trace_ptr transfer( account_name from, account_name to, string quantity = "1.00 TOK" ) {
@@ -97,7 +73,9 @@ class whitelist_blacklist_tester {
          );
       }
 
+   private:
       fc::temp_directory                tempdir; // Must come before chain
+   public:
       fc::optional<Tester>              chain;
       flat_set<account_name>            sender_bypass_whiteblacklist;
       flat_set<account_name>            actor_whitelist;
@@ -106,6 +84,7 @@ class whitelist_blacklist_tester {
       flat_set<account_name>            contract_blacklist;
       flat_set< pair<account_name, action_name> >  action_blacklist;
       map<account_name, block_id_type>  last_produced_block;
+      bool                              shutdown_called = false;
 };
 
 struct transfer_args {

From edbfeab81b1a70ea9654c21bd6469f6faa71ec47 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 12:51:04 -0400
Subject: [PATCH 1248/1648] Support double-digit major versions.

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index a5738e74a55..fdc1ac76264 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -57,7 +57,7 @@ if [[ ! -z ${BUILDKITE_TRIGGERED_FROM_BUILD_ID} ]]; then
 fi
 export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}
 # set trigger_job if master/release/develop branch and webhook
-if [[ $BUILDKITE_BRANCH =~ ^release/[0-9].[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ ]]; then
+if [[ $BUILDKITE_BRANCH =~ ^release/[0-9]+\.[0-9]+\.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ ]]; then
     [[ $BUILDKITE_SOURCE == 'webhook' ]] && export TRIGGER_JOB=true
 fi
 oIFS="$IFS"

From 02dd0095be9a5db0310b4ad8338e9c6145ecf8de Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 13 Sep 2019 12:58:45 -0400
Subject: [PATCH 1249/1648] Added back pipeline tail comment.

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index fdc1ac76264..3e80f2f7ad2 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -366,6 +366,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
 EOF
     fi
 fi
+# pipeline tail
 cat <<EOF
   - wait:
     continue_on_failure: true

From 76e28f733093e711e9fe8d83b285e5309bd9f77a Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 13 Sep 2019 16:15:10 -0400
Subject: [PATCH 1250/1648] anka plugin update and new features for failover of
 registry

---
 .cicd/generate-pipeline.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 3e80f2f7ad2..51685122d9d 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -124,7 +124,7 @@ EOF
       - "cd eos && ./.cicd/build.sh"
       - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     plugins:
-      - chef/anka#v0.5.1:
+      - chef/anka#v0.5.4:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -134,6 +134,10 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          failover-registries:
+            - 'registry_1'
+            - 'registry_2'
+          pre-execute-sleep: 5
     timeout: ${TIMEOUT:-180}
     agents: "queue=mac-anka-large-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
@@ -185,7 +189,7 @@ EOF
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
     plugins:
-      - chef/anka#v0.5.1:
+      - chef/anka#v0.5.4:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -193,6 +197,10 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          failover-registries:
+            - 'registry_1'
+            - 'registry_2'
+          pre-execute-sleep: 5
     timeout: ${TIMEOUT:-20}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
@@ -240,7 +248,7 @@ EOF
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
     plugins:
-      - chef/anka#v0.5.1:
+      - chef/anka#v0.5.4:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -248,6 +256,10 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          failover-registries:
+            - 'registry_1'
+            - 'registry_2'
+          pre-execute-sleep: 5
     timeout: ${TIMEOUT:-20}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
@@ -296,7 +308,7 @@ EOF
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     plugins:
-      - chef/anka#v0.5.1:
+      - chef/anka#v0.5.4:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -304,6 +316,10 @@ EOF
           always-pull: true
           debug: true
           wait-network: true
+          failover-registries:
+            - 'registry_1'
+            - 'registry_2'
+          pre-execute-sleep: 5
     timeout: ${TIMEOUT:-180}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
@@ -433,7 +449,7 @@ cat <<EOF
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/package.sh"
     plugins:
-      - chef/anka#v0.5.1:
+      - chef/anka#v0.5.4:
           no-volume: true
           inherit-environment-vars: true
           vm-name: 10.14.4_6C_14G_40G
@@ -441,6 +457,10 @@ cat <<EOF
           always-pull: true
           debug: true
           wait-network: true
+          failover-registries:
+            - 'registry_1'
+            - 'registry_2'
+          pre-execute-sleep: 5
     agents:
       - "queue=mac-anka-node-fleet"
     timeout: ${TIMEOUT:-10}

From a9d7747c1632563f4ba2c03be11451190d5af247 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 13 Sep 2019 17:44:46 -0400
Subject: [PATCH 1251/1648] added fix

---
 .cicd/generate-pipeline.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 3e80f2f7ad2..7231815215b 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -10,6 +10,13 @@ LINUX_CONCURRENCY='8'
 MAC_CONCURRENCY='2'
 LINUX_CONCURRENCY_GROUP='eos-scheduled-build'
 MAC_CONCURRENCY_GROUP='eos-scheduled-build-mac'
+
+# Determine if it's a forked PR and make sure to add git fetch so we don't have to git clone the forked repo's url
+if [[ $BUILDKITE_BRANCH =~ 'pull/' ]]; then
+  PR_ID=$(echo $BUILDKITE_BRANCH | cut -d/ -f2)
+  export GIT_FETCH="git fetch -v --prune origin refs/pull/$PR_ID/head &&"
+fi
+
 for FILE in $(ls $CICD_DIR/platforms); do
     # skip mac or linux by not even creating the json block
     ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
@@ -83,7 +90,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
       TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
       PINNED: $PINNED
       UNPINNED: $UNPINNED
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
       PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
     timeout: ${TIMEOUT:-320}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
@@ -120,7 +127,7 @@ EOF
         cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build"
     command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "git clone \$BUILDKITE_REPO eos && cd eos && $GIT_FETCH git checkout -f \$BUILDKITE_COMMIT && git submodule update --init --recursive"
       - "cd eos && ./.cicd/build.sh"
       - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     plugins:
@@ -181,7 +188,7 @@ EOF
             cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Unit Tests"
     command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "git clone \$BUILDKITE_REPO eos && cd eos && $GIT_FETCH git checkout -f \$BUILDKITE_COMMIT && git submodule update --init --recursive"
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
     plugins:
@@ -236,7 +243,7 @@ EOF
                 cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "git clone \$BUILDKITE_REPO eos && cd eos && $GIT_FETCH git checkout -f \$BUILDKITE_COMMIT && git submodule update --init --recursive"
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
     plugins:
@@ -292,7 +299,7 @@ EOF
                 cat <<EOF
   - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - $TEST_NAME"
     command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "git clone \$BUILDKITE_REPO eos && cd eos && $GIT_FETCH git checkout -f \$BUILDKITE_COMMIT && git submodule update --init --recursive"
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     plugins:
@@ -429,7 +436,7 @@ cat <<EOF
 
   - label: ":darwin: macOS 10.14 - Package Builder"
     command:
-      - "git clone \$BUILDKITE_REPO eos && cd eos && git checkout \$BUILDKITE_COMMIT"
+      - "git clone \$BUILDKITE_REPO eos && cd eos && $GIT_FETCH git checkout -f \$BUILDKITE_COMMIT"
       - "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
       - "cd eos && ./.cicd/package.sh"
     plugins:

From 073bf24b967421e77686eb640c4292b428de2bcd Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 13 Sep 2019 17:57:49 -0400
Subject: [PATCH 1252/1648] quick fixes

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 7231815215b..2c5772d8f2d 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -90,7 +90,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
       TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
       PINNED: $PINNED
       UNPINNED: $UNPINNED
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
       PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
     timeout: ${TIMEOUT:-320}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}

From 5a5cfd333847afcaee752b9e026dc574a8b2f1dc Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 13 Sep 2019 18:20:56 -0400
Subject: [PATCH 1253/1648] quick fix

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 2c5772d8f2d..562d32c7b5f 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -12,7 +12,7 @@ LINUX_CONCURRENCY_GROUP='eos-scheduled-build'
 MAC_CONCURRENCY_GROUP='eos-scheduled-build-mac'
 
 # Determine if it's a forked PR and make sure to add git fetch so we don't have to git clone the forked repo's url
-if [[ $BUILDKITE_BRANCH =~ 'pull/' ]]; then
+if [[ $BUILDKITE_BRANCH =~ '^pull/[0-9]+/head:' ]]; then
   PR_ID=$(echo $BUILDKITE_BRANCH | cut -d/ -f2)
   export GIT_FETCH="git fetch -v --prune origin refs/pull/$PR_ID/head &&"
 fi

From 27ac59adb0d42647b8d91798464b41c2e158790a Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Fri, 13 Sep 2019 18:56:05 -0400
Subject: [PATCH 1254/1648] removed quote from GIT_FETCH/pull regex

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 562d32c7b5f..64ea89fd712 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -12,7 +12,7 @@ LINUX_CONCURRENCY_GROUP='eos-scheduled-build'
 MAC_CONCURRENCY_GROUP='eos-scheduled-build-mac'
 
 # Determine if it's a forked PR and make sure to add git fetch so we don't have to git clone the forked repo's url
-if [[ $BUILDKITE_BRANCH =~ '^pull/[0-9]+/head:' ]]; then
+if [[ $BUILDKITE_BRANCH =~ ^pull/[0-9]+/head: ]]; then
   PR_ID=$(echo $BUILDKITE_BRANCH | cut -d/ -f2)
   export GIT_FETCH="git fetch -v --prune origin refs/pull/$PR_ID/head &&"
 fi

From 3552298ada027149f74d8bb83001124430632c48 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 8 Aug 2019 15:22:02 -0400
Subject: [PATCH 1255/1648] move isA() out of WAVM's Runtime.cpp since linking
 needs that

---
 libraries/wasm-jit/Source/Runtime/Linker.cpp  | 14 ++++++++++++++
 libraries/wasm-jit/Source/Runtime/Runtime.cpp | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libraries/wasm-jit/Source/Runtime/Linker.cpp b/libraries/wasm-jit/Source/Runtime/Linker.cpp
index 5675e44e36e..0e73cefbdad 100644
--- a/libraries/wasm-jit/Source/Runtime/Linker.cpp
+++ b/libraries/wasm-jit/Source/Runtime/Linker.cpp
@@ -12,6 +12,20 @@ namespace Runtime
 {
 	RUNTIME_API IntrinsicResolver IntrinsicResolver::singleton;
 
+	bool isA(ObjectInstance* object,const ObjectType& type)
+	{
+		if(type.kind != object->kind) { return false; }
+
+		switch(type.kind)
+		{
+		case ObjectKind::function: return asFunctionType(type) == asFunction(object)->type;
+		case ObjectKind::global: return asGlobalType(type) == asGlobal(object)->type;
+		case ObjectKind::table: return isSubset(asTableType(type),asTable(object)->type);
+		case ObjectKind::memory: return isSubset(asMemoryType(type),asMemory(object)->type);
+		default: Errors::unreachable();
+		}
+	}
+
 	bool IntrinsicResolver::resolve(const std::string& moduleName,const std::string& exportName,ObjectType type,ObjectInstance*& outObject)
 	{
 		// Make sure the wavmIntrinsics module can't be directly imported.
diff --git a/libraries/wasm-jit/Source/Runtime/Runtime.cpp b/libraries/wasm-jit/Source/Runtime/Runtime.cpp
index 7508a6caf87..2de03ef7801 100644
--- a/libraries/wasm-jit/Source/Runtime/Runtime.cpp
+++ b/libraries/wasm-jit/Source/Runtime/Runtime.cpp
@@ -40,20 +40,6 @@ namespace Runtime
 		throw Exception {cause,describeCallStack(callStack)};
 	}
 
-	bool isA(ObjectInstance* object,const ObjectType& type)
-	{
-		if(type.kind != object->kind) { return false; }
-
-		switch(type.kind)
-		{
-		case ObjectKind::function: return asFunctionType(type) == asFunction(object)->type;
-		case ObjectKind::global: return asGlobalType(type) == asGlobal(object)->type;
-		case ObjectKind::table: return isSubset(asTableType(type),asTable(object)->type);
-		case ObjectKind::memory: return isSubset(asMemoryType(type),asMemory(object)->type);
-		default: Errors::unreachable();
-		}
-	}
-
 	[[noreturn]] void handleHardwareTrap(Platform::HardwareTrapType trapType,Platform::CallStack&& trapCallStack,Uptr trapOperand)
 	{
       std::cerr << "handle hardware trap\n";

From 8e4bb69fe8d7371cbea4782c694622da4017e23f Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 8 Aug 2019 15:22:49 -0400
Subject: [PATCH 1256/1648] Remove global/table/memory intrinsic support

---
 .../wasm-jit/Include/Runtime/Intrinsics.h     | 72 -----------------
 .../wasm-jit/Source/Runtime/Intrinsics.cpp    | 80 +------------------
 2 files changed, 3 insertions(+), 149 deletions(-)

diff --git a/libraries/wasm-jit/Include/Runtime/Intrinsics.h b/libraries/wasm-jit/Include/Runtime/Intrinsics.h
index fa3e6f2b8a0..e5d37f3b7d9 100644
--- a/libraries/wasm-jit/Include/Runtime/Intrinsics.h
+++ b/libraries/wasm-jit/Include/Runtime/Intrinsics.h
@@ -17,78 +17,6 @@ namespace Intrinsics
 	private:
 		const char* name;
 	};
-	
-	// The base class of Intrinsic globals.
-	struct Global
-	{
-		Runtime::GlobalInstance* global;
-
-		RUNTIME_API Global(const char* inName,IR::GlobalType inType);
-		RUNTIME_API ~Global();
-		
-		RUNTIME_API void reset();
-
-	protected:
-		void* value;
-	private:
-		const char* name;
-		IR::GlobalType globalType;
-	};
-	
-	// A partially specialized template for Intrinsic globals:
-	// Provides access via implicit coercion to a value, and for mutable globals an assignment operator.
-	template<IR::ValueType type,bool isMutable>
-	struct GenericGlobal : Global
-	{
-		typedef typename IR::ValueTypeInfo<type>::Value Value;
-
-		GenericGlobal(const char* inName,Value inValue)
-		: Global(inName,IR::GlobalType(type,isMutable)) { *(Value*)value = inValue; }
-
-		operator Value() const { return *(Value*)value; }
-		void operator=(Value newValue) { *(Value*)value = newValue; }
-	};
-	template<IR::ValueType type>
-	struct GenericGlobal<type,false> : Global
-	{
-		typedef typename IR::ValueTypeInfo<type>::Value Value;
-
-		GenericGlobal(const char* inName,Value inValue)
-		: Global(inName,IR::GlobalType(type,false)) { *(Value*)value = inValue; }
-
-		operator Value() const { return *(Value*)value; }
-		
-		void reset(Value inValue)
-		{
-			Global::reset();
-			*(Value*)value = inValue;
-		}
-	};
-
-	// Intrinsic memories and tables
-	struct Memory
-	{
-		RUNTIME_API Memory(const char* inName,const IR::MemoryType& inType);
-		RUNTIME_API ~Memory();
-
-		operator Runtime::MemoryInstance*() const { return memory; }
-
-	private:
-		const char* name;
-		Runtime::MemoryInstance* const memory;
-	};
-
-	struct Table
-	{
-		RUNTIME_API Table(const char* inName,const IR::TableType& inType);
-		RUNTIME_API ~Table();
-		
-		operator Runtime::TableInstance*() const { return table; }
-
-	private:
-		const char* name;
-		Runtime::TableInstance* const table;
-	};
 
 	// Finds an intrinsic object by name and type.
 	RUNTIME_API Runtime::ObjectInstance* find(const std::string& name,const IR::ObjectType& type);
diff --git a/libraries/wasm-jit/Source/Runtime/Intrinsics.cpp b/libraries/wasm-jit/Source/Runtime/Intrinsics.cpp
index f62fb477adb..11f5dc3a3f1 100644
--- a/libraries/wasm-jit/Source/Runtime/Intrinsics.cpp
+++ b/libraries/wasm-jit/Source/Runtime/Intrinsics.cpp
@@ -11,9 +11,6 @@ namespace Intrinsics
 	struct Singleton
 	{
 		std::map<std::string,Intrinsics::Function*> functionMap;
-		std::map<std::string,Intrinsics::Global*> variableMap;
-		std::map<std::string,Intrinsics::Memory*> memoryMap;
-		std::map<std::string,Intrinsics::Table*> tableMap;
 		Platform::Mutex* mutex;
 
 		Singleton(): mutex(Platform::createMutex()) {}
@@ -51,71 +48,6 @@ namespace Intrinsics
       delete function;
 	}
 
-	Global::Global(const char* inName,IR::GlobalType inType)
-	:	name(inName)
-	,	globalType(inType)
-	{
-		global = Runtime::createGlobal(inType,Runtime::Value((I64)0));
-		value = &global->value;
-		{
-			Platform::Lock lock(Singleton::get().mutex);
-			Singleton::get().variableMap[getDecoratedName(inName,inType)] = this;
-		}
-	}
-
-	Global::~Global()
-	{
-		{
-			Platform::Lock Lock(Singleton::get().mutex);
-			Singleton::get().variableMap.erase(Singleton::get().variableMap.find(getDecoratedName(name,global->type)));
-		}
-		delete global;
-	}
-
-	void Global::reset()
-	{
-		global = Runtime::createGlobal(globalType,Runtime::Value((I64)0));
-		value = &global->value;
-	}
-
-	Table::Table(const char* inName,const IR::TableType& type)
-	: name(inName)
-	, table(Runtime::createTable(type))
-	{
-		if(!table) { Errors::fatal("failed to create intrinsic table"); }
-
-		Platform::Lock lock(Singleton::get().mutex);
-		Singleton::get().tableMap[getDecoratedName(inName,type)] = this;
-	}
-	
-	Table::~Table()
-	{
-		{
-			Platform::Lock Lock(Singleton::get().mutex);
-			Singleton::get().tableMap.erase(Singleton::get().tableMap.find(getDecoratedName(name,table->type)));
-		}
-		delete table;
-	}
-	
-	Memory::Memory(const char* inName,const IR::MemoryType& type)
-	: name(inName)
-	, memory(Runtime::createMemory(type))
-	{
-		if(!memory) { Errors::fatal("failed to create intrinsic memory"); }
-
-		Platform::Lock lock(Singleton::get().mutex);
-		Singleton::get().memoryMap[getDecoratedName(inName,type)] = this;
-	}
-	
-	Memory::~Memory()
-	{
-		{
-			Platform::Lock Lock(Singleton::get().mutex);
-			Singleton::get().memoryMap.erase(Singleton::get().memoryMap.find(getDecoratedName(name,memory->type)));
-		}
-		delete memory;
-	}
-
 	Runtime::ObjectInstance* find(const std::string& name,const IR::ObjectType& type)
 	{
 		std::string decoratedName = getDecoratedName(name,type);
@@ -131,20 +63,17 @@ namespace Intrinsics
 		}
 		case IR::ObjectKind::table:
 		{
-			auto keyValue = Singleton::get().tableMap.find(decoratedName);
-			result = keyValue == Singleton::get().tableMap.end() ? nullptr : asObject((Runtime::TableInstance*)*keyValue->second);
+			result = nullptr;
 			break;
 		}
 		case IR::ObjectKind::memory:
 		{
-			auto keyValue = Singleton::get().memoryMap.find(decoratedName);
-			result = keyValue == Singleton::get().memoryMap.end() ? nullptr : asObject((Runtime::MemoryInstance*)*keyValue->second);
+			result = nullptr;
 			break;
 		}
 		case IR::ObjectKind::global:
 		{
-			auto keyValue = Singleton::get().variableMap.find(decoratedName);
-			result = keyValue == Singleton::get().variableMap.end() ? nullptr : asObject(keyValue->second->global);
+			result = nullptr;
 			break;
 		}
 		default: Errors::unreachable();
@@ -158,9 +87,6 @@ namespace Intrinsics
 		Platform::Lock lock(Singleton::get().mutex);
 		std::vector<Runtime::ObjectInstance*> result;
 		for(auto mapIt : Singleton::get().functionMap) { result.push_back(mapIt.second->function); }
-		for(auto mapIt : Singleton::get().tableMap) { result.push_back((Runtime::TableInstance*)*mapIt.second); }
-		for(auto mapIt : Singleton::get().memoryMap) { result.push_back((Runtime::MemoryInstance*)*mapIt.second); }
-		for(auto mapIt : Singleton::get().variableMap) { result.push_back(mapIt.second->global); }
 		return result;
 	}
 }

From 40d0de6ef838d08a3f2aa3da31022d5b7117332c Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 13 Aug 2019 15:45:41 -0400
Subject: [PATCH 1257/1648] decouple wavm runtime from being a required
 component in eosio

---
 CMakeLists.txt                                |   8 +
 CMakeModules/EosioTester.cmake.in             |   8 +-
 CMakeModules/EosioTesterBuild.cmake.in        |   8 +-
 libraries/chain/CMakeLists.txt                |   7 +-
 .../eosio/chain/wasm_interface_private.hpp    |  14 +-
 .../include/eosio/chain/webassembly/wavm.hpp  | 240 +++++++++---------
 .../wasm-jit/Source/Runtime/CMakeLists.txt    |  20 +-
 unittests/CMakeLists.txt                      |  24 +-
 8 files changed, 184 insertions(+), 145 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f26266ec320..30acb6937d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,14 @@ if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "")
    set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
 endif()
 
+# WASM runtimes to build
+list(APPEND EOSIO_WASM_RUNTIMES wabt)   #wabt is always enabled; it works everywhere
+if(NOT WIN32)
+   list(APPEND EOSIO_WASM_RUNTIMES wavm)
+   # try and find LLVM now so that package variables get populated in global scope
+   find_package(LLVM REQUIRED CONFIG)
+endif()
+
 if(UNIX)
   if(APPLE)
     set(whole_archive_flag "-force_load")
diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index 47ef8b44383..f0e45ee5c4a 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -20,9 +20,11 @@ if( GPERFTOOLS_FOUND )
     list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-find_package(LLVM @LLVM_VERSION@ EXACT REQUIRED CONFIG)
-llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
-link_directories(${LLVM_LIBRARY_DIR})
+if(NOT "@LLVM_FOUND@" STREQUAL "")
+   find_package(LLVM @LLVM_VERSION@ EXACT REQUIRED CONFIG)
+   llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
+   link_directories(${LLVM_LIBRARY_DIR})
+endif()
 
 set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_EXTENSIONS ON )
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index 118db06e1fa..954b0cd645d 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -18,9 +18,11 @@ if( GPERFTOOLS_FOUND )
     list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
 endif()
 
-find_package(LLVM @LLVM_VERSION@ EXACT REQUIRED CONFIG)
-llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
-link_directories(${LLVM_LIBRARY_DIR})
+if(NOT "@LLVM_FOUND@" STREQUAL "")
+   find_package(LLVM @LLVM_VERSION@ EXACT REQUIRED CONFIG)
+   llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
+   link_directories(${LLVM_LIBRARY_DIR})
+endif()
 
 set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_EXTENSIONS ON )
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 66a357946ff..30b856bdc26 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -16,6 +16,11 @@ else()
    endif()
 endif()
 
+if("wavm" IN_LIST EOSIO_WASM_RUNTIMES)
+   set(CHAIN_WAVM_SOURCES "webassembly/wavm.cpp")
+   add_definitions(-DWAVM_RUNTIME_ENABLED)
+endif()
+
 ## SORT .cpp by most likely to change / break compile
 add_library( eosio_chain
              merkle.cpp
@@ -50,7 +55,7 @@ add_library( eosio_chain
               asset.cpp
               snapshot.cpp
 
-             webassembly/wavm.cpp
+             ${CHAIN_WAVM_SOURCES}
              webassembly/wabt.cpp
 
 #             get_config.cpp
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 973e0a67efa..83e55b34e10 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -38,12 +38,14 @@ namespace eosio { namespace chain {
       struct by_last_block_num;
 
       wasm_interface_impl(wasm_interface::vm_type vm, const chainbase::database& d) : db(d) {
+#ifdef WAVM_RUNTIME_ENABLED
          if(vm == wasm_interface::vm_type::wavm)
             runtime_interface = std::make_unique<webassembly::wavm::wavm_runtime>();
-         else if(vm == wasm_interface::vm_type::wabt)
+#endif
+         if(vm == wasm_interface::vm_type::wabt)
             runtime_interface = std::make_unique<webassembly::wabt_runtime::wabt_runtime>();
-         else
-            EOS_THROW(wasm_exception, "wasm_interface_impl fall through");
+         if(!runtime_interface)
+            EOS_THROW(wasm_exception, "${r} wasm runtime not supported on this platform and/or configuration", ("r", vm));
       }
 
       ~wasm_interface_impl() {
@@ -166,6 +168,12 @@ namespace eosio { namespace chain {
       const chainbase::database& db;
    };
 
+#define _ADD_PAREN_1(...) ((__VA_ARGS__)) _ADD_PAREN_2
+#define _ADD_PAREN_2(...) ((__VA_ARGS__)) _ADD_PAREN_1
+#define _ADD_PAREN_1_END
+#define _ADD_PAREN_2_END
+#define _WRAPPED_SEQ(SEQ) BOOST_PP_CAT(_ADD_PAREN_1 SEQ, _END)
+
 #define _REGISTER_INTRINSIC_EXPLICIT(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
    _REGISTER_WAVM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
    _REGISTER_WABT_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index a19c0b3662b..d9050eaf739 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -32,6 +32,119 @@ struct running_instance_context {
 };
 extern running_instance_context the_running_instance_context;
 
+template<typename T>
+struct wasm_to_value_type;
+
+template<>
+struct wasm_to_value_type<F32> {
+   static constexpr auto value = ValueType::f32;
+};
+
+template<>
+struct wasm_to_value_type<F64> {
+   static constexpr auto value = ValueType::f64;
+};
+template<>
+struct wasm_to_value_type<I32> {
+   static constexpr auto value = ValueType::i32;
+};
+template<>
+struct wasm_to_value_type<I64> {
+   static constexpr auto value = ValueType::i64;
+};
+
+template<typename T>
+constexpr auto wasm_to_value_type_v = wasm_to_value_type<T>::value;
+
+template<typename T>
+struct wasm_to_rvalue_type;
+template<>
+struct wasm_to_rvalue_type<F32> {
+   static constexpr auto value = ResultType::f32;
+};
+template<>
+struct wasm_to_rvalue_type<F64> {
+   static constexpr auto value = ResultType::f64;
+};
+template<>
+struct wasm_to_rvalue_type<I32> {
+   static constexpr auto value = ResultType::i32;
+};
+template<>
+struct wasm_to_rvalue_type<I64> {
+   static constexpr auto value = ResultType::i64;
+};
+template<>
+struct wasm_to_rvalue_type<void> {
+   static constexpr auto value = ResultType::none;
+};
+template<>
+struct wasm_to_rvalue_type<const name&> {
+   static constexpr auto value = ResultType::i64;
+};
+template<>
+struct wasm_to_rvalue_type<name> {
+   static constexpr auto value = ResultType::i64;
+};
+
+template<>
+struct wasm_to_rvalue_type<char*> {
+   static constexpr auto value = ResultType::i32;
+};
+
+template<>
+struct wasm_to_rvalue_type<fc::time_point_sec> {
+   static constexpr auto value = ResultType::i32;
+};
+
+
+template<typename T>
+constexpr auto wasm_to_rvalue_type_v = wasm_to_rvalue_type<T>::value;
+
+template<typename T>
+struct is_reference_from_value {
+   static constexpr bool value = false;
+};
+
+template<>
+struct is_reference_from_value<name> {
+   static constexpr bool value = true;
+};
+
+template<>
+struct is_reference_from_value<fc::time_point_sec> {
+   static constexpr bool value = true;
+};
+
+template<typename T>
+constexpr bool is_reference_from_value_v = is_reference_from_value<T>::value;
+
+
+
+struct void_type {
+};
+
+/**
+ * Forward declaration of provider for FunctionType given a desired C ABI signature
+ */
+template<typename>
+struct wasm_function_type_provider;
+
+/**
+ * specialization to destructure return and arguments
+ */
+template<typename Ret, typename ...Args>
+struct wasm_function_type_provider<Ret(Args...)> {
+   static const FunctionType *type() {
+      return FunctionType::get(wasm_to_rvalue_type_v<Ret>, {wasm_to_value_type_v<Args> ...});
+   }
+};
+
+#define __INTRINSIC_NAME(LABEL, SUFFIX) LABEL##SUFFIX
+#define _INTRINSIC_NAME(LABEL, SUFFIX) __INTRINSIC_NAME(LABEL,SUFFIX)
+
+#ifdef WAVM_RUNTIME_ENABLED
+
 /**
  * class to represent an in-wasm-memory array
  * it is a hint to the transcriber that the next parameter will
@@ -174,114 +287,6 @@ inline auto convert_wasm_to_native(native_to_wasm_t<T> val) {
    return T(val);
 }
 
-template<typename T>
-struct wasm_to_value_type;
-
-template<>
-struct wasm_to_value_type<F32> {
-   static constexpr auto value = ValueType::f32;
-};
-
-template<>
-struct wasm_to_value_type<F64> {
-   static constexpr auto value = ValueType::f64;
-};
-template<>
-struct wasm_to_value_type<I32> {
-   static constexpr auto value = ValueType::i32;
-};
-template<>
-struct wasm_to_value_type<I64> {
-   static constexpr auto value = ValueType::i64;
-};
-
-template<typename T>
-constexpr auto wasm_to_value_type_v = wasm_to_value_type<T>::value;
-
-template<typename T>
-struct wasm_to_rvalue_type;
-template<>
-struct wasm_to_rvalue_type<F32> {
-   static constexpr auto value = ResultType::f32;
-};
-template<>
-struct wasm_to_rvalue_type<F64> {
-   static constexpr auto value = ResultType::f64;
-};
-template<>
-struct wasm_to_rvalue_type<I32> {
-   static constexpr auto value = ResultType::i32;
-};
-template<>
-struct wasm_to_rvalue_type<I64> {
-   static constexpr auto value = ResultType::i64;
-};
-template<>
-struct wasm_to_rvalue_type<void> {
-   static constexpr auto value = ResultType::none;
-};
-template<>
-struct wasm_to_rvalue_type<const name&> {
-   static constexpr auto value = ResultType::i64;
-};
-template<>
-struct wasm_to_rvalue_type<name> {
-   static constexpr auto value = ResultType::i64;
-};
-
-template<>
-struct wasm_to_rvalue_type<char*> {
-   static constexpr auto value = ResultType::i32;
-};
-
-template<>
-struct wasm_to_rvalue_type<fc::time_point_sec> {
-   static constexpr auto value = ResultType::i32;
-};
-
-
-template<typename T>
-constexpr auto wasm_to_rvalue_type_v = wasm_to_rvalue_type<T>::value;
-
-template<typename T>
-struct is_reference_from_value {
-   static constexpr bool value = false;
-};
-
-template<>
-struct is_reference_from_value<name> {
-   static constexpr bool value = true;
-};
-
-template<>
-struct is_reference_from_value<fc::time_point_sec> {
-   static constexpr bool value = true;
-};
-
-template<typename T>
-constexpr bool is_reference_from_value_v = is_reference_from_value<T>::value;
-
-
-
-struct void_type {
-};
-
-/**
- * Forward declaration of provider for FunctionType given a desired C ABI signature
- */
-template<typename>
-struct wasm_function_type_provider;
-
-/**
- * specialization to destructure return and arguments
- */
-template<typename Ret, typename ...Args>
-struct wasm_function_type_provider<Ret(Args...)> {
-   static const FunctionType *type() {
-      return FunctionType::get(wasm_to_rvalue_type_v<Ret>, {wasm_to_value_type_v<Args> ...});
-   }
-};
-
 /**
  * Forward declaration of the invoker type which transcribes arguments to/from a native method
  * and injects the appropriate checks
@@ -698,21 +703,22 @@ struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) const
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) const volatile, Cls, Params...>;
 };
 
-#define _ADD_PAREN_1(...) ((__VA_ARGS__)) _ADD_PAREN_2
-#define _ADD_PAREN_2(...) ((__VA_ARGS__)) _ADD_PAREN_1
-#define _ADD_PAREN_1_END
-#define _ADD_PAREN_2_END
-#define _WRAPPED_SEQ(SEQ) BOOST_PP_CAT(_ADD_PAREN_1 SEQ, _END)
+#define _REGISTER_WAVM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
+   static Intrinsics::Function _INTRINSIC_NAME(__intrinsic_fn, __COUNTER__) (\
+      MOD "." NAME,\
+      eosio::chain::webassembly::wavm::wasm_function_type_provider<WASM_SIG>::type(),\
+      (void *)eosio::chain::webassembly::wavm::intrinsic_function_invoker_wrapper<WASM_SIG, SIG>::type::fn<&CLS::METHOD>()\
+   );
 
-#define __INTRINSIC_NAME(LABEL, SUFFIX) LABEL##SUFFIX
-#define _INTRINSIC_NAME(LABEL, SUFFIX) __INTRINSIC_NAME(LABEL,SUFFIX)
+#else
 
 #define _REGISTER_WAVM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
    static Intrinsics::Function _INTRINSIC_NAME(__intrinsic_fn, __COUNTER__) (\
       MOD "." NAME,\
       eosio::chain::webassembly::wavm::wasm_function_type_provider<WASM_SIG>::type(),\
-      (void *)eosio::chain::webassembly::wavm::intrinsic_function_invoker_wrapper<WASM_SIG, SIG>::type::fn<&CLS::METHOD>()\
-   );\
+      nullptr\
+   );
 
+#endif
 
 } } } }// eosio::chain::webassembly::wavm
diff --git a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
index b8016437563..f7967b22a20 100644
--- a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
@@ -8,19 +8,26 @@ endif()
 set(Sources
 	Intrinsics.cpp
 	Linker.cpp
-	LLVMEmitIR.cpp
-	LLVMJIT.cpp
 	LLVMJIT.h
-	Memory.cpp
-	ModuleInstance.cpp
 	ObjectGC.cpp
-	Runtime.cpp
 	RuntimePrivate.h
-	Table.cpp
 	Threads.cpp
 	WAVMIntrinsics.cpp
 	${LLVM_SHIM_FILE}
   )
+
+if("wavm" IN_LIST EOSIO_WASM_RUNTIMES)
+  list(APPEND Sources
+     LLVMEmitIR.cpp
+     LLVMJIT.cpp
+     Memory.cpp
+     ModuleInstance.cpp
+     Runtime.cpp
+     Table.cpp
+  )
+  llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
+endif()
+
 set(PublicHeaders
 	${WAVM_INCLUDE_DIR}/Runtime/Intrinsics.h
 	${WAVM_INCLUDE_DIR}/Runtime/Linker.h
@@ -39,7 +46,6 @@ add_definitions(-DRUNTIME_API=DLL_EXPORT)
 target_include_directories( Runtime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../chain/include )
 
 # Link against the LLVM libraries
-llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
 target_link_libraries(Runtime Platform Logging IR ${LLVM_LIBS})
 
 install(TARGETS Runtime 
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 7ff6ade4f20..26b859b5a53 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -56,23 +56,25 @@ foreach(TEST_SUITE ${UNIT_TESTS}) # create an independent target for each test s
   if (NOT "" STREQUAL "${SUITE_NAME}") # ignore empty lines
     execute_process(COMMAND bash -c "echo ${SUITE_NAME} | sed -e 's/s$//' | sed -e 's/_test$//'" OUTPUT_VARIABLE TRIMMED_SUITE_NAME OUTPUT_STRIP_TRAILING_WHITESPACE) # trim "_test" or "_tests" from the end of ${SUITE_NAME}
     # to run unit_test with all log from blockchain displayed, put "--verbose" after "--", i.e. "unit_test -- --verbose"
-    add_test(NAME ${TRIMMED_SUITE_NAME}_unit_test_wavm COMMAND unit_test --run_test=${SUITE_NAME} --report_level=detailed --color_output --catch_system_errors=no -- --wavm)
-    add_test(NAME ${TRIMMED_SUITE_NAME}_unit_test_wabt COMMAND unit_test --run_test=${SUITE_NAME} --report_level=detailed --color_output -- --wabt)
-    # build list of tests to run during coverage testing
-    if(NOT "" STREQUAL "${ctest_tests}")
-      set(ctest_tests "${ctest_tests}|${TRIMMED_SUITE_NAME}_unit_test_wavm|${TRIMMED_SUITE_NAME}_unit_test_wabt")
-    else()
-      set(ctest_tests "${TRIMMED_SUITE_NAME}_unit_test_wavm|${TRIMMED_SUITE_NAME}_unit_test_wabt")
-    endif()
+    foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
+      add_test(NAME ${TRIMMED_SUITE_NAME}_unit_test_${RUNTIME} COMMAND unit_test --run_test=${SUITE_NAME} --report_level=detailed --color_output --catch_system_errors=no -- --${RUNTIME})
+      # build list of tests to run during coverage testing
+      if(ctest_tests)
+         string(APPEND ctest_tests "|")
+      endif()
+      string(APPEND ctest_tests ${TRIMMED_SUITE_NAME}_unit_test_$RUNTIME)
+    endforeach()
   endif()
 endforeach(TEST_SUITE)
 set(ctest_tests "'${ctest_tests}' -j8") # surround test list string in apostrophies
 
 # The following tests are known to take the longest, bump up their cost (priority) so that they'll run first
 # even on fresh first time test runs before ctest auto-detects costs
-set_tests_properties(api_unit_test_wavm api_unit_test_wabt PROPERTIES COST 5000)
-set_tests_properties(wasm_unit_test_wavm wasm_unit_test_wabt PROPERTIES COST 4000)
-set_tests_properties(delay_unit_test_wavm delay_unit_test_wabt PROPERTIES COST 3000)
+foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
+   set_tests_properties(api_unit_test_${RUNTIME} PROPERTIES COST 5000)
+   set_tests_properties(wasm_unit_test_${RUNTIME} PROPERTIES COST 4000)
+   set_tests_properties(delay_unit_test_${RUNTIME} PROPERTIES COST 3000)
+endforeach()
 
 ### COVERAGE TESTING ###
 if(ENABLE_COVERAGE_TESTING)

From c43db378d77498b056a45396226b0b055f82d30a Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sat, 14 Sep 2019 21:08:42 -0400
Subject: [PATCH 1258/1648] minor cleanup to optional runtime support

---
 CMakeLists.txt                                | 21 +++++++++----------
 libraries/chain/CMakeLists.txt                |  6 +++++-
 .../eosio/chain/wasm_interface_private.hpp    |  2 +-
 .../include/eosio/chain/webassembly/wavm.hpp  |  2 +-
 .../wasm-jit/Source/Runtime/CMakeLists.txt    | 20 +++++++++---------
 plugins/chain_plugin/chain_plugin.cpp         |  2 +-
 6 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30acb6937d5..66cae2ee1ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,12 +64,18 @@ if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "")
    set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
 endif()
 
-# WASM runtimes to build
-list(APPEND EOSIO_WASM_RUNTIMES wabt)   #wabt is always enabled; it works everywhere
-if(NOT WIN32)
+# WASM runtimes to enable. Each runtime in this list will have:
+#  * definition EOSIO_<RUNTIME>_RUNTIME_ENABLED defined in public libchain interface
+#  * ctest entries with --runtime
+list(APPEND EOSIO_WASM_RUNTIMES wabt)   #always enable wabt; it works everywhere and parts of eosio still assume it's always available
+if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32)
    list(APPEND EOSIO_WASM_RUNTIMES wavm)
-   # try and find LLVM now so that package variables get populated in global scope
+   # WAVM requires LLVM, but move the check up here to a central location so that the EosioTester.cmakes
+   # can be created with the exact version found
    find_package(LLVM REQUIRED CONFIG)
+   if(LLVM_VERSION_MAJOR VERSION_LESS 7 OR LLVM_VERSION_MAJOR VERSION_GREATER 9)
+	   message(FATAL_ERROR "EOSIO requires an LLVM version 7.0 to 9.0")
+   endif()
 endif()
 
 if(UNIX)
@@ -90,13 +96,6 @@ set( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 # the pthread dependency through fc.
 find_package(Boost 1.67 REQUIRED COMPONENTS program_options unit_test_framework)
 
-# WAVM requires LLVM, but move the check up here to a central location so that the EosioTester.cmakes
-# can be created with the exact version found
-find_package(LLVM REQUIRED CONFIG)
-if(LLVM_VERSION_MAJOR VERSION_LESS 7 OR LLVM_VERSION_MAJOR VERSION_GREATER 9)
-	message(FATAL_ERROR "EOSIO requires an LLVM version 7.0 to 9.0")
-endif()
-
 if( APPLE AND UNIX )
 # Apple Specific Options Here
     message( STATUS "Configuring EOSIO on macOS" )
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 30b856bdc26..1c71503c61e 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -18,7 +18,6 @@ endif()
 
 if("wavm" IN_LIST EOSIO_WASM_RUNTIMES)
    set(CHAIN_WAVM_SOURCES "webassembly/wavm.cpp")
-   add_definitions(-DWAVM_RUNTIME_ENABLED)
 endif()
 
 ## SORT .cpp by most likely to change / break compile
@@ -86,6 +85,11 @@ target_include_directories( eosio_chain
                                    "${CMAKE_BINARY_DIR}/libraries/wabt"
                             )
 
+foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
+   string(TOUPPER "${RUNTIME}" RUNTIMEUC)
+   target_compile_definitions(eosio_chain PUBLIC "EOSIO_${RUNTIMEUC}_RUNTIME_ENABLED")
+endforeach()
+
 install( TARGETS eosio_chain
    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 83e55b34e10..21d83383a52 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -38,7 +38,7 @@ namespace eosio { namespace chain {
       struct by_last_block_num;
 
       wasm_interface_impl(wasm_interface::vm_type vm, const chainbase::database& d) : db(d) {
-#ifdef WAVM_RUNTIME_ENABLED
+#ifdef EOSIO_WAVM_RUNTIME_ENABLED
          if(vm == wasm_interface::vm_type::wavm)
             runtime_interface = std::make_unique<webassembly::wavm::wavm_runtime>();
 #endif
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index d9050eaf739..01c41c8ce75 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -143,7 +143,7 @@ struct wasm_function_type_provider<Ret(Args...)> {
 #define __INTRINSIC_NAME(LABEL, SUFFIX) LABEL##SUFFIX
 #define _INTRINSIC_NAME(LABEL, SUFFIX) __INTRINSIC_NAME(LABEL,SUFFIX)
 
-#ifdef WAVM_RUNTIME_ENABLED
+#ifdef EOSIO_WAVM_RUNTIME_ENABLED
 
 /**
  * class to represent an in-wasm-memory array
diff --git a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
index f7967b22a20..96291858da3 100644
--- a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
@@ -13,19 +13,19 @@ set(Sources
 	RuntimePrivate.h
 	Threads.cpp
 	WAVMIntrinsics.cpp
-	${LLVM_SHIM_FILE}
   )
 
 if("wavm" IN_LIST EOSIO_WASM_RUNTIMES)
-  list(APPEND Sources
-     LLVMEmitIR.cpp
-     LLVMJIT.cpp
-     Memory.cpp
-     ModuleInstance.cpp
-     Runtime.cpp
-     Table.cpp
-  )
-  llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
+	list(APPEND Sources
+		LLVMEmitIR.cpp
+		LLVMJIT.cpp
+		Memory.cpp
+		ModuleInstance.cpp
+		Runtime.cpp
+		Table.cpp
+		${LLVM_SHIM_FILE}
+	)
+	llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
 endif()
 
 set(PublicHeaders
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index aa846083147..87b069f95a1 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -197,7 +197,7 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
          ("protocol-features-dir", bpo::value<bfs::path>()->default_value("protocol_features"),
           "the location of the protocol_features directory (absolute path or relative to application config dir)")
          ("checkpoint", bpo::value<vector<string>>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.")
-         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("wavm/wabt"), "Override default WASM runtime")
+         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("runtime"), "Override default WASM runtime")
          ("abi-serializer-max-time-ms", bpo::value<uint32_t>()->default_value(config::default_abi_serializer_max_time_ms),
           "Override default maximum ABI serialization time allowed in ms")
          ("chain-state-db-size-mb", bpo::value<uint64_t>()->default_value(config::default_state_size / (1024  * 1024)), "Maximum size (in MiB) of the chain state database")

From 7ed9b9df498dc252c8c6174f6f88b72a101d6a6a Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 15 Sep 2019 22:04:31 -0400
Subject: [PATCH 1259/1648] handle runtimes with "-" in them for optional
 runtime support

---
 libraries/chain/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 1c71503c61e..91bf9bb37fb 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -87,6 +87,7 @@ target_include_directories( eosio_chain
 
 foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
    string(TOUPPER "${RUNTIME}" RUNTIMEUC)
+   string(REPLACE "-" "_" RUNTIMEUC ${RUNTIMEUC})
    target_compile_definitions(eosio_chain PUBLIC "EOSIO_${RUNTIMEUC}_RUNTIME_ENABLED")
 endforeach()
 

From 57dde3a65fdce083c71dee63e204d1a2036eb582 Mon Sep 17 00:00:00 2001
From: Matias Romeo <matias.romeo@gmail.com>
Date: Mon, 16 Sep 2019 00:28:34 -0300
Subject: [PATCH 1260/1648] Add eos-vm-jit to the list of possible runtimes

---
 plugins/chain_plugin/chain_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 6b529f98114..73ca06e34b9 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -188,7 +188,7 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
          ("protocol-features-dir", bpo::value<bfs::path>()->default_value("protocol_features"),
           "the location of the protocol_features directory (absolute path or relative to application config dir)")
          ("checkpoint", bpo::value<vector<string>>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.")
-         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("wavm/wabt/eos-vm/eos-vm"), "Override default WASM runtime")
+         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("wavm/wabt/eos-vm/eos-vm-jit"), "Override default WASM runtime")
          ("abi-serializer-max-time-ms", bpo::value<uint32_t>()->default_value(config::default_abi_serializer_max_time_ms),
           "Override default maximum ABI serialization time allowed in ms")
          ("chain-state-db-size-mb", bpo::value<uint64_t>()->default_value(config::default_state_size / (1024  * 1024)), "Maximum size (in MiB) of the chain state database")

From e4a6411f4948aac5e0754bb2a360359f24a4e98c Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 16 Sep 2019 10:21:58 -0400
Subject: [PATCH 1261/1648] return error when attempting to remove key from
 YubiHSM wallet

The YubiHSM keosd wallet doesn't support removing keys from the YubiHSM. This is mostly because the interaction with the YubiHSM for removing a key is tricky given our desire to validate the wallet password before performing that action. Implementing this would mean opening up a second simultaneous session with the YubiHSM just to verify the wallet password. While this may be a valid enhancement in the future, it's too much effort for now.

That said, the current implementation was silently dropping removal requests. Fix it to return an error so it's not deceptive.
---
 plugins/wallet_plugin/yubihsm_wallet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/wallet_plugin/yubihsm_wallet.cpp b/plugins/wallet_plugin/yubihsm_wallet.cpp
index 3078d9eae84..cce98fc69e5 100644
--- a/plugins/wallet_plugin/yubihsm_wallet.cpp
+++ b/plugins/wallet_plugin/yubihsm_wallet.cpp
@@ -257,6 +257,7 @@ string yubihsm_wallet::create_key(string key_type) {
 
 bool yubihsm_wallet::remove_key(string key) {
    FC_ASSERT(!is_locked());
+   FC_THROW_EXCEPTION(chain::wallet_exception, "YubiHSM wallet does not currently support removal of keys");
    return true;
 }
 

From 7b66d487550c29bff925a64fab784ec68f0aab48 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 16 Sep 2019 11:55:44 -0400
Subject: [PATCH 1262/1648] Had a case of 'error' found in a transaction id,
 add word boundary to regex

---
 tests/Cluster.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Cluster.py b/tests/Cluster.py
index 5acd1f61917..c9009e29041 100644
--- a/tests/Cluster.py
+++ b/tests/Cluster.py
@@ -965,7 +965,7 @@ def bios_bootstrap(self, biosNode, totalNodes, pfSetupPolicy, silent=False):
             if not silent: Utils.Print("Launcher failed to shut down eos cluster.")
             return None
 
-        p = re.compile('error', re.IGNORECASE)
+        p = re.compile(r"\berror\b", re.IGNORECASE)
         with open(Cluster.__bootlog) as bootFile:
             for line in bootFile:
                 if p.search(line):

From 2001d4cb4e5f747f1e28b7fffea9533fb93ab299 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 16 Sep 2019 13:56:01 -0400
Subject: [PATCH 1263/1648] Fix release build type for macOS on Travis CI

---
 .cicd/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 22a8e825006..103f1ff0401 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -5,7 +5,7 @@ mkdir -p $BUILD_DIR
 CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_BUILD_TYPE='Release'"
 if [[ $(uname) == 'Darwin' ]]; then
     # You can't use chained commands in execute
-    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" && ./$CICD_DIR/platforms/macos-10.14.sh
+    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" && ./$CICD_DIR/platforms/macos-10.14.sh
     ( [[ ! $PINNED == false || $UNPINNED == true ]] ) && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
     cmake $CMAKE_EXTRAS ..

From f475b762dfba81521ad684bce319688cef4c7383 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 16 Sep 2019 13:58:28 -0400
Subject: [PATCH 1264/1648] Clean up IF statements

---
 .cicd/build.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 103f1ff0401..2aa3d46452f 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -5,8 +5,13 @@ mkdir -p $BUILD_DIR
 CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_BUILD_TYPE='Release'"
 if [[ $(uname) == 'Darwin' ]]; then
     # You can't use chained commands in execute
-    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" && ./$CICD_DIR/platforms/macos-10.14.sh
-    ( [[ ! $PINNED == false || $UNPINNED == true ]] ) && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
+    if [[ $TRAVIS == true ]]; then
+        export PINNED=false
+        ccache -s
+        CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+        ./$CICD_DIR/platforms/macos-10.14.sh
+    fi
+    [[ ! $PINNED == false || $UNPINNED == true ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
     cmake $CMAKE_EXTRAS ..
     make -j$JOBS

From 4a3244a946e7ba1582701211f332cc79fcdb21ab Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 16 Sep 2019 12:59:51 -0500
Subject: [PATCH 1265/1648] More fixes for CICD pipeline.

---
 .cicd/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 22a8e825006..103f1ff0401 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -5,7 +5,7 @@ mkdir -p $BUILD_DIR
 CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_BUILD_TYPE='Release'"
 if [[ $(uname) == 'Darwin' ]]; then
     # You can't use chained commands in execute
-    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" && ./$CICD_DIR/platforms/macos-10.14.sh
+    [[ $TRAVIS == true ]] && export PINNED=false && ccache -s && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" && ./$CICD_DIR/platforms/macos-10.14.sh
     ( [[ ! $PINNED == false || $UNPINNED == true ]] ) && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
     cmake $CMAKE_EXTRAS ..

From cfe7abc6cf89236a002814376910859b6804449b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Mon, 16 Sep 2019 14:01:41 -0400
Subject: [PATCH 1266/1648] Quoted strings

---
 .cicd/build.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 2aa3d46452f..cb27dcae295 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -3,15 +3,15 @@ set -eo pipefail
 . ./.cicd/helpers/general.sh
 mkdir -p $BUILD_DIR
 CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_BUILD_TYPE='Release'"
-if [[ $(uname) == 'Darwin' ]]; then
+if [[ "$(uname)" == 'Darwin' ]]; then
     # You can't use chained commands in execute
-    if [[ $TRAVIS == true ]]; then
+    if [[ "$TRAVIS" == 'true' ]]; then
         export PINNED=false
         ccache -s
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
         ./$CICD_DIR/platforms/macos-10.14.sh
     fi
-    [[ ! $PINNED == false || $UNPINNED == true ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
+    [[ ! "$PINNED" == 'false' || "$UNPINNED" == 'true' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
     cmake $CMAKE_EXTRAS ..
     make -j$JOBS
@@ -21,33 +21,33 @@ else # Linux
     PRE_COMMANDS="cd $MOUNTED_DIR/build"
     # PRE_COMMANDS: Executed pre-cmake
     # CMAKE_EXTRAS: Executed within and right before the cmake path (cmake CMAKE_EXTRAS ..)
-    [[ ! $IMAGE_TAG =~ 'unpinned' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$MOUNTED_DIR/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
-    if [[ $IMAGE_TAG == 'amazon_linux-2' ]]; then
+    [[ ! "$IMAGE_TAG" =~ 'unpinned' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$MOUNTED_DIR/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+    if [[ "$IMAGE_TAG" == 'amazon_linux-2' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
-    elif [[ $IMAGE_TAG == 'centos-7.6' ]]; then
+    elif [[ "$IMAGE_TAG" == 'centos-7.6' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
-    elif [[ $IMAGE_TAG == 'ubuntu-16.04' ]]; then
+    elif [[ "$IMAGE_TAG" == 'ubuntu-16.04' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
-    elif [[ $IMAGE_TAG == 'ubuntu-18.04' ]]; then
+    elif [[ "$IMAGE_TAG" == 'ubuntu-18.04' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
-    elif [[ $IMAGE_TAG == 'amazon_linux-2-unpinned' ]]; then
+    elif [[ "$IMAGE_TAG" == 'amazon_linux-2-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
-    elif [[ $IMAGE_TAG == 'centos-7.6-unpinned' ]]; then
+    elif [[ "$IMAGE_TAG" == 'centos-7.6-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/devtoolset-8/enable && source /opt/rh/rh-python36/enable && export PATH=/usr/lib64/ccache:\\\$PATH"
-    elif [[ $IMAGE_TAG == 'ubuntu-18.04-unpinned' ]]; then
+    elif [[ "$IMAGE_TAG" == 'ubuntu-18.04-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DLLVM_DIR='/usr/lib/llvm-7/lib/cmake/llvm'"
     fi
     BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
     # Docker Commands
-    if [[ $BUILDKITE == true ]]; then
+    if [[ "$BUILDKITE" == 'true' ]]; then
         # Generate Base Images
         $CICD_DIR/generate-base-images.sh
-        [[ $ENABLE_INSTALL == true ]] && COMMANDS="cp -r $MOUNTED_DIR /root/eosio && cd /root/eosio/build &&"
+        [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="cp -r $MOUNTED_DIR /root/eosio && cd /root/eosio/build &&"
         COMMANDS="$COMMANDS $BUILD_COMMANDS"
-        [[ $ENABLE_INSTALL == true ]] && COMMANDS="$COMMANDS && make install"
-    elif [[ $TRAVIS == true ]]; then
+        [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="$COMMANDS && make install"
+    elif [[ "$TRAVIS" == 'true' ]]; then
         ARGS="$ARGS -v /usr/lib/ccache -v $HOME/.ccache:/opt/.ccache -e JOBS -e TRAVIS -e CCACHE_DIR=/opt/.ccache"
         COMMANDS="ccache -s && $BUILD_COMMANDS"
     fi

From 2164d82d01321229a940c35c61566bfea083d9d1 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 16 Sep 2019 14:12:10 -0400
Subject: [PATCH 1267/1648] use -fdiagnostics-color=always even for clang

technically clang does not support -fdiagnostics-color (it's not in its docs) but it does indeed support it for gcc compat. Let's a
lways use -fdiagnostics-color so we fix a problem where when both GCC & Clang are used in a single build there isn't a failure due
to -fcolor-diagnostics (which GCC balks at)
---
 CMakeLists.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f26266ec320..2e45fe8d88b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,16 +43,14 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
         message(FATAL_ERROR "GCC version must be at least 7.0!")
     endif()
-    if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
-       add_compile_options(-fdiagnostics-color=always)
-    endif()
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
         message(FATAL_ERROR "Clang version must be at least 5.0!")
     endif()
-    if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
-       add_compile_options(-fcolor-diagnostics)
-    endif()
+endif()
+
+if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
+   add_compile_options(-fdiagnostics-color=always)
 endif()
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")

From dbbbd3edd69ab0551b1398c114a438c7e1d979e0 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 16 Sep 2019 14:12:10 -0400
Subject: [PATCH 1268/1648] use -fdiagnostics-color=always even for clang

technically clang does not support -fdiagnostics-color (it's not in its docs) but it does indeed support it for gcc compat. Let's always use -fdiagnostics-color so we fix a problem where when both GCC & Clang are used in a single build there isn't a failure due to -fcolor-diagnostics (which GCC balks at)
---
 CMakeLists.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f26266ec320..2e45fe8d88b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,16 +43,14 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
         message(FATAL_ERROR "GCC version must be at least 7.0!")
     endif()
-    if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
-       add_compile_options(-fdiagnostics-color=always)
-    endif()
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
         message(FATAL_ERROR "Clang version must be at least 5.0!")
     endif()
-    if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
-       add_compile_options(-fcolor-diagnostics)
-    endif()
+endif()
+
+if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
+   add_compile_options(-fdiagnostics-color=always)
 endif()
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")

From 297b3160039e7b1a2f89928d9ea782901f6a11cd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 16 Sep 2019 14:46:20 -0400
Subject: [PATCH 1269/1648] Fix problem with keepalive timer sometimes causing
 a crash on exit because plugin_shutdown not called. Moved the creation of
 keepalive timer to after acceptor bind which can easily fail if port already
 in use. Changed fc_elog to elog for port already in use so that it is always
 logged regardless of net_plugin_impl logger setting. Also move the setup of
 logger to start of plugin_startup since logging is used within the method.

---
 plugins/net_plugin/net_plugin.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index c8cc8d4a38b..b9ef647f1f6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3302,6 +3302,7 @@ namespace eosio {
 
    void net_plugin::plugin_startup() {
       handle_sighup();
+      try {
 
       fc_ilog( logger, "my node_id is ${id}", ("id", my->node_id ));
 
@@ -3348,20 +3349,13 @@ namespace eosio {
          }
       }
 
-      {
-         std::lock_guard<std::mutex> g( my->keepalive_timer_mtx );
-         my->keepalive_timer.reset( new boost::asio::steady_timer( my->thread_pool->get_executor() ) );
-      }
-      my->ticker();
-
       if( my->acceptor ) {
          my->acceptor->open(listen_endpoint.protocol());
          my->acceptor->set_option(tcp::acceptor::reuse_address(true));
          try {
            my->acceptor->bind(listen_endpoint);
          } catch (const std::exception& e) {
-           fc_elog( logger, "net_plugin::plugin_startup failed to bind to port ${port}",
-                    ("port", listen_endpoint.port()));
+           elog( "net_plugin::plugin_startup failed to bind to port ${port}", ("port", listen_endpoint.port()) );
            throw e;
          }
          my->acceptor->listen();
@@ -3377,6 +3371,12 @@ namespace eosio {
          } );
       }
 
+      {
+         std::lock_guard<std::mutex> g( my->keepalive_timer_mtx );
+         my->keepalive_timer.reset( new boost::asio::steady_timer( my->thread_pool->get_executor() ) );
+      }
+      my->ticker();
+
       my->incoming_transaction_ack_subscription = app().get_channel<compat::channels::transaction_ack>().subscribe(
             boost::bind(&net_plugin_impl::transaction_ack, my.get(), _1));
 
@@ -3387,6 +3387,12 @@ namespace eosio {
       for( const auto& seed_node : my->supplied_peers ) {
          connect( seed_node );
       }
+
+      } catch( ... ) {
+         // always watn plugin_shutdown even on exception
+         plugin_shutdown();
+         throw;
+      }
    }
 
    void net_plugin::handle_sighup() {

From 9ab6483f143a2ae4e77fb82b8ddf0b0b1c3b0000 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 16 Sep 2019 15:01:19 -0400
Subject: [PATCH 1270/1648] Make sure plugin_shutdown is called in case of
 exception in plugin_startup to ensure proper shutdown on exception

---
 plugins/producer_plugin/producer_plugin.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 2f8d3145712..e9e72e9983e 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -866,6 +866,7 @@ void producer_plugin::plugin_startup()
 { try {
    handle_sighup(); // Sets loggers
 
+   try {
    ilog("producer plugin:  plugin_startup() begin");
 
    chain::controller& chain = my->chain_plug->chain();
@@ -901,6 +902,11 @@ void producer_plugin::plugin_startup()
    my->schedule_production_loop();
 
    ilog("producer plugin:  plugin_startup() end");
+   } catch( ... ) {
+      // always call plugin_shutdown, even on exception
+      plugin_shutdown();
+      throw;
+   }
 } FC_CAPTURE_AND_RETHROW() }
 
 void producer_plugin::plugin_shutdown() {

From 353f417ccd421e77400e9efd4345e512f9e9908c Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Mon, 16 Sep 2019 16:14:04 -0400
Subject: [PATCH 1271/1648] Fix data races for eos-vm's handling of checktime -
 Make sure that set_expiration_callback blocks until any pending callback
 completes.   This cannot deadlock as long as the callback doesn't touch the
 timer. - Make platform_timer::expired thread-safe.  C++ only guarantees that
 sig_atomic_t   is safe for signal handlers executed in the same thread as
 other accesses. - Invoke the callback in eos-vm.cpp even if the timer expires
 before we set up the callback. - std::atomic variables are only AS-safe if
 is_lock_free() is true.

Destroying a platform_timer is still unsafe.
---
 libraries/chain/include/eosio/chain/platform_timer.hpp   | 9 +++++----
 .../chain/include/eosio/chain/transaction_context.hpp    | 2 +-
 libraries/chain/platform_timer_posix.cpp                 | 2 ++
 libraries/chain/webassembly/eos-vm.cpp                   | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/platform_timer.hpp b/libraries/chain/include/eosio/chain/platform_timer.hpp
index a5874e685cb..29a8d62d46f 100644
--- a/libraries/chain/include/eosio/chain/platform_timer.hpp
+++ b/libraries/chain/include/eosio/chain/platform_timer.hpp
@@ -34,7 +34,7 @@ struct platform_timer {
       _expiration_callback_data = user;
    }
 
-   volatile sig_atomic_t expired = 1;
+   std::atomic_bool expired = true;
 
 private:
    struct impl;
@@ -46,9 +46,10 @@ struct platform_timer {
       if(atomic_compare_exchange_strong(&_callback_variables_busy, &expect_false, true)) {
          void(*cb)(void*) = _expiration_callback;
          void* cb_data = _expiration_callback_data;
-         _callback_variables_busy.store(false, std::memory_order_release);
-         if(cb)
+         if(cb) {
             cb(cb_data);
+         }
+         _callback_variables_busy.store(false, std::memory_order_release);
       }
    }
 
@@ -57,4 +58,4 @@ struct platform_timer {
    void* _expiration_callback_data;
 };
 
-}}
\ No newline at end of file
+}}
diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index 8268eaaaa40..b1962fa6f5e 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -21,7 +21,7 @@ namespace eosio { namespace chain {
             result in an exception. Use nullptr to disable a previously set callback. */
          void set_expiration_callback(void(*func)(void*), void* user);
 
-         volatile sig_atomic_t& expired;
+         std::atomic_bool& expired;
       private:
          platform_timer& _timer;
 
diff --git a/libraries/chain/platform_timer_posix.cpp b/libraries/chain/platform_timer_posix.cpp
index d47bd1f025a..1575664ba59 100644
--- a/libraries/chain/platform_timer_posix.cpp
+++ b/libraries/chain/platform_timer_posix.cpp
@@ -12,6 +12,8 @@
 
 namespace eosio { namespace chain {
 
+static_assert(std::atomic_bool::is_always_lock_free, "Only lock-free atomics AS-safe.");
+
 struct platform_timer::impl {
    timer_t timerid;
 
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index e3682695e5f..0fd07b83e57 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -21,10 +21,11 @@ namespace {
         guard(transaction_checktime_timer& timer, F&& func)
            : _timer(timer), _func(static_cast<F&&>(func)) {
            _timer.set_expiration_callback(&callback, this);
+           if(_timer.expired) {
+              _func(); // it's harmless if _func is invoked twice
+           }
         }
         ~guard() {
-           // FIXME: This works correctly only if the callback is invoked by a signal
-           // handler in the current thread.
            _timer.set_expiration_callback(nullptr, nullptr);
         }
         static void callback(void* data) {

From bbecffdd2f11b9821710dccd20be793d1e4476f6 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 16 Sep 2019 17:52:50 -0400
Subject: [PATCH 1272/1648] changes to script

---
 .cicd/submodule-regression-check.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh
index d0dc7bf117d..8baec667100 100755
--- a/.cicd/submodule-regression-check.sh
+++ b/.cicd/submodule-regression-check.sh
@@ -1,25 +1,31 @@
 #!/bin/bash
 set -eo pipefail
+[[ $(uname) == 'Darwin' ]] && echo "Submodule regression doesn't run on mac (declare: -A: invalid option).." && exit 0
 declare -A PR_MAP
 declare -A BASE_MAP
 # Support Travis and BK
 if ${TRAVIS:-false}; then
     BASE_BRANCH=$TRAVIS_BRANCH
     CURRENT_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} # We default to TRAVIS_BRANCH if it's not a PR so it passes on non PR runs
+    [[ ! -z $TRAVIS_PULL_REQUEST_SLUG ]] && CURRENT_BRANCH=$TRAVIS_COMMIT # Support git log & echo output
 else
     BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}
     CURRENT_BRANCH=$BUILDKITE_BRANCH
 fi
+[[ $BASE_BRANCH == $CURRENT_BRANCH ]] && echo 'BASE_BRANCH and CURRENT_BRANCH are the same' && exit 0
+
 echo "getting submodule info for $CURRENT_BRANCH"
 while read -r a b; do
     PR_MAP[$a]=$b
 done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
+
 echo "getting submodule info for $BASE_BRANCH"
 git checkout $BASE_BRANCH &> /dev/null
 git submodule update --init &> /dev/null
 while read -r a b; do
     BASE_MAP[$a]=$b
 done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
+
 for k in "${!BASE_MAP[@]}"; do
     base_ts=${BASE_MAP[$k]}
     pr_ts=${PR_MAP[$k]}
@@ -28,7 +34,17 @@ for k in "${!BASE_MAP[@]}"; do
     echo "  timestamp on $BASE_BRANCH: $base_ts"
     if (( $pr_ts < $base_ts)); then
         echo "$k is older on $CURRENT_BRANCH than $BASE_BRANCH; investigating..."
-        if for c in `git log $CURRENT_BRANCH ^$BASE_BRANCH --pretty=format:"%H"`; do git show --pretty="" --name-only $c; done | grep -q "^$k$"; then
+        if [[ $TRAVIS == true && ! -z $TRAVIS_PULL_REQUEST_SLUG ]]; then # IF it's a forked PR, we need to switch back to the PR ref/head so we can git log properly
+            echo "git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge:"
+            git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge: &> /dev/null
+            echo "switching back to $TRAVIS_PULL_REQUEST_SLUG:$TRAVIS_PULL_REQUEST_BRANCH ($TRAVIS_COMMIT)"
+            echo 'git checkout -qf FETCH_HEAD'
+            git checkout -qf FETCH_HEAD &> /dev/null
+        elif [[ $BUILDKITE == true ]]; then
+            echo "switching back to $CURRENT_BRANCH"
+            git checkout -f $CURRENT_BRANCH &> /dev/null
+        fi
+        if [[ ! -z $(for c in $(git --no-pager log $CURRENT_BRANCH ^$BASE_BRANCH --pretty=format:"%H"); do git show --pretty="" --name-only $c; done | grep "^$k$") ]]; then
             echo "ERROR: $k has regressed"
             exit 1
         else

From 869bc39294fe4254d5895cdc24221d0cce3c9138 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 16 Sep 2019 18:09:01 -0400
Subject: [PATCH 1273/1648] moved logic to skip mac:

---
 .cicd/submodule-regression-check.sh | 1 -
 .travis.yml                         | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh
index 8baec667100..a8135440e74 100755
--- a/.cicd/submodule-regression-check.sh
+++ b/.cicd/submodule-regression-check.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -eo pipefail
-[[ $(uname) == 'Darwin' ]] && echo "Submodule regression doesn't run on mac (declare: -A: invalid option).." && exit 0
 declare -A PR_MAP
 declare -A BASE_MAP
 # Support Travis and BK
diff --git a/.travis.yml b/.travis.yml
index 110f2756374..2388b63f36e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,11 @@ matrix:
             - ccache
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
-script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
+script: "
+if [[ $(uname) != 'Darwin' ]]; then
+  ./.cicd/submodule-regression-check.sh
+fi
+ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
 notifications:
   webhooks:
     secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=

From 06137378586c6b63baf0cf4febeed875706422fb Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 16 Sep 2019 18:12:42 -0400
Subject: [PATCH 1274/1648] quick travis script cleanup

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2388b63f36e..3ab2674b20b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,9 +49,7 @@ matrix:
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
 script: "
-if [[ $(uname) != 'Darwin' ]]; then
-  ./.cicd/submodule-regression-check.sh
-fi
+[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh
 ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
 notifications:
   webhooks:

From da178de4ed7967eaa6a650ec12a2338bf15d6f69 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 16 Sep 2019 18:19:53 -0400
Subject: [PATCH 1275/1648] quick travis script cleanup

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ab2674b20b..b848d7d8b97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,8 +49,7 @@ matrix:
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
 script: "
-[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh
-ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
+[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh; ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
 notifications:
   webhooks:
     secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=

From e5a89b873c29e3e87ac616fd95502d869b9c9de3 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 16 Sep 2019 18:30:06 -0400
Subject: [PATCH 1276/1648] quick travis script cleanup

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b848d7d8b97..eab89413569 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,7 @@ matrix:
             - ccache
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
-script: "
-[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh; ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
+script: "[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh; ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
 notifications:
   webhooks:
     secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=

From 8cba938e238f7d2a0af8610afb7efe0019672411 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Tue, 17 Sep 2019 17:07:55 +0800
Subject: [PATCH 1277/1648] Modify from_variant and to_variant of uint128 and
 int128 to use boost multiprecision

---
 libraries/fc              | 2 +-
 tests/get_table_tests.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/fc b/libraries/fc
index c9e7389ba1f..2824a8caf6f 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit c9e7389ba1f0d8bd4fe4dbbfe97863c722f8e564
+Subproject commit 2824a8caf6f4f0422affe637987da9b366b55118
diff --git a/tests/get_table_tests.cpp b/tests/get_table_tests.cpp
index 7cbad763f5c..8b6088f1722 100644
--- a/tests/get_table_tests.cpp
+++ b/tests/get_table_tests.cpp
@@ -557,13 +557,13 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    // i128 secondary key type
    params.key_type = "i128";
    params.index_position = "3";
-   params.lower_bound = "0x05000000000000000000000000000000"; // This is 5 in uint128 representation
+   params.lower_bound = "5"; 
 
    auto res_3 = plugin.get_table_rows(params);
    chain::uint128_t sec128_expected_value = 5;
    BOOST_REQUIRE(res_3.rows.size() > 0);
    BOOST_CHECK(res_3.rows[0].get_object()["sec128"].as<chain::uint128_t>() == sec128_expected_value);
-   BOOST_TEST(res_3.next_key == "0x07000000000000000000000000000000");
+   BOOST_TEST(res_3.next_key == "7");
    params.lower_bound = res_3.next_key;
    auto more2_res_3 = plugin.get_table_rows(params);
    chain::uint128_t more2_sec128_expected_value = 7;

From 1e6ecb0be8e27c3f31b33594768a54dab5d11dd3 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Tue, 17 Sep 2019 17:13:34 +0800
Subject: [PATCH 1278/1648] User lower precision floating point for float128
 next_key

---
 plugins/chain_plugin/chain_plugin.cpp | 6 +++---
 tests/get_table_tests.cpp             | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index c16f87dfcbf..6d21c08a27c 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1530,9 +1530,9 @@ string convert_to_string(const chain::key256_t& source, const string& key_type,
 
 template<>
 string convert_to_string(const float128_t& source, const string& key_type, const string& encode_type, const string& desc) {
-      try {
-      const uint128_t val = *reinterpret_cast<const uint128_t *>(&source);
-      return fc::variant(val).as<string>();
+   try {
+      float64_t f = f128_to_f64(source);
+      return fc::variant(f).as<string>();
    } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} from '${source}' to string.", ("desc", desc)("source",source) )
 }
 
diff --git a/tests/get_table_tests.cpp b/tests/get_table_tests.cpp
index 8b6088f1722..d47f7e7f0c9 100644
--- a/tests/get_table_tests.cpp
+++ b/tests/get_table_tests.cpp
@@ -449,7 +449,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_by_seckey_test, TESTER ) try {
 } FC_LOG_AND_RETHROW()
 
 
-BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
+BOOST_FIXTURE_TEST_CASE( get_table_next_key_test, TESTER ) try {
    create_account(N(test));
 
    // setup contract and abi
@@ -591,14 +591,14 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    // float128 secondary key type
    params.key_type = "float128";
    params.index_position = "5";
-   params.lower_bound = "0x00000000000000000000000000400140"; // This is 5.0 in uint128 representation
+   params.lower_bound = "5.0";
 
    auto res_5 = plugin.get_table_rows(params);
    float128_t secldouble_expected_value = ui64_to_f128(5);
    BOOST_REQUIRE(res_5.rows.size() > 0);
    chain::uint128_t secldouble_res_value =  res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
    BOOST_TEST(*reinterpret_cast<float128_t*>(&secldouble_res_value) == secldouble_expected_value);
-   BOOST_TEST(res_5.next_key == "0x00000000000000000000000000c00140");
+   BOOST_TEST(res_5.next_key == "7.00000000000000000");
    params.lower_bound = res_5.next_key;
    auto more2_res_5 = plugin.get_table_rows(params);
    float128_t more2_secldouble_expected_value = ui64_to_f128(7);
@@ -668,6 +668,6 @@ BOOST_FIXTURE_TEST_CASE( get_table_more2_test, TESTER ) try {
    BOOST_TEST(more2_sec160_res_value == more2_sec160_expected_value);
    BOOST_TEST(more2_res_8.rows[0].get_object()["hash_input"].as<string>() == "secondinput");
 
-} FC_LOG_AND_RETHROW() /// get_table_more2_test
+} FC_LOG_AND_RETHROW() /// get_table_next_key_test
 
 BOOST_AUTO_TEST_SUITE_END()

From 0e6f8e96bb888831852c83211fd2d91c7e41dfdf Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 17 Sep 2019 10:38:21 -0400
Subject: [PATCH 1279/1648] submodule last in scripts

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eab89413569..bd9c3ee801a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ matrix:
             - ccache
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
-script: "[[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh; ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh"
+script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && [[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh"
 notifications:
   webhooks:
     secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=

From aa80bcad993392420f695dd0672f08a3091d47ad Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 17 Sep 2019 10:30:51 -0500
Subject: [PATCH 1280/1648] Fixed PR changes to print integrity hash at correct
 time and just pass initial_timestamp instead of genesis.

---
 libraries/chain/controller.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 3a53691d170..d09957b37c4 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -532,15 +532,15 @@ struct controller_impl {
                         "Snapshot is invalid." );
             blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
          }
+         const auto hash = calculate_integrity_hash();
+         ilog( "database initialized with hash: ${hash}", ("hash", hash) );
+
          init(shutdown);
       } catch (boost::interprocess::bad_alloc& e) {
          elog( "db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );
          throw e;
       }
 
-      const auto hash = calculate_integrity_hash();
-      ilog( "database initialized with hash: ${hash}", ("hash", hash) );
-
       ilog( "Finished initialization from snapshot" );
    }
 
@@ -955,10 +955,10 @@ struct controller_impl {
       return enc.result();
    }
 
-   void create_native_account( const genesis_state& genesis, account_name name, const authority& owner, const authority& active, bool is_privileged = false ) {
+   void create_native_account( const fc::time_point& initial_timestamp, account_name name, const authority& owner, const authority& active, bool is_privileged = false ) {
       db.create<account_object>([&](auto& a) {
          a.name = name;
-         a.creation_date = genesis.initial_timestamp;
+         a.creation_date = initial_timestamp;
 
          if( name == config::system_account_name ) {
             // The initial eosio ABI value affects consensus; see  https://github.com/EOSIO/eos/issues/7794
@@ -973,9 +973,9 @@ struct controller_impl {
       });
 
       const auto& owner_permission  = authorization.create_permission(name, config::owner_name, 0,
-                                                                      owner, genesis.initial_timestamp );
+                                                                      owner, initial_timestamp );
       const auto& active_permission = authorization.create_permission(name, config::active_name, owner_permission.id,
-                                                                      active, genesis.initial_timestamp );
+                                                                      active, initial_timestamp );
 
       resource_limits.initialize_account(name);
 
@@ -1023,14 +1023,14 @@ struct controller_impl {
       resource_limits.initialize_database();
 
       authority system_auth(genesis.initial_key);
-      create_native_account( genesis, config::system_account_name, system_auth, system_auth, true );
+      create_native_account( genesis.initial_timestamp, config::system_account_name, system_auth, system_auth, true );
 
       auto empty_authority = authority(1, {}, {});
       auto active_producers_authority = authority(1, {}, {});
       active_producers_authority.accounts.push_back({{config::system_account_name, config::active_name}, 1});
 
-      create_native_account( genesis, config::null_account_name, empty_authority, empty_authority );
-      create_native_account( genesis, config::producers_account_name, empty_authority, active_producers_authority );
+      create_native_account( genesis.initial_timestamp, config::null_account_name, empty_authority, empty_authority );
+      create_native_account( genesis.initial_timestamp, config::producers_account_name, empty_authority, active_producers_authority );
       const auto& active_permission       = authorization.get_permission({config::producers_account_name, config::active_name});
       const auto& majority_permission     = authorization.create_permission( config::producers_account_name,
                                                                              config::majority_producers_permission_name,

From c8539c7505a9a0a1d391e4e20179694fc7fc4b65 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 17 Sep 2019 11:55:51 -0400
Subject: [PATCH 1281/1648] Added changes for Areg (better failure on missing
 ENVs)

---
 .cicd/submodule-regression-check.sh | 33 ++++++++++++++++-------------
 .travis.yml                         |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh
index a8135440e74..e8e9c8772cd 100755
--- a/.cicd/submodule-regression-check.sh
+++ b/.cicd/submodule-regression-check.sh
@@ -4,14 +4,15 @@ declare -A PR_MAP
 declare -A BASE_MAP
 # Support Travis and BK
 if ${TRAVIS:-false}; then
+    [[ -z $TRAVIS_PULL_REQUEST_BRANCH ]] && echo "Unable to find TRAVIS_PULL_REQUEST_BRANCH ENV. Skipping submodule regression check." && exit 0
     BASE_BRANCH=$TRAVIS_BRANCH
-    CURRENT_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} # We default to TRAVIS_BRANCH if it's not a PR so it passes on non PR runs
-    [[ ! -z $TRAVIS_PULL_REQUEST_SLUG ]] && CURRENT_BRANCH=$TRAVIS_COMMIT # Support git log & echo output
+    CURRENT_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
+    [[ ! -z $TRAVIS_PULL_REQUEST_SLUG ]] && CURRENT_BRANCH=$TRAVIS_COMMIT # When we're not running from a PR, the slug is not set. When we are, we need to use the TRAVIS_COMMIT to be sure we're supporting the Forked PR's merge/code that's in the EOS repo. This is needed for the git log below.
 else
-    BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}
+    [[ -z $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]] && echo "Unable to find BUILDKITE_PULL_REQUEST_BASE_BRANCH ENV. Skipping submodule regression check." && exit 0
+    BASE_BRANCH=$BUILDKITE_PULL_REQUEST_BASE_BRANCH
     CURRENT_BRANCH=$BUILDKITE_BRANCH
 fi
-[[ $BASE_BRANCH == $CURRENT_BRANCH ]] && echo 'BASE_BRANCH and CURRENT_BRANCH are the same' && exit 0
 
 echo "getting submodule info for $CURRENT_BRANCH"
 while read -r a b; do
@@ -25,6 +26,18 @@ while read -r a b; do
     BASE_MAP[$a]=$b
 done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
 
+# We need to switch back to the PR ref/head so we can git log properly
+if [[ $TRAVIS == true && ! -z $TRAVIS_PULL_REQUEST_SLUG ]]; then
+    echo "git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge:"
+    git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge: &> /dev/null
+    echo "switching back to $TRAVIS_PULL_REQUEST_SLUG:$TRAVIS_PULL_REQUEST_BRANCH ($TRAVIS_COMMIT)"
+    echo 'git checkout -qf FETCH_HEAD'
+    git checkout -qf FETCH_HEAD &> /dev/null
+elif [[ $BUILDKITE == true ]]; then
+    echo "switching back to $CURRENT_BRANCH"
+    git checkout -f $CURRENT_BRANCH &> /dev/null
+fi
+
 for k in "${!BASE_MAP[@]}"; do
     base_ts=${BASE_MAP[$k]}
     pr_ts=${PR_MAP[$k]}
@@ -32,17 +45,7 @@ for k in "${!BASE_MAP[@]}"; do
     echo "  timestamp on $CURRENT_BRANCH: $pr_ts"
     echo "  timestamp on $BASE_BRANCH: $base_ts"
     if (( $pr_ts < $base_ts)); then
-        echo "$k is older on $CURRENT_BRANCH than $BASE_BRANCH; investigating..."
-        if [[ $TRAVIS == true && ! -z $TRAVIS_PULL_REQUEST_SLUG ]]; then # IF it's a forked PR, we need to switch back to the PR ref/head so we can git log properly
-            echo "git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge:"
-            git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge: &> /dev/null
-            echo "switching back to $TRAVIS_PULL_REQUEST_SLUG:$TRAVIS_PULL_REQUEST_BRANCH ($TRAVIS_COMMIT)"
-            echo 'git checkout -qf FETCH_HEAD'
-            git checkout -qf FETCH_HEAD &> /dev/null
-        elif [[ $BUILDKITE == true ]]; then
-            echo "switching back to $CURRENT_BRANCH"
-            git checkout -f $CURRENT_BRANCH &> /dev/null
-        fi
+        echo "$k is older on $CURRENT_BRANCH than $BASE_BRANCH; investigating the difference between $CURRENT_BRANCH and $BASE_BRANCH to look for $k changing..."
         if [[ ! -z $(for c in $(git --no-pager log $CURRENT_BRANCH ^$BASE_BRANCH --pretty=format:"%H"); do git show --pretty="" --name-only $c; done | grep "^$k$") ]]; then
             echo "ERROR: $k has regressed"
             exit 1
diff --git a/.travis.yml b/.travis.yml
index bd9c3ee801a..915f636b9e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ matrix:
             - ccache
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
-script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && [[ $(uname) != 'Darwin' ]] && ./.cicd/submodule-regression-check.sh"
+script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"
 notifications:
   webhooks:
     secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=

From f9dc122aac8794dd3b93cd4b35324fc3b5193690 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 17 Sep 2019 11:03:03 -0500
Subject: [PATCH 1282/1648] PR changes to remove caching of chain_id and other
 cleanup.

---
 plugins/chain_plugin/chain_plugin.cpp | 34 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 0b97618e5d9..dad7790c335 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -144,7 +144,6 @@ class chain_plugin_impl {
    fc::optional<block_log>          block_logger;
    fc::optional<controller::config> chain_config;
    fc::optional<controller>         chain;
-   fc::optional<chain_id_type>      chain_id;
    fc::optional<genesis_state>      genesis;
    //txn_msg_rate_limits              rate_limits;
    fc::optional<vm_type>            wasm_runtime;
@@ -773,7 +772,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          clear_directory_contents( my->chain_config->state_dir );
          clear_directory_contents( my->blocks_dir );
       } else if( options.at( "hard-replay-blockchain" ).as<bool>()) {
-	do_hard_replay(options);
+         do_hard_replay(options);
       } else if( options.at( "replay-blockchain" ).as<bool>()) {
          ilog( "Replay requested: deleting state database" );
          if( options.at( "truncate-at-block" ).as<uint32_t>() > 0 )
@@ -822,7 +821,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          auto infile = std::ifstream(my->snapshot_path->generic_string(), (std::ios::in | std::ios::binary));
          auto reader = std::make_shared<istream_snapshot_reader>(infile);
          reader->validate();
-         my->chain_id = controller::extract_chain_id(reader);
+         chain_id_type chain_id = controller::extract_chain_id(reader);
          infile.close();
 
          EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,
@@ -841,13 +840,13 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             auto log_genesis = block_log::extract_genesis_state(my->blocks_dir);
             if (log_genesis) {
                my->genesis = log_genesis;
-               EOS_ASSERT( my->genesis->compute_chain_id() == *my->chain_id,
+               EOS_ASSERT( my->genesis->compute_chain_id() == chain_id,
                            plugin_config_exception,
                            "snapshot chain id does not match the chain id from the genesis state in the block log.");
             }
             else {
                auto block_log_chain_id = block_log::extract_chain_id(my->blocks_dir);
-               EOS_ASSERT( block_log_chain_id == *my->chain_id,
+               EOS_ASSERT( block_log_chain_id == chain_id,
                            plugin_config_exception,
                            "snapshot chain id does not match the chain id in the block log.");
             }
@@ -857,15 +856,16 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          bfs::path genesis_file;
          bool genesis_timestamp_specified = false;
          fc::optional<genesis_state> existing_genesis;
+         fc::optional<chain_id_type> chain_id;
 
          if( fc::exists( my->blocks_dir / "blocks.log" ) ) {
             my->genesis = block_log::extract_genesis_state( my->blocks_dir );
             existing_genesis = my->genesis;
             if (my->genesis) {
-               my->chain_id = my->genesis->compute_chain_id();
+               chain_id = my->genesis->compute_chain_id();
             }
             else {
-               my->chain_id = block_log::extract_chain_id( my->blocks_dir );
+               chain_id = block_log::extract_chain_id( my->blocks_dir );
             }
          }
 
@@ -893,7 +893,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                         "--genesis-timestamp is only valid if also passed in with --genesis-json");
          }
 
-         if( !existing_genesis && !my->chain_id ) {
+         if( !existing_genesis && !chain_id ) {
             if( !genesis_file.empty() ) {
                if( genesis_timestamp_specified ) {
                   ilog( "Using genesis state provided in '${genesis}' but with adjusted genesis timestamp",
@@ -901,12 +901,9 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                } else {
                   ilog( "Using genesis state provided in '${genesis}'", ("genesis", genesis_file.generic_string()));
                }
-               wlog( "Starting up fresh blockchain with provided genesis state." );
             } else {
-               wlog( "Starting up fresh blockchain with default genesis state." );
                my->genesis.emplace();
             }
-            my->chain_id = my->genesis->compute_chain_id();
          } else {
             if (existing_genesis) {
                EOS_ASSERT( *my->genesis == *existing_genesis, plugin_config_exception,
@@ -916,7 +913,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                );
             }
             else if (my->genesis) {
-               EOS_ASSERT( my->genesis->compute_chain_id() == *my->chain_id, plugin_config_exception,
+               EOS_ASSERT( my->genesis->compute_chain_id() == chain_id, plugin_config_exception,
                            "Genesis state, provided via command line arguments, has a chain_id that does not match the "
                            "existing chain id in blocks.log. It is not necessary to provide genesis state arguments "
                            "when a blocks.log file already exists."
@@ -941,6 +938,14 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
 
       my->chain.emplace( *my->chain_config, std::move(pfs) );
 
+      if (!my->genesis && !options.count( "snapshot" )) {
+         EOS_ASSERT( my->chain->db().revision() < 1, plugin_config_exception,
+                     "Genesis state is necessary to initialize fresh blockchain state but genesis state could "
+                     "not be found in the block log. Please either load from snapshot or find a block log that "
+                     "starts from genesis."
+         );
+      }
+
       // set up method providers
       my->get_block_by_number_provider = app().get_method<methods::get_block_by_number>().register_provider(
             [this]( uint32_t block_num ) -> signed_block_ptr {
@@ -1017,8 +1022,6 @@ void chain_plugin::plugin_startup()
       } else {
          my->chain->startup(shutdown);
       }
-      // ensure that our cached id is set to the chain's actual id
-      my->chain_id = my->chain->get_chain_id();
    } catch (const database_guard_exception& e) {
       log_guard_exception(e);
       // make sure to properly close the db
@@ -1289,8 +1292,7 @@ controller& chain_plugin::chain() { return *my->chain; }
 const controller& chain_plugin::chain() const { return *my->chain; }
 
 chain::chain_id_type chain_plugin::get_chain_id()const {
-   EOS_ASSERT( my->chain_id.valid(), chain_id_type_exception, "chain ID has not been initialized yet" );
-   return *my->chain_id;
+   return my->chain->get_chain_id();
 }
 
 fc::microseconds chain_plugin::get_abi_serializer_max_time() const {

From 9ed9c105d940ef13df8f7aba20899865c6410d49 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 17 Sep 2019 11:03:50 -0500
Subject: [PATCH 1283/1648] PR removing of extra code and cleanup.

---
 .../testing/include/eosio/testing/tester.hpp  | 81 +++++++------------
 libraries/testing/tester.cpp                  | 24 +-----
 2 files changed, 33 insertions(+), 72 deletions(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 8859926dcd3..508fde8118b 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -376,14 +376,34 @@ namespace eosio { namespace testing {
             return cfg;
          }
 
-         fc::optional<genesis_state> get_genesis() const {
-            return genesis;
-         }
-
          void schedule_protocol_features_wo_preactivation(const vector<digest_type> feature_digests);
          void preactivate_protocol_features(const vector<digest_type> feature_digests);
          void preactivate_all_builtin_protocol_features();
 
+
+         static std::pair<controller::config, genesis_state> default_config(const fc::temp_directory& tempdir) {
+            controller::config cfg;
+            cfg.blocks_dir      = tempdir.path() / config::default_blocks_dir_name;
+            cfg.state_dir  = tempdir.path() / config::default_state_dir_name;
+            cfg.state_size = 1024*1024*8;
+            cfg.state_guard_size = 0;
+            cfg.reversible_cache_size = 1024*1024*8;
+            cfg.reversible_guard_size = 0;
+            cfg.contracts_console = true;
+
+            genesis_state genesis;
+            genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
+            genesis.initial_key = get_public_key( config::system_account_name, "active" );
+
+            for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
+               if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
+                  cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
+               else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
+                  cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
+            }
+            return {cfg, genesis};
+         }
+
       protected:
          signed_block_ptr _produce_block( fc::microseconds skip_time, bool skip_pending_trxs = false );
          void             _start_block(fc::time_point block_time);
@@ -465,30 +485,6 @@ namespace eosio { namespace testing {
       }
 
       bool validate() { return true; }
-
-
-      static std::pair<controller::config, genesis_state> default_config(const fc::temp_directory& tempdir) {
-         controller::config cfg;
-         cfg.blocks_dir      = tempdir.path() / config::default_blocks_dir_name;
-         cfg.state_dir  = tempdir.path() / config::default_state_dir_name;
-         cfg.state_size = 1024*1024*8;
-         cfg.state_guard_size = 0;
-         cfg.reversible_cache_size = 1024*1024*8;
-         cfg.reversible_guard_size = 0;
-         cfg.contracts_console = false;
-
-         genesis_state genesis;
-         genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-         genesis.initial_key = get_public_key( config::system_account_name, "active" );
-
-         for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
-            if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
-               cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
-            else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
-               cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
-         }
-         return {cfg, genesis};
-      }
    };
 
    class validating_tester : public base_tester {
@@ -509,38 +505,17 @@ namespace eosio { namespace testing {
       }
       controller::config vcfg;
 
-      static std::pair<controller::config, genesis_state> default_config(const fc::temp_directory& tempdir) {
-         controller::config vcfg;
-         vcfg.blocks_dir      = tempdir.path() / std::string("v_").append(config::default_blocks_dir_name);
-         vcfg.state_dir  = tempdir.path() /  std::string("v_").append(config::default_state_dir_name);
-         vcfg.state_size = 1024*1024*8;
-         vcfg.state_guard_size = 0;
-         vcfg.reversible_cache_size = 1024*1024*8;
-         vcfg.reversible_guard_size = 0;
-         vcfg.contracts_console = false;
-
-         genesis_state genesis;
-         genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-         genesis.initial_key = get_public_key( config::system_account_name, "active" );
-
-         for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
-            if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
-               vcfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
-            else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
-               vcfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
-         }
-         return {vcfg, genesis};
-      }
-
       validating_tester(const flat_set<account_name>& trusted_producers = flat_set<account_name>()) {
          auto def_conf = default_config(tempdir);
 
          vcfg = def_conf.first;
+         config_validator(vcfg);
          vcfg.trusted_producers = trusted_producers;
 
          validating_node = create_validating_node(vcfg, def_conf.second, true);
 
-         init();
+         init(def_conf.first, def_conf.second);
+         execute_setup_policy(setup_policy::full);
       }
 
       static void config_validator(controller::config& vcfg) {
@@ -549,6 +524,8 @@ namespace eosio { namespace testing {
 
          vcfg.blocks_dir = vcfg.blocks_dir.parent_path() / std::string("v_").append( vcfg.blocks_dir.filename().generic_string() );
          vcfg.state_dir  = vcfg.state_dir.parent_path() / std::string("v_").append( vcfg.state_dir.filename().generic_string() );
+
+         vcfg.contracts_console = false;
       }
 
       static unique_ptr<controller> create_validating_node(controller::config vcfg, const genesis_state& genesis, bool use_genesis) {
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index e644a90e6fa..f8680771b8b 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -150,27 +150,11 @@ namespace eosio { namespace testing {
    }
 
    void base_tester::init(const setup_policy policy, db_read_mode read_mode) {
-      cfg.blocks_dir      = tempdir.path() / config::default_blocks_dir_name;
-      cfg.state_dir  = tempdir.path() / config::default_state_dir_name;
-      cfg.state_size = 1024*1024*8;
-      cfg.state_guard_size = 0;
-      cfg.reversible_cache_size = 1024*1024*8;
-      cfg.reversible_guard_size = 0;
-      cfg.contracts_console = true;
-      cfg.read_mode = read_mode;
-
-      genesis_state genesis;
-      genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-      genesis.initial_key = get_public_key( config::system_account_name, "active" );
-
-      for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
-         if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
-            cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
-         else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
-            cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
-      }
+      auto def_conf = default_config(tempdir);
+      def_conf.first.read_mode = read_mode;
+      cfg = def_conf.first;
 
-      open(genesis);
+      open(def_conf.second);
       execute_setup_policy(policy);
    }
 

From 6f6970ce27b155e3c693e4908801891f87356846 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 17 Sep 2019 12:05:01 -0400
Subject: [PATCH 1284/1648] change to echo

---
 .cicd/submodule-regression-check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh
index e8e9c8772cd..9befa9d0728 100755
--- a/.cicd/submodule-regression-check.sh
+++ b/.cicd/submodule-regression-check.sh
@@ -30,7 +30,7 @@ done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --for
 if [[ $TRAVIS == true && ! -z $TRAVIS_PULL_REQUEST_SLUG ]]; then
     echo "git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge:"
     git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge: &> /dev/null
-    echo "switching back to $TRAVIS_PULL_REQUEST_SLUG:$TRAVIS_PULL_REQUEST_BRANCH ($TRAVIS_COMMIT)"
+    echo "switching back to $TRAVIS_COMMIT"
     echo 'git checkout -qf FETCH_HEAD'
     git checkout -qf FETCH_HEAD &> /dev/null
 elif [[ $BUILDKITE == true ]]; then

From 8a3c8467248b1a7f43026e5fddcbcc31633040a6 Mon Sep 17 00:00:00 2001
From: jgiszczak <jonrg@hypercubepc.com>
Date: Tue, 17 Sep 2019 15:10:59 -0500
Subject: [PATCH 1285/1648] Change eosio-launcher enable-gelf-logging argument
 default to false.

---
 programs/eosio-launcher/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index 50833a0970f..5ac1ef4fa28 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -500,7 +500,7 @@ launcher_def::set_options (bpo::options_description &cfg) {
     ("servers",bpo::value<string>(),"a file containing ip addresses and names of individual servers to deploy as producers or non-producers ")
     ("per-host",bpo::value<int>(&per_host)->default_value(0),("specifies how many " + string(node_executable_name) + " instances will run on a single host. Use 0 to indicate all on one.").c_str())
     ("network-name",bpo::value<string>(&network.name)->default_value("testnet_"),"network name prefix used in GELF logging source")
-    ("enable-gelf-logging",bpo::value<bool>(&gelf_enabled)->default_value(true),"enable gelf logging appender in logging configuration file")
+    ("enable-gelf-logging",bpo::value<bool>(&gelf_enabled)->default_value(false),"enable gelf logging appender in logging configuration file")
     ("gelf-endpoint",bpo::value<string>(&gelf_endpoint)->default_value("10.160.11.21:12201"),"hostname:port or ip:port of GELF endpoint")
     ("template",bpo::value<string>(&start_temp)->default_value("testnet.template"),"the startup script template")
     ("script",bpo::value<string>(&start_script)->default_value("bios_boot.sh"),"the generated startup script name")

From 8d692b2abbd9cd1bbec79f7034f1b61ba4fdc8a8 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Wed, 18 Sep 2019 10:30:49 +0800
Subject: [PATCH 1286/1648] Update fc libraries

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index 2824a8caf6f..3cd44bd5d98 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 2824a8caf6f4f0422affe637987da9b366b55118
+Subproject commit 3cd44bd5d984891bf16a71b277df2135adbe8cd6

From da68996d0c9da68a6b31616488d397fe1631b7ce Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 18 Sep 2019 08:24:56 -0400
Subject: [PATCH 1287/1648] Fix errorExit string

---
 tests/nodeos_forked_chain_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/nodeos_forked_chain_test.py b/tests/nodeos_forked_chain_test.py
index 1d172cd1c90..745f18c2f51 100755
--- a/tests/nodeos_forked_chain_test.py
+++ b/tests/nodeos_forked_chain_test.py
@@ -289,7 +289,7 @@ def getMinHeadAndLib(prodNodes):
             blockProducer=node.getBlockProducerByNum(blockNum)
 
         if producerToSlot[lastBlockProducer]["count"]!=inRowCountPerProducer:
-            Utils.errorExit("Producer %s, in slot %d, expected to produce %d blocks but produced %d blocks" % (blockProducer, inRowCountPerProducer, producerToSlot[lastBlockProducer]["count"]))
+            Utils.errorExit("Producer %s, in slot %d, expected to produce %d blocks but produced %d blocks" % (blockProducer, slot, inRowCountPerProducer, producerToSlot[lastBlockProducer]["count"]))
 
         if blockProducer==productionCycle[0]:
             break

From 155ced2d28b5ad78deb38bfa7547913b9d78e667 Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Mon, 16 Sep 2019 15:25:08 -0400
Subject: [PATCH 1288/1648] Add test for function body code size

---
 unittests/wasm_tests.cpp | 44 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index 6b5d641f953..f805310c4a6 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -8,7 +8,10 @@
 #include <eosio/chain/wast_to_wasm.hpp>
 #include <eosio/testing/tester.hpp>
 
+#include <Inline/Serialization.h>
+#include <IR/Module.h>
 #include <Runtime/Runtime.h>
+#include <WASM/WASM.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -883,7 +886,6 @@ BOOST_FIXTURE_TEST_CASE( lotso_globals, TESTER ) try {
    BOOST_CHECK_THROW(set_code(N(globals),
       string(ss.str() + "(global $z (mut i64) (i64.const -12)))")
    .c_str()), eosio::chain::wasm_execution_error);
-
 } FC_LOG_AND_RETHROW()
 
 BOOST_FIXTURE_TEST_CASE( offset_check, TESTER ) try {
@@ -1382,7 +1384,7 @@ BOOST_FIXTURE_TEST_CASE( lotso_stack_4, TESTER ) try {
       ss << "(local i32)";
    ss << "  )";
    ss << ")";
-   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), fc::exception);
+   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), wasm_serialization_error);
    produce_blocks(1);
    }
 } FC_LOG_AND_RETHROW()
@@ -1445,7 +1447,7 @@ BOOST_FIXTURE_TEST_CASE( lotso_stack_7, TESTER ) try {
       ss << "(param i32)";
    ss << "  )";
    ss << ")";
-   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), fc::exception);
+   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), wasm_serialization_error);
    produce_blocks(1);
    }
 } FC_LOG_AND_RETHROW()
@@ -1486,7 +1488,7 @@ BOOST_FIXTURE_TEST_CASE( lotso_stack_9, TESTER ) try {
       ss << "(local f32)";
    ss << "  )";
    ss << ")";
-   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), fc::exception);
+   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), wasm_serialization_error);
    produce_blocks(1);
    }
 } FC_LOG_AND_RETHROW()
@@ -1843,6 +1845,40 @@ BOOST_FIXTURE_TEST_CASE( depth_tests, TESTER ) try {
 
 } FC_LOG_AND_RETHROW()
 
+// TODO: Update to use eos-vm once merged
+BOOST_FIXTURE_TEST_CASE( code_size, TESTER )  try {
+   using namespace IR;
+   using namespace Runtime;
+   using namespace Serialization;
+   std::vector<U8> code_start = {
+      0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,
+      0x03, 0x7e, 0x7e, 0x7e, 0x00, 0x03, 0x02, 0x01, 0x00, 0x07, 0x09, 0x01,
+      0x05, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x00, 0x00, 0x0a, 0x8b, 0x80, 0x80,
+      0x0a, 0x01, 0x86, 0x80, 0x80, 0x0a, 0x00
+   };
+
+   std::vector<U8> function_body = {
+      0x41, 0xff, 0xff, 0xff, 0xff, 0x07, 0x1a
+   };
+
+   std::vector<U8> code_end = { 0x0b };
+ 
+   std::vector<U8> code_function_body;
+   for(unsigned int i = 0; i < wasm_constraints::maximum_code_size; i+=7) {
+      code_function_body.insert(code_function_body.end(), function_body.begin(), function_body.end());
+   }
+
+
+   std::vector<U8> code;
+   code.insert(code.end(), code_start.begin(), code_start.end());
+   code.insert(code.end(), code_function_body.begin(), code_function_body.end());
+   code.insert(code.end(), code_end.begin(), code_end.end());
+
+   Module module;
+   Serialization::MemoryInputStream stream((const U8*)code.data(), code.size());
+   BOOST_CHECK_THROW(WASM::serialize(stream, module), FatalSerializationException);
+
+} FC_LOG_AND_RETHROW()
 // TODO: restore net_usage_tests
 #if 0
 BOOST_FIXTURE_TEST_CASE(net_usage_tests, tester ) try {

From afff0a21965d4a7744adf8b3464eb9f1f705e8ad Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Wed, 18 Sep 2019 15:13:51 -0400
Subject: [PATCH 1289/1648] Fix whitespace

---
 unittests/wasm_tests.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index f805310c4a6..22f33557e4d 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -1868,7 +1868,6 @@ BOOST_FIXTURE_TEST_CASE( code_size, TESTER )  try {
       code_function_body.insert(code_function_body.end(), function_body.begin(), function_body.end());
    }
 
-
    std::vector<U8> code;
    code.insert(code.end(), code_start.begin(), code_start.end());
    code.insert(code.end(), code_function_body.begin(), code_function_body.end());

From e4c54300066b2dbe7d61c38dec8196ad98efdfe4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 18 Sep 2019 15:15:09 -0400
Subject: [PATCH 1290/1648] get_block_id_for_num will throw
 unknown_block_exception when block num is not found

---
 plugins/net_plugin/net_plugin.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b9ef647f1f6..90b426781d3 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1611,8 +1611,12 @@ namespace eosio {
          c->syncing = true;
          app().post( priority::medium, [chain_plug = my_impl->chain_plug, c,
                                         msg_head_num = msg.head_num, msg_head_id = msg.head_id]() {
-            controller& cc = chain_plug->chain();
-            if( cc.get_block_id_for_num( msg_head_num ) != msg_head_id ) {
+            bool on_fork = true;
+            try {
+               controller& cc = chain_plug->chain();
+               on_fork = cc.get_block_id_for_num( msg_head_num ) != msg_head_id;
+            } catch( ... ) {}
+            if( on_fork ) {
                c->strand.post( [c]() {
                   request_message req;
                   req.req_blocks.mode = catch_up;

From 95135f9aef606a2842a183aa1500ba26a3ec5d1e Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Thu, 19 Sep 2019 18:23:49 +0800
Subject: [PATCH 1291/1648] Maintain old behaviour of float128_t variant

---
 libraries/chain/abi_serializer.cpp                |  3 ++-
 .../chain/include/eosio/chain/database_utils.hpp  | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/abi_serializer.cpp b/libraries/chain/abi_serializer.cpp
index 4a029b193ea..bd3ac712c79 100644
--- a/libraries/chain/abi_serializer.cpp
+++ b/libraries/chain/abi_serializer.cpp
@@ -11,6 +11,7 @@
 
 using namespace boost;
 
+
 namespace eosio { namespace chain {
 
    const size_t abi_serializer::max_recursion_depth;
@@ -75,7 +76,7 @@ namespace eosio { namespace chain {
       // TODO: Add proper support for floating point types. For now this is good enough.
       built_in_types.emplace("float32",                   pack_unpack<float>());
       built_in_types.emplace("float64",                   pack_unpack<double>());
-      built_in_types.emplace("float128",                  pack_unpack<uint128_t>());
+      built_in_types.emplace("float128",                  pack_unpack<float128_t>());
 
       built_in_types.emplace("time_point",                pack_unpack<fc::time_point>());
       built_in_types.emplace("time_point_sec",            pack_unpack<fc::time_point_sec>());
diff --git a/libraries/chain/include/eosio/chain/database_utils.hpp b/libraries/chain/include/eosio/chain/database_utils.hpp
index 52f8a42cd68..84c90842795 100644
--- a/libraries/chain/include/eosio/chain/database_utils.hpp
+++ b/libraries/chain/include/eosio/chain/database_utils.hpp
@@ -118,12 +118,23 @@ namespace fc {
 
    inline
    void to_variant( const float128_t& f, variant& v ) {
-      v = variant(*reinterpret_cast<const uint128_t*>(&f));
+      // Assumes platform is little endian and hex representation of 128-bit integer is in little endian order.	
+      const eosio::chain::uint128_t as_bytes = *reinterpret_cast<const eosio::chain::uint128_t*>(&f);
+      std::string s = "0x";	
+      s.append( to_hex( reinterpret_cast<const char*>(&as_bytes), sizeof(as_bytes) ) );	
+      v = s;
    }
 
    inline
    void from_variant( const variant& v, float128_t& f ) {
-      from_variant(v, *reinterpret_cast<uint128_t*>(&f));
+      // Temporarily hold the binary in uint128_t before casting it to float128_t
+      eosio::chain::uint128_t temp = 0;	      
+      auto s = v.as_string();	
+      FC_ASSERT( s.size() == 2 + 2 * sizeof(temp) && s.find("0x") == 0,	"Failure in converting hex data into a float128_t");	
+      auto sz = from_hex( s.substr(2), reinterpret_cast<char*>(&temp), sizeof(temp) );	
+      // Assumes platform is little endian and hex representation of 128-bit integer is in little endian order.	
+      FC_ASSERT( sz == sizeof(temp), "Failure in converting hex data into a float128_t" );	
+      f = *reinterpret_cast<const float128_t*>(&temp);
    }
 
    inline

From 7c0ccaa21aa433a913d7247e5cad2450e3eb9f5c Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Thu, 19 Sep 2019 09:21:09 -0400
Subject: [PATCH 1292/1648] Add wasm spec tests and necessary CMake changes

---
 .gitmodules           | 3 +++
 CMakeLists.txt        | 1 +
 eosio-wasm-spec-tests | 1 +
 3 files changed, 5 insertions(+)
 create mode 160000 eosio-wasm-spec-tests

diff --git a/.gitmodules b/.gitmodules
index 80fe86f626d..b288e59a47a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,3 +18,6 @@
 [submodule "libraries/yubihsm"]
 	path = libraries/yubihsm
 	url = https://github.com/Yubico/yubihsm-shell
+[submodule "eosio-wasm-spec-tests"]
+	path = eosio-wasm-spec-tests
+	url = https://github.com/EOSIO/eosio-wasm-spec-tests
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00968fe546d..0a11cb50550 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,7 @@ add_subdirectory( scripts )
 add_subdirectory( unittests )
 add_subdirectory( tests )
 add_subdirectory( tools )
+add_subdirectory( eosio-wasm-spec-tests/generated-tests )
 
 install_directory_permissions(DIRECTORY ${CMAKE_INSTALL_FULL_SYSCONFDIR}/eosio)
 
diff --git a/eosio-wasm-spec-tests b/eosio-wasm-spec-tests
new file mode 160000
index 00000000000..61c9cb0573e
--- /dev/null
+++ b/eosio-wasm-spec-tests
@@ -0,0 +1 @@
+Subproject commit 61c9cb0573eed7d0396f8f2345464752bf6ad5bb

From f912a99fee1b008df5b250e6a7c5d756eb08e10d Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 19 Sep 2019 09:20:53 -0500
Subject: [PATCH 1293/1648] Reverted name change.

---
 tests/Node.py                                 |  4 ++--
 tests/nodeos_irreversible_mode_test.py        | 10 +++++-----
 ..._multiple_version_protocol_feature_test.py |  4 ++--
 tests/nodeos_protocol_feature_test.py         |  4 ++--
 tests/nodeos_under_min_avail_ram.py           | 20 +++++++++----------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/Node.py b/tests/Node.py
index 580db1eaccc..69656c08250 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1346,7 +1346,7 @@ def getNextCleanProductionCycle(self, trans):
     # TBD: make nodeId an internal property
     # pylint: disable=too-many-locals
     # If nodeosPath is equal to None, it will use the existing nodeos path
-    def relaunch(self, nodeId, chainArg=None, newChain=False, timeout=Utils.systemWaitTimeout, addSwapRemoveFlags=None, cachePopen=False, nodeosPath=None):
+    def relaunch(self, nodeId, chainArg=None, newChain=False, timeout=Utils.systemWaitTimeout, addSwapFlags=None, cachePopen=False, nodeosPath=None):
 
         assert(self.pid is None)
         assert(self.killed)
@@ -1358,7 +1358,7 @@ def relaunch(self, nodeId, chainArg=None, newChain=False, timeout=Utils.systemWa
         splittedCmd=self.cmd.split()
         if nodeosPath: splittedCmd[0] = nodeosPath
         myCmd=" ".join(splittedCmd)
-        toAddOrSwap=copy.deepcopy(addSwapRemoveFlags) if addSwapRemoveFlags is not None else {}
+        toAddOrSwap=copy.deepcopy(addSwapFlags) if addSwapFlags is not None else {}
         if not newChain:
             skip=False
             swapValue=None
diff --git a/tests/nodeos_irreversible_mode_test.py b/tests/nodeos_irreversible_mode_test.py
index 65afd2cf173..f511132ab1d 100755
--- a/tests/nodeos_irreversible_mode_test.py
+++ b/tests/nodeos_irreversible_mode_test.py
@@ -138,8 +138,8 @@ def confirmHeadLibAndForkDbHeadOfSpecMode(nodeToTest, headLibAndForkDbHeadBefore
       assert forkDbHead == forkDbHeadBeforeSwitchMode, \
          "Fork db head ({}) should be equal to fork db head before switch mode ({}) ".format(forkDbHead, forkDbHeadBeforeSwitchMode)
 
-def relaunchNode(node: Node, nodeId, chainArg="", addSwapRemoveFlags=None, relaunchAssertMessage="Fail to relaunch"):
-   isRelaunchSuccess = node.relaunch(nodeId, chainArg=chainArg, addSwapRemoveFlags=addSwapRemoveFlags, timeout=relaunchTimeout, cachePopen=True)
+def relaunchNode(node: Node, nodeId, chainArg="", addSwapFlags=None, relaunchAssertMessage="Fail to relaunch"):
+   isRelaunchSuccess = node.relaunch(nodeId, chainArg=chainArg, addSwapFlags=addSwapFlags, timeout=relaunchTimeout, cachePopen=True)
    time.sleep(1) # Give a second to replay or resync if needed
    assert isRelaunchSuccess, relaunchAssertMessage
    return isRelaunchSuccess
@@ -252,7 +252,7 @@ def switchIrrToSpecMode(nodeIdOfNodeToTest, nodeToTest):
 
       # Kill and relaunch in speculative mode
       nodeToTest.kill(signal.SIGTERM)
-      relaunchNode(nodeToTest, nodeIdOfNodeToTest, addSwapRemoveFlags={"--read-mode": "speculative"})
+      relaunchNode(nodeToTest, nodeIdOfNodeToTest, addSwapFlags={"--read-mode": "speculative"})
 
       # Ensure the node condition is as expected after relaunch
       confirmHeadLibAndForkDbHeadOfSpecMode(nodeToTest, headLibAndForkDbHeadBeforeSwitchMode)
@@ -287,7 +287,7 @@ def switchIrrToSpecModeWithConnectedToProdNode(nodeIdOfNodeToTest, nodeToTest):
          # Kill and relaunch in irreversible mode
          nodeToTest.kill(signal.SIGTERM)
          waitForBlksProducedAndLibAdvanced() # Wait for some blks to be produced and lib advance)
-         relaunchNode(nodeToTest, nodeIdOfNodeToTest, addSwapRemoveFlags={"--read-mode": "speculative"})
+         relaunchNode(nodeToTest, nodeIdOfNodeToTest, addSwapFlags={"--read-mode": "speculative"})
 
          # Ensure the node condition is as expected after relaunch
          ensureHeadLibAndForkDbHeadIsAdvancing(nodeToTest)
@@ -353,7 +353,7 @@ def switchToSpecModeWithIrrModeSnapshot(nodeIdOfNodeToTest, nodeToTest):
          # Start from clean data dir, recover back up blocks, and then relaunch with irreversible snapshot
          removeState(nodeIdOfNodeToTest)
          recoverBackedupBlksDir(nodeIdOfNodeToTest) # this function will delete the existing blocks dir first
-         relaunchNode(nodeToTest, nodeIdOfNodeToTest, chainArg=" --snapshot {}".format(getLatestSnapshot(nodeIdOfNodeToTest)), addSwapRemoveFlags={"--read-mode": "speculative"})
+         relaunchNode(nodeToTest, nodeIdOfNodeToTest, chainArg=" --snapshot {}".format(getLatestSnapshot(nodeIdOfNodeToTest)), addSwapFlags={"--read-mode": "speculative"})
          confirmHeadLibAndForkDbHeadOfSpecMode(nodeToTest)
          # Ensure it automatically replays "reversible blocks", i.e. head lib and fork db should be the same
          headLibAndForkDbHeadAfterRelaunch = getHeadLibAndForkDbHead(nodeToTest)
diff --git a/tests/nodeos_multiple_version_protocol_feature_test.py b/tests/nodeos_multiple_version_protocol_feature_test.py
index 64dcb33bbb4..fdc0c3785bc 100755
--- a/tests/nodeos_multiple_version_protocol_feature_test.py
+++ b/tests/nodeos_multiple_version_protocol_feature_test.py
@@ -36,10 +36,10 @@
 cluster=Cluster(walletd=True)
 cluster.setWalletMgr(walletMgr)
 
-def restartNode(node: Node, nodeId, chainArg=None, addSwapRemoveFlags=None, nodeosPath=None):
+def restartNode(node: Node, nodeId, chainArg=None, addSwapFlags=None, nodeosPath=None):
     if not node.killed:
         node.kill(signal.SIGTERM)
-    isRelaunchSuccess = node.relaunch(nodeId, chainArg, addSwapRemoveFlags=addSwapRemoveFlags,
+    isRelaunchSuccess = node.relaunch(nodeId, chainArg, addSwapFlags=addSwapFlags,
                                       timeout=5, cachePopen=True, nodeosPath=nodeosPath)
     assert isRelaunchSuccess, "Fail to relaunch"
 
diff --git a/tests/nodeos_protocol_feature_test.py b/tests/nodeos_protocol_feature_test.py
index ed38e9d24cd..369068494ef 100755
--- a/tests/nodeos_protocol_feature_test.py
+++ b/tests/nodeos_protocol_feature_test.py
@@ -30,10 +30,10 @@
 
 # The following test case will test the Protocol Feature JSON reader of the blockchain
 
-def restartNode(node: Node, nodeId, chainArg=None, addSwapRemoveFlags=None):
+def restartNode(node: Node, nodeId, chainArg=None, addSwapFlags=None):
     if not node.killed:
         node.kill(signal.SIGTERM)
-    isRelaunchSuccess = node.relaunch(nodeId, chainArg, addSwapRemoveFlags=addSwapRemoveFlags, timeout=5, cachePopen=True)
+    isRelaunchSuccess = node.relaunch(nodeId, chainArg, addSwapFlags=addSwapFlags, timeout=5, cachePopen=True)
     assert isRelaunchSuccess, "Fail to relaunch"
 
 walletMgr=WalletMgr(True)
diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index e19ecf6cdd5..53894dba6e2 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -217,21 +217,21 @@ def setName(self, num):
     Print("all nodes exited with expected reason database_guard_exception")
 
     Print("relaunch nodes with new capacity")
-    addSwapRemoveFlags={}
+    addSwapFlags={}
     maxRAMValue+=2
     currentMinimumMaxRAM=maxRAMValue
     enabledStaleProduction=False
     for i in range(numNodes):
-        addSwapRemoveFlags[maxRAMFlag]=str(maxRAMValue)
-        #addSwapRemoveFlags["--max-irreversible-block-age"]=str(-1)
+        addSwapFlags[maxRAMFlag]=str(maxRAMValue)
+        #addSwapFlags["--max-irreversible-block-age"]=str(-1)
         nodeIndex=numNodes-i-1
         if not enabledStaleProduction:
-            addSwapRemoveFlags["--enable-stale-production"]=""   # just enable stale production for the first node
+            addSwapFlags["--enable-stale-production"]=""   # just enable stale production for the first node
             enabledStaleProduction=True
-        if not nodes[nodeIndex].relaunch(nodeIndex, "", newChain=False, addSwapRemoveFlags=addSwapRemoveFlags):
+        if not nodes[nodeIndex].relaunch(nodeIndex, "", newChain=False, addSwapFlags=addSwapFlags):
             Utils.cmdError("Failed to restart node0 with new capacity %s" % (maxRAMValue))
             errorExit("Failure - Node should have restarted")
-        addSwapRemoveFlags={}
+        addSwapFlags={}
         maxRAMValue=currentMinimumMaxRAM+30
 
     time.sleep(20)
@@ -285,16 +285,16 @@ def setName(self, num):
             errorExit("Failure - Node should be alive")
 
     Print("relaunch node with even more capacity")
-    addSwapRemoveFlags={}
+    addSwapFlags={}
 
     time.sleep(10)
     maxRAMValue=currentMinimumMaxRAM+5
     currentMinimumMaxRAM=maxRAMValue
-    addSwapRemoveFlags[maxRAMFlag]=str(maxRAMValue)
-    if not nodes[len(nodes)-1].relaunch(nodeIndex, "", newChain=False, addSwapRemoveFlags=addSwapRemoveFlags):
+    addSwapFlags[maxRAMFlag]=str(maxRAMValue)
+    if not nodes[len(nodes)-1].relaunch(nodeIndex, "", newChain=False, addSwapFlags=addSwapFlags):
         Utils.cmdError("Failed to restart node %d with new capacity %s" % (numNodes-1, maxRAMValue))
         errorExit("Failure - Node should have restarted")
-    addSwapRemoveFlags={}
+    addSwapFlags={}
 
     time.sleep(10)
     allDone=True

From ad50fd3622a32c22b4db445e80ee4b4dbdb1d9e9 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 19 Sep 2019 09:33:00 -0500
Subject: [PATCH 1294/1648] Removed unneeded block log method paremeter and
 added assert to validate expectations.

---
 libraries/chain/block_log.cpp                     | 8 ++++++--
 libraries/chain/controller.cpp                    | 4 ++--
 libraries/chain/include/eosio/chain/block_log.hpp | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index f039b0386a9..4bffe3a8a9c 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -341,8 +341,8 @@ namespace eosio { namespace chain {
       my->reset(gs, first_block, 1);
    }
 
-   void block_log::reset( const chain_id_type& chain_id, const signed_block_ptr& first_block, uint32_t first_block_num ) {
-      my->reset(chain_id, first_block, first_block_num);
+   void block_log::reset( const chain_id_type& chain_id, uint32_t first_block_num ) {
+      my->reset(chain_id, signed_block_ptr(), first_block_num);
    }
 
    void detail::block_log_impl::write( const genesis_state& gs ) {
@@ -695,6 +695,10 @@ namespace eosio { namespace chain {
             fc::raw::unpack(block_stream, gs);
             return gs.compute_chain_id();
          }
+         EOS_ASSERT( contains_chain_id(version, first_block_num), block_log_exception,
+                     "Block log error! version: ${version} with first_block_num: ${num} does not contain a "
+                     "chain id or genesis state, so the chain id cannot be determined.",
+                     ("version", version)("num", first_block_num) );
          chain_id_type chain_id;
          fc::raw::unpack(block_stream, chain_id);
          return chain_id;
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index d09957b37c4..506065ba6d6 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -530,7 +530,7 @@ struct controller_impl {
             EOS_ASSERT( lib_num > 0, snapshot_exception,
                         "Snapshot indicates controller head at block number 0, but that is not allowed. "
                         "Snapshot is invalid." );
-            blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
+            blog.reset( chain_id, lib_num + 1 );
          }
          const auto hash = calculate_integrity_hash();
          ilog( "database initialized with hash: ${hash}", ("hash", hash) );
@@ -589,7 +589,7 @@ struct controller_impl {
          lib_num = blog.head()->block_num();
       } else {
          if( first_block_num != (lib_num + 1) ) {
-            blog.reset( chain_id, signed_block_ptr(), lib_num + 1 );
+            blog.reset( chain_id, lib_num + 1 );
          }
       }
 
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index e8e24103595..db2fe7f4cd5 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -41,7 +41,7 @@ namespace eosio { namespace chain {
          uint64_t append(const signed_block_ptr& b);
          void flush();
          void reset( const genesis_state& gs, const signed_block_ptr& genesis_block );
-         void reset( const chain_id_type& chain_id, const signed_block_ptr& genesis_block, uint32_t first_block_num );
+         void reset( const chain_id_type& chain_id, uint32_t first_block_num );
 
          signed_block_ptr read_block(uint64_t file_pos)const;
          void             read_block_header(block_header& bh, uint64_t file_pos)const;

From 37ede05a806951bd089c50c46bf5329f92642376 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 19 Sep 2019 09:33:24 -0500
Subject: [PATCH 1295/1648] Further cleanup of chain initalization.

---
 plugins/chain_plugin/chain_plugin.cpp | 107 +++++++++++++++-----------
 1 file changed, 60 insertions(+), 47 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 14eddbfb298..cc979c2d3b6 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -10,6 +10,7 @@
 #include <eosio/chain/reversible_block_object.hpp>
 #include <eosio/chain/controller.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
+#include <eosio/chain/global_property_object.hpp>
 #include <eosio/chain/snapshot.hpp>
 
 #include <eosio/chain/eosio_contract.hpp>
@@ -811,6 +812,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          wlog("The --import-reversible-blocks option should be used by itself.");
       }
 
+      fc::optional<chain_id_type> block_log_chain_id;
       if (options.count( "snapshot" )) {
          my->snapshot_path = options.at( "snapshot" ).as<bfs::path>();
          EOS_ASSERT( fc::exists(*my->snapshot_path), plugin_config_exception,
@@ -845,7 +847,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                            "snapshot chain id does not match the chain id from the genesis state in the block log.");
             }
             else {
-               auto block_log_chain_id = block_log::extract_chain_id(my->blocks_dir);
+               block_log_chain_id = block_log::extract_chain_id(my->blocks_dir);
                EOS_ASSERT( block_log_chain_id == chain_id,
                            plugin_config_exception,
                            "snapshot chain id does not match the chain id in the block log.");
@@ -853,24 +855,9 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          }
 
       } else {
-         bfs::path genesis_file;
-         bool genesis_timestamp_specified = false;
-         fc::optional<genesis_state> existing_genesis;
-         fc::optional<chain_id_type> chain_id;
-
-         if( fc::exists( my->blocks_dir / "blocks.log" ) ) {
-            my->genesis = block_log::extract_genesis_state( my->blocks_dir );
-            existing_genesis = my->genesis;
-            if (my->genesis) {
-               chain_id = my->genesis->compute_chain_id();
-            }
-            else {
-               chain_id = block_log::extract_chain_id( my->blocks_dir );
-            }
-         }
 
          if( options.count( "genesis-json" )) {
-            genesis_file = options.at( "genesis-json" ).as<bfs::path>();
+            bfs::path genesis_file = options.at( "genesis-json" ).as<bfs::path>();
             if( genesis_file.is_relative()) {
                genesis_file = bfs::current_path() / genesis_file;
             }
@@ -884,7 +871,10 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
 
             if( options.count( "genesis-timestamp" ) ) {
                my->genesis->initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
-               genesis_timestamp_specified = true;
+               ilog( "Using genesis state provided in '${genesis}' but with adjusted genesis timestamp",
+                     ("genesis", genesis_file.generic_string()) );
+            } else {
+               ilog( "Using genesis state provided in '${genesis}'", ("genesis", genesis_file.generic_string()));
             }
          }
          else {
@@ -893,31 +883,29 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                         "--genesis-timestamp is only valid if also passed in with --genesis-json");
          }
 
-         if( !existing_genesis && !chain_id ) {
-            if( !genesis_file.empty() ) {
-               if( genesis_timestamp_specified ) {
-                  ilog( "Using genesis state provided in '${genesis}' but with adjusted genesis timestamp",
-                        ("genesis", genesis_file.generic_string()) );
-               } else {
-                  ilog( "Using genesis state provided in '${genesis}'", ("genesis", genesis_file.generic_string()));
+         if( fc::exists( my->blocks_dir / "blocks.log" ) ) {
+            auto log_genesis = block_log::extract_genesis_state( my->blocks_dir );
+            if (log_genesis) {
+               if (my->genesis) {
+                  EOS_ASSERT( *my->genesis == *log_genesis, plugin_config_exception,
+                              "Genesis state provided via command line arguments does not match the existing genesis state"
+                              " in blocks.log. It is not necessary to provide genesis state arguments when a blocks.log "
+                              "file already exists."
+                  );
+               }
+               else {
+                  my->genesis = log_genesis;
                }
-            } else {
-               my->genesis.emplace();
-            }
-         } else {
-            if (existing_genesis) {
-               EOS_ASSERT( *my->genesis == *existing_genesis, plugin_config_exception,
-                           "Genesis state provided via command line arguments does not match the existing genesis state"
-                           " in blocks.log. It is not necessary to provide genesis state arguments when a blocks.log "
-                           "file already exists."
-               );
             }
-            else if (my->genesis) {
-               EOS_ASSERT( my->genesis->compute_chain_id() == chain_id, plugin_config_exception,
-                           "Genesis state, provided via command line arguments, has a chain_id that does not match the "
-                           "existing chain id in blocks.log. It is not necessary to provide genesis state arguments "
-                           "when a blocks.log file already exists."
-               );
+            else {
+               block_log_chain_id = block_log::extract_chain_id( my->blocks_dir );
+               if (my->genesis) {
+                  EOS_ASSERT( my->genesis->compute_chain_id() == *block_log_chain_id, plugin_config_exception,
+                              "Genesis state, provided via command line arguments, has a chain_id that does not match the "
+                              "existing chain id in blocks.log. It is not necessary to provide genesis state arguments "
+                              "when a blocks.log file already exists."
+                  );
+               }
             }
          }
       }
@@ -938,12 +926,37 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
 
       my->chain.emplace( *my->chain_config, std::move(pfs) );
 
-      if (!my->genesis && !options.count( "snapshot" )) {
-         EOS_ASSERT( my->chain->db().revision() < 1, plugin_config_exception,
-                     "Genesis state is necessary to initialize fresh blockchain state but genesis state could "
-                     "not be found in the block log. Please either load from snapshot or find a block log that "
-                     "starts from genesis."
-         );
+      if( !options.count( "snapshot" ) ) {
+         if( my->chain->db().revision() < 1 ) { // No existing blockchain state
+            EOS_ASSERT( my->genesis || !block_log_chain_id, plugin_config_exception,
+                        "Genesis state is necessary to initialize fresh blockchain state but genesis state could not be "
+                        "found in the blocks log. Please either load from snapshot or find a blocks log that starts "
+                        "from genesis."
+            );
+            if( my->genesis ) {
+               ilog( "Starting up fresh blockchain with provided genesis state." );
+            } else {
+               ilog( "Starting up fresh blockchain with default genesis state." );
+               my->genesis.emplace();
+            }
+         } else { // Existing blockchain state
+            const auto& state_chain_id = my->chain->get_global_properties().chain_id;
+            if( my->genesis ) {
+               auto provided_chain_id = my->genesis->compute_chain_id();
+               EOS_ASSERT( provided_chain_id == state_chain_id, plugin_config_exception,
+                           "Existing state is for a different chain than the one specified by the provided genesis "
+                           "state. Provided genesis state chain id: ${provided_chain_id}, existing state chain id: ${state_chain_id}",
+                           ("provided_chain_id", provided_chain_id)("state_chain_id", state_chain_id)
+               );
+            } else if( block_log_chain_id ) {
+               EOS_ASSERT( *block_log_chain_id == state_chain_id, block_log_exception,
+                           "Existing state is for a different chain than the one specified in the blocks log."
+                           " Block log chain id: ${block_log_chain_id}, existing state chain id: ${state_chain_id}",
+                           ("block_log_chain_id", *block_log_chain_id)("state_chain_id", state_chain_id)
+
+               );
+            }
+         }
       }
 
       // set up method providers

From 0bb56ea281c80f2ebc6917f75675942a8ca47073 Mon Sep 17 00:00:00 2001
From: Chris Gundlach <cgundlach@naughtydawgllc.com>
Date: Thu, 19 Sep 2019 10:07:24 -0700
Subject: [PATCH 1296/1648] updated check for completion for v1 block log

---
 libraries/chain/block_log.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index d9c971e7447..3104710ae6a 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -687,6 +687,11 @@ namespace eosio { namespace chain {
                   block_log_exception,
                   "Block log file at '${blocks_log}' first block already returned by former call to previous(), it is no longer valid to call this function.", ("blocks_log", _block_file_name) );
 
+      if (_version == 1 && _blocks_found == _blocks_expected) {
+         _current_position_in_file = block_log::npos;
+         return _current_position_in_file;
+      }
+	 
       if (_start_of_buffer_position > _current_position_in_file) {
          update_buffer();
       }
@@ -710,9 +715,6 @@ namespace eosio { namespace chain {
                      block_log_exception,
                      "Block log file at '${blocks_log}' formatting is incorrect, indicates position later location in file: ${pos}, which was retrieved at: ${orig_pos}.",
                      ("blocks_log", _block_file_name)("pos", _current_position_in_file)("orig_pos", previous_position_in_file) );
-         if (_version == 1 && _blocks_found != _blocks_expected) {
-            _current_position_in_file = block_location_in_file = block_log::npos;
-         }
       }
 
       return block_location_in_file;

From 671cd74804ebc014c40e2554137c5266381f661f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 13:47:51 -0400
Subject: [PATCH 1297/1648] Adjust cmake flags to disable mongo on all Travis
 builds.

---
 .cicd/build.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index cb27dcae295..9cc772504dd 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 . ./.cicd/helpers/general.sh
 mkdir -p $BUILD_DIR
-CMAKE_EXTRAS="-DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_BUILD_TYPE='Release'"
+CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE='Release'"
 if [[ "$(uname)" == 'Darwin' ]]; then
     # You can't use chained commands in execute
     if [[ "$TRAVIS" == 'true' ]]; then
@@ -10,6 +10,8 @@ if [[ "$(uname)" == 'Darwin' ]]; then
         ccache -s
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
         ./$CICD_DIR/platforms/macos-10.14.sh
+    else
+        CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     fi
     [[ ! "$PINNED" == 'false' || "$UNPINNED" == 'true' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
@@ -44,6 +46,7 @@ else # Linux
     if [[ "$BUILDKITE" == 'true' ]]; then
         # Generate Base Images
         $CICD_DIR/generate-base-images.sh
+        CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
         [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="cp -r $MOUNTED_DIR /root/eosio && cd /root/eosio/build &&"
         COMMANDS="$COMMANDS $BUILD_COMMANDS"
         [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="$COMMANDS && make install"

From fa7e2abaa93155d8192586d8836851d7bc4899a9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 13:48:28 -0400
Subject: [PATCH 1298/1648] Add echos to cmake and make commands to be executed
 on Mac.

---
 .cicd/build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 9cc772504dd..46f63ff30ad 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -15,7 +15,9 @@ if [[ "$(uname)" == 'Darwin' ]]; then
     fi
     [[ ! "$PINNED" == 'false' || "$UNPINNED" == 'true' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
+    echo "cmake $CMAKE_EXTRAS"
     cmake $CMAKE_EXTRAS ..
+    echo "make -j$JOBS"
     make -j$JOBS
 else # Linux
     ARGS=${ARGS:-"--rm --init -v $(pwd):$MOUNTED_DIR"}

From 17a3004101048adb8c906ae9c83935e7c6e4029c Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 14:07:10 -0400
Subject: [PATCH 1299/1648] Add echos to cmake and make commands to be executed
 on Mac.

---
 .cicd/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 46f63ff30ad..8a8de73a5c5 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -15,7 +15,7 @@ if [[ "$(uname)" == 'Darwin' ]]; then
     fi
     [[ ! "$PINNED" == 'false' || "$UNPINNED" == 'true' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
-    echo "cmake $CMAKE_EXTRAS"
+    echo "cmake $CMAKE_EXTRAS .."
     cmake $CMAKE_EXTRAS ..
     echo "make -j$JOBS"
     make -j$JOBS

From 1062c0975b06f9fee107c8b315c774af4427a826 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 14:34:48 -0400
Subject: [PATCH 1300/1648] Reorder commands to support mongo on Buildkite.

---
 .cicd/build.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 8a8de73a5c5..c8fb2ea6f3a 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -4,7 +4,6 @@ set -eo pipefail
 mkdir -p $BUILD_DIR
 CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE='Release'"
 if [[ "$(uname)" == 'Darwin' ]]; then
-    # You can't use chained commands in execute
     if [[ "$TRAVIS" == 'true' ]]; then
         export PINNED=false
         ccache -s
@@ -43,20 +42,20 @@ else # Linux
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DLLVM_DIR='/usr/lib/llvm-7/lib/cmake/llvm'"
     fi
-    BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
     # Docker Commands
     if [[ "$BUILDKITE" == 'true' ]]; then
         # Generate Base Images
         $CICD_DIR/generate-base-images.sh
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
         [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="cp -r $MOUNTED_DIR /root/eosio && cd /root/eosio/build &&"
-        COMMANDS="$COMMANDS $BUILD_COMMANDS"
-        [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="$COMMANDS && make install"
+        [[ "$ENABLE_INSTALL" == 'true' ]] && POST_COMMANDS="make install"
     elif [[ "$TRAVIS" == 'true' ]]; then
         ARGS="$ARGS -v /usr/lib/ccache -v $HOME/.ccache:/opt/.ccache -e JOBS -e TRAVIS -e CCACHE_DIR=/opt/.ccache"
-        COMMANDS="ccache -s && $BUILD_COMMANDS"
+        COMMANDS="ccache -s"
     fi
-    COMMANDS="$PRE_COMMANDS && $COMMANDS"
+    BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
+    COMMANDS="$PRE_COMMANDS && $COMMANDS && $BUILD_COMMANDS && $POST_COMMANDS"
     echo "$ docker run $ARGS $(buildkite-intrinsics) $FULL_TAG bash -c \"$COMMANDS\""
+    exit
     eval docker run $ARGS $(buildkite-intrinsics) $FULL_TAG bash -c \"$COMMANDS\"
 fi
\ No newline at end of file

From 744b93d53bf8a130daa4efa350a9eb9a1f184567 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 14:39:19 -0400
Subject: [PATCH 1301/1648] Revert "Reorder commands to support mongo on
 Buildkite."

This reverts commit 1062c0975b06f9fee107c8b315c774af4427a826.
---
 .cicd/build.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index c8fb2ea6f3a..8a8de73a5c5 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -4,6 +4,7 @@ set -eo pipefail
 mkdir -p $BUILD_DIR
 CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE='Release'"
 if [[ "$(uname)" == 'Darwin' ]]; then
+    # You can't use chained commands in execute
     if [[ "$TRAVIS" == 'true' ]]; then
         export PINNED=false
         ccache -s
@@ -42,20 +43,20 @@ else # Linux
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DLLVM_DIR='/usr/lib/llvm-7/lib/cmake/llvm'"
     fi
+    BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
     # Docker Commands
     if [[ "$BUILDKITE" == 'true' ]]; then
         # Generate Base Images
         $CICD_DIR/generate-base-images.sh
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
         [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="cp -r $MOUNTED_DIR /root/eosio && cd /root/eosio/build &&"
-        [[ "$ENABLE_INSTALL" == 'true' ]] && POST_COMMANDS="make install"
+        COMMANDS="$COMMANDS $BUILD_COMMANDS"
+        [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="$COMMANDS && make install"
     elif [[ "$TRAVIS" == 'true' ]]; then
         ARGS="$ARGS -v /usr/lib/ccache -v $HOME/.ccache:/opt/.ccache -e JOBS -e TRAVIS -e CCACHE_DIR=/opt/.ccache"
-        COMMANDS="ccache -s"
+        COMMANDS="ccache -s && $BUILD_COMMANDS"
     fi
-    BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
-    COMMANDS="$PRE_COMMANDS && $COMMANDS && $BUILD_COMMANDS && $POST_COMMANDS"
+    COMMANDS="$PRE_COMMANDS && $COMMANDS"
     echo "$ docker run $ARGS $(buildkite-intrinsics) $FULL_TAG bash -c \"$COMMANDS\""
-    exit
     eval docker run $ARGS $(buildkite-intrinsics) $FULL_TAG bash -c \"$COMMANDS\"
 fi
\ No newline at end of file

From 9627dea00e8cae82987e4a5a5adf351981b0c6fd Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 14:40:13 -0400
Subject: [PATCH 1302/1648] Ensured and re-enabled mongo for Linux on Travis.

---
 .cicd/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 8a8de73a5c5..c00c35cd8d1 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -20,6 +20,7 @@ if [[ "$(uname)" == 'Darwin' ]]; then
     echo "make -j$JOBS"
     make -j$JOBS
 else # Linux
+    CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     ARGS=${ARGS:-"--rm --init -v $(pwd):$MOUNTED_DIR"}
     . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$IMAGE_TAG.dockerfile
     PRE_COMMANDS="cd $MOUNTED_DIR/build"
@@ -48,7 +49,6 @@ else # Linux
     if [[ "$BUILDKITE" == 'true' ]]; then
         # Generate Base Images
         $CICD_DIR/generate-base-images.sh
-        CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
         [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="cp -r $MOUNTED_DIR /root/eosio && cd /root/eosio/build &&"
         COMMANDS="$COMMANDS $BUILD_COMMANDS"
         [[ "$ENABLE_INSTALL" == 'true' ]] && COMMANDS="$COMMANDS && make install"

From aaebd79c3f2df5a1e00aa264aaa098f529b08c56 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 14:55:22 -0400
Subject: [PATCH 1303/1648] Switch to llvm@7 in .travis.yml.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 915f636b9e7..c3cad95a4d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ matrix:
             - graphviz
             - libtool
             - gmp
-            - llvm@4
+            - llvm@7
             - pkgconfig
             - python
             - python@2

From 5efcd8b01fcac8f055cdc32cbfd8718ec4a2dd62 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 14:57:09 -0400
Subject: [PATCH 1304/1648] Install boost version provided by brew for Travis.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c3cad95a4d7..c426ddbeae3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ matrix:
             - doxygen
             - libusb
             - openssl
-            - boost@1.70
+            - boost
             - ccache
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"

From e577c1f0cd125999feb7b373d1f3a0d676387c5d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 19 Sep 2019 15:26:19 -0400
Subject: [PATCH 1305/1648] Refactor producer plugin start_block into a few
 methods to make the logic easier to follow

---
 plugins/producer_plugin/producer_plugin.cpp | 463 +++++++++++---------
 1 file changed, 250 insertions(+), 213 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index e9e72e9983e..d34bee56f72 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -183,11 +183,15 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       void schedule_production_loop();
       void produce_block();
       bool maybe_produce_block();
+      bool remove_expired_persisted_trxs( const fc::time_point& deadline );
+      bool remove_expired_blacklisted_trxs( const fc::time_point& deadline );
+      bool process_unapplied_trxs( const fc::time_point& deadline );
+      bool process_scheduled_and_incoming_trxs( const fc::time_point& deadline, size_t& pending_incoming_process_limit );
+      bool process_incoming_trxs( const fc::time_point& deadline, size_t& pending_incoming_process_limit );
 
       boost::program_options::variables_map _options;
       bool     _production_enabled                 = false;
       bool     _pause_production                   = false;
-      uint32_t _production_skip_flags              = 0; //eosio::chain::skip_nothing;
 
       using signature_provider_type = std::function<chain::signature_type(chain::digest_type)>;
       std::map<chain::public_key_type, signature_provider_type> _signature_providers;
@@ -209,7 +213,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       std::vector<chain::digest_type>                           _protocol_features_to_activate;
       bool                                                      _protocol_features_signaled = false; // to mark whether it has been signaled in start_block
 
-      producer_plugin* _self = nullptr;
       chain_plugin* chain_plug = nullptr;
 
       incoming::channels::block::channel_type::handle         _incoming_block_subscription;
@@ -240,7 +243,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
       uint32_t _timer_corelation_id = 0;
 
       // keep a expected ratio between defer txn and incoming txn
-      double _incoming_trx_weight = 0.0;
       double _incoming_defer_ratio = 1.0; // 1:1
 
       // path to write the snapshots to
@@ -608,7 +610,6 @@ void new_chain_banner(const eosio::chain::controller& db)
 
 producer_plugin::producer_plugin()
    : my(new producer_plugin_impl(app().get_io_service())){
-      my->_self = this;
    }
 
 producer_plugin::~producer_plugin() {}
@@ -895,7 +896,6 @@ void producer_plugin::plugin_startup()
          if (chain.head_block_num() == 0) {
             new_chain_banner(chain);
          }
-         //_production_skip_flags |= eosio::chain::skip_undo_history_check;
       }
    }
 
@@ -1457,7 +1457,6 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
    } LOG_AND_DROP();
 
    if( chain.is_building_block() ) {
-      auto pending_block_time = chain.pending_block_time();
       const auto& pending_block_signing_authority = chain.pending_block_signing_authority();
       const fc::time_point preprocess_deadline = calculate_block_deadline(block_time);
 
@@ -1466,122 +1465,10 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
          _pending_block_mode = pending_block_mode::speculating;
       }
 
-      // order: persisted, forked, aborted
-
-      bool exhausted = false;
-
-      // remove all expired transactions
-      size_t num_expired_persistent = 0;
-      size_t num_expired_other = 0;
-      size_t orig_count = _unapplied_transactions.size();
-      exhausted = !_unapplied_transactions.clear_expired( pending_block_time, preprocess_deadline,
-                     [&num_expired_persistent, &num_expired_other, pbm = _pending_block_mode,
-                      &chain, has_producers = !_producers.empty()]( const transaction_id_type& txid, trx_enum_type trx_type ) {
-               if( trx_type == trx_enum_type::persisted ) {
-                  if( pbm == pending_block_mode::producing ) {
-                     fc_dlog( _trx_trace_log,
-                              "[TRX_TRACE] Block ${block_num} for producer ${prod} is EXPIRING PERSISTED tx: ${txid}",
-                              ("block_num", chain.head_block_num() + 1)("prod", chain.pending_block_producer())("txid", txid));
-                  } else {
-                     fc_dlog( _trx_trace_log, "[TRX_TRACE] Speculative execution is EXPIRING PERSISTED tx: ${txid}", ("txid", txid));
-                  }
-                  ++num_expired_persistent;
-               } else {
-                  if (has_producers) {
-                     fc_dlog(_trx_trace_log,
-                           "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
-                           ("txid", txid));
-                  }
-                  ++num_expired_other;
-               }
-      });
-
-      if( exhausted ) {
-         fc_wlog( _log, "Unable to process all expired transactions in unapplied queue before deadline, "
-                        "Persistent expired ${persistent_expired}, Other expired ${other_expired}",
-                  ("persistent_expired", num_expired_persistent)("other_expired", num_expired_other) );
-      } else {
-         fc_dlog( _log, "Processed ${m} expired transactions of the ${n} transactions in the unapplied queue, "
-                        "Persistent expired ${persistent_expired}, Other expired ${other_expired}",
-                  ("m", num_expired_persistent+num_expired_other)("n", orig_count)
-                  ("persistent_expired", num_expired_persistent)("other_expired", num_expired_other) );
-      }
-
       try {
-         size_t orig_pending_txn_size = _pending_incoming_transactions.size();
-
-         // Processing unapplied transactions...
-         if( !_unapplied_transactions.empty() ) {
-            int num_applied = 0, num_failed = 0, num_processed = 0;
-            auto unapplied_trxs_size = _unapplied_transactions.size();
-            auto itr     = (_pending_block_mode == pending_block_mode::producing) ?
-                  _unapplied_transactions.begin() : _unapplied_transactions.persisted_begin();
-            auto end_itr = (_pending_block_mode == pending_block_mode::producing) ?
-                  _unapplied_transactions.end()   : _unapplied_transactions.persisted_end();
-            while( itr != end_itr ) {
-               if( preprocess_deadline <= fc::time_point::now() ) exhausted = true;
-               if( exhausted ) break;
-
-               const transaction_metadata_ptr trx = itr->trx_meta;
-               ++num_processed;
-               try {
-                  auto deadline = fc::time_point::now() + fc::milliseconds( _max_transaction_time_ms );
-                  bool deadline_is_subjective = false;
-                  if( _max_transaction_time_ms < 0 ||
-                      (_pending_block_mode == pending_block_mode::producing && preprocess_deadline < deadline) ) {
-                     deadline_is_subjective = true;
-                     deadline = preprocess_deadline;
-                  }
-
-                  auto trace = chain.push_transaction( trx, deadline );
-                  if( trace->except ) {
-                     if( failure_is_subjective( *trace->except, deadline_is_subjective ) ) {
-                        exhausted = true;
-                        // don't erase, subjective failure so try again next time
-                        break;
-                     } else {
-                        // this failed our configured maximum transaction time, we don't want to replay it
-                        ++num_failed;
-                        itr = _unapplied_transactions.erase( itr );
-                        continue;
-                     }
-                  } else {
-                     ++num_applied;
-                     itr = _unapplied_transactions.erase( itr );
-                     continue;
-                  }
-               } LOG_AND_DROP();
-               ++itr;
-            }
-
-            fc_dlog( _log, "Processed ${m} of ${n} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",
-                     ("m", num_processed)( "n", unapplied_trxs_size )("applied", num_applied)("failed", num_failed) );
-         }
+         size_t pending_incoming_process_limit = _pending_incoming_transactions.size();
 
          if (_pending_block_mode == pending_block_mode::producing) {
-            auto& blacklist_by_id = _blacklisted_transactions.get<by_id>();
-            auto& blacklist_by_expiry = _blacklisted_transactions.get<by_expiry>();
-            auto now = fc::time_point::now();
-            if(!blacklist_by_expiry.empty()) {
-               int num_expired = 0;
-               int orig_count = _blacklisted_transactions.size();
-
-               while (!blacklist_by_expiry.empty() && blacklist_by_expiry.begin()->expiry <= now) {
-                  if (preprocess_deadline <= fc::time_point::now()) break;
-                  blacklist_by_expiry.erase(blacklist_by_expiry.begin());
-                  num_expired++;
-               }
-
-               fc_dlog(_log, "Processed ${n} blacklisted transactions, Expired ${expired}",
-                      ("n", orig_count)
-                      ("expired", num_expired));
-            }
-
-            // scheduled transactions
-            int num_applied = 0;
-            int num_failed = 0;
-            int num_processed = 0;
-
             auto scheduled_trx_deadline = preprocess_deadline;
             if (_max_scheduled_transaction_time_per_block_ms >= 0) {
                scheduled_trx_deadline = std::min<fc::time_point>(
@@ -1589,124 +1476,274 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
                      fc::time_point::now() + fc::milliseconds(_max_scheduled_transaction_time_per_block_ms)
                );
             }
-            time_point pending_block_time = chain.pending_block_time();
-            const auto& sch_idx = chain.db().get_index<generated_transaction_multi_index,by_delay>();
-            const auto scheduled_trxs_size = sch_idx.size();
-            auto sch_itr = sch_idx.begin();
-            while( sch_itr != sch_idx.end() ) {
-               if( sch_itr->delay_until > pending_block_time) break;    // not scheduled yet
-               if( sch_itr->published >= pending_block_time ) {
-                  ++sch_itr;
-                  continue; // do not allow schedule and execute in same block
+            // may exhaust scheduled_trx_deadline but not preprocess_deadline, exhausted preprocess_deadline checked below
+            process_scheduled_and_incoming_trxs( scheduled_trx_deadline, pending_incoming_process_limit );
+         }
+
+         if( app().is_quiting() ) // db guard exception above in LOG_AND_DROP could have called app().quit()
+            return start_block_result::failed;
+         if (preprocess_deadline <= fc::time_point::now()) {
+            return start_block_result::exhausted;
+         } else {
+            if( !process_incoming_trxs( preprocess_deadline, pending_incoming_process_limit ) )
+               return start_block_result::exhausted;
+            return start_block_result::succeeded;
+         }
+
+      } catch ( const guard_exception& e ) {
+         chain_plugin::handle_guard_exception(e);
+         return start_block_result::failed;
+      } catch ( std::bad_alloc& ) {
+         chain_plugin::handle_bad_alloc();
+      } catch ( boost::interprocess::bad_alloc& ) {
+         chain_plugin::handle_db_exhaustion();
+      }
+
+   }
+
+   return start_block_result::failed;
+}
+
+bool producer_plugin_impl::remove_expired_persisted_trxs( const fc::time_point& deadline )
+{
+   chain::controller& chain = chain_plug->chain();
+   auto pending_block_time = chain.pending_block_time();
+
+   // remove all expired transactions
+   size_t num_expired_persistent = 0;
+   size_t num_expired_other = 0;
+   size_t orig_count = _unapplied_transactions.size();
+   bool exhausted = !_unapplied_transactions.clear_expired( pending_block_time, deadline,
+                  [&num_expired_persistent, &num_expired_other, pbm = _pending_block_mode,
+                   &chain, has_producers = !_producers.empty()]( const transaction_id_type& txid, trx_enum_type trx_type ) {
+            if( trx_type == trx_enum_type::persisted ) {
+               if( pbm == pending_block_mode::producing ) {
+                  fc_dlog( _trx_trace_log,
+                           "[TRX_TRACE] Block ${block_num} for producer ${prod} is EXPIRING PERSISTED tx: ${txid}",
+                           ("block_num", chain.head_block_num() + 1)("prod", chain.pending_block_producer())("txid", txid));
+               } else {
+                  fc_dlog( _trx_trace_log, "[TRX_TRACE] Speculative execution is EXPIRING PERSISTED tx: ${txid}", ("txid", txid));
                }
-               if( scheduled_trx_deadline <= fc::time_point::now() ) {
-                  break;
+               ++num_expired_persistent;
+            } else {
+               if (has_producers) {
+                  fc_dlog(_trx_trace_log,
+                        "[TRX_TRACE] Node with producers configured is dropping an EXPIRED transaction that was PREVIOUSLY ACCEPTED : ${txid}",
+                        ("txid", txid));
                }
+               ++num_expired_other;
+            }
+   });
 
-               const transaction_id_type trx_id = sch_itr->trx_id; // make copy since reference could be invalidated
-               if (blacklist_by_id.find(trx_id) != blacklist_by_id.end()) {
-                  ++sch_itr;
-                  continue;
-               }
+   if( exhausted ) {
+      fc_wlog( _log, "Unable to process all expired transactions in unapplied queue before deadline, "
+                     "Persistent expired ${persistent_expired}, Other expired ${other_expired}",
+               ("persistent_expired", num_expired_persistent)("other_expired", num_expired_other) );
+   } else {
+      fc_dlog( _log, "Processed ${m} expired transactions of the ${n} transactions in the unapplied queue, "
+                     "Persistent expired ${persistent_expired}, Other expired ${other_expired}",
+               ("m", num_expired_persistent+num_expired_other)("n", orig_count)
+               ("persistent_expired", num_expired_persistent)("other_expired", num_expired_other) );
+   }
+
+   return !exhausted;
+}
 
-               auto sch_itr_next = sch_itr; // save off next since sch_itr may be invalidated by loop
-               ++sch_itr_next;
-               const auto next_delay_until = sch_itr_next != sch_idx.end() ? sch_itr_next->delay_until : sch_itr->delay_until;
-               const auto next_id = sch_itr_next != sch_idx.end() ? sch_itr_next->id : sch_itr->id;
+bool producer_plugin_impl::remove_expired_blacklisted_trxs( const fc::time_point& deadline )
+{
+   bool exhausted = false;
+   auto& blacklist_by_expiry = _blacklisted_transactions.get<by_expiry>();
+   auto now = fc::time_point::now();
+   if(!blacklist_by_expiry.empty()) {
+      int num_expired = 0;
+      int orig_count = _blacklisted_transactions.size();
+
+      while (!blacklist_by_expiry.empty() && blacklist_by_expiry.begin()->expiry <= now) {
+         if (deadline <= fc::time_point::now()) {
+            exhausted = true;
+            break;
+         }
+         blacklist_by_expiry.erase(blacklist_by_expiry.begin());
+         num_expired++;
+      }
 
-               num_processed++;
+      fc_dlog(_log, "Processed ${n} blacklisted transactions, Expired ${expired}",
+              ("n", orig_count)("expired", num_expired));
+   }
+   return !exhausted;
+}
 
-               // configurable ratio of incoming txns vs deferred txns
-               while (_incoming_trx_weight >= 1.0 && orig_pending_txn_size && _pending_incoming_transactions.size()) {
-                  if (scheduled_trx_deadline <= fc::time_point::now()) break;
+bool producer_plugin_impl::process_unapplied_trxs( const fc::time_point& deadline )
+{
+   bool exhausted = false;
+   if( !_unapplied_transactions.empty() ) {
+      chain::controller& chain = chain_plug->chain();
+      int num_applied = 0, num_failed = 0, num_processed = 0;
+      auto unapplied_trxs_size = _unapplied_transactions.size();
+      auto itr     = (_pending_block_mode == pending_block_mode::producing) ?
+                     _unapplied_transactions.begin() : _unapplied_transactions.persisted_begin();
+      auto end_itr = (_pending_block_mode == pending_block_mode::producing) ?
+                     _unapplied_transactions.end()   : _unapplied_transactions.persisted_end();
+      while( itr != end_itr ) {
+         if( deadline <= fc::time_point::now() ) {
+            exhausted = true;
+            break;
+         }
 
-                  auto e = _pending_incoming_transactions.pop_front();
-                  --orig_pending_txn_size;
-                  _incoming_trx_weight -= 1.0;
-                  process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
-               }
+         const transaction_metadata_ptr trx = itr->trx_meta;
+         ++num_processed;
+         try {
+            auto trx_deadline = fc::time_point::now() + fc::milliseconds( _max_transaction_time_ms );
+            bool deadline_is_subjective = false;
+            if( _max_transaction_time_ms < 0 ||
+                (_pending_block_mode == pending_block_mode::producing && deadline < trx_deadline) ) {
+               deadline_is_subjective = true;
+               trx_deadline = deadline;
+            }
 
-               if (scheduled_trx_deadline <= fc::time_point::now()) {
+            auto trace = chain.push_transaction( trx, trx_deadline );
+            if( trace->except ) {
+               if( failure_is_subjective( *trace->except, deadline_is_subjective ) ) {
+                  exhausted = true;
+                  // don't erase, subjective failure so try again next time
                   break;
+               } else {
+                  // this failed our configured maximum transaction time, we don't want to replay it
+                  ++num_failed;
+                  itr = _unapplied_transactions.erase( itr );
+                  continue;
                }
+            } else {
+               ++num_applied;
+               itr = _unapplied_transactions.erase( itr );
+               continue;
+            }
+         } LOG_AND_DROP();
+         ++itr;
+      }
 
-               try {
-                  auto deadline = fc::time_point::now() + fc::milliseconds(_max_transaction_time_ms);
-                  bool deadline_is_subjective = false;
-                  if (_max_transaction_time_ms < 0 || (_pending_block_mode == pending_block_mode::producing && scheduled_trx_deadline < deadline)) {
-                     deadline_is_subjective = true;
-                     deadline = scheduled_trx_deadline;
-                  }
+      fc_dlog( _log, "Processed ${m} of ${n} previously applied transactions, Applied ${applied}, Failed/Dropped ${failed}",
+               ("m", num_processed)( "n", unapplied_trxs_size )("applied", num_applied)("failed", num_failed) );
+   }
+   return !exhausted;
+}
 
-                  auto trace = chain.push_scheduled_transaction(trx_id, deadline);
-                  if (trace->except) {
-                     if (failure_is_subjective(*trace->except, deadline_is_subjective)) {
-                        exhausted = true;
-                        break;
-                     } else {
-                        auto expiration = fc::time_point::now() + fc::seconds(chain.get_global_properties().configuration.deferred_trx_expiration_window);
-                        // this failed our configured maximum transaction time, we don't want to replay it add it to a blacklist
-                        _blacklisted_transactions.insert(transaction_id_with_expiry{trx_id, expiration});
-                        num_failed++;
-                     }
-                  } else {
-                     num_applied++;
-                  }
-               } LOG_AND_DROP();
+bool producer_plugin_impl::process_scheduled_and_incoming_trxs( const fc::time_point& deadline, size_t& orig_pending_txn_size )
+{
+   // scheduled transactions
+   int num_applied = 0;
+   int num_failed = 0;
+   int num_processed = 0;
+   bool exhausted = false;
+   double incoming_trx_weight = 0.0;
+
+   auto& blacklist_by_id = _blacklisted_transactions.get<by_id>();
+   chain::controller& chain = chain_plug->chain();
+   time_point pending_block_time = chain.pending_block_time();
+   const auto& sch_idx = chain.db().get_index<generated_transaction_multi_index,by_delay>();
+   const auto scheduled_trxs_size = sch_idx.size();
+   auto sch_itr = sch_idx.begin();
+   while( sch_itr != sch_idx.end() ) {
+      if( sch_itr->delay_until > pending_block_time) break;    // not scheduled yet
+      if( sch_itr->published >= pending_block_time ) {
+         ++sch_itr;
+         continue; // do not allow schedule and execute in same block
+      }
+      if( deadline <= fc::time_point::now() ) {
+         exhausted = true;
+         break;
+      }
 
-               _incoming_trx_weight += _incoming_defer_ratio;
-               if (!orig_pending_txn_size) _incoming_trx_weight = 0.0;
+      const transaction_id_type trx_id = sch_itr->trx_id; // make copy since reference could be invalidated
+      if (blacklist_by_id.find(trx_id) != blacklist_by_id.end()) {
+         ++sch_itr;
+         continue;
+      }
 
-               if( sch_itr_next == sch_idx.end() ) break;
-               sch_itr = sch_idx.lower_bound( boost::make_tuple( next_delay_until, next_id ) );
-            }
+      auto sch_itr_next = sch_itr; // save off next since sch_itr may be invalidated by loop
+      ++sch_itr_next;
+      const auto next_delay_until = sch_itr_next != sch_idx.end() ? sch_itr_next->delay_until : sch_itr->delay_until;
+      const auto next_id = sch_itr_next != sch_idx.end() ? sch_itr_next->id : sch_itr->id;
 
-            if( scheduled_trxs_size > 0 ) {
-               fc_dlog( _log,
-                        "Processed ${m} of ${n} scheduled transactions, Applied ${applied}, Failed/Dropped ${failed}",
-                        ( "m", num_processed )
-                        ( "n", scheduled_trxs_size )
-                        ( "applied", num_applied )
-                        ( "failed", num_failed ) );
-            }
+      num_processed++;
 
+      // configurable ratio of incoming txns vs deferred txns
+      while (incoming_trx_weight >= 1.0 && orig_pending_txn_size && _pending_incoming_transactions.size()) {
+         if (deadline <= fc::time_point::now()) {
+            exhausted = true;
+            break;
          }
 
-         if( app().is_quiting() ) // db guard exception above in LOG_AND_DROP could have called app().quit()
-            return start_block_result::failed;
-         if (exhausted || preprocess_deadline <= fc::time_point::now()) {
-            return start_block_result::exhausted;
-         } else {
-            // attempt to apply any pending incoming transactions
-            _incoming_trx_weight = 0.0;
-
-            if (!_pending_incoming_transactions.empty()) {
-               size_t processed = 0;
-               fc_dlog(_log, "Processing ${n} pending transactions", ("n", orig_pending_txn_size));
-               while (orig_pending_txn_size && _pending_incoming_transactions.size()) {
-                  if (preprocess_deadline <= fc::time_point::now()) return start_block_result::exhausted;
-                  auto e = _pending_incoming_transactions.pop_front();
-                  --orig_pending_txn_size;
-                  process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
-                  ++processed;
-               }
-               fc_dlog(_log, "Processed ${n} pending transactions, ${p} left", ("n", processed)("p", _pending_incoming_transactions.size()));
+         auto e = _pending_incoming_transactions.pop_front();
+         --orig_pending_txn_size;
+         incoming_trx_weight -= 1.0;
+         process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
+      }
+
+      if (deadline <= fc::time_point::now()) {
+         exhausted = true;
+         break;
+      }
+
+      try {
+         auto trx_deadline = fc::time_point::now() + fc::milliseconds(_max_transaction_time_ms);
+         bool deadline_is_subjective = false;
+         if (_max_transaction_time_ms < 0 || (_pending_block_mode == pending_block_mode::producing && deadline < trx_deadline)) {
+            deadline_is_subjective = true;
+            trx_deadline = deadline;
+         }
+
+         auto trace = chain.push_scheduled_transaction(trx_id, trx_deadline);
+         if (trace->except) {
+            if (failure_is_subjective(*trace->except, deadline_is_subjective)) {
+               exhausted = true;
+               break;
+            } else {
+               auto expiration = fc::time_point::now() + fc::seconds(chain.get_global_properties().configuration.deferred_trx_expiration_window);
+               // this failed our configured maximum transaction time, we don't want to replay it add it to a blacklist
+               _blacklisted_transactions.insert(transaction_id_with_expiry{trx_id, expiration});
+               num_failed++;
             }
-            return start_block_result::succeeded;
+         } else {
+            num_applied++;
          }
+      } LOG_AND_DROP();
 
-      } catch ( const guard_exception& e ) {
-         chain_plugin::handle_guard_exception(e);
-         return start_block_result::failed;
-      } catch ( std::bad_alloc& ) {
-         chain_plugin::handle_bad_alloc();
-      } catch ( boost::interprocess::bad_alloc& ) {
-         chain_plugin::handle_db_exhaustion();
-      }
+      incoming_trx_weight += _incoming_defer_ratio;
+      if (!orig_pending_txn_size) incoming_trx_weight = 0.0;
 
+      if( sch_itr_next == sch_idx.end() ) break;
+      sch_itr = sch_idx.lower_bound( boost::make_tuple( next_delay_until, next_id ) );
    }
 
-   return start_block_result::failed;
+   if( scheduled_trxs_size > 0 ) {
+      fc_dlog( _log,
+               "Processed ${m} of ${n} scheduled transactions, Applied ${applied}, Failed/Dropped ${failed}",
+               ( "m", num_processed )( "n", scheduled_trxs_size )( "applied", num_applied )( "failed", num_failed ) );
+   }
+
+   return !exhausted;
+}
+
+bool producer_plugin_impl::process_incoming_trxs( const fc::time_point& deadline, size_t& orig_pending_txn_size )
+{
+   bool exhausted = false;
+   if (!_pending_incoming_transactions.empty()) {
+      size_t processed = 0;
+      fc_dlog(_log, "Processing ${n} pending transactions", ("n", orig_pending_txn_size));
+      while (orig_pending_txn_size && _pending_incoming_transactions.size()) {
+         if (deadline <= fc::time_point::now()) {
+            exhausted = true;
+            break;
+         }
+         auto e = _pending_incoming_transactions.pop_front();
+         --orig_pending_txn_size;
+         process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
+         ++processed;
+      }
+      fc_dlog(_log, "Processed ${n} pending transactions, ${p} left", ("n", processed)("p", _pending_incoming_transactions.size()));
+   }
+   return !exhausted;
 }
 
 void producer_plugin_impl::schedule_production_loop() {

From 7bb5b690f4fbee8e6b2c92de95fcf28001677ce2 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Thu, 19 Sep 2019 15:38:22 -0400
Subject: [PATCH 1306/1648] fix get_table_tests/get_table_next_key_test

---
 tests/get_table_tests.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/get_table_tests.cpp b/tests/get_table_tests.cpp
index d47f7e7f0c9..081708059b2 100644
--- a/tests/get_table_tests.cpp
+++ b/tests/get_table_tests.cpp
@@ -538,7 +538,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_next_key_test, TESTER ) try {
    auto more2_res_1 = plugin.get_table_rows(params);
    BOOST_REQUIRE(more2_res_1.rows.size() > 0);
    BOOST_TEST(more2_res_1.rows[0].get_object()["key"].as<uint64_t>() == 1);
-   
+
 
    // i64 secondary key type
    params.key_type = "i64";
@@ -557,7 +557,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_next_key_test, TESTER ) try {
    // i128 secondary key type
    params.key_type = "i128";
    params.index_position = "3";
-   params.lower_bound = "5"; 
+   params.lower_bound = "5";
 
    auto res_3 = plugin.get_table_rows(params);
    chain::uint128_t sec128_expected_value = 5;
@@ -596,15 +596,15 @@ BOOST_FIXTURE_TEST_CASE( get_table_next_key_test, TESTER ) try {
    auto res_5 = plugin.get_table_rows(params);
    float128_t secldouble_expected_value = ui64_to_f128(5);
    BOOST_REQUIRE(res_5.rows.size() > 0);
-   chain::uint128_t secldouble_res_value =  res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
-   BOOST_TEST(*reinterpret_cast<float128_t*>(&secldouble_res_value) == secldouble_expected_value);
+   float128_t secldouble_res_value =  res_5.rows[0].get_object()["secldouble"].as<float128_t>();
+   BOOST_TEST(secldouble_res_value == secldouble_expected_value);
    BOOST_TEST(res_5.next_key == "7.00000000000000000");
    params.lower_bound = res_5.next_key;
    auto more2_res_5 = plugin.get_table_rows(params);
    float128_t more2_secldouble_expected_value = ui64_to_f128(7);
    BOOST_REQUIRE(more2_res_5.rows.size() > 0);
-   chain::uint128_t more2_secldouble_res_value =  more2_res_5.rows[0].get_object()["secldouble"].as<chain::uint128_t>();
-   BOOST_TEST(*reinterpret_cast<float128_t*>(&more2_secldouble_res_value) == more2_secldouble_expected_value);
+   float128_t more2_secldouble_res_value =  more2_res_5.rows[0].get_object()["secldouble"].as<float128_t>();
+   BOOST_TEST(more2_secldouble_res_value == more2_secldouble_expected_value);
 
    params.table = N(hashobjs);
 

From 46c2fa784bfcba8eba82f28607d1f6c91d30cff9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 15:51:13 -0400
Subject: [PATCH 1307/1648] Mongo installation only needs to occur for
 Buildkite.

---
 .cicd/platforms/macos-10.14.sh | 59 ++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index fe124319d19..e841f7421d7 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -61,31 +61,34 @@ else
     # install boost from brew
     brew install boost || true
 fi
-# install mongoDB
-cd ~
-curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
-tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz
-rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz
-ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
-# install mongo-c-driver from source
-cd /tmp
-curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz
-tar -xzf mongo-c-driver-1.13.0.tar.gz
-cd mongo-c-driver-1.13.0
-mkdir -p cmake-build
-cd cmake-build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF ..
-make -j $(getconf _NPROCESSORS_ONLN)
-sudo make install
-cd ../..
-rm mongo-c-driver-1.13.0.tar.gz
-# install mongo-cxx-driver from source
-cd /tmp
-curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz
-tar -xzf mongo-cxx-driver-r3.4.0.tar.gz
-cd mongo-cxx-driver-r3.4.0/build
-cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' ..
-make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1
-sudo make install
-cd ../..
-rm -f mongo-cxx-driver-r3.4.0.tar.gz
+# mongo dependencies only needed in Buildkite.
+if [[ "$BUILDKITE" == 'true' ]]; then
+    # install mongoDB
+    cd ~
+    curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
+    tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz
+    rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz
+    ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
+    # install mongo-c-driver from source
+    cd /tmp
+    curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz
+    tar -xzf mongo-c-driver-1.13.0.tar.gz
+    cd mongo-c-driver-1.13.0
+    mkdir -p cmake-build
+    cd cmake-build
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF ..
+    make -j $(getconf _NPROCESSORS_ONLN)
+    sudo make install
+    cd ../..
+    rm mongo-c-driver-1.13.0.tar.gz
+    # install mongo-cxx-driver from source
+    cd /tmp
+    curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz
+    cd mongo-cxx-driver-r3.4.0/build
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' ..
+    make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1
+    sudo make install
+    cd ../..
+    rm -f mongo-cxx-driver-r3.4.0.tar.gz
+fi
\ No newline at end of file

From 11597c4eb07c099708936efaf047179c43b65130 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 19 Sep 2019 15:57:49 -0400
Subject: [PATCH 1308/1648] Revert "Mongo installation only needs to occur for
 Buildkite."

This reverts commit 46c2fa784bfcba8eba82f28607d1f6c91d30cff9.
Tests scripts are identical between Travis and Buildkite. Reverting for now.
---
 .cicd/platforms/macos-10.14.sh | 59 ++++++++++++++++------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index e841f7421d7..fe124319d19 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -61,34 +61,31 @@ else
     # install boost from brew
     brew install boost || true
 fi
-# mongo dependencies only needed in Buildkite.
-if [[ "$BUILDKITE" == 'true' ]]; then
-    # install mongoDB
-    cd ~
-    curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
-    tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz
-    rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz
-    ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
-    # install mongo-c-driver from source
-    cd /tmp
-    curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz
-    tar -xzf mongo-c-driver-1.13.0.tar.gz
-    cd mongo-c-driver-1.13.0
-    mkdir -p cmake-build
-    cd cmake-build
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF ..
-    make -j $(getconf _NPROCESSORS_ONLN)
-    sudo make install
-    cd ../..
-    rm mongo-c-driver-1.13.0.tar.gz
-    # install mongo-cxx-driver from source
-    cd /tmp
-    curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz
-    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz
-    cd mongo-cxx-driver-r3.4.0/build
-    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' ..
-    make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1
-    sudo make install
-    cd ../..
-    rm -f mongo-cxx-driver-r3.4.0.tar.gz
-fi
\ No newline at end of file
+# install mongoDB
+cd ~
+curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
+tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz
+rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz
+ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
+# install mongo-c-driver from source
+cd /tmp
+curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz
+tar -xzf mongo-c-driver-1.13.0.tar.gz
+cd mongo-c-driver-1.13.0
+mkdir -p cmake-build
+cd cmake-build
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF ..
+make -j $(getconf _NPROCESSORS_ONLN)
+sudo make install
+cd ../..
+rm mongo-c-driver-1.13.0.tar.gz
+# install mongo-cxx-driver from source
+cd /tmp
+curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz
+tar -xzf mongo-cxx-driver-r3.4.0.tar.gz
+cd mongo-cxx-driver-r3.4.0/build
+cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' ..
+make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1
+sudo make install
+cd ../..
+rm -f mongo-cxx-driver-r3.4.0.tar.gz

From 1135e22ef008f9d2532cad276573a6848fae3001 Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Thu, 19 Sep 2019 09:16:57 -0400
Subject: [PATCH 1309/1648] Review feedback

---
 unittests/wasm_tests.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index 22f33557e4d..005b908edf9 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -1846,7 +1846,7 @@ BOOST_FIXTURE_TEST_CASE( depth_tests, TESTER ) try {
 } FC_LOG_AND_RETHROW()
 
 // TODO: Update to use eos-vm once merged
-BOOST_FIXTURE_TEST_CASE( code_size, TESTER )  try {
+BOOST_AUTO_TEST_CASE( code_size )  try {
    using namespace IR;
    using namespace Runtime;
    using namespace Serialization;
@@ -1857,15 +1857,11 @@ BOOST_FIXTURE_TEST_CASE( code_size, TESTER )  try {
       0x0a, 0x01, 0x86, 0x80, 0x80, 0x0a, 0x00
    };
 
-   std::vector<U8> function_body = {
-      0x41, 0xff, 0xff, 0xff, 0xff, 0x07, 0x1a
-   };
-
    std::vector<U8> code_end = { 0x0b };
  
    std::vector<U8> code_function_body;
-   for(unsigned int i = 0; i < wasm_constraints::maximum_code_size; i+=7) {
-      code_function_body.insert(code_function_body.end(), function_body.begin(), function_body.end());
+   for(unsigned int i = 0; i < wasm_constraints::maximum_code_size; ++i) {
+      code_function_body.push_back(0x01);
    }
 
    std::vector<U8> code;
@@ -1878,6 +1874,7 @@ BOOST_FIXTURE_TEST_CASE( code_size, TESTER )  try {
    BOOST_CHECK_THROW(WASM::serialize(stream, module), FatalSerializationException);
 
 } FC_LOG_AND_RETHROW()
+
 // TODO: restore net_usage_tests
 #if 0
 BOOST_FIXTURE_TEST_CASE(net_usage_tests, tester ) try {

From bd06cd88630483bad4902ed1b4b76444b6fd6bf7 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 19 Sep 2019 19:30:41 -0400
Subject: [PATCH 1310/1648] remove bad semicolon (in unused but compiled code)

---
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
index 56fd7da3eb3..6e7c7ef7124 100644
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
@@ -47,7 +47,7 @@ void disassembleFunction(U8* bytes,Uptr numBytes)
 			instructionBuffer,
 			sizeof(instructionBuffer)
 			);
-		if(numInstructionBytes == 0 || numInstructionBytes > numBytesRemaining);
+		if(numInstructionBytes == 0 || numInstructionBytes > numBytesRemaining)
 			break;
 		numBytesRemaining -= numInstructionBytes;
 		nextByte += numInstructionBytes;

From 621fae83e29ae41d82c436effa0cbfbebc5e0295 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 20 Sep 2019 07:48:11 -0400
Subject: [PATCH 1311/1648] Enhance push_block_returns_forked_transactions test
 to verify forked unapplied transactions are applied.

---
 unittests/forked_tests.cpp | 83 ++++++++++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 8 deletions(-)

diff --git a/unittests/forked_tests.cpp b/unittests/forked_tests.cpp
index b26a1668ebe..67abe388b95 100644
--- a/unittests/forked_tests.cpp
+++ b/unittests/forked_tests.cpp
@@ -583,9 +583,10 @@ BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
    push_blocks(c, c2);
 
    wlog( "c1 blocks:" );
+   signed_block_ptr cb;
    c.produce_blocks(3);
    signed_block_ptr b;
-   b = c.produce_block();
+   cb = b = c.produce_block();
    account_name expected_producer = N(dan);
    BOOST_REQUIRE_EQUAL( b->producer.to_string(), expected_producer.to_string() );
 
@@ -623,10 +624,57 @@ BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
    BOOST_REQUIRE_EQUAL( b->producer.to_string(), expected_producer.to_string() );
    // create accounts on c1 which will be forked out
    c.produce_block();
-   auto trace1 = c.create_account( N(test1) );
+
+   transaction_trace_ptr trace1, trace2, trace3;
+   { // create account the hard way so we can set reference block and expiration
+      signed_transaction trx;
+      authority active_auth( get_public_key( N(test1), "active" ) );
+      authority owner_auth( get_public_key( N(test1), "owner" ) );
+      trx.actions.emplace_back( vector<permission_level>{{config::system_account_name,config::active_name}},
+                                newaccount{
+                                      .creator  = config::system_account_name,
+                                      .name     = N(test1),
+                                      .owner    = owner_auth,
+                                      .active   = active_auth,
+                                });
+      trx.expiration = c.control->head_block_time() + fc::seconds( 60 );
+      trx.set_reference_block( cb->id() );
+      trx.sign( get_private_key( config::system_account_name, "active" ), c.control->get_chain_id()  );
+      trace1 = c.push_transaction( trx );
+   }
    c.produce_block();
-   auto trace2 = c.create_account( N(test2) );
-   auto trace3 = c.create_account( N(test3) );
+   {
+      signed_transaction trx;
+      authority active_auth( get_public_key( N(test2), "active" ) );
+      authority owner_auth( get_public_key( N(test2), "owner" ) );
+      trx.actions.emplace_back( vector<permission_level>{{config::system_account_name,config::active_name}},
+                                newaccount{
+                                      .creator  = config::system_account_name,
+                                      .name     = N(test2),
+                                      .owner    = owner_auth,
+                                      .active   = active_auth,
+                                });
+      trx.expiration = c.control->head_block_time() + fc::seconds( 60 );
+      trx.set_reference_block( cb->id() );
+      trx.sign( get_private_key( config::system_account_name, "active" ), c.control->get_chain_id()  );
+      trace2 = c.push_transaction( trx );
+   }
+   {
+      signed_transaction trx;
+      authority active_auth( get_public_key( N(test3), "active" ) );
+      authority owner_auth( get_public_key( N(test3), "owner" ) );
+      trx.actions.emplace_back( vector<permission_level>{{config::system_account_name,config::active_name}},
+                                newaccount{
+                                      .creator  = config::system_account_name,
+                                      .name     = N(test3),
+                                      .owner    = owner_auth,
+                                      .active   = active_auth,
+                                });
+      trx.expiration = c.control->head_block_time() + fc::seconds( 60 );
+      trx.set_reference_block( cb->id() );
+      trx.sign( get_private_key( config::system_account_name, "active" ), c.control->get_chain_id()  );
+      trace3 = c.push_transaction( trx );
+   }
    c.produce_block();
    c.produce_blocks(9);
 
@@ -640,10 +688,29 @@ BOOST_AUTO_TEST_CASE( push_block_returns_forked_transactions ) try {
    // verify transaction on fork is reported by push_block in order
    BOOST_REQUIRE_EQUAL( 3, c.get_unapplied_transaction_queue().size() );
    BOOST_REQUIRE_EQUAL( trace1->id, c.get_unapplied_transaction_queue().begin()->id() );
-   c.get_unapplied_transaction_queue().erase( c.get_unapplied_transaction_queue().begin() );
-   BOOST_REQUIRE_EQUAL( trace2->id, c.get_unapplied_transaction_queue().begin()->id() );
-   c.get_unapplied_transaction_queue().erase( c.get_unapplied_transaction_queue().begin() );
-   BOOST_REQUIRE_EQUAL( trace3->id, c.get_unapplied_transaction_queue().begin()->id() );
+   BOOST_REQUIRE_EQUAL( trace2->id, (++c.get_unapplied_transaction_queue().begin())->id() );
+   BOOST_REQUIRE_EQUAL( trace3->id, (++(++c.get_unapplied_transaction_queue().begin()))->id() );
+
+   BOOST_REQUIRE_EXCEPTION(c.control->get_account( N(test1) ), fc::exception,
+                           [a=N(test1)] (const fc::exception& e)->bool {
+                              return std::string( e.what() ).find( a.to_string() ) != std::string::npos;
+                           }) ;
+   BOOST_REQUIRE_EXCEPTION(c.control->get_account( N(test2) ), fc::exception,
+                           [a=N(test2)] (const fc::exception& e)->bool {
+                              return std::string( e.what() ).find( a.to_string() ) != std::string::npos;
+                           }) ;
+   BOOST_REQUIRE_EXCEPTION(c.control->get_account( N(test3) ), fc::exception,
+                           [a=N(test3)] (const fc::exception& e)->bool {
+                              return std::string( e.what() ).find( a.to_string() ) != std::string::npos;
+                           }) ;
+
+   // produce block which will apply the unapplied transactions
+   c.produce_block();
+
+   // verify unapplied transactions ran
+   BOOST_REQUIRE_EQUAL( c.control->get_account( N(test1) ).name,  N(test1) );
+   BOOST_REQUIRE_EQUAL( c.control->get_account( N(test2) ).name,  N(test2) );
+   BOOST_REQUIRE_EQUAL( c.control->get_account( N(test3) ).name,  N(test3) );
 
 } FC_LOG_AND_RETHROW()
 

From 5320958d8738862f8411332fd789ff365f3e3afd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 20 Sep 2019 08:40:33 -0400
Subject: [PATCH 1312/1648] Finish: Refactor producer plugin start_block into a
 few methods to make the logic easier to follow

---
 plugins/producer_plugin/producer_plugin.cpp | 25 ++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index d34bee56f72..b0bd08826c9 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1466,8 +1466,17 @@ producer_plugin_impl::start_block_result producer_plugin_impl::start_block() {
       }
 
       try {
+         if( !remove_expired_persisted_trxs( preprocess_deadline ) )
+            return start_block_result::exhausted;
+         if( !remove_expired_blacklisted_trxs( preprocess_deadline ) )
+            return start_block_result::exhausted;
+
+         // limit execution of pending incoming to once per block
          size_t pending_incoming_process_limit = _pending_incoming_transactions.size();
 
+         if( !process_unapplied_trxs( preprocess_deadline ) )
+            return start_block_result::exhausted;
+
          if (_pending_block_mode == pending_block_mode::producing) {
             auto scheduled_trx_deadline = preprocess_deadline;
             if (_max_scheduled_transaction_time_per_block_ms >= 0) {
@@ -1628,7 +1637,7 @@ bool producer_plugin_impl::process_unapplied_trxs( const fc::time_point& deadlin
    return !exhausted;
 }
 
-bool producer_plugin_impl::process_scheduled_and_incoming_trxs( const fc::time_point& deadline, size_t& orig_pending_txn_size )
+bool producer_plugin_impl::process_scheduled_and_incoming_trxs( const fc::time_point& deadline, size_t& pending_incoming_process_limit )
 {
    // scheduled transactions
    int num_applied = 0;
@@ -1668,14 +1677,14 @@ bool producer_plugin_impl::process_scheduled_and_incoming_trxs( const fc::time_p
       num_processed++;
 
       // configurable ratio of incoming txns vs deferred txns
-      while (incoming_trx_weight >= 1.0 && orig_pending_txn_size && _pending_incoming_transactions.size()) {
+      while (incoming_trx_weight >= 1.0 && pending_incoming_process_limit && _pending_incoming_transactions.size()) {
          if (deadline <= fc::time_point::now()) {
             exhausted = true;
             break;
          }
 
          auto e = _pending_incoming_transactions.pop_front();
-         --orig_pending_txn_size;
+         --pending_incoming_process_limit;
          incoming_trx_weight -= 1.0;
          process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
       }
@@ -1710,7 +1719,7 @@ bool producer_plugin_impl::process_scheduled_and_incoming_trxs( const fc::time_p
       } LOG_AND_DROP();
 
       incoming_trx_weight += _incoming_defer_ratio;
-      if (!orig_pending_txn_size) incoming_trx_weight = 0.0;
+      if (!pending_incoming_process_limit) incoming_trx_weight = 0.0;
 
       if( sch_itr_next == sch_idx.end() ) break;
       sch_itr = sch_idx.lower_bound( boost::make_tuple( next_delay_until, next_id ) );
@@ -1725,19 +1734,19 @@ bool producer_plugin_impl::process_scheduled_and_incoming_trxs( const fc::time_p
    return !exhausted;
 }
 
-bool producer_plugin_impl::process_incoming_trxs( const fc::time_point& deadline, size_t& orig_pending_txn_size )
+bool producer_plugin_impl::process_incoming_trxs( const fc::time_point& deadline, size_t& pending_incoming_process_limit )
 {
    bool exhausted = false;
    if (!_pending_incoming_transactions.empty()) {
       size_t processed = 0;
-      fc_dlog(_log, "Processing ${n} pending transactions", ("n", orig_pending_txn_size));
-      while (orig_pending_txn_size && _pending_incoming_transactions.size()) {
+      fc_dlog(_log, "Processing ${n} pending transactions", ("n", pending_incoming_process_limit));
+      while (pending_incoming_process_limit && _pending_incoming_transactions.size()) {
          if (deadline <= fc::time_point::now()) {
             exhausted = true;
             break;
          }
          auto e = _pending_incoming_transactions.pop_front();
-         --orig_pending_txn_size;
+         --pending_incoming_process_limit;
          process_incoming_transaction_async(std::get<0>(e), std::get<1>(e), std::get<2>(e));
          ++processed;
       }

From e50fd68f77bcc2702841fa3089e86439329587b0 Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Thu, 19 Sep 2019 09:46:27 -0400
Subject: [PATCH 1313/1648] Update for all backends

---
 eosio-wasm-spec-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eosio-wasm-spec-tests b/eosio-wasm-spec-tests
index 61c9cb0573e..a31634877a6 160000
--- a/eosio-wasm-spec-tests
+++ b/eosio-wasm-spec-tests
@@ -1 +1 @@
-Subproject commit 61c9cb0573eed7d0396f8f2345464752bf6ad5bb
+Subproject commit a31634877a64fb687641cd198a207eedf04ab528

From 9256542d278bb8d2454b5aff2c6c95a0781d2d25 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 20 Sep 2019 09:18:25 -0400
Subject: [PATCH 1314/1648] Mongo is disabled, no need to execute
 macos-10.14.sh on Travis.

---
 .cicd/build.sh |  1 -
 .travis.yml    | 14 ++++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index c00c35cd8d1..b8e97ba8cb7 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -9,7 +9,6 @@ if [[ "$(uname)" == 'Darwin' ]]; then
         export PINNED=false
         ccache -s
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
-        ./$CICD_DIR/platforms/macos-10.14.sh
     else
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     fi
diff --git a/.travis.yml b/.travis.yml
index c426ddbeae3..eade49ece33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,18 +34,20 @@ matrix:
         homebrew:
           update: true
           packages:
-            - graphviz
+            - ccache
+            - boost
+            - python@2
+            - python
             - libtool
+            - libusb
+            - graphviz
+            - automake
+            - wget
             - gmp
             - llvm@7
             - pkgconfig
-            - python
-            - python@2
             - doxygen
-            - libusb
             - openssl
-            - boost
-            - ccache
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
 script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"

From b0259393e5489fd449fe1b0c63d5ff0443070c8b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 20 Sep 2019 09:38:50 -0400
Subject: [PATCH 1315/1648] Upgrade to boost_1_71_0

---
 .cicd/platforms/amazon_linux-2-unpinned.dockerfile | 8 ++++----
 .cicd/platforms/amazon_linux-2.dockerfile          | 8 ++++----
 .cicd/platforms/centos-7.6-unpinned.dockerfile     | 8 ++++----
 .cicd/platforms/centos-7.6.dockerfile              | 8 ++++----
 .cicd/platforms/macos-10.14.sh                     | 8 ++++----
 .cicd/platforms/ubuntu-16.04.dockerfile            | 8 ++++----
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile   | 8 ++++----
 .cicd/platforms/ubuntu-18.04.dockerfile            | 8 ++++----
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
index 3a4110c69f6..ef4f154b4bc 100644
--- a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
@@ -16,13 +16,13 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     cd / && \
     rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \
-    tar -xjf boost_1_70_0.tar.bz2 && \
-    cd boost_1_70_0 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
     ./bootstrap.sh --prefix=/usr/local && \
     ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
-    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0
+    rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
 RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
     tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \
diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/amazon_linux-2.dockerfile
index 6cdaddf0d7c..d6ef339b792 100644
--- a/.cicd/platforms/amazon_linux-2.dockerfile
+++ b/.cicd/platforms/amazon_linux-2.dockerfile
@@ -43,13 +43,13 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \
-    tar -xjf boost_1_70_0.tar.bz2 && \
-    cd boost_1_70_0 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
     ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
-    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0
+    rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
 RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
     tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \
diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile
index 613da74ad7d..114aa3aca50 100644
--- a/.cicd/platforms/centos-7.6-unpinned.dockerfile
+++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile
@@ -33,15 +33,15 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
     source /opt/rh/devtoolset-8/enable && \
     source /opt/rh/rh-python36/enable && \
-    tar -xjf boost_1_70_0.tar.bz2 && \
-    cd boost_1_70_0 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
     ./bootstrap.sh --prefix=/usr/local && \
     ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
-    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 
+    rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
 RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
     tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \
diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/centos-7.6.dockerfile
index 6e42a57f688..6f549b38d3f 100644
--- a/.cicd/platforms/centos-7.6.dockerfile
+++ b/.cicd/platforms/centos-7.6.dockerfile
@@ -52,13 +52,13 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \
-    tar -xjf boost_1_70_0.tar.bz2 && \
-    cd boost_1_70_0 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
     ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
-    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0
+    rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
 RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
     tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \
diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index fe124319d19..92704cce092 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -50,13 +50,13 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then
     cd ../..
     rm -rf clang8
     # install boost from source
-    curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2
-    tar -xjf boost_1_70_0.tar.bz2
-    cd boost_1_70_0
+    curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2
+    tar -xjf boost_1_71_0.tar.bz2
+    cd boost_1_71_0
     ./bootstrap.sh --prefix=/usr/local
     sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
     cd ..
-    sudo rm -rf boost_1_70_0.tar.bz2 boost_1_70_0  
+    sudo rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
 else
     # install boost from brew
     brew install boost || true
diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile
index 8dc07bc2228..01484cfbd31 100644
--- a/.cicd/platforms/ubuntu-16.04.dockerfile
+++ b/.cicd/platforms/ubuntu-16.04.dockerfile
@@ -44,13 +44,13 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \
-    tar -xjf boost_1_70_0.tar.bz2 && \
-    cd boost_1_70_0 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
     ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
-    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0   
+    rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
 RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \
     tar -xzf mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \
diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index cb7473ca98a..143d4d6e3f7 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -18,13 +18,13 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     cd / && \
     rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \
-    tar -xjf boost_1_70_0.tar.bz2 && \
-    cd boost_1_70_0 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
     ./bootstrap.sh --prefix=/usr/local && \
     ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -j$(nproc) install && \
     cd / && \
-    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0    
+    rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
 RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
     tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile
index 20072008e6d..6354f938cea 100644
--- a/.cicd/platforms/ubuntu-18.04.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04.dockerfile
@@ -45,13 +45,13 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \
-    tar -xjf boost_1_70_0.tar.bz2 && \
-    cd boost_1_70_0 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
     ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
-    rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0  
+    rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
 RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
     tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \

From 50bd691b3d1b0ca129a1b299aecd5bb13656cb3f Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 20 Sep 2019 09:59:41 -0400
Subject: [PATCH 1316/1648] JQ required for release package test.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index eade49ece33..c435d0902d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ matrix:
           update: true
           packages:
             - ccache
+            - jq
             - boost
             - python@2
             - python

From 3e1e5a1d7b24a85698c389d1bb2779b0fc7921ba Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 20 Sep 2019 09:16:46 -0500
Subject: [PATCH 1317/1648] Made check actually verify a file type exists.

---
 plugins/chain_plugin/chain_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index cc979c2d3b6..43a0d89f5c5 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -834,7 +834,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                      "--snapshot is incompatible with --genesis-json as the snapshot contains genesis information");
 
          auto shared_mem_path = my->chain_config->state_dir / "shared_memory.bin";
-         EOS_ASSERT( !fc::exists(shared_mem_path),
+         EOS_ASSERT( !fc::is_regular_file(shared_mem_path),
                  plugin_config_exception,
                  "Snapshot can only be used to initialize an empty database." );
 
@@ -883,7 +883,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                         "--genesis-timestamp is only valid if also passed in with --genesis-json");
          }
 
-         if( fc::exists( my->blocks_dir / "blocks.log" ) ) {
+         if( fc::is_regular_file( my->blocks_dir / "blocks.log" ) ) {
             auto log_genesis = block_log::extract_genesis_state( my->blocks_dir );
             if (log_genesis) {
                if (my->genesis) {

From 19604e2559ca050569580c82e864e64c150fae0c Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 20 Sep 2019 09:17:45 -0500
Subject: [PATCH 1318/1648] Removed erroneous test and unneeded variable.

---
 unittests/snapshot_tests.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index bb1d544d10c..b6a0e85a704 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -405,18 +405,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_replay_over_snapshot, SNAPSHOT_SUITE, snapsho
       from_block_log_chain.push_block(block);
    }
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *from_block_log_chain.control);
-
-   // verifies that snap_chain's block_log does not have a genesis_state
-   copied_config = copy_config_and_files(snap_chain.get_config(), ordinal++);
-   try {
-      tester from_chain_id_block_log_chain(copied_config);
-      BOOST_FAIL("Should not be able to create new tester chain with block_log that does not start at block 1 "
-                 "(and thus does not have a genesis state)");
-   }
-   catch(const database_exception& ble) {
-      BOOST_REQUIRE_EQUAL("This version of controller::startup does not work with a fresh state database.", ble.top_message());
-   }
-
 }
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(test_chain_id_in_snapshot, SNAPSHOT_SUITE, snapshot_suites)
@@ -533,8 +521,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
    // undo the auto-pending from tester
    chain.control->abort_block();
 
-   auto integrity_value = chain.control->calculate_integrity_hash();
-
    // push that block to all sub testers and validate the integrity of the database after it.
    v2_tester.push_block(new_block);
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *v2_tester.control);

From b5c34d28ea1a4372e88180ca7fcf5625c59feedb Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 20 Sep 2019 09:18:41 -0500
Subject: [PATCH 1319/1648] Changes for state history plugin support for
 global_property_object.

---
 .../eosio/state_history_plugin/state_history_serialization.hpp   | 1 +
 plugins/state_history_plugin/state_history_plugin_abi.cpp        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
index 2ce588766d0..3f42d0792e9 100644
--- a/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
+++ b/plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
@@ -320,6 +320,7 @@ datastream<ST>& operator<<(datastream<ST>&
    fc::raw::pack(ds, make_history_serial_wrapper(
                          obj.db, as_type<eosio::chain::shared_producer_authority_schedule>(obj.obj.proposed_schedule)));
    fc::raw::pack(ds, make_history_serial_wrapper(obj.db, as_type<eosio::chain::chain_config>(obj.obj.configuration)));
+   fc::raw::pack(ds, as_type<eosio::chain::chain_id_type>(obj.obj.chain_id));
 
    return ds;
 }
diff --git a/plugins/state_history_plugin/state_history_plugin_abi.cpp b/plugins/state_history_plugin/state_history_plugin_abi.cpp
index 541dc4a6262..199dd317e37 100644
--- a/plugins/state_history_plugin/state_history_plugin_abi.cpp
+++ b/plugins/state_history_plugin/state_history_plugin_abi.cpp
@@ -362,6 +362,7 @@ extern const char* const state_history_plugin_abi = R"({
                 { "type": "uint32?", "name": "proposed_schedule_block_num" },
                 { "type": "producer_authority_schedule", "name": "proposed_schedule" },
                 { "type": "chain_config", "name": "configuration" }
+                { "type": "chain_id_type", "name": "chain_id" }
             ]
         },
         {

From 9e7a610b09a96501b2036d5760f24e7da76b885b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 20 Sep 2019 10:35:08 -0400
Subject: [PATCH 1320/1648] Fix boost link

---
 .cicd/platforms/amazon_linux-2-unpinned.dockerfile | 2 +-
 .cicd/platforms/amazon_linux-2.dockerfile          | 2 +-
 .cicd/platforms/centos-7.6-unpinned.dockerfile     | 2 +-
 .cicd/platforms/centos-7.6.dockerfile              | 2 +-
 .cicd/platforms/macos-10.14.sh                     | 2 +-
 .cicd/platforms/ubuntu-16.04.dockerfile            | 2 +-
 .cicd/platforms/ubuntu-18.04-unpinned.dockerfile   | 2 +-
 .cicd/platforms/ubuntu-18.04.dockerfile            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
index ef4f154b4bc..8dfa0be6695 100644
--- a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile
@@ -16,7 +16,7 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     cd / && \
     rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --prefix=/usr/local && \
diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/amazon_linux-2.dockerfile
index d6ef339b792..55df25e33be 100644
--- a/.cicd/platforms/amazon_linux-2.dockerfile
+++ b/.cicd/platforms/amazon_linux-2.dockerfile
@@ -43,7 +43,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile
index 114aa3aca50..21b8d03ea74 100644
--- a/.cicd/platforms/centos-7.6-unpinned.dockerfile
+++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile
@@ -33,7 +33,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
     source /opt/rh/devtoolset-8/enable && \
     source /opt/rh/rh-python36/enable && \
     tar -xjf boost_1_71_0.tar.bz2 && \
diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/centos-7.6.dockerfile
index 6f549b38d3f..734b240c0b1 100644
--- a/.cicd/platforms/centos-7.6.dockerfile
+++ b/.cicd/platforms/centos-7.6.dockerfile
@@ -52,7 +52,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
index 92704cce092..363365bc3a7 100755
--- a/.cicd/platforms/macos-10.14.sh
+++ b/.cicd/platforms/macos-10.14.sh
@@ -50,7 +50,7 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then
     cd ../..
     rm -rf clang8
     # install boost from source
-    curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2
+    curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
     tar -xjf boost_1_71_0.tar.bz2
     cd boost_1_71_0
     ./bootstrap.sh --prefix=/usr/local
diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile
index 01484cfbd31..d93c21afc04 100644
--- a/.cicd/platforms/ubuntu-16.04.dockerfile
+++ b/.cicd/platforms/ubuntu-16.04.dockerfile
@@ -44,7 +44,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
index 143d4d6e3f7..148762a72c1 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
@@ -18,7 +18,7 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     cd / && \
     rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --prefix=/usr/local && \
diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile
index 6354f938cea..79d30a25f16 100644
--- a/.cicd/platforms/ubuntu-18.04.dockerfile
+++ b/.cicd/platforms/ubuntu-18.04.dockerfile
@@ -45,7 +45,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd / && \
     rm -rf /llvm
 # build boost
-RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \
+RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \

From f0c279e4d5addee5f46318eca3d42b4f5e038c64 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Fri, 20 Sep 2019 09:50:03 -0500
Subject: [PATCH 1321/1648] Fixed type definition for state history abi.

---
 plugins/state_history_plugin/state_history_plugin_abi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/state_history_plugin/state_history_plugin_abi.cpp b/plugins/state_history_plugin/state_history_plugin_abi.cpp
index 199dd317e37..072215973c6 100644
--- a/plugins/state_history_plugin/state_history_plugin_abi.cpp
+++ b/plugins/state_history_plugin/state_history_plugin_abi.cpp
@@ -362,7 +362,7 @@ extern const char* const state_history_plugin_abi = R"({
                 { "type": "uint32?", "name": "proposed_schedule_block_num" },
                 { "type": "producer_authority_schedule", "name": "proposed_schedule" },
                 { "type": "chain_config", "name": "configuration" }
-                { "type": "chain_id_type", "name": "chain_id" }
+                { "type": "checksum256", "name": "chain_id" }
             ]
         },
         {

From 1de34e6119a27d5fcdcf8d0fa8e35420c9174861 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Fri, 20 Sep 2019 10:53:07 -0400
Subject: [PATCH 1322/1648] Current test scripts force mongo to run. Must
 always install in Travis for now.

---
 .cicd/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index b8e97ba8cb7..c00c35cd8d1 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -9,6 +9,7 @@ if [[ "$(uname)" == 'Darwin' ]]; then
         export PINNED=false
         ccache -s
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+        ./$CICD_DIR/platforms/macos-10.14.sh
     else
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     fi

From 24931c7c050671ad45d86e3db7c4cceef6db9a54 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Fri, 20 Sep 2019 10:55:12 -0400
Subject: [PATCH 1323/1648] Remove all traces of intrinsic_debug_log

---
 libraries/chain/apply_context.cpp             |   7 -
 libraries/chain/controller.cpp                |  90 --
 .../include/eosio/chain/apply_context.hpp     |   7 +-
 .../chain/include/eosio/chain/controller.hpp  |   3 -
 .../eosio/chain/intrinsic_debug_log.hpp       | 187 ----
 .../eosio/chain/webassembly/common.hpp        |  21 -
 .../include/eosio/chain/webassembly/wabt.hpp  |  12 -
 .../include/eosio/chain/webassembly/wavm.hpp  |  12 -
 libraries/chain/intrinsic_debug_log.cpp       | 955 ------------------
 libraries/chain/webassembly/wabt.cpp          |   6 -
 libraries/chain/webassembly/wavm.cpp          |   9 -
 plugins/chain_plugin/chain_plugin.cpp         |   7 -
 programs/CMakeLists.txt                       |   1 -
 programs/intrinsic-log-util/CMakeLists.txt    |  30 -
 programs/intrinsic-log-util/cli_parser.hpp    | 834 ---------------
 programs/intrinsic-log-util/diff.cpp          |  14 -
 programs/intrinsic-log-util/diff.hpp          |  16 -
 programs/intrinsic-log-util/intrinsic_log.hpp |   0
 programs/intrinsic-log-util/main.cpp          | 267 -----
 programs/intrinsic-log-util/print.cpp         |  24 -
 programs/intrinsic-log-util/print.hpp         |  33 -
 programs/intrinsic-log-util/root.hpp          |  24 -
 unittests/intrinsic_debug_log_tests.cpp.bak   | 352 -------
 23 files changed, 3 insertions(+), 2908 deletions(-)
 delete mode 100644 libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
 delete mode 100644 libraries/chain/intrinsic_debug_log.cpp
 delete mode 100644 programs/intrinsic-log-util/CMakeLists.txt
 delete mode 100644 programs/intrinsic-log-util/cli_parser.hpp
 delete mode 100644 programs/intrinsic-log-util/diff.cpp
 delete mode 100644 programs/intrinsic-log-util/diff.hpp
 delete mode 100644 programs/intrinsic-log-util/intrinsic_log.hpp
 delete mode 100644 programs/intrinsic-log-util/main.cpp
 delete mode 100644 programs/intrinsic-log-util/print.cpp
 delete mode 100644 programs/intrinsic-log-util/print.hpp
 delete mode 100644 programs/intrinsic-log-util/root.hpp
 delete mode 100644 unittests/intrinsic_debug_log_tests.cpp.bak

diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp
index f66b3c709bb..02c964b0dee 100644
--- a/libraries/chain/apply_context.cpp
+++ b/libraries/chain/apply_context.cpp
@@ -34,7 +34,6 @@ apply_context::apply_context(controller& con, transaction_context& trx_ctx, uint
 :control(con)
 ,db(con.mutable_db())
 ,trx_context(trx_ctx)
-/*,intrinsic_log(con.get_intrinsic_debug_log())*/
 ,recurse_depth(depth)
 ,first_receiver_action_ordinal(action_ordinal)
 ,action_ordinal(action_ordinal)
@@ -53,12 +52,6 @@ apply_context::apply_context(controller& con, transaction_context& trx_ctx, uint
 void apply_context::exec_one()
 {
    auto start = fc::time_point::now();
-   /*
-   if( intrinsic_log ) {
-      intrinsic_log->start_action( control.get_dynamic_global_properties().global_action_sequence + 1,
-                                   receiver, act->account, act->name );
-   }
-   */
 
    action_receipt r;
    r.receiver         = receiver;
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 36d33788637..b11232498ba 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -217,9 +217,6 @@ struct controller_impl {
    chainbase::database            db;
    chainbase::database            reversible_blocks; ///< a special database to persist blocks that have successfully been applied but are still reversible
    block_log                      blog;
-   /*
-   optional<intrinsic_debug_log>  intrinsic_log;
-   */
    optional<pending_state>        pending;
    block_state_ptr                head;
    fork_database                  fork_db;
@@ -293,7 +290,6 @@ struct controller_impl {
         cfg.read_only ? database::read_only : database::read_write,
         cfg.reversible_cache_size, false, cfg.db_map_mode, cfg.db_hugepage_paths ),
     blog( cfg.blocks_dir ),
-    /*intrinsic_log( cfg.intrinsic_debug_log_path ? *cfg.intrinsic_debug_log_path : optional<intrinsic_debug_log>() ),*/
     fork_db( cfg.state_dir ),
     wasmif( cfg.wasm_runtime, db ),
     resource_limits( db ),
@@ -310,11 +306,6 @@ struct controller_impl {
                             const vector<digest_type>& new_features )
                            { check_protocol_features( timestamp, cur_features, new_features ); }
       );
-      /*
-      if( intrinsic_log ) {
-         intrinsic_log->open();
-      }
-      */
 
       set_activation_handler<builtin_protocol_feature_t::preactivate_feature>();
       set_activation_handler<builtin_protocol_feature_t::replace_deferred>();
@@ -625,18 +616,6 @@ struct controller_impl {
       while( db.revision() > head->block_num ) {
          db.undo();
       }
-      /*
-      if( intrinsic_log && intrinsic_log->last_committed_block_num() > 0
-             && head->block_num != intrinsic_log->last_committed_block_num() )
-      {
-         wlog( "head block num (${head}) does not match last block in intrinsic.log (${last}): replacing intrinsic.log",
-               ("head", head->block_num)("last", intrinsic_log->last_committed_block_num())
-         );
-         intrinsic_log->close();
-         fc::remove( intrinsic_log->get_path() );
-         intrinsic_log->open();
-      }
-      */
 
       protocol_features.init( db );
 
@@ -706,21 +685,6 @@ struct controller_impl {
       if( last_block_num > head->block_num ) {
          replay( shutdown ); // replay any irreversible and reversible blocks ahead of current head
       }
-      /*
-      if( intrinsic_log ) {
-         intrinsic_log->close();
-
-         // Print intrinsic_log in JSON form
-         intrinsic_log->open( intrinsic_debug_log::open_mode::read_only );
-         const auto end_itr = intrinsic_log->end_block();
-         for( auto itr = intrinsic_log->begin_block(); itr != end_itr; ++itr ) {
-            dlog( "\n${json}", ("json", fc::json::to_pretty_string(*itr)) );
-         }
-         intrinsic_log->close();
-
-         intrinsic_log.reset();
-      }
-      */
 
       if( shutdown() ) return;
 
@@ -1195,11 +1159,6 @@ struct controller_impl {
 
       transaction_trace_ptr trace;
       if( gtrx.expiration < self.pending_block_time() ) {
-	 /*
-         if( intrinsic_log ) {
-            intrinsic_log->start_transaction( gtrx.trx_id );
-         }
-	 */
          trace = std::make_shared<transaction_trace>();
          trace->id = gtrx.trx_id;
          trace->block_num = self.head_block_num() + 1;
@@ -1220,18 +1179,6 @@ struct controller_impl {
       in_trx_requiring_checks = true;
 
       uint32_t cpu_time_to_bill_us = billed_cpu_time_us;
-      /*
-      auto abort_transaction_in_intrinsic_log_on_exit = fc::make_scoped_exit(
-      [abort_transaction=static_cast<bool>(intrinsic_log), this] {
-         if( abort_transaction ) {
-            intrinsic_log->abort_transaction();
-         }
-      });
-
-      if( intrinsic_log ) {
-         intrinsic_log->start_transaction( gtrx.trx_id );
-      }
-      */
 
       transaction_checktime_timer trx_timer(timer);
       transaction_context trx_context( self, dtrx, gtrx.trx_id, std::move(trx_timer) );
@@ -1275,9 +1222,6 @@ struct controller_impl {
          undo_session.squash();
 
          restore.cancel();
-	 /*
-         abort_transaction_in_intrinsic_log_on_exit.cancel();
-	 */
 
          return trace;
       } catch( const disallowed_transaction_extensions_bad_block_exception& ) {
@@ -1308,9 +1252,6 @@ struct controller_impl {
             emit( self.accepted_transaction, trx );
             emit( self.applied_transaction, std::tie(trace, dtrx) );
             undo_session.squash();
-	    /*
-            abort_transaction_in_intrinsic_log_on_exit.cancel();
-	    */
             return trace;
          }
          trace->elapsed = fc::time_point::now() - trx_context.start;
@@ -1350,9 +1291,6 @@ struct controller_impl {
          emit( self.applied_transaction, std::tie(trace, dtrx) );
 
          undo_session.squash();
-	 /*
-         abort_transaction_in_intrinsic_log_on_exit.cancel();
-	 */
       } else {
          emit( self.accepted_transaction, trx );
          emit( self.applied_transaction, std::tie(trace, dtrx) );
@@ -1475,7 +1413,6 @@ struct controller_impl {
                trx_context.undo();
             } else {
                restore.cancel();
-               //abort_transaction_in_intrinsic_log_on_exit.cancel();
                trx_context.squash();
             }
 
@@ -1518,11 +1455,6 @@ struct controller_impl {
       } else {
          pending.emplace( maybe_session(), *head, when, confirm_block_count, new_protocol_feature_activations );
       }
-      /*
-      if( intrinsic_log ) {
-         intrinsic_log->start_block( head->block_num + 1 );
-      }
-      */
 
       pending->_block_status = s;
       pending->_producer_block_id = producer_block_id;
@@ -1659,11 +1591,6 @@ struct controller_impl {
       EOS_ASSERT( pending->_block_stage.contains<building_block>(), block_validate_exception, "already called finalize_block");
 
       try {
-      /*
-      if( intrinsic_log ) {
-         intrinsic_log->finish_block();
-      }
-      */
 
       auto& pbhs = pending->get_pending_block_header_state();
 
@@ -2117,17 +2044,6 @@ struct controller_impl {
          applied_trxs = pending->extract_trx_metas();
          pending.reset();
          protocol_features.popped_blocks_to( head->block_num );
-
-         // intrinsic_log is only supported in replay at the moment and abort_block should not be called during replay.
-         // But this is here since intrinsic_log already supports abort_block and it sets things up for the future
-         // in case we want to adapt the intrinsic_log to working during regular operation.
-         // In that case, we would also need to add support for popping committed blocks from the intrinsic log
-         // and call the appropriate function from controller_impl::pop_block().
-	 /*
-         if( intrinsic_log ) {
-            intrinsic_log->abort_block();
-         }
-	 */
       }
       return applied_trxs;
    }
@@ -2401,12 +2317,6 @@ const protocol_feature_manager& controller::get_protocol_feature_manager()const
 {
    return my->protocol_features;
 }
-/*
-optional<intrinsic_debug_log>&  controller::get_intrinsic_debug_log()
-{
-   return my->intrinsic_log;
-}
-*/
 
 controller::controller( const controller::config& cfg )
 :my( new controller_impl( cfg, *this, protocol_feature_set{} ) )
diff --git a/libraries/chain/include/eosio/chain/apply_context.hpp b/libraries/chain/include/eosio/chain/apply_context.hpp
index 87adbf91269..8b1cf7d6844 100644
--- a/libraries/chain/include/eosio/chain/apply_context.hpp
+++ b/libraries/chain/include/eosio/chain/apply_context.hpp
@@ -555,10 +555,9 @@ class apply_context {
    /// Fields:
    public:
 
-      controller&                     control;
-      chainbase::database&            db;  ///< database where state is stored
-      transaction_context&            trx_context; ///< transaction context in which the action is running
-      /*optional<intrinsic_debug_log>&  intrinsic_log;*/
+      controller&                   control;
+      chainbase::database&          db;  ///< database where state is stored
+      transaction_context&          trx_context; ///< transaction context in which the action is running
 
    private:
       const action*                 act = nullptr; ///< action being applied
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 42318bea0be..2561c30916f 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -9,7 +9,6 @@
 #include <eosio/chain/account_object.hpp>
 #include <eosio/chain/snapshot.hpp>
 #include <eosio/chain/protocol_feature_manager.hpp>
-#include <eosio/chain/intrinsic_debug_log.hpp>
 
 namespace chainbase {
    class database;
@@ -81,7 +80,6 @@ namespace eosio { namespace chain {
             bool                     allow_ram_billing_in_notify = false;
             uint32_t                 maximum_variable_signature_length = chain::config::default_max_variable_signature_length;
             bool                     disable_all_subjective_mitigations = false; //< for testing purposes only
-            optional<path>           intrinsic_debug_log_path; //< for debugging purposes only
 
             genesis_state            genesis;
             wasm_interface::vm_type  wasm_runtime = chain::config::default_wasm_runtime;
@@ -177,7 +175,6 @@ namespace eosio { namespace chain {
          const authorization_manager&          get_authorization_manager()const;
          authorization_manager&                get_mutable_authorization_manager();
          const protocol_feature_manager&       get_protocol_feature_manager()const;
-         optional<intrinsic_debug_log>&        get_intrinsic_debug_log();
 
          const flat_set<account_name>&   get_actor_whitelist() const;
          const flat_set<account_name>&   get_actor_blacklist() const;
diff --git a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp b/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
deleted file mode 100644
index b04166ef2f2..00000000000
--- a/libraries/chain/include/eosio/chain/intrinsic_debug_log.hpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-#pragma once
-
-#include <eosio/chain/types.hpp>
-#include <iterator>
-
-namespace boost {
-   namespace filesystem {
-      class path;
-   }
-}
-
-namespace eosio { namespace chain {
-
-   namespace detail {
-      struct extended_block_data;
-      class intrinsic_debug_log_impl;
-   }
-
-   class intrinsic_debug_log {
-      public:
-         intrinsic_debug_log( const boost::filesystem::path& log_path );
-         intrinsic_debug_log( intrinsic_debug_log&& other );
-         ~intrinsic_debug_log();
-
-         enum class open_mode {
-            read_only,
-            create_new,
-            continue_existing,
-            create_new_and_auto_finish_block,
-            continue_existing_and_auto_finish_block
-         };
-
-         void open( open_mode mode = open_mode::continue_existing );
-         void flush();
-
-         /** invalidates all block_iterators */
-         void close();
-
-         void start_block( uint32_t block_num );
-         void abort_block();
-         void start_transaction( const transaction_id_type& trx_id );
-         void abort_transaction();
-         void start_action( uint64_t global_sequence_num,
-                            name receiver, name first_receiver, name action_name );
-         void acknowledge_intrinsic_without_recording();
-         void record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash );
-         void finish_block();
-
-         struct intrinsic_record {
-            uint32_t                        intrinsic_ordinal = 0;
-            digest_type                     arguments_hash;
-            digest_type                     memory_hash;
-
-            friend bool operator == ( const intrinsic_record& lhs, const intrinsic_record& rhs ) {
-               return std::tie( lhs.intrinsic_ordinal, lhs.arguments_hash, lhs.memory_hash )
-                        == std::tie( rhs.intrinsic_ordinal, rhs.arguments_hash, rhs.memory_hash );
-            }
-
-            friend bool operator != ( const intrinsic_record& lhs, const intrinsic_record& rhs ) {
-               return !(lhs == rhs);
-            }
-         };
-
-         struct action_data {
-            uint64_t                        global_sequence_num = 0;
-            name                            receiver{};
-            name                            first_receiver{};
-            name                            action_name{};
-            std::vector<intrinsic_record>   recorded_intrinsics;
-         };
-
-         struct transaction_data {
-            transaction_id_type             trx_id;
-            std::vector< action_data >      actions;
-         };
-
-         struct block_data {
-            uint32_t                        block_num = 0;
-            std::vector<transaction_data>   transactions;
-         };
-
-         class block_iterator : public std::iterator<std::bidirectional_iterator_tag, const block_data> {
-         protected:
-            detail::intrinsic_debug_log_impl*           _log = nullptr;
-            int64_t                                     _pos = -1;
-            mutable const detail::extended_block_data*  _cached_block_data = nullptr;
-
-         protected:
-            explicit block_iterator( detail::intrinsic_debug_log_impl* log, int64_t pos = -1 )
-            :_log(log)
-            ,_pos(pos)
-            {}
-
-            const block_data* get_pointer()const;
-
-            friend class intrinsic_debug_log;
-
-         public:
-            block_iterator() = default;
-
-            friend bool operator == ( const block_iterator& lhs, const block_iterator& rhs ) {
-               return std::tie( lhs._log, lhs._pos ) == std::tie( rhs._log, rhs._pos );
-            }
-
-            friend bool operator != ( const block_iterator& lhs, const block_iterator& rhs ) {
-               return !(lhs == rhs);
-            }
-
-            const block_data& operator*()const {
-               return *get_pointer();
-            }
-
-            const block_data* operator->()const {
-               return get_pointer();
-            }
-
-            block_iterator& operator++();
-
-            block_iterator& operator--();
-
-            block_iterator operator++(int) {
-               block_iterator result(*this);
-               ++(*this);
-               return result;
-            }
-
-            block_iterator operator--(int) {
-               block_iterator result(*this);
-               --(*this);
-               return result;
-            }
-         };
-
-         using block_reverse_iterator = std::reverse_iterator<block_iterator>;
-
-         // the four begin/end functions below can only be called in read-only mode
-         block_iterator begin_block()const;
-         block_iterator end_block()const;
-         block_reverse_iterator rbegin_block()const { return std::make_reverse_iterator( begin_block() ); }
-         block_reverse_iterator rend_blocks()const   { return std::make_reverse_iterator( end_block() ); }
-
-         bool is_open()const;
-         bool is_read_only()const;
-
-         const boost::filesystem::path& get_path()const;
-
-         /** @returns the block number of the last committed block in the log or 0 if no blocks are committed in the log */
-         uint32_t last_committed_block_num()const;
-
-         struct intrinsic_differences {
-            uint32_t                        block_num = 0;
-            transaction_id_type             trx_id;
-            uint64_t                        global_sequence_num = 0;
-            name                            receiver{};
-            name                            first_receiver{};
-            name                            action_name{};
-            std::vector<intrinsic_record>   lhs_recorded_intrinsics;
-            std::vector<intrinsic_record>   rhs_recorded_intrinsics;
-         };
-
-         /**
-          * @pre requires both lhs and rhs to both have the same blocks, transactions, and actions (otherwise it throws)
-          * @return empty optional if no difference; otherwise the intrinsic_differences for the first different action
-          */
-         static std::optional<intrinsic_differences>
-         find_first_difference( intrinsic_debug_log& lhs, intrinsic_debug_log& rhs );
-
-      private:
-         std::unique_ptr<detail::intrinsic_debug_log_impl> my;
-   };
-
-} }
-
-FC_REFLECT( eosio::chain::intrinsic_debug_log::intrinsic_record, (intrinsic_ordinal)(arguments_hash)(memory_hash) )
-FC_REFLECT( eosio::chain::intrinsic_debug_log::action_data,
-            (global_sequence_num)(receiver)(first_receiver)(action_name)(recorded_intrinsics)
-)
-FC_REFLECT( eosio::chain::intrinsic_debug_log::transaction_data, (trx_id)(actions) )
-FC_REFLECT( eosio::chain::intrinsic_debug_log::block_data, (block_num)(transactions) )
-FC_REFLECT( eosio::chain::intrinsic_debug_log::intrinsic_differences,
-            (block_num)(trx_id)(global_sequence_num)(receiver)(first_receiver)(action_name)
-            (lhs_recorded_intrinsics)(rhs_recorded_intrinsics)
-)
diff --git a/libraries/chain/include/eosio/chain/webassembly/common.hpp b/libraries/chain/include/eosio/chain/webassembly/common.hpp
index eafcf1590b1..6ec4b9b6a2b 100644
--- a/libraries/chain/include/eosio/chain/webassembly/common.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/common.hpp
@@ -74,13 +74,6 @@ namespace eosio { namespace chain {
          return value;
       }
 
-      template<typename DataStream>
-      friend inline DataStream& operator<<( DataStream& ds, const array_ptr<T>& ) {
-         uint64_t zero = 0;
-         ds.write( (const char*)&zero, sizeof(zero) ); // Serializing pointers is not currently supported
-         return ds;
-      }
-
       T *value;
    };
 
@@ -103,21 +96,7 @@ namespace eosio { namespace chain {
          return value;
       }
 
-      template<typename DataStream>
-      friend inline DataStream& operator<<( DataStream& ds, const null_terminated_ptr& ) {
-         uint64_t zero = 0;
-         ds.write( (const char*)&zero, sizeof(zero) ); // Serializing pointers is not currently supported
-         return ds;
-      }
-
       char *value;
    };
 
-   template<typename... Params>
-   digest_type calc_arguments_hash( Params&&... params ) {
-      digest_type::encoder enc;
-      (fc::raw::pack( enc, std::forward<Params>(params) ), ...);
-      return enc.result();
-   }
-
  } } // eosio::chain
diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index ecac8b5fdfb..8bf978272f7 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -647,8 +647,6 @@ struct intrinsic_invoker_impl<Ret, std::tuple<T &, Inputs...>> {
 
 extern apply_context* fixme_context;
 
-digest_type calc_memory_hash( const Memory& mem );
-
 /**
  * forward declaration of a wrapper class to call methods of the class
  */
@@ -659,11 +657,6 @@ struct intrinsic_function_invoker {
    template<MethodSig Method>
    static Ret wrapper(wabt_apply_instance_vars& vars, Params... params, const TypedValues&, int) {
       class_from_wasm<Cls>::value(vars.ctx).checktime();
-      /*auto& intrinsic_log = vars.ctx.control.get_intrinsic_debug_log();
-      if( intrinsic_log ) {
-         intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( *vars.memory ) );
-      }
-      */
       return (class_from_wasm<Cls>::value(vars.ctx).*Method)(params...);
    }
 
@@ -680,11 +673,6 @@ struct intrinsic_function_invoker<void, MethodSig, Cls, Params...> {
    template<MethodSig Method>
    static void_type wrapper(wabt_apply_instance_vars& vars, Params... params, const TypedValues& args, int offset) {
       class_from_wasm<Cls>::value(vars.ctx).checktime();
-      /*auto& intrinsic_log = vars.ctx.control.get_intrinsic_debug_log();
-      if( intrinsic_log ) {
-         intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( *vars.memory ) );
-      }
-      */
       (class_from_wasm<Cls>::value(vars.ctx).*Method)(params...);
       return void_type();
    }
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 803d41bfaab..509977e61be 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -639,8 +639,6 @@ struct intrinsic_invoker_impl<Ret, std::tuple<T &, Inputs...>, std::tuple<Transl
    }
 };
 
-digest_type calc_memory_hash( MemoryInstance* mem );
-
 /**
  * forward declaration of a wrapper class to call methods of the class
  */
@@ -651,11 +649,6 @@ struct intrinsic_function_invoker {
    template<MethodSig Method>
    static Ret wrapper(running_instance_context& ctx, Params... params) {
       class_from_wasm<Cls>::value(*ctx.apply_ctx).checktime();
-      /*auto& intrinsic_log = ctx.apply_ctx->control.get_intrinsic_debug_log();
-      if( intrinsic_log ) {
-         intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( ctx.memory ) );
-      }
-      */
       return (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
    }
 
@@ -675,11 +668,6 @@ struct intrinsic_function_invoker<WasmSig, void, MethodSig, Cls, Params...> {
    template<MethodSig Method>
    static void_type wrapper(running_instance_context& ctx, Params... params) {
       class_from_wasm<Cls>::value(*ctx.apply_ctx).checktime();
-      /*auto& intrinsic_log = ctx.apply_ctx->control.get_intrinsic_debug_log();
-      if( intrinsic_log ) {
-         intrinsic_log->record_intrinsic( calc_arguments_hash( params... ), calc_memory_hash( ctx.memory ) );
-      }
-      */
       (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
       return void_type();
    }
diff --git a/libraries/chain/intrinsic_debug_log.cpp b/libraries/chain/intrinsic_debug_log.cpp
deleted file mode 100644
index f2f33dd4255..00000000000
--- a/libraries/chain/intrinsic_debug_log.cpp
+++ /dev/null
@@ -1,955 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-#include <eosio/chain/intrinsic_debug_log.hpp>
-#include <eosio/chain/exceptions.hpp>
-#include <fc/io/raw.hpp>
-#include <fc/scoped_exit.hpp>
-#include <fstream>
-#include <map>
-#include <variant>
-#include <boost/filesystem.hpp>
-
-namespace bfs = boost::filesystem;
-
-template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
-template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
-
-using pos_t = uint64_t;
-
-namespace eosio { namespace chain {
-
-   namespace detail {
-
-      template<typename T, typename... Us>
-      struct is_one_of {
-         static constexpr bool value = (std::is_same_v<T, Us> || ...);
-      };
-
-      struct extended_block_data {
-         extended_block_data( intrinsic_debug_log::block_data&& block_data,
-                              const pos_t& pos,
-                              const std::optional<pos_t>& previous_pos,
-                              const std::optional<pos_t>& next_pos )
-         :block_data( std::move(block_data) )
-         ,pos( pos )
-         ,previous_pos( previous_pos )
-         ,next_pos( next_pos )
-         {}
-
-         intrinsic_debug_log::block_data block_data;
-         pos_t                           pos;
-         std::optional<pos_t>            previous_pos; //< if empty, then this is first block in the log
-         std::optional<pos_t>            next_pos; //< if empty, then this is the last block in the log
-      };
-
-      class intrinsic_debug_log_impl {
-         public:
-            static constexpr uint8_t block_tag       = 0;
-            static constexpr uint8_t transaction_tag = 1;
-            static constexpr uint8_t action_tag      = 2;
-            static constexpr uint8_t intrinsic_tag   = 3;
-
-            struct closed {};
-
-            struct read_only {
-               explicit read_only( uint32_t last_committed_block_num )
-               :last_committed_block_num( last_committed_block_num )
-               {}
-
-               uint32_t last_committed_block_num;
-            };
-
-            struct in_block;
-            struct in_transaction;
-            struct in_action;
-
-            struct waiting_to_start_block {
-               explicit waiting_to_start_block( uint32_t last_committed_block_num );
-               explicit waiting_to_start_block( const in_block& s );
-               explicit waiting_to_start_block( const in_transaction& s );
-               explicit waiting_to_start_block( const in_action& s );
-
-               uint32_t last_committed_block_num;
-            };
-
-            struct in_block {
-               in_block( const waiting_to_start_block& s, pos_t pos, uint32_t num );
-               explicit in_block( const in_transaction& s );
-               explicit in_block( const in_action& s );
-
-               pos_t    block_start_pos;
-               uint32_t block_num;
-               uint32_t last_committed_block_num;
-               bool     block_header_written = false;
-            };
-
-            struct in_transaction {
-               in_transaction( const in_block& s, pos_t transaction_start_pos );
-               in_transaction( const in_transaction& s, pos_t transaction_start_pos );
-               in_transaction( const in_action& s, pos_t transaction_start_pos );
-
-               pos_t    block_start_pos;
-               pos_t    transaction_start_pos;
-               uint32_t block_num;
-               uint32_t last_committed_block_num;
-            };
-
-            struct in_action {
-               struct force_new_t {};
-
-               explicit in_action( const in_transaction& s );
-               in_action( const in_transaction& s, force_new_t ):in_action( s ){}
-               in_action( const in_action& s, force_new_t );
-
-               pos_t    block_start_pos;
-               pos_t    transaction_start_pos;
-               uint32_t block_num;
-               uint32_t last_committed_block_num;
-               uint32_t intrinsic_counter = 0;
-            };
-
-            using state_type = std::variant<
-                                 closed,
-                                 read_only,
-                                 waiting_to_start_block,
-                                 in_block,
-                                 in_transaction,
-                                 in_action
-                               >;
-
-            struct log_metadata_t {
-               pos_t    last_committed_block_begin_pos{};
-               pos_t    last_committed_block_end_pos{};
-            };
-
-            std::fstream                          log;
-            bfs::path                             log_path;
-            std::map<pos_t, extended_block_data>  block_data_cache;
-            state_type                            state{ closed{} };
-            std::optional<log_metadata_t>         log_metadata;
-            bool                                  finish_block_on_shutdown = false;
-
-            void open( bool open_as_read_only, bool start_fresh, bool auto_finish_block );
-            void close();
-
-            void start_block( uint32_t block_num );
-            void abort_block();
-            void start_transaction( const transaction_id_type& trx_id );
-            void abort_transaction();
-            void start_action( uint64_t global_sequence_num,
-                               name receiver, name first_receiver, name action_name );
-            void acknowledge_intrinsic_without_recording();
-            void record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash );
-            void finish_block();
-
-            bool is_open()const {
-               return !std::holds_alternative<closed>( state );
-            }
-
-            bool is_read_only()const {
-               return std::holds_alternative<read_only>( state );
-            }
-
-            bool can_write()const {
-               return !std::holds_alternative<closed>( state ) && !std::holds_alternative<read_only>( state );
-            }
-
-         protected:
-            void truncate_to( uint64_t pos );
-            std::optional<pos_t> get_position_of_previous_block( pos_t pos );
-            const extended_block_data& get_block_at_position( pos_t pos );
-
-            friend class intrinsic_debug_log::block_iterator;
-      };
-
-      intrinsic_debug_log_impl::waiting_to_start_block::waiting_to_start_block( uint32_t last_committed_block_num )
-      :last_committed_block_num( last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::waiting_to_start_block::waiting_to_start_block( const in_block& s )
-      :last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::waiting_to_start_block::waiting_to_start_block( const in_transaction& s )
-      :last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::waiting_to_start_block::waiting_to_start_block( const in_action& s )
-      :last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::in_block::in_block( const waiting_to_start_block& s, pos_t pos, uint32_t num )
-      :block_start_pos( pos )
-      ,block_num( num )
-      ,last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::in_block::in_block( const in_transaction& s )
-      :block_start_pos( s.block_start_pos )
-      ,block_num( s.block_num )
-      ,last_committed_block_num( s.last_committed_block_num )
-      ,block_header_written(true)
-      {}
-
-      intrinsic_debug_log_impl::in_block::in_block( const in_action& s )
-      :block_start_pos( s.block_start_pos )
-      ,block_num( s.block_num )
-      ,last_committed_block_num( s.last_committed_block_num )
-      ,block_header_written(true)
-      {}
-
-      intrinsic_debug_log_impl::in_transaction::in_transaction( const in_block& s, pos_t transaction_start_pos )
-      :block_start_pos( s.block_start_pos )
-      ,transaction_start_pos( transaction_start_pos )
-      ,block_num( s.block_num )
-      ,last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::in_transaction::in_transaction( const in_transaction& s, pos_t transaction_start_pos )
-      :block_start_pos( s.block_start_pos )
-      ,transaction_start_pos( transaction_start_pos )
-      ,block_num( s.block_num )
-      ,last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::in_transaction::in_transaction( const in_action& s, pos_t transaction_start_pos )
-      :block_start_pos( s.block_start_pos )
-      ,transaction_start_pos( transaction_start_pos )
-      ,block_num( s.block_num )
-      ,last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::in_action::in_action( const in_transaction& s )
-      :block_start_pos( s.block_start_pos )
-      ,transaction_start_pos( s.transaction_start_pos )
-      ,block_num( s.block_num )
-      ,last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      intrinsic_debug_log_impl::in_action::in_action( const in_action& s, in_action::force_new_t )
-      :block_start_pos( s.block_start_pos )
-      ,transaction_start_pos( s.transaction_start_pos )
-      ,block_num( s.block_num )
-      ,last_committed_block_num( s.last_committed_block_num )
-      {}
-
-      void intrinsic_debug_log_impl::open( bool open_as_read_only, bool start_fresh, bool auto_finish_block ) {
-         FC_ASSERT( !log.is_open(), "cannot open when the log is already open" );
-         FC_ASSERT( std::holds_alternative<closed>( state ), "state out of sync" );
-
-         std::ios_base::openmode open_mode = std::ios::in | std::ios::binary;
-
-         if( open_as_read_only ) {
-            FC_ASSERT( !start_fresh,       "start_fresh cannot be true in read-only mode" );
-            FC_ASSERT( !auto_finish_block, "auto_finish_block cannot be true in read-only mode" );
-         } else {
-            open_mode |= (std::ios::out | std::ios::app);
-         }
-
-         if( start_fresh ) {
-            open_mode |= std::ios::trunc;
-         }
-
-         log.open( log_path.generic_string().c_str(), open_mode );
-
-         uint32_t last_committed_block_num = 0; // 0 indicates no committed blocks in log
-
-         try {
-            log.seekg( 0, std::ios::end );
-            pos_t file_size = log.tellg();
-            if( file_size > 0 ) {
-               pos_t last_committed_block_begin_pos{};
-               FC_ASSERT( file_size > sizeof(last_committed_block_begin_pos),
-                          "corrupted log: file size is too small to be valid" );
-               log.seekg( -sizeof(last_committed_block_begin_pos), std::ios::end );
-               fc::raw::unpack( log, last_committed_block_begin_pos );
-               FC_ASSERT( last_committed_block_begin_pos < file_size, "corrupted log: invalid block position" );
-
-               log.seekg( last_committed_block_begin_pos, std::ios::beg	);
-               uint8_t tag = 0;
-               fc::raw::unpack( log, tag );
-               FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
-
-               fc::raw::unpack( log, last_committed_block_num );
-
-               log_metadata.emplace( log_metadata_t{ last_committed_block_begin_pos, file_size } );
-            }
-         } catch( ... ) {
-            log.close();
-            throw;
-         }
-
-         finish_block_on_shutdown = auto_finish_block;
-
-         if( open_as_read_only ) {
-            state.emplace<read_only>( last_committed_block_num );
-            log.seekg( 0, std::ios::beg );
-         } else {
-            state.emplace<waiting_to_start_block>( last_committed_block_num );
-            log.seekp( 0, std::ios::end );
-         }
-      }
-
-      void intrinsic_debug_log_impl::close() {
-         if( !log.is_open() ) return;
-
-         if( finish_block_on_shutdown
-               && !std::holds_alternative<closed>( state )
-               && !std::holds_alternative<read_only>( state )
-               && !std::holds_alternative<waiting_to_start_block>( state )
-         ) {
-            finish_block();
-         }
-
-         std::optional<pos_t> truncate_pos = std::visit( overloaded{
-            []( closed ) -> std::optional<pos_t> {
-               FC_ASSERT( false, "state out of sync" );
-               return {}; // unreachable, only added for compilation purposes
-            },
-            []( const read_only& ) -> std::optional<pos_t> { return {}; },
-            []( const waiting_to_start_block&  ) -> std::optional<pos_t> { return {}; },
-            []( const in_block&  ) -> std::optional<pos_t> { return {}; },
-            []( auto&& s )
-            -> std::enable_if_t<
-                  detail::is_one_of< std::decay_t<decltype(s)>,
-                     in_transaction, in_action
-                  >::value,
-                  std::optional<pos_t>
-            >
-            {
-               return s.block_start_pos;
-            }
-         }, state );
-
-         if( truncate_pos ) {
-            truncate_to( *truncate_pos );
-         } else {
-            log.flush();
-         }
-
-         log.close();
-
-         finish_block_on_shutdown = false;
-
-         state.emplace<closed>();
-         log_metadata.reset();
-         block_data_cache.clear();
-      }
-
-      void intrinsic_debug_log_impl::truncate_to( pos_t pos ) {
-         FC_ASSERT( can_write(),  "called while in invalid state" );
-
-         log.seekp( 0, std::ios::end );
-         pos_t file_size = log.tellp();
-         FC_ASSERT( 0 <= pos && pos <= file_size, "position is out of bounds" );
-
-         FC_ASSERT( !log_metadata || log_metadata->last_committed_block_end_pos <= pos,
-                    "truncation would erase committed block data which is currently not supported" );
-
-         log.flush();
-         if( pos == file_size ) return;
-
-         if( log.tellp() > pos ) {
-            log.seekp( pos );
-         }
-
-         bfs::resize_file( log_path, pos );
-
-         log.sync();
-      }
-
-      void intrinsic_debug_log_impl::start_block( uint32_t block_num  ) {
-         FC_ASSERT( block_num > 0, "block number cannot be 0" );
-         bool writable = std::visit( overloaded{
-            []( closed ) { return false; },
-            []( const read_only& ) { return false; },
-            [&]( const waiting_to_start_block& s ) {
-               FC_ASSERT( s.last_committed_block_num < block_num,
-                          "must start a block with greater height than previously started blocks" );
-               state = in_block( s, log.tellp(), block_num );
-               return true;
-            },
-            []( auto&& s )
-            -> std::enable_if_t<
-                  detail::is_one_of< std::decay_t<decltype(s)>,
-                     in_block, in_transaction, in_action
-                  >::value,
-                  bool
-            >
-            {
-               FC_ASSERT( false, "cannot start block while still processing a block" );
-               return false; // unreachable, only added for compilation purposes
-            }
-         }, state );
-         FC_ASSERT( writable, "log is not setup for writing" );
-      }
-
-      void intrinsic_debug_log_impl::abort_block() {
-         bool writable = std::visit( overloaded{
-            []( closed ) { return false; },
-            []( const read_only& ) { return false; },
-            []( const waiting_to_start_block& ) {
-               return true; // nothing to abort
-            },
-            [&]( auto&& s )
-            -> std::enable_if_t<
-                  detail::is_one_of< std::decay_t<decltype(s)>,
-                     in_block, in_transaction, in_action
-                  >::value,
-                  bool
-            >
-            {
-               truncate_to( s.block_start_pos );
-               state = waiting_to_start_block( s );
-               return true;
-            }
-         }, state );
-         FC_ASSERT( writable, "log is not setup for writing" );
-      }
-
-      void intrinsic_debug_log_impl::start_transaction( const transaction_id_type& trx_id ) {
-         auto write_transaction_header = [&] {
-            uint64_t transaction_start_pos = log.tellp();
-            fc::raw::pack( log, transaction_tag );
-            fc::raw::pack( log, trx_id );
-            return transaction_start_pos;
-         };
-
-         bool writable = std::visit( overloaded{
-            []( closed ) { return false; },
-            []( const read_only& ) { return false; },
-            []( const waiting_to_start_block& ) {
-               FC_ASSERT( false, "cannot start transaction in the current state" );
-               return false; // unreachable, only added for compilation purposes
-            },
-            [&]( const in_block& s ) {
-               if( !s.block_header_written ) {
-                  fc::raw::pack( log, block_tag );
-                  fc::raw::pack( log, s.block_num );
-               }
-               uint64_t transaction_start_pos = write_transaction_header();
-               state = in_transaction( s, transaction_start_pos );
-               return true;
-            },
-            [&]( auto&& s )
-            -> std::enable_if_t<
-                  detail::is_one_of< std::decay_t<decltype(s)>,
-                     in_transaction, in_action
-                  >::value,
-                  bool
-            >
-            {
-               uint64_t transaction_start_pos = write_transaction_header();
-               state = in_transaction( s, transaction_start_pos );
-               return true;
-            }
-         }, state );
-         FC_ASSERT( writable, "log is not setup for writing" );
-      }
-
-      void intrinsic_debug_log_impl::abort_transaction() {
-         bool writable = std::visit( overloaded{
-            []( closed ) { return false; },
-            []( const read_only& ) { return false; },
-            []( const waiting_to_start_block& ) {
-               FC_ASSERT( false, "cannot abort transaction in the current state" );
-               return false; // unreachable, only added for compilation purposes
-            },
-            []( const in_block& s ) {
-               FC_ASSERT( false, "cannot abort transaction in the current state" );
-               return false; // unreachable, only added for compilation purposes
-            },
-            [&]( auto&& s )
-            -> std::enable_if_t<
-                  detail::is_one_of< std::decay_t<decltype(s)>,
-                     in_transaction, in_action
-                  >::value,
-                  bool
-            >
-            {
-               truncate_to( s.transaction_start_pos );
-               state = in_block( s );
-               return true;
-            }
-         }, state );
-         FC_ASSERT( writable, "log is not setup for writing" );
-      }
-
-      void intrinsic_debug_log_impl::start_action( uint64_t global_sequence_num,
-                                                   name receiver, name first_receiver, name action_name )
-      {
-         bool writable = std::visit( overloaded{
-            []( closed ) { return false; },
-            []( const read_only& ) { return false; },
-            []( const waiting_to_start_block& ) {
-               FC_ASSERT( false, "cannot start action in the current state" );
-               return false; // unreachable, only added for compilation purposes
-            },
-            []( const in_block& ) {
-               FC_ASSERT( false, "cannot start action in the current state" );
-               return false; // unreachable, only added for compilation purposes
-            },
-            [&]( auto&& s )
-            -> std::enable_if_t<
-                  detail::is_one_of< std::decay_t<decltype(s)>,
-                     in_transaction, in_action
-                  >::value,
-                  bool
-            >
-            {
-               fc::raw::pack( log, action_tag );
-               fc::raw::pack( log, global_sequence_num );
-               fc::raw::pack( log, receiver );
-               fc::raw::pack( log, first_receiver );
-               fc::raw::pack( log, action_name );
-               state = in_action( s, in_action::force_new_t{} );
-               return true;
-            }
-         }, state );
-         FC_ASSERT( writable, "log is not setup for writing" );
-      }
-
-      void intrinsic_debug_log_impl::acknowledge_intrinsic_without_recording() {
-         FC_ASSERT( can_write(), "log is not setup for writing" );
-         in_action& s = std::get<in_action>( state );
-         ++(s.intrinsic_counter);
-      }
-
-      void intrinsic_debug_log_impl::record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash ) {
-         FC_ASSERT( can_write(), "log is not setup for writing" );
-         in_action& s = std::get<in_action>( state );
-
-         fc::raw::pack( log, intrinsic_tag );
-         fc::raw::pack( log, s.intrinsic_counter );
-         fc::raw::pack( log, arguments_hash );
-         fc::raw::pack( log, memory_hash );
-
-         ++(s.intrinsic_counter);
-      }
-
-      void intrinsic_debug_log_impl::finish_block() {
-         bool writable = std::visit( overloaded{
-            []( closed ) { return false; },
-            []( const read_only& ) { return false; },
-            []( const waiting_to_start_block& ) {
-               FC_ASSERT( false, "no started block" );
-               return false; // unreachable, only added for compilation purposes
-            },
-            [&]( const in_block& s ) {
-               state = waiting_to_start_block( s.last_committed_block_num );
-               return true; // nothing to commit
-            },
-            [&]( auto&& s )
-            -> std::enable_if_t<
-                  detail::is_one_of< std::decay_t<decltype(s)>,
-                     in_transaction, in_action
-                  >::value,
-                  bool
-            >
-            {
-               fc::raw::pack( log, block_tag );
-               fc::raw::pack( log, s.block_start_pos );
-               pos_t new_last_committed_block_end_pos = log.tellp();
-               log.flush();
-
-               pos_t new_last_committed_block_begin_pos{};
-               if( log_metadata ) {
-                  new_last_committed_block_begin_pos = log_metadata->last_committed_block_end_pos;
-               }
-
-               log_metadata.emplace( log_metadata_t{ new_last_committed_block_begin_pos, new_last_committed_block_end_pos} );
-
-               state = waiting_to_start_block( s.last_committed_block_num );
-               return true;
-            }
-         }, state );
-         FC_ASSERT( writable, "log is not setup for writing" );
-      }
-
-      std::optional<pos_t> intrinsic_debug_log_impl::get_position_of_previous_block( pos_t pos ) {
-         std::optional<pos_t> previous_pos;
-         if( pos > sizeof(pos_t) ) {
-            pos_t read_pos = 0;
-            log.seekg( pos - sizeof(read_pos), std::ios::beg );
-            fc::raw::unpack( log, read_pos );
-            FC_ASSERT( read_pos < log.tellg(), "corrupted log: invalid block position" );
-            previous_pos = read_pos;
-         }
-         return previous_pos;
-      }
-
-      const extended_block_data& intrinsic_debug_log_impl::get_block_at_position( pos_t pos ) {
-         FC_ASSERT( is_read_only(), "only allowed in read-only mode" );
-         FC_ASSERT( log_metadata && 0 <= pos && pos < log_metadata->last_committed_block_end_pos,
-                    "position is out of bounds" );
-
-         auto itr = block_data_cache.find( pos );
-         if( itr != block_data_cache.end() ) return itr->second;
-
-         std::optional<pos_t> previous_pos = get_position_of_previous_block( pos );
-         log.seekg( pos, std::ios::beg );
-
-         intrinsic_debug_log::block_data block_data;
-
-         // Read all data for the current block.
-         {
-            uint8_t tag = 0;
-            fc::raw::unpack( log, tag );
-            FC_ASSERT( tag == block_tag, "corrupted log: expected block tag" );
-            fc::raw::unpack( log, block_data.block_num );
-
-            bool in_transaction = false;
-            bool in_action      = false;
-            uint64_t minimum_accepted_global_sequence_num = 0;
-
-            for(;;) {
-               fc::raw::unpack( log, tag );
-               if( tag == block_tag ) {
-                  pos_t read_pos{};
-                  fc::raw::unpack( log, read_pos );
-                  FC_ASSERT( read_pos == pos, "corrupted log: block position did not match" );
-                  break;
-               } else if( tag == transaction_tag ) {
-                  block_data.transactions.emplace_back();
-                  fc::raw::unpack( log, block_data.transactions.back().trx_id );
-                  in_transaction = true;
-                  in_action      = false;
-               } else if( tag == action_tag ) {
-                  FC_ASSERT( in_transaction, "corrupted log: no start of transaction before encountering action tag");
-                  uint64_t global_sequence_num = 0;
-                  fc::raw::unpack( log, global_sequence_num );
-                  FC_ASSERT( global_sequence_num >= minimum_accepted_global_sequence_num,
-                             "corrupted log: global sequence numbers of actions within a block are not monotonically increasing"
-                  );
-                  block_data.transactions.back().actions.emplace_back();
-                  auto& act = block_data.transactions.back().actions.back();
-                  act.global_sequence_num = global_sequence_num;
-                  fc::raw::unpack( log, act.receiver );
-                  fc::raw::unpack( log, act.first_receiver );
-                  fc::raw::unpack( log, act.action_name );
-                  in_action = true;
-                  minimum_accepted_global_sequence_num = global_sequence_num + 1;
-               } else if( tag == intrinsic_tag ) {
-                  FC_ASSERT( in_action, "corrupted log: no start of action before encountering intrinsic tag");
-                  auto& intrinsics = block_data.transactions.back().actions.back().recorded_intrinsics;
-                  uint32_t minimum_accepted_ordinal = 0;
-                  if( intrinsics.size() > 0 ) {
-                     minimum_accepted_ordinal = intrinsics.back().intrinsic_ordinal + 1;
-                  }
-                  uint32_t ordinal = 0;
-                  fc::raw::unpack( log, ordinal );
-                  FC_ASSERT( ordinal >= minimum_accepted_ordinal,
-                             "corrupted log: intrinsic ordinals within an action are not monotonically increasing" );
-                  intrinsics.emplace_back();
-                  auto& intrinsic = intrinsics.back();
-                  intrinsic.intrinsic_ordinal = ordinal;
-                  fc::raw::unpack( log, intrinsic.arguments_hash );
-                  fc::raw::unpack( log, intrinsic.memory_hash );
-               } else {
-                  FC_ASSERT( false, "corrupted log: unrecognized tag" );
-               }
-            }
-
-            FC_ASSERT( block_data.transactions.size() > 0, "corrupted log: empty block included" );
-         }
-
-         std::optional<pos_t> next_pos;
-         if( log.tellg() < log_metadata->last_committed_block_end_pos ) next_pos = log.tellg();
-
-         auto res = block_data_cache.emplace(
-                        std::piecewise_construct,
-                        std::forward_as_tuple( pos ),
-                        std::forward_as_tuple( std::move(block_data), pos, previous_pos, next_pos )
-         );
-         return res.first->second;
-      }
-   }
-
-   intrinsic_debug_log::intrinsic_debug_log( const bfs::path& log_path )
-   :my( new detail::intrinsic_debug_log_impl() ) {
-      my->log_path = log_path;
-      my->log.exceptions( std::fstream::failbit | std::fstream::badbit );
-   }
-
-   intrinsic_debug_log::intrinsic_debug_log( intrinsic_debug_log&& other) {
-      my = std::move(other.my);
-   }
-
-   intrinsic_debug_log::~intrinsic_debug_log() {
-      if( my ) {
-         try {
-            my->close();
-         } FC_LOG_AND_DROP()
-         my.reset();
-      }
-   }
-
-   void intrinsic_debug_log::open( open_mode mode ) {
-      bool open_as_read_only = (mode == open_mode::read_only);
-      bool start_fresh = false;
-      bool auto_finish_block = false;
-
-      if( !open_as_read_only ) {
-         start_fresh = ( mode == open_mode::create_new || mode == open_mode::create_new_and_auto_finish_block );
-         auto_finish_block = ( mode == open_mode::create_new_and_auto_finish_block
-                                 || mode == open_mode::continue_existing_and_auto_finish_block );
-      }
-
-      my->open( open_as_read_only, start_fresh, auto_finish_block );
-   }
-
-   void intrinsic_debug_log::close() {
-      my->close();
-   }
-
-   void intrinsic_debug_log::flush() {
-      my->log.flush();
-   }
-
-   void intrinsic_debug_log::start_block( uint32_t block_num ) {
-      my->start_block( block_num );
-   }
-
-   void intrinsic_debug_log::abort_block() {
-      my->abort_block();
-   }
-
-   void intrinsic_debug_log::start_transaction( const transaction_id_type& trx_id ) {
-      my->start_transaction( trx_id );
-   }
-
-   void intrinsic_debug_log::abort_transaction() {
-      my->abort_transaction();
-   }
-
-   void intrinsic_debug_log::start_action( uint64_t global_sequence_num,
-                                           name receiver, name first_receiver, name action_name )
-   {
-      my->start_action( global_sequence_num, receiver, first_receiver, action_name );
-   }
-
-   void intrinsic_debug_log::acknowledge_intrinsic_without_recording() {
-      my->acknowledge_intrinsic_without_recording();
-   }
-
-   void intrinsic_debug_log::record_intrinsic( const digest_type& arguments_hash, const digest_type& memory_hash ) {
-      my->record_intrinsic( arguments_hash, memory_hash );
-   }
-
-   void intrinsic_debug_log::finish_block() {
-      my->finish_block();
-   }
-
-   bool intrinsic_debug_log::is_open()const {
-      return my->is_open();
-   }
-
-   bool intrinsic_debug_log::is_read_only()const {
-      return my->is_read_only();
-   }
-
-   const boost::filesystem::path& intrinsic_debug_log::get_path()const {
-      return my->log_path;
-   }
-
-   uint32_t intrinsic_debug_log::last_committed_block_num()const {
-      std::optional<uint32_t> result = std::visit( overloaded{
-         []( detail::intrinsic_debug_log_impl::closed ) -> std::optional<uint32_t> { return {}; },
-         [&]( auto&& s )
-         -> std::enable_if_t<
-               detail::is_one_of< std::decay_t<decltype(s)>,
-                  detail::intrinsic_debug_log_impl::read_only,
-                  detail::intrinsic_debug_log_impl::waiting_to_start_block,
-                  detail::intrinsic_debug_log_impl::in_block,
-                  detail::intrinsic_debug_log_impl::in_transaction,
-                  detail::intrinsic_debug_log_impl::in_action
-               >::value,
-               std::optional<uint32_t>
-         >
-         {
-            return s.last_committed_block_num;
-         }
-      }, my->state );
-      FC_ASSERT( result, "log is closed" );
-      return *result;
-   }
-
-   intrinsic_debug_log::block_iterator intrinsic_debug_log::begin_block()const {
-      FC_ASSERT( my->is_read_only(), "block_begin is only allowed in read-only mode" );
-      return block_iterator( my.get(), (my->log_metadata ? 0ll : -1ll) );
-   }
-
-   intrinsic_debug_log::block_iterator intrinsic_debug_log::end_block()const {
-      FC_ASSERT( my->is_read_only(), "block_end is only allowed in read-only mode" );
-      return block_iterator( my.get() );
-   }
-
-   const intrinsic_debug_log::block_data* intrinsic_debug_log::block_iterator::get_pointer()const {
-      FC_ASSERT( _log, "cannot dereference default constructed block iterator" );
-      FC_ASSERT( _pos >= 0, "cannot dereference an end block iterator" );
-
-      if( !_cached_block_data ) {
-         _cached_block_data = &_log->get_block_at_position( _pos );
-      }
-
-      return &(_cached_block_data->block_data);
-
-   }
-
-   intrinsic_debug_log::block_iterator& intrinsic_debug_log::block_iterator::operator++() {
-      FC_ASSERT( _log, "cannot increment default constructed block iterator" );
-      FC_ASSERT( _pos >= 0, "cannot increment end block iterator" );
-
-      if( !_cached_block_data ) {
-         _cached_block_data = &_log->get_block_at_position( static_cast<pos_t>(_pos) );
-      }
-
-      _pos = (_cached_block_data->next_pos ? static_cast<int64_t>(*_cached_block_data->next_pos) : -1ll);
-      _cached_block_data = nullptr;
-
-      return *this;
-   }
-
-   intrinsic_debug_log::block_iterator& intrinsic_debug_log::block_iterator::operator--() {
-      FC_ASSERT( _log, "cannot decrement default constructed block iterator" );
-
-      if( _pos < 0 ) {
-         FC_ASSERT( !_cached_block_data, "invariant failure" );
-         FC_ASSERT( _log->log_metadata, "cannot decrement end block iterator when the log contains no blocks" );
-         _pos = static_cast<int64_t>( _log->log_metadata->last_committed_block_begin_pos );
-         return *this;
-      }
-
-      std::optional<pos_t> prev_pos;
-      if( _cached_block_data ) {
-         prev_pos = _cached_block_data->previous_pos;
-      } else {
-         prev_pos = _log->get_position_of_previous_block( static_cast<pos_t>(_pos) );
-      }
-
-      FC_ASSERT( prev_pos, "cannot decrement begin block iterator" );
-      _pos = static_cast<int64_t>(*prev_pos);
-      _cached_block_data = nullptr;
-      return *this;
-   }
-
-   std::optional<intrinsic_debug_log::intrinsic_differences>
-   intrinsic_debug_log::find_first_difference( intrinsic_debug_log& lhs, intrinsic_debug_log& rhs ) {
-      lhs.close();
-      rhs.close();
-      lhs.open( intrinsic_debug_log::open_mode::read_only );
-      rhs.open( intrinsic_debug_log::open_mode::read_only );
-
-      auto close_logs = fc::make_scoped_exit([&lhs, &rhs] {
-         lhs.close();
-         rhs.close();
-      });
-
-      enum class mismatch_t {
-         equivalent,
-         lhs_ended_early,
-         rhs_ended_early,
-         mismatch
-      };
-
-      auto find_if_mismatched = []( auto&& lhs_begin, auto&& lhs_end,
-                                    auto&& rhs_begin, auto&& rhs_end,
-                                    auto&& compare_equivalent ) -> mismatch_t
-      {
-         for( ; lhs_begin != lhs_end && rhs_begin != rhs_end; ++lhs_begin, ++rhs_begin ) {
-            const auto& lhs_value = *lhs_begin;
-            const auto& rhs_value = *rhs_begin;
-            if( compare_equivalent( lhs_value, rhs_value ) ) continue;
-            return mismatch_t::mismatch;
-         }
-
-         bool lhs_empty = (lhs_begin == lhs_end);
-         bool rhs_empty = (rhs_begin == rhs_end);
-         // lhs_empty and rhs_empty cannot both be false at this point since we exited the for loop.
-
-         if( lhs_empty && !rhs_empty ) return mismatch_t::lhs_ended_early;
-         if( !lhs_empty && rhs_empty ) return mismatch_t::rhs_ended_early;
-         return mismatch_t::equivalent;
-      };
-
-      std::optional<intrinsic_differences> result;
-      const char* error_msg = nullptr;
-
-      auto status = find_if_mismatched(
-         lhs.begin_block(), lhs.end_block(),
-         rhs.begin_block(), rhs.end_block(),
-         [&find_if_mismatched, &result, &error_msg]
-         ( const block_data& block_lhs, const block_data& block_rhs ) {
-            if( block_lhs.block_num != block_rhs.block_num ) {
-               error_msg = "logs do not have the same blocks";
-               return false;
-            }
-            auto status2 = find_if_mismatched(
-               block_lhs.transactions.begin(), block_lhs.transactions.end(),
-               block_rhs.transactions.begin(), block_rhs.transactions.end(),
-               [&find_if_mismatched, &result, &error_msg, &block_lhs]
-               ( const transaction_data& trx_lhs, const transaction_data& trx_rhs ) {
-                  if( trx_lhs.trx_id != trx_rhs.trx_id ) {
-                     return false;
-                  }
-                  auto status3 = find_if_mismatched(
-                     trx_lhs.actions.begin(), trx_lhs.actions.end(),
-                     trx_rhs.actions.begin(), trx_rhs.actions.end(),
-                     [&result, &block_lhs, &trx_lhs]
-                     ( const action_data& act_lhs, const action_data& act_rhs ) {
-                        if( std::tie( act_lhs.global_sequence_num,
-                                      act_lhs.receiver,
-                                      act_lhs.first_receiver,
-                                      act_lhs.action_name )
-                              != std::tie( act_rhs.global_sequence_num,
-                                           act_rhs.receiver,
-                                           act_rhs.first_receiver,
-                                           act_rhs.action_name )
-                        ) {
-                           return false;
-                        }
-                        if( act_lhs.recorded_intrinsics != act_rhs.recorded_intrinsics ) {
-                           result.emplace( intrinsic_differences{
-                              .block_num               = block_lhs.block_num,
-                              .trx_id                  = trx_lhs.trx_id,
-                              .global_sequence_num     = act_lhs.global_sequence_num,
-                              .receiver                = act_lhs.receiver,
-                              .first_receiver          = act_lhs.first_receiver,
-                              .action_name             = act_lhs.action_name,
-                              .lhs_recorded_intrinsics = act_lhs.recorded_intrinsics,
-                              .rhs_recorded_intrinsics = act_rhs.recorded_intrinsics
-                           } );
-                           return false;
-                        }
-                        return true;
-                     }
-                  );
-                  if( status3 == mismatch_t::equivalent ) return true;
-                  if( error_msg == nullptr && !result ) {
-                     error_msg = "different actions within a particular transaction";
-                  }
-                  return false;
-               }
-            );
-            if( status2 == mismatch_t::equivalent ) return true;
-            if( error_msg == nullptr && !result ) {
-               error_msg = "different transactions in a particular block";
-            }
-            return false;
-         }
-      );
-
-      if( status == mismatch_t::mismatch ) {
-         if( error_msg != nullptr ) {
-            FC_THROW_EXCEPTION( fc::exception, error_msg );
-         }
-         return result;
-      }
-
-      FC_ASSERT( status == mismatch_t::equivalent, "logs do not have the same blocks" );
-      return {}; // the logs are equivalent
-   }
-
-} } /// eosio::chain
diff --git a/libraries/chain/webassembly/wabt.cpp b/libraries/chain/webassembly/wabt.cpp
index a73617e199a..d43cd07c0be 100644
--- a/libraries/chain/webassembly/wabt.cpp
+++ b/libraries/chain/webassembly/wabt.cpp
@@ -107,10 +107,4 @@ void wabt_runtime::immediately_exit_currently_running_module() {
    throw wasm_exit();
 }
 
-digest_type calc_memory_hash( const Memory& mem ) {
-   digest_type::encoder enc;
-   enc.write( mem.data.data(), mem.data.size() );
-   return enc.result();
-}
-
 }}}}
diff --git a/libraries/chain/webassembly/wavm.cpp b/libraries/chain/webassembly/wavm.cpp
index c0481c7cb86..71f72fa832f 100644
--- a/libraries/chain/webassembly/wavm.cpp
+++ b/libraries/chain/webassembly/wavm.cpp
@@ -171,13 +171,4 @@ void wavm_runtime::immediately_exit_currently_running_module() {
 #endif
 }
 
-digest_type calc_memory_hash( MemoryInstance* mem ) {
-   const char* base_of_memory = (const char*)( getMemoryBaseAddress(mem) );
-   std::size_t mem_size = IR::numBytesPerPage * Runtime::getMemoryNumPages(mem);
-
-   digest_type::encoder enc;
-   enc.write( base_of_memory, mem_size );
-   return enc.result();
-}
-
 }}}}
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 87062c460b4..87b069f95a1 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -253,8 +253,6 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
 #ifdef __linux__
          ("database-hugepage-path", bpo::value<vector<string>>()->composing(), "Optional path for database hugepages when in \"locked\" mode (may specify multiple times)")
 #endif
-         ("debug-log-intrinsics", bpo::bool_switch()->default_value(false),
-          "enable logging of intrinsics for debugging purposes")
          ;
 
 // TODO: rate limiting
@@ -639,11 +637,6 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          else
             my->blocks_dir = bld;
       }
-      /*
-      if( options.at( "debug-log-intrinsics" ).as<bool>() ) {
-         my->chain_config->intrinsic_debug_log_path = app().data_dir() / "intrinsics.log";
-      }
-      */
 
       protocol_feature_set pfs;
       {
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 6cb1e5bd635..a40ef3b423c 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -3,4 +3,3 @@ add_subdirectory( cleos )
 add_subdirectory( keosd )
 add_subdirectory( eosio-launcher )
 add_subdirectory( eosio-blocklog )
-add_subdirectory( intrinsic-log-util )
diff --git a/programs/intrinsic-log-util/CMakeLists.txt b/programs/intrinsic-log-util/CMakeLists.txt
deleted file mode 100644
index 4697c35d47a..00000000000
--- a/programs/intrinsic-log-util/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-add_executable( intrinsic-log-util
-   main.cpp
-   print.cpp
-   diff.cpp
-)
-
-if( UNIX AND NOT APPLE )
-  set(rt_library rt )
-endif()
-
-find_package( Gperftools QUIET )
-if( GPERFTOOLS_FOUND )
-    message( STATUS "Found gperftools; compiling intrinsic-log-util with TCMalloc")
-    list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc )
-endif()
-
-target_include_directories(intrinsic-log-util PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-
-target_link_libraries( intrinsic-log-util
-        PRIVATE appbase
-        PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
-
-copy_bin( intrinsic-log-util )
-#install( TARGETS
-#   intrinsic-log-util
-#
-#   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
-#   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
-#   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
-#)
diff --git a/programs/intrinsic-log-util/cli_parser.hpp b/programs/intrinsic-log-util/cli_parser.hpp
deleted file mode 100644
index bdb41621bed..00000000000
--- a/programs/intrinsic-log-util/cli_parser.hpp
+++ /dev/null
@@ -1,834 +0,0 @@
-#pragma once
-
-#include <fc/exception/exception.hpp>
-
-#include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
-
-#include <variant>
-#include <memory>
-#include <type_traits>
-
-//#include <iosfwd>
-#include <iostream>
-
-namespace eosio::cli_parser {
-
-   namespace bfs = boost::filesystem;
-   namespace bpo = boost::program_options;
-
-   enum class subcommand_style {
-      only_contains_subcommands,
-      invokable_and_contains_subcommands,
-      terminal_subcommand_with_positional_arguments,
-      terminal_subcommand_without_positional_arguments
-   };
-
-   struct subcommand_description {
-      subcommand_description( const std::string& subcommand_name, const std::string& description )
-      :subcommand_name( subcommand_name )
-      ,description( description )
-      {}
-
-      std::string subcommand_name;
-      std::string description;
-   };
-
-   struct subcommand_descriptions {
-      std::vector<subcommand_description> descriptions;
-      bool                                requires_subcommand = false;
-   };
-
-   struct positional_description {
-      enum argument_restriction {
-         required,
-         optional,
-         repeating
-      };
-
-      positional_description( const std::string& positional_name,
-                              const std::string& description,
-                              argument_restriction restriction )
-      :positional_name( positional_name )
-      ,description( description )
-      ,restriction( restriction )
-      {}
-
-      std::string          positional_name;
-      std::string          description;
-      argument_restriction restriction;
-   };
-
-   using positional_descriptions = std::vector<positional_description>;
-
-   struct autocomplete_failure {};
-   struct autocomplete_success {};
-   struct parse_failure {};
-
-   struct parse_metadata {
-      parse_metadata( const std::vector<std::string>& context )
-      :subcommand_context( context )
-      {}
-
-      /** @pre subcommand_descriptions alternative of other_description must be present */
-      void add_subcommand_description( const std::string& subcommand, const std::string& description )
-      {
-         std::get<subcommand_descriptions>( other_description ).descriptions.emplace_back( subcommand, description );
-      }
-
-      void set_positional_descriptions( const positional_descriptions& pos_desc ) {
-         other_description.emplace<positional_descriptions>( pos_desc );
-      }
-
-      void set_positional_descriptions( positional_descriptions&& pos_desc ) {
-         other_description.emplace<positional_descriptions>( std::move(pos_desc) );
-      }
-
-      std::vector<std::string>                                       subcommand_context;
-      std::string                                                    subcommand_desc;
-      std::shared_ptr<bpo::options_description>                      opts_description;
-      std::variant<subcommand_descriptions, positional_descriptions> other_description;
-      bool                                                           initialization_skipped = false;
-   };
-
-   namespace detail {
-      template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
-      template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
-
-      template<typename T, typename = int>
-      struct has_name : std::false_type {};
-
-      template<typename T>
-      struct has_name<T, decltype((void) T::name, 0)> : std::true_type {};
-
-      template<typename T, typename = int>
-      struct has_description : std::false_type {};
-
-      template<typename T>
-      struct has_description<T, decltype((void) T::get_description(), 0)> : std::true_type {};
-
-      template<typename T, typename = int>
-      struct has_initialize : std::false_type {};
-
-      template<typename T>
-      struct has_initialize<T, decltype((void) std::declval<T>().initialize( std::move( std::declval<bpo::variables_map>() ) ), 0)>
-      : std::true_type
-      {};
-
-      template<typename Visitor, typename... Args>
-      bool maybe_call_visitor( Visitor&& visitor, Args&&... args ) {
-         if constexpr( std::is_invocable_v<Visitor, Args...> ) {
-            std::forward<Visitor>(visitor)( std::forward<Args>(args)... );
-            return true;
-         } else {
-            return false;
-         }
-      }
-
-      template<std::size_t I, typename Ret, typename Tuple, typename Extractor, typename Reducer, typename... Args>
-      bool reduce_tuple_helper( Ret& accumulator, Tuple&& t,
-                                Extractor&& extract, Reducer&& reduce )
-      {
-         if constexpr( I < std::tuple_size_v<std::decay_t<Tuple>> ) {
-            if( !reduce( accumulator, I, extract( std::get<I>( t ) ) ) )
-               return false;
-
-            return reduce_tuple_helper<I+1>( accumulator, std::forward<Tuple>(t),
-                                             std::forward<Extractor>(extract),
-                                             std::forward<Reducer>(reduce) );
-         }
-
-         return true;
-      }
-
-      template<typename Ret, typename Tuple, typename Extractor, typename Reducer, typename... Args>
-      bool reduce_tuple( Ret& accumulator, Tuple&& t,
-                         Extractor&& extract, Reducer&& reduce )
-      {
-         return reduce_tuple_helper<0>( accumulator, std::forward<Tuple>(t),
-                                        std::forward<Extractor>(extract),
-                                        std::forward<Reducer>(reduce) );
-      }
-
-      template<int I, typename Visitor, typename... Ts>
-      bool visit_by_name_helper( const std::variant<Ts...>& var, const std::string& subcommand_name, Visitor&& visitor ) {
-         using variant_type = std::variant<Ts...>;
-
-         if constexpr( I < std::variant_size_v<variant_type> )
-         {
-            if constexpr( has_name< std::variant_alternative_t<I, variant_type> >::value ) {
-               if( subcommand_name.compare( std::variant_alternative_t<I, variant_type>::name ) == 0 ) {
-                  std::forward<Visitor>(visitor)( std::get<I>( var ) );
-                  return true;
-               }
-            }
-            return visit_by_name_helper<I+1>( var,
-                                              subcommand_name,
-                                              std::forward<Visitor>(visitor) );
-         } else {
-            return false;
-         }
-      }
-
-      template<typename Visitor, typename... Ts>
-      bool visit_by_name( const std::variant<Ts...>& var, const std::string& subcommand_name, Visitor&& visitor ) {
-         return visit_by_name_helper<0>( var, subcommand_name, std::forward<Visitor>( visitor ) );
-      }
-
-      template<int I, typename Variant, typename Visitor, typename... Args>
-      bool construct_variant_by_name_helper( Variant& var,
-                                             const std::string& subcommand_name,
-                                             Visitor&& visitor,
-                                             Args&&... args )
-      {
-         if constexpr( I < std::variant_size_v<Variant> ) {
-            if constexpr( has_name< std::variant_alternative_t<I, Variant> >::value ) {
-               if( subcommand_name.compare( std::variant_alternative_t<I, Variant>::name ) == 0 ) {
-                  std::forward<Visitor>(visitor)( var.template emplace<I>( std::forward<Args>(args)... ) );
-                  return true;
-               }
-            }
-            return construct_variant_by_name_helper<I+1>( var,
-                                                          subcommand_name,
-                                                          std::forward<Visitor>(visitor),
-                                                          std::forward<Args>(args)... );
-         } else {
-            return false;
-         }
-      }
-
-      template<typename Variant, typename... Args>
-      bool construct_variant_by_name( Variant& var,
-                                      const std::string& subcommand_name,
-                                      Args&&... args )
-      {
-         return construct_variant_by_name_helper<0>( var,
-                                                     subcommand_name,
-                                                     []( auto&& ) {}, // do nothing in visitor
-                                                     std::forward<Args>(args)... );
-      }
-
-      template<typename Variant, typename Visitor, typename... Args>
-      bool construct_and_visit_variant_by_name( Variant& var,
-                                                const std::string& subcommand_name,
-                                                Visitor&& visitor,
-                                                Args&&... args )
-      {
-         return construct_variant_by_name_helper<0>( var,
-                                                     subcommand_name,
-                                                     std::forward<Visitor>(visitor),
-                                                     std::forward<Args>(args)... );
-      }
-
-      template<int I, typename Variant, typename Visitor>
-      void static_visit_all_helper( Visitor&& visitor )
-      {
-         if constexpr( I < std::variant_size_v<Variant> ) {
-            if constexpr( has_name< std::variant_alternative_t<I, Variant> >::value ) {
-               std::string desc;
-               if constexpr( has_description< std::variant_alternative_t<I, Variant> >::value ) {
-                  desc = std::variant_alternative_t<I, Variant>::get_description();
-               }
-               visitor( std::variant_alternative_t<I, Variant>::name, desc );
-            }
-            return static_visit_all_helper<I+1, Variant>( std::forward<Visitor>(visitor) );
-         }
-      }
-
-      template<typename Variant, typename Visitor>
-      void static_visit_all( Visitor&& visitor ) {
-         static_visit_all_helper<0, Variant>( std::forward<Visitor>(visitor) );
-      }
-
-      struct no_subcommand {};
-
-      class subcommand_untyped_base {};
-
-      template<typename T, typename... Us>
-      class subcommand_base : public subcommand_untyped_base {
-         static_assert( (std::is_default_constructible_v<Us> && ...) );
-         static_assert( (std::is_base_of_v<subcommand_untyped_base, Us> && ...), "subcommands must derive from subcommand type" );
-
-      protected:
-         subcommand_base() = default;
-         friend T;
-
-         bpo::options_description _get_options( const std::vector<std::string>& subcommand_context )
-         {
-            std::string options_name;
-            if( subcommand_context.size() > 0 ) {
-               for( const auto& s : subcommand_context ) {
-                  options_name += s;
-                  options_name += " ";
-               }
-            } else {
-               options_name += T::name;
-               options_name += " ";
-            }
-            options_name += "options";
-
-            bpo::options_description options( options_name );
-            T& derived = static_cast<T&>( *this );
-            derived.set_options( options );
-            return options;
-         }
-
-         template<typename U=T>
-         static std::string _get_description() {
-            if constexpr( has_description<U>::value ) {
-               return U::get_description();
-            } else {
-               return {};
-            }
-         }
-
-         template<typename U=T>
-         void _initialize( bpo::variables_map&& vm ) {
-            if constexpr( has_initialize<U>::value ) {
-               T& derived = static_cast<T&>( *this );
-               derived.initialize( std::move(vm) );
-            }
-         }
-      };
-
-      template<typename T, subcommand_style SubcommandStyle, typename... Us>
-      class subcommand;
-
-      template<typename T, subcommand_style SubcommandStyle, typename... Us>
-      class subcommand
-         : public subcommand_base<T,  Us...>
-      {
-      protected:
-         using base_type = subcommand_base<T,  Us...>;
-         using subcommands_type = std::variant<no_subcommand, Us...>;
-
-         using _enable = std::enable_if_t<
-            SubcommandStyle == subcommand_style::only_contains_subcommands
-            || SubcommandStyle == subcommand_style::invokable_and_contains_subcommands
-         >;
-
-         static_assert( sizeof...(Us) > 0 );
-
-         subcommands_type _subcommand;
-
-      public:
-         static constexpr bool has_subcommands      = true;
-         static constexpr bool invokable_subcommand = (SubcommandStyle == subcommand_style::invokable_and_contains_subcommands);
-
-         parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
-                               const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
-         {
-            parse_metadata pm( subcommand_context );
-            bpo::options_description subcommand_options{base_type::_get_options(subcommand_context)};
-
-            auto subcommand_options_ptr = std::make_shared<bpo::options_description>( subcommand_options );
-
-            subcommand_options.add_options()
-               ("__command", bpo::value<std::string>(), "command to execute" )
-               ("__subargs", bpo::value<std::vector<std::string>>(), "arguments for command" )
-            ;
-
-            bpo::positional_options_description pos;
-            pos.add( "__command", 1 ).add( "__subargs", -1 );
-
-            bpo::parsed_options parsed = bpo::command_line_parser( opts )
-                                          .options( subcommand_options )
-                                          .positional( pos )
-                                          .allow_unregistered()
-                                          .run();
-
-            bpo::variables_map vm;
-
-            bpo::variables_map vm_temp;
-            bpo::store( parsed, vm_temp );
-
-            if( vm_temp.count( "__command" ) > 0 ) {
-               std::string cmd_name = vm_temp["__command"].as<std::string>();
-
-               std::vector<std::string> inner_opts = bpo::collect_unrecognized( parsed.options, bpo::include_positional );
-               FC_ASSERT( inner_opts.size() > 0, "unexpected error" );
-               FC_ASSERT( *inner_opts.begin() == cmd_name,
-                          "unrecognized option '${option}'",
-                          ("option", *inner_opts.begin())
-               );
-               inner_opts.erase( inner_opts.begin() );
-
-               bool success = construct_and_visit_variant_by_name( _subcommand, cmd_name,
-                  [&inner_opts, &pm, &cmd_name, &subcommand_options_ptr, &skip_initialize, context = subcommand_context]
-                  ( auto&& s ) mutable {
-                     context.emplace_back( cmd_name );
-                     pm = s.parse( inner_opts, skip_initialize, context );
-                     FC_ASSERT( pm.opts_description, "unexpected error" );
-                     subcommand_options_ptr->add( *pm.opts_description );
-                     pm.opts_description = subcommand_options_ptr;
-                  }
-               );
-               FC_ASSERT(  success, "unrecognized sub-command '${name}' within context: ${context}",
-                           ("name", cmd_name)("context", subcommand_context)
-               );
-               vm = std::move(vm_temp);
-            } else {
-               bpo::parsed_options parsed2 = bpo::command_line_parser( opts )
-                                                .options( *subcommand_options_ptr )
-                                                .run();
-               bpo::store( parsed2, vm );
-
-               std::get<subcommand_descriptions>( pm.other_description ).requires_subcommand = !invokable_subcommand;
-
-               static_visit_all<std::decay_t<decltype(_subcommand)>>(
-                  [&pm]( const char* name, const std::string& desc ) {
-                     pm.add_subcommand_description( name, desc );
-                  }
-               );
-
-               pm.opts_description = std::move(subcommand_options_ptr);
-               pm.subcommand_desc  = base_type::_get_description();
-               pm.initialization_skipped = skip_initialize;
-            }
-
-            if( !skip_initialize ) {
-               bpo::notify( vm );
-               base_type::_initialize( std::move(vm) );
-            }
-
-            return pm;
-         }
-
-         const subcommands_type& get_subcommand()const { return _subcommand; }
-      };
-
-      template<typename T>
-      class subcommand<T, subcommand_style::terminal_subcommand_with_positional_arguments>
-         : public subcommand_base<T>
-      {
-      protected:
-         using base_type = subcommand_base<T>;
-
-      public:
-         static constexpr bool has_subcommands = false;
-         static constexpr bool invokable_subcommand = true;
-
-         parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
-                               const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
-         {
-            parse_metadata pm( subcommand_context );
-            pm.subcommand_desc  = base_type::_get_description();
-            pm.opts_description = std::make_shared<bpo::options_description>(
-                                          base_type::_get_options(subcommand_context) );
-
-            bpo::options_description subcommand_options{ *pm.opts_description };
-            positional_descriptions pos_desc;
-            const auto& pos = _get_positional_options( subcommand_options, pos_desc );
-            pm.set_positional_descriptions( pos_desc );
-
-            bpo::variables_map vm;
-
-            bpo::store( bpo::command_line_parser( opts )
-                           .options( subcommand_options )
-                           .positional( pos )
-                           .run(),
-                        vm );
-
-            if( !skip_initialize ) {
-               bpo::notify( vm );
-               base_type::_initialize( std::move(vm) );
-            }
-            pm.initialization_skipped = skip_initialize;
-
-            return pm;
-         }
-
-      protected:
-         bpo::positional_options_description _get_positional_options( bpo::options_description& options,
-                                                                      positional_descriptions& pos_desc )
-         {
-            T& derived = static_cast<T&>( *this );
-            return derived.get_positional_options( options, pos_desc );
-         }
-      };
-
-      template<typename T>
-      class subcommand<T, subcommand_style::terminal_subcommand_without_positional_arguments>
-         : public subcommand_base<T>
-      {
-      protected:
-         using base_type = subcommand_base<T>;
-
-      public:
-         static constexpr bool has_subcommands = false;
-         static constexpr bool invokable_subcommand = true;
-
-
-         parse_metadata parse( const std::vector<std::string>& opts, bool skip_initialize,
-                               const std::vector<std::string>& subcommand_context = std::vector<std::string>() )
-         {
-            parse_metadata pm( subcommand_context );
-            pm.subcommand_desc  = base_type::_get_description();
-            pm.opts_description = std::make_shared<bpo::options_description>(
-                                          base_type::_get_options(subcommand_context) );
-
-            bpo::variables_map vm;
-
-            bpo::store( bpo::command_line_parser( opts )
-                           .options( *pm.opts_description )
-                           .run(),
-                        vm );
-
-            if( !skip_initialize ) {
-               bpo::notify( vm );
-               base_type::_initialize( std::move(vm) );
-            }
-            pm.initialization_skipped = skip_initialize;
-
-            return pm;
-         }
-      };
-
-   } /// namespace detail
-
-   template<typename T, subcommand_style SubcommandStyle, typename... Us>
-   using subcommand = eosio::cli_parser::detail::subcommand<T, SubcommandStyle, Us...>;
-
-   bpo::positional_options_description
-   build_positional_descriptions( const bpo::options_description& options,
-                                  positional_descriptions& pos_desc,
-                                  const std::vector<std::string>& required_pos_names,
-                                  const std::vector<std::string>& optional_pos_names = std::vector<std::string>(),
-                                  const std::string& repeat_name = std::string{}
-                                )
-   {
-      bpo::positional_options_description pos;
-
-      auto add_positional = [&pos, &pos_desc, &options]( const std::string& pos_name,
-                                                         positional_description::argument_restriction restriction )
-      {
-         pos.add( pos_name.c_str(), (restriction == positional_description::repeating ? -1 : 1) );
-         const bpo::option_description* opt = options.find_nothrow( pos_name, false );
-         if( opt ) {
-            pos_desc.emplace_back( pos_name, opt->description(), restriction );
-         } else {
-            pos_desc.emplace_back( pos_name, "", restriction );
-         }
-      };
-
-      for( const auto& n : required_pos_names ) {
-         add_positional( n, positional_description::required );
-      }
-
-      for( const auto& n : optional_pos_names ) {
-         add_positional( n, positional_description::optional );
-      }
-
-      if( repeat_name.size() > 0 ) {
-         add_positional( repeat_name, positional_description::repeating );
-      }
-
-      return pos;
-   }
-
-   void print_subcommand_help( std::ostream& stream, const std::string& program_name, const parse_metadata& pm ) {
-      const subcommand_descriptions* subcommands = std::get_if<subcommand_descriptions>( &pm.other_description );
-      bool subcommands_present = (subcommands && subcommands->descriptions.size() > 0);
-
-      const positional_descriptions* positionals = std::get_if<positional_descriptions>( &pm.other_description );
-      bool positionals_present = (positionals && positionals->size() > 0);
-
-      auto formatting_width = pm.opts_description->get_option_column_width() - 2;
-
-      std::string subcommand_usage;
-      for( const auto& s : pm.subcommand_context ) {
-         subcommand_usage += " ";
-         subcommand_usage += s;
-      }
-      if( subcommands_present ) {
-         if( subcommands->requires_subcommand )
-            subcommand_usage += " SUBCOMMAND";
-         else
-            subcommand_usage += " [SUBCOMMAND]";
-      }
-
-      if( pm.subcommand_desc.size() > 0 ) {
-         stream << pm.subcommand_desc << std::endl;
-      }
-
-      stream   << "Usage: " << program_name
-               << subcommand_usage
-               << " [OPTIONS]";
-
-      if( positionals_present ) {
-         for( const auto& p : *positionals ) {
-            bool optional_arg = (p.restriction == positional_description::optional);
-            stream << " ";
-            if( optional_arg ) stream << "[";
-            stream << p.positional_name;
-            if( optional_arg ) stream << "]";
-            if( p.restriction == positional_description::repeating ) stream << "...";
-         }
-      }
-
-      stream << std::endl << std::endl;
-
-      if( positionals_present ) {
-         stream << "Positionals:" << std::endl;
-
-         for( const auto& p : *positionals ) {
-            stream << "  ";
-            auto orig_width = stream.width( formatting_width );
-            stream << std::left << p.positional_name;
-            stream.width( orig_width );
-            stream << p.description << std::endl;
-         }
-
-         stream << std::endl;
-      }
-
-      pm.opts_description->print( stream );
-
-      if( subcommands_present ) {
-         stream << std::endl;
-
-         std::string subcommands_title;
-         if( pm.subcommand_context.size() > 0 ) {
-            for( const auto& s : pm.subcommand_context ) {
-               subcommands_title += s;
-               subcommands_title += " ";
-            }
-            subcommands_title += "subcommands:";
-         } else {
-            subcommands_title = "Subcommands:";
-         }
-
-         stream << subcommands_title << std::endl;
-         for( const auto& s : subcommands->descriptions ) {
-            stream << "  ";
-            auto orig_width = stream.width( formatting_width );
-            stream << std::left << s.subcommand_name;
-            stream.width( orig_width );
-            stream << s.description << std::endl;
-         }
-      }
-   }
-
-   bool print_autocomplete_suggestions( std::ostream& stream, const parse_metadata& pm, const std::string& last_token ) {
-      bool printed_something = false;
-
-      if( std::holds_alternative<subcommand_descriptions>( pm.other_description ) ) {
-         for( const auto& s : std::get<subcommand_descriptions>( pm.other_description ).descriptions ) {
-            if( s.subcommand_name.find( last_token ) != 0 ) continue;
-            if( printed_something )
-               stream << " ";
-            stream << s.subcommand_name;
-            printed_something = true;
-         }
-      }
-
-      if( last_token.size() > 0 ) {
-         for( const auto& opt : pm.opts_description->options() ) {
-            //if( opt->match( last_token, true, false, false ) == bpo::option_description::no_match ) continue;
-            // The option_description::match function doesn't seem to work.
-
-            const auto& short_name = opt->canonical_display_name( bpo::command_line_style::allow_dash_for_short );
-            if( short_name.size() > 0 && short_name[0] == '-' && short_name.find( last_token ) == 0 ) {
-               if( printed_something )
-                  stream << " ";
-               stream << short_name;
-               printed_something = true;
-            }
-
-            const auto& long_name = opt->canonical_display_name( bpo::command_line_style::allow_long );
-            if( long_name.size() > 0 && long_name[0] == '-' && long_name.find( last_token ) == 0 ) {
-               if( printed_something )
-                  stream << " ";
-               stream << long_name;
-               printed_something = true;
-            }
-         }
-      }
-
-      return printed_something;
-   }
-
-   template<typename T>
-   std::optional<parse_metadata>
-   parse_program_options( T& root, const std::vector<std::string>& opts,
-                          bool skip_initialize = false, bool avoid_throwing = false )
-   {
-      try {
-         return root.parse( opts, skip_initialize );
-      } catch( ... ) {
-         if( !avoid_throwing ) throw;
-      }
-
-      return {};
-   }
-
-   template<typename T>
-   std::variant<autocomplete_failure, autocomplete_success, parse_failure, parse_metadata>
-   parse_program_options_extended( T& root, int argc, const char** argv,
-                                   std::ostream& out_stream, std::ostream* err_stream = nullptr,
-                                   bool avoid_throwing = false )
-   {
-      if( argc <= 0 ) {
-         if( avoid_throwing ) return parse_failure{};
-         FC_ASSERT( false, "command line arguments should at least include program name" );
-      }
-
-      std::string program_name{ bfs::path( argv[0] ).filename().generic_string() };
-
-      bool autocomplete_mode = false;
-
-      std::vector<std::string> opts;
-      opts.reserve( argc - 1 );
-      for( int i = 1; i < argc; ++i ) {
-         opts.emplace_back( std::string( *(argv + i) ) );
-         if( opts.back().compare( "-" ) == 0 ) {
-            if( autocomplete_mode ) return autocomplete_failure{};
-            if( avoid_throwing ) return parse_failure{};
-            FC_ASSERT( false, "- is not allowed by itself in the command line arguments" );
-         }
-         if( opts.back().compare( "--" ) == 0 ) {
-            if( i != 1 ) {
-               if( autocomplete_mode ) return autocomplete_failure{};
-               if( avoid_throwing ) return parse_failure{};
-               FC_ASSERT( false, "-- is not allowed by itself in the command line arguments" );
-            }
-            opts.pop_back();
-            autocomplete_mode = true;
-         }
-      }
-
-      if( !autocomplete_mode ) {
-         const auto pm = parse_program_options( root, opts, false, avoid_throwing );
-         if( !pm ) return parse_failure{};
-         return *pm;
-      }
-
-      // Autocomplete helper logic:
-
-      std::string last_token;
-      if( opts.size() > 0 ) {
-         if( opts.back().size() == 0 ) {
-            opts.pop_back();
-         } else {
-            last_token = opts.back();
-         }
-      }
-
-      if( last_token.size() > 0 ) {
-         if( opts.size() == 0 ) return autocomplete_failure{};
-         opts.pop_back();
-      }
-
-      auto pm = parse_program_options( root, opts, true, true );
-      if( !pm ) return autocomplete_failure{};
-
-      if( last_token.size() > 0 ) {
-         if( print_autocomplete_suggestions( out_stream, *pm, last_token ) ) {
-            out_stream << std::endl;
-         } else {
-            return autocomplete_failure{};
-         }
-      }
-
-      if( err_stream ) {
-         *err_stream << std::endl;
-         print_subcommand_help( *err_stream, program_name, *pm );
-      }
-
-      return autocomplete_success{};
-   }
-
-   enum class dispatch_status {
-      successful_dispatch,
-      no_handler_for_terminal_subcommand,
-      no_handler_for_nonterminal_subcommand
-   };
-
-   namespace detail {
-
-      template<typename Ret, typename Reducer, typename Visitor, typename LastArg, typename... OtherArgs>
-      auto dispatch_helper( Reducer&& reduce, Visitor&& visitor, const LastArg& last_arg, const OtherArgs&... other_args )
-      -> std::enable_if_t<
-            !std::is_same_v<std::decay_t<LastArg>, no_subcommand>,
-            std::pair<dispatch_status, Ret>
-         >
-      {
-         static_assert( std::is_convertible_v<std::invoke_result_t<Reducer, std::tuple<const OtherArgs&..., const LastArg&>>, Ret> );
-
-         dispatch_status status = dispatch_status::no_handler_for_terminal_subcommand;
-
-         if constexpr( LastArg::has_subcommands ) {
-            return std::visit([&]( const auto& next_subcommand ) {
-               return dispatch_helper<Ret>( std::forward<Reducer>(reduce),
-                                            std::forward<Visitor>(visitor),
-                                            next_subcommand,
-                                            other_args..., last_arg );
-            }, last_arg.get_subcommand() );
-         } else {
-            if( maybe_call_visitor( std::forward<Visitor>(visitor), other_args..., last_arg ) )
-               status = dispatch_status::successful_dispatch;
-         }
-
-         return {status, reduce( std::make_tuple( std::cref(other_args)..., std::cref(last_arg) ) )};
-      }
-
-      template<typename Ret, typename Reducer, typename Visitor, typename LastArg, typename... OtherArgs>
-      auto dispatch_helper( Reducer&& reduce, Visitor&& visitor, const LastArg& last_arg, const OtherArgs&... other_args )
-      -> std::enable_if_t<
-            std::is_same_v<std::decay_t<LastArg>, no_subcommand>,
-            std::pair<dispatch_status, Ret>
-         >
-      {
-         static_assert( std::is_convertible_v<std::invoke_result_t<Reducer, std::tuple<const OtherArgs&...>>, Ret> );
-
-         dispatch_status status = dispatch_status::no_handler_for_nonterminal_subcommand;
-
-         if( maybe_call_visitor( std::forward<Visitor>(visitor), other_args... ) )
-            status = dispatch_status::successful_dispatch;
-
-         return {status, reduce( std::make_tuple( std::cref(other_args)... )  )};
-      }
-
-      template<typename... Args>
-      std::string get_subcommand_string( const std::tuple<const Args&...>& t ) {
-         static_assert( (has_name<Args>::value && ...) );
-
-         std::string result;
-
-         bool completed = reduce_tuple( result, t,
-            []( auto&& v ) -> std::string { return std::decay_t<decltype(v)>::name; },
-            []( std::string& accumulator, std::size_t index, const std::string& v ) -> bool {
-               if( index != 0 ) {
-                  if( index > 1 ) {
-                     accumulator += " ";
-                  }
-                  accumulator += v;
-               }
-               return true;
-            }
-         );
-
-         if( !completed ) return {};
-
-         return result;
-      }
-
-   } /// namespace detail
-
-   template<typename Dispatcher, typename Root>
-   auto dispatch( Dispatcher&& dispatcher, const Root& root ) -> std::pair<dispatch_status, std::string> {
-      return detail::dispatch_helper<std::string>(
-         []( const auto& t ) { return detail::get_subcommand_string(t); },
-         std::forward<Dispatcher>(dispatcher),
-         root
-      );
-   }
-
-} /// namespace eosio::cli_parser
-
-namespace eosio {
-   using subcommand_style = cli_parser::subcommand_style;
-
-   template<typename T, subcommand_style SubcommandStyle, typename... Us>
-   using subcommand = eosio::cli_parser::subcommand<T, SubcommandStyle, Us...>;
-}
diff --git a/programs/intrinsic-log-util/diff.cpp b/programs/intrinsic-log-util/diff.cpp
deleted file mode 100644
index 72d22ce33a3..00000000000
--- a/programs/intrinsic-log-util/diff.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "diff.hpp"
-
-#include <eosio/chain/exceptions.hpp>
-#include <eosio/chain/intrinsic_debug_log.hpp>
-
-#include <ostream>
-
-void exec_diff( subcommand_dispatcher_base& dispatcher,
-                const configuration::root& root,
-                const configuration::diff& diff  )
-{
-   dispatcher.stream << "diff was called" << std::endl;
-   idump((diff.first_log.generic_string())(diff.second_log.generic_string()));
-}
diff --git a/programs/intrinsic-log-util/diff.hpp b/programs/intrinsic-log-util/diff.hpp
deleted file mode 100644
index a8654d56b71..00000000000
--- a/programs/intrinsic-log-util/diff.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "root.hpp"
-
-namespace configuration {
-   struct root;
-
-   struct diff {
-      bfs::path first_log;
-      bfs::path second_log;
-   };
-}
-
-void exec_diff( subcommand_dispatcher_base& dispatcher,
-                const configuration::root& root,
-                const configuration::diff& diff  );
diff --git a/programs/intrinsic-log-util/intrinsic_log.hpp b/programs/intrinsic-log-util/intrinsic_log.hpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/programs/intrinsic-log-util/main.cpp b/programs/intrinsic-log-util/main.cpp
deleted file mode 100644
index e5c5550fcd0..00000000000
--- a/programs/intrinsic-log-util/main.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eosio/LICENSE.txt
- */
-#include "root.hpp"
-#include "diff.hpp"
-#include "print.hpp"
-
-#include "cli_parser.hpp"
-
-#include <eosio/chain/exceptions.hpp>
-
-#include <fc/io/json.hpp>
-
-#include <boost/program_options.hpp>
-#include <boost/exception/diagnostic_information.hpp>
-
-#include <cstring>
-#include <iostream>
-
-using namespace eosio;
-using namespace eosio::chain;
-
-namespace bpo = boost::program_options;
-
-struct print_block_subcommand
-   :  public configuration::print_block,
-      public subcommand<
-         print_block_subcommand,
-         subcommand_style::terminal_subcommand_with_positional_arguments
-      >
-{
-   static constexpr const char* name = "block";
-
-   static std::string get_description() {
-      return "Print a specific block";
-   }
-
-   void set_options( bpo::options_description& options ) {
-      options.add_options()
-         ("output-file,o", bpo::value<bfs::path>(),
-          "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
-      ;
-   }
-
-   bpo::positional_options_description
-   get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc ) {
-      options.add_options()
-         ("block-num", bpo::value<uint32_t>(&block_num),
-          "the block number to print")
-         ("trx-id", bpo::value<std::vector<std::string>>(),
-          "ID of transaction to print (optional)")
-      ;
-
-      return cli_parser::build_positional_descriptions( options, pos_desc, { "block-num" }, {}, "trx-id" );
-   }
-
-   void initialize( bpo::variables_map&& vm ) {
-      if( vm.count( "trx-id" ) ) {
-         for( const auto& trx_id : vm.at( "trx-id" ).as<std::vector<std::string>>() ) {
-            try {
-               trxs_filter.emplace_back( fc::variant( trx_id ).as<transaction_id_type>() );
-            } EOS_RETHROW_EXCEPTIONS( fc::exception, "invalid transaction id: ${trx_id}", ("trx_id", trx_id) )
-         }
-      }
-   }
-};
-
-struct print_blocks_subcommand
-   :  public configuration::print_blocks,
-      public subcommand<
-         print_blocks_subcommand,
-         subcommand_style::terminal_subcommand_without_positional_arguments
-      >
-{
-   static constexpr const char* name = "blocks";
-
-   static std::string get_description() {
-      return "Print a range of blocks";
-   }
-
-   void set_options( bpo::options_description& options ) {
-      options.add_options()
-         ("output-file,o", bpo::value<bfs::path>(),
-          "the file to write the output to (absolute or relative path).  If not specified then output is to stdout.")
-         ("first,f", bpo::value<uint32_t>(&first_block_num)->default_value(first_block_num),
-          "the first block number to print")
-         ("last,l", bpo::value<uint32_t>()->default_value(last_block_num),
-          "the first block number to print")
-      ;
-   }
-
-   void initialize( bpo::variables_map&& vm ) {
-      if( vm.count( "last" ) ) {
-         last_block_num = vm.at( "last" ).as<uint32_t>();
-         FC_ASSERT( last_block_num >= first_block_num, "invalid range" );
-      }
-   }
-};
-
-struct print_subcommand
-   :  public configuration::print,
-      public subcommand<
-         print_subcommand,
-         subcommand_style::only_contains_subcommands,
-         print_block_subcommand,
-         print_blocks_subcommand
-      >
-{
-   static constexpr const char* name = "print";
-
-   static std::string get_description() {
-      return "Print blocks in a log file";
-   }
-
-   void set_options( bpo::options_description& options ) {
-      options.add_options()
-         ("log-file", bpo::value<bfs::path>(), "path to the log file (required)")
-         ("no-pretty-print", bpo::bool_switch()->default_value(no_pretty_print), "avoid pretty printing")
-      ;
-   }
-
-   void initialize( bpo::variables_map&& vm ) {
-      FC_ASSERT( vm.count( "log-file" ) > 0, "path to log file must be provided (use --log-file)" );
-      log_path = bfs::canonical( vm.at( "log-file" ).as<bfs::path>() );
-   }
-};
-
-struct diff_subcommand
-   :  public configuration::diff,
-      public subcommand<
-         diff_subcommand,
-         subcommand_style::terminal_subcommand_with_positional_arguments
-      >
-{
-   static constexpr const char* name = "diff";
-
-   static std::string get_description() {
-      return "Find the differences between two log files";
-   }
-
-   void set_options( bpo::options_description& options ) {
-      options.add_options()
-         ("start-block", bpo::value<uint32_t>()->default_value(0),
-          "ignore any differences prior to this block")
-      ;
-   }
-
-   bpo::positional_options_description
-   get_positional_options( bpo::options_description& options, cli_parser::positional_descriptions& pos_desc ) {
-      options.add_options()
-         ("first-log", bpo::value<bfs::path>(&first_log),
-         "path to the first log file to compare")
-         ("second-log", bpo::value<bfs::path>(&second_log),
-         "path to the second log file to compare")
-      ;
-
-      return cli_parser::build_positional_descriptions( options, pos_desc, {
-         "first-log", "second-log"
-      } );
-   }
-
-   void initialize( bpo::variables_map&& vm ) {
-      first_log  = bfs::canonical( first_log );
-      second_log = bfs::canonical( second_log );
-   }
-};
-
-struct root_command
-   :  public configuration::root,
-      public subcommand<
-         root_command,
-         subcommand_style::only_contains_subcommands,
-         print_subcommand,
-         diff_subcommand
-      >
-{
-   static constexpr const char* name = "Generic";
-
-   static std::string get_description() {
-      return "Utility to inspect intrinsic log files";
-   }
-
-   void set_options( bpo::options_description& options ) {
-      options.add_options()
-         ("help,h", bpo::bool_switch(&print_help)->default_value(print_help), "Print this help message and exit.")
-         ("no-detail", bpo::bool_switch()->default_value(no_detail), "Temporarily added for testing purposes.")
-      ;
-   }
-};
-
-class subcommand_dispatcher : public subcommand_dispatcher_base {
-public:
-   subcommand_dispatcher( std::ostream& stream )
-   :subcommand_dispatcher_base( stream )
-   {}
-
-   void operator()( const root_command& root, const diff_subcommand& diff ) {
-      exec_diff( *this, root, diff );
-   }
-
-   void operator()( const root_command& root, const print_subcommand& print, const print_blocks_subcommand& blocks ) {
-      exec_print_blocks( *this, root, print, blocks );
-   }
-
-   void operator()( const root_command& root, const print_subcommand& print, const print_block_subcommand& block ) {
-      exec_print_block( *this, root, print, block );
-   }
-};
-
-int main( int argc, const char** argv ) {
-   try {
-      root_command rc;
-      auto parse_result = cli_parser::parse_program_options_extended( rc, argc, argv, std::cout, &std::cerr );
-
-      if( std::holds_alternative<cli_parser::parse_failure>( parse_result ) ) {
-         FC_ASSERT( false, "parse error occurred" );
-      } else if( std::holds_alternative<cli_parser::autocomplete_failure>( parse_result ) ) {
-         return -1;
-      } else if( std::holds_alternative<cli_parser::autocomplete_success>( parse_result ) ) {
-         return 0;
-      }
-
-      const auto& pm = std::get<cli_parser::parse_metadata>( parse_result );
-
-      if( argc == 1 || rc.print_help ) {
-         cli_parser::print_subcommand_help( std::cout, bfs::path( argv[0] ).filename().generic_string(), pm );
-         return 0;
-      }
-
-      std::ios::sync_with_stdio(false); // for potential performance boost for large log files
-
-      subcommand_dispatcher d( std::cout );
-      auto dispatch_result = cli_parser::dispatch( d, rc );
-
-      FC_ASSERT( dispatch_result.first != cli_parser::dispatch_status::no_handler_for_terminal_subcommand,
-                 "The ${subcommand} sub-command has not been implemented yet.",
-                 ("subcommand", dispatch_result.second)
-      );
-
-      if( dispatch_result.first == cli_parser::dispatch_status::no_handler_for_nonterminal_subcommand ) {
-         std::cout << "\033[0;31m"
-                   << "The sub-command "
-                   << "\033[1;31m" << dispatch_result.second << "\033[0;31m"
-                   << " cannot be called by itself."
-                   << "\033[0m"
-                   << std::endl;
-         cli_parser::print_subcommand_help( std::cout, bfs::path( argv[0] ).filename().generic_string(), pm );
-         return -1;
-      }
-
-   } catch( const fc::exception& e ) {
-      elog( "${e}", ("e", e.to_detail_string()));
-      return -1;
-   } catch( const boost::exception& e ) {
-      elog("${e}", ("e",boost::diagnostic_information(e)));
-      return -1;
-   } catch( const std::exception& e ) {
-      elog("${e}", ("e",e.what()));
-      return -1;
-   } catch( ... ) {
-      elog("unknown exception");
-      return -1;
-   }
-
-   return 0;
-}
diff --git a/programs/intrinsic-log-util/print.cpp b/programs/intrinsic-log-util/print.cpp
deleted file mode 100644
index f5483bc9af0..00000000000
--- a/programs/intrinsic-log-util/print.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "print.hpp"
-
-#include <eosio/chain/exceptions.hpp>
-#include <eosio/chain/intrinsic_debug_log.hpp>
-
-#include <ostream>
-
-void exec_print_block(  subcommand_dispatcher_base& dispatcher,
-                        const configuration::root& root,
-                        const configuration::print& print,
-                        const configuration::print_block&  block )
-{
-   dispatcher.stream << "print block was called" << std::endl;
-   idump((print.log_path.generic_string())(block.block_num)(block.trxs_filter));
-}
-
-void exec_print_blocks( subcommand_dispatcher_base& dispatcher,
-                        const configuration::root& root,
-                        const configuration::print& print,
-                        const configuration::print_blocks& blocks )
-{
-   dispatcher.stream << "print blocks was called" << std::endl;
-   idump((print.log_path.generic_string())(blocks.first_block_num)(blocks.last_block_num));
-}
diff --git a/programs/intrinsic-log-util/print.hpp b/programs/intrinsic-log-util/print.hpp
deleted file mode 100644
index 7eb32cab8a0..00000000000
--- a/programs/intrinsic-log-util/print.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "root.hpp"
-
-#include <eosio/chain/types.hpp>
-
-namespace configuration {
-   struct print {
-      bfs::path log_path;
-      bool      no_pretty_print = false;
-   };
-
-   struct print_block {
-      uint32_t                                        block_num = 0;
-      std::vector<eosio::chain::transaction_id_type>  trxs_filter;
-   };
-
-   struct print_blocks {
-      uint32_t first_block_num = 0;
-      uint32_t last_block_num = std::numeric_limits<uint32_t>::max();
-   };
-
-}
-
-void exec_print_block(  subcommand_dispatcher_base& dispatcher,
-                        const configuration::root& root,
-                        const configuration::print& print,
-                        const configuration::print_block&  block );
-
-void exec_print_blocks( subcommand_dispatcher_base& dispatcher,
-                        const configuration::root& root,
-                        const configuration::print& print,
-                        const configuration::print_blocks& blocks );
diff --git a/programs/intrinsic-log-util/root.hpp b/programs/intrinsic-log-util/root.hpp
deleted file mode 100644
index 0f17ade8d88..00000000000
--- a/programs/intrinsic-log-util/root.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <iosfwd>
-
-#include <boost/filesystem.hpp>
-
-namespace bfs = boost::filesystem;
-
-namespace configuration {
-   struct root {
-      bool print_help = false;
-      bool no_detail = false;
-   };
-}
-
-class subcommand_dispatcher_base {
-public:
-   subcommand_dispatcher_base( std::ostream& stream )
-   :stream( stream )
-   {}
-
-public:
-   std::ostream& stream;
-};
diff --git a/unittests/intrinsic_debug_log_tests.cpp.bak b/unittests/intrinsic_debug_log_tests.cpp.bak
deleted file mode 100644
index 399d1eeb7d7..00000000000
--- a/unittests/intrinsic_debug_log_tests.cpp.bak
+++ /dev/null
@@ -1,352 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE
- */
-#include <eosio/chain/intrinsic_debug_log.hpp>
-
-#include <fc/filesystem.hpp>
-#include <fc/io/json.hpp>
-#include <fstream>
-#include <boost/test/unit_test.hpp>
-
-using namespace eosio;
-using namespace chain;
-
-BOOST_AUTO_TEST_SUITE(intrinsic_debug_log_tests)
-
-BOOST_AUTO_TEST_CASE(basic_test) {
-   fc::temp_directory  tempdir;
-   auto log_path = tempdir.path() / "intrinsic.log";
-   {
-      auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
-      name alice("alice");
-      name foo("foo");
-      intrinsic_debug_log log( log_path );
-      log.open();
-      log.start_block( 2u );
-      log.start_transaction( transaction_id_type() );
-      log.start_action( 1ull, alice, alice, foo );
-      log.acknowledge_intrinsic_without_recording();
-      log.record_intrinsic( digest, digest );
-      log.finish_block();
-      log.close();
-   }
-
-   std::fstream log_stream( log_path.generic_string().c_str(), std::ios::in | std::ios::binary );
-   log_stream.seekg( 0, std::ios::end );
-   std::size_t file_size = log_stream.tellg();
-   log_stream.seekg( 0, std::ios::beg );
-
-   vector<char> buffer( file_size );
-   log_stream.read( buffer.data(), file_size );
-   log_stream.close();
-
-   const char* expected =
-      "00" "02000000" // start of block 2
-      "01" "0000000000000000000000000000000000000000000000000000000000000000" // start of transaction
-      "02"            // start of action with:
-      "0100000000000000"  // global sequence number of 1,
-      "0000000000855c34"  // receiver "alice",
-      "0000000000855c34"  // first_receiver "alice",
-      "000000000000285d"  // and action_name "foo".
-      "03"                                                            // recording an intrinsic with:
-      "01000000"                                                          // an ordinal of 1,
-      "0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20"  // this arguments hash,
-      "0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20"  // and this WASM lineary memory hash.
-      "00" "0000000000000000" // end of the block with pointer to position of the start of the block
-   ;
-
-   BOOST_CHECK_EQUAL( fc::to_hex( buffer ), expected );
-}
-
-BOOST_AUTO_TEST_CASE(iterate_test) {
-   fc::temp_directory  tempdir;
-   auto log_path = tempdir.path() / "intrinsic.log";
-   auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
-   name alice("alice");
-   name bob("bob");
-   name foo("foo");
-   name bar("bar");
-
-   intrinsic_debug_log log( log_path );
-   log.open();
-   log.close();
-
-   log.open( intrinsic_debug_log::open_mode::read_only );
-   BOOST_CHECK( log.begin_block() == log.end_block() );
-   log.close();
-
-   log.open();
-   log.start_block( 2u );
-   log.start_transaction( transaction_id_type() );
-   log.start_action( 1ull, alice, alice, foo );
-   log.acknowledge_intrinsic_without_recording();
-   log.record_intrinsic( digest, digest );
-   log.finish_block();
-   log.close();
-
-   log.open( intrinsic_debug_log::open_mode::read_only );
-   BOOST_CHECK( log.begin_block() != log.end_block() );
-   log.close();
-
-   log.open();
-   log.start_block( 4u );
-   log.start_transaction( transaction_id_type() );
-   log.start_transaction( transaction_id_type() );
-   log.start_action( 2ull, alice, alice, bar );
-   log.record_intrinsic( digest, digest );
-   log.record_intrinsic( digest, digest );
-   log.start_action( 3ull, bob, alice, bar );
-   log.finish_block();
-   log.close();
-
-   log.open( intrinsic_debug_log::open_mode::read_only );
-   std::vector< std::pair< uint32_t, uint32_t > > expected_blocks = {
-      {2u, 1u},
-      {4u, 2u}
-   };
-
-   {
-      auto block_itr = log.begin_block();
-      const auto block_end_itr = log.end_block();
-      for( auto itr = expected_blocks.begin(); block_itr != block_end_itr; ++block_itr, ++itr ) {
-         BOOST_REQUIRE( itr != expected_blocks.end() );
-         BOOST_CHECK_EQUAL( block_itr->block_num, itr->first );
-         BOOST_CHECK_EQUAL( block_itr->transactions.size(), itr->second );
-         wdump( (fc::json::to_pretty_string(*block_itr)) );
-      }
-
-      for( auto itr = expected_blocks.rbegin(); itr != expected_blocks.rend(); ++itr ) {
-         --block_itr;
-         BOOST_CHECK_EQUAL( block_itr->block_num, itr->first );
-         BOOST_CHECK_EQUAL( block_itr->transactions.size(), itr->second );
-      }
-      log.close(); // invalidates block_itr;
-   }
-
-   log.open( intrinsic_debug_log::open_mode::read_only );
-   {
-      auto block_itr = log.end_block();
-      --block_itr;
-      auto itr = expected_blocks.rbegin();
-      for( ; itr != expected_blocks.rend() && itr->first > 3u; ++itr ) {
-         --block_itr;
-         // Avoid dereferencing block_itr to not read block and add to cache.
-      }
-
-      BOOST_REQUIRE( itr != expected_blocks.rend() );
-      BOOST_REQUIRE_EQUAL( itr->first, 2u ); // ensure we are at the expected block
-
-      // block_itr should also be point to a valid block (the same one with a block height of 2).
-      // However, it hasn't been cached yet since we have not yet dereferenced it.
-
-      BOOST_REQUIRE_EQUAL( block_itr->block_num, 2u );
-   }
-}
-
-BOOST_AUTO_TEST_CASE(difference_test) {
-   fc::temp_directory  tempdir;
-   auto log1_path = tempdir.path() / "intrinsic1.log";
-   auto log2_path = tempdir.path() / "intrinsic2.log";
-   auto trx_id = fc::variant("0102030405060708090a0b0c0d0e0f100102030405060708090a0b0c0d0e0f10").as<transaction_id_type>();
-   auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
-   name alice("alice");
-   name bob("bob");
-   name foo("foo");
-   name bar("bar");
-
-   intrinsic_debug_log log1( log1_path );
-   {
-      log1.open();
-      log1.start_block( 2u );
-      log1.start_transaction( transaction_id_type() );
-      log1.start_action( 1ull, alice, alice, foo );
-      log1.acknowledge_intrinsic_without_recording();
-      log1.record_intrinsic( digest, digest );
-      log1.finish_block();
-      log1.start_block( 4u );
-      log1.start_transaction( trx_id );
-      log1.start_action( 2ull, alice, alice, bar );
-      log1.record_intrinsic( digest, digest );
-      log1.record_intrinsic( digest, digest );
-      log1.start_action( 3ull, bob, alice, bar );
-      log1.finish_block();
-      log1.close();
-   }
-
-   intrinsic_debug_log log2( log2_path );
-   {
-      log2.open();
-      log2.start_block( 2u );
-      log2.start_transaction( transaction_id_type() );
-      log2.start_action( 1ull, alice, alice, foo );
-      log2.acknowledge_intrinsic_without_recording();
-      log2.record_intrinsic( digest, digest );
-      log2.finish_block();
-      log2.start_block( 4u );
-      log2.start_transaction( trx_id );
-      log2.start_action( 2ull, alice, alice, bar );
-      log2.record_intrinsic( digest, digest );
-      log2.start_action( 3ull, bob, alice, bar );
-      log2.finish_block();
-      log2.close();
-   }
-
-   auto result = intrinsic_debug_log::find_first_difference( log1, log2 );
-   BOOST_REQUIRE( result.has_value() );
-
-   wdump( (fc::json::to_pretty_string(*result)) );
-
-   BOOST_CHECK_EQUAL( result->block_num, 4u );
-   BOOST_CHECK_EQUAL( result->trx_id, trx_id );
-   BOOST_CHECK_EQUAL( result->global_sequence_num, 2ull );
-   BOOST_CHECK_EQUAL( result->receiver.to_string(), "alice" );
-   BOOST_CHECK_EQUAL( result->first_receiver.to_string(), "alice" );
-   BOOST_CHECK_EQUAL( result->action_name.to_string(), "bar" );
-   BOOST_CHECK_EQUAL( result->lhs_recorded_intrinsics.size(), 2 );
-   BOOST_CHECK_EQUAL( result->rhs_recorded_intrinsics.size(), 1 );
-}
-
-BOOST_AUTO_TEST_CASE(equivalence_test) {
-   fc::temp_directory  tempdir;
-   auto log1_path = tempdir.path() / "intrinsic1.log";
-   auto log2_path = tempdir.path() / "intrinsic2.log";
-   auto trx_id = fc::variant("0102030405060708090a0b0c0d0e0f100102030405060708090a0b0c0d0e0f10").as<transaction_id_type>();
-   auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
-   name alice("alice");
-   name bob("bob");
-   name foo("foo");
-   name bar("bar");
-
-   intrinsic_debug_log log1( log1_path );
-   {
-      log1.open();
-      log1.start_block( 1u );
-      log1.finish_block();
-      log1.start_block( 2u );
-      log1.start_transaction( transaction_id_type() );
-      log1.abort_transaction();
-      log1.start_transaction( transaction_id_type() );
-      log1.start_action( 1ull, alice, alice, foo );
-      log1.acknowledge_intrinsic_without_recording();
-      log1.record_intrinsic( digest, digest );
-      log1.finish_block();
-      log1.start_block( 4u );
-      log1.start_transaction( trx_id );
-      log1.start_action( 2ull, alice, alice, bar );
-      log1.record_intrinsic( digest, digest );
-      log1.start_action( 3ull, bob, alice, bar );
-      log1.finish_block();
-      log1.start_block( 5u );
-      log1.start_transaction( transaction_id_type() );
-      log1.start_action( 4ull, alice, alice, foo );
-      log1.abort_block();
-      log1.start_block( 5u );
-      log1.close();
-   }
-
-   intrinsic_debug_log log2( log2_path );
-   {
-      log2.open();
-      log2.start_block( 2u );
-      log2.start_transaction( transaction_id_type() );
-      log2.start_action( 1ull, alice, alice, foo );
-      log2.acknowledge_intrinsic_without_recording();
-      log2.record_intrinsic( digest, digest );
-      log2.finish_block();
-      log2.start_block( 4u );
-      log2.start_transaction( trx_id );
-      log2.start_action( 2ull, alice, alice, bar );
-      log2.record_intrinsic( digest, digest );
-      log2.start_action( 3ull, bob, alice, bar );
-      log2.finish_block();
-      log2.close();
-   }
-
-   auto result = intrinsic_debug_log::find_first_difference( log1, log2 );
-   if( result ) {
-      wdump( (fc::json::to_pretty_string(*result)) );
-   }
-   BOOST_REQUIRE( !result );
-}
-
-BOOST_AUTO_TEST_CASE(auto_finish_block_test) {
-   fc::temp_directory  tempdir;
-   auto ref_log1_path = tempdir.path() / "intrinsic1.log";
-   auto ref_log2_path = tempdir.path() / "intrinsic2.log";
-   auto log_path      = tempdir.path() / "intrinsic.log";
-   auto trx_id = fc::variant("0102030405060708090a0b0c0d0e0f100102030405060708090a0b0c0d0e0f10").as<transaction_id_type>();
-   auto digest = fc::variant("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20").as<digest_type>();
-   name alice("alice");
-   name foo("foo");
-
-   intrinsic_debug_log ref_log1( ref_log1_path ); // reference log 1
-   {
-      ref_log1.open();
-      ref_log1.start_block( 1u );
-      ref_log1.finish_block();
-      ref_log1.close();
-   }
-
-   intrinsic_debug_log ref_log2( ref_log2_path ); // reference log 2
-   {
-      ref_log2.open();
-      ref_log2.start_block( 1u );
-      ref_log2.finish_block();
-      ref_log2.start_block( 2u );
-      ref_log2.start_transaction( trx_id );
-      ref_log2.start_action( 1ull, alice, alice, foo );
-      ref_log2.acknowledge_intrinsic_without_recording();
-      ref_log2.record_intrinsic( digest, digest );
-      ref_log2.finish_block();
-      ref_log2.close();
-   }
-
-   // Mode 1 (default mode): do not automatically finish any pending block.
-   // This mode enforces that the log remains consistent with block activity (truncate blocks if necessary).
-   {
-      {
-         intrinsic_debug_log log( log_path );
-         log.open();
-         log.start_block( 1u );
-         log.finish_block();
-         log.start_block( 2u );
-         log.start_transaction( trx_id );
-         log.start_action( 1ull, alice, alice, foo );
-         log.acknowledge_intrinsic_without_recording();
-         log.record_intrinsic( digest, digest );
-      }
-
-      intrinsic_debug_log log( log_path );
-      log.open( intrinsic_debug_log::open_mode::read_only );
-
-      auto result = intrinsic_debug_log::find_first_difference( log, ref_log1 );
-      BOOST_REQUIRE( !result );
-   }
-
-   // Mode 2: automatically finish any pending block.
-   // This mode keeps recent information in log during any shutdown by automatically finish the block even if it
-   // is not explicitly called. This may result in the data recorded for last block in the log to not have all
-   // the data that actually occurred in that block.
-   {
-      {
-         intrinsic_debug_log log( log_path );
-         log.open( intrinsic_debug_log::open_mode::continue_existing_and_auto_finish_block );
-         log.start_block( 1u );
-         log.finish_block();
-         log.start_block( 2u );
-         log.start_transaction( trx_id);
-         log.start_action( 1ull, alice, alice, foo );
-         log.acknowledge_intrinsic_without_recording();
-         log.record_intrinsic( digest, digest );
-      }
-
-      intrinsic_debug_log log( log_path );
-      log.open( intrinsic_debug_log::open_mode::read_only );
-
-      auto result = intrinsic_debug_log::find_first_difference( log, ref_log2 );
-      BOOST_REQUIRE( !result );
-   }
-}
-
-BOOST_AUTO_TEST_SUITE_END()

From 3f2828743a41caa8ba38a7d52df974d52fe8e1da Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 20 Sep 2019 13:04:36 -0400
Subject: [PATCH 1324/1648] Upgrade to Boost 1.71.0

---
 scripts/.build_vars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/.build_vars b/scripts/.build_vars
index 8e85e5ac675..75dc9a38c10 100644
--- a/scripts/.build_vars
+++ b/scripts/.build_vars
@@ -30,7 +30,7 @@ export INSTALL_MONGO=${INSTALL_MONGO:-false}
 
 # BOOST
 export BOOST_VERSION_MAJOR=1
-export BOOST_VERSION_MINOR=70
+export BOOST_VERSION_MINOR=71
 export BOOST_VERSION_PATCH=0
 export BOOST_VERSION=${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH}
 export BOOST_ROOT=${BOOST_LOCATION:-${SRC_DIR}/boost_${BOOST_VERSION}}

From 4d49dd4ed50f014e25965a8d5766fc0568ec2acd Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Fri, 20 Sep 2019 14:58:04 -0400
Subject: [PATCH 1325/1648] Fix incorrect exception type and cleanup code

---
 unittests/wasm_tests.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index 005b908edf9..94ce93abac1 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -1447,7 +1447,7 @@ BOOST_FIXTURE_TEST_CASE( lotso_stack_7, TESTER ) try {
       ss << "(param i32)";
    ss << "  )";
    ss << ")";
-   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), wasm_serialization_error);
+   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), wasm_execution_error);
    produce_blocks(1);
    }
 } FC_LOG_AND_RETHROW()
@@ -1488,7 +1488,7 @@ BOOST_FIXTURE_TEST_CASE( lotso_stack_9, TESTER ) try {
       ss << "(local f32)";
    ss << "  )";
    ss << ")";
-   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), wasm_serialization_error);
+   BOOST_CHECK_THROW(set_code(N(stackz), ss.str().c_str()), wasm_execution_error);
    produce_blocks(1);
    }
 } FC_LOG_AND_RETHROW()
@@ -1860,9 +1860,7 @@ BOOST_AUTO_TEST_CASE( code_size )  try {
    std::vector<U8> code_end = { 0x0b };
  
    std::vector<U8> code_function_body;
-   for(unsigned int i = 0; i < wasm_constraints::maximum_code_size; ++i) {
-      code_function_body.push_back(0x01);
-   }
+   code_function_body.insert(code_function_body.end(), wasm_constraints::maximum_code_size, 0x01);
 
    std::vector<U8> code;
    code.insert(code.end(), code_start.begin(), code_start.end());

From 8ed4b58024f550e939f45e56a076cd60692b3ac7 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 20 Sep 2019 22:42:37 -0400
Subject: [PATCH 1326/1648] set immutable chain_id during construction of
 controller; fixes a bug introduced in EOSIO/eos#7841 in which plugins like
 net_plugin were incorrectly using the default chain ID

---
 libraries/chain/controller.cpp                | 49 ++++++----
 .../chain/include/eosio/chain/controller.hpp  |  6 +-
 .../chain/include/eosio/chain/snapshot.hpp    |  4 +
 libraries/chain/snapshot.cpp                  | 12 ++-
 .../testing/include/eosio/testing/tester.hpp  | 24 ++---
 libraries/testing/tester.cpp                  | 22 +++--
 plugins/chain_plugin/chain_plugin.cpp         | 92 +++++++++----------
 unittests/snapshot_tests.cpp                  |  2 +-
 8 files changed, 118 insertions(+), 93 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 506065ba6d6..612249bc830 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -225,7 +225,7 @@ struct controller_impl {
    authorization_manager          authorization;
    protocol_feature_manager       protocol_features;
    controller::config             conf;
-   chain_id_type                  chain_id; // read by thread_pool threads, value will not be changed after initialization/snapshot
+   const chain_id_type            chain_id; // read by thread_pool threads, value will not be changed
    optional<fc::time_point>       replay_head_time;
    db_read_mode                   read_mode = db_read_mode::SPECULATIVE;
    bool                           in_trx_requiring_checks = false; ///< if true, checks that are normally skipped on replay (e.g. auth checks) cannot be skipped
@@ -281,7 +281,7 @@ struct controller_impl {
       apply_handlers[receiver][make_pair(contract,action)] = v;
    }
 
-   controller_impl( const controller::config& cfg, controller& s, protocol_feature_set&& pfs  )
+   controller_impl( const controller::config& cfg, controller& s, protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id )
    :self(s),
     db( cfg.state_dir,
         cfg.read_only ? database::read_only : database::read_write,
@@ -296,9 +296,21 @@ struct controller_impl {
     authorization( s, db ),
     protocol_features( std::move(pfs) ),
     conf( cfg ),
+    chain_id( (db.revision() >= 1) ? db.get<global_property_object>().chain_id
+                                   : ( expected_chain_id ? *expected_chain_id
+                                                         : genesis_state().compute_chain_id() ) ),
     read_mode( cfg.read_mode ),
     thread_pool( "chain", cfg.thread_pool_size )
    {
+      if( expected_chain_id && db.revision() >= 1 ) {
+         const auto& actual_chain_id = db.get<global_property_object>().chain_id;
+         EOS_ASSERT( *expected_chain_id == actual_chain_id,
+                     database_exception,
+                     "Unexpected chain ID in state. Expected: ${expected}. Actual: ${actual}.",
+                     ("expected", *expected_chain_id)("actual", actual_chain_id)
+         );
+      }
+
       fork_db.open( [this]( block_timestamp_type timestamp,
                             const flat_set<digest_type>& cur_features,
                             const vector<digest_type>& new_features )
@@ -546,6 +558,11 @@ struct controller_impl {
 
    void startup(std::function<bool()> shutdown, const genesis_state& genesis) {
       EOS_ASSERT( db.revision() < 1, database_exception, "This version of controller::startup only works with a fresh state database." );
+      const auto& genesis_chain_id = genesis.compute_chain_id();
+      EOS_ASSERT( genesis_chain_id == chain_id, misc_exception,
+                  "genesis state provided to startup does not match the chain ID that controller was constructed with",
+                  ("genesis_chain_id", genesis_chain_id)("controller_chain_id", chain_id)
+      );
 
       if( fork_db.head() ) {
          if( read_mode == db_read_mode::IRREVERSIBLE && fork_db.head()->id != fork_db.root()->id ) {
@@ -575,7 +592,6 @@ struct controller_impl {
       EOS_ASSERT( db.revision() >= 1, database_exception, "This version of controller::startup does not work with a fresh state database." );
       EOS_ASSERT( fork_db.head(), fork_database_exception, "No existing fork database despite existing chain state. Replay required." );
 
-      chain_id = db.get<global_property_object>().chain_id;
       uint32_t lib_num = fork_db.root()->block_num;
       auto first_block_num = blog.first_block_num();
       if( blog.head() ) {
@@ -836,13 +852,13 @@ struct controller_impl {
       resource_limits.add_to_snapshot(snapshot);
    }
 
-   static fc::optional<genesis_state> extract_legacy_genesis_state( const snapshot_reader_ptr& snapshot, uint32_t version ) {
+   static fc::optional<genesis_state> extract_legacy_genesis_state( snapshot_reader& snapshot, uint32_t version ) {
       fc::optional<genesis_state> genesis;
       using v2 = legacy::snapshot_global_property_object_v2;
 
       if (std::clamp(version, v2::minimum_version, v2::maximum_version) == version ) {
          genesis.emplace();
-         snapshot->read_section<genesis_state>([&genesis=*genesis]( auto &section ){
+         snapshot.read_section<genesis_state>([&genesis=*genesis]( auto &section ){
             section.read_row(genesis);
          });
       }
@@ -905,7 +921,7 @@ struct controller_impl {
             using v2 = legacy::snapshot_global_property_object_v2;
 
             if (std::clamp(header.version, v2::minimum_version, v2::maximum_version) == header.version ) {
-               fc::optional<genesis_state> genesis = extract_legacy_genesis_state(snapshot, header.version);
+               fc::optional<genesis_state> genesis = extract_legacy_genesis_state(*snapshot, header.version);
                EOS_ASSERT( genesis, snapshot_exception,
                            "Snapshot indicates chain_snapshot_header version 2, but does not contain a genesis_state. "
                            "It must be corrupted.");
@@ -942,8 +958,10 @@ struct controller_impl {
       });
 
       const auto& gpo = db.get<global_property_object>();
-      // ensure chain_id is populated from global_property_object's chain_id
-      chain_id = gpo.chain_id;
+      EOS_ASSERT( gpo.chain_id == chain_id, misc_exception,
+                  "chain ID in snapshot does not match the chain ID that controller was constructed with",
+                  ("snapshot_chain_id", gpo.chain_id)("controller_chain_id", chain_id)
+      );
    }
 
    sha256 calculate_integrity_hash() const {
@@ -1004,7 +1022,6 @@ struct controller_impl {
       });
 
       genesis.initial_configuration.validate();
-      chain_id = genesis.compute_chain_id();
       db.create<global_property_object>([&genesis,&chain_id=this->chain_id](auto& gpo ){
          gpo.configuration = genesis.initial_configuration;
          gpo.chain_id = chain_id;
@@ -2348,13 +2365,13 @@ const protocol_feature_manager& controller::get_protocol_feature_manager()const
    return my->protocol_features;
 }
 
-controller::controller( const controller::config& cfg )
-:my( new controller_impl( cfg, *this, protocol_feature_set{} ) )
+controller::controller( const controller::config& cfg, const fc::optional<chain_id_type>& expected_chain_id )
+:my( new controller_impl( cfg, *this, protocol_feature_set{}, expected_chain_id ) )
 {
 }
 
-controller::controller( const config& cfg, protocol_feature_set&& pfs )
-:my( new controller_impl( cfg, *this, std::move(pfs) ) )
+controller::controller( const config& cfg, protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id )
+:my( new controller_impl( cfg, *this, std::move(pfs), expected_chain_id ) )
 {
 }
 
@@ -3149,9 +3166,9 @@ fc::optional<uint64_t> controller::convert_exception_to_error_code( const fc::ex
    return e_ptr->error_code;
 }
 
-chain_id_type controller::extract_chain_id(const snapshot_reader_ptr& snapshot) {
+chain_id_type controller::extract_chain_id(snapshot_reader& snapshot) {
    chain_snapshot_header header;
-   snapshot->read_section<chain_snapshot_header>([&header]( auto &section ){
+   snapshot.read_section<chain_snapshot_header>([&header]( auto &section ){
       section.read_row(header);
       header.validate();
    });
@@ -3163,7 +3180,7 @@ chain_id_type controller::extract_chain_id(const snapshot_reader_ptr& snapshot)
    }
 
    chain_id_type chain_id;
-   snapshot->read_section<global_property_object>([&chain_id]( auto &section ){
+   snapshot.read_section<global_property_object>([&chain_id]( auto &section ){
       snapshot_global_property_object global_properties;
       section.read_row(global_properties);
       chain_id = global_properties.chain_id;
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 959820d93c7..e4adf700c10 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -100,8 +100,8 @@ namespace eosio { namespace chain {
             incomplete  = 3, ///< this is an incomplete block (either being produced by a producer or speculatively produced by a node)
          };
 
-         explicit controller( const config& cfg );
-         controller( const config& cfg, protocol_feature_set&& pfs );
+         controller( const config& cfg, const fc::optional<chain_id_type>& expected_chain_id );
+         controller( const config& cfg, protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id );
          ~controller();
 
          void add_indices();
@@ -328,7 +328,7 @@ namespace eosio { namespace chain {
             return pretty_output;
          }
 
-      static chain_id_type extract_chain_id(const snapshot_reader_ptr& snapshot);
+      static chain_id_type extract_chain_id(snapshot_reader& snapshot);
 
       private:
          friend class apply_context;
diff --git a/libraries/chain/include/eosio/chain/snapshot.hpp b/libraries/chain/include/eosio/chain/snapshot.hpp
index 618e8d36088..69f89987912 100644
--- a/libraries/chain/include/eosio/chain/snapshot.hpp
+++ b/libraries/chain/include/eosio/chain/snapshot.hpp
@@ -279,6 +279,8 @@ namespace eosio { namespace chain {
 
       virtual void validate() const = 0;
 
+      virtual void return_to_header() = 0;
+
       virtual ~snapshot_reader(){};
 
       protected:
@@ -316,6 +318,7 @@ namespace eosio { namespace chain {
          bool read_row( detail::abstract_snapshot_row_reader& row_reader ) override;
          bool empty ( ) override;
          void clear_section() override;
+         void return_to_header() override;
 
       private:
          const fc::variant& snapshot;
@@ -352,6 +355,7 @@ namespace eosio { namespace chain {
          bool read_row( detail::abstract_snapshot_row_reader& row_reader ) override;
          bool empty ( ) override;
          void clear_section() override;
+         void return_to_header() override;
 
       private:
          bool validate_section() const;
diff --git a/libraries/chain/snapshot.cpp b/libraries/chain/snapshot.cpp
index e226a4f4886..66966ef6be5 100644
--- a/libraries/chain/snapshot.cpp
+++ b/libraries/chain/snapshot.cpp
@@ -30,6 +30,7 @@ void variant_snapshot_writer::finalize() {
 
 variant_snapshot_reader::variant_snapshot_reader(const fc::variant& snapshot)
 :snapshot(snapshot)
+,cur_section(nullptr)
 ,cur_row(0)
 {
 }
@@ -114,6 +115,10 @@ void variant_snapshot_reader::clear_section() {
    cur_row = 0;
 }
 
+void variant_snapshot_reader::return_to_header() {
+   clear_section();
+}
+
 ostream_snapshot_writer::ostream_snapshot_writer(std::ostream& snapshot)
 :snapshot(snapshot)
 ,header_pos(snapshot.tellp())
@@ -336,6 +341,11 @@ void istream_snapshot_reader::clear_section() {
    cur_row = 0;
 }
 
+void istream_snapshot_reader::return_to_header() {
+   snapshot.seekg( header_pos );
+   clear_section();
+}
+
 integrity_hash_snapshot_writer::integrity_hash_snapshot_writer(fc::sha256::encoder& enc)
 :enc(enc)
 {
@@ -358,4 +368,4 @@ void integrity_hash_snapshot_writer::finalize() {
    // no-op for structural details
 }
 
-}}
\ No newline at end of file
+}}
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 508fde8118b..60224544b23 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -163,13 +163,13 @@ namespace eosio { namespace testing {
 
          void              close();
          template <typename Lambda>
-         void              open( protocol_feature_set&& pfs, Lambda lambda );
+         void              open( protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id, Lambda lambda );
          void              open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot );
          void              open( protocol_feature_set&& pfs, const genesis_state& genesis );
-         void              open( protocol_feature_set&& pfs );
+         void              open( protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id = {} );
          void              open( const snapshot_reader_ptr& snapshot );
          void              open( const genesis_state& genesis );
-         void              open();
+         void              open( const fc::optional<chain_id_type>& expected_chain_id = {} );
          bool              is_same_chain( base_tester& other );
 
          virtual signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) ) = 0;
@@ -380,6 +380,13 @@ namespace eosio { namespace testing {
          void preactivate_protocol_features(const vector<digest_type> feature_digests);
          void preactivate_all_builtin_protocol_features();
 
+         static genesis_state default_genesis() {
+            genesis_state genesis;
+            genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
+            genesis.initial_key = get_public_key( config::system_account_name, "active" );
+
+            return genesis;
+         }
 
          static std::pair<controller::config, genesis_state> default_config(const fc::temp_directory& tempdir) {
             controller::config cfg;
@@ -391,17 +398,13 @@ namespace eosio { namespace testing {
             cfg.reversible_guard_size = 0;
             cfg.contracts_console = true;
 
-            genesis_state genesis;
-            genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.000");
-            genesis.initial_key = get_public_key( config::system_account_name, "active" );
-
             for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
                if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
                   cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
                else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
                   cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
             }
-            return {cfg, genesis};
+            return {cfg, default_genesis()};
          }
 
       protected:
@@ -418,7 +421,6 @@ namespace eosio { namespace testing {
          std::map<chain::public_key_type, chain::private_key_type> block_signing_private_keys;
       protected:
          controller::config                            cfg;
-         fc::optional<genesis_state>                   genesis;
          map<transaction_id_type, transaction_receipt> chain_transactions;
          map<account_name, block_id_type>              last_produced_block;
          unapplied_transaction_queue                   unapplied_transactions;
@@ -529,7 +531,7 @@ namespace eosio { namespace testing {
       }
 
       static unique_ptr<controller> create_validating_node(controller::config vcfg, const genesis_state& genesis, bool use_genesis) {
-         unique_ptr<controller> validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set());
+         unique_ptr<controller> validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set(), genesis.compute_chain_id());
          validating_node->add_indices();
          if (use_genesis) {
             validating_node->startup( []() { return false; }, genesis );
@@ -613,7 +615,7 @@ namespace eosio { namespace testing {
                hbh.producer == vn_hbh.producer;
 
         validating_node.reset();
-        validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set());
+        validating_node = std::make_unique<controller>(vcfg, make_protocol_feature_set(), control->get_chain_id());
         validating_node->add_indices();
         validating_node->startup( []() { return false; } );
 
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index f8680771b8b..3baa63629c5 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -170,7 +170,7 @@ namespace eosio { namespace testing {
 
    void base_tester::init(controller::config config) {
       cfg = config;
-      open();
+      open(default_genesis().compute_chain_id());
    }
 
    void base_tester::init(controller::config config, protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot) {
@@ -185,7 +185,7 @@ namespace eosio { namespace testing {
 
    void base_tester::init(controller::config config, protocol_feature_set&& pfs) {
       cfg = config;
-      open(std::move(pfs));
+      open(std::move(pfs), default_genesis().compute_chain_id());
    }
 
    void base_tester::execute_setup_policy(const setup_policy policy) {
@@ -241,13 +241,13 @@ namespace eosio { namespace testing {
       open( make_protocol_feature_set(), genesis );
    }
 
-   void base_tester::open() {
-      open( make_protocol_feature_set() );
+   void base_tester::open( const fc::optional<chain_id_type>& expected_chain_id ) {
+      open( make_protocol_feature_set(), expected_chain_id );
    }
 
    template <typename Lambda>
-   void base_tester::open( protocol_feature_set&& pfs, Lambda lambda ) {
-      control.reset( new controller(cfg, std::move(pfs)) );
+   void base_tester::open( protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id, Lambda lambda ) {
+      control.reset( new controller(cfg, std::move(pfs), expected_chain_id) );
       control->add_indices();
       lambda();
       chain_transactions.clear();
@@ -266,19 +266,21 @@ namespace eosio { namespace testing {
    }
 
    void base_tester::open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot ) {
-      open(std::move(pfs), [&snapshot,&control=this->control]() {
+      const auto& snapshot_chain_id = controller::extract_chain_id( *snapshot );
+      snapshot->return_to_header();
+      open(std::move(pfs), snapshot_chain_id, [&snapshot,&control=this->control]() {
          control->startup([]() { return false; }, snapshot );
       });
    }
 
    void base_tester::open( protocol_feature_set&& pfs, const genesis_state& genesis ) {
-      open(std::move(pfs), [&genesis,&control=this->control]() {
+      open(std::move(pfs), genesis.compute_chain_id(), [&genesis,&control=this->control]() {
          control->startup( []() { return false; }, genesis );
       });
    }
 
-   void base_tester::open( protocol_feature_set&& pfs ) {
-      open(std::move(pfs), [&control=this->control]() {
+   void base_tester::open( protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id ) {
+      open(std::move(pfs), expected_chain_id, [&control=this->control]() {
          control->startup( []() { return false; } );
       });
    }
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 43a0d89f5c5..c6cc5b8997b 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -812,7 +812,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          wlog("The --import-reversible-blocks option should be used by itself.");
       }
 
-      fc::optional<chain_id_type> block_log_chain_id;
+      fc::optional<chain_id_type> expected_chain_id;
       if (options.count( "snapshot" )) {
          my->snapshot_path = options.at( "snapshot" ).as<bfs::path>();
          EOS_ASSERT( fc::exists(*my->snapshot_path), plugin_config_exception,
@@ -821,9 +821,9 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          // recover genesis information from the snapshot
          // used for validation code below
          auto infile = std::ifstream(my->snapshot_path->generic_string(), (std::ios::in | std::ios::binary));
-         auto reader = std::make_shared<istream_snapshot_reader>(infile);
-         reader->validate();
-         chain_id_type chain_id = controller::extract_chain_id(reader);
+         istream_snapshot_reader reader(infile);
+         reader.validate();
+         expected_chain_id = controller::extract_chain_id(reader);
          infile.close();
 
          EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,
@@ -842,15 +842,21 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             auto log_genesis = block_log::extract_genesis_state(my->blocks_dir);
             if (log_genesis) {
                my->genesis = log_genesis;
-               EOS_ASSERT( my->genesis->compute_chain_id() == chain_id,
+               const auto& block_log_chain_id = my->genesis->compute_chain_id();
+               EOS_ASSERT( expected_chain_id == block_log_chain_id,
                            plugin_config_exception,
-                           "snapshot chain id does not match the chain id from the genesis state in the block log.");
-            }
-            else {
-               block_log_chain_id = block_log::extract_chain_id(my->blocks_dir);
-               EOS_ASSERT( block_log_chain_id == chain_id,
+                           "snapshot chain id does not match the chain id from the genesis state in the block log.",
+                           ("snapshot_chain_id", expected_chain_id)
+                           ("block_log_chain_id", block_log_chain_id)
+               );
+            } else {
+               const auto& block_log_chain_id = block_log::extract_chain_id(my->blocks_dir);
+               EOS_ASSERT( expected_chain_id == block_log_chain_id,
                            plugin_config_exception,
-                           "snapshot chain id does not match the chain id in the block log.");
+                           "snapshot chain id does not match the chain id in the block log.",
+                           ("snapshot_chain_id", expected_chain_id)
+                           ("block_log_chain_id", block_log_chain_id)
+               );
             }
          }
 
@@ -876,8 +882,9 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             } else {
                ilog( "Using genesis state provided in '${genesis}'", ("genesis", genesis_file.generic_string()));
             }
-         }
-         else {
+
+            expected_chain_id = my->genesis->compute_chain_id();
+         } else {
             EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,
                         plugin_config_exception,
                         "--genesis-timestamp is only valid if also passed in with --genesis-json");
@@ -892,19 +899,20 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                               " in blocks.log. It is not necessary to provide genesis state arguments when a blocks.log "
                               "file already exists."
                   );
-               }
-               else {
+               } else {
                   my->genesis = log_genesis;
+                  expected_chain_id = my->genesis->compute_chain_id();
                }
-            }
-            else {
-               block_log_chain_id = block_log::extract_chain_id( my->blocks_dir );
+            } else {
+               const auto& block_log_chain_id = block_log::extract_chain_id( my->blocks_dir );
                if (my->genesis) {
-                  EOS_ASSERT( my->genesis->compute_chain_id() == *block_log_chain_id, plugin_config_exception,
+                  EOS_ASSERT( expected_chain_id == block_log_chain_id, plugin_config_exception,
                               "Genesis state, provided via command line arguments, has a chain_id that does not match the "
                               "existing chain id in blocks.log. It is not necessary to provide genesis state arguments "
                               "when a blocks.log file already exists."
                   );
+               } else {
+                  expected_chain_id = block_log_chain_id;
                }
             }
          }
@@ -924,38 +932,20 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          my->chain_config->db_hugepage_paths = options.at("database-hugepage-path").as<std::vector<std::string>>();
 #endif
 
-      my->chain.emplace( *my->chain_config, std::move(pfs) );
-
-      if( !options.count( "snapshot" ) ) {
-         if( my->chain->db().revision() < 1 ) { // No existing blockchain state
-            EOS_ASSERT( my->genesis || !block_log_chain_id, plugin_config_exception,
-                        "Genesis state is necessary to initialize fresh blockchain state but genesis state could not be "
-                        "found in the blocks log. Please either load from snapshot or find a blocks log that starts "
-                        "from genesis."
-            );
-            if( my->genesis ) {
-               ilog( "Starting up fresh blockchain with provided genesis state." );
-            } else {
-               ilog( "Starting up fresh blockchain with default genesis state." );
-               my->genesis.emplace();
-            }
-         } else { // Existing blockchain state
-            const auto& state_chain_id = my->chain->get_global_properties().chain_id;
-            if( my->genesis ) {
-               auto provided_chain_id = my->genesis->compute_chain_id();
-               EOS_ASSERT( provided_chain_id == state_chain_id, plugin_config_exception,
-                           "Existing state is for a different chain than the one specified by the provided genesis "
-                           "state. Provided genesis state chain id: ${provided_chain_id}, existing state chain id: ${state_chain_id}",
-                           ("provided_chain_id", provided_chain_id)("state_chain_id", state_chain_id)
-               );
-            } else if( block_log_chain_id ) {
-               EOS_ASSERT( *block_log_chain_id == state_chain_id, block_log_exception,
-                           "Existing state is for a different chain than the one specified in the blocks log."
-                           " Block log chain id: ${block_log_chain_id}, existing state chain id: ${state_chain_id}",
-                           ("block_log_chain_id", *block_log_chain_id)("state_chain_id", state_chain_id)
+      my->chain.emplace( *my->chain_config, std::move(pfs), expected_chain_id );
 
-               );
-            }
+      if( !options.count( "snapshot" ) && my->chain->db().revision() < 1 ) {
+         // No snapshot and no existing blockchain state
+         EOS_ASSERT( my->genesis || !expected_chain_id, plugin_config_exception,
+                     "Genesis state is necessary to initialize fresh blockchain state but genesis state could not be "
+                     "found in the blocks log. Please either load from snapshot or find a blocks log that starts "
+                     "from genesis."
+         );
+         if( my->genesis ) {
+            ilog( "Starting up fresh blockchain with provided genesis state." );
+         } else {
+            ilog( "Starting up fresh blockchain with default genesis state." );
+            my->genesis.emplace();
          }
       }
 
@@ -1142,7 +1132,7 @@ bool chain_plugin::recover_reversible_blocks( const fc::path& db_dir, uint32_t c
 
    ilog( "Reconstructing '${reversible_dir}' from backed up reversible directory", ("reversible_dir", reversible_dir) );
 
-   optional<chainbase::database> old_reversible; 
+   optional<chainbase::database> old_reversible;
 
    try {
       old_reversible = chainbase::database( backup_dir, database::read_only, 0, true );
diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index b6a0e85a704..3024a6716bb 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -497,7 +497,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
 
    auto reader = SNAPSHOT_SUITE::get_reader(v2);
    snapshotted_tester v2_tester(chain.get_config(), reader, ordinal++);
-   auto chain_id = chain::controller::extract_chain_id(reader);
+   auto chain_id = chain::controller::extract_chain_id(*reader);
    BOOST_REQUIRE_EQUAL(chain_id, v2_tester.control->get_chain_id());
    BOOST_REQUIRE_EQUAL(chain.control->get_chain_id(), v2_tester.control->get_chain_id());
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *v2_tester.control);

From 16d7e8461f7cfa613bfb9d2f4792e8849a224979 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Sat, 21 Sep 2019 00:17:31 -0400
Subject: [PATCH 1327/1648] address review comments by @heifner

---
 libraries/chain/controller.cpp        | 14 +++++++-------
 plugins/chain_plugin/chain_plugin.cpp |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 612249bc830..a6aca78e3e0 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -559,8 +559,8 @@ struct controller_impl {
    void startup(std::function<bool()> shutdown, const genesis_state& genesis) {
       EOS_ASSERT( db.revision() < 1, database_exception, "This version of controller::startup only works with a fresh state database." );
       const auto& genesis_chain_id = genesis.compute_chain_id();
-      EOS_ASSERT( genesis_chain_id == chain_id, misc_exception,
-                  "genesis state provided to startup does not match the chain ID that controller was constructed with",
+      EOS_ASSERT( genesis_chain_id == chain_id, chain_id_type_exception,
+                  "genesis state provided to startup corresponds to a chain ID (${genesis_chain_id}) that does not match the chain ID that controller was constructed with (${controller_chain_id})",
                   ("genesis_chain_id", genesis_chain_id)("controller_chain_id", chain_id)
       );
 
@@ -597,7 +597,7 @@ struct controller_impl {
       if( blog.head() ) {
          EOS_ASSERT( first_block_num <= lib_num && lib_num <= blog.head()->block_num(),
                      block_log_exception,
-                     "block log does not contain last irreversible block",
+                     "block log (ranging from ${block_log_first_num} to ${block_log_last_num}) does not contain the last irreversible block (${fork_db_lib})",
                      ("block_log_first_num", first_block_num)
                      ("block_log_last_num", blog.head()->block_num())
                      ("fork_db_lib", lib_num)
@@ -640,7 +640,7 @@ struct controller_impl {
       // Also, even though blog.head() may still be nullptr, blog.first_block_num() is guaranteed to be lib_num + 1.
 
       EOS_ASSERT( db.revision() >= head->block_num, fork_database_exception,
-                  "fork database head is inconsistent with state",
+                  "fork database head (${head}) is inconsistent with state (${db})",
                   ("db",db.revision())("head",head->block_num) );
 
       if( db.revision() > head->block_num ) {
@@ -671,7 +671,7 @@ struct controller_impl {
             reversible_blocks.remove( *itr );
 
          EOS_ASSERT( itr == rbi.end() || itr->blocknum == lib_num + 1, reversible_blocks_exception,
-                     "gap exists between last irreversible block and first reversible block",
+                     "gap exists between last irreversible block (${lib}) and first reversible block (${first_reversible_block_num})",
                      ("lib", lib_num)("first_reversible_block_num", itr->blocknum)
          );
 
@@ -958,8 +958,8 @@ struct controller_impl {
       });
 
       const auto& gpo = db.get<global_property_object>();
-      EOS_ASSERT( gpo.chain_id == chain_id, misc_exception,
-                  "chain ID in snapshot does not match the chain ID that controller was constructed with",
+      EOS_ASSERT( gpo.chain_id == chain_id, chain_id_type_exception,
+                  "chain ID in snapshot (${snapshot_chain_id}) does not match the chain ID that controller was constructed with (${controller_chain_id})",
                   ("snapshot_chain_id", gpo.chain_id)("controller_chain_id", chain_id)
       );
    }
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index c6cc5b8997b..80628782d52 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -845,7 +845,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                const auto& block_log_chain_id = my->genesis->compute_chain_id();
                EOS_ASSERT( expected_chain_id == block_log_chain_id,
                            plugin_config_exception,
-                           "snapshot chain id does not match the chain id from the genesis state in the block log.",
+                           "snapshot chain ID (${snapshot_chain_id}) does not match the chain ID from the genesis state in the block log (${block_log_chain_id})",
                            ("snapshot_chain_id", expected_chain_id)
                            ("block_log_chain_id", block_log_chain_id)
                );
@@ -853,7 +853,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                const auto& block_log_chain_id = block_log::extract_chain_id(my->blocks_dir);
                EOS_ASSERT( expected_chain_id == block_log_chain_id,
                            plugin_config_exception,
-                           "snapshot chain id does not match the chain id in the block log.",
+                           "snapshot chain ID (${snapshot_chain_id}) does not match the chain ID (${block_log_chain_id}) in the block log",
                            ("snapshot_chain_id", expected_chain_id)
                            ("block_log_chain_id", block_log_chain_id)
                );

From 209f6d938f277584970f594dfccd1b7925f8c850 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 22 Sep 2019 11:18:48 -0400
Subject: [PATCH 1328/1648] support unix socket HTTP server for nodeos

---
 plugins/http_plugin/http_plugin.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index fcbb847bfdc..0ab7653b7af 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -392,6 +392,10 @@ namespace eosio {
          cfg.add_options()
             ("unix-socket-path", bpo::value<string>()->default_value(current_http_plugin_defaults.default_unix_socket_path),
              "The filename (relative to data-dir) to create a unix socket for HTTP RPC; set blank to disable.");
+      else
+         cfg.add_options()
+            ("unix-socket-path", bpo::value<string>(),
+             "The filename (relative to data-dir) to create a unix socket for HTTP RPC; set blank to disable.");   
 #endif
 
       if(current_http_plugin_defaults.default_http_port)

From 10e4a60e56d2343814b30b33631cf501bc9a29b3 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Mon, 23 Sep 2019 11:27:18 +0800
Subject: [PATCH 1329/1648] convert_to_type for uint128 is not needed anymore
 since fc variant is modified

---
 plugins/chain_plugin/chain_plugin.cpp                  | 10 ----------
 .../include/eosio/chain_plugin/chain_plugin.hpp        |  3 ---
 2 files changed, 13 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 6d21c08a27c..8887c8156e9 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1476,16 +1476,6 @@ uint64_t convert_to_type(const string& str, const string& desc) {
    }
 }
 
-template<>
-uint128_t convert_to_type(const string& str, const string& desc) {
-   uint128_t val;
-   try {
-      auto bmp = boost::multiprecision::uint128_t(str);
-      val = *reinterpret_cast<uint128_t*>(&bmp);
-   } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} string '${str}' to uint128_t type.", ("desc", desc)("str",str) )
-   return val;
-}
-
 template<>
 double convert_to_type(const string& str, const string& desc) {
    double val{};
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index b79395f542b..684cc1a2967 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -63,9 +63,6 @@ Type convert_to_type(const string& str, const string& desc) {
 template<>
 uint64_t convert_to_type(const string& str, const string& desc);
 
-template<>
-uint128_t convert_to_type(const string& str, const string& desc);
-
 template<>
 double convert_to_type(const string& str, const string& desc);
 

From 96d9f41031148e65172d81672f835dd52e86bef6 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Mon, 23 Sep 2019 11:27:35 +0800
Subject: [PATCH 1330/1648] Fix strict alias violation

---
 .../include/eosio/chain_plugin/chain_plugin.hpp  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index 684cc1a2967..ceae80733a2 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -642,7 +642,9 @@ class read_write {
             // The input is in big endian, i.e. f58262c8005bb64b8f99ec6083faf050c502d099d9929ae37ffed2fe1bb954fb
             // fixed_bytes will convert the input to array of 2 uint128_t in little endian, i.e. 50f0fa8360ec998f4bb65b00c86282f5 fb54b91bfed2fe7fe39a92d999d002c5
             // which is the format used by secondary index
-            fixed_bytes<32> fb(*reinterpret_cast<const std::array<const uint8_t, 32>*>(v.data())); 
+            uint8_t buffer[32];
+            memcpy(buffer, v.data(), 32);
+            fixed_bytes<32> fb(buffer); 
             return chain::key256_t(fb.get_array());
         };
      }
@@ -658,7 +660,9 @@ class read_write {
             // The input is in big endian, i.e. 83a83a3876c64c33f66f33c54f1869edef5b5d4a000000000000000000000000
             // fixed_bytes will convert the input to array of 2 uint128_t in little endian, i.e. ed69184fc5336ff6334cc676383aa883 0000000000000000000000004a5d5bef
             // which is the format used by secondary index
-            fixed_bytes<20> fb(*reinterpret_cast<const std::array<const uint8_t, 20>*>(v.data())); 
+            uint8_t buffer[20];
+            memcpy(buffer, v.data(), 20);
+            fixed_bytes<20> fb(buffer); 
             return chain::key256_t(fb.get_array());
         };
      }
@@ -671,11 +675,13 @@ class read_write {
      static auto function() {
         return [](const input_type v) {
             // The input is in little endian of uint256_t, i.e. fb54b91bfed2fe7fe39a92d999d002c550f0fa8360ec998f4bb65b00c86282f5
-            // fixed_bytes will convert the input to array of 2 uint128_t in little endian, i.e. 50f0fa8360ec998f4bb65b00c86282f5 fb54b91bfed2fe7fe39a92d999d002c5
+            // the following will convert the input to array of 2 uint128_t in little endian, i.e. 50f0fa8360ec998f4bb65b00c86282f5 fb54b91bfed2fe7fe39a92d999d002c5
             // which is the format used by secondary index
             chain::key256_t k;
-            k[0] = ((uint128_t *)&v)[1]; //128-255
-            k[1] = ((uint128_t *)&v)[0]; //0-127
+            uint8_t buffer[32];
+            boost::multiprecision::export_bits(v, buffer, 8, false);
+            memcpy(&k[0], buffer + 16, 16);
+            memcpy(&k[1], buffer, 16);
             return k;
         };
      }

From 845f5d29bca693a277071cac4f04d83f7d4b78e0 Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Mon, 23 Sep 2019 09:09:46 -0400
Subject: [PATCH 1331/1648] Bump CICD timeout for Mac Unit Tests

---
 .cicd/generate-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 19c89a3dfd5..41a7b58560e 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -208,7 +208,7 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 5
-    timeout: ${TIMEOUT:-20}
+    timeout: ${TIMEOUT:-25}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
@@ -501,4 +501,4 @@ cat <<EOF
     skip: ${SKIP_PACKAGE_BUILDER}${SKIP_MAC}${SKIP_MACOS_10_14}
 
 EOF
-IFS=$oIFS
\ No newline at end of file
+IFS=$oIFS

From dc0c0c84e9a6017617c327d9d3c449ec07a345de Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 20 Sep 2019 15:02:22 -0400
Subject: [PATCH 1332/1648] Remove unneeded request_message

---
 plugins/net_plugin/net_plugin.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 90b426781d3..3c762c8b361 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1591,12 +1591,7 @@ namespace eosio {
       if (head < msg.head_num ) {
          fc_dlog(logger, "sync check state 3");
          c->syncing = false;
-         if (!verify_catchup(c, msg.head_num, msg.head_id)) {
-            request_message req;
-            req.req_blocks.mode = catch_up;
-            req.req_trx.mode = none;
-            c->enqueue( req );
-         }
+         verify_catchup(c, msg.head_num, msg.head_id);
          return;
       } else {
          fc_dlog(logger, "sync check state 4");

From 18717faba28ac6a8c05a9f02bfd0975074176b4c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Sat, 21 Sep 2019 10:48:02 -0500
Subject: [PATCH 1333/1648] sync_master recv_block only called on valid blocks,
 so don't disconnect if unexpected

---
 plugins/net_plugin/net_plugin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 3c762c8b361..98421f21977 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1718,9 +1718,8 @@ namespace eosio {
             if( ++c->consecutive_rejected_blocks > def_max_consecutive_rejected_blocks ) {
                auto sync_next_expected = sync_next_expected_num;
                g_sync.unlock();
-               fc_wlog( logger, "expected block ${ne} but got ${bn}, closing connection: ${p}",
+               fc_wlog( logger, "expected block ${ne} but got ${bn}, from connection: ${p}",
                         ("ne", sync_next_expected)( "bn", blk_num )( "p", c->peer_name() ) );
-               c->close();
             }
             return;
          }

From 14c82dd6bbaa6d8247d7c15eae9f9b03673e9612 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Sat, 21 Sep 2019 20:22:21 -0500
Subject: [PATCH 1334/1648] Check for out of date last irreversible block
 notice

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 98421f21977..6850e5731e3 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1498,7 +1498,7 @@ namespace eosio {
       std::tie( lib_num, std::ignore, fork_head_block_num,
                 std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
 
-      if( !is_sync_required( fork_head_block_num ) ) {
+      if( !is_sync_required( fork_head_block_num ) || target <= lib_num ) {
          fc_dlog( logger, "We are already caught up, my irr = ${b}, head = ${h}, target = ${t}",
                   ("b", lib_num)( "h", fork_head_block_num )( "t", target ) );
          return;

From bb454802d7ae11f109c14c5968e18e5e9a9de4d2 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Mon, 23 Sep 2019 11:12:17 -0400
Subject: [PATCH 1335/1648] Cleanup

---
 libraries/chain/include/eosio/chain/wasm_interface.hpp        | 4 ++--
 .../chain/include/eosio/chain/wasm_interface_private.hpp      | 3 ---
 libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp    | 2 +-
 libraries/chain/webassembly/eos-vm.cpp                        | 4 ----
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index 2007e65573f..2e59299b128 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -87,9 +87,9 @@ namespace eosio { namespace chain {
 
          //validates code -- does a WASM validation pass and checks the wasm against EOSIO specific constraints
          static void validate(const controller& control, const bytes& code);
-	 
+
          //get the wasm_allocator used for the linear memory for wasm
-	      static vm::wasm_allocator* get_wasm_allocator();
+         static vm::wasm_allocator* get_wasm_allocator();
 
          //indicate that a particular code probably won't be used after given block_num
          void code_block_num_last_used(const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, const uint32_t& block_num);
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index a26def5fb00..40dd98adae4 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -15,13 +15,10 @@
 #include "Runtime/Intrinsics.h"
 #include "Platform/Platform.h"
 #include "WAST/WAST.h"
-
 #include "IR/Validate.h"
 
 #include <eosio/vm/allocator.hpp>
 
-#include <fstream>
-
 using namespace fc;
 using namespace eosio::chain::webassembly;
 using namespace eosio::vm;
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index 9c050d0b9a8..b62e77b90c4 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -91,7 +91,7 @@ namespace eosio { namespace vm {
    struct construct_derived<eosio::chain::transaction_context, Ctx> {
       static auto &value(Ctx& ctx) { return ctx.trx_context; }
    };
-   
+
    template <>
    struct construct_derived<eosio::chain::apply_context, eosio::chain::apply_context> {
       static auto &value(eosio::chain::apply_context& ctx) { return ctx; }
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 0fd07b83e57..94fc1f7cd79 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -2,7 +2,6 @@
 #include <eosio/chain/apply_context.hpp>
 #include <eosio/chain/transaction_context.hpp>
 #include <eosio/chain/wasm_eosio_constraints.hpp>
-#include <fstream>
 //eos-vm includes
 #include <eosio/vm/backend.hpp>
 
@@ -107,9 +106,6 @@ bool eos_vm_runtime<Impl>::inject_module(IR::Module& module) {
 template<typename Impl>
 std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime<Impl>::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t>) {
    using backend_t = backend<apply_context, Impl>;
-   std::ofstream mf("temp.wasm");
-   mf.write((char*)code_bytes, code_size);
-   mf.close();
    try {
       wasm_code_ptr code((uint8_t*)code_bytes, code_size);
       std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size);

From 3eac48009ed0c5e48586bb491e0c2cad568e344b Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Mon, 23 Sep 2019 13:40:22 -0400
Subject: [PATCH 1336/1648] Fix function body size

---
 unittests/wasm_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index 94ce93abac1..1eff7655c5c 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -1860,7 +1860,7 @@ BOOST_AUTO_TEST_CASE( code_size )  try {
    std::vector<U8> code_end = { 0x0b };
  
    std::vector<U8> code_function_body;
-   code_function_body.insert(code_function_body.end(), wasm_constraints::maximum_code_size, 0x01);
+   code_function_body.insert(code_function_body.end(), wasm_constraints::maximum_code_size + 4, 0x01);
 
    std::vector<U8> code;
    code.insert(code.end(), code_start.begin(), code_start.end());

From f32cb80149b88f313498f7aa74f1b470cb0fcb62 Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Mon, 23 Sep 2019 13:58:09 -0400
Subject: [PATCH 1337/1648] Bump CICD timeout for Mac Unit Tests

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 41a7b58560e..2711a9166ac 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -208,7 +208,7 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 5
-    timeout: ${TIMEOUT:-25}
+    timeout: ${TIMEOUT:-30}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 

From 5100c35a1d76b61b0d8cc1083d6a91299f93177a Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Mon, 23 Sep 2019 15:45:37 -0400
Subject: [PATCH 1338/1648] Reenable test that was commented out for some
 reason.

---
 unittests/api_tests.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
index a59ef384744..7f40f291ef2 100644
--- a/unittests/api_tests.cpp
+++ b/unittests/api_tests.cpp
@@ -587,7 +587,6 @@ BOOST_FIXTURE_TEST_CASE(require_notice_tests, TESTER) { try {
 
    } FC_LOG_AND_RETHROW() }
 
-/*
 BOOST_AUTO_TEST_CASE(ram_billing_in_notify_tests) { try {
    fc::temp_directory tempdir;
    validating_tester chain( tempdir, true );
@@ -615,7 +614,7 @@ BOOST_AUTO_TEST_CASE(ram_billing_in_notify_tests) { try {
 
    BOOST_REQUIRE_EQUAL( chain.validate(), true );
 } FC_LOG_AND_RETHROW() }
-*/
+
 /*************************************************************************************
  * context free action tests
  *************************************************************************************/

From 0e039c179cb899b00d15cf491ac5415e10a9f8e0 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Mon, 23 Sep 2019 18:23:30 -0400
Subject: [PATCH 1339/1648] Update eos-vm

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 3a25cc10506..d09208662eb 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 3a25cc10506be4a09b87066382d9cf8b5c9c77c5
+Subproject commit d09208662eb5d313eb732dd00aafd733ba8fa9a3

From d60e1c3e7b84eb0e62d3a7ad46b1e1f739980bdb Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 14 Jun 2019 13:57:39 -0400
Subject: [PATCH 1340/1648] EOS-VM Optimized Compiler

---
 CMakeLists.txt                                |    4 +
 libraries/chain/CMakeLists.txt                |   34 +-
 libraries/chain/controller.cpp                |    2 +-
 .../chain/include/eosio/chain/controller.hpp  |    3 +
 .../include/eosio/chain/wasm_interface.hpp    |    8 +-
 .../eosio/chain/wasm_interface_private.hpp    |   55 +-
 .../eosio/chain/webassembly/eos-vm-oc.hpp     |  728 +++++++++
 .../webassembly/eos-vm-oc/code_cache.hpp      |  116 ++
 .../webassembly/eos-vm-oc/compile_monitor.hpp |   12 +
 .../eos-vm-oc/compile_trampoline.hpp          |    7 +
 .../chain/webassembly/eos-vm-oc/config.hpp    |   18 +
 .../chain/webassembly/eos-vm-oc/eos-vm-oc.hpp |   71 +
 .../chain/webassembly/eos-vm-oc/executor.hpp  |   38 +
 .../chain/webassembly/eos-vm-oc/intrinsic.hpp |   28 +
 .../eos-vm-oc/intrinsic_mapping.hpp           |  254 ++++
 .../webassembly/eos-vm-oc/ipc_helpers.hpp     |   54 +
 .../webassembly/eos-vm-oc/ipc_protocol.hpp    |   71 +
 .../chain/webassembly/eos-vm-oc/memory.hpp    |   67 +
 .../chain/webassembly/runtime_interface.hpp   |    5 +-
 .../include/eosio/chain/webassembly/wabt.hpp  |    3 +-
 .../include/eosio/chain/webassembly/wavm.hpp  |    3 +-
 libraries/chain/wasm_interface.cpp            |   17 +-
 libraries/chain/webassembly/eos-vm-oc.cpp     |   53 +
 .../webassembly/eos-vm-oc/LLVMEmitIR.cpp      | 1303 +++++++++++++++++
 .../chain/webassembly/eos-vm-oc/LLVMJIT.cpp   |  308 ++++
 .../chain/webassembly/eos-vm-oc/LLVMJIT.h     |   25 +
 .../webassembly/eos-vm-oc/code_cache.cpp      |  376 +++++
 .../webassembly/eos-vm-oc/compile_monitor.cpp |  305 ++++
 .../eos-vm-oc/compile_trampoline.cpp          |  186 +++
 .../chain/webassembly/eos-vm-oc/executor.cpp  |  251 ++++
 .../chain/webassembly/eos-vm-oc/intrinsic.cpp |   18 +
 .../webassembly/eos-vm-oc/ipc_helpers.cpp     |  131 ++
 .../webassembly/eos-vm-oc/llvmWARshim.cpp     |   14 +
 .../webassembly/eos-vm-oc/llvmWARshim.llvmwar |    1 +
 .../chain/webassembly/eos-vm-oc/memory.cpp    |   46 +
 libraries/chain/webassembly/wabt.cpp          |    3 +-
 libraries/chain/webassembly/wavm.cpp          |    3 +-
 .../testing/include/eosio/testing/tester.hpp  |    3 +
 plugins/chain_plugin/chain_plugin.cpp         |   30 +-
 programs/nodeos/main.cpp                      |    3 +
 unittests/main.cpp                            |    3 +
 41 files changed, 4641 insertions(+), 19 deletions(-)
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/compile_monitor.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/compile_trampoline.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/config.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/LLVMJIT.h
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/executor.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/ipc_helpers.cpp
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/llvmWARshim.cpp
 create mode 120000 libraries/chain/webassembly/eos-vm-oc/llvmWARshim.llvmwar
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/memory.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a11cb50550..957e925e1e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,10 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32)
    if(LLVM_VERSION_MAJOR VERSION_LESS 7 OR LLVM_VERSION_MAJOR VERSION_GREATER 9)
 	   message(FATAL_ERROR "EOSIO requires an LLVM version 7.0 to 9.0")
    endif()
+
+   if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+      list(APPEND EOSIO_WASM_RUNTIMES eos-vm-oc)
+   endif()
 endif()
 
 if(UNIX)
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 91bf9bb37fb..ec1e3a62b88 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -20,6 +20,32 @@ if("wavm" IN_LIST EOSIO_WASM_RUNTIMES)
    set(CHAIN_WAVM_SOURCES "webassembly/wavm.cpp")
 endif()
 
+if("eos-vm-oc" IN_LIST EOSIO_WASM_RUNTIMES)
+   set(CHAIN_EOSVMOC_SOURCES webassembly/eos-vm-oc/code_cache.cpp
+                             webassembly/eos-vm-oc/executor.cpp
+                             webassembly/eos-vm-oc/memory.cpp
+                             webassembly/eos-vm-oc/intrinsic.cpp
+                             webassembly/eos-vm-oc/LLVMJIT.cpp
+                             webassembly/eos-vm-oc/LLVMEmitIR.cpp
+                             webassembly/eos-vm-oc/compile_monitor.cpp
+                             webassembly/eos-vm-oc/compile_trampoline.cpp
+                             webassembly/eos-vm-oc/ipc_helpers.cpp
+                             webassembly/eos-vm-oc.cpp)
+
+   if(LLVM_VERSION VERSION_LESS 7.1 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+      enable_language(ASM-LLVMWAR)
+      list(APPEND CHAIN_EOSVMOC_SOURCES webassembly/eos-vm-oc/llvmWARshim.llvmwar)
+   else()
+      list(APPEND CHAIN_EOSVMOC_SOURCES webassembly/eos-vm-oc/llvmWARshim.cpp)
+   endif()
+
+   llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native orcjit)
+   include_directories(${LLVM_INCLUDE_DIRS})
+   add_definitions(${LLVM_DEFINITIONS})
+
+   option(EOSVMOC_ENABLE_DEVELOPER_OPTIONS "enable developer options for EOS-VM OC" OFF)
+endif()
+
 ## SORT .cpp by most likely to change / break compile
 add_library( eosio_chain
              merkle.cpp
@@ -56,6 +82,7 @@ add_library( eosio_chain
 
              ${CHAIN_WAVM_SOURCES}
              webassembly/wabt.cpp
+             ${CHAIN_EOSVMOC_SOURCES}
 
 #             get_config.cpp
 #
@@ -76,7 +103,7 @@ add_library( eosio_chain
              )
 
 target_link_libraries( eosio_chain fc chainbase Logging IR WAST WASM Runtime
-                       softfloat builtins wabt
+                       softfloat builtins wabt ${LLVM_LIBS}
                      )
 target_include_directories( eosio_chain
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"
@@ -91,6 +118,11 @@ foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
    target_compile_definitions(eosio_chain PUBLIC "EOSIO_${RUNTIMEUC}_RUNTIME_ENABLED")
 endforeach()
 
+if(EOSVMOC_ENABLE_DEVELOPER_OPTIONS)
+   message(WARNING "EOS-VM OC Developer Options are enabled; these are NOT supported")
+   target_compile_definitions(eosio_chain PUBLIC EOSIO_EOS_VM_OC_DEVELOPER)
+endif()
+
 install( TARGETS eosio_chain
    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index a6aca78e3e0..33bb2c19d8d 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -291,7 +291,7 @@ struct controller_impl {
         cfg.reversible_cache_size, false, cfg.db_map_mode, cfg.db_hugepage_paths ),
     blog( cfg.blocks_dir ),
     fork_db( cfg.state_dir ),
-    wasmif( cfg.wasm_runtime, db ),
+    wasmif( cfg.wasm_runtime, cfg.eosvmoc_tierup, db, cfg.state_dir, cfg.eosvmoc_config ),
     resource_limits( db ),
     authorization( s, db ),
     protocol_features( std::move(pfs) ),
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index e4adf700c10..1de8c9de6b1 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -9,6 +9,7 @@
 #include <eosio/chain/account_object.hpp>
 #include <eosio/chain/snapshot.hpp>
 #include <eosio/chain/protocol_feature_manager.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/config.hpp>
 
 namespace chainbase {
    class database;
@@ -82,6 +83,8 @@ namespace eosio { namespace chain {
             bool                     disable_all_subjective_mitigations = false; //< for testing purposes only
 
             wasm_interface::vm_type  wasm_runtime = chain::config::default_wasm_runtime;
+            eosvmoc::config          eosvmoc_config;
+            bool                     eosvmoc_tierup         = false;
 
             db_read_mode             read_mode              = db_read_mode::SPECULATIVE;
             validation_mode          block_validation_mode  = validation_mode::FULL;
diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index 341331989e5..a391e442d68 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -11,6 +11,7 @@ namespace eosio { namespace chain {
    class apply_context;
    class wasm_runtime_interface;
    class controller;
+   namespace eosvmoc { struct config; }
 
    struct wasm_exit {
       int32_t code = 0;
@@ -73,10 +74,11 @@ namespace eosio { namespace chain {
       public:
          enum class vm_type {
             wavm,
-            wabt
+            wabt,
+            eos_vm_oc
          };
 
-         wasm_interface(vm_type vm, const chainbase::database& db);
+         wasm_interface(vm_type vm, bool eosvmoc_tierup, const chainbase::database& d, const boost::filesystem::path data_dir, const eosvmoc::config& eosvmoc_config);
          ~wasm_interface();
 
          //call before dtor to skip what can be minutes of dtor overhead with some runtimes; can cause leaks
@@ -108,4 +110,4 @@ namespace eosio{ namespace chain {
    std::istream& operator>>(std::istream& in, wasm_interface::vm_type& runtime);
 }}
 
-FC_REFLECT_ENUM( eosio::chain::wasm_interface::vm_type, (wavm)(wabt) )
+FC_REFLECT_ENUM( eosio::chain::wasm_interface::vm_type, (wavm)(wabt)(eos_vm_oc) )
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 21d83383a52..695b86c374e 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -3,6 +3,11 @@
 #include <eosio/chain/wasm_interface.hpp>
 #include <eosio/chain/webassembly/wavm.hpp>
 #include <eosio/chain/webassembly/wabt.hpp>
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+#include <eosio/chain/webassembly/eos-vm-oc.hpp>
+#else
+#define _REGISTER_EOSVMOC_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)
+#endif
 #include <eosio/chain/webassembly/runtime_interface.hpp>
 #include <eosio/chain/wasm_eosio_injection.hpp>
 #include <eosio/chain/transaction_context.hpp>
@@ -24,6 +29,8 @@ using boost::multi_index_container;
 
 namespace eosio { namespace chain {
 
+   namespace eosvmoc { struct config; }
+
    struct wasm_interface_impl {
       struct wasm_cache_entry {
          digest_type                                          code_hash;
@@ -37,15 +44,35 @@ namespace eosio { namespace chain {
       struct by_first_block_num;
       struct by_last_block_num;
 
-      wasm_interface_impl(wasm_interface::vm_type vm, const chainbase::database& d) : db(d) {
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+      struct eosvmoc_tier {
+         eosvmoc_tier(const boost::filesystem::path& d, const eosvmoc::config& c, const chainbase::database& db) : cc(d, c, db), exec(cc) {}
+         eosvmoc::code_cache_async cc;
+         eosvmoc::executor exec;
+         eosvmoc::memory mem;
+      };
+#endif
+
+      wasm_interface_impl(wasm_interface::vm_type vm, bool eosvmoc_tierup, const chainbase::database& d, const boost::filesystem::path data_dir, const eosvmoc::config& eosvmoc_config) : db(d), wasm_runtime_time(vm) {
 #ifdef EOSIO_WAVM_RUNTIME_ENABLED
          if(vm == wasm_interface::vm_type::wavm)
             runtime_interface = std::make_unique<webassembly::wavm::wavm_runtime>();
 #endif
          if(vm == wasm_interface::vm_type::wabt)
             runtime_interface = std::make_unique<webassembly::wabt_runtime::wabt_runtime>();
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+         if(vm == wasm_interface::vm_type::eos_vm_oc)
+            runtime_interface = std::make_unique<webassembly::eosvmoc::eosvmoc_runtime>(data_dir, eosvmoc_config, d);
+#endif
          if(!runtime_interface)
             EOS_THROW(wasm_exception, "${r} wasm runtime not supported on this platform and/or configuration", ("r", vm));
+
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+         if(eosvmoc_tierup) {
+            EOS_ASSERT(vm != wasm_interface::vm_type::eos_vm_oc, wasm_exception, "You can't use EOS-VM OC as the base runtime when tier up is activated");
+            eosvmoc.emplace(data_dir, eosvmoc_config, d);
+         }
+#endif
       }
 
       ~wasm_interface_impl() {
@@ -84,7 +111,13 @@ namespace eosio { namespace chain {
 
       void current_lib(uint32_t lib) {
          //anything last used before or on the LIB can be evicted
-         wasm_instantiation_cache.get<by_last_block_num>().erase(wasm_instantiation_cache.get<by_last_block_num>().begin(), wasm_instantiation_cache.get<by_last_block_num>().upper_bound(lib));
+         const auto first_it = wasm_instantiation_cache.get<by_last_block_num>().begin();
+         const auto last_it  = wasm_instantiation_cache.get<by_last_block_num>().upper_bound(lib);
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+         if(eosvmoc) for(auto it = first_it; it != last_it; it++)
+            eosvmoc->cc.free_code(it->code_hash, it->vm_version);
+#endif
+         wasm_instantiation_cache.get<by_last_block_num>().erase(first_it, last_it);
       }
 
       const std::unique_ptr<wasm_instantiated_module_interface>& get_instantiated_module( const digest_type& code_hash, const uint8_t& vm_type,
@@ -125,8 +158,14 @@ namespace eosio { namespace chain {
                EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
             }
 
-            wasm_injections::wasm_binary_injection<true> injector(module);
-            injector.inject();
+            if(wasm_runtime_time == wasm_interface::vm_type::wabt || wasm_runtime_time == wasm_interface::vm_type::wavm) {
+               wasm_injections::wasm_binary_injection<true> injector(module);
+               injector.inject();
+            }
+            else {
+               wasm_injections::wasm_binary_injection<false> injector(module);
+               injector.inject();
+            }
 
             std::vector<U8> bytes;
             try {
@@ -140,7 +179,7 @@ namespace eosio { namespace chain {
             }
 
             wasm_instantiation_cache.modify(it, [&](auto& c) {
-               c.module = runtime_interface->instantiate_module((const char*)bytes.data(), bytes.size(), parse_initial_memory(module));
+               c.module = runtime_interface->instantiate_module((const char*)bytes.data(), bytes.size(), parse_initial_memory(module), code_hash, vm_type, vm_version);
             });
          }
          return it->module;
@@ -166,6 +205,11 @@ namespace eosio { namespace chain {
       wasm_cache_index wasm_instantiation_cache;
 
       const chainbase::database& db;
+      const wasm_interface::vm_type wasm_runtime_time;
+
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+      fc::optional<eosvmoc_tier> eosvmoc;
+#endif
    };
 
 #define _ADD_PAREN_1(...) ((__VA_ARGS__)) _ADD_PAREN_2
@@ -176,6 +220,7 @@ namespace eosio { namespace chain {
 
 #define _REGISTER_INTRINSIC_EXPLICIT(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
    _REGISTER_WAVM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
+   _REGISTER_EOSVMOC_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
    _REGISTER_WABT_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)
 
 #define _REGISTER_INTRINSIC4(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
new file mode 100644
index 00000000000..a19c3b6bc1d
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
@@ -0,0 +1,728 @@
+#pragma once
+
+#include <eosio/chain/webassembly/common.hpp>
+#include <eosio/chain/exceptions.hpp>
+#include <eosio/chain/webassembly/runtime_interface.hpp>
+#include <eosio/chain/apply_context.hpp>
+#include <softfloat.hpp>
+#include "IR/Types.h"
+
+#include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/memory.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/executor.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/code_cache.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/config.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+
+#include <boost/hana/equal.hpp>
+
+namespace eosio { namespace chain { namespace webassembly { namespace eosvmoc {
+
+using namespace IR;
+using namespace Runtime;
+using namespace fc;
+using namespace eosio::chain::webassembly::common;
+
+using namespace eosio::chain::eosvmoc;
+
+class eosvmoc_instantiated_module;
+
+class eosvmoc_runtime : public eosio::chain::wasm_runtime_interface {
+   public:
+      eosvmoc_runtime(const boost::filesystem::path data_dir, const eosvmoc::config& eosvmoc_config, const chainbase::database& db);
+      ~eosvmoc_runtime();
+      std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
+                                                                             const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) override;
+
+      void immediately_exit_currently_running_module() override;
+
+      friend eosvmoc_instantiated_module;
+      eosvmoc::code_cache_sync cc;
+      eosvmoc::executor exec;
+      eosvmoc::memory mem;
+};
+
+/**
+ * class to represent an in-wasm-memory array
+ * it is a hint to the transcriber that the next parameter will
+ * be a size (in Ts) and that the pair are validated together
+ * This triggers the template specialization of intrinsic_invoker_impl
+ * @tparam T
+ */
+template<typename T>
+inline array_ptr<T> array_ptr_impl (U32 ptr, size_t length)
+{
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   volatile GS_PTR char* p = 0;
+   char check;
+   if(length || cb_ptr->current_linear_memory_pages < 0)
+      check = p[ptr];
+   if constexpr(sizeof(T) > 1)
+      EOS_ASSERT(length < INT_MAX/(uint32_t)sizeof(T), wasm_execution_error, "access violation");
+   check = p[ptr+length*sizeof(T)-1];
+
+   return array_ptr<T>((T*)((char*)(cb_ptr->full_linear_memory_start) + ptr));
+}
+
+/**
+ * class to represent an in-wasm-memory char array that must be null terminated
+ */
+inline null_terminated_ptr null_terminated_ptr_impl(U32 ptr)
+{
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   GS_PTR char* p = (GS_PTR char*)ptr;
+   do {
+      if(*p == '\0')
+         return null_terminated_ptr((char*)(cb_ptr->full_linear_memory_start) + ptr);
+   } while(p++);
+   __builtin_unreachable();
+}
+
+
+/**
+ * template that maps native types to WASM VM types
+ * @tparam T the native type
+ */
+template<typename T>
+struct native_to_wasm {
+   using type = void;
+};
+
+/**
+ * specialization for mapping pointers to int32's
+ */
+template<typename T>
+struct native_to_wasm<T *> {
+   using type = I32;
+};
+
+/**
+ * Mappings for native types
+ */
+template<>
+struct native_to_wasm<float> {
+   using type = F32;
+};
+template<>
+struct native_to_wasm<double> {
+   using type = F64;
+};
+template<>
+struct native_to_wasm<int32_t> {
+   using type = I32;
+};
+template<>
+struct native_to_wasm<uint32_t> {
+   using type = I32;
+};
+template<>
+struct native_to_wasm<int64_t> {
+   using type = I64;
+};
+template<>
+struct native_to_wasm<uint64_t> {
+   using type = I64;
+};
+template<>
+struct native_to_wasm<bool> {
+   using type = I32;
+};
+template<>
+struct native_to_wasm<const name &> {
+   using type = I64;
+};
+template<>
+struct native_to_wasm<name> {
+   using type = I64;
+};
+template<>
+struct native_to_wasm<const fc::time_point_sec &> {
+   using type = I32;
+};
+
+template<>
+struct native_to_wasm<fc::time_point_sec> {
+   using type = I32;
+};
+
+// convenience alias
+template<typename T>
+using native_to_wasm_t = typename native_to_wasm<T>::type;
+
+template<typename T>
+inline auto convert_native_to_wasm(T val) {
+   return native_to_wasm_t<T>(val);
+}
+
+inline auto convert_native_to_wasm(const name &val) {
+   return native_to_wasm_t<const name &>(val.to_uint64_t());
+}
+
+inline auto convert_native_to_wasm(const fc::time_point_sec& val) {
+   return native_to_wasm_t<const fc::time_point_sec &>(val.sec_since_epoch());
+}
+
+inline auto convert_native_to_wasm(char* ptr) {
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   ///XXX this validation isn't as strict
+   U64 delta = (U64)(ptr - cb_ptr->full_linear_memory_start);
+   volatile GS_PTR char* p = 0;
+   char temp;
+   temp = p[delta];
+   return (U32)delta;
+}
+
+template<typename T>
+inline auto convert_wasm_to_native(native_to_wasm_t<T> val) {
+   return T(val);
+}
+
+template<typename T>
+struct wasm_to_value_type;
+
+template<>
+struct wasm_to_value_type<F32> {
+   static constexpr auto value = ValueType::f32;
+};
+
+template<>
+struct wasm_to_value_type<F64> {
+   static constexpr auto value = ValueType::f64;
+};
+template<>
+struct wasm_to_value_type<I32> {
+   static constexpr auto value = ValueType::i32;
+};
+template<>
+struct wasm_to_value_type<I64> {
+   static constexpr auto value = ValueType::i64;
+};
+
+template<typename T>
+constexpr auto wasm_to_value_type_v = wasm_to_value_type<T>::value;
+
+template<typename T>
+struct wasm_to_rvalue_type;
+template<>
+struct wasm_to_rvalue_type<F32> {
+   static constexpr auto value = ResultType::f32;
+};
+template<>
+struct wasm_to_rvalue_type<F64> {
+   static constexpr auto value = ResultType::f64;
+};
+template<>
+struct wasm_to_rvalue_type<I32> {
+   static constexpr auto value = ResultType::i32;
+};
+template<>
+struct wasm_to_rvalue_type<I64> {
+   static constexpr auto value = ResultType::i64;
+};
+template<>
+struct wasm_to_rvalue_type<void> {
+   static constexpr auto value = ResultType::none;
+};
+template<>
+struct wasm_to_rvalue_type<const name&> {
+   static constexpr auto value = ResultType::i64;
+};
+template<>
+struct wasm_to_rvalue_type<name> {
+   static constexpr auto value = ResultType::i64;
+};
+
+template<>
+struct wasm_to_rvalue_type<char*> {
+   static constexpr auto value = ResultType::i32;
+};
+
+template<>
+struct wasm_to_rvalue_type<fc::time_point_sec> {
+   static constexpr auto value = ResultType::i32;
+};
+
+
+template<typename T>
+constexpr auto wasm_to_rvalue_type_v = wasm_to_rvalue_type<T>::value;
+
+template<typename T>
+struct is_reference_from_value {
+   static constexpr bool value = false;
+};
+
+template<>
+struct is_reference_from_value<name> {
+   static constexpr bool value = true;
+};
+
+template<>
+struct is_reference_from_value<fc::time_point_sec> {
+   static constexpr bool value = true;
+};
+
+template<typename T>
+constexpr bool is_reference_from_value_v = is_reference_from_value<T>::value;
+
+
+
+struct void_type {
+};
+
+/**
+ * Forward declaration of provider for FunctionType given a desired C ABI signature
+ */
+template<typename>
+struct wasm_function_type_provider;
+
+/**
+ * specialization to destructure return and arguments
+ */
+template<typename Ret, typename ...Args>
+struct wasm_function_type_provider<Ret(Args...)> {
+   static const FunctionType *type() {
+      return FunctionType::get(wasm_to_rvalue_type_v<Ret>, {wasm_to_value_type_v<Args> ...});
+   }
+};
+
+/**
+ * Forward declaration of the invoker type which transcribes arguments to/from a native method
+ * and injects the appropriate checks
+ *
+ * @tparam Ret - the return type of the native function
+ * @tparam NativeParameters - a std::tuple of the remaining native parameters to transcribe
+ * @tparam WasmParameters - a std::tuple of the transribed parameters
+ */
+template<bool is_injected, typename Ret, typename NativeParameters, typename WasmParameters>
+struct intrinsic_invoker_impl;
+
+/**
+ * Specialization for the fully transcribed signature
+ * @tparam Ret - the return type of the native function
+ * @tparam Translated - the arguments to the wasm function
+ */
+template<bool is_injected, typename Ret, typename ...Translated>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<>, std::tuple<Translated...>> {
+   using next_method_type        = Ret (*)(Translated...);
+
+   template<next_method_type Method>
+   static native_to_wasm_t<Ret> invoke(Translated... translated) {
+      EOSVMOC_MEMORY_PTR_cb_ptr;
+      try {
+         if constexpr(!is_injected)
+            EOS_ASSERT(cb_ptr->current_call_depth_remaining != 1, wasm_execution_error, "Exceeded call depth maximum");
+         return convert_native_to_wasm(Method(translated...));
+      }
+      catch(...) {
+         *cb_ptr->eptr = std::current_exception();
+         siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
+         __builtin_unreachable();
+      }
+   }
+
+   template<next_method_type Method>
+   static const auto fn() {
+      return invoke<Method>;
+   }
+};
+
+/**
+ * specialization of the fully transcribed signature for void return values
+ * @tparam Translated - the arguments to the wasm function
+ */
+template<bool is_injected, typename ...Translated>
+struct intrinsic_invoker_impl<is_injected, void_type, std::tuple<>, std::tuple<Translated...>> {
+   using next_method_type        = void_type (*)(Translated...);
+
+   template<next_method_type Method>
+   static void invoke(Translated... translated) {
+      EOSVMOC_MEMORY_PTR_cb_ptr;
+      try {
+         if constexpr(!is_injected)
+            EOS_ASSERT(cb_ptr->current_call_depth_remaining != 1, wasm_execution_error, "Exceeded call depth maximum");
+         Method(translated...);
+      }
+      catch(...) {
+         *cb_ptr->eptr = std::current_exception();
+         siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
+         __builtin_unreachable();
+      }
+   }
+
+   template<next_method_type Method>
+   static const auto fn() {
+      return invoke<Method>;
+   }
+};
+
+/**
+ * Sepcialization for transcribing  a simple type in the native method signature
+ * @tparam Ret - the return type of the native method
+ * @tparam Input - the type of the native parameter to transcribe
+ * @tparam Inputs - the remaining native parameters to transcribe
+ * @tparam Translated - the list of transcribed wasm parameters
+ */
+template<bool is_injected, typename Ret, typename Input, typename... Inputs, typename... Translated>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<Input, Inputs...>, std::tuple<Translated...>> {
+   using translated_type = native_to_wasm_t<Input>;
+   using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., translated_type>>;
+   using then_type = Ret (*)(Input, Inputs..., Translated...);
+
+   template<then_type Then>
+   static Ret translate_one(Inputs... rest, Translated... translated, translated_type last) {
+      auto native = convert_wasm_to_native<Input>(last);
+      return Then(native, rest..., translated...);
+   };
+
+   template<then_type Then>
+   static const auto fn() {
+      return next_step::template fn<translate_one<Then>>();
+   }
+};
+
+/**
+ * Specialization for transcribing  a array_ptr type in the native method signature
+ * This type transcribes into 2 wasm parameters: a pointer and byte length and checks the validity of that memory
+ * range before dispatching to the native method
+ *
+ * @tparam Ret - the return type of the native method
+ * @tparam Inputs - the remaining native parameters to transcribe
+ * @tparam Translated - the list of transcribed wasm parameters
+ */
+template<bool is_injected, typename T, typename Ret, typename... Inputs, typename ...Translated>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, size_t, Inputs...>, std::tuple<Translated...>> {
+   using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32, I32>>;
+   using then_type = Ret(*)(array_ptr<T>, size_t, Inputs..., Translated...);
+
+   template<then_type Then, typename U=T>
+   static auto translate_one(Inputs... rest, Translated... translated, I32 ptr, I32 size) -> std::enable_if_t<std::is_const<U>::value, Ret> {
+      static_assert(!std::is_pointer<U>::value, "Currently don't support array of pointers");
+      const auto length = size_t((U32)size);
+      T* base = array_ptr_impl<T>((U32)ptr, length);
+      if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
+         EOSVMOC_MEMORY_PTR_cb_ptr;
+         std::vector<uint8_t>& copy = cb_ptr->bounce_buffers->emplace_back(length > 0 ? length*sizeof(T) : 1);
+         T* copy_ptr = (T*)&copy[0];
+         memcpy( (void*)copy.data(), (void*)base, length * sizeof(T) );
+         return Then(static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
+      }
+      return Then(static_cast<array_ptr<T>>(base), length, rest..., translated...);
+   };
+
+   template<then_type Then, typename U=T>
+   static auto translate_one(Inputs... rest, Translated... translated, I32 ptr, I32 size) -> std::enable_if_t<!std::is_const<U>::value, Ret> {
+      static_assert(!std::is_pointer<U>::value, "Currently don't support array of pointers");
+      const auto length = size_t((U32)size);
+      T* base = array_ptr_impl<T>((U32)ptr, length);
+      if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
+         EOSVMOC_MEMORY_PTR_cb_ptr;
+         std::vector<uint8_t>& copy = cb_ptr->bounce_buffers->emplace_back(length > 0 ? length*sizeof(T) : 1);
+         T* copy_ptr = (T*)&copy[0];
+         memcpy( (void*)copy.data(), (void*)base, length * sizeof(T) );
+         Ret ret = Then(static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
+         memcpy( (void*)base, (void*)copy.data(), length * sizeof(T) );
+         return ret;
+      }
+      return Then(static_cast<array_ptr<T>>(base), length, rest..., translated...);
+   };
+
+   template<then_type Then>
+   static const auto fn() {
+      return next_step::template fn<translate_one<Then>>();
+   }
+};
+
+/**
+ * Specialization for transcribing  a null_terminated_ptr type in the native method signature
+ * This type transcribes 1 wasm parameters: a char pointer which is validated to contain
+ * a null value before the end of the allocated memory.
+ *
+ * @tparam Ret - the return type of the native method
+ * @tparam Inputs - the remaining native parameters to transcribe
+ * @tparam Translated - the list of transcribed wasm parameters
+ */
+template<bool is_injected, typename Ret, typename... Inputs, typename ...Translated>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<null_terminated_ptr, Inputs...>, std::tuple<Translated...>> {
+   using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32>>;
+   using then_type = Ret(*)(null_terminated_ptr, Inputs..., Translated...);
+
+   template<then_type Then>
+   static Ret translate_one(Inputs... rest, Translated... translated, I32 ptr) {
+      return Then(null_terminated_ptr_impl((U32)ptr), rest..., translated...);
+   };
+
+   template<then_type Then>
+   static const auto fn() {
+      return next_step::template fn<translate_one<Then>>();
+   }
+};
+
+/**
+ * Specialization for transcribing  a pair of array_ptr types in the native method signature that share size
+ * This type transcribes into 3 wasm parameters: 2 pointers and byte length and checks the validity of those memory
+ * ranges before dispatching to the native method
+ *
+ * @tparam Ret - the return type of the native method
+ * @tparam Inputs - the remaining native parameters to transcribe
+ * @tparam Translated - the list of transcribed wasm parameters
+ */
+template<bool is_injected, typename T, typename U, typename Ret, typename... Inputs, typename ...Translated>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, array_ptr<U>, size_t, Inputs...>, std::tuple<Translated...>> {
+   using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32, I32, I32>>;
+   using then_type = Ret(*)(array_ptr<T>, array_ptr<U>, size_t, Inputs..., Translated...);
+
+   template<then_type Then>
+   static Ret translate_one(Inputs... rest, Translated... translated, I32 ptr_t, I32 ptr_u, I32 size) {
+      static_assert(std::is_same<std::remove_const_t<T>, char>::value && std::is_same<std::remove_const_t<U>, char>::value, "Currently only support array of (const)chars");
+      const auto length = size_t((U32)size);
+      return Then(array_ptr_impl<T>((U32)ptr_t, length), array_ptr_impl<U>((U32)ptr_u, length), length, rest..., translated...);
+   };
+
+   template<then_type Then>
+   static const auto fn() {
+      return next_step::template fn<translate_one<Then>>();
+   }
+};
+
+/**
+ * Specialization for transcribing memset parameters
+ *
+ * @tparam Ret - the return type of the native method
+ * @tparam Inputs - the remaining native parameters to transcribe
+ * @tparam Translated - the list of transcribed wasm parameters
+ */
+template<bool is_injected, typename Ret>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<char>, int, size_t>, std::tuple<>> {
+   using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<>, std::tuple<I32, I32, I32>>;
+   using then_type = Ret(*)(array_ptr<char>, int, size_t);
+
+   template<then_type Then>
+   static Ret translate_one(I32 ptr, I32 value, I32 size) {
+      const auto length = size_t((U32)size);
+      return Then(array_ptr_impl<char>((U32)ptr, length), value, length);
+   };
+
+   template<then_type Then>
+   static const auto fn() {
+      return next_step::template fn<translate_one<Then>>();
+   }
+};
+
+/**
+ * Specialization for transcribing  a pointer type in the native method signature
+ * This type transcribes into an int32  pointer checks the validity of that memory
+ * range before dispatching to the native method
+ *
+ * @tparam Ret - the return type of the native method
+ * @tparam Inputs - the remaining native parameters to transcribe
+ * @tparam Translated - the list of transcribed wasm parameters
+ */
+template<bool is_injected, typename T, typename Ret, typename... Inputs, typename ...Translated>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<T *, Inputs...>, std::tuple<Translated...>> {
+   using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32>>;
+   using then_type = Ret (*)(T *, Inputs..., Translated...);
+
+   template<then_type Then, typename U=T>
+   static auto translate_one(Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<std::is_const<U>::value, Ret> {
+      T* base = array_ptr_impl<T>((U32)ptr, 1);
+      if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
+         std::remove_const_t<T> copy;
+         T* copy_ptr = &copy;
+         memcpy( (void*)copy_ptr, (void*)base, sizeof(T) );
+         return Then(copy_ptr, rest..., translated...);
+      }
+      return Then(base, rest..., translated...);
+   };
+
+   template<then_type Then, typename U=T>
+   static auto translate_one(Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<!std::is_const<U>::value, Ret> {
+      T* base = array_ptr_impl<T>((U32)ptr, 1);
+      if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
+         std::remove_const_t<T> copy;
+         T* copy_ptr = &copy;
+         memcpy( (void*)copy_ptr, (void*)base, sizeof(T) );
+         Ret ret = Then(copy_ptr, rest..., translated...);
+         memcpy( (void*)base, (void*)copy_ptr, sizeof(T) );
+         return ret;
+      }
+      return Then(base, rest..., translated...);
+   };
+
+   template<then_type Then>
+   static const auto fn() {
+      return next_step::template fn<translate_one<Then>>();
+   }
+};
+
+/**
+ * Specialization for transcribing a reference to a name which can be passed as a native value
+ *    This type transcribes into a native type which is loaded by value into a
+ *    variable on the stack and then passed by reference to the intrinsic.
+ *
+ * @tparam Ret - the return type of the native method
+ * @tparam Inputs - the remaining native parameters to transcribe
+ * @tparam Translated - the list of transcribed wasm parameters
+ */
+template<bool is_injected, typename Ret, typename... Inputs, typename ...Translated>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<const name&, Inputs...>, std::tuple<Translated...>> {
+   using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., native_to_wasm_t<const name&> >>;
+   using then_type = Ret (*)(const name&, Inputs..., Translated...);
+
+   template<then_type Then>
+   static Ret translate_one(Inputs... rest, Translated... translated, native_to_wasm_t<const name&> wasm_value) {
+      auto value = name(wasm_value);
+      return Then(value, rest..., translated...);
+   }
+
+   template<then_type Then>
+   static const auto fn() {
+      return next_step::template fn<translate_one<Then>>();
+   }
+};
+
+/**
+ * Specialization for transcribing  a reference type in the native method signature
+ *    This type transcribes into an int32  pointer checks the validity of that memory
+ *    range before dispatching to the native method
+ *
+ * @tparam Ret - the return type of the native method
+ * @tparam Inputs - the remaining native parameters to transcribe
+ * @tparam Translated - the list of transcribed wasm parameters
+ */
+template<bool is_injected, typename T, typename Ret, typename... Inputs, typename ...Translated>
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<T &, Inputs...>, std::tuple<Translated...>> {
+   using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32>>;
+   using then_type = Ret (*)(T &, Inputs..., Translated...);
+
+   template<then_type Then, typename U=T>
+   static auto translate_one(Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<std::is_const<U>::value, Ret> {
+      EOSVMOC_MEMORY_PTR_cb_ptr;
+      // references cannot be created for null pointers
+      EOS_ASSERT((U32)ptr != 0, wasm_exception, "references cannot be created for null pointers");
+      volatile GS_PTR char* p = 0;
+      char check;
+      check = p[(U32)ptr];
+      check = p[(U32)(ptr)+sizeof(T)-1u];
+      T &base = *(T*)(((char*)(cb_ptr->full_linear_memory_start))+(U32)ptr);
+
+      if ( reinterpret_cast<uintptr_t>(&base) % alignof(T) != 0 ) {
+         std::remove_const_t<T> copy;
+         T* copy_ptr = &copy;
+         memcpy( (void*)copy_ptr, (void*)&base, sizeof(T) );
+         return Then(*copy_ptr, rest..., translated...);
+      }
+      return Then(base, rest..., translated...);
+   }
+
+   template<then_type Then, typename U=T>
+   static auto translate_one(Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<!std::is_const<U>::value, Ret> {
+      EOSVMOC_MEMORY_PTR_cb_ptr;
+      // references cannot be created for null pointers
+      EOS_ASSERT((U32)ptr != 0, wasm_exception, "reference cannot be created for null pointers");
+      volatile GS_PTR char* p = 0;
+      char check;
+      check = p[(U32)ptr];
+      check = p[(U32)(ptr)+sizeof(T)-1u];
+      T &base = *(T*)(((char*)(cb_ptr->full_linear_memory_start))+(U32)ptr);
+
+      if ( reinterpret_cast<uintptr_t>(&base) % alignof(T) != 0 ) {
+         std::remove_const_t<T> copy;
+         T* copy_ptr = &copy;
+         memcpy( (void*)copy_ptr, (void*)&base, sizeof(T) );
+         Ret ret = Then(*copy_ptr, rest..., translated...);
+         memcpy( (void*)&base, (void*)copy_ptr, sizeof(T) );
+         return ret;
+      }
+      return Then(base, rest..., translated...);
+   }
+
+   template<then_type Then>
+   static const auto fn() {
+      return next_step::template fn<translate_one<Then>>();
+   }
+};
+
+/**
+ * forward declaration of a wrapper class to call methods of the class
+ */
+template<bool is_injected, typename WasmSig, typename Ret, typename MethodSig, typename Cls, typename... Params>
+struct intrinsic_function_invoker {
+   using impl = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Params...>, std::tuple<>>;
+
+   template<MethodSig Method>
+   static Ret wrapper(Params... params) {
+      EOSVMOC_MEMORY_PTR_cb_ptr;
+      return (class_from_wasm<Cls>::value(*cb_ptr->ctx).*Method)(params...);
+   }
+
+   template<MethodSig Method>
+   static const WasmSig *fn() {
+      auto fn = impl::template fn<wrapper<Method>>();
+      static_assert(std::is_same<WasmSig *, decltype(fn)>::value,
+                    "Intrinsic function signature does not match the ABI");
+      return fn;
+   }
+};
+
+template<bool is_injected, typename WasmSig, typename MethodSig, typename Cls, typename... Params>
+struct intrinsic_function_invoker<is_injected, WasmSig, void, MethodSig, Cls, Params...> {
+   using impl = intrinsic_invoker_impl<is_injected, void_type, std::tuple<Params...>, std::tuple<>>;
+
+   template<MethodSig Method>
+   static void_type wrapper(Params... params) {
+      EOSVMOC_MEMORY_PTR_cb_ptr;
+      (class_from_wasm<Cls>::value(*cb_ptr->ctx).*Method)(params...);
+      return void_type();
+   }
+
+   template<MethodSig Method>
+   static const WasmSig *fn() {
+      auto fn = impl::template fn<wrapper<Method>>();
+      static_assert(std::is_same<WasmSig *, decltype(fn)>::value,
+                    "Intrinsic function signature does not match the ABI");
+      return fn;
+   }
+};
+
+template<bool, typename, typename>
+struct intrinsic_function_invoker_wrapper;
+
+template<bool is_injected, typename WasmSig, typename Cls, typename Ret, typename... Params>
+struct intrinsic_function_invoker_wrapper<is_injected, WasmSig, Ret (Cls::*)(Params...)> {
+   using type = intrinsic_function_invoker<is_injected, WasmSig, Ret, Ret (Cls::*)(Params...), Cls, Params...>;
+};
+
+template<bool is_injected, typename WasmSig, typename Cls, typename Ret, typename... Params>
+struct intrinsic_function_invoker_wrapper<is_injected, WasmSig, Ret (Cls::*)(Params...) const> {
+   using type = intrinsic_function_invoker<is_injected, WasmSig, Ret, Ret (Cls::*)(Params...) const, Cls, Params...>;
+};
+
+template<bool is_injected, typename WasmSig, typename Cls, typename Ret, typename... Params>
+struct intrinsic_function_invoker_wrapper<is_injected, WasmSig, Ret (Cls::*)(Params...) volatile> {
+   using type = intrinsic_function_invoker<is_injected, WasmSig, Ret, Ret (Cls::*)(Params...) volatile, Cls, Params...>;
+};
+
+template<bool is_injected, typename WasmSig, typename Cls, typename Ret, typename... Params>
+struct intrinsic_function_invoker_wrapper<is_injected, WasmSig, Ret (Cls::*)(Params...) const volatile> {
+   using type = intrinsic_function_invoker<is_injected, WasmSig, Ret, Ret (Cls::*)(Params...) const volatile, Cls, Params...>;
+};
+
+#define _ADD_PAREN_1(...) ((__VA_ARGS__)) _ADD_PAREN_2
+#define _ADD_PAREN_2(...) ((__VA_ARGS__)) _ADD_PAREN_1
+#define _ADD_PAREN_1_END
+#define _ADD_PAREN_2_END
+#define _WRAPPED_SEQ(SEQ) BOOST_PP_CAT(_ADD_PAREN_1 SEQ, _END)
+
+#define __INTRINSIC_NAME(LABEL, SUFFIX) LABEL##SUFFIX
+#define _INTRINSIC_NAME(LABEL, SUFFIX) __INTRINSIC_NAME(LABEL,SUFFIX)
+
+#define _REGISTER_EOSVMOC_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
+   static eosio::chain::eosvmoc::intrinsic _INTRINSIC_NAME(__intrinsic_fn, __COUNTER__) EOSVMOC_INTRINSIC_INIT_PRIORITY (\
+      MOD "." NAME,\
+      eosio::chain::webassembly::eosvmoc::wasm_function_type_provider<WASM_SIG>::type(),\
+      (void *)eosio::chain::webassembly::eosvmoc::intrinsic_function_invoker_wrapper<std::string_view(MOD) != "env", WASM_SIG, SIG>::type::fn<&CLS::METHOD>(),\
+      ::boost::hana::index_if(eosio::chain::eosvmoc::intrinsic_table, ::boost::hana::equal.to(BOOST_HANA_STRING(MOD "." NAME))).value()\
+   );\
+
+
+} } } }// eosio::chain::webassembly::eosvmoc
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
new file mode 100644
index 00000000000..6f273a2476e
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
@@ -0,0 +1,116 @@
+#pragma once
+
+#include <boost/lockfree/spsc_queue.hpp>
+
+#include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index/sequenced_index.hpp>
+#include <boost/multi_index/composite_key.hpp>
+#include <boost/multi_index/key_extractors.hpp>
+
+#include <boost/interprocess/segment_manager.hpp> //XXX no we just want the rbtree thing
+#include <boost/asio/local/datagram_protocol.hpp>
+
+
+#include <thread>
+
+namespace std {
+    template<> struct hash<eosio::chain::eosvmoc::code_tuple> {
+        size_t operator()(const eosio::chain::eosvmoc::code_tuple& ct) const noexcept {
+            return ct.code_id._hash[0];
+        }
+    };
+}
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+using namespace boost::multi_index;
+using namespace boost::asio;
+
+namespace bip = boost::interprocess;
+namespace bfs = boost::filesystem;
+
+using allocator_t = bip::rbtree_best_fit<bip::null_mutex_family, bip::offset_ptr<void>, 16>;
+
+struct config;
+
+class code_cache_base {
+   public:
+      code_cache_base(const bfs::path data_dir, const eosvmoc::config& eosvmoc_config, const chainbase::database& db);
+      ~code_cache_base();
+
+      const int& fd() const { return _cache_fd; }
+
+      void free_code(const digest_type& code_id, const uint8_t& vm_version);
+
+   protected:
+      struct by_hash;
+
+      typedef boost::multi_index_container<
+         code_descriptor,
+         indexed_by<
+            sequenced<>,
+            ordered_unique<tag<by_hash>,
+               composite_key< code_descriptor,
+                  member<code_descriptor, digest_type, &code_descriptor::code_hash>,
+                  member<code_descriptor, uint8_t,     &code_descriptor::vm_version>
+               >
+            >
+         >
+      > code_cache_index;
+      code_cache_index _cache_index;
+
+      const chainbase::database& _db;
+
+      bfs::path _cache_file_path;
+      int _cache_fd;
+
+      io_context _ctx;
+      local::datagram_protocol::socket _compile_monitor_write_socket{_ctx};
+      local::datagram_protocol::socket _compile_monitor_read_socket{_ctx};
+
+      //these are really only useful to the async code cache, but keep them here so
+      //free_code can be shared
+      std::unordered_set<code_tuple> _queued_compiles;
+      std::unordered_map<code_tuple, bool> _outstanding_compiles_and_poison;
+
+      size_t _free_bytes_eviction_threshold;
+      void check_eviction_threshold(size_t free_bytes);
+
+      void set_on_disk_region_dirty(bool);
+
+      template <typename T>
+      void serialize_cache_index(fc::datastream<T>& ds);
+};
+
+class code_cache_async : public code_cache_base {
+   public:
+      code_cache_async(const bfs::path data_dir, const eosvmoc::config& eosvmoc_config, const chainbase::database& db);
+      ~code_cache_async();
+
+      //If code is in cache: returns pointer & bumps to front of MRU list
+      //If code is not in cache, and not blacklisted, and not currently compiling: return nullptr and kick off compile
+      //otherwise: return nullptr
+      const code_descriptor* const get_descriptor_for_code(const digest_type& code_id, const uint8_t& vm_version);
+
+   private:
+      std::thread _monitor_reply_thread;
+      boost::lockfree::spsc_queue<wasm_compilation_result_message> _result_queue;
+      void wait_on_compile_monitor_message();
+      std::tuple<size_t, size_t> consume_compile_thread_queue();
+      std::unordered_set<code_tuple> _blacklist;
+      size_t _threads;
+};
+
+class code_cache_sync : public code_cache_base {
+   public:
+      using code_cache_base::code_cache_base;
+      ~code_cache_sync();
+
+      //Can still fail and return nullptr if, for example, there is an expected instantiation failure
+      const code_descriptor* const get_descriptor_for_code_sync(const digest_type& code_id, const uint8_t& vm_version);
+};
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/compile_monitor.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/compile_monitor.hpp
new file mode 100644
index 00000000000..7d4229e4616
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/compile_monitor.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <eosio/chain/webassembly/eos-vm-oc/config.hpp>
+
+#include <boost/asio/local/datagram_protocol.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+wrapped_fd get_connection_to_compile_monitor(int cache_fd);
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/compile_trampoline.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/compile_trampoline.hpp
new file mode 100644
index 00000000000..c6be55ad3ea
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/compile_trampoline.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+void run_compile_trampoline(int fd);
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/config.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/config.hpp
new file mode 100644
index 00000000000..dbab7b0342b
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/config.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <istream>
+#include <ostream>
+#include <vector>
+#include <string>
+
+#include <boost/filesystem/path.hpp>
+#include <fc/reflect/reflect.hpp>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+struct config {
+   uint64_t cache_size = 1024u*1024u*1024u;
+   uint64_t threads    = 1u;
+};
+
+}}}
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
new file mode 100644
index 00000000000..13f5d52b5f5
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <eosio/chain/types.hpp>
+
+#include <exception>
+
+#include <stdint.h>
+#include <stddef.h>
+#include <setjmp.h>
+
+#include <vector>
+#include <list>
+
+namespace eosio { namespace chain {
+
+class apply_context;
+
+namespace eosvmoc {
+
+struct control_block {
+   uint64_t magic;
+   uintptr_t execution_thread_code_start;
+   size_t execution_thread_code_length;
+   uintptr_t execution_thread_memory_start;
+   size_t execution_thread_memory_length;
+   apply_context* ctx;
+   std::exception_ptr* eptr;
+   unsigned current_call_depth_remaining;
+   unsigned bouce_buffer_ptr;  //XX remove me
+   int64_t current_linear_memory_pages; //-1 if no memory
+   uintptr_t full_linear_memory_start;
+   sigjmp_buf* jmp;
+   std::list<std::vector<uint8_t>>* bounce_buffers;
+   uintptr_t running_code_base;
+   bool is_running;
+};
+
+struct no_offset{};
+struct code_offset{ size_t offset; };    //relative to code_begin
+struct intrinsic_ordinal{ size_t ordinal; };
+
+using eosvmoc_optional_offset_or_import_t = fc::static_variant<no_offset, code_offset, intrinsic_ordinal>;
+
+struct code_descriptor {
+   digest_type code_hash;
+   uint8_t vm_version;
+   uint8_t codegen_version;
+   size_t code_begin;
+   eosvmoc_optional_offset_or_import_t start;
+   unsigned apply_offset;
+   int starting_memory_pages;
+   size_t initdata_begin;
+   unsigned initdata_size;
+   unsigned initdata_prolouge_size;
+};
+
+enum eosvmoc_exitcode : int {
+   EOSVMOC_EXIT_CLEAN_EXIT = 1,
+   EOSVMOC_EXIT_CHECKTIME_FAIL,
+   EOSVMOC_EXIT_SEGV,
+   EOSVMOC_EXIT_EXCEPTION
+};
+
+}}}
+
+FC_REFLECT(eosio::chain::eosvmoc::no_offset, );
+FC_REFLECT(eosio::chain::eosvmoc::code_offset, (offset));
+FC_REFLECT(eosio::chain::eosvmoc::intrinsic_ordinal, (ordinal));
+FC_REFLECT(eosio::chain::eosvmoc::code_descriptor, (code_hash)(vm_version)(codegen_version)(code_begin)(start)(apply_offset)(starting_memory_pages)(initdata_begin)(initdata_size)(initdata_prolouge_size));
+
+#define EOSVMOC_INTRINSIC_INIT_PRIORITY __attribute__((init_priority(198)))
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
new file mode 100644
index 00000000000..b6ff5e37369
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <stdint.h>
+#include <stddef.h>
+#include <exception>
+#include <setjmp.h>
+
+#include <list>
+#include <vector>
+
+namespace eosio { namespace chain {
+
+class apply_context;
+
+namespace eosvmoc {
+
+class code_cache_base;
+class memory;
+struct code_descriptor;
+
+class executor {
+   public:
+      executor(const code_cache_base& cc);
+      ~executor();
+
+      void execute(const code_descriptor& code, const memory& mem, apply_context& context);
+
+   private:
+      uint8_t* code_mapping;
+      size_t code_mapping_size;
+      bool mapping_is_executable;
+
+      std::exception_ptr executors_exception_ptr;
+      sigjmp_buf executors_sigjmp_buf;
+      std::list<std::vector<uint8_t>> executors_bounce_buffers;
+};
+
+}}}
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp
new file mode 100644
index 00000000000..d61af22c919
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp>
+
+#include <map>
+#include <string>
+
+namespace IR {
+   struct FunctionType;
+}
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+struct intrinsic {
+   intrinsic(const char* name, const IR::FunctionType* type, void* function_ptr, size_t ordinal);
+};
+
+struct intrinsic_entry {
+   const IR::FunctionType* const type;
+   const void* const function_ptr;
+   const size_t ordinal;
+};
+
+using intrinsic_map_t = std::map<std::string, intrinsic_entry>;
+
+const intrinsic_map_t& get_intrinsic_map();
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp
new file mode 100644
index 00000000000..497fe8cc529
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp
@@ -0,0 +1,254 @@
+#pragma once
+
+#define BOOST_HANA_CONFIG_ENABLE_STRING_UDL
+#include <boost/hana/tuple.hpp>
+#include <boost/hana/string.hpp>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+using namespace boost::hana::literals;
+
+//NEVER reorder or remove indexes; the PIC uses the indexes in this table as an offset in to a jump
+// table. Adding on the bottom is fine and requires no other updates elsewhere
+constexpr auto intrinsic_table = boost::hana::make_tuple(
+   "eosvmoc_internal.unreachable"_s,
+   "eosvmoc_internal.grow_memory"_s,
+   "eosvmoc_internal.div0_or_overflow"_s,
+   "eosvmoc_internal.indirect_call_mismatch"_s,
+   "eosvmoc_internal.indirect_call_oob"_s,
+   "eosvmoc_internal.depth_assert"_s,
+   "eosio_injection.call_depth_assert"_s,  //these two are never used by EOS-VM OC but all intrinsics
+   "eosio_injection.checktime"_s,          //must be mapped
+   "env.__ashlti3"_s,
+   "env.__ashrti3"_s,
+   "env.__lshlti3"_s,
+   "env.__lshrti3"_s,
+   "env.__divti3"_s,
+   "env.__udivti3"_s,
+   "env.__modti3"_s,
+   "env.__umodti3"_s,
+   "env.__multi3"_s,
+   "env.__addtf3"_s,
+   "env.__subtf3"_s,
+   "env.__multf3"_s,
+   "env.__divtf3"_s,
+   "env.__eqtf2"_s,
+   "env.__netf2"_s,
+   "env.__getf2"_s,
+   "env.__gttf2"_s,
+   "env.__lttf2"_s,
+   "env.__letf2"_s,
+   "env.__cmptf2"_s,
+   "env.__unordtf2"_s,
+   "env.__negtf2"_s,
+   "env.__floatsitf"_s,
+   "env.__floatunsitf"_s,
+   "env.__floatditf"_s,
+   "env.__floatunditf"_s,
+   "env.__floattidf"_s,
+   "env.__floatuntidf"_s,
+   "env.__floatsidf"_s,
+   "env.__extendsftf2"_s,
+   "env.__extenddftf2"_s,
+   "env.__fixtfti"_s,
+   "env.__fixtfdi"_s,
+   "env.__fixtfsi"_s,
+   "env.__fixunstfti"_s,
+   "env.__fixunstfdi"_s,
+   "env.__fixunstfsi"_s,
+   "env.__fixsfti"_s,
+   "env.__fixdfti"_s,
+   "env.__fixunssfti"_s,
+   "env.__fixunsdfti"_s,
+   "env.__trunctfdf2"_s,
+   "env.__trunctfsf2"_s,
+   "env.is_feature_active"_s,
+   "env.activate_feature"_s,
+   "env.get_resource_limits"_s,
+   "env.set_resource_limits"_s,
+   "env.set_proposed_producers"_s,
+   "env.set_proposed_producers_ex"_s,
+   "env.get_blockchain_parameters_packed"_s,
+   "env.set_blockchain_parameters_packed"_s,
+   "env.is_privileged"_s,
+   "env.set_privileged"_s,
+   "env.preactivate_feature"_s,
+   "env.get_active_producers"_s,
+   "env.db_store_i64"_s,
+   "env.db_update_i64"_s,
+   "env.db_remove_i64"_s,
+   "env.db_get_i64"_s,
+   "env.db_next_i64"_s,
+   "env.db_previous_i64"_s,
+   "env.db_find_i64"_s,
+   "env.db_lowerbound_i64"_s,
+   "env.db_upperbound_i64"_s,
+   "env.db_end_i64"_s,
+   "env.db_idx64_store"_s,
+   "env.db_idx64_remove"_s,
+   "env.db_idx64_update"_s,
+   "env.db_idx64_find_primary"_s,
+   "env.db_idx64_find_secondary"_s,
+   "env.db_idx64_lowerbound"_s,
+   "env.db_idx64_upperbound"_s,
+   "env.db_idx64_end"_s,
+   "env.db_idx64_next"_s,
+   "env.db_idx64_previous"_s,
+   "env.db_idx128_store"_s,
+   "env.db_idx128_remove"_s,
+   "env.db_idx128_update"_s,
+   "env.db_idx128_find_primary"_s,
+   "env.db_idx128_find_secondary"_s,
+   "env.db_idx128_lowerbound"_s,
+   "env.db_idx128_upperbound"_s,
+   "env.db_idx128_end"_s,
+   "env.db_idx128_next"_s,
+   "env.db_idx128_previous"_s,
+   "env.db_idx_double_store"_s,
+   "env.db_idx_double_remove"_s,
+   "env.db_idx_double_update"_s,
+   "env.db_idx_double_find_primary"_s,
+   "env.db_idx_double_find_secondary"_s,
+   "env.db_idx_double_lowerbound"_s,
+   "env.db_idx_double_upperbound"_s,
+   "env.db_idx_double_end"_s,
+   "env.db_idx_double_next"_s,
+   "env.db_idx_double_previous"_s,
+   "env.db_idx_long_double_store"_s,
+   "env.db_idx_long_double_remove"_s,
+   "env.db_idx_long_double_update"_s,
+   "env.db_idx_long_double_find_primary"_s,
+   "env.db_idx_long_double_find_secondary"_s,
+   "env.db_idx_long_double_lowerbound"_s,
+   "env.db_idx_long_double_upperbound"_s,
+   "env.db_idx_long_double_end"_s,
+   "env.db_idx_long_double_next"_s,
+   "env.db_idx_long_double_previous"_s,
+   "env.db_idx256_store"_s,
+   "env.db_idx256_remove"_s,
+   "env.db_idx256_update"_s,
+   "env.db_idx256_find_primary"_s,
+   "env.db_idx256_find_secondary"_s,
+   "env.db_idx256_lowerbound"_s,
+   "env.db_idx256_upperbound"_s,
+   "env.db_idx256_end"_s,
+   "env.db_idx256_next"_s,
+   "env.db_idx256_previous"_s,
+   "env.assert_recover_key"_s,
+   "env.recover_key"_s,
+   "env.assert_sha256"_s,
+   "env.assert_sha1"_s,
+   "env.assert_sha512"_s,
+   "env.assert_ripemd160"_s,
+   "env.sha1"_s,
+   "env.sha256"_s,
+   "env.sha512"_s,
+   "env.ripemd160"_s,
+   "env.check_transaction_authorization"_s,
+   "env.check_permission_authorization"_s,
+   "env.get_permission_last_used"_s,
+   "env.get_account_creation_time"_s,
+   "env.current_time"_s,
+   "env.publication_time"_s,
+   "env.is_feature_activated"_s,
+   "env.get_sender"_s,
+   "env.abort"_s,
+   "env.eosio_assert"_s,
+   "env.eosio_assert_message"_s,
+   "env.eosio_assert_code"_s,
+   "env.eosio_exit"_s,
+   "env.read_action_data"_s,
+   "env.action_data_size"_s,
+   "env.current_receiver"_s,
+   "env.require_recipient"_s,
+   "env.require_auth"_s,
+   "env.require_auth2"_s,
+   "env.has_auth"_s,
+   "env.is_account"_s,
+   "env.prints"_s,
+   "env.prints_l"_s,
+   "env.printi"_s,
+   "env.printui"_s,
+   "env.printi128"_s,
+   "env.printui128"_s,
+   "env.printsf"_s,
+   "env.printdf"_s,
+   "env.printqf"_s,
+   "env.printn"_s,
+   "env.printhex"_s,
+   "env.read_transaction"_s,
+   "env.transaction_size"_s,
+   "env.expiration"_s,
+   "env.tapos_block_prefix"_s,
+   "env.tapos_block_num"_s,
+   "env.get_action"_s,
+   "env.send_inline"_s,
+   "env.send_context_free_inline"_s,
+   "env.send_deferred"_s,
+   "env.cancel_deferred"_s,
+   "env.get_context_free_data"_s,
+   "env.memcpy"_s,
+   "env.memmove"_s,
+   "env.memcmp"_s,
+   "env.memset"_s,
+   "eosio_injection._eosio_f32_add"_s,
+   "eosio_injection._eosio_f32_sub"_s,
+   "eosio_injection._eosio_f32_mul"_s,
+   "eosio_injection._eosio_f32_div"_s,
+   "eosio_injection._eosio_f32_min"_s,
+   "eosio_injection._eosio_f32_max"_s,
+   "eosio_injection._eosio_f32_copysign"_s,
+   "eosio_injection._eosio_f32_abs"_s,
+   "eosio_injection._eosio_f32_neg"_s,
+   "eosio_injection._eosio_f32_sqrt"_s,
+   "eosio_injection._eosio_f32_ceil"_s,
+   "eosio_injection._eosio_f32_floor"_s,
+   "eosio_injection._eosio_f32_trunc"_s,
+   "eosio_injection._eosio_f32_nearest"_s,
+   "eosio_injection._eosio_f32_eq"_s,
+   "eosio_injection._eosio_f32_ne"_s,
+   "eosio_injection._eosio_f32_lt"_s,
+   "eosio_injection._eosio_f32_le"_s,
+   "eosio_injection._eosio_f32_gt"_s,
+   "eosio_injection._eosio_f32_ge"_s,
+   "eosio_injection._eosio_f64_add"_s,
+   "eosio_injection._eosio_f64_sub"_s,
+   "eosio_injection._eosio_f64_mul"_s,
+   "eosio_injection._eosio_f64_div"_s,
+   "eosio_injection._eosio_f64_min"_s,
+   "eosio_injection._eosio_f64_max"_s,
+   "eosio_injection._eosio_f64_copysign"_s,
+   "eosio_injection._eosio_f64_abs"_s,
+   "eosio_injection._eosio_f64_neg"_s,
+   "eosio_injection._eosio_f64_sqrt"_s,
+   "eosio_injection._eosio_f64_ceil"_s,
+   "eosio_injection._eosio_f64_floor"_s,
+   "eosio_injection._eosio_f64_trunc"_s,
+   "eosio_injection._eosio_f64_nearest"_s,
+   "eosio_injection._eosio_f64_eq"_s,
+   "eosio_injection._eosio_f64_ne"_s,
+   "eosio_injection._eosio_f64_lt"_s,
+   "eosio_injection._eosio_f64_le"_s,
+   "eosio_injection._eosio_f64_gt"_s,
+   "eosio_injection._eosio_f64_ge"_s,
+   "eosio_injection._eosio_f32_promote"_s,
+   "eosio_injection._eosio_f64_demote"_s,
+   "eosio_injection._eosio_f32_trunc_i32s"_s,
+   "eosio_injection._eosio_f64_trunc_i32s"_s,
+   "eosio_injection._eosio_f32_trunc_i32u"_s,
+   "eosio_injection._eosio_f64_trunc_i32u"_s,
+   "eosio_injection._eosio_f32_trunc_i64s"_s,
+   "eosio_injection._eosio_f64_trunc_i64s"_s,
+   "eosio_injection._eosio_f32_trunc_i64u"_s,
+   "eosio_injection._eosio_f64_trunc_i64u"_s,
+   "eosio_injection._eosio_i32_to_f32"_s,
+   "eosio_injection._eosio_i64_to_f32"_s,
+   "eosio_injection._eosio_ui32_to_f32"_s,
+   "eosio_injection._eosio_ui64_to_f32"_s,
+   "eosio_injection._eosio_i32_to_f64"_s,
+   "eosio_injection._eosio_i64_to_f64"_s,
+   "eosio_injection._eosio_ui32_to_f64"_s,
+   "eosio_injection._eosio_ui64_to_f64"_s
+);
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp
new file mode 100644
index 00000000000..5ee58e998f1
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp>
+
+#include <boost/asio/local/datagram_protocol.hpp>
+
+#include <vector>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+class wrapped_fd {
+   public:
+      wrapped_fd() : _inuse(false) {}
+      wrapped_fd(int fd) : _inuse(true), _fd(fd) {}
+      wrapped_fd(const wrapped_fd&) = delete;
+      wrapped_fd& operator=(const wrapped_fd&) = delete;
+      wrapped_fd(wrapped_fd&& other) : _inuse(other._inuse), _fd(other._fd) {other._inuse = false;}
+      wrapped_fd& operator=(wrapped_fd&& other) {
+         _inuse = other._inuse;
+         _fd = other._fd;
+         other._inuse = false;
+         return *this;
+      }
+
+      operator int() const {
+         if(_inuse)
+            return _fd;
+         return -1; ///XXX this should probably assert/throw?
+      }
+
+      int release() {
+         _inuse = false;
+         return _fd;
+      }
+
+      ~wrapped_fd() {
+         if(_inuse)
+            close(_fd);
+      }
+
+   private:
+      bool _inuse = false;;
+      int _fd;
+};
+
+std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds(boost::asio::local::datagram_protocol::socket& s);
+std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds(int fd);
+void write_message_with_fds(boost::asio::local::datagram_protocol::socket& s, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds = std::vector<wrapped_fd>());
+void write_message_with_fds(int fd_to_send_to, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds = std::vector<wrapped_fd>());
+
+wrapped_fd memfd_for_vector(const std::vector<uint8_t>& bytes);
+wrapped_fd memfd_for_blob(const shared_blob& blob);
+std::vector<uint8_t> vector_for_memfd(const wrapped_fd& memfd);
+}}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp
new file mode 100644
index 00000000000..65ff33093eb
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <eosio/chain/webassembly/eos-vm-oc/config.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp>
+#include <eosio/chain/types.hpp>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+struct initialize_message {
+   //Two sent fds: 1) communication socket for this instance  2) the cache file 
+};
+
+struct initalize_response_message {
+   fc::optional<std::string> error_message; //no error message? everything groovy
+};
+
+struct code_tuple {
+   eosio::chain::digest_type code_id;
+   uint8_t vm_version;
+   bool operator==(const code_tuple& o) const {return o.code_id == code_id && o.vm_version == vm_version;}
+};
+
+struct compile_wasm_message {
+   code_tuple code;
+   //Two sent fd: 1) communication socket for result, 2) the wasm to compile
+};
+
+struct evict_wasms_message {
+   std::vector<code_descriptor> codes;
+};
+
+struct code_compilation_result_message {
+   eosvmoc_optional_offset_or_import_t start;
+   unsigned apply_offset;
+   int starting_memory_pages;
+   unsigned initdata_prolouge_size;
+   //Two sent fds: 1) wasm code, 2) initial memory snapshot
+};
+
+
+struct compilation_result_unknownfailure {};
+struct compilation_result_toofull {};
+
+using wasm_compilation_result = fc::static_variant<code_descriptor,  //a successful compile
+                                                  compilation_result_unknownfailure,
+                                                  compilation_result_toofull>;
+
+struct wasm_compilation_result_message {
+   code_tuple code;
+   wasm_compilation_result result;
+   size_t cache_free_bytes;
+};
+
+using eosvmoc_message = fc::static_variant<initialize_message,
+                                           initalize_response_message,
+                                           compile_wasm_message,
+                                           evict_wasms_message,
+                                           code_compilation_result_message,
+                                           wasm_compilation_result_message
+                                          >;
+}}}
+
+FC_REFLECT(eosio::chain::eosvmoc::initialize_message, )
+FC_REFLECT(eosio::chain::eosvmoc::initalize_response_message, (error_message))
+FC_REFLECT(eosio::chain::eosvmoc::code_tuple, (code_id)(vm_version))
+FC_REFLECT(eosio::chain::eosvmoc::compile_wasm_message, (code))
+FC_REFLECT(eosio::chain::eosvmoc::evict_wasms_message, (codes))
+FC_REFLECT(eosio::chain::eosvmoc::code_compilation_result_message, (start)(apply_offset)(starting_memory_pages)(initdata_prolouge_size))
+FC_REFLECT(eosio::chain::eosvmoc::compilation_result_unknownfailure, )
+FC_REFLECT(eosio::chain::eosvmoc::compilation_result_toofull, )
+FC_REFLECT(eosio::chain::eosvmoc::wasm_compilation_result_message, (code)(result)(cache_free_bytes))
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
new file mode 100644
index 00000000000..5b5b1b05986
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <eosio/chain/wasm_eosio_constraints.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp>
+
+#include <stdint.h>
+#include <stddef.h>
+
+#ifdef __clang__
+   #define GS_PTR __attribute__((address_space(256)))
+#else
+   #define GS_PTR __seg_gs
+#endif
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+class memory {
+      static constexpr uint64_t wasm_memory_size                  = eosio::chain::wasm_constraints::maximum_linear_memory;
+      static constexpr uint64_t intrinsic_count                   = boost::hana::length(intrinsic_table);
+      //warning: changing the following 3 params will invalidate existing PIC
+      static constexpr uint64_t mutable_global_size               = 8u  * eosio::chain::wasm_constraints::maximum_mutable_globals/4u;
+      static constexpr uint64_t table_size                        = 16u * eosio::chain::wasm_constraints::maximum_table_elements;
+      static constexpr size_t   wcb_allowance                     = 512u;
+      static_assert(sizeof(control_block) <= wcb_allowance, "EOS-VM OC memory doesn't set aside enough memory for control block");
+
+      //round up the prologue to multiple of 4K page
+      static constexpr uint64_t memory_prologue_size = ((memory::wcb_allowance + mutable_global_size + table_size + intrinsic_count*UINT64_C(8))+UINT64_C(4095))/UINT64_C(4096)*UINT64_C(4096);
+      //prolouge + 33MB + 4GB fault buffer + 4096 addtional buffer for safety
+      static constexpr uint64_t total_memory_per_slice = memory_prologue_size + wasm_memory_size + UINT64_C(0x100000000) + UINT64_C(4096);
+
+      static constexpr uint64_t number_slices = wasm_memory_size/(64u*1024u)+1u;
+
+   public:
+      memory();
+      ~memory();
+
+      uint8_t* const zero_page_memory_base() const { return zeropage_base; }
+      uint8_t* const full_page_memory_base() const { return fullpage_base; }
+
+      control_block* const get_control_block() const { return reinterpret_cast<control_block* const>(zeropage_base - cb_offset);}
+
+      //these two are really only inteded for SEGV handling
+      uint8_t* const start_of_memory_slices() const { return mapbase; }
+      size_t size_of_memory_slice_mapping() const { return mapsize; }
+
+      //to obtain memory protected for n wasm-pages, use the pointer computed from:
+      //   zero_page_memory_base()+stride*n
+      static constexpr size_t stride = total_memory_per_slice;
+
+      //offsets to various interesting things in the memory and pointers to them via helper macros
+      static constexpr uintptr_t linear_memory = 0;
+      static constexpr uintptr_t cb_offset = wcb_allowance + mutable_global_size + table_size;
+      static constexpr uintptr_t first_intrinsic_offset = cb_offset + 8u;
+#define EOSVMOC_MEMORY_PTR_linear_memory_ptr            GS_PTR uint8_t* const linear_memory_ptr = reinterpret_cast<GS_PTR control_block* const>(memory::linear_memory);
+#define EOSVMOC_MEMORY_PTR_cb_ptr                       GS_PTR control_block* const cb_ptr = reinterpret_cast<GS_PTR control_block* const>(-memory::cb_offset);
+#define EOSVMOC_MEMORY_PTR_first_intrinsic_ptr          GS_PTR uintptr_t* const first_intrinsic_ptr = reinterpret_cast<GS_PTR uintptr_t* const>(-memory::first_intrinsic_offset);
+
+   private:
+      uint8_t* mapbase;
+      uint64_t mapsize;
+
+      uint8_t* zeropage_base;
+      uint8_t* fullpage_base;
+};
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp b/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
index 2a9b8119b67..9d7da487b47 100644
--- a/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/runtime_interface.hpp
@@ -15,7 +15,8 @@ class wasm_instantiated_module_interface {
 
 class wasm_runtime_interface {
    public:
-      virtual std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) = 0;
+      virtual std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
+                                                                                     const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) = 0;
 
       //immediately exit the currently running wasm_instantiated_module_interface. Yep, this assumes only one can possibly run at a time.
       virtual void immediately_exit_currently_running_module() = 0;
@@ -23,4 +24,4 @@ class wasm_runtime_interface {
       virtual ~wasm_runtime_interface();
 };
 
-}}
\ No newline at end of file
+}}
diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index 556003c6251..760386920ef 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -50,7 +50,8 @@ struct intrinsic_registrator {
 class wabt_runtime : public eosio::chain::wasm_runtime_interface {
    public:
       wabt_runtime();
-      std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) override;
+      std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
+                                                                             const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) override;
 
       void immediately_exit_currently_running_module() override;
 
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 01c41c8ce75..4e99be52dc0 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -20,7 +20,8 @@ class wavm_runtime : public eosio::chain::wasm_runtime_interface {
    public:
       wavm_runtime();
       ~wavm_runtime();
-      std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) override;
+      std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
+                                                                             const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) override;
 
       void immediately_exit_currently_running_module() override;
 };
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 99940d112a3..5724671db42 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -26,10 +26,12 @@
 #include <string.h>
 
 namespace eosio { namespace chain {
-   using namespace webassembly;
    using namespace webassembly::common;
 
-   wasm_interface::wasm_interface(vm_type vm, const chainbase::database& d) : my( new wasm_interface_impl(vm, d) ) {}
+   wasm_interface::wasm_interface(vm_type vm, bool eosvmoc_tierup, const chainbase::database& d, const boost::filesystem::path data_dir, const eosvmoc::config& eosvmoc_config)
+     : my( new wasm_interface_impl(vm, eosvmoc_tierup, d, data_dir, eosvmoc_config) ) {}
+
+   using namespace webassembly;
 
    wasm_interface::~wasm_interface() {}
 
@@ -70,6 +72,15 @@ namespace eosio { namespace chain {
    }
 
    void wasm_interface::apply( const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, apply_context& context ) {
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+      if(my->eosvmoc) {
+         const chain::eosvmoc::code_descriptor* cd = my->eosvmoc->cc.get_descriptor_for_code(code_hash, vm_version);
+         if(cd) {
+            my->eosvmoc->exec.execute(*cd, my->eosvmoc->mem, context);
+            return;
+         }
+      }
+#endif
       my->get_instantiated_module(code_hash, vm_type, vm_version, context.trx_context)->apply(context);
    }
 
@@ -2056,6 +2067,8 @@ std::istream& operator>>(std::istream& in, wasm_interface::vm_type& runtime) {
       runtime = eosio::chain::wasm_interface::vm_type::wavm;
    else if (s == "wabt")
       runtime = eosio::chain::wasm_interface::vm_type::wabt;
+   else if (s == "eos-vm-oc")
+      runtime = eosio::chain::wasm_interface::vm_type::eos_vm_oc;
    else
       in.setstate(std::ios_base::failbit);
    return in;
diff --git a/libraries/chain/webassembly/eos-vm-oc.cpp b/libraries/chain/webassembly/eos-vm-oc.cpp
new file mode 100644
index 00000000000..af1f3eb0099
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc.cpp
@@ -0,0 +1,53 @@
+#include <eosio/chain/webassembly/eos-vm-oc.hpp>
+#include <eosio/chain/wasm_eosio_constraints.hpp>
+#include <eosio/chain/wasm_eosio_injection.hpp>
+#include <eosio/chain/apply_context.hpp>
+#include <eosio/chain/exceptions.hpp>
+
+#include <vector>
+#include <iterator>
+
+namespace eosio { namespace chain { namespace webassembly { namespace eosvmoc {
+
+class eosvmoc_instantiated_module : public wasm_instantiated_module_interface {
+   public:
+      eosvmoc_instantiated_module(const digest_type& code_hash, const uint8_t& vm_version, eosvmoc_runtime& wr) :
+         _code_hash(code_hash),
+         _vm_version(vm_version),
+         _eosvmoc_runtime(wr)
+      {
+
+      }
+
+      ~eosvmoc_instantiated_module() {
+         _eosvmoc_runtime.cc.free_code(_code_hash, _vm_version);
+      }
+
+      void apply(apply_context& context) override {
+         const code_descriptor* const cd = _eosvmoc_runtime.cc.get_descriptor_for_code_sync(_code_hash, _vm_version);
+         EOS_ASSERT(cd, wasm_execution_error, "EOS-VM OC instantiation failed");
+
+         _eosvmoc_runtime.exec.execute(*cd, _eosvmoc_runtime.mem, context);
+      }
+
+      const digest_type              _code_hash;
+      const uint8_t                  _vm_version;
+      eosvmoc_runtime&               _eosvmoc_runtime;
+};
+
+eosvmoc_runtime::eosvmoc_runtime(const boost::filesystem::path data_dir, const eosvmoc::config& eosvmoc_config, const chainbase::database& db)
+   : cc(data_dir, eosvmoc_config, db), exec(cc) {
+}
+
+eosvmoc_runtime::~eosvmoc_runtime() {
+}
+
+std::unique_ptr<wasm_instantiated_module_interface> eosvmoc_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
+                                                                                     const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) {
+
+   return std::make_unique<eosvmoc_instantiated_module>(code_hash, vm_type, *this);
+}
+
+void eosvmoc_runtime::immediately_exit_currently_running_module() {}
+
+}}}}
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
new file mode 100644
index 00000000000..c412a039816
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
@@ -0,0 +1,1303 @@
+#include "LLVMJIT.h"
+#include "llvm/ADT/SmallVector.h"
+#include "IR/Operators.h"
+#include "IR/OperatorPrinter.h"
+#include "llvm/Support/raw_ostream.h"
+
+#include "llvm/Analysis/Passes.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Intrinsics.h"
+#include "llvm/IR/Verifier.h"
+#include "llvm/IR/ValueHandle.h"
+#include "llvm/IR/DebugLoc.h"
+#include "llvm/Object/ObjectFile.h"
+#include "llvm/Object/SymbolSize.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/TargetSelect.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Transforms/Scalar.h"
+#include "llvm/IR/DIBuilder.h"
+#include "llvm/Transforms/InstCombine/InstCombine.h"
+#include "llvm/Transforms/Utils.h"
+
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+
+#define ENABLE_LOGGING 0
+#define ENABLE_FUNCTION_ENTER_EXIT_HOOKS 0
+
+using namespace IR;
+
+namespace eosio { namespace chain { namespace eosvmoc {
+namespace LLVMJIT
+{
+	static std::string getExternalFunctionName(Uptr functionDefIndex)
+	{
+		return "wasmFunc" + std::to_string(functionDefIndex);
+	}
+
+	bool getFunctionIndexFromExternalName(const char* externalName,Uptr& outFunctionDefIndex)
+	{
+		const char wasmFuncPrefix[] = "wasmFunc";
+		const Uptr numPrefixChars = sizeof(wasmFuncPrefix) - 1;
+		if(!strncmp(externalName,wasmFuncPrefix,numPrefixChars))
+		{
+			char* numberEnd = nullptr;
+			U64 functionDefIndex64 = std::strtoull(externalName + numPrefixChars,&numberEnd,10);
+			if(functionDefIndex64 > UINTPTR_MAX) { return false; }
+			outFunctionDefIndex = Uptr(functionDefIndex64);
+			return true;
+		}
+		else { return false; }
+	}
+
+	llvm::Value* CreateInBoundsGEPWAR(llvm::IRBuilder<>& irBuilder, llvm::Value* Ptr, llvm::Value* v1, llvm::Value* v2 = nullptr);
+
+	llvm::LLVMContext context;
+	llvm::Type* llvmResultTypes[(Uptr)ResultType::num];
+
+	llvm::Type* llvmI8Type;
+	llvm::Type* llvmI16Type;
+	llvm::Type* llvmI32Type;
+	llvm::Type* llvmI64Type;
+	llvm::Type* llvmF32Type;
+	llvm::Type* llvmF64Type;
+	llvm::Type* llvmVoidType;
+	llvm::Type* llvmBoolType;
+	llvm::Type* llvmI8PtrType;
+
+	llvm::Constant* typedZeroConstants[(Uptr)ValueType::num];
+
+	// Converts a WebAssembly type to a LLVM type.
+	inline llvm::Type* asLLVMType(ValueType type) { return llvmResultTypes[(Uptr)asResultType(type)]; }
+	inline llvm::Type* asLLVMType(ResultType type) { return llvmResultTypes[(Uptr)type]; }
+
+	// Converts a WebAssembly function type to a LLVM type.
+	inline llvm::FunctionType* asLLVMType(const FunctionType* functionType)
+	{
+		auto llvmArgTypes = (llvm::Type**)alloca(sizeof(llvm::Type*) * functionType->parameters.size());
+		for(Uptr argIndex = 0;argIndex < functionType->parameters.size();++argIndex)
+		{
+			llvmArgTypes[argIndex] = asLLVMType(functionType->parameters[argIndex]);
+		}
+		auto llvmResultType = asLLVMType(functionType->ret);
+		return llvm::FunctionType::get(llvmResultType,llvm::ArrayRef<llvm::Type*>(llvmArgTypes,functionType->parameters.size()),false);
+	}
+
+	// Overloaded functions that compile a literal value to a LLVM constant of the right type.
+	inline llvm::ConstantInt* emitLiteral(U32 value) { return (llvm::ConstantInt*)llvm::ConstantInt::get(llvmI32Type,llvm::APInt(32,(U64)value,false)); }
+	inline llvm::ConstantInt* emitLiteral(I32 value) { return (llvm::ConstantInt*)llvm::ConstantInt::get(llvmI32Type,llvm::APInt(32,(I64)value,false)); }
+	inline llvm::ConstantInt* emitLiteral(U64 value) { return (llvm::ConstantInt*)llvm::ConstantInt::get(llvmI64Type,llvm::APInt(64,value,false)); }
+	inline llvm::ConstantInt* emitLiteral(I64 value) { return (llvm::ConstantInt*)llvm::ConstantInt::get(llvmI64Type,llvm::APInt(64,value,false)); }
+	inline llvm::Constant* emitLiteral(F32 value) { return llvm::ConstantFP::get(context,llvm::APFloat(value)); }
+	inline llvm::Constant* emitLiteral(F64 value) { return llvm::ConstantFP::get(context,llvm::APFloat(value)); }
+	inline llvm::Constant* emitLiteral(bool value) { return llvm::ConstantInt::get(llvmBoolType,llvm::APInt(1,value ? 1 : 0,false)); }
+	inline llvm::Constant* emitLiteralPointer(const void* pointer,llvm::Type* type)
+	{
+		auto pointerInt = llvm::APInt(sizeof(Uptr) == 8 ? 64 : 32,reinterpret_cast<Uptr>(pointer));
+		return llvm::Constant::getIntegerValue(type,pointerInt);
+	}
+
+	// The LLVM IR for a module.
+	struct EmitModuleContext
+	{
+		const Module& module;
+
+		llvm::Module* llvmModule;
+		std::vector<llvm::Function*> functionDefs;
+		std::vector<size_t> importedFunctionOffsets;
+		std::vector<llvm::Constant*> globals;
+		llvm::Constant* defaultTablePointer;
+		llvm::Constant* defaultTableMaxElementIndex;
+		llvm::Constant* defaultMemoryBase;
+		llvm::Constant* depthCounter;
+		bool tableOnlyHasDefinedFuncs = true;
+
+		llvm::MDNode* likelyFalseBranchWeights;
+		llvm::MDNode* likelyTrueBranchWeights;
+
+		EmitModuleContext(const Module& inModule)
+		: module(inModule)
+		, llvmModule(new llvm::Module("",context))
+		{
+			auto zeroAsMetadata = llvm::ConstantAsMetadata::get(emitLiteral(I32(0)));
+			auto i32MaxAsMetadata = llvm::ConstantAsMetadata::get(emitLiteral(I32(INT32_MAX)));
+			likelyFalseBranchWeights = llvm::MDTuple::getDistinct(context,{llvm::MDString::get(context,"branch_weights"),zeroAsMetadata,i32MaxAsMetadata});
+			likelyTrueBranchWeights = llvm::MDTuple::getDistinct(context,{llvm::MDString::get(context,"branch_weights"),i32MaxAsMetadata,zeroAsMetadata});
+
+		}
+		llvm::Module* emit();
+	};
+
+	// The context used by functions involved in JITing a single AST function.
+	struct EmitFunctionContext
+	{
+		typedef void Result;
+
+		EmitModuleContext& moduleContext;
+		const Module& module;
+		const FunctionDef& functionDef;
+		const FunctionType* functionType;
+		llvm::Function* llvmFunction;
+		llvm::IRBuilder<> irBuilder;
+
+		std::vector<llvm::Value*> localPointers;
+
+		llvm::DISubprogram* diFunction;
+
+		// Information about an in-scope control structure.
+		struct ControlContext
+		{
+			enum class Type : U8
+			{
+				function,
+				block,
+				ifThen,
+				ifElse,
+				loop
+			};
+
+			Type type;
+			llvm::BasicBlock* endBlock;
+			llvm::PHINode* endPHI;
+			llvm::BasicBlock* elseBlock;
+			ResultType resultType;
+			Uptr outerStackSize;
+			Uptr outerBranchTargetStackSize;
+			bool isReachable;
+			bool isElseReachable;
+		};
+
+		struct BranchTarget
+		{
+			ResultType argumentType;
+			llvm::BasicBlock* block;
+			llvm::PHINode* phi;
+		};
+
+		std::vector<ControlContext> controlStack;
+		std::vector<BranchTarget> branchTargetStack;
+		std::vector<llvm::Value*> stack;
+
+		EmitFunctionContext(EmitModuleContext& inEmitModuleContext,const Module& inModule,const FunctionDef& inFunctionDef,llvm::Function* inLLVMFunction)
+		: moduleContext(inEmitModuleContext)
+		, module(inModule)
+		, functionDef(inFunctionDef)
+		, functionType(inModule.types[inFunctionDef.type.index])
+		, llvmFunction(inLLVMFunction)
+		, irBuilder(context)
+		{}
+
+		void emit();
+
+		// Operand stack manipulation
+		llvm::Value* pop()
+		{
+			WAVM_ASSERT_THROW(stack.size() - (controlStack.size() ? controlStack.back().outerStackSize : 0) >= 1);
+			llvm::Value* result = stack.back();
+			stack.pop_back();
+			return result;
+		}
+
+		void popMultiple(llvm::Value** outValues,Uptr num)
+		{
+			WAVM_ASSERT_THROW(stack.size() - (controlStack.size() ? controlStack.back().outerStackSize : 0) >= num);
+			std::copy(stack.end() - num,stack.end(),outValues);
+			stack.resize(stack.size() - num);
+		}
+
+		llvm::Value* getTopValue() const
+		{
+			return stack.back();
+		}
+
+		void push(llvm::Value* value)
+		{
+			stack.push_back(value);
+		}
+
+		// Creates a PHI node for the argument of branches to a basic block.
+		llvm::PHINode* createPHI(llvm::BasicBlock* basicBlock,ResultType type)
+		{
+			if(type == ResultType::none) { return nullptr; }
+			else
+			{
+				auto originalBlock = irBuilder.GetInsertBlock();
+				irBuilder.SetInsertPoint(basicBlock);
+				auto phi = irBuilder.CreatePHI(asLLVMType(type),2);
+				if(originalBlock) { irBuilder.SetInsertPoint(originalBlock); }
+				return phi;
+			}
+		}
+
+		// Debug logging.
+		void logOperator(const std::string& operatorDescription)
+		{
+			if(ENABLE_LOGGING)
+			{
+				std::string controlStackString;
+				for(Uptr stackIndex = 0;stackIndex < controlStack.size();++stackIndex)
+				{
+					if(!controlStack[stackIndex].isReachable) { controlStackString += "("; }
+					switch(controlStack[stackIndex].type)
+					{
+					case ControlContext::Type::function: controlStackString += "F"; break;
+					case ControlContext::Type::block: controlStackString += "B"; break;
+					case ControlContext::Type::ifThen: controlStackString += "T"; break;
+					case ControlContext::Type::ifElse: controlStackString += "E"; break;
+					case ControlContext::Type::loop: controlStackString += "L"; break;
+					default: Errors::unreachable();
+					};
+					if(!controlStack[stackIndex].isReachable) { controlStackString += ")"; }
+				}
+
+				std::string stackString;
+				const Uptr stackBase = controlStack.size() == 0 ? 0 : controlStack.back().outerStackSize;
+				for(Uptr stackIndex = 0;stackIndex < stack.size();++stackIndex)
+				{
+					if(stackIndex == stackBase) { stackString += "| "; }
+					{
+						llvm::raw_string_ostream stackTypeStream(stackString);
+						stack[stackIndex]->getType()->print(stackTypeStream,true);
+					}
+					stackString += " ";
+				}
+				if(stack.size() == stackBase) { stackString += "|"; }
+
+				//Log::printf(Log::Category::debug,"%-50s %-50s %-50s\n",controlStackString.c_str(),operatorDescription.c_str(),stackString.c_str());
+			}
+		}
+		
+		// Coerces an I32 value to an I1, and vice-versa.
+		llvm::Value* coerceI32ToBool(llvm::Value* i32Value)
+		{
+			return irBuilder.CreateICmpNE(i32Value,typedZeroConstants[(Uptr)ValueType::i32]);
+		}
+		llvm::Value* coerceBoolToI32(llvm::Value* boolValue)
+		{
+			return irBuilder.CreateZExt(boolValue,llvmI32Type);
+		}
+		
+		// Bounds checks and converts a memory operation I32 address operand to a LLVM pointer.
+		llvm::Value* coerceByteIndexToPointer(llvm::Value* byteIndex,U32 offset,llvm::Type* memoryType)
+		{
+
+			// On a 64 bit runtime, if the address is 32-bits, zext it to 64-bits.
+			// This is crucial for security, as LLVM will otherwise implicitly sign extend it to 64-bits in the GEP below,
+			// interpreting it as a signed offset and allowing access to memory outside the sandboxed memory range.
+			// There are no 'far addresses' in a 32 bit runtime.
+			byteIndex = irBuilder.CreateZExt(byteIndex,llvmI64Type);
+
+			// Add the offset to the byte index.
+			if(offset)
+			{
+				byteIndex = irBuilder.CreateAdd(byteIndex,irBuilder.CreateZExt(emitLiteral(offset),llvmI64Type));
+			}
+
+			// Cast the pointer to the appropriate type.
+			auto bytePointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultMemoryBase, byteIndex);
+
+			return irBuilder.CreatePointerCast(bytePointer,memoryType->getPointerTo(256));
+		}
+
+		// Traps a divide-by-zero
+		void trapDivideByZero(ValueType type,llvm::Value* divisor)
+		{
+			emitConditionalTrapIntrinsic(
+				irBuilder.CreateICmpEQ(divisor,typedZeroConstants[(Uptr)type]),
+				"eosvmoc_internal.div0_or_overflow",FunctionType::get(),{});
+		}
+
+		// Traps on (x / 0) or (INT_MIN / -1).
+		void trapDivideByZeroOrIntegerOverflow(ValueType type,llvm::Value* left,llvm::Value* right)
+		{
+			emitConditionalTrapIntrinsic(
+				irBuilder.CreateOr(
+					irBuilder.CreateAnd(
+						irBuilder.CreateICmpEQ(left,type == ValueType::i32 ? emitLiteral((U32)INT32_MIN) : emitLiteral((U64)INT64_MIN)),
+						irBuilder.CreateICmpEQ(right,type == ValueType::i32 ? emitLiteral((U32)-1) : emitLiteral((U64)-1))
+						),
+					irBuilder.CreateICmpEQ(right,typedZeroConstants[(Uptr)type])
+					),
+				"eosvmoc_internal.div0_or_overflow",FunctionType::get(),{});
+		}
+
+		llvm::Value* getLLVMIntrinsic(const std::initializer_list<llvm::Type*>& argTypes,llvm::Intrinsic::ID id)
+		{
+			return llvm::Intrinsic::getDeclaration(moduleContext.llvmModule,id,llvm::ArrayRef<llvm::Type*>(argTypes.begin(),argTypes.end()));
+		}
+		
+		// Emits a call to a WAVM intrinsic function.
+		llvm::Value* emitRuntimeIntrinsic(const char* intrinsicName,const FunctionType* intrinsicType,const std::initializer_list<llvm::Value*>& args)
+		{
+			const eosio::chain::eosvmoc::intrinsic_entry& ie = eosio::chain::eosvmoc::get_intrinsic_map().at(intrinsicName);
+			llvm::Value* ic = irBuilder.CreateLoad( emitLiteralPointer((void*)(-18952-ie.ordinal*8), llvmI64Type->getPointerTo(256)) );  ///XXX literal
+			llvm::Value* itp = irBuilder.CreateIntToPtr(ic, asLLVMType(ie.type)->getPointerTo());
+			return irBuilder.CreateCall(itp,llvm::ArrayRef<llvm::Value*>(args.begin(),args.end()));
+		}
+
+		// A helper function to emit a conditional call to a non-returning intrinsic function.
+		void emitConditionalTrapIntrinsic(llvm::Value* booleanCondition,const char* intrinsicName,const FunctionType* intrinsicType,const std::initializer_list<llvm::Value*>& args)
+		{
+			auto trueBlock = llvm::BasicBlock::Create(context,llvm::Twine(intrinsicName) + "Trap",llvmFunction);
+			auto endBlock = llvm::BasicBlock::Create(context,llvm::Twine(intrinsicName) + "Skip",llvmFunction);
+
+			irBuilder.CreateCondBr(booleanCondition,trueBlock,endBlock,moduleContext.likelyFalseBranchWeights);
+
+			irBuilder.SetInsertPoint(trueBlock);
+			emitRuntimeIntrinsic(intrinsicName,intrinsicType,args);
+			irBuilder.CreateUnreachable();
+
+			irBuilder.SetInsertPoint(endBlock);
+		}
+
+		//
+		// Misc operators
+		//
+
+		void nop(NoImm) {}
+		void unknown(Opcode opcode) { Errors::unreachable(); }
+		
+		//
+		// Control structure operators
+		//
+		
+		void pushControlStack(
+			ControlContext::Type type,
+			ResultType resultType,
+			llvm::BasicBlock* endBlock,
+			llvm::PHINode* endPHI,
+			llvm::BasicBlock* elseBlock = nullptr
+			)
+		{
+			// The unreachable operator filtering should filter out any opcodes that call pushControlStack.
+			if(controlStack.size()) { errorUnless(controlStack.back().isReachable); }
+
+			controlStack.push_back({type,endBlock,endPHI,elseBlock,resultType,stack.size(),branchTargetStack.size(),true,true});
+		}
+
+		void pushBranchTarget(ResultType branchArgumentType,llvm::BasicBlock* branchTargetBlock,llvm::PHINode* branchTargetPHI)
+		{
+			branchTargetStack.push_back({branchArgumentType,branchTargetBlock,branchTargetPHI});
+		}
+
+		void block(ControlStructureImm imm)
+		{
+			// Create an end block+phi for the block result.
+			auto endBlock = llvm::BasicBlock::Create(context,"blockEnd",llvmFunction);
+			auto endPHI = createPHI(endBlock,imm.resultType);
+
+			// Push a control context that ends at the end block/phi.
+			pushControlStack(ControlContext::Type::block,imm.resultType,endBlock,endPHI);
+			
+			// Push a branch target for the end block/phi.
+			pushBranchTarget(imm.resultType,endBlock,endPHI);
+		}
+		void loop(ControlStructureImm imm)
+		{
+			// Create a loop block, and an end block+phi for the loop result.
+			auto loopBodyBlock = llvm::BasicBlock::Create(context,"loopBody",llvmFunction);
+			auto endBlock = llvm::BasicBlock::Create(context,"loopEnd",llvmFunction);
+			auto endPHI = createPHI(endBlock,imm.resultType);
+			
+			// Branch to the loop body and switch the IR builder to emit there.
+			irBuilder.CreateBr(loopBodyBlock);
+			irBuilder.SetInsertPoint(loopBodyBlock);
+
+			// Push a control context that ends at the end block/phi.
+			pushControlStack(ControlContext::Type::loop,imm.resultType,endBlock,endPHI);
+			
+			// Push a branch target for the loop body start.
+			pushBranchTarget(ResultType::none,loopBodyBlock,nullptr);
+		}
+		void if_(ControlStructureImm imm)
+		{
+			// Create a then block and else block for the if, and an end block+phi for the if result.
+			auto thenBlock = llvm::BasicBlock::Create(context,"ifThen",llvmFunction);
+			auto elseBlock = llvm::BasicBlock::Create(context,"ifElse",llvmFunction);
+			auto endBlock = llvm::BasicBlock::Create(context,"ifElseEnd",llvmFunction);
+			auto endPHI = createPHI(endBlock,imm.resultType);
+
+			// Pop the if condition from the operand stack.
+			auto condition = pop();
+			irBuilder.CreateCondBr(coerceI32ToBool(condition),thenBlock,elseBlock);
+			
+			// Switch the IR builder to emit the then block.
+			irBuilder.SetInsertPoint(thenBlock);
+
+			// Push an ifThen control context that ultimately ends at the end block/phi, but may
+			// be terminated by an else operator that changes the control context to the else block.
+			pushControlStack(ControlContext::Type::ifThen,imm.resultType,endBlock,endPHI,elseBlock);
+			
+			// Push a branch target for the if end.
+			pushBranchTarget(imm.resultType,endBlock,endPHI);
+			
+		}
+		void else_(NoImm imm)
+		{
+			WAVM_ASSERT_THROW(controlStack.size());
+			ControlContext& currentContext = controlStack.back();
+
+			if(currentContext.isReachable)
+			{
+				// If the control context expects a result, take it from the operand stack and add it to the
+				// control context's end PHI.
+				if(currentContext.resultType != ResultType::none)
+				{
+					llvm::Value* result = pop();
+					currentContext.endPHI->addIncoming(result,irBuilder.GetInsertBlock());
+				}
+
+				// Branch to the control context's end.
+				irBuilder.CreateBr(currentContext.endBlock);
+			}
+			WAVM_ASSERT_THROW(stack.size() == currentContext.outerStackSize);
+
+			// Switch the IR emitter to the else block.
+			WAVM_ASSERT_THROW(currentContext.elseBlock);
+			WAVM_ASSERT_THROW(currentContext.type == ControlContext::Type::ifThen);
+			currentContext.elseBlock->moveAfter(irBuilder.GetInsertBlock());
+			irBuilder.SetInsertPoint(currentContext.elseBlock);
+
+			// Change the top of the control stack to an else clause.
+			currentContext.type = ControlContext::Type::ifElse;
+			currentContext.isReachable = currentContext.isElseReachable;
+			currentContext.elseBlock = nullptr;
+		}
+		void end(NoImm)
+		{
+			WAVM_ASSERT_THROW(controlStack.size());
+			ControlContext& currentContext = controlStack.back();
+
+			if(currentContext.isReachable)
+			{
+				// If the control context yields a result, take the top of the operand stack and
+				// add it to the control context's end PHI.
+				if(currentContext.resultType != ResultType::none)
+				{
+					llvm::Value* result = pop();
+					currentContext.endPHI->addIncoming(result,irBuilder.GetInsertBlock());
+				}
+
+				// Branch to the control context's end.
+				irBuilder.CreateBr(currentContext.endBlock);
+			}
+			WAVM_ASSERT_THROW(stack.size() == currentContext.outerStackSize);
+
+			if(currentContext.elseBlock)
+			{
+				// If this is the end of an if without an else clause, create a dummy else clause.
+				currentContext.elseBlock->moveAfter(irBuilder.GetInsertBlock());
+				irBuilder.SetInsertPoint(currentContext.elseBlock);
+				irBuilder.CreateBr(currentContext.endBlock);
+			}
+
+			// Switch the IR emitter to the end block.
+			currentContext.endBlock->moveAfter(irBuilder.GetInsertBlock());
+			irBuilder.SetInsertPoint(currentContext.endBlock);
+
+			if(currentContext.endPHI)
+			{
+				// If the control context yields a result, take the PHI that merges all the control flow
+				// to the end and push it onto the operand stack.
+				if(currentContext.endPHI->getNumIncomingValues()) { push(currentContext.endPHI); }
+				else
+				{
+					// If there weren't any incoming values for the end PHI, remove it and push a dummy value.
+					currentContext.endPHI->eraseFromParent();
+					WAVM_ASSERT_THROW(currentContext.resultType != ResultType::none);
+					push(typedZeroConstants[(Uptr)asValueType(currentContext.resultType)]);
+				}
+			}
+
+			// Pop and branch targets introduced by this control context.
+			WAVM_ASSERT_THROW(currentContext.outerBranchTargetStackSize <= branchTargetStack.size());
+			branchTargetStack.resize(currentContext.outerBranchTargetStackSize);
+
+			// Pop this control context.
+			controlStack.pop_back();
+		}
+		
+		//
+		// Control flow operators
+		//
+		
+		BranchTarget& getBranchTargetByDepth(Uptr depth)
+		{
+			WAVM_ASSERT_THROW(depth < branchTargetStack.size());
+			return branchTargetStack[branchTargetStack.size() - depth - 1];
+		}
+		
+		// This is called after unconditional control flow to indicate that operators following it are unreachable until the control stack is popped.
+		void enterUnreachable()
+		{
+			// Unwind the operand stack to the outer control context.
+			WAVM_ASSERT_THROW(controlStack.back().outerStackSize <= stack.size());
+			stack.resize(controlStack.back().outerStackSize);
+
+			// Mark the current control context as unreachable: this will cause the outer loop to stop dispatching operators to us
+			// until an else/end for the current control context is reached.
+			controlStack.back().isReachable = false;
+		}
+		
+		void br_if(BranchImm imm)
+		{
+			// Pop the condition from operand stack.
+			auto condition = pop();
+
+			BranchTarget& target = getBranchTargetByDepth(imm.targetDepth);
+			if(target.argumentType != ResultType::none)
+			{
+				// Use the stack top as the branch argument (don't pop it) and add it to the target phi's incoming values.
+				llvm::Value* argument = getTopValue();
+				target.phi->addIncoming(argument,irBuilder.GetInsertBlock());
+			}
+
+			// Create a new basic block for the case where the branch is not taken.
+			auto falseBlock = llvm::BasicBlock::Create(context,"br_ifElse",llvmFunction);
+
+			// Emit a conditional branch to either the falseBlock or the target block.
+			irBuilder.CreateCondBr(coerceI32ToBool(condition),target.block,falseBlock);
+
+			// Resume emitting instructions in the falseBlock.
+			irBuilder.SetInsertPoint(falseBlock);
+		}
+		
+		void br(BranchImm imm)
+		{
+			BranchTarget& target = getBranchTargetByDepth(imm.targetDepth);
+			if(target.argumentType != ResultType::none)
+			{
+				// Pop the branch argument from the stack and add it to the target phi's incoming values.
+				llvm::Value* argument = pop();
+				target.phi->addIncoming(argument,irBuilder.GetInsertBlock());
+			}
+
+			// Branch to the target block.
+			irBuilder.CreateBr(target.block);
+
+			enterUnreachable();
+		}
+		void br_table(BranchTableImm imm)
+		{
+			// Pop the table index from the operand stack.
+			auto index = pop();
+			
+			// Look up the default branch target, and assume its argument type applies to all targets.
+			// (this is guaranteed by the validator)
+			BranchTarget& defaultTarget = getBranchTargetByDepth(imm.defaultTargetDepth);
+			const ResultType argumentType = defaultTarget.argumentType;
+			llvm::Value* argument = nullptr;
+			if(argumentType != ResultType::none)
+			{
+				// Pop the branch argument from the stack and add it to the default target phi's incoming values.
+				argument = pop();
+				defaultTarget.phi->addIncoming(argument,irBuilder.GetInsertBlock());
+			}
+
+			// Create a LLVM switch instruction.
+			WAVM_ASSERT_THROW(imm.branchTableIndex < functionDef.branchTables.size());
+			const std::vector<U32>& targetDepths = functionDef.branchTables[imm.branchTableIndex];
+			auto llvmSwitch = irBuilder.CreateSwitch(index,defaultTarget.block,(unsigned int)targetDepths.size());
+
+			for(Uptr targetIndex = 0;targetIndex < targetDepths.size();++targetIndex)
+			{
+				BranchTarget& target = getBranchTargetByDepth(targetDepths[targetIndex]);
+
+				// Add this target to the switch instruction.
+				llvmSwitch->addCase(emitLiteral((U32)targetIndex),target.block);
+
+				if(argumentType != ResultType::none)
+				{
+					// If this is the first case in the table for this branch target, add the branch argument to
+					// the target phi's incoming values.
+					target.phi->addIncoming(argument,irBuilder.GetInsertBlock());
+				}
+			}
+
+			enterUnreachable();
+		}
+		void return_(NoImm)
+		{
+			if(functionType->ret != ResultType::none)
+			{
+				// Pop the return value from the stack and add it to the return phi's incoming values.
+				llvm::Value* result = pop();
+				controlStack[0].endPHI->addIncoming(result,irBuilder.GetInsertBlock());
+			}
+
+			// Branch to the return block.
+			irBuilder.CreateBr(controlStack[0].endBlock);
+
+			enterUnreachable();
+		}
+
+		void unreachable(NoImm)
+		{
+			// Call an intrinsic that causes a trap, and insert the LLVM unreachable terminator.
+			emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(),{});
+			irBuilder.CreateUnreachable();
+
+			enterUnreachable();
+		}
+
+		//
+		// Polymorphic operators
+		//
+
+		void drop(NoImm) { stack.pop_back(); }
+
+		void select(NoImm)
+		{
+			auto condition = pop();
+			auto falseValue = pop();
+			auto trueValue = pop();
+			push(irBuilder.CreateSelect(coerceI32ToBool(condition),trueValue,falseValue));
+		}
+
+		//
+		// Call operators
+		//
+
+		void call(CallImm imm)
+		{
+			// Map the callee function index to either an imported function pointer or a function in this module.
+			llvm::Value* callee;
+			const FunctionType* calleeType;
+			bool isExit = false;
+			if(imm.functionIndex < moduleContext.importedFunctionOffsets.size())
+			{
+				calleeType = module.types[module.functions.imports[imm.functionIndex].type.index];
+				llvm::Value* ic = irBuilder.CreateLoad( emitLiteralPointer((void*)(-18952-moduleContext.importedFunctionOffsets[imm.functionIndex]*8), llvmI64Type->getPointerTo(256)) );  ///XXX literal
+				callee = irBuilder.CreateIntToPtr(ic, asLLVMType(calleeType)->getPointerTo());
+				isExit = module.functions.imports[imm.functionIndex].moduleName == "env" && module.functions.imports[imm.functionIndex].exportName == "eosio_exit";
+			}
+			else
+			{
+				const Uptr calleeIndex = imm.functionIndex - moduleContext.importedFunctionOffsets.size();
+				callee = moduleContext.functionDefs[calleeIndex];
+				calleeType = module.types[module.functions.defs[calleeIndex].type.index];
+			}
+
+			// Pop the call arguments from the operand stack.
+			auto llvmArgs = (llvm::Value**)alloca(sizeof(llvm::Value*) * calleeType->parameters.size());
+			popMultiple(llvmArgs,calleeType->parameters.size());
+
+			// Call the function.
+			auto result = irBuilder.CreateCall(callee,llvm::ArrayRef<llvm::Value*>(llvmArgs,calleeType->parameters.size()));
+			if(isExit) {
+				irBuilder.CreateUnreachable();
+				enterUnreachable();
+			}
+
+			// Push the result on the operand stack.
+			if(calleeType->ret != ResultType::none) { push(result); }
+		}
+		void call_indirect(CallIndirectImm imm)
+		{
+			WAVM_ASSERT_THROW(imm.type.index < module.types.size());
+			
+			auto calleeType = module.types[imm.type.index];
+			auto functionPointerType = asLLVMType(calleeType)->getPointerTo();
+
+			// Compile the function index.
+			auto tableElementIndex = pop();
+			
+			// Compile the call arguments.
+			auto llvmArgs = (llvm::Value**)alloca(sizeof(llvm::Value*) * calleeType->parameters.size());
+			popMultiple(llvmArgs,calleeType->parameters.size());
+
+			// Zero extend the function index to the pointer size.
+			auto functionIndexZExt = irBuilder.CreateZExt(tableElementIndex, llvmI64Type);
+			
+			// If the function index is larger than the function table size, trap.
+			emitConditionalTrapIntrinsic(
+				irBuilder.CreateICmpUGE(functionIndexZExt,moduleContext.defaultTableMaxElementIndex),
+				"eosvmoc_internal.indirect_call_oob",FunctionType::get(),{});
+
+			// Load the type for this table entry.
+			auto functionTypePointerPointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultTablePointer, functionIndexZExt, emitLiteral((U32)0));
+			auto functionTypePointer = irBuilder.CreateLoad(functionTypePointerPointer);
+			auto llvmCalleeType = emitLiteralPointer(calleeType,llvmI8PtrType);
+			
+			// If the function type doesn't match, trap.
+			emitConditionalTrapIntrinsic(
+				irBuilder.CreateICmpNE(llvmCalleeType,functionTypePointer),
+				"eosvmoc_internal.indirect_call_mismatch",
+				FunctionType::get(),{}
+				);
+
+			//If the WASM only contains table elements to function definitions internal to the wasm, we can take a
+			// simple and approach
+			if(moduleContext.tableOnlyHasDefinedFuncs) {
+				auto functionPointerPointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultTablePointer, functionIndexZExt, emitLiteral((U32)1));
+				auto functionInfo = irBuilder.CreateLoad(functionPointerPointer);  //offset of code
+				llvm::Value* running_code_start = irBuilder.CreateLoad(emitLiteralPointer((void*)(-18848), llvmI64Type->getPointerTo(256)));  ///XXX literal
+				llvm::Value* offset_from_start = irBuilder.CreateAdd(running_code_start, functionInfo);
+				llvm::Value* ptr_cast = irBuilder.CreateIntToPtr(offset_from_start, functionPointerType);
+				auto result = irBuilder.CreateCall(ptr_cast,llvm::ArrayRef<llvm::Value*>(llvmArgs,calleeType->parameters.size()));
+
+				// Push the result on the operand stack.
+				if(calleeType->ret != ResultType::none) { push(result); }
+			}
+			else {
+				auto functionPointerPointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultTablePointer, functionIndexZExt, emitLiteral((U32)1));
+				auto functionInfo = irBuilder.CreateLoad(functionPointerPointer);  //offset of code
+
+				auto is_intrnsic = irBuilder.CreateICmpSLT(functionInfo, typedZeroConstants[(Uptr)ValueType::i64]);
+
+				llvm::BasicBlock* is_intrinsic_block = llvm::BasicBlock::Create(context, "isintrinsic", llvmFunction);
+				llvm::BasicBlock* is_code_offset_block = llvm::BasicBlock::Create(context, "isoffset");
+				llvm::BasicBlock* continuation_block = llvm::BasicBlock::Create(context, "cont");
+
+				irBuilder.CreateCondBr(is_intrnsic, is_intrinsic_block, is_code_offset_block, moduleContext.likelyFalseBranchWeights);
+
+				irBuilder.SetInsertPoint(is_intrinsic_block);
+				llvm::Value* intrinsic_start = emitLiteral((I64)(-18952)); ///XXX literal
+				llvm::Value* intrinsic_offset = irBuilder.CreateAdd(intrinsic_start, functionInfo);
+				llvm::Value* intrinsic_ptr = irBuilder.CreateLoad(irBuilder.CreateIntToPtr(intrinsic_offset, llvmI64Type->getPointerTo(256)));
+				irBuilder.CreateBr(continuation_block);
+
+				llvmFunction->getBasicBlockList().push_back(is_code_offset_block);
+				irBuilder.SetInsertPoint(is_code_offset_block);
+				llvm::Value* running_code_start = irBuilder.CreateLoad(emitLiteralPointer((void*)(-18848), llvmI64Type->getPointerTo(256)));  ///XXX literal
+				llvm::Value* offset_from_start = irBuilder.CreateAdd(running_code_start, functionInfo);
+				irBuilder.CreateBr(continuation_block);
+
+				llvmFunction->getBasicBlockList().push_back(continuation_block);
+				irBuilder.SetInsertPoint(continuation_block);
+
+				llvm::PHINode* PN = irBuilder.CreatePHI(llvmI64Type, 2, "indirecttypephi");
+				PN->addIncoming(intrinsic_ptr, is_intrinsic_block);
+				PN->addIncoming(offset_from_start, is_code_offset_block);
+
+				llvm::Value* ptr_cast = irBuilder.CreateIntToPtr(PN, functionPointerType);
+				auto result = irBuilder.CreateCall(ptr_cast,llvm::ArrayRef<llvm::Value*>(llvmArgs,calleeType->parameters.size()));
+
+				// Push the result on the operand stack.
+				if(calleeType->ret != ResultType::none) { push(result); }
+			}
+		}
+		
+		//
+		// Local/global operators
+		//
+
+		void get_local(GetOrSetVariableImm<false> imm)
+		{
+			WAVM_ASSERT_THROW(imm.variableIndex < localPointers.size());
+			push(irBuilder.CreateLoad(localPointers[imm.variableIndex]));
+		}
+		void set_local(GetOrSetVariableImm<false> imm)
+		{
+			WAVM_ASSERT_THROW(imm.variableIndex < localPointers.size());
+			auto value = irBuilder.CreateBitCast(pop(),localPointers[imm.variableIndex]->getType()->getPointerElementType());
+			irBuilder.CreateStore(value,localPointers[imm.variableIndex]);
+		}
+		void tee_local(GetOrSetVariableImm<false> imm)
+		{
+			WAVM_ASSERT_THROW(imm.variableIndex < localPointers.size());
+			auto value = irBuilder.CreateBitCast(getTopValue(),localPointers[imm.variableIndex]->getType()->getPointerElementType());
+			irBuilder.CreateStore(value,localPointers[imm.variableIndex]);
+		}
+		
+		void get_global(GetOrSetVariableImm<true> imm)
+		{
+			WAVM_ASSERT_THROW(imm.variableIndex < moduleContext.globals.size());
+			if(moduleContext.globals[imm.variableIndex]->getType()->isPointerTy())
+				push(irBuilder.CreateLoad(moduleContext.globals[imm.variableIndex]));
+			else
+				push(moduleContext.globals[imm.variableIndex]);
+		}
+		void set_global(GetOrSetVariableImm<true> imm)
+		{
+			WAVM_ASSERT_THROW(imm.variableIndex < moduleContext.globals.size());
+			auto value = irBuilder.CreateBitCast(pop(),moduleContext.globals[imm.variableIndex]->getType()->getPointerElementType());
+			irBuilder.CreateStore(value,moduleContext.globals[imm.variableIndex]);
+		}
+
+		//
+		// Memory size operators
+		// These just call out to wavmIntrinsics.growMemory/currentMemory, passing a pointer to the default memory for the module.
+		//
+
+		void grow_memory(MemoryImm)
+		{
+			auto deltaNumPages = pop();
+			auto maxMemoryPages = emitLiteral((U32)moduleContext.module.memories.defs[0].type.size.max);
+			auto previousNumPages = emitRuntimeIntrinsic(
+				"eosvmoc_internal.grow_memory",
+				FunctionType::get(ResultType::i32,{ValueType::i32,ValueType::i32}),
+				{deltaNumPages,maxMemoryPages});
+			push(previousNumPages);
+		}
+		void current_memory(MemoryImm)
+		{
+			auto offset = emitLiteral((I32)-18880); ///XXX literal
+			auto bytePointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultMemoryBase, offset);
+			auto ptrTo = irBuilder.CreatePointerCast(bytePointer,llvmI32Type->getPointerTo(256));
+			auto load = irBuilder.CreateLoad(ptrTo);
+			push(load);
+		}
+
+		//
+		// Constant operators
+		//
+
+		#define EMIT_CONST(typeId,nativeType) void typeId##_const(LiteralImm<nativeType> imm) { push(emitLiteral(imm.value)); }
+		EMIT_CONST(i32,I32) EMIT_CONST(i64,I64)
+		EMIT_CONST(f32,F32) EMIT_CONST(f64,F64)
+
+		//
+		// Load/store operators
+		//
+
+		#define EMIT_LOAD_OP(valueTypeId,name,llvmMemoryType,naturalAlignmentLog2,conversionOp) \
+			void valueTypeId##_##name(LoadOrStoreImm<naturalAlignmentLog2> imm) \
+			{ \
+				auto byteIndex = pop(); \
+				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
+				auto load = irBuilder.CreateLoad(pointer); \
+				load->setAlignment(1<<imm.alignmentLog2); \
+				load->setVolatile(true); \
+				push(conversionOp(load,asLLVMType(ValueType::valueTypeId))); \
+			}
+		#define EMIT_STORE_OP(valueTypeId,name,llvmMemoryType,naturalAlignmentLog2,conversionOp) \
+			void valueTypeId##_##name(LoadOrStoreImm<naturalAlignmentLog2> imm) \
+			{ \
+				auto value = pop(); \
+				auto byteIndex = pop(); \
+				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
+				auto memoryValue = conversionOp(value,llvmMemoryType); \
+				auto store = irBuilder.CreateStore(memoryValue,pointer); \
+				store->setVolatile(true); \
+				store->setAlignment(1<<imm.alignmentLog2); \
+			}
+			
+		llvm::Value* identityConversion(llvm::Value* value,llvm::Type* type) { return value; }
+
+		EMIT_LOAD_OP(i32,load8_s,llvmI8Type,0,irBuilder.CreateSExt)  EMIT_LOAD_OP(i32,load8_u,llvmI8Type,0,irBuilder.CreateZExt)
+		EMIT_LOAD_OP(i32,load16_s,llvmI16Type,1,irBuilder.CreateSExt) EMIT_LOAD_OP(i32,load16_u,llvmI16Type,1,irBuilder.CreateZExt)
+		EMIT_LOAD_OP(i64,load8_s,llvmI8Type,0,irBuilder.CreateSExt)  EMIT_LOAD_OP(i64,load8_u,llvmI8Type,0,irBuilder.CreateZExt)
+		EMIT_LOAD_OP(i64,load16_s,llvmI16Type,1,irBuilder.CreateSExt)  EMIT_LOAD_OP(i64,load16_u,llvmI16Type,1,irBuilder.CreateZExt)
+		EMIT_LOAD_OP(i64,load32_s,llvmI32Type,2,irBuilder.CreateSExt)  EMIT_LOAD_OP(i64,load32_u,llvmI32Type,2,irBuilder.CreateZExt)
+
+		EMIT_LOAD_OP(i32,load,llvmI32Type,2,identityConversion) EMIT_LOAD_OP(i64,load,llvmI64Type,3,identityConversion)
+		EMIT_LOAD_OP(f32,load,llvmF32Type,2,identityConversion) EMIT_LOAD_OP(f64,load,llvmF64Type,3,identityConversion)
+
+		EMIT_STORE_OP(i32,store8,llvmI8Type,0,irBuilder.CreateTrunc) EMIT_STORE_OP(i64,store8,llvmI8Type,0,irBuilder.CreateTrunc)
+		EMIT_STORE_OP(i32,store16,llvmI16Type,1,irBuilder.CreateTrunc) EMIT_STORE_OP(i64,store16,llvmI16Type,1,irBuilder.CreateTrunc)
+		EMIT_STORE_OP(i32,store,llvmI32Type,2,irBuilder.CreateTrunc) EMIT_STORE_OP(i64,store32,llvmI32Type,2,irBuilder.CreateTrunc)
+		EMIT_STORE_OP(i64,store,llvmI64Type,3,identityConversion)
+		EMIT_STORE_OP(f32,store,llvmF32Type,2,identityConversion) EMIT_STORE_OP(f64,store,llvmF64Type,3,identityConversion)
+
+		//
+		// Numeric operator macros
+		//
+
+		#define EMIT_BINARY_OP(typeId,name,emitCode) void typeId##_##name(NoImm) \
+			{ \
+				const ValueType type = ValueType::typeId; SUPPRESS_UNUSED(type); \
+				auto right = pop(); \
+				auto left = pop(); \
+				push(emitCode); \
+			}
+		#define EMIT_INT_BINARY_OP(name,emitCode) EMIT_BINARY_OP(i32,name,emitCode) EMIT_BINARY_OP(i64,name,emitCode)
+		#define EMIT_FP_BINARY_OP(name,emitCode) EMIT_BINARY_OP(f32,name,emitCode) EMIT_BINARY_OP(f64,name,emitCode)
+
+		#define EMIT_UNARY_OP(typeId,name,emitCode) void typeId##_##name(NoImm) \
+			{ \
+				const ValueType type = ValueType::typeId; SUPPRESS_UNUSED(type); \
+				auto operand = pop(); \
+				push(emitCode); \
+			}
+		#define EMIT_INT_UNARY_OP(name,emitCode) EMIT_UNARY_OP(i32,name,emitCode) EMIT_UNARY_OP(i64,name,emitCode)
+		#define EMIT_FP_UNARY_OP(name,emitCode) EMIT_UNARY_OP(f32,name,emitCode) EMIT_UNARY_OP(f64,name,emitCode)
+
+		//
+		// Int operators
+		//
+
+		llvm::Value* emitSRem(ValueType type,llvm::Value* left,llvm::Value* right)
+		{
+			// Trap if the dividend is zero.
+			trapDivideByZero(type,right); 
+
+			// LLVM's srem has undefined behavior where WebAssembly's rem_s defines that it should not trap if the corresponding
+			// division would overflow a signed integer. To avoid this case, we just branch around the srem if the INT_MAX%-1 case
+			// that overflows is detected.
+			auto preOverflowBlock = irBuilder.GetInsertBlock();
+			auto noOverflowBlock = llvm::BasicBlock::Create(context,"sremNoOverflow",llvmFunction);
+			auto endBlock = llvm::BasicBlock::Create(context,"sremEnd",llvmFunction);
+			auto noOverflow = irBuilder.CreateOr(
+				irBuilder.CreateICmpNE(left,type == ValueType::i32 ? emitLiteral((U32)INT32_MIN) : emitLiteral((U64)INT64_MIN)),
+				irBuilder.CreateICmpNE(right,type == ValueType::i32 ? emitLiteral((U32)-1) : emitLiteral((U64)-1))
+				);
+			irBuilder.CreateCondBr(noOverflow,noOverflowBlock,endBlock,moduleContext.likelyTrueBranchWeights);
+
+			irBuilder.SetInsertPoint(noOverflowBlock);
+			auto noOverflowValue = irBuilder.CreateSRem(left,right);
+			irBuilder.CreateBr(endBlock);
+
+			irBuilder.SetInsertPoint(endBlock);
+			auto phi = irBuilder.CreatePHI(asLLVMType(type),2);
+			phi->addIncoming(typedZeroConstants[(Uptr)type],preOverflowBlock);
+			phi->addIncoming(noOverflowValue,noOverflowBlock);
+			return phi;
+		}
+		
+		llvm::Value* emitShiftCountMask(ValueType type,llvm::Value* shiftCount)
+		{
+			// LLVM's shifts have undefined behavior where WebAssembly specifies that the shift count will wrap numbers
+			// grather than the bit count of the operands. This matches x86's native shift instructions, but explicitly mask
+			// the shift count anyway to support other platforms, and ensure the optimizer doesn't take advantage of the UB.
+			auto bitsMinusOne = irBuilder.CreateZExt(emitLiteral((U8)(getTypeBitWidth(type) - 1)),asLLVMType(type));
+			return irBuilder.CreateAnd(shiftCount,bitsMinusOne);
+		}
+
+		llvm::Value* emitRotl(ValueType type,llvm::Value* left,llvm::Value* right)
+		{
+			auto bitWidthMinusRight = irBuilder.CreateSub(
+				irBuilder.CreateZExt(emitLiteral(getTypeBitWidth(type)),asLLVMType(type)),
+				right
+				);
+			return irBuilder.CreateOr(
+				irBuilder.CreateShl(left,emitShiftCountMask(type,right)),
+				irBuilder.CreateLShr(left,emitShiftCountMask(type,bitWidthMinusRight))
+				);
+		}
+		
+		llvm::Value* emitRotr(ValueType type,llvm::Value* left,llvm::Value* right)
+		{
+			auto bitWidthMinusRight = irBuilder.CreateSub(
+				irBuilder.CreateZExt(emitLiteral(getTypeBitWidth(type)),asLLVMType(type)),
+				right
+				);
+			return irBuilder.CreateOr(
+				irBuilder.CreateShl(left,emitShiftCountMask(type,bitWidthMinusRight)),
+				irBuilder.CreateLShr(left,emitShiftCountMask(type,right))
+				);
+		}
+
+		EMIT_INT_BINARY_OP(add,irBuilder.CreateAdd(left,right))
+		EMIT_INT_BINARY_OP(sub,irBuilder.CreateSub(left,right))
+		EMIT_INT_BINARY_OP(mul,irBuilder.CreateMul(left,right))
+		EMIT_INT_BINARY_OP(and,irBuilder.CreateAnd(left,right))
+		EMIT_INT_BINARY_OP(or,irBuilder.CreateOr(left,right))
+		EMIT_INT_BINARY_OP(xor,irBuilder.CreateXor(left,right))
+		EMIT_INT_BINARY_OP(rotr,emitRotr(type,left,right))
+		EMIT_INT_BINARY_OP(rotl,emitRotl(type,left,right))
+			
+		// Divides use trapDivideByZero to avoid the undefined behavior in LLVM's division instructions.
+		EMIT_INT_BINARY_OP(div_s, (trapDivideByZeroOrIntegerOverflow(type,left,right), irBuilder.CreateSDiv(left,right)) )
+		EMIT_INT_BINARY_OP(rem_s, emitSRem(type,left,right) )
+		EMIT_INT_BINARY_OP(div_u, (trapDivideByZero(type,right), irBuilder.CreateUDiv(left,right)) )
+		EMIT_INT_BINARY_OP(rem_u, (trapDivideByZero(type,right), irBuilder.CreateURem(left,right)) )
+
+		// Explicitly mask the shift amount operand to the word size to avoid LLVM's undefined behavior.
+		EMIT_INT_BINARY_OP(shl,irBuilder.CreateShl(left,emitShiftCountMask(type,right)))
+		EMIT_INT_BINARY_OP(shr_s,irBuilder.CreateAShr(left,emitShiftCountMask(type,right)))
+		EMIT_INT_BINARY_OP(shr_u,irBuilder.CreateLShr(left,emitShiftCountMask(type,right)))
+
+		static llvm::Value* getNonConstantZero(llvm::IRBuilder<>& irBuilder, llvm::Constant* zero) {
+			llvm::Value* zeroAlloca = irBuilder.CreateAlloca(zero->getType(), nullptr, "nonConstantZero");
+			irBuilder.CreateStore(zero, zeroAlloca);
+			return irBuilder.CreateLoad(zeroAlloca);
+		}
+
+		#define EMIT_INT_COMPARE_OP(name, llvmSourceType, llvmDestType, valueType, emitCode)                  \
+			void name(NoImm) {                                                        \
+				auto right = irBuilder.CreateOr(                                                                \
+				irBuilder.CreateBitCast(pop(), llvmSourceType),                                                 \
+				irBuilder.CreateBitCast(                                                                        \
+					getNonConstantZero(irBuilder, typedZeroConstants[Uptr(valueType)]),                          \
+					llvmSourceType));                                                                            \
+				auto left = irBuilder.CreateBitCast(pop(), llvmSourceType);                                     \
+				push(coerceBoolToI32(emitCode));                                                                \
+			}
+
+		#define EMIT_INT_COMPARE(name, emitCode)                                                           \
+			EMIT_INT_COMPARE_OP(i32_##name, llvmI32Type, llvmI32Type, ValueType::i32, emitCode)             \
+			EMIT_INT_COMPARE_OP(i64_##name, llvmI64Type, llvmI32Type, ValueType::i64, emitCode)
+
+#if LLVM_VERSION_MAJOR < 9
+		EMIT_INT_COMPARE(eq, irBuilder.CreateICmpEQ(left, right))
+		EMIT_INT_COMPARE(ne, irBuilder.CreateICmpNE(left, right))
+		EMIT_INT_COMPARE(lt_s, irBuilder.CreateICmpSLT(left, right))
+		EMIT_INT_COMPARE(lt_u, irBuilder.CreateICmpULT(left, right))
+		EMIT_INT_COMPARE(le_s, irBuilder.CreateICmpSLE(left, right))
+		EMIT_INT_COMPARE(le_u, irBuilder.CreateICmpULE(left, right))
+		EMIT_INT_COMPARE(gt_s, irBuilder.CreateICmpSGT(left, right))
+		EMIT_INT_COMPARE(gt_u, irBuilder.CreateICmpUGT(left, right))
+		EMIT_INT_COMPARE(ge_s, irBuilder.CreateICmpSGE(left, right))
+		EMIT_INT_COMPARE(ge_u, irBuilder.CreateICmpUGE(left, right))
+#else
+		EMIT_INT_BINARY_OP(eq, coerceBoolToI32(irBuilder.CreateICmpEQ(left, right)))	
+		EMIT_INT_BINARY_OP(ne, coerceBoolToI32(irBuilder.CreateICmpNE(left, right)))	
+		EMIT_INT_BINARY_OP(lt_s, coerceBoolToI32(irBuilder.CreateICmpSLT(left, right)))	
+		EMIT_INT_BINARY_OP(lt_u, coerceBoolToI32(irBuilder.CreateICmpULT(left, right)))	
+		EMIT_INT_BINARY_OP(le_s, coerceBoolToI32(irBuilder.CreateICmpSLE(left, right)))	
+		EMIT_INT_BINARY_OP(le_u, coerceBoolToI32(irBuilder.CreateICmpULE(left, right)))	
+		EMIT_INT_BINARY_OP(gt_s, coerceBoolToI32(irBuilder.CreateICmpSGT(left, right)))	
+		EMIT_INT_BINARY_OP(gt_u, coerceBoolToI32(irBuilder.CreateICmpUGT(left, right)))	
+		EMIT_INT_BINARY_OP(ge_s, coerceBoolToI32(irBuilder.CreateICmpSGE(left, right)))	
+		EMIT_INT_BINARY_OP(ge_u, coerceBoolToI32(irBuilder.CreateICmpUGE(left, right)))
+#endif
+
+		EMIT_INT_UNARY_OP(clz,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::ctlz),llvm::ArrayRef<llvm::Value*>({operand,emitLiteral(false)})))
+		EMIT_INT_UNARY_OP(ctz,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::cttz),llvm::ArrayRef<llvm::Value*>({operand,emitLiteral(false)})))
+		EMIT_INT_UNARY_OP(popcnt,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::ctpop),llvm::ArrayRef<llvm::Value*>({operand})))
+		EMIT_INT_UNARY_OP(eqz,coerceBoolToI32(irBuilder.CreateICmpEQ(operand,typedZeroConstants[(Uptr)type])))
+
+		//
+		// FP operators
+		//
+
+		EMIT_FP_BINARY_OP(add,irBuilder.CreateFAdd(left,right))
+		EMIT_FP_BINARY_OP(sub,irBuilder.CreateFSub(left,right))
+		EMIT_FP_BINARY_OP(mul,irBuilder.CreateFMul(left,right))
+		EMIT_FP_BINARY_OP(div,irBuilder.CreateFDiv(left,right))
+		EMIT_FP_BINARY_OP(copysign,irBuilder.CreateCall(getLLVMIntrinsic({left->getType()},llvm::Intrinsic::copysign),llvm::ArrayRef<llvm::Value*>({left,right})))
+
+		EMIT_FP_UNARY_OP(neg,irBuilder.CreateFNeg(operand))
+		EMIT_FP_UNARY_OP(abs,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::fabs),llvm::ArrayRef<llvm::Value*>({operand})))
+		EMIT_FP_UNARY_OP(sqrt,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::sqrt),llvm::ArrayRef<llvm::Value*>({operand})))
+
+		EMIT_FP_BINARY_OP(eq,coerceBoolToI32(irBuilder.CreateFCmpOEQ(left,right)))
+		EMIT_FP_BINARY_OP(ne,coerceBoolToI32(irBuilder.CreateFCmpUNE(left,right)))
+		EMIT_FP_BINARY_OP(lt,coerceBoolToI32(irBuilder.CreateFCmpOLT(left,right)))
+		EMIT_FP_BINARY_OP(le,coerceBoolToI32(irBuilder.CreateFCmpOLE(left,right)))
+		EMIT_FP_BINARY_OP(gt,coerceBoolToI32(irBuilder.CreateFCmpOGT(left,right)))
+		EMIT_FP_BINARY_OP(ge,coerceBoolToI32(irBuilder.CreateFCmpOGE(left,right)))
+
+		EMIT_UNARY_OP(i32,wrap_i64,irBuilder.CreateTrunc(operand,llvmI32Type))
+		EMIT_UNARY_OP(i64,extend_s_i32,irBuilder.CreateSExt(operand,llvmI64Type))
+		EMIT_UNARY_OP(i64,extend_u_i32,irBuilder.CreateZExt(operand,llvmI64Type))
+
+		EMIT_FP_UNARY_OP(convert_s_i32,irBuilder.CreateSIToFP(operand,asLLVMType(type)))
+		EMIT_FP_UNARY_OP(convert_s_i64,irBuilder.CreateSIToFP(operand,asLLVMType(type)))
+		EMIT_FP_UNARY_OP(convert_u_i32,irBuilder.CreateUIToFP(operand,asLLVMType(type)))
+		EMIT_FP_UNARY_OP(convert_u_i64,irBuilder.CreateUIToFP(operand,asLLVMType(type)))
+
+		EMIT_UNARY_OP(f32,demote_f64,irBuilder.CreateFPTrunc(operand,llvmF32Type))
+		EMIT_UNARY_OP(f64,promote_f32,irBuilder.CreateFPExt(operand,llvmF64Type))
+		EMIT_UNARY_OP(f32,reinterpret_i32,irBuilder.CreateBitCast(operand,llvmF32Type))
+		EMIT_UNARY_OP(f64,reinterpret_i64,irBuilder.CreateBitCast(operand,llvmF64Type))
+		EMIT_UNARY_OP(i32,reinterpret_f32,irBuilder.CreateBitCast(operand,llvmI32Type))
+		EMIT_UNARY_OP(i64,reinterpret_f64,irBuilder.CreateBitCast(operand,llvmI64Type))
+
+		// These operations don't match LLVM's semantics exactly, so just call out to C++ implementations.
+		EMIT_FP_BINARY_OP(min,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{type,type}),{left,right}))
+		EMIT_FP_BINARY_OP(max,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{type,type}),{left,right}))
+		EMIT_FP_UNARY_OP(ceil,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{type}),{operand}))
+		EMIT_FP_UNARY_OP(floor,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{type}),{operand}))
+		EMIT_FP_UNARY_OP(trunc,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{type}),{operand}))
+		EMIT_FP_UNARY_OP(nearest,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{type}),{operand}))
+		EMIT_INT_UNARY_OP(trunc_s_f32,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{ValueType::f32}),{operand}))
+		EMIT_INT_UNARY_OP(trunc_s_f64,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{ValueType::f64}),{operand}))
+		EMIT_INT_UNARY_OP(trunc_u_f32,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{ValueType::f32}),{operand}))
+		EMIT_INT_UNARY_OP(trunc_u_f64,emitRuntimeIntrinsic("eosvmoc_internal.unreachable",FunctionType::get(asResultType(type),{ValueType::f64}),{operand}))
+	};
+	
+	// A do-nothing visitor used to decode past unreachable operators (but supporting logging, and passing the end operator through).
+	struct UnreachableOpVisitor
+	{
+		typedef void Result;
+
+		UnreachableOpVisitor(EmitFunctionContext& inContext): context(inContext), unreachableControlDepth(0) {}
+		#define VISIT_OP(opcode,name,nameString,Imm,...) void name(Imm imm) {}
+		ENUM_NONCONTROL_OPERATORS(VISIT_OP)
+		VISIT_OP(_,unknown,"unknown",Opcode)
+		#undef VISIT_OP
+
+		// Keep track of control structure nesting level in unreachable code, so we know when we reach the end of the unreachable code.
+		void block(ControlStructureImm) { ++unreachableControlDepth; }
+		void loop(ControlStructureImm) { ++unreachableControlDepth; }
+		void if_(ControlStructureImm) { ++unreachableControlDepth; }
+
+		// If an else or end opcode would signal an end to the unreachable code, then pass it through to the IR emitter.
+		void else_(NoImm imm)
+		{
+			if(!unreachableControlDepth) { context.else_(imm); }
+		}
+		void end(NoImm imm)
+		{
+			if(!unreachableControlDepth) { context.end(imm); }
+			else { --unreachableControlDepth; }
+		}
+
+	private:
+		EmitFunctionContext& context;
+		Uptr unreachableControlDepth;
+	};
+
+	void EmitFunctionContext::emit()
+	{
+		// Create the return basic block, and push the root control context for the function.
+		auto returnBlock = llvm::BasicBlock::Create(context,"return",llvmFunction);
+		auto returnPHI = createPHI(returnBlock,functionType->ret);
+		pushControlStack(ControlContext::Type::function,functionType->ret,returnBlock,returnPHI);
+		pushBranchTarget(functionType->ret,returnBlock,returnPHI);
+
+		// Create an initial basic block for the function.
+		auto entryBasicBlock = llvm::BasicBlock::Create(context,"entry",llvmFunction);
+		irBuilder.SetInsertPoint(entryBasicBlock);
+
+		// Create and initialize allocas for all the locals and parameters.
+		auto llvmArgIt = llvmFunction->arg_begin();
+		for(Uptr localIndex = 0;localIndex < functionType->parameters.size() + functionDef.nonParameterLocalTypes.size();++localIndex)
+		{
+			auto localType = localIndex < functionType->parameters.size()
+				? functionType->parameters[localIndex]
+				: functionDef.nonParameterLocalTypes[localIndex - functionType->parameters.size()];
+			auto localPointer = irBuilder.CreateAlloca(asLLVMType(localType),nullptr,"");
+			localPointers.push_back(localPointer);
+
+			if(localIndex < functionType->parameters.size())
+			{
+				// Copy the parameter value into the local that stores it.
+				irBuilder.CreateStore((llvm::Argument*)&(*llvmArgIt),localPointer);
+				++llvmArgIt;
+			}
+			else
+			{
+				// Initialize non-parameter locals to zero.
+				irBuilder.CreateStore(typedZeroConstants[(Uptr)localType],localPointer);
+			}
+		}
+
+		llvm::LoadInst* depth_loadinst;
+		llvm::StoreInst* depth_storeinst;
+		llvm::Value* depth = depth_loadinst = irBuilder.CreateLoad(moduleContext.depthCounter);
+		depth = irBuilder.CreateSub(depth, emitLiteral((I32)1));
+		depth_storeinst = irBuilder.CreateStore(depth, moduleContext.depthCounter);
+		emitConditionalTrapIntrinsic(irBuilder.CreateICmpEQ(depth, emitLiteral((I32)0)), "eosvmoc_internal.depth_assert", FunctionType::get(), {});
+		depth_loadinst->setVolatile(true);
+		depth_storeinst->setVolatile(true);
+
+		// Decode the WebAssembly opcodes and emit LLVM IR for them.
+		OperatorDecoderStream decoder(functionDef.code);
+		UnreachableOpVisitor unreachableOpVisitor(*this);
+		OperatorPrinter operatorPrinter(module,functionDef);
+		while(decoder)
+		{
+			if(ENABLE_LOGGING)
+			{
+				logOperator(decoder.decodeOpWithoutConsume(operatorPrinter));
+			}
+			WAVM_ASSERT_THROW(!controlStack.empty());
+
+			if(controlStack.back().isReachable) { decoder.decodeOp(*this); }
+			else { decoder.decodeOp(unreachableOpVisitor); }
+		};
+		WAVM_ASSERT_THROW(irBuilder.GetInsertBlock() == returnBlock);
+
+		depth = depth_loadinst = irBuilder.CreateLoad(moduleContext.depthCounter);
+		depth = irBuilder.CreateAdd(depth, emitLiteral((I32)1));
+		depth_storeinst = irBuilder.CreateStore(depth, moduleContext.depthCounter);
+		depth_loadinst->setVolatile(true);
+		depth_storeinst->setVolatile(true);
+
+		// Emit the function return.
+		if(functionType->ret == ResultType::none) { irBuilder.CreateRetVoid(); }
+		else { irBuilder.CreateRet(pop()); }
+	}
+
+	llvm::Module* EmitModuleContext::emit()
+	{
+		defaultMemoryBase = emitLiteralPointer(0,llvmI8Type->getPointerTo(256));
+
+		depthCounter = emitLiteralPointer((void*)-18888, llvmI32Type->getPointerTo(256)); ///XXX literal
+
+		// Create LLVM pointer constants for the module's imported functions.
+		for(Uptr functionIndex = 0;functionIndex < module.functions.imports.size();++functionIndex)
+		{
+			const intrinsic_entry& ie =get_intrinsic_map().at(module.functions.imports[functionIndex].moduleName + "." + module.functions.imports[functionIndex].exportName);
+			importedFunctionOffsets.push_back(ie.ordinal);
+		}
+
+		int current_prolouge = -8;
+
+		for(const GlobalDef& global : module.globals.defs) {
+			if(global.type.isMutable) {
+				globals.push_back(emitLiteralPointer((void*)current_prolouge,asLLVMType(global.type.valueType)->getPointerTo(256)));
+				current_prolouge -= 8;
+			}
+			else {
+				switch(global.type.valueType) {
+					case ValueType::i32: globals.push_back(emitLiteral(global.initializer.i32)); break;
+					case ValueType::i64: globals.push_back(emitLiteral(global.initializer.i64)); break;
+					case ValueType::f32: globals.push_back(emitLiteral(global.initializer.f32)); break;
+					case ValueType::f64: globals.push_back(emitLiteral(global.initializer.f64)); break;
+					default: break; //impossible
+				}
+			}
+		}
+
+		if(module.tables.size()) {
+			current_prolouge -= 8; //now pointing to LAST element
+			current_prolouge -= 16*(module.tables.defs[0].type.size.min-1); //now pointing to FIRST element
+			auto tableElementType = llvm::StructType::get(context,{llvmI8PtrType, llvmI64Type});
+			defaultTablePointer = emitLiteralPointer((void*)current_prolouge,tableElementType->getPointerTo(256));
+			defaultTableMaxElementIndex = emitLiteral((U64)module.tables.defs[0].type.size.min);
+
+			for(const TableSegment& table_segment : module.tableSegments)
+				for(Uptr i = 0; i < table_segment.indices.size(); ++i)
+					if(table_segment.indices[i] < module.functions.imports.size())
+						tableOnlyHasDefinedFuncs = false;
+		}
+		
+		// Create the LLVM functions.
+		functionDefs.resize(module.functions.defs.size());
+		for(Uptr functionDefIndex = 0;functionDefIndex < module.functions.defs.size();++functionDefIndex)
+		{
+			auto llvmFunctionType = asLLVMType(module.types[module.functions.defs[functionDefIndex].type.index]);
+			auto externalName = getExternalFunctionName(functionDefIndex);
+			functionDefs[functionDefIndex] = llvm::Function::Create(llvmFunctionType,llvm::Function::ExternalLinkage,externalName,llvmModule);
+		}
+
+		// Compile each function in the module.
+		for(Uptr functionDefIndex = 0;functionDefIndex < module.functions.defs.size();++functionDefIndex)
+		{ EmitFunctionContext(*this,module,module.functions.defs[functionDefIndex],functionDefs[functionDefIndex]).emit(); }
+
+		return llvmModule;
+	}
+
+	llvm::Module* emitModule(const Module& module)
+	{
+		static bool inited;
+		if(!inited) {
+			llvmI8Type = llvm::Type::getInt8Ty(context);
+			llvmI16Type = llvm::Type::getInt16Ty(context);
+			llvmI32Type = llvm::Type::getInt32Ty(context);
+			llvmI64Type = llvm::Type::getInt64Ty(context);
+			llvmF32Type = llvm::Type::getFloatTy(context);
+			llvmF64Type = llvm::Type::getDoubleTy(context);
+			llvmVoidType = llvm::Type::getVoidTy(context);
+			llvmBoolType = llvm::Type::getInt1Ty(context);
+			llvmI8PtrType = llvmI8Type->getPointerTo();
+
+			llvmResultTypes[(Uptr)ResultType::none] = llvm::Type::getVoidTy(context);
+			llvmResultTypes[(Uptr)ResultType::i32] = llvmI32Type;
+			llvmResultTypes[(Uptr)ResultType::i64] = llvmI64Type;
+			llvmResultTypes[(Uptr)ResultType::f32] = llvmF32Type;
+			llvmResultTypes[(Uptr)ResultType::f64] = llvmF64Type;
+
+			// Create zero constants of each type.
+			typedZeroConstants[(Uptr)ValueType::any] = nullptr;
+			typedZeroConstants[(Uptr)ValueType::i32] = emitLiteral((U32)0);
+			typedZeroConstants[(Uptr)ValueType::i64] = emitLiteral((U64)0);
+			typedZeroConstants[(Uptr)ValueType::f32] = emitLiteral((F32)0.0f);
+			typedZeroConstants[(Uptr)ValueType::f64] = emitLiteral((F64)0.0);
+		}
+
+		return EmitModuleContext(module).emit();
+	}
+}
+}}}
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
new file mode 100644
index 00000000000..b8516eb237d
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
@@ -0,0 +1,308 @@
+#include "LLVMJIT.h"
+
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
+#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
+#include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
+#include "llvm/ExecutionEngine/Orc/LambdaResolver.h"
+#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
+#include "llvm/ExecutionEngine/Orc/NullResolver.h"
+#include "llvm/ExecutionEngine/Orc/Core.h"
+
+#include "llvm/Analysis/Passes.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Intrinsics.h"
+#include "llvm/IR/Verifier.h"
+#include "llvm/IR/ValueHandle.h"
+#include "llvm/IR/DebugLoc.h"
+#include "llvm/Object/ObjectFile.h"
+#include "llvm/Object/SymbolSize.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/TargetSelect.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Transforms/Scalar.h"
+#include "llvm/IR/DIBuilder.h"
+#include "llvm/Transforms/InstCombine/InstCombine.h"
+#include "llvm/Transforms/Utils.h"
+#include <memory>
+
+#include <fc/io/datastream.hpp>
+#include <fc/io/raw.hpp>
+#include <fc/reflect/typename.hpp>
+
+#include "llvm/Support/LEB128.h"
+
+#if LLVM_VERSION_MAJOR == 7
+namespace llvm { namespace orc {
+	using LegacyRTDyldObjectLinkingLayer = RTDyldObjectLinkingLayer;
+	template<typename A, typename B>
+	using LegacyIRCompileLayer = IRCompileLayer<A, B>;
+}}
+#endif
+
+#define DUMP_UNOPTIMIZED_MODULE 0
+#define VERIFY_MODULE 0
+#define DUMP_OPTIMIZED_MODULE 0
+#define PRINT_DISASSEMBLY 0
+
+#if PRINT_DISASSEMBLY
+#include "llvm-c/Disassembler.h"
+static void disassembleFunction(U8* bytes,Uptr numBytes)
+{
+	LLVMDisasmContextRef disasmRef = LLVMCreateDisasm(llvm::sys::getProcessTriple().c_str(),nullptr,0,nullptr,nullptr);
+
+	U8* nextByte = bytes;
+	Uptr numBytesRemaining = numBytes;
+	while(numBytesRemaining)
+	{
+		char instructionBuffer[256];
+		const Uptr numInstructionBytes = LLVMDisasmInstruction(
+			disasmRef,
+			nextByte,
+			numBytesRemaining,
+			reinterpret_cast<Uptr>(nextByte),
+			instructionBuffer,
+			sizeof(instructionBuffer)
+			);
+		if(numInstructionBytes == 0 || numInstructionBytes > numBytesRemaining)
+			break;
+		numBytesRemaining -= numInstructionBytes;
+		nextByte += numInstructionBytes;
+
+		printf("\t\t%s\n",instructionBuffer);
+	};
+
+	LLVMDisasmDispose(disasmRef);
+}
+#endif
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+namespace LLVMJIT
+{
+	llvm::TargetMachine* targetMachine = nullptr;
+
+	// Allocates memory for the LLVM object loader.
+	struct UnitMemoryManager : llvm::RTDyldMemoryManager
+	{
+		UnitMemoryManager() {}
+		virtual ~UnitMemoryManager() override
+		{}
+
+		void registerEHFrames(U8* addr, U64 loadAddr,uintptr_t numBytes) override {}
+		void deregisterEHFrames() override {}
+		
+		virtual bool needsToReserveAllocationSpace() override { return true; }
+		virtual void reserveAllocationSpace(uintptr_t numCodeBytes,U32 codeAlignment,uintptr_t numReadOnlyBytes,U32 readOnlyAlignment,uintptr_t numReadWriteBytes,U32 readWriteAlignment) override {
+			code = std::make_unique<std::vector<uint8_t>>(numCodeBytes + numReadOnlyBytes + numReadWriteBytes);
+			ptr = code->data();
+		}
+		virtual U8* allocateCodeSection(uintptr_t numBytes,U32 alignment,U32 sectionID,llvm::StringRef sectionName) override
+		{
+			return get_next_code_ptr(numBytes, alignment);
+		}
+		virtual U8* allocateDataSection(uintptr_t numBytes,U32 alignment,U32 sectionID,llvm::StringRef SectionName,bool isReadOnly) override
+		{
+			if(SectionName == ".eh_frame") {
+				dumpster.resize(numBytes);
+				return dumpster.data();
+			}
+			if(SectionName == ".stack_sizes") {
+				return stack_sizes.emplace_back(numBytes).data();
+			}
+			WAVM_ASSERT_THROW(isReadOnly);
+
+			return get_next_code_ptr(numBytes, alignment);
+		}
+
+		virtual bool finalizeMemory(std::string* ErrMsg = nullptr) override {
+			code->resize(ptr - code->data());
+			return true;
+		}
+
+		std::unique_ptr<std::vector<uint8_t>> code;
+		uint8_t* ptr;
+
+		std::vector<uint8_t> dumpster;
+		std::list<std::vector<uint8_t>> stack_sizes;
+
+		U8* get_next_code_ptr(uintptr_t numBytes, U32 alignment) {
+			//XXX we should probably assert if alignment is > 16 or std align because the std::vector is aligned that way
+			uintptr_t p = (uintptr_t)ptr;
+			p += alignment - 1LL;
+			p &= ~(alignment - 1LL);
+			uint8_t* this_section = (uint8_t*)p;
+			ptr = this_section + numBytes;
+
+			return this_section;
+		}
+
+		UnitMemoryManager(const UnitMemoryManager&) = delete;
+		void operator=(const UnitMemoryManager&) = delete;
+	};
+
+	// The JIT compilation unit for a WebAssembly module instance.
+	struct JITModule
+	{
+		JITModule() {
+			objectLayer = llvm::make_unique<llvm::orc::LegacyRTDyldObjectLinkingLayer>(ES,[this](llvm::orc::VModuleKey K) {
+									return llvm::orc::LegacyRTDyldObjectLinkingLayer::Resources{
+										unitmemorymanager, std::make_shared<llvm::orc::NullResolver>()
+										};
+							  },
+							  [](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
+								  //nothing to do
+							  },
+							  [this](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
+									for(auto symbolSizePair : llvm::object::computeSymbolSizes(Obj)) {
+										auto symbol = symbolSizePair.first;
+										auto name = symbol.getName();
+										auto address = symbol.getAddress();
+										if(symbol.getType() && symbol.getType().get() == llvm::object::SymbolRef::ST_Function && name && address) {
+											Uptr loadedAddress = Uptr(*address);
+											auto symbolSection = symbol.getSection();
+											if(symbolSection)
+												loadedAddress += (Uptr)o.getSectionLoadAddress(*symbolSection.get());
+											Uptr functionDefIndex;
+											if(getFunctionIndexFromExternalName(name->data(),functionDefIndex))
+												function_to_offsets[functionDefIndex] = loadedAddress-(uintptr_t)unitmemorymanager->code->data();
+#if PRINT_DISASSEMBLY
+											disassembleFunction((U8*)loadedAddress, symbolSizePair.second);
+#endif
+										}
+									}
+							  }
+							  );
+			objectLayer->setProcessAllSections(true);
+			compileLayer = llvm::make_unique<CompileLayer>(*objectLayer,llvm::orc::SimpleCompiler(*targetMachine));
+		}
+
+		void compile(llvm::Module* llvmModule);
+
+		std::shared_ptr<UnitMemoryManager> unitmemorymanager = std::make_shared<UnitMemoryManager>();
+
+		std::map<unsigned, uintptr_t> function_to_offsets;
+		std::vector<uint8_t> final_pic_code;
+
+		~JITModule()
+		{
+		}
+	private:
+		typedef llvm::orc::LegacyIRCompileLayer<llvm::orc::LegacyRTDyldObjectLinkingLayer, llvm::orc::SimpleCompiler> CompileLayer;
+
+		llvm::orc::ExecutionSession ES;
+		std::unique_ptr<llvm::orc::LegacyRTDyldObjectLinkingLayer> objectLayer;
+		std::unique_ptr<CompileLayer> compileLayer;
+	};
+
+	static Uptr printedModuleId = 0;
+
+	void printModule(const llvm::Module* llvmModule,const char* filename)
+	{
+		std::error_code errorCode;
+		std::string augmentedFilename = std::string(filename) + std::to_string(printedModuleId++) + ".ll";
+		llvm::raw_fd_ostream dumpFileStream(augmentedFilename,errorCode,llvm::sys::fs::OpenFlags::F_Text);
+		llvmModule->print(dumpFileStream,nullptr);
+		///Log::printf(Log::Category::debug,"Dumped LLVM module to: %s\n",augmentedFilename.c_str());
+	}
+
+	void JITModule::compile(llvm::Module* llvmModule)
+	{
+		// Get a target machine object for this host, and set the module to use its data layout.
+		llvmModule->setDataLayout(targetMachine->createDataLayout());
+
+		// Verify the module.
+		if(DUMP_UNOPTIMIZED_MODULE) { printModule(llvmModule,"llvmDump"); }
+		if(VERIFY_MODULE)
+		{
+			std::string verifyOutputString;
+			llvm::raw_string_ostream verifyOutputStream(verifyOutputString);
+			if(llvm::verifyModule(*llvmModule,&verifyOutputStream))
+			{ Errors::fatalf("LLVM verification errors:\n%s\n",verifyOutputString.c_str()); }
+			///Log::printf(Log::Category::debug,"Verified LLVM module\n");
+		}
+
+		auto fpm = new llvm::legacy::FunctionPassManager(llvmModule);
+		fpm->add(llvm::createPromoteMemoryToRegisterPass());
+		fpm->add(llvm::createInstructionCombiningPass());
+		fpm->add(llvm::createCFGSimplificationPass());
+		fpm->add(llvm::createJumpThreadingPass());
+		fpm->add(llvm::createConstantPropagationPass());
+		fpm->doInitialization();
+
+		for(auto functionIt = llvmModule->begin();functionIt != llvmModule->end();++functionIt)
+		{ fpm->run(*functionIt); }
+		delete fpm;
+
+		if(DUMP_OPTIMIZED_MODULE) { printModule(llvmModule,"llvmOptimizedDump"); }
+
+		llvm::orc::VModuleKey K = ES.allocateVModule();
+		std::unique_ptr<llvm::Module> mod(llvmModule);
+		WAVM_ASSERT_THROW(!compileLayer->addModule(K, std::move(mod)));
+		WAVM_ASSERT_THROW(!compileLayer->emitAndFinalize(K));
+
+		final_pic_code = std::move(*unitmemorymanager->code);
+	}
+
+	instantiated_code instantiateModule(const IR::Module& module)
+	{
+		static bool inited;
+		if(!inited) {
+			inited = true;
+			llvm::InitializeNativeTarget();
+			llvm::InitializeNativeTargetAsmPrinter();
+			llvm::InitializeNativeTargetAsmParser();
+			llvm::InitializeNativeTargetDisassembler();
+			llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr);
+
+			auto targetTriple = llvm::sys::getProcessTriple();
+
+			llvm::TargetOptions to;
+			to.EmitStackSizeSection = 1;
+
+			targetMachine = llvm::EngineBuilder().setRelocationModel(llvm::Reloc::PIC_).setCodeModel(llvm::CodeModel::Small).setTargetOptions(to).selectTarget(
+				llvm::Triple(targetTriple),"","",llvm::SmallVector<std::string,0>()
+				);
+		}
+
+		// Emit LLVM IR for the module.
+		auto llvmModule = emitModule(module);
+
+		// Construct the JIT compilation pipeline for this module.
+		auto jitModule = new JITModule();
+		// Compile the module.
+		jitModule->compile(llvmModule);
+
+		unsigned num_functions_stack_size_found = 0;
+		for(const auto& stacksizes : jitModule->unitmemorymanager->stack_sizes) {
+			fc::datastream<const unsigned char*> ds(stacksizes.data(), stacksizes.size());
+			while(ds.remaining()) {
+				uint64_t funcaddr;
+				fc::unsigned_int stack_size;
+				fc::raw::unpack(ds, funcaddr);
+				fc::raw::unpack(ds, stack_size);
+
+				++num_functions_stack_size_found;
+				if(stack_size > 16u*1024u)
+					_exit(1);
+			}
+		}
+		if(num_functions_stack_size_found != module.functions.defs.size())
+			_exit(1);
+		if(jitModule->final_pic_code.size() >= 16u*1024u*1024u)
+			_exit(1);
+
+		instantiated_code ret;
+		ret.code = jitModule->final_pic_code;
+		ret.function_offsets = jitModule->function_to_offsets;
+		return ret;
+	}
+}
+}}}
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.h b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.h
new file mode 100644
index 00000000000..5b1152f56d6
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "Inline/BasicTypes.h"
+#include "IR/Module.h"
+
+#pragma push_macro("N")
+#undef N
+#include "llvm/IR/Module.h"
+#pragma pop_macro("N")
+#include <vector>
+#include <map>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+struct instantiated_code {
+   std::vector<uint8_t> code;
+   std::map<unsigned, uintptr_t> function_offsets;
+};
+
+namespace LLVMJIT {
+   bool getFunctionIndexFromExternalName(const char* externalName,Uptr& outFunctionDefIndex);
+   llvm::Module* emitModule(const IR::Module& module);
+   instantiated_code instantiateModule(const IR::Module& module);
+}
+}}}
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
new file mode 100644
index 00000000000..4f8a22df032
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -0,0 +1,376 @@
+#include <fc/log/logger_config.hpp> //set_thread_name
+
+#include <eosio/chain/webassembly/eos-vm-oc/code_cache.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/config.hpp>
+#include <eosio/chain/webassembly/common.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/memory.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/compile_monitor.hpp>
+#include <eosio/chain/exceptions.hpp>
+
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/mman.h>
+#include <linux/memfd.h>
+
+#include "IR/Module.h"
+#include "IR/Validate.h"
+#include "WASM/WASM.h"
+#include "LLVMJIT.h"
+
+using namespace IR;
+using namespace Runtime;
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+static constexpr size_t header_offset = 512u;
+static constexpr size_t header_size = 512u;
+static constexpr size_t total_header_size = header_offset + header_size;
+static constexpr uint64_t header_id = 0x31434f4d56534f45ULL; //"EOSVMOC1" little endian
+
+struct code_cache_header {
+   uint64_t id = header_id;
+   bool dirty = false;
+   uintptr_t serialized_descriptor_index = 0;
+} __attribute__ ((packed));
+static constexpr size_t header_dirty_bit_offset_from_file_start = header_offset + offsetof(code_cache_header, dirty);
+static constexpr size_t descriptor_ptr_from_file_start = header_offset + offsetof(code_cache_header, serialized_descriptor_index);
+
+static_assert(sizeof(code_cache_header) <= header_size, "code_cache_header too big");
+
+code_cache_async::code_cache_async(const bfs::path data_dir, const eosvmoc::config& eosvmoc_config, const chainbase::database& db) :
+   code_cache_base(data_dir, eosvmoc_config, db),
+   _result_queue(eosvmoc_config.threads * 2),
+   _threads(eosvmoc_config.threads)
+{
+   wait_on_compile_monitor_message();
+
+   _monitor_reply_thread = std::thread([this]() {
+      fc::set_thread_name("oc-monitor");
+      _ctx.run();
+   });
+}
+
+code_cache_async::~code_cache_async() {
+   _compile_monitor_write_socket.shutdown(local::datagram_protocol::socket::shutdown_send);
+   _monitor_reply_thread.join();
+   consume_compile_thread_queue();
+}
+
+//remember again: wait_on_compile_monitor_message's callback is non-main thread!
+void code_cache_async::wait_on_compile_monitor_message() {
+   _compile_monitor_read_socket.async_wait(local::datagram_protocol::socket::wait_read, [this](auto ec) {
+      if(ec) {
+         _ctx.stop();
+         return;
+      }
+
+      auto [success, message, fds] = read_message_with_fds(_compile_monitor_read_socket);
+      if(!success || !message.contains<wasm_compilation_result_message>()) {
+         _ctx.stop();
+         return;
+      }
+
+      _result_queue.push(message.get<wasm_compilation_result_message>());
+
+      wait_on_compile_monitor_message();
+   });
+}
+
+
+//number processed, bytes available (only if number processed > 0)
+std::tuple<size_t, size_t> code_cache_async::consume_compile_thread_queue() {
+   size_t bytes_remaining = 0;
+   size_t gotsome = _result_queue.consume_all([&](const wasm_compilation_result_message& result) {
+      if(_outstanding_compiles_and_poison[result.code] == false) {
+         result.result.visit(overloaded {
+            [&](const code_descriptor& cd) {
+               _cache_index.push_front(cd);
+            },
+            [&](const compilation_result_unknownfailure&) {
+               wlog("code ${c} failed to tier-up with EOS-VM OC", ("c", result.code.code_id));
+               _blacklist.emplace(result.code);
+            },
+            [&](const compilation_result_toofull&) {
+               //we'll just let this one try and tier up again next time it's used
+            }
+         });
+      }
+      _outstanding_compiles_and_poison.erase(result.code);
+      bytes_remaining = result.cache_free_bytes;
+   });
+
+   return {gotsome, bytes_remaining};
+}
+
+const code_descriptor* const code_cache_async::get_descriptor_for_code(const digest_type& code_id, const uint8_t& vm_version) {
+   //if there are any outstanding compiles, process the result queue now
+   if(_outstanding_compiles_and_poison.size()) {
+      auto [count_processed, bytes_remaining] = consume_compile_thread_queue();
+
+      if(count_processed)
+         check_eviction_threshold(bytes_remaining);
+
+      while(count_processed && _queued_compiles.size()) {
+         auto nextup = _queued_compiles.begin();
+
+         //it's not clear this check is required: if apply() was called for code then it existed in the code_index; and then
+         // if we got notification of it no longer existing we would have removed it from queued_compiles
+         const code_object* const codeobject = _db.find<code_object,by_code_hash>(boost::make_tuple(nextup->code_id, 0, nextup->vm_version));
+         if(codeobject) {
+            _outstanding_compiles_and_poison.emplace(*nextup, false);
+            std::vector<wrapped_fd> fds_to_pass;
+            fds_to_pass.emplace_back(memfd_for_blob(codeobject->code));
+            write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ *nextup }, fds_to_pass);
+            --count_processed;
+         }
+         _queued_compiles.erase(nextup);
+      }
+   }
+
+   //check for entry in cache
+   code_cache_index::index<by_hash>::type::iterator it = _cache_index.get<by_hash>().find(boost::make_tuple(code_id, vm_version));
+   if(it != _cache_index.get<by_hash>().end()) {
+      _cache_index.relocate(_cache_index.begin(), _cache_index.project<0>(it));
+      return &*it;
+   }
+
+   const code_tuple ct = code_tuple{code_id, vm_version};
+
+   if(_blacklist.find(ct) != _blacklist.end())
+      return nullptr;
+   if(auto it = _outstanding_compiles_and_poison.find(ct); it != _outstanding_compiles_and_poison.end()) {
+      it->second = false;
+      return nullptr;
+   }
+   if(_queued_compiles.find(ct) != _queued_compiles.end())
+      return nullptr;
+
+   if(_outstanding_compiles_and_poison.size() >= _threads) {
+      _queued_compiles.emplace(ct);
+      return nullptr;
+   }
+
+   const code_object* const codeobject = _db.find<code_object,by_code_hash>(boost::make_tuple(code_id, 0, vm_version));
+   if(!codeobject) //should be impossible right?
+      return nullptr;
+
+   _outstanding_compiles_and_poison.emplace(ct, false);
+   std::vector<wrapped_fd> fds_to_pass;
+   fds_to_pass.emplace_back(memfd_for_blob(codeobject->code));
+   write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ ct }, fds_to_pass);
+   return nullptr;
+}
+
+code_cache_sync::~code_cache_sync() {
+   //it's exceedingly critical that we wait for the compile monitor to be done with all its work
+   //This is easy in the sync case
+   _compile_monitor_write_socket.shutdown(local::datagram_protocol::socket::shutdown_send);
+   auto [success, message, fds] = read_message_with_fds(_compile_monitor_read_socket);
+   if(success)
+      elog("unexpected response from EOS-VM OC compile monitor during shutdown");
+}
+
+const code_descriptor* const code_cache_sync::get_descriptor_for_code_sync(const digest_type& code_id, const uint8_t& vm_version) {
+   //check for entry in cache
+   code_cache_index::index<by_hash>::type::iterator it = _cache_index.get<by_hash>().find(boost::make_tuple(code_id, vm_version));
+   if(it != _cache_index.get<by_hash>().end()) {
+      _cache_index.relocate(_cache_index.begin(), _cache_index.project<0>(it));
+      return &*it;
+   }
+
+   const code_object* const codeobject = _db.find<code_object,by_code_hash>(boost::make_tuple(code_id, 0, vm_version));
+   if(!codeobject) //should be impossible right?
+      return nullptr;
+
+   std::vector<wrapped_fd> fds_to_pass;
+   fds_to_pass.emplace_back(memfd_for_blob(codeobject->code));
+
+   write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ {code_id, vm_version} }, fds_to_pass);
+   auto [success, message, fds] = read_message_with_fds(_compile_monitor_read_socket);
+   EOS_ASSERT(success, wasm_execution_error, "failed to read response from monitor process");
+   EOS_ASSERT(message.contains<wasm_compilation_result_message>(), wasm_execution_error, "unexpected response from monitor process");
+
+   wasm_compilation_result_message result = message.get<wasm_compilation_result_message>();
+   EOS_ASSERT(result.result.contains<code_descriptor>(), wasm_execution_error, "failed to compile wasm");
+
+   check_eviction_threshold(result.cache_free_bytes);
+
+   return &*_cache_index.push_front(std::move(result.result.get<code_descriptor>())).first;
+}
+
+code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const eosvmoc::config& eosvmoc_config, const chainbase::database& db) :
+   _db(db),
+   _cache_file_path(data_dir/"code_cache.bin")
+{
+   static_assert(sizeof(allocator_t) <= header_offset, "header offset intersects with allocator");
+
+   bfs::create_directories(data_dir);
+
+   if(!bfs::exists(_cache_file_path)) {
+      std::ofstream ofs(_cache_file_path.generic_string(), std::ofstream::trunc);
+      EOS_ASSERT(ofs.good(), database_exception, "unable to create EOS-VM Optimized Compiler code cache");
+      bfs::resize_file(_cache_file_path, eosvmoc_config.cache_size);
+      bip::file_mapping creation_mapping(_cache_file_path.generic_string().c_str(), bip::read_write);
+      bip::mapped_region creation_region(creation_mapping, bip::read_write);
+      new (creation_region.get_address()) allocator_t(eosvmoc_config.cache_size, total_header_size);
+      new ((char*)creation_region.get_address() + header_offset) code_cache_header;
+   }
+
+   code_cache_header* cache_header = nullptr;
+   {
+      char header[total_header_size];
+      std::ifstream hs(_cache_file_path.generic_string(), std::ifstream::binary);
+      hs.read(header, sizeof(header));
+      EOS_ASSERT(!hs.fail(), bad_database_version_exception, "failed to read code cache header");
+
+      cache_header = reinterpret_cast<code_cache_header*>(header+header_offset);
+      EOS_ASSERT(cache_header->id == header_id, bad_database_version_exception, "code cache header magic not as expected");
+      EOS_ASSERT(!cache_header->dirty, database_exception, "code cache is dirty");
+   }
+
+   set_on_disk_region_dirty(true);
+
+   auto existing_file_size = bfs::file_size(_cache_file_path);
+   if(eosvmoc_config.cache_size > existing_file_size) {
+      bfs::resize_file(_cache_file_path, eosvmoc_config.cache_size);
+
+      bip::file_mapping resize_mapping(_cache_file_path.generic_string().c_str(), bip::read_write);
+      bip::mapped_region resize_region(resize_mapping, bip::read_write);
+
+      allocator_t* resize_allocator = reinterpret_cast<allocator_t*>(resize_region.get_address());
+      resize_allocator->grow(eosvmoc_config.cache_size - existing_file_size);
+   }
+
+   _cache_fd = ::open(_cache_file_path.generic_string().c_str(), O_RDWR | O_CLOEXEC);
+   EOS_ASSERT(_cache_fd >= 0, database_exception, "failure to open code cache");
+
+   //load up the previous cache index
+   char* code_mapping = (char*)mmap(nullptr, eosvmoc_config.cache_size, PROT_READ|PROT_WRITE, MAP_SHARED, _cache_fd, 0);
+   EOS_ASSERT(code_mapping != MAP_FAILED, database_exception, "failure to mmap code cache");
+
+   allocator_t* allocator = reinterpret_cast<allocator_t*>(code_mapping);
+
+   if(cache_header->serialized_descriptor_index) {
+      fc::datastream<const char*> ds(code_mapping + cache_header->serialized_descriptor_index, eosvmoc_config.cache_size - cache_header->serialized_descriptor_index);
+      unsigned number_entries;
+      fc::raw::unpack(ds, number_entries);
+      for(unsigned i = 0; i < number_entries; ++i) {
+         code_descriptor cd;
+         fc::raw::unpack(ds, cd);
+         if(cd.codegen_version != 0)
+            continue;
+         _cache_index.push_back(std::move(cd));
+      }
+      allocator->deallocate(code_mapping + cache_header->serialized_descriptor_index);
+
+      ilog("EOS-VM Optimized Compiler code cache loaded with ${c} entries; ${f} of ${t} bytes free", ("c", number_entries)("f", allocator->get_free_memory())("t", allocator->get_size()));
+   }
+   munmap(code_mapping, eosvmoc_config.cache_size);
+
+   _free_bytes_eviction_threshold = eosvmoc_config.cache_size * .1;
+
+   wrapped_fd compile_monitor_conn = get_connection_to_compile_monitor(_cache_fd);
+
+   //okay, let's do this by the book: we're not allowed to write & read on different threads to the same asio socket. So create two fds
+   //representing the same unix socket. we'll read on one and write on the other
+   int duped = dup(compile_monitor_conn);
+   _compile_monitor_write_socket.assign(local::datagram_protocol(), duped);
+   _compile_monitor_read_socket.assign(local::datagram_protocol(), compile_monitor_conn.release());
+}
+
+void code_cache_base::set_on_disk_region_dirty(bool dirty) {
+   bip::file_mapping dirty_mapping(_cache_file_path.generic_string().c_str(), bip::read_write);
+   bip::mapped_region dirty_region(dirty_mapping, bip::read_write);
+
+   *((char*)dirty_region.get_address()+header_dirty_bit_offset_from_file_start) = dirty;
+   if(dirty_region.flush(0, 0, false) == false)
+      elog("Syncing code cache failed");
+}
+
+template <typename T>
+void code_cache_base::serialize_cache_index(fc::datastream<T>& ds) {
+   unsigned entries = _cache_index.size();
+   fc::raw::pack(ds, entries);
+   for(const code_descriptor& cd : _cache_index)
+      fc::raw::pack(ds, cd);
+}
+
+code_cache_base::~code_cache_base() {
+   //reopen the code cache in our process
+   struct stat st;
+   if(fstat(_cache_fd, &st))
+      return;
+   char* code_mapping = (char*)mmap(nullptr, st.st_size, PROT_READ|PROT_WRITE, MAP_SHARED, _cache_fd, 0);
+   if(code_mapping == MAP_FAILED)
+      return;
+
+   allocator_t* allocator = reinterpret_cast<allocator_t*>(code_mapping);
+
+   //serialize out the cache index
+   fc::datastream<size_t> dssz;
+   serialize_cache_index(dssz);
+   size_t sz = dssz.tellp();
+
+   char* p = nullptr;
+   while(_cache_index.size()) {
+      p = (char*)allocator->allocate(sz);
+      if(p != nullptr)
+         break;
+      //in theory, there could be too little free space avaiable to store the cache index
+      //try to free up some space
+      for(unsigned int i = 0; i < 25 && _cache_index.size(); ++i) {
+         allocator->deallocate(code_mapping + _cache_index.back().code_begin);
+         allocator->deallocate(code_mapping + _cache_index.back().initdata_begin);
+         _cache_index.pop_back();
+      }
+   }
+
+   if(p) {
+      fc::datastream<char*> ds(p, sz);
+      serialize_cache_index(ds);
+
+      uintptr_t ptr_offset = p-code_mapping;
+      *((uintptr_t*)(code_mapping+descriptor_ptr_from_file_start)) = ptr_offset;
+   }
+   else
+      *((uintptr_t*)(code_mapping+descriptor_ptr_from_file_start)) = 0;
+
+   msync(code_mapping, allocator->get_size(), MS_SYNC);
+   munmap(code_mapping, allocator->get_size());
+   close(_cache_fd);
+   set_on_disk_region_dirty(false);
+
+}
+
+void code_cache_base::free_code(const digest_type& code_id, const uint8_t& vm_version) {
+   code_cache_index::index<by_hash>::type::iterator it = _cache_index.get<by_hash>().find(boost::make_tuple(code_id, vm_version));
+   if(it != _cache_index.get<by_hash>().end()) {
+      write_message_with_fds(_compile_monitor_write_socket, evict_wasms_message{ {*it} });
+      _cache_index.get<by_hash>().erase(it);
+   }
+
+   //if it's in the queued list, erase it
+   _queued_compiles.erase({code_id, vm_version});
+
+   //however, if it's currently being compiled there is no way to cancel the compile,
+   //so instead set a poison boolean that indicates not to insert the code in to the cache
+   //once the compile is complete
+   const std::unordered_map<code_tuple, bool>::iterator compiling_it = _outstanding_compiles_and_poison.find({code_id, vm_version});
+   if(compiling_it != _outstanding_compiles_and_poison.end())
+      compiling_it->second = true;
+}
+
+void code_cache_base::check_eviction_threshold(size_t free_bytes) {
+   if(free_bytes < _free_bytes_eviction_threshold) {
+      evict_wasms_message evict_msg;
+      for(unsigned int i = 0; i < 25 && _cache_index.size() > 1; ++i) {
+         evict_msg.codes.emplace_back(_cache_index.back());
+         _cache_index.pop_back();
+      }
+      write_message_with_fds(_compile_monitor_write_socket, evict_msg);
+   }
+}
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
new file mode 100644
index 00000000000..77fff54f429
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
@@ -0,0 +1,305 @@
+#include <signal.h>
+#include <sys/prctl.h>
+
+#include <eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/compile_monitor.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/compile_trampoline.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/code_cache.hpp>
+
+#include <eosio/chain/exceptions.hpp>
+
+#include <boost/asio/local/datagram_protocol.hpp>
+#include <boost/signals2.hpp>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+using namespace boost::asio;
+
+static size_t get_size_of_fd(int fd) {
+   struct stat st;
+   fstat(fd, &st); //XXX
+   return st.st_size;
+}
+
+static void copy_memfd_contents_to_pointer(void* dst, int fd) {
+   struct stat st;
+   fstat(fd, &st); //XXX
+   void* contents = mmap(nullptr, st.st_size, PROT_READ, MAP_SHARED, fd, 0); //XXX
+   memcpy(dst, contents, st.st_size);
+   munmap(contents, st.st_size);
+}
+
+struct compile_monitor_session {
+   compile_monitor_session(boost::asio::io_context& context, local::datagram_protocol::socket&& n, wrapped_fd&& c, wrapped_fd& t) :
+      _ctx(context),
+      _nodeos_instance_socket(std::move(n)),
+      _cache_fd(std::move(c)),
+      _trampoline_socket(t) {
+
+      ///XXX we should throw if any problems ctoring
+
+      struct stat st;
+      fstat(_cache_fd, &st);
+      _code_size = st.st_size;
+      _code_mapping = (char*)mmap(nullptr, _code_size, PROT_READ|PROT_WRITE, MAP_SHARED, _cache_fd, 0);
+      _allocator = reinterpret_cast<allocator_t*>(_code_mapping);
+      
+      read_message_from_nodeos();
+   }
+
+   ~compile_monitor_session() {
+      munmap(_code_mapping, _code_size);
+   }
+   
+   void read_message_from_nodeos() {
+      _nodeos_instance_socket.async_wait(local::datagram_protocol::socket::wait_read, [this](auto ec) {
+         if(ec) {
+            connection_dead_signal();
+            return;
+         }
+         auto [success, message, fds] = read_message_with_fds(_nodeos_instance_socket);
+         if(!success) {
+            connection_dead_signal();
+            return;
+         }
+
+         message.visit(overloaded {
+            [&, &fds=fds](const compile_wasm_message& compile) {
+               ///XXX verify there is 1 fd
+               kick_compile_off(compile.code, std::move(fds[0]));
+            },
+            [&](const evict_wasms_message& evict) {
+               ///XXX init mem later
+               for(const code_descriptor& cd : evict.codes)
+                  _allocator->deallocate(_code_mapping + cd.code_begin);
+            },
+            [&](const auto&) {
+               //anything else is an error
+               connection_dead_signal();
+               return;
+            }
+         });
+
+         read_message_from_nodeos();
+      });
+   }
+
+   void kick_compile_off(const code_tuple& code_id, wrapped_fd&& wasm_code) {
+      //prepare a requst to go out to the trampoline
+      int socks[2];
+      socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, socks);
+      local::datagram_protocol::socket response_socket(_ctx);
+      response_socket.assign(local::datagram_protocol(), socks[0]);
+      std::vector<wrapped_fd> fds_pass_to_trampoline;
+      fds_pass_to_trampoline.emplace_back(socks[1]);
+      fds_pass_to_trampoline.emplace_back(std::move(wasm_code));
+
+      eosvmoc_message trampoline_compile_request = compile_wasm_message{code_id};
+      write_message_with_fds(_trampoline_socket, trampoline_compile_request, fds_pass_to_trampoline);
+
+      current_compiles.emplace_front(code_id, std::move(response_socket));
+      read_message_from_compile_task(current_compiles.begin());
+   }
+
+   void read_message_from_compile_task(std::list<std::tuple<code_tuple, local::datagram_protocol::socket>>::iterator current_compile_it) {
+      auto& [code, socket] = *current_compile_it;
+      socket.async_wait(local::datagram_protocol::socket::wait_read, [this, current_compile_it](auto ec) {
+         //at this point we only expect 1 of 2 things to happen: we either get a reply (success), or we get no reply (failure)
+         auto& [code, socket] = *current_compile_it;
+         auto [success, message, fds] = read_message_with_fds(socket);
+         eosvmoc_message reply;
+         if(!success) {
+            reply = wasm_compilation_result_message{code, compilation_result_unknownfailure{}, _allocator->get_free_memory()};
+         }
+         else {
+            //XXX code_compilation_result_message, we should have 2 fds: code & initialmem
+            message.visit(overloaded {
+               [&, &fds=fds, &code=code](const code_compilation_result_message& result) {
+                  ///XXX verify there are 2 fds
+                  void* code_ptr = _allocator->allocate(get_size_of_fd(fds[0]));
+                  void* mem_ptr = _allocator->allocate(get_size_of_fd(fds[1]));
+                  if(code_ptr == nullptr || mem_ptr == nullptr) {
+                     _allocator->deallocate(code_ptr);
+                     _allocator->deallocate(mem_ptr);
+                     reply = wasm_compilation_result_message{code, compilation_result_toofull{}, _allocator->get_free_memory()};
+                     return;
+                  }
+                  ///XXX check if either is NULL and back out
+                  copy_memfd_contents_to_pointer(code_ptr, fds[0]);
+                  copy_memfd_contents_to_pointer(mem_ptr, fds[1]);
+
+                  reply = wasm_compilation_result_message{code, code_descriptor {
+                        code.code_id,
+                        code.vm_version,
+                        0,
+                        (uintptr_t)code_ptr - (uintptr_t)_code_mapping,
+                        result.start,
+                        result.apply_offset,
+                        result.starting_memory_pages,
+                        (uintptr_t)mem_ptr - (uintptr_t)_code_mapping,
+                        (unsigned)get_size_of_fd(fds[1]),
+                        result.initdata_prolouge_size
+                     },
+                     _allocator->get_free_memory()
+                  };
+               },
+               [&, &code=code](const auto&) {
+                  //XXX anything else is an error
+                  reply = wasm_compilation_result_message{code, compilation_result_unknownfailure{}, _allocator->get_free_memory()};
+               }
+            });
+         }
+
+         write_message_with_fds(_nodeos_instance_socket, reply);
+
+         //either way, we are done
+         _ctx.post([this, current_compile_it]() {
+            current_compiles.erase(current_compile_it);
+         });
+      });
+
+   }
+
+   boost::signals2::signal<void()> connection_dead_signal;
+
+private:
+   boost::asio::io_context& _ctx;
+   local::datagram_protocol::socket _nodeos_instance_socket;
+   wrapped_fd  _cache_fd;
+   wrapped_fd& _trampoline_socket;
+
+   char* _code_mapping;
+   size_t _code_size;
+   allocator_t* _allocator;
+
+   std::list<std::tuple<code_tuple, local::datagram_protocol::socket>> current_compiles;
+};
+
+struct compile_monitor {
+   compile_monitor(boost::asio::io_context& ctx, local::datagram_protocol::socket&& n, wrapped_fd&& t) : _nodeos_socket(std::move(n)), _trampoline_socket(std::move(t)) {
+      //the only duty of compile_monitor is to create a compile_monitor_session when a code_cache instance
+      // in nodeos wants one
+      wait_for_new_incomming_session(ctx);
+   }
+
+   void wait_for_new_incomming_session(boost::asio::io_context& ctx) {
+      _nodeos_socket.async_wait(boost::asio::local::datagram_protocol::socket::wait_read, [this, &ctx](auto ec) {
+         if(ec) {
+            ctx.stop();
+            return;
+         }
+         auto [success, message, fds] = read_message_with_fds(_nodeos_socket);
+         if(!success) {
+            ctx.stop();
+            return;
+         }
+         message.visit(overloaded {
+            [&, &fds=fds](const initialize_message& init) {
+               ///XXX not 2 fds, error
+               local::datagram_protocol::socket _socket_for_comm(ctx);
+               _socket_for_comm.assign(local::datagram_protocol(), fds[0].release());
+               _compile_sessions.emplace_front(ctx, std::move(_socket_for_comm), std::move(fds[1]), _trampoline_socket);
+               _compile_sessions.front().connection_dead_signal.connect([&, it = _compile_sessions.begin()]() {
+                  ctx.post([&]() {
+                     _compile_sessions.erase(it);
+                  });
+               });
+               write_message_with_fds(_nodeos_socket, initalize_response_message());
+            },
+            [&](const auto&) {
+               //anything else is an error
+            }
+         });
+
+         wait_for_new_incomming_session(ctx);
+      });
+   }
+
+   local::datagram_protocol::socket _nodeos_socket;
+   wrapped_fd _trampoline_socket;
+
+   std::list<compile_monitor_session> _compile_sessions;
+};
+
+void launch_compile_monitor(int nodeos_fd) {
+   prctl(PR_SET_NAME, "oc-monitor");
+   prctl(PR_SET_PDEATHSIG, SIGKILL);
+
+   //first off, let's disable shutdown signals to us; we want all shutdown indicators to come from
+   // nodeos shutting us down
+   sigset_t set;
+   sigemptyset(&set);
+   sigaddset(&set, SIGHUP);
+   sigaddset(&set, SIGTERM);
+   sigaddset(&set, SIGPIPE);
+   sigaddset(&set, SIGINT);
+   sigaddset(&set, SIGQUIT);
+   sigprocmask(SIG_BLOCK, &set, nullptr);
+
+   int socks[2]; //0: local trampoline socket, 1: the one we give to trampoline
+   socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, socks);
+   pid_t child = fork();
+   if(child == 0) {
+      close(socks[0]);
+      run_compile_trampoline(socks[1]);
+   }
+   close(socks[1]);
+
+   {
+      boost::asio::io_context ctx;
+      boost::asio::local::datagram_protocol::socket nodeos_socket(ctx);
+      nodeos_socket.assign(boost::asio::local::datagram_protocol(), nodeos_fd);
+      wrapped_fd trampoline_socket(socks[0]);
+      compile_monitor monitor(ctx, std::move(nodeos_socket), std::move(trampoline_socket));
+      ctx.run();
+      if(monitor._compile_sessions.size())
+         std::cerr << "ERROR: EOS-VM OC compiler monitor exiting with active sessions" << std::endl;
+   }
+   
+   _exit(0);
+}
+
+struct compile_monitor_trampoline {
+   void start() {
+      //create communication socket; let's hold off on asio usage until all forks are done
+      int socks[2];
+      socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, socks);
+      compile_manager_fd = socks[0];
+
+      pid_t child = fork();
+      if(child == 0) {
+         close(socks[0]);
+         launch_compile_monitor(socks[1]);
+      }
+      close(socks[1]);
+   }
+
+   pid_t compile_manager_pid;
+   int compile_manager_fd;
+};
+
+static compile_monitor_trampoline the_compile_monitor_trampoline;
+void start_compile_monitor() {
+   the_compile_monitor_trampoline.start();
+}
+
+wrapped_fd get_connection_to_compile_monitor(int cache_fd) {
+   int socks[2]; //0: our socket to compile_manager_session, 1: socket we'll give to compile_maanger_session
+   socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, socks);
+   wrapped_fd socket_to_monitor_session(socks[0]);
+
+   std::vector<wrapped_fd> fds_to_pass; 
+   fds_to_pass.emplace_back(socks[1]);
+   fds_to_pass.emplace_back(cache_fd);  //put cache_fd in to a wrapped_fd just temporarily, ick
+   write_message_with_fds(the_compile_monitor_trampoline.compile_manager_fd, initialize_message(), fds_to_pass);
+   fds_to_pass[1].release();
+
+   auto [success, message, fds] = read_message_with_fds(the_compile_monitor_trampoline.compile_manager_fd);
+   EOS_ASSERT(success, misc_exception, "failed to read response from monitor process");
+   EOS_ASSERT(message.contains<initalize_response_message>(), misc_exception, "unexpected response from monitor process");
+   EOS_ASSERT(!message.get<initalize_response_message>().error_message, misc_exception, "Error message from monitor process: ${e}", ("e", *message.get<initalize_response_message>().error_message));
+   return socket_to_monitor_session;
+}
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
new file mode 100644
index 00000000000..15002d77484
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
@@ -0,0 +1,186 @@
+#include <eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/memory.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+#include <eosio/chain/wasm_eosio_injection.hpp>
+
+#include <sys/prctl.h>
+#include <signal.h>
+#include <sys/resource.h>
+
+#include "IR/Module.h"
+#include "IR/Validate.h"
+#include "WASM/WASM.h"
+#include "LLVMJIT.h"
+
+using namespace IR;
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
+   std::vector<uint8_t> wasm = vector_for_memfd(wasm_code);
+
+   //ideally we catch exceptions and sent them upstream as strings for easier reporting
+
+   Module module;
+   Serialization::MemoryInputStream stream(wasm.data(), wasm.size());
+   WASM::serialize(stream, module);
+   module.userSections.clear();
+   wasm_injections::wasm_binary_injection<false> injector(module);
+   injector.inject();
+
+   instantiated_code code = LLVMJIT::instantiateModule(module);
+
+   code_compilation_result_message result_message;
+
+   const std::map<unsigned, uintptr_t>& function_to_offsets = code.function_offsets;
+
+   if(module.startFunctionIndex == UINTPTR_MAX)
+      result_message.start = no_offset{};
+   else if(module.startFunctionIndex < module.functions.imports.size()) {
+      const auto& f = module.functions.imports[module.startFunctionIndex];
+      const intrinsic_entry& ie = get_intrinsic_map().at(f.moduleName + "." + f.exportName);
+      result_message.start = intrinsic_ordinal{ie.ordinal};
+   }
+   else
+      result_message.start = code_offset{function_to_offsets.at(module.startFunctionIndex-module.functions.imports.size())};
+
+   for(const Export& exprt : module.exports) {
+      if(exprt.name == "apply")
+         result_message.apply_offset = function_to_offsets.at(exprt.index-module.functions.imports.size());
+   }
+
+   result_message.starting_memory_pages = -1;
+   if(module.memories.size())
+      result_message.starting_memory_pages = module.memories.defs.at(0).type.size.min;
+
+   std::vector<uint8_t> prolouge(memory::cb_offset); //getting the control block offset gets us as large as table+globals as possible
+   std::vector<uint8_t>::iterator prolouge_it = prolouge.end();
+
+   //set up mutable globals
+   union global_union {
+      int64_t i64;
+      int32_t i32;
+      float f32;
+      double f64;
+   };
+
+   for(const GlobalDef& global : module.globals.defs) {
+      if(!global.type.isMutable)
+         continue;
+      prolouge_it -= 8;
+      global_union* const u = (global_union* const)&*prolouge_it;
+
+      switch(global.initializer.type) {
+         case InitializerExpression::Type::i32_const: u->i32 = global.initializer.i32; break;
+         case InitializerExpression::Type::i64_const: u->i64 = global.initializer.i64; break;
+         case InitializerExpression::Type::f32_const: u->f32 = global.initializer.f32; break;
+         case InitializerExpression::Type::f64_const: u->f64 = global.initializer.f64; break;
+         default: break; //impossible
+      }
+   }
+
+   struct table_entry {
+      uintptr_t type;
+      int64_t func;    //>= 0 means offset to code in wasm; < 0 means intrinsic call at offset address
+   };
+
+   if(module.tables.size())
+      prolouge_it -= sizeof(table_entry) * module.tables.defs[0].type.size.min;
+
+   for(const TableSegment& table_segment : module.tableSegments) {
+      struct table_entry* table_index_0 = (struct table_entry*)&*prolouge_it;
+
+      for(Uptr i = 0; i < table_segment.indices.size(); ++i) {
+         const Uptr function_index = table_segment.indices[i];
+         const long int effective_table_index = table_segment.baseOffset.i32 + i;
+
+         if(effective_table_index >= module.tables.defs[0].type.size.min)
+            return;
+
+         if(function_index < module.functions.imports.size()) {
+            const auto& f = module.functions.imports[function_index];
+            const intrinsic_entry& ie = get_intrinsic_map().at(f.moduleName + "." + f.exportName);
+            table_index_0[effective_table_index].func = ie.ordinal*-8;
+            table_index_0[effective_table_index].type = (uintptr_t)module.types[module.functions.imports[function_index].type.index];
+         }
+         else {
+            table_index_0[effective_table_index].func = function_to_offsets.at(function_index - module.functions.imports.size());
+            table_index_0[effective_table_index].type = (uintptr_t)module.types[module.functions.defs[function_index - module.functions.imports.size()].type.index];
+         }
+      }
+   }
+
+   //this is somewhat copy pasta from wasm_interface_private, with the asserts removed
+   std::vector<uint8_t> initial_mem;
+   for(const DataSegment& data_segment : module.dataSegments) {
+      const U32 base_offset = data_segment.baseOffset.i32;
+
+      if(base_offset + data_segment.data.size() > initial_mem.size())
+         initial_mem.resize(base_offset + data_segment.data.size(), 0x00);
+      memcpy(initial_mem.data() + base_offset, data_segment.data.data(), data_segment.data.size());
+   }
+
+   result_message.initdata_prolouge_size = prolouge.end() - prolouge_it;
+   std::vector<uint8_t> initdata_prep;
+   std::move(prolouge_it, prolouge.end(), std::back_inserter(initdata_prep));
+   std::move(initial_mem.begin(), initial_mem.end(), std::back_inserter(initdata_prep));
+
+   std::vector<wrapped_fd> fds_to_send;
+   fds_to_send.emplace_back(memfd_for_vector(code.code));
+   fds_to_send.emplace_back(memfd_for_vector(initdata_prep));
+   write_message_with_fds(response_sock, result_message, fds_to_send);
+}
+
+void run_compile_trampoline(int fd) {
+   prctl(PR_SET_NAME, "oc-trampoline");
+   prctl(PR_SET_PDEATHSIG, SIGKILL);
+
+   //squelching this for now, but it means we won't have ability to get compile metrics
+   struct sigaction act;
+   sigset_t set;
+   sigemptyset(&set);
+   act.sa_handler = SIG_IGN;
+   act.sa_mask = set;
+   act.sa_flags = SA_NOCLDWAIT;
+   act.sa_sigaction = nullptr;
+   sigaction(SIGCHLD, &act, nullptr);
+
+   while(true) {
+      auto [success, message, fds] = read_message_with_fds(fd);
+      if(!success)
+         break;
+
+      message.visit(overloaded {
+         [&, &fds=fds](const compile_wasm_message& compile) {
+            ///XXX verify there are 2 fds
+            pid_t pid = fork();
+            if(pid == 0) {
+               prctl(PR_SET_NAME, "oc-compile");
+               prctl(PR_SET_PDEATHSIG, SIGKILL);
+
+               struct rlimit cpu_limits = {20u, 20u};
+               setrlimit(RLIMIT_CPU, &cpu_limits);
+
+               struct rlimit vm_limits = {512u*1024u*1024u, 512u*1024u*1024u};
+               setrlimit(RLIMIT_AS, &vm_limits);
+
+               struct rlimit core_limits = {0u, 0u};
+               setrlimit(RLIMIT_CORE, &core_limits);
+
+               run_compile(std::move(fds[0]), std::move(fds[1]));
+               _exit(0);
+            }
+         },
+         [&](const auto&) {
+            //XXX error
+         }
+      });
+   }
+
+   _exit(0);
+}
+
+}}}
+
+
diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
new file mode 100644
index 00000000000..69f54c09810
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -0,0 +1,251 @@
+#include <eosio/chain/webassembly/eos-vm-oc/executor.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/code_cache.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/memory.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+#include <eosio/chain/wasm_eosio_constraints.hpp>
+#include <eosio/chain/apply_context.hpp>
+#include <eosio/chain/transaction_context.hpp>
+#include <eosio/chain/exceptions.hpp>
+#include <eosio/chain/types.hpp>
+
+#include <fc/scoped_exit.hpp>
+
+#include <boost/hana/equal.hpp>
+
+#include <mutex>
+
+#include <asm/prctl.h>
+#include <sys/prctl.h>
+#include <sys/syscall.h>
+
+extern "C" int arch_prctl(int code, unsigned long* addr);
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+static constexpr auto signal_sentinel = 0x4D56534F45534559ul;
+
+static std::mutex inited_signal_mutex;
+static bool inited_signal;
+
+static void(*chained_handler)(int,siginfo_t*,void*);
+[[noreturn]] static void segv_handler(int sig, siginfo_t* info, void* ctx)  {
+   control_block* cb_in_main_segment;
+
+   //a 0 GS value is an indicator an executor hasn't been active on this thread recently
+   uint64_t current_gs;
+   syscall(SYS_arch_prctl, ARCH_GET_GS, &current_gs);
+   if(current_gs == 0)
+      goto notus;
+
+   cb_in_main_segment = reinterpret_cast<control_block*>(current_gs - memory::cb_offset);
+
+   //as a double check that the control block pointer is what we expect, look for the magic
+   if(cb_in_main_segment->magic != signal_sentinel)
+      goto notus;
+
+   //was wasm running? If not, this SEGV was not due to us
+   if(cb_in_main_segment->is_running == false)
+      goto notus;
+
+   //was the segfault within code?
+   if((uintptr_t)info->si_addr >= cb_in_main_segment->execution_thread_code_start &&
+      (uintptr_t)info->si_addr < cb_in_main_segment->execution_thread_code_start+cb_in_main_segment->execution_thread_code_length)
+         siglongjmp(*cb_in_main_segment->jmp, EOSVMOC_EXIT_CHECKTIME_FAIL);
+
+   //was the segfault within data?
+   if((uintptr_t)info->si_addr >= cb_in_main_segment->execution_thread_memory_start &&
+      (uintptr_t)info->si_addr < cb_in_main_segment->execution_thread_memory_start+cb_in_main_segment->execution_thread_memory_length)
+         siglongjmp(*cb_in_main_segment->jmp, EOSVMOC_EXIT_SEGV);
+
+notus:
+   if(chained_handler)
+      chained_handler(sig, info, ctx);
+   ::signal(sig, SIG_DFL);
+   ::raise(sig);
+   __builtin_unreachable();
+}
+
+static int32_t grow_memory(int32_t grow, int32_t max) {
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   uint64_t previous_page_count = cb_ptr->current_linear_memory_pages;
+   int32_t grow_amount = grow;
+   uint64_t max_pages = max;
+   if(grow == 0)
+      return (int32_t)cb_ptr->current_linear_memory_pages;
+   if(previous_page_count + grow_amount > max_pages)
+      return (int32_t)-1;
+
+   uint64_t current_gs;
+   arch_prctl(ARCH_GET_GS, &current_gs);
+   current_gs += grow_amount * memory::stride;
+   arch_prctl(ARCH_SET_GS, (unsigned long*)current_gs);
+   cb_ptr->current_linear_memory_pages += grow_amount;
+
+   if(grow_amount > 0)
+      memset((void*)(cb_ptr->full_linear_memory_start + previous_page_count*64u*1024u), 0, grow_amount*64u*1024u);
+
+   return (int32_t)previous_page_count;
+}
+static intrinsic grow_memory_intrinsic EOSVMOC_INTRINSIC_INIT_PRIORITY("eosvmoc_internal.grow_memory", IR::FunctionType::get(IR::ResultType::i32,{IR::ValueType::i32,IR::ValueType::i32}), (void*)&grow_memory,
+  boost::hana::index_if(intrinsic_table, ::boost::hana::equal.to(BOOST_HANA_STRING("eosvmoc_internal.grow_memory"))).value()
+);
+
+//This is effectively overriding the eosio_exit intrinsic in wasm_interface
+static void eosio_exit(int32_t code) {
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_CLEAN_EXIT);
+   __builtin_unreachable();
+}
+static intrinsic eosio_exit_intrinsic("env.eosio_exit", IR::FunctionType::get(IR::ResultType::none,{IR::ValueType::i32}), (void*)&eosio_exit,
+  boost::hana::index_if(intrinsic_table, ::boost::hana::equal.to(BOOST_HANA_STRING("env.eosio_exit"))).value()
+);
+
+static void throw_internal_exception(const std::string& s) {
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   *cb_ptr->eptr = std::make_exception_ptr(wasm_execution_error(FC_LOG_MESSAGE(error, s)));
+   siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
+   __builtin_unreachable();
+}
+
+#define DEFINE_EOSVMOC_TRAP_INTRINSIC(module,name) \
+	void name(); \
+	static intrinsic name##Function EOSVMOC_INTRINSIC_INIT_PRIORITY(#module "." #name,IR::FunctionType::get(),(void*)&name, \
+     boost::hana::index_if(intrinsic_table, ::boost::hana::equal.to(BOOST_HANA_STRING(#module "." #name))).value() \
+   ); \
+	void name()
+
+DEFINE_EOSVMOC_TRAP_INTRINSIC(eosvmoc_internal,depth_assert) {
+   throw_internal_exception("Exceeded call depth maximum");
+}
+
+DEFINE_EOSVMOC_TRAP_INTRINSIC(eosvmoc_internal,div0_or_overflow) {
+   throw_internal_exception("Division by 0 or integer overflow trapped");
+}
+
+DEFINE_EOSVMOC_TRAP_INTRINSIC(eosvmoc_internal,indirect_call_mismatch) {
+   throw_internal_exception("Indirect call function type mismatch");
+}
+
+DEFINE_EOSVMOC_TRAP_INTRINSIC(eosvmoc_internal,indirect_call_oob) {
+   throw_internal_exception("Indirect call index out of bounds");
+}
+
+DEFINE_EOSVMOC_TRAP_INTRINSIC(eosvmoc_internal,unreachable) {
+   throw_internal_exception("Unreachable reached");
+}
+
+executor::executor(const code_cache_base& cc) {
+   //XXX
+   static bool once_is_enough;
+   if(!once_is_enough) {
+      printf("current_linear_memory_pages %li\n", -memory::cb_offset + offsetof(eosio::chain::eosvmoc::control_block, current_linear_memory_pages));
+      printf("full_linear_memory_start %li\n", -memory::cb_offset + offsetof(eosio::chain::eosvmoc::control_block, full_linear_memory_start));
+      printf("cb_offset %lu\n", memory::cb_offset);
+      printf("remaining call depth: %li\n", -memory::cb_offset + offsetof(eosio::chain::eosvmoc::control_block, current_call_depth_remaining));
+      printf("first intrinsic: %lu\n", memory::first_intrinsic_offset);
+      printf("current code offset: %li\n", -memory::cb_offset + offsetof(eosio::chain::eosvmoc::control_block, running_code_base));
+      once_is_enough = true;
+   }
+
+   //if we're the first executor created, go setup the signal handling. For now we'll just leave this attached forever
+   if(std::lock_guard g(inited_signal_mutex); inited_signal == false) {
+      struct sigaction sig_action, old_sig_action;
+      sig_action.sa_sigaction = segv_handler;
+      sigemptyset(&sig_action.sa_mask);
+      sig_action.sa_flags = SA_SIGINFO | SA_NODEFER;
+      sigaction(SIGSEGV, &sig_action, &old_sig_action);
+      if(old_sig_action.sa_flags & SA_SIGINFO)
+         chained_handler = old_sig_action.sa_sigaction;
+      else if(old_sig_action.sa_handler != SIG_IGN && old_sig_action.sa_handler != SIG_DFL)
+         chained_handler = (void (*)(int,siginfo_t*,void*))old_sig_action.sa_handler;
+
+      inited_signal = true;
+   }
+
+   struct stat s;
+   fstat(cc.fd(), &s);
+   code_mapping = (uint8_t*)mmap(nullptr, s.st_size, PROT_EXEC|PROT_READ, MAP_SHARED, cc.fd(), 0);
+   code_mapping_size = s.st_size;
+   mapping_is_executable = true;
+}
+
+void executor::execute(const code_descriptor& code, const memory& mem, apply_context& context) {
+   if(mapping_is_executable == false) {
+      mprotect(code_mapping, code_mapping_size, PROT_EXEC|PROT_READ);
+      mapping_is_executable = true;
+   }
+
+   //prepare initial memory, mutable globals, and table data
+   if(code.starting_memory_pages > 0 ) {
+      arch_prctl(ARCH_SET_GS, (unsigned long*)(mem.zero_page_memory_base()+code.starting_memory_pages*memory::stride));
+      memset(mem.full_page_memory_base(), 0, 64u*1024u*code.starting_memory_pages);
+   }
+   else
+      arch_prctl(ARCH_SET_GS, (unsigned long*)mem.zero_page_memory_base());
+   memcpy(mem.full_page_memory_base() - code.initdata_prolouge_size, code_mapping + code.initdata_begin, code.initdata_size);
+
+   control_block* const cb = mem.get_control_block();
+   cb->magic = signal_sentinel;
+   cb->execution_thread_code_start = (uintptr_t)code_mapping;
+   cb->execution_thread_code_length = code_mapping_size;
+   cb->execution_thread_memory_start = (uintptr_t)mem.start_of_memory_slices();
+   cb->execution_thread_memory_length = mem.size_of_memory_slice_mapping();
+   cb->ctx = &context;
+   executors_exception_ptr = nullptr;
+   cb->eptr = &executors_exception_ptr;
+   cb->current_call_depth_remaining = eosio::chain::wasm_constraints::maximum_call_depth+2;
+   cb->bouce_buffer_ptr = 0;
+   cb->current_linear_memory_pages = code.starting_memory_pages;
+   cb->full_linear_memory_start = (uintptr_t)mem.full_page_memory_base();
+   cb->jmp = &executors_sigjmp_buf;
+   cb->bounce_buffers = &executors_bounce_buffers;
+   cb->running_code_base = (uintptr_t)(code_mapping + code.code_begin);
+   cb->is_running = true;
+
+   context.trx_context.transaction_timer.set_expiration_callback([](void* user) {
+      executor* self = (executor*)user;
+      syscall(SYS_mprotect, self->code_mapping, self->code_mapping_size, PROT_NONE);
+      self->mapping_is_executable = false;
+   }, this);
+   context.trx_context.checktime(); //catch any expiration that might have occurred before setting up callback
+
+   auto reset_is_running = fc::make_scoped_exit([cb](){cb->is_running = false;});
+   auto reset_bounce_buffers = fc::make_scoped_exit([cb](){cb->bounce_buffers->clear();});
+   auto reset_expiry_cb = fc::make_scoped_exit([&tt=context.trx_context.transaction_timer](){tt.set_expiration_callback(nullptr, nullptr);});
+
+   void(*apply_func)(uint64_t, uint64_t, uint64_t) = (void(*)(uint64_t, uint64_t, uint64_t))(cb->running_code_base + code.apply_offset);
+
+   switch(sigsetjmp(*cb->jmp, 0)) {
+      case 0:
+         code.start.visit(overloaded {
+            [&](const no_offset&) {},
+            [&](const intrinsic_ordinal& i) {
+               void(*start_func)() = (void(*)())(*(uintptr_t*)((uintptr_t)mem.zero_page_memory_base() - memory::first_intrinsic_offset - i.ordinal*8));
+               start_func();
+            },
+            [&](const code_offset& offs) {
+               void(*start_func)() = (void(*)())(cb->running_code_base + offs.offset);
+               start_func();
+            }
+         });
+         apply_func(context.get_receiver().to_uint64_t(), context.get_action().account.to_uint64_t(), context.get_action().name.to_uint64_t());
+         break;
+      //case 1: clean eosio_exit
+      case EOSVMOC_EXIT_CHECKTIME_FAIL:
+         context.trx_context.checktime();
+         break;
+      case EOSVMOC_EXIT_SEGV:
+         EOS_ASSERT(false, wasm_execution_error, "access violation");
+         break;
+      case EOSVMOC_EXIT_EXCEPTION: //exception
+         std::rethrow_exception(*cb->eptr);
+         break;
+   }
+}
+
+executor::~executor() {
+   arch_prctl(ARCH_SET_GS, nullptr);
+}
+
+}}}
diff --git a/libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp b/libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp
new file mode 100644
index 00000000000..05be2f5b73a
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp
@@ -0,0 +1,18 @@
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+static intrinsic_map_t& the_intrinsic_map() {
+   static intrinsic_map_t intrinsic_map;
+   return intrinsic_map;
+}
+
+const intrinsic_map_t& get_intrinsic_map() {
+   return the_intrinsic_map();
+}
+
+intrinsic::intrinsic(const char* n, const IR::FunctionType* t, void* f, size_t o) {
+   the_intrinsic_map().emplace(n, intrinsic_entry{t, f, o});
+}
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/ipc_helpers.cpp b/libraries/chain/webassembly/eos-vm-oc/ipc_helpers.cpp
new file mode 100644
index 00000000000..14d6590f007
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/ipc_helpers.cpp
@@ -0,0 +1,131 @@
+#include <eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp>
+#include <eosio/chain/exceptions.hpp>
+
+#include <sys/syscall.h>
+#include <linux/memfd.h>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+static constexpr size_t max_message_size = 8192;
+
+std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds(boost::asio::local::datagram_protocol::socket& s) {
+   return read_message_with_fds(s.native_handle());
+}
+
+std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds(int fd) {
+   char buff[max_message_size];
+
+   struct msghdr msg = {};
+   struct cmsghdr* cmsg;
+
+   struct iovec io = {
+      .iov_base = buff,
+      .iov_len = sizeof(buff)
+   };
+   union {
+      char buf[CMSG_SPACE(4 * sizeof(int))]; //XXX this code supports a max of 4, so it should probably throw/assert otherwise
+      struct cmsghdr align;
+   } u;
+
+   msg.msg_iov = &io;
+   msg.msg_iovlen = 1;
+   msg.msg_control = u.buf;
+   msg.msg_controllen = sizeof(u.buf);
+
+   int red;
+   do {
+      red = recvmsg(fd, &msg, 0);
+   } while(red == -1 && errno == EINTR);
+   if(red < 1 || red >= sizeof(buff))
+      return {false, eosvmoc_message(), std::vector<wrapped_fd>()};
+   fc::datastream<char*> ds(buff, red);
+   eosvmoc_message message;
+   fc::raw::unpack(ds, message);
+
+   std::vector<wrapped_fd> fds;
+
+   if(msg.msg_controllen) {
+      cmsg = CMSG_FIRSTHDR(&msg);
+      unsigned num_of_fds = (cmsg->cmsg_len - CMSG_LEN(0))/sizeof(int);
+      int* fd_ptr = (int*)CMSG_DATA(cmsg);
+      for(unsigned i = 0; i < num_of_fds; ++i)
+         fds.push_back(*fd_ptr++);
+   }
+
+   return {true, message, std::move(fds)};
+}
+
+void write_message_with_fds(boost::asio::local::datagram_protocol::socket& s, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds) {
+   write_message_with_fds(s.native_handle(), message, fds);
+}
+
+void write_message_with_fds(int fd_to_send_to, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds) {
+   struct msghdr msg = {};
+   struct cmsghdr* cmsg;
+
+   size_t sz = fc::raw::pack_size(message);
+   EOS_ASSERT(sz < max_message_size, misc_exception, "trying to send too large of message");
+   char buff[sz];
+   fc::datastream<char*> ds(buff, sz);
+   fc::raw::pack(ds, message);
+
+   struct iovec io = {
+      .iov_base = buff,
+      .iov_len = sz
+   };
+   union {
+      char buf[CMSG_SPACE(4 * sizeof(int))]; //XXX this code supports a max of 4, so it should probably throw/assert otherwise
+      struct cmsghdr align;
+   } u;
+
+   msg.msg_iov = &io;
+   msg.msg_iovlen = 1;
+   if(fds.size()) {
+      msg.msg_control = u.buf;
+      msg.msg_controllen = sizeof(u.buf);
+      cmsg = CMSG_FIRSTHDR(&msg);
+      cmsg->cmsg_level = SOL_SOCKET;
+      cmsg->cmsg_type = SCM_RIGHTS;
+      cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size());
+      unsigned char* p = CMSG_DATA(cmsg);
+      for(const wrapped_fd& fd : fds) {
+         int thisfd = fd;
+         memcpy(p, &thisfd, sizeof(thisfd));
+         p += sizeof(thisfd);
+      }
+   }
+
+   int wrote;
+   do {
+      wrote = sendmsg(fd_to_send_to, &msg, 0);
+   } while(wrote == -1 && errno == EINTR);
+}
+
+wrapped_fd memfd_for_vector(const std::vector<uint8_t>& bytes) {
+   int fd = syscall(SYS_memfd_create, "eosvmoc_code", MFD_CLOEXEC);
+   ftruncate(fd, bytes.size());
+   uint8_t* b = (uint8_t*)mmap(nullptr, bytes.size(), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+   memcpy(b, bytes.data(), bytes.size());
+   munmap(b, bytes.size());
+   return wrapped_fd(fd);
+}
+
+wrapped_fd memfd_for_blob(const shared_blob& blob) {
+   int fd = syscall(SYS_memfd_create, "eosvmoc_code", MFD_CLOEXEC);
+   ftruncate(fd, blob.size());
+   uint8_t* b = (uint8_t*)mmap(nullptr, blob.size(), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+   memcpy(b, blob.data(), blob.size());
+   munmap(b, blob.size());
+   return wrapped_fd(fd);
+}
+
+std::vector<uint8_t> vector_for_memfd(const wrapped_fd& memfd) {
+   struct stat st;
+   fstat(memfd, &st);
+   uint8_t* p = (uint8_t*)mmap(nullptr, st.st_size, PROT_READ|PROT_WRITE, MAP_SHARED, memfd, 0);
+   std::vector<uint8_t> ret(p, p+st.st_size);
+   munmap(p, st.st_size);
+   return ret;
+}
+
+}}}
diff --git a/libraries/chain/webassembly/eos-vm-oc/llvmWARshim.cpp b/libraries/chain/webassembly/eos-vm-oc/llvmWARshim.cpp
new file mode 100644
index 00000000000..d0b99beb996
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/llvmWARshim.cpp
@@ -0,0 +1,14 @@
+#include <llvm/IR/IRBuilder.h>
+namespace eosio { namespace chain { namespace eosvmoc {
+namespace LLVMJIT {
+
+llvm::Value* CreateInBoundsGEPWAR(llvm::IRBuilder<>& irBuilder, llvm::Value* Ptr, llvm::Value* v1, llvm::Value* v2) {
+   if(!v2)
+      return irBuilder.CreateInBoundsGEP(Ptr, v1);
+   else
+      return irBuilder.CreateInBoundsGEP(Ptr, {v1, v2});
+}
+
+}
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/llvmWARshim.llvmwar b/libraries/chain/webassembly/eos-vm-oc/llvmWARshim.llvmwar
new file mode 120000
index 00000000000..1e2596579da
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/llvmWARshim.llvmwar
@@ -0,0 +1 @@
+llvmWARshim.cpp
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/memory.cpp b/libraries/chain/webassembly/eos-vm-oc/memory.cpp
new file mode 100644
index 00000000000..92831d5184a
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/memory.cpp
@@ -0,0 +1,46 @@
+#include <eosio/chain/webassembly/eos-vm-oc/memory.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/mman.h>
+#include <linux/memfd.h>
+
+namespace eosio { namespace chain { namespace eosvmoc {
+
+memory::memory() {
+   int fd = syscall(SYS_memfd_create, "eosvmoc_mem", MFD_CLOEXEC);
+   FC_ASSERT(fd >= 0, "Failed to create memory memfd");
+   int ret = ftruncate(fd, wasm_memory_size+memory_prologue_size);
+   FC_ASSERT(!ret, "Failed to grow memory memfd");
+
+   mapsize = total_memory_per_slice*number_slices;
+   mapbase = (uint8_t*)mmap(nullptr, mapsize, PROT_NONE, MAP_PRIVATE|MAP_ANON, 0, 0);
+   FC_ASSERT(mapbase != MAP_FAILED, "Failed to mmap memory");
+
+   uint8_t* next_slice = mapbase;
+   uint8_t* last;
+
+   for(unsigned int p = 0; p < number_slices; ++p) {
+      last = (uint8_t*)mmap(next_slice, memory_prologue_size+64u*1024u*p, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_FIXED, fd, 0);
+      FC_ASSERT(last != MAP_FAILED, "Failed to mmap memory");
+      next_slice += total_memory_per_slice;
+   }
+
+   zeropage_base = mapbase + memory_prologue_size;
+   fullpage_base = last + memory_prologue_size;
+
+   close(fd);
+
+   //layout the intrinsic jump table
+   uintptr_t* const intrinsic_jump_table = reinterpret_cast<uintptr_t* const>(zeropage_base - first_intrinsic_offset);
+   const intrinsic_map_t& intrinsics = get_intrinsic_map();
+   for(const auto& intrinsic : intrinsics)
+      intrinsic_jump_table[-intrinsic.second.ordinal] = (uintptr_t)intrinsic.second.function_ptr;
+}
+
+memory::~memory() {
+   munmap(mapbase, mapsize);
+}
+
+}}}
\ No newline at end of file
diff --git a/libraries/chain/webassembly/wabt.cpp b/libraries/chain/webassembly/wabt.cpp
index bf641581aec..8c1a7038c8c 100644
--- a/libraries/chain/webassembly/wabt.cpp
+++ b/libraries/chain/webassembly/wabt.cpp
@@ -73,7 +73,8 @@ class wabt_instantiated_module : public wasm_instantiated_module_interface {
 
 wabt_runtime::wabt_runtime() {}
 
-std::unique_ptr<wasm_instantiated_module_interface> wabt_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) {
+std::unique_ptr<wasm_instantiated_module_interface> wabt_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
+                                                                                     const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) {
    std::unique_ptr<interp::Environment> env = std::make_unique<interp::Environment>();
    for(auto it = intrinsic_registrator::get_map().begin() ; it != intrinsic_registrator::get_map().end(); ++it) {
       interp::HostModule* host_module = env->AppendHostModule(it->first);
diff --git a/libraries/chain/webassembly/wavm.cpp b/libraries/chain/webassembly/wavm.cpp
index 604465e5023..6d31aa996be 100644
--- a/libraries/chain/webassembly/wavm.cpp
+++ b/libraries/chain/webassembly/wavm.cpp
@@ -133,7 +133,8 @@ wavm_runtime::wavm_runtime() {
 wavm_runtime::~wavm_runtime() {
 }
 
-std::unique_ptr<wasm_instantiated_module_interface> wavm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory) {
+std::unique_ptr<wasm_instantiated_module_interface> wavm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
+                                                                                     const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) {
    std::unique_ptr<Module> module = std::make_unique<Module>();
    try {
       Serialization::MemoryInputStream stream((const U8*)code_bytes, code_size);
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 60224544b23..23f782ee6ec 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -397,12 +397,15 @@ namespace eosio { namespace testing {
             cfg.reversible_cache_size = 1024*1024*8;
             cfg.reversible_guard_size = 0;
             cfg.contracts_console = true;
+            cfg.eosvmoc_config.cache_size = 1024*1024*8;
 
             for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
                if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
                   cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
                else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
                   cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
+               else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--eos-vm-oc"))
+                  cfg.wasm_runtime = chain::wasm_interface::vm_type::eos_vm_oc;
             }
             return {cfg, default_genesis()};
          }
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 80628782d52..58ae803df61 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -198,7 +198,15 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
          ("protocol-features-dir", bpo::value<bfs::path>()->default_value("protocol_features"),
           "the location of the protocol_features directory (absolute path or relative to application config dir)")
          ("checkpoint", bpo::value<vector<string>>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.")
-         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("runtime"), "Override default WASM runtime")
+         ("wasm-runtime", bpo::value<eosio::chain::wasm_interface::vm_type>()->value_name("runtime")->notifier([](const auto& vm){
+#ifndef EOSIO_EOS_VM_OC_DEVELOPER
+            //throwing an exception here (like EOS_ASSERT) is just gobbled up with a "Failed to initialize" error :(
+            if(vm == wasm_interface::vm_type::eos_vm_oc) {
+               elog("EOS-VM OC is a tier-up compiler and works in conjunction with the configured base WASM runtime. Enable EOS-VM OC via 'eos-vm-oc-enable' option");
+               EOS_ASSERT(false, plugin_exception, "");
+            }
+#endif
+         }), "Override default WASM runtime")
          ("abi-serializer-max-time-ms", bpo::value<uint32_t>()->default_value(config::default_abi_serializer_max_time_ms),
           "Override default maximum ABI serialization time allowed in ms")
          ("chain-state-db-size-mb", bpo::value<uint64_t>()->default_value(config::default_state_size / (1024  * 1024)), "Maximum size (in MiB) of the chain state database")
@@ -254,6 +262,17 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
 #ifdef __linux__
          ("database-hugepage-path", bpo::value<vector<string>>()->composing(), "Optional path for database hugepages when in \"locked\" mode (may specify multiple times)")
 #endif
+
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+         ("eos-vm-oc-cache-size-mb", bpo::value<uint64_t>()->default_value(eosvmoc::config().cache_size / (1024u*1024u)), "Maximum size (in MiB) of the EOS-VM OC code cache")
+         ("eos-vm-oc-compile-threads", bpo::value<uint64_t>()->default_value(1u)->notifier([](const auto t) {
+               if(t == 0) {
+                  elog("eos-vm-oc-compile-threads must be set to a non-zero value");
+                  EOS_ASSERT(false, plugin_exception, "");
+               }
+         }), "Number of threads to use for EOS-VM OC tier-up")
+         ("eos-vm-oc-enable", bpo::bool_switch(), "Enable EOS-VM OC tier-up runtime")
+#endif
          ;
 
 // TODO: rate limiting
@@ -932,6 +951,15 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          my->chain_config->db_hugepage_paths = options.at("database-hugepage-path").as<std::vector<std::string>>();
 #endif
 
+#ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
+      if( options.count("eos-vm-oc-cache-size-mb") )
+         my->chain_config->eosvmoc_config.cache_size = options.at( "eos-vm-oc-cache-size-mb" ).as<uint64_t>() * 1024u * 1024u;
+      if( options.count("eos-vm-oc-compile-threads") )
+         my->chain_config->eosvmoc_config.threads = options.at("eos-vm-oc-compile-threads").as<uint64_t>();
+      if( options["eos-vm-oc-enable"].as<bool>() )
+         my->chain_config->eosvmoc_tierup = true;
+#endif
+
       my->chain.emplace( *my->chain_config, std::move(pfs), expected_chain_id );
 
       if( !options.count( "snapshot" ) && my->chain->db().revision() < 1 ) {
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 5eac9d29bac..1bd360b38c2 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -17,6 +17,8 @@
 using namespace appbase;
 using namespace eosio;
 
+namespace eosio { namespace chain { namespace eosvmoc { void start_compile_monitor(); }}}
+
 namespace detail {
 
 void configure_logging(const bfs::path& config_path)
@@ -80,6 +82,7 @@ enum return_codes {
 
 int main(int argc, char** argv)
 {
+   eosio::chain::eosvmoc::start_compile_monitor();
    try {
       app().set_version(eosio::nodeos::config::version);
 
diff --git a/unittests/main.cpp b/unittests/main.cpp
index e51899278da..1484cef2f9c 100644
--- a/unittests/main.cpp
+++ b/unittests/main.cpp
@@ -10,12 +10,15 @@
 
 //extern uint32_t EOS_TESTING_GENESIS_TIMESTAMP;
 
+namespace eosio { namespace chain { namespace eosvmoc { void start_compile_monitor(); }}}
+
 void translate_fc_exception(const fc::exception &e) {
    std::cerr << "\033[33m" <<  e.to_detail_string() << "\033[0m" << std::endl;
    BOOST_TEST_FAIL("Caught Unexpected Exception");
 }
 
 boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
+   eosio::chain::eosvmoc::start_compile_monitor();
    // Turn off blockchain logging if no --verbose parameter is not added
    // To have verbose enabled, call "tests/chain_test -- --verbose"
    bool is_verbose = false;

From 1d785c174feb099133850dd1d74ee74b993a93b5 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 24 Sep 2019 01:00:50 -0400
Subject: [PATCH 1341/1648] fix whitespace issue and update eos-vm

---
 libraries/chain/CMakeLists.txt | 2 +-
 libraries/eos-vm               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 66bf34c60ac..191b9a987e5 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -56,7 +56,7 @@ add_library( eosio_chain
 
              ${CHAIN_WAVM_SOURCES}
              webassembly/wabt.cpp
-	     webassembly/eos-vm.cpp
+             webassembly/eos-vm.cpp
 
 #             get_config.cpp
 #
diff --git a/libraries/eos-vm b/libraries/eos-vm
index d09208662eb..78f7aa0bd75 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit d09208662eb5d313eb732dd00aafd733ba8fa9a3
+Subproject commit 78f7aa0bd75909c63f3ebcdc0ec3f012942c8523

From ecbf71b36c6940df90d05ff23efac2e25279f053 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 23 Sep 2019 17:19:00 -0400
Subject: [PATCH 1342/1648] use the LLVM 7 library provided by SCL on CentOS7

---
 .cicd/build.sh                                 |  1 +
 .cicd/platforms/centos-7.6-unpinned.dockerfile | 14 +-------------
 scripts/eosio_build_centos.sh                  |  2 +-
 scripts/eosio_build_centos7_deps               |  4 +++-
 scripts/helpers/eosio.sh                       |  4 +++-
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index c00c35cd8d1..fba3f05486d 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -40,6 +40,7 @@ else # Linux
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
     elif [[ "$IMAGE_TAG" == 'centos-7.6-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/devtoolset-8/enable && source /opt/rh/rh-python36/enable && export PATH=/usr/lib64/ccache:\\\$PATH"
+        CMAKE_EXTRAS="$CMAKE_EXTRAS -DLLVM_DIR='/opt/rh/llvm-toolset-7.0/root/usr/lib64/cmake/llvm'"
     elif [[ "$IMAGE_TAG" == 'ubuntu-18.04-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DLLVM_DIR='/usr/lib/llvm-7/lib/cmake/llvm'"
diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile
index 21b8d03ea74..5e7d86f33e5 100644
--- a/.cicd/platforms/centos-7.6-unpinned.dockerfile
+++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile
@@ -8,7 +8,7 @@ RUN yum update -y && \
     yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
     graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
     python python-devel rh-python36 gettext-devel file libusbx-devel \
-    libcurl-devel patch vim-common jq
+    libcurl-devel patch vim-common jq llvm-toolset-7.0-llvm-devel llvm-toolset-7.0-llvm-static
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     source /opt/rh/devtoolset-8/enable && \
@@ -20,18 +20,6 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     make install && \
     cd / && \
     rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2
-# build llvm8
-RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
-    source /opt/rh/devtoolset-8/enable && \
-    source /opt/rh/rh-python36/enable && \
-    cd llvm && \
-    mkdir build && \
-    cd build && \
-    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd / && \
-    rm -rf /llvm
 # build boost
 RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
     source /opt/rh/devtoolset-8/enable && \
diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh
index 9e20e86df55..a0fa87c3250 100755
--- a/scripts/eosio_build_centos.sh
+++ b/scripts/eosio_build_centos.sh
@@ -12,7 +12,7 @@ echo "Disk space available: ${DISK_AVAIL}G"
 
 echo ""
 
-# Repo necessary for rh-python3 and devtoolset-8
+# Repo necessary for rh-python3, devtoolset-8 and llvm-toolset-7.0
 ensure-scl
 # GCC8 for Centos / Needed for CMAKE install even if we're pinning
 ensure-devtoolset
diff --git a/scripts/eosio_build_centos7_deps b/scripts/eosio_build_centos7_deps
index 60452c66252..7d40915d770 100644
--- a/scripts/eosio_build_centos7_deps
+++ b/scripts/eosio_build_centos7_deps
@@ -18,4 +18,6 @@ gettext-devel,rpm -qa
 file,rpm -qa
 libusbx-devel,rpm -qa
 libcurl-devel,rpm -qa
-patch,rpm -qa
\ No newline at end of file
+patch,rpm -qa
+llvm-toolset-7.0-llvm-devel,rpm -qa
+llvm-toolset-7.0-llvm-static,rpm -qa
\ No newline at end of file
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 5eec8b20e37..28dd7ce8b45 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -269,7 +269,7 @@ function ensure-boost() {
 }
 
 function ensure-llvm() {
-    if $PIN_COMPILER || $BUILD_CLANG || [[ $NAME == "CentOS Linux" ]]; then
+    if $PIN_COMPILER || $BUILD_CLANG; then
         LLVM_TEMP_DIR=$(mktemp -d)
         if $PIN_COMPILER || $BUILD_CLANG; then
             local LLVM_PINNED_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread"
@@ -287,6 +287,8 @@ function ensure-llvm() {
         execute ln -sf /usr/lib/llvm-7 $LLVM_ROOT
     elif [[ $NAME == "Amazon Linux" ]]; then
         execute unlink $LLVM_ROOT || true
+    elif [[ $NAME == "CentOS Linux" ]]; then
+        execute ln -sf /opt/rh/llvm-toolset-7.0/root $LLVM_ROOT
     fi
 }
 

From d370bc9285d64adc1ec402c59a840a388f7e9684 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Tue, 24 Sep 2019 09:55:16 -0400
Subject: [PATCH 1343/1648] Avoid compiling eos-vm when it isn't enabled.

---
 libraries/CMakeLists.txt                                 | 2 ++
 libraries/chain/CMakeLists.txt                           | 9 +++++++--
 libraries/chain/include/eosio/chain/wasm_interface.hpp   | 4 ++++
 .../chain/include/eosio/chain/wasm_interface_private.hpp | 9 ++++++---
 .../chain/include/eosio/chain/webassembly/eos-vm.hpp     | 8 ++++++++
 libraries/chain/wasm_interface.cpp                       | 8 +++++++-
 6 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index ad7cc32f7dc..160c7cec10a 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -21,7 +21,9 @@ set(ENABLE_TESTS OFF CACHE BOOL "Build tests")
 set(ENABLE_ADDRESS_SANITIZER OFF CACHE BOOL "Use address sanitizer")
 set(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER OFF CACHE BOOL "Use UB sanitizer")
 set(ENABLE_PROFILE OFF CACHE BOOL "Enable for profile builds")
+if(eos-vm IN_LIST EOSIO_WASM_RUNTIMES OR eos-vm-jit IN_LIST EOSIO_WASM_RUNTIMES)
 add_subdirectory( eos-vm )
+endif()
 
 set(ENABLE_STATIC ON)
 set(CMAKE_MACOSX_RPATH OFF)
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 191b9a987e5..ddd7b24654f 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -20,6 +20,11 @@ if("wavm" IN_LIST EOSIO_WASM_RUNTIMES)
    set(CHAIN_WAVM_SOURCES "webassembly/wavm.cpp")
 endif()
 
+if("eos-vm" IN_LIST EOSIO_WASM_RUNTIMES OR "eos-vm-jit" IN_LIST EOSIO_WASM_RUNTIMES)
+   set(CHAIN_EOSVM_SOURCES "webassembly/eos-vm.cpp")
+   set(CHAIN_EOSVM_LIBRARIES eos-vm)
+endif()
+
 ## SORT .cpp by most likely to change / break compile
 add_library( eosio_chain
              merkle.cpp
@@ -56,7 +61,7 @@ add_library( eosio_chain
 
              ${CHAIN_WAVM_SOURCES}
              webassembly/wabt.cpp
-             webassembly/eos-vm.cpp
+             ${CHAIN_EOSVM_SOURCES}
 
 #             get_config.cpp
 #
@@ -77,7 +82,7 @@ add_library( eosio_chain
              )
 
 target_link_libraries( eosio_chain fc chainbase Logging IR WAST WASM Runtime
-                       softfloat builtins wabt eos-vm
+                       softfloat builtins wabt ${CHAIN_EOSVM_LIBRARIES}
                      )
 target_include_directories( eosio_chain
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"
diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index 2e59299b128..000c59dab31 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -3,7 +3,9 @@
 #include <eosio/chain/types.hpp>
 #include <eosio/chain/whitelisted_intrinsics.hpp>
 #include <eosio/chain/exceptions.hpp>
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
 #include <eosio/vm/allocator.hpp>
+#endif
 #include "Runtime/Linker.h"
 #include "Runtime/Runtime.h"
 
@@ -88,8 +90,10 @@ namespace eosio { namespace chain {
          //validates code -- does a WASM validation pass and checks the wasm against EOSIO specific constraints
          static void validate(const controller& control, const bytes& code);
 
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
          //get the wasm_allocator used for the linear memory for wasm
          static vm::wasm_allocator* get_wasm_allocator();
+#endif
 
          //indicate that a particular code probably won't be used after given block_num
          void code_block_num_last_used(const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, const uint32_t& block_num);
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 40dd98adae4..c57b1a05700 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -17,11 +17,12 @@
 #include "WAST/WAST.h"
 #include "IR/Validate.h"
 
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
 #include <eosio/vm/allocator.hpp>
+#endif
 
 using namespace fc;
 using namespace eosio::chain::webassembly;
-using namespace eosio::vm;
 using namespace IR;
 using namespace Runtime;
 
@@ -69,10 +70,12 @@ namespace eosio { namespace chain {
                });
       }
 
-      static wasm_allocator* get_wasm_allocator() {
-         static wasm_allocator walloc;
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
+      static eosio::vm::wasm_allocator* get_wasm_allocator() {
+         static eosio::vm::wasm_allocator walloc;
          return &walloc;
       }
+#endif
 
       std::vector<uint8_t> parse_initial_memory(const Module& module) {
          std::vector<uint8_t> mem_image;
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
index b62e77b90c4..f0b5fadc493 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
+
 #include <eosio/chain/webassembly/common.hpp>
 #include <eosio/chain/webassembly/runtime_interface.hpp>
 #include <eosio/chain/exceptions.hpp>
@@ -139,3 +141,9 @@ class eos_vm_runtime : public eosio::chain::wasm_runtime_interface {
 
 #define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG) \
    eosio::vm::registered_function<eosio::chain::apply_context, CLS, &CLS::METHOD> _EOS_VM_INTRINSIC_NAME(__eos_vm_intrinsic_fn, __COUNTER__)(std::string(MOD), std::string(NAME));
+
+#else
+
+#define _REGISTER_EOS_VM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)
+
+#endif
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index fe28ae91c6c..5abcbbaa41b 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -25,19 +25,25 @@
 #include <fstream>
 #include <string.h>
 
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
 #include <eosio/vm/allocator.hpp>
+#endif
 
 namespace eosio { namespace chain {
    using namespace webassembly;
    using namespace webassembly::common;
 
    wasm_interface::wasm_interface(vm_type vm, const chainbase::database& d) : my( new wasm_interface_impl(vm, d) ) {
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
       (void)get_wasm_allocator();
+#endif
    }
 
    wasm_interface::~wasm_interface() {}
 
-   wasm_allocator* wasm_interface::get_wasm_allocator() { return wasm_interface_impl::get_wasm_allocator(); }
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
+   eosio::vm::wasm_allocator* wasm_interface::get_wasm_allocator() { return wasm_interface_impl::get_wasm_allocator(); }
+#endif
 
    void wasm_interface::validate(const controller& control, const bytes& code) {
       Module module;

From 7b49766ff6655326dfbb44b89b3b943570a03ade Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Tue, 24 Sep 2019 11:24:50 -0400
Subject: [PATCH 1344/1648] Bump timeout for unit tests again.

---
 .cicd/generate-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 2711a9166ac..47305a94743 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -182,7 +182,7 @@ for ROUND in $(seq 1 $ROUNDS); do
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
-    timeout: ${TIMEOUT:-10}
+    timeout: ${TIMEOUT:-15}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
@@ -208,7 +208,7 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 5
-    timeout: ${TIMEOUT:-30}
+    timeout: ${TIMEOUT:-45}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 

From fbec73696010a553d37cd4e5255b3790756d40d5 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 24 Sep 2019 13:07:42 -0400
Subject: [PATCH 1345/1648] Consolidated Security Fixes ported from 1.8.4

- WebAssembly checktime fixes

Co-Authored-By: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
---
 libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp b/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
index 4a94c2be9aa..71ab4ab677f 100644
--- a/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_eosio_injection.hpp
@@ -759,7 +759,8 @@ namespace eosio { namespace chain { namespace wasm_injections {
    };
 
    struct post_op_full_injectors : post_op_injectors {
-      using loop_t   = wasm_ops::loop        <checktime_injection>;
+      using loop_t        = wasm_ops::loop        <checktime_injection>;
+      using grow_memory_t = wasm_ops::grow_memory <checktime_injection>;
    };
 
    template <typename ... Visitors>

From 0dab8dad4c71f88357cb20dd5dfb2a347c6788e4 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 8 Jul 2019 13:59:54 -0400
Subject: [PATCH 1346/1648] augment
 producer_schedule_tests/producer_watermark_test to check last produced block
 numbers in block_header_state

---
 unittests/producer_schedule_tests.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp
index acb3f3f5312..32655b3fbc8 100644
--- a/unittests/producer_schedule_tests.cpp
+++ b/unittests/producer_schedule_tests.cpp
@@ -471,7 +471,29 @@ BOOST_AUTO_TEST_CASE( producer_watermark_test ) try {
    BOOST_CHECK_EQUAL( true, compare_schedules( sch1, *c.control->proposed_producers() ) );
 
    produce_until_transition( c, N(bob), N(alice) );
+
+   auto bob_last_produced_block_num = c.control->head_block_num();
+   wdump((bob_last_produced_block_num));
+
    produce_until_transition( c, N(alice), N(bob) );
+
+   auto alice_last_produced_block_num = c.control->head_block_num();
+   wdump((alice_last_produced_block_num));
+
+   {
+      wdump((c.control->head_block_state()->producer_to_last_produced));
+      const auto& last_produced = c.control->head_block_state()->producer_to_last_produced;
+      auto alice_itr = last_produced.find( N(alice) );
+      BOOST_REQUIRE( alice_itr != last_produced.end() );
+      BOOST_CHECK_EQUAL( alice_itr->second, alice_last_produced_block_num );
+      auto bob_itr = last_produced.find( N(bob) );
+      BOOST_REQUIRE( bob_itr != last_produced.end() );
+      BOOST_CHECK_EQUAL( bob_itr->second, bob_last_produced_block_num );
+      auto carol_itr = last_produced.find( N(carol) );
+      BOOST_REQUIRE( carol_itr != last_produced.end() );
+      BOOST_CHECK_EQUAL( carol_itr->second, carol_last_produced_block_num );
+   }
+
    BOOST_CHECK_EQUAL( c.control->pending_producers().version, 3u );
    BOOST_REQUIRE_EQUAL( c.control->active_producers().version, 2u );
 

From bf506194a65aa6b571096b998c0777845a496f33 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 24 Sep 2019 16:33:53 -0400
Subject: [PATCH 1347/1648] always set load/store alignment assumption to just
 1 byte

---
 libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
index c412a039816..29098ff2a87 100644
--- a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
@@ -864,7 +864,7 @@ namespace LLVMJIT
 				auto byteIndex = pop(); \
 				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
 				auto load = irBuilder.CreateLoad(pointer); \
-				load->setAlignment(1<<imm.alignmentLog2); \
+				load->setAlignment(1); \
 				load->setVolatile(true); \
 				push(conversionOp(load,asLLVMType(ValueType::valueTypeId))); \
 			}
@@ -877,7 +877,7 @@ namespace LLVMJIT
 				auto memoryValue = conversionOp(value,llvmMemoryType); \
 				auto store = irBuilder.CreateStore(memoryValue,pointer); \
 				store->setVolatile(true); \
-				store->setAlignment(1<<imm.alignmentLog2); \
+				store->setAlignment(1); \
 			}
 			
 		llvm::Value* identityConversion(llvm::Value* value,llvm::Type* type) { return value; }

From a2e90f771f65dab399b90ca97cac878f09281baf Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 24 Sep 2019 16:35:27 -0400
Subject: [PATCH 1348/1648] resolve possible exception object leakage

---
 .../chain/include/eosio/chain/webassembly/eos-vm-oc.hpp  | 9 +++++----
 libraries/chain/webassembly/eos-vm-oc/executor.cpp       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
index a19c3b6bc1d..7951baf9593 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
@@ -315,9 +315,9 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<>, std::tuple<Transla
       }
       catch(...) {
          *cb_ptr->eptr = std::current_exception();
-         siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
-         __builtin_unreachable();
       }
+      siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
+      __builtin_unreachable();
    }
 
    template<next_method_type Method>
@@ -341,12 +341,13 @@ struct intrinsic_invoker_impl<is_injected, void_type, std::tuple<>, std::tuple<T
          if constexpr(!is_injected)
             EOS_ASSERT(cb_ptr->current_call_depth_remaining != 1, wasm_execution_error, "Exceeded call depth maximum");
          Method(translated...);
+         return;
       }
       catch(...) {
          *cb_ptr->eptr = std::current_exception();
-         siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
-         __builtin_unreachable();
       }
+      siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
+      __builtin_unreachable();
    }
 
    template<next_method_type Method>
diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index 69f54c09810..b0c9995aedf 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -101,7 +101,7 @@ static intrinsic eosio_exit_intrinsic("env.eosio_exit", IR::FunctionType::get(IR
   boost::hana::index_if(intrinsic_table, ::boost::hana::equal.to(BOOST_HANA_STRING("env.eosio_exit"))).value()
 );
 
-static void throw_internal_exception(const std::string& s) {
+static void throw_internal_exception(const char* const s) {
    EOSVMOC_MEMORY_PTR_cb_ptr;
    *cb_ptr->eptr = std::make_exception_ptr(wasm_execution_error(FC_LOG_MESSAGE(error, s)));
    siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);

From 71a77ba3ee9ce3fb207bd494441b6e2128af6316 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Wed, 25 Sep 2019 09:13:04 +0800
Subject: [PATCH 1349/1648] Update fc to master

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index 3cd44bd5d98..52e372f4cab 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 3cd44bd5d984891bf16a71b277df2135adbe8cd6
+Subproject commit 52e372f4cabc59d531a2bbf35bebbf244e4d9485

From 57dd64e77c0f3c82f6a873287672095ce5df7350 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 24 Sep 2019 22:55:59 -0400
Subject: [PATCH 1350/1648] fix bugs that remained with chain_id in state
 changes

---
 libraries/chain/controller.cpp                |  54 ++++---
 .../chain/include/eosio/chain/controller.hpp  |   6 +-
 .../testing/include/eosio/testing/tester.hpp  |   6 +-
 libraries/testing/tester.cpp                  |  20 ++-
 plugins/chain_plugin/chain_plugin.cpp         | 141 +++++++++++-------
 5 files changed, 142 insertions(+), 85 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index a6aca78e3e0..9210f49a4fa 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -281,7 +281,7 @@ struct controller_impl {
       apply_handlers[receiver][make_pair(contract,action)] = v;
    }
 
-   controller_impl( const controller::config& cfg, controller& s, protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id )
+   controller_impl( const controller::config& cfg, controller& s, protocol_feature_set&& pfs, const chain_id_type& chain_id )
    :self(s),
     db( cfg.state_dir,
         cfg.read_only ? database::read_only : database::read_write,
@@ -296,21 +296,10 @@ struct controller_impl {
     authorization( s, db ),
     protocol_features( std::move(pfs) ),
     conf( cfg ),
-    chain_id( (db.revision() >= 1) ? db.get<global_property_object>().chain_id
-                                   : ( expected_chain_id ? *expected_chain_id
-                                                         : genesis_state().compute_chain_id() ) ),
+    chain_id( chain_id ),
     read_mode( cfg.read_mode ),
     thread_pool( "chain", cfg.thread_pool_size )
    {
-      if( expected_chain_id && db.revision() >= 1 ) {
-         const auto& actual_chain_id = db.get<global_property_object>().chain_id;
-         EOS_ASSERT( *expected_chain_id == actual_chain_id,
-                     database_exception,
-                     "Unexpected chain ID in state. Expected: ${expected}. Actual: ${actual}.",
-                     ("expected", *expected_chain_id)("actual", actual_chain_id)
-         );
-      }
-
       fork_db.open( [this]( block_timestamp_type timestamp,
                             const flat_set<digest_type>& cur_features,
                             const vector<digest_type>& new_features )
@@ -617,17 +606,25 @@ struct controller_impl {
       init(shutdown);
    }
 
-   void init(std::function<bool()> shutdown) {
-      uint32_t lib_num = (blog.head() ? blog.head()->block_num() : fork_db.root()->block_num);
+
+   static auto validate_db_version( const chainbase::database& db ) {
       // check database version
       const auto& header_idx = db.get_index<database_header_multi_index>().indices().get<by_id>();
 
       EOS_ASSERT(header_idx.begin() != header_idx.end(), bad_database_version_exception,
                  "state database version pre-dates versioning, please restore from a compatible snapshot or replay!");
 
-      const auto& header_itr = header_idx.begin();
+      auto header_itr = header_idx.begin();
       header_itr->validate();
 
+      return header_itr;
+   }
+
+   void init(std::function<bool()> shutdown) {
+      uint32_t lib_num = (blog.head() ? blog.head()->block_num() : fork_db.root()->block_num);
+
+      auto header_itr = validate_db_version( db );
+
       // upgrade to the latest compatible version
       if (header_itr->version != database_header_object::current_version) {
          db.modify(*header_itr, [](auto& header) {
@@ -2365,13 +2362,13 @@ const protocol_feature_manager& controller::get_protocol_feature_manager()const
    return my->protocol_features;
 }
 
-controller::controller( const controller::config& cfg, const fc::optional<chain_id_type>& expected_chain_id )
-:my( new controller_impl( cfg, *this, protocol_feature_set{}, expected_chain_id ) )
+controller::controller( const controller::config& cfg, const chain_id_type& chain_id )
+:my( new controller_impl( cfg, *this, protocol_feature_set{}, chain_id ) )
 {
 }
 
-controller::controller( const config& cfg, protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id )
-:my( new controller_impl( cfg, *this, std::move(pfs), expected_chain_id ) )
+controller::controller( const config& cfg, protocol_feature_set&& pfs, const chain_id_type& chain_id )
+:my( new controller_impl( cfg, *this, std::move(pfs), chain_id ) )
 {
 }
 
@@ -3188,6 +3185,23 @@ chain_id_type controller::extract_chain_id(snapshot_reader& snapshot) {
    return chain_id;
 }
 
+fc::optional<chain_id_type> controller::extract_chain_id_from_db( const path& state_dir ) {
+   chainbase::database db( state_dir, chainbase::database::read_only );
+
+   try {
+      db.add_index<database_header_multi_index>();
+      db.add_index<global_property_multi_index>();
+   } catch( ... ) {
+      return {};
+   }
+
+   controller_impl::validate_db_version( db );
+
+   if( db.revision() < 1 ) return {};
+
+   return db.get<global_property_object>().chain_id;
+}
+
 /// Protocol feature activation handlers:
 
 template<>
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index e4adf700c10..4666ce23230 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -100,8 +100,8 @@ namespace eosio { namespace chain {
             incomplete  = 3, ///< this is an incomplete block (either being produced by a producer or speculatively produced by a node)
          };
 
-         controller( const config& cfg, const fc::optional<chain_id_type>& expected_chain_id );
-         controller( const config& cfg, protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id );
+         controller( const config& cfg, const chain_id_type& chain_id );
+         controller( const config& cfg, protocol_feature_set&& pfs, const chain_id_type& chain_id );
          ~controller();
 
          void add_indices();
@@ -330,6 +330,8 @@ namespace eosio { namespace chain {
 
       static chain_id_type extract_chain_id(snapshot_reader& snapshot);
 
+      static fc::optional<chain_id_type> extract_chain_id_from_db( const path& state_dir );
+
       private:
          friend class apply_context;
          friend class transaction_context;
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index 60224544b23..fd77a256b6c 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -163,13 +163,13 @@ namespace eosio { namespace testing {
 
          void              close();
          template <typename Lambda>
-         void              open( protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id, Lambda lambda );
+         void              open( protocol_feature_set&& pfs, fc::optional<chain_id_type> expected_chain_id, Lambda lambda );
          void              open( protocol_feature_set&& pfs, const snapshot_reader_ptr& snapshot );
          void              open( protocol_feature_set&& pfs, const genesis_state& genesis );
-         void              open( protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id = {} );
+         void              open( protocol_feature_set&& pfs, fc::optional<chain_id_type> expected_chain_id = {} );
          void              open( const snapshot_reader_ptr& snapshot );
          void              open( const genesis_state& genesis );
-         void              open( const fc::optional<chain_id_type>& expected_chain_id = {} );
+         void              open( fc::optional<chain_id_type> expected_chain_id = {} );
          bool              is_same_chain( base_tester& other );
 
          virtual signed_block_ptr produce_block( fc::microseconds skip_time = fc::milliseconds(config::block_interval_ms) ) = 0;
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
index 3baa63629c5..074de397217 100644
--- a/libraries/testing/tester.cpp
+++ b/libraries/testing/tester.cpp
@@ -1,6 +1,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <eosio/testing/tester.hpp>
+#include <eosio/chain/block_log.hpp>
 #include <eosio/chain/wast_to_wasm.hpp>
 #include <eosio/chain/eosio_contract.hpp>
 #include <eosio/chain/generated_transaction_object.hpp>
@@ -241,13 +242,24 @@ namespace eosio { namespace testing {
       open( make_protocol_feature_set(), genesis );
    }
 
-   void base_tester::open( const fc::optional<chain_id_type>& expected_chain_id ) {
+   void base_tester::open( fc::optional<chain_id_type> expected_chain_id ) {
       open( make_protocol_feature_set(), expected_chain_id );
    }
 
    template <typename Lambda>
-   void base_tester::open( protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id, Lambda lambda ) {
-      control.reset( new controller(cfg, std::move(pfs), expected_chain_id) );
+   void base_tester::open( protocol_feature_set&& pfs, fc::optional<chain_id_type> expected_chain_id, Lambda lambda ) {
+      if( !expected_chain_id ) {
+         expected_chain_id = controller::extract_chain_id_from_db( cfg.state_dir );
+         if( !expected_chain_id ) {
+            if( fc::is_regular_file( cfg.blocks_dir / "blocks.log" ) ) {
+               expected_chain_id = block_log::extract_chain_id( cfg.blocks_dir );
+            } else {
+               expected_chain_id = genesis_state().compute_chain_id();
+            }
+         }
+      }
+
+      control.reset( new controller(cfg, std::move(pfs), *expected_chain_id) );
       control->add_indices();
       lambda();
       chain_transactions.clear();
@@ -279,7 +291,7 @@ namespace eosio { namespace testing {
       });
    }
 
-   void base_tester::open( protocol_feature_set&& pfs, const fc::optional<chain_id_type>& expected_chain_id ) {
+   void base_tester::open( protocol_feature_set&& pfs, fc::optional<chain_id_type> expected_chain_id ) {
       open(std::move(pfs), expected_chain_id, [&control=this->control]() {
          control->startup( []() { return false; } );
       });
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 80628782d52..67371479318 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -812,7 +812,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          wlog("The --import-reversible-blocks option should be used by itself.");
       }
 
-      fc::optional<chain_id_type> expected_chain_id;
+      fc::optional<chain_id_type> chain_id;
       if (options.count( "snapshot" )) {
          my->snapshot_path = options.at( "snapshot" ).as<bfs::path>();
          EOS_ASSERT( fc::exists(*my->snapshot_path), plugin_config_exception,
@@ -823,7 +823,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          auto infile = std::ifstream(my->snapshot_path->generic_string(), (std::ios::in | std::ios::binary));
          istream_snapshot_reader reader(infile);
          reader.validate();
-         expected_chain_id = controller::extract_chain_id(reader);
+         chain_id = controller::extract_chain_id(reader);
          infile.close();
 
          EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,
@@ -839,22 +839,21 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                  "Snapshot can only be used to initialize an empty database." );
 
          if( fc::is_regular_file( my->blocks_dir / "blocks.log" )) {
-            auto log_genesis = block_log::extract_genesis_state(my->blocks_dir);
-            if (log_genesis) {
-               my->genesis = log_genesis;
-               const auto& block_log_chain_id = my->genesis->compute_chain_id();
-               EOS_ASSERT( expected_chain_id == block_log_chain_id,
+            auto block_log_genesis = block_log::extract_genesis_state(my->blocks_dir);
+            if( block_log_genesis ) {
+               const auto& block_log_chain_id = block_log_genesis->compute_chain_id();
+               EOS_ASSERT( *chain_id == block_log_chain_id,
                            plugin_config_exception,
                            "snapshot chain ID (${snapshot_chain_id}) does not match the chain ID from the genesis state in the block log (${block_log_chain_id})",
-                           ("snapshot_chain_id", expected_chain_id)
+                           ("snapshot_chain_id",  chain_id)
                            ("block_log_chain_id", block_log_chain_id)
                );
             } else {
                const auto& block_log_chain_id = block_log::extract_chain_id(my->blocks_dir);
-               EOS_ASSERT( expected_chain_id == block_log_chain_id,
+               EOS_ASSERT( *chain_id == block_log_chain_id,
                            plugin_config_exception,
                            "snapshot chain ID (${snapshot_chain_id}) does not match the chain ID (${block_log_chain_id}) in the block log",
-                           ("snapshot_chain_id", expected_chain_id)
+                           ("snapshot_chain_id",  chain_id)
                            ("block_log_chain_id", block_log_chain_id)
                );
             }
@@ -862,7 +861,33 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
 
       } else {
 
-         if( options.count( "genesis-json" )) {
+         chain_id = controller::extract_chain_id_from_db( my->chain_config->state_dir );
+
+         fc::optional<genesis_state> block_log_genesis;
+         fc::optional<chain_id_type> block_log_chain_id;
+
+         if( fc::is_regular_file( my->blocks_dir / "blocks.log" ) ) {
+            block_log_genesis = block_log::extract_genesis_state( my->blocks_dir );
+            if( block_log_genesis ) {
+               block_log_chain_id = block_log_genesis->compute_chain_id();
+            } else {
+               block_log_chain_id = block_log::extract_chain_id( my->blocks_dir );
+            }
+
+            if( chain_id ) {
+               EOS_ASSERT( *block_log_chain_id == *chain_id, block_log_exception,
+                           "Chain ID in blocks.log (${block_log_chain_id}) does not match the existing "
+                           " chain ID in state (${state_chain_id}).",
+                           ("block_log_chain_id", *block_log_chain_id)
+                           ("state_chain_id", *chain_id)
+               );
+            } else if( block_log_genesis ) {
+               ilog( "Starting fresh blockchain state using genesis state extracted from blocks.log." );
+               my->genesis = block_log_genesis;
+            }
+         }
+
+         if( options.count( "genesis-json" ) ) {
             bfs::path genesis_file = options.at( "genesis-json" ).as<bfs::path>();
             if( genesis_file.is_relative()) {
                genesis_file = bfs::current_path() / genesis_file;
@@ -873,48 +898,67 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                        "Specified genesis file '${genesis}' does not exist.",
                        ("genesis", genesis_file.generic_string()));
 
-            my->genesis = fc::json::from_file( genesis_file ).as<genesis_state>();
+            genesis_state provided_genesis = fc::json::from_file( genesis_file ).as<genesis_state>();
 
             if( options.count( "genesis-timestamp" ) ) {
-               my->genesis->initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
+               provided_genesis.initial_timestamp = calculate_genesis_timestamp( options.at( "genesis-timestamp" ).as<string>() );
+
                ilog( "Using genesis state provided in '${genesis}' but with adjusted genesis timestamp",
                      ("genesis", genesis_file.generic_string()) );
             } else {
                ilog( "Using genesis state provided in '${genesis}'", ("genesis", genesis_file.generic_string()));
             }
 
-            expected_chain_id = my->genesis->compute_chain_id();
+            if( block_log_genesis ) {
+               EOS_ASSERT( *block_log_genesis == provided_genesis, plugin_config_exception,
+                           "Genesis state, provided via command line arguments, does not match the existing genesis state"
+                           " in blocks.log. It is not necessary to provide genesis state arguments when a full blocks.log "
+                           "file already exists."
+               );
+            } else {
+               const auto& provided_genesis_chain_id = provided_genesis.compute_chain_id();
+               if( chain_id ) {
+                  EOS_ASSERT( provided_genesis_chain_id == *chain_id, plugin_config_exception,
+                              "Genesis state, provided via command line arguments, has a chain ID (${provided_genesis_chain_id}) "
+                              "that does not match the existing chain ID in the database state (${state_chain_id}). "
+                              "It is not necessary to provide genesis state arguments when an initialized database state already exists.",
+                              ("provided_genesis_chain_id", provided_genesis_chain_id)
+                              ("state_chain_id", *chain_id)
+                  );
+               } else {
+                  if( block_log_chain_id ) {
+                     EOS_ASSERT( provided_genesis_chain_id == *block_log_chain_id, plugin_config_exception,
+                                 "Genesis state, provided via command line arguments, has a chain ID (${provided_genesis_chain_id}) "
+                                 "that does not match the existing chain ID in blocks.log (${block_log_chain_id}).",
+                                 ("provided_genesis_chain_id", provided_genesis_chain_id)
+                                 ("block_log_chain_id", *block_log_chain_id)
+                     );
+                  }
+
+                  chain_id = provided_genesis_chain_id;
+
+                  ilog( "Starting fresh blockchain state using provided genesis state." );
+                  my->genesis = std::move(provided_genesis);
+               }
+            }
          } else {
             EOS_ASSERT( options.count( "genesis-timestamp" ) == 0,
                         plugin_config_exception,
                         "--genesis-timestamp is only valid if also passed in with --genesis-json");
          }
 
-         if( fc::is_regular_file( my->blocks_dir / "blocks.log" ) ) {
-            auto log_genesis = block_log::extract_genesis_state( my->blocks_dir );
-            if (log_genesis) {
-               if (my->genesis) {
-                  EOS_ASSERT( *my->genesis == *log_genesis, plugin_config_exception,
-                              "Genesis state provided via command line arguments does not match the existing genesis state"
-                              " in blocks.log. It is not necessary to provide genesis state arguments when a blocks.log "
-                              "file already exists."
-                  );
-               } else {
-                  my->genesis = log_genesis;
-                  expected_chain_id = my->genesis->compute_chain_id();
-               }
-            } else {
-               const auto& block_log_chain_id = block_log::extract_chain_id( my->blocks_dir );
-               if (my->genesis) {
-                  EOS_ASSERT( expected_chain_id == block_log_chain_id, plugin_config_exception,
-                              "Genesis state, provided via command line arguments, has a chain_id that does not match the "
-                              "existing chain id in blocks.log. It is not necessary to provide genesis state arguments "
-                              "when a blocks.log file already exists."
-                  );
-               } else {
-                  expected_chain_id = block_log_chain_id;
-               }
-            }
+         if( !chain_id ) {
+            // Uninitialized state database and no genesis state provided
+
+            EOS_ASSERT( !block_log_chain_id, plugin_config_exception,
+                        "Genesis state is necessary to initialize fresh blockchain state but genesis state could not be "
+                        "found in the blocks log. Please either load from snapshot or find a blocks log that starts "
+                        "from genesis."
+            );
+
+            ilog( "Starting fresh blockchain state using default genesis state." );
+            my->genesis.emplace();
+            chain_id = my->genesis->compute_chain_id();
          }
       }
 
@@ -932,22 +976,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          my->chain_config->db_hugepage_paths = options.at("database-hugepage-path").as<std::vector<std::string>>();
 #endif
 
-      my->chain.emplace( *my->chain_config, std::move(pfs), expected_chain_id );
-
-      if( !options.count( "snapshot" ) && my->chain->db().revision() < 1 ) {
-         // No snapshot and no existing blockchain state
-         EOS_ASSERT( my->genesis || !expected_chain_id, plugin_config_exception,
-                     "Genesis state is necessary to initialize fresh blockchain state but genesis state could not be "
-                     "found in the blocks log. Please either load from snapshot or find a blocks log that starts "
-                     "from genesis."
-         );
-         if( my->genesis ) {
-            ilog( "Starting up fresh blockchain with provided genesis state." );
-         } else {
-            ilog( "Starting up fresh blockchain with default genesis state." );
-            my->genesis.emplace();
-         }
-      }
+      my->chain.emplace( *my->chain_config, std::move(pfs), *chain_id );
 
       // set up method providers
       my->get_block_by_number_provider = app().get_method<methods::get_block_by_number>().register_provider(
@@ -1020,7 +1049,7 @@ void chain_plugin::plugin_startup()
          auto reader = std::make_shared<istream_snapshot_reader>(infile);
          my->chain->startup(shutdown, reader);
          infile.close();
-      } else if (my->chain->db().revision() < 1) {
+      } else if( my->genesis ) {
          my->chain->startup(shutdown, *my->genesis);
       } else {
          my->chain->startup(shutdown);

From 75a9f3e04c579324c3a5dcf6da17095bb9553fd7 Mon Sep 17 00:00:00 2001
From: Andrianto Lie <andrianto.lie@block.one>
Date: Wed, 25 Sep 2019 15:59:13 +0800
Subject: [PATCH 1351/1648] Remove unnecessary comment

---
 .../chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index ceae80733a2..c56c5899c02 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -52,7 +52,7 @@ struct permission {
 template<typename>
 struct resolver_factory;
 
-// see specializations for uint64_t, uint128_t and double in source file
+// see specializations for uint64_t and double in source file
 template<typename Type>
 Type convert_to_type(const string& str, const string& desc) {
    try {

From cf3a3dcb52eafcfd1d1c4a996308f20b726f10dc Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 25 Sep 2019 09:15:40 -0400
Subject: [PATCH 1352/1648] fork EOSVMOC OOP helpers before main via linker
 trick

EOS-VM OC needs to fork off its out of process compilation processes as early as possible. I don't want to do this, say, once a chain controller is initialized because there may already be open TCP sockets, keys loaded in memory, ASIO initialized, etc.

My first take at this was to use a static initializer but LLVM spewed weird errors (presumedly it also has some static initializers). Then as a placeholder I left a direct call as the first thing in main(), but this is annoying copy pasta that has to be placed in nodeos, unit_test, spec_tests, etc

This commit performs a little linker trick to execute the forking code right before main(). This means all static initializers are done when the fork occurs, the fork occurs before main(), and there is no need to put explicit code inside of main() for every user of libchain.
---
 libraries/chain/CMakeLists.txt                         |  4 ++++
 .../chain/webassembly/eos-vm-oc/compile_monitor.cpp    | 10 +++++++---
 programs/nodeos/main.cpp                               |  3 ---
 unittests/main.cpp                                     |  3 ---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index ec1e3a62b88..a913160bf90 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -112,6 +112,10 @@ target_include_directories( eosio_chain
                                    "${CMAKE_BINARY_DIR}/libraries/wabt"
                             )
 
+if("eos-vm-oc" IN_LIST EOSIO_WASM_RUNTIMES)
+   target_link_libraries(eosio_chain "-Wl,-wrap=main")
+endif()
+
 foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
    string(TOUPPER "${RUNTIME}" RUNTIMEUC)
    string(REPLACE "-" "_" RUNTIMEUC ${RUNTIMEUC})
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
index 77fff54f429..737847f5fb4 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
@@ -275,16 +275,20 @@ struct compile_monitor_trampoline {
       close(socks[1]);
    }
 
-   pid_t compile_manager_pid;
-   int compile_manager_fd;
+   pid_t compile_manager_pid = -1;
+   int compile_manager_fd = -1;
 };
 
 static compile_monitor_trampoline the_compile_monitor_trampoline;
-void start_compile_monitor() {
+extern "C" int __real_main(int, char*[]);
+extern "C" int __wrap_main(int argc, char* argv[]) {
    the_compile_monitor_trampoline.start();
+   return __real_main(argc, argv);
 }
 
 wrapped_fd get_connection_to_compile_monitor(int cache_fd) {
+   FC_ASSERT(the_compile_monitor_trampoline.compile_manager_fd >= 0, "EOS-VM oop connection doesn't look active");
+
    int socks[2]; //0: our socket to compile_manager_session, 1: socket we'll give to compile_maanger_session
    socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, socks);
    wrapped_fd socket_to_monitor_session(socks[0]);
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 1bd360b38c2..5eac9d29bac 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -17,8 +17,6 @@
 using namespace appbase;
 using namespace eosio;
 
-namespace eosio { namespace chain { namespace eosvmoc { void start_compile_monitor(); }}}
-
 namespace detail {
 
 void configure_logging(const bfs::path& config_path)
@@ -82,7 +80,6 @@ enum return_codes {
 
 int main(int argc, char** argv)
 {
-   eosio::chain::eosvmoc::start_compile_monitor();
    try {
       app().set_version(eosio::nodeos::config::version);
 
diff --git a/unittests/main.cpp b/unittests/main.cpp
index 1484cef2f9c..e51899278da 100644
--- a/unittests/main.cpp
+++ b/unittests/main.cpp
@@ -10,15 +10,12 @@
 
 //extern uint32_t EOS_TESTING_GENESIS_TIMESTAMP;
 
-namespace eosio { namespace chain { namespace eosvmoc { void start_compile_monitor(); }}}
-
 void translate_fc_exception(const fc::exception &e) {
    std::cerr << "\033[33m" <<  e.to_detail_string() << "\033[0m" << std::endl;
    BOOST_TEST_FAIL("Caught Unexpected Exception");
 }
 
 boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-   eosio::chain::eosvmoc::start_compile_monitor();
    // Turn off blockchain logging if no --verbose parameter is not added
    // To have verbose enabled, call "tests/chain_test -- --verbose"
    bool is_verbose = false;

From ae9a6f58ae2a9762589de3dab3e6ca5a54708a5e Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 25 Sep 2019 09:20:30 -0400
Subject: [PATCH 1353/1648] fix some strict aliasing violations

---
 .../include/eosio/chain/webassembly/eos-vm-oc.hpp    | 12 ++++++------
 .../eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp  |  4 ++--
 .../eosio/chain/webassembly/eos-vm-oc/executor.hpp   |  2 +-
 libraries/chain/webassembly/eos-vm-oc/executor.cpp   |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
index 7951baf9593..6ffe829f229 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
@@ -61,7 +61,7 @@ inline array_ptr<T> array_ptr_impl (U32 ptr, size_t length)
       EOS_ASSERT(length < INT_MAX/(uint32_t)sizeof(T), wasm_execution_error, "access violation");
    check = p[ptr+length*sizeof(T)-1];
 
-   return array_ptr<T>((T*)((char*)(cb_ptr->full_linear_memory_start) + ptr));
+   return array_ptr<T>((T*)(cb_ptr->full_linear_memory_start + ptr));
 }
 
 /**
@@ -73,7 +73,7 @@ inline null_terminated_ptr null_terminated_ptr_impl(U32 ptr)
    GS_PTR char* p = (GS_PTR char*)ptr;
    do {
       if(*p == '\0')
-         return null_terminated_ptr((char*)(cb_ptr->full_linear_memory_start) + ptr);
+         return null_terminated_ptr(cb_ptr->full_linear_memory_start + ptr);
    } while(p++);
    __builtin_unreachable();
 }
@@ -402,7 +402,7 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, size_t,
       T* base = array_ptr_impl<T>((U32)ptr, length);
       if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
          EOSVMOC_MEMORY_PTR_cb_ptr;
-         std::vector<uint8_t>& copy = cb_ptr->bounce_buffers->emplace_back(length > 0 ? length*sizeof(T) : 1);
+         std::vector<std::byte>& copy = cb_ptr->bounce_buffers->emplace_back(length > 0 ? length*sizeof(T) : 1);
          T* copy_ptr = (T*)&copy[0];
          memcpy( (void*)copy.data(), (void*)base, length * sizeof(T) );
          return Then(static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
@@ -417,7 +417,7 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, size_t,
       T* base = array_ptr_impl<T>((U32)ptr, length);
       if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
          EOSVMOC_MEMORY_PTR_cb_ptr;
-         std::vector<uint8_t>& copy = cb_ptr->bounce_buffers->emplace_back(length > 0 ? length*sizeof(T) : 1);
+         std::vector<std::byte>& copy = cb_ptr->bounce_buffers->emplace_back(length > 0 ? length*sizeof(T) : 1);
          T* copy_ptr = (T*)&copy[0];
          memcpy( (void*)copy.data(), (void*)base, length * sizeof(T) );
          Ret ret = Then(static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
@@ -604,7 +604,7 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<T &, Inputs...>, std:
       char check;
       check = p[(U32)ptr];
       check = p[(U32)(ptr)+sizeof(T)-1u];
-      T &base = *(T*)(((char*)(cb_ptr->full_linear_memory_start))+(U32)ptr);
+      T &base = *(T*)(cb_ptr->full_linear_memory_start+(U32)ptr);
 
       if ( reinterpret_cast<uintptr_t>(&base) % alignof(T) != 0 ) {
          std::remove_const_t<T> copy;
@@ -624,7 +624,7 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<T &, Inputs...>, std:
       char check;
       check = p[(U32)ptr];
       check = p[(U32)(ptr)+sizeof(T)-1u];
-      T &base = *(T*)(((char*)(cb_ptr->full_linear_memory_start))+(U32)ptr);
+      T &base = *(T*)(cb_ptr->full_linear_memory_start+(U32)ptr);
 
       if ( reinterpret_cast<uintptr_t>(&base) % alignof(T) != 0 ) {
          std::remove_const_t<T> copy;
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
index 13f5d52b5f5..e6cbb3bb294 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
@@ -28,9 +28,9 @@ struct control_block {
    unsigned current_call_depth_remaining;
    unsigned bouce_buffer_ptr;  //XX remove me
    int64_t current_linear_memory_pages; //-1 if no memory
-   uintptr_t full_linear_memory_start;
+   char* full_linear_memory_start;
    sigjmp_buf* jmp;
-   std::list<std::vector<uint8_t>>* bounce_buffers;
+   std::list<std::vector<std::byte>>* bounce_buffers;
    uintptr_t running_code_base;
    bool is_running;
 };
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
index b6ff5e37369..e49981ffe7a 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
@@ -32,7 +32,7 @@ class executor {
 
       std::exception_ptr executors_exception_ptr;
       sigjmp_buf executors_sigjmp_buf;
-      std::list<std::vector<uint8_t>> executors_bounce_buffers;
+      std::list<std::vector<std::byte>> executors_bounce_buffers;
 };
 
 }}}
diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index b0c9995aedf..5547935ccd6 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -83,7 +83,7 @@ static int32_t grow_memory(int32_t grow, int32_t max) {
    cb_ptr->current_linear_memory_pages += grow_amount;
 
    if(grow_amount > 0)
-      memset((void*)(cb_ptr->full_linear_memory_start + previous_page_count*64u*1024u), 0, grow_amount*64u*1024u);
+      memset(cb_ptr->full_linear_memory_start + previous_page_count*64u*1024u, 0, grow_amount*64u*1024u);
 
    return (int32_t)previous_page_count;
 }
@@ -197,7 +197,7 @@ void executor::execute(const code_descriptor& code, const memory& mem, apply_con
    cb->current_call_depth_remaining = eosio::chain::wasm_constraints::maximum_call_depth+2;
    cb->bouce_buffer_ptr = 0;
    cb->current_linear_memory_pages = code.starting_memory_pages;
-   cb->full_linear_memory_start = (uintptr_t)mem.full_page_memory_base();
+   cb->full_linear_memory_start = (char*)mem.full_page_memory_base();
    cb->jmp = &executors_sigjmp_buf;
    cb->bounce_buffers = &executors_bounce_buffers;
    cb->running_code_base = (uintptr_t)(code_mapping + code.code_begin);

From 2650181879ce244c5fc82125264901637c025450 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 25 Sep 2019 10:15:11 -0400
Subject: [PATCH 1354/1648] fix controller::extract_chain_id_from_db to not
 fail when state database files do not exist; fixes db_modes_test

---
 libraries/chain/controller.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 9210f49a4fa..c3260878099 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -3186,20 +3186,23 @@ chain_id_type controller::extract_chain_id(snapshot_reader& snapshot) {
 }
 
 fc::optional<chain_id_type> controller::extract_chain_id_from_db( const path& state_dir ) {
-   chainbase::database db( state_dir, chainbase::database::read_only );
-
    try {
+      chainbase::database db( state_dir, chainbase::database::read_only );
+
       db.add_index<database_header_multi_index>();
       db.add_index<global_property_multi_index>();
-   } catch( ... ) {
-      return {};
-   }
 
-   controller_impl::validate_db_version( db );
+      controller_impl::validate_db_version( db );
 
-   if( db.revision() < 1 ) return {};
+      if( db.revision() < 1 ) return {};
+
+      return db.get<global_property_object>().chain_id;
+   } catch( const bad_database_version_exception& ) {
+      throw;
+   } catch( ... ) {
+   }
 
-   return db.get<global_property_object>().chain_id;
+   return {};
 }
 
 /// Protocol feature activation handlers:

From e4f35eef6c854e4dae7d65ae05adf6c434a13771 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 25 Sep 2019 10:15:42 -0400
Subject: [PATCH 1355/1648] add additional check (to be safe) to ensure chain
 ID in state matches the chain ID provided to controller constructor

---
 libraries/chain/controller.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c3260878099..27a6f97ce7c 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -625,6 +625,14 @@ struct controller_impl {
 
       auto header_itr = validate_db_version( db );
 
+      {
+         const auto& state_chain_id = db.get<global_property_object>().chain_id;
+         EOS_ASSERT( state_chain_id == chain_id, chain_id_type_exception,
+                     "chain ID in state (${state_chain_id}) does not match the chain ID that controller was constructed with (${controller_chain_id})",
+                     ("state_chain_id", state_chain_id)("controller_chain_id", chain_id)
+         );
+      }
+
       // upgrade to the latest compatible version
       if (header_itr->version != database_header_object::current_version) {
          db.modify(*header_itr, [](auto& header) {

From 98a821f47190fde020ee8eff75075dfe98ded7fd Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 25 Sep 2019 10:16:10 -0400
Subject: [PATCH 1356/1648] bug fixes from @brianjohnson5972's review

---
 plugins/chain_plugin/chain_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 67371479318..38b57efeb3a 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -845,7 +845,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                EOS_ASSERT( *chain_id == block_log_chain_id,
                            plugin_config_exception,
                            "snapshot chain ID (${snapshot_chain_id}) does not match the chain ID from the genesis state in the block log (${block_log_chain_id})",
-                           ("snapshot_chain_id",  chain_id)
+                           ("snapshot_chain_id",  *chain_id)
                            ("block_log_chain_id", block_log_chain_id)
                );
             } else {
@@ -853,7 +853,7 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
                EOS_ASSERT( *chain_id == block_log_chain_id,
                            plugin_config_exception,
                            "snapshot chain ID (${snapshot_chain_id}) does not match the chain ID (${block_log_chain_id}) in the block log",
-                           ("snapshot_chain_id",  chain_id)
+                           ("snapshot_chain_id",  *chain_id)
                            ("block_log_chain_id", block_log_chain_id)
                );
             }

From 02cf61171773b714cde8ebeeb7969264cb5bac19 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 25 Sep 2019 11:44:36 -0400
Subject: [PATCH 1357/1648] set chain_id properly in the case where genesis
 state is extracted from block log

---
 plugins/chain_plugin/chain_plugin.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 38b57efeb3a..9e6ad976462 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -884,6 +884,8 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
             } else if( block_log_genesis ) {
                ilog( "Starting fresh blockchain state using genesis state extracted from blocks.log." );
                my->genesis = block_log_genesis;
+               // Delay setting chain_id until later so that the code handling genesis-json below can know
+               // that chain_id still only represents a chain ID extracted from the state (assuming it exists).
             }
          }
 
@@ -948,17 +950,22 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          }
 
          if( !chain_id ) {
-            // Uninitialized state database and no genesis state provided
+            if( my->genesis ) {
+               // Uninitialized state database and genesis state extracted from block log
+               chain_id = my->genesis->compute_chain_id();
+            } else {
+               // Uninitialized state database and no genesis state provided
 
-            EOS_ASSERT( !block_log_chain_id, plugin_config_exception,
-                        "Genesis state is necessary to initialize fresh blockchain state but genesis state could not be "
-                        "found in the blocks log. Please either load from snapshot or find a blocks log that starts "
-                        "from genesis."
-            );
+               EOS_ASSERT( !block_log_chain_id, plugin_config_exception,
+                           "Genesis state is necessary to initialize fresh blockchain state but genesis state could not be "
+                           "found in the blocks log. Please either load from snapshot or find a blocks log that starts "
+                           "from genesis."
+               );
 
-            ilog( "Starting fresh blockchain state using default genesis state." );
-            my->genesis.emplace();
-            chain_id = my->genesis->compute_chain_id();
+               ilog( "Starting fresh blockchain state using default genesis state." );
+               my->genesis.emplace();
+               chain_id = my->genesis->compute_chain_id();
+            }
          }
       }
 

From 060e016114b0b1876b172bbc6cdb948a329766f6 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Wed, 25 Sep 2019 13:11:04 -0400
Subject: [PATCH 1358/1648] Address review feedback.

---
 libraries/chain/CMakeLists.txt                             | 2 +-
 libraries/chain/include/eosio/chain/webassembly/common.hpp | 3 ---
 libraries/chain/wasm_interface.cpp                         | 1 -
 libraries/eos-vm                                           | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index ddd7b24654f..6a8bac0c995 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -87,7 +87,7 @@ target_link_libraries( eosio_chain fc chainbase Logging IR WAST WASM Runtime
 target_include_directories( eosio_chain
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"
                                    "${CMAKE_CURRENT_SOURCE_DIR}/../wasm-jit/Include"
-				   "${CMAKE_CURRENT_SOURCE_DIR}/libraries/eos-vm/include"
+                                   "${CMAKE_CURRENT_SOURCE_DIR}/libraries/eos-vm/include"
                                    "${CMAKE_SOURCE_DIR}/libraries/wabt"
                                    "${CMAKE_BINARY_DIR}/libraries/wabt"
                             )
diff --git a/libraries/chain/include/eosio/chain/webassembly/common.hpp b/libraries/chain/include/eosio/chain/webassembly/common.hpp
index 6ec4b9b6a2b..7f441be8649 100644
--- a/libraries/chain/include/eosio/chain/webassembly/common.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/common.hpp
@@ -58,8 +58,6 @@ namespace eosio { namespace chain {
     */
    template<typename T>
    struct array_ptr {
-      using type = T;
-      array_ptr() = default;
       explicit array_ptr (T * value) : value(value) {}
 
       typename std::add_lvalue_reference<T>::type operator*() const {
@@ -81,7 +79,6 @@ namespace eosio { namespace chain {
     * class to represent an in-wasm-memory char array that must be null terminated
     */
    struct null_terminated_ptr {
-      null_terminated_ptr() = default;
       explicit null_terminated_ptr(char* value) : value(value) {}
 
       typename std::add_lvalue_reference<char>::type operator*() const {
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 5abcbbaa41b..69382587f1b 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -1107,7 +1107,6 @@ class action_api : public context_aware_api {
          if( buffer_size == 0 ) return s;
 
          auto copy_size = std::min( static_cast<size_t>(buffer_size), s );
-         const char* d = context.get_action().data.data();
          memcpy( (char*)memory.value, context.get_action().data.data(), copy_size );
 
          return copy_size;
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 78f7aa0bd75..d85ad1704b2 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 78f7aa0bd75909c63f3ebcdc0ec3f012942c8523
+Subproject commit d85ad1704b25b9a9833b65cdd6de5d94fa166de8

From e17a3e0e9060903267667c67b497bd0e1d98d6b2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 25 Sep 2019 13:07:48 -0500
Subject: [PATCH 1359/1648] Remove deprecated network-version-match

---
 plugins/net_plugin/net_plugin.cpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6850e5731e3..153a01126d1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -242,7 +242,6 @@ namespace eosio {
       /// Peer clock may be no more than 1 second skewed from our clock, including network latency.
       const std::chrono::system_clock::duration peer_authentication_interval{std::chrono::seconds{1}};
 
-      bool                                  network_version_match = false;
       chain_id_type                         chain_id;
       fc::sha256                            node_id;
       string                                user_agent_name;
@@ -2558,15 +2557,8 @@ namespace eosio {
          }
          protocol_version = my_impl->to_protocol_version(msg.network_version);
          if( protocol_version != net_version ) {
-            if( my_impl->network_version_match ) {
-               fc_elog( logger, "Peer network version does not match expected ${nv} but got ${mnv}",
-                        ("nv", net_version)("mnv", protocol_version) );
-               enqueue( go_away_message( wrong_version ) );
-               return;
-            } else {
-               fc_ilog( logger, "Local network version: ${nv} Remote version: ${mnv}",
-                        ("nv", net_version)("mnv", protocol_version));
-            }
+            fc_ilog( logger, "Local network version: ${nv} Remote version: ${mnv}",
+                     ("nv", net_version)( "mnv", protocol_version ) );
          }
 
          if( node_id != msg.node_id ) {
@@ -3193,8 +3185,6 @@ namespace eosio {
          ( "max-clients", bpo::value<int>()->default_value(def_max_clients), "Maximum number of clients from which connections are accepted, use 0 for no limit")
          ( "connection-cleanup-period", bpo::value<int>()->default_value(def_conn_retry_wait), "number of seconds to wait before cleaning up dead connections")
          ( "max-cleanup-time-msec", bpo::value<int>()->default_value(10), "max connection cleanup time per cleanup call in millisec")
-         ( "network-version-match", bpo::value<bool>()->default_value(false),
-           "DEPRECATED, needless restriction. True to require exact match of peer network version.")
          ( "net-threads", bpo::value<uint16_t>()->default_value(my->thread_pool_size),
            "Number of worker threads in net_plugin thread pool" )
          ( "sync-fetch-span", bpo::value<uint32_t>()->default_value(def_sync_fetch_span), "number of blocks to retrieve in a chunk from any individual peer during synchronization")
@@ -3222,10 +3212,6 @@ namespace eosio {
       try {
          peer_log_format = options.at( "peer-log-format" ).as<string>();
 
-         my->network_version_match = options.at( "network-version-match" ).as<bool>();
-         if( my->network_version_match )
-            wlog( "network-version-match is DEPRECATED as it is a needless restriction" );
-
          my->sync_master.reset( new sync_manager( options.at( "sync-fetch-span" ).as<uint32_t>()));
 
          my->connector_period = std::chrono::seconds( options.at( "connection-cleanup-period" ).as<int>());

From fcc8525829787319964d14ae2af564b3b2a8f011 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 25 Sep 2019 14:54:31 -0400
Subject: [PATCH 1360/1648] eosio_exit comment and cleanup

---
 libraries/chain/webassembly/eos-vm-oc.cpp           | 1 +
 libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libraries/chain/webassembly/eos-vm-oc.cpp b/libraries/chain/webassembly/eos-vm-oc.cpp
index af1f3eb0099..648d04047fd 100644
--- a/libraries/chain/webassembly/eos-vm-oc.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc.cpp
@@ -48,6 +48,7 @@ std::unique_ptr<wasm_instantiated_module_interface> eosvmoc_runtime::instantiate
    return std::make_unique<eosvmoc_instantiated_module>(code_hash, vm_type, *this);
 }
 
+//never called. EOS-VM OC overrides eosio_exit to its own implementation
 void eosvmoc_runtime::immediately_exit_currently_running_module() {}
 
 }}}}
diff --git a/libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp b/libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp
index 05be2f5b73a..f4e15780412 100644
--- a/libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/intrinsic.cpp
@@ -12,6 +12,7 @@ const intrinsic_map_t& get_intrinsic_map() {
 }
 
 intrinsic::intrinsic(const char* n, const IR::FunctionType* t, void* f, size_t o) {
+   the_intrinsic_map().erase(n);
    the_intrinsic_map().emplace(n, intrinsic_entry{t, f, o});
 }
 

From b1745ab17286fc8a6a1eb608d68120c7c7e777cb Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 25 Sep 2019 14:36:43 -0500
Subject: [PATCH 1361/1648] Downgrade to previous version of peer sends
 go_away_message wrong_version

---
 plugins/net_plugin/net_plugin.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 153a01126d1..16c715fa006 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2100,7 +2100,7 @@ namespace eosio {
 
    // called from any thread
    bool connection::resolve_and_connect() {
-      if( no_retry != go_away_reason::no_reason) {
+      if( no_retry != go_away_reason::no_reason && no_retry != go_away_reason::wrong_version ) {
          fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( no_retry )));
          return false;
       }
@@ -2150,7 +2150,7 @@ namespace eosio {
 
    // called from connection strand
    void connection::connect( const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::results_type endpoints ) {
-      if( no_retry != go_away_reason::no_reason) {
+      if( no_retry != go_away_reason::no_reason && no_retry != go_away_reason::wrong_version ) {
          return;
       }
       connecting = true;
@@ -2617,12 +2617,18 @@ namespace eosio {
 
    void connection::handle_message( const go_away_message& msg ) {
       peer_wlog( this, "received go_away_message, reason = ${r}", ("r", reason_str( msg.reason )) );
+      bool retry = no_retry == no_reason; // if no previous go away message
       no_retry = msg.reason;
       if( msg.reason == duplicate ) {
          node_id = msg.node_id;
       }
+      if( msg.reason == wrong_version ) {
+         if( !retry ) no_retry = fatal_other; // only retry once on wrong version
+      } else {
+         retry = false;
+      }
       flush_queues();
-      close( false );
+      close( retry ); // reconnect if wrong_version
    }
 
    void connection::handle_message( const time_message& msg ) {
@@ -3126,7 +3132,11 @@ namespace eosio {
    // call from connection strand
    void connection::populate_handshake( handshake_message& hello ) {
       namespace sc = std::chrono;
-      hello.network_version = net_version_base + net_version;
+      if( no_retry == wrong_version ) {
+         hello.network_version = net_version_base + proto_explicit_sync; // try previous version
+      } else {
+         hello.network_version = net_version_base + net_version;
+      }
       hello.chain_id = my_impl->chain_id;
       hello.node_id = my_impl->node_id;
       hello.key = my_impl->get_authentication_key();

From 0adf5e7c5660e5033ab6b3a14e34921e0dcb0ab8 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Wed, 25 Sep 2019 16:10:09 -0400
Subject: [PATCH 1362/1648] untabify

---
 .../include/eosio/chain/webassembly/wabt.hpp     | 16 ++++++++--------
 .../include/eosio/chain/webassembly/wavm.hpp     | 16 ++++++++--------
 libraries/chain/wasm_interface.cpp               | 10 +++++-----
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
index 8bf978272f7..c4ae0907ed6 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wabt.hpp
@@ -703,32 +703,32 @@ using void_ret_wrapper_t = typename void_ret_wrapper<T>::type;
 template<typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<Ret (Cls::*)(Params...)> {
    static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
-		  "intrinsics should only return a reference or pointer with single byte alignment");
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<Ret, Ret (Cls::*)(Params...), Cls, Params...>;
 };
 
 template<typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<Ret (Cls::*)(Params...) const> {
    static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
-		  "intrinsics should only return a reference or pointer with single byte alignment");
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<Ret, Ret (Cls::*)(Params...) const, Cls, Params...>;
 };
 
 template<typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<Ret (Cls::*)(Params...) volatile> {
    static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
-		  "intrinsics should only return a reference or pointer with single byte alignment");
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<Ret, Ret (Cls::*)(Params...) volatile, Cls, Params...>;
 };
 
 template<typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<Ret (Cls::*)(Params...) const volatile> {
    static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
-		  "intrinsics should only return a reference or pointer with single byte alignment");
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<Ret, Ret (Cls::*)(Params...) const volatile, Cls, Params...>;
 };
 
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 509977e61be..fa6173730a2 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -700,32 +700,32 @@ struct intrinsic_function_invoker_wrapper;
 template<typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...)> {
    static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
-		  "intrinsics should only return a reference or pointer with single byte alignment");
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...), Cls, Params...>;
 };
 
 template<typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) const> {
    static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
-		  "intrinsics should only return a reference or pointer with single byte alignment");
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) const, Cls, Params...>;
 };
 
 template<typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) volatile> {
    static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
-		  "intrinsics should only return a reference or pointer with single byte alignment");
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) volatile, Cls, Params...>;
 };
 
 template<typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) const volatile> {
    static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-		  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1), 
-		  "intrinsics should only return a reference or pointer with single byte alignment");
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) const volatile, Cls, Params...>;
 };
 
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 69382587f1b..4ee48101a61 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -339,7 +339,7 @@ class softfloat_api : public context_aware_api {
          if ( f32_sign_bit(a) != f32_sign_bit(b) ) {
             return f32_sign_bit(a) ? af : bf;
          }
-	 return ::f32_lt(a,b) ? af : bf;
+         return ::f32_lt(a,b) ? af : bf;
       }
       float _eosio_f32_max( float af, float bf ) {
          float32_t a = to_softfloat32(af);
@@ -353,7 +353,7 @@ class softfloat_api : public context_aware_api {
          if ( f32_sign_bit(a) != f32_sign_bit(b) ) {
             return f32_sign_bit(a) ? bf : af;
          }
-	 return ::f32_lt( a, b ) ? bf : af;
+         return ::f32_lt( a, b ) ? bf : af;
       }
       float _eosio_f32_copysign( float af, float bf ) {
          float32_t a = to_softfloat32(af);
@@ -504,7 +504,7 @@ class softfloat_api : public context_aware_api {
             return bf;
          if (f64_sign_bit(a) != f64_sign_bit(b))
             return f64_sign_bit(a) ? af : bf;
-	 return ::f64_lt( a, b ) ? af : bf;
+         return ::f64_lt( a, b ) ? af : bf;
       }
       double _eosio_f64_max( double af, double bf ) {
          float64_t a = to_softfloat64(af);
@@ -515,7 +515,7 @@ class softfloat_api : public context_aware_api {
             return bf;
          if (f64_sign_bit(a) != f64_sign_bit(b))
             return f64_sign_bit(a) ? bf : af;
-	 return ::f64_lt( a, b ) ? bf : af;
+         return ::f64_lt( a, b ) ? bf : af;
       }
       double _eosio_f64_copysign( double af, double bf ) {
          float64_t a = to_softfloat64(af);
@@ -1003,7 +1003,7 @@ class authorization_api : public context_aware_api {
    }
 
    void require_auth2( account_name account,
-			              permission_name permission) {
+                       permission_name permission) {
       context.require_authorization( account, permission );
    }
 

From 96ce5a586011941a533659f642304f7ddf3288b3 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 25 Sep 2019 16:23:38 -0400
Subject: [PATCH 1363/1648] correct designator order for field of
 get_table_rows_params; fixes unpinned builds on centos

---
 tests/get_table_tests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/get_table_tests.cpp b/tests/get_table_tests.cpp
index 081708059b2..f6d66de136a 100644
--- a/tests/get_table_tests.cpp
+++ b/tests/get_table_tests.cpp
@@ -517,10 +517,10 @@ BOOST_FIXTURE_TEST_CASE( get_table_next_key_test, TESTER ) try {
 
    chain_apis::read_only plugin(*(this->control), fc::microseconds::maximum());
    chain_apis::read_only::get_table_rows_params params{
+      .json=true,
       .code=N(test),
       .scope="test",
-      .limit=1,
-      .json=true
+      .limit=1
    };
 
    params.table = N(numobjs);

From 4d8d2556fb1b6b6d12638c3f38469b5bd6ef8c2c Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 26 Sep 2019 08:31:38 -0500
Subject: [PATCH 1364/1648] Added test for restarted chain with existing state
 but no block log.

---
 unittests/restart_chain_tests.cpp | 59 +++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 unittests/restart_chain_tests.cpp

diff --git a/unittests/restart_chain_tests.cpp b/unittests/restart_chain_tests.cpp
new file mode 100644
index 00000000000..2c0df9eb2a9
--- /dev/null
+++ b/unittests/restart_chain_tests.cpp
@@ -0,0 +1,59 @@
+#include <sstream>
+
+#include <eosio/chain/block_log.hpp>
+#include <eosio/chain/global_property_object.hpp>
+#include <eosio/chain/snapshot.hpp>
+#include <eosio/testing/tester.hpp>
+
+#include <boost/mpl/list.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include <contracts.hpp>
+#include <snapshots.hpp>
+
+using namespace eosio;
+using namespace testing;
+using namespace chain;
+
+void remove_existing_blocks(controller::config& config) {
+   auto block_log_path = config.blocks_dir / "blocks.log";
+   remove(block_log_path);
+   auto block_index_path = config.blocks_dir / "blocks.index";
+   remove(block_index_path);
+}
+
+BOOST_AUTO_TEST_SUITE(restart_chain_tests)
+
+BOOST_AUTO_TEST_CASE(test_existing_state_without_block_log)
+{
+   tester chain;
+
+   chain.create_account(N(snapshot));
+   std::vector<signed_block_ptr> blocks;
+   blocks.push_back(chain.produce_block());
+   blocks.push_back(chain.produce_block());
+   blocks.push_back(chain.produce_block());
+
+   tester other;
+   for (auto new_block : blocks) {
+      other.push_block(new_block);
+   }
+   blocks.clear();
+
+   other.close();
+   auto cfg = other.get_config();
+   remove_existing_blocks(cfg);
+   // restarting chain with no block log and no genesis
+   other.init(cfg);
+
+   blocks.push_back(chain.produce_block());
+   blocks.push_back(chain.produce_block());
+   blocks.push_back(chain.produce_block());
+   chain.control->abort_block();
+
+   for (auto new_block : blocks) {
+      other.push_block(new_block);
+   }
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From 0b853c29bba30c1ea69a1d824e1e3c0f8751dcdc Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 26 Sep 2019 08:32:28 -0500
Subject: [PATCH 1365/1648] Added test to verify chain restarted with truncated
 block log and existing state works.

---
 unittests/snapshot_tests.cpp | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index 3024a6716bb..1d1cf0c430c 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -529,4 +529,51 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_pending_schedule_snapshot, SNAPSHOT_SUITE, sn
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *latest_from_v2_tester.control);
 }
 
+BOOST_AUTO_TEST_CASE_TEMPLATE(test_restart_with_existing_state_and_truncated_block_log, SNAPSHOT_SUITE, snapshot_suites)
+{
+   tester chain;
+   const chainbase::bfs::path parent_path = chain.get_config().blocks_dir.parent_path();
+
+   chain.create_account(N(snapshot));
+   chain.produce_blocks(1);
+   chain.set_code(N(snapshot), contracts::snapshot_test_wasm());
+   chain.set_abi(N(snapshot), contracts::snapshot_test_abi().data());
+   chain.produce_blocks(1);
+   chain.control->abort_block();
+
+   static const int pre_snapshot_block_count = 12;
+
+   for (int itr = 0; itr < pre_snapshot_block_count; itr++) {
+      // increment the contract
+      chain.push_action(N(snapshot), N(increment), N(snapshot), mutable_variant_object()
+                        ( "value", 1 )
+                        );
+
+      // produce block
+      chain.produce_block();
+   }
+
+   chain.control->abort_block();
+
+   // create a new snapshot child
+   auto writer = SNAPSHOT_SUITE::get_writer();
+   chain.control->write_snapshot(writer);
+   auto snapshot = SNAPSHOT_SUITE::finalize(writer);
+
+   // create a new child at this snapshot
+   int ordinal = 1;
+   snapshotted_tester snap_chain(chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++);
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
+
+   snap_chain.close();
+   auto cfg = snap_chain.get_config();
+   // restart chain with truncated block log and existing state, but no genesis state (chain_id)
+   snap_chain.init(cfg);
+
+   auto block = chain.produce_block();
+   chain.control->abort_block();
+   snap_chain.push_block(block);
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 1d9d0c96e523b49af484f564ea6962e9d433dfca Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 26 Sep 2019 11:02:41 -0400
Subject: [PATCH 1366/1648] move wasm_allocator from wasm_interface to
 controller

---
 libraries/chain/controller.cpp                         | 10 ++++++++++
 libraries/chain/include/eosio/chain/apply_context.hpp  |  1 +
 libraries/chain/include/eosio/chain/controller.hpp     |  4 ++++
 libraries/chain/include/eosio/chain/wasm_interface.hpp |  5 -----
 .../include/eosio/chain/wasm_interface_private.hpp     |  7 -------
 libraries/chain/wasm_interface.cpp                     |  7 -------
 libraries/chain/webassembly/eos-vm.cpp                 |  3 +--
 7 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index a6aca78e3e0..17b29a60cd3 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -234,6 +234,9 @@ struct controller_impl {
    uint32_t                       snapshot_head_block = 0;
    named_thread_pool              thread_pool;
    platform_timer                 timer;
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
+   vm::wasm_allocator                 wasm_alloc;
+#endif
 
    typedef pair<scope_name,action_name>                   handler_key;
    map< account_name, map<handler_key, apply_handler> >   apply_handlers;
@@ -257,6 +260,7 @@ struct controller_impl {
       }
 
       head = prev;
+
       db.undo();
 
       protocol_features.popped_blocks_to( prev->block_num );
@@ -3156,6 +3160,12 @@ bool controller::all_subjective_mitigations_disabled()const {
    return my->conf.disable_all_subjective_mitigations;
 }
 
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
+vm::wasm_allocator& controller::get_wasm_allocator() {
+   return my->wasm_alloc;
+}
+#endif
+
 fc::optional<uint64_t> controller::convert_exception_to_error_code( const fc::exception& e ) {
    const chain_exception* e_ptr = dynamic_cast<const chain_exception*>( &e );
 
diff --git a/libraries/chain/include/eosio/chain/apply_context.hpp b/libraries/chain/include/eosio/chain/apply_context.hpp
index 8b1cf7d6844..3a5889248bf 100644
--- a/libraries/chain/include/eosio/chain/apply_context.hpp
+++ b/libraries/chain/include/eosio/chain/apply_context.hpp
@@ -533,6 +533,7 @@ class apply_context {
    /// Misc methods:
    public:
 
+
       int get_action( uint32_t type, uint32_t index, char* buffer, size_t buffer_size )const;
       int get_context_free_data( uint32_t index, char* buffer, size_t buffer_size )const;
       vector<account_name> get_active_producers() const;
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index e4adf700c10..bac965d6aac 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -283,6 +283,10 @@ namespace eosio { namespace chain {
          void add_to_ram_correction( account_name account, uint64_t ram_bytes );
          bool all_subjective_mitigations_disabled()const;
 
+#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
+         vm::wasm_allocator&  get_wasm_allocator();
+#endif
+
          static fc::optional<uint64_t> convert_exception_to_error_code( const fc::exception& e );
 
          signal<void(const signed_block_ptr&)>         pre_accepted_block;
diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index 000c59dab31..b57883ae886 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -90,11 +90,6 @@ namespace eosio { namespace chain {
          //validates code -- does a WASM validation pass and checks the wasm against EOSIO specific constraints
          static void validate(const controller& control, const bytes& code);
 
-#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
-         //get the wasm_allocator used for the linear memory for wasm
-         static vm::wasm_allocator* get_wasm_allocator();
-#endif
-
          //indicate that a particular code probably won't be used after given block_num
          void code_block_num_last_used(const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, const uint32_t& block_num);
 
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index c57b1a05700..1d383090e6a 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -70,13 +70,6 @@ namespace eosio { namespace chain {
                });
       }
 
-#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
-      static eosio::vm::wasm_allocator* get_wasm_allocator() {
-         static eosio::vm::wasm_allocator walloc;
-         return &walloc;
-      }
-#endif
-
       std::vector<uint8_t> parse_initial_memory(const Module& module) {
          std::vector<uint8_t> mem_image;
 
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 69382587f1b..b30138fe6e3 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -34,17 +34,10 @@ namespace eosio { namespace chain {
    using namespace webassembly::common;
 
    wasm_interface::wasm_interface(vm_type vm, const chainbase::database& d) : my( new wasm_interface_impl(vm, d) ) {
-#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
-      (void)get_wasm_allocator();
-#endif
    }
 
    wasm_interface::~wasm_interface() {}
 
-#if defined(EOSIO_EOS_VM_RUNTIME_ENABLED) || defined(EOSIO_EOS_VM_JIT_RUNTIME_ENABLED)
-   eosio::vm::wasm_allocator* wasm_interface::get_wasm_allocator() { return wasm_interface_impl::get_wasm_allocator(); }
-#endif
-
    void wasm_interface::validate(const controller& control, const bytes& code) {
       Module module;
       try {
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index 94fc1f7cd79..ed541209d5b 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -53,8 +53,7 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
          _instantiated_module(std::move(mod)) {}
 
       void apply(apply_context& context) override {
-         auto* alloc = wasm_interface::get_wasm_allocator();
-         _instantiated_module->set_wasm_allocator(alloc);
+         _instantiated_module->set_wasm_allocator(&context.control.get_wasm_allocator());
          _runtime->_bkend = _instantiated_module.get();
          _runtime->_bkend->initialize(&context);
          // clamp WASM memory to maximum_linear_memory/wasm_page_size

From 4f0cd53cb201775a8703bd044181014418410336 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 26 Sep 2019 11:24:58 -0400
Subject: [PATCH 1367/1648] bump to timeout for linux Unit Test steps

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 47305a94743..09d14d0d715 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -182,7 +182,7 @@ for ROUND in $(seq 1 $ROUNDS); do
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
-    timeout: ${TIMEOUT:-15}
+    timeout: ${TIMEOUT:-20}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF

From fc7cca7df9c32c99a510ec650c70e6a6f358bc3c Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 26 Sep 2019 11:30:19 -0400
Subject: [PATCH 1368/1648] bump to timeout for linux Unit Test steps

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 09d14d0d715..59d2781b99f 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -182,7 +182,7 @@ for ROUND in $(seq 1 $ROUNDS); do
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
       queue: "$BUILDKITE_AGENT_QUEUE"
-    timeout: ${TIMEOUT:-20}
+    timeout: ${TIMEOUT:-30}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF

From dd9fb08590fe4aa9bf8f10e191b476aa77a0aae5 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 26 Sep 2019 12:16:07 -0400
Subject: [PATCH 1369/1648] update eos-vm ref

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index d85ad1704b2..32a4f42ca6d 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit d85ad1704b25b9a9833b65cdd6de5d94fa166de8
+Subproject commit 32a4f42ca6dd489b5bab9d2c1e9695ee628603fe

From 9a42d2ad4721cd87e65d8b8b522b2a8a68105268 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 26 Sep 2019 13:37:23 -0500
Subject: [PATCH 1370/1648] Fixed test to explicitly pass in chain_id from
 different sources.

---
 unittests/restart_chain_tests.cpp | 3 ++-
 unittests/snapshot_tests.cpp      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/unittests/restart_chain_tests.cpp b/unittests/restart_chain_tests.cpp
index 2c0df9eb2a9..73cfbbac42f 100644
--- a/unittests/restart_chain_tests.cpp
+++ b/unittests/restart_chain_tests.cpp
@@ -44,7 +44,8 @@ BOOST_AUTO_TEST_CASE(test_existing_state_without_block_log)
    auto cfg = other.get_config();
    remove_existing_blocks(cfg);
    // restarting chain with no block log and no genesis
-   other.init(cfg);
+   auto chain_id = controller::extract_chain_id_from_db( cfg.state_dir );
+   other.open(chain_id);
 
    blocks.push_back(chain.produce_block());
    blocks.push_back(chain.produce_block());
diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index 1d1cf0c430c..c8b5cae6b48 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -568,7 +568,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_restart_with_existing_state_and_truncated_blo
    snap_chain.close();
    auto cfg = snap_chain.get_config();
    // restart chain with truncated block log and existing state, but no genesis state (chain_id)
-   snap_chain.init(cfg);
+   auto chain_id = block_log::extract_chain_id( cfg.blocks_dir );
+   snap_chain.open(chain_id);
 
    auto block = chain.produce_block();
    chain.control->abort_block();

From bf3b19931fe55012715d44b7a44b5bd5e32cebfd Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 26 Sep 2019 13:38:23 -0500
Subject: [PATCH 1371/1648] Added test to verify controller will not proceed
 past database initialization if chain id configured incorrectly.

---
 unittests/restart_chain_tests.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/unittests/restart_chain_tests.cpp b/unittests/restart_chain_tests.cpp
index 73cfbbac42f..37cb6b1a502 100644
--- a/unittests/restart_chain_tests.cpp
+++ b/unittests/restart_chain_tests.cpp
@@ -57,4 +57,28 @@ BOOST_AUTO_TEST_CASE(test_existing_state_without_block_log)
    }
 }
 
+BOOST_AUTO_TEST_CASE(test_restart_with_different_chain_id)
+{
+   tester chain;
+
+   chain.create_account(N(snapshot));
+   std::vector<signed_block_ptr> blocks;
+   blocks.push_back(chain.produce_block());
+   blocks.push_back(chain.produce_block());
+   blocks.push_back(chain.produce_block());
+
+   tester other;
+   for (auto new_block : blocks) {
+      other.push_block(new_block);
+   }
+   blocks.clear();
+
+   other.close();
+   genesis_state genesis;
+   genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.999");
+   genesis.initial_key = eosio::testing::base_tester::get_public_key( config::system_account_name, "active" );
+   fc::optional<chain_id_type> chain_id = genesis.compute_chain_id();
+   BOOST_REQUIRE_EXCEPTION(other.open(chain_id), block_log_exception, fc_exception_message_starts_with("Controller configured with: "));
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From cce3028c6d7ffc4140f725fec6f668d855a9669e Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 26 Sep 2019 14:46:28 -0400
Subject: [PATCH 1372/1648] update eos-vm to latest develop, fix issues with
 instantiation limit and jit allocation scheme

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 32a4f42ca6d..c35303702fc 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 32a4f42ca6dd489b5bab9d2c1e9695ee628603fe
+Subproject commit c35303702fcfadb7104627f34fd64ee3ad039a96

From 0cf08901485363e20b5cd8f6d9c732fb6d0fd718 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 26 Sep 2019 14:33:37 -0500
Subject: [PATCH 1373/1648] PR test improvements.

---
 unittests/restart_chain_tests.cpp |  3 +--
 unittests/snapshot_tests.cpp      | 10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/unittests/restart_chain_tests.cpp b/unittests/restart_chain_tests.cpp
index 37cb6b1a502..ae51f8ee29a 100644
--- a/unittests/restart_chain_tests.cpp
+++ b/unittests/restart_chain_tests.cpp
@@ -44,8 +44,7 @@ BOOST_AUTO_TEST_CASE(test_existing_state_without_block_log)
    auto cfg = other.get_config();
    remove_existing_blocks(cfg);
    // restarting chain with no block log and no genesis
-   auto chain_id = controller::extract_chain_id_from_db( cfg.state_dir );
-   other.open(chain_id);
+   other.open();
 
    blocks.push_back(chain.produce_block());
    blocks.push_back(chain.produce_block());
diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
index c8b5cae6b48..cd1a2c3b2c1 100644
--- a/unittests/snapshot_tests.cpp
+++ b/unittests/snapshot_tests.cpp
@@ -564,14 +564,18 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_restart_with_existing_state_and_truncated_blo
    int ordinal = 1;
    snapshotted_tester snap_chain(chain.get_config(), SNAPSHOT_SUITE::get_reader(snapshot), ordinal++);
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
+   auto block = chain.produce_block();
+   chain.control->abort_block();
+   snap_chain.push_block(block);
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
 
    snap_chain.close();
    auto cfg = snap_chain.get_config();
    // restart chain with truncated block log and existing state, but no genesis state (chain_id)
-   auto chain_id = block_log::extract_chain_id( cfg.blocks_dir );
-   snap_chain.open(chain_id);
+   snap_chain.open();
+   verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);
 
-   auto block = chain.produce_block();
+   block = chain.produce_block();
    chain.control->abort_block();
    snap_chain.push_block(block);
    verify_integrity_hash<SNAPSHOT_SUITE>(*chain.control, *snap_chain.control);

From be81d0b195002302b44dadaa6b31cac4be373f50 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 26 Sep 2019 14:53:39 -0500
Subject: [PATCH 1374/1648] Fixed expected exception.

---
 unittests/restart_chain_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unittests/restart_chain_tests.cpp b/unittests/restart_chain_tests.cpp
index ae51f8ee29a..a8ab4cd5d82 100644
--- a/unittests/restart_chain_tests.cpp
+++ b/unittests/restart_chain_tests.cpp
@@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(test_restart_with_different_chain_id)
    genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.999");
    genesis.initial_key = eosio::testing::base_tester::get_public_key( config::system_account_name, "active" );
    fc::optional<chain_id_type> chain_id = genesis.compute_chain_id();
-   BOOST_REQUIRE_EXCEPTION(other.open(chain_id), block_log_exception, fc_exception_message_starts_with("Controller configured with: "));
+   BOOST_REQUIRE_EXCEPTION(other.open(chain_id), chain_id_type_exception, fc_exception_message_starts_with("chain ID in state "));
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 3b003a1c256a4781633de60749b25a801c20c6aa Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 26 Sep 2019 15:59:32 -0400
Subject: [PATCH 1375/1648] new timeout to handle when two jobs on the same
 host are maxing their CPU usage

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 47305a94743..c1fa3360a15 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -208,7 +208,7 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 5
-    timeout: ${TIMEOUT:-45}
+    timeout: ${TIMEOUT:-60}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 

From f8f5253e4052f26cca3a5749e18fc7049e74dfad Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 26 Sep 2019 15:38:37 -0500
Subject: [PATCH 1376/1648] PR comment fixes.

---
 unittests/restart_chain_tests.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/unittests/restart_chain_tests.cpp b/unittests/restart_chain_tests.cpp
index a8ab4cd5d82..06958d25532 100644
--- a/unittests/restart_chain_tests.cpp
+++ b/unittests/restart_chain_tests.cpp
@@ -28,7 +28,6 @@ BOOST_AUTO_TEST_CASE(test_existing_state_without_block_log)
 {
    tester chain;
 
-   chain.create_account(N(snapshot));
    std::vector<signed_block_ptr> blocks;
    blocks.push_back(chain.produce_block());
    blocks.push_back(chain.produce_block());
@@ -60,7 +59,6 @@ BOOST_AUTO_TEST_CASE(test_restart_with_different_chain_id)
 {
    tester chain;
 
-   chain.create_account(N(snapshot));
    std::vector<signed_block_ptr> blocks;
    blocks.push_back(chain.produce_block());
    blocks.push_back(chain.produce_block());
@@ -74,7 +72,7 @@ BOOST_AUTO_TEST_CASE(test_restart_with_different_chain_id)
 
    other.close();
    genesis_state genesis;
-   genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:00.999");
+   genesis.initial_timestamp = fc::time_point::from_iso_string("2020-01-01T00:00:01.000");
    genesis.initial_key = eosio::testing::base_tester::get_public_key( config::system_account_name, "active" );
    fc::optional<chain_id_type> chain_id = genesis.compute_chain_id();
    BOOST_REQUIRE_EXCEPTION(other.open(chain_id), chain_id_type_exception, fc_exception_message_starts_with("chain ID in state "));

From 579dd5c4fca2231a7be5d4dfd74e0b71b022b6a9 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 26 Sep 2019 16:53:26 -0400
Subject: [PATCH 1377/1648] fix GCC compile of EOS-VM OC and replace some
 constants

When originally testing a proof of concept for EOS-VM OC design, I validated that both Clang and GCC could operate on pointers to the GS segment easily. Unfortunately what I didn't realize was that GCC only can do this when compiling C - not C++ - and my proof of concept had used C. This wasn't detected until I was pretty far along with the implementation.

This commit refactors some things around so EOS-VM OC works with GCC.

Non-hot accesses to GS are funneled through a separate C file. Honestly this makes things pretty clunky because the control block has pointers to C++ classes and such. But, I feel like reducing the amount of inline asm bloat is preferred even if I have to #ifdef stuff around in there.

Hot access to GS (like intrinsic pointer validation) are replaced with in-line asm.

Also a number of magic constants are replaced with better constexpr values.
---
 libraries/chain/CMakeLists.txt                |   1 +
 .../eosio/chain/webassembly/eos-vm-oc.hpp     | 177 ++++++++++++------
 .../chain/webassembly/eos-vm-oc/eos-vm-oc.h   |  38 ++++
 .../chain/webassembly/eos-vm-oc/eos-vm-oc.hpp |  19 +-
 .../webassembly/eos-vm-oc/gs_seg_helpers.h    |  32 ++++
 .../chain/webassembly/eos-vm-oc/memory.hpp    |  20 +-
 .../webassembly/eos-vm-oc/LLVMEmitIR.cpp      |  15 +-
 .../chain/webassembly/eos-vm-oc/executor.cpp  |  47 +----
 .../webassembly/eos-vm-oc/gs_seg_helpers.c    |  46 +++++
 9 files changed, 264 insertions(+), 131 deletions(-)
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h
 create mode 100644 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/gs_seg_helpers.h
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/gs_seg_helpers.c

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index a913160bf90..f4f732b91ca 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -30,6 +30,7 @@ if("eos-vm-oc" IN_LIST EOSIO_WASM_RUNTIMES)
                              webassembly/eos-vm-oc/compile_monitor.cpp
                              webassembly/eos-vm-oc/compile_trampoline.cpp
                              webassembly/eos-vm-oc/ipc_helpers.cpp
+                             webassembly/eos-vm-oc/gs_seg_helpers.c
                              webassembly/eos-vm-oc.cpp)
 
    if(LLVM_VERSION VERSION_LESS 7.1 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
index 6ffe829f229..61a35f2c4f5 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
@@ -50,31 +50,80 @@ class eosvmoc_runtime : public eosio::chain::wasm_runtime_interface {
  * @tparam T
  */
 template<typename T>
-inline array_ptr<T> array_ptr_impl (U32 ptr, size_t length)
+inline array_ptr<T> array_ptr_impl (size_t ptr, size_t length)
 {
-   EOSVMOC_MEMORY_PTR_cb_ptr;
-   volatile GS_PTR char* p = 0;
-   char check;
-   if(length || cb_ptr->current_linear_memory_pages < 0)
-      check = p[ptr];
-   if constexpr(sizeof(T) > 1)
-      EOS_ASSERT(length < INT_MAX/(uint32_t)sizeof(T), wasm_execution_error, "access violation");
-   check = p[ptr+length*sizeof(T)-1];
-
-   return array_ptr<T>((T*)(cb_ptr->full_linear_memory_start + ptr));
+   constexpr int cb_full_linear_memory_start_segment_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(full_linear_memory_start);
+   constexpr int cb_first_invalid_memory_address_segment_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(first_invalid_memory_address);
+
+   static_assert(sizeof(T) == 64 || sizeof(T) == 32 || sizeof(T) == 20 || sizeof(T) == 16 || sizeof(T) == 8 ||
+                 sizeof(T) == 4 || sizeof(T) == 2 || sizeof(T) == 1, "array_ptr sizeof(T) only supports limited values");
+
+   if constexpr(sizeof(T) == 20) {
+      asm("shl $2, %[Length]\n"
+          "lea (%[Length], %[Length], 4), %[Length]\n"
+          : [Length] "+r" (length)
+          :
+          : "cc");
+   }
+   else if constexpr(sizeof(T) > 1)
+      asm("shl %[shiftAmount], %[Length]\n"
+          : [Length] "+r" (length)
+          : [shiftAmount] "i" (sizeof(T) == 64 ? 6 :
+                               sizeof(T) == 32 ? 5 :
+                               sizeof(T) == 16 ? 4 :
+                               sizeof(T) == 8  ? 3 :
+                               sizeof(T) == 4  ? 2 :
+                                                 1)
+          : "cc");
+
+   asm volatile("add %[Ptr], %[Length]\n"
+                "cmp %%gs:%c[firstInvalidMemory], %[Length]\n"
+                "jle 1f\n"
+                "mov %%gs:0x10000000, %[Ptr]\n"
+                "1:\n"
+                "add %%gs:%c[linearMemoryStart], %[Ptr]\n"
+                : [Ptr] "+r" (ptr),
+                  [Length] "+r" (length)
+                : [linearMemoryStart] "i" (cb_full_linear_memory_start_segment_offset),
+                  [firstInvalidMemory] "i" (cb_first_invalid_memory_address_segment_offset)
+                : "cc"
+               );
+
+
+   return array_ptr<T>((T*)ptr);
 }
 
 /**
  * class to represent an in-wasm-memory char array that must be null terminated
  */
-inline null_terminated_ptr null_terminated_ptr_impl(U32 ptr)
+inline null_terminated_ptr null_terminated_ptr_impl(uint64_t ptr)
 {
-   EOSVMOC_MEMORY_PTR_cb_ptr;
-   GS_PTR char* p = (GS_PTR char*)ptr;
-   do {
-      if(*p == '\0')
-         return null_terminated_ptr(cb_ptr->full_linear_memory_start + ptr);
-   } while(p++);
+   constexpr int cb_full_linear_memory_start_segment_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(full_linear_memory_start);
+   constexpr int cb_first_invalid_memory_address_segment_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(first_invalid_memory_address);
+
+   char dumpster;
+   uint64_t scratch;
+
+   asm volatile("mov %%gs:(%[Ptr]), %[Dumpster]\n"                   //probe memory location at ptr to see if valid
+                "mov %%gs:%c[firstInvalidMemory], %[Scratch]\n"      //get first invalid memory address
+                "cmpb $0, %%gs:-1(%[Scratch])\n"                     //is last byte in valid linear memory 0?
+                "jle 2f\n"                                           //if so, this will be a null terminated string one way or another
+                "mov %[Ptr],%[Scratch]\n"
+                "1:\n"                                               //start loop looking for either 0, or until we SEGV
+                "inc %[Scratch]\n"
+                "cmpb   $0,%%gs:(%[Scratch])\n"
+                "jne 1b\n"
+                "2:\n"
+                "add %%gs:%c[linearMemoryStart], %[Ptr]\n"           //add address of linear memory 0 to ptr
+                : [Ptr] "+r" (ptr),
+                  [Dumpster] "=r" (dumpster),
+                  [Scratch] "=r" (scratch)
+                : [linearMemoryStart] "i" (cb_full_linear_memory_start_segment_offset),
+                  [firstInvalidMemory] "i" (cb_first_invalid_memory_address_segment_offset)
+                : "cc"
+               );
+
+   return null_terminated_ptr((char*)ptr);
    __builtin_unreachable();
 }
 
@@ -163,12 +212,14 @@ inline auto convert_native_to_wasm(const fc::time_point_sec& val) {
 }
 
 inline auto convert_native_to_wasm(char* ptr) {
-   EOSVMOC_MEMORY_PTR_cb_ptr;
-   ///XXX this validation isn't as strict
-   U64 delta = (U64)(ptr - cb_ptr->full_linear_memory_start);
-   volatile GS_PTR char* p = 0;
-   char temp;
-   temp = p[delta];
+   constexpr int cb_full_linear_memory_start_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(full_linear_memory_start);
+   char* full_linear_memory_start;
+   asm("mov %%gs:%c[fullLinearMemOffset], %[fullLinearMem]\n"
+      : [fullLinearMem] "=r" (full_linear_memory_start)
+      : [fullLinearMemOffset] "i" (cb_full_linear_memory_start_offset)
+      );
+   U64 delta = (U64)(ptr - full_linear_memory_start);
+   array_ptr_impl<char>(delta, 1);
    return (U32)delta;
 }
 
@@ -307,16 +358,25 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<>, std::tuple<Transla
 
    template<next_method_type Method>
    static native_to_wasm_t<Ret> invoke(Translated... translated) {
-      EOSVMOC_MEMORY_PTR_cb_ptr;
       try {
-         if constexpr(!is_injected)
-            EOS_ASSERT(cb_ptr->current_call_depth_remaining != 1, wasm_execution_error, "Exceeded call depth maximum");
+         if constexpr(!is_injected) {
+            constexpr int cb_current_call_depth_remaining_segment_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(current_call_depth_remaining);
+            constexpr int depth_assertion_intrinsic_offset = OFFSET_OF_FIRST_INTRINSIC - (int)boost::hana::index_if(intrinsic_table, ::boost::hana::equal.to(BOOST_HANA_STRING("eosvmoc_internal.depth_assert"))).value()*8;
+            asm volatile("cmpl   $1,%%gs:%c[callDepthRemainOffset]\n"
+                         "jne    1f\n"
+                         "callq  *%%gs:%c[depthAssertionIntrinsicOffset]\n"
+                         "1:\n"
+                        :
+                        : [callDepthRemainOffset] "i" (cb_current_call_depth_remaining_segment_offset),
+                          [depthAssertionIntrinsicOffset] "i" (depth_assertion_intrinsic_offset)
+                        : "cc");
+         }
          return convert_native_to_wasm(Method(translated...));
       }
       catch(...) {
-         *cb_ptr->eptr = std::current_exception();
+         *reinterpret_cast<std::exception_ptr*>(eos_vm_oc_get_exception_ptr()) = std::current_exception();
       }
-      siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
+      siglongjmp(*eos_vm_oc_get_jmp_buf(), EOSVMOC_EXIT_EXCEPTION);
       __builtin_unreachable();
    }
 
@@ -336,17 +396,26 @@ struct intrinsic_invoker_impl<is_injected, void_type, std::tuple<>, std::tuple<T
 
    template<next_method_type Method>
    static void invoke(Translated... translated) {
-      EOSVMOC_MEMORY_PTR_cb_ptr;
       try {
-         if constexpr(!is_injected)
-            EOS_ASSERT(cb_ptr->current_call_depth_remaining != 1, wasm_execution_error, "Exceeded call depth maximum");
+         if constexpr(!is_injected) {
+            constexpr int cb_current_call_depth_remaining_segment_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(current_call_depth_remaining);
+            constexpr int depth_assertion_intrinsic_offset = OFFSET_OF_FIRST_INTRINSIC - (int)boost::hana::index_if(intrinsic_table, ::boost::hana::equal.to(BOOST_HANA_STRING("eosvmoc_internal.depth_assert"))).value()*8;
+            asm volatile("cmpl   $1,%%gs:%c[callDepthRemainOffset]\n"
+                         "jne    1f\n"
+                         "callq  *%%gs:%c[depthAssertionIntrinsicOffset]\n"
+                         "1:\n"
+                        :
+                        : [callDepthRemainOffset] "i" (cb_current_call_depth_remaining_segment_offset),
+                          [depthAssertionIntrinsicOffset] "i" (depth_assertion_intrinsic_offset)
+                        : "cc");
+         }
          Method(translated...);
          return;
       }
       catch(...) {
-         *cb_ptr->eptr = std::current_exception();
+         *reinterpret_cast<std::exception_ptr*>(eos_vm_oc_get_exception_ptr()) = std::current_exception();
       }
-      siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
+      siglongjmp(*eos_vm_oc_get_jmp_buf(), EOSVMOC_EXIT_EXCEPTION);
       __builtin_unreachable();
    }
 
@@ -401,8 +470,7 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, size_t,
       const auto length = size_t((U32)size);
       T* base = array_ptr_impl<T>((U32)ptr, length);
       if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
-         EOSVMOC_MEMORY_PTR_cb_ptr;
-         std::vector<std::byte>& copy = cb_ptr->bounce_buffers->emplace_back(length > 0 ? length*sizeof(T) : 1);
+         std::vector<std::byte>& copy = reinterpret_cast<std::list<std::vector<std::byte>>*>(eos_vm_oc_get_bounce_buffer_list())->emplace_back(length > 0 ? length*sizeof(T) : 1);
          T* copy_ptr = (T*)&copy[0];
          memcpy( (void*)copy.data(), (void*)base, length * sizeof(T) );
          return Then(static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
@@ -416,8 +484,7 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, size_t,
       const auto length = size_t((U32)size);
       T* base = array_ptr_impl<T>((U32)ptr, length);
       if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
-         EOSVMOC_MEMORY_PTR_cb_ptr;
-         std::vector<std::byte>& copy = cb_ptr->bounce_buffers->emplace_back(length > 0 ? length*sizeof(T) : 1);
+         std::vector<std::byte>& copy = reinterpret_cast<std::list<std::vector<std::byte>>*>(eos_vm_oc_get_bounce_buffer_list())->emplace_back(length > 0 ? length*sizeof(T) : 1);
          T* copy_ptr = (T*)&copy[0];
          memcpy( (void*)copy.data(), (void*)base, length * sizeof(T) );
          Ret ret = Then(static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
@@ -597,14 +664,8 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<T &, Inputs...>, std:
 
    template<then_type Then, typename U=T>
    static auto translate_one(Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<std::is_const<U>::value, Ret> {
-      EOSVMOC_MEMORY_PTR_cb_ptr;
-      // references cannot be created for null pointers
       EOS_ASSERT((U32)ptr != 0, wasm_exception, "references cannot be created for null pointers");
-      volatile GS_PTR char* p = 0;
-      char check;
-      check = p[(U32)ptr];
-      check = p[(U32)(ptr)+sizeof(T)-1u];
-      T &base = *(T*)(cb_ptr->full_linear_memory_start+(U32)ptr);
+      T &base = *array_ptr_impl<T>((uint32_t)ptr, 1);
 
       if ( reinterpret_cast<uintptr_t>(&base) % alignof(T) != 0 ) {
          std::remove_const_t<T> copy;
@@ -617,14 +678,8 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<T &, Inputs...>, std:
 
    template<then_type Then, typename U=T>
    static auto translate_one(Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<!std::is_const<U>::value, Ret> {
-      EOSVMOC_MEMORY_PTR_cb_ptr;
-      // references cannot be created for null pointers
       EOS_ASSERT((U32)ptr != 0, wasm_exception, "reference cannot be created for null pointers");
-      volatile GS_PTR char* p = 0;
-      char check;
-      check = p[(U32)ptr];
-      check = p[(U32)(ptr)+sizeof(T)-1u];
-      T &base = *(T*)(cb_ptr->full_linear_memory_start+(U32)ptr);
+      T &base = *array_ptr_impl<T>((uint32_t)ptr, 1);
 
       if ( reinterpret_cast<uintptr_t>(&base) % alignof(T) != 0 ) {
          std::remove_const_t<T> copy;
@@ -652,8 +707,13 @@ struct intrinsic_function_invoker {
 
    template<MethodSig Method>
    static Ret wrapper(Params... params) {
-      EOSVMOC_MEMORY_PTR_cb_ptr;
-      return (class_from_wasm<Cls>::value(*cb_ptr->ctx).*Method)(params...);
+      constexpr int cb_ctx_ptr_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(ctx);
+      apply_context* ctx;
+      asm("mov %%gs:%c[applyContextOffset], %[cPtr]\n"
+         : [cPtr] "=r" (ctx)
+         : [applyContextOffset] "i" (cb_ctx_ptr_offset)
+         );
+      return (class_from_wasm<Cls>::value(*ctx).*Method)(params...);
    }
 
    template<MethodSig Method>
@@ -671,8 +731,13 @@ struct intrinsic_function_invoker<is_injected, WasmSig, void, MethodSig, Cls, Pa
 
    template<MethodSig Method>
    static void_type wrapper(Params... params) {
-      EOSVMOC_MEMORY_PTR_cb_ptr;
-      (class_from_wasm<Cls>::value(*cb_ptr->ctx).*Method)(params...);
+      constexpr int cb_ctx_ptr_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(ctx);
+      apply_context* ctx;
+      asm("mov %%gs:%c[applyContextOffset], %[cPtr]\n"
+         : [cPtr] "=r" (ctx)
+         : [applyContextOffset] "i" (cb_ctx_ptr_offset)
+         );
+      (class_from_wasm<Cls>::value(*ctx).*Method)(params...);
       return void_type();
    }
 
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h
new file mode 100644
index 00000000000..6c5d4e42676
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <setjmp.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+#include <vector>
+#include <list>
+namespace eosio { namespace chain {class apply_context;}}
+#endif
+
+struct eos_vm_oc_control_block {
+   uint64_t magic;
+   uintptr_t execution_thread_code_start;
+   size_t execution_thread_code_length;
+   uintptr_t execution_thread_memory_start;
+   size_t execution_thread_memory_length;
+#ifdef __cplusplus
+   eosio::chain::apply_context* ctx;
+   std::exception_ptr* eptr;
+#else
+   void* ctx;
+   void* eptr;
+#endif
+   unsigned current_call_depth_remaining;
+   int64_t current_linear_memory_pages; //-1 if no memory
+   char* full_linear_memory_start;
+   sigjmp_buf* jmp;
+#ifdef __cplusplus
+   std::list<std::vector<std::byte>>* bounce_buffers;
+#else
+   void* bounce_buffers;
+#endif
+   uintptr_t running_code_base;
+   int64_t  first_invalid_memory_address;
+   unsigned is_running;
+};
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
index e6cbb3bb294..806677a5761 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <eosio/chain/types.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h>
 
 #include <exception>
 
@@ -17,23 +18,7 @@ class apply_context;
 
 namespace eosvmoc {
 
-struct control_block {
-   uint64_t magic;
-   uintptr_t execution_thread_code_start;
-   size_t execution_thread_code_length;
-   uintptr_t execution_thread_memory_start;
-   size_t execution_thread_memory_length;
-   apply_context* ctx;
-   std::exception_ptr* eptr;
-   unsigned current_call_depth_remaining;
-   unsigned bouce_buffer_ptr;  //XX remove me
-   int64_t current_linear_memory_pages; //-1 if no memory
-   char* full_linear_memory_start;
-   sigjmp_buf* jmp;
-   std::list<std::vector<std::byte>>* bounce_buffers;
-   uintptr_t running_code_base;
-   bool is_running;
-};
+using control_block = eos_vm_oc_control_block;
 
 struct no_offset{};
 struct code_offset{ size_t offset; };    //relative to code_begin
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/gs_seg_helpers.h b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/gs_seg_helpers.h
new file mode 100644
index 00000000000..d2baf938017
--- /dev/null
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/gs_seg_helpers.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <stdint.h>
+#include <setjmp.h>
+#include <string.h>
+
+#include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h>
+
+#ifdef __clang__
+   #define GS_PTR __attribute__((address_space(256)))
+#else
+   #define GS_PTR __seg_gs
+#endif
+
+//This is really rather unfortunate, but on the upside it does allow a static assert to know if
+//the values ever slide which would be a PIC breaking event we'd want to know about at compile
+//time.
+#define EOS_VM_OC_CONTROL_BLOCK_OFFSET (-18944)
+#define EOS_VM_OC_MEMORY_STRIDE (UINT64_C(4329598976))
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t eos_vm_oc_grow_memory(int32_t grow, int32_t max);
+sigjmp_buf* eos_vm_oc_get_jmp_buf();
+void* eos_vm_oc_get_exception_ptr();
+void* eos_vm_oc_get_bounce_buffer_list();
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
index 5b5b1b05986..20689a4abe2 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
@@ -3,16 +3,11 @@
 #include <eosio/chain/wasm_eosio_constraints.hpp>
 #include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp>
 #include <eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/gs_seg_helpers.h>
 
 #include <stdint.h>
 #include <stddef.h>
 
-#ifdef __clang__
-   #define GS_PTR __attribute__((address_space(256)))
-#else
-   #define GS_PTR __seg_gs
-#endif
-
 namespace eosio { namespace chain { namespace eosvmoc {
 
 class memory {
@@ -48,13 +43,13 @@ class memory {
       //   zero_page_memory_base()+stride*n
       static constexpr size_t stride = total_memory_per_slice;
 
-      //offsets to various interesting things in the memory and pointers to them via helper macros
+      //offsets to various interesting things in the memory
       static constexpr uintptr_t linear_memory = 0;
       static constexpr uintptr_t cb_offset = wcb_allowance + mutable_global_size + table_size;
       static constexpr uintptr_t first_intrinsic_offset = cb_offset + 8u;
-#define EOSVMOC_MEMORY_PTR_linear_memory_ptr            GS_PTR uint8_t* const linear_memory_ptr = reinterpret_cast<GS_PTR control_block* const>(memory::linear_memory);
-#define EOSVMOC_MEMORY_PTR_cb_ptr                       GS_PTR control_block* const cb_ptr = reinterpret_cast<GS_PTR control_block* const>(-memory::cb_offset);
-#define EOSVMOC_MEMORY_PTR_first_intrinsic_ptr          GS_PTR uintptr_t* const first_intrinsic_ptr = reinterpret_cast<GS_PTR uintptr_t* const>(-memory::first_intrinsic_offset);
+
+      static_assert(-cb_offset == EOS_VM_OC_CONTROL_BLOCK_OFFSET, "EOS-VM OC control block offset has slid out of place somehow");
+      static_assert(stride == EOS_VM_OC_MEMORY_STRIDE, "EOS-VM OC memory stride has slid out of place somehow");
 
    private:
       uint8_t* mapbase;
@@ -64,4 +59,7 @@ class memory {
       uint8_t* fullpage_base;
 };
 
-}}}
\ No newline at end of file
+}}}
+
+#define OFFSET_OF_CONTROL_BLOCK_MEMBER(M) (-(int)eosio::chain::eosvmoc::memory::cb_offset + (int)offsetof(eosio::chain::eosvmoc::control_block, M))
+#define OFFSET_OF_FIRST_INTRINSIC ((int)-eosio::chain::eosvmoc::memory::first_intrinsic_offset)
\ No newline at end of file
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
index 29098ff2a87..8cd35e7f21a 100644
--- a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
@@ -28,6 +28,7 @@
 #include "llvm/Transforms/Utils.h"
 
 #include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/memory.hpp>
 
 #define ENABLE_LOGGING 0
 #define ENABLE_FUNCTION_ENTER_EXIT_HOOKS 0
@@ -337,7 +338,7 @@ namespace LLVMJIT
 		llvm::Value* emitRuntimeIntrinsic(const char* intrinsicName,const FunctionType* intrinsicType,const std::initializer_list<llvm::Value*>& args)
 		{
 			const eosio::chain::eosvmoc::intrinsic_entry& ie = eosio::chain::eosvmoc::get_intrinsic_map().at(intrinsicName);
-			llvm::Value* ic = irBuilder.CreateLoad( emitLiteralPointer((void*)(-18952-ie.ordinal*8), llvmI64Type->getPointerTo(256)) );  ///XXX literal
+			llvm::Value* ic = irBuilder.CreateLoad( emitLiteralPointer((void*)(OFFSET_OF_FIRST_INTRINSIC-ie.ordinal*8), llvmI64Type->getPointerTo(256)) );
 			llvm::Value* itp = irBuilder.CreateIntToPtr(ic, asLLVMType(ie.type)->getPointerTo());
 			return irBuilder.CreateCall(itp,llvm::ArrayRef<llvm::Value*>(args.begin(),args.end()));
 		}
@@ -674,7 +675,7 @@ namespace LLVMJIT
 			if(imm.functionIndex < moduleContext.importedFunctionOffsets.size())
 			{
 				calleeType = module.types[module.functions.imports[imm.functionIndex].type.index];
-				llvm::Value* ic = irBuilder.CreateLoad( emitLiteralPointer((void*)(-18952-moduleContext.importedFunctionOffsets[imm.functionIndex]*8), llvmI64Type->getPointerTo(256)) );  ///XXX literal
+				llvm::Value* ic = irBuilder.CreateLoad( emitLiteralPointer((void*)(OFFSET_OF_FIRST_INTRINSIC-moduleContext.importedFunctionOffsets[imm.functionIndex]*8), llvmI64Type->getPointerTo(256)) );
 				callee = irBuilder.CreateIntToPtr(ic, asLLVMType(calleeType)->getPointerTo());
 				isExit = module.functions.imports[imm.functionIndex].moduleName == "env" && module.functions.imports[imm.functionIndex].exportName == "eosio_exit";
 			}
@@ -738,7 +739,7 @@ namespace LLVMJIT
 			if(moduleContext.tableOnlyHasDefinedFuncs) {
 				auto functionPointerPointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultTablePointer, functionIndexZExt, emitLiteral((U32)1));
 				auto functionInfo = irBuilder.CreateLoad(functionPointerPointer);  //offset of code
-				llvm::Value* running_code_start = irBuilder.CreateLoad(emitLiteralPointer((void*)(-18848), llvmI64Type->getPointerTo(256)));  ///XXX literal
+				llvm::Value* running_code_start = irBuilder.CreateLoad(emitLiteralPointer((void*)OFFSET_OF_CONTROL_BLOCK_MEMBER(running_code_base), llvmI64Type->getPointerTo(256)));
 				llvm::Value* offset_from_start = irBuilder.CreateAdd(running_code_start, functionInfo);
 				llvm::Value* ptr_cast = irBuilder.CreateIntToPtr(offset_from_start, functionPointerType);
 				auto result = irBuilder.CreateCall(ptr_cast,llvm::ArrayRef<llvm::Value*>(llvmArgs,calleeType->parameters.size()));
@@ -759,14 +760,14 @@ namespace LLVMJIT
 				irBuilder.CreateCondBr(is_intrnsic, is_intrinsic_block, is_code_offset_block, moduleContext.likelyFalseBranchWeights);
 
 				irBuilder.SetInsertPoint(is_intrinsic_block);
-				llvm::Value* intrinsic_start = emitLiteral((I64)(-18952)); ///XXX literal
+				llvm::Value* intrinsic_start = emitLiteral((I64)OFFSET_OF_FIRST_INTRINSIC);
 				llvm::Value* intrinsic_offset = irBuilder.CreateAdd(intrinsic_start, functionInfo);
 				llvm::Value* intrinsic_ptr = irBuilder.CreateLoad(irBuilder.CreateIntToPtr(intrinsic_offset, llvmI64Type->getPointerTo(256)));
 				irBuilder.CreateBr(continuation_block);
 
 				llvmFunction->getBasicBlockList().push_back(is_code_offset_block);
 				irBuilder.SetInsertPoint(is_code_offset_block);
-				llvm::Value* running_code_start = irBuilder.CreateLoad(emitLiteralPointer((void*)(-18848), llvmI64Type->getPointerTo(256)));  ///XXX literal
+				llvm::Value* running_code_start = irBuilder.CreateLoad(emitLiteralPointer((void*)OFFSET_OF_CONTROL_BLOCK_MEMBER(running_code_base), llvmI64Type->getPointerTo(256)));
 				llvm::Value* offset_from_start = irBuilder.CreateAdd(running_code_start, functionInfo);
 				irBuilder.CreateBr(continuation_block);
 
@@ -839,7 +840,7 @@ namespace LLVMJIT
 		}
 		void current_memory(MemoryImm)
 		{
-			auto offset = emitLiteral((I32)-18880); ///XXX literal
+			auto offset = emitLiteral((I32)OFFSET_OF_CONTROL_BLOCK_MEMBER(current_linear_memory_pages));
 			auto bytePointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultMemoryBase, offset);
 			auto ptrTo = irBuilder.CreatePointerCast(bytePointer,llvmI32Type->getPointerTo(256));
 			auto load = irBuilder.CreateLoad(ptrTo);
@@ -1213,7 +1214,7 @@ namespace LLVMJIT
 	{
 		defaultMemoryBase = emitLiteralPointer(0,llvmI8Type->getPointerTo(256));
 
-		depthCounter = emitLiteralPointer((void*)-18888, llvmI32Type->getPointerTo(256)); ///XXX literal
+		depthCounter = emitLiteralPointer((void*)OFFSET_OF_CONTROL_BLOCK_MEMBER(current_call_depth_remaining), llvmI32Type->getPointerTo(256));
 
 		// Create LLVM pointer constants for the module's imported functions.
 		for(Uptr functionIndex = 0;functionIndex < module.functions.imports.size();++functionIndex)
diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index 5547935ccd6..3a6db263dc9 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -3,6 +3,7 @@
 #include <eosio/chain/webassembly/eos-vm-oc/memory.hpp>
 #include <eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp>
 #include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
+#include <eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h>
 #include <eosio/chain/wasm_eosio_constraints.hpp>
 #include <eosio/chain/apply_context.hpp>
 #include <eosio/chain/transaction_context.hpp>
@@ -66,35 +67,14 @@ static void(*chained_handler)(int,siginfo_t*,void*);
    __builtin_unreachable();
 }
 
-static int32_t grow_memory(int32_t grow, int32_t max) {
-   EOSVMOC_MEMORY_PTR_cb_ptr;
-   uint64_t previous_page_count = cb_ptr->current_linear_memory_pages;
-   int32_t grow_amount = grow;
-   uint64_t max_pages = max;
-   if(grow == 0)
-      return (int32_t)cb_ptr->current_linear_memory_pages;
-   if(previous_page_count + grow_amount > max_pages)
-      return (int32_t)-1;
-
-   uint64_t current_gs;
-   arch_prctl(ARCH_GET_GS, &current_gs);
-   current_gs += grow_amount * memory::stride;
-   arch_prctl(ARCH_SET_GS, (unsigned long*)current_gs);
-   cb_ptr->current_linear_memory_pages += grow_amount;
-
-   if(grow_amount > 0)
-      memset(cb_ptr->full_linear_memory_start + previous_page_count*64u*1024u, 0, grow_amount*64u*1024u);
-
-   return (int32_t)previous_page_count;
-}
-static intrinsic grow_memory_intrinsic EOSVMOC_INTRINSIC_INIT_PRIORITY("eosvmoc_internal.grow_memory", IR::FunctionType::get(IR::ResultType::i32,{IR::ValueType::i32,IR::ValueType::i32}), (void*)&grow_memory,
+static intrinsic grow_memory_intrinsic EOSVMOC_INTRINSIC_INIT_PRIORITY("eosvmoc_internal.grow_memory", IR::FunctionType::get(IR::ResultType::i32,{IR::ValueType::i32,IR::ValueType::i32}),
+  (void*)&eos_vm_oc_grow_memory,
   boost::hana::index_if(intrinsic_table, ::boost::hana::equal.to(BOOST_HANA_STRING("eosvmoc_internal.grow_memory"))).value()
 );
 
 //This is effectively overriding the eosio_exit intrinsic in wasm_interface
 static void eosio_exit(int32_t code) {
-   EOSVMOC_MEMORY_PTR_cb_ptr;
-   siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_CLEAN_EXIT);
+   siglongjmp(*eos_vm_oc_get_jmp_buf(), EOSVMOC_EXIT_CLEAN_EXIT);
    __builtin_unreachable();
 }
 static intrinsic eosio_exit_intrinsic("env.eosio_exit", IR::FunctionType::get(IR::ResultType::none,{IR::ValueType::i32}), (void*)&eosio_exit,
@@ -102,9 +82,8 @@ static intrinsic eosio_exit_intrinsic("env.eosio_exit", IR::FunctionType::get(IR
 );
 
 static void throw_internal_exception(const char* const s) {
-   EOSVMOC_MEMORY_PTR_cb_ptr;
-   *cb_ptr->eptr = std::make_exception_ptr(wasm_execution_error(FC_LOG_MESSAGE(error, s)));
-   siglongjmp(*cb_ptr->jmp, EOSVMOC_EXIT_EXCEPTION);
+   *reinterpret_cast<std::exception_ptr*>(eos_vm_oc_get_exception_ptr()) = std::make_exception_ptr(wasm_execution_error(FC_LOG_MESSAGE(error, s)));
+   siglongjmp(*eos_vm_oc_get_jmp_buf(), EOSVMOC_EXIT_EXCEPTION);
    __builtin_unreachable();
 }
 
@@ -136,18 +115,6 @@ DEFINE_EOSVMOC_TRAP_INTRINSIC(eosvmoc_internal,unreachable) {
 }
 
 executor::executor(const code_cache_base& cc) {
-   //XXX
-   static bool once_is_enough;
-   if(!once_is_enough) {
-      printf("current_linear_memory_pages %li\n", -memory::cb_offset + offsetof(eosio::chain::eosvmoc::control_block, current_linear_memory_pages));
-      printf("full_linear_memory_start %li\n", -memory::cb_offset + offsetof(eosio::chain::eosvmoc::control_block, full_linear_memory_start));
-      printf("cb_offset %lu\n", memory::cb_offset);
-      printf("remaining call depth: %li\n", -memory::cb_offset + offsetof(eosio::chain::eosvmoc::control_block, current_call_depth_remaining));
-      printf("first intrinsic: %lu\n", memory::first_intrinsic_offset);
-      printf("current code offset: %li\n", -memory::cb_offset + offsetof(eosio::chain::eosvmoc::control_block, running_code_base));
-      once_is_enough = true;
-   }
-
    //if we're the first executor created, go setup the signal handling. For now we'll just leave this attached forever
    if(std::lock_guard g(inited_signal_mutex); inited_signal == false) {
       struct sigaction sig_action, old_sig_action;
@@ -195,8 +162,8 @@ void executor::execute(const code_descriptor& code, const memory& mem, apply_con
    executors_exception_ptr = nullptr;
    cb->eptr = &executors_exception_ptr;
    cb->current_call_depth_remaining = eosio::chain::wasm_constraints::maximum_call_depth+2;
-   cb->bouce_buffer_ptr = 0;
    cb->current_linear_memory_pages = code.starting_memory_pages;
+   cb->first_invalid_memory_address = code.starting_memory_pages*64*1024;
    cb->full_linear_memory_start = (char*)mem.full_page_memory_base();
    cb->jmp = &executors_sigjmp_buf;
    cb->bounce_buffers = &executors_bounce_buffers;
diff --git a/libraries/chain/webassembly/eos-vm-oc/gs_seg_helpers.c b/libraries/chain/webassembly/eos-vm-oc/gs_seg_helpers.c
new file mode 100644
index 00000000000..db4f1014ec6
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/gs_seg_helpers.c
@@ -0,0 +1,46 @@
+#include <eosio/chain/webassembly/eos-vm-oc/gs_seg_helpers.h>
+
+#include <asm/prctl.h>
+#include <sys/prctl.h>
+
+int arch_prctl(int code, unsigned long* addr);
+
+#define EOSVMOC_MEMORY_PTR_cb_ptr GS_PTR struct eos_vm_oc_control_block* const cb_ptr = ((GS_PTR struct eos_vm_oc_control_block* const)(EOS_VM_OC_CONTROL_BLOCK_OFFSET));
+
+int32_t eos_vm_oc_grow_memory(int32_t grow, int32_t max) {
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   uint64_t previous_page_count = cb_ptr->current_linear_memory_pages;
+   int32_t grow_amount = grow;
+   uint64_t max_pages = max;
+   if(grow == 0)
+      return (int32_t)cb_ptr->current_linear_memory_pages;
+   if(previous_page_count + grow_amount > max_pages)
+      return (int32_t)-1;
+
+   uint64_t current_gs;
+   arch_prctl(ARCH_GET_GS, &current_gs);
+   current_gs += grow_amount * EOS_VM_OC_MEMORY_STRIDE;
+   arch_prctl(ARCH_SET_GS, (unsigned long*)current_gs);
+   cb_ptr->current_linear_memory_pages += grow_amount;
+   cb_ptr->first_invalid_memory_address += grow_amount*64*1024;
+
+   if(grow_amount > 0)
+      memset(cb_ptr->full_linear_memory_start + previous_page_count*64u*1024u, 0, grow_amount*64u*1024u);
+
+   return (int32_t)previous_page_count;
+}
+
+sigjmp_buf* eos_vm_oc_get_jmp_buf() {
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   return cb_ptr->jmp;
+}
+
+void* eos_vm_oc_get_exception_ptr() {
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   return cb_ptr->eptr;
+}
+
+void* eos_vm_oc_get_bounce_buffer_list() {
+   EOSVMOC_MEMORY_PTR_cb_ptr;
+   return cb_ptr->bounce_buffers;
+}
\ No newline at end of file

From 50aa0792bd3c3a681302055fa7e270fbf981ac88 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 26 Sep 2019 16:57:07 -0400
Subject: [PATCH 1378/1648] EOS-VM OC licensing updates

---
 .../chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp     | 14 ++++++++++++++
 libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp  | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
index 8cd35e7f21a..303ac71a1bd 100644
--- a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
@@ -1,3 +1,17 @@
+/*
+Portions of this file are based on WAVM
+
+Copyright (c) 2016, Andrew Scheidecker
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of WAVM nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 #include "LLVMJIT.h"
 #include "llvm/ADT/SmallVector.h"
 #include "IR/Operators.h"
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
index b8516eb237d..b5df4e61f40 100644
--- a/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
@@ -1,3 +1,17 @@
+/*
+Portions of this file are based on WAVM
+
+Copyright (c) 2016, Andrew Scheidecker
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of WAVM nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 #include "LLVMJIT.h"
 
 #include "llvm/ExecutionEngine/ExecutionEngine.h"

From bd910a56a9d596d06ec8e1407ec06364dec8ff92 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 26 Sep 2019 17:42:21 -0400
Subject: [PATCH 1379/1648] resolve possible type punning violation on code
 cache header

---
 .../webassembly/eos-vm-oc/code_cache.cpp      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
index 4f8a22df032..83162e1f78c 100644
--- a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -218,18 +218,18 @@ code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const e
       new ((char*)creation_region.get_address() + header_offset) code_cache_header;
    }
 
-   code_cache_header* cache_header = nullptr;
+   code_cache_header cache_header;
    {
-      char header[total_header_size];
+      char header_buff[total_header_size];
       std::ifstream hs(_cache_file_path.generic_string(), std::ifstream::binary);
-      hs.read(header, sizeof(header));
+      hs.read(header_buff, sizeof(header_buff));
       EOS_ASSERT(!hs.fail(), bad_database_version_exception, "failed to read code cache header");
-
-      cache_header = reinterpret_cast<code_cache_header*>(header+header_offset);
-      EOS_ASSERT(cache_header->id == header_id, bad_database_version_exception, "code cache header magic not as expected");
-      EOS_ASSERT(!cache_header->dirty, database_exception, "code cache is dirty");
+      memcpy((char*)&cache_header, header_buff + header_offset, sizeof(cache_header));
    }
 
+   EOS_ASSERT(cache_header.id == header_id, bad_database_version_exception, "code cache header magic not as expected");
+   EOS_ASSERT(!cache_header.dirty, database_exception, "code cache is dirty");
+
    set_on_disk_region_dirty(true);
 
    auto existing_file_size = bfs::file_size(_cache_file_path);
@@ -252,8 +252,8 @@ code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const e
 
    allocator_t* allocator = reinterpret_cast<allocator_t*>(code_mapping);
 
-   if(cache_header->serialized_descriptor_index) {
-      fc::datastream<const char*> ds(code_mapping + cache_header->serialized_descriptor_index, eosvmoc_config.cache_size - cache_header->serialized_descriptor_index);
+   if(cache_header.serialized_descriptor_index) {
+      fc::datastream<const char*> ds(code_mapping + cache_header.serialized_descriptor_index, eosvmoc_config.cache_size - cache_header.serialized_descriptor_index);
       unsigned number_entries;
       fc::raw::unpack(ds, number_entries);
       for(unsigned i = 0; i < number_entries; ++i) {
@@ -263,7 +263,7 @@ code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const e
             continue;
          _cache_index.push_back(std::move(cd));
       }
-      allocator->deallocate(code_mapping + cache_header->serialized_descriptor_index);
+      allocator->deallocate(code_mapping + cache_header.serialized_descriptor_index);
 
       ilog("EOS-VM Optimized Compiler code cache loaded with ${c} entries; ${f} of ${t} bytes free", ("c", number_entries)("f", allocator->get_free_memory())("t", allocator->get_size()));
    }

From 2684ee38397f5642738069f0dadc3cdf894a1d64 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 26 Sep 2019 20:13:21 -0400
Subject: [PATCH 1380/1648] fix spelling error

---
 .../chain/webassembly/eos-vm-oc/eos-vm-oc.hpp    |  4 ++--
 .../chain/webassembly/eos-vm-oc/ipc_protocol.hpp |  4 ++--
 .../eosio/chain/webassembly/eos-vm-oc/memory.hpp |  2 +-
 .../chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp   | 12 ++++++------
 .../webassembly/eos-vm-oc/compile_monitor.cpp    |  2 +-
 .../webassembly/eos-vm-oc/compile_trampoline.cpp | 16 ++++++++--------
 .../chain/webassembly/eos-vm-oc/executor.cpp     |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
index 806677a5761..6dfffa12804 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
@@ -36,7 +36,7 @@ struct code_descriptor {
    int starting_memory_pages;
    size_t initdata_begin;
    unsigned initdata_size;
-   unsigned initdata_prolouge_size;
+   unsigned initdata_prologue_size;
 };
 
 enum eosvmoc_exitcode : int {
@@ -51,6 +51,6 @@ enum eosvmoc_exitcode : int {
 FC_REFLECT(eosio::chain::eosvmoc::no_offset, );
 FC_REFLECT(eosio::chain::eosvmoc::code_offset, (offset));
 FC_REFLECT(eosio::chain::eosvmoc::intrinsic_ordinal, (ordinal));
-FC_REFLECT(eosio::chain::eosvmoc::code_descriptor, (code_hash)(vm_version)(codegen_version)(code_begin)(start)(apply_offset)(starting_memory_pages)(initdata_begin)(initdata_size)(initdata_prolouge_size));
+FC_REFLECT(eosio::chain::eosvmoc::code_descriptor, (code_hash)(vm_version)(codegen_version)(code_begin)(start)(apply_offset)(starting_memory_pages)(initdata_begin)(initdata_size)(initdata_prologue_size));
 
 #define EOSVMOC_INTRINSIC_INIT_PRIORITY __attribute__((init_priority(198)))
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp
index 65ff33093eb..b38c3bce64b 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_protocol.hpp
@@ -33,7 +33,7 @@ struct code_compilation_result_message {
    eosvmoc_optional_offset_or_import_t start;
    unsigned apply_offset;
    int starting_memory_pages;
-   unsigned initdata_prolouge_size;
+   unsigned initdata_prologue_size;
    //Two sent fds: 1) wasm code, 2) initial memory snapshot
 };
 
@@ -65,7 +65,7 @@ FC_REFLECT(eosio::chain::eosvmoc::initalize_response_message, (error_message))
 FC_REFLECT(eosio::chain::eosvmoc::code_tuple, (code_id)(vm_version))
 FC_REFLECT(eosio::chain::eosvmoc::compile_wasm_message, (code))
 FC_REFLECT(eosio::chain::eosvmoc::evict_wasms_message, (codes))
-FC_REFLECT(eosio::chain::eosvmoc::code_compilation_result_message, (start)(apply_offset)(starting_memory_pages)(initdata_prolouge_size))
+FC_REFLECT(eosio::chain::eosvmoc::code_compilation_result_message, (start)(apply_offset)(starting_memory_pages)(initdata_prologue_size))
 FC_REFLECT(eosio::chain::eosvmoc::compilation_result_unknownfailure, )
 FC_REFLECT(eosio::chain::eosvmoc::compilation_result_toofull, )
 FC_REFLECT(eosio::chain::eosvmoc::wasm_compilation_result_message, (code)(result)(cache_free_bytes))
\ No newline at end of file
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
index 20689a4abe2..4076c0d2b8d 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
@@ -21,7 +21,7 @@ class memory {
 
       //round up the prologue to multiple of 4K page
       static constexpr uint64_t memory_prologue_size = ((memory::wcb_allowance + mutable_global_size + table_size + intrinsic_count*UINT64_C(8))+UINT64_C(4095))/UINT64_C(4096)*UINT64_C(4096);
-      //prolouge + 33MB + 4GB fault buffer + 4096 addtional buffer for safety
+      //prologue + 33MB + 4GB fault buffer + 4096 addtional buffer for safety
       static constexpr uint64_t total_memory_per_slice = memory_prologue_size + wasm_memory_size + UINT64_C(0x100000000) + UINT64_C(4096);
 
       static constexpr uint64_t number_slices = wasm_memory_size/(64u*1024u)+1u;
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
index 303ac71a1bd..49605669754 100644
--- a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
@@ -1237,12 +1237,12 @@ namespace LLVMJIT
 			importedFunctionOffsets.push_back(ie.ordinal);
 		}
 
-		int current_prolouge = -8;
+		int current_prologue = -8;
 
 		for(const GlobalDef& global : module.globals.defs) {
 			if(global.type.isMutable) {
-				globals.push_back(emitLiteralPointer((void*)current_prolouge,asLLVMType(global.type.valueType)->getPointerTo(256)));
-				current_prolouge -= 8;
+				globals.push_back(emitLiteralPointer((void*)current_prologue,asLLVMType(global.type.valueType)->getPointerTo(256)));
+				current_prologue -= 8;
 			}
 			else {
 				switch(global.type.valueType) {
@@ -1256,10 +1256,10 @@ namespace LLVMJIT
 		}
 
 		if(module.tables.size()) {
-			current_prolouge -= 8; //now pointing to LAST element
-			current_prolouge -= 16*(module.tables.defs[0].type.size.min-1); //now pointing to FIRST element
+			current_prologue -= 8; //now pointing to LAST element
+			current_prologue -= 16*(module.tables.defs[0].type.size.min-1); //now pointing to FIRST element
 			auto tableElementType = llvm::StructType::get(context,{llvmI8PtrType, llvmI64Type});
-			defaultTablePointer = emitLiteralPointer((void*)current_prolouge,tableElementType->getPointerTo(256));
+			defaultTablePointer = emitLiteralPointer((void*)current_prologue,tableElementType->getPointerTo(256));
 			defaultTableMaxElementIndex = emitLiteral((U64)module.tables.defs[0].type.size.min);
 
 			for(const TableSegment& table_segment : module.tableSegments)
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
index 737847f5fb4..41c7a731b92 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
@@ -139,7 +139,7 @@ struct compile_monitor_session {
                         result.starting_memory_pages,
                         (uintptr_t)mem_ptr - (uintptr_t)_code_mapping,
                         (unsigned)get_size_of_fd(fds[1]),
-                        result.initdata_prolouge_size
+                        result.initdata_prologue_size
                      },
                      _allocator->get_free_memory()
                   };
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
index 15002d77484..446d83c5822 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
@@ -54,8 +54,8 @@ void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
    if(module.memories.size())
       result_message.starting_memory_pages = module.memories.defs.at(0).type.size.min;
 
-   std::vector<uint8_t> prolouge(memory::cb_offset); //getting the control block offset gets us as large as table+globals as possible
-   std::vector<uint8_t>::iterator prolouge_it = prolouge.end();
+   std::vector<uint8_t> prologue(memory::cb_offset); //getting the control block offset gets us as large as table+globals as possible
+   std::vector<uint8_t>::iterator prologue_it = prologue.end();
 
    //set up mutable globals
    union global_union {
@@ -68,8 +68,8 @@ void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
    for(const GlobalDef& global : module.globals.defs) {
       if(!global.type.isMutable)
          continue;
-      prolouge_it -= 8;
-      global_union* const u = (global_union* const)&*prolouge_it;
+      prologue_it -= 8;
+      global_union* const u = (global_union* const)&*prologue_it;
 
       switch(global.initializer.type) {
          case InitializerExpression::Type::i32_const: u->i32 = global.initializer.i32; break;
@@ -86,10 +86,10 @@ void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
    };
 
    if(module.tables.size())
-      prolouge_it -= sizeof(table_entry) * module.tables.defs[0].type.size.min;
+      prologue_it -= sizeof(table_entry) * module.tables.defs[0].type.size.min;
 
    for(const TableSegment& table_segment : module.tableSegments) {
-      struct table_entry* table_index_0 = (struct table_entry*)&*prolouge_it;
+      struct table_entry* table_index_0 = (struct table_entry*)&*prologue_it;
 
       for(Uptr i = 0; i < table_segment.indices.size(); ++i) {
          const Uptr function_index = table_segment.indices[i];
@@ -121,9 +121,9 @@ void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
       memcpy(initial_mem.data() + base_offset, data_segment.data.data(), data_segment.data.size());
    }
 
-   result_message.initdata_prolouge_size = prolouge.end() - prolouge_it;
+   result_message.initdata_prologue_size = prologue.end() - prologue_it;
    std::vector<uint8_t> initdata_prep;
-   std::move(prolouge_it, prolouge.end(), std::back_inserter(initdata_prep));
+   std::move(prologue_it, prologue.end(), std::back_inserter(initdata_prep));
    std::move(initial_mem.begin(), initial_mem.end(), std::back_inserter(initdata_prep));
 
    std::vector<wrapped_fd> fds_to_send;
diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index 3a6db263dc9..c33a314e5c5 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -150,7 +150,7 @@ void executor::execute(const code_descriptor& code, const memory& mem, apply_con
    }
    else
       arch_prctl(ARCH_SET_GS, (unsigned long*)mem.zero_page_memory_base());
-   memcpy(mem.full_page_memory_base() - code.initdata_prolouge_size, code_mapping + code.initdata_begin, code.initdata_size);
+   memcpy(mem.full_page_memory_base() - code.initdata_prologue_size, code_mapping + code.initdata_begin, code.initdata_size);
 
    control_block* const cb = mem.get_control_block();
    cb->magic = signal_sentinel;

From f087bb2459a2d3cdf8c20da17138244b365ae02b Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 26 Sep 2019 20:15:16 -0400
Subject: [PATCH 1381/1648] fix potential error in null string validator

---
 libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
index 61a35f2c4f5..2940b0c26ff 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
@@ -107,7 +107,7 @@ inline null_terminated_ptr null_terminated_ptr_impl(uint64_t ptr)
    asm volatile("mov %%gs:(%[Ptr]), %[Dumpster]\n"                   //probe memory location at ptr to see if valid
                 "mov %%gs:%c[firstInvalidMemory], %[Scratch]\n"      //get first invalid memory address
                 "cmpb $0, %%gs:-1(%[Scratch])\n"                     //is last byte in valid linear memory 0?
-                "jle 2f\n"                                           //if so, this will be a null terminated string one way or another
+                "je 2f\n"                                            //if so, this will be a null terminated string one way or another
                 "mov %[Ptr],%[Scratch]\n"
                 "1:\n"                                               //start loop looking for either 0, or until we SEGV
                 "inc %[Scratch]\n"
@@ -124,7 +124,6 @@ inline null_terminated_ptr null_terminated_ptr_impl(uint64_t ptr)
                );
 
    return null_terminated_ptr((char*)ptr);
-   __builtin_unreachable();
 }
 
 

From b6cd1e85943bf96802af4e4c3e5c7c7029990d18 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 26 Sep 2019 20:29:54 -0400
Subject: [PATCH 1382/1648] cleanup allocator include and be paranoid about
 size

---
 .../include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp    | 2 +-
 libraries/chain/webassembly/eos-vm-oc/code_cache.cpp            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
index 6f273a2476e..c08fb7eb392 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
@@ -10,7 +10,7 @@
 #include <boost/multi_index/composite_key.hpp>
 #include <boost/multi_index/key_extractors.hpp>
 
-#include <boost/interprocess/segment_manager.hpp> //XXX no we just want the rbtree thing
+#include <boost/interprocess/mem_algo/rbtree_best_fit.hpp>
 #include <boost/asio/local/datagram_protocol.hpp>
 
 
diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
index 83162e1f78c..0cb0b8b407f 100644
--- a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -209,6 +209,7 @@ code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const e
    bfs::create_directories(data_dir);
 
    if(!bfs::exists(_cache_file_path)) {
+      EOS_ASSERT(eosvmoc_config.cache_size >= allocator_t::get_min_size(total_header_size), database_exception, "configured code cache size is too small");
       std::ofstream ofs(_cache_file_path.generic_string(), std::ofstream::trunc);
       EOS_ASSERT(ofs.good(), database_exception, "unable to create EOS-VM Optimized Compiler code cache");
       bfs::resize_file(_cache_file_path, eosvmoc_config.cache_size);

From 93607fab656f14424b094d5303141c74542298b2 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 26 Sep 2019 20:34:23 -0400
Subject: [PATCH 1383/1648] add cstddef include for std:byte, possibly needed
 on some platforms

---
 .../chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
index e49981ffe7a..e5a092cd57e 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/executor.hpp
@@ -7,6 +7,7 @@
 
 #include <list>
 #include <vector>
+#include <cstddef>
 
 namespace eosio { namespace chain {
 

From 4f19ce2b2f17bafecb321b9e3062cfa4b18c85d1 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 26 Sep 2019 22:05:26 -0400
Subject: [PATCH 1384/1648] cleanup to EOS-VM OC support post EOS-VM merge

---
 .../eosio/chain/webassembly/eos-vm-oc.hpp     | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
index 2940b0c26ff..91160347704 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
@@ -31,6 +31,7 @@ class eosvmoc_runtime : public eosio::chain::wasm_runtime_interface {
    public:
       eosvmoc_runtime(const boost::filesystem::path data_dir, const eosvmoc::config& eosvmoc_config, const chainbase::database& db);
       ~eosvmoc_runtime();
+      bool inject_module(IR::Module&) override { return false; }
       std::unique_ptr<wasm_instantiated_module_interface> instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
                                                                              const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) override;
 
@@ -126,6 +127,18 @@ inline null_terminated_ptr null_terminated_ptr_impl(uint64_t ptr)
    return null_terminated_ptr((char*)ptr);
 }
 
+template<typename T>
+struct void_ret_wrapper {
+   using type = T;
+};
+
+template<>
+struct void_ret_wrapper<void> {
+   using type = char;
+};
+
+template<typename T>
+using void_ret_wrapper_t = typename void_ret_wrapper<T>::type;
 
 /**
  * template that maps native types to WASM VM types
@@ -459,9 +472,9 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<Input, Inputs...>, st
  * @tparam Translated - the list of transcribed wasm parameters
  */
 template<bool is_injected, typename T, typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, size_t, Inputs...>, std::tuple<Translated...>> {
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, uint32_t, Inputs...>, std::tuple<Translated...>> {
    using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32, I32>>;
-   using then_type = Ret(*)(array_ptr<T>, size_t, Inputs..., Translated...);
+   using then_type = Ret(*)(array_ptr<T>, uint32_t, Inputs..., Translated...);
 
    template<then_type Then, typename U=T>
    static auto translate_one(Inputs... rest, Translated... translated, I32 ptr, I32 size) -> std::enable_if_t<std::is_const<U>::value, Ret> {
@@ -534,9 +547,9 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<null_terminated_ptr,
  * @tparam Translated - the list of transcribed wasm parameters
  */
 template<bool is_injected, typename T, typename U, typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, array_ptr<U>, size_t, Inputs...>, std::tuple<Translated...>> {
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, array_ptr<U>, uint32_t, Inputs...>, std::tuple<Translated...>> {
    using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32, I32, I32>>;
-   using then_type = Ret(*)(array_ptr<T>, array_ptr<U>, size_t, Inputs..., Translated...);
+   using then_type = Ret(*)(array_ptr<T>, array_ptr<U>, uint32_t, Inputs..., Translated...);
 
    template<then_type Then>
    static Ret translate_one(Inputs... rest, Translated... translated, I32 ptr_t, I32 ptr_u, I32 size) {
@@ -559,9 +572,9 @@ struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<T>, array_p
  * @tparam Translated - the list of transcribed wasm parameters
  */
 template<bool is_injected, typename Ret>
-struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<char>, int, size_t>, std::tuple<>> {
+struct intrinsic_invoker_impl<is_injected, Ret, std::tuple<array_ptr<char>, int, uint32_t>, std::tuple<>> {
    using next_step = intrinsic_invoker_impl<is_injected, Ret, std::tuple<>, std::tuple<I32, I32, I32>>;
-   using then_type = Ret(*)(array_ptr<char>, int, size_t);
+   using then_type = Ret(*)(array_ptr<char>, int, uint32_t);
 
    template<then_type Then>
    static Ret translate_one(I32 ptr, I32 value, I32 size) {
@@ -754,21 +767,33 @@ struct intrinsic_function_invoker_wrapper;
 
 template<bool is_injected, typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<is_injected, WasmSig, Ret (Cls::*)(Params...)> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<is_injected, WasmSig, Ret, Ret (Cls::*)(Params...), Cls, Params...>;
 };
 
 template<bool is_injected, typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<is_injected, WasmSig, Ret (Cls::*)(Params...) const> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<is_injected, WasmSig, Ret, Ret (Cls::*)(Params...) const, Cls, Params...>;
 };
 
 template<bool is_injected, typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<is_injected, WasmSig, Ret (Cls::*)(Params...) volatile> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<is_injected, WasmSig, Ret, Ret (Cls::*)(Params...) volatile, Cls, Params...>;
 };
 
 template<bool is_injected, typename WasmSig, typename Cls, typename Ret, typename... Params>
 struct intrinsic_function_invoker_wrapper<is_injected, WasmSig, Ret (Cls::*)(Params...) const volatile> {
+   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
+                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
+                  "intrinsics should only return a reference or pointer with single byte alignment");
    using type = intrinsic_function_invoker<is_injected, WasmSig, Ret, Ret (Cls::*)(Params...) const volatile, Cls, Params...>;
 };
 

From f4f7979bf335c476187bd5f69cfdaea121f102a1 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 27 Sep 2019 09:01:46 -0400
Subject: [PATCH 1385/1648] do not fall through after calling the chained SEGV
 handler

---
 libraries/chain/webassembly/eos-vm-oc/executor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index c33a314e5c5..041305bdafb 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -30,7 +30,7 @@ static std::mutex inited_signal_mutex;
 static bool inited_signal;
 
 static void(*chained_handler)(int,siginfo_t*,void*);
-[[noreturn]] static void segv_handler(int sig, siginfo_t* info, void* ctx)  {
+static void segv_handler(int sig, siginfo_t* info, void* ctx)  {
    control_block* cb_in_main_segment;
 
    //a 0 GS value is an indicator an executor hasn't been active on this thread recently
@@ -60,8 +60,10 @@ static void(*chained_handler)(int,siginfo_t*,void*);
          siglongjmp(*cb_in_main_segment->jmp, EOSVMOC_EXIT_SEGV);
 
 notus:
-   if(chained_handler)
+   if(chained_handler) {
       chained_handler(sig, info, ctx);
+      return;
+   }
    ::signal(sig, SIG_DFL);
    ::raise(sig);
    __builtin_unreachable();

From fbfbf589c7ef6ce53ce5519df0dd641e4c393759 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 27 Sep 2019 09:18:20 -0400
Subject: [PATCH 1386/1648] clean up signal init to not require an explict
 mutex

---
 .../chain/webassembly/eos-vm-oc/executor.cpp    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index 041305bdafb..0048905fe91 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -14,8 +14,6 @@
 
 #include <boost/hana/equal.hpp>
 
-#include <mutex>
-
 #include <asm/prctl.h>
 #include <sys/prctl.h>
 #include <sys/syscall.h>
@@ -26,9 +24,6 @@ namespace eosio { namespace chain { namespace eosvmoc {
 
 static constexpr auto signal_sentinel = 0x4D56534F45534559ul;
 
-static std::mutex inited_signal_mutex;
-static bool inited_signal;
-
 static void(*chained_handler)(int,siginfo_t*,void*);
 static void segv_handler(int sig, siginfo_t* info, void* ctx)  {
    control_block* cb_in_main_segment;
@@ -116,9 +111,8 @@ DEFINE_EOSVMOC_TRAP_INTRINSIC(eosvmoc_internal,unreachable) {
    throw_internal_exception("Unreachable reached");
 }
 
-executor::executor(const code_cache_base& cc) {
-   //if we're the first executor created, go setup the signal handling. For now we'll just leave this attached forever
-   if(std::lock_guard g(inited_signal_mutex); inited_signal == false) {
+struct executor_signal_init {
+   executor_signal_init() {
       struct sigaction sig_action, old_sig_action;
       sig_action.sa_sigaction = segv_handler;
       sigemptyset(&sig_action.sa_mask);
@@ -128,9 +122,12 @@ executor::executor(const code_cache_base& cc) {
          chained_handler = old_sig_action.sa_sigaction;
       else if(old_sig_action.sa_handler != SIG_IGN && old_sig_action.sa_handler != SIG_DFL)
          chained_handler = (void (*)(int,siginfo_t*,void*))old_sig_action.sa_handler;
-
-      inited_signal = true;
    }
+};
+
+executor::executor(const code_cache_base& cc) {
+   //if we're the first executor created, go setup the signal handling. For now we'll just leave this attached forever
+   static executor_signal_init the_executor_signal_init;
 
    struct stat s;
    fstat(cc.fd(), &s);

From cb0e1fb9a75ba3d3210a2c9089127d37962c0204 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 27 Sep 2019 11:36:12 -0500
Subject: [PATCH 1387/1648] Do not clear trx_in_progress on close since low
 priority app lambda callbacks can still be in progress

---
 plugins/net_plugin/net_plugin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6850e5731e3..48d1a81d97d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -940,7 +940,6 @@ namespace eosio {
       self->connecting = false;
       self->syncing = false;
       self->consecutive_rejected_blocks = 0;
-      self->trx_in_progress_size = 0;
       ++self->consecutive_immediate_connection_close;
       bool has_last_req = false;
       {

From 027d640ce516bddca790068b23015b5eb3fc9ee8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 27 Sep 2019 11:38:47 -0500
Subject: [PATCH 1388/1648] Revert "Do not clear trx_in_progress on close since
 low priority app lambda callbacks can still be in progress"

This reverts commit cb0e1fb9a75ba3d3210a2c9089127d37962c0204.
---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 48d1a81d97d..6850e5731e3 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -940,6 +940,7 @@ namespace eosio {
       self->connecting = false;
       self->syncing = false;
       self->consecutive_rejected_blocks = 0;
+      self->trx_in_progress_size = 0;
       ++self->consecutive_immediate_connection_close;
       bool has_last_req = false;
       {

From c3231b9a1e732dae9a6cfccfdb8196250d5571b0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 27 Sep 2019 11:36:12 -0500
Subject: [PATCH 1389/1648] Do not clear trx_in_progress on close since low
 priority app lambda callbacks can still be in progress

---
 plugins/net_plugin/net_plugin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6850e5731e3..48d1a81d97d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -940,7 +940,6 @@ namespace eosio {
       self->connecting = false;
       self->syncing = false;
       self->consecutive_rejected_blocks = 0;
-      self->trx_in_progress_size = 0;
       ++self->consecutive_immediate_connection_close;
       bool has_last_req = false;
       {

From c079fc625e8c24d0ad0e635e62eeaec66f60fd9d Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 27 Sep 2019 13:40:01 -0400
Subject: [PATCH 1390/1648] reject proposed producer schedules that have a
 block signing authority with a threshold of 0

---
 libraries/chain/wasm_interface.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 550e46980d6..cc467d44ec2 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -214,6 +214,7 @@ class privileged_api : public context_aware_api {
                }
 
                EOS_ASSERT( a.keys.size() == unique_keys.size(), wasm_execution_error, "producer schedule includes a duplicated key for ${account}", ("account", p.producer_name));
+               EOS_ASSERT( a.threshold > 0, wasm_execution_error, "producer schedule includes an authority with a threshold of 0 for ${account}", ("account", p.producer_name));
                EOS_ASSERT( sum_weights >= a.threshold, wasm_execution_error, "producer schedule includes an unsatisfiable authority for ${account}", ("account", p.producer_name));
             });
 

From 2fab7267ba9662f4ce8d56defe699212e6172cbd Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 27 Sep 2019 14:33:54 -0400
Subject: [PATCH 1391/1648] greatly simplify array_ptr_impl asm

Much of the asm didn't need to be asm
---
 .../eosio/chain/webassembly/eos-vm-oc.hpp     | 33 ++++---------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
index 91160347704..000b8cef33c 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc.hpp
@@ -56,37 +56,18 @@ inline array_ptr<T> array_ptr_impl (size_t ptr, size_t length)
    constexpr int cb_full_linear_memory_start_segment_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(full_linear_memory_start);
    constexpr int cb_first_invalid_memory_address_segment_offset = OFFSET_OF_CONTROL_BLOCK_MEMBER(first_invalid_memory_address);
 
-   static_assert(sizeof(T) == 64 || sizeof(T) == 32 || sizeof(T) == 20 || sizeof(T) == 16 || sizeof(T) == 8 ||
-                 sizeof(T) == 4 || sizeof(T) == 2 || sizeof(T) == 1, "array_ptr sizeof(T) only supports limited values");
-
-   if constexpr(sizeof(T) == 20) {
-      asm("shl $2, %[Length]\n"
-          "lea (%[Length], %[Length], 4), %[Length]\n"
-          : [Length] "+r" (length)
-          :
-          : "cc");
-   }
-   else if constexpr(sizeof(T) > 1)
-      asm("shl %[shiftAmount], %[Length]\n"
-          : [Length] "+r" (length)
-          : [shiftAmount] "i" (sizeof(T) == 64 ? 6 :
-                               sizeof(T) == 32 ? 5 :
-                               sizeof(T) == 16 ? 4 :
-                               sizeof(T) == 8  ? 3 :
-                               sizeof(T) == 4  ? 2 :
-                                                 1)
-          : "cc");
-
-   asm volatile("add %[Ptr], %[Length]\n"
-                "cmp %%gs:%c[firstInvalidMemory], %[Length]\n"
+   size_t end = ptr + length*sizeof(T);
+
+   asm volatile("cmp %%gs:%c[firstInvalidMemory], %[End]\n"
                 "jle 1f\n"
-                "mov %%gs:0x10000000, %[Ptr]\n"
+                "mov %%gs:%c[maximumEosioWasmMemory], %[Ptr]\n"      //always invalid address
                 "1:\n"
                 "add %%gs:%c[linearMemoryStart], %[Ptr]\n"
                 : [Ptr] "+r" (ptr),
-                  [Length] "+r" (length)
+                  [End] "+r" (end)
                 : [linearMemoryStart] "i" (cb_full_linear_memory_start_segment_offset),
-                  [firstInvalidMemory] "i" (cb_first_invalid_memory_address_segment_offset)
+                  [firstInvalidMemory] "i" (cb_first_invalid_memory_address_segment_offset),
+                  [maximumEosioWasmMemory] "i" (wasm_constraints::maximum_linear_memory)
                 : "cc"
                );
 

From 61fa3b6d3f188f057e7019a38acdf5692aa5d4c9 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Fri, 27 Sep 2019 16:28:48 -0400
Subject: [PATCH 1392/1648] update eos-vm ref

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index c35303702fc..3abb9ed7669 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit c35303702fcfadb7104627f34fd64ee3ad039a96
+Subproject commit 3abb9ed766910df2d407d02686dfe6c32345e77f

From e74700ddae8311fc9ce2c2dfb6df2a6285e97722 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 27 Sep 2019 19:09:09 -0400
Subject: [PATCH 1393/1648] add some paranoia around GS usage

---
 libraries/chain/webassembly/eos-vm-oc/executor.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index 0048905fe91..3b5781fd4d1 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -18,6 +18,12 @@
 #include <sys/prctl.h>
 #include <sys/syscall.h>
 
+#if defined(__has_feature)
+#if __has_feature(shadow_call_stack)
+#error EOS-VM OC is not compatible with Clang ShadowCallStack
+#endif
+#endif
+
 extern "C" int arch_prctl(int code, unsigned long* addr);
 
 namespace eosio { namespace chain { namespace eosvmoc {
@@ -129,6 +135,10 @@ executor::executor(const code_cache_base& cc) {
    //if we're the first executor created, go setup the signal handling. For now we'll just leave this attached forever
    static executor_signal_init the_executor_signal_init;
 
+   uint64_t current_gs;
+   if(arch_prctl(ARCH_GET_GS, &current_gs) || current_gs)
+      wlog("x86_64 GS register is not set as expected. EOS-VM OC may not run correctly on this platform");
+
    struct stat s;
    fstat(cc.fd(), &s);
    code_mapping = (uint8_t*)mmap(nullptr, s.st_size, PROT_EXEC|PROT_READ, MAP_SHARED, cc.fd(), 0);

From 26ed54d90f4e5436faac7fda0f6a0eabbbccc6e2 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 27 Sep 2019 20:38:16 -0400
Subject: [PATCH 1394/1648] update version to 2.0.0-develop

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c07ce958f1..577ba68e193 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,8 +23,8 @@ set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
-set(VERSION_MAJOR 1)
-set(VERSION_MINOR 9)
+set(VERSION_MAJOR 2)
+set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
 set(VERSION_SUFFIX develop)
 

From df42cfac9241c826093706a877db9cda8f409b29 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sat, 28 Sep 2019 23:51:02 -0400
Subject: [PATCH 1395/1648] clean up error checking throughout the tierup
 processes

---
 .../webassembly/eos-vm-oc/ipc_helpers.hpp     |  28 +++-
 libraries/chain/wasm_interface.cpp            |  13 +-
 .../webassembly/eos-vm-oc/code_cache.cpp      |   8 +-
 .../webassembly/eos-vm-oc/compile_monitor.cpp | 155 ++++++++++--------
 .../eos-vm-oc/compile_trampoline.cpp          |  55 +++----
 .../webassembly/eos-vm-oc/ipc_helpers.cpp     |  76 +++++----
 6 files changed, 190 insertions(+), 145 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp
index 5ee58e998f1..929bc19d66f 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp
@@ -6,6 +6,9 @@
 
 #include <vector>
 
+#include <sys/syscall.h>
+#include <linux/memfd.h>
+
 namespace eosio { namespace chain { namespace eosvmoc {
 
 class wrapped_fd {
@@ -23,9 +26,8 @@ class wrapped_fd {
       }
 
       operator int() const {
-         if(_inuse)
-            return _fd;
-         return -1; ///XXX this should probably assert/throw?
+         FC_ASSERT(_inuse, "trying to get the value of a not-in-use wrappedfd");
+         return _fd;
       }
 
       int release() {
@@ -45,10 +47,22 @@ class wrapped_fd {
 
 std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds(boost::asio::local::datagram_protocol::socket& s);
 std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds(int fd);
-void write_message_with_fds(boost::asio::local::datagram_protocol::socket& s, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds = std::vector<wrapped_fd>());
-void write_message_with_fds(int fd_to_send_to, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds = std::vector<wrapped_fd>());
+bool write_message_with_fds(boost::asio::local::datagram_protocol::socket& s, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds = std::vector<wrapped_fd>());
+bool write_message_with_fds(int fd_to_send_to, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds = std::vector<wrapped_fd>());
+
+template<typename T>
+wrapped_fd memfd_for_bytearray(const T& bytes) {
+   int fd = syscall(SYS_memfd_create, "eosvmoc_code", MFD_CLOEXEC);
+   FC_ASSERT(fd >= 0, "Failed to create memfd");
+   FC_ASSERT(ftruncate(fd, bytes.size()) == 0, "failed to grow memfd");
+   if(bytes.size()) {
+      uint8_t* b = (uint8_t*)mmap(nullptr, bytes.size(), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+      FC_ASSERT(b != MAP_FAILED, "failed to mmap memfd");
+      memcpy(b, bytes.data(), bytes.size());
+      munmap(b, bytes.size());
+   }
+   return wrapped_fd(fd);
+}
 
-wrapped_fd memfd_for_vector(const std::vector<uint8_t>& bytes);
-wrapped_fd memfd_for_blob(const shared_blob& blob);
 std::vector<uint8_t> vector_for_memfd(const wrapped_fd& memfd);
 }}}
\ No newline at end of file
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index d808f516a3a..82006fbcdaf 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -76,7 +76,18 @@ namespace eosio { namespace chain {
    void wasm_interface::apply( const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version, apply_context& context ) {
 #ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
       if(my->eosvmoc) {
-         const chain::eosvmoc::code_descriptor* cd = my->eosvmoc->cc.get_descriptor_for_code(code_hash, vm_version);
+         const chain::eosvmoc::code_descriptor* cd = nullptr;
+         try {
+            cd = my->eosvmoc->cc.get_descriptor_for_code(code_hash, vm_version);
+         }
+         catch(...) {
+            //swallow errors here, if EOS-VM OC has gone in to the weeds we shouldn't bail: continue to try and run baseline
+            //In the future, consider moving bits of EOS-VM that can fire exceptions and such out of this call path
+            static bool once_is_enough;
+            if(!once_is_enough)
+               elog("EOS-VM OC has encountered an unexpected failure");
+            once_is_enough = true;
+         }
          if(cd) {
             my->eosvmoc->exec.execute(*cd, my->eosvmoc->mem, context);
             return;
diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
index 0cb0b8b407f..7a24045b2c0 100644
--- a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -121,8 +121,8 @@ const code_descriptor* const code_cache_async::get_descriptor_for_code(const dig
          if(codeobject) {
             _outstanding_compiles_and_poison.emplace(*nextup, false);
             std::vector<wrapped_fd> fds_to_pass;
-            fds_to_pass.emplace_back(memfd_for_blob(codeobject->code));
-            write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ *nextup }, fds_to_pass);
+            fds_to_pass.emplace_back(memfd_for_bytearray(codeobject->code));
+            FC_ASSERT(write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ *nextup }, fds_to_pass), "EOS-VM failed to communicate to OOP manager");
             --count_processed;
          }
          _queued_compiles.erase(nextup);
@@ -158,7 +158,7 @@ const code_descriptor* const code_cache_async::get_descriptor_for_code(const dig
 
    _outstanding_compiles_and_poison.emplace(ct, false);
    std::vector<wrapped_fd> fds_to_pass;
-   fds_to_pass.emplace_back(memfd_for_blob(codeobject->code));
+   fds_to_pass.emplace_back(memfd_for_bytearray(codeobject->code));
    write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ ct }, fds_to_pass);
    return nullptr;
 }
@@ -185,7 +185,7 @@ const code_descriptor* const code_cache_sync::get_descriptor_for_code_sync(const
       return nullptr;
 
    std::vector<wrapped_fd> fds_to_pass;
-   fds_to_pass.emplace_back(memfd_for_blob(codeobject->code));
+   fds_to_pass.emplace_back(memfd_for_bytearray(codeobject->code));
 
    write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ {code_id, vm_version} }, fds_to_pass);
    auto [success, message, fds] = read_message_with_fds(_compile_monitor_read_socket);
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
index 41c7a731b92..74cd56e1fee 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
@@ -18,14 +18,17 @@ using namespace boost::asio;
 
 static size_t get_size_of_fd(int fd) {
    struct stat st;
-   fstat(fd, &st); //XXX
+   FC_ASSERT(fstat(fd, &st) == 0, "failed to get size of fd");
    return st.st_size;
 }
 
 static void copy_memfd_contents_to_pointer(void* dst, int fd) {
    struct stat st;
-   fstat(fd, &st); //XXX
-   void* contents = mmap(nullptr, st.st_size, PROT_READ, MAP_SHARED, fd, 0); //XXX
+   FC_ASSERT(fstat(fd, &st) == 0, "failed to get size of fd");
+   if(st.st_size == 0)
+      return;
+   void* contents = mmap(nullptr, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+   FC_ASSERT(contents != MAP_FAILED, "failed to map memfd file");
    memcpy(dst, contents, st.st_size);
    munmap(contents, st.st_size);
 }
@@ -37,12 +40,11 @@ struct compile_monitor_session {
       _cache_fd(std::move(c)),
       _trampoline_socket(t) {
 
-      ///XXX we should throw if any problems ctoring
-
       struct stat st;
-      fstat(_cache_fd, &st);
+      FC_ASSERT(fstat(_cache_fd, &st) == 0, "failed to stat cache fd");
       _code_size = st.st_size;
       _code_mapping = (char*)mmap(nullptr, _code_size, PROT_READ|PROT_WRITE, MAP_SHARED, _cache_fd, 0);
+      FC_ASSERT(_code_mapping != MAP_FAILED, "failed to mmap cache file");
       _allocator = reinterpret_cast<allocator_t*>(_code_mapping);
       
       read_message_from_nodeos();
@@ -66,13 +68,17 @@ struct compile_monitor_session {
 
          message.visit(overloaded {
             [&, &fds=fds](const compile_wasm_message& compile) {
-               ///XXX verify there is 1 fd
+               if(fds.size() != 1) {
+                  connection_dead_signal();
+                  return;
+               }
                kick_compile_off(compile.code, std::move(fds[0]));
             },
             [&](const evict_wasms_message& evict) {
-               ///XXX init mem later
-               for(const code_descriptor& cd : evict.codes)
+               for(const code_descriptor& cd : evict.codes) {
                   _allocator->deallocate(_code_mapping + cd.code_begin);
+                  _allocator->deallocate(_code_mapping + cd.initdata_begin);
+               }
             },
             [&](const auto&) {
                //anything else is an error
@@ -96,7 +102,11 @@ struct compile_monitor_session {
       fds_pass_to_trampoline.emplace_back(std::move(wasm_code));
 
       eosvmoc_message trampoline_compile_request = compile_wasm_message{code_id};
-      write_message_with_fds(_trampoline_socket, trampoline_compile_request, fds_pass_to_trampoline);
+      if(write_message_with_fds(_trampoline_socket, trampoline_compile_request, fds_pass_to_trampoline) == false) {
+         wasm_compilation_result_message reply{code_id, compilation_result_unknownfailure{}, _allocator->get_free_memory()};
+         write_message_with_fds(_nodeos_instance_socket, reply);
+         return;
+      }
 
       current_compiles.emplace_front(code_id, std::move(response_socket));
       read_message_from_compile_task(current_compiles.begin());
@@ -108,47 +118,44 @@ struct compile_monitor_session {
          //at this point we only expect 1 of 2 things to happen: we either get a reply (success), or we get no reply (failure)
          auto& [code, socket] = *current_compile_it;
          auto [success, message, fds] = read_message_with_fds(socket);
-         eosvmoc_message reply;
-         if(!success) {
-            reply = wasm_compilation_result_message{code, compilation_result_unknownfailure{}, _allocator->get_free_memory()};
-         }
-         else {
-            //XXX code_compilation_result_message, we should have 2 fds: code & initialmem
-            message.visit(overloaded {
-               [&, &fds=fds, &code=code](const code_compilation_result_message& result) {
-                  ///XXX verify there are 2 fds
-                  void* code_ptr = _allocator->allocate(get_size_of_fd(fds[0]));
-                  void* mem_ptr = _allocator->allocate(get_size_of_fd(fds[1]));
-                  if(code_ptr == nullptr || mem_ptr == nullptr) {
-                     _allocator->deallocate(code_ptr);
-                     _allocator->deallocate(mem_ptr);
-                     reply = wasm_compilation_result_message{code, compilation_result_toofull{}, _allocator->get_free_memory()};
-                     return;
-                  }
-                  ///XXX check if either is NULL and back out
+         
+         wasm_compilation_result_message reply{code, compilation_result_unknownfailure{}, _allocator->get_free_memory()};
+         
+         void* code_ptr = nullptr;
+         void* mem_ptr = nullptr;
+         try {
+            if(success && message.contains<code_compilation_result_message>() && fds.size() == 2) {
+               code_compilation_result_message& result = message.get<code_compilation_result_message>();
+               code_ptr = _allocator->allocate(get_size_of_fd(fds[0]));
+               mem_ptr = _allocator->allocate(get_size_of_fd(fds[1]));
+
+               if(code_ptr == nullptr || mem_ptr == nullptr) {
+                  _allocator->deallocate(code_ptr);
+                  _allocator->deallocate(mem_ptr);
+                  reply.result = compilation_result_toofull();
+               }
+               else {
                   copy_memfd_contents_to_pointer(code_ptr, fds[0]);
                   copy_memfd_contents_to_pointer(mem_ptr, fds[1]);
 
-                  reply = wasm_compilation_result_message{code, code_descriptor {
-                        code.code_id,
-                        code.vm_version,
-                        0,
-                        (uintptr_t)code_ptr - (uintptr_t)_code_mapping,
-                        result.start,
-                        result.apply_offset,
-                        result.starting_memory_pages,
-                        (uintptr_t)mem_ptr - (uintptr_t)_code_mapping,
-                        (unsigned)get_size_of_fd(fds[1]),
-                        result.initdata_prologue_size
-                     },
-                     _allocator->get_free_memory()
+                  reply.result = code_descriptor {
+                     code.code_id,
+                     code.vm_version,
+                     0,
+                     (uintptr_t)code_ptr - (uintptr_t)_code_mapping,
+                     result.start,
+                     result.apply_offset,
+                     result.starting_memory_pages,
+                     (uintptr_t)mem_ptr - (uintptr_t)_code_mapping,
+                     (unsigned)get_size_of_fd(fds[1]),
+                     result.initdata_prologue_size
                   };
-               },
-               [&, &code=code](const auto&) {
-                  //XXX anything else is an error
-                  reply = wasm_compilation_result_message{code, compilation_result_unknownfailure{}, _allocator->get_free_memory()};
                }
-            });
+            }
+         }
+         catch(...) {
+            _allocator->deallocate(code_ptr);
+            _allocator->deallocate(mem_ptr);
          }
 
          write_message_with_fds(_nodeos_instance_socket, reply);
@@ -190,27 +197,31 @@ struct compile_monitor {
             return;
          }
          auto [success, message, fds] = read_message_with_fds(_nodeos_socket);
-         if(!success) {
+         if(!success) {   //failure reading indicates that nodeos has shut down
             ctx.stop();
             return;
          }
-         message.visit(overloaded {
-            [&, &fds=fds](const initialize_message& init) {
-               ///XXX not 2 fds, error
-               local::datagram_protocol::socket _socket_for_comm(ctx);
-               _socket_for_comm.assign(local::datagram_protocol(), fds[0].release());
-               _compile_sessions.emplace_front(ctx, std::move(_socket_for_comm), std::move(fds[1]), _trampoline_socket);
-               _compile_sessions.front().connection_dead_signal.connect([&, it = _compile_sessions.begin()]() {
-                  ctx.post([&]() {
-                     _compile_sessions.erase(it);
-                  });
+         if(!message.contains<initialize_message>() || fds.size() != 2) {
+            ctx.stop();
+            return;
+         }
+         try {
+            local::datagram_protocol::socket _socket_for_comm(ctx);
+            _socket_for_comm.assign(local::datagram_protocol(), fds[0].release());
+            _compile_sessions.emplace_front(ctx, std::move(_socket_for_comm), std::move(fds[1]), _trampoline_socket);
+            _compile_sessions.front().connection_dead_signal.connect([&, it = _compile_sessions.begin()]() {
+               ctx.post([&]() {
+                  _compile_sessions.erase(it);
                });
-               write_message_with_fds(_nodeos_socket, initalize_response_message());
-            },
-            [&](const auto&) {
-               //anything else is an error
-            }
-         });
+            });
+            write_message_with_fds(_nodeos_socket, initalize_response_message());
+         }
+         catch(const fc::exception& e) {
+            write_message_with_fds(_nodeos_socket, initalize_response_message{e.what()});
+         }
+         catch(...) {
+            write_message_with_fds(_nodeos_socket, initalize_response_message{"Failed to create compile process"});
+         }
 
          wait_for_new_incomming_session(ctx);
       });
@@ -267,8 +278,8 @@ struct compile_monitor_trampoline {
       socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, socks);
       compile_manager_fd = socks[0];
 
-      pid_t child = fork();
-      if(child == 0) {
+      compile_manager_pid = fork();
+      if(compile_manager_pid == 0) {
          close(socks[0]);
          launch_compile_monitor(socks[1]);
       }
@@ -287,17 +298,23 @@ extern "C" int __wrap_main(int argc, char* argv[]) {
 }
 
 wrapped_fd get_connection_to_compile_monitor(int cache_fd) {
-   FC_ASSERT(the_compile_monitor_trampoline.compile_manager_fd >= 0, "EOS-VM oop connection doesn't look active");
+   FC_ASSERT(the_compile_monitor_trampoline.compile_manager_pid >= 0, "EOS-VM oop connection doesn't look active");
 
    int socks[2]; //0: our socket to compile_manager_session, 1: socket we'll give to compile_maanger_session
    socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, socks);
    wrapped_fd socket_to_monitor_session(socks[0]);
+   wrapped_fd socket_to_hand_to_monitor_session(socks[1]);
+
+   //we don't own cache_fd, so try to be extra careful not to accidentally close it: don't stick it in a wrapped_fd
+   // to hand off to write_message_with_fds even temporarily. make a copy of it.
+   int dup_of_cache_fd = dup(cache_fd);
+   FC_ASSERT(dup_of_cache_fd != -1, "failed to dup cache_fd");
+   wrapped_fd dup_cache_fd(dup_of_cache_fd);
 
    std::vector<wrapped_fd> fds_to_pass; 
-   fds_to_pass.emplace_back(socks[1]);
-   fds_to_pass.emplace_back(cache_fd);  //put cache_fd in to a wrapped_fd just temporarily, ick
+   fds_to_pass.emplace_back(std::move(socket_to_hand_to_monitor_session));
+   fds_to_pass.emplace_back(std::move(dup_cache_fd));
    write_message_with_fds(the_compile_monitor_trampoline.compile_manager_fd, initialize_message(), fds_to_pass);
-   fds_to_pass[1].release();
 
    auto [success, message, fds] = read_message_with_fds(the_compile_monitor_trampoline.compile_manager_fd);
    EOS_ASSERT(success, misc_exception, "failed to read response from monitor process");
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
index 446d83c5822..f74200a2002 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
@@ -17,7 +17,7 @@ using namespace IR;
 
 namespace eosio { namespace chain { namespace eosvmoc {
 
-void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
+void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {  //noexcept; we'll just blow up if anything tries to cross this boundry
    std::vector<uint8_t> wasm = vector_for_memfd(wasm_code);
 
    //ideally we catch exceptions and sent them upstream as strings for easier reporting
@@ -127,8 +127,8 @@ void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
    std::move(initial_mem.begin(), initial_mem.end(), std::back_inserter(initdata_prep));
 
    std::vector<wrapped_fd> fds_to_send;
-   fds_to_send.emplace_back(memfd_for_vector(code.code));
-   fds_to_send.emplace_back(memfd_for_vector(initdata_prep));
+   fds_to_send.emplace_back(memfd_for_bytearray(code.code));
+   fds_to_send.emplace_back(memfd_for_bytearray(initdata_prep));
    write_message_with_fds(response_sock, result_message, fds_to_send);
 }
 
@@ -151,31 +151,30 @@ void run_compile_trampoline(int fd) {
       if(!success)
          break;
 
-      message.visit(overloaded {
-         [&, &fds=fds](const compile_wasm_message& compile) {
-            ///XXX verify there are 2 fds
-            pid_t pid = fork();
-            if(pid == 0) {
-               prctl(PR_SET_NAME, "oc-compile");
-               prctl(PR_SET_PDEATHSIG, SIGKILL);
-
-               struct rlimit cpu_limits = {20u, 20u};
-               setrlimit(RLIMIT_CPU, &cpu_limits);
-
-               struct rlimit vm_limits = {512u*1024u*1024u, 512u*1024u*1024u};
-               setrlimit(RLIMIT_AS, &vm_limits);
-
-               struct rlimit core_limits = {0u, 0u};
-               setrlimit(RLIMIT_CORE, &core_limits);
-
-               run_compile(std::move(fds[0]), std::move(fds[1]));
-               _exit(0);
-            }
-         },
-         [&](const auto&) {
-            //XXX error
-         }
-      });
+      if(!message.contains<compile_wasm_message>() || fds.size() != 2) {
+         std::cerr << "EOS-VM OC compile trampoline got unexpected message; ignoring" << std::endl;
+         continue;
+      }
+
+      pid_t pid = fork();
+      if(pid == 0) {
+         prctl(PR_SET_NAME, "oc-compile");
+         prctl(PR_SET_PDEATHSIG, SIGKILL);
+
+         struct rlimit cpu_limits = {20u, 20u};
+         setrlimit(RLIMIT_CPU, &cpu_limits);
+
+         struct rlimit vm_limits = {512u*1024u*1024u, 512u*1024u*1024u};
+         setrlimit(RLIMIT_AS, &vm_limits);
+
+         struct rlimit core_limits = {0u, 0u};
+         setrlimit(RLIMIT_CORE, &core_limits);
+
+         run_compile(std::move(fds[0]), std::move(fds[1]));
+         _exit(0);
+      }
+      else if(pid == -1)
+         std::cerr << "EOS-VM OC compile trampoline failed to spawn compile task" << std::endl;
    }
 
    _exit(0);
diff --git a/libraries/chain/webassembly/eos-vm-oc/ipc_helpers.cpp b/libraries/chain/webassembly/eos-vm-oc/ipc_helpers.cpp
index 14d6590f007..cc694240957 100644
--- a/libraries/chain/webassembly/eos-vm-oc/ipc_helpers.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/ipc_helpers.cpp
@@ -1,12 +1,10 @@
 #include <eosio/chain/webassembly/eos-vm-oc/ipc_helpers.hpp>
 #include <eosio/chain/exceptions.hpp>
 
-#include <sys/syscall.h>
-#include <linux/memfd.h>
-
 namespace eosio { namespace chain { namespace eosvmoc {
 
 static constexpr size_t max_message_size = 8192;
+static constexpr size_t max_num_fds = 4;
 
 std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds(boost::asio::local::datagram_protocol::socket& s) {
    return read_message_with_fds(s.native_handle());
@@ -18,12 +16,15 @@ std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds
    struct msghdr msg = {};
    struct cmsghdr* cmsg;
 
+   eosvmoc_message message;
+   std::vector<wrapped_fd> fds;
+
    struct iovec io = {
       .iov_base = buff,
       .iov_len = sizeof(buff)
    };
    union {
-      char buf[CMSG_SPACE(4 * sizeof(int))]; //XXX this code supports a max of 4, so it should probably throw/assert otherwise
+      char buf[CMSG_SPACE(max_num_fds * sizeof(int))];
       struct cmsghdr align;
    } u;
 
@@ -37,16 +38,21 @@ std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds
       red = recvmsg(fd, &msg, 0);
    } while(red == -1 && errno == EINTR);
    if(red < 1 || red >= sizeof(buff))
-      return {false, eosvmoc_message(), std::vector<wrapped_fd>()};
-   fc::datastream<char*> ds(buff, red);
-   eosvmoc_message message;
-   fc::raw::unpack(ds, message);
-
-   std::vector<wrapped_fd> fds;
+      return {false, message, std::move(fds)};
+   
+   try {
+      fc::datastream<char*> ds(buff, red);
+      fc::raw::unpack(ds, message);
+   }
+   catch(...) {
+      return {false, message, std::move(fds)};
+   }
 
    if(msg.msg_controllen) {
       cmsg = CMSG_FIRSTHDR(&msg);
       unsigned num_of_fds = (cmsg->cmsg_len - CMSG_LEN(0))/sizeof(int);
+      if(num_of_fds > max_num_fds)
+         return {false, message, std::move(fds)};
       int* fd_ptr = (int*)CMSG_DATA(cmsg);
       for(unsigned i = 0; i < num_of_fds; ++i)
          fds.push_back(*fd_ptr++);
@@ -55,26 +61,35 @@ std::tuple<bool, eosvmoc_message, std::vector<wrapped_fd>> read_message_with_fds
    return {true, message, std::move(fds)};
 }
 
-void write_message_with_fds(boost::asio::local::datagram_protocol::socket& s, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds) {
-   write_message_with_fds(s.native_handle(), message, fds);
+bool write_message_with_fds(boost::asio::local::datagram_protocol::socket& s, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds) {
+   return write_message_with_fds(s.native_handle(), message, fds);
 }
 
-void write_message_with_fds(int fd_to_send_to, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds) {
+bool write_message_with_fds(int fd_to_send_to, const eosvmoc_message& message, const std::vector<wrapped_fd>& fds) {
    struct msghdr msg = {};
    struct cmsghdr* cmsg;
 
    size_t sz = fc::raw::pack_size(message);
-   EOS_ASSERT(sz < max_message_size, misc_exception, "trying to send too large of message");
-   char buff[sz];
-   fc::datastream<char*> ds(buff, sz);
-   fc::raw::pack(ds, message);
+   if(sz > max_message_size)
+      return false;
+   char buff[max_message_size];
+   try {
+      fc::datastream<char*> ds(buff, max_message_size);
+      fc::raw::pack(ds, message);
+   }
+   catch(...) {
+      return false;
+   }
+
+   if(fds.size() > max_num_fds)
+      return false;
 
    struct iovec io = {
       .iov_base = buff,
       .iov_len = sz
    };
    union {
-      char buf[CMSG_SPACE(4 * sizeof(int))]; //XXX this code supports a max of 4, so it should probably throw/assert otherwise
+      char buf[CMSG_SPACE(max_num_fds * sizeof(int))];
       struct cmsghdr align;
    } u;
 
@@ -99,30 +114,19 @@ void write_message_with_fds(int fd_to_send_to, const eosvmoc_message& message, c
    do {
       wrote = sendmsg(fd_to_send_to, &msg, 0);
    } while(wrote == -1 && errno == EINTR);
-}
 
-wrapped_fd memfd_for_vector(const std::vector<uint8_t>& bytes) {
-   int fd = syscall(SYS_memfd_create, "eosvmoc_code", MFD_CLOEXEC);
-   ftruncate(fd, bytes.size());
-   uint8_t* b = (uint8_t*)mmap(nullptr, bytes.size(), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
-   memcpy(b, bytes.data(), bytes.size());
-   munmap(b, bytes.size());
-   return wrapped_fd(fd);
-}
-
-wrapped_fd memfd_for_blob(const shared_blob& blob) {
-   int fd = syscall(SYS_memfd_create, "eosvmoc_code", MFD_CLOEXEC);
-   ftruncate(fd, blob.size());
-   uint8_t* b = (uint8_t*)mmap(nullptr, blob.size(), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
-   memcpy(b, blob.data(), blob.size());
-   munmap(b, blob.size());
-   return wrapped_fd(fd);
+   return wrote >= 0;
 }
 
 std::vector<uint8_t> vector_for_memfd(const wrapped_fd& memfd) {
    struct stat st;
-   fstat(memfd, &st);
+   FC_ASSERT(fstat(memfd, &st) == 0, "failed to get memfd size");
+
+   if(st.st_size == 0)
+      return std::vector<uint8_t>();
+
    uint8_t* p = (uint8_t*)mmap(nullptr, st.st_size, PROT_READ|PROT_WRITE, MAP_SHARED, memfd, 0);
+   FC_ASSERT(p != MAP_FAILED, "failed to map memfd");
    std::vector<uint8_t> ret(p, p+st.st_size);
    munmap(p, st.st_size);
    return ret;

From 94516fda4acff3095d2d84ed30230f50dad934c9 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sat, 28 Sep 2019 23:52:53 -0400
Subject: [PATCH 1396/1648] executor needs to check its inital map of code

---
 libraries/chain/webassembly/eos-vm-oc/executor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index 3b5781fd4d1..53685f6ea9a 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -140,8 +140,9 @@ executor::executor(const code_cache_base& cc) {
       wlog("x86_64 GS register is not set as expected. EOS-VM OC may not run correctly on this platform");
 
    struct stat s;
-   fstat(cc.fd(), &s);
+   FC_ASSERT(fstat(cc.fd(), &s) == 0, "executor failed to get code cache size");
    code_mapping = (uint8_t*)mmap(nullptr, s.st_size, PROT_EXEC|PROT_READ, MAP_SHARED, cc.fd(), 0);
+   FC_ASSERT(code_mapping != MAP_FAILED, "failed to map code cache in to executor");
    code_mapping_size = s.st_size;
    mapping_is_executable = true;
 }

From b5b655a9f2b3d9bf26475b01e7cf385e69ff49fb Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sat, 28 Sep 2019 23:53:58 -0400
Subject: [PATCH 1397/1648] be more explict about testing the alignment of
 code/data segments

---
 .../include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp    | 2 +-
 libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
index c08fb7eb392..d05977652fe 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
@@ -32,7 +32,7 @@ using namespace boost::asio;
 namespace bip = boost::interprocess;
 namespace bfs = boost::filesystem;
 
-using allocator_t = bip::rbtree_best_fit<bip::null_mutex_family, bip::offset_ptr<void>, 16>;
+using allocator_t = bip::rbtree_best_fit<bip::null_mutex_family, bip::offset_ptr<void>, alignof(std::max_align_t)>;
 
 struct config;
 
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
index b5df4e61f40..ec365479383 100644
--- a/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
@@ -148,7 +148,7 @@ namespace LLVMJIT
 		std::list<std::vector<uint8_t>> stack_sizes;
 
 		U8* get_next_code_ptr(uintptr_t numBytes, U32 alignment) {
-			//XXX we should probably assert if alignment is > 16 or std align because the std::vector is aligned that way
+			FC_ASSERT(alignment <= alignof(std::max_align_t), "alignment of section exceeds max_align_t");
 			uintptr_t p = (uintptr_t)ptr;
 			p += alignment - 1LL;
 			p &= ~(alignment - 1LL);

From d7ef3b3a0b191c8814da2a05e4daed8aabf88c31 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 29 Sep 2019 00:05:46 -0400
Subject: [PATCH 1398/1648] make sure EOS-VM OC is given at least 1 thread

---
 libraries/chain/webassembly/eos-vm-oc/code_cache.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
index 7a24045b2c0..837426c9a36 100644
--- a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -44,6 +44,8 @@ code_cache_async::code_cache_async(const bfs::path data_dir, const eosvmoc::conf
    _result_queue(eosvmoc_config.threads * 2),
    _threads(eosvmoc_config.threads)
 {
+   FC_ASSERT(_threads, "EOS-VM OC requires at least 1 compile thread");
+
    wait_on_compile_monitor_message();
 
    _monitor_reply_thread = std::thread([this]() {

From 65a2ff50ed3ba7163c12a69bc7ebbcf9df9378dc Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 29 Sep 2019 17:29:13 -0400
Subject: [PATCH 1399/1648] don't leak memfd if memory fails to be ctored

---
 libraries/chain/webassembly/eos-vm-oc/memory.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/memory.cpp b/libraries/chain/webassembly/eos-vm-oc/memory.cpp
index 92831d5184a..6bf56f01d06 100644
--- a/libraries/chain/webassembly/eos-vm-oc/memory.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/memory.cpp
@@ -1,6 +1,8 @@
 #include <eosio/chain/webassembly/eos-vm-oc/memory.hpp>
 #include <eosio/chain/webassembly/eos-vm-oc/intrinsic.hpp>
 
+#include <fc/scoped_exit.hpp>
+
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <sys/mman.h>
@@ -11,6 +13,7 @@ namespace eosio { namespace chain { namespace eosvmoc {
 memory::memory() {
    int fd = syscall(SYS_memfd_create, "eosvmoc_mem", MFD_CLOEXEC);
    FC_ASSERT(fd >= 0, "Failed to create memory memfd");
+   auto cleanup_fd = fc::make_scoped_exit([&fd](){close(fd);});
    int ret = ftruncate(fd, wasm_memory_size+memory_prologue_size);
    FC_ASSERT(!ret, "Failed to grow memory memfd");
 
@@ -30,8 +33,6 @@ memory::memory() {
    zeropage_base = mapbase + memory_prologue_size;
    fullpage_base = last + memory_prologue_size;
 
-   close(fd);
-
    //layout the intrinsic jump table
    uintptr_t* const intrinsic_jump_table = reinterpret_cast<uintptr_t* const>(zeropage_base - first_intrinsic_offset);
    const intrinsic_map_t& intrinsics = get_intrinsic_map();

From d871028f81ab107dd8cb9377d2fad8adec446214 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 29 Sep 2019 18:03:58 -0400
Subject: [PATCH 1400/1648] coalesce executor's per-action cleanup lambda

---
 libraries/chain/webassembly/eos-vm-oc/executor.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index 53685f6ea9a..03562cbde05 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -187,9 +187,11 @@ void executor::execute(const code_descriptor& code, const memory& mem, apply_con
    }, this);
    context.trx_context.checktime(); //catch any expiration that might have occurred before setting up callback
 
-   auto reset_is_running = fc::make_scoped_exit([cb](){cb->is_running = false;});
-   auto reset_bounce_buffers = fc::make_scoped_exit([cb](){cb->bounce_buffers->clear();});
-   auto reset_expiry_cb = fc::make_scoped_exit([&tt=context.trx_context.transaction_timer](){tt.set_expiration_callback(nullptr, nullptr);});
+   auto cleanup = fc::make_scoped_exit([cb, &tt=context.trx_context.transaction_timer](){
+      cb->is_running = false;
+      cb->bounce_buffers->clear();
+      tt.set_expiration_callback(nullptr, nullptr);
+   });
 
    void(*apply_func)(uint64_t, uint64_t, uint64_t) = (void(*)(uint64_t, uint64_t, uint64_t))(cb->running_code_base + code.apply_offset);
 

From f83856072ff255390a102069002c5b354fbf1872 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 29 Sep 2019 21:06:12 -0400
Subject: [PATCH 1401/1648] be more aggressive on evicting cache when compiler
 monitor indicates too full

---
 .../webassembly/eos-vm-oc/code_cache.hpp      |  1 +
 .../webassembly/eos-vm-oc/code_cache.cpp      | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
index d05977652fe..ce94cc5db90 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/code_cache.hpp
@@ -78,6 +78,7 @@ class code_cache_base {
 
       size_t _free_bytes_eviction_threshold;
       void check_eviction_threshold(size_t free_bytes);
+      void run_eviction_round();
 
       void set_on_disk_region_dirty(bool);
 
diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
index 837426c9a36..ac628aaf4be 100644
--- a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -95,7 +95,7 @@ std::tuple<size_t, size_t> code_cache_async::consume_compile_thread_queue() {
                _blacklist.emplace(result.code);
             },
             [&](const compilation_result_toofull&) {
-               //we'll just let this one try and tier up again next time it's used
+               run_eviction_round();
             }
          });
       }
@@ -365,15 +365,18 @@ void code_cache_base::free_code(const digest_type& code_id, const uint8_t& vm_ve
       compiling_it->second = true;
 }
 
-void code_cache_base::check_eviction_threshold(size_t free_bytes) {
-   if(free_bytes < _free_bytes_eviction_threshold) {
-      evict_wasms_message evict_msg;
-      for(unsigned int i = 0; i < 25 && _cache_index.size() > 1; ++i) {
-         evict_msg.codes.emplace_back(_cache_index.back());
-         _cache_index.pop_back();
-      }
-      write_message_with_fds(_compile_monitor_write_socket, evict_msg);
+void code_cache_base::run_eviction_round() {
+   evict_wasms_message evict_msg;
+   for(unsigned int i = 0; i < 25 && _cache_index.size() > 1; ++i) {
+      evict_msg.codes.emplace_back(_cache_index.back());
+      _cache_index.pop_back();
    }
+   write_message_with_fds(_compile_monitor_write_socket, evict_msg);
+}
+
+void code_cache_base::check_eviction_threshold(size_t free_bytes) {
+   if(free_bytes < _free_bytes_eviction_threshold)
+      run_eviction_round();
 }
 
 }}}
\ No newline at end of file

From 25f33f731df5c6f2eb66afcdda102a2a940cf422 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 29 Sep 2019 21:26:03 -0400
Subject: [PATCH 1402/1648] bump the code cache header to force invalidation of
 previous caches

this is not the intended way of deprecating old generated code -- that would be the codegen_version field. But this is a quick way to zap any code caches that were created by versions of EOS-VM OC before now. They could have had leaks/problems
---
 libraries/chain/webassembly/eos-vm-oc/code_cache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
index ac628aaf4be..7664a0d3e7e 100644
--- a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -27,7 +27,7 @@ namespace eosio { namespace chain { namespace eosvmoc {
 static constexpr size_t header_offset = 512u;
 static constexpr size_t header_size = 512u;
 static constexpr size_t total_header_size = header_offset + header_size;
-static constexpr uint64_t header_id = 0x31434f4d56534f45ULL; //"EOSVMOC1" little endian
+static constexpr uint64_t header_id = 0x32434f4d56534f45ULL; //"EOSVMOC2" little endian
 
 struct code_cache_header {
    uint64_t id = header_id;
@@ -230,7 +230,7 @@ code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const e
       memcpy((char*)&cache_header, header_buff + header_offset, sizeof(cache_header));
    }
 
-   EOS_ASSERT(cache_header.id == header_id, bad_database_version_exception, "code cache header magic not as expected");
+   EOS_ASSERT(cache_header.id == header_id, bad_database_version_exception, "existing EOS-VM OC code cache not compatible with this version");
    EOS_ASSERT(!cache_header.dirty, database_exception, "code cache is dirty");
 
    set_on_disk_region_dirty(true);

From 0f555c241f58553703184e9b57217fa99be2deca Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 30 Sep 2019 09:05:14 -0400
Subject: [PATCH 1403/1648] disallow WAVM with EOS-VM OC

not compatible
---
 libraries/chain/include/eosio/chain/wasm_interface_private.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 397698959a9..1d502964be2 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -83,6 +83,7 @@ namespace eosio { namespace chain {
 
 #ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
          if(eosvmoc_tierup) {
+            EOS_ASSERT(vm != wasm_interface::vm_type::wavm, wasm_exception, "WAVM is incompatible with EOS-VM OC");
             EOS_ASSERT(vm != wasm_interface::vm_type::eos_vm_oc, wasm_exception, "You can't use EOS-VM OC as the base runtime when tier up is activated");
             eosvmoc.emplace(data_dir, eosvmoc_config, d);
          }

From c75e1db0066b514437be6666f2d4e425529bbcea Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 30 Sep 2019 08:48:38 -0500
Subject: [PATCH 1404/1648] Increase stability of test by spreading push to all
 nodes

---
 tests/nodeos_under_min_avail_ram.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index 53894dba6e2..aebf5571121 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -115,6 +115,7 @@ def setName(self, num):
     nodes.append(cluster.getNode(1))
     nodes.append(cluster.getNode(2))
     nodes.append(cluster.getNode(3))
+    numNodes=len(nodes)
 
 
     for account in accounts:
@@ -167,7 +168,7 @@ def setName(self, num):
             data="{\"from\":\"%s\",\"to\":\"%s\",\"num\":%d}" % (fromAccount.name, toAccount.name, numAmount)
             opts="--permission %s@active --permission %s@active --expiration 90" % (contract, fromAccount.name)
             try:
-                trans=nodes[0].pushMessage(contract, action, data, opts)
+                trans=nodes[count % numNodes].pushMessage(contract, action, data, opts)
                 if trans is None or not trans[0]:
                     timeOutCount+=1
                     if timeOutCount>=3:
@@ -207,7 +208,6 @@ def setName(self, num):
             Utils.cmdError("All Nodes should have died")
             errorExit("Failure - All Nodes should have died")
 
-    numNodes=len(nodes)
     for i in range(numNodes):
         f = open(Utils.getNodeDataDir(i) + "/stderr.txt")
         contents = f.read()
@@ -262,7 +262,7 @@ def setName(self, num):
             data="{\"from\":\"%s\",\"to\":\"%s\",\"num\":%d}" % (fromAccount.name, toAccount.name, numAmount)
             opts="--permission %s@active --permission %s@active --expiration 90" % (contract, fromAccount.name)
             try:
-                trans=nodes[0].pushMessage(contract, action, data, opts)
+                trans=nodes[count % numNodes].pushMessage(contract, action, data, opts)
                 if trans is None or not trans[0]:
                     Print("Failed to push create action to eosio contract. sleep for 60 seconds")
                     time.sleep(60)
@@ -322,7 +322,7 @@ def setName(self, num):
         data="{\"from\":\"%s\",\"to\":\"%s\",\"num\":%d}" % (fromAccount.name, toAccount.name, numAmount)
         opts="--permission %s@active --permission %s@active --expiration 90" % (contract, fromAccount.name)
         try:
-            trans=nodes[0].pushMessage(contract, action, data, opts)
+            trans=node.pushMessage(contract, action, data, opts)
             if trans is None or not trans[0]:
                 Print("Failed to push create action to eosio contract. sleep for 60 seconds")
                 time.sleep(60)

From af1039d1698445973181230928fb3bfe397202b3 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 30 Sep 2019 13:04:39 -0500
Subject: [PATCH 1405/1648] Revert to old behavior of appending subjective
 failure to allow possibily cheaper trx in

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index b0bd08826c9..b5b3fb41691 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -526,7 +526,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             auto trace = chain.push_transaction( trx, deadline );
             if( trace->except ) {
                if( failure_is_subjective( *trace->except, deadline_is_subjective )) {
-                  _pending_incoming_transactions.add_front( trx, persist_until_expired, next );
+                  _pending_incoming_transactions.add( trx, persist_until_expired, next );
                   if( _pending_block_mode == pending_block_mode::producing ) {
                      fc_dlog( _trx_trace_log, "[TRX_TRACE] Block ${block_num} for producer ${prod} COULD NOT FIT, tx: ${txid} RETRYING ",
                               ("block_num", chain.head_block_num() + 1)

From 1685adf021c60e92e531f726da79dc818ee25e6b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 30 Sep 2019 13:52:15 -0500
Subject: [PATCH 1406/1648] Change log level of index write from dlog to ilog

---
 libraries/chain/block_log.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 914f8b6b7e2..d8fe7443bef 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -836,7 +836,7 @@ namespace eosio { namespace chain {
       buffer[_current_position - _start_of_buffer_position] = pos;
       --_current_position;
       if ((_block_written & 0xfffff) == 0) {                            //periodically print a progress indicator
-         dlog("block: ${block_written}      position in file: ${pos}", ("block_written", _block_written)("pos",pos));
+         ilog("block: ${block_written}      position in file: ${pos}", ("block_written", _block_written)("pos",pos));
       }
       --_block_written;
    }

From 40b447d3821e8bb84ee530dd6387d6b0c942bf26 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 30 Sep 2019 16:33:01 -0500
Subject: [PATCH 1407/1648] Fixed block reporting to work for trimmed block
 logs.

---
 programs/eosio-blocklog/main.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index ffef2283b57..27835c63ebd 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -73,7 +73,11 @@ void blocklog::read_log() {
    EOS_ASSERT( end->block_num() > 1, block_log_exception, "Only one block found in block log" );
 
    //fix message below, first block might not be 1, first_block_num is not set yet
-   ilog( "existing block log contains block num 1 through block num ${n}", ("n",end->block_num()) );
+   ilog( "existing block log contains block num ${first} through block num ${n}",
+         ("first",block_logger.first_block_num())("n",end->block_num()) );
+   if (first_block < block_logger.first_block_num()) {
+      first_block = block_logger.first_block_num();
+   }
 
    optional<chainbase::database> reversible_blocks;
    try {
@@ -129,10 +133,10 @@ void blocklog::read_log() {
                  ("ref_block_prefix", ref_block_prefix)
                  (pretty_output.get_object());
       fc::variant v(std::move(enhanced_object));
-       if (no_pretty_print)
-          fc::json::to_stream(*out, v, fc::json::stringify_large_ints_and_doubles);
-       else
-          *out << fc::json::to_pretty_string(v) << "\n";
+      if (no_pretty_print)
+         fc::json::to_stream(*out, v, fc::json::stringify_large_ints_and_doubles);
+      else
+         *out << fc::json::to_pretty_string(v) << "\n";
    };
    bool contains_obj = false;
    while((block_num <= last_block) && (next = block_logger.read_block_by_num( block_num ))) {
@@ -142,6 +146,7 @@ void blocklog::read_log() {
       ++block_num;
       contains_obj = true;
    }
+
    if (reversible_blocks) {
       const reversible_block_object* obj = nullptr;
       while( (block_num <= last_block) && (obj = reversible_blocks->find<reversible_block_object,by_num>(block_num)) ) {
@@ -153,6 +158,7 @@ void blocklog::read_log() {
          contains_obj = true;
       }
    }
+
    if (as_json_array)
       *out << "]";
    rt.report();

From b0052d74336f104e0e657ef2e574a451fff1463c Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 30 Sep 2019 16:44:21 -0500
Subject: [PATCH 1408/1648] Moved trim_data into block_log. GH #7939

---
 libraries/chain/block_log.cpp                 | 165 +++++++++++++++++-
 .../chain/include/eosio/chain/block_log.hpp   |  26 +++
 programs/eosio-blocklog/main.cpp              | 107 +-----------
 3 files changed, 190 insertions(+), 108 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index d8fe7443bef..29fd96468fc 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -102,6 +102,7 @@ namespace eosio { namespace chain {
          uint64_t previous();
          uint32_t version() const { return _version; }
          uint32_t first_block_num() const { return _first_block_num; }
+         constexpr static uint32_t      _buf_len                          = 1U << 24;
       private:
          void update_buffer();
 
@@ -118,9 +119,7 @@ namespace eosio { namespace chain {
          std::unique_ptr<char[]>        _buffer_ptr;
          std::string                    _block_file_name;
          constexpr static int64_t       _unset_position                   = -1;
-         constexpr static uint32_t      _buf_len                          = 1U << 24;
          constexpr static uint64_t      _position_size                    = sizeof(_current_position_in_file);
-         constexpr static int           _blknum_offset_from_pos           = 14; //offset from start of block to 4 byte block number, valid for the only allowed versions
       };
 
       constexpr uint64_t buffer_location_to_file_location(uint32_t buffer_location) { return buffer_location << 3; }
@@ -132,6 +131,7 @@ namespace eosio { namespace chain {
          void write(uint64_t pos);
          void complete();
          void update_buffer_position();
+         constexpr static uint64_t          _buffer_bytes             = 1U << 22;
       private:
          void prepare_buffer();
          bool shift_buffer();
@@ -144,9 +144,39 @@ namespace eosio { namespace chain {
          int64_t                            _current_position         = 0;
          int64_t                            _start_of_buffer_position = 0;
          int64_t                            _end_of_buffer_position   = 0;
-         constexpr static uint64_t          _buffer_bytes             = 1U << 22;
          constexpr static uint64_t          _max_buffer_length        = file_location_to_buffer_location(_buffer_bytes);
       };
+
+      /*
+       *  @brief datastream adapter that adapts FILE* for use with fc unpack
+       *
+       *  This class supports unpack functionality but not pack.
+       */
+      class fileptr_datastream {
+      public:
+         explicit fileptr_datastream( FILE* file, const std::string& filename ) : _file(file), _filename(filename) {}
+
+         void skip( size_t s ) {
+            std::vector<char> d( s );
+            read( &d[0], s );
+         }
+
+         bool read( char* d, size_t s ) {
+            size_t result = fread( d, 1, s, _file );
+            EOS_ASSERT( result == s, block_log_exception,
+                        "in file: ${file} only able to read ${act} of the expected ${exp}",
+                        ("file", _filename)("act",result)("exp",s) );
+            return true;
+         }
+
+         bool get( unsigned char& c ) { return get( *(char*)&c ); }
+
+         bool get( char& c ) { return read(&c, 1); }
+
+      private:
+         FILE* const _file;
+         const std::string _filename;
+      };
    }
 
    block_log::block_log(const fc::path& data_dir)
@@ -751,10 +781,10 @@ namespace eosio { namespace chain {
       uint32_t bnum = 0;
       if (block_pos >= _start_of_buffer_position) {
          const uint32_t index_of_block = block_pos - _start_of_buffer_position;
-         bnum = *reinterpret_cast<uint32_t*>(buf + index_of_block + _blknum_offset_from_pos);  //block number of previous block (is big endian)
+         bnum = *reinterpret_cast<uint32_t*>(buf + index_of_block + trim_data::blknum_offset);  //block number of previous block (is big endian)
       }
       else {
-         const auto blknum_offset_pos = block_pos + _blknum_offset_from_pos;
+         const auto blknum_offset_pos = block_pos + trim_data::blknum_offset;
          auto status = fseek(_file.get(), blknum_offset_pos, SEEK_SET);
          EOS_ASSERT( status == 0, block_log_exception, "Could not seek in '${blocks_log}' to position: ${pos}. Returned status: ${status}", ("blocks_log", _block_file_name)("pos", blknum_offset_pos)("status", status) );
          auto size = fread((void*)&bnum, sizeof(bnum), 1, _file.get());
@@ -906,4 +936,127 @@ namespace eosio { namespace chain {
    bool block_log::is_supported_version(uint32_t version) {
       return std::clamp(version, min_supported_version, max_supported_version) == version;
    }
-} } /// eosio::chain
+   trim_data::trim_data(fc::path block_dir) {
+
+      // code should follow logic in block_log::repair_log
+
+      using namespace std;
+      block_file_name = block_dir / "blocks.log";
+      index_file_name = block_dir / "blocks.index";
+      blk_in = FC_FOPEN(block_file_name.generic_string().c_str(), "rb");
+      EOS_ASSERT( blk_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",block_file_name.string()) );
+      ind_in = FC_FOPEN(index_file_name.generic_string().c_str(), "rb");
+      EOS_ASSERT( ind_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",index_file_name.string()) );
+      auto size = fread((void*)&version,sizeof(version), 1, blk_in);
+      EOS_ASSERT( size == 1, block_log_unsupported_version, "invalid format for file ${file}", ("file",block_file_name.string()));
+      cout << "block log version= " << version << '\n';
+      EOS_ASSERT( block_log::is_supported_version(version), block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
+
+      detail::fileptr_datastream ds(blk_in, block_file_name.string());
+      if (version == 1) {
+         first_block = 1;
+         genesis_state gs;
+         fc::raw::unpack(ds, gs);
+         chain_id = gs.compute_chain_id();
+      }
+      else {
+         size = fread((void *) &first_block, sizeof(first_block), 1, blk_in);
+         EOS_ASSERT(size == 1, block_log_exception, "invalid format for file ${file}",
+                    ("file", block_file_name.string()));
+         if (block_log::contains_genesis_state(version, first_block)) {
+            genesis_state gs;
+            fc::raw::unpack(ds, gs);
+            chain_id = gs.compute_chain_id();
+         }
+         else if (block_log::contains_chain_id(version, first_block)) {
+            chain_id = chain_id_type{};
+            ds >> *chain_id;
+         }
+         else {
+            EOS_ASSERT( false, block_log_exception,
+                        "Block log ${file} is not supported. version: ${ver} and first_block: ${first_block} does not contain "
+                        "a genesis_state nor a chain_id.",
+                        ("file", block_file_name.string())("ver", version)("first_block", first_block));
+         }
+
+         const auto expected_totem = block_log::npos;
+         std::decay_t<decltype(block_log::npos)> actual_totem;
+         size = fread ( (char*)&actual_totem, sizeof(actual_totem), 1, blk_in);
+
+         EOS_ASSERT(size == 1, block_log_exception,
+                    "Expected to read ${size} bytes, but did not read any bytes", ("size", sizeof(actual_totem)));
+         EOS_ASSERT(actual_totem == expected_totem, block_log_exception,
+                    "Expected separator between block log header and blocks was not found( expected: ${e}, actual: ${a} )",
+                    ("e", fc::to_hex((char*)&expected_totem, sizeof(expected_totem) ))("a", fc::to_hex((char*)&actual_totem, sizeof(actual_totem) )));
+      }
+
+      const uint64_t start_of_blocks = ftell(blk_in);
+      first_block_pos = block_pos(first_block);
+      EOS_ASSERT(start_of_blocks == first_block_pos, block_log_exception,
+                 "Block log ${file} was determined to have its first block at ${determined}, but the block index "
+                 "indicates the first block is at ${index}",
+                 ("file", block_file_name.string())("determined", start_of_blocks)("index",first_block_pos));
+
+      cout << "first block= " << first_block << '\n';
+      const auto status = fseek(ind_in, 0, SEEK_END);                //get length of blocks.index (gives number of blocks)
+      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} end", ("file", index_file_name.string()) );
+      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} end", ("file", index_file_name.string()) );
+      const uint64_t file_end = ftell(ind_in);                //get length of blocks.index (gives number of blocks)
+      last_block = first_block + file_end/sizeof(uint64_t) - 1;
+      cout << "last block=  " << last_block << '\n';
+   }
+
+   trim_data::~trim_data() {
+      if (blk_in != nullptr)
+         fclose(blk_in);
+      if (ind_in != nullptr)
+         fclose(ind_in);
+   }
+
+   uint64_t trim_data::block_pos(uint32_t n) {
+      using namespace std;
+      index_pos = sizeof(uint64_t) * (n - first_block);
+      auto status = fseek(ind_in, index_pos, SEEK_SET);
+      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file for block ${b}", ("file", index_file_name.string())("pos", index_pos)("b",n) );
+      const uint64_t pos = ftell(ind_in);
+      EOS_ASSERT( pos == index_pos, block_log_exception, "cannot seek to ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
+      uint64_t block_n_pos;
+      auto size = fread((void*)&block_n_pos, sizeof(block_n_pos), 1, ind_in);                   //filepos of block n
+      EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
+      return block_n_pos;
+   }
+
+   void trim_data::find_block_pos(uint32_t n) {
+      //get file position of block n from blocks.index then confirm block n is found in blocks.log at that position
+      //sets fpos0 and fpos1, throws exception if block at fpos0 is not block n
+      using namespace std;
+      auto temp = block_pos(first_block);
+      fpos0 = block_pos(n);
+      auto size = fread((void*)&fpos1, sizeof(fpos1), 1, ind_in);                   //filepos of block n+1
+      if (n != last_block)
+         EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}, size=${size}",
+                     ("file", index_file_name.string())("b",n + 1)("size",size) );
+
+      cout << "According to blocks.index:\n";
+      cout << "    block " << n << " starts at position " << fpos0 << '\n';
+      cout << "    block " << n + 1;
+
+      if (n != last_block)
+         cout << " starts at position " << fpos1 << '\n';
+      else
+         cout << " is past end\n";
+
+      //read blocks.log and verify block number n is found at file position fpos0
+      auto status = fseek(blk_in, fpos0 + blknum_offset, SEEK_SET);
+      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", fpos0 + blknum_offset) );
+      const uint64_t block_offset_pos = ftell(blk_in);
+      EOS_ASSERT( block_offset_pos == fpos0 + blknum_offset, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", fpos0 + blknum_offset) );
+      uint32_t prior_blknum;
+      size = fread((void*)&prior_blknum, sizeof(prior_blknum), 1, blk_in);     //read bigendian block number of prior block
+      EOS_ASSERT( size == 1, block_log_exception, "cannot read prior block");
+      const uint32_t bnum = fc::endian_reverse_u32(prior_blknum) + 1;          //convert to little endian, add 1 since prior block
+      cout << "At position " << fpos0 << " in " << index_file_name.generic_string() << " find block " << bnum << (bnum == n ? " as expected\n": " - not good!\n");
+      EOS_ASSERT( bnum == n, block_log_exception, "${index} does not agree with ${blocks}", ("index", index_file_name.string())("blocks", block_file_name.string()) );
+   }
+
+   } } /// eosio::chain
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index db2fe7f4cd5..739e50e6b2d 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -85,4 +85,30 @@ namespace eosio { namespace chain {
          std::unique_ptr<detail::block_log_impl> my;
    };
 
+//to derive blknum_offset==14 see block_header.hpp and note on disk struct is packed
+//   block_timestamp_type timestamp;                  //bytes 0:3
+//   account_name         producer;                   //bytes 4:11
+//   uint16_t             confirmed;                  //bytes 12:13
+//   block_id_type        previous;                   //bytes 14:45, low 4 bytes is big endian block number of previous block
+
+   struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end(), and smoke_test()
+      trim_data(fc::path block_dir);
+      ~trim_data();
+      void find_block_pos(uint32_t n);
+      uint64_t block_pos(uint32_t n);
+      fc::path block_file_name, index_file_name;        //full pathname for blocks.log and blocks.index
+      uint32_t version = 0;                              //blocklog version
+      uint32_t first_block = 0;                          //first block in blocks.log
+      uint32_t last_block = 0;                          //last block in blocks.log
+      FILE* blk_in = nullptr;                            //C style files for reading blocks.log and blocks.index
+      FILE* ind_in = nullptr;                            //C style files for reading blocks.log and blocks.index
+      //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
+      uint64_t index_pos = 0;                            //filepos in blocks.index for block n, +8 for block n+1
+      uint64_t fpos0 = 0;                                //filepos in blocks.log for block n and block n+1
+      uint64_t fpos1 = 0;                                //filepos in blocks.log for block n and block n+1
+      uint64_t first_block_pos = 0;                      //file position in blocks.log for the first block in the log
+      fc::optional<chain_id_type> chain_id;
+
+      static constexpr int blknum_offset{14};            //offset from start of block to 4 byte block number, valid for the only allowed versions
+   };
 } }
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 27835c63ebd..ab5ac942b1b 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -208,109 +208,12 @@ void blocklog::initialize(const variables_map& options) {
 
 }
 
-constexpr int blknum_offset{14};                      //offset from start of block to 4 byte block number
-//this offset is valid for version 1 and 2 blocklogs, version is checked before using blknum_offset
-
-//to derive blknum_offset==14 see block_header.hpp and note on disk struct is packed
-//   block_timestamp_type timestamp;                  //bytes 0:3
-//   account_name         producer;                   //bytes 4:11
-//   uint16_t             confirmed;                  //bytes 12:13
-//   block_id_type        previous;                   //bytes 14:45, low 4 bytes is big endian block number of previous block
-
-struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end(), and smoke_test()
-   trim_data(bfs::path block_dir);
-   ~trim_data() {
-      fclose(blk_in);
-      fclose(ind_in);
-   }
-   void find_block_pos(uint32_t n);
-   bfs::path block_file_name, index_file_name;        //full pathname for blocks.log and blocks.index
-   uint32_t version = 0;                              //blocklog version
-   uint32_t first_block = 0;                          //first block in blocks.log
-   uint32_t last_block = 0;                          //last block in blocks.log
-   FILE* blk_in = nullptr;                            //C style files for reading blocks.log and blocks.index
-   FILE* ind_in = nullptr;                            //C style files for reading blocks.log and blocks.index
-   //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
-   uint64_t index_pos = 0;                            //filepos in blocks.index for block n, +8 for block n+1
-   uint64_t fpos0 = 0;                                //filepos in blocks.log for block n and block n+1
-   uint64_t fpos1 = 0;                                //filepos in blocks.log for block n and block n+1
-};
-
-
-trim_data::trim_data(bfs::path block_dir) {
-   report_time rt("trimming log");
-   using namespace std;
-   block_file_name = block_dir / "blocks.log";
-   index_file_name = block_dir / "blocks.index";
-   blk_in = FOPEN(block_file_name.c_str(), "rb");
-   EOS_ASSERT( blk_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",block_file_name.string()) );
-   ind_in = FOPEN(index_file_name.c_str(), "rb");
-   EOS_ASSERT( ind_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",index_file_name.string()) );
-   auto size = fread((void*)&version,sizeof(version), 1, blk_in);
-   EOS_ASSERT( size == 1, block_log_unsupported_version, "invalid format for file ${file}", ("file",block_file_name.string()));
-   cout << "block log version= " << version << '\n';
-   EOS_ASSERT( block_log::is_supported_version(version), block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
-   if (version == 1) {
-      first_block = 1;
-   }
-   else {
-      size = fread((void *) &first_block, sizeof(first_block), 1, blk_in);
-      EOS_ASSERT(size == 1, block_log_exception, "invalid format for file ${file}",
-                 ("file", block_file_name.string()));
-   }
-   cout << "first block= " << first_block << '\n';
-   const auto status = fseek(ind_in, 0, SEEK_END);                //get length of blocks.index (gives number of blocks)
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} end", ("file", index_file_name.string()) );
-   const uint64_t file_end = ftell(ind_in);                //get length of blocks.index (gives number of blocks)
-   last_block = first_block + file_end/sizeof(uint64_t) - 1;
-   cout << "last block=  " << last_block << '\n';
-   rt.report();
-}
-
-void trim_data::find_block_pos(uint32_t n) {
-   //get file position of block n from blocks.index then confirm block n is found in blocks.log at that position
-   //sets fpos0 and fpos1, throws exception if block at fpos0 is not block n
-   report_time rt("finding block position");
-   using namespace std;
-   index_pos = sizeof(uint64_t) * (n - first_block);
-   auto status = fseek(ind_in, index_pos, SEEK_SET);
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file for block ${b}", ("file", index_file_name.string())("pos", index_pos)("b",n) );
-   const uint64_t pos = ftell(ind_in);
-   EOS_ASSERT( pos == index_pos, block_log_exception, "cannot seek to ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
-   auto size = fread((void*)&fpos0, sizeof(fpos0), 1, ind_in);                   //filepos of block n
-   EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
-   size = fread((void*)&fpos1, sizeof(fpos1), 1, ind_in);                   //filepos of block n+1
-   if (n != last_block)
-      EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}, size=${size}", ("file", index_file_name.string())("b",n + 1)("size",size) );
-
-   cout << "According to blocks.index:\n";
-   cout << "    block " << n << " starts at position " << fpos0 << '\n';
-   cout << "    block " << n + 1;
-
-   if (n != last_block)
-      cout << " starts at position " << fpos1 << '\n';
-   else
-      cout << " is past end\n";
-
-   //read blocks.log and verify block number n is found at file position fpos0
-   status = fseek(blk_in, fpos0 + blknum_offset, SEEK_SET);
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", fpos0 + blknum_offset) );
-   const uint64_t block_offset_pos = ftell(blk_in);
-   EOS_ASSERT( block_offset_pos == fpos0 + blknum_offset, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", fpos0 + blknum_offset) );
-   uint32_t prior_blknum;
-   size = fread((void*)&prior_blknum, sizeof(prior_blknum), 1, blk_in);     //read bigendian block number of prior block
-   EOS_ASSERT( size == 1, block_log_exception, "cannot read prior block");
-   const uint32_t bnum = endian_reverse_u32(prior_blknum) + 1;          //convert to little endian, add 1 since prior block
-   cout << "At position " << fpos0 << " in " << index_file_name << " find block " << bnum << (bnum == n ? " as expected\n": " - not good!\n");
-   EOS_ASSERT( bnum == n, block_log_exception, "${index} does not agree with ${blocks}", ("index", index_file_name.string())("blocks", block_file_name.string()) );
-   rt.report();
-}
-
 int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block to keep (remove later blocks)
    report_time rt("trimming blocklog end");
    using namespace std;
    trim_data td(block_dir);
-   cout << "\nIn directory " << block_dir << " will trim all blocks after block " << n << " from " << td.block_file_name << " and " << td.index_file_name << ".\n";
+   cout << "\nIn directory " << block_dir << " will trim all blocks after block " << n << " from "
+        << td.block_file_name.generic_string() << " and " << td.index_file_name.generic_string() << ".\n";
    if (n < td.first_block) {
       cerr << "All blocks are after block " << n << " so do nothing (trim_end would delete entire blocks.log)\n";
       return 1;
@@ -522,8 +425,8 @@ void smoke_test(bfs::path block_dir) {
    uint64_t file_pos;
    auto size = fread((void*)&file_pos, sizeof(uint64_t), 1, td.blk_in);
    EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", td.block_file_name.string()) );
-   status = fseek(td.blk_in, file_pos + blknum_offset, SEEK_SET);
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", td.block_file_name.string())("pos", file_pos + blknum_offset) );
+   status = fseek(td.blk_in, file_pos + trim_data::blknum_offset, SEEK_SET);
+   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", td.block_file_name.string())("pos", file_pos + trim_data::blknum_offset) );
    uint32_t bnum;
    size = fread((void*)&bnum, sizeof(uint32_t), 1, td.blk_in);
    EOS_ASSERT( size == 1, block_log_exception, "${file} read fails", ("file", td.block_file_name.string()) );
@@ -570,7 +473,7 @@ int main(int argc, char** argv) {
                return -1;
          }
          if (blog.first_block != 0) {
-            if (trim_blocklog_front(vmap.at("blocks-dir").as<bfs::path>(), blog.first_block) != 0)
+            if (!trim_blocklog_front(vmap.at("blocks-dir").as<bfs::path>(), blog.first_block))
                return -1;
          }
          return 0;

From f52866f0a889029df1192d65321615a4c55a6a57 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 30 Sep 2019 16:45:19 -0500
Subject: [PATCH 1409/1648] Adding missed invarients to existing code. GH #7939

---
 libraries/chain/block_log.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 29fd96468fc..ae6285f0fbc 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -372,6 +372,8 @@ namespace eosio { namespace chain {
    }
 
    void block_log::reset( const chain_id_type& chain_id, uint32_t first_block_num ) {
+      EOS_ASSERT( first_block_num > 1, block_log_exception,
+                  "Block log version ${ver} needs to be created with a genesis state if starting from block number 1." );
       my->reset(chain_id, signed_block_ptr(), first_block_num);
    }
 
@@ -561,6 +563,15 @@ namespace eosio { namespace chain {
       uint32_t first_block_num = 1;
       if (version != 1) {
          old_block_stream.read ( (char*)&first_block_num, sizeof(first_block_num) );
+
+         // this assert is only here since repair_log is only used for --hard-replay-blockchain, which removes any
+         // existing state, if another API needs to use it, this can be removed and the check for the first block's
+         // previous block id will need to accommodate this.
+         EOS_ASSERT( first_block_num == 1, block_log_exception,
+                     "Block log ${file} must contain a genesis state and start at block number 1.  This block log "
+                     "starts at block number ${first_block_num}.",
+                     ("file", (backup_dir / "blocks.log").generic_string())("first_block_num", first_block_num));
+
          new_block_stream.write( (char*)&first_block_num, sizeof(first_block_num) );
       }
 
@@ -577,6 +588,12 @@ namespace eosio { namespace chain {
 
          new_block_stream << chain_id;
       }
+      else {
+         EOS_ASSERT( false, block_log_exception,
+                     "Block log ${file} is not supported. version: ${ver} and first_block_num: ${fbn} does not contain "
+                     "a genesis_state nor a chain_id.",
+                     ("file", (backup_dir / "blocks.log").generic_string())("ver", version)("fbn", first_block_num));
+      }
 
       if (version != 1) {
          auto expected_totem = npos;

From d798600354ef67d3574e8549e7ab7a500a4bf3aa Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 30 Sep 2019 16:46:44 -0500
Subject: [PATCH 1410/1648] Movede trim_blocklog_front logic into block_log and
 added support for version 3. GH #7939

---
 libraries/chain/block_log.cpp                 |  88 +++++++++
 .../chain/include/eosio/chain/block_log.hpp   |   5 +-
 .../include/eosio/chain/chain_id_type.hpp     |   2 +-
 programs/eosio-blocklog/main.cpp              | 183 +-----------------
 4 files changed, 96 insertions(+), 182 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index ae6285f0fbc..0f037762f5e 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -953,6 +953,94 @@ namespace eosio { namespace chain {
    bool block_log::is_supported_version(uint32_t version) {
       return std::clamp(version, min_supported_version, max_supported_version) == version;
    }
+
+   bool block_log::trim_blocklog_front(const fc::path& block_dir, uint32_t truncate_at_block) {
+      using namespace std;
+      ilog("In directory ${dir} will trim all blocks before block ${n} from blocks.log and blocks.index.",
+           ("dir", block_dir.generic_string())("n", truncate_at_block));
+      trim_data original_block_log(block_dir);
+      if (truncate_at_block <= original_block_log.first_block) {
+         ilog("There are no blocks before block ${n} so do nothing.", ("n", truncate_at_block));
+         return false;
+      }
+      if (truncate_at_block > original_block_log.last_block) {
+         ilog("All blocks are before block ${n} so do nothing (trim front would delete entire blocks.log).", ("n", truncate_at_block));
+         return false;
+      }
+      original_block_log.find_block_pos(truncate_at_block);
+
+      fc::path new_block_filename = block_dir / "blocks.out";
+      if (fc::remove(new_block_filename)) {
+         ilog("Removing old blocks.out file");
+      }
+      fc::cfile new_block_file;
+      new_block_file.set_file_path(new_block_filename);
+      new_block_file.open( LOG_WRITE_C );
+
+      static_assert( block_log::max_supported_version > 0, "a version number of zero is not supported" );
+      uint32_t version = block_log::max_supported_version;
+      new_block_file.seek(0);
+      new_block_file.write((char*)&version, sizeof(version));
+      new_block_file.write((char*)&truncate_at_block, sizeof(truncate_at_block));
+
+      new_block_file << *original_block_log.chain_id;
+
+      // append a totem to indicate the division between blocks and header
+      auto totem = block_log::npos;
+      new_block_file.write((char*)&totem, sizeof(totem));
+
+      const auto new_block_file_first_block_pos = new_block_file.tellp();
+
+      // copy over remainder of block log to new block log
+      auto buffer =  make_unique<char[]>(detail::reverse_iterator::_buf_len);                   //read big chunks of old blocks.log into this buffer
+      char* buf =  buffer.get();
+
+      const uint64_t pos_delta = original_block_log.fpos0 - new_block_file_first_block_pos;     // offset bytes to shift from old blocklog to new blocklog
+      auto status = fseek(original_block_log.blk_in, 0, SEEK_END);
+      EOS_ASSERT( status == 0, block_log_exception, "blocks.log seek failed" );
+      const uint64_t to_write = ftell(original_block_log.blk_in) - original_block_log.fpos0;
+      const auto pos_size = sizeof(uint64_t);
+      uint64_t original_pos = ftell(original_block_log.blk_in) - pos_size;
+
+      fc::path new_index_filename = block_dir / "index.out";
+      const auto num_blocks = original_block_log.last_block - truncate_at_block + 1;
+      detail::index_writer index(new_index_filename, num_blocks);
+      uint64_t read_size = 0;
+      for(uint64_t written = to_write; written > 0; written -= read_size) {
+         read_size = to_write;
+         if (read_size > detail::reverse_iterator::_buf_len) {
+            read_size = detail::reverse_iterator::_buf_len;
+         }
+         const auto start_of_blk_buffer_pos = original_block_log.fpos0 + to_write - read_size;
+         status = fseek(original_block_log.blk_in, start_of_blk_buffer_pos, SEEK_SET);
+         const auto num_read = fread(buf, read_size, 1, original_block_log.blk_in);
+         EOS_ASSERT( num_read == 1, block_log_exception, "blocks.log read failed" );
+         while(original_pos >= start_of_blk_buffer_pos) {
+            const auto buffer_index = original_pos - start_of_blk_buffer_pos;
+            uint64_t& pos_content = *(uint64_t*)(buf + buffer_index);
+            const auto start_of_this_block = pos_content;
+            pos_content = start_of_this_block - pos_delta;
+            index.write(pos_content);
+            original_pos = start_of_this_block - pos_size;
+         }
+         new_block_file.write(buf, read_size);
+      }
+      index.complete();
+      fclose(original_block_log.blk_in);
+      original_block_log.blk_in = nullptr;
+      new_block_file.flush();
+      new_block_file.close();
+
+      fc::path old_log = block_dir / "old.log";
+      rename(original_block_log.block_file_name, old_log);
+      rename(new_block_filename, original_block_log.block_file_name);
+      fc::path old_ind = block_dir / "old.index";
+      rename(original_block_log.index_file_name, old_ind);
+      rename(new_index_filename, original_block_log.index_file_name);
+
+      return true;
+   }
+
    trim_data::trim_data(fc::path block_dir) {
 
       // code should follow logic in block_log::repair_log
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index 739e50e6b2d..db7f3c00b7b 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -78,7 +78,10 @@ namespace eosio { namespace chain {
          static bool contains_chain_id(uint32_t version, uint32_t first_block_num);
 
          static bool is_supported_version(uint32_t version);
-      private:
+
+         static bool trim_blocklog_front(const fc::path& block_dir, uint32_t truncate_at_block);
+
+   private:
          void open(const fc::path& data_dir);
          void construct_index();
 
diff --git a/libraries/chain/include/eosio/chain/chain_id_type.hpp b/libraries/chain/include/eosio/chain/chain_id_type.hpp
index 1fb1ac70a94..5a1cc52de86 100644
--- a/libraries/chain/include/eosio/chain/chain_id_type.hpp
+++ b/libraries/chain/include/eosio/chain/chain_id_type.hpp
@@ -42,11 +42,11 @@ namespace chain {
          friend T fc::variant::as()const;
 
          friend class eosio::chain_apis::read_only;
-         friend class chain_plugin;
 
          friend class eosio::net_plugin_impl;
          friend struct eosio::handshake_message;
          friend class block_log;
+         friend struct trim_data;
          friend class controller;
          friend struct controller_impl;
          friend class global_property_object;
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index ab5ac942b1b..55e2b4939a1 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -231,188 +231,11 @@ int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block
    return 0;
 }
 
-int trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first block to keep (remove prior blocks)
+bool trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first block to keep (remove prior blocks)
    report_time rt("trimming blocklog start");
-   using namespace std;
-   cout << "\nIn directory " << block_dir << " will trim all blocks before block " << n << " from blocks.log and blocks.index.\n";
-   trim_data td(block_dir);
-   if (n <= td.first_block) {
-      cerr << "There are no blocks before block " << n << " so do nothing\n";
-      return 1;
-   }
-   if (n > td.last_block) {
-      cerr << "All blocks are before block " << n << " so do nothing (trim_front would delete entire blocks.log)\n";
-      return 2;
-   }
-   td.find_block_pos(n);
-
-   constexpr uint32_t buf_len{1U<<24};                            //buf_len must be a power of 2
-   auto buffer =  make_unique<char[]>(buf_len);                   //read big chunks of old blocks.log into this buffer
-   char* buf =  buffer.get();
-
-   bfs::path block_out_filename = block_dir / "blocks.out";
-   FILE* blk_out = FOPEN(block_out_filename.c_str(), "wb");
-   EOS_ASSERT( blk_out != nullptr, block_log_not_found, "cannot write ${file}", ("file", block_out_filename.string()) );
-
-   //in version 1 file: version number, no first block number, rest of header length 0x6e, at 0x72 first block
-   //in version 2 file: version number, first block number,    rest of header length 0x6e, at 0x76 totem,  at 0x7e first block
-   *(uint32_t*)buf = 2;
-   auto size = fwrite((void*)buf, sizeof(uint32_t), 1, blk_out);                           //write version number 2
-   EOS_ASSERT( size == 1, block_log_exception, "blocks.out write fails" );
-   size = fwrite((void*)&n, sizeof(n), 1, blk_out);                            //write first block number
-   EOS_ASSERT( size == 1, block_log_exception, "blocks.out write fails" );
-
-   const auto past_version_offset = (td.version == 1) ? 4 : 8;
-   auto status = fseek(td.blk_in, past_version_offset, SEEK_SET) ;                //position past version number and maybe block number
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", td.block_file_name.string())("pos", past_version_offset) );
-   const auto header_len = 0x6e;
-   size = fread((void*)buf, header_len, 1, td.blk_in);
-   EOS_ASSERT( size == 1, block_log_exception, "blocks.log read fails" );
-   const auto totem_len = 8; //copy rest of header length 0x6e
-   memset(buf + header_len, 0xff, totem_len);                                       //totem is 8 bytes of 0xff
-   size = fwrite(buf, header_len + totem_len, 1, blk_out);                          //write header and totem
-   EOS_ASSERT( size == 1, block_log_exception, "blocks.out write fails" );
-
-   //pos_delta is the amount to subtract from every file position record in blocks.log because the blocks < n are removed
-   uint64_t pos_delta = td.fpos0 - 0x7e;                           //bytes removed from the blocklog
-   //bytes removed is file position of block n minus file position 'where file header ends'
-   //even if version 1 blocklog 'where file header ends' is where the new version 2 file header of length 0x7e ends
-
-   //read big chunks of blocks.log into buf, update the file position records, then write to blk_out
-   status = fseek(td.blk_in, 0, SEEK_END);                     //get blocks.log file length
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", 0) );
-   const uint64_t end = ftell(td.blk_in);
-   uint32_t last_buf_len = (end - td.fpos0 >= buf_len)? buf_len : end - td.fpos0; //bytes to read from blk_in
-   status = fseek(td.blk_in, -(uint64_t)last_buf_len, SEEK_END);        //pos is where read last buf from blk_in
-   EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", last_buf_len) );
-   uint64_t pos = ftell(td.blk_in);
-   EOS_ASSERT( pos == end - last_buf_len, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", last_buf_len) );
-   uint64_t did_read = fread((void*)buf, last_buf_len, 1, td.blk_in);           //read tail of blocks.log file into buf
-   cout << "seek " << td.block_file_name << " to " << pos << " read " << last_buf_len << " bytes\n";//debug
-   EOS_ASSERT( did_read == 1, block_log_exception, "${file} read fails", ("file", td.block_file_name.string()) );
-
-   //prepare to write index_out_filename
-   uint64_t total_fpos_len = (td.last_block + 1 - n) * sizeof(uint64_t);
-   auto fpos_buffer = make_unique<uint64_t[]>(buf_len);
-   uint64_t* fpos_list = fpos_buffer.get();                        //list of file positions, periodically write to blocks.index
-   bfs::path index_out_filename = block_dir / "index.out";
-   FILE* ind_out = FOPEN(index_out_filename.c_str(), "wb");
-   EOS_ASSERT( ind_out != nullptr, block_log_not_found, "cannot write ${file}", ("file",index_out_filename.string()) );
-   uint64_t last_fpos_len = total_fpos_len & ((uint64_t)buf_len - 1);//buf_len is a power of 2 so -1 creates low bits all 1
-   if (!last_fpos_len)                                            //will write integral number of buf_len and one time write last_fpos_len
-      last_fpos_len = buf_len;
-   uint32_t blk_base = td.last_block + 1 - (last_fpos_len >> 3);     //first entry in fpos_list is for block blk_base
-   cout << "******filling index buf blk_base " << blk_base << " last_fpos_len " << last_fpos_len << '\n';//debug
-
-   //as we traverse linked list of blocks in buf (from end toward start), for each block we know this:
-   int32_t index_start;                                           //buf index for block start
-   int32_t index_end;                                             //buf index for block end == buf index for block start file position
-   uint64_t file_pos;                                             //file position of block start
-   uint32_t bnum;                                                 //block number
-
-   //some code here is repeated in the loop below but we do it twice so can print a status message before the loop starts
-   index_end = last_buf_len - 8;                                     //buf index where last block ends and the block file position starts
-   file_pos = *(uint64_t*)(buf + index_end);                         //file pos of block start
-   index_start = file_pos - pos;                                   //buf index for block start
-   bnum = *(uint32_t*)(buf + index_start + blknum_offset);         //block number of previous block (is big endian)
-   bnum = endian_reverse_u32(bnum) + 1;                              //convert from big endian to little endian and add 1
-   EOS_ASSERT( bnum == td.last_block, block_log_exception, "last block from ${index} ${ind} != last block from ${block} ${log}", ("index", td.index_file_name.string())("ind", td.last_block)("block", td.block_file_name.string())("log", bnum) );
-
-   cout << '\n';                                                  //print header for periodic update messages
-   cout << setw(10) << "block" << setw(16) << "old file pos" << setw(16) << "new file pos" << '\n';
-   cout << setw(10) << bnum << setw(16) << file_pos << setw(16) << file_pos-pos_delta << '\n';
-   uint64_t last_file_pos = file_pos + 1;                            //used to check that file_pos is strictly decreasing
-   constexpr uint32_t fk{4096};                                   //buffer shift that keeps buf disk block aligned
-
-   for (;;) {        //invariant: at top of loop index_end and bnum are set and index_end is >= 0
-      file_pos = *(uint64_t *) (buf + index_end);                 //get file pos of block start
-      if (file_pos >= last_file_pos) {                            //check that file_pos decreases
-         cout << '\n';
-         cout << "file pos for block " << bnum + 1 << " is " << last_file_pos << '\n';
-         cout << "file pos for block " << bnum << " is " << file_pos << '\n';
-         EOS_ASSERT(file_pos < last_file_pos, block_log_exception, "${file} linked list of blocks is corrupt", ("file", td.index_file_name.string()) );
-      }
-      last_file_pos = file_pos;
-      *(uint64_t *) (buf + index_end) = file_pos - pos_delta;     //update file position in buf
-      fpos_list[bnum - blk_base] = file_pos - pos_delta;          //save updated file position for new index file
-      index_start = file_pos - pos;                               //will go negative when pass first block in buf
-
-      if ((bnum & 0xfffff) == 0)                                  //periodic progress indicator
-         cout << setw(10) << bnum << setw(16) << file_pos << setw(16) << file_pos-pos_delta << '\n';
-
-      if (bnum == blk_base) {                                     //if fpos_list is full write it to file
-         cout << "****** bnum=" << bnum << " blk_base= " << blk_base << " so write index buf seek to " << (blk_base - n) * sizeof(uint64_t) << " write len " << last_fpos_len << '\n';//debug
-         status = fseek(ind_out, (blk_base - n) * sizeof(uint64_t), SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", index_out_filename.string())("pos", last_buf_len) );
-         size = fwrite((void *) fpos_list, last_fpos_len, 1, ind_out);       //write fpos_list to index file
-         EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", index_out_filename.string()) );
-         last_fpos_len = buf_len;
-         if (bnum == n) {                                         //if done with all blocks >= block n
-            cout << setw(10) << bnum << setw(16) << file_pos << setw(16) << file_pos-pos_delta << '\n';
-            EOS_ASSERT( index_start==0, block_log_exception, "block ${n} found with unexpected index_start ${s}", ("n",n) ("s",index_start));
-            EOS_ASSERT( pos==td.fpos0, block_log_exception, "block ${n} found at unexpected file position ${p}", ("n",n) ("p",file_pos));
-            status = fseek(blk_out, pos - pos_delta, SEEK_SET);
-            EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", index_out_filename.string())("pos", pos - pos_delta) );
-            size = fwrite((void*)buf, last_buf_len, 1, blk_out);
-            EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", block_out_filename.string()) );
-            break;
-         } else {
-            blk_base -= (buf_len >> 3);
-            cout << "******filling index buf blk_base " << blk_base << " fpos_len " << buf_len << '\n';//debug
-         }
-      }
-
-      if (index_start <= 0) {                                     //if buf is ready to write (all file pos are updated)
-         //cout << "index_start = " << index_start << " so write buf len " << last_buf_len << " bnum= " << bnum << '\n';//debug
-         EOS_ASSERT(file_pos > td.fpos0, block_log_exception, "reverse scan of ${file} did not halt at block ${n}", ("file", td.block_file_name.string())("n",n));
-         status = fseek(blk_out, pos - pos_delta, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", block_out_filename.string())("pos", pos - pos_delta) );
-         size = fwrite((void*)buf, last_buf_len, 1, blk_out);
-         EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", block_out_filename.string()) );
-         last_buf_len = (pos - td.fpos0 > buf_len) ? buf_len : pos - td.fpos0;
-         pos -= last_buf_len;
-         index_start += last_buf_len;
-         //cout << "seek blocks to " << pos << " read " << last_buf_len << " bytes\n";//debug
-         status = fseek(td.blk_in, pos, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", pos) );
-         did_read = fread((void*)buf, last_buf_len, 1, td.blk_in);           //read next buf from blocklog
-         EOS_ASSERT(did_read == 1, block_log_exception, "${file} read fails", ("file", td.index_file_name.string()));
-      }
-
-      index_end = index_start - sizeof(uint64_t);                 //move to prior block in buf
-      --bnum;
-
-      if (index_end < 0) {                                        //the file pos record straddles buf boundary
-         cout << "****  index_end= " << index_end << " so save buf-4K len= " << last_buf_len-fk << " bnum= " << bnum << '\n';//debug
-         status = fseek(blk_out, pos - pos_delta + fk, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", index_out_filename.string())("pos", pos - pos_delta + fk) );
-         size = fwrite((void*)(buf + fk), last_buf_len - fk, 1, blk_out);             //skip first 4K of buf write out the rest
-         EOS_ASSERT( size == 1, block_log_exception, "${file} write fails", ("file", index_out_filename.string()) );
-         last_buf_len = (pos - td.fpos0 >= buf_len - fk) ? buf_len - fk : pos - td.fpos0;   //bytes to read from blk_in
-         memcpy(buf + last_buf_len, buf, fk);                     //move first 4K of buf after zone will read
-         pos-= last_buf_len;
-         index_end += last_buf_len;
-         cout << "seek blocks to " << pos << " read " << last_buf_len << " bytes before saved 4k\n";//debug
-         status = fseek(td.blk_in, pos, SEEK_SET);
-         EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from end of file", ("file", td.block_file_name.string())("pos", pos) );
-         did_read = fread(buf, last_buf_len, 1, td.blk_in);
-         EOS_ASSERT(did_read == 1, block_log_exception, "${file} read fails", ("file", td.block_file_name.string()) );
-         last_buf_len += fk;                                       //bytes in buf will eventually write to disk
-      }
-   }
-
-   fclose(blk_out);
-   fclose(ind_out);
-   bfs::path old_log = block_dir / "old.log";
-   bfs::path old_ind = block_dir / "old.index";
-   rename(td.block_file_name, old_log);
-   rename(td.index_file_name, old_ind);
-   rename(block_out_filename, td.block_file_name);
-   rename(index_out_filename, td.index_file_name);
-   cout << "The new " << td.block_file_name << " and " << td.index_file_name << " files contain blocks " << n << " through " << td.last_block << '\n';
-   cout << "The original (before trim front) files have been renamed to " << old_log << " and " << old_ind << ".\n";
+   const bool status = block_log::trim_blocklog_front(block_dir, n);
    rt.report();
-   return 0;
+   return status;
 }
 
 

From f071dc9f97a5272c8135b2a39655a4795f6808fa Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Mon, 30 Sep 2019 16:47:21 -0500
Subject: [PATCH 1411/1648] Added integration tests for trimming front of block
 log. GH #7939

---
 tests/block_log_util_test.py | 75 +++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/tests/block_log_util_test.py b/tests/block_log_util_test.py
index 2d0a292b7f2..1278808c50b 100755
--- a/tests/block_log_util_test.py
+++ b/tests/block_log_util_test.py
@@ -22,6 +22,16 @@
 
 from core_symbol import CORE_SYMBOL
 
+def verifyBlockLog(expected_block_num, trimmedBlockLog):
+    firstBlockNum = expected_block_num
+    for block in trimmedBlockLog:
+        assert 'block_num' in block, print("ERROR: eosio-blocklog didn't return block output")
+        block_num = block['block_num']
+        assert block_num == expected_block_num
+        expected_block_num += 1
+    Print("Block_log contiguous from block number %d to %d" % (firstBlockNum, expected_block_num - 1))
+
+
 appArgs=AppArgs()
 args = TestHelper.parse_args({"--dump-error-details","--keep-logs","-v","--leave-running","--clean-run"})
 Utils.Debug=args.v
@@ -33,7 +43,7 @@
 prodCount=2
 killAll=args.clean_run
 walletPort=TestHelper.DEFAULT_WALLET_PORT
-totalNodes=pnodes
+totalNodes=pnodes+1
 
 walletMgr=WalletMgr(True, port=walletPort)
 testSuccessful=False
@@ -130,6 +140,69 @@ def checkBlockLog(blockLog, blockNumsToFind, firstBlockNum=1):
     Print("Block num %d will definitely be at least one block behind the most recent entry in block log, so --trim will work" % (beforeEndOfBlockLog))
     output=cluster.getBlockLog(0, blockLogAction=BlockLogAction.trim, last=beforeEndOfBlockLog, throwException=True)
 
+    Print("Kill the non production node, we want to verify its block log")
+    cluster.getNode(2).kill(signal.SIGTERM)
+
+    Print("Trim off block num 1 to remove genesis block from block log.")
+    output=cluster.getBlockLog(2, blockLogAction=BlockLogAction.trim, first=2, throwException=True)
+
+    Print("Smoke test the trimmed block log.")
+    output=cluster.getBlockLog(2, blockLogAction=BlockLogAction.smoke_test)
+
+    Print("Analyze block log.")
+    trimmedBlockLog=cluster.getBlockLog(2, blockLogAction=BlockLogAction.return_blocks)
+
+    verifyBlockLog(2, trimmedBlockLog)
+
+    # relaunch the node with the truncated block log and ensure it catches back up with the producers
+    current_head_block_num = node1.getInfo()["head_block_num"]
+    cluster.getNode(2).relaunch(2, cachePopen=True)
+    assert cluster.getNode(2).waitForBlock(current_head_block_num, timeout=60, reportInterval=15)
+
+    # ensure it continues to advance
+    current_head_block_num = node1.getInfo()["head_block_num"]
+    assert cluster.getNode(2).waitForBlock(current_head_block_num, timeout=60, reportInterval=15)
+    info = cluster.getNode(2).getInfo()
+    block = cluster.getNode(2).getBlock(2)
+    assert block is not None
+    block = cluster.getNode(2).getBlock(1, silentErrors=True)
+    assert block is None
+
+    # verify it shuts down cleanly
+    cluster.getNode(2).interruptAndVerifyExitStatus()
+
+    firstBlock = info["last_irreversible_block_num"]
+    Print("Trim off block num %s." % (firstBlock))
+    output=cluster.getBlockLog(2, blockLogAction=BlockLogAction.trim, first=firstBlock, throwException=True)
+
+    Print("Smoke test the trimmed block log.")
+    output=cluster.getBlockLog(2, blockLogAction=BlockLogAction.smoke_test)
+
+    Print("Analyze block log.")
+    trimmedBlockLog=cluster.getBlockLog(2, blockLogAction=BlockLogAction.return_blocks)
+
+    verifyBlockLog(firstBlock, trimmedBlockLog)
+
+    # relaunch the node with the truncated block log and ensure it catches back up with the producers
+    current_head_block_num = node1.getInfo()["head_block_num"]
+    assert current_head_block_num >= info["head_block_num"]
+    cluster.getNode(2).relaunch(2, cachePopen=True)
+    assert cluster.getNode(2).waitForBlock(current_head_block_num, timeout=60, reportInterval=15)
+
+    # ensure it continues to advance
+    current_head_block_num = node1.getInfo()["head_block_num"]
+    assert cluster.getNode(2).waitForBlock(current_head_block_num, timeout=60, reportInterval=15)
+    info = cluster.getNode(2).getInfo()
+    block = cluster.getNode(2).getBlock(firstBlock)
+    assert block is not None
+    block = cluster.getNode(2).getBlock(firstBlock - 1, silentErrors=True)
+    assert block is None
+    block = cluster.getNode(2).getBlock(1, silentErrors=True)
+    assert block is None
+
+    # verify it shuts down cleanly
+    cluster.getNode(2).interruptAndVerifyExitStatus()
+
     testSuccessful=True
 
 finally:

From c5d06dd5d01c39eb71339006110fe5b00cbbb929 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 30 Sep 2019 18:45:42 -0400
Subject: [PATCH 1412/1648] ensure eos-vm-oc headers get installed

---
 libraries/chain/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 1145579f25a..c4b359b11f5 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -142,7 +142,7 @@ install( TARGETS eosio_chain
 )
 install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/eosio/chain/
       DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/chain
-      FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" PATTERN "webassembly" EXCLUDE
+      FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" EXCLUDE
 )
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/eosio/chain/core_symbol.hpp DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/chain)
 #if(MSVC)

From 4e9431da2e1400d04896ce90f46f4e7a3fefc3a9 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 1 Oct 2019 10:11:48 -0500
Subject: [PATCH 1413/1648] Added comments and cleanup. GH #7939

---
 libraries/chain/block_log.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 0f037762f5e..de18f2a9073 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -969,6 +969,7 @@ namespace eosio { namespace chain {
       }
       original_block_log.find_block_pos(truncate_at_block);
 
+      // ****** create the new block log file and write out the header for the file
       fc::path new_block_filename = block_dir / "blocks.out";
       if (fc::remove(new_block_filename)) {
          ilog("Removing old blocks.out file");
@@ -990,31 +991,45 @@ namespace eosio { namespace chain {
       new_block_file.write((char*)&totem, sizeof(totem));
 
       const auto new_block_file_first_block_pos = new_block_file.tellp();
+      // ****** end of new block log header
+
 
       // copy over remainder of block log to new block log
-      auto buffer =  make_unique<char[]>(detail::reverse_iterator::_buf_len);                   //read big chunks of old blocks.log into this buffer
+      auto buffer =  make_unique<char[]>(detail::reverse_iterator::_buf_len);
       char* buf =  buffer.get();
 
-      const uint64_t pos_delta = original_block_log.fpos0 - new_block_file_first_block_pos;     // offset bytes to shift from old blocklog to new blocklog
+      // offset bytes to shift from old blocklog position to new blocklog position
+      const uint64_t pos_delta = original_block_log.fpos0 - new_block_file_first_block_pos;
       auto status = fseek(original_block_log.blk_in, 0, SEEK_END);
       EOS_ASSERT( status == 0, block_log_exception, "blocks.log seek failed" );
+
+      // all blocks to copy to the new blocklog
       const uint64_t to_write = ftell(original_block_log.blk_in) - original_block_log.fpos0;
       const auto pos_size = sizeof(uint64_t);
+
+      // start with the last block's position stored at the end of the block
       uint64_t original_pos = ftell(original_block_log.blk_in) - pos_size;
 
-      fc::path new_index_filename = block_dir / "index.out";
       const auto num_blocks = original_block_log.last_block - truncate_at_block + 1;
+
+      fc::path new_index_filename = block_dir / "index.out";
       detail::index_writer index(new_index_filename, num_blocks);
+
       uint64_t read_size = 0;
       for(uint64_t written = to_write; written > 0; written -= read_size) {
          read_size = to_write;
          if (read_size > detail::reverse_iterator::_buf_len) {
             read_size = detail::reverse_iterator::_buf_len;
          }
+
+         // read in the previous contiguous memory into the read buffer
          const auto start_of_blk_buffer_pos = original_block_log.fpos0 + to_write - read_size;
          status = fseek(original_block_log.blk_in, start_of_blk_buffer_pos, SEEK_SET);
          const auto num_read = fread(buf, read_size, 1, original_block_log.blk_in);
          EOS_ASSERT( num_read == 1, block_log_exception, "blocks.log read failed" );
+
+         // walk this memory section to adjust block position to match the adjusted location
+         // of the block start and store in the new index file
          while(original_pos >= start_of_blk_buffer_pos) {
             const auto buffer_index = original_pos - start_of_blk_buffer_pos;
             uint64_t& pos_content = *(uint64_t*)(buf + buffer_index);

From ca6e78b8195f6f0dd525691db1c5daaf950e4589 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 1 Oct 2019 10:49:45 -0500
Subject: [PATCH 1414/1648] Retain persisted trx until expired on speculative
 nodes

---
 .../include/eosio/chain/unapplied_transaction_queue.hpp    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
index d052e2a3614..f32498dffc4 100644
--- a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
+++ b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -125,7 +125,12 @@ class unapplied_transaction_queue {
       for( const auto& receipt : bs->block->transactions ) {
          if( receipt.trx.contains<packed_transaction>() ) {
             const auto& pt = receipt.trx.get<packed_transaction>();
-            idx.erase( pt.id() );
+            auto itr = queue.get<by_trx_id>().find( pt.id() );
+            if( itr != queue.get<by_trx_id>().end() ) {
+               if( itr->trx_type != trx_enum_type::persisted ) {
+                  idx.erase( pt.id() );
+               }
+            }
          }
       }
    }

From 28a9fde5b1c60f793a1ecde186a68f61564a0145 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 1 Oct 2019 20:38:30 -0400
Subject: [PATCH 1415/1648] get the linker order right for eosio tester cmakes

---
 CMakeModules/EosioTester.cmake.in      | 4 +++-
 CMakeModules/EosioTesterBuild.cmake.in | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index f0e45ee5c4a..dc9242dcdc6 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -79,7 +79,6 @@ find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
 macro(add_eosio_test_executable test_name)
    add_executable( ${test_name} ${ARGN} )
    target_link_libraries( ${test_name}
-       ${LLVM_LIBS}
        ${libtester}
        ${libchain}
        ${libfc}
@@ -103,6 +102,9 @@ macro(add_eosio_test_executable test_name)
        ${Boost_CHRONO_LIBRARY}
        ${Boost_IOSTREAMS_LIBRARY}
        ${Boost_DATE_TIME_LIBRARY}
+
+       ${LLVM_LIBS}
+
        ${PLATFORM_SPECIFIC_LIBS}
       )
 
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index 954b0cd645d..390f9e5e6b9 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -78,7 +78,6 @@ find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
 macro(add_eosio_test_executable test_name)
    add_executable( ${test_name} ${ARGN} )
    target_link_libraries( ${test_name}
-       ${LLVM_LIBS}
        ${libtester}
        ${libchain}
        ${libfc}
@@ -102,6 +101,9 @@ macro(add_eosio_test_executable test_name)
        ${Boost_CHRONO_LIBRARY}
        ${Boost_IOSTREAMS_LIBRARY}
        ${Boost_DATE_TIME_LIBRARY}
+
+       ${LLVM_LIBS}
+
        ${PLATFORM_SPECIFIC_LIBS}
       )
 

From a59995d70772db04a7e8ab1f6c686baa424870a4 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 1 Oct 2019 20:43:16 -0400
Subject: [PATCH 1416/1648] when linking with a libchain containing EOS-VM OC,
 need to wrap main

---
 CMakeModules/EosioTester.cmake.in      | 7 +++++++
 CMakeModules/EosioTesterBuild.cmake.in | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index dc9242dcdc6..b43f3740d78 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -76,6 +76,11 @@ find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
     DOC "Path to the GMP library"
 )
 
+set(EOSIO_WASM_RUNTIMES @EOSIO_WASM_RUNTIMES@)
+if("eos-vm-oc" IN_LIST EOSIO_WASM_RUNTIMES)
+   set(WRAP_MAIN "-Wl,-wrap=main")
+endif()
+
 macro(add_eosio_test_executable test_name)
    add_executable( ${test_name} ${ARGN} )
    target_link_libraries( ${test_name}
@@ -106,6 +111,8 @@ macro(add_eosio_test_executable test_name)
        ${LLVM_LIBS}
 
        ${PLATFORM_SPECIFIC_LIBS}
+
+       ${WRAP_MAIN}
       )
 
    target_include_directories( ${test_name} PUBLIC
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index 390f9e5e6b9..54d5a3d7a8d 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -75,6 +75,11 @@ find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
     DOC "Path to the GMP library"
 )
 
+set(EOSIO_WASM_RUNTIMES @EOSIO_WASM_RUNTIMES@)
+if("eos-vm-oc" IN_LIST EOSIO_WASM_RUNTIMES)
+   set(WRAP_MAIN "-Wl,-wrap=main")
+endif()
+
 macro(add_eosio_test_executable test_name)
    add_executable( ${test_name} ${ARGN} )
    target_link_libraries( ${test_name}
@@ -105,6 +110,8 @@ macro(add_eosio_test_executable test_name)
        ${LLVM_LIBS}
 
        ${PLATFORM_SPECIFIC_LIBS}
+
+       ${WRAP_MAIN}
       )
 
    target_include_directories( ${test_name} PUBLIC

From 84c6ba5ce885c7be8cc9fae9397acee85a5ab75b Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 2 Oct 2019 09:30:13 -0400
Subject: [PATCH 1417/1648] &> /dev/null -> 1> /dev/null so we can see errors

---
 .cicd/submodule-regression-check.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh
index 9befa9d0728..47b4bcacc4b 100755
--- a/.cicd/submodule-regression-check.sh
+++ b/.cicd/submodule-regression-check.sh
@@ -20,8 +20,8 @@ while read -r a b; do
 done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
 
 echo "getting submodule info for $BASE_BRANCH"
-git checkout $BASE_BRANCH &> /dev/null
-git submodule update --init &> /dev/null
+git checkout $BASE_BRANCH 1> /dev/null
+git submodule update --init 1> /dev/null
 while read -r a b; do
     BASE_MAP[$a]=$b
 done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --format=%ct`')
@@ -29,13 +29,13 @@ done < <(git submodule --quiet foreach --recursive 'echo $path `git log -1 --for
 # We need to switch back to the PR ref/head so we can git log properly
 if [[ $TRAVIS == true && ! -z $TRAVIS_PULL_REQUEST_SLUG ]]; then
     echo "git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge:"
-    git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge: &> /dev/null
+    git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge: 1> /dev/null
     echo "switching back to $TRAVIS_COMMIT"
     echo 'git checkout -qf FETCH_HEAD'
-    git checkout -qf FETCH_HEAD &> /dev/null
+    git checkout -qf FETCH_HEAD 1> /dev/null
 elif [[ $BUILDKITE == true ]]; then
     echo "switching back to $CURRENT_BRANCH"
-    git checkout -f $CURRENT_BRANCH &> /dev/null
+    git checkout -f $CURRENT_BRANCH 1> /dev/null
 fi
 
 for k in "${!BASE_MAP[@]}"; do

From 79e6396646fa7cc5d55d9a69172dc25b90dc7e8f Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Wed, 2 Oct 2019 10:54:18 -0500
Subject: [PATCH 1418/1648] Replaced cached trim_data variables with methods
 that determine those values. GH #7939

---
 libraries/chain/block_log.cpp                 | 93 +++++++++----------
 .../chain/include/eosio/chain/block_log.hpp   |  7 +-
 programs/eosio-blocklog/main.cpp              |  8 +-
 3 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index de18f2a9073..06f4c2901f6 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -157,15 +157,17 @@ namespace eosio { namespace chain {
          explicit fileptr_datastream( FILE* file, const std::string& filename ) : _file(file), _filename(filename) {}
 
          void skip( size_t s ) {
-            std::vector<char> d( s );
-            read( &d[0], s );
+            auto status = fseek(_file, s, SEEK_SET);
+            EOS_ASSERT( status == 0, block_log_exception,
+                        "Could not seek past ${bytes} bytes in Block log file at '${blocks_log}'. Returned status: ${status}",
+                        ("bytes", s)("blocks_log", _filename)("status", status) );
          }
 
          bool read( char* d, size_t s ) {
             size_t result = fread( d, 1, s, _file );
             EOS_ASSERT( result == s, block_log_exception,
-                        "in file: ${file} only able to read ${act} of the expected ${exp}",
-                        ("file", _filename)("act",result)("exp",s) );
+                        "only able to read ${act} bytes of the expected ${exp} bytes in file: ${file}",
+                        ("act",result)("exp",s)("file", _filename) );
             return true;
          }
 
@@ -967,7 +969,6 @@ namespace eosio { namespace chain {
          ilog("All blocks are before block ${n} so do nothing (trim front would delete entire blocks.log).", ("n", truncate_at_block));
          return false;
       }
-      original_block_log.find_block_pos(truncate_at_block);
 
       // ****** create the new block log file and write out the header for the file
       fc::path new_block_filename = block_dir / "blocks.out";
@@ -978,13 +979,14 @@ namespace eosio { namespace chain {
       new_block_file.set_file_path(new_block_filename);
       new_block_file.open( LOG_WRITE_C );
 
-      static_assert( block_log::max_supported_version > 0, "a version number of zero is not supported" );
+      static_assert( block_log::max_supported_version == 3,
+                     "Code was written to support version 3 format, need to update this code for latest format." );
       uint32_t version = block_log::max_supported_version;
       new_block_file.seek(0);
       new_block_file.write((char*)&version, sizeof(version));
       new_block_file.write((char*)&truncate_at_block, sizeof(truncate_at_block));
 
-      new_block_file << *original_block_log.chain_id;
+      new_block_file << original_block_log.chain_id;
 
       // append a totem to indicate the division between blocks and header
       auto totem = block_log::npos;
@@ -999,12 +1001,13 @@ namespace eosio { namespace chain {
       char* buf =  buffer.get();
 
       // offset bytes to shift from old blocklog position to new blocklog position
-      const uint64_t pos_delta = original_block_log.fpos0 - new_block_file_first_block_pos;
+      const uint64_t original_file_block_pos = original_block_log.block_pos(truncate_at_block);
+      const uint64_t pos_delta = original_file_block_pos - new_block_file_first_block_pos;
       auto status = fseek(original_block_log.blk_in, 0, SEEK_END);
       EOS_ASSERT( status == 0, block_log_exception, "blocks.log seek failed" );
 
       // all blocks to copy to the new blocklog
-      const uint64_t to_write = ftell(original_block_log.blk_in) - original_block_log.fpos0;
+      const uint64_t to_write = ftell(original_block_log.blk_in) - original_file_block_pos;
       const auto pos_size = sizeof(uint64_t);
 
       // start with the last block's position stored at the end of the block
@@ -1023,7 +1026,7 @@ namespace eosio { namespace chain {
          }
 
          // read in the previous contiguous memory into the read buffer
-         const auto start_of_blk_buffer_pos = original_block_log.fpos0 + to_write - read_size;
+         const auto start_of_blk_buffer_pos = original_file_block_pos + to_write - read_size;
          status = fseek(original_block_log.blk_in, start_of_blk_buffer_pos, SEEK_SET);
          const auto num_read = fread(buf, read_size, 1, original_block_log.blk_in);
          EOS_ASSERT( num_read == 1, block_log_exception, "blocks.log read failed" );
@@ -1069,7 +1072,7 @@ namespace eosio { namespace chain {
       EOS_ASSERT( ind_in != nullptr, block_log_not_found, "cannot read file ${file}", ("file",index_file_name.string()) );
       auto size = fread((void*)&version,sizeof(version), 1, blk_in);
       EOS_ASSERT( size == 1, block_log_unsupported_version, "invalid format for file ${file}", ("file",block_file_name.string()));
-      cout << "block log version= " << version << '\n';
+      ilog("block log version= ${version}",("version",version));
       EOS_ASSERT( block_log::is_supported_version(version), block_log_unsupported_version, "block log version ${v} is not supported", ("v",version));
 
       detail::fileptr_datastream ds(blk_in, block_file_name.string());
@@ -1089,14 +1092,13 @@ namespace eosio { namespace chain {
             chain_id = gs.compute_chain_id();
          }
          else if (block_log::contains_chain_id(version, first_block)) {
-            chain_id = chain_id_type{};
-            ds >> *chain_id;
+            ds >> chain_id;
          }
          else {
-            EOS_ASSERT( false, block_log_exception,
-                        "Block log ${file} is not supported. version: ${ver} and first_block: ${first_block} does not contain "
-                        "a genesis_state nor a chain_id.",
-                        ("file", block_file_name.string())("ver", version)("first_block", first_block));
+            EOS_THROW( block_log_exception,
+                       "Block log ${file} is not supported. version: ${ver} and first_block: ${first_block} does not contain "
+                       "a genesis_state nor a chain_id.",
+                       ("file", block_file_name.string())("ver", version)("first_block", first_block));
          }
 
          const auto expected_totem = block_log::npos;
@@ -1117,13 +1119,12 @@ namespace eosio { namespace chain {
                  "indicates the first block is at ${index}",
                  ("file", block_file_name.string())("determined", start_of_blocks)("index",first_block_pos));
 
-      cout << "first block= " << first_block << '\n';
+      ilog("first block= ${first}",("first",first_block));
       const auto status = fseek(ind_in, 0, SEEK_END);                //get length of blocks.index (gives number of blocks)
       EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} end", ("file", index_file_name.string()) );
-      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} end", ("file", index_file_name.string()) );
       const uint64_t file_end = ftell(ind_in);                //get length of blocks.index (gives number of blocks)
       last_block = first_block + file_end/sizeof(uint64_t) - 1;
-      cout << "last block=  " << last_block << '\n';
+      ilog("last block= ${first}",("first",first_block));
    }
 
    trim_data::~trim_data() {
@@ -1133,9 +1134,21 @@ namespace eosio { namespace chain {
          fclose(ind_in);
    }
 
+   uint64_t trim_data::block_index(uint32_t n) const {
+      using namespace std;
+      EOS_ASSERT( n <= last_block, block_log_exception,
+                  "cannot seek in ${file} to block number ${b}, block number ${last} is the last block",
+                  ("file", index_file_name.string())("b",n)("last",last_block) );
+      return sizeof(uint64_t) * (n - first_block);
+   }
+
    uint64_t trim_data::block_pos(uint32_t n) {
       using namespace std;
-      index_pos = sizeof(uint64_t) * (n - first_block);
+      // can indicate the location of the block after the last block
+      if (n == last_block + 1) {
+         return ftell(blk_in);
+      }
+      const uint64_t index_pos = sizeof(uint64_t) * (n - first_block);
       auto status = fseek(ind_in, index_pos, SEEK_SET);
       EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file for block ${b}", ("file", index_file_name.string())("pos", index_pos)("b",n) );
       const uint64_t pos = ftell(ind_in);
@@ -1143,40 +1156,22 @@ namespace eosio { namespace chain {
       uint64_t block_n_pos;
       auto size = fread((void*)&block_n_pos, sizeof(block_n_pos), 1, ind_in);                   //filepos of block n
       EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}", ("file", index_file_name.string())("b",n) );
-      return block_n_pos;
-   }
 
-   void trim_data::find_block_pos(uint32_t n) {
-      //get file position of block n from blocks.index then confirm block n is found in blocks.log at that position
-      //sets fpos0 and fpos1, throws exception if block at fpos0 is not block n
-      using namespace std;
-      auto temp = block_pos(first_block);
-      fpos0 = block_pos(n);
-      auto size = fread((void*)&fpos1, sizeof(fpos1), 1, ind_in);                   //filepos of block n+1
-      if (n != last_block)
-         EOS_ASSERT( size == 1, block_log_exception, "cannot read ${file} entry for block ${b}, size=${size}",
-                     ("file", index_file_name.string())("b",n + 1)("size",size) );
-
-      cout << "According to blocks.index:\n";
-      cout << "    block " << n << " starts at position " << fpos0 << '\n';
-      cout << "    block " << n + 1;
-
-      if (n != last_block)
-         cout << " starts at position " << fpos1 << '\n';
-      else
-         cout << " is past end\n";
-
-      //read blocks.log and verify block number n is found at file position fpos0
-      auto status = fseek(blk_in, fpos0 + blknum_offset, SEEK_SET);
-      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", fpos0 + blknum_offset) );
+      //read blocks.log and verify block number n is found at the determined file position
+      const auto calc_blknum_pos = block_n_pos + blknum_offset;
+      status = fseek(blk_in, calc_blknum_pos, SEEK_SET);
+      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", calc_blknum_pos) );
       const uint64_t block_offset_pos = ftell(blk_in);
-      EOS_ASSERT( block_offset_pos == fpos0 + blknum_offset, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", fpos0 + blknum_offset) );
+      EOS_ASSERT( block_offset_pos == calc_blknum_pos, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file", ("file", block_file_name.string())("pos", calc_blknum_pos) );
       uint32_t prior_blknum;
       size = fread((void*)&prior_blknum, sizeof(prior_blknum), 1, blk_in);     //read bigendian block number of prior block
       EOS_ASSERT( size == 1, block_log_exception, "cannot read prior block");
       const uint32_t bnum = fc::endian_reverse_u32(prior_blknum) + 1;          //convert to little endian, add 1 since prior block
-      cout << "At position " << fpos0 << " in " << index_file_name.generic_string() << " find block " << bnum << (bnum == n ? " as expected\n": " - not good!\n");
-      EOS_ASSERT( bnum == n, block_log_exception, "${index} does not agree with ${blocks}", ("index", index_file_name.string())("blocks", block_file_name.string()) );
+      EOS_ASSERT( bnum == n, block_log_exception,
+                  "At position ${pos} in ${file} expected to find ${exp_bnum} but found ${act_bnum}",
+                  ("pos",block_offset_pos)("file", block_file_name.string())("exp_bnum",n)("act_bnum",bnum) );
+
+      return block_n_pos;
    }
 
    } } /// eosio::chain
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index db7f3c00b7b..31a44d7d5d9 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -97,7 +97,7 @@ namespace eosio { namespace chain {
    struct trim_data {            //used by trim_blocklog_front(), trim_blocklog_end(), and smoke_test()
       trim_data(fc::path block_dir);
       ~trim_data();
-      void find_block_pos(uint32_t n);
+      uint64_t block_index(uint32_t n) const;
       uint64_t block_pos(uint32_t n);
       fc::path block_file_name, index_file_name;        //full pathname for blocks.log and blocks.index
       uint32_t version = 0;                              //blocklog version
@@ -106,11 +106,8 @@ namespace eosio { namespace chain {
       FILE* blk_in = nullptr;                            //C style files for reading blocks.log and blocks.index
       FILE* ind_in = nullptr;                            //C style files for reading blocks.log and blocks.index
       //we use low level file IO because it is distinctly faster than C++ filebuf or iostream
-      uint64_t index_pos = 0;                            //filepos in blocks.index for block n, +8 for block n+1
-      uint64_t fpos0 = 0;                                //filepos in blocks.log for block n and block n+1
-      uint64_t fpos1 = 0;                                //filepos in blocks.log for block n and block n+1
       uint64_t first_block_pos = 0;                      //file position in blocks.log for the first block in the log
-      fc::optional<chain_id_type> chain_id;
+      chain_id_type chain_id;
 
       static constexpr int blknum_offset{14};            //offset from start of block to 4 byte block number, valid for the only allowed versions
    };
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 55e2b4939a1..9da73c7698b 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -222,9 +222,9 @@ int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block
       cerr << "There are no blocks after block " << n << " so do nothing\n";
       return 2;
    }
-   td.find_block_pos(n);
-   bfs::resize_file(td.block_file_name, td.fpos1);
-   uint64_t index_end= td.index_pos + sizeof(uint64_t);             //advance past record for block n
+   const uint64_t end_of_new_file = td.block_pos(n + 1);
+   bfs::resize_file(td.block_file_name, end_of_new_file);
+   const uint64_t index_end= td.block_index(n) + sizeof(uint64_t);             //advance past record for block n
    bfs::resize_file(td.index_file_name, index_end);
    cout << "blocks.index has been trimmed to " << index_end << " bytes\n";
    rt.report();
@@ -262,7 +262,7 @@ void smoke_test(bfs::path block_dir) {
    for (uint32_t n = td.first_block; ; n += delta) {
       if (n > td.last_block)
          n = td.last_block;
-      td.find_block_pos(n);                                 //check block 'n' is where blocks.index says
+      td.block_pos(n);                                 //check block 'n' is where blocks.index says
       if (n == td.last_block)
          break;
    }

From 14d758cfe4ff948e8b7c115df70536888defdfd1 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Wed, 2 Oct 2019 12:49:16 -0400
Subject: [PATCH 1419/1648] When using the `set_proposed_producers_ex`
 intrinsic with the new format (`packed_producer_format == 1`) avoid calling
 `valid()` on each of the keys.

---
 libraries/chain/wasm_interface.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 82006fbcdaf..51d3bca1081 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -199,7 +199,7 @@ class privileged_api : public context_aware_api {
          context.control.get_resource_limits_manager().get_account_limits( account, ram_bytes, net_weight, cpu_weight);
       }
 
-      int64_t set_proposed_producers_common( vector<producer_authority> && producers ) {
+      int64_t set_proposed_producers_common( vector<producer_authority> && producers, bool validate_keys ) {
          EOS_ASSERT(producers.size() <= config::max_producers, wasm_execution_error, "Producer schedule exceeds the maximum producer count for this chain");
          EOS_ASSERT( producers.size() > 0
                      || !context.control.is_builtin_activated( builtin_protocol_feature_t::disallow_empty_producer_schedule ),
@@ -214,14 +214,16 @@ class privileged_api : public context_aware_api {
          for (const auto& p: producers) {
             EOS_ASSERT( context.is_account(p.producer_name), wasm_execution_error, "producer schedule includes a nonexisting account" );
 
-            p.authority.visit([&p, num_supported_key_types](const auto& a) {
+            p.authority.visit([&p, num_supported_key_types, validate_keys](const auto& a) {
                uint32_t sum_weights = 0;
                std::set<public_key_type> unique_keys;
                for (const auto& kw: a.keys ) {
                   EOS_ASSERT( kw.key.which() < num_supported_key_types, unactivated_key_type,
                               "Unactivated key type used in proposed producer schedule");
 
-                  EOS_ASSERT( kw.key.valid(), wasm_execution_error, "producer schedule includes an invalid key" );
+                  if( validate_keys ) {
+                     EOS_ASSERT( kw.key.valid(), wasm_execution_error, "producer schedule includes an invalid key" );
+                  }
 
                   if (std::numeric_limits<uint32_t>::max() - sum_weights <= kw.weight) {
                      sum_weights = std::numeric_limits<uint32_t>::max();
@@ -245,7 +247,7 @@ class privileged_api : public context_aware_api {
          return context.control.set_proposed_producers( std::move(producers) );
       }
 
-      int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, uint32_t datalen) {
+      int64_t set_proposed_producers( array_ptr<char> packed_producer_schedule, uint32_t datalen ) {
          datastream<const char*> ds( packed_producer_schedule, datalen );
          vector<producer_authority> producers;
 
@@ -259,10 +261,10 @@ class privileged_api : public context_aware_api {
             producers.emplace_back(producer_authority{ p.producer_name, block_signing_authority_v0{ 1, {{p.block_signing_key, 1}} } } );
          }
 
-         return set_proposed_producers_common(std::move(producers));
+         return set_proposed_producers_common(std::move(producers), true);
       }
 
-      int64_t set_proposed_producers_ex( uint64_t packed_producer_format, array_ptr<char> packed_producer_schedule, uint32_t datalen) {
+      int64_t set_proposed_producers_ex( uint64_t packed_producer_format, array_ptr<char> packed_producer_schedule, uint32_t datalen ) {
          if (packed_producer_format == 0) {
             return set_proposed_producers(packed_producer_schedule, datalen);
          } else if (packed_producer_format == 1) {
@@ -270,7 +272,7 @@ class privileged_api : public context_aware_api {
             vector<producer_authority> producers;
 
             fc::raw::unpack(ds, producers);
-            return set_proposed_producers_common(std::move(producers));
+            return set_proposed_producers_common(std::move(producers), false);
          } else {
             EOS_THROW(wasm_execution_error, "Producer schedule is in an unknown format!");
          }

From 303c839387531f66bb4404922381c76658a98261 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Wed, 2 Oct 2019 13:27:35 -0500
Subject: [PATCH 1420/1648] Added passing in the temp directory for temporary
 storage of new files and eventual storage of old versions. GH #7939

---
 libraries/chain/block_log.cpp                     | 7 ++++---
 libraries/chain/include/eosio/chain/block_log.hpp | 2 +-
 programs/eosio-blocklog/main.cpp                  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 06f4c2901f6..f08e90c9088 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -956,8 +956,9 @@ namespace eosio { namespace chain {
       return std::clamp(version, min_supported_version, max_supported_version) == version;
    }
 
-   bool block_log::trim_blocklog_front(const fc::path& block_dir, uint32_t truncate_at_block) {
+   bool block_log::trim_blocklog_front(const fc::path& block_dir, const fc::path& temp_dir, uint32_t truncate_at_block) {
       using namespace std;
+      EOS_ASSERT( block_dir != temp_dir, block_log_exception, "block_dir and temp_dir need to be different directories" );
       ilog("In directory ${dir} will trim all blocks before block ${n} from blocks.log and blocks.index.",
            ("dir", block_dir.generic_string())("n", truncate_at_block));
       trim_data original_block_log(block_dir);
@@ -971,7 +972,7 @@ namespace eosio { namespace chain {
       }
 
       // ****** create the new block log file and write out the header for the file
-      fc::path new_block_filename = block_dir / "blocks.out";
+      fc::path new_block_filename = temp_dir / "blocks.log";
       if (fc::remove(new_block_filename)) {
          ilog("Removing old blocks.out file");
       }
@@ -1015,7 +1016,7 @@ namespace eosio { namespace chain {
 
       const auto num_blocks = original_block_log.last_block - truncate_at_block + 1;
 
-      fc::path new_index_filename = block_dir / "index.out";
+      fc::path new_index_filename = temp_dir / "blocks.index";
       detail::index_writer index(new_index_filename, num_blocks);
 
       uint64_t read_size = 0;
diff --git a/libraries/chain/include/eosio/chain/block_log.hpp b/libraries/chain/include/eosio/chain/block_log.hpp
index 31a44d7d5d9..5fbe3e771a5 100644
--- a/libraries/chain/include/eosio/chain/block_log.hpp
+++ b/libraries/chain/include/eosio/chain/block_log.hpp
@@ -79,7 +79,7 @@ namespace eosio { namespace chain {
 
          static bool is_supported_version(uint32_t version);
 
-         static bool trim_blocklog_front(const fc::path& block_dir, uint32_t truncate_at_block);
+         static bool trim_blocklog_front(const fc::path& block_dir, const fc::path& temp_dir, uint32_t truncate_at_block);
 
    private:
          void open(const fc::path& data_dir);
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 9da73c7698b..811eb488751 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -233,7 +233,7 @@ int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block
 
 bool trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first block to keep (remove prior blocks)
    report_time rt("trimming blocklog start");
-   const bool status = block_log::trim_blocklog_front(block_dir, n);
+   const bool status = block_log::trim_blocklog_front(block_dir, blocks_dir / "old", n);
    rt.report();
    return status;
 }

From a607f9b743705716d2387327d2dccf884dad5d4f Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Wed, 2 Oct 2019 13:32:48 -0500
Subject: [PATCH 1421/1648] Fixed variable name. GH #7939

---
 programs/eosio-blocklog/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index 811eb488751..bbe368cc96f 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -233,7 +233,7 @@ int trim_blocklog_end(bfs::path block_dir, uint32_t n) {       //n is last block
 
 bool trim_blocklog_front(bfs::path block_dir, uint32_t n) {        //n is first block to keep (remove prior blocks)
    report_time rt("trimming blocklog start");
-   const bool status = block_log::trim_blocklog_front(block_dir, blocks_dir / "old", n);
+   const bool status = block_log::trim_blocklog_front(block_dir, block_dir / "old", n);
    rt.report();
    return status;
 }

From 798bece93554d40ea5e2b5cf46f3f6d13a9f61c1 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Wed, 2 Oct 2019 13:41:23 -0500
Subject: [PATCH 1422/1648] Need to ensure temp directory exists. GH #7939

---
 libraries/chain/block_log.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index f08e90c9088..c7d86205e3c 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -972,6 +972,7 @@ namespace eosio { namespace chain {
       }
 
       // ****** create the new block log file and write out the header for the file
+      fc::create_directories(temp_dir);
       fc::path new_block_filename = temp_dir / "blocks.log";
       if (fc::remove(new_block_filename)) {
          ilog("Removing old blocks.out file");

From 85bbf6c530d4d46e877ea6d692cc4262a02bdc48 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 3 Oct 2019 07:53:03 -0500
Subject: [PATCH 1423/1648] Change default subjective cpu leeway to 9000us from
 3000us and make it configurable

---
 libraries/chain/include/eosio/chain/config.hpp              | 1 +
 libraries/chain/include/eosio/chain/transaction_context.hpp | 2 +-
 plugins/producer_plugin/producer_plugin.cpp                 | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/include/eosio/chain/config.hpp b/libraries/chain/include/eosio/chain/config.hpp
index 37bbde84999..a92e92426d4 100644
--- a/libraries/chain/include/eosio/chain/config.hpp
+++ b/libraries/chain/include/eosio/chain/config.hpp
@@ -69,6 +69,7 @@ const static uint32_t   default_max_block_cpu_usage                 = 200'000; /
 const static uint32_t   default_target_block_cpu_usage_pct          = 10 * percent_1;
 const static uint32_t   default_max_transaction_cpu_usage           = 3*default_max_block_cpu_usage/4; /// max trx cpu usage in microseconds
 const static uint32_t   default_min_transaction_cpu_usage           = 100; /// min trx cpu usage in microseconds (10000 TPS equiv)
+const static uint32_t   default_subjective_cpu_leeway_us            = 9000; /// default subjective cpu leeway in microseconds
 
 const static uint32_t   default_max_trx_lifetime               = 60*60; // 1 hour
 const static uint32_t   default_deferred_trx_expiration_window = 10*60; // 10 minutes
diff --git a/libraries/chain/include/eosio/chain/transaction_context.hpp b/libraries/chain/include/eosio/chain/transaction_context.hpp
index b1962fa6f5e..01cdb7d732f 100644
--- a/libraries/chain/include/eosio/chain/transaction_context.hpp
+++ b/libraries/chain/include/eosio/chain/transaction_context.hpp
@@ -126,7 +126,7 @@ namespace eosio { namespace chain {
          bool                          enforce_whiteblacklist = true;
 
          fc::time_point                deadline = fc::time_point::maximum();
-         fc::microseconds              leeway = fc::microseconds(3000);
+         fc::microseconds              leeway = fc::microseconds( config::default_subjective_cpu_leeway_us );
          int64_t                       billed_cpu_time_us = 0;
          bool                          explicit_billed_cpu_time = false;
 
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index b5b3fb41691..0b8d1292931 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -652,6 +652,8 @@ void producer_plugin::set_program_options(
           "offset of last block producing time in microseconds. Negative number results in blocks to go out sooner, and positive number results in blocks to go out later")
          ("max-scheduled-transaction-time-per-block-ms", boost::program_options::value<int32_t>()->default_value(100),
           "Maximum wall-clock time, in milliseconds, spent retiring scheduled transactions in any block before returning to normal transaction processing.")
+         ("subjective-cpu-leeway-us", boost::program_options::value<int32_t>()->default_value( config::default_subjective_cpu_leeway_us ),
+          "Amount of cpu to allow transaction to consume when account has exhausted cpu.")
          ("incoming-defer-ratio", bpo::value<double>()->default_value(1.0),
           "ratio between incoming transations and deferred transactions when both are exhausted")
          ("incoming-transaction-queue-size-mb", bpo::value<uint16_t>()->default_value( 1024 ),
@@ -795,6 +797,10 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
 
    my->_max_scheduled_transaction_time_per_block_ms = options.at("max-scheduled-transaction-time-per-block-ms").as<int32_t>();
 
+   if( options.at( "subjective-cpu-leeway-us" ).as<int32_t>() != config::default_subjective_cpu_leeway_us ) {
+      chain.set_subjective_cpu_leeway( fc::microseconds( options.at( "subjective-cpu-leeway-us" ).as<int32_t>() ) );
+   }
+
    my->_max_transaction_time_ms = options.at("max-transaction-time").as<int32_t>();
 
    my->_max_irreversible_block_age_us = fc::seconds(options.at("max-irreversible-block-age").as<int32_t>());

From 72072d80b123d6b4d948f5f8a3e54f1eb0f1a30c Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jeffreyssmith2nd@gmail.com>
Date: Thu, 3 Oct 2019 09:13:12 -0400
Subject: [PATCH 1424/1648] Add optional ability to disable WASM Spec Tests

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e26c7f3f74..48a0436a267 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,10 @@ add_subdirectory( scripts )
 add_subdirectory( unittests )
 add_subdirectory( tests )
 add_subdirectory( tools )
+
+if (NOT DISABLE_WASM_SPEC_TESTS)
 add_subdirectory( eosio-wasm-spec-tests/generated-tests )
+endif()
 
 install_directory_permissions(DIRECTORY ${CMAKE_INSTALL_FULL_SYSCONFDIR}/eosio)
 

From 14920bc4899dbe5794a4c1cd76cd2af6e7a626f5 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 3 Oct 2019 08:31:44 -0500
Subject: [PATCH 1425/1648] Change assert that always failed to EOS_THROW. GH
 #7939

---
 libraries/chain/block_log.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index c7d86205e3c..3919c9cc190 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -591,10 +591,10 @@ namespace eosio { namespace chain {
          new_block_stream << chain_id;
       }
       else {
-         EOS_ASSERT( false, block_log_exception,
-                     "Block log ${file} is not supported. version: ${ver} and first_block_num: ${fbn} does not contain "
-                     "a genesis_state nor a chain_id.",
-                     ("file", (backup_dir / "blocks.log").generic_string())("ver", version)("fbn", first_block_num));
+         EOS_THROW( block_log_exception,
+                    "Block log ${file} is not supported. version: ${ver} and first_block_num: ${fbn} does not contain "
+                    "a genesis_state nor a chain_id.",
+                    ("file", (backup_dir / "blocks.log").generic_string())("ver", version)("fbn", first_block_num));
       }
 
       if (version != 1) {

From 42f1bc9e4de73cad9b608bf6be334030bff47f2c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 3 Oct 2019 09:01:09 -0500
Subject: [PATCH 1426/1648] Update subjective-cpu-leeway-us description and set
 default_subjective_cpu_leeway_us to 31ms

---
 libraries/chain/include/eosio/chain/config.hpp | 2 +-
 plugins/producer_plugin/producer_plugin.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/config.hpp b/libraries/chain/include/eosio/chain/config.hpp
index a92e92426d4..6c92a7e3da5 100644
--- a/libraries/chain/include/eosio/chain/config.hpp
+++ b/libraries/chain/include/eosio/chain/config.hpp
@@ -69,7 +69,7 @@ const static uint32_t   default_max_block_cpu_usage                 = 200'000; /
 const static uint32_t   default_target_block_cpu_usage_pct          = 10 * percent_1;
 const static uint32_t   default_max_transaction_cpu_usage           = 3*default_max_block_cpu_usage/4; /// max trx cpu usage in microseconds
 const static uint32_t   default_min_transaction_cpu_usage           = 100; /// min trx cpu usage in microseconds (10000 TPS equiv)
-const static uint32_t   default_subjective_cpu_leeway_us            = 9000; /// default subjective cpu leeway in microseconds
+const static uint32_t   default_subjective_cpu_leeway_us            = 31000; /// default subjective cpu leeway in microseconds
 
 const static uint32_t   default_max_trx_lifetime               = 60*60; // 1 hour
 const static uint32_t   default_deferred_trx_expiration_window = 10*60; // 10 minutes
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 0b8d1292931..d47339bc40e 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -653,7 +653,7 @@ void producer_plugin::set_program_options(
          ("max-scheduled-transaction-time-per-block-ms", boost::program_options::value<int32_t>()->default_value(100),
           "Maximum wall-clock time, in milliseconds, spent retiring scheduled transactions in any block before returning to normal transaction processing.")
          ("subjective-cpu-leeway-us", boost::program_options::value<int32_t>()->default_value( config::default_subjective_cpu_leeway_us ),
-          "Amount of cpu to allow transaction to consume when account has exhausted cpu.")
+          "Time in microseconds allowed for a transaction that starts with insufficient CPU quota to complete and cover its CPU usage.")
          ("incoming-defer-ratio", bpo::value<double>()->default_value(1.0),
           "ratio between incoming transations and deferred transactions when both are exhausted")
          ("incoming-transaction-queue-size-mb", bpo::value<uint16_t>()->default_value( 1024 ),

From 24f8a02ae3e6debc2d5b11aeeb1ec631e6f769b1 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 3 Oct 2019 11:05:47 -0400
Subject: [PATCH 1427/1648] Fix build script LLVM symlinking

For unpinned builds the build script symlinks the system LLVM7 directory to LLVM_ROOT. But the command only successfully works the first time. Fix that.
---
 scripts/helpers/eosio.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 28dd7ce8b45..68c5367d526 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -282,13 +282,13 @@ function ensure-llvm() {
         && make -j${JOBS} install"
         echo " - LLVM successfully installed @ ${LLVM_ROOT}"
     elif [[ $ARCH == "Darwin" ]]; then
-        execute ln -sf /usr/local/opt/llvm@7 $LLVM_ROOT
+        execute ln -snf /usr/local/opt/llvm@7 $LLVM_ROOT
     elif [[ $NAME == "Ubuntu" ]]; then
-        execute ln -sf /usr/lib/llvm-7 $LLVM_ROOT
+        execute ln -snf /usr/lib/llvm-7 $LLVM_ROOT
     elif [[ $NAME == "Amazon Linux" ]]; then
         execute unlink $LLVM_ROOT || true
     elif [[ $NAME == "CentOS Linux" ]]; then
-        execute ln -sf /opt/rh/llvm-toolset-7.0/root $LLVM_ROOT
+        execute ln -snf /opt/rh/llvm-toolset-7.0/root $LLVM_ROOT
     fi
 }
 

From 936934b46b862e55ecfaae8679ac0bb794954c5f Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 3 Oct 2019 10:11:16 -0500
Subject: [PATCH 1428/1648] Fixed skip logic and added assert to verify at or
 past first block when searching for a block number location. GH #7939

---
 libraries/chain/block_log.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 3919c9cc190..85fe1ab9840 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -157,7 +157,7 @@ namespace eosio { namespace chain {
          explicit fileptr_datastream( FILE* file, const std::string& filename ) : _file(file), _filename(filename) {}
 
          void skip( size_t s ) {
-            auto status = fseek(_file, s, SEEK_SET);
+            auto status = fseek(_file, s, SEEK_CUR);
             EOS_ASSERT( status == 0, block_log_exception,
                         "Could not seek past ${bytes} bytes in Block log file at '${blocks_log}'. Returned status: ${status}",
                         ("bytes", s)("blocks_log", _filename)("status", status) );
@@ -1138,6 +1138,9 @@ namespace eosio { namespace chain {
 
    uint64_t trim_data::block_index(uint32_t n) const {
       using namespace std;
+      EOS_ASSERT( first_block <= n, block_log_exception,
+                  "cannot seek in ${file} to block number ${b}, block number ${first} is the first block",
+                  ("file", index_file_name.string())("b",n)("first",first_block) );
       EOS_ASSERT( n <= last_block, block_log_exception,
                   "cannot seek in ${file} to block number ${b}, block number ${last} is the last block",
                   ("file", index_file_name.string())("b",n)("last",last_block) );
@@ -1150,7 +1153,7 @@ namespace eosio { namespace chain {
       if (n == last_block + 1) {
          return ftell(blk_in);
       }
-      const uint64_t index_pos = sizeof(uint64_t) * (n - first_block);
+      const uint64_t index_pos = block_index(n);
       auto status = fseek(ind_in, index_pos, SEEK_SET);
       EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} ${pos} from beginning of file for block ${b}", ("file", index_file_name.string())("pos", index_pos)("b",n) );
       const uint64_t pos = ftell(ind_in);

From 1fde0c88023fcad4fa69af77f3c67d6c4a486700 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Thu, 3 Oct 2019 11:13:49 -0400
Subject: [PATCH 1429/1648] update EOS VM Optimized Compiler naming convention

---
 libraries/chain/CMakeLists.txt                     |  4 ++--
 .../include/eosio/chain/wasm_interface_private.hpp |  4 ++--
 .../webassembly/eos-vm-oc/intrinsic_mapping.hpp    |  2 +-
 .../eosio/chain/webassembly/eos-vm-oc/memory.hpp   |  6 +++---
 libraries/chain/wasm_interface.cpp                 |  6 +++---
 libraries/chain/webassembly/eos-vm-oc.cpp          |  4 ++--
 .../chain/webassembly/eos-vm-oc/code_cache.cpp     | 14 +++++++-------
 .../webassembly/eos-vm-oc/compile_monitor.cpp      |  4 ++--
 .../webassembly/eos-vm-oc/compile_trampoline.cpp   |  4 ++--
 libraries/chain/webassembly/eos-vm-oc/executor.cpp |  4 ++--
 plugins/chain_plugin/chain_plugin.cpp              |  8 ++++----
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index c4b359b11f5..f476979d515 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -44,7 +44,7 @@ if("eos-vm-oc" IN_LIST EOSIO_WASM_RUNTIMES)
    include_directories(${LLVM_INCLUDE_DIRS})
    add_definitions(${LLVM_DEFINITIONS})
 
-   option(EOSVMOC_ENABLE_DEVELOPER_OPTIONS "enable developer options for EOS-VM OC" OFF)
+   option(EOSVMOC_ENABLE_DEVELOPER_OPTIONS "enable developer options for EOS VM OC" OFF)
 endif()
 
 if("eos-vm" IN_LIST EOSIO_WASM_RUNTIMES OR "eos-vm-jit" IN_LIST EOSIO_WASM_RUNTIMES)
@@ -131,7 +131,7 @@ foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
 endforeach()
 
 if(EOSVMOC_ENABLE_DEVELOPER_OPTIONS)
-   message(WARNING "EOS-VM OC Developer Options are enabled; these are NOT supported")
+   message(WARNING "EOS VM OC Developer Options are enabled; these are NOT supported")
    target_compile_definitions(eosio_chain PUBLIC EOSIO_EOS_VM_OC_DEVELOPER)
 endif()
 
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index 1d502964be2..dedc6d78de4 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -83,8 +83,8 @@ namespace eosio { namespace chain {
 
 #ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
          if(eosvmoc_tierup) {
-            EOS_ASSERT(vm != wasm_interface::vm_type::wavm, wasm_exception, "WAVM is incompatible with EOS-VM OC");
-            EOS_ASSERT(vm != wasm_interface::vm_type::eos_vm_oc, wasm_exception, "You can't use EOS-VM OC as the base runtime when tier up is activated");
+            EOS_ASSERT(vm != wasm_interface::vm_type::wavm, wasm_exception, "WAVM is incompatible with EOS VM OC");
+            EOS_ASSERT(vm != wasm_interface::vm_type::eos_vm_oc, wasm_exception, "You can't use EOS VM OC as the base runtime when tier up is activated");
             eosvmoc.emplace(data_dir, eosvmoc_config, d);
          }
 #endif
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp
index 497fe8cc529..022df920918 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/intrinsic_mapping.hpp
@@ -17,7 +17,7 @@ constexpr auto intrinsic_table = boost::hana::make_tuple(
    "eosvmoc_internal.indirect_call_mismatch"_s,
    "eosvmoc_internal.indirect_call_oob"_s,
    "eosvmoc_internal.depth_assert"_s,
-   "eosio_injection.call_depth_assert"_s,  //these two are never used by EOS-VM OC but all intrinsics
+   "eosio_injection.call_depth_assert"_s,  //these two are never used by EOS VM OC but all intrinsics
    "eosio_injection.checktime"_s,          //must be mapped
    "env.__ashlti3"_s,
    "env.__ashrti3"_s,
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
index 4076c0d2b8d..509e183bd80 100644
--- a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
@@ -17,7 +17,7 @@ class memory {
       static constexpr uint64_t mutable_global_size               = 8u  * eosio::chain::wasm_constraints::maximum_mutable_globals/4u;
       static constexpr uint64_t table_size                        = 16u * eosio::chain::wasm_constraints::maximum_table_elements;
       static constexpr size_t   wcb_allowance                     = 512u;
-      static_assert(sizeof(control_block) <= wcb_allowance, "EOS-VM OC memory doesn't set aside enough memory for control block");
+      static_assert(sizeof(control_block) <= wcb_allowance, "EOS VM OC memory doesn't set aside enough memory for control block");
 
       //round up the prologue to multiple of 4K page
       static constexpr uint64_t memory_prologue_size = ((memory::wcb_allowance + mutable_global_size + table_size + intrinsic_count*UINT64_C(8))+UINT64_C(4095))/UINT64_C(4096)*UINT64_C(4096);
@@ -48,8 +48,8 @@ class memory {
       static constexpr uintptr_t cb_offset = wcb_allowance + mutable_global_size + table_size;
       static constexpr uintptr_t first_intrinsic_offset = cb_offset + 8u;
 
-      static_assert(-cb_offset == EOS_VM_OC_CONTROL_BLOCK_OFFSET, "EOS-VM OC control block offset has slid out of place somehow");
-      static_assert(stride == EOS_VM_OC_MEMORY_STRIDE, "EOS-VM OC memory stride has slid out of place somehow");
+      static_assert(-cb_offset == EOS_VM_OC_CONTROL_BLOCK_OFFSET, "EOS VM OC control block offset has slid out of place somehow");
+      static_assert(stride == EOS_VM_OC_MEMORY_STRIDE, "EOS VM OC memory stride has slid out of place somehow");
 
    private:
       uint8_t* mapbase;
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 51d3bca1081..b0cfe07745a 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -81,11 +81,11 @@ namespace eosio { namespace chain {
             cd = my->eosvmoc->cc.get_descriptor_for_code(code_hash, vm_version);
          }
          catch(...) {
-            //swallow errors here, if EOS-VM OC has gone in to the weeds we shouldn't bail: continue to try and run baseline
-            //In the future, consider moving bits of EOS-VM that can fire exceptions and such out of this call path
+            //swallow errors here, if EOS VM OC has gone in to the weeds we shouldn't bail: continue to try and run baseline
+            //In the future, consider moving bits of EOS VM that can fire exceptions and such out of this call path
             static bool once_is_enough;
             if(!once_is_enough)
-               elog("EOS-VM OC has encountered an unexpected failure");
+               elog("EOS VM OC has encountered an unexpected failure");
             once_is_enough = true;
          }
          if(cd) {
diff --git a/libraries/chain/webassembly/eos-vm-oc.cpp b/libraries/chain/webassembly/eos-vm-oc.cpp
index 648d04047fd..3db4399f133 100644
--- a/libraries/chain/webassembly/eos-vm-oc.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc.cpp
@@ -25,7 +25,7 @@ class eosvmoc_instantiated_module : public wasm_instantiated_module_interface {
 
       void apply(apply_context& context) override {
          const code_descriptor* const cd = _eosvmoc_runtime.cc.get_descriptor_for_code_sync(_code_hash, _vm_version);
-         EOS_ASSERT(cd, wasm_execution_error, "EOS-VM OC instantiation failed");
+         EOS_ASSERT(cd, wasm_execution_error, "EOS VM OC instantiation failed");
 
          _eosvmoc_runtime.exec.execute(*cd, _eosvmoc_runtime.mem, context);
       }
@@ -48,7 +48,7 @@ std::unique_ptr<wasm_instantiated_module_interface> eosvmoc_runtime::instantiate
    return std::make_unique<eosvmoc_instantiated_module>(code_hash, vm_type, *this);
 }
 
-//never called. EOS-VM OC overrides eosio_exit to its own implementation
+//never called. EOS VM OC overrides eosio_exit to its own implementation
 void eosvmoc_runtime::immediately_exit_currently_running_module() {}
 
 }}}}
diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
index 7664a0d3e7e..7fdf9759786 100644
--- a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -44,7 +44,7 @@ code_cache_async::code_cache_async(const bfs::path data_dir, const eosvmoc::conf
    _result_queue(eosvmoc_config.threads * 2),
    _threads(eosvmoc_config.threads)
 {
-   FC_ASSERT(_threads, "EOS-VM OC requires at least 1 compile thread");
+   FC_ASSERT(_threads, "EOS VM OC requires at least 1 compile thread");
 
    wait_on_compile_monitor_message();
 
@@ -91,7 +91,7 @@ std::tuple<size_t, size_t> code_cache_async::consume_compile_thread_queue() {
                _cache_index.push_front(cd);
             },
             [&](const compilation_result_unknownfailure&) {
-               wlog("code ${c} failed to tier-up with EOS-VM OC", ("c", result.code.code_id));
+               wlog("code ${c} failed to tier-up with EOS VM OC", ("c", result.code.code_id));
                _blacklist.emplace(result.code);
             },
             [&](const compilation_result_toofull&) {
@@ -124,7 +124,7 @@ const code_descriptor* const code_cache_async::get_descriptor_for_code(const dig
             _outstanding_compiles_and_poison.emplace(*nextup, false);
             std::vector<wrapped_fd> fds_to_pass;
             fds_to_pass.emplace_back(memfd_for_bytearray(codeobject->code));
-            FC_ASSERT(write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ *nextup }, fds_to_pass), "EOS-VM failed to communicate to OOP manager");
+            FC_ASSERT(write_message_with_fds(_compile_monitor_write_socket, compile_wasm_message{ *nextup }, fds_to_pass), "EOS VM failed to communicate to OOP manager");
             --count_processed;
          }
          _queued_compiles.erase(nextup);
@@ -171,7 +171,7 @@ code_cache_sync::~code_cache_sync() {
    _compile_monitor_write_socket.shutdown(local::datagram_protocol::socket::shutdown_send);
    auto [success, message, fds] = read_message_with_fds(_compile_monitor_read_socket);
    if(success)
-      elog("unexpected response from EOS-VM OC compile monitor during shutdown");
+      elog("unexpected response from EOS VM OC compile monitor during shutdown");
 }
 
 const code_descriptor* const code_cache_sync::get_descriptor_for_code_sync(const digest_type& code_id, const uint8_t& vm_version) {
@@ -213,7 +213,7 @@ code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const e
    if(!bfs::exists(_cache_file_path)) {
       EOS_ASSERT(eosvmoc_config.cache_size >= allocator_t::get_min_size(total_header_size), database_exception, "configured code cache size is too small");
       std::ofstream ofs(_cache_file_path.generic_string(), std::ofstream::trunc);
-      EOS_ASSERT(ofs.good(), database_exception, "unable to create EOS-VM Optimized Compiler code cache");
+      EOS_ASSERT(ofs.good(), database_exception, "unable to create EOS VM Optimized Compiler code cache");
       bfs::resize_file(_cache_file_path, eosvmoc_config.cache_size);
       bip::file_mapping creation_mapping(_cache_file_path.generic_string().c_str(), bip::read_write);
       bip::mapped_region creation_region(creation_mapping, bip::read_write);
@@ -230,7 +230,7 @@ code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const e
       memcpy((char*)&cache_header, header_buff + header_offset, sizeof(cache_header));
    }
 
-   EOS_ASSERT(cache_header.id == header_id, bad_database_version_exception, "existing EOS-VM OC code cache not compatible with this version");
+   EOS_ASSERT(cache_header.id == header_id, bad_database_version_exception, "existing EOS VM OC code cache not compatible with this version");
    EOS_ASSERT(!cache_header.dirty, database_exception, "code cache is dirty");
 
    set_on_disk_region_dirty(true);
@@ -268,7 +268,7 @@ code_cache_base::code_cache_base(const boost::filesystem::path data_dir, const e
       }
       allocator->deallocate(code_mapping + cache_header.serialized_descriptor_index);
 
-      ilog("EOS-VM Optimized Compiler code cache loaded with ${c} entries; ${f} of ${t} bytes free", ("c", number_entries)("f", allocator->get_free_memory())("t", allocator->get_size()));
+      ilog("EOS VM Optimized Compiler code cache loaded with ${c} entries; ${f} of ${t} bytes free", ("c", number_entries)("f", allocator->get_free_memory())("t", allocator->get_size()));
    }
    munmap(code_mapping, eosvmoc_config.cache_size);
 
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
index 74cd56e1fee..67b85c5ded4 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_monitor.cpp
@@ -265,7 +265,7 @@ void launch_compile_monitor(int nodeos_fd) {
       compile_monitor monitor(ctx, std::move(nodeos_socket), std::move(trampoline_socket));
       ctx.run();
       if(monitor._compile_sessions.size())
-         std::cerr << "ERROR: EOS-VM OC compiler monitor exiting with active sessions" << std::endl;
+         std::cerr << "ERROR: EOS VM OC compiler monitor exiting with active sessions" << std::endl;
    }
    
    _exit(0);
@@ -298,7 +298,7 @@ extern "C" int __wrap_main(int argc, char* argv[]) {
 }
 
 wrapped_fd get_connection_to_compile_monitor(int cache_fd) {
-   FC_ASSERT(the_compile_monitor_trampoline.compile_manager_pid >= 0, "EOS-VM oop connection doesn't look active");
+   FC_ASSERT(the_compile_monitor_trampoline.compile_manager_pid >= 0, "EOS VM oop connection doesn't look active");
 
    int socks[2]; //0: our socket to compile_manager_session, 1: socket we'll give to compile_maanger_session
    socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, socks);
diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
index f74200a2002..58940a4d5c7 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
@@ -152,7 +152,7 @@ void run_compile_trampoline(int fd) {
          break;
 
       if(!message.contains<compile_wasm_message>() || fds.size() != 2) {
-         std::cerr << "EOS-VM OC compile trampoline got unexpected message; ignoring" << std::endl;
+         std::cerr << "EOS VM OC compile trampoline got unexpected message; ignoring" << std::endl;
          continue;
       }
 
@@ -174,7 +174,7 @@ void run_compile_trampoline(int fd) {
          _exit(0);
       }
       else if(pid == -1)
-         std::cerr << "EOS-VM OC compile trampoline failed to spawn compile task" << std::endl;
+         std::cerr << "EOS VM OC compile trampoline failed to spawn compile task" << std::endl;
    }
 
    _exit(0);
diff --git a/libraries/chain/webassembly/eos-vm-oc/executor.cpp b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
index 03562cbde05..1dad9744e09 100644
--- a/libraries/chain/webassembly/eos-vm-oc/executor.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/executor.cpp
@@ -20,7 +20,7 @@
 
 #if defined(__has_feature)
 #if __has_feature(shadow_call_stack)
-#error EOS-VM OC is not compatible with Clang ShadowCallStack
+#error EOS VM OC is not compatible with Clang ShadowCallStack
 #endif
 #endif
 
@@ -137,7 +137,7 @@ executor::executor(const code_cache_base& cc) {
 
    uint64_t current_gs;
    if(arch_prctl(ARCH_GET_GS, &current_gs) || current_gs)
-      wlog("x86_64 GS register is not set as expected. EOS-VM OC may not run correctly on this platform");
+      wlog("x86_64 GS register is not set as expected. EOS VM OC may not run correctly on this platform");
 
    struct stat s;
    FC_ASSERT(fstat(cc.fd(), &s) == 0, "executor failed to get code cache size");
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 401d6a54823..08f5e3e66e1 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -202,7 +202,7 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
 #ifndef EOSIO_EOS_VM_OC_DEVELOPER
             //throwing an exception here (like EOS_ASSERT) is just gobbled up with a "Failed to initialize" error :(
             if(vm == wasm_interface::vm_type::eos_vm_oc) {
-               elog("EOS-VM OC is a tier-up compiler and works in conjunction with the configured base WASM runtime. Enable EOS-VM OC via 'eos-vm-oc-enable' option");
+               elog("EOS VM OC is a tier-up compiler and works in conjunction with the configured base WASM runtime. Enable EOS VM OC via 'eos-vm-oc-enable' option");
                EOS_ASSERT(false, plugin_exception, "");
             }
 #endif
@@ -264,14 +264,14 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
 #endif
 
 #ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
-         ("eos-vm-oc-cache-size-mb", bpo::value<uint64_t>()->default_value(eosvmoc::config().cache_size / (1024u*1024u)), "Maximum size (in MiB) of the EOS-VM OC code cache")
+         ("eos-vm-oc-cache-size-mb", bpo::value<uint64_t>()->default_value(eosvmoc::config().cache_size / (1024u*1024u)), "Maximum size (in MiB) of the EOS VM OC code cache")
          ("eos-vm-oc-compile-threads", bpo::value<uint64_t>()->default_value(1u)->notifier([](const auto t) {
                if(t == 0) {
                   elog("eos-vm-oc-compile-threads must be set to a non-zero value");
                   EOS_ASSERT(false, plugin_exception, "");
                }
-         }), "Number of threads to use for EOS-VM OC tier-up")
-         ("eos-vm-oc-enable", bpo::bool_switch(), "Enable EOS-VM OC tier-up runtime")
+         }), "Number of threads to use for EOS VM OC tier-up")
+         ("eos-vm-oc-enable", bpo::bool_switch(), "Enable EOS VM OC tier-up runtime")
 #endif
          ;
 

From 2e7f7f47c4ca6bb112a8ef335cff7da28445f032 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 3 Oct 2019 11:20:07 -0500
Subject: [PATCH 1430/1648] Fixed logic for reverse reading the block log for
 truncation. GH #7939

---
 libraries/chain/block_log.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 85fe1ab9840..737d052140c 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -1021,14 +1021,14 @@ namespace eosio { namespace chain {
       detail::index_writer index(new_index_filename, num_blocks);
 
       uint64_t read_size = 0;
-      for(uint64_t written = to_write; written > 0; written -= read_size) {
-         read_size = to_write;
+      for(uint64_t to_write_remaining = to_write; to_write_remaining > 0; to_write_remaining -= read_size) {
+         read_size = to_write_remaining;
          if (read_size > detail::reverse_iterator::_buf_len) {
             read_size = detail::reverse_iterator::_buf_len;
          }
 
          // read in the previous contiguous memory into the read buffer
-         const auto start_of_blk_buffer_pos = original_file_block_pos + to_write - read_size;
+         const auto start_of_blk_buffer_pos = original_file_block_pos + to_write_remaining - read_size;
          status = fseek(original_block_log.blk_in, start_of_blk_buffer_pos, SEEK_SET);
          const auto num_read = fread(buf, read_size, 1, original_block_log.blk_in);
          EOS_ASSERT( num_read == 1, block_log_exception, "blocks.log read failed" );

From 018f0c1893e4c909ceb1cc478ea60f724f1d3c82 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 3 Oct 2019 11:22:40 -0500
Subject: [PATCH 1431/1648] Fixed code so last_block is set before we call
 block_pos ... GH #7939

which validates that n is less than or equal to last_block + 1.
---
 libraries/chain/block_log.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 737d052140c..153a60fac83 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -1115,17 +1115,18 @@ namespace eosio { namespace chain {
       }
 
       const uint64_t start_of_blocks = ftell(blk_in);
+
+      const auto status = fseek(ind_in, 0, SEEK_END);                //get length of blocks.index (gives number of blocks)
+      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} end", ("file", index_file_name.string()) );
+      const uint64_t file_end = ftell(ind_in);                //get length of blocks.index (gives number of blocks)
+      last_block = first_block + file_end/sizeof(uint64_t) - 1;
+
       first_block_pos = block_pos(first_block);
       EOS_ASSERT(start_of_blocks == first_block_pos, block_log_exception,
                  "Block log ${file} was determined to have its first block at ${determined}, but the block index "
                  "indicates the first block is at ${index}",
                  ("file", block_file_name.string())("determined", start_of_blocks)("index",first_block_pos));
-
       ilog("first block= ${first}",("first",first_block));
-      const auto status = fseek(ind_in, 0, SEEK_END);                //get length of blocks.index (gives number of blocks)
-      EOS_ASSERT( status == 0, block_log_exception, "cannot seek to ${file} end", ("file", index_file_name.string()) );
-      const uint64_t file_end = ftell(ind_in);                //get length of blocks.index (gives number of blocks)
-      last_block = first_block + file_end/sizeof(uint64_t) - 1;
       ilog("last block= ${first}",("first",first_block));
    }
 

From 668743f285061be62ba717eb19818cfc3d802627 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 3 Oct 2019 17:18:36 -0400
Subject: [PATCH 1432/1648] update eos-vm ref and install eos-vm license

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 3abb9ed7669..45b8dca29ac 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 3abb9ed766910df2d407d02686dfe6c32345e77f
+Subproject commit 45b8dca29ac42eb881099ff0c4ed89117f018617

From 470873024db432683fa4b4ec5ee9a2c36801c286 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 3 Oct 2019 17:19:02 -0500
Subject: [PATCH 1433/1648] Fixed trimmed file to write buffer in reverse
 order. GH #7939

and other fixes
---
 libraries/chain/block_log.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 153a60fac83..5285646d7f7 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -979,7 +979,11 @@ namespace eosio { namespace chain {
       }
       fc::cfile new_block_file;
       new_block_file.set_file_path(new_block_filename);
+      // need to open as append in case the file doesn't already exist, then reopen without append to allow writing the
+      // file in any order
       new_block_file.open( LOG_WRITE_C );
+      new_block_file.close();
+      new_block_file.open( LOG_RW_C );
 
       static_assert( block_log::max_supported_version == 3,
                      "Code was written to support version 3 format, need to update this code for latest format." );
@@ -997,7 +1001,6 @@ namespace eosio { namespace chain {
       const auto new_block_file_first_block_pos = new_block_file.tellp();
       // ****** end of new block log header
 
-
       // copy over remainder of block log to new block log
       auto buffer =  make_unique<char[]>(detail::reverse_iterator::_buf_len);
       char* buf =  buffer.get();
@@ -1043,6 +1046,7 @@ namespace eosio { namespace chain {
             index.write(pos_content);
             original_pos = start_of_this_block - pos_size;
          }
+         new_block_file.seek(new_block_file_first_block_pos + to_write_remaining - read_size);
          new_block_file.write(buf, read_size);
       }
       index.complete();
@@ -1051,10 +1055,10 @@ namespace eosio { namespace chain {
       new_block_file.flush();
       new_block_file.close();
 
-      fc::path old_log = block_dir / "old.log";
+      fc::path old_log = temp_dir / "old.log";
       rename(original_block_log.block_file_name, old_log);
       rename(new_block_filename, original_block_log.block_file_name);
-      fc::path old_ind = block_dir / "old.index";
+      fc::path old_ind = temp_dir / "old.index";
       rename(original_block_log.index_file_name, old_ind);
       rename(new_index_filename, original_block_log.index_file_name);
 
@@ -1127,7 +1131,7 @@ namespace eosio { namespace chain {
                  "indicates the first block is at ${index}",
                  ("file", block_file_name.string())("determined", start_of_blocks)("index",first_block_pos));
       ilog("first block= ${first}",("first",first_block));
-      ilog("last block= ${first}",("first",first_block));
+      ilog("last block= ${last}",("last",last_block));
    }
 
    trim_data::~trim_data() {

From 9de6bbb83dca03a83c0d54baa4dc06fc734f1da5 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 3 Oct 2019 17:24:24 -0500
Subject: [PATCH 1434/1648] Fixed comment. GH #7939

---
 libraries/chain/block_log.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/block_log.cpp b/libraries/chain/block_log.cpp
index 5285646d7f7..822de1ea8b8 100644
--- a/libraries/chain/block_log.cpp
+++ b/libraries/chain/block_log.cpp
@@ -979,7 +979,7 @@ namespace eosio { namespace chain {
       }
       fc::cfile new_block_file;
       new_block_file.set_file_path(new_block_filename);
-      // need to open as append in case the file doesn't already exist, then reopen without append to allow writing the
+      // need to open as append since the file doesn't already exist, then reopen without append to allow writing the
       // file in any order
       new_block_file.open( LOG_WRITE_C );
       new_block_file.close();

From df859b7317e5b6f4106db2c6001b9ce4118cdf52 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 3 Oct 2019 19:09:43 -0400
Subject: [PATCH 1435/1648] install license

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e26c7f3f74..5e954ce8f42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,6 +200,8 @@ configure_file(${CMAKE_SOURCE_DIR}/libraries/fc/src/network/LICENSE.go
                ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.go COPYONLY)
 configure_file(${CMAKE_SOURCE_DIR}/libraries/yubihsm/LICENSE
                ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.yubihsm COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/libraries/eos-vm/LICENSE
+               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.eos-vm COPYONLY)
 
 install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ COMPONENT base)
 install(FILES libraries/wabt/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.wabt COMPONENT base)
@@ -208,6 +210,7 @@ install(FILES libraries/wasm-jit/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATARO
 install(FILES libraries/fc/secp256k1/upstream/COPYING DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.secp256k1 COMPONENT base)
 install(FILES libraries/fc/src/network/LICENSE.go DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ COMPONENT base)
 install(FILES libraries/yubihsm/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.yubihsm COMPONENT base)
+install(FILES libraries/eos-vm/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.eos-vm COMPONENT base)
 
 add_custom_target(base-install
   COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}"

From 9767e94b8d27ce2211af8057d0afbe73c4cd3ab0 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 3 Oct 2019 19:36:37 -0400
Subject: [PATCH 1436/1648] update ref to temporary branch with license fixes

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 45b8dca29ac..86751193b85 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 45b8dca29ac42eb881099ff0c4ed89117f018617
+Subproject commit 86751193b856c7b411494c2cddb32af940c3e7b3

From ba8dc1b1228b4615a6070a6f8c19685b380254e8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 4 Oct 2019 12:13:17 -0500
Subject: [PATCH 1437/1648] Distinguish between block not found and on fork to
 give a better error message. Also allow reconnect for benign_other go_away
 which is what we now send for unknown block

---
 .../include/eosio/net_plugin/protocol.hpp     |  2 +-
 plugins/net_plugin/net_plugin.cpp             | 42 +++++++++++++------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
index 1a81610c383..a806486b50a 100644
--- a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
+++ b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
@@ -64,7 +64,7 @@ namespace eosio {
     case validation : return "invalid block";
     case authentication : return "authentication failure";
     case fatal_other : return "some other failure";
-    case benign_other : return "some other non-fatal condition";
+    case benign_other : return "some other non-fatal condition, possibly unknown block";
     default : return "some crazy reason";
     }
   }
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5f22a136775..e5d7cbe58e0 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2099,9 +2099,14 @@ namespace eosio {
 
    // called from any thread
    bool connection::resolve_and_connect() {
-      if( no_retry != go_away_reason::no_reason && no_retry != go_away_reason::wrong_version ) {
-         fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( no_retry )));
-         return false;
+      switch ( no_retry ) {
+         case no_reason:
+         case wrong_version:
+         case benign_other:
+            break;
+         default:
+            fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( no_retry )));
+            return false;
       }
 
       string::size_type colon = peer_address().find(':');
@@ -2149,8 +2154,13 @@ namespace eosio {
 
    // called from connection strand
    void connection::connect( const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::results_type endpoints ) {
-      if( no_retry != go_away_reason::no_reason && no_retry != go_away_reason::wrong_version ) {
-         return;
+      switch ( no_retry ) {
+         case no_reason:
+         case wrong_version:
+         case benign_other:
+            break;
+         default:
+            return;
       }
       connecting = true;
       pending_message_buffer.reset();
@@ -2583,20 +2593,26 @@ namespace eosio {
 
             if( peer_lib <= lib_num && peer_lib > 0 ) {
                bool on_fork = false;
+               bool unknown_block = false;
                try {
                   block_id_type peer_lib_id = cc.get_block_id_for_num( peer_lib );
                   on_fork = (msg_lib_id != peer_lib_id);
-               } catch( const unknown_block_exception& ex ) {
-                  fc_wlog( logger, "peer last irreversible block ${pl} is unknown", ("pl", peer_lib) );
-                  on_fork = true;
+               } catch( const unknown_block_exception& ) {
+                  peer_wlog( c, "peer last irreversible block ${pl} is unknown", ("pl", peer_lib) );
+                  unknown_block = true;
                } catch( ... ) {
-                  fc_wlog( logger, "caught an exception getting block id for ${pl}", ("pl", peer_lib) );
+                  peer_wlog( c, "caught an exception getting block id for ${pl}", ("pl", peer_lib) );
                   on_fork = true;
                }
-               if( on_fork ) {
-                  c->strand.post( [c]() {
-                     fc_elog( logger, "Peer chain is forked" );
-                     c->enqueue( go_away_message( forked ) );
+               if( on_fork || unknown_block ) {
+                  c->strand.post( [on_fork, unknown_block, c]() {
+                     if( on_fork ) {
+                        peer_elog( c, "Peer chain is forked" );
+                        c->enqueue( go_away_message( forked ) );
+                     } else if( unknown_block ) {
+                        peer_elog( c, "Peer asked for unknown block" );
+                        c->enqueue( go_away_message( benign_other ) );
+                     }
                   } );
                }
             }

From 31bb872f9eb7d0becf7a511e4f0644b29d8daeb4 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 6 Oct 2019 22:06:25 -0400
Subject: [PATCH 1438/1648] EOS VM OC license updates

---
 .../chain/webassembly/eos-vm-oc/About WAVM    | 26 +++++++++++++++++++
 .../webassembly/eos-vm-oc/LLVMEmitIR.cpp      |  6 +++--
 .../chain/webassembly/eos-vm-oc/LLVMJIT.cpp   |  6 +++--
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 libraries/chain/webassembly/eos-vm-oc/About WAVM

diff --git a/libraries/chain/webassembly/eos-vm-oc/About WAVM b/libraries/chain/webassembly/eos-vm-oc/About WAVM
new file mode 100644
index 00000000000..298915f8d42
--- /dev/null
+++ b/libraries/chain/webassembly/eos-vm-oc/About WAVM	
@@ -0,0 +1,26 @@
+The EOS VM Optimized Compiler was created in part based on WAVM
+https://github.com/WebAssembly/wasm-jit-prototype
+subject the following:
+Copyright (c) 2019, Andrew Scheidecker
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution.
+* Neither the name of WAVM nor the names of its contributors may be used to endorse or
+promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot;
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
index 49605669754..d52a2b94ab8 100644
--- a/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMEmitIR.cpp
@@ -1,7 +1,9 @@
 /*
-Portions of this file are based on WAVM
+The EOS VM Optimized Compiler was created in part based on WAVM
+https://github.com/WebAssembly/wasm-jit-prototype
+subject the following:
 
-Copyright (c) 2016, Andrew Scheidecker
+Copyright (c) 2016-2019, Andrew Scheidecker
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
index ec365479383..d3fdb28a5d2 100644
--- a/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/LLVMJIT.cpp
@@ -1,7 +1,9 @@
 /*
-Portions of this file are based on WAVM
+The EOS VM Optimized Compiler was created in part based on WAVM
+https://github.com/WebAssembly/wasm-jit-prototype
+subject the following:
 
-Copyright (c) 2016, Andrew Scheidecker
+Copyright (c) 2016-2019, Andrew Scheidecker
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

From fe8836ba83ce50812bd0fd32e39535cdf1648edd Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 7 Oct 2019 13:23:04 -0400
Subject: [PATCH 1439/1648] fix up markup that leaked in to license file

---
 libraries/chain/webassembly/eos-vm-oc/About WAVM | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/About WAVM b/libraries/chain/webassembly/eos-vm-oc/About WAVM
index 298915f8d42..a948eb0736d 100644
--- a/libraries/chain/webassembly/eos-vm-oc/About WAVM	
+++ b/libraries/chain/webassembly/eos-vm-oc/About WAVM	
@@ -14,10 +14,10 @@ provided with the distribution.
 * Neither the name of WAVM nor the names of its contributors may be used to endorse or
 promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot;
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY DIRECT,
+ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
 INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

From 7d006bacb59bb103a3b1e769841576f9d3af3587 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Mon, 7 Oct 2019 13:36:26 -0400
Subject: [PATCH 1440/1648] bump version to v2.0.0-rc1

---
 CMakeLists.txt |  2 +-
 README.md      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b43ede597bc..98c119cbd3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set( CXX_STANDARD_REQUIRED ON)
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX develop)
+set(VERSION_SUFFIX rc1)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")
diff --git a/README.md b/README.md
index bcfc75421c4..cdf595d4189 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,13 @@ $ brew remove eosio
 
 #### Ubuntu 18.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio_1.8.0-rc1-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_1.8.0-rc1-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc1/eosio_2.0.0-rc1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-rc1-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio_1.8.0-rc1-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_1.8.0-rc1-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc1/eosio_2.0.0-rc1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-rc1-ubuntu-16.04_amd64.deb
 ```
 #### Ubuntu Package Uninstall
 ```sh
@@ -58,8 +58,8 @@ $ sudo apt remove eosio
 ```
 #### Centos RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio-1.8.0-rc1.el7.x86_64.rpm
-$ sudo yum install ./eosio-1.8.0-rc1.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc1/eosio-2.0.0-rc1.el7.x86_64.rpm
+$ sudo yum install ./eosio-2.0.0-rc1.el7.x86_64.rpm
 ```
 #### Centos RPM Package Uninstall
 ```sh

From 97466a5888016257ccf6bea5d762a73f3fb14921 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 8 Oct 2019 10:35:58 -0400
Subject: [PATCH 1441/1648] eosio/producer -> eosio/ci

---
 .cicd/helpers/file-hash.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/helpers/file-hash.sh b/.cicd/helpers/file-hash.sh
index 0f939ff27a3..4a4ec933a98 100755
--- a/.cicd/helpers/file-hash.sh
+++ b/.cicd/helpers/file-hash.sh
@@ -5,4 +5,4 @@ FILE_NAME=$(basename $1 | awk '{split($0,a,/\.(d|s)/); print a[1] }')
 export DETERMINED_HASH=$(sha1sum $1 | awk '{ print $1 }')
 ( [[ $FILE_NAME =~ 'macos' ]] && [[ $PINNED == false || $UNPINNED == true ]] ) && FILE_NAME="${FILE_NAME}-unpinned"
 export HASHED_IMAGE_TAG="eos-${FILE_NAME}-${DETERMINED_HASH}"
-export FULL_TAG="eosio/producer:$HASHED_IMAGE_TAG"
\ No newline at end of file
+export FULL_TAG="eosio/ci:$HASHED_IMAGE_TAG"
\ No newline at end of file

From 92606436e6305037471e29509d85fdc3cb583376 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 4 Oct 2019 18:58:52 -0400
Subject: [PATCH 1442/1648] Add global-greylist-limit option to producer_plugin
 (currently does nothing).

Clean up usage of the max virtual multiplier throughout the code by
using
one constant defined in config.hpp.

Enhance the resource_limits_test/sanity_check test.
---
 libraries/chain/controller.cpp                | 16 +++++++--
 .../chain/include/eosio/chain/config.hpp      |  1 +
 .../chain/include/eosio/chain/controller.hpp  |  1 +
 .../eosio/chain/resource_limits_private.hpp   |  2 +-
 plugins/producer_plugin/producer_plugin.cpp   | 12 +++++++
 unittests/resource_limits_test.cpp            | 33 ++++++++++---------
 6 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 3b439379b35..a434c731fe5 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -230,6 +230,7 @@ struct controller_impl {
    db_read_mode                   read_mode = db_read_mode::SPECULATIVE;
    bool                           in_trx_requiring_checks = false; ///< if true, checks that are normally skipped on replay (e.g. auth checks) cannot be skipped
    optional<fc::microseconds>     subjective_cpu_leeway;
+   uint32_t                       global_greylist_limit = config::maximum_elastic_resource_multiplier;
    bool                           trusted_producer_light_validation = false;
    uint32_t                       snapshot_head_block = 0;
    named_thread_pool              thread_pool;
@@ -1653,11 +1654,10 @@ struct controller_impl {
       // Update resource limits:
       resource_limits.process_account_limit_updates();
       const auto& chain_config = self.get_global_properties().configuration;
-      uint32_t max_virtual_mult = 1000;
       uint64_t CPU_TARGET = EOS_PERCENT(chain_config.max_block_cpu_usage, chain_config.target_block_cpu_usage_pct);
       resource_limits.set_block_parameters(
-         { CPU_TARGET, chain_config.max_block_cpu_usage, config::block_cpu_usage_average_window_ms / config::block_interval_ms, max_virtual_mult, {99, 100}, {1000, 999}},
-         {EOS_PERCENT(chain_config.max_block_net_usage, chain_config.target_block_net_usage_pct), chain_config.max_block_net_usage, config::block_size_average_window_ms / config::block_interval_ms, max_virtual_mult, {99, 100}, {1000, 999}}
+         { CPU_TARGET, chain_config.max_block_cpu_usage, config::block_cpu_usage_average_window_ms / config::block_interval_ms, config::maximum_elastic_resource_multiplier, {99, 100}, {1000, 999}},
+         {EOS_PERCENT(chain_config.max_block_net_usage, chain_config.target_block_net_usage_pct), chain_config.max_block_net_usage, config::block_size_average_window_ms / config::block_interval_ms, config::maximum_elastic_resource_multiplier, {99, 100}, {1000, 999}}
       );
       resource_limits.process_block_usage(pbhs.block_num);
 
@@ -3131,6 +3131,16 @@ void controller::set_subjective_cpu_leeway(fc::microseconds leeway) {
    my->subjective_cpu_leeway = leeway;
 }
 
+void controller::set_global_greylist_limit( uint32_t limit ) {
+   EOS_ASSERT( 0 < limit && limit <= chain::config::maximum_elastic_resource_multiplier,
+               misc_exception,
+               "Invalid limit (${limit}) passed into set_global_greylist_limit. "
+               "Must be between 1 and ${max}.",
+               ("limit", limit)("max", chain::config::maximum_elastic_resource_multiplier)
+   );
+   my->global_greylist_limit = limit;
+}
+
 void controller::add_resource_greylist(const account_name &name) {
    my->conf.resource_greylist.insert(name);
 }
diff --git a/libraries/chain/include/eosio/chain/config.hpp b/libraries/chain/include/eosio/chain/config.hpp
index 6c92a7e3da5..2931ba1053c 100644
--- a/libraries/chain/include/eosio/chain/config.hpp
+++ b/libraries/chain/include/eosio/chain/config.hpp
@@ -48,6 +48,7 @@ static const uint32_t account_cpu_usage_average_window_ms  = 24*60*60*1000l;
 static const uint32_t account_net_usage_average_window_ms  = 24*60*60*1000l;
 static const uint32_t block_cpu_usage_average_window_ms    = 60*1000l;
 static const uint32_t block_size_average_window_ms         = 60*1000l;
+static const uint32_t maximum_elastic_resource_multiplier  = 1000;
 
 //const static uint64_t   default_max_storage_size       = 10 * 1024;
 //const static uint32_t   default_max_trx_runtime        = 10*1000;
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 241a8ae04e7..c388c87f1ea 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -282,6 +282,7 @@ namespace eosio { namespace chain {
          validation_mode get_validation_mode()const;
 
          void set_subjective_cpu_leeway(fc::microseconds leeway);
+         void set_global_greylist_limit( uint32_t limit );
 
          void add_to_ram_correction( account_name account, uint64_t ram_bytes );
          bool all_subjective_mitigations_disabled()const;
diff --git a/libraries/chain/include/eosio/chain/resource_limits_private.hpp b/libraries/chain/include/eosio/chain/resource_limits_private.hpp
index e3ac7346263..ccaed484ce5 100644
--- a/libraries/chain/include/eosio/chain/resource_limits_private.hpp
+++ b/libraries/chain/include/eosio/chain/resource_limits_private.hpp
@@ -233,7 +233,7 @@ namespace eosio { namespace chain { namespace resource_limits {
        * real maximum block is less, this virtual number is only used for rate limiting users.
        *
        * It's lowest possible value is max_block_size * blocksize_average_window_ms / block_interval
-       * It's highest possible value is 1000 times its lowest possible value
+       * It's highest possible value is config::maximum_elastic_resource_multiplier (1000) times its lowest possible value
        *
        * This means that the most an account can consume during idle periods is 1000x the bandwidth
        * it is gauranteed under congestion.
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index d47339bc40e..bee42bfa27f 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -646,6 +646,8 @@ void producer_plugin::set_program_options(
           "Limits the maximum time (in milliseconds) that is allowed for sending blocks to a keosd provider for signing")
          ("greylist-account", boost::program_options::value<vector<string>>()->composing()->multitoken(),
           "account that can not access to extended CPU/NET virtual resources")
+         ("global-greylist-limit", boost::program_options::value<uint32_t>()->default_value(1000),
+          "Limit (between 1 and 1000) on the multiple that CPU/NET virtual resources can extend during low congestion (only enforced subjectively; use 1000 to not enforce any limit)")
          ("produce-time-offset-us", boost::program_options::value<int32_t>()->default_value(0),
           "offset of non last block producing time in microseconds. Negative number results in blocks to go out sooner, and positive number results in blocks to go out later")
          ("last-block-time-offset-us", boost::program_options::value<int32_t>()->default_value(0),
@@ -867,6 +869,16 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
       add_greylist_accounts(param);
    }
 
+   {
+      uint32_t global_greylist_limit = options.at("global-greylist-limit").as<uint32_t>();
+      EOS_ASSERT( 0 < global_greylist_limit && global_greylist_limit <= config::maximum_elastic_resource_multiplier,
+                  plugin_config_exception,
+                  "global-greylist-limit must be between 1 and ${max}",
+                  ("max", config::maximum_elastic_resource_multiplier)
+      );
+      chain.set_global_greylist_limit( global_greylist_limit );
+   }
+
 } FC_LOG_AND_RETHROW() }
 
 void producer_plugin::plugin_startup()
diff --git a/unittests/resource_limits_test.cpp b/unittests/resource_limits_test.cpp
index 67b79dd0162..a32190c55ae 100644
--- a/unittests/resource_limits_test.cpp
+++ b/unittests/resource_limits_test.cpp
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_SUITE(resource_limits_test)
     * Test to make sure that the elastic limits for blocks relax and contract as expected
     */
    BOOST_FIXTURE_TEST_CASE(elastic_cpu_relax_contract, resource_limits_fixture) try {
-      const uint64_t desired_virtual_limit = config::default_max_block_cpu_usage * 1000ULL;
+      const uint64_t desired_virtual_limit = config::default_max_block_cpu_usage * config::maximum_elastic_resource_multiplier;
       const uint64_t expected_relax_iterations = expected_elastic_iterations( config::default_max_block_cpu_usage, desired_virtual_limit, 1000, 999 );
 
       // this is enough iterations for the average to reach/exceed the target (triggering congestion handling) and then the iterations to contract down to the min
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_SUITE(resource_limits_test)
     * Test to make sure that the elastic limits for blocks relax and contract as expected
     */
    BOOST_FIXTURE_TEST_CASE(elastic_net_relax_contract, resource_limits_fixture) try {
-      const uint64_t desired_virtual_limit = config::default_max_block_net_usage * 1000ULL;
+      const uint64_t desired_virtual_limit = config::default_max_block_net_usage * config::maximum_elastic_resource_multiplier;
       const uint64_t expected_relax_iterations = expected_elastic_iterations( config::default_max_block_net_usage, desired_virtual_limit, 1000, 999 );
 
       // this is enough iterations for the average to reach/exceed the target (triggering congestion handling) and then the iterations to contract down to the min
@@ -307,28 +307,31 @@ BOOST_AUTO_TEST_SUITE(resource_limits_test)
 
 
    BOOST_FIXTURE_TEST_CASE(sanity_check, resource_limits_fixture) try {
-      double total_staked_tokens = 1'000'000'000'0000.;
-      double user_stake = 1'0000.;
-      double max_block_cpu = 100000.; // us;
-      double blocks_per_day = 2*60*60*23;
-      double total_cpu_per_period = max_block_cpu * blocks_per_day * 3;
+      int64_t  total_staked_tokens = 1'000'000'000'0000ll;
+      int64_t  user_stake = 1'0000ll;
+      uint64_t max_block_cpu = 200'000.; // us;
+      uint64_t blocks_per_day = 2*60*60*24;
+      uint64_t total_cpu_per_period = max_block_cpu * blocks_per_day;
 
-      double congested_cpu_time_per_period = total_cpu_per_period * user_stake / total_staked_tokens;
+      double congested_cpu_time_per_period = (double(total_cpu_per_period) * user_stake) / total_staked_tokens;
       wdump((congested_cpu_time_per_period));
-      double uncongested_cpu_time_per_period = (1000*total_cpu_per_period) * user_stake / total_staked_tokens;
+      double uncongested_cpu_time_per_period = congested_cpu_time_per_period * config::maximum_elastic_resource_multiplier;
       wdump((uncongested_cpu_time_per_period));
 
-
       initialize_account( N(dan) );
       initialize_account( N(everyone) );
-      set_account_limits( N(dan), 0, 0, 10000 );
-      set_account_limits( N(everyone), 0, 0, 10000000000000ll );
+      set_account_limits( N(dan), 0, 0, user_stake );
+      set_account_limits( N(everyone), 0, 0, (total_staked_tokens - user_stake) );
       process_account_limit_updates();
 
-      add_transaction_usage( {N(dan)}, 10, 0, 1 ); /// dan should be able to do 10 us per 3 days
-
+      // dan cannot consume more than 34 us per day
+      BOOST_REQUIRE_THROW( add_transaction_usage( {N(dan)}, 35, 0, 1 ), tx_cpu_usage_exceeded );
 
+      // Ensure CPU usage is 0 by "waiting" for one day's worth of blocks to pass.
+      add_transaction_usage( {N(dan)}, 0, 0, 1 + blocks_per_day );
 
-   } FC_LOG_AND_RETHROW() 
+      // But dan should be able to consume up to 34 us per day.
+      add_transaction_usage( {N(dan)}, 34, 0, 2 + blocks_per_day );
+   } FC_LOG_AND_RETHROW()
 
 BOOST_AUTO_TEST_SUITE_END()

From fc65062b1ab813284c980e14a01d591d67a5dc0e Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Mon, 7 Oct 2019 14:01:34 -0400
Subject: [PATCH 1443/1648] Support global-greylist-limit

---
 libraries/chain/controller.cpp                |  4 ++
 .../chain/include/eosio/chain/controller.hpp  |  1 +
 .../include/eosio/chain/resource_limits.hpp   |  9 ++--
 libraries/chain/resource_limits.cpp           | 47 +++++++++++++------
 libraries/chain/transaction_context.cpp       | 19 ++++++--
 plugins/chain_plugin/chain_plugin.cpp         |  8 ++--
 .../eosio/producer_plugin/producer_plugin.hpp | 17 +++----
 plugins/producer_plugin/producer_plugin.cpp   | 12 ++---
 unittests/protocol_feature_tests.cpp          | 32 ++++++-------
 9 files changed, 90 insertions(+), 59 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index a434c731fe5..c3079f25f93 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -3141,6 +3141,10 @@ void controller::set_global_greylist_limit( uint32_t limit ) {
    my->global_greylist_limit = limit;
 }
 
+uint32_t controller::get_global_greylist_limit()const {
+   return my->global_greylist_limit;
+}
+
 void controller::add_resource_greylist(const account_name &name) {
    my->conf.resource_greylist.insert(name);
 }
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index c388c87f1ea..9c6b19d3798 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -283,6 +283,7 @@ namespace eosio { namespace chain {
 
          void set_subjective_cpu_leeway(fc::microseconds leeway);
          void set_global_greylist_limit( uint32_t limit );
+         uint32_t get_global_greylist_limit()const;
 
          void add_to_ram_correction( account_name account, uint64_t ram_bytes );
          bool all_subjective_mitigations_disabled()const;
diff --git a/libraries/chain/include/eosio/chain/resource_limits.hpp b/libraries/chain/include/eosio/chain/resource_limits.hpp
index 08d1d1f7c3b..5e1f3ca8423 100644
--- a/libraries/chain/include/eosio/chain/resource_limits.hpp
+++ b/libraries/chain/include/eosio/chain/resource_limits.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <eosio/chain/exceptions.hpp>
 #include <eosio/chain/types.hpp>
+#include <eosio/chain/config.hpp>
 #include <eosio/chain/snapshot.hpp>
 #include <chainbase/chainbase.hpp>
 #include <set>
@@ -87,11 +88,11 @@ namespace eosio { namespace chain { namespace resource_limits {
          uint64_t get_block_cpu_limit() const;
          uint64_t get_block_net_limit() const;
 
-         int64_t get_account_cpu_limit( const account_name& name, bool elastic = true) const;
-         int64_t get_account_net_limit( const account_name& name, bool elastic = true) const;
+         std::pair<int64_t, bool> get_account_cpu_limit( const account_name& name, uint32_t greylist_limit = config::maximum_elastic_resource_multiplier ) const;
+         std::pair<int64_t, bool> get_account_net_limit( const account_name& name, uint32_t greylist_limit = config::maximum_elastic_resource_multiplier ) const;
 
-         account_resource_limit get_account_cpu_limit_ex( const account_name& name, bool elastic = true) const;
-         account_resource_limit get_account_net_limit_ex( const account_name& name, bool elastic = true) const;
+         std::pair<account_resource_limit, bool> get_account_cpu_limit_ex( const account_name& name, uint32_t greylist_limit = config::maximum_elastic_resource_multiplier ) const;
+         std::pair<account_resource_limit, bool> get_account_net_limit_ex( const account_name& name, uint32_t greylist_limit = config::maximum_elastic_resource_multiplier ) const;
 
          int64_t get_account_ram_usage( const account_name& name ) const;
 
diff --git a/libraries/chain/resource_limits.cpp b/libraries/chain/resource_limits.cpp
index d98ca79fbc8..10edf69117d 100644
--- a/libraries/chain/resource_limits.cpp
+++ b/libraries/chain/resource_limits.cpp
@@ -365,12 +365,12 @@ uint64_t resource_limits_manager::get_block_net_limit() const {
    return config.net_limit_parameters.max - state.pending_net_usage;
 }
 
-int64_t resource_limits_manager::get_account_cpu_limit( const account_name& name, bool elastic ) const {
-   auto arl = get_account_cpu_limit_ex(name, elastic);
-   return arl.available;
+std::pair<int64_t, bool> resource_limits_manager::get_account_cpu_limit( const account_name& name, uint32_t greylist_limit ) const {
+   auto [arl, greylisted] = get_account_cpu_limit_ex(name, greylist_limit);
+   return {arl.available, greylisted};
 }
 
-account_resource_limit resource_limits_manager::get_account_cpu_limit_ex( const account_name& name, bool elastic) const {
+std::pair<account_resource_limit, bool> resource_limits_manager::get_account_cpu_limit_ex( const account_name& name, uint32_t greylist_limit ) const {
 
    const auto& state = _db.get<resource_limits_state_object>();
    const auto& usage = _db.get<resource_usage_object, by_owner>(name);
@@ -380,14 +380,23 @@ account_resource_limit resource_limits_manager::get_account_cpu_limit_ex( const
    get_account_limits( name, x, y, cpu_weight );
 
    if( cpu_weight < 0 || state.total_cpu_weight == 0 ) {
-      return { -1, -1, -1 };
+      return {{ -1, -1, -1 }, false};
    }
 
    account_resource_limit arl;
 
    uint128_t window_size = config.account_cpu_usage_average_window;
+   uint64_t  greylisted_virtual_cpu_limit = config.cpu_limit_parameters.max * greylist_limit;
+
+   bool greylisted = false;
+   uint128_t virtual_cpu_capacity_in_window = window_size;
+   if( greylisted_virtual_cpu_limit < state.virtual_cpu_limit ) {
+      virtual_cpu_capacity_in_window *= greylisted_virtual_cpu_limit;
+      greylisted = true;
+   } else {
+      virtual_cpu_capacity_in_window *= state.virtual_cpu_limit;
+   }
 
-   uint128_t virtual_cpu_capacity_in_window = (uint128_t)(elastic ? state.virtual_cpu_limit : config.cpu_limit_parameters.max) * window_size;
    uint128_t user_weight     = (uint128_t)cpu_weight;
    uint128_t all_user_weight = (uint128_t)state.total_cpu_weight;
 
@@ -401,15 +410,15 @@ account_resource_limit resource_limits_manager::get_account_cpu_limit_ex( const
 
    arl.used = impl::downgrade_cast<int64_t>(cpu_used_in_window);
    arl.max = impl::downgrade_cast<int64_t>(max_user_use_in_window);
-   return arl;
+   return {arl, greylisted};
 }
 
-int64_t resource_limits_manager::get_account_net_limit( const account_name& name, bool elastic) const {
-   auto arl = get_account_net_limit_ex(name, elastic);
-   return arl.available;
+std::pair<int64_t, bool> resource_limits_manager::get_account_net_limit( const account_name& name, uint32_t greylist_limit ) const {
+   auto [arl, greylisted] = get_account_net_limit_ex(name, greylist_limit);
+   return {arl.available, greylisted};
 }
 
-account_resource_limit resource_limits_manager::get_account_net_limit_ex( const account_name& name, bool elastic) const {
+std::pair<account_resource_limit, bool> resource_limits_manager::get_account_net_limit_ex( const account_name& name, uint32_t greylist_limit ) const {
    const auto& config = _db.get<resource_limits_config_object>();
    const auto& state  = _db.get<resource_limits_state_object>();
    const auto& usage  = _db.get<resource_usage_object, by_owner>(name);
@@ -418,18 +427,26 @@ account_resource_limit resource_limits_manager::get_account_net_limit_ex( const
    get_account_limits( name, x, net_weight, y );
 
    if( net_weight < 0 || state.total_net_weight == 0) {
-      return { -1, -1, -1 };
+      return {{ -1, -1, -1 }, false};
    }
 
    account_resource_limit arl;
 
    uint128_t window_size = config.account_net_usage_average_window;
+   uint64_t  greylisted_virtual_net_limit = config.net_limit_parameters.max * greylist_limit;
+
+   bool greylisted = false;
+   uint128_t virtual_network_capacity_in_window = window_size;
+   if( greylisted_virtual_net_limit < state.virtual_net_limit ) {
+      virtual_network_capacity_in_window *= greylisted_virtual_net_limit;
+      greylisted = true;
+   } else {
+      virtual_network_capacity_in_window *= state.virtual_net_limit;
+   }
 
-   uint128_t virtual_network_capacity_in_window = (uint128_t)(elastic ? state.virtual_net_limit : config.net_limit_parameters.max) * window_size;
    uint128_t user_weight     = (uint128_t)net_weight;
    uint128_t all_user_weight = (uint128_t)state.total_net_weight;
 
-
    auto max_user_use_in_window = (virtual_network_capacity_in_window * user_weight) / all_user_weight;
    auto net_used_in_window  = impl::integer_divide_ceil((uint128_t)usage.net_usage.value_ex * window_size, (uint128_t)config::rate_limiting_precision);
 
@@ -440,7 +457,7 @@ account_resource_limit resource_limits_manager::get_account_net_limit_ex( const
 
    arl.used = impl::downgrade_cast<int64_t>(net_used_in_window);
    arl.max = impl::downgrade_cast<int64_t>(max_user_use_in_window);
-   return arl;
+   return {arl, greylisted};
 }
 
 } } } /// eosio::chain::resource_limits
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index 5f7cb9fce93..ac3ed8f4455 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -481,17 +481,26 @@ namespace eosio { namespace chain {
       int64_t account_cpu_limit = large_number_no_overflow;
       bool greylisted_net = false;
       bool greylisted_cpu = false;
+
+      uint32_t global_greylist_limit = control.get_global_greylist_limit();
       for( const auto& a : bill_to_accounts ) {
-         bool elastic = force_elastic_limits || !(control.is_producing_block() && control.is_resource_greylisted(a));
-         auto net_limit = rl.get_account_net_limit(a, elastic);
+         uint32_t greylist_limit = config::maximum_elastic_resource_multiplier;
+         if( !force_elastic_limits && control.is_producing_block() ) {
+            if( control.is_resource_greylisted(a) ) {
+               greylist_limit = 1;
+            } else {
+               greylist_limit = global_greylist_limit;
+            }
+         }
+         auto [net_limit, net_was_greylisted] = rl.get_account_net_limit(a, greylist_limit);
          if( net_limit >= 0 ) {
             account_net_limit = std::min( account_net_limit, net_limit );
-            if (!elastic) greylisted_net = true;
+            greylisted_net |= net_was_greylisted;
          }
-         auto cpu_limit = rl.get_account_cpu_limit(a, elastic);
+         auto [cpu_limit, cpu_was_greylisted] = rl.get_account_cpu_limit(a, greylist_limit);
          if( cpu_limit >= 0 ) {
             account_cpu_limit = std::min( account_cpu_limit, cpu_limit );
-            if (!elastic) greylisted_cpu = true;
+            greylisted_cpu |= cpu_was_greylisted;
          }
       }
 
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 08f5e3e66e1..799ab8607e1 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1615,7 +1615,7 @@ string convert_to_string(const chain::key256_t& source, const string& key_type,
          return std::string(val);
       }
       EOS_ASSERT( false, chain_type_exception, "Incompatible key_type and encode_type for key256_t next_key" );
-     
+
    } FC_RETHROW_EXCEPTIONS(warn, "Could not convert ${desc} source '${source}' to string.", ("desc", desc)("source",source) )
 }
 
@@ -2328,9 +2328,9 @@ read_only::get_account_results read_only::get_account( const get_account_params&
    result.last_code_update = accnt_metadata_obj.last_code_update;
    result.created          = accnt_obj.creation_date;
 
-   bool grelisted = db.is_resource_greylisted(result.account_name);
-   result.net_limit = rm.get_account_net_limit_ex( result.account_name, !grelisted);
-   result.cpu_limit = rm.get_account_cpu_limit_ex( result.account_name, !grelisted);
+   uint32_t greylist_limit = db.is_resource_greylisted(result.account_name) ? 1 : config::maximum_elastic_resource_multiplier;
+   result.net_limit = rm.get_account_net_limit_ex( result.account_name, greylist_limit).first;
+   result.cpu_limit = rm.get_account_cpu_limit_ex( result.account_name, greylist_limit).first;
    result.ram_usage = rm.get_account_ram_usage( result.account_name );
 
    const auto& permissions = d.get_index<permission_index,by_owner>();
diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
index 6ebff8d4016..4fc05c188a0 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
@@ -14,13 +14,14 @@ class producer_plugin : public appbase::plugin<producer_plugin> {
    APPBASE_PLUGIN_REQUIRES((chain_plugin)(http_client_plugin))
 
    struct runtime_options {
-      fc::optional<int32_t> max_transaction_time;
-      fc::optional<int32_t> max_irreversible_block_age;
-      fc::optional<int32_t> produce_time_offset_us;
-      fc::optional<int32_t> last_block_time_offset_us;
-      fc::optional<int32_t> max_scheduled_transaction_time_per_block_ms;
-      fc::optional<int32_t> subjective_cpu_leeway_us;
-      fc::optional<double>  incoming_defer_ratio;
+      fc::optional<int32_t>   max_transaction_time;
+      fc::optional<int32_t>   max_irreversible_block_age;
+      fc::optional<int32_t>   produce_time_offset_us;
+      fc::optional<int32_t>   last_block_time_offset_us;
+      fc::optional<int32_t>   max_scheduled_transaction_time_per_block_ms;
+      fc::optional<int32_t>   subjective_cpu_leeway_us;
+      fc::optional<double>    incoming_defer_ratio;
+      fc::optional<uint32_t>  global_greylist_limit;
    };
 
    struct whitelist_blacklist {
@@ -115,7 +116,7 @@ class producer_plugin : public appbase::plugin<producer_plugin> {
 
 } //eosio
 
-FC_REFLECT(eosio::producer_plugin::runtime_options, (max_transaction_time)(max_irreversible_block_age)(produce_time_offset_us)(last_block_time_offset_us)(max_scheduled_transaction_time_per_block_ms)(subjective_cpu_leeway_us)(incoming_defer_ratio));
+FC_REFLECT(eosio::producer_plugin::runtime_options, (max_transaction_time)(max_irreversible_block_age)(produce_time_offset_us)(last_block_time_offset_us)(max_scheduled_transaction_time_per_block_ms)(subjective_cpu_leeway_us)(incoming_defer_ratio)(global_greylist_limit));
 FC_REFLECT(eosio::producer_plugin::greylist_params, (accounts));
 FC_REFLECT(eosio::producer_plugin::whitelist_blacklist, (actor_whitelist)(actor_blacklist)(contract_whitelist)(contract_blacklist)(action_blacklist)(key_blacklist) )
 FC_REFLECT(eosio::producer_plugin::integrity_hash_information, (head_block_id)(integrity_hash))
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index bee42bfa27f..8f87eed7e83 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -871,11 +871,6 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
 
    {
       uint32_t global_greylist_limit = options.at("global-greylist-limit").as<uint32_t>();
-      EOS_ASSERT( 0 < global_greylist_limit && global_greylist_limit <= config::maximum_elastic_resource_multiplier,
-                  plugin_config_exception,
-                  "global-greylist-limit must be between 1 and ${max}",
-                  ("max", config::maximum_elastic_resource_multiplier)
-      );
       chain.set_global_greylist_limit( global_greylist_limit );
    }
 
@@ -967,6 +962,7 @@ bool producer_plugin::paused() const {
 }
 
 void producer_plugin::update_runtime_options(const runtime_options& options) {
+   chain::controller& chain = my->chain_plug->chain();
    bool check_speculating = false;
 
    if (options.max_transaction_time) {
@@ -995,15 +991,17 @@ void producer_plugin::update_runtime_options(const runtime_options& options) {
    }
 
    if (check_speculating && my->_pending_block_mode == pending_block_mode::speculating) {
-      chain::controller& chain = my->chain_plug->chain();
       my->_unapplied_transactions.add_aborted( chain.abort_block() );
       my->schedule_production_loop();
    }
 
    if (options.subjective_cpu_leeway_us) {
-      chain::controller& chain = my->chain_plug->chain();
       chain.set_subjective_cpu_leeway(fc::microseconds(*options.subjective_cpu_leeway_us));
    }
+
+   if (options.global_greylist_limit) {
+      chain.set_global_greylist_limit(*options.global_greylist_limit);
+   }
 }
 
 producer_plugin::runtime_options producer_plugin::get_runtime_options() const {
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
index d97b1f1ced8..4874d4e5354 100644
--- a/unittests/protocol_feature_tests.cpp
+++ b/unittests/protocol_feature_tests.cpp
@@ -881,17 +881,17 @@ BOOST_AUTO_TEST_CASE( only_bill_to_first_authorizer ) { try {
       trx.sign(get_private_key(tester_account2, "active"), chain.control->get_chain_id());
 
 
-      auto tester_cpu_limit0  = mgr.get_account_cpu_limit_ex(tester_account);
-      auto tester2_cpu_limit0 = mgr.get_account_cpu_limit_ex(tester_account2);
-      auto tester_net_limit0  = mgr.get_account_net_limit_ex(tester_account);
-      auto tester2_net_limit0 = mgr.get_account_net_limit_ex(tester_account2);
+      auto tester_cpu_limit0  = mgr.get_account_cpu_limit_ex(tester_account).first;
+      auto tester2_cpu_limit0 = mgr.get_account_cpu_limit_ex(tester_account2).first;
+      auto tester_net_limit0  = mgr.get_account_net_limit_ex(tester_account).first;
+      auto tester2_net_limit0 = mgr.get_account_net_limit_ex(tester_account2).first;
 
       chain.push_transaction(trx);
 
-      auto tester_cpu_limit1  = mgr.get_account_cpu_limit_ex(tester_account);
-      auto tester2_cpu_limit1 = mgr.get_account_cpu_limit_ex(tester_account2);
-      auto tester_net_limit1  = mgr.get_account_net_limit_ex(tester_account);
-      auto tester2_net_limit1 = mgr.get_account_net_limit_ex(tester_account2);
+      auto tester_cpu_limit1  = mgr.get_account_cpu_limit_ex(tester_account).first;
+      auto tester2_cpu_limit1 = mgr.get_account_cpu_limit_ex(tester_account2).first;
+      auto tester_net_limit1  = mgr.get_account_net_limit_ex(tester_account).first;
+      auto tester2_net_limit1 = mgr.get_account_net_limit_ex(tester_account2).first;
 
       BOOST_CHECK(tester_cpu_limit1.used > tester_cpu_limit0.used);
       BOOST_CHECK(tester2_cpu_limit1.used > tester2_cpu_limit0.used);
@@ -925,17 +925,17 @@ BOOST_AUTO_TEST_CASE( only_bill_to_first_authorizer ) { try {
       trx.sign(get_private_key(tester_account, "active"), chain.control->get_chain_id());
       trx.sign(get_private_key(tester_account2, "active"), chain.control->get_chain_id());
 
-      auto tester_cpu_limit0  = mgr.get_account_cpu_limit_ex(tester_account);
-      auto tester2_cpu_limit0 = mgr.get_account_cpu_limit_ex(tester_account2);
-      auto tester_net_limit0  = mgr.get_account_net_limit_ex(tester_account);
-      auto tester2_net_limit0 = mgr.get_account_net_limit_ex(tester_account2);
+      auto tester_cpu_limit0  = mgr.get_account_cpu_limit_ex(tester_account).first;
+      auto tester2_cpu_limit0 = mgr.get_account_cpu_limit_ex(tester_account2).first;
+      auto tester_net_limit0  = mgr.get_account_net_limit_ex(tester_account).first;
+      auto tester2_net_limit0 = mgr.get_account_net_limit_ex(tester_account2).first;
 
       chain.push_transaction(trx);
 
-      auto tester_cpu_limit1  = mgr.get_account_cpu_limit_ex(tester_account);
-      auto tester2_cpu_limit1 = mgr.get_account_cpu_limit_ex(tester_account2);
-      auto tester_net_limit1  = mgr.get_account_net_limit_ex(tester_account);
-      auto tester2_net_limit1 = mgr.get_account_net_limit_ex(tester_account2);
+      auto tester_cpu_limit1  = mgr.get_account_cpu_limit_ex(tester_account).first;
+      auto tester2_cpu_limit1 = mgr.get_account_cpu_limit_ex(tester_account2).first;
+      auto tester_net_limit1  = mgr.get_account_net_limit_ex(tester_account).first;
+      auto tester2_net_limit1 = mgr.get_account_net_limit_ex(tester_account2).first;
 
       BOOST_CHECK(tester_cpu_limit1.used > tester_cpu_limit0.used);
       BOOST_CHECK(tester2_cpu_limit1.used == tester2_cpu_limit0.used);

From 9e3481e9590eade26015813254ee7a9a129d09e7 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 8 Oct 2019 17:32:20 -0400
Subject: [PATCH 1444/1648] add whitelist_blacklist_tests/global_greylist_tests
 test

---
 unittests/whitelist_blacklist_tests.cpp | 187 +++++++++++++++++++++++-
 1 file changed, 186 insertions(+), 1 deletion(-)

diff --git a/unittests/whitelist_blacklist_tests.cpp b/unittests/whitelist_blacklist_tests.cpp
index dcbcb1ba14a..e5270e7acad 100644
--- a/unittests/whitelist_blacklist_tests.cpp
+++ b/unittests/whitelist_blacklist_tests.cpp
@@ -1,4 +1,5 @@
 #include <eosio/chain/generated_transaction_object.hpp>
+#include <eosio/chain/resource_limits.hpp>
 #include <eosio/testing/tester.hpp>
 #include <eosio/testing/tester_network.hpp>
 
@@ -389,7 +390,7 @@ BOOST_AUTO_TEST_CASE( blacklist_onerror ) { try {
    tester1.chain->set_code( N(charlie), contracts::deferred_test_wasm() );
    tester1.chain->set_abi( N(charlie),  contracts::deferred_test_abi().data() );
    tester1.chain->produce_blocks();
-   
+
    tester1.chain->push_action( N(bob), N(defercall), N(alice), mvo()
       ( "payer", "alice" )
       ( "sender_id", 0 )
@@ -712,4 +713,188 @@ BOOST_AUTO_TEST_CASE( blacklist_sender_bypass ) { try {
 
 } FC_LOG_AND_RETHROW() }
 
+BOOST_AUTO_TEST_CASE( global_greylist_tests ) { try {
+   fc::temp_directory tempdir;
+   auto conf_genesis = tester::default_config( tempdir );
+
+   auto& cfg = conf_genesis.second.initial_configuration;
+
+   cfg.max_block_net_usage        = 128 * 1024; // 64 KiB max block size
+   cfg.target_block_net_usage_pct = config::percent_1/10;
+   // A total net usage of more than 131 bytes will keep the block above the target.
+   cfg.max_transaction_net_usage  = 64 * 1024;
+
+   cfg.max_block_cpu_usage        = 150'000; // maximum of 150 ms of CPU per block
+   cfg.target_block_cpu_usage_pct = config::percent_1/10; // More than 150 us of CPU to keep the block above the target.
+   cfg.max_transaction_cpu_usage  = 50'000;
+   cfg.min_transaction_cpu_usage  = 100; // Empty blocks (consisting of only onblock) would be below the target.
+   // But all it takes is one transaction in the block to be above the target.
+
+   tester c( conf_genesis.first, conf_genesis.second );
+   c.execute_setup_policy( setup_policy::full );
+
+   const resource_limits_manager& rm = c.control->get_resource_limits_manager();
+
+   const auto& user_account  = N(user);
+   const auto& other_account = N(other);
+
+   c.create_accounts( {user_account, other_account} );
+
+   c.push_action( config::system_account_name, N(setalimits), config::system_account_name, fc::mutable_variant_object()
+      ("account", user_account)
+      ("ram_bytes", -1)
+      ("net_weight", 1)
+      ("cpu_weight", 1)
+   );
+
+   c.push_action( config::system_account_name, N(setalimits), config::system_account_name, fc::mutable_variant_object()
+      ("account", other_account)
+      ("ram_bytes", -1)
+      ("net_weight", 249'999'999)
+      ("cpu_weight", 249'999'999)
+   );
+
+   const uint64_t reqauth_net_charge = 104;
+   auto push_reqauth = [&]( name acnt, name perm, uint32_t billed_cpu_time_us ) {
+      signed_transaction trx;
+      trx.actions.emplace_back( c.get_action( config::system_account_name, N(reqauth),
+                                              std::vector<permission_level>{{acnt, perm}},
+                                              fc::mutable_variant_object()("from", acnt) ) );
+      c.set_transaction_headers( trx, 6, 0 );
+      trx.sign( c.get_private_key( acnt, perm.to_string() ), c.control->get_chain_id() );
+      // This transaction is charged 104 bytes of NET.
+
+      return c.push_transaction( trx, fc::time_point::maximum(), billed_cpu_time_us );
+   };
+
+   // Force contraction of elastic resources until fully congested.
+   c.produce_block();
+   for( size_t i = 0; i < 300; ++i ) {
+      push_reqauth( other_account, config::active_name, cfg.min_transaction_cpu_usage );
+      push_reqauth( other_account, config::owner_name, cfg.min_transaction_cpu_usage );
+      c.produce_block();
+   }
+
+   BOOST_REQUIRE_EQUAL( rm.get_virtual_block_cpu_limit(), cfg.max_block_cpu_usage );
+   BOOST_REQUIRE_EQUAL( rm.get_virtual_block_net_limit(), cfg.max_block_net_usage );
+
+   uint64_t blocks_per_day = 2*60*60*24;
+
+   uint64_t user_cpu_per_day = (cfg.max_block_cpu_usage * blocks_per_day / 250'000'000); // 103 us
+   uint64_t user_net_per_day = (cfg.max_block_net_usage * blocks_per_day / 250'000'000); // 90 bytes
+   wdump((user_cpu_per_day)(user_net_per_day));
+
+   BOOST_REQUIRE_EQUAL( rm.get_account_cpu_limit_ex(user_account).first.max, user_cpu_per_day );
+   BOOST_REQUIRE_EQUAL( rm.get_account_net_limit_ex(user_account).first.max, user_net_per_day );
+   BOOST_REQUIRE_EQUAL( rm.get_account_cpu_limit_ex(user_account, 1).first.max, user_cpu_per_day );
+   BOOST_REQUIRE_EQUAL( rm.get_account_net_limit_ex(user_account, 1).first.max, user_net_per_day );
+
+   // The reqauth transaction will use more NET than the user can currently support under full congestion.
+   BOOST_REQUIRE_EXCEPTION(
+      push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage ),
+      tx_net_usage_exceeded,
+      fc_exception_message_starts_with("transaction net usage is too high")
+   );
+
+   wdump((rm.get_account_net_limit(user_account).first));
+
+   // Allow congestion to reduce a little bit.
+   c.produce_blocks(1400);
+
+   BOOST_REQUIRE( rm.get_virtual_block_net_limit() > (3*cfg.max_block_net_usage) );
+   BOOST_REQUIRE( rm.get_virtual_block_net_limit() < (4*cfg.max_block_net_usage) );
+   wdump((rm.get_account_net_limit_ex(user_account)));
+   BOOST_REQUIRE( rm.get_account_net_limit_ex(user_account).first.max > 3*reqauth_net_charge );
+   BOOST_REQUIRE( rm.get_account_net_limit_ex(user_account).first.max < 4*reqauth_net_charge );
+
+
+   // User can only push three reqauths per day even at this relaxed congestion level.
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   BOOST_REQUIRE_EXCEPTION(
+      push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage ),
+      tx_net_usage_exceeded,
+      fc_exception_message_starts_with("transaction net usage is too high")
+   );
+   c.produce_block( fc::days(1) );
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   c.produce_block( fc::days(1) );
+
+   // Reducing the global greylist from 1000 to 4 should not make a difference since it would not be the
+   // bottleneck at this level of congestion. But dropping it to 3 would make a difference.
+   {
+      auto user_elastic_cpu_limit = rm.get_account_cpu_limit_ex(user_account).first.max;
+      auto user_elastic_net_limit = rm.get_account_net_limit_ex(user_account).first.max;
+
+      auto user_cpu_res1 = rm.get_account_cpu_limit_ex(user_account, 4);
+      BOOST_REQUIRE_EQUAL( user_cpu_res1.first.max, user_elastic_cpu_limit );
+      BOOST_REQUIRE_EQUAL( user_cpu_res1.second, false );
+      auto user_net_res1 = rm.get_account_net_limit_ex(user_account, 4);
+      BOOST_REQUIRE_EQUAL( user_net_res1.first.max, user_elastic_net_limit );
+      BOOST_REQUIRE_EQUAL( user_net_res1.second, false );
+
+      auto user_cpu_res2 = rm.get_account_cpu_limit_ex(user_account, 3);
+      BOOST_REQUIRE( user_cpu_res2.first.max < user_elastic_cpu_limit );
+      BOOST_REQUIRE_EQUAL( user_cpu_res2.second, true );
+      auto user_net_res2 = rm.get_account_net_limit_ex(user_account, 3);
+      BOOST_REQUIRE( user_net_res2.first.max < user_elastic_net_limit );
+      BOOST_REQUIRE_EQUAL( user_net_res2.second, true );
+      BOOST_REQUIRE( 2*reqauth_net_charge < user_net_res2.first.max );
+      BOOST_REQUIRE( user_net_res2.first.max < 3*reqauth_net_charge );
+   }
+
+   ilog("setting global greylist limit to 4");
+   c.control->set_global_greylist_limit( 4 );
+   c.produce_block();
+
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+
+   ilog("setting global greylist limit to 3");
+   c.control->set_global_greylist_limit( 3 );
+   c.produce_block( fc::days(1) );
+
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   BOOST_REQUIRE_EXCEPTION(
+      push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage ),
+      greylist_net_usage_exceeded,
+      fc_exception_message_starts_with("greylisted transaction net usage is too high")
+   );
+   c.produce_block( fc::days(1) );
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+   push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
+   c.produce_block();
+
+   // Finally, dropping the global greylist limit to 1 will restrict the user's NET bandwidth so much that this user
+   // cannot push even a single reqauth just like when they were under full congestion.
+   // However, this time the exception will be due to greylist_net_usage_exceeded rather than tx_net_usage_exceeded.
+   ilog("setting global greylist limit to 1");
+   c.control->set_global_greylist_limit( 1 );
+   c.produce_block( fc::days(1) );
+   BOOST_REQUIRE_EQUAL( rm.get_account_cpu_limit_ex(user_account, 1).first.max, user_cpu_per_day  );
+   BOOST_REQUIRE_EQUAL( rm.get_account_net_limit_ex(user_account, 1).first.max, user_net_per_day  );
+   BOOST_REQUIRE_EXCEPTION(
+      push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage ),
+      greylist_net_usage_exceeded,
+      fc_exception_message_starts_with("greylisted transaction net usage is too high")
+   );
+} FC_LOG_AND_RETHROW() }
+
 BOOST_AUTO_TEST_SUITE_END()

From 29f3ff71053e848757ad9a9bd5867b55525a508b Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 9 Oct 2019 13:59:12 -0400
Subject: [PATCH 1445/1648] don't rebuild llvm unnecessarily during pinned
 builds

---
 scripts/helpers/eosio.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 68c5367d526..d9395c29a91 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -270,6 +270,9 @@ function ensure-boost() {
 
 function ensure-llvm() {
     if $PIN_COMPILER || $BUILD_CLANG; then
+        if [[ -d $LLVM_ROOT ]]; then
+            return
+        fi
         LLVM_TEMP_DIR=$(mktemp -d)
         if $PIN_COMPILER || $BUILD_CLANG; then
             local LLVM_PINNED_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread"

From 09f9eb2dc67b31440ff5c40dea055b4609d2b84e Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Thu, 10 Oct 2019 10:11:06 -0400
Subject: [PATCH 1446/1648] address @heifner's review comments on
 EOSIO/eos#8044

---
 libraries/chain/controller.cpp                 | 11 +++++------
 .../chain/include/eosio/chain/controller.hpp   |  5 +++--
 libraries/chain/transaction_context.cpp        |  4 ++--
 .../eosio/producer_plugin/producer_plugin.hpp  |  4 ++--
 plugins/producer_plugin/producer_plugin.cpp    | 12 ++++++------
 unittests/whitelist_blacklist_tests.cpp        | 18 +++++++++---------
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c3079f25f93..f57aa026ed1 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -230,7 +230,6 @@ struct controller_impl {
    db_read_mode                   read_mode = db_read_mode::SPECULATIVE;
    bool                           in_trx_requiring_checks = false; ///< if true, checks that are normally skipped on replay (e.g. auth checks) cannot be skipped
    optional<fc::microseconds>     subjective_cpu_leeway;
-   uint32_t                       global_greylist_limit = config::maximum_elastic_resource_multiplier;
    bool                           trusted_producer_light_validation = false;
    uint32_t                       snapshot_head_block = 0;
    named_thread_pool              thread_pool;
@@ -3131,18 +3130,18 @@ void controller::set_subjective_cpu_leeway(fc::microseconds leeway) {
    my->subjective_cpu_leeway = leeway;
 }
 
-void controller::set_global_greylist_limit( uint32_t limit ) {
+void controller::set_greylist_limit( uint32_t limit ) {
    EOS_ASSERT( 0 < limit && limit <= chain::config::maximum_elastic_resource_multiplier,
                misc_exception,
-               "Invalid limit (${limit}) passed into set_global_greylist_limit. "
+               "Invalid limit (${limit}) passed into set_greylist_limit. "
                "Must be between 1 and ${max}.",
                ("limit", limit)("max", chain::config::maximum_elastic_resource_multiplier)
    );
-   my->global_greylist_limit = limit;
+   my->conf.greylist_limit = limit;
 }
 
-uint32_t controller::get_global_greylist_limit()const {
-   return my->global_greylist_limit;
+uint32_t controller::get_greylist_limit()const {
+   return my->conf.greylist_limit;
 }
 
 void controller::add_resource_greylist(const account_name &name) {
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 9c6b19d3798..058b2ac0a5f 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -94,6 +94,7 @@ namespace eosio { namespace chain {
 
             flat_set<account_name>   resource_greylist;
             flat_set<account_name>   trusted_producers;
+            uint32_t                 greylist_limit         = chain::config::maximum_elastic_resource_multiplier;
          };
 
          enum class block_status {
@@ -282,8 +283,8 @@ namespace eosio { namespace chain {
          validation_mode get_validation_mode()const;
 
          void set_subjective_cpu_leeway(fc::microseconds leeway);
-         void set_global_greylist_limit( uint32_t limit );
-         uint32_t get_global_greylist_limit()const;
+         void set_greylist_limit( uint32_t limit );
+         uint32_t get_greylist_limit()const;
 
          void add_to_ram_correction( account_name account, uint64_t ram_bytes );
          bool all_subjective_mitigations_disabled()const;
diff --git a/libraries/chain/transaction_context.cpp b/libraries/chain/transaction_context.cpp
index ac3ed8f4455..49a67dff882 100644
--- a/libraries/chain/transaction_context.cpp
+++ b/libraries/chain/transaction_context.cpp
@@ -482,14 +482,14 @@ namespace eosio { namespace chain {
       bool greylisted_net = false;
       bool greylisted_cpu = false;
 
-      uint32_t global_greylist_limit = control.get_global_greylist_limit();
+      uint32_t specified_greylist_limit = control.get_greylist_limit();
       for( const auto& a : bill_to_accounts ) {
          uint32_t greylist_limit = config::maximum_elastic_resource_multiplier;
          if( !force_elastic_limits && control.is_producing_block() ) {
             if( control.is_resource_greylisted(a) ) {
                greylist_limit = 1;
             } else {
-               greylist_limit = global_greylist_limit;
+               greylist_limit = specified_greylist_limit;
             }
          }
          auto [net_limit, net_was_greylisted] = rl.get_account_net_limit(a, greylist_limit);
diff --git a/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp b/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
index 4fc05c188a0..e572fa2e5d8 100644
--- a/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
+++ b/plugins/producer_plugin/include/eosio/producer_plugin/producer_plugin.hpp
@@ -21,7 +21,7 @@ class producer_plugin : public appbase::plugin<producer_plugin> {
       fc::optional<int32_t>   max_scheduled_transaction_time_per_block_ms;
       fc::optional<int32_t>   subjective_cpu_leeway_us;
       fc::optional<double>    incoming_defer_ratio;
-      fc::optional<uint32_t>  global_greylist_limit;
+      fc::optional<uint32_t>  greylist_limit;
    };
 
    struct whitelist_blacklist {
@@ -116,7 +116,7 @@ class producer_plugin : public appbase::plugin<producer_plugin> {
 
 } //eosio
 
-FC_REFLECT(eosio::producer_plugin::runtime_options, (max_transaction_time)(max_irreversible_block_age)(produce_time_offset_us)(last_block_time_offset_us)(max_scheduled_transaction_time_per_block_ms)(subjective_cpu_leeway_us)(incoming_defer_ratio)(global_greylist_limit));
+FC_REFLECT(eosio::producer_plugin::runtime_options, (max_transaction_time)(max_irreversible_block_age)(produce_time_offset_us)(last_block_time_offset_us)(max_scheduled_transaction_time_per_block_ms)(subjective_cpu_leeway_us)(incoming_defer_ratio)(greylist_limit));
 FC_REFLECT(eosio::producer_plugin::greylist_params, (accounts));
 FC_REFLECT(eosio::producer_plugin::whitelist_blacklist, (actor_whitelist)(actor_blacklist)(contract_whitelist)(contract_blacklist)(action_blacklist)(key_blacklist) )
 FC_REFLECT(eosio::producer_plugin::integrity_hash_information, (head_block_id)(integrity_hash))
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 8f87eed7e83..501518d7272 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -646,8 +646,8 @@ void producer_plugin::set_program_options(
           "Limits the maximum time (in milliseconds) that is allowed for sending blocks to a keosd provider for signing")
          ("greylist-account", boost::program_options::value<vector<string>>()->composing()->multitoken(),
           "account that can not access to extended CPU/NET virtual resources")
-         ("global-greylist-limit", boost::program_options::value<uint32_t>()->default_value(1000),
-          "Limit (between 1 and 1000) on the multiple that CPU/NET virtual resources can extend during low congestion (only enforced subjectively; use 1000 to not enforce any limit)")
+         ("greylist-limit", boost::program_options::value<uint32_t>()->default_value(1000),
+          "Limit (between 1 and 1000) on the multiple that CPU/NET virtual resources can extend during low usage (only enforced subjectively; use 1000 to not enforce any limit)")
          ("produce-time-offset-us", boost::program_options::value<int32_t>()->default_value(0),
           "offset of non last block producing time in microseconds. Negative number results in blocks to go out sooner, and positive number results in blocks to go out later")
          ("last-block-time-offset-us", boost::program_options::value<int32_t>()->default_value(0),
@@ -870,8 +870,8 @@ void producer_plugin::plugin_initialize(const boost::program_options::variables_
    }
 
    {
-      uint32_t global_greylist_limit = options.at("global-greylist-limit").as<uint32_t>();
-      chain.set_global_greylist_limit( global_greylist_limit );
+      uint32_t greylist_limit = options.at("greylist-limit").as<uint32_t>();
+      chain.set_greylist_limit( greylist_limit );
    }
 
 } FC_LOG_AND_RETHROW() }
@@ -999,8 +999,8 @@ void producer_plugin::update_runtime_options(const runtime_options& options) {
       chain.set_subjective_cpu_leeway(fc::microseconds(*options.subjective_cpu_leeway_us));
    }
 
-   if (options.global_greylist_limit) {
-      chain.set_global_greylist_limit(*options.global_greylist_limit);
+   if (options.greylist_limit) {
+      chain.set_greylist_limit(*options.greylist_limit);
    }
 }
 
diff --git a/unittests/whitelist_blacklist_tests.cpp b/unittests/whitelist_blacklist_tests.cpp
index e5270e7acad..faabea39220 100644
--- a/unittests/whitelist_blacklist_tests.cpp
+++ b/unittests/whitelist_blacklist_tests.cpp
@@ -713,7 +713,7 @@ BOOST_AUTO_TEST_CASE( blacklist_sender_bypass ) { try {
 
 } FC_LOG_AND_RETHROW() }
 
-BOOST_AUTO_TEST_CASE( global_greylist_tests ) { try {
+BOOST_AUTO_TEST_CASE( greylist_limit_tests ) { try {
    fc::temp_directory tempdir;
    auto conf_genesis = tester::default_config( tempdir );
 
@@ -829,7 +829,7 @@ BOOST_AUTO_TEST_CASE( global_greylist_tests ) { try {
    c.produce_block();
    c.produce_block( fc::days(1) );
 
-   // Reducing the global greylist from 1000 to 4 should not make a difference since it would not be the
+   // Reducing the greylist limit from 1000 to 4 should not make a difference since it would not be the
    // bottleneck at this level of congestion. But dropping it to 3 would make a difference.
    {
       auto user_elastic_cpu_limit = rm.get_account_cpu_limit_ex(user_account).first.max;
@@ -852,8 +852,8 @@ BOOST_AUTO_TEST_CASE( global_greylist_tests ) { try {
       BOOST_REQUIRE( user_net_res2.first.max < 3*reqauth_net_charge );
    }
 
-   ilog("setting global greylist limit to 4");
-   c.control->set_global_greylist_limit( 4 );
+   ilog("setting greylist limit to 4");
+   c.control->set_greylist_limit( 4 );
    c.produce_block();
 
    push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
@@ -863,8 +863,8 @@ BOOST_AUTO_TEST_CASE( global_greylist_tests ) { try {
    push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
    c.produce_block();
 
-   ilog("setting global greylist limit to 3");
-   c.control->set_global_greylist_limit( 3 );
+   ilog("setting greylist limit to 3");
+   c.control->set_greylist_limit( 3 );
    c.produce_block( fc::days(1) );
 
    push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
@@ -882,11 +882,11 @@ BOOST_AUTO_TEST_CASE( global_greylist_tests ) { try {
    push_reqauth( user_account, config::active_name, cfg.min_transaction_cpu_usage );
    c.produce_block();
 
-   // Finally, dropping the global greylist limit to 1 will restrict the user's NET bandwidth so much that this user
+   // Finally, dropping the greylist limit to 1 will restrict the user's NET bandwidth so much that this user
    // cannot push even a single reqauth just like when they were under full congestion.
    // However, this time the exception will be due to greylist_net_usage_exceeded rather than tx_net_usage_exceeded.
-   ilog("setting global greylist limit to 1");
-   c.control->set_global_greylist_limit( 1 );
+   ilog("setting greylist limit to 1");
+   c.control->set_greylist_limit( 1 );
    c.produce_block( fc::days(1) );
    BOOST_REQUIRE_EQUAL( rm.get_account_cpu_limit_ex(user_account, 1).first.max, user_cpu_per_day  );
    BOOST_REQUIRE_EQUAL( rm.get_account_net_limit_ex(user_account, 1).first.max, user_net_per_day  );

From c18519e69c6e9111b5ccb26a6572cf5d4151a3b1 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Thu, 10 Oct 2019 10:40:46 -0400
Subject: [PATCH 1447/1648] remove unnecessary reflection of controller::config

---
 .../chain/include/eosio/chain/controller.hpp   | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 058b2ac0a5f..61d4f366caf 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -353,21 +353,3 @@ namespace eosio { namespace chain {
    };
 
 } }  /// eosio::chain
-
-FC_REFLECT( eosio::chain::controller::config,
-            (actor_whitelist)
-            (actor_blacklist)
-            (contract_whitelist)
-            (contract_blacklist)
-            (blocks_dir)
-            (state_dir)
-            (state_size)
-            (reversible_cache_size)
-            (read_only)
-            (force_all_checks)
-            (disable_replay_opts)
-            (contracts_console)
-            (wasm_runtime)
-            (resource_greylist)
-            (trusted_producers)
-          )

From dabad6794045cfea4031e9c90dfe5a3a9ff4c490 Mon Sep 17 00:00:00 2001
From: Todd Fleming <todd.fleming@block.one>
Date: Fri, 11 Oct 2019 11:48:13 -0400
Subject: [PATCH 1448/1648] #8054: fix commas in ship abi

---
 plugins/state_history_plugin/state_history_plugin_abi.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/state_history_plugin/state_history_plugin_abi.cpp b/plugins/state_history_plugin/state_history_plugin_abi.cpp
index 072215973c6..766c747d3d1 100644
--- a/plugins/state_history_plugin/state_history_plugin_abi.cpp
+++ b/plugins/state_history_plugin/state_history_plugin_abi.cpp
@@ -361,7 +361,7 @@ extern const char* const state_history_plugin_abi = R"({
             "name": "global_property_v1", "fields": [
                 { "type": "uint32?", "name": "proposed_schedule_block_num" },
                 { "type": "producer_authority_schedule", "name": "proposed_schedule" },
-                { "type": "chain_config", "name": "configuration" }
+                { "type": "chain_config", "name": "configuration" },
                 { "type": "checksum256", "name": "chain_id" }
             ]
         },
@@ -531,7 +531,7 @@ extern const char* const state_history_plugin_abi = R"({
         { "name": "resource_limits_ratio", "types": ["resource_limits_ratio_v0"] },
         { "name": "elastic_limit_parameters", "types": ["elastic_limit_parameters_v0"] },
         { "name": "resource_limits_config", "types": ["resource_limits_config_v0"] },
-        { "name": "block_signing_authority", "types": ["block_signing_authority_v0"] },
+        { "name": "block_signing_authority", "types": ["block_signing_authority_v0"] }
     ],
     "tables": [
         { "name": "account", "type": "account", "key_names": ["name"] },

From 3ec948d94c198db35860b85b4fbd92086631cd63 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 9 Oct 2019 08:52:46 -0500
Subject: [PATCH 1449/1648] Update to support new producer schedule

---
 programs/cleos/main.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 39d9e0311b5..51a1a092e16 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -1322,10 +1322,21 @@ struct get_schedule_subcommand {
          return;
       }
       printf("%s schedule version %s\n", name, schedule["version"].as_string().c_str());
-      printf("    %-13s %s\n", "Producer", "Producer key");
+      printf("    %-13s %s\n", "Producer", "Producer Authority");
       printf("    %-13s %s\n", "=============", "==================");
-      for (auto& row: schedule["producers"].get_array())
-         printf("    %-13s %s\n", row["producer_name"].as_string().c_str(), row["block_signing_key"].as_string().c_str());
+      for( auto& row: schedule["producers"].get_array() ) {
+         if( row.get_object().contains("block_signing_key") ) {
+            // pre 2.0
+            printf( "    %-13s %s\n", row["producer_name"].as_string().c_str(), row["block_signing_key"].as_string().c_str() );
+         } else {
+            printf( "    %-13s ", row["producer_name"].as_string().c_str() );
+            auto a = row["authority"].as<block_signing_authority>();
+            static_assert( std::is_same<decltype(a), static_variant<block_signing_authority_v0>>::value,
+                           "Updates maybe needed if block_signing_authority changes" );
+            block_signing_authority_v0 auth = a.get<block_signing_authority_v0>();
+            printf( "%s\n", fc::json::to_string( auth ).c_str() );
+         }
+      }
       printf("\n");
    }
 

From d48beacb330ca43b5b455ad40cf31abb4b3ce587 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 11 Oct 2019 12:13:58 -0500
Subject: [PATCH 1450/1648] Updated to use new version library for version and
 full-version reporting

---
 programs/keosd/CMakeLists.txt  | 2 +-
 programs/keosd/main.cpp        | 3 +++
 programs/nodeos/CMakeLists.txt | 2 +-
 programs/nodeos/main.cpp       | 5 ++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/programs/keosd/CMakeLists.txt b/programs/keosd/CMakeLists.txt
index 3c806fbed39..f3903cd648c 100644
--- a/programs/keosd/CMakeLists.txt
+++ b/programs/keosd/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 configure_file(config.hpp.in config.hpp ESCAPE_QUOTES)
 
 target_link_libraries( ${KEY_STORE_EXECUTABLE_NAME}
-        PRIVATE appbase
+        PRIVATE appbase version
         PRIVATE wallet_api_plugin wallet_plugin
         PRIVATE http_plugin
         PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
diff --git a/programs/keosd/main.cpp b/programs/keosd/main.cpp
index dd7aa6a040e..ce1138014a8 100644
--- a/programs/keosd/main.cpp
+++ b/programs/keosd/main.cpp
@@ -3,6 +3,7 @@
 #include <eosio/http_plugin/http_plugin.hpp>
 #include <eosio/wallet_plugin/wallet_plugin.hpp>
 #include <eosio/wallet_api_plugin/wallet_api_plugin.hpp>
+#include <eosio/version/version.hpp>
 
 #include <fc/log/logger_config.hpp>
 #include <fc/exception/exception.hpp>
@@ -33,6 +34,8 @@ bfs::path determine_home_directory()
 int main(int argc, char** argv)
 {
    try {
+      app().set_version_string(eosio::version::version_client());
+      app().set_full_version_string(eosio::version::version_full());
       bfs::path home = determine_home_directory();
       app().set_default_data_dir(home / "eosio-wallet");
       app().set_default_config_dir(home / "eosio-wallet");
diff --git a/programs/nodeos/CMakeLists.txt b/programs/nodeos/CMakeLists.txt
index d5fe8273eb5..0b1b5fed649 100644
--- a/programs/nodeos/CMakeLists.txt
+++ b/programs/nodeos/CMakeLists.txt
@@ -48,7 +48,7 @@ else()
 endif()
 
 target_link_libraries( ${NODE_EXECUTABLE_NAME}
-        PRIVATE appbase
+        PRIVATE appbase version
         PRIVATE -Wl,${whole_archive_flag} login_plugin               -Wl,${no_whole_archive_flag}
         PRIVATE -Wl,${whole_archive_flag} history_plugin             -Wl,${no_whole_archive_flag}
         PRIVATE -Wl,${whole_archive_flag} state_history_plugin       -Wl,${no_whole_archive_flag}
diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 5eac9d29bac..a9e4f65f22e 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -4,6 +4,7 @@
 #include <eosio/http_plugin/http_plugin.hpp>
 #include <eosio/net_plugin/net_plugin.hpp>
 #include <eosio/producer_plugin/producer_plugin.hpp>
+#include <eosio/version/version.hpp>
 
 #include <fc/log/logger_config.hpp>
 #include <fc/log/appender.hpp>
@@ -82,6 +83,8 @@ int main(int argc, char** argv)
 {
    try {
       app().set_version(eosio::nodeos::config::version);
+      app().set_version_string(eosio::version::version_client());
+      app().set_full_version_string(eosio::version::version_full());
 
       auto root = fc::app_path();
       app().set_default_data_dir(root / "eosio" / nodeos::config::node_executable_name / "data" );
@@ -91,7 +94,7 @@ int main(int argc, char** argv)
          .default_http_port = 8888
       });
       if(!app().initialize<chain_plugin, net_plugin, producer_plugin>(argc, argv)) {
-         if(app().get_options().count("help") || app().get_options().count("version")) {
+         if(app().get_options().count("help") || app().get_options().count("version") || app().get_options().count("full-version")) {
             return SUCCESS;
          }
          return INITIALIZE_FAIL;

From 84725dccaff2069d18c968debe0c9bd5a3822813 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 11 Oct 2019 12:23:36 -0500
Subject: [PATCH 1451/1648] Add server_full_version_string to get info

---
 plugins/chain_plugin/chain_plugin.cpp                       | 3 ++-
 .../include/eosio/chain_plugin/chain_plugin.hpp             | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
index 799ab8607e1..a854095fe3f 100644
--- a/plugins/chain_plugin/chain_plugin.cpp
+++ b/plugins/chain_plugin/chain_plugin.cpp
@@ -1430,7 +1430,8 @@ read_only::get_info_results read_only::get_info(const read_only::get_info_params
       //__builtin_popcountll(db.get_dynamic_global_properties().recent_slots_filled) / 64.0,
       app().version_string(),
       db.fork_db_pending_head_block_num(),
-      db.fork_db_pending_head_block_id()
+      db.fork_db_pending_head_block_id(),
+      app().full_version_string()
    };
 }
 
diff --git a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
index c56c5899c02..e00deb709e2 100644
--- a/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
+++ b/plugins/chain_plugin/include/eosio/chain_plugin/chain_plugin.hpp
@@ -113,6 +113,7 @@ class read_only {
       optional<string>        server_version_string;
       optional<uint32_t>              fork_db_head_block_num;
       optional<chain::block_id_type>  fork_db_head_block_id;
+      optional<string>        server_full_version_string;
    };
    get_info_results get_info(const get_info_params&) const;
 
@@ -749,7 +750,10 @@ class chain_plugin : public plugin<chain_plugin> {
 FC_REFLECT( eosio::chain_apis::permission, (perm_name)(parent)(required_auth) )
 FC_REFLECT(eosio::chain_apis::empty, )
 FC_REFLECT(eosio::chain_apis::read_only::get_info_results,
-(server_version)(chain_id)(head_block_num)(last_irreversible_block_num)(last_irreversible_block_id)(head_block_id)(head_block_time)(head_block_producer)(virtual_block_cpu_limit)(virtual_block_net_limit)(block_cpu_limit)(block_net_limit)(server_version_string)(fork_db_head_block_num)(fork_db_head_block_id) )
+           (server_version)(chain_id)(head_block_num)(last_irreversible_block_num)(last_irreversible_block_id)
+           (head_block_id)(head_block_time)(head_block_producer)
+           (virtual_block_cpu_limit)(virtual_block_net_limit)(block_cpu_limit)(block_net_limit)
+           (server_version_string)(fork_db_head_block_num)(fork_db_head_block_id)(server_full_version_string) )
 FC_REFLECT(eosio::chain_apis::read_only::get_activated_protocol_features_params, (lower_bound)(upper_bound)(limit)(search_by_block_num)(reverse) )
 FC_REFLECT(eosio::chain_apis::read_only::get_activated_protocol_features_results, (activated_protocol_features)(more) )
 FC_REFLECT(eosio::chain_apis::read_only::get_block_params, (block_num_or_id))

From 26ecee1c094f4ae1f3aeba053af9eab0756572b6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 15 Oct 2019 12:29:18 -0500
Subject: [PATCH 1452/1648] Update to v2.0 of appbase which includes set
 version

---
 libraries/appbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/appbase b/libraries/appbase
index f34a3b402b0..72e93b39672 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit f34a3b402b0f93d41df850032abdfaca7335172f
+Subproject commit 72e93b396726916a596482897ab13f99a8197379

From b3abe17f79b29792858c3d083cae238741090a5b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 8 Oct 2019 11:18:32 -0500
Subject: [PATCH 1453/1648] Remove read delay timer and just disconnect when
 queue is full. Also drop trx when too many in progress.

---
 plugins/net_plugin/net_plugin.cpp | 64 ++++++-------------------------
 1 file changed, 12 insertions(+), 52 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e5d7cbe58e0..e701bf5cc52 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -380,9 +380,7 @@ namespace eosio {
    constexpr auto     def_send_buffer_size_mb = 4;
    constexpr auto     def_send_buffer_size = 1024*1024*def_send_buffer_size_mb;
    constexpr auto     def_max_write_queue_size = def_send_buffer_size*10;
-   constexpr boost::asio::chrono::milliseconds def_read_delay_for_full_write_queue{100};
    constexpr auto     def_max_trx_in_progress_size = 100*1024*1024; // 100 MB
-   constexpr auto     def_max_read_delays = 100; // number of times read_delay_timer started without any reads
    constexpr auto     def_max_consecutive_rejected_blocks = 3; // num of rejected blocks before disconnect
    constexpr auto     def_max_consecutive_immediate_connection_close = 9; // back off if client keeps closing
    constexpr auto     def_max_peer_block_ids_per_connection = 100*1024; // if we reach this many then the connection is spaming us, disconnect
@@ -593,10 +591,6 @@ namespace eosio {
       std::mutex                            response_expected_timer_mtx;
       boost::asio::steady_timer             response_expected_timer;
 
-      uint16_t                              read_delay_count = 0; // only accessed from strand
-      std::mutex                            read_delay_timer_mtx;
-      boost::asio::steady_timer             read_delay_timer;
-
       std::atomic<go_away_reason>           no_retry{no_reason};
 
       mutable std::mutex          conn_mtx; //< mtx for last_req, last_handshake_recv, last_handshake_sent, fork_head, fork_head_num, last_close
@@ -822,7 +816,6 @@ namespace eosio {
         socket( new tcp::socket( my_impl->thread_pool->get_executor() ) ),
         connection_id( ++my_impl->current_connection_id ),
         response_expected_timer( my_impl->thread_pool->get_executor() ),
-        read_delay_timer( my_impl->thread_pool->get_executor() ),
         last_handshake_recv(),
         last_handshake_sent()
    {
@@ -836,7 +829,6 @@ namespace eosio {
         socket( new tcp::socket( my_impl->thread_pool->get_executor() ) ),
         connection_id( ++my_impl->current_connection_id ),
         response_expected_timer( my_impl->thread_pool->get_executor() ),
-        read_delay_timer( my_impl->thread_pool->get_executor() ),
         last_handshake_recv(),
         last_handshake_sent()
    {
@@ -958,11 +950,6 @@ namespace eosio {
       fc_ilog( logger, "closing '${a}', ${p}", ("a", self->peer_address())("p", self->peer_name()) );
       fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();
-      {
-         std::lock_guard<std::mutex> g( self->read_delay_timer_mtx );
-         self->read_delay_timer.cancel();
-         self->read_delay_count = 0;
-      }
 
       if( reconnect ) {
          my_impl->start_conn_timer( std::chrono::milliseconds( 100 ), connection_wptr() );
@@ -2266,47 +2253,13 @@ namespace eosio {
             }
          };
 
-         if( buffer_queue.write_queue_size() > def_max_write_queue_size ||
-             trx_in_progress_size > def_max_trx_in_progress_size )
-         {
-            // too much queued up, reschedule
-            uint32_t write_queue_size = buffer_queue.write_queue_size();
-            uint32_t trx_in_progress_size = this->trx_in_progress_size.load();
-            if( write_queue_size > def_max_write_queue_size ) {
-               peer_wlog( this, "write_queue full ${s} bytes", ("s", write_queue_size) );
-            } else {
-               peer_wlog( this, "max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
-            }
-            if( write_queue_size > 2*def_max_write_queue_size ||
-                trx_in_progress_size > 2*def_max_trx_in_progress_size ||
-                ++read_delay_count > def_max_read_delays )
-            {
-               fc_elog( logger, "queues over full, giving up on connection, closing connection to: ${p}",
-                        ("p", peer_name()) );
-               fc_elog( logger, "  write_queue ${s} bytes", ("s", write_queue_size) );
-               fc_elog( logger, "  max trx in progress ${s} bytes", ("s", trx_in_progress_size) );
-               close( false );
-               return;
-            }
-            std::lock_guard<std::mutex> g( read_delay_timer_mtx );
-            read_delay_timer.cancel();
-            read_delay_timer.expires_from_now( def_read_delay_for_full_write_queue );
-            connection_wptr weak_conn = shared_from_this();
-            read_delay_timer.async_wait( boost::asio::bind_executor(strand, [weak_conn]( boost::system::error_code ec ) {
-               if( ec == boost::asio::error::operation_aborted ) return;
-               auto conn = weak_conn.lock();
-               if( !conn ) return;
-               if( !ec ) {
-                  conn->start_read_message();
-               } else {
-                  fc_elog( logger, "Read delay timer error: ${e}, closing connection: ${p}",
-                           ("e", ec.message())("p",conn->peer_name()) );
-                  conn->close();
-               }
-            } ) );
+         uint32_t write_queue_size = buffer_queue.write_queue_size();
+         if( write_queue_size > def_max_write_queue_size ) {
+            fc_elog( logger, "write queue full ${s} bytes, giving up on connection, closing connection to: ${p}",
+                     ("s", write_queue_size)("p", peer_name()) );
+            close( false );
             return;
          }
-         read_delay_count = 0;
 
          boost::asio::async_read( *socket,
             pending_message_buffer.get_buffer_sequence_for_boost_async_read(), completion_handler,
@@ -2805,6 +2758,13 @@ namespace eosio {
       const auto& tid = trx->id();
       peer_dlog( this, "received packed_transaction ${id}", ("id", tid) );
 
+      uint32_t trx_in_progress_size = this->trx_in_progress_size.load();
+      if( trx_in_progress_size > def_max_trx_in_progress_size ) {
+         fc_wlog( logger, "Dropping trx ${id}, too many trx in progress ${s} bytes",
+                  ("id", tid)("s", trx_in_progress_size) );
+         return;
+      }
+
       bool have_trx = my_impl->dispatcher->have_txn( tid );
       node_transaction_state nts = {tid, trx->expiration(), 0, connection_id};
       my_impl->dispatcher->add_peer_txn( nts );

From e7272e313d223af4942cb74775d9d8b08e0f0ee0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 8 Oct 2019 12:38:58 -0500
Subject: [PATCH 1454/1648] Fix variable shadowing

---
 plugins/net_plugin/net_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index e701bf5cc52..8b9f6e91a3a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2758,10 +2758,10 @@ namespace eosio {
       const auto& tid = trx->id();
       peer_dlog( this, "received packed_transaction ${id}", ("id", tid) );
 
-      uint32_t trx_in_progress_size = this->trx_in_progress_size.load();
-      if( trx_in_progress_size > def_max_trx_in_progress_size ) {
+      uint32_t trx_in_progress_sz = this->trx_in_progress_size.load();
+      if( trx_in_progress_sz > def_max_trx_in_progress_size ) {
          fc_wlog( logger, "Dropping trx ${id}, too many trx in progress ${s} bytes",
-                  ("id", tid)("s", trx_in_progress_size) );
+                  ("id", tid)("s", trx_in_progress_sz) );
          return;
       }
 

From ae4be1b3a36fa8387dc9d372564c9bdec872956b Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 10 Oct 2019 09:46:06 -0500
Subject: [PATCH 1455/1648] Reduce some error level logging to info as they are
 normal responses to client requests when using snaphot. Also send
 benign_other in corner case of unable to find block.

---
 plugins/net_plugin/net_plugin.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8b9f6e91a3a..6979a6cd875 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1158,6 +1158,11 @@ namespace eosio {
             c->strand.post( [c, sb{std::move(sb)}, trigger_send]() {
                c->enqueue_block( sb, trigger_send, true );
             });
+         } else {
+            c->strand.post( [c, num]() {
+               peer_ilog( c, "enqueue sync, unable to fetch block ${num}, sending go away: benign_other", ("num", num) );
+               c->enqueue( go_away_message( benign_other ) );
+            });
          }
       });
 
@@ -1233,7 +1238,7 @@ namespace eosio {
       queue_write(send_buffer,trigger_send, priority,
                   [conn{std::move(self)}, close_after_send](boost::system::error_code ec, std::size_t ) {
                         if (close_after_send != no_reason) {
-                           fc_elog( logger, "sent a go away message: ${r}, closing connection to ${p}",
+                           fc_ilog( logger, "sent a go away message: ${r}, closing connection to ${p}",
                                     ("r", reason_str(close_after_send))("p", conn->peer_name()) );
                            conn->close();
                            return;
@@ -2551,7 +2556,7 @@ namespace eosio {
                   block_id_type peer_lib_id = cc.get_block_id_for_num( peer_lib );
                   on_fork = (msg_lib_id != peer_lib_id);
                } catch( const unknown_block_exception& ) {
-                  peer_wlog( c, "peer last irreversible block ${pl} is unknown", ("pl", peer_lib) );
+                  peer_ilog( c, "peer last irreversible block ${pl} is unknown", ("pl", peer_lib) );
                   unknown_block = true;
                } catch( ... ) {
                   peer_wlog( c, "caught an exception getting block id for ${pl}", ("pl", peer_lib) );
@@ -2560,10 +2565,10 @@ namespace eosio {
                if( on_fork || unknown_block ) {
                   c->strand.post( [on_fork, unknown_block, c]() {
                      if( on_fork ) {
-                        peer_elog( c, "Peer chain is forked" );
+                        peer_elog( c, "Peer chain is forked, sending: forked go away" );
                         c->enqueue( go_away_message( forked ) );
                      } else if( unknown_block ) {
-                        peer_elog( c, "Peer asked for unknown block" );
+                        peer_ilog( c, "Peer asked for unknown block, sending: benign_other go away" );
                         c->enqueue( go_away_message( benign_other ) );
                      }
                   } );

From aef98ccaf49dea1438562364ee205ed51f174d6d Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 15 Oct 2019 15:22:11 -0400
Subject: [PATCH 1456/1648] 10.14.4 -> 10.14.6

---
 .cicd/generate-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 1e8b79fa4c8..a7a8ace47e0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -3,7 +3,7 @@ set -eo pipefail
 # environment
 . ./.cicd/helpers/general.sh
 export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
-export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.4_6C_14G_40G'}
+export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.6_6C_14G_40G'}
 export PLATFORMS_JSON_ARRAY='[]'
 [[ -z "$ROUNDS" ]] && export ROUNDS='1'
 LINUX_CONCURRENCY='8'
@@ -459,7 +459,7 @@ cat <<EOF
       - chef/anka#v0.5.4:
           no-volume: true
           inherit-environment-vars: true
-          vm-name: 10.14.4_6C_14G_40G
+          vm-name: 10.14.6_6C_14G_40G
           vm-registry-tag: "clean::cicd::git-ssh::nas::brew::buildkite-agent"
           always-pull: true
           debug: true

From f0d7d9cdd27ba39e0bad5ff99c78671e24114119 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 15 Oct 2019 14:58:49 -0500
Subject: [PATCH 1457/1648] Handle cases where version_* not specified

---
 libraries/version/src/version_impl.cpp.in | 33 +++++++++++------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 67d44c2ccc4..6eeb961ab09 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -14,28 +14,27 @@ namespace eosio { namespace version {
    const bool        version_dirty { @_VERSION_DIRTY_@  };
 
    std::string _version_client() {
-      if (version_major == "unknown") {
-         std::string version{"unknown"};
-         return version;
-      }
-      else {
-         std::string version{'v' + version_major + '.' + version_minor + '.' + version_patch + '-' + version_suffix};
+      if( version_major == "unknown" || version_major.empty() ) {
+         return "unknown";
+      } else {
+         std::string version{'v' + version_major };
+         if( !version_minor.empty() )  version += '.' + version_minor;
+         if( !version_patch.empty() )  version += '.' + version_patch;
+         if( !version_suffix.empty() ) version += '-' + version_suffix;
          return version;
       }
    }
 
    std::string _version_full() {
-      if (version_major == "unknown") {
-         std::string version{"unknown"};
-         return version;
-      }
-      else {
-         std::string version{'v' + version_major + '.' + version_minor + '.' + version_patch + '-' + version_suffix + '-' + version_hash};
-         
-         if (version_dirty == true) {
-            version += "-dirty";
-         }
-         
+      if( version_major == "unknown" || version_major.empty() ) {
+         return "unknown";
+      } else {
+         std::string version{'v' + version_major };
+         if( !version_minor.empty() )  version += '.' + version_minor;
+         if( !version_patch.empty() )  version += '.' + version_patch;
+         if( !version_suffix.empty() ) version += '-' + version_suffix;
+         if( !version_hash.empty() )   version += '-' + version_hash;
+         if( version_dirty )           version += "-dirty";
          return version;
       }
    }

From a86b9e0a8ca236ef39c77cbbe24cffbf91961f69 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 15 Oct 2019 15:40:44 -0500
Subject: [PATCH 1458/1648] Require version_minor along with version_major

---
 libraries/version/src/version_impl.cpp.in | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libraries/version/src/version_impl.cpp.in b/libraries/version/src/version_impl.cpp.in
index 6eeb961ab09..a71b9da3339 100644
--- a/libraries/version/src/version_impl.cpp.in
+++ b/libraries/version/src/version_impl.cpp.in
@@ -14,11 +14,10 @@ namespace eosio { namespace version {
    const bool        version_dirty { @_VERSION_DIRTY_@  };
 
    std::string _version_client() {
-      if( version_major == "unknown" || version_major.empty() ) {
+      if( version_major == "unknown" || version_major.empty() || version_minor == "unknown" || version_minor.empty()) {
          return "unknown";
       } else {
-         std::string version{'v' + version_major };
-         if( !version_minor.empty() )  version += '.' + version_minor;
+         std::string version{'v' + version_major + '.' + version_minor};
          if( !version_patch.empty() )  version += '.' + version_patch;
          if( !version_suffix.empty() ) version += '-' + version_suffix;
          return version;
@@ -26,11 +25,10 @@ namespace eosio { namespace version {
    }
 
    std::string _version_full() {
-      if( version_major == "unknown" || version_major.empty() ) {
+      if( version_major == "unknown" || version_major.empty() || version_minor == "unknown" || version_minor.empty()) {
          return "unknown";
       } else {
-         std::string version{'v' + version_major };
-         if( !version_minor.empty() )  version += '.' + version_minor;
+         std::string version{'v' + version_major + '.' + version_minor};
          if( !version_patch.empty() )  version += '.' + version_patch;
          if( !version_suffix.empty() ) version += '-' + version_suffix;
          if( !version_hash.empty() )   version += '-' + version_hash;

From c4834681c8288700f3610a0c747c7da6fcf3a642 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 16 Oct 2019 11:40:02 -0400
Subject: [PATCH 1459/1648] Add separate build/test fleet.

---
 .cicd/generate-pipeline.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index a7a8ace47e0..ff8d6a64d4f 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -5,6 +5,8 @@ set -eo pipefail
 export MOJAVE_ANKA_TAG_BASE=${MOJAVE_ANKA_TAG_BASE:-'clean::cicd::git-ssh::nas::brew::buildkite-agent'}
 export MOJAVE_ANKA_TEMPLATE_NAME=${MOJAVE_ANKA_TEMPLATE_NAME:-'10.14.6_6C_14G_40G'}
 export PLATFORMS_JSON_ARRAY='[]'
+BUILDKITE_BUILD_AGENT_QUEUE='automation-eks-eos-builder-fleet'
+BUILDKITE_TEST_AGENT_QUEUE='automation-eks-eos-tester-fleet'
 [[ -z "$ROUNDS" ]] && export ROUNDS='1'
 LINUX_CONCURRENCY='8'
 MAC_CONCURRENCY='2'
@@ -116,7 +118,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
 
@@ -181,7 +183,7 @@ for ROUND in $(seq 1 $ROUNDS); do
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-30}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
@@ -240,7 +242,7 @@ EOF
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-20}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 
@@ -300,7 +302,7 @@ EOF
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 
@@ -401,7 +403,7 @@ cat <<EOF
       echo '+++ :javascript: Running test-metrics.js'
       node --max-old-space-size=32768 test-metrics.js
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     soft_fail: true
 
@@ -418,7 +420,7 @@ cat <<EOF
       OS: "el7" # OS and PKGTYPE required for lambdas
       PKGTYPE: "rpm"
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
@@ -432,7 +434,7 @@ cat <<EOF
       OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
       PKGTYPE: "deb"
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_UBUNTU_16_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
@@ -446,7 +448,7 @@ cat <<EOF
       OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
       PKGTYPE: "deb"
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_UBUNTU_18_04}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
@@ -479,7 +481,7 @@ cat <<EOF
       IMAGE_TAG: "ubuntu-18.04-unpinned"
       BUILDKITE_AGENT_ACCESS_TOKEN:
     agents:
-      queue: "$BUILDKITE_AGENT_QUEUE"
+      queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-30}
     skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
 

From 8941c1ce8fb0e8200a8c4baa815ca7259da3f50e Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 16 Oct 2019 14:11:47 -0400
Subject: [PATCH 1460/1648] Pass correct number of JOBS to unit test step.

---
 .cicd/test.sh            | 4 ++--
 scripts/parallel-test.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.cicd/test.sh b/.cicd/test.sh
index c2284b4e855..4a3a203757d 100755
--- a/.cicd/test.sh
+++ b/.cicd/test.sh
@@ -10,9 +10,9 @@ if [[ $(uname) == 'Darwin' ]]; then # macOS
     EXIT_STATUS=$?
 else # Linux
     . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$IMAGE_TAG.dockerfile
-    echo "$ docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) $FULL_TAG bash -c \"$MOUNTED_DIR/$@\""
+    echo "$ docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$MOUNTED_DIR/$@\""
     set +e # defer error handling to end
-    eval docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) $FULL_TAG bash -c \"$MOUNTED_DIR/$@\"
+    eval docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$MOUNTED_DIR/$@\"
     EXIT_STATUS=$?
 fi
 # buildkite
diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
index 9c333b5babd..bd3f9150ab9 100755
--- a/scripts/parallel-test.sh
+++ b/scripts/parallel-test.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 # variables
 echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':evergreen_tree: ')Configuring Environment"
-[[ -z "$CPUS" ]] && export CPUS=$(getconf _NPROCESSORS_ONLN)
+[[ -z "$JOBS" ]] && export JOBS=$(getconf _NPROCESSORS_ONLN)
 GIT_ROOT="$(dirname $BASH_SOURCE[0])/.."
 if [[ "$(uname)" == 'Linux' ]]; then
     . /etc/os-release
@@ -22,8 +22,8 @@ else
 fi
 # run tests
 set +e # defer ctest error handling to end
-echo "$ ctest -j $CPUS -LE _tests --output-on-failure -T Test"
-ctest -j $CPUS -LE _tests --output-on-failure -T Test
+echo "$ ctest -j $JOBS -LE _tests --output-on-failure -T Test"
+ctest -j $JOBS -LE _tests --output-on-failure -T Test
 EXIT_STATUS=$?
 echo 'Done running parallelizable tests.'
 exit $EXIT_STATUS
\ No newline at end of file

From 3fd3cd1b8f8df088ff73ca9dccfd90df28f3ed07 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Thu, 17 Oct 2019 08:35:31 -0500
Subject: [PATCH 1461/1648] Added support for reporting extensions_type
 parameters in RPC and eosio-blocklog json output. For release/2.0.x

---
 .../include/eosio/chain/abi_serializer.hpp    | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/libraries/chain/include/eosio/chain/abi_serializer.hpp b/libraries/chain/include/eosio/chain/abi_serializer.hpp
index df67be86ad1..6322eb7945b 100644
--- a/libraries/chain/include/eosio/chain/abi_serializer.hpp
+++ b/libraries/chain/include/eosio/chain/abi_serializer.hpp
@@ -367,6 +367,8 @@ namespace impl {
 
       /**
        * overload of to_variant_object for actions
+       *
+       * This matches the FC_REFLECT for this type, but this is provided to extract the contents of act.data
        * @tparam Resolver
        * @param act
        * @param resolver
@@ -375,6 +377,7 @@ namespace impl {
       template<typename Resolver>
       static void add( mutable_variant_object &out, const char* name, const action& act, Resolver resolver, abi_traverse_context& ctx )
       {
+         static_assert(fc::reflector<action>::total_member_count == 4);
          auto h = ctx.enter_scope();
          mutable_variant_object mvo;
          mvo("account", act.account);
@@ -409,6 +412,8 @@ namespace impl {
 
       /**
        * overload of to_variant_object for packed_transaction
+       *
+       * This matches the FC_REFLECT for this type, but this is provided to allow extracting the contents of ptrx.transaction
        * @tparam Resolver
        * @param act
        * @param resolver
@@ -417,6 +422,7 @@ namespace impl {
       template<typename Resolver>
       static void add( mutable_variant_object &out, const char* name, const packed_transaction& ptrx, Resolver resolver, abi_traverse_context& ctx )
       {
+         static_assert(fc::reflector<packed_transaction>::total_member_count == 4);
          auto h = ctx.enter_scope();
          mutable_variant_object mvo;
          auto trx = ptrx.get_transaction();
@@ -430,6 +436,88 @@ namespace impl {
 
          out(name, std::move(mvo));
       }
+
+      /**
+       * overload of to_variant_object for transaction
+       *
+       * This matches the FC_REFLECT for this type, but this is provided to allow extracting the contents of trx.transaction_extensions
+       */
+      template<typename Resolver>
+      static void add( mutable_variant_object &out, const char* name, const transaction& trx, Resolver resolver, abi_traverse_context& ctx )
+      {
+         static_assert(fc::reflector<transaction>::total_member_count == 9);
+         auto h = ctx.enter_scope();
+         mutable_variant_object mvo;
+         mvo("expiration", trx.expiration);
+         mvo("ref_block_num", trx.ref_block_num);
+         mvo("ref_block_prefix", trx.ref_block_prefix);
+         mvo("max_net_usage_words", trx.max_net_usage_words);
+         mvo("max_cpu_usage_ms", trx.max_cpu_usage_ms);
+         mvo("delay_sec", trx.delay_sec);
+         add(mvo, "context_free_actions", trx.context_free_actions, resolver, ctx);
+         add(mvo, "actions", trx.actions, resolver, ctx);
+
+         // process contents of block.transaction_extensions
+         auto exts = trx.validate_and_extract_extensions();
+         if (exts.count(deferred_transaction_generation_context::extension_id()) > 0) {
+            const auto& deferred_transaction_generation = exts.lower_bound(deferred_transaction_generation_context::extension_id())->second.get<deferred_transaction_generation_context>();
+            mvo("deferred_transaction_generation", deferred_transaction_generation);
+         }
+
+         out(name, std::move(mvo));
+      }
+
+      /**
+       * overload of to_variant_object for signed_block
+       *
+       * This matches the FC_REFLECT for this type, but this is provided to allow extracting the contents of
+       * block.header_extensions and block.block_extensions
+       */
+      template<typename Resolver>
+      static void add( mutable_variant_object &out, const char* name, const signed_block& block, Resolver resolver, abi_traverse_context& ctx )
+      {
+         static_assert(fc::reflector<signed_block>::total_member_count == 12);
+         auto h = ctx.enter_scope();
+         mutable_variant_object mvo;
+         mvo("timestamp", block.timestamp);
+         mvo("producer", block.producer);
+         mvo("confirmed", block.confirmed);
+         mvo("previous", block.previous);
+         mvo("transaction_mroot", block.transaction_mroot);
+         mvo("action_mroot", block.action_mroot);
+         mvo("schedule_version", block.schedule_version);
+         mvo("new_producers", block.new_producers);
+
+         // process contents of block.header_extensions
+         flat_multimap<uint16_t, block_header_extension> header_exts = block.validate_and_extract_header_extensions();
+         if ( header_exts.count(protocol_feature_activation::extension_id() > 0) ) {
+            const auto& new_protocol_features = header_exts.lower_bound(protocol_feature_activation::extension_id())->second.get<protocol_feature_activation>().protocol_features;
+            vector<variant> pf_array;
+            pf_array.reserve(new_protocol_features.size());
+            for (auto feature : new_protocol_features) {
+               mutable_variant_object feature_mvo;
+               add(feature_mvo, "feature_digest", feature, resolver, ctx);
+               pf_array.push_back(feature_mvo);
+            }
+            mvo("new_protocol_features", pf_array);
+         }
+         if ( header_exts.count(producer_schedule_change_extension::extension_id())) {
+            const auto& new_producer_schedule = header_exts.lower_bound(producer_schedule_change_extension::extension_id())->second.get<producer_schedule_change_extension>();
+            mvo("new_producer_schedule", new_producer_schedule);
+         }
+
+         mvo("producer_signature", block.producer_signature);
+         add(mvo, "transactions", block.transactions, resolver, ctx);
+
+         // process contents of block.block_extensions
+         auto block_exts = block.validate_and_extract_extensions();
+         if ( block_exts.count(additional_block_signatures_extension::extension_id()) > 0) {
+            const auto& additional_signatures = block_exts.lower_bound(additional_block_signatures_extension::extension_id())->second.get<additional_block_signatures_extension>();
+            mvo("additional_signatures", additional_signatures);
+         }
+
+         out(name, std::move(mvo));
+      }
    };
 
    /**

From 87ef878079ab08eefa673d1c64bedda63cccb4a5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 17 Oct 2019 09:10:01 -0500
Subject: [PATCH 1462/1648] bcast block even with syncing with peer as there
 can be race condition around determination

---
 plugins/net_plugin/net_plugin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6979a6cd875..f61cc65e5e8 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1886,7 +1886,6 @@ namespace eosio {
    void dispatch_manager::bcast_block(const block_state_ptr& bs) {
       fc_dlog( logger, "bcast block ${b}", ("b", bs->block_num) );
 
-      if( my_impl->sync_master->syncing_with_peer() ) return;
       bool have_connection = false;
       for_each_block_connection( [&have_connection]( auto& cp ) {
          peer_dlog( cp, "socket_is_open ${s}, connecting ${c}, syncing ${ss}",

From 9234fd58be8c83ec218f260b53aa53b879d053e9 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 21 Oct 2019 09:22:42 -0400
Subject: [PATCH 1463/1648] Modify --print-default-config to exit with success

---
 programs/nodeos/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index a9e4f65f22e..35725669dae 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -94,7 +94,8 @@ int main(int argc, char** argv)
          .default_http_port = 8888
       });
       if(!app().initialize<chain_plugin, net_plugin, producer_plugin>(argc, argv)) {
-         if(app().get_options().count("help") || app().get_options().count("version") || app().get_options().count("full-version")) {
+         const auto& opts = app().get_options();
+         if( opts.count("help") || opts.count("version") || opts.count("full-version") || opts.count("print-default-config") ) {
             return SUCCESS;
          }
          return INITIALIZE_FAIL;

From f8e9a53acd4d8f00f4d2bec90e29b22d59daadb9 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Mon, 21 Oct 2019 11:46:41 -0400
Subject: [PATCH 1464/1648] Bump commit.

---
 eosio-wasm-spec-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eosio-wasm-spec-tests b/eosio-wasm-spec-tests
index a31634877a6..25c46086d69 160000
--- a/eosio-wasm-spec-tests
+++ b/eosio-wasm-spec-tests
@@ -1 +1 @@
-Subproject commit a31634877a64fb687641cd198a207eedf04ab528
+Subproject commit 25c46086d694f5973ae1123e6a8aaa6e7232a2d4

From ee0c37c792f16266aaa98fc716832281ca8a9a6d Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Mon, 21 Oct 2019 11:47:10 -0400
Subject: [PATCH 1465/1648] Split WASM spec tests to own label and steps.

---
 .cicd/generate-pipeline.sh | 56 ++++++++++++++++++++++++++++++++++++++
 .travis.yml                |  2 +-
 scripts/wasm-spec-test.sh  | 29 ++++++++++++++++++++
 3 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100755 scripts/wasm-spec-test.sh

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ff8d6a64d4f..8bf6e12ccb5 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -214,6 +214,62 @@ EOF
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
+EOF
+        fi
+        if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
+            cat <<EOF
+    concurrency: ${CONCURRENCY}
+    concurrency_group: ${CONCURRENCY_GROUP}
+EOF
+        fi
+    echo
+    done
+    # wasm spec tests
+    echo '    # wasm spec tests'
+    echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
+        if [[ ! "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
+            CONCURRENCY=$LINUX_CONCURRENCY
+            CONCURRENCY_GROUP=$LINUX_CONCURRENCY_GROUP
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - WASM Spec Tests"
+    command:
+      - "buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "./.cicd/test.sh scripts/wasm-spec-test.sh"
+    env:
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      BUILDKITE_AGENT_ACCESS_TOKEN:
+    agents:
+      queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
+    timeout: ${TIMEOUT:-30}
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_WASM_SPEC_TESTS}
+
+EOF
+        else
+            CONCURRENCY=$MAC_CONCURRENCY
+            CONCURRENCY_GROUP=$MAC_CONCURRENCY_GROUP
+            cat <<EOF
+  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - WASM Spec Tests"
+    command:
+      - "git clone \$BUILDKITE_REPO eos && cd eos && $GIT_FETCH git checkout -f \$BUILDKITE_COMMIT && git submodule update --init --recursive"
+      - "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
+      - "cd eos && ./.cicd/test.sh scripts/wasm-spec-test.sh"
+    plugins:
+      - chef/anka#v0.5.4:
+          no-volume: true
+          inherit-environment-vars: true
+          vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
+          vm-registry-tag: "${MOJAVE_ANKA_TAG_BASE}::$(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)"
+          always-pull: true
+          debug: true
+          wait-network: true
+          failover-registries:
+            - 'registry_1'
+            - 'registry_2'
+          pre-execute-sleep: 5
+    timeout: ${TIMEOUT:-60}
+    agents: "queue=mac-anka-node-fleet"
+    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_WASM_SPEC_TESTS}
+
 EOF
         fi
         if [ "$BUILDKITE_SOURCE" = "schedule" ]; then
diff --git a/.travis.yml b/.travis.yml
index c435d0902d6..fe1da4547da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ matrix:
             - openssl
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
-script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"
+script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/wasm-spec-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"
 notifications:
   webhooks:
     secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=
diff --git a/scripts/wasm-spec-test.sh b/scripts/wasm-spec-test.sh
new file mode 100755
index 00000000000..06814e8d068
--- /dev/null
+++ b/scripts/wasm-spec-test.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -eo pipefail
+# variables
+echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':evergreen_tree: ')Configuring Environment"
+[[ -z "$JOBS" ]] && export JOBS=$(getconf _NPROCESSORS_ONLN)
+GIT_ROOT="$(dirname $BASH_SOURCE[0])/.."
+if [[ "$(uname)" == 'Linux' ]]; then
+    . /etc/os-release
+    if [[ "$ID" == 'centos' ]]; then
+        [[ -f /opt/rh/rh-python36/enable ]] && source /opt/rh/rh-python36/enable
+    fi
+fi
+cd $GIT_ROOT/build
+# count tests
+echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':microscope: ')Running WASM Spec Tests"
+TEST_COUNT=$(ctest -N -L wasm_spec_tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
+if [[ $TEST_COUNT > 0 ]]; then
+    echo "$TEST_COUNT tests found."
+else
+    echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':no_entry: ')ERROR: No tests registered with ctest! Exiting..."
+    exit 1
+fi
+# run tests
+set +e # defer ctest error handling to end
+echo "$ ctest -j $JOBS -L wasm_spec_tests --output-on-failure -T Test"
+ctest -j $JOBS -L wasm_spec_tests --output-on-failure -T Test
+EXIT_STATUS=$?
+echo 'Done running WASM spec tests.'
+exit $EXIT_STATUS
\ No newline at end of file

From 2bb414cd4317884aea75d64ecdcd3a3acafc0a48 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Mon, 21 Oct 2019 11:50:42 -0400
Subject: [PATCH 1466/1648] mac steps get a min of 1 hour

---
 .cicd/generate-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ff8d6a64d4f..f59b1cf7705 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -269,7 +269,7 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 5
-    timeout: ${TIMEOUT:-20}
+    timeout: ${TIMEOUT:-60}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
@@ -472,7 +472,7 @@ cat <<EOF
           pre-execute-sleep: 5
     agents:
       - "queue=mac-anka-node-fleet"
-    timeout: ${TIMEOUT:-10}
+    timeout: ${TIMEOUT:-60}
     skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
 
   - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"

From 4246f23830ca45a1be08def4cfc799dbd3dfdc97 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 22 Oct 2019 15:19:02 -0400
Subject: [PATCH 1467/1648] Add debug log of sync vars in request_next_chunck

---
 plugins/net_plugin/net_plugin.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f61cc65e5e8..ec4d83b5f08 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1372,6 +1372,9 @@ namespace eosio {
       std::tie( lib_block_num, std::ignore, fork_head_block_num,
                 std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
 
+      fc_dlog( logger, "sync_last_requested_num: ${r}, sync_next_expected_num: ${e}, sync_known_lib_num: ${k}, sync_req_span: ${s}",
+               ("r", sync_last_requested_num)("e", sync_next_expected_num)("k", sync_known_lib_num)("s", sync_req_span) );
+
       if( fork_head_block_num < sync_last_requested_num && sync_source && sync_source->current() ) {
          fc_ilog( logger, "ignoring request, head is ${h} last req = ${r} source is ${p}",
                   ("h", fork_head_block_num)( "r", sync_last_requested_num )( "p", sync_source->peer_name() ) );

From a7b919bc94f6a83f36fdfecfac406de9cc34157e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 22 Oct 2019 18:42:20 -0400
Subject: [PATCH 1468/1648] Add debug logging

---
 plugins/net_plugin/net_plugin.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ec4d83b5f08..bdb5a133c2e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1707,13 +1707,13 @@ namespace eosio {
       stages state = sync_state;
       fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
       if( state == lib_catchup ) {
+         fc_dlog( logger, "sync_last_requested_num: ${r}, sync_next_expected_num: ${e}, sync_known_lib_num: ${k}, sync_req_span: ${s}",
+                  ("r", sync_last_requested_num)("e", sync_next_expected_num)("k", sync_known_lib_num)("s", sync_req_span) );
          if (blk_num != sync_next_expected_num) {
-            if( ++c->consecutive_rejected_blocks > def_max_consecutive_rejected_blocks ) {
-               auto sync_next_expected = sync_next_expected_num;
-               g_sync.unlock();
-               fc_wlog( logger, "expected block ${ne} but got ${bn}, from connection: ${p}",
-                        ("ne", sync_next_expected)( "bn", blk_num )( "p", c->peer_name() ) );
-            }
+            auto sync_next_expected = sync_next_expected_num;
+            g_sync.unlock();
+            fc_dlog( logger, "expected block ${ne} but got ${bn}, from connection: ${p}",
+                     ("ne", sync_next_expected)( "bn", blk_num )( "p", c->peer_name() ) );
             return;
          }
          sync_next_expected_num = blk_num + 1;

From d029bfe5b4721ed2789cac994c0cbec309f5942e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 23 Oct 2019 15:05:46 -0400
Subject: [PATCH 1469/1648] Call sync_recv_block for already received block
 since accounting of blocks is required

---
 plugins/net_plugin/net_plugin.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index bdb5a133c2e..53daae082be 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2367,9 +2367,10 @@ namespace eosio {
 
             block_id_type blk_id = bh.id();
             if( my_impl->dispatcher->have_block( blk_id ) ) {
+               uint32_t blk_num = bh.block_num();
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}",
-                        ("p", peer_name())("num", block_header::num_from_id( blk_id )) );
-               consecutive_rejected_blocks = 0;
+                        ("p", peer_name())("num", blk_num) );
+               my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
                cancel_wait();
 
                pending_message_buffer.advance_read_ptr( message_length );

From a45539ca1cb501de00f703ec850e5254deba395f Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 24 Oct 2019 10:05:57 -0400
Subject: [PATCH 1470/1648] added new build step & comments to help describe
 what variables are available for logic creation

---
 .cicd/generate-pipeline.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ad62db32160..0c250ebb0fb 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -75,34 +75,6 @@ nIFS=$IFS # fix array splitting (\n won't work)
 # start with a wait step
 echo '  - wait'
 echo ''
-# base-image steps
-echo '    # base-images'
-echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
-    if [[ "$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)" =~ 'macos' ]]; then
-        cat <<EOF
-  - label: "$(echo "$PLATFORM_JSON" | jq -r .ICON) Anka - Ensure $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) Template Dependency Tag"
-    command:
-      - "git clone git@github.com:EOSIO/mac-anka-fleet.git"
-      - "cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
-    agents: "queue=mac-anka-templater-fleet"
-    env:
-      REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
-      REPO_COMMIT: $BUILDKITE_COMMIT
-      TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
-      TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
-      PINNED: $PINNED
-      UNPINNED: $UNPINNED
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/macos-10.14.sh && cd ~/eos && cd .. && rm -rf eos"
-      PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
-    timeout: ${TIMEOUT:-320}
-    skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}\${SKIP_ENSURE_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}
-
-EOF
-    fi
-done
-BUILDKITE_AGENT_QUEUE='automation-eks-eos-builder-fleet'
-echo '  - wait'
-echo ''
 # build steps
 echo '    # builds'
 echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do

From 2ff7e3ac52aa80be8dc6b36a9de3547fe4120045 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 24 Oct 2019 10:06:55 -0400
Subject: [PATCH 1471/1648] added new build step & comments to help describe
 what variables are available for logic creation

---
 .cicd/generate-pipeline.sh | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 0c250ebb0fb..5dce2bf71e0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -32,11 +32,23 @@ for FILE in $(ls $CICD_DIR/platforms); do
         [[ $FILE =~ 'unpinned' ]] && continue
     fi
     export FILE_NAME="$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')"
+    # macos-10.14
+    # ubuntu-16.04
     export PLATFORM_NAME="$(echo $FILE_NAME | cut -d- -f1 | sed 's/os/OS/g')"
+    # macOS
+    # ubuntu
     export PLATFORM_NAME_UPCASE="$(echo $PLATFORM_NAME | tr a-z A-Z)"
+    # MACOS
+    # UBUNTU
     export VERSION_MAJOR="$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f1)"
+    # 10
+    # 16
     [[ "$(echo $FILE_NAME | cut -d- -f2)" =~ '.' ]] && export VERSION_MINOR="_$(echo $FILE_NAME | cut -d- -f2 | cut -d. -f2)" || export VERSION_MINOR=''
+    # _14
+    # _04
     export VERSION_FULL="$(echo $FILE_NAME | cut -d- -f2)"
+    # 10.14
+    # 16.04
     OLDIFS=$IFS
     IFS='_'
     set $PLATFORM_NAME
@@ -105,7 +117,7 @@ EOF
       - "cd eos && ./.cicd/build.sh"
       - "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     plugins:
-      - chef/anka#v0.5.4:
+      - chef/anka#v0.5.5:
           no-volume: true
           inherit-environment-vars: true
           vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
@@ -119,10 +131,20 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 5
+          pre-commands: 
+            - "git clone git@github.com:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
+    env:
+      REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
+      REPO_COMMIT: $BUILDKITE_COMMIT
+      TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
+      TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
+      PINNED: $PINNED
+      UNPINNED: $UNPINNED
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME).sh && cd ~/eos && cd .. && rm -rf eos"
+      PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
     timeout: ${TIMEOUT:-180}
     agents: "queue=mac-anka-large-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_BUILD}
-
 EOF
     fi
     if [ "$BUILDKITE_SOURCE" = "schedule" ]; then

From ce1a2cb3e051aa96f5be3e487c30a294f4d7aec3 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Thu, 24 Oct 2019 10:37:01 -0400
Subject: [PATCH 1472/1648] ensure script name change

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 5dce2bf71e0..c739acd2b80 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -132,7 +132,7 @@ EOF
             - 'registry_2'
           pre-execute-sleep: 5
           pre-commands: 
-            - "git clone git@github.com:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure_tag.bash -u 12 -r 25G -a '-n'"
+            - "git clone git@github.com:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure-tag.bash -u 12 -r 25G -a '-n'"
     env:
       REPO: ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}
       REPO_COMMIT: $BUILDKITE_COMMIT

From 47ec06bc0971a3fe0c9bfd5929d043ede2c76686 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 29 Oct 2019 14:28:04 -0400
Subject: [PATCH 1473/1648] when building pinned boost on macOS, make sure
 SDKROOT is set

---
 scripts/helpers/eosio.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index d9395c29a91..06f5474b400 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -250,13 +250,15 @@ function ensure-boost() {
         if [[ $ARCH == "Linux" ]] && $PIN_COMPILER; then
             B2_FLAGS="toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I${CLANG_ROOT}/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j${JOBS} install"
             BOOTSTRAP_FLAGS="--with-toolset=clang"
+        elif $PIN_COMPILER; then
+            local SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
         fi
-		execute bash -c "cd $SRC_DIR && \
+        execute bash -c "cd $SRC_DIR && \
         curl -LO https://dl.bintray.com/boostorg/release/$BOOST_VERSION_MAJOR.$BOOST_VERSION_MINOR.$BOOST_VERSION_PATCH/source/boost_$BOOST_VERSION.tar.bz2 \
         && tar -xjf boost_$BOOST_VERSION.tar.bz2 \
         && cd $BOOST_ROOT \
-        && ./bootstrap.sh ${BOOTSTRAP_FLAGS} --prefix=$BOOST_ROOT \
-        && ./b2 ${B2_FLAGS} \
+        && SDKROOT="$SDKROOT" ./bootstrap.sh ${BOOTSTRAP_FLAGS} --prefix=$BOOST_ROOT \
+        && SDKROOT="$SDKROOT" ./b2 ${B2_FLAGS} \
         && cd .. \
         && rm -f boost_$BOOST_VERSION.tar.bz2 \
         && rm -rf $BOOST_LINK_LOCATION"        

From 17e8360a476b851d038ebf6f12781b6dadeef226 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 30 Oct 2019 13:09:43 -0400
Subject: [PATCH 1474/1648] Move platforms into distinct folders to support
 future platform types.

---
 .cicd/platforms/macos-10.14.sh                | 91 -------------------
 .../amazon_linux-2-pinned.dockerfile}         |  0
 .../centos-7.6-pinned.dockerfile}             |  0
 .cicd/platforms/pinned/macos-10.14-pinned.sh  | 86 ++++++++++++++++++
 .../ubuntu-16.04-pinned.dockerfile}           |  0
 .../ubuntu-18.04-pinned.dockerfile}           |  0
 .../amazon_linux-2-unpinned.dockerfile        |  0
 .../centos-7.6-unpinned.dockerfile            |  0
 .../unpinned/macos-10.14-unpinned.sh          | 33 +++++++
 .../ubuntu-18.04-unpinned.dockerfile          |  4 +-
 10 files changed, 121 insertions(+), 93 deletions(-)
 delete mode 100755 .cicd/platforms/macos-10.14.sh
 rename .cicd/platforms/{amazon_linux-2.dockerfile => pinned/amazon_linux-2-pinned.dockerfile} (100%)
 rename .cicd/platforms/{centos-7.6.dockerfile => pinned/centos-7.6-pinned.dockerfile} (100%)
 create mode 100755 .cicd/platforms/pinned/macos-10.14-pinned.sh
 rename .cicd/platforms/{ubuntu-16.04.dockerfile => pinned/ubuntu-16.04-pinned.dockerfile} (100%)
 rename .cicd/platforms/{ubuntu-18.04.dockerfile => pinned/ubuntu-18.04-pinned.dockerfile} (100%)
 rename .cicd/platforms/{ => unpinned}/amazon_linux-2-unpinned.dockerfile (100%)
 rename .cicd/platforms/{ => unpinned}/centos-7.6-unpinned.dockerfile (100%)
 create mode 100755 .cicd/platforms/unpinned/macos-10.14-unpinned.sh
 rename .cicd/platforms/{ => unpinned}/ubuntu-18.04-unpinned.dockerfile (94%)

diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh
deleted file mode 100755
index 363365bc3a7..00000000000
--- a/.cicd/platforms/macos-10.14.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-VERSION=1
-brew update
-brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl jq || :
-if [[ ! $PINNED == false || $UNPINNED == true ]]; then
-    # install clang from source
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8
-    cd clang8
-    git checkout 18e41dc
-    cd tools
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git
-    cd lld
-    git checkout d60a035
-    cd ../
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git
-    cd polly
-    git checkout 1bc06e5
-    cd ../
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang
-    cd clang
-    git checkout a03da8b
-    cd tools
-    mkdir extra
-    cd extra
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git
-    cd clang-tools-extra
-    git checkout 6b34834
-    cd ../../../../../projects/
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git
-    cd libcxx
-    git checkout 1853712
-    cd ../
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git
-    cd libcxxabi
-    git checkout d7338a4
-    cd ../
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git
-    cd libunwind
-    git checkout 57f6739
-    cd ../
-    git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git
-    cd compiler-rt
-    git checkout 5bc7979
-    mkdir ../../build
-    cd ../../build
-    cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release ..
-    make -j $(getconf _NPROCESSORS_ONLN)
-    sudo make install
-    cd ../..
-    rm -rf clang8
-    # install boost from source
-    curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
-    tar -xjf boost_1_71_0.tar.bz2
-    cd boost_1_71_0
-    ./bootstrap.sh --prefix=/usr/local
-    sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
-    cd ..
-    sudo rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
-else
-    # install boost from brew
-    brew install boost || true
-fi
-# install mongoDB
-cd ~
-curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
-tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz
-rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz
-ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
-# install mongo-c-driver from source
-cd /tmp
-curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz
-tar -xzf mongo-c-driver-1.13.0.tar.gz
-cd mongo-c-driver-1.13.0
-mkdir -p cmake-build
-cd cmake-build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF ..
-make -j $(getconf _NPROCESSORS_ONLN)
-sudo make install
-cd ../..
-rm mongo-c-driver-1.13.0.tar.gz
-# install mongo-cxx-driver from source
-cd /tmp
-curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz
-tar -xzf mongo-cxx-driver-r3.4.0.tar.gz
-cd mongo-cxx-driver-r3.4.0/build
-cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' ..
-make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1
-sudo make install
-cd ../..
-rm -f mongo-cxx-driver-r3.4.0.tar.gz
diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
similarity index 100%
rename from .cicd/platforms/amazon_linux-2.dockerfile
rename to .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/pinned/centos-7.6-pinned.dockerfile
similarity index 100%
rename from .cicd/platforms/centos-7.6.dockerfile
rename to .cicd/platforms/pinned/centos-7.6-pinned.dockerfile
diff --git a/.cicd/platforms/pinned/macos-10.14-pinned.sh b/.cicd/platforms/pinned/macos-10.14-pinned.sh
new file mode 100755
index 00000000000..99d51a7ff45
--- /dev/null
+++ b/.cicd/platforms/pinned/macos-10.14-pinned.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+set -eo pipefail
+VERSION=1
+brew update
+brew install git cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq || :
+# install clang from source
+git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8
+cd clang8
+git checkout 18e41dc
+cd tools
+git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git
+cd lld
+git checkout d60a035
+cd ../
+git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git
+cd polly
+git checkout 1bc06e5
+cd ../
+git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang
+cd clang
+git checkout a03da8b
+cd tools
+mkdir extra
+cd extra
+git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git
+cd clang-tools-extra
+git checkout 6b34834
+cd ../../../../../projects/
+git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git
+cd libcxx
+git checkout 1853712
+cd ../
+git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git
+cd libcxxabi
+git checkout d7338a4
+cd ../
+git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git
+cd libunwind
+git checkout 57f6739
+cd ../
+git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git
+cd compiler-rt
+git checkout 5bc7979
+mkdir ../../build
+cd ../../build
+cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release ..
+make -j $(getconf _NPROCESSORS_ONLN)
+sudo make install
+cd ../..
+rm -rf clang8
+# install boost from source
+curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
+tar -xjf boost_1_71_0.tar.bz2
+cd boost_1_71_0
+./bootstrap.sh --prefix=/usr/local
+sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
+cd ..
+sudo rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
+# install mongoDB
+cd ~
+curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
+tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz
+rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz
+ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
+# install mongo-c-driver from source
+cd /tmp
+curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz
+tar -xzf mongo-c-driver-1.13.0.tar.gz
+cd mongo-c-driver-1.13.0
+mkdir -p cmake-build
+cd cmake-build
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF ..
+make -j $(getconf _NPROCESSORS_ONLN)
+sudo make install
+cd ../..
+rm mongo-c-driver-1.13.0.tar.gz
+# install mongo-cxx-driver from source
+cd /tmp
+curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz
+tar -xzf mongo-cxx-driver-r3.4.0.tar.gz
+cd mongo-cxx-driver-r3.4.0/build
+cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' ..
+make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1
+sudo make install
+cd ../..
+rm -f mongo-cxx-driver-r3.4.0.tar.gz 
\ No newline at end of file
diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile
similarity index 100%
rename from .cicd/platforms/ubuntu-16.04.dockerfile
rename to .cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile
diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile
similarity index 100%
rename from .cicd/platforms/ubuntu-18.04.dockerfile
rename to .cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile
diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
similarity index 100%
rename from .cicd/platforms/amazon_linux-2-unpinned.dockerfile
rename to .cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/unpinned/centos-7.6-unpinned.dockerfile
similarity index 100%
rename from .cicd/platforms/centos-7.6-unpinned.dockerfile
rename to .cicd/platforms/unpinned/centos-7.6-unpinned.dockerfile
diff --git a/.cicd/platforms/unpinned/macos-10.14-unpinned.sh b/.cicd/platforms/unpinned/macos-10.14-unpinned.sh
new file mode 100755
index 00000000000..424641cbf4f
--- /dev/null
+++ b/.cicd/platforms/unpinned/macos-10.14-unpinned.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -eo pipefail
+VERSION=1
+brew update
+brew install git cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq boost || :
+# install mongoDB
+cd ~
+curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
+tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz
+rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz
+ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
+# install mongo-c-driver from source
+cd /tmp
+curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz
+tar -xzf mongo-c-driver-1.13.0.tar.gz
+cd mongo-c-driver-1.13.0
+mkdir -p cmake-build
+cd cmake-build
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF ..
+make -j $(getconf _NPROCESSORS_ONLN)
+sudo make install
+cd ../..
+rm mongo-c-driver-1.13.0.tar.gz
+# install mongo-cxx-driver from source
+cd /tmp
+curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz
+tar -xzf mongo-cxx-driver-r3.4.0.tar.gz
+cd mongo-cxx-driver-r3.4.0/build
+cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX='/usr/local' ..
+make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1
+sudo make install
+cd ../..
+rm -f mongo-cxx-driver-r3.4.0.tar.gz 
\ No newline at end of file
diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile
similarity index 94%
rename from .cicd/platforms/ubuntu-18.04-unpinned.dockerfile
rename to .cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile
index 148762a72c1..22e4cb0e0de 100644
--- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile
@@ -6,8 +6,8 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y git make \
     bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
     autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
-    autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
-    libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang ccache vim-common jq
+    autoconf libtool curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
+    libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang-7 ccache vim-common jq
 # build cmake.
 RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
     tar -xzf cmake-3.13.2.tar.gz && \

From d576fb9634157d782cb455b39776f40faf60f75d Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 30 Oct 2019 13:10:20 -0400
Subject: [PATCH 1475/1648] Add support for platform directory.

---
 .cicd/build.sh                | 13 +++++-----
 .cicd/generate-base-images.sh |  8 +++---
 .cicd/generate-pipeline.sh    | 46 ++++++++++++++++++-----------------
 .cicd/helpers/file-hash.sh    |  1 -
 .cicd/installation-build.sh   |  2 --
 .cicd/package.sh              |  2 +-
 .cicd/test.sh                 |  7 +++---
 7 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index fba3f05486d..d403160459e 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -9,7 +9,6 @@ if [[ "$(uname)" == 'Darwin' ]]; then
         export PINNED=false
         ccache -s
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
-        ./$CICD_DIR/platforms/macos-10.14.sh
     else
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     fi
@@ -22,18 +21,17 @@ if [[ "$(uname)" == 'Darwin' ]]; then
 else # Linux
     CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     ARGS=${ARGS:-"--rm --init -v $(pwd):$MOUNTED_DIR"}
-    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$IMAGE_TAG.dockerfile
     PRE_COMMANDS="cd $MOUNTED_DIR/build"
     # PRE_COMMANDS: Executed pre-cmake
     # CMAKE_EXTRAS: Executed within and right before the cmake path (cmake CMAKE_EXTRAS ..)
     [[ ! "$IMAGE_TAG" =~ 'unpinned' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$MOUNTED_DIR/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
-    if [[ "$IMAGE_TAG" == 'amazon_linux-2' ]]; then
+    if [[ "$IMAGE_TAG" == 'amazon_linux-2-pinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
-    elif [[ "$IMAGE_TAG" == 'centos-7.6' ]]; then
+    elif [[ "$IMAGE_TAG" == 'centos-7.6-pinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
-    elif [[ "$IMAGE_TAG" == 'ubuntu-16.04' ]]; then
+    elif [[ "$IMAGE_TAG" == 'ubuntu-16.04-pinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
-    elif [[ "$IMAGE_TAG" == 'ubuntu-18.04' ]]; then
+    elif [[ "$IMAGE_TAG" == 'ubuntu-18.04-pinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
     elif [[ "$IMAGE_TAG" == 'amazon_linux-2-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
@@ -43,7 +41,7 @@ else # Linux
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DLLVM_DIR='/opt/rh/llvm-toolset-7.0/root/usr/lib64/cmake/llvm'"
     elif [[ "$IMAGE_TAG" == 'ubuntu-18.04-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
-        CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DLLVM_DIR='/usr/lib/llvm-7/lib/cmake/llvm'"
+        CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++-7' -DCMAKE_C_COMPILER='clang-7' -DLLVM_DIR='/usr/lib/llvm-7/lib/cmake/llvm'"
     fi
     BUILD_COMMANDS="cmake $CMAKE_EXTRAS .. && make -j$JOBS"
     # Docker Commands
@@ -57,6 +55,7 @@ else # Linux
         ARGS="$ARGS -v /usr/lib/ccache -v $HOME/.ccache:/opt/.ccache -e JOBS -e TRAVIS -e CCACHE_DIR=/opt/.ccache"
         COMMANDS="ccache -s && $BUILD_COMMANDS"
     fi
+    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$PLATFORM_TYPE/$IMAGE_TAG.dockerfile
     COMMANDS="$PRE_COMMANDS && $COMMANDS"
     echo "$ docker run $ARGS $(buildkite-intrinsics) $FULL_TAG bash -c \"$COMMANDS\""
     eval docker run $ARGS $(buildkite-intrinsics) $FULL_TAG bash -c \"$COMMANDS\"
diff --git a/.cicd/generate-base-images.sh b/.cicd/generate-base-images.sh
index 005e0f78907..d05a4a25b99 100755
--- a/.cicd/generate-base-images.sh
+++ b/.cicd/generate-base-images.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 set -eo pipefail
 . ./.cicd/helpers/general.sh
-. $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/${IMAGE_TAG}.dockerfile
+. $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$PLATFORM_TYPE/$IMAGE_TAG.dockerfile
 # look for Docker image
 echo "+++ :mag_right: Looking for $FULL_TAG"
 ORG_REPO=$(echo $FULL_TAG | cut -d: -f1)
 TAG=$(echo $FULL_TAG | cut -d: -f2)
 EXISTS=$(curl -s -H "Authorization: Bearer $(curl -sSL "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${ORG_REPO}:pull" | jq --raw-output .token)" "https://registry.hub.docker.com/v2/${ORG_REPO}/manifests/$TAG")
 # build, if neccessary
-if [[ $EXISTS =~ '404 page not found' || $EXISTS =~ 'manifest unknown' ]]; then # if we cannot pull the image, we build and push it first
-    docker build -t $FULL_TAG -f $CICD_DIR/platforms/${IMAGE_TAG}.dockerfile .
+if [[ $EXISTS =~ '404 page not found' || $EXISTS =~ 'manifest unknown' || $FORCE_BASE_IMAGE == 'true' ]]; then # if we cannot pull the image, we build and push it first
+    docker build -t $FULL_TAG -f $CICD_DIR/platforms/$PLATFORM_TYPE/$IMAGE_TAG.dockerfile .
     docker push $FULL_TAG
 else
     echo "$FULL_TAG already exists."
-fi
+fi
\ No newline at end of file
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c739acd2b80..a20c6f2f3e3 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -18,18 +18,20 @@ if [[ $BUILDKITE_BRANCH =~ ^pull/[0-9]+/head: ]]; then
   PR_ID=$(echo $BUILDKITE_BRANCH | cut -d/ -f2)
   export GIT_FETCH="git fetch -v --prune origin refs/pull/$PR_ID/head &&"
 fi
-
-for FILE in $(ls $CICD_DIR/platforms); do
+# Determine which dockerfiles/scripts to use for the pipeline.
+if [[ $PINNED == false || $UNPINNED == true ]]; then
+    export PLATFORM_TYPE="unpinned"
+else
+    export PLATFORM_TYPE="pinned"
+fi
+for FILE in $(ls $CICD_DIR/platforms/$PLATFORM_TYPE); do
     # skip mac or linux by not even creating the json block
     ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
     ( [[ $SKIP_LINUX == true ]] && [[ ! $FILE =~ 'macos' ]] ) && continue
     # use pinned or unpinned, not both sets of platform files
-    if [[ $PINNED == false || $UNPINNED == true ]] && [[ ! $FILE =~ 'macos' ]]; then
+    if [[ $PINNED == false || $UNPINNED == true ]]; then
         export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true}
         export SKIP_PACKAGE_BUILDER=${SKIP_PACKAGE_BUILDER:-true}
-        [[ ! $FILE =~ 'unpinned' ]] && continue
-    else
-        [[ $FILE =~ 'unpinned' ]] && continue
     fi
     export FILE_NAME="$(echo $FILE | awk '{split($0,a,/\.(d|s)/); print a[1] }')"
     # macos-10.14
@@ -58,7 +60,7 @@ for FILE in $(ls $CICD_DIR/platforms); do
     [[ $FILE_NAME =~ 'ubuntu' ]] && export ICON=':ubuntu:'
     [[ $FILE_NAME =~ 'centos' ]] && export ICON=':centos:'
     [[ $FILE_NAME =~ 'macos' ]] && export ICON=':darwin:'
-    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$FILE # returns HASHED_IMAGE_TAG, etc
+    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$PLATFORM_TYPE/$FILE # returns HASHED_IMAGE_TAG, etc
     export PLATFORMS_JSON_ARRAY=$(echo $PLATFORMS_JSON_ARRAY | jq -c '. += [{ 
         "FILE_NAME": env.FILE_NAME, 
         "PLATFORM_NAME": env.PLATFORM_NAME,
@@ -100,7 +102,7 @@ echo $PLATFORMS_JSON_ARRAY | jq -cr '.[]' | while read -r PLATFORM_JSON; do
       - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
@@ -138,9 +140,9 @@ EOF
       REPO_COMMIT: $BUILDKITE_COMMIT
       TEMPLATE: $MOJAVE_ANKA_TEMPLATE_NAME
       TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
-      PINNED: $PINNED
-      UNPINNED: $UNPINNED
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f $BUILDKITE_COMMIT && git submodule update --init --recursive && export PINNED=$PINNED && export UNPINNED=$UNPINNED && . ./.cicd/platforms/$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME).sh && cd ~/eos && cd .. && rm -rf eos"
+      IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
+      PLATFORM_TYPE: $PLATFORM_TYPE
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f $BUILDKITE_COMMIT && git submodule update --init --recursive && export IMAGE_TAG=$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) && export PLATFORM_TYPE=$PLATFORM_TYPE && . ./.cicd/platforms/$PLATFORM_TYPE/$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME).sh && cd ~/eos && cd .. && rm -rf eos"
       PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
     timeout: ${TIMEOUT:-180}
     agents: "queue=mac-anka-large-node-fleet"
@@ -175,7 +177,7 @@ for ROUND in $(seq 1 $ROUNDS); do
       - "./.cicd/test.sh scripts/parallel-test.sh"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-30}
@@ -231,7 +233,7 @@ EOF
       - "./.cicd/test.sh scripts/wasm-spec-test.sh"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-30}
@@ -290,7 +292,7 @@ EOF
       - "./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-20}
@@ -350,7 +352,7 @@ EOF
       - "./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
     env:
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-180}
@@ -465,8 +467,8 @@ cat <<EOF
       - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
       - "./.cicd/package.sh"
     env:
-      IMAGE_TAG: "centos-7.6"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      IMAGE_TAG: "centos-7.6-$PLATFORM_TYPE"
+      PLATFORM_TYPE: $PLATFORM_TYPE
       OS: "el7" # OS and PKGTYPE required for lambdas
       PKGTYPE: "rpm"
     agents:
@@ -479,8 +481,8 @@ cat <<EOF
       - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 16.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
       - "./.cicd/package.sh"
     env:
-      IMAGE_TAG: "ubuntu-16.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      IMAGE_TAG: "ubuntu-16.04-$PLATFORM_TYPE"
+      PLATFORM_TYPE: $PLATFORM_TYPE
       OS: "ubuntu-16.04" # OS and PKGTYPE required for lambdas
       PKGTYPE: "deb"
     agents:
@@ -493,8 +495,8 @@ cat <<EOF
       - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
       - "./.cicd/package.sh"
     env:
-      IMAGE_TAG: "ubuntu-18.04"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      IMAGE_TAG: "ubuntu-18.04-$PLATFORM_TYPE"
+      PLATFORM_TYPE: $PLATFORM_TYPE
       OS: "ubuntu-18.04" # OS and PKGTYPE required for lambdas
       PKGTYPE: "deb"
     agents:
@@ -529,7 +531,7 @@ cat <<EOF
     command: "./.cicd/installation-build.sh"
     env:
       IMAGE_TAG: "ubuntu-18.04-unpinned"
-      BUILDKITE_AGENT_ACCESS_TOKEN:
+      PLATFORM_TYPE: "unpinned"
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-30}
diff --git a/.cicd/helpers/file-hash.sh b/.cicd/helpers/file-hash.sh
index 4a4ec933a98..6297ea9204d 100755
--- a/.cicd/helpers/file-hash.sh
+++ b/.cicd/helpers/file-hash.sh
@@ -3,6 +3,5 @@ set -eo pipefail
 [[ -z $1 ]] && echo "Please provide the file to be hashed" && exit 1
 FILE_NAME=$(basename $1 | awk '{split($0,a,/\.(d|s)/); print a[1] }')
 export DETERMINED_HASH=$(sha1sum $1 | awk '{ print $1 }')
-( [[ $FILE_NAME =~ 'macos' ]] && [[ $PINNED == false || $UNPINNED == true ]] ) && FILE_NAME="${FILE_NAME}-unpinned"
 export HASHED_IMAGE_TAG="eos-${FILE_NAME}-${DETERMINED_HASH}"
 export FULL_TAG="eosio/ci:$HASHED_IMAGE_TAG"
\ No newline at end of file
diff --git a/.cicd/installation-build.sh b/.cicd/installation-build.sh
index f74844423c7..4a5ecd709cf 100755
--- a/.cicd/installation-build.sh
+++ b/.cicd/installation-build.sh
@@ -7,11 +7,9 @@ if [[ $BUILDKITE_BRANCH =~ ^release/[0-9].[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^mas
     export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04"
     export ARGS="--name ci-contracts-builder-$BUILDKITE_COMMIT --init -v $(pwd):$MOUNTED_DIR"
     $CICD_DIR/build.sh
-    docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-latest
     docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT
     docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH
     docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
-    docker push $CONTRACTS_BUILDER_TAG-latest
     docker push $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT
     docker push $CONTRACTS_BUILDER_TAG-$BRANCH
     docker push $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
diff --git a/.cicd/package.sh b/.cicd/package.sh
index 79a8dae0088..7376744e5d1 100755
--- a/.cicd/package.sh
+++ b/.cicd/package.sh
@@ -18,7 +18,7 @@ if [[ $(uname) == 'Darwin' ]]; then
     done
 else # Linux
     ARGS=${ARGS:-"--rm --init -v $(pwd):$MOUNTED_DIR"}
-    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$IMAGE_TAG.dockerfile
+    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$PLATFORM_TYPE/$IMAGE_TAG.dockerfile
     PRE_COMMANDS="cd $MOUNTED_DIR/build/packages && chmod 755 ./*.sh"
     if [[ "$IMAGE_TAG" =~ "ubuntu" ]]; then
         ARTIFACT='*.deb'
diff --git a/.cicd/test.sh b/.cicd/test.sh
index 4a3a203757d..815724ec8bb 100755
--- a/.cicd/test.sh
+++ b/.cicd/test.sh
@@ -9,10 +9,11 @@ if [[ $(uname) == 'Darwin' ]]; then # macOS
     ./"$@"
     EXIT_STATUS=$?
 else # Linux
-    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$IMAGE_TAG.dockerfile
-    echo "$ docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$MOUNTED_DIR/$@\""
+    COMMANDS="$MOUNTED_DIR/$@"
+    . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$PLATFORM_TYPE/$IMAGE_TAG.dockerfile
+    echo "$ docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$COMMANDS""
     set +e # defer error handling to end
-    eval docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$MOUNTED_DIR/$@\"
+    eval docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$COMMANDS\""
     EXIT_STATUS=$?
 fi
 # buildkite

From f210d8c10f0a7807b1963ed58590cf42583dbcdd Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 30 Oct 2019 13:10:37 -0400
Subject: [PATCH 1476/1648] Do not start mongod if it does not exist.

---
 scripts/long-running-test.sh | 10 ++++++----
 scripts/serial-test.sh       | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/long-running-test.sh b/scripts/long-running-test.sh
index 1b2b86db8ae..f10de222686 100755
--- a/scripts/long-running-test.sh
+++ b/scripts/long-running-test.sh
@@ -16,10 +16,12 @@ if [[ ! -z "$(pgrep mongod)" ]]; then
     echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':leaves: ')Killing old MongoDB"
     $(pgrep mongod | xargs kill -9) || :
 fi
-echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':leaves: ')Starting new MongoDB"
-[[ ! -d ~/data/mongodb && ! -d mongodata ]] && mkdir mongodata
-echo "$ mongod --fork --logpath $(pwd)/mongod.log $([[ -d ~/data/mongodb ]] && echo '--dbpath ~/data/mongodb' || echo "--dbpath $(pwd)/mongodata") $([[ -f ~/etc/mongod.conf ]] && echo '-f ~/etc/mongod.conf')"
-eval mongod --fork --logpath $(pwd)/mongod.log $([[ -d ~/data/mongodb ]] && echo '--dbpath ~/data/mongodb' || echo "--dbpath $(pwd)/mongodata") $([[ -f ~/etc/mongod.conf ]] && echo '-f ~/etc/mongod.conf')
+if [[ -x $(command -v mongod) ]]; then
+    echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':leaves: ')Starting new MongoDB"
+    [[ ! -d ~/data/mongodb && ! -d mongodata ]] && mkdir mongodata
+    echo "$ mongod --fork --logpath $(pwd)/mongod.log $([[ -d ~/data/mongodb ]] && echo '--dbpath ~/data/mongodb' || echo "--dbpath $(pwd)/mongodata") $([[ -f ~/etc/mongod.conf ]] && echo '-f ~/etc/mongod.conf')"
+    eval mongod --fork --logpath $(pwd)/mongod.log $([[ -d ~/data/mongodb ]] && echo '--dbpath ~/data/mongodb' || echo "--dbpath $(pwd)/mongodata") $([[ -f ~/etc/mongod.conf ]] && echo '-f ~/etc/mongod.conf')
+fi
 # tests
 if [[ -z "$TEST" ]]; then # run all serial tests
     # count tests
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
index 84c8729009d..f5b7a24e812 100755
--- a/scripts/serial-test.sh
+++ b/scripts/serial-test.sh
@@ -16,10 +16,12 @@ if [[ ! -z "$(pgrep mongod)" ]]; then
     echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':leaves: ')Killing old MongoDB"
     $(pgrep mongod | xargs kill -9) || :
 fi
-echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':leaves: ')Starting new MongoDB"
-[[ ! -d ~/data/mongodb && ! -d mongodata ]] && mkdir mongodata
-echo "$ mongod --fork --logpath $(pwd)/mongod.log $([[ -d ~/data/mongodb ]] && echo '--dbpath ~/data/mongodb' || echo "--dbpath $(pwd)/mongodata") $(if [[ -f ~/etc/mongod.conf ]]; then echo '-f ~/etc/mongod.conf'; elif [[ -f /usr/local/etc/mongod.conf ]]; then echo '-f /usr/local/etc/mongod.conf'; fi)"
-eval mongod --fork --logpath $(pwd)/mongod.log $([[ -d ~/data/mongodb ]] && echo '--dbpath ~/data/mongodb' || echo "--dbpath $(pwd)/mongodata") $(if [[ -f ~/etc/mongod.conf ]]; then echo '-f ~/etc/mongod.conf'; elif [[ -f /usr/local/etc/mongod.conf ]]; then echo '-f /usr/local/etc/mongod.conf'; fi)
+if [[ -x $(command -v mongod) ]]; then
+    echo "+++ $([[ "$BUILDKITE" == 'true' ]] && echo ':leaves: ')Starting new MongoDB"
+    [[ ! -d ~/data/mongodb && ! -d mongodata ]] && mkdir mongodata
+    echo "$ mongod --fork --logpath $(pwd)/mongod.log $([[ -d ~/data/mongodb ]] && echo '--dbpath ~/data/mongodb' || echo "--dbpath $(pwd)/mongodata") $(if [[ -f ~/etc/mongod.conf ]]; then echo '-f ~/etc/mongod.conf'; elif [[ -f /usr/local/etc/mongod.conf ]]; then echo '-f /usr/local/etc/mongod.conf'; fi)"
+    eval mongod --fork --logpath $(pwd)/mongod.log $([[ -d ~/data/mongodb ]] && echo '--dbpath ~/data/mongodb' || echo "--dbpath $(pwd)/mongodata") $(if [[ -f ~/etc/mongod.conf ]]; then echo '-f ~/etc/mongod.conf'; elif [[ -f /usr/local/etc/mongod.conf ]]; then echo '-f /usr/local/etc/mongod.conf'; fi)
+fi
 # tests
 if [[ -z "$TEST" ]]; then # run all serial tests
     # count tests

From 260fee44eba3f1b5db1ae798c276691f30899bb1 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 30 Oct 2019 13:11:14 -0400
Subject: [PATCH 1477/1648] Add support for platform type directory.

---
 .travis.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fe1da4547da..e4d1e998a24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,22 +12,26 @@ matrix:
       dist: xenial
       services: docker
       env:
-        - IMAGE_TAG='ubuntu-18.04'
+        - PLATFORM_TYPE='pinned'
+        - IMAGE_TAG='ubuntu-18.04-pinned'
     - os: linux
       dist: xenial
       services: docker
       env:
-        - IMAGE_TAG='ubuntu-16.04'
+        - PLATFORM_TYPE='pinned'
+        - IMAGE_TAG='ubuntu-16.04-pinned'
     - os: linux
       dist: xenial
       services: docker
       env:
-        - IMAGE_TAG='amazon_linux-2'
+        - PLATFORM_TYPE='pinned'
+        - IMAGE_TAG='amazon_linux-2-pinned'
     - os: linux
       dist: xenial
       services: docker
-      env: 
-        - IMAGE_TAG='centos-7.6'
+      env:
+        - PLATFORM_TYPE='pinned'
+        - IMAGE_TAG='centos-7.6-pinned'
     - os: osx
       osx_image: xcode10.2
       addons:
@@ -45,7 +49,6 @@ matrix:
             - automake
             - wget
             - gmp
-            - llvm@7
             - pkgconfig
             - doxygen
             - openssl

From c9beac780cfb6cb64217b49d3f492152737532be Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 30 Oct 2019 13:32:16 -0400
Subject: [PATCH 1478/1648] Fix missing LLVM.

---
 .cicd/platforms/pinned/macos-10.14-pinned.sh     | 2 +-
 .cicd/platforms/unpinned/macos-10.14-unpinned.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/platforms/pinned/macos-10.14-pinned.sh b/.cicd/platforms/pinned/macos-10.14-pinned.sh
index 99d51a7ff45..d8e747be21a 100755
--- a/.cicd/platforms/pinned/macos-10.14-pinned.sh
+++ b/.cicd/platforms/pinned/macos-10.14-pinned.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 VERSION=1
 brew update
-brew install git cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq || :
+brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl jq || :
 # install clang from source
 git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8
 cd clang8
diff --git a/.cicd/platforms/unpinned/macos-10.14-unpinned.sh b/.cicd/platforms/unpinned/macos-10.14-unpinned.sh
index 424641cbf4f..40144091f50 100755
--- a/.cicd/platforms/unpinned/macos-10.14-unpinned.sh
+++ b/.cicd/platforms/unpinned/macos-10.14-unpinned.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 VERSION=1
 brew update
-brew install git cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq boost || :
+brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl jq boost || :
 # install mongoDB
 cd ~
 curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz

From 5c3c26d028293ad0283ce80b9d17496c1fa019a1 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 30 Oct 2019 13:42:55 -0400
Subject: [PATCH 1479/1648] Fix missing LLVM.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e4d1e998a24..f3830ebf785 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,6 +49,7 @@ matrix:
             - automake
             - wget
             - gmp
+            - llvm@7
             - pkgconfig
             - doxygen
             - openssl

From 81b2c69569688cb2ab86de2612ce134a58b8f68a Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 30 Oct 2019 14:42:27 -0400
Subject: [PATCH 1480/1648] Fix quotes.

---
 .cicd/test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/test.sh b/.cicd/test.sh
index 815724ec8bb..632e714d82e 100755
--- a/.cicd/test.sh
+++ b/.cicd/test.sh
@@ -11,9 +11,9 @@ if [[ $(uname) == 'Darwin' ]]; then # macOS
 else # Linux
     COMMANDS="$MOUNTED_DIR/$@"
     . $HELPERS_DIR/file-hash.sh $CICD_DIR/platforms/$PLATFORM_TYPE/$IMAGE_TAG.dockerfile
-    echo "$ docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$COMMANDS""
+    echo "$ docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$COMMANDS\""
     set +e # defer error handling to end
-    eval docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$COMMANDS\""
+    eval docker run --rm --init -v $(pwd):$MOUNTED_DIR $(buildkite-intrinsics) -e JOBS $FULL_TAG bash -c \"$COMMANDS\"
     EXIT_STATUS=$?
 fi
 # buildkite

From 122ae7fcf55d4ae6f766256a3f936731d23c7578 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 28 Oct 2019 13:01:37 -0500
Subject: [PATCH 1481/1648] Post callback as medium priority to prevent ship
 running at maximum priority

---
 .../state_history_plugin/state_history_plugin.cpp    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/state_history_plugin/state_history_plugin.cpp b/plugins/state_history_plugin/state_history_plugin.cpp
index 040c4678da9..df9bc683b65 100644
--- a/plugins/state_history_plugin/state_history_plugin.cpp
+++ b/plugins/state_history_plugin/state_history_plugin.cpp
@@ -325,11 +325,13 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
 
       template <typename F>
       void callback(boost::system::error_code ec, const char* what, F f) {
-         if (plugin->stopping)
-            return;
-         if (ec)
-            return on_fail(ec, what);
-         catch_and_close(f);
+         app().post( priority::medium, [=]() {
+            if( plugin->stopping )
+               return;
+            if( ec )
+               return on_fail( ec, what );
+            catch_and_close( f );
+         } );
       }
 
       void on_fail(boost::system::error_code ec, const char* what) {

From 8f69fafcd994506f345b295a0dbe9c9ae1454fe2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 1 Nov 2019 11:15:35 -0500
Subject: [PATCH 1482/1648] Be careful to capture lambda values by value since
 execution happens later via app post

---
 .../state_history_plugin.cpp                  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/state_history_plugin/state_history_plugin.cpp b/plugins/state_history_plugin/state_history_plugin.cpp
index df9bc683b65..6c5b8bc514a 100644
--- a/plugins/state_history_plugin/state_history_plugin.cpp
+++ b/plugins/state_history_plugin/state_history_plugin.cpp
@@ -181,10 +181,10 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
          socket_stream->next_layer().set_option(boost::asio::ip::tcp::no_delay(true));
          socket_stream->next_layer().set_option(boost::asio::socket_base::send_buffer_size(1024 * 1024));
          socket_stream->next_layer().set_option(boost::asio::socket_base::receive_buffer_size(1024 * 1024));
-         socket_stream->async_accept([self = shared_from_this(), this](boost::system::error_code ec) {
-            callback(ec, "async_accept", [&] {
-               start_read();
-               send(state_history_plugin_abi);
+         socket_stream->async_accept([self = shared_from_this()](boost::system::error_code ec) {
+            self->callback(ec, "async_accept", [self] {
+               self->start_read();
+               self->send(state_history_plugin_abi);
             });
          });
       }
@@ -192,15 +192,15 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
       void start_read() {
          auto in_buffer = std::make_shared<boost::beast::flat_buffer>();
          socket_stream->async_read(
-             *in_buffer, [self = shared_from_this(), this, in_buffer](boost::system::error_code ec, size_t) {
-                callback(ec, "async_read", [&] {
+             *in_buffer, [self = shared_from_this(), in_buffer](boost::system::error_code ec, size_t) {
+                self->callback(ec, "async_read", [self, in_buffer] {
                    auto d = boost::asio::buffer_cast<char const*>(boost::beast::buffers_front(in_buffer->data()));
                    auto s = boost::asio::buffer_size(in_buffer->data());
                    fc::datastream<const char*> ds(d, s);
                    state_request               req;
                    fc::raw::unpack(ds, req);
-                   req.visit(*this);
-                   start_read();
+                   req.visit(*self);
+                   self->start_read();
                 });
              });
       }
@@ -226,11 +226,11 @@ struct state_history_plugin_impl : std::enable_shared_from_this<state_history_pl
          sent_abi = true;
          socket_stream->async_write( //
              boost::asio::buffer(send_queue[0]),
-             [self = shared_from_this(), this](boost::system::error_code ec, size_t) {
-                callback(ec, "async_write", [&] {
-                   send_queue.erase(send_queue.begin());
-                   sending = false;
-                   send();
+             [self = shared_from_this()](boost::system::error_code ec, size_t) {
+                self->callback(ec, "async_write", [self] {
+                   self->send_queue.erase(self->send_queue.begin());
+                   self->sending = false;
+                   self->send();
                 });
              });
       }

From 2b8da20788d10e60d21053105c488410ad36b686 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 18 Oct 2019 15:22:07 -0400
Subject: [PATCH 1483/1648] add harden flags to cicd & pinned builds

---
 .cicd/helpers/clang.make                                | 8 ++++++--
 .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile | 4 ++--
 .cicd/platforms/pinned/centos-7.6-pinned.dockerfile     | 4 ++--
 .cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile   | 4 ++--
 .cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile   | 4 ++--
 scripts/helpers/eosio.sh                                | 4 ++--
 scripts/pinned_toolchain.cmake                          | 9 +++++++--
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.cicd/helpers/clang.make b/.cicd/helpers/clang.make
index d1a4d5f5071..fbc23804204 100755
--- a/.cicd/helpers/clang.make
+++ b/.cicd/helpers/clang.make
@@ -3,8 +3,12 @@ set(CMAKE_CXX_COMPILER_WORKS 1)
 set(CMAKE_C_COMPILER /usr/local/bin/clang)
 set(CMAKE_CXX_COMPILER /usr/local/bin/clang++)
 set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES /usr/local/include/c++/v1 /usr/local/include /usr/include)
-set(CMAKE_CXX_FLAGS_INIT "-nostdinc++")
-set(CMAKE_EXE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
+set(CMAKE_C_FLAGS_INIT "-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie")
+set(CMAKE_CXX_FLAGS_INIT "-nostdinc++ -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie")
+set(CMAKE_EXE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++ -pie")
+if(NOT APPLE)
+   string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " -Wl,-z,relro,-z,now")
+endif()
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
 set(CMAKE_MODULE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
 set(CMAKE_CXX_STANDARD_LIBRARIES "/usr/local/lib/libc++.a /usr/local/lib/libc++abi.a")
\ No newline at end of file
diff --git a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
index 55df25e33be..d14acd1a795 100644
--- a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
+++ b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
@@ -37,7 +37,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd llvm && \
     mkdir build && \
     cd build && \
-    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
     make -j$(nproc) && \
     make install && \
     cd / && \
@@ -47,7 +47,7 @@ RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
-    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
     rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
diff --git a/.cicd/platforms/pinned/centos-7.6-pinned.dockerfile b/.cicd/platforms/pinned/centos-7.6-pinned.dockerfile
index 734b240c0b1..8b816cf2deb 100644
--- a/.cicd/platforms/pinned/centos-7.6-pinned.dockerfile
+++ b/.cicd/platforms/pinned/centos-7.6-pinned.dockerfile
@@ -46,7 +46,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd llvm && \
     mkdir build && \
     cd build && \
-    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
     make -j$(nproc) && \
     make install && \
     cd / && \
@@ -56,7 +56,7 @@ RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
-    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
     rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
diff --git a/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile b/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile
index d93c21afc04..a8e4743f009 100644
--- a/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile
+++ b/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile
@@ -38,7 +38,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd llvm && \
     mkdir build && \
     cd build && \
-    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. && \
+    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
     make -j$(nproc) && \
     make install && \
     cd / && \
@@ -48,7 +48,7 @@ RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
-    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
     rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
diff --git a/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile b/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile
index 79d30a25f16..7815e219c8f 100644
--- a/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile
+++ b/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile
@@ -39,7 +39,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l
     cd llvm && \
     mkdir build && \
     cd build && \
-    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread .. && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='/tmp/clang.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
     make -j$(nproc) && \
     make install && \
     cd / && \
@@ -49,7 +49,7 @@ RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.
     tar -xjf boost_1_71_0.tar.bz2 && \
     cd boost_1_71_0 && \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
-    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
     cd / && \
     rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0
 # build mongodb
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index 06f5474b400..d240c8c64b4 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -248,7 +248,7 @@ function ensure-boost() {
         B2_FLAGS="-q -j${JOBS} --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test install"
         BOOTSTRAP_FLAGS=""
         if [[ $ARCH == "Linux" ]] && $PIN_COMPILER; then
-            B2_FLAGS="toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I${CLANG_ROOT}/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j${JOBS} install"
+            B2_FLAGS="toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I${CLANG_ROOT}/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j${JOBS} install"
             BOOTSTRAP_FLAGS="--with-toolset=clang"
         elif $PIN_COMPILER; then
             local SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
@@ -277,7 +277,7 @@ function ensure-llvm() {
         fi
         LLVM_TEMP_DIR=$(mktemp -d)
         if $PIN_COMPILER || $BUILD_CLANG; then
-            local LLVM_PINNED_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread"
+            local LLVM_PINNED_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE='${BUILD_DIR}/pinned_toolchain.cmake' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO"
         fi
         trap "rm -rf '$LLVM_TEMP_DIR'" EXIT
         execute bash -c "cd '$LLVM_TEMP_DIR' \
diff --git a/scripts/pinned_toolchain.cmake b/scripts/pinned_toolchain.cmake
index cdb517c5e1f..73b0a43bf62 100644
--- a/scripts/pinned_toolchain.cmake
+++ b/scripts/pinned_toolchain.cmake
@@ -6,9 +6,14 @@ set(CMAKE_CXX_COMPILER ${OPT_PATH}/clang8/bin/clang++)
 
 set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${OPT_PATH}/clang8/include/c++/v1 /usr/local/include /usr/include)
 
-set(CMAKE_CXX_FLAGS_INIT "-nostdinc++")
+set(CMAKE_C_FLAGS_INIT "-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie")
+set(CMAKE_CXX_FLAGS_INIT "-nostdinc++ -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie")
+
+set(CMAKE_EXE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++ -pie")
+if(NOT APPLE)
+   string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " -Wl,-z,relro,-z,now")
+endif()
 
-set(CMAKE_EXE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
 set(CMAKE_MODULE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
 

From c68cfc3ed919e2edab065ad4f9e2c934c7a27183 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 5 Nov 2019 12:36:44 -0500
Subject: [PATCH 1484/1648] Fix for unpinned env and triggered wasm spec tests.

---
 .cicd/build.sh             | 2 +-
 .cicd/generate-pipeline.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index d403160459e..c7633fffb93 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -12,7 +12,7 @@ if [[ "$(uname)" == 'Darwin' ]]; then
     else
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     fi
-    [[ ! "$PINNED" == 'false' || "$UNPINNED" == 'true' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
+    [[ "$PINNED" == 'false' || "$UNPINNED" == 'true' ]] || CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
     echo "cmake $CMAKE_EXTRAS .."
     cmake $CMAKE_EXTRAS ..
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index a20c6f2f3e3..6d4d30bedcd 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -418,6 +418,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
         SKIP_BUILD: "true"
+        SKIP_WASM_SPEC_TESTS: "true"
         PINNED: "${PINNED}"
         UNPINNED: "${UNPINNED}"
 

From 1f34c06438c37f48e49eb58bf5c7e14f96c0e312 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 5 Nov 2019 11:51:48 -0500
Subject: [PATCH 1485/1648] ensure GMP is always dynamically linked

---
 libraries/fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fc b/libraries/fc
index 52e372f4cab..e0e9f08b99c 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 52e372f4cabc59d531a2bbf35bebbf244e4d9485
+Subproject commit e0e9f08b99ce2d4ce65f6e7bf51c766dcddc65e6

From bc4ac47ac68ab1f1e910e752b88cd29677646156 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 5 Nov 2019 14:29:44 -0500
Subject: [PATCH 1486/1648] Remove signs of UNPINNED in favor of only
 supporting one env.

---
 .cicd/build.sh             | 2 +-
 .cicd/generate-pipeline.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index c7633fffb93..79eb3bcc17f 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -12,7 +12,7 @@ if [[ "$(uname)" == 'Darwin' ]]; then
     else
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DBUILD_MONGO_DB_PLUGIN=true"
     fi
-    [[ "$PINNED" == 'false' || "$UNPINNED" == 'true' ]] || CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
+    [[ ! "$PINNED" == 'false' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$HELPERS_DIR/clang.make"
     cd $BUILD_DIR
     echo "cmake $CMAKE_EXTRAS .."
     cmake $CMAKE_EXTRAS ..
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 6d4d30bedcd..88df384ddba 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -19,7 +19,7 @@ if [[ $BUILDKITE_BRANCH =~ ^pull/[0-9]+/head: ]]; then
   export GIT_FETCH="git fetch -v --prune origin refs/pull/$PR_ID/head &&"
 fi
 # Determine which dockerfiles/scripts to use for the pipeline.
-if [[ $PINNED == false || $UNPINNED == true ]]; then
+if [[ $PINNED == false ]]; then
     export PLATFORM_TYPE="unpinned"
 else
     export PLATFORM_TYPE="pinned"
@@ -29,7 +29,7 @@ for FILE in $(ls $CICD_DIR/platforms/$PLATFORM_TYPE); do
     ( [[ $SKIP_MAC == true ]] && [[ $FILE =~ 'macos' ]] ) && continue
     ( [[ $SKIP_LINUX == true ]] && [[ ! $FILE =~ 'macos' ]] ) && continue
     # use pinned or unpinned, not both sets of platform files
-    if [[ $PINNED == false || $UNPINNED == true ]]; then
+    if [[ $PINNED == false ]]; then
         export SKIP_CONTRACT_BUILDER=${SKIP_CONTRACT_BUILDER:-true}
         export SKIP_PACKAGE_BUILDER=${SKIP_PACKAGE_BUILDER:-true}
     fi
@@ -404,7 +404,7 @@ EOF
 done
 # trigger eosio-lrt post pr
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
-    if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
+    if ( [[ ! $PINNED == false ]] ); then
     cat <<EOF
   - label: ":pipeline: Trigger Long Running Tests"
     trigger: "eosio-lrt"
@@ -427,7 +427,7 @@ EOF
 fi
 # trigger multiversion post pr
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
-    if ( [[ ! $PINNED == false || $UNPINNED == true ]] ); then
+    if ( [[ ! $PINNED == false ]] ); then
     cat <<EOF
   - label: ":pipeline: Trigger Multiversion Test"
     trigger: "eos-multiversion-tests"

From d370b7daff436039d131239e56e2e2b10affa4ee Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Tue, 5 Nov 2019 14:36:17 -0500
Subject: [PATCH 1487/1648] Remove signs of UNPINNED in favor of only
 supporting one env.

---
 .cicd/generate-pipeline.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 88df384ddba..c4075e306fa 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -420,7 +420,6 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
         SKIP_BUILD: "true"
         SKIP_WASM_SPEC_TESTS: "true"
         PINNED: "${PINNED}"
-        UNPINNED: "${UNPINNED}"
 
 EOF
     fi

From 3ee09ed30d440750dac16b4fa663e17b21b41a25 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 5 Nov 2019 17:03:27 -0500
Subject: [PATCH 1488/1648] 10 second sleep

---
 .cicd/generate-pipeline.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c4075e306fa..b618526eedf 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -132,7 +132,7 @@ EOF
           failover-registries:
             - 'registry_1'
             - 'registry_2'
-          pre-execute-sleep: 5
+          pre-execute-sleep: 10
           pre-commands: 
             - "git clone git@github.com:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure-tag.bash -u 12 -r 25G -a '-n'"
     env:
@@ -205,7 +205,7 @@ EOF
           failover-registries:
             - 'registry_1'
             - 'registry_2'
-          pre-execute-sleep: 5
+          pre-execute-sleep: 10
     timeout: ${TIMEOUT:-60}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
@@ -261,7 +261,7 @@ EOF
           failover-registries:
             - 'registry_1'
             - 'registry_2'
-          pre-execute-sleep: 5
+          pre-execute-sleep: 10
     timeout: ${TIMEOUT:-60}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_WASM_SPEC_TESTS}
@@ -320,7 +320,7 @@ EOF
           failover-registries:
             - 'registry_1'
             - 'registry_2'
-          pre-execute-sleep: 5
+          pre-execute-sleep: 10
     timeout: ${TIMEOUT:-60}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
@@ -380,7 +380,7 @@ EOF
           failover-registries:
             - 'registry_1'
             - 'registry_2'
-          pre-execute-sleep: 5
+          pre-execute-sleep: 10
     timeout: ${TIMEOUT:-180}
     agents: "queue=mac-anka-node-fleet"
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
@@ -521,7 +521,7 @@ cat <<EOF
           failover-registries:
             - 'registry_1'
             - 'registry_2'
-          pre-execute-sleep: 5
+          pre-execute-sleep: 10
     agents:
       - "queue=mac-anka-node-fleet"
     timeout: ${TIMEOUT:-60}

From 0719aa38c1be1c64bb469f4094a35f38857f337e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 7 Nov 2019 09:11:59 -0500
Subject: [PATCH 1489/1648] Change to debug level log output

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 53daae082be..a105e6a9a47 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1655,7 +1655,7 @@ namespace eosio {
    }
 
    void sync_manager::sync_recv_notice( const connection_ptr& c, const notice_message& msg) {
-      fc_ilog( logger, "sync_manager got ${m} block notice", ("m", modes_str( msg.known_blocks.mode )) );
+      fc_dlog( logger, "sync_manager got ${m} block notice", ("m", modes_str( msg.known_blocks.mode )) );
       EOS_ASSERT( msg.known_blocks.mode == catch_up || msg.known_blocks.mode == last_irr_catch_up, plugin_exception,
                   "sync_recv_notice only called on catch_up" );
       if (msg.known_blocks.mode == catch_up) {

From 8ed34adc7a6cd11e4bbbf1b8d2131c0caf7a220b Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Thu, 7 Nov 2019 16:27:58 -0500
Subject: [PATCH 1490/1648] Consolidated Security Fixes for 2.0.x

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 86751193b85..4b2c2e76811 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 86751193b856c7b411494c2cddb32af940c3e7b3
+Subproject commit 4b2c2e76811ff3a4a1b571b5be3bacc6035014e5

From 1d422a270d103e85f7138bec98e3286a2e4754a4 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Thu, 7 Nov 2019 16:45:55 -0500
Subject: [PATCH 1491/1648] bump version to 2.0.0-rc2

---
 CMakeLists.txt |  2 +-
 README.md      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98c119cbd3b..d880199cea1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set( CXX_STANDARD_REQUIRED ON)
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX rc1)
+set(VERSION_SUFFIX rc2)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")
diff --git a/README.md b/README.md
index cdf595d4189..1ab1e108124 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,13 @@ $ brew remove eosio
 
 #### Ubuntu 18.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc1/eosio_2.0.0-rc1-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_2.0.0-rc1-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc1/eosio_2.0.0-rc1-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_2.0.0-rc1-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
 ```
 #### Ubuntu Package Uninstall
 ```sh
@@ -58,8 +58,8 @@ $ sudo apt remove eosio
 ```
 #### Centos RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc1/eosio-2.0.0-rc1.el7.x86_64.rpm
-$ sudo yum install ./eosio-2.0.0-rc1.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio-2.0.0-rc2.el7.x86_64.rpm
+$ sudo yum install ./eosio-2.0.0-rc2.el7.x86_64.rpm
 ```
 #### Centos RPM Package Uninstall
 ```sh

From 54b34e95936a3d4cff38195fadf61b29d5cff684 Mon Sep 17 00:00:00 2001
From: Brian Johnson <johnsonb@objectcomputing.com>
Date: Thu, 7 Nov 2019 09:42:12 -0600
Subject: [PATCH 1492/1648] Fixed test to not count failed attempts as actual
 sends and added some leeway in validation.

---
 tests/nodeos_under_min_avail_ram.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index aebf5571121..108c3742964 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -177,6 +177,7 @@ def setName(self, num):
                         break
 
                     Print("Failed to push create action to eosio contract. sleep for 5 seconds")
+                    count-=1 # failed attempt shouldn't be counted
                     time.sleep(5)
                 else:
                     timeOutCount=0
@@ -188,8 +189,10 @@ def setName(self, num):
     #spread the actions to all accounts, to use each accounts tps bandwidth
     fromIndexStart=fromIndex+1 if fromIndex+1<namedAccounts.numAccounts else 0
 
-    if count < 5 or count > 15:
-        strMsg="little" if count < 15 else "much"
+    # min and max are subjective, just assigned to make sure that many small changes in nodeos don't 
+    # result in the test not correctly validating behavior
+    if count < 5 or count > 20:
+        strMsg="little" if count < 20 else "much"
         Utils.cmdError("Was able to send %d store actions which was too %s" % (count, strMsg))
         errorExit("Incorrect number of store actions sent")
 

From 50f850db774592142bfaf4c0d585d15c5c1e68d2 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 19 Nov 2019 14:44:59 -0600
Subject: [PATCH 1493/1648] Rename sync_state struct to peer_sync_state to
 distinguish from sync_state enum

---
 plugins/net_plugin/net_plugin.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a105e6a9a47..605446a2414 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -422,8 +422,8 @@ namespace eosio {
    /**
     * Index by start_block_num
     */
-   struct sync_state {
-      sync_state(uint32_t start = 0, uint32_t end = 0, uint32_t last_acted = 0)
+   struct peer_sync_state {
+      explicit peer_sync_state(uint32_t start = 0, uint32_t end = 0, uint32_t last_acted = 0)
          :start_block( start ), end_block( end ), last( last_acted ),
           start_time(time_point::now())
       {}
@@ -551,7 +551,7 @@ namespace eosio {
 
       void update_endpoints();
 
-      optional<sync_state>    peer_requested;  // this peer is requesting info from us
+      optional<peer_sync_state>    peer_requested;  // this peer is requesting info from us
 
       std::atomic<bool>                         socket_open{false};
 
@@ -983,13 +983,13 @@ namespace eosio {
       g_conn.unlock();
 
       if( !peer_requested ) {
-         peer_requested = sync_state( block_header::num_from_id(lib_id)+1,
-                                      block_header::num_from_id(head_id),
-                                      block_header::num_from_id(lib_id) );
+         peer_requested = peer_sync_state( block_header::num_from_id(lib_id)+1,
+                                           block_header::num_from_id(head_id),
+                                           block_header::num_from_id(lib_id) );
       } else {
          uint32_t start = std::min( peer_requested->last + 1, block_header::num_from_id(lib_id)+1 );
          uint32_t end   = std::max( peer_requested->end_block, block_header::num_from_id(head_id) );
-         peer_requested = sync_state( start, end, start - 1 );
+         peer_requested = peer_sync_state( start, end, start - 1 );
       }
       if( peer_requested->start_block <= peer_requested->end_block ) {
          fc_dlog( logger, "enqueue ${s} - ${e}", ("s", peer_requested->start_block)( "e", peer_requested->end_block ) );
@@ -2745,7 +2745,7 @@ namespace eosio {
          peer_requested.reset();
          flush_queues();
       } else {
-         peer_requested = sync_state( msg.start_block, msg.end_block, msg.start_block-1);
+         peer_requested = peer_sync_state( msg.start_block, msg.end_block, msg.start_block-1);
          enqueue_sync_block();
       }
    }

From facae8e375e1aeaccd29d3672bc3862aaabb1298 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 19 Nov 2019 14:47:26 -0600
Subject: [PATCH 1494/1648] Fix self check to compare to this node's node_id

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 605446a2414..7a10261ece0 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2472,7 +2472,7 @@ namespace eosio {
 
       connecting = false;
       if (msg.generation == 1) {
-         if( msg.node_id == node_id) {
+         if( msg.node_id == my_impl->node_id) {
             fc_elog( logger, "Self connection detected node_id ${id}. Closing connection", ("id", node_id) );
             enqueue( go_away_message( self ) );
             return;

From 36e66457ae33cefcd636b93c5b23382ff3c406a5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 19 Nov 2019 14:49:39 -0600
Subject: [PATCH 1495/1648] Remove dead code

---
 plugins/net_plugin/net_plugin.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7a10261ece0..b7fcb349c8a 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -970,13 +970,10 @@ namespace eosio {
          enqueue(note);
          return;
       }
-      block_id_type remote_head_id;
-      uint32_t remote_head_num = 0;
       std::unique_lock<std::mutex> g_conn( conn_mtx );
       if( last_handshake_recv.generation >= 1 ) {
-         remote_head_id = last_handshake_recv.head_id;
-         remote_head_num = block_header::num_from_id(remote_head_id);
-         fc_dlog( logger, "maybe truncating branch at = ${h}:${id}", ("h", remote_head_num)( "id", remote_head_id ) );
+         fc_dlog( logger, "maybe truncating branch at = ${h}:${id}",
+                  ("h", block_header::num_from_id(last_handshake_recv.head_id))("id", last_handshake_recv.head_id) );
       }
 
       block_id_type lib_id = last_handshake_recv.last_irreversible_block_id;
@@ -1615,8 +1612,6 @@ namespace eosio {
          } );
          return;
       }
-      c->syncing = false;
-      fc_elog( logger, "sync check failed to resolve status" );
    }
 
    bool sync_manager::verify_catchup(const connection_ptr& c, uint32_t num, const block_id_type& id) {

From 106abbccbde45d4ccaf67cce65a00f17ffaec555 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 19 Nov 2019 14:57:30 -0600
Subject: [PATCH 1496/1648] Avoid wrapping generation

---
 plugins/net_plugin/net_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b7fcb349c8a..a5b847f83e6 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1032,6 +1032,8 @@ namespace eosio {
       strand.post( [c = shared_from_this()]() {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          c->populate_handshake( c->last_handshake_sent );
+         static_assert( std::is_same_v<decltype(c->sent_handshake_count), int16_t>, "INT16_MAX based on int16_t" );
+         if( c->sent_handshake_count == INT16_MAX ) c->sent_handshake_count = 1; // do not wrap
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          auto last_handshake_sent = c->last_handshake_sent;
          g_conn.unlock();

From b6168c1cf29ce5d4f154aed664a74b0cbe8ed351 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 19 Nov 2019 15:02:33 -0600
Subject: [PATCH 1497/1648] sync_recv_block should only be called if in lib
 catchup

---
 plugins/net_plugin/net_plugin.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a5b847f83e6..33d2f592bc4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1595,7 +1595,7 @@ namespace eosio {
             note.known_blocks.ids.push_back(head_id);
             c->enqueue( note );
          }
-         c->syncing = true;
+         c->syncing = head != msg.head_num; // head might resolve fork if same length
          app().post( priority::medium, [chain_plug = my_impl->chain_plug, c,
                                         msg_head_num = msg.head_num, msg_head_id = msg.head_id]() {
             bool on_fork = true;
@@ -1680,15 +1680,13 @@ namespace eosio {
    // called from connection strand
    void sync_manager::rejected_block( const connection_ptr& c, uint32_t blk_num ) {
       std::unique_lock<std::mutex> g( sync_mtx );
-      if( sync_state != in_sync ) {
-         if( ++c->consecutive_rejected_blocks > def_max_consecutive_rejected_blocks ) {
-            fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn", blk_num)( "p", c->peer_name() ) );
-            sync_last_requested_num = 0;
-            sync_source.reset();
-            g.unlock();
-            c->close();
-            send_handshakes();
-         }
+      if( ++c->consecutive_rejected_blocks > def_max_consecutive_rejected_blocks ) {
+         fc_wlog( logger, "block ${bn} not accepted from ${p}, closing connection", ("bn", blk_num)("p", c->peer_name()) );
+         sync_last_requested_num = 0;
+         sync_source.reset();
+         g.unlock();
+         c->close();
+         send_handshakes();
       }
    }
 
@@ -2367,7 +2365,8 @@ namespace eosio {
                uint32_t blk_num = bh.block_num();
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}",
                         ("p", peer_name())("num", blk_num) );
-               my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
+               if( my_impl->sync_master->syncing_with_peer() )
+                  my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
                cancel_wait();
 
                pending_message_buffer.advance_read_ptr( message_length );
@@ -2827,7 +2826,8 @@ namespace eosio {
             c->strand.post( [sync_master = my_impl->sync_master.get(),
                              dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {
                dispatcher->add_peer_block( blk_id, c->connection_id );
-               sync_master->sync_recv_block( c, blk_id, blk_num );
+               if( my_impl->sync_master->syncing_with_peer() )
+                  sync_master->sync_recv_block( c, blk_id, blk_num );
             });
             return;
          }

From cb7a223a38bb1aa90cc288627800297d9a73e478 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 20 Nov 2019 07:42:00 -0600
Subject: [PATCH 1498/1648] Add full version to startup ilog message if diff
 than version

---
 programs/nodeos/main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
index 35725669dae..64ab9c3be44 100644
--- a/programs/nodeos/main.cpp
+++ b/programs/nodeos/main.cpp
@@ -101,7 +101,9 @@ int main(int argc, char** argv)
          return INITIALIZE_FAIL;
       }
       initialize_logging();
-      ilog("${name} version ${ver}", ("name", nodeos::config::node_executable_name)("ver", app().version_string()));
+      ilog( "${name} version ${ver} ${fv}",
+            ("name", nodeos::config::node_executable_name)("ver", app().version_string())
+            ("fv", app().version_string() == app().full_version_string() ? "" : app().full_version_string()) );
       ilog("${name} using configuration file ${c}", ("name", nodeos::config::node_executable_name)("c", app().full_config_file_path().string()));
       ilog("${name} data directory is ${d}", ("name", nodeos::config::node_executable_name)("d", app().data_dir().string()));
       app().startup();

From e897e64b50469f81bc25f20a6b75da36087463f1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 20 Nov 2019 11:04:58 -0600
Subject: [PATCH 1499/1648] Add additional logging

---
 plugins/net_plugin/net_plugin.cpp | 62 +++++++++++++++++++------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 33d2f592bc4..63653452d74 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1037,10 +1037,10 @@ namespace eosio {
          c->last_handshake_sent.generation = ++c->sent_handshake_count;
          auto last_handshake_sent = c->last_handshake_sent;
          g_conn.unlock();
-         fc_dlog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}",
-                  ("g", last_handshake_sent.generation)( "ep", c->peer_name() )
-                  ( "lib", last_handshake_sent.last_irreversible_block_num )
-                  ( "head", last_handshake_sent.head_num ) );
+         fc_ilog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}, id ${id}",
+                  ("g", last_handshake_sent.generation)("ep", c->peer_name())
+                  ("lib", last_handshake_sent.last_irreversible_block_num)
+                  ("head", last_handshake_sent.head_num)("id", last_handshake_sent.head_id.str().substr(8,16)) );
          c->enqueue( last_handshake_sent );
       });
    }
@@ -1343,7 +1343,7 @@ namespace eosio {
       if( sync_state == newstate ) {
          return;
       }
-      fc_dlog( logger, "old state ${os} becoming ${ns}", ("os", stage_str( sync_state ))( "ns", stage_str( newstate ) ) );
+      fc_ilog( logger, "old state ${os} becoming ${ns}", ("os", stage_str( sync_state ))( "ns", stage_str( newstate ) ) );
       sync_state = newstate;
    }
 
@@ -1548,7 +1548,9 @@ namespace eosio {
       //-----------------------------
 
       if (head_id == msg.head_id) {
-         fc_dlog(logger, "sync check state 0");
+         fc_ilog( logger, "handshake from ${ep}, lib ${lib}, head ${head}, head id ${id}.. sync 0",
+                  ("ep", c->peer_name())("lib", msg.last_irreversible_block_num)("head", msg.head_num)
+                  ("id", msg.head_id.str().substr(8,16)) );
          c->syncing = false;
          notice_message note;
          note.known_blocks.mode = none;
@@ -1558,7 +1560,9 @@ namespace eosio {
          return;
       }
       if (head < peer_lib) {
-         fc_dlog(logger, "sync check state 1");
+         fc_ilog( logger, "handshake from ${ep}, lib ${lib}, head ${head}, head id ${id}.. sync 1",
+                  ("ep", c->peer_name())("lib", msg.last_irreversible_block_num)("head", msg.head_num)
+                  ("id", msg.head_id.str().substr(8,16)) );
          c->syncing = false;
          // wait for receipt of a notice message before initiating sync
          if (c->protocol_version < proto_explicit_sync) {
@@ -1567,7 +1571,9 @@ namespace eosio {
          return;
       }
       if (lib_num > msg.head_num ) {
-         fc_dlog(logger, "sync check state 2");
+         fc_ilog( logger, "handshake from ${ep}, lib ${lib}, head ${head}, head id ${id}.. sync 2",
+                  ("ep", c->peer_name())("lib", msg.last_irreversible_block_num)("head", msg.head_num)
+                  ("id", msg.head_id.str().substr(8,16)) );
          if (msg.generation > 1 || c->protocol_version > proto_base) {
             notice_message note;
             note.known_trx.pending = lib_num;
@@ -1581,12 +1587,16 @@ namespace eosio {
       }
 
       if (head < msg.head_num ) {
-         fc_dlog(logger, "sync check state 3");
+         fc_ilog( logger, "handshake from ${ep}, lib ${lib}, head ${head}, head id ${id}.. sync 3",
+                  ("ep", c->peer_name())("lib", msg.last_irreversible_block_num)("head", msg.head_num)
+                  ("id", msg.head_id.str().substr(8,16)) );
          c->syncing = false;
          verify_catchup(c, msg.head_num, msg.head_id);
          return;
       } else {
-         fc_dlog(logger, "sync check state 4");
+         fc_ilog( logger, "handshake from ${ep}, lib ${lib}, head ${head}, head id ${id}.. sync 4",
+                  ("ep", c->peer_name())("lib", msg.last_irreversible_block_num)("head", msg.head_num)
+                  ("id", msg.head_id.str().substr(8,16)) );
          if (msg.generation > 1 ||  c->protocol_version > proto_base) {
             notice_message note;
             note.known_trx.mode = none;
@@ -1629,10 +1639,10 @@ namespace eosio {
       } );
       if( req.req_blocks.mode == catch_up ) {
          std::lock_guard<std::mutex> g( sync_mtx );
-         fc_ilog( logger, "got a catch_up notice while in ${s}, fork head num = ${fhn} "
-                          "target LIB = ${lib} next_expected = ${ne}",
-                  ("s", stage_str( sync_state ))( "fhn", num )( "lib", sync_known_lib_num )
-                  ("ne", sync_next_expected_num ) );
+         fc_ilog( logger, "catch_up while in ${s}, fork head num = ${fhn} "
+                          "target LIB = ${lib} next_expected = ${ne}, id ${id}..., peer ${p}",
+                  ("s", stage_str( sync_state ))("fhn", num)("lib", sync_known_lib_num)
+                  ("ne", sync_next_expected_num)("id", id.str().substr(8,16))("p", c->peer_name()) );
          if( sync_state == lib_catchup )
             return false;
          set_state( head_catchup );
@@ -1642,6 +1652,9 @@ namespace eosio {
             c->fork_head_num = num;
          }
       } else {
+         fc_ilog( logger, "none notice while in ${s}, fork head num = ${fhn}, id ${id}..., peer ${p}",
+                  ("s", stage_str( sync_state ))("fhn", num)
+                  ("id", id.str().substr(8,16))("p", c->peer_name()) );
          std::lock_guard<std::mutex> g_conn( c->conn_mtx );
          c->fork_head = block_id_type();
          c->fork_head_num = 0;
@@ -1660,6 +1673,8 @@ namespace eosio {
             fc_elog( logger,"got a catch up with ids size = 0" );
          } else {
             const block_id_type& id = msg.known_blocks.ids.back();
+            fc_ilog( logger, "notice_message, pending ${p}, blk_num ${n}, id ${id}...",
+                     ("p", msg.known_blocks.pending)("n", block_header::num_from_id(id))("id",id.str().substr(8,16)) );
             if( !my_impl->dispatcher->have_block( id ) ) {
                verify_catchup( c, msg.known_blocks.pending, id );
             } else {
@@ -1910,9 +1925,10 @@ namespace eosio {
             g_conn.unlock();
             if( !has_block ) {
                if( !add_peer_block( bs->id, cp->connection_id ) ) {
+                  fc_ilog( logger, "not bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()) );
                   return;
                }
-               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)( "p", cp->peer_name() ) );
+               fc_ilog( logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()) );
                cp->enqueue_buffer( send_buffer, true, priority::medium, no_reason );
             }
          });
@@ -2363,8 +2379,8 @@ namespace eosio {
             block_id_type blk_id = bh.id();
             if( my_impl->dispatcher->have_block( blk_id ) ) {
                uint32_t blk_num = bh.block_num();
-               fc_dlog( logger, "canceling wait on ${p}, already received block ${num}",
-                        ("p", peer_name())("num", blk_num) );
+               fc_ilog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
+                        ("p", peer_name())("num", blk_num)("id", blk_id.str().substr(8,16)) );
                if( my_impl->sync_master->syncing_with_peer() )
                   my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
                cancel_wait();
@@ -2846,21 +2862,21 @@ namespace eosio {
          my_impl->update_chain_info();
          reason = no_reason;
       } catch( const unlinkable_block_exception &ex) {
-         peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));
+         peer_elog(c, "bad signed_block ${n} : ${m}", ("n", blk_num)("m",ex.what()));
          reason = unlinkable;
       } catch( const block_validate_exception &ex) {
-         peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));
+         peer_elog(c, "bad signed_block ${n} : ${m}", ("n", blk_num)("m",ex.what()));
          fc_elog( logger, "block_validate_exception accept block #${n} syncing from ${p}",("n",blk_num)("p",c->peer_name()) );
          reason = validation;
       } catch( const assert_exception &ex) {
-         peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));
+         peer_elog(c, "bad signed_block ${n} : ${m}", ("n", blk_num)("m",ex.what()));
          fc_elog( logger, "unable to accept block on assert exception ${n} from ${p}",("n",ex.to_string())("p",c->peer_name()));
       } catch( const fc::exception &ex) {
-         peer_elog(c, "bad signed_block : ${m}", ("m",ex.what()));
+         peer_elog(c, "bad signed_block ${n} : ${m}", ("n", blk_num)("m",ex.what()));
          fc_elog( logger, "accept_block threw a non-assert exception ${x} from ${p}",( "x",ex.to_string())("p",c->peer_name()));
       } catch( ...) {
-         peer_elog(c, "bad signed_block : unknown exception");
-         fc_elog( logger, "handle sync block caught something else from ${p}",("num",blk_num)("p",c->peer_name()));
+         peer_elog(c, "bad signed_block ${n} : unknown exception", ("n", blk_num));
+         fc_elog( logger, "handle sync block caught something else from ${p}",("p",c->peer_name()));
       }
 
       if( reason == no_reason ) {

From 970d1261aec827ce99851777021db664002decfa Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 20 Nov 2019 15:45:40 -0600
Subject: [PATCH 1500/1648] Don't send handshakes to everyone as often as it
 just causes confusion. Also don't go into syncing mode for head catchup.

---
 plugins/net_plugin/net_plugin.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 63653452d74..32d7a69461d 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1605,7 +1605,7 @@ namespace eosio {
             note.known_blocks.ids.push_back(head_id);
             c->enqueue( note );
          }
-         c->syncing = head != msg.head_num; // head might resolve fork if same length
+         c->syncing = false;
          app().post( priority::medium, [chain_plug = my_impl->chain_plug, c,
                                         msg_head_num = msg.head_num, msg_head_id = msg.head_id]() {
             bool on_fork = true;
@@ -1701,7 +1701,6 @@ namespace eosio {
          sync_source.reset();
          g.unlock();
          c->close();
-         send_handshakes();
       }
    }
 
@@ -1756,7 +1755,6 @@ namespace eosio {
             set_state( head_catchup );
          } else {
             set_state( in_sync );
-            send_handshakes();
          }
       } else if( state == lib_catchup ) {
          if( blk_num == sync_known_lib_num ) {
@@ -2522,7 +2520,6 @@ namespace eosio {
                   gam.node_id = node_id;
                   enqueue(gam);
                   no_retry = duplicate;
-                  my_impl->sync_master->send_handshakes();
                   return;
                }
             }

From 749287be9495ec6988d8fc95cf8598836e793c85 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Wed, 20 Nov 2019 13:48:46 -0500
Subject: [PATCH 1501/1648] return more from producer_plugin's
 get_runtime_options()

---
 libraries/chain/controller.cpp                     | 4 ++++
 libraries/chain/include/eosio/chain/controller.hpp | 1 +
 plugins/producer_plugin/producer_plugin.cpp        | 7 ++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index f57aa026ed1..c8ac4affdd5 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -3130,6 +3130,10 @@ void controller::set_subjective_cpu_leeway(fc::microseconds leeway) {
    my->subjective_cpu_leeway = leeway;
 }
 
+fc::optional<fc::microseconds> controller::get_subjective_cpu_leeway() const {
+    return my->subjective_cpu_leeway;
+}
+
 void controller::set_greylist_limit( uint32_t limit ) {
    EOS_ASSERT( 0 < limit && limit <= chain::config::maximum_elastic_resource_multiplier,
                misc_exception,
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 61d4f366caf..4f96075fabc 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -283,6 +283,7 @@ namespace eosio { namespace chain {
          validation_mode get_validation_mode()const;
 
          void set_subjective_cpu_leeway(fc::microseconds leeway);
+         fc::optional<fc::microseconds> get_subjective_cpu_leeway() const;
          void set_greylist_limit( uint32_t limit );
          uint32_t get_greylist_limit()const;
 
diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 501518d7272..09c263ce6d3 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -1010,7 +1010,12 @@ producer_plugin::runtime_options producer_plugin::get_runtime_options() const {
       my->_max_irreversible_block_age_us.count() < 0 ? -1 : my->_max_irreversible_block_age_us.count() / 1'000'000,
       my->_produce_time_offset_us,
       my->_last_block_time_offset_us,
-      my->_max_scheduled_transaction_time_per_block_ms
+      my->_max_scheduled_transaction_time_per_block_ms,
+      my->chain_plug->chain().get_subjective_cpu_leeway() ?
+            my->chain_plug->chain().get_subjective_cpu_leeway()->count() :
+            fc::optional<int32_t>(),
+      my->_incoming_defer_ratio,
+      my->chain_plug->chain().get_greylist_limit()
    };
 }
 

From b6166e43c79df48a6c065f506b29ace7ef5a79a4 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 21 Nov 2019 12:47:39 -0600
Subject: [PATCH 1502/1648] Only send handshake if it has changed from last
 send. Log all incoming blocks.

---
 plugins/net_plugin/net_plugin.cpp | 43 ++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 32d7a69461d..4001b402071 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -621,7 +621,7 @@ namespace eosio {
       static void _close( connection* self, bool reconnect ); // for easy capture
    public:
 
-      void populate_handshake( handshake_message& hello );
+      bool populate_handshake( handshake_message& hello );
 
       bool resolve_and_connect();
       void connect( const std::shared_ptr<tcp::resolver>& resolver, tcp::resolver::results_type endpoints );
@@ -1031,17 +1031,18 @@ namespace eosio {
    void connection::send_handshake() {
       strand.post( [c = shared_from_this()]() {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
-         c->populate_handshake( c->last_handshake_sent );
-         static_assert( std::is_same_v<decltype(c->sent_handshake_count), int16_t>, "INT16_MAX based on int16_t" );
-         if( c->sent_handshake_count == INT16_MAX ) c->sent_handshake_count = 1; // do not wrap
-         c->last_handshake_sent.generation = ++c->sent_handshake_count;
-         auto last_handshake_sent = c->last_handshake_sent;
-         g_conn.unlock();
-         fc_ilog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}, id ${id}",
-                  ("g", last_handshake_sent.generation)("ep", c->peer_name())
-                  ("lib", last_handshake_sent.last_irreversible_block_num)
-                  ("head", last_handshake_sent.head_num)("id", last_handshake_sent.head_id.str().substr(8,16)) );
-         c->enqueue( last_handshake_sent );
+         if( c->populate_handshake( c->last_handshake_sent ) ) {
+            static_assert( std::is_same_v<decltype( c->sent_handshake_count ), int16_t>, "INT16_MAX based on int16_t" );
+            if( c->sent_handshake_count == INT16_MAX ) c->sent_handshake_count = 1; // do not wrap
+            c->last_handshake_sent.generation = ++c->sent_handshake_count;
+            auto last_handshake_sent = c->last_handshake_sent;
+            g_conn.unlock();
+            fc_ilog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}, id ${id}",
+                     ("g", last_handshake_sent.generation)( "ep", c->peer_name())
+                     ("lib", last_handshake_sent.last_irreversible_block_num)
+                     ("head", last_handshake_sent.head_num)("id", last_handshake_sent.head_id.str().substr(8,16)) );
+            c->enqueue( last_handshake_sent );
+         }
       });
    }
 
@@ -2386,6 +2387,8 @@ namespace eosio {
                pending_message_buffer.advance_read_ptr( message_length );
                return true;
             }
+            fc_ilog( logger, "${p} received block ${num}, id ${id}...",
+                     ("p", peer_name())("num", bh.block_num())("id", blk_id.str().substr(8,16)) );
 
             auto ds = pending_message_buffer.create_datastream();
             fc::raw::unpack( ds, which ); // throw away
@@ -3123,13 +3126,24 @@ namespace eosio {
    }
 
    // call from connection strand
-   void connection::populate_handshake( handshake_message& hello ) {
+   bool connection::populate_handshake( handshake_message& hello ) {
       namespace sc = std::chrono;
+      bool send = false;
       if( no_retry == wrong_version ) {
          hello.network_version = net_version_base + proto_explicit_sync; // try previous version
+         send = true;
       } else {
          hello.network_version = net_version_base + net_version;
       }
+      uint32_t lib, head;
+      std::tie( lib, std::ignore, head,
+                hello.last_irreversible_block_id, std::ignore, hello.head_id ) = my_impl->get_chain_info();
+      // only send handshake if state has changed since last handshake
+      send |= lib != hello.last_irreversible_block_num;
+      send |= head != hello.head_num;
+      if( !send ) return false;
+      hello.last_irreversible_block_num = lib;
+      hello.head_num = head;
       hello.chain_id = my_impl->chain_id;
       hello.node_id = my_impl->node_id;
       hello.key = my_impl->get_authentication_key();
@@ -3154,8 +3168,7 @@ namespace eosio {
 #endif
       hello.agent = my_impl->user_agent_name;
 
-      std::tie( hello.last_irreversible_block_num, std::ignore, hello.head_num,
-                hello.last_irreversible_block_id, std::ignore, hello.head_id ) = my_impl->get_chain_info();
+      return true;
    }
 
    net_plugin::net_plugin()

From 18963960be7a4b07819329464fca2fd48999430c Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 22 Nov 2019 14:03:17 -0500
Subject: [PATCH 1503/1648] chainbase sync to pick up DB shrink fix while in
 heap mode

---
 libraries/chainbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chainbase b/libraries/chainbase
index c6fa8ac0eaf..d6632fcc1e7 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit c6fa8ac0eaf00dc365b7d2d7c26608273c2cbb0d
+Subproject commit d6632fcc1e71b0ee2022621059a432ec216b6661

From c82cb987acb1c29f8b5f97f437a770480f0dfd90 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Nov 2019 21:03:05 -0600
Subject: [PATCH 1504/1648] If block less than lib received outside of lib
 catchup then tell peer to stop sending

---
 plugins/net_plugin/net_plugin.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 4001b402071..596f0a772fc 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -989,9 +989,10 @@ namespace eosio {
          peer_requested = peer_sync_state( start, end, start - 1 );
       }
       if( peer_requested->start_block <= peer_requested->end_block ) {
-         fc_dlog( logger, "enqueue ${s} - ${e}", ("s", peer_requested->start_block)( "e", peer_requested->end_block ) );
+         fc_ilog( logger, "enqueue ${s} - ${e} to ${p}", ("s", peer_requested->start_block)("e", peer_requested->end_block)("p", peer_name()) );
          enqueue_sync_block();
       } else {
+         fc_ilog( logger, "nothing to enqueue ${p} to ${p}", ("p", peer_name()) );
          peer_requested.reset();
       }
    }
@@ -1132,7 +1133,7 @@ namespace eosio {
          break;
       }
       default:
-         fc_dlog(logger, "sending empty request but not calling sync wait on ${p}", ("p",peer_address()));
+         fc_ilog(logger, "sending empty request but not calling sync wait on ${p}", ("p",peer_address()));
          enqueue( ( sync_request_message ) {0,0} );
       }
    }
@@ -1147,6 +1148,7 @@ namespace eosio {
       bool trigger_send = true;
       if(num == peer_requested->end_block) {
          peer_requested.reset();
+         fc_ilog( logger, "done enqueue_sync_block ${num} to ${p}", ("num", num)("p", peer_name()) );
       }
       connection_wptr weak = shared_from_this();
       app().post( priority::medium, [num, trigger_send, weak{std::move(weak)}]() {
@@ -2376,8 +2378,8 @@ namespace eosio {
             fc::raw::unpack( peek_ds, bh );
 
             block_id_type blk_id = bh.id();
+            uint32_t blk_num = bh.block_num();
             if( my_impl->dispatcher->have_block( blk_id ) ) {
-               uint32_t blk_num = bh.block_num();
                fc_ilog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
                         ("p", peer_name())("num", blk_num)("id", blk_id.str().substr(8,16)) );
                if( my_impl->sync_master->syncing_with_peer() )
@@ -2389,6 +2391,18 @@ namespace eosio {
             }
             fc_ilog( logger, "${p} received block ${num}, id ${id}...",
                      ("p", peer_name())("num", bh.block_num())("id", blk_id.str().substr(8,16)) );
+            if( !my_impl->sync_master->syncing_with_peer() ) { // guard against peer thinking it needs to send us old blocks
+               uint32_t lib = 0;
+               std::tie( lib, std::ignore, std::ignore, std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
+               if( blk_num < lib ) {
+                  enqueue( ( sync_request_message ) {0,0} );
+                  send_handshake();
+                  cancel_wait();
+
+                  pending_message_buffer.advance_read_ptr( message_length );
+                  return true;
+               }
+            }
 
             auto ds = pending_message_buffer.create_datastream();
             fc::raw::unpack( ds, which ); // throw away

From ba58387de693fc376311b0e736192d0d95de78e6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 22 Nov 2019 21:15:32 -0600
Subject: [PATCH 1505/1648] Make sure handshake is first response to first
 handshake from peer. Add extra verification in blk_send_branch that we have
 valid handshake from peer.

---
 plugins/net_plugin/net_plugin.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 596f0a772fc..be7b54264b8 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -978,13 +978,15 @@ namespace eosio {
 
       block_id_type lib_id = last_handshake_recv.last_irreversible_block_id;
       g_conn.unlock();
+      auto lib_num = block_header::num_from_id(lib_id);
+      if( lib_num == 0 ) return; // if last_irreversible_block_id is null (we have not received handshake or reset)
 
       if( !peer_requested ) {
-         peer_requested = peer_sync_state( block_header::num_from_id(lib_id)+1,
+         peer_requested = peer_sync_state( lib_num+1,
                                            block_header::num_from_id(head_id),
-                                           block_header::num_from_id(lib_id) );
+                                           lib_num );
       } else {
-         uint32_t start = std::min( peer_requested->last + 1, block_header::num_from_id(lib_id)+1 );
+         uint32_t start = std::min( peer_requested->last + 1, lib_num+1 );
          uint32_t end   = std::max( peer_requested->end_block, block_header::num_from_id(head_id) );
          peer_requested = peer_sync_state( start, end, start - 1 );
       }
@@ -1030,7 +1032,7 @@ namespace eosio {
    }
 
    void connection::send_handshake() {
-      strand.post( [c = shared_from_this()]() {
+      strand.dispatch( [c = shared_from_this()]() {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          if( c->populate_handshake( c->last_handshake_sent ) ) {
             static_assert( std::is_same_v<decltype( c->sent_handshake_count ), int16_t>, "INT16_MAX based on int16_t" );

From e3761a49c15d76dbabcd900d7c05aab574ab7a53 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 25 Nov 2019 09:48:05 -0600
Subject: [PATCH 1506/1648] Send head id along with verify request_message so
 if not on a fork the peer can send from head instead of from lib

---
 plugins/net_plugin/net_plugin.cpp | 48 +++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index be7b54264b8..5429720c307 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -662,7 +662,8 @@ namespace eosio {
 
       const string peer_name();
 
-      void blk_send_branch();
+      void blk_send_branch( const block_id_type& msg_head_id );
+      void blk_send_branch_impl( uint32_t msg_head_num, uint32_t lib_num, uint32_t head_num );
       void blk_send(const block_id_type& blkid);
       void stop_send();
 
@@ -956,11 +957,10 @@ namespace eosio {
       }
    }
 
-   void connection::blk_send_branch() {
+   void connection::blk_send_branch( const block_id_type& msg_head_id ) {
       uint32_t head_num = 0;
-      block_id_type head_id;
       std::tie( std::ignore, std::ignore, head_num,
-                std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
+                std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
 
       fc_dlog(logger, "head_num = ${h}",("h",head_num));
       if(head_num == 0) {
@@ -981,14 +981,30 @@ namespace eosio {
       auto lib_num = block_header::num_from_id(lib_id);
       if( lib_num == 0 ) return; // if last_irreversible_block_id is null (we have not received handshake or reset)
 
+      app().post( priority::medium, [chain_plug = my_impl->chain_plug, c = shared_from_this(),
+            lib_num, head_num, msg_head_id]() {
+         auto msg_head_num = block_header::num_from_id(msg_head_id);
+         bool on_fork = msg_head_num == 0;
+         try {
+            controller& cc = chain_plug->chain();
+            on_fork = on_fork || cc.get_block_id_for_num( block_header::num_from_id(msg_head_id) ) != msg_head_id;
+         } catch( ... ) {}
+         if( on_fork ) msg_head_num = 0;
+         // if peer on fork, start at their last lib, otherwise we can start at msg_head+1
+         c->strand.post( [c, msg_head_num, lib_num, head_num]() {
+            c->blk_send_branch_impl( msg_head_num, lib_num, head_num );
+         } );
+      } );
+   }
+
+   void connection::blk_send_branch_impl( uint32_t msg_head_num, uint32_t lib_num, uint32_t head_num ) {
       if( !peer_requested ) {
-         peer_requested = peer_sync_state( lib_num+1,
-                                           block_header::num_from_id(head_id),
-                                           lib_num );
+         auto last = msg_head_num != 0 ? msg_head_num : lib_num;
+         peer_requested = peer_sync_state( last+1, head_num, last );
       } else {
-         uint32_t start = std::min( peer_requested->last + 1, lib_num+1 );
-         uint32_t end   = std::max( peer_requested->end_block, block_header::num_from_id(head_id) );
-         peer_requested = peer_sync_state( start, end, start - 1 );
+         auto last = msg_head_num != 0 ? msg_head_num : std::min( peer_requested->last, lib_num );
+         uint32_t end   = std::max( peer_requested->end_block, head_num );
+         peer_requested = peer_sync_state( last+1, end, last );
       }
       if( peer_requested->start_block <= peer_requested->end_block ) {
          fc_ilog( logger, "enqueue ${s} - ${e} to ${p}", ("s", peer_requested->start_block)("e", peer_requested->end_block)("p", peer_name()) );
@@ -1643,11 +1659,12 @@ namespace eosio {
          return true;
       } );
       if( req.req_blocks.mode == catch_up ) {
-         std::lock_guard<std::mutex> g( sync_mtx );
+         std::unique_lock<std::mutex> g( sync_mtx );
          fc_ilog( logger, "catch_up while in ${s}, fork head num = ${fhn} "
                           "target LIB = ${lib} next_expected = ${ne}, id ${id}..., peer ${p}",
                   ("s", stage_str( sync_state ))("fhn", num)("lib", sync_known_lib_num)
                   ("ne", sync_next_expected_num)("id", id.str().substr(8,16))("p", c->peer_name()) );
+         g.unlock();
          if( sync_state == lib_catchup )
             return false;
          set_state( head_catchup );
@@ -1656,6 +1673,11 @@ namespace eosio {
             c->fork_head = id;
             c->fork_head_num = num;
          }
+
+         block_id_type head_id;
+         std::tie( std::ignore, std::ignore, std::ignore,
+                   std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
+         req.req_blocks.ids.emplace_back( head_id );
       } else {
          fc_ilog( logger, "none notice while in ${s}, fork head num = ${fhn}, id ${id}..., peer ${p}",
                   ("s", stage_str( sync_state ))("fhn", num)
@@ -1706,6 +1728,8 @@ namespace eosio {
          sync_source.reset();
          g.unlock();
          c->close();
+      } else {
+         c->send_handshake();
       }
    }
 
@@ -2736,7 +2760,7 @@ namespace eosio {
       switch (msg.req_blocks.mode) {
       case catch_up :
          peer_dlog( this, "received request_message:catch_up" );
-         blk_send_branch();
+         blk_send_branch( msg.req_blocks.ids.empty() ? block_id_type() : msg.req_blocks.ids.back() );
          break;
       case normal :
          peer_dlog( this, "received request_message:normal" );

From 2d5b5e3bd1fe73a6e8c8e632a21d75ed6426cf5e Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Sun, 24 Nov 2019 21:44:14 -0500
Subject: [PATCH 1507/1648] explictly use openssl 1.1 via brew on macos

---
 .cicd/platforms/pinned/macos-10.14-pinned.sh     | 2 +-
 .cicd/platforms/unpinned/macos-10.14-unpinned.sh | 2 +-
 CMakeLists.txt                                   | 2 +-
 scripts/eosio_build_darwin_deps                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cicd/platforms/pinned/macos-10.14-pinned.sh b/.cicd/platforms/pinned/macos-10.14-pinned.sh
index d8e747be21a..5c38259f7c5 100755
--- a/.cicd/platforms/pinned/macos-10.14-pinned.sh
+++ b/.cicd/platforms/pinned/macos-10.14-pinned.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 VERSION=1
 brew update
-brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl jq || :
+brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl@1.1 jq || :
 # install clang from source
 git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8
 cd clang8
diff --git a/.cicd/platforms/unpinned/macos-10.14-unpinned.sh b/.cicd/platforms/unpinned/macos-10.14-unpinned.sh
index 40144091f50..069e8162e4a 100755
--- a/.cicd/platforms/unpinned/macos-10.14-unpinned.sh
+++ b/.cicd/platforms/unpinned/macos-10.14-unpinned.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 VERSION=1
 brew update
-brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl jq boost || :
+brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@7 pkgconfig doxygen openssl@1.1 jq boost || :
 # install mongoDB
 cd ~
 curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d880199cea1..eb76ad618d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin")
 
 # add defaults for openssl
 if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "")
-   set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
+   set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1")
 endif()
 
 # WASM runtimes to enable. Each runtime in this list will have:
diff --git a/scripts/eosio_build_darwin_deps b/scripts/eosio_build_darwin_deps
index a0f4204748c..02caeed9142 100755
--- a/scripts/eosio_build_darwin_deps
+++ b/scripts/eosio_build_darwin_deps
@@ -10,4 +10,4 @@ python,/usr/local/opt/python3
 python@2,/usr/local/opt/python2
 doxygen,/usr/local/bin/doxygen
 libusb,/usr/local/lib/libusb-1.0.0.dylib
-openssl,/usr/local/opt/openssl/lib/libssl.a
\ No newline at end of file
+openssl@1.1,/usr/local/opt/openssl@1.1/lib/libssl.a
\ No newline at end of file

From d119bb0eb787cbe32ff0567f2e0682ba707e2737 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 25 Nov 2019 10:30:54 -0500
Subject: [PATCH 1508/1648] need to set brew bottle to openssl@1.1 too

---
 scripts/generate_bottle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate_bottle.sh b/scripts/generate_bottle.sh
index 9371f929eb8..648256ed599 100644
--- a/scripts/generate_bottle.sh
+++ b/scripts/generate_bottle.sh
@@ -44,7 +44,7 @@ echo "class Eosio < Formula
 
    depends_on \"gmp\"
    depends_on \"gettext\"
-   depends_on \"openssl\"
+   depends_on \"openssl@1.1\"
    depends_on \"libusb\"
    depends_on :macos => :mojave
    depends_on :arch =>  :intel

From 0ef236f451cf8e18a01382d449ff8d8cf59804e8 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 25 Nov 2019 13:49:16 -0600
Subject: [PATCH 1509/1648] If verifying catchup and num is notice is less than
 lib, nothing to do.

---
 plugins/net_plugin/net_plugin.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5429720c307..0f18591295b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1665,7 +1665,11 @@ namespace eosio {
                   ("s", stage_str( sync_state ))("fhn", num)("lib", sync_known_lib_num)
                   ("ne", sync_next_expected_num)("id", id.str().substr(8,16))("p", c->peer_name()) );
          g.unlock();
-         if( sync_state == lib_catchup )
+         uint32_t lib;
+         block_id_type head_id;
+         std::tie( lib, std::ignore, std::ignore,
+                   std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
+         if( sync_state == lib_catchup || num < lib )
             return false;
          set_state( head_catchup );
          {
@@ -1674,9 +1678,6 @@ namespace eosio {
             c->fork_head_num = num;
          }
 
-         block_id_type head_id;
-         std::tie( std::ignore, std::ignore, std::ignore,
-                   std::ignore, std::ignore, head_id ) = my_impl->get_chain_info();
          req.req_blocks.ids.emplace_back( head_id );
       } else {
          fc_ilog( logger, "none notice while in ${s}, fork head num = ${fhn}, id ${id}..., peer ${p}",

From 3b54f79dc41de0f19ef6f29efdb546350f05f331 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 25 Nov 2019 17:05:51 -0500
Subject: [PATCH 1510/1648] remove OPENSSL_ROOT_DIR from build script -- not
 needed

---
 scripts/eosio_build.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh
index ae07a588051..32de8ec0f2e 100755
--- a/scripts/eosio_build.sh
+++ b/scripts/eosio_build.sh
@@ -162,7 +162,6 @@ fi
 # Setup based on architecture
 if [[ $ARCH == "Linux" ]]; then
    export CMAKE=${CMAKE:-${EOSIO_INSTALL_DIR}/bin/cmake}
-   OPENSSL_ROOT_DIR=/usr/include/openssl
    [[ ! -e /etc/os-release ]] && print_supported_linux_distros_and_exit
    case $NAME in
       "Amazon Linux AMI" | "Amazon Linux")
@@ -185,7 +184,6 @@ if [ "$ARCH" == "Darwin" ]; then
    # EOSIO_INSTALL_DIR/lib/cmake: mongo_db_plugin.cpp:25:10: fatal error: 'bsoncxx/builder/basic/kvp.hpp' file not found
    CMAKE_PREFIX_PATHS="/usr/local/opt/gettext;${EOSIO_INSTALL_DIR}"
    FILE="${SCRIPT_DIR}/eosio_build_darwin.sh"
-   OPENSSL_ROOT_DIR=/usr/local/opt/openssl
    export CMAKE=${CMAKE}
 fi
 
@@ -219,7 +217,7 @@ fi
 $ENABLE_DOXYGEN && LOCAL_CMAKE_FLAGS="-DBUILD_DOXYGEN='${DOXYGEN}' ${LOCAL_CMAKE_FLAGS}"
 $ENABLE_COVERAGE_TESTING && LOCAL_CMAKE_FLAGS="-DENABLE_COVERAGE_TESTING='${ENABLE_COVERAGE_TESTING}' ${LOCAL_CMAKE_FLAGS}"
 
-execute bash -c "$CMAKE -DCMAKE_BUILD_TYPE='${CMAKE_BUILD_TYPE}' -DCORE_SYMBOL_NAME='${CORE_SYMBOL_NAME}' -DOPENSSL_ROOT_DIR='${OPENSSL_ROOT_DIR}' -DCMAKE_INSTALL_PREFIX='${EOSIO_INSTALL_DIR}' ${LOCAL_CMAKE_FLAGS} '${REPO_ROOT}'"
+execute bash -c "$CMAKE -DCMAKE_BUILD_TYPE='${CMAKE_BUILD_TYPE}' -DCORE_SYMBOL_NAME='${CORE_SYMBOL_NAME}' -DCMAKE_INSTALL_PREFIX='${EOSIO_INSTALL_DIR}' ${LOCAL_CMAKE_FLAGS} '${REPO_ROOT}'"
 execute make -j$JOBS
 execute cd $REPO_ROOT 1>/dev/null
 

From d7dfa4fb11e64b31321bbbf985d3310887772640 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 26 Nov 2019 09:30:57 -0600
Subject: [PATCH 1511/1648] Reduce received block and bcast block logging to
 debug level

---
 plugins/net_plugin/net_plugin.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0f18591295b..928e00841a7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1953,10 +1953,10 @@ namespace eosio {
             g_conn.unlock();
             if( !has_block ) {
                if( !add_peer_block( bs->id, cp->connection_id ) ) {
-                  fc_ilog( logger, "not bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()) );
+                  fc_dlog( logger, "not bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()) );
                   return;
                }
-               fc_ilog( logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()) );
+               fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()) );
                cp->enqueue_buffer( send_buffer, true, priority::medium, no_reason );
             }
          });
@@ -2407,7 +2407,7 @@ namespace eosio {
             block_id_type blk_id = bh.id();
             uint32_t blk_num = bh.block_num();
             if( my_impl->dispatcher->have_block( blk_id ) ) {
-               fc_ilog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
+               fc_dlog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
                         ("p", peer_name())("num", blk_num)("id", blk_id.str().substr(8,16)) );
                if( my_impl->sync_master->syncing_with_peer() )
                   my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
@@ -2416,7 +2416,7 @@ namespace eosio {
                pending_message_buffer.advance_read_ptr( message_length );
                return true;
             }
-            fc_ilog( logger, "${p} received block ${num}, id ${id}...",
+            fc_dlog( logger, "${p} received block ${num}, id ${id}...",
                      ("p", peer_name())("num", bh.block_num())("id", blk_id.str().substr(8,16)) );
             if( !my_impl->sync_master->syncing_with_peer() ) { // guard against peer thinking it needs to send us old blocks
                uint32_t lib = 0;

From 44da180d53d118e409fe3ddb743e3e332e015ca1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 25 Nov 2019 15:28:08 -0600
Subject: [PATCH 1512/1648] Enable debug level logging for net_plugin,
 http_plugin, and producer_plugin for launcher logging config. debug level
 used to be enabled by default for net_plugin and http_plugin for the tests.

---
 programs/eosio-launcher/main.cpp | 46 ++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index 5ac1ef4fa28..ba16ebf24c2 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -1167,26 +1167,32 @@ launcher_def::write_logging_config_file(tn_node_def &node) {
 
   auto log_config = fc::logging_config::default_config();
   if(gelf_enabled) {
-    log_config.appenders.push_back(
-          fc::appender_config( "net", "gelf",
-              fc::mutable_variant_object()
-                  ( "endpoint", node.gelf_endpoint )
-                  ( "host", instance.name )
-             ) );
-    log_config.loggers.front().appenders.push_back("net");
-
-    fc::logger_config p2p ("net_plugin_impl");
-    p2p.level=fc::log_level::debug;
-    p2p.appenders.push_back ("stderr");
-    p2p.appenders.push_back ("net");
-    log_config.loggers.emplace_back(p2p);
-
-     fc::logger_config http("http_plugin");
-     http.level=fc::log_level::debug;
-     http.appenders.push_back("stderr");
-     http.appenders.push_back("net");
-     log_config.loggers.emplace_back(http);
-  }
+     log_config.appenders.push_back(
+           fc::appender_config( "net", "gelf",
+                           fc::mutable_variant_object()
+                                 ( "endpoint", node.gelf_endpoint )
+                                 ( "host", instance.name )
+           ) );
+     log_config.loggers.front().appenders.push_back( "net" );
+  }
+
+  fc::logger_config p2p( "net_plugin_impl" );
+  p2p.level = fc::log_level::debug;
+  p2p.appenders.push_back( "stderr" );
+  if( gelf_enabled ) p2p.appenders.push_back( "net" );
+  log_config.loggers.emplace_back( p2p );
+
+  fc::logger_config http( "http_plugin" );
+  http.level = fc::log_level::debug;
+  http.appenders.push_back( "stderr" );
+  if( gelf_enabled ) http.appenders.push_back( "net" );
+  log_config.loggers.emplace_back( http );
+
+  fc::logger_config pp( "producer_plugin" );
+  pp.level = fc::log_level::debug;
+  pp.appenders.push_back( "stderr" );
+  if( gelf_enabled ) pp.appenders.push_back( "net" );
+  log_config.loggers.emplace_back( pp );
 
   auto str = fc::json::to_pretty_string( log_config, fc::json::stringify_large_ints_and_doubles );
   cfg.write( str.c_str(), str.size() );

From 538778ad445984f7220739449483f66e266ca00c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Nov 2019 08:10:16 -0600
Subject: [PATCH 1513/1648] Add const and extra logging

---
 plugins/net_plugin/net_plugin.cpp | 35 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 928e00841a7..60becc0d6de 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -978,7 +978,7 @@ namespace eosio {
 
       block_id_type lib_id = last_handshake_recv.last_irreversible_block_id;
       g_conn.unlock();
-      auto lib_num = block_header::num_from_id(lib_id);
+      const auto lib_num = block_header::num_from_id(lib_id);
       if( lib_num == 0 ) return; // if last_irreversible_block_id is null (we have not received handshake or reset)
 
       app().post( priority::medium, [chain_plug = my_impl->chain_plug, c = shared_from_this(),
@@ -986,8 +986,8 @@ namespace eosio {
          auto msg_head_num = block_header::num_from_id(msg_head_id);
          bool on_fork = msg_head_num == 0;
          try {
-            controller& cc = chain_plug->chain();
-            on_fork = on_fork || cc.get_block_id_for_num( block_header::num_from_id(msg_head_id) ) != msg_head_id;
+            const controller& cc = chain_plug->chain();
+            on_fork = on_fork || cc.get_block_id_for_num( msg_head_num ) != msg_head_id;
          } catch( ... ) {}
          if( on_fork ) msg_head_num = 0;
          // if peer on fork, start at their last lib, otherwise we can start at msg_head+1
@@ -1166,7 +1166,7 @@ namespace eosio {
       bool trigger_send = true;
       if(num == peer_requested->end_block) {
          peer_requested.reset();
-         fc_ilog( logger, "done enqueue_sync_block ${num} to ${p}", ("num", num)("p", peer_name()) );
+         fc_ilog( logger, "completing enqueue_sync_block ${num} to ${p}", ("num", num)("p", peer_name()) );
       }
       connection_wptr weak = shared_from_this();
       app().post( priority::medium, [num, trigger_send, weak{std::move(weak)}]() {
@@ -1659,12 +1659,13 @@ namespace eosio {
          return true;
       } );
       if( req.req_blocks.mode == catch_up ) {
-         std::unique_lock<std::mutex> g( sync_mtx );
-         fc_ilog( logger, "catch_up while in ${s}, fork head num = ${fhn} "
-                          "target LIB = ${lib} next_expected = ${ne}, id ${id}..., peer ${p}",
-                  ("s", stage_str( sync_state ))("fhn", num)("lib", sync_known_lib_num)
-                  ("ne", sync_next_expected_num)("id", id.str().substr(8,16))("p", c->peer_name()) );
-         g.unlock();
+         {
+            std::lock_guard<std::mutex> g( sync_mtx );
+            fc_ilog( logger, "catch_up while in ${s}, fork head num = ${fhn} "
+                             "target LIB = ${lib} next_expected = ${ne}, id ${id}..., peer ${p}",
+                     ("s", stage_str( sync_state ))("fhn", num)("lib", sync_known_lib_num)
+                     ("ne", sync_next_expected_num)("id", id.str().substr( 8, 16 ))("p", c->peer_name()) );
+         }
          uint32_t lib;
          block_id_type head_id;
          std::tie( lib, std::ignore, std::ignore,
@@ -2404,8 +2405,8 @@ namespace eosio {
             block_header bh;
             fc::raw::unpack( peek_ds, bh );
 
-            block_id_type blk_id = bh.id();
-            uint32_t blk_num = bh.block_num();
+            const block_id_type blk_id = bh.id();
+            const uint32_t blk_num = bh.block_num();
             if( my_impl->dispatcher->have_block( blk_id ) ) {
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
                         ("p", peer_name())("num", blk_num)("id", blk_id.str().substr(8,16)) );
@@ -2903,20 +2904,20 @@ namespace eosio {
          my_impl->update_chain_info();
          reason = no_reason;
       } catch( const unlinkable_block_exception &ex) {
-         peer_elog(c, "bad signed_block ${n} : ${m}", ("n", blk_num)("m",ex.what()));
+         peer_elog(c, "bad signed_block ${n} ${id}...: ${m}", ("n", blk_num)("id", blk_id.str().substr(8,16))("m",ex.what()));
          reason = unlinkable;
       } catch( const block_validate_exception &ex) {
-         peer_elog(c, "bad signed_block ${n} : ${m}", ("n", blk_num)("m",ex.what()));
+         peer_elog(c, "bad signed_block ${n} ${id}...: ${m}", ("n", blk_num)("id", blk_id.str().substr(8,16))("m",ex.what()));
          fc_elog( logger, "block_validate_exception accept block #${n} syncing from ${p}",("n",blk_num)("p",c->peer_name()) );
          reason = validation;
       } catch( const assert_exception &ex) {
-         peer_elog(c, "bad signed_block ${n} : ${m}", ("n", blk_num)("m",ex.what()));
+         peer_elog(c, "bad signed_block ${n} ${id}...: ${m}", ("n", blk_num)("id", blk_id.str().substr(8,16))("m",ex.what()));
          fc_elog( logger, "unable to accept block on assert exception ${n} from ${p}",("n",ex.to_string())("p",c->peer_name()));
       } catch( const fc::exception &ex) {
-         peer_elog(c, "bad signed_block ${n} : ${m}", ("n", blk_num)("m",ex.what()));
+         peer_elog(c, "bad signed_block ${n} ${id}...: ${m}", ("n", blk_num)("id", blk_id.str().substr(8,16))("m",ex.what()));
          fc_elog( logger, "accept_block threw a non-assert exception ${x} from ${p}",( "x",ex.to_string())("p",c->peer_name()));
       } catch( ...) {
-         peer_elog(c, "bad signed_block ${n} : unknown exception", ("n", blk_num));
+         peer_elog(c, "bad signed_block ${n} ${id}...: unknown exception", ("n", blk_num)("id", blk_id.str().substr(8,16)));
          fc_elog( logger, "handle sync block caught something else from ${p}",("p",c->peer_name()));
       }
 

From 29d98dc429bf72f3dcb8903f4432e45ba4d936b6 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Nov 2019 09:45:25 -0600
Subject: [PATCH 1514/1648] Additional logging for when block is not applied to
 head

---
 plugins/producer_plugin/producer_plugin.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 501518d7272..e75e812d153 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -383,16 +383,22 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             return;
          }
 
-         if( chain.head_block_state()->header.timestamp.next().to_time_point() >= fc::time_point::now() ) {
+         const auto& hbs = chain.head_block_state();
+         if( hbs->header.timestamp.next().to_time_point() >= fc::time_point::now() ) {
             _production_enabled = true;
          }
 
-
          if( fc::time_point::now() - block->timestamp < fc::minutes(5) || (blk_num % 1000 == 0) ) {
             ilog("Received block ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, lib: ${lib}, conf: ${confs}, latency: ${latency} ms]",
                  ("p",block->producer)("id",id.str().substr(8,16))("n",blk_num)("t",block->timestamp)
                  ("count",block->transactions.size())("lib",chain.last_irreversible_block_num())
                  ("confs", block->confirmed)("latency", (fc::time_point::now() - block->timestamp).count()/1000 ) );
+            if( hbs->id != id ) { // not applied to head
+               ilog("Block not applied to head ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, dpos: ${dpos}, conf: ${confs}, latency: ${latency} ms]",
+                    ("p",hbs->block->producer)("id",hbs->id.str().substr(8,16))("n",hbs->block_num)("t",hbs->block->timestamp)
+                    ("count",hbs->block->transactions.size())("dpos", hbs->dpos_irreversible_blocknum)
+                    ("confs", hbs->block->confirmed)("latency", (fc::time_point::now() - hbs->block->timestamp).count()/1000 ) );
+            }
          }
       }
 
@@ -1954,7 +1960,7 @@ void producer_plugin_impl::produce_block() {
    block_state_ptr new_bs = chain.head_block_state();
 
    ilog("Produced block ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, lib: ${lib}, confirmed: ${confs}]",
-        ("p",new_bs->header.producer)("id",new_bs->id.str().substr(0,16))
+        ("p",new_bs->header.producer)("id",new_bs->id.str().substr(8,16))
         ("n",new_bs->block_num)("t",new_bs->header.timestamp)
         ("count",new_bs->block->transactions.size())("lib",chain.last_irreversible_block_num())("confs", new_bs->header.confirmed));
 

From 9dd2053fee1c124b9159dd138f8f93d219c4a063 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Nov 2019 12:49:49 -0600
Subject: [PATCH 1515/1648] If peer sending less than lib and we have notified
 it of our lib, then close connection

---
 plugins/net_plugin/net_plugin.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 60becc0d6de..8e05e0261b0 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2423,9 +2423,18 @@ namespace eosio {
                uint32_t lib = 0;
                std::tie( lib, std::ignore, std::ignore, std::ignore, std::ignore, std::ignore ) = my_impl->get_chain_info();
                if( blk_num < lib ) {
-                  enqueue( ( sync_request_message ) {0,0} );
-                  send_handshake();
-                  cancel_wait();
+                  std::unique_lock<std::mutex> g( conn_mtx );
+                  const auto last_sent_lib = last_handshake_sent.last_irreversible_block_num;
+                  g.unlock();
+                  if( !peer_requested && blk_num < last_sent_lib ) {
+                     fc_ilog( logger, "received block ${n} less than sent lib ${lib}", ("n", blk_num)("lib", last_sent_lib) );
+                     close();
+                  } else {
+                     fc_ilog( logger, "received block ${n} less than lib ${lib}", ("n", blk_num)("lib", lib) );
+                     enqueue( (sync_request_message) {0, 0} );
+                     send_handshake();
+                     cancel_wait();
+                  }
 
                   pending_message_buffer.advance_read_ptr( message_length );
                   return true;

From 1d8c95e17475756b1d6a8c2d30424491a6fc6096 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Nov 2019 13:55:38 -0600
Subject: [PATCH 1516/1648] Only log block not applied to head if not running
 in irreversible mode

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 83cad6e7c30..2d668a65611 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -393,7 +393,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                  ("p",block->producer)("id",id.str().substr(8,16))("n",blk_num)("t",block->timestamp)
                  ("count",block->transactions.size())("lib",chain.last_irreversible_block_num())
                  ("confs", block->confirmed)("latency", (fc::time_point::now() - block->timestamp).count()/1000 ) );
-            if( hbs->id != id ) { // not applied to head
+            if( chain.get_read_mode() != db_read_mode::IRREVERSIBLE && hbs->id != id ) { // not applied to head
                ilog("Block not applied to head ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, dpos: ${dpos}, conf: ${confs}, latency: ${latency} ms]",
                     ("p",hbs->block->producer)("id",hbs->id.str().substr(8,16))("n",hbs->block_num)("t",hbs->block->timestamp)
                     ("count",hbs->block->transactions.size())("dpos", hbs->dpos_irreversible_blocknum)

From 975f78a5ec1398aea98766f659d7f5d6566dd3ab Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 27 Nov 2019 14:52:36 -0600
Subject: [PATCH 1517/1648] Explicitly guard agaisnt null block_state->block

---
 plugins/producer_plugin/producer_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 2d668a65611..87dfde02810 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -393,7 +393,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
                  ("p",block->producer)("id",id.str().substr(8,16))("n",blk_num)("t",block->timestamp)
                  ("count",block->transactions.size())("lib",chain.last_irreversible_block_num())
                  ("confs", block->confirmed)("latency", (fc::time_point::now() - block->timestamp).count()/1000 ) );
-            if( chain.get_read_mode() != db_read_mode::IRREVERSIBLE && hbs->id != id ) { // not applied to head
+            if( chain.get_read_mode() != db_read_mode::IRREVERSIBLE && hbs->id != id && hbs->block != nullptr ) { // not applied to head
                ilog("Block not applied to head ${id}... #${n} @ ${t} signed by ${p} [trxs: ${count}, dpos: ${dpos}, conf: ${confs}, latency: ${latency} ms]",
                     ("p",hbs->block->producer)("id",hbs->id.str().substr(8,16))("n",hbs->block_num)("t",hbs->block->timestamp)
                     ("count",hbs->block->transactions.size())("dpos", hbs->dpos_irreversible_blocknum)

From a8d7dcee2101917378b0b26997fb17d638994875 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Mon, 2 Dec 2019 10:11:49 -0500
Subject: [PATCH 1518/1648] Updated C7 version.

---
 .cicd/build.sh                                            | 4 ++--
 .cicd/generate-pipeline.sh                                | 8 ++++----
 ...7.6-pinned.dockerfile => centos-7.7-pinned.dockerfile} | 0
 ...unpinned.dockerfile => centos-7.7-unpinned.dockerfile} | 0
 .travis.yml                                               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename .cicd/platforms/pinned/{centos-7.6-pinned.dockerfile => centos-7.7-pinned.dockerfile} (100%)
 rename .cicd/platforms/unpinned/{centos-7.6-unpinned.dockerfile => centos-7.7-unpinned.dockerfile} (100%)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index 79eb3bcc17f..fa815c9a7e7 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -27,7 +27,7 @@ else # Linux
     [[ ! "$IMAGE_TAG" =~ 'unpinned' ]] && CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_TOOLCHAIN_FILE=$MOUNTED_DIR/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
     if [[ "$IMAGE_TAG" == 'amazon_linux-2-pinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
-    elif [[ "$IMAGE_TAG" == 'centos-7.6-pinned' ]]; then
+    elif [[ "$IMAGE_TAG" == 'centos-7.7-pinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
     elif [[ "$IMAGE_TAG" == 'ubuntu-16.04-pinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib/ccache:\\\$PATH"
@@ -36,7 +36,7 @@ else # Linux
     elif [[ "$IMAGE_TAG" == 'amazon_linux-2-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && export PATH=/usr/lib64/ccache:\\\$PATH"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang'"
-    elif [[ "$IMAGE_TAG" == 'centos-7.6-unpinned' ]]; then
+    elif [[ "$IMAGE_TAG" == 'centos-7.7-unpinned' ]]; then
         PRE_COMMANDS="$PRE_COMMANDS && source /opt/rh/devtoolset-8/enable && source /opt/rh/rh-python36/enable && export PATH=/usr/lib64/ccache:\\\$PATH"
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DLLVM_DIR='/opt/rh/llvm-toolset-7.0/root/usr/lib64/cmake/llvm'"
     elif [[ "$IMAGE_TAG" == 'ubuntu-18.04-unpinned' ]]; then
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index b618526eedf..9ab5504c0b0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -462,19 +462,19 @@ cat <<EOF
   - wait
 
     # packaging
-  - label: ":centos: CentOS 7.6 - Package Builder"
+  - label: ":centos: CentOS 7.7 - Package Builder"
     command:
-      - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.6 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
+      - "buildkite-agent artifact download build.tar.gz . --step ':centos: CentOS 7.7 - Build' --agent-access-token \$\$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
       - "./.cicd/package.sh"
     env:
-      IMAGE_TAG: "centos-7.6-$PLATFORM_TYPE"
+      IMAGE_TAG: "centos-7.7-$PLATFORM_TYPE"
       PLATFORM_TYPE: $PLATFORM_TYPE
       OS: "el7" # OS and PKGTYPE required for lambdas
       PKGTYPE: "rpm"
     agents:
       queue: "$BUILDKITE_TEST_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}
-    skip: ${SKIP_CENTOS_7_6}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
+    skip: ${SKIP_CENTOS_7_7}${SKIP_PACKAGE_BUILDER}${SKIP_LINUX}
 
   - label: ":ubuntu: Ubuntu 16.04 - Package Builder"
     command:
diff --git a/.cicd/platforms/pinned/centos-7.6-pinned.dockerfile b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
similarity index 100%
rename from .cicd/platforms/pinned/centos-7.6-pinned.dockerfile
rename to .cicd/platforms/pinned/centos-7.7-pinned.dockerfile
diff --git a/.cicd/platforms/unpinned/centos-7.6-unpinned.dockerfile b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
similarity index 100%
rename from .cicd/platforms/unpinned/centos-7.6-unpinned.dockerfile
rename to .cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
diff --git a/.travis.yml b/.travis.yml
index f3830ebf785..d5ab3bea56f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
       services: docker
       env:
         - PLATFORM_TYPE='pinned'
-        - IMAGE_TAG='centos-7.6-pinned'
+        - IMAGE_TAG='centos-7.7-pinned'
     - os: osx
       osx_image: xcode10.2
       addons:

From 8d2d6a0b5d7173ffdbb956cd05a8e5ec3b3a4652 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 2 Dec 2019 11:00:21 -0600
Subject: [PATCH 1519/1648] Only cancel wait if not syncing

---
 plugins/net_plugin/net_plugin.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 8e05e0261b0..b0f202c5db4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2410,9 +2410,11 @@ namespace eosio {
             if( my_impl->dispatcher->have_block( blk_id ) ) {
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
                         ("p", peer_name())("num", blk_num)("id", blk_id.str().substr(8,16)) );
-               if( my_impl->sync_master->syncing_with_peer() )
+               if( my_impl->sync_master->syncing_with_peer() ) {
                   my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
-               cancel_wait();
+               } else {
+                  cancel_wait();
+               }
 
                pending_message_buffer.advance_read_ptr( message_length );
                return true;

From bda434efaa375eda8f36ddc311408abbfadaa204 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 2 Dec 2019 11:04:07 -0600
Subject: [PATCH 1520/1648] send handshake if head_id changed

---
 plugins/net_plugin/net_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index b0f202c5db4..0a7771033a4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3188,12 +3188,14 @@ namespace eosio {
       } else {
          hello.network_version = net_version_base + net_version;
       }
+      const auto prev_head_id = hello.head_id;
       uint32_t lib, head;
       std::tie( lib, std::ignore, head,
                 hello.last_irreversible_block_id, std::ignore, hello.head_id ) = my_impl->get_chain_info();
       // only send handshake if state has changed since last handshake
       send |= lib != hello.last_irreversible_block_num;
       send |= head != hello.head_num;
+      send |= head_id != prev_head_id;
       if( !send ) return false;
       hello.last_irreversible_block_num = lib;
       hello.head_num = head;

From 563005cdcb4c7e9722194e9a98d4a56cd59a9ea1 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 2 Dec 2019 11:21:27 -0600
Subject: [PATCH 1521/1648] Fix compile error

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 0a7771033a4..a05e814fe74 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -3195,7 +3195,7 @@ namespace eosio {
       // only send handshake if state has changed since last handshake
       send |= lib != hello.last_irreversible_block_num;
       send |= head != hello.head_num;
-      send |= head_id != prev_head_id;
+      send |= prev_head_id != hello.head_id;
       if( !send ) return false;
       hello.last_irreversible_block_num = lib;
       hello.head_num = head;

From 2f7bfee54585e7cf960ed3528853c98f374263e3 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Mon, 2 Dec 2019 13:09:49 -0500
Subject: [PATCH 1522/1648] Updated C7 version.

---
 .cicd/platforms/pinned/centos-7.7-pinned.dockerfile     | 2 +-
 .cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
index 8b816cf2deb..7bfb826b347 100644
--- a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
+++ b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7.6.1810
+FROM centos:7.7.1908
 ENV VERSION 1
 # install dependencies.
 RUN yum update -y && \
diff --git a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
index 5e7d86f33e5..4eedf27f0eb 100644
--- a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7.6.1810
+FROM centos:7.7.1908
 ENV VERSION 1
 # install dependencies.
 RUN yum update -y && \

From c74d07ebc7f452ff090597b7dfc3f843a9451729 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 2 Dec 2019 12:15:16 -0600
Subject: [PATCH 1523/1648] Always cancel_wait on receive

---
 plugins/net_plugin/net_plugin.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index a05e814fe74..072dc555243 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2410,11 +2410,9 @@ namespace eosio {
             if( my_impl->dispatcher->have_block( blk_id ) ) {
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
                         ("p", peer_name())("num", blk_num)("id", blk_id.str().substr(8,16)) );
-               if( my_impl->sync_master->syncing_with_peer() ) {
+               if( my_impl->sync_master->syncing_with_peer() )
                   my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
-               } else {
-                  cancel_wait();
-               }
+               cancel_wait();
 
                pending_message_buffer.advance_read_ptr( message_length );
                return true;

From e16ad6456a405f8150bf1b2798736bffcf293ea0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 2 Dec 2019 13:57:24 -0600
Subject: [PATCH 1524/1648] on fork should be true if not found

---
 plugins/net_plugin/net_plugin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 072dc555243..5e90f0c1044 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -988,7 +988,9 @@ namespace eosio {
          try {
             const controller& cc = chain_plug->chain();
             on_fork = on_fork || cc.get_block_id_for_num( msg_head_num ) != msg_head_id;
-         } catch( ... ) {}
+         } catch( ... ) {
+            on_fork = true;
+         }
          if( on_fork ) msg_head_num = 0;
          // if peer on fork, start at their last lib, otherwise we can start at msg_head+1
          c->strand.post( [c, msg_head_num, lib_num, head_num]() {

From 174ca52ac1161fa4c394dfced4711c7074615932 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 2 Dec 2019 18:16:58 -0600
Subject: [PATCH 1525/1648] Do not send a go away message if unable to fetch a
 block as we might have just switched to a diff fork

---
 plugins/net_plugin/net_plugin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 5e90f0c1044..02eef68d3e7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1182,8 +1182,7 @@ namespace eosio {
             });
          } else {
             c->strand.post( [c, num]() {
-               peer_ilog( c, "enqueue sync, unable to fetch block ${num}, sending go away: benign_other", ("num", num) );
-               c->enqueue( go_away_message( benign_other ) );
+               peer_ilog( c, "enqueue sync, unable to fetch block ${num}", ("num", num) );
             });
          }
       });

From b5b9b604b389502e72a63d2ff20d5b4c2872a1fa Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Wed, 4 Dec 2019 09:20:52 -0500
Subject: [PATCH 1526/1648] Fix for incorrect openssl and timeouts in Travis.

---
 .cicd/build.sh | 1 +
 .travis.yml    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index fa815c9a7e7..aaec78cc395 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -7,6 +7,7 @@ if [[ "$(uname)" == 'Darwin' ]]; then
     # You can't use chained commands in execute
     if [[ "$TRAVIS" == 'true' ]]; then
         export PINNED=false
+        brew reinstall openssl@1.1 # Fixes issue where builds in Travis cannot find libcrypto.
         ccache -s
         CMAKE_EXTRAS="$CMAKE_EXTRAS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
     else
diff --git a/.travis.yml b/.travis.yml
index d5ab3bea56f..83ab0ce1b7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,10 +52,10 @@ matrix:
             - llvm@7
             - pkgconfig
             - doxygen
-            - openssl
+            - openssl@1.1
       env: 
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
-script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/wasm-spec-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"
+script: "ccache --max-size=1G && ./.cicd/build.sh && ./.cicd/test.sh scripts/parallel-test.sh && ./.cicd/test.sh scripts/serial-test.sh && if [[ $(uname) != 'Darwin' ]]; then ./.cicd/submodule-regression-check.sh; fi"
 notifications:
   webhooks:
     secure: gmqODqoFAil2cR7v++ibqRNECBOSD/VJX+2qPa7XptkVWmVMzbII5CNgBQAscjFsp9arHPMXCCzkBi847PCSiHdsnYFQ4T273FLRWr3cDbLjfmR+BJ7dGKvQnlpSi2Ze2TtAPJyRl+iv+cxDj7cWE5zw2c4xbgh1a/cNO+/ayUfFkyMEIfVWRsHkdkra4gOLywou0XRLHr4CX1V60uU7uuqATnIMMi7gQYwiKKtZqjkbf8wcBvZirDhjQ6lDPN5tnZo6L4QHmqjtzNJg/UrD4h+zES53dLVI4uxlXRAwwpw+mJOFA3QE/3FT+bMQjLCffUz4gZaWcdgebPYzrwSWUbJoFdWAOwcTqivQY0FIQzcz/r6uGWcwWTavzkPEbg68BVM2BZId/0110J6feeTkpJ3MPV+UsIoGTvbg50vi/I06icftuZ/cLqDj3+Emifm7Jlr1sRTSdqtYAJj/2ImUfsb46cwgjAVhFOTvc+KuPgJQgvOXV7bZkxEr5qDWo8Al2sV8BWb83j1rMlZ4LfERokImDVqxu2kkcunchzvhtYFTesSpmwegVpwceCtOtO0rEUgATnfTEHzk2rm8nuz4UtidsQnluUKqmKD0QCqHXFfn+3ZRJsDqr+iCYdxv1BAeAVc9q1L7bgrKDMGiJgkxuhZ2v3J2SflWLvjZjFDduuc=

From c3794708ecf564a64de43f073e62de9a068f09d9 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 03:50:21 -0500
Subject: [PATCH 1527/1648] copy docs folder from docs/starter branch

---
 .../00_install-prebuilt-binaries.md           |  62 +++
 .../01_download-eosio-source.md               |  25 +
 .../00_build-script.md                        |  15 +
 .../00_eosio-dependencies/00_macos-mojave.md  | 119 +++++
 .../00_eosio-dependencies/01_amazon-linux.md  | 169 +++++++
 .../00_eosio-dependencies/02_centos-linux.md  | 185 ++++++++
 .../00_eosio-dependencies/03_ubuntu-linux.md  | 208 ++++++++
 .../00_eosio-dependencies/index.md            |  53 +++
 .../02_manual-build/01_eosio-manual-build.md  |  43 ++
 .../02_manual-build/index.md                  |  29 ++
 .../02_build-eosio-binaries/index.md          |  12 +
 .../03_install-eosio-binaries.md              |  18 +
 .../04_build-validation.md                    |  29 ++
 .../05_uninstall-eosio.md                     |  10 +
 docs/00_install/01_build-from-source/index.md |  11 +
 docs/00_install/index.md                      |  19 +
 docs/01_nodeos/02_usage/00_nodeos-options.md  | 448 ++++++++++++++++++
 .../02_usage/01_nodeos-configuration.md       |  60 +++
 .../02_node-setups/00_producing-node.md       |  94 ++++
 .../02_node-setups/01_non-producing-node.md   |  37 ++
 .../02_usage/02_node-setups/index.md          |  10 +
 .../00_local-single-node-testnet.md           | 119 +++++
 .../01_local-multi-node-testnet.md            | 212 +++++++++
 .../03_development-environment/index.md       |  24 +
 .../single-host-multi-node-testnet.png        | Bin 0 -> 213042 bytes
 .../single-host-single-node-testnet.png       | Bin 0 -> 182310 bytes
 .../02_usage/05_nodeos-implementation.md      |  58 +++
 docs/01_nodeos/02_usage/index.md              |  10 +
 .../03_plugins/chain_api_plugin/index.md      |  38 ++
 .../03_plugins/chain_plugin/index.md          | 174 +++++++
 .../03_plugins/db_size_api_plugin/index.md    |  39 ++
 .../03_plugins/faucet_testnet_plugin/index.md |  23 +
 .../03_plugins/history_api_plugin/index.md    |  62 +++
 .../03_plugins/history_plugin/index.md        |  42 ++
 .../03_plugins/http_client_plugin/index.md    |  44 ++
 .../01_nodeos/03_plugins/http_plugin/index.md |  72 +++
 docs/01_nodeos/03_plugins/index.md            |  27 ++
 .../03_plugins/login_plugin/index.md          |  47 ++
 .../03_plugins/mongo_db_plugin/index.md       | 155 ++++++
 .../03_plugins/net_api_plugin/index.md        |  50 ++
 docs/01_nodeos/03_plugins/net_plugin/index.md |  91 ++++
 .../03_plugins/producer_api_plugin/index.md   |  42 ++
 .../03_plugins/producer_plugin/index.md       | 116 +++++
 ...ow-to-create-snapshot-with-full-history.md |  39 ++
 .../how-to-fast-start-without-old-history.md  |  40 ++
 ...ow-to-replay-or-resync-wth-full-history.md |  19 +
 ...w-to-restore-snapshot-with-full-history.md |  31 ++
 .../03_plugins/state_history_plugin/index.md  |  80 ++++
 .../test_control_api_plugin/index.md          |  45 ++
 .../03_plugins/test_control_plugin/index.md   |  36 ++
 .../03_plugins/txn_test_gen_plugin/index.md   |  40 ++
 .../how-to-generate-a-blocks.log.md           |   6 +
 .../04_replays/how-to-generate-a-snapshot.md  |  17 +
 .../how-to-replay-from-a-blocks.log.md        |  24 +
 .../how-to-replay-from-a-snapshot.md          |  29 ++
 docs/01_nodeos/04_replays/index.md            |  50 ++
 .../06_logging/00_setup-logging.json.md       |  11 +
 .../01_nodeos/06_logging/01_logging-levels.md |  62 +++
 docs/01_nodeos/06_logging/index.md            | 106 +++++
 .../07_upgrade-guides/1.8-upgrade-guide.md    | 130 +++++
 docs/01_nodeos/07_upgrade-guides/index.md     |   5 +
 .../00_upgrade-issues-1.6-1.7.md              |   0
 .../01_upgrade-issues-1.7-1.8.md              |   0
 .../00_upgrade-issues/index.md                |   0
 docs/01_nodeos/08_troubleshooting/index.md    |  43 ++
 docs/01_nodeos/eosio_components.png           | Bin 0 -> 49499 bytes
 docs/01_nodeos/index.md                       |  26 +
 .../02_how-to-guides/how-to-buy-ram.md        |  23 +
 .../how-to-config-a-multisig-account.md       |  22 +
 .../how-to-connect-a-specific-network.md      |  25 +
 .../how-to-create-a-wallet.md                 |  43 ++
 .../how-to-create-an-account.md               |  21 +
 .../how-to-create-key-pairs.md                |  22 +
 .../how-to-delegate-CPU-resource.md           |  34 ++
 .../how-to-delegate-net-resource.md           |  34 ++
 .../how-to-deploy-a-smart-contract.md         |  19 +
 .../how-to-get-account-information.md         |  43 ++
 .../how-to-get-block-information.md           |  18 +
 .../how-to-get-tables-information.md          |  18 +
 .../how-to-get-transaction-information.md     |  20 +
 .../02_how-to-guides/how-to-import-a-key.md   |  22 +
 .../how-to-link-permission.md                 |  20 +
 .../how-to-list-all-key-pair.md               |  34 ++
 .../02_how-to-guides/how-to-stake-resource.md |  28 ++
 .../how-to-submit-a-transaction.md            |  91 ++++
 .../how-to-transfer-an-eosio.token-token.md   |  21 +
 .../02_how-to-guides/how-to-undelegate-CPU.md |  34 ++
 .../02_how-to-guides/how-to-undelegate-NET.md |  34 ++
 .../how-to-unlink-permission.md               |  20 +
 .../02_how-to-guides/how-to-unstake-CPU.md    |  32 ++
 .../02_how-to-guides/how-to-unstake-NET.md    |  32 ++
 docs/02_cleos/02_how-to-guides/how-to-vote.md |  31 ++
 docs/02_cleos/02_how-to-guides/index.md       |   0
 .../03_command-reference/convert/index.md     |   8 +
 .../convert/pack_action_data.md               |  23 +
 .../convert/pack_transaction.md               |  51 ++
 .../convert/unpack_action_data.md             |  28 ++
 .../convert/unpack_transaction.md             |  57 +++
 .../03_command-reference/create/account.md    |  72 +++
 .../03_command-reference/create/index.md      |  15 +
 .../03_command-reference/create/key.md        |  28 ++
 .../03_command-reference/get/account.md       | 100 ++++
 .../03_command-reference/get/accounts.md      |  21 +
 .../03_command-reference/get/block.md         |  35 ++
 .../02_cleos/03_command-reference/get/code.md |  30 ++
 .../get/currency-balance.md                   |  21 +
 .../get/currency-stats.md                     |  22 +
 .../03_command-reference/get/currency.md      |   8 +
 .../03_command-reference/get/index.md         |  18 +
 .../02_cleos/03_command-reference/get/info.md |  28 ++
 .../03_command-reference/get/schedule.md      |  28 ++
 .../03_command-reference/get/servants.md      |  36 ++
 .../03_command-reference/get/table.md         |  36 ++
 .../03_command-reference/get/transaction.md   |  79 +++
 .../get/transaction_id.md                     |  10 +
 docs/02_cleos/03_command-reference/index.md   |   0
 .../03_command-reference/multisig/index.md    |  12 +
 .../multisig/multisig-approve.md              |  23 +
 .../multisig/multisig-cancel.md               |  18 +
 .../multisig/multisig-exec.md                 |  19 +
 .../multisig/multisig-invalidate.md           |  19 +
 .../multisig/multisig-propose.md              |  23 +
 .../multisig/multisig-propose_trx.md          |  26 +
 .../multisig/multisig-review.md               |  17 +
 .../multisig/multisig-unapprove.md            |  20 +
 .../03_command-reference/net/connect.md       |  18 +
 .../03_command-reference/net/disconnect.md    |  18 +
 .../03_command-reference/net/index.md         |  19 +
 .../03_command-reference/net/peers.md         |  18 +
 .../03_command-reference/net/status.md        |  16 +
 .../03_command-reference/push/index.md        |  10 +
 .../03_command-reference/push/push-action.md  |  33 ++
 .../push/push-transaction.md                  |  36 ++
 .../push/push-transactions.md                 |   8 +
 .../03_command-reference/set/index.md         |  21 +
 .../03_command-reference/set/set-abi.md       |  24 +
 .../03_command-reference/set/set-account.md   |  84 ++++
 .../03_command-reference/set/set-action.md    |  72 +++
 .../03_command-reference/set/set-code.md      |  42 ++
 .../03_command-reference/set/set-contract.md  |  79 +++
 .../03_command-reference/system/index.md      |  20 +
 .../system/system-bidname.md                  |  28 ++
 .../system/system-bidnameinfo.md              |  16 +
 .../system/system-buyram.md                   |  22 +
 .../system/system-canceldelay.md              |  20 +
 .../system/system-claimrewards.md             |  20 +
 .../system/system-delegatebw.md               |  24 +
 .../system/system-listbw.md                   |  12 +
 .../system/system-listproducers.md            |  12 +
 .../system/system-newaccount.md               |  28 ++
 .../system/system-regproducer.md              |  22 +
 .../system/system-regproxy.md                 |  19 +
 .../system/system-rex-buyrex.md               |  27 ++
 .../system/system-rex-cancelrexorder.md       |  26 +
 .../system/system-rex-closerex.md             |  26 +
 .../system/system-rex-consolidate.md          |  26 +
 .../system/system-rex-defundcpuloan.md        |  26 +
 .../system/system-rex-defundnetloan.md        |  29 ++
 .../system/system-rex-deposit.md              |  25 +
 .../system/system-rex-fundcpuloan.md          |  27 ++
 .../system/system-rex-fundnetloan.md          |  26 +
 .../system/system-rex-lendrex.md              |  27 ++
 .../system/system-rex-mvfromsavings.md        |  27 ++
 .../system/system-rex-mvtosavings.md          |  28 ++
 .../system/system-rex-rentcpu.md              |  24 +
 .../system/system-rex-rentnet.md              |  24 +
 .../system/system-rex-rexexec.md              |  23 +
 .../system/system-rex-sellrex.md              |  20 +
 .../system/system-rex-unstaketorex.md         |  24 +
 .../system/system-rex-updaterex.md            |  22 +
 .../system/system-rex-withdraw.md             |  23 +
 .../03_command-reference/system/system-rex.md |  21 +
 .../system/system-sellram.md                  |  17 +
 .../system/system-undelegatebw.md             |  20 +
 .../system/system-unregprod.md                |  16 +
 .../system/system-unregproxy.md               |  16 +
 .../system/system-voteproducer-approve.md     |  17 +
 .../system/system-voteproducer-prods.md       |  17 +
 .../system/system-voteproducer-proxy.md       |  18 +
 .../system/system-voteproducer-unapprove.md   |  17 +
 .../system/system-voteproducer.md             |   5 +
 .../02_cleos/03_command-reference/transfer.md |  64 +++
 .../03_command-reference/version/client.md    |  11 +
 .../03_command-reference/version/index.md     |  23 +
 .../03_command-reference/wallet/create.md     |  10 +
 .../03_command-reference/wallet/create_key.md |  23 +
 .../03_command-reference/wallet/import.md     |   9 +
 .../03_command-reference/wallet/index.md      |  15 +
 .../03_command-reference/wallet/keys.md       |  25 +
 .../03_command-reference/wallet/list.md       |  33 ++
 .../03_command-reference/wallet/lock.md       |  23 +
 .../03_command-reference/wallet/lock_all.md   |  21 +
 .../03_command-reference/wallet/open.md       |  23 +
 .../wallet/private_keys.md                    |  25 +
 .../03_command-reference/wallet/unlock.md     |  21 +
 docs/02_cleos/04_troubleshooting.md           |  21 +
 docs/02_cleos/05_FAQ.md                       |   7 +
 docs/02_cleos/index.md                        | 118 +++++
 docs/03_keosd/10_usage.md                     | 113 +++++
 docs/03_keosd/15_plugins/http_plugin/index.md |   3 +
 docs/03_keosd/15_plugins/index.md             |  12 +
 .../15_plugins/wallet_api_plugin/index.md     |  41 ++
 .../15_plugins/wallet_plugin/index.md         |  41 ++
 docs/03_keosd/20_security.md                  |  13 +
 .../how-to-attach-a-yubihsm-hard-wallet.md    |  68 +++
 docs/03_keosd/30_how-to-guides/index.md       |   2 +
 docs/03_keosd/35_wallet-specification.md      | 140 ++++++
 docs/03_keosd/40_troubleshooting.md           |   9 +
 docs/03_keosd/50_FAQ.md                       |   7 +
 docs/03_keosd/index.md                        |  14 +
 210 files changed, 7932 insertions(+)
 create mode 100644 docs/00_install/00_install-prebuilt-binaries.md
 create mode 100644 docs/00_install/01_build-from-source/01_download-eosio-source.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/00_build-script.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/01_amazon-linux.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/02_centos-linux.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/03_ubuntu-linux.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
 create mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/index.md
 create mode 100644 docs/00_install/01_build-from-source/03_install-eosio-binaries.md
 create mode 100644 docs/00_install/01_build-from-source/04_build-validation.md
 create mode 100644 docs/00_install/01_build-from-source/05_uninstall-eosio.md
 create mode 100644 docs/00_install/01_build-from-source/index.md
 create mode 100644 docs/00_install/index.md
 create mode 100644 docs/01_nodeos/02_usage/00_nodeos-options.md
 create mode 100644 docs/01_nodeos/02_usage/01_nodeos-configuration.md
 create mode 100644 docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
 create mode 100644 docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
 create mode 100644 docs/01_nodeos/02_usage/02_node-setups/index.md
 create mode 100644 docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
 create mode 100644 docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
 create mode 100644 docs/01_nodeos/02_usage/03_development-environment/index.md
 create mode 100644 docs/01_nodeos/02_usage/03_development-environment/single-host-multi-node-testnet.png
 create mode 100644 docs/01_nodeos/02_usage/03_development-environment/single-host-single-node-testnet.png
 create mode 100644 docs/01_nodeos/02_usage/05_nodeos-implementation.md
 create mode 100644 docs/01_nodeos/02_usage/index.md
 create mode 100644 docs/01_nodeos/03_plugins/chain_api_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/chain_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/db_size_api_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/faucet_testnet_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/history_api_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/history_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/http_client_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/http_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/index.md
 create mode 100644 docs/01_nodeos/03_plugins/login_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/mongo_db_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/net_api_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/net_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/producer_api_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/producer_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/state_history_plugin/how-to-create-snapshot-with-full-history.md
 create mode 100644 docs/01_nodeos/03_plugins/state_history_plugin/how-to-fast-start-without-old-history.md
 create mode 100644 docs/01_nodeos/03_plugins/state_history_plugin/how-to-replay-or-resync-wth-full-history.md
 create mode 100644 docs/01_nodeos/03_plugins/state_history_plugin/how-to-restore-snapshot-with-full-history.md
 create mode 100644 docs/01_nodeos/03_plugins/state_history_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/test_control_api_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/test_control_plugin/index.md
 create mode 100644 docs/01_nodeos/03_plugins/txn_test_gen_plugin/index.md
 create mode 100644 docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md
 create mode 100644 docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md
 create mode 100644 docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md
 create mode 100644 docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md
 create mode 100644 docs/01_nodeos/04_replays/index.md
 create mode 100644 docs/01_nodeos/06_logging/00_setup-logging.json.md
 create mode 100644 docs/01_nodeos/06_logging/01_logging-levels.md
 create mode 100644 docs/01_nodeos/06_logging/index.md
 create mode 100644 docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md
 create mode 100644 docs/01_nodeos/07_upgrade-guides/index.md
 create mode 100644 docs/01_nodeos/08_troubleshooting/00_upgrade-issues/00_upgrade-issues-1.6-1.7.md
 create mode 100644 docs/01_nodeos/08_troubleshooting/00_upgrade-issues/01_upgrade-issues-1.7-1.8.md
 create mode 100644 docs/01_nodeos/08_troubleshooting/00_upgrade-issues/index.md
 create mode 100644 docs/01_nodeos/08_troubleshooting/index.md
 create mode 100644 docs/01_nodeos/eosio_components.png
 create mode 100644 docs/01_nodeos/index.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-buy-ram.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-config-a-multisig-account.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-connect-a-specific-network.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-create-a-wallet.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-create-an-account.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-create-key-pairs.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-delegate-CPU-resource.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-delegate-net-resource.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-deploy-a-smart-contract.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-get-account-information.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-get-block-information.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-get-tables-information.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-get-transaction-information.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-import-a-key.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-link-permission.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-list-all-key-pair.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-stake-resource.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-submit-a-transaction.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-transfer-an-eosio.token-token.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-undelegate-CPU.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-undelegate-NET.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-unlink-permission.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-unstake-CPU.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-unstake-NET.md
 create mode 100644 docs/02_cleos/02_how-to-guides/how-to-vote.md
 create mode 100644 docs/02_cleos/02_how-to-guides/index.md
 create mode 100755 docs/02_cleos/03_command-reference/convert/index.md
 create mode 100755 docs/02_cleos/03_command-reference/convert/pack_action_data.md
 create mode 100755 docs/02_cleos/03_command-reference/convert/pack_transaction.md
 create mode 100755 docs/02_cleos/03_command-reference/convert/unpack_action_data.md
 create mode 100755 docs/02_cleos/03_command-reference/convert/unpack_transaction.md
 create mode 100755 docs/02_cleos/03_command-reference/create/account.md
 create mode 100755 docs/02_cleos/03_command-reference/create/index.md
 create mode 100755 docs/02_cleos/03_command-reference/create/key.md
 create mode 100755 docs/02_cleos/03_command-reference/get/account.md
 create mode 100755 docs/02_cleos/03_command-reference/get/accounts.md
 create mode 100755 docs/02_cleos/03_command-reference/get/block.md
 create mode 100755 docs/02_cleos/03_command-reference/get/code.md
 create mode 100755 docs/02_cleos/03_command-reference/get/currency-balance.md
 create mode 100755 docs/02_cleos/03_command-reference/get/currency-stats.md
 create mode 100755 docs/02_cleos/03_command-reference/get/currency.md
 create mode 100755 docs/02_cleos/03_command-reference/get/index.md
 create mode 100755 docs/02_cleos/03_command-reference/get/info.md
 create mode 100755 docs/02_cleos/03_command-reference/get/schedule.md
 create mode 100755 docs/02_cleos/03_command-reference/get/servants.md
 create mode 100755 docs/02_cleos/03_command-reference/get/table.md
 create mode 100755 docs/02_cleos/03_command-reference/get/transaction.md
 create mode 100755 docs/02_cleos/03_command-reference/get/transaction_id.md
 create mode 100644 docs/02_cleos/03_command-reference/index.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/index.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/multisig-approve.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/multisig-cancel.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/multisig-exec.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/multisig-invalidate.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/multisig-propose.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/multisig-propose_trx.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/multisig-review.md
 create mode 100755 docs/02_cleos/03_command-reference/multisig/multisig-unapprove.md
 create mode 100755 docs/02_cleos/03_command-reference/net/connect.md
 create mode 100755 docs/02_cleos/03_command-reference/net/disconnect.md
 create mode 100755 docs/02_cleos/03_command-reference/net/index.md
 create mode 100755 docs/02_cleos/03_command-reference/net/peers.md
 create mode 100755 docs/02_cleos/03_command-reference/net/status.md
 create mode 100755 docs/02_cleos/03_command-reference/push/index.md
 create mode 100755 docs/02_cleos/03_command-reference/push/push-action.md
 create mode 100755 docs/02_cleos/03_command-reference/push/push-transaction.md
 create mode 100755 docs/02_cleos/03_command-reference/push/push-transactions.md
 create mode 100755 docs/02_cleos/03_command-reference/set/index.md
 create mode 100755 docs/02_cleos/03_command-reference/set/set-abi.md
 create mode 100755 docs/02_cleos/03_command-reference/set/set-account.md
 create mode 100755 docs/02_cleos/03_command-reference/set/set-action.md
 create mode 100755 docs/02_cleos/03_command-reference/set/set-code.md
 create mode 100755 docs/02_cleos/03_command-reference/set/set-contract.md
 create mode 100755 docs/02_cleos/03_command-reference/system/index.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-bidname.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-bidnameinfo.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-buyram.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-canceldelay.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-claimrewards.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-delegatebw.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-listbw.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-listproducers.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-newaccount.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-regproducer.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-regproxy.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-buyrex.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-cancelrexorder.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-closerex.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-consolidate.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-defundcpuloan.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-defundnetloan.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-deposit.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-fundcpuloan.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-fundnetloan.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-lendrex.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-mvfromsavings.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-mvtosavings.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-rentcpu.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-rentnet.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-rexexec.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-sellrex.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-unstaketorex.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-updaterex.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex-withdraw.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-rex.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-sellram.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-undelegatebw.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-unregprod.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-unregproxy.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-voteproducer-approve.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-voteproducer-prods.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-voteproducer-proxy.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-voteproducer-unapprove.md
 create mode 100755 docs/02_cleos/03_command-reference/system/system-voteproducer.md
 create mode 100755 docs/02_cleos/03_command-reference/transfer.md
 create mode 100755 docs/02_cleos/03_command-reference/version/client.md
 create mode 100755 docs/02_cleos/03_command-reference/version/index.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/create.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/create_key.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/import.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/index.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/keys.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/list.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/lock.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/lock_all.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/open.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/private_keys.md
 create mode 100755 docs/02_cleos/03_command-reference/wallet/unlock.md
 create mode 100644 docs/02_cleos/04_troubleshooting.md
 create mode 100644 docs/02_cleos/05_FAQ.md
 create mode 100644 docs/02_cleos/index.md
 create mode 100644 docs/03_keosd/10_usage.md
 create mode 100644 docs/03_keosd/15_plugins/http_plugin/index.md
 create mode 100644 docs/03_keosd/15_plugins/index.md
 create mode 100644 docs/03_keosd/15_plugins/wallet_api_plugin/index.md
 create mode 100644 docs/03_keosd/15_plugins/wallet_plugin/index.md
 create mode 100644 docs/03_keosd/20_security.md
 create mode 100644 docs/03_keosd/30_how-to-guides/how-to-attach-a-yubihsm-hard-wallet.md
 create mode 100644 docs/03_keosd/30_how-to-guides/index.md
 create mode 100644 docs/03_keosd/35_wallet-specification.md
 create mode 100644 docs/03_keosd/40_troubleshooting.md
 create mode 100644 docs/03_keosd/50_FAQ.md
 create mode 100644 docs/03_keosd/index.md

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
new file mode 100644
index 00000000000..12644d79645
--- /dev/null
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -0,0 +1,62 @@
+
+[[info | Previous Builds]]
+| If you have previously installed EOSIO from source using shell scripts, you must first run the [Uninstall Script](01_build-from-source/05_uninstall-eosio.md) before installing any prebuilt binaries on the same OS.
+
+## Prebuilt Binaries
+
+EOSIO prebuilt binary packages are available for specific [Operating Systems](index.md#supported-operating-systems). Find the instructions below for your given OS:
+
+### Mac OS X:
+
+#### Mac OS X Brew Install
+```sh
+$ brew tap eosio/eosio
+$ brew install eosio
+```
+#### Mac OS X Brew Uninstall
+```sh
+$ brew remove eosio
+```
+
+### Ubuntu Linux:
+
+#### Ubuntu 18.04 Package Install
+```sh
+$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio_1.8.0-rc1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_1.8.0-rc1-ubuntu-18.04_amd64.deb
+```
+#### Ubuntu 16.04 Package Install
+```sh
+$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio_1.8.0-rc1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_1.8.0-rc1-ubuntu-16.04_amd64.deb
+```
+#### Ubuntu Package Uninstall
+```sh
+$ sudo apt remove eosio
+```
+
+### RPM-based (CentOS, Amazon Linux, etc.):
+
+#### RPM Package Install
+```sh
+$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio-1.8.0-rc1.el7.x86_64.rpm
+$ sudo yum install ./eosio-1.8.0-rc1.el7.x86_64.rpm
+```
+#### RPM Package Uninstall
+```sh
+$ sudo yum remove eosio
+```
+
+## Location of EOSIO binaries
+
+After installing the prebuilt binaries, the actual EOSIO binaries will be located under the `~/eosio/x.y/bin` folder, where `x.y` is the EOSIO release version that was installed.
+
+## Previous Versions
+
+To install previous versions of the EOSIO prebuilt binaries:
+
+1. Browse to https://github.com/EOSIO/eos/tags and select the actual version of the EOSIO software you need to install.
+
+2. Scroll down past the `Release Notes` and download the package or archive that you need for your OS.
+
+3. Follow the instructions on the first paragraph above to install the selected prebuilt binaries on the given OS.
diff --git a/docs/00_install/01_build-from-source/01_download-eosio-source.md b/docs/00_install/01_build-from-source/01_download-eosio-source.md
new file mode 100644
index 00000000000..2421b07d84d
--- /dev/null
+++ b/docs/00_install/01_build-from-source/01_download-eosio-source.md
@@ -0,0 +1,25 @@
+
+To download the EOSIO source code, clone the `eos` repo and its submodules. It is adviced to create a home `eosio` folder first and download all the EOSIO related software there:
+
+```sh
+$ mkdir -p ~/eosio && cd ~/eosio
+$ git clone --recursive https://github.com/EOSIO/eos
+```
+
+## Update Submodules
+
+If a repository is cloned without the `--recursive` flag, the submodules *must* be updated before starting the build process:
+
+```sh
+$ cd ~/eosio/eos
+$ git submodule update --init --recursive
+```
+
+## Pull Changes
+
+When pulling changes, especially after switching branches, the submodules *must* also be updated. This can be achieved with the `git submodule` command as above, or using `git pull` directly:
+
+```sh
+$ [git checkout <branch>]  (optional)
+$ git pull --recurse-submodules
+```
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/00_build-script.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/00_build-script.md
new file mode 100644
index 00000000000..0f2dae7097f
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/00_build-script.md
@@ -0,0 +1,15 @@
+
+[[info | Shell Scripts]]
+| The build script is one of various automated shell scripts provided in the EOSIO repository for building, installing, and optionally uninstalling the EOSIO software and its dependencies. They are available in the `eos/scripts` folder.
+
+The build script first installs all dependencies and then builds EOSIO. The script supports these [Operating Systems](../../index.md#supported-operating-systems). To run it, first change to the `~/eosio/eos` folder, then launch the script:
+
+```sh
+$ cd ~/eosio/eos
+$ ./scripts/eosio_build.sh
+```
+
+The build process writes temporary content to the `eos/build` folder. After building, the program binaries can be found at `eos/build/programs`.
+
+[[info | What's Next?]]
+| [Install EOSIO binaries](../03_install-eosio-binaries.md)
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
new file mode 100644
index 00000000000..10c4d28095a
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
@@ -0,0 +1,119 @@
+## Dependencies - Manual Install - MacOS Mojave 10.14 or Higher
+
+[[info | Reminder]]
+| This section assumes you already have the EOSIO source code. If not, just [Download the EOSIO source](../../../../01_build-from-source/01_download-eosio-source.md).
+
+## Steps
+
+Please follow the steps below to build EOSIO on your selected OS:
+
+1. [Change to EOSIO folder](#1-change-to-eosio-folder)
+2. [Install Homebrew](#2-install-homebrew)
+3. [Install dependencies](#3-install-dependencies)
+4. [Build clang8](#4-build-clang8)
+5. [Build boost](#5-build-boost)
+6. [Build mongodb](#6-build-mongodb)
+7. [Build mongodb C driver](#7-build-mongodb-c-driver)
+8. [Build mongodb CXX driver](#8-build-mongodb-cxx-driver)
+
+### 1. Change to EOSIO folder
+```sh
+$ cd ~/eosio
+```
+
+### 2. Install Homebrew
+
+```sh
+$ which brew && (brew doctor && brew cask doctor && \
+    echo 'brew already installed') || /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+```
+
+### 3. Install dependencies
+
+```sh
+$ brew update && brew install git cmake python@2 python libtool libusb \
+    graphviz automake wget gmp pkgconfig doxygen openssl@1.1 jq
+```
+
+<!--
+### 4. download eosio
+```sh
+mkdir -p ~/eosio && cd ~/eosio
+git clone --recursive --single-branch -b release/2.0.x https://github.com/EOSIO/eos.git
+```
+-->
+
+### 4. Build clang8
+```sh
+$ git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    cd ~/eosio/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir ~/eosio/clang8/build && cd ~/eosio/clang8/build && \
+    cmake -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(getconf _NPROCESSORS_ONLN) && \
+    sudo make install && \
+    cd ~/eosio && \
+    rm -rf clang8
+```
+
+### 5. Build boost
+```sh
+$ curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --prefix=/usr/local && \
+    sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install && \
+    cd ~/eosio && \
+    sudo rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
+```
+
+### 6. Build mongodb
+
+```sh
+$ curl -LO https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz && \
+    tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz && \
+    rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz && \
+    ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
+```
+
+### 7. Build mongodb C driver
+```sh
+$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && \
+    cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && \
+    cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF .. && \
+    make -j $(getconf _NPROCESSORS_ONLN) && \
+    sudo make install && \
+    cd ~/eosio && \
+    rm -rf mongo-c-driver-1.13.0.tar.gz mongo-c-driver-1.13.0
+```
+
+### 8. Build mongodb CXX driver
+```sh
+$ curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && \
+    cd mongo-cxx-driver-r3.4.0/build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
+    make -j $(getconf _NPROCESSORS_ONLN) && \
+    sudo make install && \
+    cd ~/eosio && \
+    rm -rf mongo-cxx-driver-r3.4.0.tar.gz mongo-cxx-driver-r3.4.0
+```
+
+<!--
+### 9. build eosio
+```sh
+$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make .. && make -j $(getconf _NPROCESSORS_ONLN)"
+```
+-->
+
+[[info | What's Next?]]
+| The EOSIO dependencies are now installed. Next, you can [Manually Build the EOSIO Binaries](../01_eosio-manual-build.md).
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/01_amazon-linux.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/01_amazon-linux.md
new file mode 100644
index 00000000000..ba116e0bd6d
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/01_amazon-linux.md
@@ -0,0 +1,169 @@
+## Dependencies - Manual Install - Amazon Linux 2017.09 or Higher
+
+[[info | Reminder]]
+| This section assumes you already have the EOSIO source code. If not, just [Download the EOSIO source](../../../../01_build-from-source/01_download-eosio-source.md).
+
+## Steps
+
+Please follow the steps below to build EOSIO on your selected OS:
+
+1. [Change to EOSIO folder](#1-change-to-eosio-folder)
+2. [Install dependencies](#2-install-dependencies)
+3. [Build cmake](#3-build-cmake)
+4. [Build clang8](#4-build-clang8) <!-- 5. [Copy clang8 cmake file](#5-copy-clang8-cmake-file) -->
+5. [Build llvm8](#5-build-llvm8)
+6. [Build boost](#6-build-boost)
+7. [Build mongodb](#7-build-mongodb)
+8. [Build mongodb C driver](#8-build-mongodb-c-driver)
+9. [Build mongodb CXX driver](#9-build-mongodb-cxx-driver)
+10. [Add mongodb to PATH](#10-add-mongodb-to-path)
+11. [Install ccache](#11-install-ccache)
+
+<!--
+### 0. download and run base docker image
+```sh
+docker pull amazonlinux:2.0.20190508
+docker run -it amazonlinux:2.0.20190508
+```
+-->
+
+### 1. Change to EOSIO folder
+```sh
+$ cd ~/eosio
+```
+
+### 2. Install dependencies
+```sh
+$ yum update -y && \
+    yum install -y which git sudo procps-ng util-linux autoconf automake \
+    libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
+    libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
+    graphviz patch gcc gcc-c++ vim-common jq
+```
+
+<!--
+### 3. download eosio
+```sh
+mkdir -p ~/eosio && cd ~/eosio
+git clone --recursive --single-branch -b release/2.0.x https://github.com/EOSIO/eos.git
+```
+-->
+
+### 3. Build cmake
+```sh
+$ curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=/usr/local && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf cmake-3.13.2.tar.gz cmake-3.13.2
+```
+
+### 4. Build clang8
+```sh
+$ git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    cd ~/eosio/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir ~/eosio/clang8/build && cd ~/eosio/clang8/build && \
+    cmake -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf clang8
+```
+
+<!--
+### 5. Copy clang8 cmake file
+```sh
+$ cp eos/.cicd/helpers/clang.make /tmp/clang.cmake
+```
+-->
+
+### 5. Build llvm8
+```sh
+$ git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
+    cd llvm && \
+    mkdir build && \
+    cd build && \
+    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf llvm
+```
+
+### 6. Build boost
+```sh
+$ curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    cd ~/eosio && \
+    rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
+```
+
+### 7. Build mongodb
+```sh
+$ curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz
+```
+
+### 8. Build mongodb C driver
+```sh
+$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && \
+    cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && \
+    cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF  -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf mongo-c-driver-1.13.0.tar.gz mongo-c-driver-1.13.0
+```
+
+### 9. Build mongodb CXX driver
+```sh
+$ curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && \
+    cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local  -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf mongo-cxx-driver-r3.4.0.tar.gz mongo-cxx-driver-r3.4.0
+```
+
+### 10. Add mongodb to PATH
+```sh
+$ export PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
+```
+
+### 11. Install ccache
+```sh
+$ curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
+    yum install -y ccache-3.3.4-1.el7.x86_64.rpm
+```
+
+<!--
+### 12. build eosio
+```sh
+$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib64/ccache:\$PATH && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
+```
+-->
+
+[[info | What's Next?]]
+| The EOSIO dependencies are now installed. Next, you can [Manually Build the EOSIO Binaries](../01_eosio-manual-build.md).
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/02_centos-linux.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/02_centos-linux.md
new file mode 100644
index 00000000000..f96e326f145
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/02_centos-linux.md
@@ -0,0 +1,185 @@
+## Dependencies - Manual Install - CentOS 7 and higher
+
+[[info | Reminder]]
+| This section assumes you already have the EOSIO source code. If not, just [Download the EOSIO source](../../../../01_build-from-source/01_download-eosio-source.md).
+
+## Steps
+
+Please follow the steps below to build EOSIO on your selected OS:
+
+1. [Change to EOSIO folder](#1-change-to-eosio-folder)
+2. [Install dependencies](#2-install-dependencies)
+3. [Build cmake](#3-build-cmake)
+4. [Build clang8](#4-build-clang8) <!-- 5. [Copy clang8 cmake file](#5-copy-clang8-cmake-file) -->
+5. [Build llvm8](#5-build-llvm8)
+6. [Build boost](#6-build-boost)
+7. [Build mongodb](#7-build-mongodb)
+8. [Build mongodb C driver](#8-build-mongodb-c-driver)
+9. [Build mongodb CXX driver](#9-build-mongodb-cxx-driver)
+10. [Add mongodb to PATH](#10-add-mongodb-to-path)
+11. [Install ccache](#11-install-ccache)
+12. [Fix ccache for CentOS](#12-fix-ccache-for-centos)
+
+<!--
+### 0. download and run base docker image
+```sh
+docker pull centos:7.6.1810
+docker run -it centos:7.6.1810
+```
+-->
+
+### 1. Change to EOSIO folder
+```sh
+$ cd ~/eosio
+```
+
+### 2. Install dependencies
+```sh
+$ yum update -y && \
+    yum install -y epel-release && \
+    yum --enablerepo=extras install -y centos-release-scl && \
+    yum --enablerepo=extras install -y devtoolset-8 && \
+    yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
+    graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
+    python python-devel rh-python36 file libusbx-devel \
+    libcurl-devel patch vim-common jq
+```
+
+<!--
+### 3. download eosio
+```sh
+mkdir -p ~/eosio && cd ~/eosio
+git clone --recursive --single-branch -b release/2.0.x https://github.com/EOSIO/eos.git
+```
+-->
+
+### 3. Build cmake
+```sh
+$ curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    source /opt/rh/devtoolset-8/enable && \
+    source /opt/rh/rh-python36/enable && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=/usr/local && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf cmake-3.13.2.tar.gz cmake-3.13.2
+```
+
+### 4. Build clang8
+```sh
+$ git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    patch -p2 < ~/eosio/eos/scripts/clang-devtoolset8-support.patch && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    cd ~/eosio/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir ~/eosio/clang8/build && cd ~/eosio/clang8/build && \
+    source /opt/rh/devtoolset-8/enable && \
+    source /opt/rh/rh-python36/enable && \
+    cmake -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf clang8
+```
+
+<!--
+### 5. Copy clang8 cmake file
+```sh
+$ cp eos/.cicd/helpers/clang.make /tmp/clang.cmake
+```
+-->
+
+### 5. Build llvm8
+```sh
+$ git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
+    cd llvm && \
+    mkdir build && \
+    cd build && \
+    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf llvm
+```
+
+### 6. Build boost
+```sh
+$ curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    cd ~/eosio && \
+    rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
+```
+
+### 7. Build mongodb
+```sh
+$ curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    rm -rf mongodb-linux-x86_64-amazon-3.6.3.tgz
+```
+
+### 8. Build mongodb C driver
+```sh
+$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && \
+    cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && \
+    cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf mongo-c-driver-1.13.0.tar.gz /mongo-c-driver-1.13.0
+```
+
+### 9. Build mongodb CXX driver
+```sh
+$ curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && \
+    cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf mongo-cxx-driver-r3.4.0.tar.gz mongo-cxx-driver-r3.4.0
+```
+
+### 10. Add mongodb to PATH
+```sh
+$ export PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
+```
+
+### 11. Install ccache
+```sh
+$ curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
+    yum install -y ccache-3.3.4-1.el7.x86_64.rpm
+```
+
+### 12. Fix ccache for CentOS
+```sh
+cd /usr/lib64/ccache && \
+    ln -s ../../bin/ccache c++ && \
+    export CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
+```
+
+<!--
+# 13. build eosio
+```sh
+$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib64/ccache:\$PATH && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
+```
+-->
+
+[[info | What's Next?]]
+| The EOSIO dependencies are now installed. Next, you can [Manually Build the EOSIO Binaries](../01_eosio-manual-build.md).
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/03_ubuntu-linux.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/03_ubuntu-linux.md
new file mode 100644
index 00000000000..34095b86aa2
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/03_ubuntu-linux.md
@@ -0,0 +1,208 @@
+## Dependencies - Manual Install - Ubuntu 16.04 or higher and Linux Mint 18
+
+[[info | Reminder]]
+| This section assumes you already have the EOSIO source code. If not, just [Download the EOSIO source](../../../../01_build-from-source/01_download-eosio-source.md).
+
+## Steps
+
+Please follow the steps below to build EOSIO on your selected OS:
+
+1. [Change to EOSIO folder](#1-change-to-eosio-folder)
+2. [Install dependencies](#2-install-dependencies)
+3. [Build cmake](#3-build-cmake)
+4. [Build clang8](#4-build-clang8) <!-- 5. [Copy clang8 cmake file](#5-copy-clang8-cmake-file) -->
+5. [Build llvm8](#5-build-llvm8)
+6. [Build boost](#6-build-boost)
+7. [Build mongodb](#7-build-mongodb)
+8. [Build mongodb C driver](#8-build-mongodb-c-driver)
+9. [Build mongodb CXX driver](#9-build-mongodb-cxx-driver)
+10. [Add mongodb to PATH](#10-add-mongodb-to-path)
+11. [Install ccache (Ubuntu 16.04 only)](#11-install-ccache-(ubuntu-16.04-only))
+
+<!--
+### 0. download and run base docker image
+```sh
+docker pull ubuntu:16.04
+docker run -it ubuntu:16.04
+  (OR)
+docker pull ubuntu:18.04
+docker run -it ubuntu:18.04
+```
+-->
+
+### 1. Change to EOSIO folder
+```sh
+$ cd ~/eosio
+```
+
+### 2. Install dependencies
+
+#### Ubuntu 16.04:
+```sh
+$ apt-get update && \
+    apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git automake \
+    libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev \
+    python2.7 python2.7-dev python3 python3-dev autoconf libtool curl zlib1g-dev \
+    sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config apt-transport-https vim-common jq
+```
+
+#### Ubuntu 18.04:
+```sh
+apt-get update && \
+    apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y git make \
+    bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
+    autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
+    autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
+    libcurl4-gnutls-dev pkg-config patch ccache vim-common jq
+```
+
+<!--
+### 3. download eosio
+```sh
+mkdir -p ~/eosio && cd ~/eosio
+git clone --recursive --single-branch -b release/2.0.x https://github.com/EOSIO/eos.git
+```
+-->
+
+### 3. Build cmake
+```sh
+$ curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=/usr/local && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf cmake-3.13.2.tar.gz cmake-3.13.2
+```
+
+### 4. Build clang8
+```sh
+$ git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    cd ~/eosio/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir ~/eosio/clang8/build && cd ~/eosio/clang8/build && \
+    cmake -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf clang8
+```
+
+<!--
+### 5. Copy clang8 cmake file
+```sh
+$ cp eos/.cicd/helpers/clang.make /tmp/clang.cmake
+```
+-->
+
+### 5. Build llvm8
+```sh
+$ git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
+    cd llvm && \
+    mkdir build && \
+    cd build && \
+    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf llvm
+```
+
+### 6. Build boost
+```sh
+$ curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    cd ~/eosio && \
+    rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
+```
+
+### 7. Build mongodb
+
+#### Ubuntu 16.04:
+```sh
+$ curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \
+    tar -xzf mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \
+    rm -f mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz
+```
+
+#### Ubuntu 18.04:
+```sh
+$ curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
+    tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
+    rm -f mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz
+```
+
+### 8. Build mongodb C driver
+```sh
+$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && \
+    cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && \
+    cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf mongo-c-driver-1.13.0.tar.gz mongo-c-driver-1.13.0
+```
+
+### 9. Build mongodb CXX driver
+```sh
+$ curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && \
+    cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
+    make -j$(nproc) && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf mongo-cxx-driver-r3.4.0.tar.gz mongo-cxx-driver-r3.4.0
+```
+
+### 10. Add mongodb to PATH
+
+#### Ubuntu 16.04:
+```sh
+$ export PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1604-3.6.3/bin
+```
+
+#### Ubuntu 18.04:
+```sh
+$ export PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1804-4.1.1/bin
+```
+
+### 11. Install ccache (Ubuntu 16.04 only)
+```sh
+$ curl -LO https://github.com/ccache/ccache/releases/download/v3.4.1/ccache-3.4.1.tar.gz && \
+    tar -xzf ccache-3.4.1.tar.gz && \
+    cd ccache-3.4.1 && \
+    ./configure && \
+    make && \
+    make install && \
+    cd ~/eosio && \
+    rm -rf ccache-3.4.1.tar.gz ccache-3.4.1
+```
+
+<!--
+### 12. build eosio
+```sh
+$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib/ccache:\${PATH} && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
+```
+-->
+
+[[info | What's Next?]]
+| The EOSIO dependencies are now installed. Next, you can [Manually Build the EOSIO Binaries](../01_eosio-manual-build.md).
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md
new file mode 100644
index 00000000000..3291d5fe8bb
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md
@@ -0,0 +1,53 @@
+# EOSIO Software Dependencies
+
+The EOSIO software requires specific software dependencies to build the EOSIO binaries. These dependencies can be built from source or installed from binaries directly. Dependencies can be pinned to a specific version release or unpinned to the current version, usually the latest one. The main EOSIO dependencies hosted outside the EOSIO repos are:
+
+* Clang - the C++17 compliant compiler used by EOSIO
+* CMake - the build system used by EOSIO
+* Boost - the C++ Boost library used by EOSIO
+* OpenSSL - the secure communications (and crypto) library
+* LLVM - the LLVM compiler/toolchain infrastructure
+
+Other dependencies are either inside the EOSIO repo, such as the `secp256k1` elliptic curve DSA library, or they are otherwise used for testing or housekeeping purposes, such as:
+
+* automake, autoconf, autotools
+* doxygen, graphviz
+* python2, python3
+* bzip2, zlib
+* etc.
+
+## Pinned Dependencies
+
+To guarantee interoperability across different EOSIO software releases, developers may opt to reproduce the exact "pinned" dependency binaries used in-house. Block producers may want to install and run the EOSIO software built with these pinned dependencies for portability and stability reasons. Pinned dependencies are usually built from source.
+
+## Unpinned Dependencies
+
+Regular users or application developers may prefer installing unpinned versions of the EOSIO dependencies. These correspond to the latest or otherwise stable versions of the dependencies. The main advantage of unpinned dependencies is reduced installation times and perhaps better performance. Pinned dependencies are typically installed from binaries.
+
+## Automatic Installation of Dependencies
+
+EOSIO dependencies can be built or installed automatically from the [Build Script](../../00_build-script.md) when building EOSIO from source. To build the pinned dependencies, the optional `-P` parameter can be specified when invoking the script. Otherwise, the unpinned dependencies will be installed instead, with the exception of `boost` and `cmake` which are always pinned:
+
+```sh
+$ cd ~/eosio/eos
+$ ./scripts/eosio_build.sh [-P]
+```
+
+## Manual Installation of Dependencies
+
+Below are instructions to install the EOSIO dependencies manually on various platforms:
+
+* [MacOS Mojave](00_macos-mojave.md)
+* [Amazon Linux](01_amazon-linux.md)
+* [CentOS Linux](02_centos-linux.md)
+* [Ubuntu Linux](03_ubuntu-linux.md)
+
+EOSIO dependencies can also be built and installed manually by reproducing the same commands invoked by the [Build Script](../../00_build-script.md). The actual commands can be generated from the script directly by exporting specific environment variables and CLI parameters to the script when invoked:
+
+```sh
+$ cd ~/eosio/eos
+$ export VERBOSE=true && export DRYRUN=true && ./scripts/eosio_build.sh -y [-P]
+```
+
+[[info | Automatic installation of dependencies]]
+| (#automatic-installation-of-dependencies) should be preferred over manual installation if possible.
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
new file mode 100644
index 00000000000..37b58d9b904
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
@@ -0,0 +1,43 @@
+# EOSIO Manual Build
+
+[[warning | Reminder]]
+| This section assumes that you have already installed the EOSIO dependencies manually. If not, visit the [Manual Installation of EOSIO Dependencies](00_eosio-dependencies/index.md#manual-installation-of-dependencies) section.
+
+## Instructions
+
+Please follow the steps below to build the EOSIO software manually on your selected OS:
+
+### All Platforms
+
+Create and change to the `build` folder under the `eos` folder:
+
+```sh
+$ mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build
+```
+
+### MacOS
+
+Use the following command on MacOS to build the EOSIO binaries manually:
+
+```sh
+$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make .. && make -j$(getconf _NPROCESSORS_ONLN)"
+```
+
+### Amazon Linux or CentOS Linux
+
+Use the following command on Amazon Linux or CentOS Linux to build the EOSIO binaries manually:
+
+```sh
+$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib64/ccache:\$PATH && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
+```
+
+### Ubuntu Linux
+
+Use the following command on Ubuntu Linux to build the EOSIO binaries manually:
+
+```sh
+$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib/ccache:\${PATH} && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
+```
+
+[[info | What's Next?]]
+| [Install EOSIO binaries manually](../../03_install-eosio-binaries.md#using-make-install)
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
new file mode 100644
index 00000000000..68202be4a32
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
@@ -0,0 +1,29 @@
+# EOSIO Manual Build
+
+[[info | Manual Builds are for Advanced Developers]]
+| These manual instructions are intended for advanced developers. The [Build Script](../00_build-script.md) should be the preferred method to build EOSIO from source. If the script fails or your platform is not supported, continue with the instructions below.
+
+## EOSIO Dependencies
+
+When performing a manual build, it is necessary to install specific software packages that the EOSIO software depends on. To learn more about these dependencies, visit the [EOSIO Software Dependencies](00_eosio-dependencies/index.md) section.
+
+## Instructions
+
+The following steps will build the EOSIO binaries manually by invoking commands on the shell:
+
+1. [Manual Install of EOSIO Dependencies](00_eosio-dependencies/index.md)
+2. [Manual Build of EOSIO Binaries](01_eosio-manual-build.md)
+
+## Out-of-source Builds
+
+While building dependencies and EOSIO binaries, out-of-source builds are also supported. Refer to the `cmake` help for more information.
+
+# Other Compilers
+
+To override `clang`'s default compiler toolchain, add these flags to the `cmake` command within the above instructions:
+
+`-DCMAKE_CXX_COMPILER=/path/to/c++ -DCMAKE_C_COMPILER=/path/to/cc`
+
+## Debug Builds
+
+For a debug build, add `-DCMAKE_BUILD_TYPE=Debug`. Other common build types include `Release` and `RelWithDebInfo`.
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/index.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/index.md
new file mode 100644
index 00000000000..6757ba67e33
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/index.md
@@ -0,0 +1,12 @@
+# Build EOSIO Binaries
+
+[[info | Reminder]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../00_install-prebuilt-binaries.md) instead of building from source.
+
+EOSIO can be built on several platforms using different building methods. Advanced users may opt to build EOSIO from the build script. Node operators or block producers who wish to deploy a public node, may prefer manual methods.
+
+* [Build Script](00_build-script.md) - Suitable for the majority of developers, this script builds on Mac OS and many flavors of Linux.
+* [Manual Build](02_manual-build/index.md) - Suitable for those platforms that may be hostile to the build script or for operators who need more control over their build.
+
+[[info | Installation Recommended]]
+| After building EOSIO successfully, it is highly recommended to [install the EOSIO binaries](../03_install-eosio-binaries.md). This copies the EOSIO binaries to a central location, such as `~/eosio/x.y/bin`, where `x.y` is the EOSIO release version.
diff --git a/docs/00_install/01_build-from-source/03_install-eosio-binaries.md b/docs/00_install/01_build-from-source/03_install-eosio-binaries.md
new file mode 100644
index 00000000000..cb02ab4a2d5
--- /dev/null
+++ b/docs/00_install/01_build-from-source/03_install-eosio-binaries.md
@@ -0,0 +1,18 @@
+
+## Using install script
+
+For ease of contract development, content can be installed at the `/usr/local` folder using the `eosio_install.sh` script within the `eos/scripts` folder. Adequate permission is required to install on system folders:
+
+```sh
+$ cd ~/eosio/eos
+$ sudo ./scripts/eosio_install.sh
+```
+
+## Using make install
+
+In lieu of the `eosio_install.sh` script, you can install the EOSIO binaries directly by invoking `make install` target within the `eos/build` folder. Again, adequate permission is required to install on system folders:
+
+```sh
+$ cd ~/eosio/eos/build
+$ sudo make install
+```
diff --git a/docs/00_install/01_build-from-source/04_build-validation.md b/docs/00_install/01_build-from-source/04_build-validation.md
new file mode 100644
index 00000000000..ae72767ccee
--- /dev/null
+++ b/docs/00_install/01_build-from-source/04_build-validation.md
@@ -0,0 +1,29 @@
+
+Optionally, a set of tests can be run against your build to perform some basic validation.
+
+To run the test suite after building, start `mongod`:
+
+On Linux platforms:
+```sh
+~/opt/mongodb/bin/mongod -f ~/opt/mongodb/mongod.conf &
+```
+
+On MacOS:
+```sh
+/usr/local/bin/mongod -f /usr/local/etc/mongod.conf &
+```
+
+and set the build path to EOSIO_HOME by the following:
+```sh
+export EOSIO_HOME=~/eosio/eos/build
+```
+
+then run `make test` on all platforms:
+
+```sh
+cd ~/eosio/eos/build
+make test
+```
+
+[[info | Recommend]]
+| An optional but strongly suggested `make install` step after [building EOSIO from source](index.md) makes local development significantly more friendly.
diff --git a/docs/00_install/01_build-from-source/05_uninstall-eosio.md b/docs/00_install/01_build-from-source/05_uninstall-eosio.md
new file mode 100644
index 00000000000..d8a80a87b71
--- /dev/null
+++ b/docs/00_install/01_build-from-source/05_uninstall-eosio.md
@@ -0,0 +1,10 @@
+
+If you have previously built EOSIO from source and now wish to install the prebuilt binaries, or to build from source again, it is recommended to run the `eosio_uninstall.sh` script within the `eos/scripts` folder:
+
+```sh
+$ cd ~/eosio/eos
+$ sudo ./scripts/eosio_uninstall.sh
+```
+
+[[info | Uninstall Dependencies]]
+| The uninstall script will also prompt the user to uninstall EOSIO dependencies. This is recommended if installing prebuilt EOSIO binaries or building EOSIO for the first time.
diff --git a/docs/00_install/01_build-from-source/index.md b/docs/00_install/01_build-from-source/index.md
new file mode 100644
index 00000000000..11fd626e390
--- /dev/null
+++ b/docs/00_install/01_build-from-source/index.md
@@ -0,0 +1,11 @@
+# Build EOSIO from Source
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../00_install-prebuilt-binaries.md) instead of building from source.
+
+To build the EOSIO binaries from the source code, just follow the steps below:
+
+1. [Download EOSIO Source](01_download-eosio-source.md)
+2. [Build EOSIO Binaries](02_build-eosio-binaries/index.md)
+3. [Install EOSIO Binaries](03_install-eosio-binaries.md)
+4. [Build Validation](04_build-validation.md)
diff --git a/docs/00_install/index.md b/docs/00_install/index.md
new file mode 100644
index 00000000000..fc69df995af
--- /dev/null
+++ b/docs/00_install/index.md
@@ -0,0 +1,19 @@
+# EOSIO Software Installation
+
+There are various ways to install and use the EOSIO software:
+
+* [Install EOSIO Prebuilt Binaries](00_install-prebuilt-binaries.md)
+* [Build EOSIO from Source](01_build-from-source/index.md)
+
+[[info]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](00_install-prebuilt-binaries.md), then proceed to the [Getting Started](https://developers.eos.io/eosio-home/docs/) section of the [EOSIO Developer Portal](https://developers.eos.io/). If you are an advanced developer, a block producer, or no binaries are available for your platform, you may need to [Build EOSIO from source](01_build-from-source/index.md) instead.
+
+## Supported Operating Systems
+
+EOSIO currently supports the following operating systems:
+
+1. Amazon Linux 2
+2. CentOS 7
+3. Ubuntu 16.04
+4. Ubuntu 18.04
+5. MacOS 10.14 (Mojave)
diff --git a/docs/01_nodeos/02_usage/00_nodeos-options.md b/docs/01_nodeos/02_usage/00_nodeos-options.md
new file mode 100644
index 00000000000..97291a9ef37
--- /dev/null
+++ b/docs/01_nodeos/02_usage/00_nodeos-options.md
@@ -0,0 +1,448 @@
+
+`Nodeos` is a command line interface (CLI) application. As such, it can be started manually from the command line or through an automated script. The behavior of `nodeos` is determined mainly by which plugins are loaded and which plugin options are used. The `nodeos` application features two main option categories: *nodeos-specific* options and *plugin-specific* options.
+
+## Nodeos-specific Options
+
+Nodeos-specific options are used mainly for housekeeping purposes, such as setting the directory where the blockchain data resides, specifying the name of the `nodeos` configuraton file, setting the name and path of the logging configuration file, etc. A sample output from running  `$ nodeos --help` is displayed below, showing the nodeos-specific options (Note: the plugin-specific options have been excluded for clarity):
+
+```console
+Application Config Options:
+  --plugin arg                          Plugin(s) to enable, may be specified 
+                                        multiple times
+
+Application Command Line Options:
+  -h [ --help ]                         Print this help message and exit.
+  -v [ --version ]                      Print version information.
+  --full-version                        Print full version information.
+  --print-default-config                Print default configuration template
+  -d [ --data-dir ] arg                 Directory containing program runtime 
+                                        data
+  --config-dir arg                      Directory containing configuration 
+                                        files such as config.ini
+  -c [ --config ] arg (=config.ini)     Configuration file name relative to 
+                                        config-dir
+  -l [ --logconf ] arg (=logging.json)  Logging configuration file name/path 
+                                        for library users
+```
+
+## Plugin-specific Options
+
+Plugin-specific options control the behavior of the nodeos plugins. Every plugin-specific option has a unique name, so it can be specified in any order within the command line or `config.ini` file. When specifying one or more plugin-specific option(s), the applicable plugin(s) must also be enabled using the `--plugin` option or else the corresponding option(s) will be ignored. A sample output from running `$ nodeos --help` is displayed below, showing an excerpt from the plugin-specific options:
+
+```console
+Config Options for eosio::chain_plugin:
+  --blocks-dir arg (="blocks")          the location of the blocks directory 
+                                        (absolute path or relative to 
+                                        application data dir)
+  --protocol-features-dir arg (="protocol_features")
+                                        the location of the protocol_features 
+                                        directory (absolute path or relative to
+                                        application config dir)
+  --checkpoint arg                      Pairs of [BLOCK_NUM,BLOCK_ID] that 
+                                        should be enforced as checkpoints.
+  --wasm-runtime runtime                Override default WASM runtime
+  --abi-serializer-max-time-ms arg (=15000)
+                                        Override default maximum ABI 
+                                        serialization time allowed in ms
+  --chain-state-db-size-mb arg (=1024)  Maximum size (in MiB) of the chain 
+                                        state database
+  --chain-state-db-guard-size-mb arg (=128)
+                                        Safely shut down node when free space 
+                                        remaining in the chain state database 
+                                        drops below this size (in MiB).
+  --reversible-blocks-db-size-mb arg (=340)
+                                        Maximum size (in MiB) of the reversible
+                                        blocks database
+  --reversible-blocks-db-guard-size-mb arg (=2)
+                                        Safely shut down node when free space 
+                                        remaining in the reverseible blocks 
+                                        database drops below this size (in 
+                                        MiB).
+  --signature-cpu-billable-pct arg (=50)
+                                        Percentage of actual signature recovery
+                                        cpu to bill. Whole number percentages, 
+                                        e.g. 50 for 50%
+  --chain-threads arg (=2)              Number of worker threads in controller 
+                                        thread pool
+  --contracts-console                   print contract's output to console
+  --actor-whitelist arg                 Account added to actor whitelist (may 
+                                        specify multiple times)
+  --actor-blacklist arg                 Account added to actor blacklist (may 
+                                        specify multiple times)
+  --contract-whitelist arg              Contract account added to contract 
+                                        whitelist (may specify multiple times)
+  --contract-blacklist arg              Contract account added to contract 
+                                        blacklist (may specify multiple times)
+  --action-blacklist arg                Action (in the form code::action) added
+                                        to action blacklist (may specify 
+                                        multiple times)
+  --key-blacklist arg                   Public key added to blacklist of keys 
+                                        that should not be included in 
+                                        authorities (may specify multiple 
+                                        times)
+  --sender-bypass-whiteblacklist arg    Deferred transactions sent by accounts 
+                                        in this list do not have any of the 
+                                        subjective whitelist/blacklist checks 
+                                        applied to them (may specify multiple 
+                                        times)
+  --read-mode arg (=speculative)        Database read mode ("speculative", 
+                                        "head", "read-only", "irreversible").
+                                        In "speculative" mode database contains
+                                        changes done up to the head block plus 
+                                        changes made by transactions not yet 
+                                        included to the blockchain.
+                                        In "head" mode database contains 
+                                        changes done up to the current head 
+                                        block.
+                                        In "read-only" mode database contains 
+                                        changes done up to the current head 
+                                        block and transactions cannot be pushed
+                                        to the chain API.
+                                        In "irreversible" mode database 
+                                        contains changes done up to the last 
+                                        irreversible block and transactions 
+                                        cannot be pushed to the chain API.
+                                        
+  --validation-mode arg (=full)         Chain validation mode ("full" or 
+                                        "light").
+                                        In "full" mode all incoming blocks will
+                                        be fully validated.
+                                        In "light" mode all incoming blocks 
+                                        headers will be fully validated; 
+                                        transactions in those validated blocks 
+                                        will be trusted 
+                                        
+  --disable-ram-billing-notify-checks   Disable the check which subjectively 
+                                        fails a transaction if a contract bills
+                                        more RAM to another account within the 
+                                        context of a notification handler (i.e.
+                                        when the receiver is not the code of 
+                                        the action).
+  --maximum-variable-signature-length arg (=16384)
+                                        Subjectively limit the maximum length 
+                                        of variable components in a variable 
+                                        legnth signature to this size in bytes
+  --trusted-producer arg                Indicate a producer whose blocks 
+                                        headers signed by it will be fully 
+                                        validated, but transactions in those 
+                                        validated blocks will be trusted.
+  --database-map-mode arg (=mapped)     Database map mode ("mapped", "heap", or
+                                        "locked").
+                                        In "mapped" mode database is memory 
+                                        mapped as a file.
+                                        In "heap" mode database is preloaded in
+                                        to swappable memory.
+                                        In "locked" mode database is preloaded 
+                                        and locked in to memory.
+                                        
+
+Command Line Options for eosio::chain_plugin:
+  --genesis-json arg                    File to read Genesis State from
+  --genesis-timestamp arg               override the initial timestamp in the 
+                                        Genesis State file
+  --print-genesis-json                  extract genesis_state from blocks.log 
+                                        as JSON, print to console, and exit
+  --extract-genesis-json arg            extract genesis_state from blocks.log 
+                                        as JSON, write into specified file, and
+                                        exit
+  --print-build-info                    print build environment information to 
+                                        console as JSON and exit
+  --extract-build-info arg              extract build environment information 
+                                        as JSON, write into specified file, and
+                                        exit
+  --fix-reversible-blocks               recovers reversible block database if 
+                                        that database is in a bad state
+  --force-all-checks                    do not skip any checks that can be 
+                                        skipped while replaying irreversible 
+                                        blocks
+  --disable-replay-opts                 disable optimizations that specifically
+                                        target replay
+  --replay-blockchain                   clear chain state database and replay 
+                                        all blocks
+  --hard-replay-blockchain              clear chain state database, recover as 
+                                        many blocks as possible from the block 
+                                        log, and then replay those blocks
+  --delete-all-blocks                   clear chain state database and block 
+                                        log
+  --truncate-at-block arg (=0)          stop hard replay / block log recovery 
+                                        at this block number (if set to 
+                                        non-zero number)
+  --import-reversible-blocks arg        replace reversible block database with 
+                                        blocks imported from specified file and
+                                        then exit
+  --export-reversible-blocks arg        export reversible block database in 
+                                        portable format into specified file and
+                                        then exit
+  --snapshot arg                        File to read Snapshot State from
+
+Config Options for eosio::history_plugin:
+  -f [ --filter-on ] arg                Track actions which match 
+                                        receiver:action:actor. Actor may be 
+                                        blank to include all. Action and Actor 
+                                        both blank allows all from Recieiver. 
+                                        Receiver may not be blank.
+  -F [ --filter-out ] arg               Do not track actions which match 
+                                        receiver:action:actor. Action and Actor
+                                        both blank excludes all from Reciever. 
+                                        Actor blank excludes all from 
+                                        reciever:action. Receiver may not be 
+                                        blank.
+
+Config Options for eosio::http_client_plugin:
+  --https-client-root-cert arg          PEM encoded trusted root certificate 
+                                        (or path to file containing one) used 
+                                        to validate any TLS connections made.  
+                                        (may specify multiple times)
+                                        
+  --https-client-validate-peers arg (=1)
+                                        true: validate that the peer 
+                                        certificates are valid and trusted, 
+                                        false: ignore cert errors
+
+Config Options for eosio::http_plugin:
+  --unix-socket-path arg                The filename (relative to data-dir) to 
+                                        create a unix socket for HTTP RPC; set 
+                                        blank to disable.
+  --http-server-address arg (=127.0.0.1:8888)
+                                        The local IP and port to listen for 
+                                        incoming http connections; set blank to
+                                        disable.
+  --https-server-address arg            The local IP and port to listen for 
+                                        incoming https connections; leave blank
+                                        to disable.
+  --https-certificate-chain-file arg    Filename with the certificate chain to 
+                                        present on https connections. PEM 
+                                        format. Required for https.
+  --https-private-key-file arg          Filename with https private key in PEM 
+                                        format. Required for https
+  --https-ecdh-curve arg (=secp384r1)   Configure https ECDH curve to use: 
+                                        secp384r1 or prime256v1
+  --access-control-allow-origin arg     Specify the Access-Control-Allow-Origin
+                                        to be returned on each request.
+  --access-control-allow-headers arg    Specify the Access-Control-Allow-Header
+                                        s to be returned on each request.
+  --access-control-max-age arg          Specify the Access-Control-Max-Age to 
+                                        be returned on each request.
+  --access-control-allow-credentials    Specify if Access-Control-Allow-Credent
+                                        ials: true should be returned on each 
+                                        request.
+  --max-body-size arg (=1048576)        The maximum body size in bytes allowed 
+                                        for incoming RPC requests
+  --http-max-bytes-in-flight-mb arg (=500)
+                                        Maximum size in megabytes http_plugin 
+                                        should use for processing http 
+                                        requests. 503 error response when 
+                                        exceeded.
+  --verbose-http-errors                 Append the error log to HTTP responses
+  --http-validate-host arg (=1)         If set to false, then any incoming 
+                                        "Host" header is considered valid
+  --http-alias arg                      Additionaly acceptable values for the 
+                                        "Host" header of incoming HTTP 
+                                        requests, can be specified multiple 
+                                        times.  Includes http/s_server_address 
+                                        by default.
+  --http-threads arg (=2)               Number of worker threads in http thread
+                                        pool
+
+Config Options for eosio::login_plugin:
+  --max-login-requests arg (=1000000)   The maximum number of pending login 
+                                        requests
+  --max-login-timeout arg (=60)         The maximum timeout for pending login 
+                                        requests (in seconds)
+
+Config Options for eosio::net_plugin:
+  --p2p-listen-endpoint arg (=0.0.0.0:9876)
+                                        The actual host:port used to listen for
+                                        incoming p2p connections.
+  --p2p-server-address arg              An externally accessible host:port for 
+                                        identifying this node. Defaults to 
+                                        p2p-listen-endpoint.
+  --p2p-peer-address arg                The public endpoint of a peer node to 
+                                        connect to. Use multiple 
+                                        p2p-peer-address options as needed to 
+                                        compose a network.
+                                          Syntax: host:port[:<trx>|<blk>]
+                                          The optional 'trx' and 'blk' 
+                                        indicates to node that only 
+                                        transactions 'trx' or blocks 'blk' 
+                                        should be sent.  Examples:
+                                            p2p.eos.io:9876
+                                            p2p.trx.eos.io:9876:trx
+                                            p2p.blk.eos.io:9876:blk
+                                        
+  --p2p-max-nodes-per-host arg (=1)     Maximum number of client nodes from any
+                                        single IP address
+  --agent-name arg (="EOS Test Agent")  The name supplied to identify this node
+                                        amongst the peers.
+  --allowed-connection arg (=any)       Can be 'any' or 'producers' or 
+                                        'specified' or 'none'. If 'specified', 
+                                        peer-key must be specified at least 
+                                        once. If only 'producers', peer-key is 
+                                        not required. 'producers' and 
+                                        'specified' may be combined.
+  --peer-key arg                        Optional public key of peer allowed to 
+                                        connect.  May be used multiple times.
+  --peer-private-key arg                Tuple of [PublicKey, WIF private key] 
+                                        (may specify multiple times)
+  --max-clients arg (=25)               Maximum number of clients from which 
+                                        connections are accepted, use 0 for no 
+                                        limit
+  --connection-cleanup-period arg (=30) number of seconds to wait before 
+                                        cleaning up dead connections
+  --max-cleanup-time-msec arg (=10)     max connection cleanup time per cleanup
+                                        call in millisec
+  --net-threads arg (=2)                Number of worker threads in net_plugin 
+                                        thread pool
+  --sync-fetch-span arg (=100)          number of blocks to retrieve in a chunk
+                                        from any individual peer during 
+                                        synchronization
+  --use-socket-read-watermark arg (=0)  Enable expirimental socket read 
+                                        watermark optimization
+  --peer-log-format arg (=["${_name}" ${_ip}:${_port}])
+                                        The string used to format peers when 
+                                        logging messages about them.  Variables
+                                        are escaped with ${<variable name>}.
+                                        Available Variables:
+                                           _name  self-reported name
+                                        
+                                           _id    self-reported ID (64 hex 
+                                                  characters)
+                                        
+                                           _sid   first 8 characters of 
+                                                  _peer.id
+                                        
+                                           _ip    remote IP address of peer
+                                        
+                                           _port  remote port number of peer
+                                        
+                                           _lip   local IP address connected to
+                                                  peer
+                                        
+                                           _lport local port number connected 
+                                                  to peer
+                                        
+                                        
+
+Config Options for eosio::producer_plugin:
+
+  -e [ --enable-stale-production ]      Enable block production, even if the 
+                                        chain is stale.
+  -x [ --pause-on-startup ]             Start this node in a state where 
+                                        production is paused
+  --max-transaction-time arg (=30)      Limits the maximum time (in 
+                                        milliseconds) that is allowed a pushed 
+                                        transaction's code to execute before 
+                                        being considered invalid
+  --max-irreversible-block-age arg (=-1)
+                                        Limits the maximum age (in seconds) of 
+                                        the DPOS Irreversible Block for a chain
+                                        this node will produce blocks on (use 
+                                        negative value to indicate unlimited)
+  -p [ --producer-name ] arg            ID of producer controlled by this node 
+                                        (e.g. inita; may specify multiple 
+                                        times)
+  --private-key arg                     (DEPRECATED - Use signature-provider 
+                                        instead) Tuple of [public key, WIF 
+                                        private key] (may specify multiple 
+                                        times)
+  --signature-provider arg (=EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV=KEY:5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3)
+                                        Key=Value pairs in the form 
+                                        <public-key>=<provider-spec>
+                                        Where:
+                                           <public-key>    is a string form of 
+                                                           a vaild EOSIO public
+                                                           key
+                                        
+                                           <provider-spec> is a string in the 
+                                                           form <provider-type>
+                                                           :<data>
+                                        
+                                           <provider-type> is KEY, or KEOSD
+                                        
+                                           KEY:<data>      is a string form of 
+                                                           a valid EOSIO 
+                                                           private key which 
+                                                           maps to the provided
+                                                           public key
+                                        
+                                           KEOSD:<data>    is the URL where 
+                                                           keosd is available 
+                                                           and the approptiate 
+                                                           wallet(s) are 
+                                                           unlocked
+  --keosd-provider-timeout arg (=5)     Limits the maximum time (in 
+                                        milliseconds) that is allowed for 
+                                        sending blocks to a keosd provider for 
+                                        signing
+  --greylist-account arg                account that can not access to extended
+                                        CPU/NET virtual resources
+  --greylist-limit arg (=1000)          Limit (between 1 and 1000) on the 
+                                        multiple that CPU/NET virtual resources
+                                        can extend during low usage (only 
+                                        enforced subjectively; use 1000 to not 
+                                        enforce any limit)
+  --produce-time-offset-us arg (=0)     offset of non last block producing time
+                                        in microseconds. Negative number 
+                                        results in blocks to go out sooner, and
+                                        positive number results in blocks to go
+                                        out later
+  --last-block-time-offset-us arg (=0)  offset of last block producing time in 
+                                        microseconds. Negative number results 
+                                        in blocks to go out sooner, and 
+                                        positive number results in blocks to go
+                                        out later
+  --max-scheduled-transaction-time-per-block-ms arg (=100)
+                                        Maximum wall-clock time, in 
+                                        milliseconds, spent retiring scheduled 
+                                        transactions in any block before 
+                                        returning to normal transaction 
+                                        processing.
+  --subjective-cpu-leeway-us arg (=31000)
+                                        Time in microseconds allowed for a 
+                                        transaction that starts with 
+                                        insufficient CPU quota to complete and 
+                                        cover its CPU usage.
+  --incoming-defer-ratio arg (=1)       ratio between incoming transations and 
+                                        deferred transactions when both are 
+                                        exhausted
+  --incoming-transaction-queue-size-mb arg (=1024)
+                                        Maximum size (in MiB) of the incoming 
+                                        transaction queue. Exceeding this value
+                                        will subjectively drop transaction with
+                                        resource exhaustion.
+  --producer-threads arg (=2)           Number of worker threads in producer 
+                                        thread pool
+  --snapshots-dir arg (="snapshots")    the location of the snapshots directory
+                                        (absolute path or relative to 
+                                        application data dir)
+
+Config Options for eosio::state_history_plugin:
+  --state-history-dir arg (="state-history")
+                                        the location of the state-history 
+                                        directory (absolute path or relative to
+                                        application data dir)
+  --trace-history                       enable trace history
+  --chain-state-history                 enable chain state history
+  --state-history-endpoint arg (=127.0.0.1:8080)
+                                        the endpoint upon which to listen for 
+                                        incoming connections. Caution: only 
+                                        expose this port to your internal 
+                                        network.
+  --trace-history-debug-mode            enable debug mode for trace history
+
+Command Line Options for eosio::state_history_plugin:
+  --delete-state-history                clear state history files
+
+Config Options for eosio::txn_test_gen_plugin:
+  --txn-reference-block-lag arg (=0)    Lag in number of blocks from the head 
+                                        block when selecting the reference 
+                                        block for transactions (-1 means Last 
+                                        Irreversible Block)
+  --txn-test-gen-threads arg (=2)       Number of worker threads in 
+                                        txn_test_gen thread pool
+  --txn-test-gen-account-prefix arg (=txn.test.)
+                                        Prefix to use for accounts generated 
+                                        and used by this plugin
+```
+
+For more information on each plugin-specific option, just visit the [Plugins](../03_plugins/index.md) section.
diff --git a/docs/01_nodeos/02_usage/01_nodeos-configuration.md b/docs/01_nodeos/02_usage/01_nodeos-configuration.md
new file mode 100644
index 00000000000..3dd689e4ba9
--- /dev/null
+++ b/docs/01_nodeos/02_usage/01_nodeos-configuration.md
@@ -0,0 +1,60 @@
+
+The plugin-specific options can be configured using either CLI options or a configuration file, `config.ini`. Nodeos-specific options can only be configured from the command line. All CLI options and `config.ini` options can be found by running `$ nodeos --help` as shown above.
+
+Each `config.ini` option has a corresponding CLI option. However, not all CLI options are available in `config.ini`. For instance, most plugin-specific options that perform actions are not available in `config.ini`, such as `--delete-state-history` from `state_history_plugin`.
+
+For example, the CLI option `--plugin eosio::chain_api_plugin` can also be set by adding `plugin = eosio::chain_api_plugin` in `config.ini`.
+
+## `config.ini` location
+
+The default `config.ini` can be found in the following folders:
+- Mac OS: `~/Library/Application Support/eosio/nodeos/config`
+- Linux: `~/.local/share/eosio/nodeos/config`
+
+A custom `config.ini` file can be set by passing the `nodeos` option `--config path/to/config.ini`.
+
+## Nodeos Example
+
+The example below shows a typical usage of `nodeos` when starting a block producing node:
+
+```sh
+$ nodeos --replay-blockchain \
+  -e -p eosio \
+  --plugin eosio::producer_plugin  \
+  --plugin eosio::chain_api_plugin \
+  --plugin eosio::http_plugin      \
+  >> nodeos.log 2>&1 &
+```
+
+```sh
+$ nodeos \
+  -e -p eosio \
+  --data-dir /users/mydir/eosio/data     \
+  --config-dir /users/mydir/eosio/config \
+  --plugin eosio::producer_plugin      \
+  --plugin eosio::chain_plugin         \
+  --plugin eosio::http_plugin          \
+  --plugin eosio::state_history_plugin \
+  --contracts-console   \
+  --disable-replay-opts \
+  --access-control-allow-origin='*' \
+  --http-validate-host=false        \
+  --verbose-http-errors             \
+  --state-history-dir /shpdata \
+  --trace-history              \
+  --chain-state-history        \
+  >> nodeos.log 2>&1 &
+```
+
+The above `nodeos` command starts a producing node by:
+
+* enabling block production (`-e`)
+* identifying itself as block producer "eosio" (`-p`)
+* setting the blockchain data directory (`--data-dir`)
+* setting the `config.ini` directory (`--config-dir`)
+* loading plugins `producer_plugin`, `chain_plugin`, `http_plugin`, `state_history_plugin` (`--plugin`)
+* passing `chain_plugin` options (`--contracts-console`, `--disable-replay-opts`)
+* passing `http-plugin` options (`--access-control-allow-origin`, `--http-validate-host`, `--verbose-http-errors`)
+* passing `state_history` options (`--state-history-dir`, `--trace-history`, `--chain-state-history`)
+* redirecting both `stdout` and `stderr` to the `nodeos.log` file
+* returning to the shell by running in the background (&)
diff --git a/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md b/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
new file mode 100644
index 00000000000..6368c5d2271
--- /dev/null
+++ b/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
@@ -0,0 +1,94 @@
+
+[[info | System contracts required]]
+| These instructions assume you want to launch a producing node on a network with **system contracts loaded**. These instructions will not work on a default development node using native functionality, or one without system contracts loaded.
+
+## Goal
+
+This section describes how to set up a producing node within the EOSIO network. A producing node, as its name implies, is a node that is configured to produce blocks in an `EOSIO` based blockchain. This functionality if provided through the `producer_plugin` as well as other [Nodeos Plugins](../../03_plugins/index.md).
+
+## Before you begin
+
+* [Install the EOSIO software](../../../00_install/index.md) before starting this section.
+* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built from source, make sure to run the [install script](../../../00_install/01_build-from-source/03_install-eosio-binaries.md).
+* Know how to pass [Nodeos options](../../02_usage/00_nodeos-options.md) to enable or disable functionality.
+
+## Steps
+
+Please follow the steps below to set up a producing node:
+
+1. [Register your account as a producer](#1-register-your-account-as-a-producer)
+2. [Set Producer Name](#2-set-producer-name)
+3. [Set the Producer's signature-provider](#3-set-the-producers-signature-provider)
+4. [Define a peers list](#4-define-a-peers-list)
+5. [Load the Required Plugins](#5-load-the-required-plugins)
+
+### 1. Register your account as a producer
+
+In order for your account to be eligible as a producer, you will need to register the account as a producer:
+
+```sh
+$ cleos system regproducer accountname1 EOS1234534... http://producer.site Antarctica
+```
+
+### 2. Set Producer Name
+
+Set the `producer-name` option in `config.ini` to your account, as follows:
+
+```console
+# config.ini:
+
+# ID of producer controlled by this node (e.g. inita; may specify multiple times) (eosio::producer_plugin)
+producer-name = youraccount
+```
+
+### 3. Set the Producer's signature-provider
+
+You will need to set the private key for your producer. The public key should have an authority for the producer account defined above. 
+
+`signature-provider` is defined with a 3-field tuple:
+* `public-key` - A valid EOSIO public key in form of a string.
+* `provider-spec` - It's a string formatted like <provider-type>:<data>
+* `provider-type` - KEY or KEOSD
+
+#### Using a Key:
+
+```console
+# config.ini:
+
+signature-provider = PUBLIC_SIGNING_KEY=KEY:PRIVATE_SIGNING_KEY
+
+//Example
+//signature-provider = EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV=KEY:5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3
+```
+
+#### Using Keosd:
+You can also use Keosd instead of hard-defining keys. 
+
+```console
+# config.ini:
+
+signature-provider = KEOSD:<data>   
+
+//Example
+//EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV=KEOSD:https://127.0.0.1:88888
+```
+
+### 4. Define a peers list
+
+```console
+# config.ini:
+
+# Default p2p port is 9876
+p2p-peer-address = 123.255.78.9:9876
+```
+
+### 5. Load the Required Plugins
+
+In your [config.ini](../index.md), confirm the following plugins are loading or append them if necessary. 
+
+```console
+# config.ini:
+
+plugin = eosio::chain_plugin
+plugin = eosio::producer_plugin
+```
diff --git a/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md b/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
new file mode 100644
index 00000000000..d729e79cca1
--- /dev/null
+++ b/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
@@ -0,0 +1,37 @@
+
+## Goal
+
+This section describes how to set up a non-producing node within the EOSIO network. A non-producing node is a node that is not configured to produce blocks, instead it is connected and synchronized with other peers from an `EOSIO` based blockchain, exposing one or more services publicly or privately by enabling one or more [Nodeos Plugins](../../03_plugins/index.md), except the `producer_plugin`.
+
+## Before you begin
+
+* [Install the EOSIO software](../../../00_install/index.md) before starting this section.
+* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built from source, make sure to run the [install script](../../../00_install/01_build-from-source/03_install-eosio-binaries.md).
+* Know how to pass [Nodeos options](../../02_usage/00_nodeos-options.md) to enable or disable functionality.
+
+## Steps
+
+To setup a non-producing node is simple. 
+
+1. [Set Peers](#1-set-peers)
+2. [Enable one or more available plugins](#2-enable-one-or-more-available-plugins)
+
+### 1. Set Peers
+
+You need to set some peers in your config ini, for example:
+
+```console
+# config.ini:
+
+p2p-peer-address = 106.10.42.238:9876
+```
+
+Or you can include the peer in as a boot flag when running `nodeos`, as follows:
+
+```sh
+$ nodeos ... --p2p-peer-address=106.10.42.238:9876
+```
+
+### 2. Enable one or more available plugins
+
+Each available plugin is listed and detailed in the [Nodeos Plugins](../../03_plugins/index.md) section. When `nodeos` starts, it will expose the functionality provided by the enabled plugins it was started with. For example, if you start `nodeos` with [`state_history_plugin`](../../03_plugins/state_history_plugin/index.md) enabled, you will have a non-producing node that offers full blockchain history. If you start `nodeos` with [`http_plugin`](../../03_plugins/http_plugin/index.md) enabled, you will have a non-producing node which exposes the EOSIO RPC API. Therefore, you can extend the basic functionality provided by a non-producing node by enabling any number of existing plugins on top of it. Another aspect to consider is that some plugins have dependencies to other plugins. Therefore, you need to satisfy all dependencies for a plugin in order to enable it.
diff --git a/docs/01_nodeos/02_usage/02_node-setups/index.md b/docs/01_nodeos/02_usage/02_node-setups/index.md
new file mode 100644
index 00000000000..7fa608fff40
--- /dev/null
+++ b/docs/01_nodeos/02_usage/02_node-setups/index.md
@@ -0,0 +1,10 @@
+# Nodeos Common Setups
+
+`Nodeos` generally runs in two modes:
+
+ * [Producing Node](00_producing-node.md)
+ * [Non-Producing Node](01_non-producing-node.md)
+
+`Producing Nodes` are configured for block production. They connect to the peer-to-peer network and actively produce new blocks. Loose transactions are also validated and relayed. On mainnet, `Producing Nodes` only produce blocks if their assigned block producer is part of an active schedule.
+
+`Non-Producing Nodes` connect to the peer-to-peer network but do not actively produce new blocks; they are useful for acting as proxy nodes, relaying API calls, validating transactions, broadcasting information to other nodes, etc. `Non-Producing Nodes` are also useful for monitoring the blockchain state.
diff --git a/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md b/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
new file mode 100644
index 00000000000..1239b0ed71f
--- /dev/null
+++ b/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
@@ -0,0 +1,119 @@
+
+## Goal
+
+This section describes how to set up a single-node blockchain configuration running on a single host.  This is referred to as a _**single host, single-node testnet**_.  We will set up one node on your local computer and have it produce blocks.  The following diagram depicts the desired single host testnet.
+
+![Single host single node testnet](single-host-single-node-testnet.png)
+
+`cleos` is used to manage the wallets, manage the accounts, and invoke actions on the blockchain.  `keosd` performs wallet management, including digital signing.  If not started explicitly, `keosd` is started by `cleos` by default.
+
+## Before you begin
+
+* [Install the EOSIO software](../../../00_install/index.md) before starting this section.
+* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built from source, make sure to run the [install script](../../../00_install/01_build-from-source/03_install-eosio-binaries.md).
+* Know how to pass [Nodeos options](../../02_usage/00_nodeos-options.md) to enable or disable functionality.
+
+## Steps
+
+Open one "terminal" window and perform the following steps:
+
+1. [Start the Producer Node](#1-start-the-producer-node)
+2. [Get Node Info](#2-get-node-info)
+
+### 1. Start the Producer Node
+
+Start your own single-node blockchain with this single command:
+
+```sh
+$ nodeos -e -p eosio --plugin eosio::chain_api_plugin --plugin eosio::history_api_plugin
+```
+
+[[info | Nodeos Minimal Options]]
+| A minimal `nodeos` instance setup for block production requires both `chain_api_plugin` and `history_api_plugin` with the `-e` option (enable stale production) and `-p eosio` option (producer name `eosio`). Alternatively, you can also setup and specify your own account as the producer name.
+
+After running `nodeos`, you should get log messages similar as below. It means the blocks are successfully produced.
+
+```console
+1575001ms thread-0   chain_controller.cpp:235      _push_block          ] initm #1 @2017-09-04T04:26:15  | 0 trx, 0 pending, exectime_ms=0
+1575001ms thread-0   producer_plugin.cpp:207       block_production_loo ] initm generated block #1 @ 2017-09-04T04:26:15 with 0 trxs  0 pending
+1578001ms thread-0   chain_controller.cpp:235      _push_block          ] initc #2 @2017-09-04T04:26:18  | 0 trx, 0 pending, exectime_ms=0
+1578001ms thread-0   producer_plugin.cpp:207       block_production_loo ] initc generated block #2 @ 2017-09-04T04:26:18 with 0 trxs  0 pending
+...
+eosio generated block 046b9984... #101527 @ 2018-04-01T14:24:58.000 with 0 trxs
+eosio generated block 5e527ee2... #101528 @ 2018-04-01T14:24:58.500 with 0 trxs
+...
+```
+At this point, `nodeos` is running with a single producer, `eosio`.
+
+### 2. Get Node Info
+
+Get info about the producing node:
+
+```sh
+$ cleos get info
+```
+
+This should produce output that looks similar to this:
+
+```console
+{
+  "server_version": "0f9df63e",
+  "chain_id": "cf057bbfb72640471fd910bcb67639c22df9f92470936cddc1ade0e2f2e7dc4f",
+  "head_block_num": 134,
+  "last_irreversible_block_num": 133,
+  "last_irreversible_block_id": "00000085060e9872849ef87bef3b19ab07de9faaed71154510c7f0aeeaddae2c",
+  "head_block_id": "000000861e3222dce1c7c2cfb938940d8aac22c816cc8b0b89f6bf65a8ad5bdc",
+  "head_block_time": "2019-11-18T22:13:10.500",
+  "head_block_producer": "eosio",
+  "virtual_block_cpu_limit": 228396,
+  "virtual_block_net_limit": 1197744,
+  "block_cpu_limit": 199900,
+  "block_net_limit": 1048576,
+  "server_version_string": "v2.0.0-rc2",
+  "fork_db_head_block_num": 134,
+  "fork_db_head_block_id": "000000861e3222dce1c7c2cfb938940d8aac22c816cc8b0b89f6bf65a8ad5bdc",
+  "server_full_version_string": "v2.0.0-rc2-0f9df63e1eca4dda4cb7df30683f4a1220599444"
+}
+```
+
+## Advanced Steps
+
+The more advanced user will likely have need to modify the configuration.  `nodeos` uses a custom configuration folder.  The location of this folder is determined by your system.
+
+* Mac OS: `~/Library/Application\ Support/eosio/nodeos/config`
+* Linux: `~/.local/share/eosio/nodeos/config`
+
+The build seeds this folder with a default `genesis.json` file.  A configuration folder can be specified using the `--config-dir` command line argument to `nodeos`.  If you use this option, you will need to manually copy a `genesis.json` file to your config folder.
+ 
+`nodeos` will need a properly configured `config.ini` file in order to do meaningful work.  On startup, `nodeos` looks in the config folder for `config.ini`.  If one is not found, a default `config.ini` file is created.  If you do not already have a `config.ini` file ready to use, run `nodeos` and then close it immediately with <kbd>Ctrl-C</kbd>.  A default configuration (`config.ini`) will have been created in the config folder.  Edit the `config.ini` file, adding/updating the following settings to the defaults already in place:
+
+```console
+# config.ini:
+
+    # Enable production on a stale chain, since a single-node test chain is pretty much always stale
+    enable-stale-production = true
+    # Enable block production with the testnet producers
+    producer-name = eosio
+    # Load the block producer plugin, so you can produce blocks
+    plugin = eosio::producer_plugin
+    # As well as API and HTTP plugins
+    plugin = eosio::chain_api_plugin
+    plugin = eosio::http_plugin
+    plugin = eosio::history_api_plugin
+```
+
+Now it should be possible to run `nodeos` and see it begin producing blocks.
+
+```sh
+$ nodeos
+```
+
+`nodeos` stores runtime data (e.g., shared memory and log content) in a custom data folder.  The location of this folder is determined by your system.
+
+* Mac OS: `~/Library/Application\ Support/eosio/nodeos/data`
+* Linux: `~/.local/share/eosio/nodeos/data`
+ 
+A data folder can be specified using the `--data-dir` command line argument to `nodeos`.
+
+[[info | What's next?]]
+| We will explore how to setup and run a [single-host, multi-node testnet](#01_local-multi-node-testnet.md).
diff --git a/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md b/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
new file mode 100644
index 00000000000..58df0597585
--- /dev/null
+++ b/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
@@ -0,0 +1,212 @@
+
+## Goal
+
+This section describes how to set up a multi-node blockchain configuration running on a single host.  This is referred to as a _**single host, multi-node testnet**_.  We will set up two nodes on your local computer and have them communicate with each other.  The examples in this section rely on three command-line applications, `nodeos`, `keosd`, and `cleos`.  The following diagram depicts the desired testnet configuration.
+
+![Single host multi node testnet](single-host-multi-node-testnet.png)
+
+## Before you begin
+
+* [Install the EOSIO software](../../../00_install/index.md) before starting this section.
+* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built from source, make sure to run the [install script](../../../00_install/01_build-from-source/03_install-eosio-binaries.md).
+* Know how to pass [Nodeos options](../../02_usage/00_nodeos-options.md) to enable or disable functionality.
+
+## Steps
+
+Open four "terminal" windows and perform the following steps:
+
+1. [Start the Wallet Manager](#1-start-the-wallet-manager)
+2. [Create a Default Wallet](#2-create-a-default-wallet)
+3. [Loading the EOSIO Key](#3-loading-the-eosio-key)
+4. [Start the First Producer Node](#4-start-the-first-producer-node)
+5. [Start the Second Producer Node](#5-start-the-second-producer-node)
+6. [Get Nodes Info](#6-get-nodes-info)
+
+### 1. Start the Wallet Manager
+
+In the first terminal window, start `keosd`, the wallet management application:
+
+```sh
+$ keosd --http-server-address 127.0.0.1:8899
+```
+
+If successful, `keosd` will display some information, starting with:
+
+```console
+2493323ms thread-0   wallet_plugin.cpp:39          plugin_initialize    ] initializing wallet plugin
+2493323ms thread-0   http_plugin.cpp:141           plugin_initialize    ] host: 127.0.0.1 port: 8899
+2493323ms thread-0   http_plugin.cpp:144           plugin_initialize    ] configured http to listen on 127.0.0.1:8899
+2493323ms thread-0   http_plugin.cpp:213           plugin_startup       ] start listening for http requests
+2493324ms thread-0   wallet_api_plugin.cpp:70      plugin_startup       ] starting wallet_api_plugin
+```
+
+Look for a line saying the wallet is listening on 127.0.0.1:8899. This will indicate that `keosd` started correctly and is listening on the correct port. If you see anything else, or you see some error report prior to "starting wallet_api_plugin", then you need to diagnose the issue and restart.
+
+When `keosd` is running correctly, leave that window open with the wallet app running and move to the next terminal window.
+
+### 2. Create a Default Wallet
+
+In the next terminal window, use `cleos`, the command-line utility, to create the default wallet.
+
+```sh
+$ cleos --wallet-url http://127.0.0.1:8899  wallet create --to-console
+```
+
+`cleos` will indicate that it created the "default" wallet, and will provide a password for future wallet access. As the message says, be sure to preserve this password for future use. Here is an example of this output:
+
+```console
+Creating wallet: default
+Save password to use in the future to unlock this wallet.
+Without password imported keys will not be retrievable.
+"PW5JsmfYz2wrdUEotTzBamUCAunAA8TeRZGT57Ce6PkvM12tre8Sm"
+```
+
+`keosd` will generate some status output in its window. We will continue to use this second window for subsequent `cleos` commands.
+
+### 3. Loading the EOSIO Key
+
+The private blockchain launched in the steps above is created with a default initial key which must be loaded into the wallet.
+
+```sh
+$ cleos --wallet-url http://127.0.0.1:8899 wallet import --private-key 5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3
+```
+
+```console
+imported private key for: EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV
+```
+
+### 4. Start the First Producer Node
+
+We can now start the first producer node. In the third terminal window run:
+
+```sh
+$ nodeos --enable-stale-production --producer-name eosio --plugin eosio::chain_api_plugin --plugin eosio::net_api_plugin
+```
+
+This creates a special producer, known as the "bios" producer. Assuming everything has executed correctly to this point, you should see output from the `nodeos` process reporting block creation.
+
+### 5. Start the Second Producer Node
+
+The following commands assume that you are running this tutorial from the `eos\build` directory, from which you ran `./eosio_build.sh` to build the EOSIO binaries.
+
+To start additional nodes, you must first load the `eosio.bios` contract. This contract enables you to have direct control over the resource allocation of other accounts and to access other privileged API calls. Return to the second terminal window and run the following command to load the contract:
+
+```sh
+$ cleos --wallet-url http://127.0.0.1:8899 set contract eosio build/contracts/eosio.bios
+```
+
+We will create an account to become a producer, using the account name `inita`.  To create the account, we need to generate keys to associate with the account, and import those into our wallet.
+
+Run the create key command:
+
+```sh
+$ cleos create key
+```
+
+[[caution | Caution]]
+| The command line instructions that follow use the private/public keys shown below. In order to be able to cut-and-paste the command line instructions directly from this tutorial, use those keys instead of the ones generated from your `cleos create key` command. If you still want to use your newly generated keys, you need to replace the key values with yours in the commands that follow.
+
+This will report newly generated public and private keypairs that will look similar to the following.
+
+```console
+Private key: 5JgbL2ZnoEAhTudReWH1RnMuQS6DBeLZt4ucV6t8aymVEuYg7sr
+Public key: EOS6hMjoWRF2L8x9YpeqtUEcsDKAyxSuM1APicxgRU1E3oyV5sDEg
+```
+
+Now import the private key portion into your wallet. If successful, the matching public key will be reported. This should match the previously generated public key:
+
+```sh
+$ cleos --wallet-url http://127.0.0.1:8899 wallet import 5JgbL2ZnoEAhTudReWH1RnMuQS6DBeLZt4ucV6t8aymVEuYg7sr
+```
+
+```console
+imported private key for: EOS6hMjoWRF2L8x9YpeqtUEcsDKAyxSuM1APicxgRU1E3oyV5sDEg
+```
+
+Create the `inita` account that we will use to become a producer. The `create account` command requires two public keys, one for the account's owner key and one for its active key.  In this example, the newly created public key is used twice, as both the owner key and the active key. Example output from the create command is shown:
+
+```sh
+$ cleos --wallet-url http://127.0.0.1:8899 create account eosio inita EOS6hMjoWRF2L8x9YpeqtUEcsDKAyxSuM1APicxgRU1E3oyV5sDEg EOS6hMjoWRF2L8x9YpeqtUEcsDKAyxSuM1APicxgRU1E3oyV5sDEg
+```
+
+```console
+executed transaction: d1ea511977803d2d88f46deb554f5b6cce355b9cc3174bec0da45fc16fe9d5f3  352 bytes  102400 cycles
+#         eosio <= eosio::newaccount            {"creator":"eosio","name":"inita","owner":{"threshold":1,"keys":[{"key":"EOS6hMjoWRF2L8x9YpeqtUEcsDK...
+```
+
+We now have an account that is available to have a contract assigned to it, enabling it to do meaningful work. In other tutorials, the account has been used to establish simple contracts. In this case, the account will be designated as a block producer.
+
+In the fourth terminal window, start a second `nodeos` instance. Notice that this command line is substantially longer than the one we used above to create the first producer. This is necessary to avoid collisions with the first `nodeos` instance. Fortunately, you can just cut and paste this command line and adjust the keys:
+
+```sh
+$ nodeos --producer-name inita --plugin eosio::chain_api_plugin --plugin eosio::net_api_plugin --http-server-address 127.0.0.1:8889 --p2p-listen-endpoint 127.0.0.1:9877 --p2p-peer-address 127.0.0.1:9876 --config-dir node2 --data-dir node2 --private-key [\"EOS6hMjoWRF2L8x9YpeqtUEcsDKAyxSuM1APicxgRU1E3oyV5sDEg\",\"5JgbL2ZnoEAhTudReWH1RnMuQS6DBeLZt4ucV6t8aymVEuYg7sr\"]
+```
+
+The output from this new node will show a little activity but will stop reporting until the last step in this tutorial, when the `inita` account is registered as a producer account and activated. Here is some example output from a newly started node. Your output might look a little different, depending on how much time you took entering each of these commands. Furthermore, this example is only the last few lines of output:
+
+```console
+2393147ms thread-0   producer_plugin.cpp:176       plugin_startup       ] producer plugin:  plugin_startup() end
+2393157ms thread-0   net_plugin.cpp:1271           start_sync           ] Catching up with chain, our last req is 0, theirs is 8249 peer dhcp15.ociweb.com:9876 - 295f5fd
+2393158ms thread-0   chain_controller.cpp:1402     validate_block_heade ] head_block_time 2018-03-01T12:00:00.000, next_block 2018-04-05T22:31:08.500, block_interval 500
+2393158ms thread-0   chain_controller.cpp:1404     validate_block_heade ] Did not produce block within block_interval 500ms, took 3061868500ms)
+2393512ms thread-0   producer_plugin.cpp:241       block_production_loo ] Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)
+2395680ms thread-0   net_plugin.cpp:1385           recv_notice          ] sync_manager got last irreversible block notice
+2395680ms thread-0   net_plugin.cpp:1271           start_sync           ] Catching up with chain, our last req is 8248, theirs is 8255 peer dhcp15.ociweb.com:9876 - 295f5fd
+2396002ms thread-0   producer_plugin.cpp:226       block_production_loo ] Previous result occurred 5 times
+2396002ms thread-0   producer_plugin.cpp:244       block_production_loo ] Not producing block because it isn't my turn, its eosio
+```
+
+At this point, the second `nodeos` is an idle producer. To turn it into an active producer, `inita` needs to be registered as a producer with the bios node, and the bios node needs to perform an action to update the producer schedule.
+
+```sh
+$ cleos --wallet-url http://127.0.0.1:8899 push action eosio setprods "{ \"schedule\": [{\"producer_name\": \"inita\",\"block_signing_key\": \"EOS6hMjoWRF2L8x9YpeqtUEcsDKAyxSuM1APicxgRU1E3oyV5sDEg\"}]}" -p eosio@active
+```
+
+```console
+executed transaction: 2cff4d96814752aefaf9908a7650e867dab74af02253ae7d34672abb9c58235a  272 bytes  105472 cycles
+#         eosio <= eosio::setprods              {"version":1,"producers":[{"producer_name":"inita","block_signing_key":"EOS6hMjoWRF2L8x9YpeqtUEcsDKA...
+```
+
+Congratulations, you have now configured a two-node testnet! You can see that the original node is no longer producing blocks but it is receiving them. You can verify this by running the `get info` commmand against each node.
+
+### 6. Get Nodes Info
+
+Get info about the first node:
+
+```sh
+$ cleos get info
+```
+
+This should produce output that looks similar to this:
+
+```console
+{
+  "server_version": "223565e8",
+  "head_block_num": 11412,
+  "last_irreversible_block_num": 11411,
+  "head_block_id": "00002c94daf7dff456cd940bd585c4d9b38e520e356d295d3531144329c8b6c3",
+  "head_block_time": "2018-04-06T00:06:14",
+  "head_block_producer": "inita"
+}
+```
+
+Now for the second node:
+
+```sh
+$ cleos --url http://127.0.0.1:8889 get info
+```
+
+This should produce output that looks similar to this:
+
+```console
+{
+  "server_version": "223565e8",
+  "head_block_num": 11438,
+  "last_irreversible_block_num": 11437,
+  "head_block_id": "00002cae32697444fa9a2964e4db85b5e8fd4c8b51529a0c13e38587c1bf3c6f",
+  "head_block_time": "2018-04-06T00:06:27",
+  "head_block_producer": "inita"
+}
+```
+
+In a later tutorial we will explore how to use more advanced tools to run a multi-host, multi-node testnet.
diff --git a/docs/01_nodeos/02_usage/03_development-environment/index.md b/docs/01_nodeos/02_usage/03_development-environment/index.md
new file mode 100644
index 00000000000..029dc36d0cd
--- /dev/null
+++ b/docs/01_nodeos/02_usage/03_development-environment/index.md
@@ -0,0 +1,24 @@
+# Development Environment
+
+There are several ways to configure a `nodeos` environment for development and testing. Which option to use largely depends on what the project goals are. Some practical options are provided below.
+
+## Local Single-Node Testnet
+
+This is the go-to option for smart contract developers, aspiring Block Producers or Non-Producing Node operators. It has the most simple configuration with the least number of requirements.
+
+* [Configure Nodeos as a Local Single-node Testnet](00_local-single-node-testnet.md) 
+
+## Local Multi-Node Testnet
+
+While this option can technically be used for smart contract development, it may be overkill. This is most beneficial for those who are working on aspects of core development, such as benchmarking, optimization and experimentation. It's also a good option for hands-on learning and concept proofing.
+
+* [Configure Nodeos as a Local Two-Node Testnet](01_local-multi-node-testnet.md)
+* [Configure Nodeos as a Local 21-Node Testnet](https://github.com/EOSIO/eos/blob/master/tutorials/bios-boot-tutorial/README.md)
+
+## Third-Party Testnets
+
+The following third-party testnets are available for testing EOSIO dApps and smart contracts:
+
+* Jungle Testnet [monitor](https://monitor.jungletestnet.io/), [website](https://jungletestnet.io/)
+* [CryptoKylin Testnet](https://www.cryptokylin.io/)
+* [Telos Testnet](https://mon-test.telosfoundation.io/)
diff --git a/docs/01_nodeos/02_usage/03_development-environment/single-host-multi-node-testnet.png b/docs/01_nodeos/02_usage/03_development-environment/single-host-multi-node-testnet.png
new file mode 100644
index 0000000000000000000000000000000000000000..86b63c571f36bee71d72e9bed282ec8d9bd53af2
GIT binary patch
literal 213042
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%0DreFBOX2&%~KqSy?Z3JAS3ZUp|1|?
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
L)5=su(}4d2d3sH<

literal 0
HcmV?d00001

diff --git a/docs/01_nodeos/02_usage/03_development-environment/single-host-single-node-testnet.png b/docs/01_nodeos/02_usage/03_development-environment/single-host-single-node-testnet.png
new file mode 100644
index 0000000000000000000000000000000000000000..0698c40e213c0bc5974453903294de6b77c8486c
GIT binary patch
literal 182310
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

literal 0
HcmV?d00001

diff --git a/docs/01_nodeos/02_usage/05_nodeos-implementation.md b/docs/01_nodeos/02_usage/05_nodeos-implementation.md
new file mode 100644
index 00000000000..31e0fd841c9
--- /dev/null
+++ b/docs/01_nodeos/02_usage/05_nodeos-implementation.md
@@ -0,0 +1,58 @@
+
+The EOSIO platform stores blockchain information in various data structures at various stages of a transaction's lifecycle. Some of these are described below. The producing node is the `nodeos` instance run by the block producer who is currently creating blocks for the blockchain (which changes every 6 seconds, producing 12 blocks in sequence before switching to another producer.)
+
+## Blockchain State and Storage
+
+Every `nodeos` instance creates some internal files to housekeep the blockchain state. These files reside in the `~/eosio/nodeos/data` installation directory and their purpose is described below:
+
+* The `block.log` is an append only log of blocks written to disk and contains all the irreversible blocks.
+* `Reversible_blocks` is a memory mapped file and contains blocks that have been written to the blockchain but have not yet become irreversible.
+* The `chain state` or `database` is a memory mapped file, storing the blockchain state of each block (account details, deferred transactions, transactions, data stored using multi index tables in smart contracts, etc.). Once a block becomes irreversible we no longer cache the chain state.
+* The `pending block` is an in memory block containing transactions as they are processed into a block, this will/may eventually become the head block. If this instance of `nodeos` is the producing node then the pending block is distributed to other `nodeos` instances.
+* The head block is the last block written to the blockchain, stored in `reversible_blocks`.
+
+## Nodeos Read Modes
+
+EOSIO provides a set of [services and interfaces](https://developers.eos.io/eosio-cpp/docs/db-api) that enable contract developers to persist state across action, and consequently transaction, boundaries. Contracts may use these services and interfaces for different purposes. For example, `eosio.token` contract keeps balances for all users in the database.
+
+Each instance of `nodeos` keeps the database in memory, so contracts can read and write data.   `nodeos` also provides access to this data over HTTP RPC API for reading the database.
+
+However, at any given time there can be multiple correct ways to query that data: 
+- `speculative`: this includes the side effects of confirmed and unconfirmed transactions.
+- `head`: this only includes the side effects of confirmed transactions, this mode processes unconfirmed transactions but does not include them.
+- `read-only`: this only includes the side effects of confirmed transactions.
+- `irreversible`: this mode also includes confirmed transactions only up to those included in the last irreversible block.
+
+A transaction is considered confirmed when a `nodeos` instance has received, processed, and written it to a block on the blockchain, i.e. it is in the head block or an earlier block.
+
+### Speculative Mode
+
+Clients such as `cleos` and the RPC API, will see database state as of the current head block plus changes made by all transactions known to this node but potentially not included in the chain, unconfirmed transactions for example.
+
+Speculative mode is low latency but fragile, there is no guarantee that the transactions reflected in the state will be included in the chain OR that they will reflected in the same order the state implies.  
+
+This mode features the lowest latency, but is the least consistent. 
+
+In speculative mode `nodeos` is able to execute transactions which have TaPoS (Transaction as Proof of Stake) pointing to any valid block in a fork considered to be the best fork by this node.
+
+### Head Mode
+
+Clients such as `cleos` and the RPC API will see database state as of the current head block of the chain.  Since current head block is not yet irreversible and short-lived forks are possible, state read in this mode may become inaccurate  if `nodeos` switches to a better fork.  Note that this is also true of speculative mode.  
+
+This mode represents a good trade-off between highly consistent views of the data and latency.
+
+In this mode `nodeos` is able to execute transactions which have TaPoS pointing to any valid block in a fork considered to be the best fork by this node.
+
+### Read-Only Mode
+
+Clients such as `cleos` and the RPC API will see database state as of the current head block of the chain. It **will not** include changes made by transactions known to this node but not included in the chain, such as unconfirmed transactions.
+
+### Irreversible Mode
+
+When `nodeos` is configured to be in irreversible read mode, it will still track the most up-to-date blocks in the fork database, but the state will lag behind the current best head block, sometimes referred to as the fork DB head, to always reflect the state of the last irreversible block. 
+
+Clients such as `cleos` and the RPC API will see database state as of the current head block of the chain. It **will not** include changes made by transactions known to this node but not included in the chain, such as unconfirmed transactions.
+
+## How To Specify the Read Mode
+
+The mode in which `nodeos` is run can be specified using the `--read-mode` option from the `eosio::chain_plugin`.
diff --git a/docs/01_nodeos/02_usage/index.md b/docs/01_nodeos/02_usage/index.md
new file mode 100644
index 00000000000..7ce07849a2f
--- /dev/null
+++ b/docs/01_nodeos/02_usage/index.md
@@ -0,0 +1,10 @@
+# Nodeos Usage
+
+This section explains how to use `nodeos`, lists its configuration options, describes its local file layout, provides common setups, and discusses the potential test environments for development.
+
+* [Options](00_nodeos-options.md) - Setting up `nodeos`; nodeos vs. plugin only options.
+* [Configuration](01_nodeos-configuration.md) - CLI vs. `config.ini` options; `nodeos` example.
+* [Node Setups](02_node-setups/index.md) - Producing vs. non-producing nodes setup.
+* [Development Environment](03_development-environment/index.md) - Setting up a development/test environment.
+* [Nodeos Implementation](05_nodeos-implementation.md) - Blockchain state and storage, `nodeos` read modes.
+* [Deprecation Notices](https://github.com/EOSIO/eos/issues/7597) - Lists `nodeos` deprecated functionality.
diff --git a/docs/01_nodeos/03_plugins/chain_api_plugin/index.md b/docs/01_nodeos/03_plugins/chain_api_plugin/index.md
new file mode 100644
index 00000000000..a430896df19
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/chain_api_plugin/index.md
@@ -0,0 +1,38 @@
+# chain_api_plugin
+
+## Description
+
+The `chain_api_plugin` exposes functionality from the [`chain_plugin`](../chain_plugin/index.md) to the RPC API interface managed by the [`http_plugin`](../http_plugin/index.md).
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::chain_api_plugin
+
+# command-line
+$ nodeos ... --plugin eosio::chain_api_plugin
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`chain_plugin`](../chain_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::chain_plugin
+[options]
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::chain_plugin [operations] [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/01_nodeos/03_plugins/chain_plugin/index.md b/docs/01_nodeos/03_plugins/chain_plugin/index.md
new file mode 100644
index 00000000000..6fac390f160
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/chain_plugin/index.md
@@ -0,0 +1,174 @@
+# chain_plugin
+
+## Description
+
+The `chain_plugin` is a core plugin required to process and aggregate chain data on an EOSIO node.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::chain_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::chain_plugin [operations] [options]
+```
+
+## Operations
+
+These can only be specified from the `nodeos` command-line:
+
+```console
+Command Line Options for eosio::chain_plugin:
+
+  --genesis-json arg                    File to read Genesis State from
+  --genesis-timestamp arg               override the initial timestamp in the 
+                                        Genesis State file
+  --print-genesis-json                  extract genesis_state from blocks.log 
+                                        as JSON, print to console, and exit
+  --extract-genesis-json arg            extract genesis_state from blocks.log 
+                                        as JSON, write into specified file, and
+                                        exit
+  --fix-reversible-blocks               recovers reversible block database if 
+                                        that database is in a bad state
+  --force-all-checks                    do not skip any checks that can be 
+                                        skipped while replaying irreversible 
+                                        blocks
+  --disable-replay-opts                 disable optimizations that specifically
+                                        target replay
+  --replay-blockchain                   clear chain state database and replay 
+                                        all blocks
+  --hard-replay-blockchain              clear chain state database, recover as 
+                                        many blocks as possible from the block 
+                                        log, and then replay those blocks
+  --delete-all-blocks                   clear chain state database and block 
+                                        log
+  --truncate-at-block arg (=0)          stop hard replay / block log recovery 
+                                        at this block number (if set to 
+                                        non-zero number)
+  --import-reversible-blocks arg        replace reversible block database with 
+                                        blocks imported from specified file and
+                                        then exit
+  --export-reversible-blocks arg        export reversible block database in 
+                                        portable format into specified file and
+                                        then exit
+  --snapshot arg                        File to read Snapshot State from
+```
+
+## Options
+
+These can be specified from both the `nodeos` command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::chain_plugin:
+
+  --blocks-dir arg (="blocks")          the location of the blocks directory 
+                                        (absolute path or relative to 
+                                        application data dir)
+  --protocol-features-dir arg (="protocol_features")
+                                        the location of the protocol_features 
+                                        directory (absolute path or relative to
+                                        application config dir)
+  --checkpoint arg                      Pairs of [BLOCK_NUM,BLOCK_ID] that 
+                                        should be enforced as checkpoints.
+  --wasm-runtime wavm/wabt              Override default WASM runtime
+  --abi-serializer-max-time-ms arg (=15000)
+                                        Override default maximum ABI 
+                                        serialization time allowed in ms
+  --chain-state-db-size-mb arg (=1024)  Maximum size (in MiB) of the chain 
+                                        state database
+  --chain-state-db-guard-size-mb arg (=128)
+                                        Safely shut down node when free space 
+                                        remaining in the chain state database 
+                                        drops below this size (in MiB).
+  --reversible-blocks-db-size-mb arg (=340)
+                                        Maximum size (in MiB) of the reversible
+                                        blocks database
+  --reversible-blocks-db-guard-size-mb arg (=2)
+                                        Safely shut down node when free space 
+                                        remaining in the reverseible blocks 
+                                        database drops below this size (in 
+                                        MiB).
+  --signature-cpu-billable-pct arg (=50)
+                                        Percentage of actual signature recovery
+                                        cpu to bill. Whole number percentages, 
+                                        e.g. 50 for 50%
+  --chain-threads arg (=2)              Number of worker threads in controller 
+                                        thread pool
+  --contracts-console                   print contract's output to console
+  --actor-whitelist arg                 Account added to actor whitelist (may 
+                                        specify multiple times)
+  --actor-blacklist arg                 Account added to actor blacklist (may 
+                                        specify multiple times)
+  --contract-whitelist arg              Contract account added to contract 
+                                        whitelist (may specify multiple times)
+  --contract-blacklist arg              Contract account added to contract 
+                                        blacklist (may specify multiple times)
+  --action-blacklist arg                Action (in the form code::action) added
+                                        to action blacklist (may specify 
+                                        multiple times)
+  --key-blacklist arg                   Public key added to blacklist of keys 
+                                        that should not be included in 
+                                        authorities (may specify multiple 
+                                        times)
+  --sender-bypass-whiteblacklist arg    Deferred transactions sent by accounts 
+                                        in this list do not have any of the 
+                                        subjective whitelist/blacklist checks 
+                                        applied to them (may specify multiple 
+                                        times)
+  --read-mode arg (=speculative)        Database read mode ("speculative", 
+                                        "head", "read-only", "irreversible").
+                                        In "speculative" mode database contains
+                                        changes done up to the head block plus 
+                                        changes made by transactions not yet 
+                                        included to the blockchain.
+                                        In "head" mode database contains 
+                                        changes done up to the current head 
+                                        block.
+                                        In "read-only" mode database contains 
+                                        changes done up to the current head 
+                                        block and transactions cannot be pushed
+                                        to the chain API.
+                                        In "irreversible" mode database 
+                                        contains changes done up to the last 
+                                        irreversible block and transactions 
+                                        cannot be pushed to the chain API.
+                                        
+  --validation-mode arg (=full)         Chain validation mode ("full" or 
+                                        "light").
+                                        In "full" mode all incoming blocks will
+                                        be fully validated.
+                                        In "light" mode all incoming blocks 
+                                        headers will be fully validated; 
+                                        transactions in those validated blocks 
+                                        will be trusted 
+                                        
+  --disable-ram-billing-notify-checks   Disable the check which subjectively 
+                                        fails a transaction if a contract bills
+                                        more RAM to another account within the 
+                                        context of a notification handler (i.e.
+                                        when the receiver is not the code of 
+                                        the action).
+  --trusted-producer arg                Indicate a producer whose blocks 
+                                        headers signed by it will be fully 
+                                        validated, but transactions in those 
+                                        validated blocks will be trusted.
+  --database-map-mode arg (=mapped)     Database map mode ("mapped", "heap", or
+                                        "locked").
+                                        In "mapped" mode database is memory 
+                                        mapped as a file.
+                                        In "heap" mode database is preloaded in
+                                        to swappable memory.
+                                        In "locked" mode database is preloaded,
+                                        locked in to memory, and optionally can
+                                        use huge pages.
+                                        
+  --database-hugepage-path arg          Optional path for database hugepages 
+                                        when in "locked" mode (may specify 
+                                        multiple times)
+```
+
+## Dependencies
+
+None
diff --git a/docs/01_nodeos/03_plugins/db_size_api_plugin/index.md b/docs/01_nodeos/03_plugins/db_size_api_plugin/index.md
new file mode 100644
index 00000000000..357ab5fb749
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/db_size_api_plugin/index.md
@@ -0,0 +1,39 @@
+# db_size_api_plugin
+
+## Description
+
+The `db_size_api_plugin` retrieves analytics about the blockchain.
+
+* free_bytes
+* used_bytes
+* size
+* indices
+
+## Usage
+
+```console
+# Not available
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`chain_plugin`](../chain_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::chain_plugin
+[options]
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::chain_plugin [operations] [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/01_nodeos/03_plugins/faucet_testnet_plugin/index.md b/docs/01_nodeos/03_plugins/faucet_testnet_plugin/index.md
new file mode 100644
index 00000000000..42de7572def
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/faucet_testnet_plugin/index.md
@@ -0,0 +1,23 @@
+# faucet_testnet_plugin
+
+## Description
+
+The `faucet_testnet_plugin` provides an interface that assists in the automation of distributing tokens on an EOSIO testnet.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::faucet_testnet_plugin
+
+# command-line
+$ nodeos ... --plugin eosio::faucet_testnet_plugin
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`http_plugin`](../http_plugin/index.md)
diff --git a/docs/01_nodeos/03_plugins/history_api_plugin/index.md b/docs/01_nodeos/03_plugins/history_api_plugin/index.md
new file mode 100644
index 00000000000..3adbc66f7a8
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/history_api_plugin/index.md
@@ -0,0 +1,62 @@
+# history_api_plugin
+
+[[warning | Deprecation Notice]]
+| The `history_plugin` that the `history_api_plugin` depends upon is deprecated and will no longer be maintained. Please use the [`state_history_plugin`](../state_history_plugin/index.md) instead.
+
+## Description
+
+The `history_api_plugin` exposes functionality from the [`history_plugin`](../history_plugin/index.md) to the RPC API interface managed by the [`http_plugin`](../http_plugin/index.md), providing read-only access to blockchain data.
+
+It provides four RPC API endpoints:
+
+* get_actions
+* get_transaction
+* get_key_accounts
+* get_controlled_accounts
+
+[[info | More Info]]
+| See HISTORY section of [RPC API](https://developers.eos.io/eosio-nodeos/reference).
+
+The four actions listed above are used by the following Cleos commands (matching order):
+
+* get actions
+* get transaction
+* get accounts
+* get servants
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::history_api_plugin
+
+# command-line
+$ nodeos ... --plugin eosio::history_api_plugin
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`history_plugin`](../history_plugin/index.md)
+* [`chain_plugin`](../chain_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::history_plugin
+[options]
+plugin = eosio::chain_plugin
+[options]
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::history_plugin [options]  \
+             --plugin eosio::chain_plugin [operations] [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/01_nodeos/03_plugins/history_plugin/index.md b/docs/01_nodeos/03_plugins/history_plugin/index.md
new file mode 100644
index 00000000000..c8fbc7137eb
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/history_plugin/index.md
@@ -0,0 +1,42 @@
+# history_plugin
+
+[[warning | Deprecation Notice]]
+| The `history_plugin` is deprecated and will no longer be maintained. Please use the [`state_history_plugin`](../state_history_plugin/index.md) instead.
+
+## Description
+
+The `history_plugin` provides a cache layer to obtain historical data about the blockchain objects. It depends on [`chain_plugin`](../chain_plugin/index.md) for the data.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::history_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::history_plugin [options]
+```
+
+## Options
+
+These can be specified from both the `nodeos` command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::history_plugin:
+  -f [ --filter-on ] arg                Track actions which match 
+                                        receiver:action:actor. Actor may be 
+                                        blank to include all. Action and Actor 
+                                        both blank allows all from Recieiver. 
+                                        Receiver may not be blank.
+  -F [ --filter-out ] arg               Do not track actions which match 
+                                        receiver:action:actor. Action and Actor
+                                        both blank excludes all from Reciever. 
+                                        Actor blank excludes all from 
+                                        reciever:action. Receiver may not be 
+                                        blank.
+```
+
+## Dependencies
+
+* [`chain_plugin`](../chain_plugin/index.md)
diff --git a/docs/01_nodeos/03_plugins/http_client_plugin/index.md b/docs/01_nodeos/03_plugins/http_client_plugin/index.md
new file mode 100644
index 00000000000..2a92af9f597
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/http_client_plugin/index.md
@@ -0,0 +1,44 @@
+# http_client_plugin
+
+## Description
+
+The `http_client_plugin`  is an internal utility plugin, providing the `producer_plugin` the ability to use securely an external `keosd` instance as its block signer. It can only be used when the `producer_plugin` is configured to produce blocks.
+
+## Usage
+
+# config.ini
+plugin = eosio::http_client_plugin
+
+
+```sh
+# config.ini
+plugin = eosio::http_client_plugin
+https-client-root-cert = "path/to/my/certificate.pem"
+https-client-validate-peers = 1
+
+# command-line
+$ nodeos ... --plugin eosio::http_client_plugin  \
+             --https-client-root-cert "path/to/my/certificate.pem"  \
+             --https-client-validate-peers 1
+```
+
+## Options
+
+These can be specified from both the `nodeos` command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::http_client_plugin:
+  --https-client-root-cert arg          PEM encoded trusted root certificate 
+                                        (or path to file containing one) used 
+                                        to validate any TLS connections made.  
+                                        (may specify multiple times)
+                                        
+  --https-client-validate-peers arg (=1)
+                                        true: validate that the peer 
+                                        certificates are valid and trusted, 
+                                        false: ignore cert errors
+```
+
+## Dependencies
+
+* [`producer_plugin`](../producer_plugin/index.md)
diff --git a/docs/01_nodeos/03_plugins/http_plugin/index.md b/docs/01_nodeos/03_plugins/http_plugin/index.md
new file mode 100644
index 00000000000..922f94b00c4
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/http_plugin/index.md
@@ -0,0 +1,72 @@
+# http_plugin
+
+## Description
+
+The `http_plugin` is a core plugin supported by both `nodeos` and `keosd`. The plugin is required to enable any RPC API functionality provided by a `nodeos` or `keosd` instance.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::http_plugin [options]
+$ keosd ... --plugin eosio::http_plugin [options]
+```
+
+## Options
+
+These can be specified from both the command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::http_plugin:
+  --unix-socket-path arg                The filename (relative to data-dir) to 
+                                        create a unix socket for HTTP RPC; set 
+                                        blank to disable (=keosd.sock for keosd)
+  --http-server-address arg (=127.0.0.1:8888 for nodeos)
+                                        The local IP and port to listen for 
+                                        incoming http connections; set blank to
+                                        disable.
+  --https-server-address arg            The local IP and port to listen for 
+                                        incoming https connections; leave blank
+                                        to disable.
+  --https-certificate-chain-file arg    Filename with the certificate chain to 
+                                        present on https connections. PEM 
+                                        format. Required for https.
+  --https-private-key-file arg          Filename with https private key in PEM 
+                                        format. Required for https
+  --https-ecdh-curve arg (=secp384r1)   Configure https ECDH curve to use: 
+                                        secp384r1 or prime256v1
+  --access-control-allow-origin arg     Specify the Access-Control-Allow-Origin
+                                        to be returned on each request.
+  --access-control-allow-headers arg    Specify the Access-Control-Allow-Header
+                                        s to be returned on each request.
+  --access-control-max-age arg          Specify the Access-Control-Max-Age to 
+                                        be returned on each request.
+  --access-control-allow-credentials    Specify if Access-Control-Allow-Credent
+                                        ials: true should be returned on each 
+                                        request.
+  --max-body-size arg (=1048576)        The maximum body size in bytes allowed 
+                                        for incoming RPC requests
+  --http-max-bytes-in-flight-mb arg (=500)
+                                        Maximum size in megabytes http_plugin 
+                                        should use for processing http 
+                                        requests. 503 error response when 
+                                        exceeded.
+  --verbose-http-errors                 Append the error log to HTTP responses
+  --http-validate-host arg (=1)         If set to false, then any incoming 
+                                        "Host" header is considered valid
+  --http-alias arg                      Additionaly acceptable values for the 
+                                        "Host" header of incoming HTTP 
+                                        requests, can be specified multiple 
+                                        times.  Includes http/s_server_address 
+                                        by default.
+  --http-threads arg (=2)               Number of worker threads in http thread
+                                        pool
+```
+
+## Dependencies
+
+None
diff --git a/docs/01_nodeos/03_plugins/index.md b/docs/01_nodeos/03_plugins/index.md
new file mode 100644
index 00000000000..ad6fdaa9c32
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/index.md
@@ -0,0 +1,27 @@
+# Nodeos Plugins
+
+## Overview
+
+Plugins extend the core functionality implemented in `nodeos`. Some plugins are mandatory, such as `chain_plugin`, `net_plugin`, and `producer_plugin`, which reflect the modular design of `nodeos`. The other plugins are optional as they provide nice to have features, but non-essential for the nodes operation.
+
+For information on specific plugins, just select from the list below:
+
+* [`chain_api_plugin`](chain_api_plugin/index.md)
+* [`chain_plugin`](chain_plugin/index.md)
+* [`db_size_api_plugin`](db_size_api_plugin/index.md)
+* [`faucet_testnet_plugin`](faucet_testnet_plugin/index.md)
+* [`history_api_plugin`](history_api_plugin/index.md)
+* [`history_plugin`](history_plugin/index.md)
+* [`http_client_plugin`](http_client_plugin/index.md)
+* [`http_plugin`](http_plugin/index.md)
+* [`login_plugin`](login_plugin/index.md)
+* [`net_api_plugin`](net_api_plugin/index.md)
+* [`net_plugin`](net_plugin/index.md)
+* [`producer_plugin`](producer_plugin/index.md)
+* [`state_history_plugin`](state_history_plugin/index.md)
+* [`test_control_api_plugin`](test_control_api_plugin/index.md)
+* [`test_control_plugin`](test_control_plugin/index.md)
+* [`txn_test_gen_plugin`](txn_test_gen_plugin/index.md)
+
+[[info | Nodeos is modular]]
+| Plugins add incremental functionality to `nodeos`. Unlike runtime plugins, `nodeos` plugins are built at compile-time.
diff --git a/docs/01_nodeos/03_plugins/login_plugin/index.md b/docs/01_nodeos/03_plugins/login_plugin/index.md
new file mode 100644
index 00000000000..8f2ba95c311
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/login_plugin/index.md
@@ -0,0 +1,47 @@
+# login_plugin
+
+## Description
+
+The `login_plugin` supports the concept of applications authenticating with the EOSIO blockchain. The `login_plugin` API allows an application to verify whether an account is allowed to sign in order to satisfy a specified authority.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::login_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::login_plugin [options]
+```
+
+## Options
+
+These can be specified from both the `nodeos` command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::login_plugin:
+  --max-login-requests arg (=1000000)   The maximum number of pending login 
+                                        requests
+  --max-login-timeout arg (=60)         The maximum timeout for pending login 
+                                        requests (in seconds)
+```
+
+## Dependencies
+
+* [`chain_plugin`](../chain_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::chain_plugin
+[options]
+plugin = eosio::http_plugin 
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::chain_plugin [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/01_nodeos/03_plugins/mongo_db_plugin/index.md b/docs/01_nodeos/03_plugins/mongo_db_plugin/index.md
new file mode 100644
index 00000000000..c5018089968
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/mongo_db_plugin/index.md
@@ -0,0 +1,155 @@
+# mongo_db_plugin
+
+[[warning | Deprecation Notice]]
+| The `mongo_db_plugin` is deprecated and will no longer be maintained. Please refer to the [`state_history_plugin`](../state_history_plugin/index.md) and the [`history-tools`](../state_history_plugin/index.md#history-tools) for better options to archive blockchain data.
+
+## Description
+
+The optional `eosio::mongo_db_plugin` provides archiving of blockchain data into a MongoDB. It is recommended that the plugin be added to a non-producing node as it is designed to shut down on any failed insert into the MongoDB and it is resource intensive. For best results dedicate a `nodeos` instance to running this one plugin. The rationale behind this shutdown on error is so that any issues with connectivity or the mongo database can be fixed and `nodeos` can be restarted without having to resync or replay.
+
+## Important Notes
+
+* Documents stored in mongo by `mongo_db_plugin` which contain empty field/struct names will be stored with the field/struct name of `empty_field_name` / `empty_struct_name`.
+* Action data is stored on chain as raw bytes. This plugin attempts to use associated ABI on accounts to deserialize the raw bytes into expanded `abi_def` form for storage into mongo. Note that invalid or missing ABI on a contract will result in the action data being stored as raw bytes. For example the EOSIO system contract does not provide ABI for the `onblock` action so it is stored as raw bytes.
+* The `mongo_db_plugin` does slow down replay/resync as the conversion of block data to JSON and insertion into MongoDB is resource intensive. The plugin does use a worker thread for processing the block data, but this does not help much when replaying/resyncing.
+
+## Recommendations
+
+* It is recommended that a large `--abi-serializer-max-time-ms` value be passed into the `nodeos` running the `mongo_db_plugin` as the default ABI serializer time limit is not large enough to serialize large blocks.
+* Read-only mode should be used to avoid speculative execution. See [Nodeos Read Modes](../../02_usage/05_nodeos-implementation.md#nodeos-read-modes). Forked data is still recorded (data that never becomes irreversible) but speculative transaction processing and signaling is avoided, minimizing the transaction_traces/action_traces stored.
+
+## Options
+
+These can be specified from both the command-line or the `config.ini` file:
+
+```console
+  -q [ --mongodb-queue-size ] arg (=256)
+                                        The target queue size between nodeos
+                                        and MongoDB plugin thread.
+  --mongodb-abi-cache-size              The maximum size of the abi cache for
+                                        serializing data.
+  --mongodb-wipe                        Required with --replay-blockchain,
+                                        --hard-replay-blockchain, or
+                                        --delete-all-blocks to wipe mongo
+                                        db.This option required to prevent
+                                        accidental wipe of mongo db. 
+                                        Defaults to false.
+  --mongodb-block-start arg (=0)        If specified then only abi data pushed
+                                        to mongodb until specified block is
+                                        reached.
+  -m [ --mongodb-uri ] arg              MongoDB URI connection string, see:
+                                        https://docs.mongodb.com/master/referen
+                                        ce/connection-string/. If not specified
+                                        then plugin is disabled. Default
+                                        database 'EOS' is used if not specified
+                                        in URI. Example: mongodb://127.0.0.1:27
+                                        017/EOS
+  --mongodb-update-via-block-num arg (=0)
+                                        Update blocks/block_state with latest
+                                        via block number so that duplicates are
+                                        overwritten.                         
+  --mongodb-store-blocks                Enables storing blocks in mongodb.
+                                        Defaults to true.
+  --mongodb-store-block-states          Enables storing block state in mongodb.
+                                        Defaults to true.
+  --mongodb-store-transactions          Enables storing transactions in mongodb.
+                                        Defaults to true.
+  --mongodb-store-transaction-traces    Enables storing transaction traces in                                             mongodb.
+                                        Defaults to true.
+  --mongodb-store-action-traces         Enables storing action traces in mongodb.
+                                        Defaults to true.
+  --mongodb-filter-on                   Mongodb: Track actions which match
+                                        receiver:action:actor. Actor may be blank
+                                        to include all. Receiver and Action may
+                                        not be blank. Default is * include
+                                        everything.
+  --mongodb-filter-out                  Mongodb: Do not track actions which match
+                                        receiver:action:actor. Action and Actor
+                                        both blank excludes all from reciever.                                           Actor blank excludes all from
+                                        reciever:action. Receiver may not be
+                                        blank.
+```
+
+## Notes
+
+* `--mongodb-store-*` options all default to true.
+* `--mongodb-filter-*` options currently only applies to the `action_traces` collection.
+
+## Example Filters
+
+```console
+mongodb-filter-out = eosio:onblock:
+mongodb-filter-out = gu2tembqgage::
+mongodb-filter-out = blocktwitter:: 
+```
+
+[[warning | Warning]]
+| When the `mongo_db_plugin` is turned on, the target mongodb instance may take a lot of storage space. With all collections enabled and no filters applied, the mongodb data folder can easily occupy hundreds of GBs of data. It is recommended that you tailor the options and utilize the filters as you need in order to maximize storage efficiency.
+
+## Collections
+
+* `accounts` - created on applied transaction. Always updated even if `mongodb-store-action-traces=false`.
+  * Currently limited to just name and ABI if contract abi on account
+  * Mostly for internal use as the stored ABI is used to convert action data into JSON for storage as associated actions on contract are processed.
+  * Invalid ABI on account will prevent conversion of action data into JSON for storage resulting in just the action data being stored as hex. For example, the original eosio.system contract did not provide ABI for the `onblock` action and therefore all `onblock` action data is stored as hex until the time `onblock` ABI is added to the eosio.system contract.
+
+* `action_traces` - created on applied transaction
+  * `receipt` - action_trace action_receipt - see `eosio::chain::action_receipt`
+  * `trx_id` - transaction id
+  * `act` - action - see `eosio::chain::action`
+  * `elapsed` - time in microseconds to execute action
+  * `console` - console output of action. Always empty unless `contracts-console = true` option specified.
+
+* `block_states` - created on accepted block
+  * `block_num`
+  * `block_id`
+  * `block_header_state` - see `eosio::chain::block_header_state`
+  * `validated`
+  * `in_current_chain`
+
+* `blocks` - created on accepted block
+  * `block_num`
+  * `block_id`
+  * `block` - signed block - see `eosio::chain::signed_block`
+  * `validated` - added on irreversible block
+  * `in_current_chain` - added on irreversible block
+  * `irreversible=true` - added on irreversible block
+
+* `transaction_traces` - created on applied transaction
+  * see `chain::eosio::transaction_trace`
+
+* `transactions` - created on accepted transaction - does not include inline actions
+  * see `eosio::chain::signed_transaction`. In addition to signed_transaction data the following are also stored.
+  * `trx_id` - transaction id
+  * `irreversible=true` - added on irreversible block
+  * `block_id` - added on irreversble block
+  * `block_num` - added on irreversible block
+  * `signing_keys`
+  * `accepted`
+  * `implicit`
+  * `scheduled`
+
+* `account_controls` - created on applied transaction. Always updated even if `mongodb-store-action-traces=false`.
+  * `controlled_account`
+  * `controlling_permission`
+  * `controlling_account`
+
+The equivalent of `/v1/history/get_controlled_acounts` with mongo: `db.account_controls.find({"controlling_account":"hellozhangyi"}).pretty()`
+
+* `pub_keys` - created on applied transaction. Always updated even if `mongodb-store-action-traces=false`.
+  * `account`
+  * `permission`
+  * `public_key`
+
+## Examples
+
+The mongodb equivalent of `/v1/history/get_key_accounts` RPC API endpoint:
+
+```console
+db.pub_keys.find({"public_key":"EOS7EarnUhcyYqmdnPon8rm7mBCTnBoot6o7fE2WzjvEX2TdggbL3"}).pretty()
+```
+
+## Dependencies
+
+* [`chain_plugin`](../chain_plugin/index.md)
+* [`history_plugin`](../history_plugin/index.md)
diff --git a/docs/01_nodeos/03_plugins/net_api_plugin/index.md b/docs/01_nodeos/03_plugins/net_api_plugin/index.md
new file mode 100644
index 00000000000..af4bf4dd371
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/net_api_plugin/index.md
@@ -0,0 +1,50 @@
+# net_api_plugin
+
+## Description
+
+The `net_api_plugin` exposes functionality from the `net_plugin` to the RPC API interface managed by the `http_plugin`.
+
+The `net_api_plugin` provides four RPC API endpoints:
+
+* connect
+* disconnect
+* connections
+* status
+
+See [Net section of RPC API](https://developers.eos.io/eosio-nodeos/reference).
+
+[[caution | Caution]]
+| This plugin exposes endpoints that allow management of p2p connections. Running this plugin on a publicly accessible node is not recommended as it can be exploited.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::net_api_plugin
+
+# command-line
+$ nodeos ... --plugin eosio::net_api_plugin
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`net_plugin`](../net_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::net_plugin
+[options]
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::net_plugin [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/01_nodeos/03_plugins/net_plugin/index.md b/docs/01_nodeos/03_plugins/net_plugin/index.md
new file mode 100644
index 00000000000..84e7811b4dd
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/net_plugin/index.md
@@ -0,0 +1,91 @@
+# net_plugin
+
+## Description
+
+The `net_plugin` provides an authenticated p2p protocol to persistently synchronize nodes.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::net_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::net_plugin [options]
+```
+
+## Options
+
+These can be specified from both the `nodeos` command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::net_plugin:
+
+  --p2p-listen-endpoint arg (=0.0.0.0:9876)
+                                        The actual host:port used to listen for
+                                        incoming p2p connections.
+  --p2p-server-address arg              An externally accessible host:port for 
+                                        identifying this node. Defaults to 
+                                        p2p-listen-endpoint.
+  --p2p-peer-address arg                The public endpoint of a peer node to 
+                                        connect to. Use multiple 
+                                        p2p-peer-address options as needed to 
+                                        compose a network.
+  --p2p-max-nodes-per-host arg (=1)     Maximum number of client nodes from any
+                                        single IP address
+  --agent-name arg (="EOS Test Agent")  The name supplied to identify this node
+                                        amongst the peers.
+  --allowed-connection arg (=any)       Can be 'any' or 'producers' or 
+                                        'specified' or 'none'. If 'specified', 
+                                        peer-key must be specified at least 
+                                        once. If only 'producers', peer-key is 
+                                        not required. 'producers' and 
+                                        'specified' may be combined.
+  --peer-key arg                        Optional public key of peer allowed to 
+                                        connect.  May be used multiple times.
+  --peer-private-key arg                Tuple of [PublicKey, WIF private key] 
+                                        (may specify multiple times)
+  --max-clients arg (=25)               Maximum number of clients from which 
+                                        connections are accepted, use 0 for no 
+                                        limit
+  --connection-cleanup-period arg (=30) number of seconds to wait before 
+                                        cleaning up dead connections
+  --max-cleanup-time-msec arg (=10)     max connection cleanup time per cleanup
+                                        call in millisec
+  --network-version-match arg (=0)      True to require exact match of peer 
+                                        network version.
+  --net-threads arg (=1)                Number of worker threads in net_plugin 
+                                        thread pool
+  --sync-fetch-span arg (=100)          number of blocks to retrieve in a chunk
+                                        from any individual peer during 
+                                        synchronization
+  --use-socket-read-watermark arg (=0)  Enable expirimental socket read 
+                                        watermark optimization
+  --peer-log-format arg (=["${_name}" ${_ip}:${_port}])
+                                        The string used to format peers when 
+                                        logging messages about them.  Variables
+                                        are escaped with ${<variable name>}.
+                                        Available Variables:
+                                           _name  self-reported name
+                                        
+                                           _id    self-reported ID (64 hex 
+                                                  characters)
+                                        
+                                           _sid   first 8 characters of 
+                                                  _peer.id
+                                        
+                                           _ip    remote IP address of peer
+                                        
+                                           _port  remote port number of peer
+                                        
+                                           _lip   local IP address connected to
+                                                  peer
+                                        
+                                           _lport local port number connected 
+                                                  to peer
+```
+
+## Dependencies
+
+None
diff --git a/docs/01_nodeos/03_plugins/producer_api_plugin/index.md b/docs/01_nodeos/03_plugins/producer_api_plugin/index.md
new file mode 100644
index 00000000000..c43a9645f86
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/producer_api_plugin/index.md
@@ -0,0 +1,42 @@
+# producer_api_plugin
+
+## Description
+
+The `producer_api_plugin` exposes a number of endpoints for the [`producer_plugin`](../producer_plugin/index.md) to the RPC API interface managed by the [`http_plugin`](../http_plugin/index.md).
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::producer_api_plugin
+
+# nodeos startup params
+$ nodeos ... --plugin eosio::producer_api_plugin
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`producer_plugin`](../producer_plugin/index.md)
+* [`chain_plugin`](../chain_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::producer_plugin
+[options]
+plugin = eosio::chain_plugin
+[options]
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::producer_plugin [options]  \
+             --plugin eosio::chain_plugin [operations] [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/01_nodeos/03_plugins/producer_plugin/index.md b/docs/01_nodeos/03_plugins/producer_plugin/index.md
new file mode 100644
index 00000000000..022a473d36b
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/producer_plugin/index.md
@@ -0,0 +1,116 @@
+# producer_plugin
+
+## Description
+
+The `producer_plugin` loads functionality required for a node to produce blocks.
+
+[[info]]
+| Additional configuration is required to produce blocks. Please read [Configuring Block Producing Node](https://developers.eos.io/eosio-nodeos/docs/environment-producing-node).
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::producer_plugin [options]
+
+# nodeos startup params
+$ nodeos ... -- plugin eosio::producer_plugin [options]
+```
+
+## Options
+
+These can be specified from both the `nodeos` command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::producer_plugin:
+
+  -e [ --enable-stale-production ]      Enable block production, even if the 
+                                        chain is stale.
+  -x [ --pause-on-startup ]             Start this node in a state where 
+                                        production is paused
+  --max-transaction-time arg (=30)      Limits the maximum time (in 
+                                        milliseconds) that is allowed a pushed 
+                                        transaction's code to execute before 
+                                        being considered invalid
+  --max-irreversible-block-age arg (=-1)
+                                        Limits the maximum age (in seconds) of 
+                                        the DPOS Irreversible Block for a chain
+                                        this node will produce blocks on (use 
+                                        negative value to indicate unlimited)
+  -p [ --producer-name ] arg            ID of producer controlled by this node 
+                                        (e.g. inita; may specify multiple 
+                                        times)
+  --private-key arg                     (DEPRECATED - Use signature-provider 
+                                        instead) Tuple of [public key, WIF 
+                                        private key] (may specify multiple 
+                                        times)
+  --signature-provider arg (=EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV=KEY:5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3)
+                                        Key=Value pairs in the form 
+                                        <public-key>=<provider-spec>
+                                        Where:
+                                           <public-key>    is a string form of 
+                                                           a vaild EOSIO public
+                                                           key
+                                        
+                                           <provider-spec> is a string in the 
+                                                           form <provider-type>
+                                                           :<data>
+                                        
+                                           <provider-type> is KEY, or KEOSD
+                                        
+                                           KEY:<data>      is a string form of 
+                                                           a valid EOSIO 
+                                                           private key which 
+                                                           maps to the provided
+                                                           public key
+                                        
+                                           KEOSD:<data>    is the URL where 
+                                                           keosd is available 
+                                                           and the approptiate 
+                                                           wallet(s) are 
+                                                           unlocked
+  --keosd-provider-timeout arg (=5)     Limits the maximum time (in 
+                                        milliseconds) that is allowed for 
+                                        sending blocks to a keosd provider for 
+                                        signing
+  --greylist-account arg                account that can not access to extended
+                                        CPU/NET virtual resources
+  --produce-time-offset-us arg (=0)     offset of non last block producing time
+                                        in microseconds. Negative number 
+                                        results in blocks to go out sooner, and
+                                        positive number results in blocks to go
+                                        out later
+  --last-block-time-offset-us arg (=0)  offset of last block producing time in 
+                                        microseconds. Negative number results 
+                                        in blocks to go out sooner, and 
+                                        positive number results in blocks to go
+                                        out later
+  --max-scheduled-transaction-time-per-block-ms arg (=100)
+                                        Maximum wall-clock time, in 
+                                        milliseconds, spent retiring scheduled 
+                                        transactions in any block before 
+                                        returning to normal transaction 
+                                        processing.
+  --incoming-defer-ratio arg (=1)       ratio between incoming transations and 
+                                        deferred transactions when both are 
+                                        exhausted
+  --producer-threads arg (=2)           Number of worker threads in producer 
+                                        thread pool
+  --snapshots-dir arg (="snapshots")    the location of the snapshots directory
+                                        (absolute path or relative to 
+                                        application data dir)
+```
+
+## Dependencies
+
+* [`chain_plugin`](../chain_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::chain_plugin [operations] [options]
+
+# command-line
+$ nodeos ... --plugin eosio::chain_plugin [operations] [options]
+```
diff --git a/docs/01_nodeos/03_plugins/state_history_plugin/how-to-create-snapshot-with-full-history.md b/docs/01_nodeos/03_plugins/state_history_plugin/how-to-create-snapshot-with-full-history.md
new file mode 100644
index 00000000000..c20cfe2d943
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/state_history_plugin/how-to-create-snapshot-with-full-history.md
@@ -0,0 +1,39 @@
+<!-- # How to create a portable snapshot with full state history -->
+
+## Goal
+
+This procedure creates a database containing the chain state, with full history since genesis state.
+
+## Before you begin
+
+* Make sure [EOSIO is installed](../../../00_install/index.md).
+* Learn about [Using Nodeos](../../02_usage/index.md).
+* Get familiar with [state_history](../../03_plugins/state_history_plugin/index.md) plugin.
+
+## Steps
+
+1. Enable the `producer_api_plugin` on a node with full state-history.
+
+[[caution | Caution when using `producer_api_plugin`]]
+| Either use a firewall to block access to `http-server-address`, or change it to `localhost:8888` to disable remote access.
+
+2. Create a portable snapshot:
+```sh
+$ curl http://127.0.0.1:8888/v1/producer/create_snapshot | json_pp
+```
+
+3. Wait for `nodeos` to process several blocks after the snapshot completed. The goal is for the state-history files to contain at least 1 more block than the portable snapshot has, and for the `blocks.log` file to contain the block after it has become irreversible.
+
+[[info | Note]]
+| If the block included in the portable snapshot is forked out, then the snapshot will be invalid. Repeat this process if this happens.
+
+4. Stop `nodeos`.
+
+5. Make backups of:
+   * The newly-created portable snapshot (`data/snapshots/snapshot-xxxxxxx.bin`)
+   * The contents of `data/state-history`:
+     * `chain_state_history.log`
+     * `trace_history.log`
+     * `chain_state_history.index`: optional. Restoring will take longer without this file.
+     * `trace_history.index`: optional. Restoring will take longer without this file.
+   * Optional: the contents of `data/blocks`, but excluding `data/blocks/reversible`.
diff --git a/docs/01_nodeos/03_plugins/state_history_plugin/how-to-fast-start-without-old-history.md b/docs/01_nodeos/03_plugins/state_history_plugin/how-to-fast-start-without-old-history.md
new file mode 100644
index 00000000000..b7f5d43b56d
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/state_history_plugin/how-to-fast-start-without-old-history.md
@@ -0,0 +1,40 @@
+<!-- # How to fast start without history on existing chains -->
+
+## Goal
+
+This procedure records the current chain state and future history, without previous historical data on the local chain.
+
+## Before you begin
+
+* Make sure [EOSIO is installed](../../../00_install/index.md).
+* Learn about [Using Nodeos](../../02_usage/index.md).
+* Get familiar with [state_history](../../03_plugins/state_history_plugin/index.md) plugin.
+
+## Steps
+
+1. Get the following:
+   * A portable snapshot (`data/snapshots/snapshot-xxxxxxx.bin`)
+   * Optional: a block log which includes the block the snapshot was taken at
+
+2. Make sure `data/state` does not exist
+
+3. Start `nodeos` with the `--snapshot` option, and the options listed in the [`state_history_plugin`](#index.md).
+
+4. Look for `Placing initial state in block n` in the log, where n is the start block number.
+
+5. Start a filler with `--fpg-create` (if PostgreSQL), `--fill-skip-to n`, and `--fill-trim`. Replace `n` with the value above.
+
+6. Do not stop `nodeos` until it has received at least 1 block from the network, or it won't be able to restart.
+
+## Remarks
+
+If `nodeos` fails to receive blocks from the network, then try the above using `net_api_plugin`. Use `cleos net disconnect` and `cleos net connect` to reconnect nodes which timed out.
+
+[[caution | Caution when using `net_api_plugin`]]
+| Either use a firewall to block access to your `http-server-address`, or change it to `localhost:8888` to disable remote access.
+
+[[info]]
+| Whenever you run a filler after this point, use the `--fill-trim` option. Only use `--fpg-create` and `--fill-skip-to` the first time.
+
+[[info]]
+| On large chains, this procedure creates a delta record that is too large for javascript processes to handle. 64-bit C++ processes can handle the large record. `fill-pg` and `fill-lmdb` break up the large record into smaller records when filling databases.
diff --git a/docs/01_nodeos/03_plugins/state_history_plugin/how-to-replay-or-resync-wth-full-history.md b/docs/01_nodeos/03_plugins/state_history_plugin/how-to-replay-or-resync-wth-full-history.md
new file mode 100644
index 00000000000..de7d0e89ae2
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/state_history_plugin/how-to-replay-or-resync-wth-full-history.md
@@ -0,0 +1,19 @@
+<!-- # How to replay or resync with full history -->
+
+## Goal
+
+This procedure records the entire chain history.
+
+## Before you begin
+
+* Make sure [EOSIO is installed](../../../00_install/index.md).
+* Learn about [Using Nodeos](../../02_usage/index.md).
+* Get familiar with [state_history](../../03_plugins/state_history_plugin/index.md) plugin.
+
+## Steps
+
+1. Get a block log and place it in `data/blocks`, or get a genesis file and use the `--genesis-json` option
+
+2. Make sure `data/state` does not exist, or use the `--replay-blockchain` option
+
+3. Start `nodeos` with the `--snapshot` option, and the options listed in the [`state_history_plugin`]
diff --git a/docs/01_nodeos/03_plugins/state_history_plugin/how-to-restore-snapshot-with-full-history.md b/docs/01_nodeos/03_plugins/state_history_plugin/how-to-restore-snapshot-with-full-history.md
new file mode 100644
index 00000000000..98cf666d88c
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/state_history_plugin/how-to-restore-snapshot-with-full-history.md
@@ -0,0 +1,31 @@
+<!-- # How to restore a portable snapshot with full state history -->
+
+## Goal
+
+This procedure restores an existing snapshot with full history, so the node can become active in the blockchain.
+
+## Before you begin
+
+* Make sure [EOSIO is installed](../../../00_install/index.md).
+* Learn about [Using Nodeos](../../02_usage/index.md).
+* Get familiar with [state_history](../../03_plugins/state_history_plugin/index.md) plugin.
+
+## Steps
+
+1. Get the following:
+   * A portable snapshot (`data/snapshots/snapshot-xxxxxxx.bin`)
+   * The contents of `data/state-history`
+   * Optional: a block log which includes the block the snapshot was taken at. Do not include `data/blocks/reversible`.
+
+2. Make sure `data/state` does not exist
+
+3. Start `nodeos` with the `--snapshot` option, and the options listed in the [`state_history_plugin`](#index.md).
+
+4. Do not stop `nodeos` until it has received at least 1 block from the network, or it won't be able to restart.
+
+## Remarks
+
+If `nodeos` fails to receive blocks from the network, then try the above using `net_api_plugin`. Use `cleos net disconnect` and `cleos net connect` to reconnect nodes which timed out.
+
+[[caution | Caution when using `net_api_plugin`]]
+| Either use a firewall to block access to `http-server-address`, or change it to `localhost:8888` to disable remote access.
diff --git a/docs/01_nodeos/03_plugins/state_history_plugin/index.md b/docs/01_nodeos/03_plugins/state_history_plugin/index.md
new file mode 100644
index 00000000000..e24fc265af8
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/state_history_plugin/index.md
@@ -0,0 +1,80 @@
+# state_history_plugin
+
+## Description
+
+The `state_history_plugin` is useful for capturing historical data about the blockchain state. The plugin receives blockchain data from other connected nodes and caches the data into files. The plugin listens on a socket for applications to connect and sends blockchain data back based on the plugin options specified when starting `nodeos`.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::state_history_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::state_history_plugin [operations] [options]
+```
+
+## Operations
+
+These can only be specified from the `nodeos` command-line:
+
+```console
+Command Line Options for eosio::state_history_plugin:
+
+  --delete-state-history                clear state history files
+```
+
+## Options
+
+These can be specified from both the `nodeos` command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::state_history_plugin:
+
+  --state-history-dir arg (="state-history")
+                                        the location of the state-history 
+                                        directory (absolute path or relative to
+                                        application data dir)
+  --trace-history                       enable trace history
+  --chain-state-history                 enable chain state history
+  --state-history-endpoint arg (=127.0.0.1:8080)
+                                        the endpoint upon which to listen for 
+                                        incoming connections. Caution: only 
+                                        expose this port to your internal 
+                                        network.
+  --trace-history-debug-mode            enable debug mode for trace history
+```
+
+## Examples
+
+### JavaScript Example
+
+  * [Source code](https://github.com/EOSIO/eos/blob/state-history-docs/docs/state-history-plugin/js-example.md)
+
+### history-tools
+
+  * [Source code](https://github.com/EOSIO/history-tools/)
+  * [Documentation](https://eosio.github.io/history-tools/)
+  * [Protocol](https://github.com/EOSIO/eos/blob/state-history-docs/docs/state-history-plugin/protocol.md)
+
+## Dependencies
+
+* [`chain_plugin`](../chain_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::chain_plugin --disable-replay-opts
+
+# command-line
+$ nodeos ... --plugin eosio::chain_plugin --disable-replay-opts
+```
+
+## How-To Guides
+
+* [How to fast start without history on existing chains](how-to-fast-start-without-old-history.md)
+* [How to create a portable snapshot with full state history](how-to-create-snapshot-with-full-history.md)
+* [How to restore a portable snapshot with full state history](how-to-restore-snapshot-with-full-history.md)
+* [How to replay or resync with full history](how-to-replay-or-resync-wth-full-history.md)
diff --git a/docs/01_nodeos/03_plugins/test_control_api_plugin/index.md b/docs/01_nodeos/03_plugins/test_control_api_plugin/index.md
new file mode 100644
index 00000000000..d3636f6fdf0
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/test_control_api_plugin/index.md
@@ -0,0 +1,45 @@
+# test_control_api_plugin
+
+## Description
+
+The `test_control_api_plugin` allows to send a control message to the [test_control_plugin](../test_control_plugin/index.md) telling the plugin to shut down the `nodeos` instance when reaching a particular block. It is intended for testing.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::test_control_api_plugin
+
+# command-line
+$ nodeos ... --plugin eosio::test_control_api_plugin
+```
+
+## Options
+
+None
+
+## Usage Example
+
+```sh
+curl %s/v1/test_control/kill_node_on_producer -d '{ \"producer\":\"%s\", \"where_in_sequence\":%d, \"based_on_lib\":\"%s\" }' -X POST -H \"Content-Type: application/json\"" %
+```
+
+## Dependencies
+
+* [`test_control_plugin`](../test_control_plugin/index.md)
+* [`chain_plugin`](../chain_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::chain_plugin
+[options]
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::chain_plugin [operations] [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/01_nodeos/03_plugins/test_control_plugin/index.md b/docs/01_nodeos/03_plugins/test_control_plugin/index.md
new file mode 100644
index 00000000000..1a6c63c152e
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/test_control_plugin/index.md
@@ -0,0 +1,36 @@
+# test_control_plugin
+
+## Description
+
+The `test_control_plugin` is designed to cause a graceful shutdown when reaching a particular block in a sequence of blocks produced by a specific block producer. It can be invoked to either shutdown on the **head block** or the **last irreversible block**.
+
+This is intended for testing, to determine exactly when a nodeos instance will shutdown.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::test_control_plugin
+
+# command-line
+$ nodeos ... --plugin eosio::test_control_plugin
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`chain_plugin`](../chain_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::chain_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::chain_plugin [operations] [options]
+```
diff --git a/docs/01_nodeos/03_plugins/txn_test_gen_plugin/index.md b/docs/01_nodeos/03_plugins/txn_test_gen_plugin/index.md
new file mode 100644
index 00000000000..0adf0744acc
--- /dev/null
+++ b/docs/01_nodeos/03_plugins/txn_test_gen_plugin/index.md
@@ -0,0 +1,40 @@
+# txn_test_gen_plugin
+
+## Description
+
+The `txn_test_gen_plugin` is used for transaction test purposes.
+
+[[info | For More Information]]
+For more information, check the [txn_test_gen_plugin/README.md](https://github.com/EOSIO/eos/blob/develop/plugins/txn_test_gen_plugin/README.md) on the EOSIO/eos repository.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::txn_test_gen_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::txn_test_gen_plugin [options]
+```
+
+## Options
+
+These can be specified from both the `nodeos` command-line or the `config.ini` file:
+
+```console
+Config Options for eosio::txn_test_gen_plugin:
+  --txn-reference-block-lag arg (=0)    Lag in number of blocks from the head 
+                                        block when selecting the reference 
+                                        block for transactions (-1 means Last 
+                                        Irreversible Block)
+  --txn-test-gen-threads arg (=2)       Number of worker threads in 
+                                        txn_test_gen thread pool
+  --txn-test-gen-account-prefix arg (=txn.test.)
+                                        Prefix to use for accounts generated 
+                                        and used by this plugin
+```
+
+## Dependencies
+
+None
diff --git a/docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md b/docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md
new file mode 100644
index 00000000000..43756906e5b
--- /dev/null
+++ b/docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md
@@ -0,0 +1,6 @@
+<!-- ## How to generate a blocks.log file -->
+
+The `blocks.log` file is used by `nodeos` to persist irreversible blocks. This is the actual local copy of the immutable blockchain maintained by the node. The default location of the `blocks.log` file is in the `data/blocks` directory. However the default data directory can be overridden with the `-d [ --data-dir ]` option on the `nodeos` command line.
+
+[[info | Other `blocks.log` files]]
+| You can also download a `blocks.log` file from third party providers.
diff --git a/docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md b/docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md
new file mode 100644
index 00000000000..d708595d467
--- /dev/null
+++ b/docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md
@@ -0,0 +1,17 @@
+<!-- ## How to generate a snapshot -->
+
+You can force a running `nodeos` instance to create a snapshot by using the `create_snapshot` RPC API call supported by the `producer_api_plugin`. This will create a snapshot file in the `data/snapshots` directory. Snapshot files are written to disk with the name pattern `*snapshot-\<head_block_id_in_hex\>.bin*`.
+
+[[info | Snapshots Location]]
+| By default, snapshots are written to the `data/snapshots` directory relative to your `nodeos` data directory. See the `-d [ --data-dir ]` option.
+
+If your `nodeos` instance is running locally, the below command will request `nodeos` to create a snapshot:
+
+```sh
+$ curl --request POST \
+  --url http://127.0.0.1:8888/v1/producer/create_snapshot \
+  --header 'content-type: application/x-www-form-urlencoded; charset=UTF-8'
+```
+
+[[info | Other `blocks.log` files]]
+| You can also download a `blocks.log` file from third party providers.
diff --git a/docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md b/docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md
new file mode 100644
index 00000000000..df3f5cf2850
--- /dev/null
+++ b/docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md
@@ -0,0 +1,24 @@
+<!-- # How to replay from a blocks.log file -->
+
+Once you have obtained a copy of the `blocks.log` file which you wish to replay the blockchain from, copy it to your `data/blocks` directory, backing up any existing contents if you wish to keep them, and remove the `blocks.index`, `forkdb.dat`, `shared_memory.bin`, and `shared_memory.meta`.
+
+The table below sumarizes the actions you should take for each of the files enumerated above:
+
+Folder name             | File name          | Action
+----------------------- | ------------------ | ------
+data/blocks             | blocks.index       | Remove
+data/blocks             | blocks.log         | Replace this file with the `block.log` you want to replay
+data/blocks/reversible  | forkdb.dat         | Remove
+data/blocks/reversible  | shared_memory.bin  | Remove
+data/blocks/reversible  | shared_memory.meta | Remove
+
+You can use `blocks-dir = "blocks"` in the `config.ini` file, or use the `--blocks-dir` command line option, to specify where to find the `blocks.log` file to replay.
+
+```sh
+$ nodeos --replay-blockchain \
+  -e -p eosio \
+  --plugin eosio::producer_plugin  \
+  --plugin eosio::chain_api_plugin \
+  --plugin eosio::http_plugin      \
+  >> nodeos.log 2>&1 &
+```
diff --git a/docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md b/docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md
new file mode 100644
index 00000000000..bca108cbc13
--- /dev/null
+++ b/docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md
@@ -0,0 +1,29 @@
+<!-- ## How to replay from a snapshot -->
+
+Once you have obtained a copy of a valid snapshot file from which you wish to create a valid chain state, copy it to your data/snapshots directory, backing up (if you wish to keep them) and removing any existing contents of the data directory.
+
+location          | name                       |  action
+----------------- | -------------------------- | ------------
+data/snapshots    | <head block id in hex>.bin | place the snapshot file you want to replay here
+data/             | *                          | remove
+
+You can use `snapshots-dir = "snapshots" ` in the configuration file or using the `--snapshots-dir` command line option, to specify the where to find the the snapshot to replay, use `--snapshot` to specify the name of the snapshot to replay.
+
+```sh
+$ nodeos --snapshot yoursnapshot.name \
+  -e -p eosio \
+  --plugin eosio::producer_plugin  \
+  --plugin eosio::chain_api_plugin \
+  --plugin eosio::http_plugin      \
+  >> nodeos.log 2>&1 &
+```
+
+When replaying from a snapshot file it is recommended that all existing data is removed, however if a blocks.log file is provided it *must* at least contain blocks up to the snapshotted block and *may* contain additional blocks that will be applied as part of startup.  If a blocks.log file exists, but does not contain blocks up to and/or after the snapshotted block then replaying from a snapshot will create an exception. Any available reversible blocks will also be applied.
+
+blocks.log               | snapshot                    | action
+------------------------ | --------------------------- | ------
+no blocks.log            | for irreversible block 2000 | ok
+contains blocks 1 - 1999 | for irreversible block 2000 | exception
+contains blocks 1 - 2001 | for irreversible block 2000 | ok - will recreate from snapshot and 'play' block 2001
+
+When instantiating a node from a snapshot file, it is illegal to pass in the `--genesis-json` or `--genesis-timestamp` arguments to `nodeos` as that information is loaded from the snapshot file. If a `blocks.log` file exists, the genesis information it contains will be validated against the genesis data in the snapshot.  The replay will fail with an error if the genesis data is not consistent, i.e. it checks that the blocks.log file and the snapshot file are for the same blockchain.
diff --git a/docs/01_nodeos/04_replays/index.md b/docs/01_nodeos/04_replays/index.md
new file mode 100644
index 00000000000..6fd8435b425
--- /dev/null
+++ b/docs/01_nodeos/04_replays/index.md
@@ -0,0 +1,50 @@
+# Nodeos Replays
+
+Nodeos provides various options for replaying blockchain blocks. This can be useful if, for example, a node has downloaded a `blocks.log` file from the internet (as a faster alternative to synchronizing from the p2p network) and the node wants to use it to quickly catch up with the network, or if you want to know the chain state at specified points in a blockchain's life.
+
+Replaying data can be done in two ways:
+
+- From a **`blocks.log` file**:  
+The `blocks.log` file contains all irreversible transactions on the blockchain. All instances of `nodeos` write irreversible blocks to the `blocks.log` file, which is located at the `data/blocks` directory relative to the `nodeos` directory. Using a `blocks.log` file to replay will allow you to start a `nodeos` instance, which recreates the entire history of the blockchain locally, without adding unnecessary load to the network.
+
+- From a **snapshot file**:  
+Snapshot files can be created from a running `nodeos` instance. The snapshot contains the chain state for the block referenced when created. It is recommended to use snapshot files created from blocks that are irreversible. Using a snapshot file to replay allows you to quickly start a `nodeos` instance which has a full and correct chain state at a specified block number, but not a full history of transactions up to that block number. From that point on the `nodeos` instance will operate in the configured manner.
+
+## Replay How-Tos
+
+* [How To Generate a Blocks Log](how-to-generate-a-blocks.log.md)
+* [How To Generate a Snapshot](how-to-generate-a-snapshot.md)
+* [How To Replay from a Blocks Log](how-to-replay-from-a-blocks.log.md)
+* [How to Replay from a Snapshot](how-to-replay-from-a-snapshot.md)
+
+## Replay Snapshot-specific Options
+
+Typing `$ nodeos --help` on the command line will show you all the options available for running `nodeos`. The snapshot and replay specific options are:
+
+ - **--force-all-checks**  
+The node operator may not trust the source of the `blocks.log` file and may want to run `nodeos` with `--replay-blockchain --force-all-checks` the first time to make sure the blocks are good. The `--force-all-checks` flag can be passed into `nodeos` to tell it to not skip any checks during replay.
+
+ - **--disable-replay-opts**  
+By default, during replay, `nodeos` does not create a stack of chain state deltas (this stack is used to enable rollback of state for reversible blocks.) This is a replay performance optimization. Using this option turns off this replay optimization and creates a stack of chain state deltas. If you are using the state history plugin you must use this option.
+
+ - **--replay-blockchain**  
+This option tells `nodeos` to replay from the `blocks.log` file located in the data/blocks directory. `nodeos` will clear the chain state and replay all blocks.
+
+ - **--hard-replay-blockchain**  
+This option tells `nodeos` to replay from the `blocks.log` file located in the data/blocks directory. `nodeos` makes a backup of the existing `blocks.log` file and will then clear the chain state and replay all blocks. This option assumes that the backup `blocks.log` file may contain corrupted blocks, so `nodeos` replays as many blocks as possible from the backup block log. When `nodeos` finds the first corrupted block while replying from `nodeos.log` it will synchronize the rest of the blockchain from the p2p network.
+
+ - **--delete-all-blocks**  
+This tells `nodeos` to clear the local chain state and local the `blocks.log` file, If you intend to then synchronize from the p2p network you would need to provide a correct `genesis.json` file. This option is not recommended.
+
+ - **--truncate-at-block**  
+Default argument (=0), only used if the given value is non-zero.
+Using this option when replaying the blockchain will force the replay to stop at the specified block number. This option will only work if replaying with the `--hard-replay-blockchain` option, or, when not replaying, the `--fix-reversible-blocks` option. The local `nodeos` process will contain the chain state for that block. This option may be useful for checking blockchain state at specific points in time. It is intended for testing/validation and is not intended to be used when creating a local `nodeos` instance which is synchronized with the network.  
+ 
+ - **--snapshot**  
+Use this option to specify which snapshot file to use to recreate the chain state from a snapshot file. This option will not replay the `blocks.log` file. The `nodeos` instance will not know the full transaction history of the blockchain. 
+
+ - **--snapshots-dir**  
+You can use this to specify the location of the snapshot file directory  (absolute path or relative to application data dir.)
+
+ - **--blocks-dir**  
+You can use this to specify the location of the `blocks.log` file directory  (absolute path or relative to application data dir)
diff --git a/docs/01_nodeos/06_logging/00_setup-logging.json.md b/docs/01_nodeos/06_logging/00_setup-logging.json.md
new file mode 100644
index 00000000000..049f1d9d416
--- /dev/null
+++ b/docs/01_nodeos/06_logging/00_setup-logging.json.md
@@ -0,0 +1,11 @@
+The `logging.json` file is usually located in the specified `--config-dir`, the same directory as the `config.ini` file. This path can be explicitly defined using the `-l` or `--logconf` options when starting `nodeos`.
+ 
+```sh
+./nodeos --help
+  ...
+  Application Command Line Options:
+  ...
+  --config-dir arg                      Directory containing configuration files such as config.ini
+  -l [ --logconf ] arg (=logging.json)  Logging configuration file name/path for library users
+
+```
diff --git a/docs/01_nodeos/06_logging/01_logging-levels.md b/docs/01_nodeos/06_logging/01_logging-levels.md
new file mode 100644
index 00000000000..4197d3a86a1
--- /dev/null
+++ b/docs/01_nodeos/06_logging/01_logging-levels.md
@@ -0,0 +1,62 @@
+There are six available logging levels:
+- all
+- debug
+- info
+- warn
+- error
+- off  
+
+Sample `logging.json`:
+
+```
+{
+ "includes": [],
+ "appenders": [{
+     "name": "consoleout", 
+     "type": "console",
+     "args": {
+       "stream": "std_out",
+       "level_colors": [{
+           "level": "debug",
+           "color": "green"
+         },{
+           "level": "warn",
+           "color": "brown"
+         },{
+           "level": "error",
+           "color": "red"
+         }
+       ]
+     },
+     "enabled": true
+   },{
+     "name": "net",
+     "type": "gelf",
+     "args": {
+       "endpoint": "10.10.10.10",
+       "host": "test"
+     },
+     "enabled": true
+   }
+ ],
+ "loggers": [{
+     "name": "default",
+     "level": "info",
+     "enabled": true,
+     "additivity": false,
+     "appenders": [
+       "consoleout",
+       "net"
+     ]
+   },{
+     "name": "net_plugin_impl",
+     "level": "debug",
+     "enabled": true,
+     "additivity": false,
+     "appenders": [
+       "net"
+     ]
+   }
+ ]
+}
+```
diff --git a/docs/01_nodeos/06_logging/index.md b/docs/01_nodeos/06_logging/index.md
new file mode 100644
index 00000000000..2f27bd2ba8e
--- /dev/null
+++ b/docs/01_nodeos/06_logging/index.md
@@ -0,0 +1,106 @@
+# Logging Overview
+
+Logging for `nodeos` is controlled by the `logging.json` file. CLI options can be passed to `nodeos` to [setup `logging.json`](00_setup-logging.json.md). The logging configuration file can be used to define [appenders](#appenders) and tie them to [loggers](#loggers) and [logging levels](01_logging-levels.md).
+
+## Appenders
+
+The logging library built into EOSIO supports two appender types:
+
+- [Console](#console)
+- [GELF](#gelf) (Graylog Extended Log Format)
+
+### Console 
+
+This will output log messages to the screen. The configuration options are:
+
+- `name` - arbitrary name to identify instance for use in loggers
+- `type` - "console"
+- `stream` - "std_out" or "std_err"
+- `level_colors` - maps a log level to a colour
+  - level - see [logging levels](01_logging-levels.md)
+  - color - may be one of ("red", "green", "brown", "blue", "magenta", "cyan", "white", "console_default")
+- `enabled` - bool value to enable/disable the appender.
+
+Example:
+
+```json
+{
+    "name": "consoleout",
+    "type": "console",
+    "args": {
+    "stream": "std_out",
+
+    "level_colors": [{
+        "level": "debug",
+        "color": "green"
+        },{
+        "level": "warn",
+        "color": "brown"
+        },{
+        "level": "error",
+        "color": "red"
+        }
+    ]
+    },
+    "enabled": true
+}
+```
+
+### GELF
+
+This sends the log messages to `Graylog`. `Graylog` is a fully integrated platform for collecting, indexing, and analyzing log messages. The configuration options are:
+
+ - `name` - arbitrary name to identify instance for use in loggers
+ - `type` - "gelf"
+ - `endpoint` - ip address and port number
+ - `host` - Graylog hostname, identifies you to Graylog.
+ - `enabled` - bool value to enable/disable the appender.
+
+Example:
+
+```json
+{
+    "name": "net",
+    "type": "gelf",
+    "args": {
+        "endpoint": "104.198.210.18:12202”,
+        "host": <YOURNAMEHERE IN QUOTES>
+    },
+    "enabled": true
+}
+```
+
+## Loggers
+
+The logging library built into EOSIO currently supports five loggers:
+
+- `default` - the default logger, always enabled.
+- `net_plugin_impl` - detailed logging for the net plugin.
+- `bnet_plugin` - detailed logging for the bnet plugin.
+- `producer_plugin` - detailed logging for the producer plugin.
+- `transaction_tracing` - detailed log that emits verdicts from relay nodes on the P2P network.
+
+The configuration options are:
+
+ - `name` - must match one of the names described above.
+ - `level` - see logging levels below.
+ - `enabled` - bool value to enable/disable the logger.
+ - `additivity` - true or false
+ - `appenders` - list of appenders by name (name in the appender configuration)
+
+Example:
+
+```json
+{
+    "name": "net_plugin_impl",
+    "level": "debug",
+    "enabled": true,
+    "additivity": false,
+    "appenders": [
+        "net"
+    ]
+}
+```
+
+[[info]]
+| `net_plugin_impl`, `bnet_plugin`, `producer_plugin`, `transaction_tracing` are not enabled unless explicitly enabled in the `logging.json`
diff --git a/docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md b/docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md
new file mode 100644
index 00000000000..5a5e411b73f
--- /dev/null
+++ b/docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md
@@ -0,0 +1,130 @@
+# EOSIO 1.8+ Consensus Protocol Upgrade Process
+
+This guide is intended to instruct node operators on the steps needed to successfully transition an EOSIO network through a consensus protocol upgrade (also known as a "hard fork") with minimal disruption to users.
+
+## Test networks
+
+Before deploying the upgrade to any non-test networks, protocol upgrades should be deployed and verified on test networks. The version of nodeos supporting the initial set of protocol upgrades is [v1.8.1](https://github.com/EOSIO/eos/releases/tag/v1.8.1). Existing EOSIO-based test networks can use this version of nodeos to carry out and test the upgrade process.
+
+This test upgrade process can give block producers of their respective EOSIO blockchain networks practice with carrying out the steps necessary to successfully coordinate the activation of the first consensus protocol upgrade feature (or just protocol feature for short), which will fork out any nodes that have not yet updated to the new version of nodeos by the time of activation. The process will also inform block producers of the requirements for nodes to upgrade nodeos to v1.8 from v1.7 and earlier, and it can help them decide an appropriate deadline to be given as notice to the community for when the first protocol feature will be activated.
+
+Testing the upgrade process on test networks will also allow block explorers and other applications interacting with the blockchain to test the transition and the behavior of their applications under the new rules after activation of the individual protocol features. Some of the protocol features (`PREACTIVATE_FEATURE` and `NO_DUPLICATE_DEFERRED_ID` as examples) make slight changes to the block and transaction data structures, and therefore force applications that are reliant on the old structure to migrate. One of the protocol features (`RESTRICT_ACTION_TO_SELF`) restricts an existing authorization bypass (which has been deprecated since the v1.5.1 release of EOSIO) and could potentially break smart contracts that continue to rely on that authorization bypass.
+
+## Upgrade process for all EOSIO networks (including test networks)
+
+Because these steps require replay from genesis, after the release of [v1.8.1](https://github.com/EOSIO/eos/releases/tag/v1.8.1) of nodeos which supports the initial set of consensus protocol upgrades, all node operators should take the following steps as soon as possible. These steps should be followed on an additional node that they can afford to be taken offline for an extended period of time:
+
+1. Ensure that their existing node is running the most recent stable release (1.7) of nodeos and then shut down nodeos.
+2. Make a backup and delete the `blocks/reversible` directory, `state-history` directory, and `state` directory within the data directory.
+3. Replace their old version of nodeos with the new release.
+4. Start the new 1.8 release of nodeos and let it complete replay from genesis and catch up with syncing with the network. The node should receive blocks and LIB should advance. Nodes running v1.8 and v1.7 will continue to coexist in the same network prior to the activation of the first protocol upgrade feature.
+
+A replay from genesis is required when upgrading nodeos from v1.7 to v1.8. Afterward, the v1.8 node can, as usual, start and stop quickly without requiring replays. The state directory generated by a v1.7 node will not be compatible with v1.8 of nodeos. Version 1 portable snapshots (generated by v1.7) will not be compatible with v1.8 which require the version 2 portable snapshots.
+
+Due to the long amount of time it will take to replay from genesis (even longer if running with plugins that track history), block producers of the network are suggested to provide sufficient time to the community to upgrade their nodes prior to activating the first protocol upgrade feature.
+
+Nodes that wish to make the transition but are not interested in tracking the history of the chain from genesis have an option to speed things up by using a version 2 portable snapshots that can be generated by synced v1.8 nodes. Since the portable snapshots are generated in a deterministic and portable manner, users can simply compare the hash of the snapshot files they downloaded from an arbitrary source to the hashes published by a variety of trusted sources, but only if they correspond to snapshots taken at the same block ID.   
+
+### Special notes to block producers
+
+Block producers will obviously need to run the replay of nodeos on a separate machine that is not producing blocks. This machine will have to be production ready so that they can switch block production over to it when it has finished replaying and syncing. Alternatively, they can take a portable snapshot on the replay machine and move it to yet another machine which is production ready, then activate the switch over from their currently producing v1.7 BP node to the v1.8 node.
+
+Nearly all of the protocol upgrade features introduced in v1.8 first require a special protocol feature (codename `PREACTIVATE_FEATURE`) to be activated and for an updated version of the system contract that utilizes the functionality introduced by that feature to be deployed. Block producers should be aware that as soon as the `PREACTIVATE_FEATURE` protocol feature is activated by the BPs, all nodes still on v1.7 will be unable to continue syncing normally and their last irreversible block will stop advancing. For this reason, it is important to coordinate when the activation happens and announce the expected activation date with sufficient time provided to the community to upgrade their nodes in time.
+
+After activation of the `PREACTIVATE_FEATURE` and deployment of the updated system contract, block producers will be able to more easily coordinate activation of further protocol features. For the remaining protocol features in the v1.8 release, they can activate the features at any time and no preparation time needs to be given to the community since anyone synced up with the blockchain at that time will necessarily be on a version of nodeos that is at least v1.8 and therefore will support the entire initial set of protocol features. Furthermore, due to the `PREACTIVATE_FEATURE` protocol feature, they can activate the other remaining protocol features with an `eosio.msig` proposed transaction using the `activate` action in the new system contract and no replay is required.
+
+The activation of the first protocol feature, `PREACTIVATE_FEATURE`, however cannot be done with an `eosio.msig` proposed transaction. It will require more coordination and manual action by the block producers. First, block producers should come to an agreement on the earliest time that they are willing to activate the first protocol feature.
+
+The BPs should then set this chosen time in the configuration JSON file for the `PREACTIVATE_FEATURE` protocol upgrade of their v1.8 node. Specifically, they should modify the value for the `earliest_allowed_activation_time` field in the `protocol_features/BUILTIN-PREACTIVATE_FEATURE.json` file located in the config directory.
+
+It is important that this configuration change happens prior to allowing that node to produce blocks on the network. As long as more than two-thirds of the active block producers have set the same future time in the configuration file for the `PREACTIVATE_FEATURE` on their BP nodes, the network will be safe from any attempts at premature activation by some other active BP.
+
+After the agreed upon time has passed, any of the active block producers can activate the `PREACTIVATE_FEATURE` protocol feature with a simple request sent to the [`producer_api_plugin`](../03_plugins/producer_api_plugin/index.md) of their BP node.
+
+To determine the specific format of the request, the digest of the `PREACTIVATE_FEATURE` protocol feature must first be determined. This can be found by looking at nodeos startup logs, or by sending a request to the `get_supported_protocol_features` endpoint provided by the [`producer_api_plugin`](../03_plugins/producer_api_plugin/index.md). 
+
+Send a request to the endpoint locally: 
+
+```
+curl -X POST http://127.0.0.1:8888/v1/producer/get_supported_protocol_features -d '{}' | jq
+```
+
+In the returned array, find an object that references the `PREACTIVATE_FEATURE` codename, for example:
+
+```
+...
+{
+  "feature_digest": "0ec7e080177b2c02b278d5088611686b49d739925a92d9bfcacd7fc6b74053bd",
+  "subjective_restrictions": {
+    "enabled": true,
+    "preactivation_required": false,
+    "earliest_allowed_activation_time": "1970-01-01T00:00:00.000"
+  },
+  "description_digest": "64fe7df32e9b86be2b296b3f81dfd527f84e82b98e363bc97e40bc7a83733310",
+  "dependencies": [],
+  "protocol_feature_type": "builtin",
+  "specification": [
+    {
+      "name": "builtin_feature_codename",
+      "value": "PREACTIVATE_FEATURE"
+    }
+  ]
+},
+...
+```
+
+In this case, the digest of the `PREACTIVATE_FEATURE` protocol feature is `0ec7e080177b2c02b278d5088611686b49d739925a92d9bfcacd7fc6b74053bd` (note that the values may be different depending on the local changes made to the configuration of the protocol features that are specific to the blockchain network).
+
+Then, the local block producing nodeos instance can be requested to activate the `PREACTIVATE_FEATURE` protocol at its earliest opportunity (i.e. the next time that node produces a block) using the following command:
+
+```
+curl -X POST http://127.0.0.1:8888/v1/producer/schedule_protocol_feature_activations -d '{"protocol_features_to_activate": ["0ec7e080177b2c02b278d5088611686b49d739925a92d9bfcacd7fc6b74053bd"]}' | jq
+```
+
+The above command should only be used after the time has passed the agreed upon `earliest_allowed_activation_time` for the `PREACTIVATE_FEATURE` protocol feature.
+
+Any synced v1.8.x nodes can be used to check which protocol features have been activated using the following command:
+
+```
+curl -X POST http://127.0.0.1:8888/v1/chain/get_activated_protocol_features -d '{}' | jq
+```
+
+For example, if the `PREACTIVATE_FEATURE` protocol feature is activated, that command may return a result such as (specific values, especially the `activation_block_num`, may vary):
+
+```
+{
+  "activated_protocol_features": [
+    {
+      "feature_digest": "0ec7e080177b2c02b278d5088611686b49d739925a92d9bfcacd7fc6b74053bd",
+      "activation_ordinal": 0,
+      "activation_block_num": 348,
+      "description_digest": "64fe7df32e9b86be2b296b3f81dfd527f84e82b98e363bc97e40bc7a83733310",
+      "dependencies": [],
+      "protocol_feature_type": "builtin",
+      "specification": [
+        {
+          "name": "builtin_feature_codename",
+          "value": "PREACTIVATE_FEATURE"
+        }
+      ]
+    }
+  ]
+}
+```
+
+Once the `PREACTIVATE_FEATURE` protocol feature has been activated, the [new system contract](https://github.com/EOSIO/eosio.contracts/releases/tag/v1.7.0) with the `activate` action can be deployed.
+
+## Notes for block explorers, exchanges, and applications
+
+Block explorers, exchanges, and applications building on the blockchain can all follow the four-step processes described above to upgrade their nodes in time and ensure their services continue when the first protocol upgrade is activated. However, they should also be aware that certain protocol features change the behavior of existing operations on the blockchain, and in some cases also slightly change the structure of blocks and transactions.
+
+
+**First**, v1.8 changes the structure of transaction traces, even prior to the activation of any protocol features. Clients consuming transaction and action traces made available through [`history_plugin`](../03_plugins/history_plugin/index.md), [`mongo_db_plugin`](../03_plugins/mongo_db_plugin/index.md), or [`state_history_plugin`](../03_plugins/state_history_plugin/index.md) should be aware of the changes made to the trace structure (see details at [#7044](https://github.com/EOSIO/eos/pull/7044) and [#7108](https://github.com/EOSIO/eos/pull/7108)). Clients consuming the trace output of the `push_transaction` RPC from the chain API should not need to do anything since the output of that RPC should be backwards compatible. However, they are encouraged to replace usage of `push_transaction` with the new RPC [`send_transaction`](https://developers.eos.io/eosio-nodeos/reference#send_transaction) which uses the new flat structure to store the action traces.
+
+The [`state_history_plugin`](../03_plugins/state_history_plugin/index.md) has also changed its API and the structure of the files it stores on disk in a backwards incompatible way in v1.8. These changes reflect, among other things, the transaction trace structural changes and the data structure changes made within the chain state database to support the new protocol features. Consumers of the [`state_history_plugin`](../03_plugins/state_history_plugin/index.md) will need to be updated to work with the new changes in v1.8.
+
+**Second**, all protocol features are activated by signaling their 256-bit digest through a block. The block producer is able to place the digest of a protocol feature in a special section of the block header (called the block header extensions) that, under the original rules of v1.7, is expected to be empty. This change may especially be relevant to block explorers which need to ensure that their tools will not break because of the extra data included in the block header and ideally will update their block explorers to reflect the new information. The first time block explorers or other consumers of the blockchain data will encounter a non-empty block header extension is during the activation of the `PREACTIVATE_FEATURE` protocol feature.
+
+**Third**, upon activation of the `NO_DUPLICATE_DEFERRED_ID` protocol feature, contract-generated deferred transactions will include a non-empty `transaction_extensions` field. While block explorers may be interested in exposing the contents of this field in a user-friendly way, clients are free to ignore it. However, for code dealing with the binary serialized form of these transactions directly, they must be capable of successfully deserializing the transaction with the extension data present. Note that this also applies to smart contract code that may be reading the deferred transaction that caused it to execute, whether it is because it is executing an action within the deferred transaction or executing the `eosio::onerror` notification handler of the contract that sent the (failed) deferred transaction.
+
+**Fourth**, activation of the `RESTRICT_ACTION_TO_SELF` protocol feature will remove the authorization bypass that is available when a contract sends an inline action to itself (this authorization bypass was deprecated in the v1.5.1 release of EOSIO). Smart contract developers should ensure their contracts do not rely on this authorization bypass prior to the time the block producers activate the `RESTRICT_ACTION_TO_SELF` protocol feature, otherwise, their contracts may stop functioning correctly.
diff --git a/docs/01_nodeos/07_upgrade-guides/index.md b/docs/01_nodeos/07_upgrade-guides/index.md
new file mode 100644
index 00000000000..c4c95438f1a
--- /dev/null
+++ b/docs/01_nodeos/07_upgrade-guides/index.md
@@ -0,0 +1,5 @@
+# Upgrade Guides
+
+This section contains important instructions for node operators and other EOSIO stakeholders to transition an EOSIO network successfully through an EOSIO version or protocol upgrade.
+
+* [1.8 Upgrade Guide](1.8-upgrade-guide.md)
diff --git a/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/00_upgrade-issues-1.6-1.7.md b/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/00_upgrade-issues-1.6-1.7.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/01_upgrade-issues-1.7-1.8.md b/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/01_upgrade-issues-1.7-1.8.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/index.md b/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/index.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/01_nodeos/08_troubleshooting/index.md b/docs/01_nodeos/08_troubleshooting/index.md
new file mode 100644
index 00000000000..a9b1019e3eb
--- /dev/null
+++ b/docs/01_nodeos/08_troubleshooting/index.md
@@ -0,0 +1,43 @@
+# Troubleshooting
+
+### "Database dirty flag set (likely due to unclean shutdown): replay required"
+
+`nodeos` needs to be shut down cleanly. To ensure this is done, send a `SIGTERM`, `SIGQUIT` or `SIGINT` and wait for the process to shutdown. Failing to do this will result in this error. If you get this error, you're only recourse is to replay by starting `nodeos` with `--replay-blockchain` 
+
+### "Memory does not match data" Error at Restart
+
+If you get an error such as `St9exception: content of memory does not match data expected by executable` when trying to start `nodeos`, try restarting `nodeos` with one of the following options (you can use `nodeos --help` to get a full listing of these).
+
+```
+Command Line Options for eosio::chain_plugin:
+    --fix-reversible-blocks               recovers reversible block database if 
+                                          that database is in a bad state
+    --force-all-checks                    do not skip any checks that can be 
+                                          skipped while replaying irreversible 
+                                          blocks
+    --replay-blockchain                   clear chain state database and replay 
+                                          all blocks
+    --hard-replay-blockchain              clear chain state database, recover as 
+                                          many blocks as possible from the block 
+                                          log, and then replay those blocks
+    --delete-all-blocks                   clear chain state database and block 
+                                          log
+```
+
+### "Could not grow database file to requested size." Error
+
+Start `nodeos` with `--shared-memory-size-mb 1024`. A 1 GB shared memory file allows approximately half a million transactions.
+
+### What version of EOSIO am I running/connecting to?
+
+If defaults can be used, then `cleos get info` will output a block that contains a field called `server_version`.  If your `nodeos` is not using the defaults, then you need to know the URL of the `nodeos`. In that case, use the following with your `nodeos` URL:
+
+```sh
+$ cleos --url http://localhost:8888 get info
+```
+
+To focus only on the version line within the block:
+
+```sh
+$ cleos --url http://localhost:8888 get info | grep server_version
+```
diff --git a/docs/01_nodeos/eosio_components.png b/docs/01_nodeos/eosio_components.png
new file mode 100644
index 0000000000000000000000000000000000000000..59660cb775824b3d4cdd9d9a4ededb90c13e4f7d
GIT binary patch
literal 49499
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

literal 0
HcmV?d00001

diff --git a/docs/01_nodeos/index.md b/docs/01_nodeos/index.md
new file mode 100644
index 00000000000..ff4bae0a507
--- /dev/null
+++ b/docs/01_nodeos/index.md
@@ -0,0 +1,26 @@
+# Nodeos Overview
+
+EOSIO comes with a number of programs.  The primary ones that you will use, and the ones that are covered here, are:
+
+* `nodeos` (node + eos = nodeos)  - the core EOSIO node daemon that can be configured with plugins to run a node. Example uses are block production, dedicated API endpoints, and local development. 
+* `cleos` (cli + eos = cleos) - command line interface to interact with the blockchain and to manage wallets.
+* `keosd` (key + eos = keosd) - component that securely stores EOSIO keys in wallets. 
+
+The basic relationship between these components is illustrated in the following diagram.
+
+![EOSIO components](eosio_components.png)
+
+[[info | EOSIO Software Installation]]
+| Please [Install EOSIO](../00_install/index.md) before proceeding to the sections below.
+
+Please navigate the sections below to use `nodeos` in various network configurations, and learn how to setup `nodeos` instances for supporting EOSIO blockchain applications.
+
+* [Usage](02_usage/index.md) - Using `nodeos`, config options, node setups/environments.
+* [Plugins](03_plugins/index.md) - Using plugins, plugin options, mandatory vs. optional.
+* [Replays](04_replays/index.md) - Replaying the chain from a snapshot or a blocks.log file.
+* [Logging](06_logging/index.md) - Logging config/usage, loggers, appenders, logging levels.
+* [Upgrade Guides](07_upgrade-guides/index.md) - EOSIO version/consensus upgrade guides.
+* [Troubleshooting](08_troubleshooting/index.md) - Common `nodeos` troubleshooting questions.
+
+[[info | Access Node]]
+| A local or remote EOSIO access node running `nodeos` is required for a client application or smart contract to interact with the blockchain.
diff --git a/docs/02_cleos/02_how-to-guides/how-to-buy-ram.md b/docs/02_cleos/02_how-to-guides/how-to-buy-ram.md
new file mode 100644
index 00000000000..9c9942c05f6
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-buy-ram.md
@@ -0,0 +1,23 @@
+## Goal
+
+Setup an account that require multiple signatures for signning a transaction
+
+## Before you begin
+
+* You have an account
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* You have sufficient token allocated to your account
+
+* Install the currently supported version of cleos
+
+* Unlock your wallet
+
+## Steps
+
+Buys RAM in value of 0.1 SYS tokens for account `alice`:
+
+```shell
+cleos system buyram alice alice "0.1 SYS" -p alice@active
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-config-a-multisig-account.md b/docs/02_cleos/02_how-to-guides/how-to-config-a-multisig-account.md
new file mode 100644
index 00000000000..f587d484bd2
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-config-a-multisig-account.md
@@ -0,0 +1,22 @@
+## Goal
+
+Setup an account that require multiple signatures for signning a transaction
+
+## Before you begin
+
+* You have an account
+
+* You have enough resoruces allocated to execute the transaction
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is an account
+  * What is a transaction
+
+
+## Steps
+
+```shell
+cleos set account permission multisig active '{\"threshold\" : 1, \"accounts\" :[{\"permission\":{\"actor\":\"eosio\",\"permission\":\"active\"},\"weight\":1},{\"permission\":{\"actor\":\"customera\",\"permission\":\"active\"},\"weight\":1}]}' owner -p multisig@owner"
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-connect-a-specific-network.md b/docs/02_cleos/02_how-to-guides/how-to-connect-a-specific-network.md
new file mode 100644
index 00000000000..d5478ef9669
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-connect-a-specific-network.md
@@ -0,0 +1,25 @@
+## Goal
+
+Connect to a specific `nodeos` or `keosd` host
+
+`cleos` and `keosd` can connecte to a specific node by using the `-H, --host` and `-p, --port` optional arguments.
+
+[[info]]
+| If no optional arguments are used (i.e. -H and -p), `cleos` automatically tries to connect to a locally running `nodeos` and `keosd` node on the default port
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+## Steps
+### Connecting to Nodeos
+
+```bash
+  cleos -url http://nodeos-host:8888 ${subcommand}
+```
+
+### Connecting to Keosd
+
+```bash
+  cleos --wallet-url http://keosd-host:8888 ${subcommand}
+```
diff --git a/docs/02_cleos/02_how-to-guides/how-to-create-a-wallet.md b/docs/02_cleos/02_how-to-guides/how-to-create-a-wallet.md
new file mode 100644
index 00000000000..90044ccbd4c
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-create-a-wallet.md
@@ -0,0 +1,43 @@
+## Goal
+
+Create a keosd wallet
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is an account
+  * What is a public and private key pair
+
+## Steps
+
+Create a wallet and save the password to a file:
+
+```shell
+cleos wallet create --file password.pwd
+```
+
+You should see something like below. Note here the wallet is named as `default`
+
+```shell
+Creating wallet: default
+Save password to use in the future to unlock this wallet.
+Without password imported keys will not be retrievable.
+saving password to password.pwd
+```
+
+Alternatively, you can name a wallet with `-n` option:
+
+```shell
+cleos wallet create -n named_wallet -f passwd
+```
+
+You will see something like below:
+
+```shell
+Creating wallet: named_wallet
+Save password to use in the future to unlock this wallet.
+Without password imported keys will not be retrievable.
+saving password to passwd
+```
diff --git a/docs/02_cleos/02_how-to-guides/how-to-create-an-account.md b/docs/02_cleos/02_how-to-guides/how-to-create-an-account.md
new file mode 100644
index 00000000000..398ceb7c6e2
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-create-an-account.md
@@ -0,0 +1,21 @@
+## Goal
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is an account
+  * What is a public and private key pair
+
+* Created an Owner and an Active key pair
+* Imported a key pair which can authorize on behalf of a creator account
+
+## Steps
+
+```shell
+cleos create account creator name OwnerKey [ActiveKey]
+```
+
+[[info]]
+| ActiveKey is optional but recommanded to provide.
diff --git a/docs/02_cleos/02_how-to-guides/how-to-create-key-pairs.md b/docs/02_cleos/02_how-to-guides/how-to-create-key-pairs.md
new file mode 100644
index 00000000000..a6e09b44c86
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-create-key-pairs.md
@@ -0,0 +1,22 @@
+## Goal
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is a public and private key pair
+
+## Steps
+
+To output the key pair to the console
+
+```shell
+cleos create key --to-console
+```
+
+To save the key pair to file
+
+```shell
+cleos create key --file FILE_TO_SAVEKEY
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-delegate-CPU-resource.md b/docs/02_cleos/02_how-to-guides/how-to-delegate-CPU-resource.md
new file mode 100644
index 00000000000..c18835426bc
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-delegate-CPU-resource.md
@@ -0,0 +1,34 @@
+## Goal
+
+Delegate resource for an account or application
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* Understand the following:
+  * What is an account
+  * What is network bandwidth
+  * What is CPU bandwidth
+
+
+
+## Steps
+
+Delegate 0.01 SYS CPU bandwidth from `bob` to `alice`
+
+```shell
+cleos system delegatebw bob alice "0.01 SYS" "0 SYS"
+```
+
+You should see something below:
+
+```shell
+executed transaction: 5487afafd67bf459a20fcc2dbc5d0c2f0d1f10e33123eaaa07088046fd18e3ae  192 bytes  503 us
+#         eosio <= eosio::delegatebw            {"from":"bob","receiver":"alice","stake_net_quantity":"0.0000 SYS","stake_cpu_quanti...
+#   eosio.token <= eosio.token::transfer        {"from":"bob","to":"eosio.stake","quantity":"0.0010 EOS","memo":"stake bandwidth"}
+#  bob <= eosio.token::transfer        {"from":"bob","to":"eosio.stake","quantity":"0.0010 SYS","memo":"stake bandwidth"}
+#   eosio.stake <= eosio.token::transfer        {"from":"bob","to":"eosio.stake","quantity":"0.0010 SYS","memo":"stake bandwidth"}
+```
diff --git a/docs/02_cleos/02_how-to-guides/how-to-delegate-net-resource.md b/docs/02_cleos/02_how-to-guides/how-to-delegate-net-resource.md
new file mode 100644
index 00000000000..42f2f2017f0
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-delegate-net-resource.md
@@ -0,0 +1,34 @@
+## Goal
+
+Delegate resource for an account or application
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* Understand the following:
+  * What is an account
+  * What is network bandwidth
+  * What is CPU bandwidth
+
+
+
+## Steps
+
+Delegate 0.01 SYS network bandwidth from `bob` to `alice`
+
+```shell
+cleos system delegatebw bob alice "0 SYS" "0.01 SYS"
+```
+
+You should see something below:
+
+```shell
+executed transaction: 5487afafd67bf459a20fcc2dbc5d0c2f0d1f10e33123eaaa07088046fd18e3ae  192 bytes  503 us
+#         eosio <= eosio::delegatebw            {"from":"bob","receiver":"alice","stake_net_quantity":"0.0100 SYS","stake_cpu_quanti...
+#   eosio.token <= eosio.token::transfer        {"from":"bob","to":"eosio.stake","quantity":"0.0010 SYS","memo":"stake bandwidth"}
+#  bob <= eosio.token::transfer        {"from":"bob","to":"eosio.stake","quantity":"0.0010 SYS","memo":"stake bandwidth"}
+#   eosio.stake <= eosio.token::transfer        {"from":"bob","to":"eosio.stake","quantity":"0.0010 SYS","memo":"stake bandwidth"}
+```
diff --git a/docs/02_cleos/02_how-to-guides/how-to-deploy-a-smart-contract.md b/docs/02_cleos/02_how-to-guides/how-to-deploy-a-smart-contract.md
new file mode 100644
index 00000000000..355d671ea6e
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-deploy-a-smart-contract.md
@@ -0,0 +1,19 @@
+## Goal
+
+Deploy an EOSIO contract
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Unlock the wallet which contains the private key of the contract account
+
+## Steps
+
+Execute:
+
+```shell
+cleos set contract contract_account contract_directory_path
+```
+
+Replace the `contract_directory_path` with the path points to your contract folder
diff --git a/docs/02_cleos/02_how-to-guides/how-to-get-account-information.md b/docs/02_cleos/02_how-to-guides/how-to-get-account-information.md
new file mode 100644
index 00000000000..039e94fbaf8
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-get-account-information.md
@@ -0,0 +1,43 @@
+## Goal
+
+Query infomation of an EOSIO account
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is an account
+
+## Steps
+
+Execute the command below:
+
+```shell
+cleos get account ACCOUNT_NAME
+```
+
+You should be see something like below:
+
+```shell
+created: 2018-06-01T12:00:00.000
+privileged: true
+permissions:
+     owner     1:    1 EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV
+        active     1:    1 EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV
+memory:
+     quota:       unlimited  used:     3.004 KiB
+
+net bandwidth:
+     used:               unlimited
+     available:          unlimited
+     limit:              unlimited
+
+cpu bandwidth:
+     used:               unlimited
+     available:          unlimited
+     limit:              unlimited
+```
+
+[[info]]
+| Depends on the EOSIO network you are connected, you might see different fields associated with an account. That depends on which system contract has been deployed tp the network.
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-get-block-information.md b/docs/02_cleos/02_how-to-guides/how-to-get-block-information.md
new file mode 100644
index 00000000000..1010f807b27
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-get-block-information.md
@@ -0,0 +1,18 @@
+## Goal
+
+Query infomation of a block
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is a block
+
+## Steps
+
+Execute the command below:
+
+```shell
+cleos get block BLOCK_NUMBER
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-get-tables-information.md b/docs/02_cleos/02_how-to-guides/how-to-get-tables-information.md
new file mode 100644
index 00000000000..7686ac5a8c6
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-get-tables-information.md
@@ -0,0 +1,18 @@
+## Goal
+
+Query infomation of a table
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is an account
+  * What is a table
+  * What is a scope of table
+
+## Steps
+
+```shell
+cleos get table ACCOUNT SCOPE TABLE
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-get-transaction-information.md b/docs/02_cleos/02_how-to-guides/how-to-get-transaction-information.md
new file mode 100644
index 00000000000..0ab255fe9c8
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-get-transaction-information.md
@@ -0,0 +1,20 @@
+## Goal
+
+Query infomation of a transaction
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+
+  * What is a transaction
+
+## Steps
+
+```shell
+cleos get transaction id
+```
+
+[[info]]
+| Beware that you need to connect a nodeos that enable history API plugin to query transaction information
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-import-a-key.md b/docs/02_cleos/02_how-to-guides/how-to-import-a-key.md
new file mode 100644
index 00000000000..6e1faf530a7
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-import-a-key.md
@@ -0,0 +1,22 @@
+## Goal
+
+Import an key pair
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is a public and private key pair
+
+## Steps
+
+```bash
+cleos wallet import
+```
+
+Type your private key. You should see something like below:
+
+```shell
+private key: imported private key for: EOS8FBXJUfbANf3xeDWPoJxnip3Ych9HjzLBr1VaXRQFdkVAxwLE7
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-link-permission.md b/docs/02_cleos/02_how-to-guides/how-to-link-permission.md
new file mode 100644
index 00000000000..57ecab69046
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-link-permission.md
@@ -0,0 +1,20 @@
+## Goal
+
+Link a permission to an action of a contract
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is an account
+  * What is permission level
+  * What is an action
+
+## Steps
+
+Link a permission level `permlvl` to the action `transfer` of contract `hodlcontract`
+
+```shell
+cleos set action permission alice hodlcontract transfer permlvl
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-list-all-key-pair.md b/docs/02_cleos/02_how-to-guides/how-to-list-all-key-pair.md
new file mode 100644
index 00000000000..576e4935bd4
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-list-all-key-pair.md
@@ -0,0 +1,34 @@
+## Goal
+
+List all key pairs
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is a public and private key pair
+
+## Steps
+
+Unlock your wallet
+
+```bash
+cleos wallet unlock
+```
+
+List all public keys:
+
+```bash
+cleos wallet keys
+```
+
+List all private keys:
+
+```bash
+cleos wallet private_keys
+
+```
+
+[[warning]]
+| Be careful never real your private keys in a production enviroment
diff --git a/docs/02_cleos/02_how-to-guides/how-to-stake-resource.md b/docs/02_cleos/02_how-to-guides/how-to-stake-resource.md
new file mode 100644
index 00000000000..83f3a8da756
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-stake-resource.md
@@ -0,0 +1,28 @@
+## Goal
+
+Stake resource for your account
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* Understand the following:
+  * What is an account
+  * What is network bandwidth
+  * What is CPU bandwidth
+
+## Steps
+
+Stake 0.01 SYS network bandwidth for `alice`
+
+```shell
+cleos system delegatebw alice alice "0 SYS" "0.01 SYS"
+```
+
+Stake 0.01 SYS CPU bandwidth for `alice`:
+
+```shell
+cleos system delegatebw alice alice "0.01 SYS" "0 SYS"
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-submit-a-transaction.md b/docs/02_cleos/02_how-to-guides/how-to-submit-a-transaction.md
new file mode 100644
index 00000000000..419876d805f
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-submit-a-transaction.md
@@ -0,0 +1,91 @@
+## Goal
+
+Push a transaction
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Understand the following:
+  * What is a transaction
+  * How to generate a valid transaction JSON
+
+## Steps
+
+* Create a JSON snippet contains a valid transaction such as the following:
+
+```JSON
+{
+  "expiration": "2019-08-01T07:15:49",
+  "ref_block_num": 34881,
+  "ref_block_prefix": 2972818865,
+  "max_net_usage_words": 0,
+  "max_cpu_usage_ms": 0,
+  "delay_sec": 0,
+  "context_free_actions": [],
+  "actions": [{
+      "account": "eosio.token",
+      "name": "transfer",
+      "authorization": [{
+          "actor": "han",
+          "permission": "active"
+        }
+      ],
+      "data": "000000000000a6690000000000ea305501000000000000000453595300000000016d"
+    }
+  ],
+  "transaction_extensions": [],
+  "context_free_data": []
+}
+```
+
+* You can also create a JSON snippet that uses clear text JSON for `data` field.
+
+[[info]]
+| Be aware that if a clear text `data` field is used, cleos need to fetch copies of required ABIs using `nodeos` API. That operation has a performance overhead on `nodeos`
+
+```JSON
+{
+  "expiration": "2019-08-01T07:15:49",
+  "ref_block_num": 34881,
+  "ref_block_prefix": 2972818865,
+  "max_net_usage_words": 0,
+  "max_cpu_usage_ms": 0,
+  "delay_sec": 0,
+  "context_free_actions": [],
+  "actions": [{
+      "account": "eosio.token",
+      "name": "transfer",
+      "authorization": [{
+          "actor": "han",
+          "permission": "active"
+        }
+      ],
+      "data": {
+        "from": "han",
+        "to": "eosio",
+        "quantity": "0.0001 SYS",
+        "memo": "m"
+      }
+    }
+  ],
+  "transaction_extensions": [],
+  "context_free_data": []
+}
+```
+
+* Execute the following command:
+
+```shell
+cleos push transaction TRX_FILE.json
+```
+
+* Submit a transction from a JSON:
+
+```shell
+cleos push transaction JSON
+```
+
+<!---
+Link to Push Action API
+-->
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-transfer-an-eosio.token-token.md b/docs/02_cleos/02_how-to-guides/how-to-transfer-an-eosio.token-token.md
new file mode 100644
index 00000000000..794621a445a
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-transfer-an-eosio.token-token.md
@@ -0,0 +1,21 @@
+## Goal
+
+Transfer token created by eosio.token contract
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* You are going to transfer a token created by eosio.token contract and eosio.token contract has been deployed on the network which you are connected to
+
+* Understand the following:
+  * What is a transaction
+  * Token transfers are irrevertable 
+
+## Steps
+
+Assume you would like to transfer `0.0001 SYS` token to an account called `bob` from an account called `alice`, execute the following:
+
+```shell
+cleos transfer alice bob "0.0001 SYS" "Hodl!" -p alice@active
+```
diff --git a/docs/02_cleos/02_how-to-guides/how-to-undelegate-CPU.md b/docs/02_cleos/02_how-to-guides/how-to-undelegate-CPU.md
new file mode 100644
index 00000000000..dc9ca010ab5
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-undelegate-CPU.md
@@ -0,0 +1,34 @@
+## Goal
+
+Undelegate resource for an account or application
+
+Beware that only the account which originally delegated resource can undelegate
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* Understand the following:
+  * What is an account
+  * What is network bandwidth
+  * What is CPU bandwidth
+
+## Steps
+
+Undelegate 0.01 SYS CPU bandwidth form from account `alice` back to account `bob`:
+
+```shell
+cleos system undelegatebw bob alice "0 SYS" "0.01 SYS"
+```
+
+You should see something below:
+
+```shell
+
+node1:~ han$ cleos system delegatebw bob alice "0 SYS" "0.01 SYS"
+executed transaction: e7e7edb6c5556de933f9d663fea8b4a9cd56ece6ff2cebf056ddd0835efa6606  184 bytes  452 us
+#         eosio <= eosio::undelegatebw          {"from":"alice","receiver":"bob","unstake_net_quantity":"0.0000 EOS","unstake_cpu_qu...
+warning: transaction executed locally, but may not be confirmed by the network yet         ]
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-undelegate-NET.md b/docs/02_cleos/02_how-to-guides/how-to-undelegate-NET.md
new file mode 100644
index 00000000000..09996586b0d
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-undelegate-NET.md
@@ -0,0 +1,34 @@
+## Goal
+
+Undelegate resource for an account or application
+
+Beware that only the account which originally delegated resource can undelegate
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* Understand the following:
+  * What is an account
+  * What is network bandwidth
+  * What is CPU bandwidth
+
+## Steps
+
+Undelegate 0.01 SYS network bandwidth from account `alice` back to account `bob`:
+
+```shell
+cleos system undelegatebw bob alice "0 SYS" "0.01 SYS"
+```
+
+You should see something below:
+
+```shell
+
+node1:~ han$ cleos system delegatebw bob alice "0 SYS" "0.01 SYS"
+executed transaction: e7e7edb6c5556de933f9d663fea8b4a9cd56ece6ff2cebf056ddd0835efa6606  184 bytes  452 us
+#         eosio <= eosio::undelegatebw          {"from":"alice","receiver":"bob","unstake_net_quantity":"0.01 EOS","unstake_cpu_qu...
+warning: transaction executed locally, but may not be confirmed by the network yet         ]
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-unlink-permission.md b/docs/02_cleos/02_how-to-guides/how-to-unlink-permission.md
new file mode 100644
index 00000000000..a7dff1fb9b0
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-unlink-permission.md
@@ -0,0 +1,20 @@
+## Goal
+
+Unlink a linked permission level
+
+## Before you begin
+
+* Install the current supported version of cleos
+
+* Understand the following:
+  * What is an account
+  * What is permission level
+  * What is an action
+
+## Steps
+
+Remove a linked permission level from an action `transfer` of contract `hodlcontract`
+
+```shell
+cleos set action permission alice hodlcontract transfer NULL
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-unstake-CPU.md b/docs/02_cleos/02_how-to-guides/how-to-unstake-CPU.md
new file mode 100644
index 00000000000..b824a244dfe
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-unstake-CPU.md
@@ -0,0 +1,32 @@
+## Goal
+
+Unstake resource from your account
+
+Beware that only the account which originally delegated resource can undelegate
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* Understand the following:
+  * What is an account
+  * What is network bandwidth
+  * What is CPU bandwidth
+
+## Steps
+
+Unstake 0.01 SYS CPU bandwidth form account `alice`:
+
+```shell
+cleos system undelegatebw alice alice "0.01 SYS" "0 SYS"
+```
+
+You should see something below:
+
+```shell
+executed transaction: e7e7edb6c5556de933f9d663fea8b4a9cd56ece6ff2cebf056ddd0835efa6606  184 bytes  452 us
+#         eosio <= eosio::undelegatebw          {"from":"alice","receiver":"alice","unstake_net_quantity":"0.0000 EOS","unstake_cpu_qu...
+warning: transaction executed locally, but may not be confirmed by the network yet         ]
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-unstake-NET.md b/docs/02_cleos/02_how-to-guides/how-to-unstake-NET.md
new file mode 100644
index 00000000000..0d8c698d353
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-unstake-NET.md
@@ -0,0 +1,32 @@
+## Goal
+
+Unstake resource from your account
+
+Beware that only the account which originally delegated resource can undelegate
+
+## Before you begin
+
+* Install the currently supported version of cleos
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* Understand the following:
+  * What is an account
+  * What is network bandwidth
+  * What is CPU bandwidth
+
+## Steps
+
+Unstake 0.01 SYS network bandwidth from account `alice`:
+
+```shell
+cleos system undelegatebw alice alice "0 SYS" "0.01 SYS"
+```
+
+You should see something below:
+
+```shell
+executed transaction: e7e7edb6c5556de933f9d663fea8b4a9cd56ece6ff2cebf056ddd0835efa6606  184 bytes  452 us
+#         eosio <= eosio::undelegatebw          {"from":"alice","receiver":"alice","unstake_net_quantity":"0.01 EOS","unstake_cpu_qu...
+warning: transaction executed locally, but may not be confirmed by the network yet         ]
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/how-to-vote.md b/docs/02_cleos/02_how-to-guides/how-to-vote.md
new file mode 100644
index 00000000000..34dd01c586b
--- /dev/null
+++ b/docs/02_cleos/02_how-to-guides/how-to-vote.md
@@ -0,0 +1,31 @@
+## Goal
+
+Vote for a block producer
+
+## Before you begin
+
+* Install the current supported version of cleos
+
+* Ensure the reference system contracts from `eosio.contracts` repository is deployed and used to manage system resources
+
+* Understand the following:
+  * What is a block producer
+  * How does voting works
+
+* Unlock your wallet
+
+## Steps
+
+Assume you are going to vote for blockproducer1 and blockproducer2 from an account called `eosiotestts2`, execute the following:
+
+```bash
+cleos system voteproducer prods eosiotestts2 blockproducer1 blockproducer2
+```
+
+You should see something like below:
+
+
+```shell
+executed transaction: 2d8b58f7387aef52a1746d7a22d304bbbe0304481d7751fc4a50b619df62676d  128 bytes  374 us
+#         eosio <= eosio::voteproducer          {"voter":"eosiotestts2","proxy":"","producers":["blockproducer1","blockproducer2"]}
+```
\ No newline at end of file
diff --git a/docs/02_cleos/02_how-to-guides/index.md b/docs/02_cleos/02_how-to-guides/index.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/02_cleos/03_command-reference/convert/index.md b/docs/02_cleos/03_command-reference/convert/index.md
new file mode 100755
index 00000000000..d4ae096130d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/convert/index.md
@@ -0,0 +1,8 @@
+## Description
+Pack and unpack transactions
+
+## subcommands
+- [pack_transaction](pack_transaction) - From plain signed json to packed form
+- [unpack_transaction](unpack_transaction) - From packed to plain signed json form
+- [pack_action_data](pack_action_data) - From json action data to packed form
+- [unpack_action_data](unpack_action_data) - From packed to json action data form
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/convert/pack_action_data.md b/docs/02_cleos/03_command-reference/convert/pack_action_data.md
new file mode 100755
index 00000000000..b84dc7e4f68
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/convert/pack_action_data.md
@@ -0,0 +1,23 @@
+## Description
+From json action data to packed form
+
+## Positionals
+- `account` _TEXT_ - The name of the account that hosts the contract
+- `name` _TEXT_ - The name of the function that's called by this action
+- `unpacked_action_data` _TEXT_ - The action data expressed as json
+
+## Options
+
+- `-h,--help` - Print this help message and exit
+
+## Usage
+```shell
+ cleos convert pack_action_data eosio unlinkauth '{"account":"test1", "code":"test2", "type":"eosioeosio"}'
+```
+
+## Output
+
+
+```text
+000000008090b1ca000000000091b1ca000075982aea3055
+```
diff --git a/docs/02_cleos/03_command-reference/convert/pack_transaction.md b/docs/02_cleos/03_command-reference/convert/pack_transaction.md
new file mode 100755
index 00000000000..db2b60a6980
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/convert/pack_transaction.md
@@ -0,0 +1,51 @@
+## Description
+
+From plain signed json to packed form
+
+## Positionals
+
+- `transaction` _TEXT_ - The plain signed json (string)
+
+## Options
+
+- `-h,--help` - Print this help message and exit
+- `--pack-action-data` - Pack all action data within transaction, needs interaction with nodeos
+
+## Usage
+
+
+```shell
+cleos convert pack_transaction '{
+  "expiration": "2018-08-02T20:24:36",
+  "ref_block_num": 14207,
+  "ref_block_prefix": 1438248607,
+  "max_net_usage_words": 0,
+  "max_cpu_usage_ms": 0,
+  "delay_sec": 0,
+  "context_free_actions": [],
+  "actions": [{
+      "account": "eosio",
+      "name": "newaccount",
+      "authorization": [{
+          "actor": "eosio",
+          "permission": "active"
+        }
+      ],
+      "data": "0000000000ea305500a6823403ea30550100000001000240cc0bf90a5656c8bb81f0eb86f49f89613c5cd988c018715d4646c6bd0ad3d8010000000100000001000240cc0bf90a5656c8bb81f0eb86f49f89613c5cd988c018715d4646c6bd0ad3d801000000"
+    }
+  ],
+  "transaction_extensions": []
+}'
+```
+
+## Output
+
+
+```shell
+{
+  "signatures": [],
+  "compression": "none",
+  "packed_context_free_data": "",
+  "packed_trx": "8468635b7f379feeb95500000000010000000000ea305500409e9a2264b89a010000000000ea305500000000a8ed3232660000000000ea305500a6823403ea30550100000001000240cc0bf90a5656c8bb81f0eb86f49f89613c5cd988c018715d4646c6bd0ad3d8010000000100000001000240cc0bf90a5656c8bb81f0eb86f49f89613c5cd988c018715d4646c6bd0ad3d80100000000"
+}
+```
diff --git a/docs/02_cleos/03_command-reference/convert/unpack_action_data.md b/docs/02_cleos/03_command-reference/convert/unpack_action_data.md
new file mode 100755
index 00000000000..c1f5810acb1
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/convert/unpack_action_data.md
@@ -0,0 +1,28 @@
+## Description
+From packed to json action data form
+
+## Positionals
+- `account` _TEXT_ - The name of the account that hosts the contract
+- `name` _TEXT_ - The name of the function that's called by this action
+- `packed_action_data` _TEXT_ - The action data expressed as packed hex string 
+## Options
+
+- `-h,--help` - Print this help message and exit
+
+## Usage
+
+
+```text
+ cleos convert unpack_action_data eosio unlinkauth 000000008090b1ca000000000091b1ca000075982aea3055
+```
+
+## Output
+
+
+```json
+{
+  "account": "test1",
+  "code": "test2",
+  "type": "eosioeosio"
+}
+```
diff --git a/docs/02_cleos/03_command-reference/convert/unpack_transaction.md b/docs/02_cleos/03_command-reference/convert/unpack_transaction.md
new file mode 100755
index 00000000000..29d9f43c2c6
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/convert/unpack_transaction.md
@@ -0,0 +1,57 @@
+## Description
+
+From packed to plain signed json form
+
+## Positionals
+
+- `transaction` _TEXT_ - The packed transaction json (string containing packed_trx and optionally compression fields.)
+
+## Options
+
+- `-h,--help` - Print this help message and exit
+- `--unpack-action-data` - Unpack all action data within transaction, needs interaction with nodeos
+
+## Usage
+
+```text
+cleos convert unpack_transaction '{
+  "signatures": [
+    "SIG_K1_KmRbWahefwxs6uyCGNR6wNRjw7cntEeFQhNCbyg8S92Kbp7zdSSVGTD2QS7pNVWgcU126zpxaBp9CwUxFpRwSnfkjd46bS"
+  ],
+  "compression": "none",
+  "packed_context_free_data": "",
+  "packed_trx": "8468635b7f379feeb95500000000010000000000ea305500409e9a2264b89a010000000000ea305500000000a8ed3232660000000000ea305500a6823403ea30550100000001000240cc0bf90a5656c8bb81f0eb86f49f89613c5cd988c018715d4646c6bd0ad3d8010000000100000001000240cc0bf90a5656c8bb81f0eb86f49f89613c5cd988c018715d4646c6bd0ad3d80100000000"
+}'
+```
+
+## Output
+
+
+```text
+{
+  "expiration": "2018-08-02T20:24:36",
+  "ref_block_num": 14207,
+  "ref_block_prefix": 1438248607,
+  "max_net_usage_words": 0,
+  "max_cpu_usage_ms": 0,
+  "delay_sec": 0,
+  "context_free_actions": [],
+  "actions": [{
+      "account": "eosio",
+      "name": "newaccount",
+      "authorization": [{
+          "actor": "eosio",
+          "permission": "active"
+        }
+      ],
+      "data": "0000000000ea305500a6823403ea30550100000001000240cc0bf90a5656c8bb81f0eb86f49f89613c5cd988c018715d4646c6bd0ad3d8010000000100000001000240cc0bf90a5656c8bb81f0eb86f49f89613c5cd988c018715d4646c6bd0ad3d801000000"
+    }
+  ],
+  "transaction_extensions": [],
+  "signatures": [
+    "SIG_K1_KmRbWahefwxs6uyCGNR6wNRjw7cntEeFQhNCbyg8S92Kbp7zdSSVGTD2QS7pNVWgcU126zpxaBp9CwUxFpRwSnfkjd46bS"
+  ],
+  "context_free_data": []
+}
+
+```
diff --git a/docs/02_cleos/03_command-reference/create/account.md b/docs/02_cleos/03_command-reference/create/account.md
new file mode 100755
index 00000000000..f7b26d3e5f4
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/create/account.md
@@ -0,0 +1,72 @@
+## Description
+Creates a new account on the blockchain
+
+## Usage
+
+
+```shell
+Usage: cleos create account [OPTIONS] creator name OwnerKey [ActiveKey]
+
+Positionals:
+  creator TEXT                The name of the account creating the new account (required)
+  name TEXT                   The name of the new account (required)
+  OwnerKey TEXT               The owner public key or permission level for the new account (required)
+  ActiveKey TEXT              The active public key or permission level for the new account
+
+Options:
+  -h,--help                   Print this help message and exit
+  -x,--expiration             set the time in seconds before a transaction expires, defaults to 30s
+  -f,--force-unique           force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+  -s,--skip-sign              Specify if unlocked wallet keys should be used to sign transaction
+  -j,--json                   print result as json
+  -d,--dont-broadcast         don't broadcast transaction to the network (just print to stdout)
+  --return-packed             used in conjunction with --dont-broadcast to get the packed transaction
+  -r,--ref-block TEXT         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+  -p,--permission TEXT ...    An account and permission level to authorize, as in 'account@permission' (defaults to 'creator@active')
+  --max-cpu-usage-ms UINT     set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+  --max-net-usage UINT        set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+  --delay-sec UINT            set the delay_sec seconds, defaults to 0s
+```
+
+## Command
+A set of EOS keys is required to create an account. A set of EOS keys can be generated by using `./cleos create key`.
+
+```shell
+$ ./cleos create account inita tester EOS4toFS3YXEQCkuuw1aqDLrtHim86Gz9u3hBdcBw5KNPZcursVHq EOS7d9A3uLe6As66jzN8j44TXJUqJSK3bFjjEEqR4oTvNAB3iM9SA
+```
+
+## Output
+
+
+```shell
+{
+  "transaction_id": "6acd2ece68c4b86c1fa209c3989235063384020781f2c67bbb80bc8d540ca120",
+  "processed": {
+    "refBlockNum": "25217",
+    "refBlockPrefix": "2095475630",
+    "expiration": "2017-07-25T17:54:55",
+    "scope": [
+      "eos",
+      "inita"
+    ],
+    "signatures": [],
+    "messages": [{
+        "code": "eos",
+        "type": "newaccount",
+        "authorization": [{
+            "account": "inita",
+            "permission": "active"
+          }
+        ],
+        "data": "c9251a0000000000b44c5a2400000000010000000102bcca6347d828d4e1868b7dfa91692a16d5b20d0ee3d16a7ca2ddcc7f6dd03344010000010000000102bcca6347d828d4e1868b7dfa91692a16d5b20d0ee3d16a7ca2ddcc7f6dd03344010000010000000001c9251a000000000061d0640b000000000100010000000000000008454f5300000000"
+      }
+    ],
+    "output": [{
+        "notify": [],
+        "sync_transactions": [],
+        "async_transactions": []
+      }
+    ]
+  }
+}
+```
diff --git a/docs/02_cleos/03_command-reference/create/index.md b/docs/02_cleos/03_command-reference/create/index.md
new file mode 100755
index 00000000000..37d0be3b232
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/create/index.md
@@ -0,0 +1,15 @@
+## Description
+Create various items, on and off the blockchain
+
+## Subcommands
+- [key](key)  -  Create a new keypair and print the public and private keys
+- [account](account) - Create a new account on the blockchain
+
+```text
+Create various items, on and off the blockchain
+Usage: ./cleos create SUBCOMMAND
+
+Subcommands:
+  key                         Create a new keypair and print the public and private keys
+  account                     Create a new account on the blockchain
+```
diff --git a/docs/02_cleos/03_command-reference/create/key.md b/docs/02_cleos/03_command-reference/create/key.md
new file mode 100755
index 00000000000..fa6036705c5
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/create/key.md
@@ -0,0 +1,28 @@
+## Description
+
+Creates a new keypair and prints the public and private keys
+
+## Usage
+
+```shell
+Usage: cleos create key [OPTIONS]
+
+Options:
+  -h,--help                   Print this help message and exit
+  --r1                        Generate a key using the R1 curve (iPhone), instead of the K1 curve (Bitcoin)
+  -f,--file TEXT              Name of file to write private/public key output to. (Must be set, unless "--to-console" is passed
+  --to-console                Print private/public keys to console.
+```
+
+## Command
+
+```shell
+$ ./cleos create key -f passwd
+```
+
+## Output
+
+```shell
+Private key: 5KCkcSxYKZfh5Cr8CCunS2PiUKzNZLhtfBjudaUnad3PDargFQo
+Public key: EOS5uHeBsURAT6bBXNtvwKtWaiDSDJSdSmc96rHVws5M1qqVCkAm6
+```
diff --git a/docs/02_cleos/03_command-reference/get/account.md b/docs/02_cleos/03_command-reference/get/account.md
new file mode 100755
index 00000000000..760def7f5aa
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/account.md
@@ -0,0 +1,100 @@
+## Description
+Retrieves an account from the blockchain
+
+## Positional Parameters
+- `name` _TEXT_ - The name of the account to retrieve
+- `core-symbol` _TEXT_ - The expected core symbol of the chain you are querying
+## Options
+- `-j,--json` - Output in JSON format
+## Example
+## Get formatted data for user **eosio**
+
+```shell
+$ cleos get account eosio
+privileged: true
+permissions: 
+     owner     1:    1 EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV
+        active     1:    1 EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV
+memory: 
+     quota:        -1 bytes  used:      1.22 Mb   
+
+net bandwidth: (averaged over 3 days)
+     used:                -1 bytes
+     available:           -1 bytes
+     limit:               -1 bytes
+
+cpu bandwidth: (averaged over 3 days)
+     used:                -1 us
+     available:           -1 us   
+     limit:               -1 us   
+
+producers:     <not voted>
+```
+## Get JSON data for user **eosio**
+
+```shell
+$ cleos get account eosio --json
+{
+  "account_name": "eosio",
+  "privileged": true,
+  "last_code_update": "2018-05-23T18:00:25.500",
+  "created": "2018-03-02T12:00:00.000",
+  "ram_quota": -1,
+  "net_weight": -1,
+  "cpu_weight": -1,
+  "net_limit": {
+    "used": -1,
+    "available": -1,
+    "max": -1
+  },
+  "cpu_limit": {
+    "used": -1,
+    "available": -1,
+    "max": -1
+  },
+  "ram_usage": 1279625,
+  "permissions": [{
+      "perm_name": "active",
+      "parent": "owner",
+      "required_auth": {
+        "threshold": 1,
+        "keys": [{
+            "key": "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
+            "weight": 1
+          }
+        ],
+        "accounts": [],
+        "waits": []
+      }
+    },{
+      "perm_name": "owner",
+      "parent": "",
+      "required_auth": {
+        "threshold": 1,
+        "keys": [{
+            "key": "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
+            "weight": 1
+          }
+        ],
+        "accounts": [],
+        "waits": []
+      }
+    }
+  ],
+  "total_resources": null,
+  "delegated_bandwidth": null,
+  "voter_info": {
+    "owner": "eosio",
+    "proxy": "",
+    "producers": [],
+    "staked": 0,
+    "last_vote_weight": "0.00000000000000000",
+    "proxied_vote_weight": "0.00000000000000000",
+    "is_proxy": 0,
+    "deferred_trx_id": 0,
+    "last_unstake_time": "1970-01-01T00:00:00",
+    "unstaking": "0.0000 SYS"
+  }
+}
+
+```
diff --git a/docs/02_cleos/03_command-reference/get/accounts.md b/docs/02_cleos/03_command-reference/get/accounts.md
new file mode 100755
index 00000000000..68a5f084512
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/accounts.md
@@ -0,0 +1,21 @@
+## Description
+Retrieves all accounts associated with a defined public key
+
+[[info]]
+|This command will not return privileged accounts.
+
+## Positional Parameters
+`public_key` _TEXT_  - The public key to retrieve accounts for
+## Options
+- `-j,--json` - Output in JSON format
+## Example
+
+
+```shell
+$ cleos get accounts EOS8mUftJXepGzdQ2TaCduNuSPAfXJHf22uex4u41ab1EVv9EAhWt
+{
+  "account_names": [
+    "testaccount"
+  ]
+}
+```
diff --git a/docs/02_cleos/03_command-reference/get/block.md b/docs/02_cleos/03_command-reference/get/block.md
new file mode 100755
index 00000000000..a6e625f9a30
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/block.md
@@ -0,0 +1,35 @@
+## Description
+Retrieves a full block from the blockchain
+
+## Positional Parameters
+- `block` _TEXT_ - The number **or** ID of the block to retrieve
+## Options
+- `--header-state` - Get block header state from fork database instead
+## Example
+
+
+```shell
+$ ./cleos get block 1
+$ ./cleos get block 0000000130d70e94e0022fd2fa035cabb9e542c34ea27f572ac90b5a7aa3d891
+```
+This will output a block object similar to the following
+
+```json
+{
+  "timestamp": "2018-03-02T12:00:00.000",
+  "producer": "",
+  "confirmed": 1,
+  "previous": "0000000000000000000000000000000000000000000000000000000000000000",
+  "transaction_mroot": "0000000000000000000000000000000000000000000000000000000000000000",
+  "action_mroot": "0000000000000000000000000000000000000000000000000000000000000000",
+  "schedule_version": 0,
+  "new_producers": null,
+  "header_extensions": [],
+  "producer_signature": "SIG_K1_111111111111111111111111111111111111111111111111111111111111111116uk5ne",
+  "transactions": [],
+  "block_extensions": [],
+  "id": "0000000130d70e94e0022fd2fa035cabb9e542c34ea27f572ac90b5a7aa3d891",
+  "block_num": 1,
+  "ref_block_prefix": 3526296288
+}
+```
diff --git a/docs/02_cleos/03_command-reference/get/code.md b/docs/02_cleos/03_command-reference/get/code.md
new file mode 100755
index 00000000000..7bdeca67e60
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/code.md
@@ -0,0 +1,30 @@
+## Description
+Retrieves the code and ABI for an account
+
+## Positional Parameters
+- `name` _TEXT_ - The name of the account whose code should be retrieved
+## Options
+- `-c,--code` _TEXT_ - The name of the file to save the contract _.wast_ to
+- `-a,--abi` _TEXT_ - The name of the file to save the contract _.abi_ to
+- `--wasm` Save contract as wasm
+## Examples
+Simply output the hash of eosio.token contract 
+
+```shell
+$ cleos get code eosio.token
+code hash: f675e7aeffbf562c033acfaf33eadff255dacb90d002db51c7ad7cbf057eb791
+```
+Retrieve and save abi for eosio.token contract
+
+```shell
+$ cleos get code eosio.token -a eosio.token.abi
+code hash: f675e7aeffbf562c033acfaf33eadff255dacb90d002db51c7ad7cbf057eb791
+saving abi to eosio.token.abi
+```
+Retrieve and save wast code for eosio.token contract
+
+```shell
+$ cleos get code eosio.token -c eosio.token.wast
+code hash: f675e7aeffbf562c033acfaf33eadff255dacb90d002db51c7ad7cbf057eb791
+saving wast to eosio.token.wast
+```
diff --git a/docs/02_cleos/03_command-reference/get/currency-balance.md b/docs/02_cleos/03_command-reference/get/currency-balance.md
new file mode 100755
index 00000000000..53d9ab96e88
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/currency-balance.md
@@ -0,0 +1,21 @@
+## Description
+
+Retrieve the balance of an account for a given currency
+
+## Positional Parameters
+`contract` _TEXT_ - The contract that operates the currency
+
+`account` _TEXT_ - The account to query balances for
+
+`symbol` _TEXT_ - The symbol for the currency if the contract operates multiple currencies
+
+## Options
+There are no options for this subcommand
+
+## Example
+Get balance of eosio from eosio.token contract for SYS symbol. 
+
+```text
+$ cleos get currency balance eosio.token eosio SYS
+999999920.0000 SYS
+```
diff --git a/docs/02_cleos/03_command-reference/get/currency-stats.md b/docs/02_cleos/03_command-reference/get/currency-stats.md
new file mode 100755
index 00000000000..f959bf5b81d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/currency-stats.md
@@ -0,0 +1,22 @@
+## Description
+Retrieve the stats of for a given currency
+
+## Positional Parameters
+`contract` _TEXT_  - The contract that operates the currency
+
+`symbol` _TEXT_ - The symbol for the currency if the contract operates multiple currencies
+## Options
+There are no options for this subcommand
+## Example
+Get stats of the SYS token from the eosio.token contract. 
+
+```text
+$ cleos get currency stats eosio.token SYS
+{
+  "SYS": {
+    "supply": "1000000000.0000 SYS",
+    "max_supply": "10000000000.0000 SYS",
+    "issuer": "eosio"
+  }
+}
+```
diff --git a/docs/02_cleos/03_command-reference/get/currency.md b/docs/02_cleos/03_command-reference/get/currency.md
new file mode 100755
index 00000000000..0baa9aebb22
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/currency.md
@@ -0,0 +1,8 @@
+## Description
+
+Exposes subcommands for accessing standard currencies
+
+## Subcommands
+[currency balance](currency-balance.md) - Retrieve the balance of an account for a given currency
+
+[currency stats](currency-stats.md) - Retrieve the stats of for a given currency
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/get/index.md b/docs/02_cleos/03_command-reference/get/index.md
new file mode 100755
index 00000000000..f92f3f06598
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/index.md
@@ -0,0 +1,18 @@
+## Description
+
+Retrieves various items and information from the blockchain
+
+## Subcommands
+- [info](info.md)  Get current blockchain information
+- [block](block.md)  Retrieve a full block from the blockchain
+- [account](account.md)  Retrieve an account from the blockchain
+- [code](code.md)  Retrieve the code and ABI for an account
+- [table](table.md)  Retrieve the contents of a database table
+- [currency](currency.md)  Retrieve information related to standard currencies
+- [accounts](accounts.md)  Retrieve accounts associated with a public key
+- [servants](servants.md)  Retrieve accounts which are servants of a given
+
+- [transaction](transaction.md)                 Retrieve a transaction from the blockchain
+- [actions](actions.md)                     Retrieve all actions with specific account name referenced in authorization or receiver
+- [schedule](schedule.md)                    Retrieve the producer schedule
+- [transaction_id](transaction_id.md)               Get transaction id given transaction object
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/get/info.md b/docs/02_cleos/03_command-reference/get/info.md
new file mode 100755
index 00000000000..4d1933875f2
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/info.md
@@ -0,0 +1,28 @@
+## Description
+
+Gets current blockchain information
+
+## Position Parameters
+This command does not accept any parameters. 
+## Options
+- `-h` - --help                   Print this help message and exit
+## Example
+
+
+```shell
+$ ./cleos get info
+```
+This command simply returns the current blockchain state information. 
+
+```shell
+{
+  "server_version": "7451e092",
+  "head_block_num": 6980,
+  "last_irreversible_block_num": 6963,
+  "head_block_id": "00001b4490e32b84861230871bb1c25fb8ee777153f4f82c5f3e4ca2b9877712",
+  "head_block_time": "2017-12-07T09:18:48",
+  "head_block_producer": "initp",
+  "recent_slots": "1111111111111111111111111111111111111111111111111111111111111111",
+  "participation_rate": "1.00000000000000000"
+}
+```
diff --git a/docs/02_cleos/03_command-reference/get/schedule.md b/docs/02_cleos/03_command-reference/get/schedule.md
new file mode 100755
index 00000000000..35286153d2d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/schedule.md
@@ -0,0 +1,28 @@
+## Description
+
+Retrieve the producer schedule
+
+
+## Options
+- `-h` - --help                   Print this help message and exit
+
+- `-j`- --json                   Output in JSON format
+
+
+## Example
+
+```shell
+$ ./cleos get schedule
+```
+This command simply returns the current producer schedule. 
+
+```shell
+active schedule version 0
+    Producer      Producer key
+    ============= ==================
+    eosio         EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV
+
+pending schedule empty
+
+proposed schedule empty
+```
diff --git a/docs/02_cleos/03_command-reference/get/servants.md b/docs/02_cleos/03_command-reference/get/servants.md
new file mode 100755
index 00000000000..873dbc45df0
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/servants.md
@@ -0,0 +1,36 @@
+## Description
+Retrieve accounts which are servants of a given account 
+
+## Info
+
+**Command**
+
+```shell
+$ ./cleos get servants
+```
+**Output**
+
+```shell
+Usage: ./cleos get servants account
+
+Positionals:
+  account TEXT                The name of the controlling account
+```
+
+## Command
+
+
+```shell
+$ ./cleos get servants inita
+```
+
+## Output
+
+
+```shell
+{
+  "controlled_accounts": [
+    "tester"
+  ]
+}
+```
diff --git a/docs/02_cleos/03_command-reference/get/table.md b/docs/02_cleos/03_command-reference/get/table.md
new file mode 100755
index 00000000000..17d0183a924
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/table.md
@@ -0,0 +1,36 @@
+## Description
+
+Retrieves the contents of a database table
+
+## Positional Parameters
+`contract` _TEXT_ - The contract who owns the table
+
+`scope` _TEXT_ - The scope within the contract in which the table is found
+
+`table` _TEXT_ - The name of the table as specified by the contract abi
+
+## Options
+`-b,--binary` _UINT_ - Return the value as BINARY rather than using abi to interpret as JSON
+
+`-l,--limit` _UINT_ - The maximum number of rows to return
+
+`-k,--key` _TEXT_ - The name of the key to index by as defined by the abi, defaults to primary key
+
+`-L,--lower` _TEXT_ - JSON representation of lower bound value of key, defaults to first
+
+`-U,--upper` _TEXT_ - JSON representation of upper bound value value of key, defaults to last
+
+## Example
+Get the data from the accounts table for the eosio.token contract, for user eosio,
+
+```shell
+$ cleos get table eosio.token eosio accounts
+{
+  "rows": [{
+      "balance": "999999920.0000 SYS"
+    }
+  ],
+  "more": false
+}
+
+```
diff --git a/docs/02_cleos/03_command-reference/get/transaction.md b/docs/02_cleos/03_command-reference/get/transaction.md
new file mode 100755
index 00000000000..c23c67f82d0
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/transaction.md
@@ -0,0 +1,79 @@
+## Description
+Retrieves a transaction from the blockchain
+
+## Positional Parameters
+`id`` _TEXT_ - ID of the transaction to retrieve
+
+## Options
+` -b,--block-hint` UINT        the block number this transaction may be in
+
+**Command**
+
+```shell
+$ ./cleos get transaction
+```
+**Output**
+
+## Example
+
+
+```shell
+$ ./cleos get transaction eb4b94b72718a369af09eb2e7885b3f494dd1d8a20278a6634611d5edd76b703
+{
+  "transaction_id": "eb4b94b72718a369af09eb2e7885b3f494dd1d8a20278a6634611d5edd76b703",
+  "processed": {
+    "refBlockNum": 2206,
+    "refBlockPrefix": 221394282,
+    "expiration": "2017-09-05T08:03:58",
+    "scope": [
+      "inita",
+      "tester"
+    ],
+    "signatures": [
+      "1f22e64240e1e479eee6ccbbd79a29f1a6eb6020384b4cca1a958e7c708d3e562009ae6e60afac96f9a3b89d729a50cd5a7b5a7a647540ba1678831bf970e83312"
+    ],
+    "messages": [{
+        "code": "eos",
+        "type": "transfer",
+        "authorization": [{
+            "account": "inita",
+            "permission": "active"
+          }
+        ],
+        "data": {
+          "from": "inita",
+          "to": "tester",
+          "amount": 1000,
+          "memo": ""
+        },
+        "hex_data": "000000008040934b00000000c84267a1e80300000000000000"
+      }
+    ],
+    "output": [{
+        "notify": [{
+            "name": "tester",
+            "output": {
+              "notify": [],
+              "sync_transactions": [],
+              "async_transactions": []
+            }
+          },{
+            "name": "inita",
+            "output": {
+              "notify": [],
+              "sync_transactions": [],
+              "async_transactions": []
+            }
+          }
+        ],
+        "sync_transactions": [],
+        "async_transactions": []
+      }
+    ]
+  }
+}
+```
+
+[[info]]
+|Important Note
+The above transaction id will not exist on your blockchain
diff --git a/docs/02_cleos/03_command-reference/get/transaction_id.md b/docs/02_cleos/03_command-reference/get/transaction_id.md
new file mode 100755
index 00000000000..8118e8391fe
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/transaction_id.md
@@ -0,0 +1,10 @@
+## Description
+Get transaction id given transaction object
+
+## Positional Parameters
+
+- `transaction` _TEXT_ - The JSON string or filename defining the transaction which transaction id we want to retrieve (required)
+
+## Options
+
+  `-h,--help`                   Print this help message and exit
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/index.md b/docs/02_cleos/03_command-reference/index.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/02_cleos/03_command-reference/multisig/index.md b/docs/02_cleos/03_command-reference/multisig/index.md
new file mode 100755
index 00000000000..2d7cf90942c
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/index.md
@@ -0,0 +1,12 @@
+## Description
+Multisig contract commands
+
+## Subcommands
+- [multisig propose](multisig-propose.md) - Propose transaction
+- [multisig review](multisig-review.md) - Review transaction
+- [multisig approve](multisig-approve.md) - Approve proposed transaction
+- [multisig unapprove](multisig-unapprove.md) - Unapprove proposed transaction
+
+- [multisig invalidate](multisig-invalidate.md) - Invalidate all multisig approvals of an account
+- [multisig cancel](multisig-cancel.md) - Cancel proposed transaction
+- [multisig exec](multisig-exec.md) - Execute proposed transaction
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/multisig/multisig-approve.md b/docs/02_cleos/03_command-reference/multisig/multisig-approve.md
new file mode 100755
index 00000000000..e5b0a94e110
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/multisig-approve.md
@@ -0,0 +1,23 @@
+## Description
+Approve proposed transaction
+
+## Positional Arguments
+- `proposer` _TEXT_ - Proposer name (string)
+- `proposal_name` _TEXT_ - Proposal name (string)
+- `permissions` _TEXT_ - The JSON string of filename defining approving permissions
+- `proposal_hash` _TEXT_ - Hash of proposed transaction (i.e. transaction ID) to optionally enforce as a condition of the approval
+
+## Options
+
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-j,--json` print result as json
+- `-d,--dont-broadcast` Don't broadcast transaction to the network (just print to stdout)
+- `--return-packed` used in conjunction with --dont-broadcast to get the packed transaction
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/multisig/multisig-cancel.md b/docs/02_cleos/03_command-reference/multisig/multisig-cancel.md
new file mode 100755
index 00000000000..12cd1cb3945
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/multisig-cancel.md
@@ -0,0 +1,18 @@
+## Description
+Cancel proposed transaction
+
+## Positional Arguments
+- `proposer` _TEXT_ - Proposer name (string)
+- `proposal_name` _TEXT_ - Proposal name (string)
+- `canceler` _TEXT_ - Canceler name (string)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/multisig/multisig-exec.md b/docs/02_cleos/03_command-reference/multisig/multisig-exec.md
new file mode 100755
index 00000000000..ff760d43b1e
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/multisig-exec.md
@@ -0,0 +1,19 @@
+## Description
+
+Execute proposed transaction
+
+## Positional Arguments
+- `proposer` _TEXT_ - Proposer name (string)
+- `proposal_name` _TEXT_ - Proposal name (string)
+- `executer` _TEXT_ - Account paying for execution (string)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/multisig/multisig-invalidate.md b/docs/02_cleos/03_command-reference/multisig/multisig-invalidate.md
new file mode 100755
index 00000000000..adcaed2e432
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/multisig-invalidate.md
@@ -0,0 +1,19 @@
+## Description
+Invalidate all multisig approvals of an account
+
+## Positionals:
+  invalidator TEXT            invalidator name (string) (required)
+
+## Options:
+ - `-h,--help`                   Print this help message and exit
+ - `-x,--expiration`             set the time in seconds before a transaction expires, defaults to 30s
+-  `-f,--force-unique`           force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+ - `-s,--skip-sign`              Specify if unlocked wallet keys should be used to sign transaction
+ - `-j,--json`                   print result as json
+ - `-d,--dont-broadcast`         don't broadcast transaction to the network (just print to stdout)
+-  `--return-packed`             used in conjunction with --dont-broadcast to get the packed transaction
+ - `-r,--ref-block` TEXT         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+ - `-p,--permission` TEXT ...    An account and permission level to authorize, as in 'account@permission' (defaults to 'invalidator@active')
+ - `--max-cpu-usage-ms` UINT     set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+ - `--max-net-usage` UINT        set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+ - `--delay-sec` UINT            set the delay_sec seconds, defaults to 0s
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/multisig/multisig-propose.md b/docs/02_cleos/03_command-reference/multisig/multisig-propose.md
new file mode 100755
index 00000000000..978f288952d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/multisig-propose.md
@@ -0,0 +1,23 @@
+## Description
+Propose action
+
+## Positional Arguments
+`proposal_name` _TEXT_ - Proposal name (string)
+`requested_permissions` _TEXT_  - The JSON string or filename defining requested permissions
+`trx_permissions` _TEXT_ - The JSON string or filename defining transaction permissions
+`contract` _TEXT_ - Contract to wich deferred transaction should be delivered
+`action` _TEXT_ - Action of deferred transaction
+`data` _TEXT_ - The JSON string or filename defining the action to propose
+`proposer` _TEXT_ - Account proposing the transaction
+`proposal_expiration` _UINT_ - Proposal expiration interval in hours
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/multisig/multisig-propose_trx.md b/docs/02_cleos/03_command-reference/multisig/multisig-propose_trx.md
new file mode 100755
index 00000000000..843a5cea8bd
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/multisig-propose_trx.md
@@ -0,0 +1,26 @@
+##Description
+Propose transaction
+
+## Positional Arguments
+
+`proposal_name` _TEXT_ - Proposal name (string)
+`requested_permissions` _TEXT_  - The JSON string or filename defining requested permissions
+`trx_permissions` _TEXT_ - The JSON string or filename defining transaction permissions
+`contract` _TEXT_ - Contract to wich deferred transaction should be delivered
+`action` _TEXT_ - Action of deferred transaction
+`data` _TEXT_ - The JSON string or filename defining the action to propose
+`proposer` _TEXT_ - Account proposing the transaction
+`proposal_expiration` _UINT_ - Proposal expiration interval in hours
+
+## Options
+
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/multisig/multisig-review.md b/docs/02_cleos/03_command-reference/multisig/multisig-review.md
new file mode 100755
index 00000000000..6c3dd8dece6
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/multisig-review.md
@@ -0,0 +1,17 @@
+## Description
+Review transaction
+
+## Positional Arguments
+- `proposer` _TEXT_ - Proposer name (string)
+- `proposal_name` _TEXT_ - Proposal name (string)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+## Examples
diff --git a/docs/02_cleos/03_command-reference/multisig/multisig-unapprove.md b/docs/02_cleos/03_command-reference/multisig/multisig-unapprove.md
new file mode 100755
index 00000000000..f2dda4b9e94
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/multisig/multisig-unapprove.md
@@ -0,0 +1,20 @@
+## Description
+Unapprove proposed transaction
+
+---
+## Positional Arguments
+- `proposer` _TEXT_ - Proposer name (string)
+- `proposal_name` _TEXT_ - Proposal name (string)
+- `permissions` _TEXT_ - The JSON string of filename defining approving permissions
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `--return-packed` used in conjunction with --dont-broadcast to get the packed transaction
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/net/connect.md b/docs/02_cleos/03_command-reference/net/connect.md
new file mode 100755
index 00000000000..3bbd9278b0b
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/net/connect.md
@@ -0,0 +1,18 @@
+## Description
+Start a new connection to a peer
+
+**Command**
+
+```shell
+./cleos net connect
+```
+
+**Output**
+
+```shell
+start a new connection to a peer
+Usage: ./cleos net connect host
+
+Positionals:
+  host TEXT                   The hostname:port to connect to.
+```
diff --git a/docs/02_cleos/03_command-reference/net/disconnect.md b/docs/02_cleos/03_command-reference/net/disconnect.md
new file mode 100755
index 00000000000..a605422d5bb
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/net/disconnect.md
@@ -0,0 +1,18 @@
+## Description
+close an existing connection
+
+**Command**
+
+```shell
+$ ./cleos net disconnect
+```
+
+**Output**
+
+```shell
+close an existing connection
+Usage: ./cleos net disconnect host
+
+Positionals:
+  host TEXT                   The hostname:port to disconnect from.
+```
diff --git a/docs/02_cleos/03_command-reference/net/index.md b/docs/02_cleos/03_command-reference/net/index.md
new file mode 100755
index 00000000000..bbfcdf583df
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/net/index.md
@@ -0,0 +1,19 @@
+## Description
+Interact with local p2p network connections.
+
+## Command
+
+```shell
+Interact with local p2p network connections
+Usage: ./cleos net SUBCOMMAND
+```
+
+## Subcommands
+ 
+ - [cleos net connect](connect) start a new connection to a peer
+
+ - [cleos net disconnect](disconnect) ` close an existing connection
+  
+ - [cleos net status](status) status of existing connection
+  
+ - [cleos net peers](peers) status of all existing peers
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/net/peers.md b/docs/02_cleos/03_command-reference/net/peers.md
new file mode 100755
index 00000000000..49ae89de590
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/net/peers.md
@@ -0,0 +1,18 @@
+## Description
+status of all existing peers
+
+**Command**
+
+```shell
+$ ./cleos net status
+```
+**Output**
+
+```shell
+ERROR: RequiredError: host
+status of existing connection
+Usage: ./cleos net status host
+
+Positionals:
+  host TEXT                   The hostname:port to query status of connection
+```
diff --git a/docs/02_cleos/03_command-reference/net/status.md b/docs/02_cleos/03_command-reference/net/status.md
new file mode 100755
index 00000000000..fb7ef0d307d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/net/status.md
@@ -0,0 +1,16 @@
+## Description
+status of existing connection
+
+**Command**
+
+```shell
+$ ./cleos net status
+```
+**Output**
+
+```shell
+Usage: ./cleos net status host
+
+Positionals:
+  host TEXT                   The hostname:port to query status of connection
+```
diff --git a/docs/02_cleos/03_command-reference/push/index.md b/docs/02_cleos/03_command-reference/push/index.md
new file mode 100755
index 00000000000..11f6233d9ca
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/push/index.md
@@ -0,0 +1,10 @@
+## Description
+Pushes arbitrary transactions to the blockchain.
+
+## Commands
+
+[push action](push-action.md)  Push a transaction with a single action
+
+[push transaction](push-transaction.md) Push an arbitrary JSON transaction
+
+[push transactions](push-transactions.md) Push an array of arbitrary JSON transactions
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/push/push-action.md b/docs/02_cleos/03_command-reference/push/push-action.md
new file mode 100755
index 00000000000..82e8f657274
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/push/push-action.md
@@ -0,0 +1,33 @@
+## Description
+Push a transaction with a single action
+
+## Positionals
+  `contract` _Type: Text_ - The account providing the contract to execute
+ 
+  `action` _Type: Text_ - The action to execute on the contract
+ 
+  `data` _Type: Text_ - The arguments to the contract
+
+**Output**
+
+## Options
+
+ ` -h,--help` - Print this help message and exit
+ 
+ `-x,--expiration` - set the time in seconds before a transaction expires, defaults to 30s
+ 
+ `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+
+` -s,--skip-sign` - Specify if unlocked wallet keys should be used to sign transaction
+
+`-j,--json` - print result as json
+
+`-d,--dont-broadcast` - don't broadcast transaction to the network (just print to stdout)
+
+`-p,--permission` _Type: Text_ - An account and permission level to authorize, as in 'account@permission'
+
+`--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+
+`--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+
+`--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
diff --git a/docs/02_cleos/03_command-reference/push/push-transaction.md b/docs/02_cleos/03_command-reference/push/push-transaction.md
new file mode 100755
index 00000000000..97533cc51be
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/push/push-transaction.md
@@ -0,0 +1,36 @@
+## Description
+
+Push an arbitrary JSON transaction
+
+## Positional Parameters
+- `transaction` (text) The JSON of the transaction to push, or the name of a JSON file containing the transaction
+
+## Options
+This command has no options
+
+` -h,--help` - Print this help message and exit
+ 
+`-x,--expiration` - set the time in seconds before a transaction expires, defaults to 30s
+ 
+`-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+
+` -s,--skip-sign` - Specify if unlocked wallet keys should be used to sign transaction
+
+`-j,--json` - print result as json
+
+`-d,--dont-broadcast` - don't broadcast transaction to the network (just print to stdout)
+
+`-p,--permission` _Type: Text_ - An account and permission level to authorize, as in 'account@permission'
+
+`--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+
+`--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+
+`--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
+
+## Example
+
+
+```text
+$ push transaction {}
+```
diff --git a/docs/02_cleos/03_command-reference/push/push-transactions.md b/docs/02_cleos/03_command-reference/push/push-transactions.md
new file mode 100755
index 00000000000..b2ea4aed0a4
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/push/push-transactions.md
@@ -0,0 +1,8 @@
+## Description
+Push an array of arbitrary JSON transactions
+
+## Positional Arguments
+Pushes an array of arbitrary JSON transactions.
+## Options
+This command has no options
+## Examples
diff --git a/docs/02_cleos/03_command-reference/set/index.md b/docs/02_cleos/03_command-reference/set/index.md
new file mode 100755
index 00000000000..0484ab9ff38
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/set/index.md
@@ -0,0 +1,21 @@
+## Description
+Sets or updates the blockchain state.
+## Commands
+
+Set or update blockchain state
+
+```shell
+Usage: ./cleos set [OPTIONS] SUBCOMMAND
+
+Options:
+  -h,--help                   Print this help message and exit
+```
+
+## Subcommands
+  
+- [code](set-code)                       Create or update the code on an account
+- [abi](set-abi)                         Create or update the abi on an account
+- [contract](set-contract)                    Create or update the contract on an account
+- [account](set-account)                     set or update blockchain account state
+- [action](set-action)                      set or update blockchain action state
+
diff --git a/docs/02_cleos/03_command-reference/set/set-abi.md b/docs/02_cleos/03_command-reference/set/set-abi.md
new file mode 100755
index 00000000000..3890ceacf4d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/set/set-abi.md
@@ -0,0 +1,24 @@
+## Description
+Create or update the abi on an account
+
+## Positionals
+* `account` _TEXT_ - The account to set code for (required)
+* `abi-file` _TEXT_ - The fullpath containing the contract WAST or WASM (required)
+
+## Options
+* `-h,--help` Print this help message and exit
+* `-a,--abi' _TEXT_ - The ABI for the contract
+* `-x,--expiration _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+* `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+* `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+* `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+* `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+* `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+* `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+* `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+* `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
+## Usage
+
+```shell
+cleos set abi someaccount1 ./path/to/abi.abi
+```
diff --git a/docs/02_cleos/03_command-reference/set/set-account.md b/docs/02_cleos/03_command-reference/set/set-account.md
new file mode 100755
index 00000000000..a0df2f42772
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/set/set-account.md
@@ -0,0 +1,84 @@
+## Description
+set parameters dealing with account permissions
+
+## Positionals
+- `account` _TEXT_ - The account to set/delete a permission authority for
+- `permission` _TEXT_ - The permission name to set/delete an authority for
+- `authority` _TEXT_ - [delete] NULL, [create/update] public key, JSON string, or filename defining the authority
+- `parent` _TEXT_ - [create] The permission name of this parents permission (Defaults to: "Active")
+## Options
+
+`-h,--help` Print this help message and exit
+
+`--add-code` [code] add 'eosio.code' permission to specified permission authority
+
+`--remove-code` [code] remove 'eosio.code' permission from specified permission authority
+
+`-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+
+`-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+
+`-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+
+`-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+
+`-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+
+`-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+
+`--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+
+`--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+
+`--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
+
+## Command
+To modify the permissions of an account, you must have the authority over the account and the permission of which you are modifying. The set account permission command is subject to change so it's associated Class is not fully documented.
+
+The first example associates a new key to the active permissions of an account.
+
+```shell
+$ ./cleos set account permission test active '{"threshold" : 1, "keys" : [{"permission":{"key":"EOS8X7Mp7apQWtL6T2sfSZzBcQNUqZB7tARFEm9gA9Tn9nbMdsvBB","permission":"active"},"weight":1}], "accounts" : [{"permission":{"account":"acc2","permission":"active"},"weight":50}]}' owner
+```
+This second example modifies the same account permission, but removes the key set in the last example, and grants active authority of the @test account to another account.
+
+```shell
+$ ./cleos set account permission test active '{"threshold" : 1, "keys" : [], "accounts" : [{"permission":{"account":"sandwich","permission":"active"},"weight":1},{"permission":{"account":"acc1","permission":"active"},"weight":50}]}' owner
+```
+The third example demonstrates how to setup permissions for multisig.
+
+```shell
+$ ./cleos set account permission test active '{"threshold" : 100, "keys" : [{"permission":{"key":"EOS8X7Mp7apQWtL6T2sfSZzBcQNUqZB7tARFEm9gA9Tn9nbMdsvBB","permission":"active"},"weight":25}], "accounts" : [{"permission":{"account":"@sandwich","permission":"active"},"weight":75}]}' owner
+```
+The JSON object used in this command is actually composed of two different types of objects
+
+The authority JSON object ...
+
+```json
+{
+  "threshold"       : 100,    /*An integer that defines cumulative signature weight required for authorization*/
+  "keys"            : [],     /*An array made up of individual permissions defined with an EOS PUBLIC KEY*/
+  "accounts"        : []      /*An array made up of individual permissions defined with an EOS ACCOUNT*/
+}
+```
+...which includes one or more permissions objects.
+
+```json
+/*Set Permission with Key*/
+{
+  "permission" : {
+    "key"           : "EOS8X7Mp7apQWtL6T2sfSZzBcQNUqZB7tARFEm9gA9Tn9nbMdsvBB",
+    "permission"    : "active"
+  },
+  weight            : 25      /*Set the weight of a signature from this permission*/
+}
+
+/*Set Permission with Account*/
+{
+  "permission" : {
+    "account"       : "sandwich",
+    "permission"    : "active"
+  },
+  weight            : 75      /*Set the weight of a signature from this permission*/
+}
+```
diff --git a/docs/02_cleos/03_command-reference/set/set-action.md b/docs/02_cleos/03_command-reference/set/set-action.md
new file mode 100755
index 00000000000..f19d5525165
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/set/set-action.md
@@ -0,0 +1,72 @@
+## Description
+Sets or updates an action's state on the blockchain.
+
+**Command**
+
+```shell
+$ ./cleos set action
+```
+**Output**
+
+```shell
+ERROR: RequiredError: Subcommand required
+set or update blockchain action state
+Usage: ./cleos set action [OPTIONS] SUBCOMMAND
+
+Options:
+  -h,--help                   Print this help message and exit
+
+Subcommands:
+  permission                  set parmaters dealing with account permissions
+```
+**Command**
+
+```shell
+$ ./cleos set action permission
+```
+
+## Positionals
+
+`account` TEXT The account to set/delete a permission authority for (required
+
+`code` _Text_ The account that owns the code for the action
+
+`type` _Type_ the type of the action
+
+`requirement` _Type_ The permission name require for executing the given action
+
+## Options
+`-h,--help` Print this help message and exit
+
+`-x,--expiration` _Type:Text_ - set the time in seconds before a transaction expires, defaults to 30s
+
+`-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+
+`-s,--skip-sign` Specify if unlocked wallet keys 
+should be used to sign transaction
+
+`-j,--json` print result as json
+
+`-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+
+`--return-packed` used in conjunction with --dont-broadcast to get the packed transaction
+
+`-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+
+`-p,--permission`  _Type:Text_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+
+`--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+
+`--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+
+`--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
+
+## Usage
+
+```shell
+#Link a `voteproducer` action to the 'voting' permissions
+cleos set action permission sandwichfarm eosio.system voteproducer voting -p sandwichfarm@voting
+
+#Now can execute the transaction with the previously set permissions. 
+cleos system voteproducer approve sandwichfarm someproducer -p sandwichfarm@voting
+```
diff --git a/docs/02_cleos/03_command-reference/set/set-code.md b/docs/02_cleos/03_command-reference/set/set-code.md
new file mode 100755
index 00000000000..538f8e7a16c
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/set/set-code.md
@@ -0,0 +1,42 @@
+## Description
+Sets or updates an account's code on the blockchain.
+
+## Positionals
+
+* `account` _TEXT_ - The account to set code for (required)
+* `code-file` _TEXT_ - The fullpath containing the contract WAST or WASM (required)
+
+## Options
+
+`-h,--help` Print this help message and exit
+`-a,--abi` _TEXT_ - The ABI for the contract
+
+`-c,--clear` Remove contract on an account
+
+`--suppress-duplicate-check`  Don't check for duplicate
+
+`-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+
+`-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+
+`-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+
+`-j,--json` print result as json
+
+`-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+
+`--return-packed` used in conjunction with --dont-broadcast to get the packed transaction
+
+`-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+
+`-p,--permission`  _Type:Text_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+
+* `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+* `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+* `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+* `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+* `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
+
+```shell
+cleos set code someaccount1 ./path/to/wasm
+```
diff --git a/docs/02_cleos/03_command-reference/set/set-contract.md b/docs/02_cleos/03_command-reference/set/set-contract.md
new file mode 100755
index 00000000000..b05bd349881
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/set/set-contract.md
@@ -0,0 +1,79 @@
+## Description
+Creates or updates the contract on an account.
+## Positional Parameters
+ `account` _TEXT_ - The account to publish a contract for
+  `wast-file`  _TEXT_ - The file containing the contract WAST or WASM
+  `abi-file`  _TEXT_ - The ABI for the contract
+## Options
+
+`-h,--help` Print this help message and exit
+
+`-a,--abi` _TEXT_ - The ABI for the contract
+
+`-c,--clear` Remove contract on an account
+
+`--suppress-duplicate-check`  Don't check for duplicate
+
+`-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+
+`-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+
+`-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+
+`-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+
+`--return-packed`             used in conjunction with --dont-broadcast to get the packed transaction
+
+`-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+
+`-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+
+`--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+
+`--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+
+`--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
+
+## Example
+Here we deploy the standard currency contract. 
+
+```shell
+$ ./cleos set contract currency ../../../contracts/currency/currency.wast ../../../contracts/currency/currency.abi
+```
+This will output something similar to...
+
+```shell
+Reading WAST...
+Assembling WASM...
+Publishing contract...
+{
+  "transaction_id": "9990306e13f630a9c5436a5a0b6fb8fe2c7f3da2f342b4898a39c4a2c17dcdb3",
+  "processed": {
+    "refBlockNum": 1208,
+    "refBlockPrefix": 3058534156,
+    "expiration": "2017-08-24T18:29:52",
+    "scope": [
+      "currency",
+      "eos"
+    ],
+    "signatures": [],
+    "messages": [{
+        "code": "eos",
+        "type": "setcode",
+        "authorization": [{
+            "account": "currency",
+            "permission": "active"
+          }
+        ],
+        "data": "00000079b822651d0000e8150061736d0100000001390a60017e0060037e7e7f017f60047e7e7f7f017f60017f0060057e7e7e7f7f017f60027f7f0060027f7f017f60027e7f0060000060027e7e00029d010a03656e7606617373657274000503656e76086c6f61645f693634000403656e76067072696e7469000003656e76067072696e746e000003656e76067072696e7473000303656e760b726561644d657373616765000603656e760a72656d6f76655f693634000103656e760b7265717569726541757468000003656e760d726571756972654e6f74696365000003656e760973746f72655f6936340002030706000007030809040401700000050301000107cc0107066d656d6f72790200205f5a4e33656f733133726571756972654e6f74696365454e535f344e616d6545000a1e5f5a4e33656f7331317265717569726541757468454e535f344e616d6545000b345f5a4e3863757272656e6379313273746f72654163636f756e74454e33656f73344e616d6545524b4e535f374163636f756e7445000c355f5a4e3863757272656e637932336170706c795f63757272656e63795f7472616e7366657245524b4e535f385472616e7366657245000d04696e6974000e056170706c79000f0a9d0d060600200010080b0600200010070b3400024020012903084200510d0020004280808080a8d7bee3082001411010091a0f0b20004280808080a8d7bee308200110061a0b8a0604017e027f047e017f4100410028020441206b2208360204200029030821052000290300210720002903102104411010042004100241c000100442808080c887d7c8b21d100341d00010042007100341e000100420051003200029030021052000290308100820051008200029030010072000290300210142002105423b210441f00021034200210603400240024002400240024020054206560d0020032c00002202419f7f6a41ff017141194b0d01200241a0016a21020c020b420021072005420b580d020c030b200241ea016a41002002414f6a41ff01714105491b21020b2002ad42388642388721070b2007421f83200442ffffffff0f838621070b200341016a2103200542017c2105200720068421062004427b7c2204427a520d000b420021052008420037031820082006370310200142808080c887d7c8b21d4280808080a8d7bee308200841106a411010011a200041086a2903002101423b210441f00021034200210603400240024002400240024020054206560d0020032c00002202419f7f6a41ff017141194b0d01200241a0016a21020c020b420021072005420b580d020c030b200241ea016a41002002414f6a41ff01714105491b21020b2002ad42388642388721070b2007421f83200442ffffffff0f838621070b200341016a2103200542017c2105200720068421062004427b7c2204427a520d000b2008200637030020084200370308200142808080c887d7c8b21d4280808080a8d7bee3082008411010011a200841186a2203290300200041106a22022903005a418001100020032003290300200229030022057d370300200520082903087c20055a41b00110002008200829030820022903007c370308200029030021050240024020032903004200510d0020054280808080a8d7bee308200841106a411010091a0c010b20054280808080a8d7bee308200841106a10061a0b200041086a290300210502400240200841086a2903004200510d0020054280808080a8d7bee3082008411010091a0c010b20054280808080a8d7bee308200810061a0b4100200841206a3602040b980303027f057e017f4100410028020441106b220736020442002103423b210241e00121014200210403400240024002400240024020034207560d0020012c00002200419f7f6a41ff017141194b0d01200041a0016a21000c020b420021052003420b580d020c030b200041ea016a41002000414f6a41ff01714105491b21000b2000ad42388642388721050b2005421f83200242ffffffff0f838621050b200141016a2101200342017c2103200520048421042002427b7c2202427a520d000b42002103423b210241f00021014200210603400240024002400240024020034206560d0020012c00002200419f7f6a41ff017141194b0d01200041a0016a21000c020b420021052003420b580d020c030b200041ea016a41002000414f6a41ff01714105491b21000b2000ad42388642388721050b2005421f83200242ffffffff0f838621050b200141016a2101200342017c2103200520068421062002427b7c2202427a520d000b2007428094ebdc033703082007200637030020044280808080a8d7bee3082007411010091a4100200741106a3602040bb10303027f047e017f4100410028020441206b220836020442002105423b210441e00121034200210603400240024002400240024020054207560d0020032c00002202419f7f6a41ff017141194b0d01200241a0016a21020c020b420021072005420b580d020c030b200241ea016a41002002414f6a41ff01714105491b21020b2002ad42388642388721070b2007421f83200442ffffffff0f838621070b200341016a2103200542017c2105200720068421062004427b7c2204427a520d000b024020062000520d0042002105423b210441f00121034200210603400240024002400240024020054207560d0020032c00002202419f7f6a41ff017141194b0d01200241a0016a21020c020b420021072005420b580d020c030b200241ea016a41002002414f6a41ff01714105491b21020b2002ad42388642388721070b2007421f83200442ffffffff0f838621070b200341016a2103200542017c2105200720068421062004427b7c2204427a520d000b20062001520d00200842003703102008420037030820084200370318200841086a4118100541174b4180021000200841086a100d0b4100200841206a3602040b0bff010b0041040b04200500000041100b2254686973206170706561727320746f2062652061207472616e73666572206f6620000041c0000b0220000041d0000b072066726f6d20000041e0000b0520746f20000041f0000b086163636f756e7400004180010b2c696e746567657220756e646572666c6f77207375627472616374696e6720746f6b656e2062616c616e6365000041b0010b26696e7465676572206f766572666c6f7720616464696e6720746f6b656e2062616c616e6365000041e0010b0963757272656e6379000041f0010b097472616e7366657200004180020b1e6d6573736167652073686f72746572207468616e2065787065637465640000fd02046e616d651006617373657274020000086c6f61645f693634050000000000067072696e74690100067072696e746e0100067072696e747301000b726561644d6573736167650200000a72656d6f76655f693634030000000b726571756972654175746801000d726571756972654e6f7469636501000973746f72655f6936340400000000205f5a4e33656f733133726571756972654e6f74696365454e535f344e616d65450101301e5f5a4e33656f7331317265717569726541757468454e535f344e616d6545010130345f5a4e3863757272656e6379313273746f72654163636f756e74454e33656f73344e616d6545524b4e535f374163636f756e74450201300131355f5a4e3863757272656e637932336170706c795f63757272656e63795f7472616e7366657245524b4e535f385472616e73666572450901300131013201330134013501360137013804696e69740801300131013201330134013501360137056170706c7909013001310132013301340135013601370138010b4163636f756e744e616d65044e616d6502087472616e7366657200030466726f6d0b4163636f756e744e616d6502746f0b4163636f756e744e616d65087175616e746974790655496e743634076163636f756e740002036b65790655496e7436340762616c616e63650655496e74363401000000b298e982a4087472616e736665720100000080bafac608076163636f756e74"
+      }
+    ],
+    "output": [{
+        "notify": [],
+        "sync_transactions": [],
+        "async_transactions": []
+      }
+    ]
+  }
+}
+```
diff --git a/docs/02_cleos/03_command-reference/system/index.md b/docs/02_cleos/03_command-reference/system/index.md
new file mode 100755
index 00000000000..3c89ccf499c
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/index.md
@@ -0,0 +1,20 @@
+## Description
+Send eosio.system contract action to the blockchain.
+
+## Subcommands
+
+- [system newaccount](system-newaccount.md) Create an account, buy ram, stake for bandwidth for the account
+- [system regproducer](system-regproducer.md) Register a new producer
+- [system unregprod](system-unregprod.md) Unregister an existing producer
+- [system voteproducer](system-voteproducer.md) Vote for a producer
+- [system listproducers](system-listproducers.md) List producers
+- [system delegatebw](system-delegatebw.md) Delegate bandwidth
+- [system undelegatebw](system-undelegatebw.md) Undelegate bandwidth
+- [system listbw](system-listbw.md) List delegated bandwidth
+- [system buyram](system-buyram.md) Buy RAM
+- [system sellram](system-sellram.md) Sell RAM
+- [system claimrewards](system-claimrewards.md) Claim producer rewards
+- [system regproxy](system-regproxy.md) Register an account as a proxy (for voting)
+- [system unregproxy](system-unregproxy.md) Unregister an account as a proxy (for voting)
+- [system canceldelay](system-canceldelay.md) Cancel a delayed transaction
+ - [system rex](system-rex) Actions related to REX (the resource exchange)
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/system/system-bidname.md b/docs/02_cleos/03_command-reference/system/system-bidname.md
new file mode 100755
index 00000000000..c1d03163a42
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-bidname.md
@@ -0,0 +1,28 @@
+## Description
+
+Place a bid on "premium" usernames (account names less than 12 characters)
+
+## Positionals
+* `bidder` _TEXT_ - The bidding account (required)
+* `newname` _TEXT_  - The bidding name (required)
+* `bid` _TEXT_ - The amount of CORE SYMBOL to bid (required)
+## Options
+* `-h,--help` - Print this help message and exit
+* `-x,--expiration` - set the time in seconds before a transaction expires, defaults to 30s
+* `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+* `-s,--skip-sign` - Specify if unlocked wallet keys should be used to sign transaction
+* `-j,--json` - print result as json
+* `-d,--dont-broadcast` - don't broadcast transaction to the network (just print to stdout)
+* `-r,--ref-block` _TEXT_ - set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+* `-p,--permission` _TEXT_ - An account and permission level to authorize, as in 'account@permission'
+* `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+* `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Usage
+
+
+```shell
+cleos system bidname accountname1 bob "10 SYS"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-bidnameinfo.md b/docs/02_cleos/03_command-reference/system/system-bidnameinfo.md
new file mode 100755
index 00000000000..d5541078e4b
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-bidnameinfo.md
@@ -0,0 +1,16 @@
+## Description
+
+Returns data about a particular name and it's bidding status
+
+## Positionals
+* `name` _TEXT_  - The name to lookup
+
+## Options
+* `-h,--help` - Print this help message and exit
+* `-j,--json` - Print result as json
+
+## Usage
+
+```shell
+cleos system bidnameinfo bob
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-buyram.md b/docs/02_cleos/03_command-reference/system/system-buyram.md
new file mode 100755
index 00000000000..028df3f8384
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-buyram.md
@@ -0,0 +1,22 @@
+## Description
+Buy RAM
+
+## Positional Arguments
+- `payer` _TEXT_  - Theaccount paying for RAM
+- `receiver` _TEXT_ - The account receiving bought RAM
+- `amount` _TEXT_ - The amount of EOS to pay for RAM
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-k,--kbytes`                 buyram in number of kibibytes (KiB)
+- `-b,--bytes`                  buyram in number of bytes
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-j,--json` - print result as json
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
diff --git a/docs/02_cleos/03_command-reference/system/system-canceldelay.md b/docs/02_cleos/03_command-reference/system/system-canceldelay.md
new file mode 100755
index 00000000000..12b8c89a991
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-canceldelay.md
@@ -0,0 +1,20 @@
+## Description
+
+Cancel a delayed transaction
+
+## Positional Arguments
+- `canceling_account` _TEXT_ - Account  from authorization on the original delayed transaction
+- `canceling_permission` _TEXT_ - Permission from authorization on the original delayed transaction
+- `trx_id` _TEXT_ - The transaction id of the original delayed transaction
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/system/system-claimrewards.md b/docs/02_cleos/03_command-reference/system/system-claimrewards.md
new file mode 100755
index 00000000000..63c21575d1a
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-claimrewards.md
@@ -0,0 +1,20 @@
+## Description
+
+Claim producer rewards
+
+## Positional Arguments
+- `owner` _TEXT_ - The account to claim rewards for
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-delegatebw.md b/docs/02_cleos/03_command-reference/system/system-delegatebw.md
new file mode 100755
index 00000000000..9cd96812433
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-delegatebw.md
@@ -0,0 +1,24 @@
+---
+title: "system delegatebw"
+excerpt: "Delegate bandwidth"
+---
+## Positional Arguments
+- `from` _TEXT_ - The account undelegating bandwidth
+- `receiver` _TEXT_ - The account to undelegate bandwidth from
+- `stake_net_quantity` _TEXT_ - The amount of EOS to delegate for network bandwidth
+- `stake_cpu_quantity` _TEXT_  - The amount of EOS to delegate for CPU bandwidth
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-listbw.md b/docs/02_cleos/03_command-reference/system/system-listbw.md
new file mode 100755
index 00000000000..325f30efc45
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-listbw.md
@@ -0,0 +1,12 @@
+## Description
+
+List delegated bandwidth
+
+## Positional Arguments
+- `account` _TEXT_ - The account delegated bandwidth
+
+## Options
+`-j,--json` - Output in JSON format
+`-h,--help` - Print this help message and exit
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-listproducers.md b/docs/02_cleos/03_command-reference/system/system-listproducers.md
new file mode 100755
index 00000000000..c728b0fb27b
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-listproducers.md
@@ -0,0 +1,12 @@
+## Description
+
+List producers
+
+## Positional Arguments
+
+## Options
+
+`-h,--help`                   Print this help message and exit
+`-j,--json`                   Output in JSON format
+`-l,--limit` _UINT_             The maximum number of rows to return
+`-L,--lower` _TEXT_             lower bound value of key, defaults to first
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/system/system-newaccount.md b/docs/02_cleos/03_command-reference/system/system-newaccount.md
new file mode 100755
index 00000000000..5e0b92cb1dc
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-newaccount.md
@@ -0,0 +1,28 @@
+## Description
+
+Create an account, buy ram, stake for bandwidth for the account
+
+## Positional Arguments
+- `creator` _TEXT_  - The name of the account creating the new account
+- `name` _TEXT_  - The name of the new account
+- `OwnerKey` _TEXT_  - The owner public key for the new account
+- `ActiveKey` _TEXT_  - The active public key for the new account
+## Options
+- `-h,--help` Print this help message and exit
+- `--stake-net` _TEXT_ - The amount of EOS delegated for net bandwidth
+- `--stake-cpu` _TEXT_  - The amount of EOS delegated for CPU bandwidth
+- `--buy-ram-bytes` _UINT_ - The amount of RAM bytes to purchase for the new account in kilobytes KiB, default is 8 KiB
+- `--buy-ram-EOS` _TEXT_ - The amount of RAM bytes to purchase for the new account in EOS
+- `--transfer` - Transfer voting power and right to unstake EOS to receiver
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-regproducer.md b/docs/02_cleos/03_command-reference/system/system-regproducer.md
new file mode 100755
index 00000000000..eb0914d5352
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-regproducer.md
@@ -0,0 +1,22 @@
+---
+title: "system regproducer"
+excerpt: "Register a new producer"
+---
+## Positional Arguments
+- `account` _TEXT_ - The account to register as a producer
+- `producer_key` _TEXT_ - The producer's public key
+- `url` _TEXT_ - URL where info about producer can be found
+- `location` _UINT_ - Relative location for purpose of nearest neighbor scheduling
+## Options
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-regproxy.md b/docs/02_cleos/03_command-reference/system/system-regproxy.md
new file mode 100755
index 00000000000..97d53a7e0d3
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-regproxy.md
@@ -0,0 +1,19 @@
+---
+title: "system regproxy"
+excerpt: "Register an account as a proxy (for voting)"
+---
+## Positional Arguments
+`proxy` _TEXT_ - The proxy account to register
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-buyrex.md b/docs/02_cleos/03_command-reference/system/system-rex-buyrex.md
new file mode 100755
index 00000000000..5bae51820a7
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-buyrex.md
@@ -0,0 +1,27 @@
+---
+title: "system rex buyrex"
+excerpt: "Buy REX using tokens in owner's REX fund"
+---
+## Positionals
+- `from` _TEXT_ - Account buying REX tokens (required)
+- `amount` _TEXT_ - Amount to be taken from REX fund and used in buying REX (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex buyrex accountname1 "1 REX"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-cancelrexorder.md b/docs/02_cleos/03_command-reference/system/system-rex-cancelrexorder.md
new file mode 100755
index 00000000000..07e74046858
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-cancelrexorder.md
@@ -0,0 +1,26 @@
+---
+title: "system rex cancelrexorder"
+excerpt: "Cancel queued REX sell order if one exists"
+---
+## Positionals
+- `owner` _TEXT_ - Owner account of sell order (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex cancelrexorder accountname1
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-closerex.md b/docs/02_cleos/03_command-reference/system/system-rex-closerex.md
new file mode 100755
index 00000000000..979b1211641
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-closerex.md
@@ -0,0 +1,26 @@
+---
+title: "system rex closerex"
+excerpt: "Delete unused REX-related user table entries"
+---
+## Positionals
+- `owner` _TEXT_ - Account which owns the REX fund (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex closerex accountname1
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-consolidate.md b/docs/02_cleos/03_command-reference/system/system-rex-consolidate.md
new file mode 100755
index 00000000000..2f1f8b1f018
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-consolidate.md
@@ -0,0 +1,26 @@
+---
+title: "system rex consolidate"
+excerpt: "Consolidate REX maturity buckets into one that matures in 4 days"
+---
+## Positionals
+- `owner` _TEXT_ - Account which owns the REX fund (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex consolidate accountname1
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-defundcpuloan.md b/docs/02_cleos/03_command-reference/system/system-rex-defundcpuloan.md
new file mode 100755
index 00000000000..167fa2c8f7f
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-defundcpuloan.md
@@ -0,0 +1,26 @@
+---
+title: "system rex defundcpuloan"
+excerpt: "Withdraw from a CPU loan fund"
+---
+## Positionals
+- `from` _TEXT_ - Loan owner (required)
+- `loan_num` _TEXT_ - Loan ID (required)
+- `payment` _TEXT_ - Amount to be deposited (required)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+```text
+cleos system rex defundcpuloan accountname1 abc123 "1 EOS"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-defundnetloan.md b/docs/02_cleos/03_command-reference/system/system-rex-defundnetloan.md
new file mode 100755
index 00000000000..80193deb667
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-defundnetloan.md
@@ -0,0 +1,29 @@
+## Description
+
+Withdraw from a Network loan fund
+
+## Positionals
+- `from` _TEXT_ - Loan owner (required)
+- `loan_num` _TEXT_ - Loan ID (required)
+- `payment` _TEXT_ - Amount to be deposited (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-j,--json` print result as json
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+
+## Examples
+
+
+
+```text
+cleos system rex defundnetloan accountname1 abc123 "1 EOS"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-deposit.md b/docs/02_cleos/03_command-reference/system/system-rex-deposit.md
new file mode 100755
index 00000000000..da277a71554
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-deposit.md
@@ -0,0 +1,25 @@
+---
+title: "system rex deposit"
+excerpt: "Deposit into owner's REX fund by transfering from owner's liquid token balance"
+---
+## Positionals
+- `owner` _TEXT_ - Account which owns the REX fund (required)
+- `amount` _TEXT_ - Amount to be deposited into REX fund (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-j,--json` print result as json
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+## Examples
+
+
+```text
+cleos system rex deposit accountname1 "1 SYS"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-fundcpuloan.md b/docs/02_cleos/03_command-reference/system/system-rex-fundcpuloan.md
new file mode 100755
index 00000000000..c40c414830a
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-fundcpuloan.md
@@ -0,0 +1,27 @@
+---
+title: "system rex fundcpuloan"
+excerpt: "Deposit into a CPU loan fund"
+---
+## Positionals
+
+- `from` _TEXT_ - Loan owner (required)
+- `loan_num` _TEXT_ - Loan ID (required)
+- `payment` _TEXT_ - Amount to be deposited (required)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-j,--json` print result as json
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+
+## Examples
+
+```text
+cleos system rex fundcpuloan accountname1 abc123 "1 EOS"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-fundnetloan.md b/docs/02_cleos/03_command-reference/system/system-rex-fundnetloan.md
new file mode 100755
index 00000000000..f855d313567
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-fundnetloan.md
@@ -0,0 +1,26 @@
+---
+title: "system rex fundnetloan"
+excerpt: "Deposit into a Network loan fund"
+---
+## Positionals
+- `from` _TEXT_ - Loan owner (required)
+- `loan_num` _TEXT_ - Loan ID (required)
+- `payment` _TEXT_ - Amount to be deposited (required)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-j,--json` print result as json
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+## Examples
+
+
+```text
+cleos system rex fundnetloan accountname1 abc123 "1 EOS"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-lendrex.md b/docs/02_cleos/03_command-reference/system/system-rex-lendrex.md
new file mode 100755
index 00000000000..c9003931d6c
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-lendrex.md
@@ -0,0 +1,27 @@
+---
+title: "system rex lendrex"
+excerpt: "Deposit tokens to REX fund and use the tokens to buy REX"
+---
+## Positionals
+- `from` _TEXT_ - Account buying REX tokens (required)
+- `amount` _TEXT_ - Amount to be taken from REX fund and used in buying REX (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex lendrex accountname1 "1 REX"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-mvfromsavings.md b/docs/02_cleos/03_command-reference/system/system-rex-mvfromsavings.md
new file mode 100755
index 00000000000..b872b97661b
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-mvfromsavings.md
@@ -0,0 +1,27 @@
+---
+title: "system rex mvfromsavings"
+excerpt: "Move REX tokens out of savings bucket"
+---
+## Positionals
+- `owner` _TEXT_ - Account which owns the REX fund (required)
+- `rex` _TEXT_ - Amount of REX to be moved out of savings bucket (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex mvfromsavings accountname1 "1 REX"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-mvtosavings.md b/docs/02_cleos/03_command-reference/system/system-rex-mvtosavings.md
new file mode 100755
index 00000000000..91682612b1c
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-mvtosavings.md
@@ -0,0 +1,28 @@
+---
+title: "system rex mvtosavings"
+excerpt: "Move REX tokens to savings bucket"
+---
+## Positionals
+- `owner` _TEXT_ - Account which owns the REX fund (required)
+- `rex` _TEXT_ - Amount to be Amount of REX to be moved to savings bucket (required) into REX fund (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+
+## Examples
+
+
+```text
+cleos system rex mvtosavings accountname1 "1 REX"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-rentcpu.md b/docs/02_cleos/03_command-reference/system/system-rex-rentcpu.md
new file mode 100755
index 00000000000..f9bd424042d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-rentcpu.md
@@ -0,0 +1,24 @@
+## Positionals
+- `from` _TEXT_ - Account buying REX tokens (required)
+- `receiver` _TEXT_ - Account to whom rented CPU bandwidth is staked (required)
+- `loan_payment` _TEXT_ - Loan fee to be paid, used to calculate amount of rented bandwidth (required)
+- `loan_fund` _TEXT_ - Loan fund to be used in automatic renewal, can be 0 tokens (required)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex rentcpu accountname1 accountname2 "1 EOS" 0
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-rentnet.md b/docs/02_cleos/03_command-reference/system/system-rex-rentnet.md
new file mode 100755
index 00000000000..d51b4f1c6ad
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-rentnet.md
@@ -0,0 +1,24 @@
+## Positionals
+- `from` _TEXT_ - Account buying REX tokens (required)
+- `receiver` _TEXT_ - Account to whom rented NET bandwidth is staked (required)
+- `loan_payment` _TEXT_ - Loan fee to be paid, used to calculate amount of rented bandwidth (required)
+- `loan_fund` _TEXT_ - Loan fund to be used in automatic renewal, can be 0 tokens (required)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex rentnet accountname1 accountname2 "1 EOS" 0
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-rexexec.md b/docs/02_cleos/03_command-reference/system/system-rex-rexexec.md
new file mode 100755
index 00000000000..006a66ca714
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-rexexec.md
@@ -0,0 +1,23 @@
+## Positionals
+- `user` _TEXT_ - User executing the action (required)
+- `max` _TEXT_ - Maximum number of CPU loans, Network loans, and sell orders to be processed (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex rexexec accountname1 10
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-sellrex.md b/docs/02_cleos/03_command-reference/system/system-rex-sellrex.md
new file mode 100755
index 00000000000..9863b43ae87
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-sellrex.md
@@ -0,0 +1,20 @@
+## Positionals
+- `from` _TEXT_ - Account selling REX tokens (required)
+- `rex` _TEXT_ - Amount of REX tokens to be sold (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+## Examples
+
+
+```text
+cleos system rex sellrex accountname1 "1 REX"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-unstaketorex.md b/docs/02_cleos/03_command-reference/system/system-rex-unstaketorex.md
new file mode 100755
index 00000000000..f5ea340c0ae
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-unstaketorex.md
@@ -0,0 +1,24 @@
+## Positionals
+- `from` _TEXT_ - Account buying REX tokens (required)
+- `receiver` _TEXT_ - Account that tokens have been staked to (required)
+- `from_cpu` _TEXT_ - Amount to be unstaked from CPU resources and used in REX purchase (required)
+- `from_net` _TEXT_ - Amount to be unstaked from Net resources and used in REX purchase (required)
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex unstaketorex accountname1 accountname2 "1 EOS" 0
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-updaterex.md b/docs/02_cleos/03_command-reference/system/system-rex-updaterex.md
new file mode 100755
index 00000000000..58c8f63c766
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-updaterex.md
@@ -0,0 +1,22 @@
+## Positionals
+- `owner` _TEXT_ - Account which owns the REX fund (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex updaterex accountname1
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex-withdraw.md b/docs/02_cleos/03_command-reference/system/system-rex-withdraw.md
new file mode 100755
index 00000000000..a6ba219437a
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex-withdraw.md
@@ -0,0 +1,23 @@
+## Positionals
+- `owner` _TEXT_ - Account which owns the REX fund (required)
+- `amount` _TEXT_ - Amount to be withdrawn from REX fund (required)
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - Force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_ - Set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - Set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - Set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
+
+
+```text
+cleos system rex withdraw accountname1 "1 SYS"
+```
diff --git a/docs/02_cleos/03_command-reference/system/system-rex.md b/docs/02_cleos/03_command-reference/system/system-rex.md
new file mode 100755
index 00000000000..fdc47940b58
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-rex.md
@@ -0,0 +1,21 @@
+## Subcommands
+- [deposit](system-rex-deposit) - Deposit into owner's REX fund by transfering from owner's liquid token balance
+- [withdraw](system-rex-withdraw) - Withdraw from owner's REX fund by transfering to owner's liquid token balance
+- [buyrex](system-rex-buyrex) - Buy REX using tokens in owner's REX fund
+- [lendrex](system-rex-lendrex)  - Deposit tokens to REX fund and use the tokens to buy REX
+- [unstaketorex](system-rex-unstaketorex) - Buy REX using staked tokens
+- [sellrex](system-rex-sellrex) - Sell REX tokens
+- [cancelrexorder](system-rex-cancelrexorder) - Cancel queued REX sell order if one exists
+- [mvtosavings](system-rex-mvtosavings) - Move REX tokens to savings bucket
+- [mvfromsavings](system-rex-mvfromsavings) - Move REX tokens out of savings bucket
+- [rentcpu](system-rex-rentcpu) - Rent CPU bandwidth for 30 days
+- [rentnet](system-rex-rentnet) - Rent Network bandwidth for 30 days
+- [fundcpuloan](system-rex-fundcpuloan) - Deposit into a CPU loan fund
+- [fundnetloan](system-rex-fundnetloan) - Deposit into a Network loan fund
+- [defundcpuloan](system-rex-defundcpuloan) - Withdraw from a CPU loan fund
+- [defundnetloan](system-rex-defundnetloan) - Withdraw from a Network loan fund
+- [consolidate](system-rex-consolidate) - Consolidate REX maturity buckets into one that matures in 4 days
+- [updaterex](system-rex-updaterex) - Update REX owner vote stake and vote weight
+- [rexexec](system-rex-rexexec) - Perform REX maintenance by processing expired loans and
+- [unfilled](system-rex-unfilled) - unfilled orders
+- [closerex](system-rex-closerex) - Delete unused REX-related user table entries
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/system/system-sellram.md b/docs/02_cleos/03_command-reference/system/system-sellram.md
new file mode 100755
index 00000000000..0230f70002a
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-sellram.md
@@ -0,0 +1,17 @@
+## Positional Arguments
+- `account` _TEXT_ - The account to receive EOS for sold RAM
+- `bytes` _UINT_  - Number of RAM bytes to sell
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-undelegatebw.md b/docs/02_cleos/03_command-reference/system/system-undelegatebw.md
new file mode 100755
index 00000000000..d1342c5f3de
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-undelegatebw.md
@@ -0,0 +1,20 @@
+## Positional Arguments
+- `from` _TEXT_ - The account undelegating bandwidth
+- `receiver` _TEXT_ - The account to undelegate bandwidth from
+- `unstake_net_quantity` _TEXT_ - The amount of EOS to undelegate for network bandwidth
+- `unstake_cpu_quantity` _TEXT_  - The amount of EOS to undelegate for CPU bandwidth
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-unregprod.md b/docs/02_cleos/03_command-reference/system/system-unregprod.md
new file mode 100755
index 00000000000..2eae07b63dd
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-unregprod.md
@@ -0,0 +1,16 @@
+## Positional Arguments
+`account` _TEXT_ - The account to unregister as a producer
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-unregproxy.md b/docs/02_cleos/03_command-reference/system/system-unregproxy.md
new file mode 100755
index 00000000000..9e61609a946
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-unregproxy.md
@@ -0,0 +1,16 @@
+## Positional Arguments
+- `proxy` _TEXT_ - The proxy account to unregister
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-voteproducer-approve.md b/docs/02_cleos/03_command-reference/system/system-voteproducer-approve.md
new file mode 100755
index 00000000000..1cdaebeda2d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-voteproducer-approve.md
@@ -0,0 +1,17 @@
+## Positional Arguments
+  - `voter` _TEXT_ - The voting account
+  - `producer` _TEXT_ - The account to vote for
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-voteproducer-prods.md b/docs/02_cleos/03_command-reference/system/system-voteproducer-prods.md
new file mode 100755
index 00000000000..73efca2d6f0
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-voteproducer-prods.md
@@ -0,0 +1,17 @@
+## Positional Arguments
+- `voter` _TEXT_ - The voting account
+- `producers` _TEXT ..._ - The account(s) to vote for. All options from this position and following will be treated as the producer list.
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-voteproducer-proxy.md b/docs/02_cleos/03_command-reference/system/system-voteproducer-proxy.md
new file mode 100755
index 00000000000..ecf1fda7920
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-voteproducer-proxy.md
@@ -0,0 +1,18 @@
+## Positional Arguments
+- `voter` _TEXT_ - The voting account
+- `proxy` _TEXT_ - The proxy account
+
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-voteproducer-unapprove.md b/docs/02_cleos/03_command-reference/system/system-voteproducer-unapprove.md
new file mode 100755
index 00000000000..f43dcabd7de
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-voteproducer-unapprove.md
@@ -0,0 +1,17 @@
+## Positional Arguments
+- `voter` _TEXT_ - The voting account
+- `producer` _TEXT_  - The account to remove from voted producers
+## Options
+- `-h,--help` Print this help message and exit
+- `-x,--expiration` _TEXT_ - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` Specify if unlocked wallet keys should be used to sign transaction
+- `-d,--dont-broadcast` - Don't broadcast transaction to the network (just print to stdout)
+- `-r,--ref-block` _TEXT_         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `-p,--permission`  _TEXT_ - An account and permission level to authorize, as in 'account@permission' (defaults to 'account@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_            set the delay_sec seconds, defaults to 0s
+- `-j,--json` print result as json
+
+## Examples
diff --git a/docs/02_cleos/03_command-reference/system/system-voteproducer.md b/docs/02_cleos/03_command-reference/system/system-voteproducer.md
new file mode 100755
index 00000000000..4a4af137b23
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/system/system-voteproducer.md
@@ -0,0 +1,5 @@
+## Subcommands
+- [voteproducer proxy](system-voteproducer-proxy) - Vote your stake through a proxy
+- [voteproducer prods](system-voteproducer-prods) - Vote for one or more producers
+- [voteproducer approve](system-voteproducer-approve) -Add one producer to list of voted producers
+- [voteproducer unapprove](system-voteproducer-unapprove) - Remove one producer from list of voted producers
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/transfer.md b/docs/02_cleos/03_command-reference/transfer.md
new file mode 100755
index 00000000000..c614194a346
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/transfer.md
@@ -0,0 +1,64 @@
+## Description
+Transfer tokens from account to account
+
+## Positional Parameters
+- `sender` _TEXT_ - The account sending EOS
+- `recipient` _TEXT_ - The account receiving EOS
+- `amount` _UINT_ - The amount of EOS to send
+- `memo` _TEXT_ - The memo for the transfer
+
+## Example
+Transfer 1000 SYS from **inita** to **tester**
+
+```shell
+$ ./cleos transfer inita tester 1000
+```
+The response will look something like this
+
+```shell
+{
+  "transaction_id": "eb4b94b72718a369af09eb2e7885b3f494dd1d8a20278a6634611d5edd76b703",
+  "processed": {
+    "refBlockNum": 2206,
+    "refBlockPrefix": 221394282,
+    "expiration": "2017-09-05T08:03:58",
+    "scope": [
+      "inita",
+      "tester"
+    ],
+    "signatures": [
+      "1f22e64240e1e479eee6ccbbd79a29f1a6eb6020384b4cca1a958e7c708d3e562009ae6e60afac96f9a3b89d729a50cd5a7b5a7a647540ba1678831bf970e83312"
+    ],
+    "messages": [{
+        "code": "eos",
+        "type": "transfer",
+        "authorization": [{
+            "account": "inita",
+            "permission": "active"
+          }
+        ],
+        "data": {
+          "from": "inita",
+          "to": "tester",
+          "amount": 1000,
+          "memo": ""
+        },
+        "hex_data": "000000008040934b00000000c84267a1e80300000000000000"
+      }
+    ],
+    "output": [{
+        "notify": [{
+            "name": "tester",
+            "output": { ... }
+          },{
+            "name": "inita",
+            "output": { ... }
+          }
+        ],
+        "sync_transactions": [],
+        "async_transactions": []
+      }
+    ]
+  }
+}
+```
diff --git a/docs/02_cleos/03_command-reference/version/client.md b/docs/02_cleos/03_command-reference/version/client.md
new file mode 100755
index 00000000000..7350fd9a96a
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/version/client.md
@@ -0,0 +1,11 @@
+## Description
+
+Retrieve version information of the client
+
+## Positionals
+none
+## Usage
+
+```shell
+$ ./cleos version client
+```
diff --git a/docs/02_cleos/03_command-reference/version/index.md b/docs/02_cleos/03_command-reference/version/index.md
new file mode 100755
index 00000000000..40a54e2dbff
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/version/index.md
@@ -0,0 +1,23 @@
+## Description
+
+Retrieve version information
+
+## Command
+
+```shell
+$ ./cleos version
+```
+
+## Subcommands
+[client](client) - Retrieve version information of the client
+
+```shell
+$ ./cleos version client
+```
+
+## Output
+
+
+```shell
+Build version: 7f854a61
+```
diff --git a/docs/02_cleos/03_command-reference/wallet/create.md b/docs/02_cleos/03_command-reference/wallet/create.md
new file mode 100755
index 00000000000..b4594459019
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/create.md
@@ -0,0 +1,10 @@
+## Description
+
+Creates a wallet with the specified name. If no name is given, the wallet will be created with the name 'default'
+
+## Positionals
+None
+## Options
+- `-n, --name` _TEXT_ - The name of the new wallet
+- `-f, --file` _TEXT_ - Name of file to write wallet password output to. (Must be set, unless "--to-console" is passed
+- `--to-console` - Print password to console
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/wallet/create_key.md b/docs/02_cleos/03_command-reference/wallet/create_key.md
new file mode 100755
index 00000000000..2e7ae0d70b7
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/create_key.md
@@ -0,0 +1,23 @@
+## Description
+
+Creates a key pair within the wallet so that you don't need to manually import it like you would with `cleos create key`. By default, this will create a key with the type \"favored\" by the wallet, which is a K1 key. But this command also lets you create a key in R1 format.
+
+## Positionals
+
+`key_type` _TEXT_ - "K1" or "R1" Key type to create
+
+## Options
+
+-n,--name TEXT=default The name of the wallet to create key into
+
+## Usage
+
+```shell
+$ cleos wallet create_key K1
+```
+
+## Outputs
+
+```shell
+Created new private key with a public key of: "EOS67xHKzQArkWZN6rKLCq7NLvaj8kurwxzRxoTVz6cgDJkiWdGug"
+```
diff --git a/docs/02_cleos/03_command-reference/wallet/import.md b/docs/02_cleos/03_command-reference/wallet/import.md
new file mode 100755
index 00000000000..38563a1ed1a
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/import.md
@@ -0,0 +1,9 @@
+## Description
+Imports private key into wallet
+
+## Positionals
+None
+
+## Options
+- `-n, --name` _TEXT_ - The name of the wallet to import key into.
+- `--private-key` _TEXT_ - Private key in WIF format to import.
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/wallet/index.md b/docs/02_cleos/03_command-reference/wallet/index.md
new file mode 100755
index 00000000000..f50f5fadf6e
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/index.md
@@ -0,0 +1,15 @@
+## Description
+Subcommand used to interact with the local wallet.
+
+## Subcommands
+
+- [create](create.md)  Create a new wallet locally
+- [create_key](create_key.md)  Creates a key pair within the wallet
+- [open](open.md)  Open an existing wallet
+- [lock](lock.md)  Lock wallet
+- [lock_all](lock_all.md)  Lock all unlocked wallets
+- [unlock](unlock.md)  Unlock wallet
+- [import](import.md)   Import private key into wallet
+- [list](list.md)   List opened wallets, * = unlocked
+- [keys](keys.md)  List of private keys from all unlocked wallets in wif format.
+- [private_keys](private_keys.md)  List of public keys from all unlocked wallets.
\ No newline at end of file
diff --git a/docs/02_cleos/03_command-reference/wallet/keys.md b/docs/02_cleos/03_command-reference/wallet/keys.md
new file mode 100755
index 00000000000..02e3dc2d0d4
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/keys.md
@@ -0,0 +1,25 @@
+## Description
+
+List of public keys from all unlocked wallets. These are the keys that could be used to sign transactions.
+
+## Positionals
+None.
+## Options
+None.
+## Usage
+
+
+```shell
+$ ./cleos wallet keys
+```
+
+## Outputs
+
+
+```shell
+[[
+    "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV",
+    "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
+  ]
+]
+```
diff --git a/docs/02_cleos/03_command-reference/wallet/list.md b/docs/02_cleos/03_command-reference/wallet/list.md
new file mode 100755
index 00000000000..2a48734a521
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/list.md
@@ -0,0 +1,33 @@
+## Description
+
+Lists opened wallets, * = unlocked
+
+## Positionals
+None
+
+## Options
+None
+
+## Usage
+
+
+```shell
+$ ./cleos wallet list
+```
+
+## Outputs
+
+
+```shell
+Wallets:
+[
+  "default *",
+  "second-wallet *"
+]
+
+or when there are no wallets
+Wallets:
+[
+]
+
+```
diff --git a/docs/02_cleos/03_command-reference/wallet/lock.md b/docs/02_cleos/03_command-reference/wallet/lock.md
new file mode 100755
index 00000000000..7c749abbbfe
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/lock.md
@@ -0,0 +1,23 @@
+## Description
+
+Locks a wallet
+
+## Positionals
+None
+
+## Options
+- `-n, --name` _TEXT_ - The name of the wallet to lock
+## Usage
+
+
+```shell
+$ cleos wallet lock
+or
+$ ./cleos wallet lock -n second-wallet
+```
+
+## Outputs
+
+```shell
+Locked: 'default'
+```
diff --git a/docs/02_cleos/03_command-reference/wallet/lock_all.md b/docs/02_cleos/03_command-reference/wallet/lock_all.md
new file mode 100755
index 00000000000..633cb9bdb4d
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/lock_all.md
@@ -0,0 +1,21 @@
+## Description
+Locks all unlocked wallets
+
+
+## Positionals
+None
+## Options
+None
+## Usage
+
+
+```shell
+$ ./cleos wallet lock_all
+```
+
+## Outputs
+
+
+```shell
+Locked All Wallets
+```
diff --git a/docs/02_cleos/03_command-reference/wallet/open.md b/docs/02_cleos/03_command-reference/wallet/open.md
new file mode 100755
index 00000000000..574d992ed24
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/open.md
@@ -0,0 +1,23 @@
+## Description
+
+Opens an existing wallet
+
+## Positionals
+None
+## Options
+- `-n, --name` _TEXT_ - The name of the wallet to open.
+## Usage
+
+
+```shell
+$ cleos wallet open
+or
+$ cleos wallet open -n second-wallet
+```
+
+## Outputs
+
+
+```shell
+Opened: default
+```
diff --git a/docs/02_cleos/03_command-reference/wallet/private_keys.md b/docs/02_cleos/03_command-reference/wallet/private_keys.md
new file mode 100755
index 00000000000..74426291db3
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/private_keys.md
@@ -0,0 +1,25 @@
+## Description 
+
+It is possible to query for the public and private key pairs of an individual wallet. The wallet must already be unlocked and you must give the password again
+
+## Positionals
+None
+
+## Options
+`-n,--name` _TEXT_ - The name of the wallet to list keys from, otherwise - default
+
+`--password` _TEXT_ - The password returned by wallet create
+
+## Usage
+
+
+```javascript
+cleos wallet private_keys
+```
+
+## Outputs
+
+
+```text
+
+```
diff --git a/docs/02_cleos/03_command-reference/wallet/unlock.md b/docs/02_cleos/03_command-reference/wallet/unlock.md
new file mode 100755
index 00000000000..20ad682e84b
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/wallet/unlock.md
@@ -0,0 +1,21 @@
+## Description
+Unlocks a wallet
+
+## Positionals
+None
+## Options
+- `-n, --name` _TEXT_ - The name of the wallet to unlock.
+- `--password` _TEXT_ - The password returned by wallet create.
+## Usage
+To unlock a wallet, specify the password provided when it was created.
+
+```shell
+$ ./cleos wallet unlock -n second-wallet --password PW5Ji6JUrLjhKAVn68nmacLxwhvtqUAV18J7iycZppsPKeoGGgBEw
+```
+
+## Outputs
+
+
+```shell
+Unlocked: 'second-wallet'
+```
diff --git a/docs/02_cleos/04_troubleshooting.md b/docs/02_cleos/04_troubleshooting.md
new file mode 100644
index 00000000000..e2f6b6e32c4
--- /dev/null
+++ b/docs/02_cleos/04_troubleshooting.md
@@ -0,0 +1,21 @@
+## Cannot connect to RPC endpoint
+
+Check if your local nodeos is running by visiting the following URL in your browser:
+
+```shell
+
+curl http://localhost:8888/v1/chain/get_info
+
+```
+
+If you are trying to connect a remote nodeos API endpoint, try to visit the API endpoint with the following suffix:
+
+```shell
+http://API_ENDPOINT:PORT/v1/chain/get_info
+```
+
+Replace API_ENDPOINT and PORT with your remote nodeos API endpoint detail
+
+## “Missing Authorizations"
+
+That means you are not using the required authorizations. Most likely you are not using correct EOSIO account or permission level to sign the transaction
diff --git a/docs/02_cleos/05_FAQ.md b/docs/02_cleos/05_FAQ.md
new file mode 100644
index 00000000000..0b28f80a35a
--- /dev/null
+++ b/docs/02_cleos/05_FAQ.md
@@ -0,0 +1,7 @@
+## Domain Socket (IPC) vs. HTTPS (RPC)
+
+There are two options to connect `cleos` to `keosd`. You can either use domain sockets or HTTPS. Uses domain socket offering many benefits. It reduces the chance of leaking access of `keosd` to the LAN, WAN or Internet. Also, unlike HTTPS protocol where many attack vectors exist such as CORS, a domain socket can only be used for the intended use case Inter-Processes Communication
+
+## What does "transaction executed locally, but may not be confirmed by the network yet" means?
+
+It means the transaction has been successfully accepted and executed by the instance of nodeos that cleos submitted it directly to. That instance of nodeos should relay the transaction to additional instances via the peer-to-peer protocol but, there is no guarantee that these additional instances accepted or executed the transaction. There is also no guarantee, at this point, that the transaction has been accepted and executed by a valid block producer and subsequently included in a valid block in the blockchain. If you require stronger confirmation of a transaction's inclusion in the immutable blockchain, you must take extra steps to monitor for the transaction's presence in an irreversible block
diff --git a/docs/02_cleos/index.md b/docs/02_cleos/index.md
new file mode 100644
index 00000000000..9f6169eb448
--- /dev/null
+++ b/docs/02_cleos/index.md
@@ -0,0 +1,118 @@
+# Introduction
+
+`cleos` is a command line tool that interfaces with the REST API exposed by `nodeos`. Developers can also use `cleos` to deploy and test EOSIO smart contracts.
+
+## Installation
+
+`cleos` is distributed as part of the [EOSIO software suite](https://github.com/EOSIO/eos/blob/master/README.md). To install `cleos` just visit the [EOSIO Software Installation](../00_install/index.md) section.
+
+## Using Cleos
+
+To use `cleos`, you need the end point (IP address and port number) of a running `nodeos` instance. Also, the `nodeos` instance must be configured to load the `eosio::chain_api_plugin` when launched. This allows `nodeos` to respond to the RPC requests coming from `cleos`.
+
+### Cleos Commands
+
+For a list of all `cleos` commands, run:
+
+```sh
+$ cleos --help
+```
+
+```console
+Command Line Interface to EOSIO Client
+Usage: cleos [OPTIONS] SUBCOMMAND
+
+Options:
+  -h,--help                   Print this help message and exit
+  -u,--url TEXT=http://127.0.0.1:8888/
+                              the http/https URL where nodeos is running
+  --wallet-url TEXT=unix:///Users/username/eosio-wallet/keosd.sock
+                              the http/https URL where keosd is running
+  -r,--header                 pass specific HTTP header; repeat this option to pass multiple headers
+  -n,--no-verify              don't verify peer certificate when using HTTPS
+  --no-auto-keosd             don't automatically launch a keosd if one is not currently running
+  -v,--verbose                output verbose errors and action console output
+  --print-request             print HTTP request to STDERR
+  --print-response            print HTTP response to STDERR
+
+Subcommands:
+  version                     Retrieve version information
+  create                      Create various items, on and off the blockchain
+  convert                     Pack and unpack transactions
+  get                         Retrieve various items and information from the blockchain
+  set                         Set or update blockchain state
+  transfer                    Transfer tokens from account to account
+  net                         Interact with local p2p network connections
+  wallet                      Interact with local wallet
+  sign                        Sign a transaction
+  push                        Push arbitrary transactions to the blockchain
+  multisig                    Multisig contract commands
+  wrap                        Wrap contract commands
+  system                      Send eosio.system contract action to the blockchain.
+```
+
+### Cleos Subcommands
+
+To get help with any particular subcommand, run `cleos SUBCOMMAND --help`. For instance:
+
+```sh
+$ cleos create --help
+```
+
+```console
+Create various items, on and off the blockchain
+Usage: cleos create SUBCOMMAND
+
+Subcommands:
+  key                         Create a new keypair and print the public and private keys
+  account                     Create a new account on the blockchain
+                              (assumes system contract does not restrict RAM usage)
+```
+
+`cleos` can also provide usage help for subcommands within subcommands. For instance:
+
+```sh
+$ cleos create account --help
+```
+
+```console
+Create a new account on the blockchain (assumes system contract does not restrict RAM usage)
+Usage: cleos create account [OPTIONS] creator name OwnerKey [ActiveKey]
+
+Positionals:
+  creator TEXT                The name of the account creating the new account (required)
+  name TEXT                   The name of the new account (required)
+  OwnerKey TEXT               The owner public key or permission level for the new account (required)
+  ActiveKey TEXT              The active public key or permission level for the new account
+
+Options:
+  -h,--help                   Print this help message and exit
+  -x,--expiration             set the time in seconds before a transaction expires, defaults to 30s
+  -f,--force-unique           force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+  -s,--skip-sign              Specify if unlocked wallet keys should be used to sign transaction
+  -j,--json                   print result as json
+  --json-file TEXT            save result in json format into a file
+  -d,--dont-broadcast         don't broadcast transaction to the network (just print to stdout)
+  --return-packed             used in conjunction with --dont-broadcast to get the packed transaction
+  -r,--ref-block TEXT         set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+  --use-old-rpc               use old RPC push_transaction, rather than new RPC send_transaction
+  -p,--permission TEXT ...    An account and permission level to authorize, as in 'account@permission' (defaults to 'creator@active')
+  --max-cpu-usage-ms UINT     set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+  --max-net-usage UINT        set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+  --delay-sec UINT            set the delay_sec seconds, defaults to 0s
+```
+
+## Cleos Example
+
+The following `cleos` command creates a local wallet named `mywallet` and displays the password to the screen:
+
+```sh
+$ cleos wallet create -n mywallet --to-console
+```
+
+```console
+Creating wallet: mywallet
+Save password to use in the future to unlock this wallet.
+Without password imported keys will not be retrievable.
+"PW5JbF34UdA193Eps1bjrWVJRaNMt1VKddLn4Dx6SPVTfMDRnMBWN"
+```
diff --git a/docs/03_keosd/10_usage.md b/docs/03_keosd/10_usage.md
new file mode 100644
index 00000000000..68f4a41a295
--- /dev/null
+++ b/docs/03_keosd/10_usage.md
@@ -0,0 +1,113 @@
+
+[[info | Recommended Usage]]
+| For most users, the easiest way to use `keosd` is to have `cleos` launch it automatically. Wallet files will be created in the default directory (`~/eosio-wallet`).
+
+## Launching keosd manually
+
+`keosd` can be launched manually from the terminal by running:
+
+```sh
+$ keosd
+```
+
+By default, `keosd` creates the folder `~/eosio-wallet` and populates it with a basic `config.ini` file.  The location of the config file can be specified on the command line using the `--config-dir` argument.  The configuration file contains the HTTP server endpoint for incoming HTTP connections and other parameters for cross-origin resource sharing.
+
+[[info | Wallet Location]]
+| The location of the wallet data folder can be specified on the command line with the `--data-dir` option.
+
+## Auto-locking
+
+By default, `keosd` is set to lock your wallet after 15 minutes of inactivity. This is configurable in the `config.ini` by setting the timeout seconds in `unlock-timeout`. Setting it to 0 will cause `keosd` to always lock your wallet.
+
+## Stopping keosd
+
+The most effective way to stop `keosd` is to find the keosd process and send a SIGTERM signal to it.
+
+## Other options
+
+For a list of all commands known to `keosd`, simply run it with no arguments:
+
+```sh
+$ keosd --help
+```
+
+```console
+Application Options:
+
+Config Options for eosio::http_plugin:
+  --unix-socket-path arg (=keosd.sock)  The filename (relative to data-dir) to
+                                        create a unix socket for HTTP RPC; set
+                                        blank to disable.
+  --http-server-address arg             The local IP and port to listen for
+                                        incoming http connections; leave blank
+                                        to disable.
+  --https-server-address arg            The local IP and port to listen for
+                                        incoming https connections; leave blank
+                                        to disable.
+  --https-certificate-chain-file arg    Filename with the certificate chain to
+                                        present on https connections. PEM
+                                        format. Required for https.
+  --https-private-key-file arg          Filename with https private key in PEM
+                                        format. Required for https
+  --https-ecdh-curve arg (=secp384r1)   Configure https ECDH curve to use:
+                                        secp384r1 or prime256v1
+  --access-control-allow-origin arg     Specify the Access-Control-Allow-Origin
+                                        to be returned on each request.
+  --access-control-allow-headers arg    Specify the Access-Control-Allow-Header
+                                        s to be returned on each request.
+  --access-control-max-age arg          Specify the Access-Control-Max-Age to
+                                        be returned on each request.
+  --access-control-allow-credentials    Specify if Access-Control-Allow-Credent
+                                        ials: true should be returned on each
+                                        request.
+  --max-body-size arg (=1048576)        The maximum body size in bytes allowed
+                                        for incoming RPC requests
+  --http-max-bytes-in-flight-mb arg (=500)
+                                        Maximum size in megabytes http_plugin
+                                        should use for processing http
+                                        requests. 503 error response when
+                                        exceeded.
+  --verbose-http-errors                 Append the error log to HTTP responses
+  --http-validate-host arg (=1)         If set to false, then any incoming
+                                        "Host" header is considered valid
+  --http-alias arg                      Additionaly acceptable values for the
+                                        "Host" header of incoming HTTP
+                                        requests, can be specified multiple
+                                        times.  Includes http/s_server_address
+                                        by default.
+  --http-threads arg (=2)               Number of worker threads in http thread
+                                        pool
+
+Config Options for eosio::wallet_plugin:
+  --wallet-dir arg (=".")               The path of the wallet files (absolute
+                                        path or relative to application data
+                                        dir)
+  --unlock-timeout arg (=900)           Timeout for unlocked wallet in seconds
+                                        (default 900 (15 minutes)). Wallets
+                                        will automatically lock after specified
+                                        number of seconds of inactivity.
+                                        Activity is defined as any wallet
+                                        command e.g. list-wallets.
+  --yubihsm-url URL                     Override default URL of
+                                        http://localhost:12345 for connecting
+                                        to yubihsm-connector
+  --yubihsm-authkey key_num             Enables YubiHSM support using given
+                                        Authkey
+
+Application Config Options:
+  --plugin arg                          Plugin(s) to enable, may be specified
+                                        multiple times
+
+Application Command Line Options:
+  -h [ --help ]                         Print this help message and exit.
+  -v [ --version ]                      Print version information.
+  --print-default-config                Print default configuration template
+  -d [ --data-dir ] arg                 Directory containing program runtime
+                                        data
+  --config-dir arg                      Directory containing configuration
+                                        files such as config.ini
+  -c [ --config ] arg (=config.ini)     Configuration file name relative to
+                                        config-dir
+  -l [ --logconf ] arg (=logging.json)  Logging configuration file name/path
+                                        for library users
+```
diff --git a/docs/03_keosd/15_plugins/http_plugin/index.md b/docs/03_keosd/15_plugins/http_plugin/index.md
new file mode 100644
index 00000000000..fe2f3cc9d18
--- /dev/null
+++ b/docs/03_keosd/15_plugins/http_plugin/index.md
@@ -0,0 +1,3 @@
+---
+link: /01_nodeos/03_plugins/http_plugin/index.md
+---
diff --git a/docs/03_keosd/15_plugins/index.md b/docs/03_keosd/15_plugins/index.md
new file mode 100644
index 00000000000..93044c41600
--- /dev/null
+++ b/docs/03_keosd/15_plugins/index.md
@@ -0,0 +1,12 @@
+# Keosd Plugins
+
+## Overview
+
+Plugins extend the core functionality implemented in `keosd`. For information on specific plugins, just select from the list below:
+
+* [`http_plugin`](http_plugin/index.md)
+* [`wallet_api_plugin`](wallet_api_plugin/index.md)
+* [`wallet_plugin`](wallet_plugin/index.md)
+
+[[info | Keosd is modular]]
+| Plugins add incremental functionality to `keosd`. Unlike runtime plugins, `keosd` plugins are built at compile-time.
diff --git a/docs/03_keosd/15_plugins/wallet_api_plugin/index.md b/docs/03_keosd/15_plugins/wallet_api_plugin/index.md
new file mode 100644
index 00000000000..4b338bff57f
--- /dev/null
+++ b/docs/03_keosd/15_plugins/wallet_api_plugin/index.md
@@ -0,0 +1,41 @@
+# wallet_api_plugin
+
+## Description
+
+The `wallet_api_plugin` exposes functionality from the [`wallet_plugin`](../wallet_plugin/index.md) to the RPC API interface managed by the [`http_plugin`](../http_plugin/index.md).
+
+[[caution | Caution]]
+| This plugin exposes wallets and so running this plugin on a publicly accessible node is not recommended. As of 1.2.0, `nodeos` will no longer allow the `wallet_api_plugin`.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::wallet_api_plugin
+
+# command-line
+$ nodeos ... --plugin eosio::wallet_api_plugin
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`wallet_plugin`](../wallet_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::wallet_plugin
+[options]
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::wallet_plugin [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/03_keosd/15_plugins/wallet_plugin/index.md b/docs/03_keosd/15_plugins/wallet_plugin/index.md
new file mode 100644
index 00000000000..64633f6d46c
--- /dev/null
+++ b/docs/03_keosd/15_plugins/wallet_plugin/index.md
@@ -0,0 +1,41 @@
+# wallet_plugin
+
+## Description
+
+The `wallet_plugin` adds access to wallet functionality from a node.
+
+[[caution | Caution]]
+| This plugin is not designed to be loaded as a plugin on a publicly accessible node without further security measures. This is also particularly true when loading the `wallet_api_plugin`, which should not be loaded on a publicly accessible node under any conditions.
+
+## Usage
+
+```sh
+# config.ini
+plugin = eosio::wallet_plugin
+
+# command-line
+$ nodeos ... --plugin eosio::wallet_plugin
+```
+
+## Options
+
+None
+
+## Dependencies
+
+* [`wallet_plugin`](../wallet_plugin/index.md)
+* [`http_plugin`](../http_plugin/index.md)
+
+### Load Dependency Examples
+
+```sh
+# config.ini
+plugin = eosio::wallet_plugin
+[options]
+plugin = eosio::http_plugin
+[options]
+
+# command-line
+$ nodeos ... --plugin eosio::wallet_plugin [options]  \
+             --plugin eosio::http_plugin [options]
+```
diff --git a/docs/03_keosd/20_security.md b/docs/03_keosd/20_security.md
new file mode 100644
index 00000000000..66dd791528a
--- /dev/null
+++ b/docs/03_keosd/20_security.md
@@ -0,0 +1,13 @@
+### How does `keosd` Locking/Unlocking works and what are the security implications?
+
+From a user's perspective, when a wallet is created, it remains in an `unlocked` state. Depending on the way `keosd` is launched, it may remain `unlocked` until the process is restarted. When a wallet is locked (either by timeout or process restart) the password is required to unlock it.
+
+However, it must be emphasized that `keosd` has no authentication/authorization mechanism besides locking/unlocking the wallet for storing/retrieving private keys and signing digital messages.
+
+### How is the `keosd` service accessed and what are the security implications?
+
+When a domain socket is used to access `keosd`, any UNIX user/group that has access rights to write to the socket file on the filesystem can submit transactions and receive signed transactions from `keosd` using any key in any unlocked wallet.
+
+In the case of a TCP socket bound to localhost, any local process (regardless of owner or permission) can do the same things mentioned above. That includes a snippet of JavaScript code in a web page running in a local browser (though some browsers may have some security mitigations for this).
+
+In the case of a TCP socket bound to a LAN/WAN address, any remote actor that can send packets to a machine running `keosd` may do the same. That present a huge security risk, even if the communication is encrypted or secured via HTTPS.
diff --git a/docs/03_keosd/30_how-to-guides/how-to-attach-a-yubihsm-hard-wallet.md b/docs/03_keosd/30_how-to-guides/how-to-attach-a-yubihsm-hard-wallet.md
new file mode 100644
index 00000000000..0bbf3e1024a
--- /dev/null
+++ b/docs/03_keosd/30_how-to-guides/how-to-attach-a-yubihsm-hard-wallet.md
@@ -0,0 +1,68 @@
+## Goal
+
+Attach a YubiHSM as a hard wallet
+
+## Before you begin
+
+* Install the currently supported version of `keosd`
+
+* Install YubiHSM2 Software Toolkit (YubiHSM2 SDK)
+
+* Create an AuthKey with at least the following Capabilities:
+
+   * sign-ecdsa
+   * generate-asymmetric-key
+   * export-wrapped
+
+* **Delete the default AuthKey**
+
+[[warning | Security]]
+| It is extremely important to create a new AuthKey and remove the default AuthKey before proceed to the following steps.
+
+## Steps
+
+### Configure `keosd`
+
+   There are two options to connect `keosd` to YubiHSM:
+
+   #### Using a YubiHSM connector
+
+   By default, `keosd` will connect to the YubiHSM connector on the default host and port. If a non-default URL is used, set the `--yubihsm-url` option or `yubihsm-url` in `config.ini` with the correct connector URL
+
+   #### Directly connect via USB
+
+   `keosd` also can directly connect to YubiHSM via USB protocol
+
+   If this option is used, set `keosd` startup option as the below:
+
+   ```shell
+   --yubihsm-url=ysb://
+   ```
+
+### Start `keosd` with AuthKey:
+
+   ```shell
+   --yubihsm-authkey Your_AuthKey_Object_Number
+   ```
+
+   if a YubiHSM connector is used, check the YubiHSM connector is up and running by visiting YubiHSM URL:
+      http://YubiHSM_HOST:YubiHSM_PORT/connector/status ((Default HOST and Port: http://127.0.0.1:12345)
+
+   You should see something like below:
+
+   ```json
+   status=OK
+   serial=*
+   version=2.0.0
+   pid=666
+   address=localhost
+   port=12345
+   ```
+
+### Unlock YubiHSM wallet with the password of AuthKey using the following option:
+
+   ```bash
+   cleos wallet unlock -n YubiHSM --password YOUR_AUTHKEY_PASSWORD
+   ```
+
+After unlocking the wallet, you can use `cleos wallet` commands as usual. Beware as a part of security mechanism, some wallet subcommands, such as retrieve private keys, or remove a key, are not supported when a YubiHSM is used
\ No newline at end of file
diff --git a/docs/03_keosd/30_how-to-guides/index.md b/docs/03_keosd/30_how-to-guides/index.md
new file mode 100644
index 00000000000..ea92ec5eeaf
--- /dev/null
+++ b/docs/03_keosd/30_how-to-guides/index.md
@@ -0,0 +1,2 @@
+
+* [How to attach a YubiHSM hard wallet](how-to-attach-a-yubihsm-hard-wallet.md)
diff --git a/docs/03_keosd/35_wallet-specification.md b/docs/03_keosd/35_wallet-specification.md
new file mode 100644
index 00000000000..39bb1b3f816
--- /dev/null
+++ b/docs/03_keosd/35_wallet-specification.md
@@ -0,0 +1,140 @@
+## EOS Wallet Import Format (WIF)
+
+Wallet Import Format is an encoding for a private EDSA key.  EOS uses the same version, checksum, and encoding scheme as the Bitcoin WIF addresses and should be compatible with existing libraries [1].
+
+This is an example of a WIF Private Key:
+
+```
+5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAbuatmU
+```
+
+This encoding is good for:
+
+* Copy and Pasting private keys (ensures the entire key is copied)
+* Including keys in text or user editable file formats
+* Shortening the key-length
+
+This encoding is not good for:
+
+* Writing keys down by hand (even a single upper / lowercase mistake can cause a major problem)
+* Binary or computer storage where code handles the key and data is already checked
+
+Considerations:
+
+* If a key could be written down or re-keyed, the BIP39 Mnemonic Code standard is a better option to use.
+* It is a good idea to always label a WIF key using the word "Private" or "Private Key".
+
+## Private key to WIF
+
+1. A fake private key of all zeros is used.  This is 32 bytes long (shown here as hex).
+
+```
+0000000000000000000000000000000000000000000000000000000000000000
+```
+
+2. Add a 0x80 byte in front.  This byte represents the Bitcoin mainnet.  EOS uses the same version byte.  When encoded the version byte helps to identify this as a private key.  Unlike Bitcoin, EOS always uses compressed public keys (derived from a private key) and therefore does not suffix the private key with a 0x01 byte.
+
+```
+800000000000000000000000000000000000000000000000000000000000000000
+```
+
+3. Perform a binary SHA-256 hash on the versioned key.
+
+```
+ce145d282834c009c24410812a60588c1085b63d65a7effc2e0a5e3a2e21b236
+```
+
+4. Perform a binary SHA-256 hash on result of SHA-256 hash.
+
+```
+0565fba7ebf8143516e0222d7950c28589a34c3ee144c3876ceb01bfb0e9bb70
+```
+
+5. Take the first 4 bytes of the second SHA-256 hash, this is the checksum.
+
+```
+0565fba7
+```
+
+6. Add the 4 checksum bytes to the versioned key from step 2.
+
+```
+8000000000000000000000000000000000000000000000000000000000000000000565fba7
+```
+
+7. [Base58](http://npmjs.com/package/bs58) encode the binary data from step 6.
+
+```
+5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAbuatmU
+```
+
+---
+
+## WIF to private key (checksum checking)
+
+1. Start with the Wallet Import Private Key.
+
+```
+5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAbuatmU
+```
+
+2. [Base58](http://npmjs.com/package/bs58) decode the WIF string (shown as HEX here).
+
+```
+8000000000000000000000000000000000000000000000000000000000000000000565fba7
+```
+
+3. Slice the decoded WIF into the versioned key and the checksum (last 4 bytes).
+
+```
+800000000000000000000000000000000000000000000000000000000000000000
+0565fba7
+```
+
+4. Perform a binary SHA-256 hash on the versioned key.
+
+```
+ce145d282834c009c24410812a60588c1085b63d65a7effc2e0a5e3a2e21b236
+```
+
+5. Perform a binary SHA-256 hash on result of SHA-256 hash.
+
+```
+0565fba7ebf8143516e0222d7950c28589a34c3ee144c3876ceb01bfb0e9bb70
+```
+
+6. Take the first 4 bytes of the second SHA-256 hash, this is the checksum.
+
+```
+0565fba7
+```
+
+7. Make sure the checksum in steps 3 and 6 match.
+
+8. Slice the versioned private key from step 3 into the version and private key.
+
+```
+80
+0000000000000000000000000000000000000000000000000000000000000000
+```
+
+9. If the version is 0x80 then there is no error.
+
+---
+
+## [Base58check](https://www.npmjs.com/package/base58check)
+
+Base58Check is a JavaScript implementation of this algorithm and may be used to encode and decode EOS WIF private keys.
+
+```sh
+base58check = require('base58check')
+wif = base58check.encode(privateKey = '00'.repeat(32), version = '80', encoding = 'hex')
+assert.equal('5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAbuatmU', wif)
+let {prefix, data} = base58check.decode(wif)
+assert.equal(prefix.toString('hex'), '80')
+assert.equal(data.toString('hex'), '00'.repeat(32))
+```
+
+---
+
+[1] Bitcoin WIF format - https://en.bitcoin.it/wiki/Wallet_import_format
diff --git a/docs/03_keosd/40_troubleshooting.md b/docs/03_keosd/40_troubleshooting.md
new file mode 100644
index 00000000000..b384ce8dcf0
--- /dev/null
+++ b/docs/03_keosd/40_troubleshooting.md
@@ -0,0 +1,9 @@
+## How to solve the error "Failed to lock access to wallet directory; is another keosd running"?
+
+Since `cleos` may auto-launch an instance of `keosd`, it is possible to end up with multiple instances of `keosd` running. That can cause unexpected behavior or the error message above.
+
+To fix this issue, you can terminate all running `keosd` instances and restart `keosd`. The following command will find and terminate all instances of `keosd` running on the system:
+
+```sh
+$ pkill keosd
+```
diff --git a/docs/03_keosd/50_FAQ.md b/docs/03_keosd/50_FAQ.md
new file mode 100644
index 00000000000..a5b93db6717
--- /dev/null
+++ b/docs/03_keosd/50_FAQ.md
@@ -0,0 +1,7 @@
+### How does `keosd` store key pairs
+
+`keosd` encrypts key pairs under-the-hood before storing them on a wallet file. Depending on the wallet implementation, say Secure Clave or YubiHSM, a specific cryptographic algorithm will be used. When the standard file system of a UNIX-based OS is used, `keosd` encrypts key pairs using 256-bit AES in CBC mode.
+
+### How to enable the `keosd` Secure Enclave
+
+To enable the secure enclave feature of `keosd`, you need to sign a `keosd` binary with a certificate provided with your Apple Developer Account. Be aware that there might be some constraints imposed by App Store when signing from a console application. Therefore, the signed binaries might need to be resigned every 7 days.
diff --git a/docs/03_keosd/index.md b/docs/03_keosd/index.md
new file mode 100644
index 00000000000..3e337558089
--- /dev/null
+++ b/docs/03_keosd/index.md
@@ -0,0 +1,14 @@
+# Introduction
+
+`keosd` is a key manager daemon for storing private keys and signing digital messages. It provides a secure key storage medium for keys to be encrypted at rest in the associated wallet file. `keosd` also defines a secure enclave for signing transaction created by `cleos` or a third part library.
+
+## Installation
+
+`keosd` is distributed as part of the [EOSIO software suite](https://github.com/EOSIO/eos/blob/master/README.md). To install `keosd` just visit the [EOSIO Software Installation](../00_install/index.md) section.
+
+## Operation
+
+When a wallet is unlocked with the corresponding password, `cleos` can request `keosd` to sign a transaction with the appropriate private keys. Also, `keosd` provides support for hardware-based wallets such as Secure Encalve and YubiHSM.
+
+[[info | Audience]]
+| `keosd` is intended to be used by EOSIO developers only.

From a0f90710bcf0c7ddf89348b1b38cdb0a0371097f Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 03:54:36 -0500
Subject: [PATCH 1528/1648] bump version from 1.8 to 2.0 on links to prebuilt
 binaries

---
 docs/00_install/00_install-prebuilt-binaries.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index 12644d79645..9aa882860cc 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -22,13 +22,13 @@ $ brew remove eosio
 
 #### Ubuntu 18.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio_1.8.0-rc1-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_1.8.0-rc1-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio_1.8.0-rc1-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_1.8.0-rc1-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
 ```
 #### Ubuntu Package Uninstall
 ```sh
@@ -39,8 +39,8 @@ $ sudo apt remove eosio
 
 #### RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.8.0-rc1/eosio-1.8.0-rc1.el7.x86_64.rpm
-$ sudo yum install ./eosio-1.8.0-rc1.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio-2.0.0-rc2.el7.x86_64.rpm
+$ sudo yum install ./eosio-2.0.0-rc2.el7.x86_64.rpm
 ```
 #### RPM Package Uninstall
 ```sh

From 1d8767eee9b2b5a4a203661ccaaeb72b846f3ed1 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 03:57:51 -0500
Subject: [PATCH 1529/1648] cherrypick README.md changes from docs/starter
 branch

---
 README.md | 89 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 74 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 1ab1e108124..c30ea84dda0 100644
--- a/README.md
+++ b/README.md
@@ -20,18 +20,55 @@ Some of the groundbreaking features of EOSIO include:
 1. Designed for Parallel Execution of Context Free Validation Logic
 1. Designed for Inter Blockchain Communication
 
+## License
+
 EOSIO is released under the open source MIT license and is offered “AS IS” without warranty of any kind, express or implied. Any security provided by the EOSIO software depends in part on how it is used, configured, and deployed. EOSIO is built upon many third-party libraries such as WABT (Apache License) and WAVM (BSD 3-clause) which are also provided “AS IS” without warranty of any kind. Without limiting the generality of the foregoing, Block.one makes no representation or guarantee that EOSIO or any third-party libraries will perform as intended or will be free of errors, bugs or faulty code. Both may fail in large or small ways that could completely or partially limit functionality or compromise computer systems. If you use or implement EOSIO, you do so at your own risk. In no event will Block.one be liable to any party for any damages whatsoever, even if it had been advised of the possibility of damage.  
 
+## Disclaimer
+
 Block.one is neither launching nor operating any initial public blockchains based upon the EOSIO software. This release refers only to version 1.0 of our open source software. We caution those who wish to use blockchains built on EOSIO to carefully vet the companies and organizations launching blockchains based on EOSIO before disclosing any private keys to their derivative software.
 
+## Testnets
+
 There is no public testnet running currently.
 
+## Supported Operating Systems
+
+EOSIO currently supports the following operating systems:  
+
+1. Amazon Linux 2
+2. CentOS 7
+3. Ubuntu 16.04
+4. Ubuntu 18.04
+5. MacOS 10.14 (Mojave)
+
+---
+
+**Note: It may be possible to install EOSIO on other Unix-based operating systems. This is not officially supported, though.**
+
+---
+
+## Software Installation
+
+There are currently two methods to install the EOSIO software:
+
+* Install from [Prebuilt Binaries](#prebuilt-binaries)
+* Build/Install from [Shell Scripts](#shell-scripts)
+
 ---
 
-**If you used our build scripts to install eosio, [please be sure to uninstall](#build-script-uninstall) before using our packages.**
+**Note: If you used our shell scripts to build/install EOSIO, please run the [Uninstall Script](#uninstall-script) before using our prebuilt binary packages.**
 
 ---
 
+Installing EOSIO from prebuilt binaries is recommended for most users. Building and installing from source code is available for advanced users.
+
+## Prebuilt Binaries
+
+Prebuilt software packages are available for the EOSIO [supported operating systems](#supported-operating-systems) above. Find the instructions below for your OS.
+
+### Mac OS X:
+
 #### Mac OS X Brew Install
 ```sh
 $ brew tap eosio/eosio
@@ -42,6 +79,8 @@ $ brew install eosio
 $ brew remove eosio
 ```
 
+### Ubuntu Linux:
+
 #### Ubuntu 18.04 Package Install
 ```sh
 $ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
@@ -56,30 +95,50 @@ $ sudo apt install ./eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
 ```sh
 $ sudo apt remove eosio
 ```
-#### Centos RPM Package Install
+
+### RPM-based (CentOS, Amazon Linux, etc.):
+
+#### RPM Package Install
 ```sh
 $ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio-2.0.0-rc2.el7.x86_64.rpm
 $ sudo yum install ./eosio-2.0.0-rc2.el7.x86_64.rpm
 ```
-#### Centos RPM Package Uninstall
+#### RPM Package Uninstall
 ```sh
 $ sudo yum remove eosio
 ```
 
-#### Build Script Uninstall
+## Shell Scripts
 
-If you have previously installed EOSIO using build scripts, you can execute `eosio_uninstall.sh` to uninstall.
-- Passing `-y` will answer yes to all prompts (does not remove data directories)
-- Passing `-f` will remove data directories (be very careful with this)
-- Passing in `-i` allows you to specify where your eosio installation is located
+Shell scripts are provided in the EOSIO repository for building, installing, and uninstalling the EOSIO binaries and dependencies from source code.
 
-## Supported Operating Systems
-EOSIO currently supports the following operating systems:  
-1. Amazon Linux 2
-2. CentOS 7
-3. Ubuntu 16.04
-4. Ubuntu 18.04
-5. MacOS 10.14 (Mojave)
+---
+
+**Note: If you used our shell scripts and the EOSIO installation failed, please run the [Uninstall Script](#uninstall-script) before building EOSIO.**
+
+---
+
+Check the **Build from Source** section in the documentation for more information. Below are the basic shell scripts to get started quickly.
+
+### Build Script
+To build the EOSIO binaries and install dependencies, run:
+```sh
+git clone --recursive https://github.com/eosio/eos
+cd eos
+./scripts/eosio_build.sh
+```
+
+### Install Script
+To install the EOSIO built binaries, run:
+```sh
+./scripts/eosio_install.sh
+```
+
+### Uninstall Script
+To uninstall the EOSIO built/installed binaries and dependencies, run:
+```sh
+./scripts/eosio_uninstall.sh
+```
 
 ## Resources
 1. [Website](https://eos.io)

From 8f8a32a13932ecdbe9fe21f990860b1c7ea46248 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Dec 2019 12:07:57 -0600
Subject: [PATCH 1530/1648] Add back in sending handshakes when becoming
 in_sync since it is possible for client to fall behind while catching up

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 02eef68d3e7..90da0eab4b4 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1787,6 +1787,7 @@ namespace eosio {
             set_state( head_catchup );
          } else {
             set_state( in_sync );
+            send_handshakes();
          }
       } else if( state == lib_catchup ) {
          if( blk_num == sync_known_lib_num ) {

From 7c34f501c9f004d2cc357ba401824f365721017c Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Dec 2019 13:50:33 -0600
Subject: [PATCH 1531/1648] Send handshake instead of go away message as client
 needs to know we have not been able to honor request

---
 plugins/net_plugin/net_plugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 90da0eab4b4..ea55271f67f 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1183,6 +1183,7 @@ namespace eosio {
          } else {
             c->strand.post( [c, num]() {
                peer_ilog( c, "enqueue sync, unable to fetch block ${num}", ("num", num) );
+               c->send_handshake();
             });
          }
       });

From 08755e43a4afa162a7494cd8c8ceeb5dcd2a6702 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 4 Dec 2019 20:54:54 -0600
Subject: [PATCH 1532/1648] Add UTC to print

---
 tests/testUtils.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/testUtils.py b/tests/testUtils.py
index dfd1823dbf7..69d3899eef9 100755
--- a/tests/testUtils.py
+++ b/tests/testUtils.py
@@ -10,6 +10,7 @@
 import json
 import shlex
 import socket
+from datetime import datetime
 from sys import stdout
 from sys import exit
 import traceback
@@ -76,6 +77,7 @@ class Utils:
     def Print(*args, **kwargs):
         stackDepth=len(inspect.stack())-2
         s=' '*stackDepth
+        stdout.write(datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%f "))
         stdout.write(s)
         print(*args, **kwargs)
 

From cae8f9af79f623ca053197c78dd3153baac89832 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 5 Dec 2019 11:23:19 -0600
Subject: [PATCH 1533/1648] switch from strand dispatch to strand post. add
 extra checks for correct socket.

---
 plugins/net_plugin/net_plugin.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index ea55271f67f..f7169d7bd4c 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1050,7 +1050,7 @@ namespace eosio {
    }
 
    void connection::send_handshake() {
-      strand.dispatch( [c = shared_from_this()]() {
+      strand.post( [c = shared_from_this()]() {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          if( c->populate_handshake( c->last_handshake_sent ) ) {
             static_assert( std::is_same_v<decltype( c->sent_handshake_count ), int16_t>, "INT16_MAX based on int16_t" );
@@ -1108,12 +1108,12 @@ namespace eosio {
       std::vector<boost::asio::const_buffer> bufs;
       buffer_queue.fill_out_buffer( bufs );
 
-      strand.dispatch( [c{std::move(c)}, bufs{std::move(bufs)}, priority]() {
+      strand.post( [c{std::move(c)}, bufs{std::move(bufs)}, priority]() {
          boost::asio::async_write( *c->socket, bufs,
             boost::asio::bind_executor( c->strand, [c, socket=c->socket, priority]( boost::system::error_code ec, std::size_t w ) {
             try {
                // May have closed connection and cleared buffer_queue
-               if( !c->socket_is_open() ) return;
+               if( !c->socket_is_open() || socket != c->socket ) return;
 
                c->buffer_queue.out_callback( ec, w );
 
@@ -2204,7 +2204,7 @@ namespace eosio {
       boost::asio::async_connect( *socket, endpoints,
          boost::asio::bind_executor( strand,
                [resolver, c = shared_from_this(), socket=socket]( const boost::system::error_code& err, const tcp::endpoint& endpoint ) {
-            if( !err && socket->is_open() ) {
+            if( !err && socket->is_open() && socket == c->socket ) {
                if( c->start_session() ) {
                   c->send_handshake();
                }
@@ -2316,7 +2316,7 @@ namespace eosio {
             boost::asio::bind_executor( strand,
               [conn = shared_from_this(), socket=socket]( boost::system::error_code ec, std::size_t bytes_transferred ) {
                // may have closed connection and cleared pending_message_buffer
-               if( !conn->socket_is_open() ) return;
+               if( !conn->socket_is_open() || socket != conn->socket ) return;
 
                bool close_connection = false;
                try {
@@ -2429,7 +2429,7 @@ namespace eosio {
                   std::unique_lock<std::mutex> g( conn_mtx );
                   const auto last_sent_lib = last_handshake_sent.last_irreversible_block_num;
                   g.unlock();
-                  if( !peer_requested && blk_num < last_sent_lib ) {
+                  if( blk_num < last_sent_lib ) {
                      fc_ilog( logger, "received block ${n} less than sent lib ${lib}", ("n", blk_num)("lib", last_sent_lib) );
                      close();
                   } else {
@@ -2704,6 +2704,12 @@ namespace eosio {
                                      ("o", offset)( "us", offset / NsecPerUsec ) ) );
       org = 0;
       rec = 0;
+
+      std::unique_lock<std::mutex> g_conn( conn_mtx );
+      if( last_handshake_recv.generation == 0 ) {
+         g_conn.unlock();
+         send_handshake();
+      }
    }
 
    void connection::handle_message( const notice_message& msg ) {

From 8fe6e1a02215b94962c05ab1e8c0ad1cabf057b5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 5 Dec 2019 13:47:46 -0600
Subject: [PATCH 1534/1648] Add extra temp logging

---
 plugins/net_plugin/net_plugin.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index f7169d7bd4c..be85a662efa 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1112,8 +1112,13 @@ namespace eosio {
          boost::asio::async_write( *c->socket, bufs,
             boost::asio::bind_executor( c->strand, [c, socket=c->socket, priority]( boost::system::error_code ec, std::size_t w ) {
             try {
+               fc_dlog( logger, "${peer} wrote priority: ${p}", ("peer", c->peer_name())("p", priority) );
                // May have closed connection and cleared buffer_queue
-               if( !c->socket_is_open() || socket != c->socket ) return;
+               if( !c->socket_is_open() || socket != c->socket ) {
+                  fc_wlog( logger, "async write socket ${r} before callback: ${p}",
+                           ("r", c->socket_is_open() ? "changed" : "closed")("p", c->peer_name()) );
+                  return;
+               }
 
                c->buffer_queue.out_callback( ec, w );
 
@@ -1210,7 +1215,14 @@ namespace eosio {
       ds.write( header, header_size );
       fc::raw::pack( ds, m );
 
-      enqueue_buffer( send_buffer, trigger_send, priority::low, close_after_send );
+      static int current = 0;
+      int priority = (m.which() * 10000) + (++current);
+      if (m.contains<handshake_message>()) {
+         priority = 500 + current;
+      }
+
+      fc_dlog( logger, "${peer} enqueue priority ${p}", ("peer", peer_name())("p", priority) );
+      enqueue_buffer( send_buffer, trigger_send, priority, close_after_send );
    }
 
    template< typename T>

From e42bc139e328e961a84851fc18fee7bc7314c34a Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 5 Dec 2019 15:13:27 -0600
Subject: [PATCH 1535/1648] Always clear out queue on async write callback
 otherwise we always believe we are still in the process of sending and will
 never send anything else.

---
 plugins/net_plugin/net_plugin.cpp | 43 ++++++++++++++-----------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index be85a662efa..026ae60df86 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -667,10 +667,10 @@ namespace eosio {
       void blk_send(const block_id_type& blkid);
       void stop_send();
 
-      void enqueue( const net_message &msg, bool trigger_send = true );
-      void enqueue_block( const signed_block_ptr& sb, bool trigger_send = true, bool to_sync_queue = false);
+      void enqueue( const net_message &msg );
+      void enqueue_block( const signed_block_ptr& sb, bool to_sync_queue = false);
       void enqueue_buffer( const std::shared_ptr<std::vector<char>>& send_buffer,
-                           bool trigger_send, int priority, go_away_reason close_after_send,
+                           int priority, go_away_reason close_after_send,
                            bool to_sync_queue = false);
       void cancel_sync(go_away_reason);
       void flush_queues();
@@ -684,7 +684,6 @@ namespace eosio {
       void fetch_timeout(boost::system::error_code ec);
 
       void queue_write(const std::shared_ptr<vector<char>>& buff,
-                       bool trigger_send,
                        int priority,
                        std::function<void(boost::system::error_code, std::size_t)> callback,
                        bool to_sync_queue = false);
@@ -1085,7 +1084,6 @@ namespace eosio {
    }
 
    void connection::queue_write(const std::shared_ptr<vector<char>>& buff,
-                                bool trigger_send,
                                 int priority,
                                 std::function<void(boost::system::error_code, std::size_t)> callback,
                                 bool to_sync_queue) {
@@ -1095,9 +1093,7 @@ namespace eosio {
          close();
          return;
       }
-      if( buffer_queue.is_out_queue_empty() && trigger_send) {
-         do_queue_write( priority );
-      }
+      do_queue_write( priority );
    }
 
    void connection::do_queue_write(int priority) {
@@ -1112,6 +1108,7 @@ namespace eosio {
          boost::asio::async_write( *c->socket, bufs,
             boost::asio::bind_executor( c->strand, [c, socket=c->socket, priority]( boost::system::error_code ec, std::size_t w ) {
             try {
+               c->buffer_queue.clear_out_queue();
                fc_dlog( logger, "${peer} wrote priority: ${p}", ("peer", c->peer_name())("p", priority) );
                // May have closed connection and cleared buffer_queue
                if( !c->socket_is_open() || socket != c->socket ) {
@@ -1120,8 +1117,6 @@ namespace eosio {
                   return;
                }
 
-               c->buffer_queue.out_callback( ec, w );
-
                if( ec ) {
                   if( ec.value() != boost::asio::error::eof ) {
                      fc_elog( logger, "Error sending to peer ${p}: ${i}", ("p", c->peer_name())( "i", ec.message() ) );
@@ -1131,7 +1126,9 @@ namespace eosio {
                   c->close();
                   return;
                }
-               c->buffer_queue.clear_out_queue();
+
+               c->buffer_queue.out_callback( ec, w );
+
                c->enqueue_sync_block();
                c->do_queue_write( priority );
             } catch( const std::exception& ex ) {
@@ -1170,20 +1167,19 @@ namespace eosio {
          fc_dlog( logger, "enqueue sync block ${num}", ("num", peer_requested->last + 1) );
       }
       uint32_t num = ++peer_requested->last;
-      bool trigger_send = true;
       if(num == peer_requested->end_block) {
          peer_requested.reset();
          fc_ilog( logger, "completing enqueue_sync_block ${num} to ${p}", ("num", num)("p", peer_name()) );
       }
       connection_wptr weak = shared_from_this();
-      app().post( priority::medium, [num, trigger_send, weak{std::move(weak)}]() {
+      app().post( priority::medium, [num, weak{std::move(weak)}]() {
          connection_ptr c = weak.lock();
          if( !c ) return;
          controller& cc = my_impl->chain_plug->chain();
          signed_block_ptr sb = cc.fetch_block_by_number( num );
          if( sb ) {
-            c->strand.post( [c, sb{std::move(sb)}, trigger_send]() {
-               c->enqueue_block( sb, trigger_send, true );
+            c->strand.post( [c, sb{std::move(sb)}]() {
+               c->enqueue_block( sb, true );
             });
          } else {
             c->strand.post( [c, num]() {
@@ -1196,7 +1192,7 @@ namespace eosio {
       return true;
    }
 
-   void connection::enqueue( const net_message& m, bool trigger_send ) {
+   void connection::enqueue( const net_message& m ) {
       verify_strand_in_this_thread( strand, __func__, __LINE__ );
       go_away_reason close_after_send = no_reason;
       if (m.contains<go_away_message>()) {
@@ -1222,7 +1218,7 @@ namespace eosio {
       }
 
       fc_dlog( logger, "${peer} enqueue priority ${p}", ("peer", peer_name())("p", priority) );
-      enqueue_buffer( send_buffer, trigger_send, priority, close_after_send );
+      enqueue_buffer( send_buffer, priority, close_after_send );
    }
 
    template< typename T>
@@ -1258,19 +1254,20 @@ namespace eosio {
       return create_send_buffer( packed_transaction_which, trx );
    }
 
-   void connection::enqueue_block( const signed_block_ptr& sb, bool trigger_send, bool to_sync_queue) {
+   void connection::enqueue_block( const signed_block_ptr& sb, bool to_sync_queue) {
       fc_dlog( logger, "enqueue block ${num}", ("num", sb->block_num()) );
       verify_strand_in_this_thread( strand, __func__, __LINE__ );
-      enqueue_buffer( create_send_buffer( sb ), trigger_send, priority::medium, no_reason, to_sync_queue);
+      enqueue_buffer( create_send_buffer( sb ), priority::medium, no_reason, to_sync_queue);
    }
 
    void connection::enqueue_buffer( const std::shared_ptr<std::vector<char>>& send_buffer,
-                                    bool trigger_send, int priority, go_away_reason close_after_send,
+                                    int priority, go_away_reason close_after_send,
                                     bool to_sync_queue)
    {
       connection_ptr self = shared_from_this();
-      queue_write(send_buffer,trigger_send, priority,
+      queue_write(send_buffer, priority,
                   [conn{std::move(self)}, close_after_send](boost::system::error_code ec, std::size_t ) {
+                        if (ec) return;
                         if (close_after_send != no_reason) {
                            fc_ilog( logger, "sent a go away message: ${r}, closing connection to ${p}",
                                     ("r", reason_str(close_after_send))("p", conn->peer_name()) );
@@ -1973,7 +1970,7 @@ namespace eosio {
                   return;
                }
                fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()) );
-               cp->enqueue_buffer( send_buffer, true, priority::medium, no_reason );
+               cp->enqueue_buffer( send_buffer, priority::medium, no_reason );
             }
          });
          return true;
@@ -2048,7 +2045,7 @@ namespace eosio {
 
          cp->strand.post( [cp, send_buffer]() {
             fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_name()) );
-            cp->enqueue_buffer( send_buffer, true, priority::low, no_reason );
+            cp->enqueue_buffer( send_buffer, priority::low, no_reason );
          } );
          return true;
       } );

From 4f1e3bd0093f96dc808853f45f996c4143401c7e Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 5 Dec 2019 16:12:57 -0600
Subject: [PATCH 1536/1648] Add clear of out queu on connect to match 1.8.x.
 Remove unused priority arguement. Remove temp logging.

---
 plugins/net_plugin/net_plugin.cpp | 43 ++++++++++++-------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 026ae60df86..7ec8b617860 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -670,7 +670,7 @@ namespace eosio {
       void enqueue( const net_message &msg );
       void enqueue_block( const signed_block_ptr& sb, bool to_sync_queue = false);
       void enqueue_buffer( const std::shared_ptr<std::vector<char>>& send_buffer,
-                           int priority, go_away_reason close_after_send,
+                           go_away_reason close_after_send,
                            bool to_sync_queue = false);
       void cancel_sync(go_away_reason);
       void flush_queues();
@@ -684,10 +684,9 @@ namespace eosio {
       void fetch_timeout(boost::system::error_code ec);
 
       void queue_write(const std::shared_ptr<vector<char>>& buff,
-                       int priority,
                        std::function<void(boost::system::error_code, std::size_t)> callback,
                        bool to_sync_queue = false);
-      void do_queue_write(int priority);
+      void do_queue_write();
 
       static bool is_valid( const handshake_message& msg );
 
@@ -1049,7 +1048,7 @@ namespace eosio {
    }
 
    void connection::send_handshake() {
-      strand.post( [c = shared_from_this()]() {
+      strand.dispatch( [c = shared_from_this()]() {
          std::unique_lock<std::mutex> g_conn( c->conn_mtx );
          if( c->populate_handshake( c->last_handshake_sent ) ) {
             static_assert( std::is_same_v<decltype( c->sent_handshake_count ), int16_t>, "INT16_MAX based on int16_t" );
@@ -1084,7 +1083,6 @@ namespace eosio {
    }
 
    void connection::queue_write(const std::shared_ptr<vector<char>>& buff,
-                                int priority,
                                 std::function<void(boost::system::error_code, std::size_t)> callback,
                                 bool to_sync_queue) {
       if( !buffer_queue.add_write_queue( buff, callback, to_sync_queue )) {
@@ -1093,10 +1091,10 @@ namespace eosio {
          close();
          return;
       }
-      do_queue_write( priority );
+      do_queue_write();
    }
 
-   void connection::do_queue_write(int priority) {
+   void connection::do_queue_write() {
       if( !buffer_queue.ready_to_send() )
          return;
       connection_ptr c(shared_from_this());
@@ -1104,15 +1102,14 @@ namespace eosio {
       std::vector<boost::asio::const_buffer> bufs;
       buffer_queue.fill_out_buffer( bufs );
 
-      strand.post( [c{std::move(c)}, bufs{std::move(bufs)}, priority]() {
+      strand.dispatch( [c{std::move(c)}, bufs{std::move(bufs)}]() {
          boost::asio::async_write( *c->socket, bufs,
-            boost::asio::bind_executor( c->strand, [c, socket=c->socket, priority]( boost::system::error_code ec, std::size_t w ) {
+            boost::asio::bind_executor( c->strand, [c, socket=c->socket]( boost::system::error_code ec, std::size_t w ) {
             try {
                c->buffer_queue.clear_out_queue();
-               fc_dlog( logger, "${peer} wrote priority: ${p}", ("peer", c->peer_name())("p", priority) );
                // May have closed connection and cleared buffer_queue
                if( !c->socket_is_open() || socket != c->socket ) {
-                  fc_wlog( logger, "async write socket ${r} before callback: ${p}",
+                  fc_ilog( logger, "async write socket ${r} before callback: ${p}",
                            ("r", c->socket_is_open() ? "changed" : "closed")("p", c->peer_name()) );
                   return;
                }
@@ -1130,7 +1127,7 @@ namespace eosio {
                c->buffer_queue.out_callback( ec, w );
 
                c->enqueue_sync_block();
-               c->do_queue_write( priority );
+               c->do_queue_write();
             } catch( const std::exception& ex ) {
                fc_elog( logger, "Exception in do_queue_write to ${p} ${s}", ("p", c->peer_name())( "s", ex.what() ) );
             } catch( const fc::exception& ex ) {
@@ -1211,14 +1208,7 @@ namespace eosio {
       ds.write( header, header_size );
       fc::raw::pack( ds, m );
 
-      static int current = 0;
-      int priority = (m.which() * 10000) + (++current);
-      if (m.contains<handshake_message>()) {
-         priority = 500 + current;
-      }
-
-      fc_dlog( logger, "${peer} enqueue priority ${p}", ("peer", peer_name())("p", priority) );
-      enqueue_buffer( send_buffer, priority, close_after_send );
+      enqueue_buffer( send_buffer, close_after_send );
    }
 
    template< typename T>
@@ -1257,16 +1247,16 @@ namespace eosio {
    void connection::enqueue_block( const signed_block_ptr& sb, bool to_sync_queue) {
       fc_dlog( logger, "enqueue block ${num}", ("num", sb->block_num()) );
       verify_strand_in_this_thread( strand, __func__, __LINE__ );
-      enqueue_buffer( create_send_buffer( sb ), priority::medium, no_reason, to_sync_queue);
+      enqueue_buffer( create_send_buffer( sb ), no_reason, to_sync_queue);
    }
 
    void connection::enqueue_buffer( const std::shared_ptr<std::vector<char>>& send_buffer,
-                                    int priority, go_away_reason close_after_send,
+                                    go_away_reason close_after_send,
                                     bool to_sync_queue)
    {
       connection_ptr self = shared_from_this();
-      queue_write(send_buffer, priority,
-                  [conn{std::move(self)}, close_after_send](boost::system::error_code ec, std::size_t ) {
+      queue_write(send_buffer,
+            [conn{std::move(self)}, close_after_send](boost::system::error_code ec, std::size_t ) {
                         if (ec) return;
                         if (close_after_send != no_reason) {
                            fc_ilog( logger, "sent a go away message: ${r}, closing connection to ${p}",
@@ -1970,7 +1960,7 @@ namespace eosio {
                   return;
                }
                fc_dlog( logger, "bcast block ${b} to ${p}", ("b", bnum)("p", cp->peer_name()) );
-               cp->enqueue_buffer( send_buffer, priority::medium, no_reason );
+               cp->enqueue_buffer( send_buffer, no_reason );
             }
          });
          return true;
@@ -2045,7 +2035,7 @@ namespace eosio {
 
          cp->strand.post( [cp, send_buffer]() {
             fc_dlog( logger, "sending trx to ${n}", ("n", cp->peer_name()) );
-            cp->enqueue_buffer( send_buffer, priority::low, no_reason );
+            cp->enqueue_buffer( send_buffer, no_reason );
          } );
          return true;
       } );
@@ -2210,6 +2200,7 @@ namespace eosio {
       }
       connecting = true;
       pending_message_buffer.reset();
+      buffer_queue.clear_out_queue();
       boost::asio::async_connect( *socket, endpoints,
          boost::asio::bind_executor( strand,
                [resolver, c = shared_from_this(), socket=socket]( const boost::system::error_code& err, const tcp::endpoint& endpoint ) {

From ecde55bbac9420f165f5b8b0e60d9b8d5bdb5045 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 6 Dec 2019 12:18:00 -0600
Subject: [PATCH 1537/1648] known_blocks.pending is head NOT known_trx.pending

---
 plugins/net_plugin/net_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 7ec8b617860..500d4a59680 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2733,7 +2733,7 @@ namespace eosio {
          break;
       case last_irr_catch_up: {
          std::unique_lock<std::mutex> g_conn( conn_mtx );
-         last_handshake_recv.head_num = msg.known_trx.pending;
+         last_handshake_recv.head_num = msg.known_blocks.pending;
          g_conn.unlock();
          break;
       }

From b23dbf74ca867471efe9f9ad394431f4faccfd33 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Fri, 6 Dec 2019 18:54:37 +0100
Subject: [PATCH 1538/1648] Fix shortcut link

---
 .../15_plugins/{http_plugin/index.md => http_plugin.md}         | 0
 docs/03_keosd/15_plugins/index.md                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename docs/03_keosd/15_plugins/{http_plugin/index.md => http_plugin.md} (100%)

diff --git a/docs/03_keosd/15_plugins/http_plugin/index.md b/docs/03_keosd/15_plugins/http_plugin.md
similarity index 100%
rename from docs/03_keosd/15_plugins/http_plugin/index.md
rename to docs/03_keosd/15_plugins/http_plugin.md
diff --git a/docs/03_keosd/15_plugins/index.md b/docs/03_keosd/15_plugins/index.md
index 93044c41600..49758a973ce 100644
--- a/docs/03_keosd/15_plugins/index.md
+++ b/docs/03_keosd/15_plugins/index.md
@@ -4,7 +4,7 @@
 
 Plugins extend the core functionality implemented in `keosd`. For information on specific plugins, just select from the list below:
 
-* [`http_plugin`](http_plugin/index.md)
+* [`http_plugin`](../../01_nodeos/03_plugins/http_plugin/index.md)
 * [`wallet_api_plugin`](wallet_api_plugin/index.md)
 * [`wallet_plugin`](wallet_plugin/index.md)
 

From a509151a903825b5a5c4eebc11854f5a19e58469 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 14:26:07 -0500
Subject: [PATCH 1539/1648] minor edits on keosd wallet plugins

---
 docs/03_keosd/15_plugins/wallet_api_plugin/index.md | 2 +-
 docs/03_keosd/15_plugins/wallet_plugin/index.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/03_keosd/15_plugins/wallet_api_plugin/index.md b/docs/03_keosd/15_plugins/wallet_api_plugin/index.md
index 4b338bff57f..8a796498a6b 100644
--- a/docs/03_keosd/15_plugins/wallet_api_plugin/index.md
+++ b/docs/03_keosd/15_plugins/wallet_api_plugin/index.md
@@ -5,7 +5,7 @@
 The `wallet_api_plugin` exposes functionality from the [`wallet_plugin`](../wallet_plugin/index.md) to the RPC API interface managed by the [`http_plugin`](../http_plugin/index.md).
 
 [[caution | Caution]]
-| This plugin exposes wallets and so running this plugin on a publicly accessible node is not recommended. As of 1.2.0, `nodeos` will no longer allow the `wallet_api_plugin`.
+| This plugin exposes wallets. Therefore, running this plugin on a publicly accessible node is not recommended. As of 1.2.0, `nodeos` will no longer allow the `wallet_api_plugin`.
 
 ## Usage
 
diff --git a/docs/03_keosd/15_plugins/wallet_plugin/index.md b/docs/03_keosd/15_plugins/wallet_plugin/index.md
index 64633f6d46c..34c62e304ab 100644
--- a/docs/03_keosd/15_plugins/wallet_plugin/index.md
+++ b/docs/03_keosd/15_plugins/wallet_plugin/index.md
@@ -5,7 +5,7 @@
 The `wallet_plugin` adds access to wallet functionality from a node.
 
 [[caution | Caution]]
-| This plugin is not designed to be loaded as a plugin on a publicly accessible node without further security measures. This is also particularly true when loading the `wallet_api_plugin`, which should not be loaded on a publicly accessible node under any conditions.
+| This plugin is not designed to be loaded as a plugin on a publicly accessible node without further security measures. This is particularly true when loading the `wallet_api_plugin`, which should not be loaded on a publicly accessible node under any circumstances.
 
 ## Usage
 

From 22dc33553e74ca0a47c30a59f87a31f6b9b58026 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 14:39:28 -0500
Subject: [PATCH 1540/1648] minor edits on manual build instructions

---
 .../02_build-eosio-binaries/02_manual-build/index.md      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
index 68202be4a32..b1de367136d 100644
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
@@ -9,16 +9,16 @@ When performing a manual build, it is necessary to install specific software pac
 
 ## Instructions
 
-The following steps will build the EOSIO binaries manually by invoking commands on the shell:
+The following instructions will build the EOSIO dependencies and EOSIO binaries manually by invoking commands on the shell:
 
-1. [Manual Install of EOSIO Dependencies](00_eosio-dependencies/index.md)
-2. [Manual Build of EOSIO Binaries](01_eosio-manual-build.md)
+1. [Manual Install EOSIO Dependencies](00_eosio-dependencies/index.md)
+2. [Manual Build EOSIO Binaries](01_eosio-manual-build.md)
 
 ## Out-of-source Builds
 
 While building dependencies and EOSIO binaries, out-of-source builds are also supported. Refer to the `cmake` help for more information.
 
-# Other Compilers
+## Other Compilers
 
 To override `clang`'s default compiler toolchain, add these flags to the `cmake` command within the above instructions:
 

From 9efca7cacd7f762bd253287c517f109ce484202b Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 14:51:56 -0500
Subject: [PATCH 1541/1648] minor edits to cleos get subcommands

---
 .../03_command-reference/get/index.md         | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/docs/02_cleos/03_command-reference/get/index.md b/docs/02_cleos/03_command-reference/get/index.md
index f92f3f06598..7c471963c88 100755
--- a/docs/02_cleos/03_command-reference/get/index.md
+++ b/docs/02_cleos/03_command-reference/get/index.md
@@ -3,16 +3,15 @@
 Retrieves various items and information from the blockchain
 
 ## Subcommands
-- [info](info.md)  Get current blockchain information
-- [block](block.md)  Retrieve a full block from the blockchain
-- [account](account.md)  Retrieve an account from the blockchain
-- [code](code.md)  Retrieve the code and ABI for an account
-- [table](table.md)  Retrieve the contents of a database table
-- [currency](currency.md)  Retrieve information related to standard currencies
-- [accounts](accounts.md)  Retrieve accounts associated with a public key
-- [servants](servants.md)  Retrieve accounts which are servants of a given
-
-- [transaction](transaction.md)                 Retrieve a transaction from the blockchain
-- [actions](actions.md)                     Retrieve all actions with specific account name referenced in authorization or receiver
-- [schedule](schedule.md)                    Retrieve the producer schedule
-- [transaction_id](transaction_id.md)               Get transaction id given transaction object
\ No newline at end of file
+- [info](info.md) - Get current blockchain information
+- [block](block.md) - Retrieve a full block from the blockchain
+- [account](account.md) - Retrieve an account from the blockchain
+- [code](code.md) - Retrieve the code and ABI for an account
+- [table](table.md) - Retrieve the contents of a database table
+- [currency](currency.md) - Retrieve information related to standard currencies
+- [accounts](accounts.md) - Retrieve accounts associated with a public key
+- [servants](servants.md) - Retrieve accounts which are servants of a given account
+- [transaction](transaction.md) - Retrieve a transaction from the blockchain
+- [actions](actions.md) - Retrieve all actions with specific account name referenced in authorization or receiver
+- [schedule](schedule.md) - Retrieve the producer schedule
+- [transaction_id](transaction_id.md) - Get transaction id given transaction object

From ef5ecf6e1e8384ce08ab309d801a4d6d3492167b Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 15:43:56 -0500
Subject: [PATCH 1542/1648] remove incorrect cleos system rex unfill subcommand

---
 docs/02_cleos/03_command-reference/system/system-rex.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/02_cleos/03_command-reference/system/system-rex.md b/docs/02_cleos/03_command-reference/system/system-rex.md
index fdc47940b58..8bf7c5d5f36 100755
--- a/docs/02_cleos/03_command-reference/system/system-rex.md
+++ b/docs/02_cleos/03_command-reference/system/system-rex.md
@@ -17,5 +17,4 @@
 - [consolidate](system-rex-consolidate) - Consolidate REX maturity buckets into one that matures in 4 days
 - [updaterex](system-rex-updaterex) - Update REX owner vote stake and vote weight
 - [rexexec](system-rex-rexexec) - Perform REX maintenance by processing expired loans and
-- [unfilled](system-rex-unfilled) - unfilled orders
 - [closerex](system-rex-closerex) - Delete unused REX-related user table entries
\ No newline at end of file

From b7104fc132d8ba05f35598e7829c76192917d4e1 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 15:58:44 -0500
Subject: [PATCH 1543/1648] add description to cleos system rex subcommand

---
 docs/02_cleos/03_command-reference/system/system-rex.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/02_cleos/03_command-reference/system/system-rex.md b/docs/02_cleos/03_command-reference/system/system-rex.md
index 8bf7c5d5f36..8d872d1727b 100755
--- a/docs/02_cleos/03_command-reference/system/system-rex.md
+++ b/docs/02_cleos/03_command-reference/system/system-rex.md
@@ -1,4 +1,9 @@
+## Description
+
+Actions related to REX (the resource exchange).
+
 ## Subcommands
+
 - [deposit](system-rex-deposit) - Deposit into owner's REX fund by transfering from owner's liquid token balance
 - [withdraw](system-rex-withdraw) - Withdraw from owner's REX fund by transfering to owner's liquid token balance
 - [buyrex](system-rex-buyrex) - Buy REX using tokens in owner's REX fund
@@ -16,5 +21,5 @@
 - [defundnetloan](system-rex-defundnetloan) - Withdraw from a Network loan fund
 - [consolidate](system-rex-consolidate) - Consolidate REX maturity buckets into one that matures in 4 days
 - [updaterex](system-rex-updaterex) - Update REX owner vote stake and vote weight
-- [rexexec](system-rex-rexexec) - Perform REX maintenance by processing expired loans and
-- [closerex](system-rex-closerex) - Delete unused REX-related user table entries
\ No newline at end of file
+- [rexexec](system-rex-rexexec) - Perform REX maintenance by processing expired loans and unfilled sell orders
+- [closerex](system-rex-closerex) - Delete unused REX-related user table entries

From 1ce5b8d841c5bff433b4591d622cd87560df15b8 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 16:14:15 -0500
Subject: [PATCH 1544/1648] add unreferenced cleos system bidname, bidnameinfo
 subcommands

---
 .../03_command-reference/system/index.md      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/docs/02_cleos/03_command-reference/system/index.md b/docs/02_cleos/03_command-reference/system/index.md
index 3c89ccf499c..207da518e40 100755
--- a/docs/02_cleos/03_command-reference/system/index.md
+++ b/docs/02_cleos/03_command-reference/system/index.md
@@ -1,20 +1,23 @@
 ## Description
+
 Send eosio.system contract action to the blockchain.
 
 ## Subcommands
 
-- [system newaccount](system-newaccount.md) Create an account, buy ram, stake for bandwidth for the account
-- [system regproducer](system-regproducer.md) Register a new producer
-- [system unregprod](system-unregprod.md) Unregister an existing producer
-- [system voteproducer](system-voteproducer.md) Vote for a producer
-- [system listproducers](system-listproducers.md) List producers
-- [system delegatebw](system-delegatebw.md) Delegate bandwidth
-- [system undelegatebw](system-undelegatebw.md) Undelegate bandwidth
-- [system listbw](system-listbw.md) List delegated bandwidth
-- [system buyram](system-buyram.md) Buy RAM
-- [system sellram](system-sellram.md) Sell RAM
-- [system claimrewards](system-claimrewards.md) Claim producer rewards
-- [system regproxy](system-regproxy.md) Register an account as a proxy (for voting)
-- [system unregproxy](system-unregproxy.md) Unregister an account as a proxy (for voting)
-- [system canceldelay](system-canceldelay.md) Cancel a delayed transaction
- - [system rex](system-rex) Actions related to REX (the resource exchange)
\ No newline at end of file
+- [system newaccount](system-newaccount.md) - Create a new account on the blockchain with initial resources
+- [system regproducer](system-regproducer.md) - Register a new producer
+- [system unregprod](system-unregprod.md) - Unregister an existing producer
+- [system voteproducer](system-voteproducer.md) - Vote for a producer
+- [system listproducers](system-listproducers.md) - List producers
+- [system delegatebw](system-delegatebw.md) - Delegate bandwidth
+- [system undelegatebw](system-undelegatebw.md) - Undelegate bandwidth
+- [system listbw](system-listbw.md) - List delegated bandwidth
+- [system bidname](system-bidname.md) - Name bidding
+- [system bidnameinfo](system-bidnameinfo.md) - Get bidname info
+- [system buyram](system-buyram.md) - Buy RAM
+- [system sellram](system-sellram.md) - Sell RAM
+- [system claimrewards](system-claimrewards.md) - Claim producer rewards
+- [system regproxy](system-regproxy.md) - Register an account as a proxy (for voting)
+- [system unregproxy](system-unregproxy.md) - Unregister an account as a proxy (for voting)
+- [system canceldelay](system-canceldelay.md) - Cancel a delayed transaction
+ - [system rex](system-rex.md) - Actions related to REX (the resource exchange)

From bb2fe0b23ec2b3488249f67de5960df6a08217b3 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 17:15:03 -0500
Subject: [PATCH 1545/1648] add missing cleos get abi,scope subcommands

---
 docs/02_cleos/03_command-reference/get/abi.md   | 17 +++++++++++++++++
 docs/02_cleos/03_command-reference/get/index.md |  2 ++
 docs/02_cleos/03_command-reference/get/scope.md | 12 ++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 docs/02_cleos/03_command-reference/get/abi.md
 create mode 100644 docs/02_cleos/03_command-reference/get/scope.md

diff --git a/docs/02_cleos/03_command-reference/get/abi.md b/docs/02_cleos/03_command-reference/get/abi.md
new file mode 100644
index 00000000000..a2f9cf64458
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/abi.md
@@ -0,0 +1,17 @@
+## Description
+Retrieves the ABI for an account
+
+## Positional Parameters
+- `name` _TEXT_ - The name of the account whose abi should be retrieved
+
+## Options
+- `-f,--file` _TEXT_ - The name of the file to save the contract .abi to instead of writing to console
+
+## Examples
+Retrieve and save abi for eosio.token contract
+
+```shell
+$ cleos get abi eosio.token -f eosio.token.abi
+
+saving abi to eosio.token.abi
+```
diff --git a/docs/02_cleos/03_command-reference/get/index.md b/docs/02_cleos/03_command-reference/get/index.md
index 7c471963c88..594852b921f 100755
--- a/docs/02_cleos/03_command-reference/get/index.md
+++ b/docs/02_cleos/03_command-reference/get/index.md
@@ -7,7 +7,9 @@ Retrieves various items and information from the blockchain
 - [block](block.md) - Retrieve a full block from the blockchain
 - [account](account.md) - Retrieve an account from the blockchain
 - [code](code.md) - Retrieve the code and ABI for an account
+- [abi](abi.md) - Retrieve the ABI for an account
 - [table](table.md) - Retrieve the contents of a database table
+- [scope](scope.md) - Retrieve a list of scopes and tables owned by a contract
 - [currency](currency.md) - Retrieve information related to standard currencies
 - [accounts](accounts.md) - Retrieve accounts associated with a public key
 - [servants](servants.md) - Retrieve accounts which are servants of a given account
diff --git a/docs/02_cleos/03_command-reference/get/scope.md b/docs/02_cleos/03_command-reference/get/scope.md
new file mode 100644
index 00000000000..b7a85088b67
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/scope.md
@@ -0,0 +1,12 @@
+## Description
+Retrieves a list of scopes and tables owned by a contract
+
+## Positional Parameters
+- `contract` _TEXT_ - The contract who owns the table
+
+## Options
+- `-t,--table` _TEXT_ - The name of the table as filter
+- `-l,--limit` _UINT_ - The maximum number of rows to return
+- `-L,--lower` _TEXT_ - lower bound of scope
+- `-U,--upper` _TEXT_ - upper bound of scope
+- `-r,--reverse` - Iterate in reverse order

From c926f3d0b1f927c1ac35423b4d43831ac9e604ca Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 17:27:48 -0500
Subject: [PATCH 1546/1648] add missing options to cleos transfer command

---
 docs/02_cleos/03_command-reference/transfer.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/02_cleos/03_command-reference/transfer.md b/docs/02_cleos/03_command-reference/transfer.md
index c614194a346..d0386d07dac 100755
--- a/docs/02_cleos/03_command-reference/transfer.md
+++ b/docs/02_cleos/03_command-reference/transfer.md
@@ -7,6 +7,23 @@ Transfer tokens from account to account
 - `amount` _UINT_ - The amount of EOS to send
 - `memo` _TEXT_ - The memo for the transfer
 
+## Options
+- `-c,--contract` _TEXT_ - The contract which controls the token
+- `--pay-ram-to-open` - Pay ram to open recipient's token balance row
+- `-x,--expiration` - set the time in seconds before a transaction expires, defaults to 30s
+- `-f,--force-unique` - force the transaction to be unique. this will consume extra bandwidth and remove any protections against accidently issuing the same transaction multiple times
+- `-s,--skip-sign` - Specify if unlocked wallet keys should be used to sign transaction
+- `-j,--json` - print result as json
+- `--json-file` _TEXT_ - save result in json format into a file
+- `-d,--dont-broadcast` - don't broadcast transaction to the network (just print to stdout)
+- `--return-packed` - used in conjunction with --dont-broadcast to get the packed transaction
+- `-r,--ref-block` _TEXT_ - set the reference block num or block id used for TAPOS (Transaction as Proof-of-Stake)
+- `--use-old-rpc` - use old RPC push_transaction, rather than new RPC send_transaction
+- `-p,--permission` _TEXT_ ... - An account and permission level to authorize, as in 'account@permission' (defaults to 'sender@active')
+- `--max-cpu-usage-ms` _UINT_ - set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)
+- `--max-net-usage` _UINT_ - set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)
+- `--delay-sec` _UINT_ - set the delay_sec seconds, defaults to 0s
+
 ## Example
 Transfer 1000 SYS from **inita** to **tester**
 

From 6817827c41b2b19e1c811657ad44d834f8db15a6 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 17:42:10 -0500
Subject: [PATCH 1547/1648] add missing cleos sign command

---
 docs/02_cleos/03_command-reference/sign.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docs/02_cleos/03_command-reference/sign.md

diff --git a/docs/02_cleos/03_command-reference/sign.md b/docs/02_cleos/03_command-reference/sign.md
new file mode 100644
index 00000000000..abced2d041c
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/sign.md
@@ -0,0 +1,16 @@
+## Description
+Sign a transaction
+
+## Usage
+```sh
+$ cleos sign [OPTIONS] transaction
+```
+
+## Positional Parameters
+- `transaction` _TEXT_ - The JSON string or filename defining the transaction to sign
+
+## Options
+- `-k,--private-key` _TEXT_ - The private key that will be used to sign the transaction
+- `--public-key` _TEXT_ - Ask keosd to sign with the corresponding private key of the given public key
+- `-c,--chain-id` _TEXT_ - The chain id that will be used to sign the transaction
+- `-p,--push-transaction` - Push transaction after signing

From f972f311c96a25d11fbbf33346b7a5cbea372451 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 19:26:37 -0500
Subject: [PATCH 1548/1648] add eosio index file and split nodeos index content

---
 docs/01_nodeos/index.md                   |  19 ++++++++-----------
 docs/{01_nodeos => }/eosio_components.png | Bin
 docs/index.md                             |  14 ++++++++++++++
 3 files changed, 22 insertions(+), 11 deletions(-)
 rename docs/{01_nodeos => }/eosio_components.png (100%)
 create mode 100644 docs/index.md

diff --git a/docs/01_nodeos/index.md b/docs/01_nodeos/index.md
index ff4bae0a507..86c5594a09e 100644
--- a/docs/01_nodeos/index.md
+++ b/docs/01_nodeos/index.md
@@ -1,21 +1,18 @@
-# Nodeos Overview
+# Nodeos
 
-EOSIO comes with a number of programs.  The primary ones that you will use, and the ones that are covered here, are:
+## Introduction
 
-* `nodeos` (node + eos = nodeos)  - the core EOSIO node daemon that can be configured with plugins to run a node. Example uses are block production, dedicated API endpoints, and local development. 
-* `cleos` (cli + eos = cleos) - command line interface to interact with the blockchain and to manage wallets.
-* `keosd` (key + eos = keosd) - component that securely stores EOSIO keys in wallets. 
+`nodeos` is the core service daemon that runs on every EOSIO node. It can be configured to execute and validate transactions, produce blocks with valid transactions, and confirm those blocks to record them on the blockchain.
 
-The basic relationship between these components is illustrated in the following diagram.
+## Installation
 
-![EOSIO components](eosio_components.png)
+`nodeos` is distributed as part of the [EOSIO software suite](https://github.com/EOSIO/eos/blob/master/README.md). To install `nodeos` just visit the [EOSIO Software Installation](../00_install/index.md) section.
 
-[[info | EOSIO Software Installation]]
-| Please [Install EOSIO](../00_install/index.md) before proceeding to the sections below.
+## Explore
 
-Please navigate the sections below to use `nodeos` in various network configurations, and learn how to setup `nodeos` instances for supporting EOSIO blockchain applications.
+Please navigate the sections below to configure and use `nodeos`.
 
-* [Usage](02_usage/index.md) - Using `nodeos`, config options, node setups/environments.
+* [Usage](02_usage/index.md) - Configuring and using `nodeos`, node setups/environments.
 * [Plugins](03_plugins/index.md) - Using plugins, plugin options, mandatory vs. optional.
 * [Replays](04_replays/index.md) - Replaying the chain from a snapshot or a blocks.log file.
 * [Logging](06_logging/index.md) - Logging config/usage, loggers, appenders, logging levels.
diff --git a/docs/01_nodeos/eosio_components.png b/docs/eosio_components.png
similarity index 100%
rename from docs/01_nodeos/eosio_components.png
rename to docs/eosio_components.png
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000000..7d5582ee50e
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,14 @@
+# EOSIO Overview
+
+EOSIO is a configurable blockchain platform for deploying smart contracts and distributed applications. EOSIO comes with a number of programs. The primary ones that you will use are the following:
+
+* [`nodeos`](01_nodeos/index.md) (node + eos = nodeos)  - core service daemon that runs a node for block production, API endpoints, or local development.
+* [`cleos`](02_cleos/index.md) (cli + eos = cleos) - command line interface to interact with the blockchain (via `nodeos`) and manage wallets (via `keosd`).
+* [`keosd`](03_keosd/index.md) (key + eos = keosd) - component that manages EOSIO keys in wallets and provides a secure enclave for digital signing.
+
+The basic relationship between these components is illustrated in the following diagram.
+
+![EOSIO components](eosio_components.png)
+
+[[info | What's Next?]]
+| [Install the EOSIO Software](00_install/index.md) before proceeding to the sections above.

From 419954ba2a4fa3098effdac24457e8e15fe83926 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 19:28:57 -0500
Subject: [PATCH 1549/1648] add cleos,keosd titles to index and demote intro
 title

---
 docs/02_cleos/index.md | 4 +++-
 docs/03_keosd/index.md | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/02_cleos/index.md b/docs/02_cleos/index.md
index 9f6169eb448..d4e63e56e27 100644
--- a/docs/02_cleos/index.md
+++ b/docs/02_cleos/index.md
@@ -1,4 +1,6 @@
-# Introduction
+# Cleos
+
+## Introduction
 
 `cleos` is a command line tool that interfaces with the REST API exposed by `nodeos`. Developers can also use `cleos` to deploy and test EOSIO smart contracts.
 
diff --git a/docs/03_keosd/index.md b/docs/03_keosd/index.md
index 3e337558089..70ea1f30c45 100644
--- a/docs/03_keosd/index.md
+++ b/docs/03_keosd/index.md
@@ -1,6 +1,8 @@
-# Introduction
+# Keosd
 
-`keosd` is a key manager daemon for storing private keys and signing digital messages. It provides a secure key storage medium for keys to be encrypted at rest in the associated wallet file. `keosd` also defines a secure enclave for signing transaction created by `cleos` or a third part library.
+## Introduction
+
+`keosd` is a key manager service daemon for storing private keys and signing digital messages. It provides a secure key storage medium for keys to be encrypted at rest in the associated wallet file. `keosd` also defines a secure enclave for signing transaction created by `cleos` or a third part library.
 
 ## Installation
 

From 0cf1de221996bb42a14424ca559df6742dd9b060 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 6 Dec 2019 19:49:52 -0500
Subject: [PATCH 1550/1648] minor edits on eosio index and nodeos index

---
 docs/01_nodeos/index.md |  2 +-
 docs/index.md           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/01_nodeos/index.md b/docs/01_nodeos/index.md
index 86c5594a09e..2f8b1b46787 100644
--- a/docs/01_nodeos/index.md
+++ b/docs/01_nodeos/index.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-`nodeos` is the core service daemon that runs on every EOSIO node. It can be configured to execute and validate transactions, produce blocks with valid transactions, and confirm those blocks to record them on the blockchain.
+`nodeos` is the core service daemon that runs on every EOSIO node. It can be configured to process smart contracts, validate transactions, produce blocks with valid transactions, and confirm blocks to record them on the blockchain.
 
 ## Installation
 
diff --git a/docs/index.md b/docs/index.md
index 7d5582ee50e..f19a12fd57e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,14 +1,14 @@
 # EOSIO Overview
 
-EOSIO is a configurable blockchain platform for deploying smart contracts and distributed applications. EOSIO comes with a number of programs. The primary ones that you will use are the following:
+EOSIO is the next-generation blockchain platform for creating and deploying smart contracts and distributed applications. EOSIO comes with a number of programs. The primary ones described here are the following:
 
-* [`nodeos`](01_nodeos/index.md) (node + eos = nodeos)  - core service daemon that runs a node for block production, API endpoints, or local development.
-* [`cleos`](02_cleos/index.md) (cli + eos = cleos) - command line interface to interact with the blockchain (via `nodeos`) and manage wallets (via `keosd`).
-* [`keosd`](03_keosd/index.md) (key + eos = keosd) - component that manages EOSIO keys in wallets and provides a secure enclave for digital signing.
+* [Nodeos](01_nodeos/index.md) (node + eos = nodeos)  - core service daemon that runs a node for block production, API endpoints, or local development.
+* [Cleos](02_cleos/index.md) (cli + eos = cleos) - command line interface to interact with the blockchain (via `nodeos`) and manage wallets (via `keosd`).
+* [Keosd](03_keosd/index.md) (key + eos = keosd) - component that manages EOSIO keys in wallets and provides a secure enclave for digital signing.
 
 The basic relationship between these components is illustrated in the following diagram.
 
 ![EOSIO components](eosio_components.png)
 
 [[info | What's Next?]]
-| [Install the EOSIO Software](00_install/index.md) before proceeding to the sections above.
+| [Install the EOSIO Software](00_install/index.md) before exploring the sections above.

From 0aecd0172b04e3a00dc24737ba6ade7048d3ec7a Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Sat, 7 Dec 2019 08:48:53 -0500
Subject: [PATCH 1551/1648] minor edits on main eosio index

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index f19a12fd57e..6d16b301994 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -6,7 +6,7 @@ EOSIO is the next-generation blockchain platform for creating and deploying smar
 * [Cleos](02_cleos/index.md) (cli + eos = cleos) - command line interface to interact with the blockchain (via `nodeos`) and manage wallets (via `keosd`).
 * [Keosd](03_keosd/index.md) (key + eos = keosd) - component that manages EOSIO keys in wallets and provides a secure enclave for digital signing.
 
-The basic relationship between these components is illustrated in the following diagram.
+The basic relationship between these components is illustrated in the diagram below.
 
 ![EOSIO components](eosio_components.png)
 

From 69f67f037ee33f95f198ec98643ff4bc7e21d46f Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Sat, 7 Dec 2019 09:16:14 -0500
Subject: [PATCH 1552/1648] update nodeos logging title

---
 docs/01_nodeos/06_logging/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/01_nodeos/06_logging/index.md b/docs/01_nodeos/06_logging/index.md
index 2f27bd2ba8e..b6ad286ea06 100644
--- a/docs/01_nodeos/06_logging/index.md
+++ b/docs/01_nodeos/06_logging/index.md
@@ -1,4 +1,4 @@
-# Logging Overview
+# Logging
 
 Logging for `nodeos` is controlled by the `logging.json` file. CLI options can be passed to `nodeos` to [setup `logging.json`](00_setup-logging.json.md). The logging configuration file can be used to define [appenders](#appenders) and tie them to [loggers](#loggers) and [logging levels](01_logging-levels.md).
 

From 73545c03dbc47e02bc180c61769a3fdd032121ec Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Sat, 7 Dec 2019 09:18:02 -0500
Subject: [PATCH 1553/1648] minor edits on eosio and nodeos indexes

---
 docs/01_nodeos/index.md | 2 +-
 docs/index.md           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/01_nodeos/index.md b/docs/01_nodeos/index.md
index 2f8b1b46787..511c6a4f2e4 100644
--- a/docs/01_nodeos/index.md
+++ b/docs/01_nodeos/index.md
@@ -6,7 +6,7 @@
 
 ## Installation
 
-`nodeos` is distributed as part of the [EOSIO software suite](https://github.com/EOSIO/eos/blob/master/README.md). To install `nodeos` just visit the [EOSIO Software Installation](../00_install/index.md) section.
+`nodeos` is distributed as part of the [EOSIO software suite](https://github.com/EOSIO/eos/blob/master/README.md). To install `nodeos`, visit the [EOSIO Software Installation](../00_install/index.md) section.
 
 ## Explore
 
diff --git a/docs/index.md b/docs/index.md
index 6d16b301994..2e3dcab590b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,6 +1,6 @@
 # EOSIO Overview
 
-EOSIO is the next-generation blockchain platform for creating and deploying smart contracts and distributed applications. EOSIO comes with a number of programs. The primary ones described here are the following:
+EOSIO is the next-generation blockchain platform for creating and deploying smart contracts and distributed applications. EOSIO comes with a number of programs. The primary ones included in EOSIO are the following:
 
 * [Nodeos](01_nodeos/index.md) (node + eos = nodeos)  - core service daemon that runs a node for block production, API endpoints, or local development.
 * [Cleos](02_cleos/index.md) (cli + eos = cleos) - command line interface to interact with the blockchain (via `nodeos`) and manage wallets (via `keosd`).

From 7f437616baa6673699f0259a3af7f838cfe13eda Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Sat, 7 Dec 2019 09:51:26 -0500
Subject: [PATCH 1554/1648] fix anchor link reference in manual install of
 eosio dependencies

---
 .../02_manual-build/00_eosio-dependencies/index.md              | 2 ++
 .../02_build-eosio-binaries/02_manual-build/index.md            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md
index 3291d5fe8bb..fc30fed92a4 100644
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md
@@ -42,6 +42,8 @@ Below are instructions to install the EOSIO dependencies manually on various pla
 * [CentOS Linux](02_centos-linux.md)
 * [Ubuntu Linux](03_ubuntu-linux.md)
 
+### Other Platforms
+
 EOSIO dependencies can also be built and installed manually by reproducing the same commands invoked by the [Build Script](../../00_build-script.md). The actual commands can be generated from the script directly by exporting specific environment variables and CLI parameters to the script when invoked:
 
 ```sh
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
index b1de367136d..fc7b15d8549 100644
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
@@ -11,7 +11,7 @@ When performing a manual build, it is necessary to install specific software pac
 
 The following instructions will build the EOSIO dependencies and EOSIO binaries manually by invoking commands on the shell:
 
-1. [Manual Install EOSIO Dependencies](00_eosio-dependencies/index.md)
+1. [Manual Install EOSIO Dependencies](00_eosio-dependencies/index.md#manual-installation-of-dependencies)
 2. [Manual Build EOSIO Binaries](01_eosio-manual-build.md)
 
 ## Out-of-source Builds

From 0a1f6813735f48471bba0216169ce76bb1f16dbc Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Sat, 7 Dec 2019 10:44:59 -0500
Subject: [PATCH 1555/1648] fix brew install command in macos build
 instructions

---
 .../02_manual-build/00_eosio-dependencies/00_macos-mojave.md   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
index 10c4d28095a..c0ee740910e 100644
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
@@ -24,8 +24,7 @@ $ cd ~/eosio
 ### 2. Install Homebrew
 
 ```sh
-$ which brew && (brew doctor && brew cask doctor && \
-    echo 'brew already installed') || /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+$ which brew && echo 'brew already installed' || /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 ```
 
 ### 3. Install dependencies

From 3eacaa7be5f2e6c851fcc39ffe79bfd33a7c9d02 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Sat, 7 Dec 2019 11:14:12 -0500
Subject: [PATCH 1556/1648] minor edits on eosio manual build instructions

---
 .../02_manual-build/01_eosio-manual-build.md                   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
index 37b58d9b904..461782aa3a4 100644
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
@@ -1,6 +1,5 @@
-# EOSIO Manual Build
 
-[[warning | Reminder]]
+[[info | Reminder]]
 | This section assumes that you have already installed the EOSIO dependencies manually. If not, visit the [Manual Installation of EOSIO Dependencies](00_eosio-dependencies/index.md#manual-installation-of-dependencies) section.
 
 ## Instructions

From e7b8ee8aac94ad320f2786d7a84052e11f6550a4 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Sat, 7 Dec 2019 11:24:21 -0500
Subject: [PATCH 1557/1648] fix and update links in eosio binaries install

---
 .../02_manual-build/01_eosio-manual-build.md                | 2 +-
 .../01_build-from-source/03_install-eosio-binaries.md       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
index 461782aa3a4..dfb625b95a0 100644
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
+++ b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
@@ -39,4 +39,4 @@ $ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/us
 ```
 
 [[info | What's Next?]]
-| [Install EOSIO binaries manually](../../03_install-eosio-binaries.md#using-make-install)
+| [Install EOSIO binaries manually](../../03_install-eosio-binaries.md#eosio-manual-install)
diff --git a/docs/00_install/01_build-from-source/03_install-eosio-binaries.md b/docs/00_install/01_build-from-source/03_install-eosio-binaries.md
index cb02ab4a2d5..3dcd509f27a 100644
--- a/docs/00_install/01_build-from-source/03_install-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/03_install-eosio-binaries.md
@@ -1,5 +1,5 @@
 
-## Using install script
+## EOSIO install script
 
 For ease of contract development, content can be installed at the `/usr/local` folder using the `eosio_install.sh` script within the `eos/scripts` folder. Adequate permission is required to install on system folders:
 
@@ -8,9 +8,9 @@ $ cd ~/eosio/eos
 $ sudo ./scripts/eosio_install.sh
 ```
 
-## Using make install
+## EOSIO manual install
 
-In lieu of the `eosio_install.sh` script, you can install the EOSIO binaries directly by invoking `make install` target within the `eos/build` folder. Again, adequate permission is required to install on system folders:
+In lieu of the `eosio_install.sh` script, you can install the EOSIO binaries directly by invoking `make install` within the `eos/build` folder. Again, adequate permission is required to install on system folders:
 
 ```sh
 $ cd ~/eosio/eos/build

From 4e7e535db4c3a5f1c1891493c007d14f54cd91dc Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Sat, 7 Dec 2019 13:07:50 -0500
Subject: [PATCH 1558/1648] minor edits on eosio build validation

---
 docs/00_install/01_build-from-source/04_build-validation.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/00_install/01_build-from-source/04_build-validation.md b/docs/00_install/01_build-from-source/04_build-validation.md
index ae72767ccee..718e80fe339 100644
--- a/docs/00_install/01_build-from-source/04_build-validation.md
+++ b/docs/00_install/01_build-from-source/04_build-validation.md
@@ -1,5 +1,5 @@
 
-Optionally, a set of tests can be run against your build to perform some basic validation.
+Optionally, a set of tests can be run against your build to perform some basic validation of the EOSIO software installation.
 
 To run the test suite after building, start `mongod`:
 
@@ -13,7 +13,7 @@ On MacOS:
 /usr/local/bin/mongod -f /usr/local/etc/mongod.conf &
 ```
 
-and set the build path to EOSIO_HOME by the following:
+then set the build path to EOSIO_HOME:
 ```sh
 export EOSIO_HOME=~/eosio/eos/build
 ```
@@ -26,4 +26,4 @@ make test
 ```
 
 [[info | Recommend]]
-| An optional but strongly suggested `make install` step after [building EOSIO from source](index.md) makes local development significantly more friendly.
+| It is strongly suggested to [Install the EOSIO binaries](03_install-eosio-binaries.md) after building EOSIO from source as it makes local development significantly more friendly.

From de38dbf56a996728af9ea4b1633bf73fb08f3307 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 9 Dec 2019 18:04:10 -0500
Subject: [PATCH 1559/1648] If requesting next chuck and determine nothing to
 request, send handshake

---
 plugins/net_plugin/net_plugin.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 500d4a59680..2a507b94b94 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -1465,6 +1465,7 @@ namespace eosio {
          return;
       }
 
+      bool request_sent = false;
       if( sync_last_requested_num != sync_known_lib_num ) {
          uint32_t start = sync_next_expected_num;
          uint32_t end = start + sync_req_span - 1;
@@ -1474,12 +1475,18 @@ namespace eosio {
             sync_last_requested_num = end;
             connection_ptr c = sync_source;
             g_sync.unlock();
+            request_sent = true;
             c->strand.post( [c, start, end]() {
                fc_ilog( logger, "requesting range ${s} to ${e}, from ${n}", ("n", c->peer_name())( "s", start )( "e", end ) );
                c->request_sync_blocks( start, end );
             } );
          }
       }
+      if( !request_sent ) {
+         connection_ptr c = sync_source;
+         g_sync.unlock();
+         c->send_handshake();
+      }
    }
 
    // static, thread safe

From ce6da5df8aa371f200f4ff8770b66d748b43e6fd Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 10 Dec 2019 10:47:36 -0500
Subject: [PATCH 1560/1648] Use error code to avoid exceptions from boost asio

---
 plugins/net_plugin/net_plugin.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 500d4a59680..c2517a07f8e 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -923,7 +923,7 @@ namespace eosio {
       boost::system::error_code ec;
       if( self->socket->is_open() ) {
          self->socket->shutdown( tcp::socket::shutdown_both, ec );
-         self->socket->close();
+         self->socket->close( ec );
       }
       self->socket.reset( new tcp::socket( my_impl->thread_pool->get_executor() ) );
       self->flush_queues();
@@ -2257,8 +2257,9 @@ namespace eosio {
                         fc_elog( logger, "Error max_client_count ${m} exceeded", ("m", max_client_count));
                      }
                      // new_connection never added to connections and start_session not called, lifetime will end
-                     socket->shutdown( tcp::socket::shutdown_both );
-                     socket->close();
+                     boost::system::error_code ec;
+                     socket->shutdown( tcp::socket::shutdown_both, ec );
+                     socket->close( ec );
                   }
                }
             } else {
@@ -2292,7 +2293,11 @@ namespace eosio {
             const size_t max_socket_read_watermark = 4096;
             std::size_t socket_read_watermark = std::min<std::size_t>(minimum_read, max_socket_read_watermark);
             boost::asio::socket_base::receive_low_watermark read_watermark_opt(socket_read_watermark);
-            socket->set_option(read_watermark_opt);
+            boost::system::error_code ec;
+            socket->set_option( read_watermark_opt, ec );
+            if( ec ) {
+               fc_elog( logger, "unable to set read watermark ${peer}: ${e1}", ("peer", peer_name())( "e1", ec.message() ) );
+            }
          }
 
          auto completion_handler = [minimum_read](boost::system::error_code ec, std::size_t bytes_transferred) -> std::size_t {
@@ -3412,15 +3417,15 @@ namespace eosio {
       }
 
       if( my->acceptor ) {
-         my->acceptor->open(listen_endpoint.protocol());
-         my->acceptor->set_option(tcp::acceptor::reuse_address(true));
          try {
+           my->acceptor->open(listen_endpoint.protocol());
+           my->acceptor->set_option(tcp::acceptor::reuse_address(true));
            my->acceptor->bind(listen_endpoint);
+           my->acceptor->listen();
          } catch (const std::exception& e) {
            elog( "net_plugin::plugin_startup failed to bind to port ${port}", ("port", listen_endpoint.port()) );
            throw e;
          }
-         my->acceptor->listen();
          fc_ilog( logger, "starting listener, max clients is ${mc}",("mc",my->max_client_count) );
          my->start_listen_loop();
       }

From 8f48de8783a6d02bbf5fc4b0f6a0dc56c5d19455 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 10 Dec 2019 14:41:24 -0500
Subject: [PATCH 1561/1648] Add thread protection around peer logging variables

---
 plugins/net_plugin/net_plugin.cpp | 75 +++++++++++++++----------------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index aef39365002..d546c99751b 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -539,8 +539,6 @@ namespace eosio {
 
       bool socket_is_open() const { return socket_open.load(); } // thread safe, atomic
       const string& peer_address() const { return peer_addr; } // thread safe, const
-      // thread safe, not updated after start_session()
-      const string& remote_address() const { return socket_open.load() ? remote_endpoint_ip : unknown; }
 
       void set_connection_type( const string& peer_addr );
       bool is_transactions_only_connection()const { return connection_type == transactions_only; }
@@ -556,11 +554,6 @@ namespace eosio {
       std::atomic<bool>                         socket_open{false};
 
       const string            peer_addr;
-      string                  remote_endpoint_ip;     // not updated after start
-      string                  remote_endpoint_port;   // not updated after start
-      string                  local_endpoint_ip;      // not updated after start
-      string                  local_endpoint_port;    // not updated after start
-
       enum connection_types : char {
          both,
          transactions_only,
@@ -579,7 +572,6 @@ namespace eosio {
       queued_buffer           buffer_queue;
 
       std::atomic<uint32_t>   trx_in_progress_size{0};
-      fc::sha256              node_id;
       const uint32_t          connection_id;
       int16_t                 sent_handshake_count = 0;
       std::atomic<bool>       connecting{true};
@@ -593,13 +585,18 @@ namespace eosio {
 
       std::atomic<go_away_reason>           no_retry{no_reason};
 
-      mutable std::mutex          conn_mtx; //< mtx for last_req, last_handshake_recv, last_handshake_sent, fork_head, fork_head_num, last_close
+      mutable std::mutex          conn_mtx; //< mtx for last_req .. local_endpoint_port
       optional<request_message>   last_req;
       handshake_message           last_handshake_recv;
       handshake_message           last_handshake_sent;
       block_id_type               fork_head;
       uint32_t                    fork_head_num{0};
       fc::time_point              last_close;
+      fc::sha256                  conn_node_id;
+      string                      remote_endpoint_ip;
+      string                      remote_endpoint_port;
+      string                      local_endpoint_ip;
+      string                      local_endpoint_port;
 
       connection_status get_status()const;
 
@@ -718,20 +715,17 @@ namespace eosio {
 
       void process_signed_block( const block_id_type& id, signed_block_ptr msg );
 
-      fc::optional<fc::variant_object> _logger_variant;
-      const fc::variant_object& get_logger_variant()  {
-         if (!_logger_variant) {
-            _logger_variant.emplace(fc::mutable_variant_object()
-               ("_name", peer_name())
-               ("_id", node_id)
-               ("_sid", ((string)node_id).substr(0, 7))
-               ("_ip", remote_endpoint_ip)
-               ("_port", remote_endpoint_port)
-               ("_lip", local_endpoint_ip)
-               ("_lport", local_endpoint_port)
-            );
-         }
-         return *_logger_variant;
+      fc::variant_object get_logger_variant()  {
+         fc::mutable_variant_object mvo;
+         mvo( "_name", peer_name());
+         std::lock_guard<std::mutex> g_conn( conn_mtx );
+         mvo( "_id", conn_node_id )
+            ( "_sid", conn_node_id.str().substr( 0, 7 ) )
+            ( "_ip", remote_endpoint_ip )
+            ( "_port", remote_endpoint_port )
+            ( "_lip", local_endpoint_ip )
+            ( "_lport", local_endpoint_port );
+         return mvo;
       }
    };
 
@@ -819,7 +813,6 @@ namespace eosio {
         last_handshake_sent()
    {
       fc_ilog( logger, "creating connection to ${n}", ("n", endpoint) );
-      node_id.data()[0] = 0;
    }
 
    connection::connection()
@@ -832,18 +825,18 @@ namespace eosio {
         last_handshake_sent()
    {
       fc_ilog( logger, "accepted network connection" );
-      node_id.data()[0] = 0;
    }
 
    void connection::update_endpoints() {
       boost::system::error_code ec;
+      boost::system::error_code ec2;
       auto rep = socket->remote_endpoint(ec);
+      auto lep = socket->local_endpoint(ec2);
+      std::lock_guard<std::mutex> g_conn( conn_mtx );
       remote_endpoint_ip = ec ? unknown : rep.address().to_string();
       remote_endpoint_port = ec ? unknown : std::to_string(rep.port());
-
-      auto lep = socket->local_endpoint(ec);
-      local_endpoint_ip = ec ? unknown : lep.address().to_string();
-      local_endpoint_port = ec ? unknown : std::to_string(lep.port());
+      local_endpoint_ip = ec2 ? unknown : lep.address().to_string();
+      local_endpoint_port = ec2 ? unknown : std::to_string(lep.port());
    }
 
    void connection::set_connection_type( const string& peer_add ) {
@@ -938,13 +931,13 @@ namespace eosio {
          self->last_handshake_recv = handshake_message();
          self->last_handshake_sent = handshake_message();
          self->last_close = fc::time_point::now();
+         self->conn_node_id = fc::sha256();
       }
       if( has_last_req ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
       self->peer_requested.reset();
       self->sent_handshake_count = 0;
-      self->node_id = fc::sha256();
       my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
       fc_ilog( logger, "closing '${a}', ${p}", ("a", self->peer_address())("p", self->peer_name()) );
       fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
@@ -1308,11 +1301,10 @@ namespace eosio {
 
    // locks conn_mtx, do not call while holding conn_mtx
    const string connection::peer_name() {
-      std::unique_lock<std::mutex> g_conn( conn_mtx );
+      std::lock_guard<std::mutex> g_conn( conn_mtx );
       if( !last_handshake_recv.p2p_address.empty() ) {
          return last_handshake_recv.p2p_address;
       }
-      g_conn.unlock();
       if( !peer_address().empty() ) {
          return peer_address();
       }
@@ -2242,7 +2234,8 @@ namespace eosio {
                      if( conn->socket_is_open()) {
                         if( conn->peer_address().empty()) {
                            ++visitors;
-                           if( paddr_str == conn->remote_address()) {
+                           std::lock_guard<std::mutex> g_conn( conn->conn_mtx );
+                           if( paddr_str == conn->remote_endpoint_ip ) {
                               ++from_addr;
                            }
                         }
@@ -2552,7 +2545,7 @@ namespace eosio {
       connecting = false;
       if (msg.generation == 1) {
          if( msg.node_id == my_impl->node_id) {
-            fc_elog( logger, "Self connection detected node_id ${id}. Closing connection", ("id", node_id) );
+            fc_elog( logger, "Self connection detected node_id ${id}. Closing connection", ("id", msg.node_id) );
             enqueue( go_away_message( self ) );
             return;
          }
@@ -2586,7 +2579,9 @@ namespace eosio {
                   g_cnts.unlock();
                   fc_dlog( logger, "sending go_away duplicate to ${ep}", ("ep",msg.p2p_address) );
                   go_away_message gam(duplicate);
-                  gam.node_id = node_id;
+                  g_conn.lock();
+                  gam.node_id = conn_node_id;
+                  g_conn.unlock();
                   enqueue(gam);
                   no_retry = duplicate;
                   return;
@@ -2609,9 +2604,11 @@ namespace eosio {
                      ("nv", net_version)( "mnv", protocol_version ) );
          }
 
-         if( node_id != msg.node_id ) {
-            node_id = msg.node_id;
+         g_conn.lock();
+         if( conn_node_id != msg.node_id ) {
+            conn_node_id = msg.node_id;
          }
+         g_conn.unlock();
 
          if( !my_impl->authenticate_peer( msg ) ) {
             fc_elog( logger, "Peer not authenticated.  Closing connection." );
@@ -2665,7 +2662,6 @@ namespace eosio {
       std::unique_lock<std::mutex> g_conn( conn_mtx );
       last_handshake_recv = msg;
       g_conn.unlock();
-      _logger_variant.reset();
       my_impl->sync_master->recv_handshake( shared_from_this(), msg );
    }
 
@@ -2674,7 +2670,8 @@ namespace eosio {
       bool retry = no_retry == no_reason; // if no previous go away message
       no_retry = msg.reason;
       if( msg.reason == duplicate ) {
-         node_id = msg.node_id;
+         std::lock_guard<std::mutex> g_conn( conn_mtx );
+         conn_node_id = msg.node_id;
       }
       if( msg.reason == wrong_version ) {
          if( !retry ) no_retry = fatal_other; // only retry once on wrong version

From f0c5f8ca22d6de0a28a5fbdd34378c48fb4798c8 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 10 Dec 2019 17:46:09 -0500
Subject: [PATCH 1562/1648] reset the new handler

---
 libraries/chain/controller.cpp                   | 16 +++++++++++++++-
 .../chain/include/eosio/chain/controller.hpp     |  1 -
 unittests/misc_tests.cpp                         | 10 ++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index c8ac4affdd5..1cb9d6fa992 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -32,6 +32,8 @@
 #include <fc/scoped_exit.hpp>
 #include <fc/variant_object.hpp>
 
+#include <new>
+
 namespace eosio { namespace chain {
 
 using resource_limits::resource_limits_manager;
@@ -213,6 +215,14 @@ struct pending_state {
 };
 
 struct controller_impl {
+
+   // LLVM sets the new handler, we need to reset this to throw a bad_alloc exception so we can possibly exit cleanly
+   // and not just abort.
+   struct reset_new_handler {
+      reset_new_handler() { /* std::set_new_handler([](){ throw std::bad_alloc(); });*/ }
+   };
+
+   reset_new_handler              rnh; // placed here to allow for this to be set before constructing the other fields
    controller&                    self;
    chainbase::database            db;
    chainbase::database            reversible_blocks; ///< a special database to persist blocks that have successfully been applied but are still reversible
@@ -286,7 +296,8 @@ struct controller_impl {
    }
 
    controller_impl( const controller::config& cfg, controller& s, protocol_feature_set&& pfs, const chain_id_type& chain_id )
-   :self(s),
+   :rnh(),
+    self(s),
     db( cfg.state_dir,
         cfg.read_only ? database::read_only : database::read_write,
         cfg.state_size, false, cfg.db_map_mode, cfg.db_hugepage_paths ),
@@ -304,6 +315,8 @@ struct controller_impl {
     read_mode( cfg.read_mode ),
     thread_pool( "chain", cfg.thread_pool_size )
    {
+
+      // reset the
       fork_db.open( [this]( block_timestamp_type timestamp,
                             const flat_set<digest_type>& cur_features,
                             const vector<digest_type>& new_features )
@@ -316,6 +329,7 @@ struct controller_impl {
       set_activation_handler<builtin_protocol_feature_t::webauthn_key>();
       set_activation_handler<builtin_protocol_feature_t::wtmsig_block_signatures>();
 
+
       self.irreversible_block.connect([this](const block_state_ptr& bsp) {
          wasmif.current_lib(bsp->block_num);
       });
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
index 4f96075fabc..b17afd01da5 100644
--- a/libraries/chain/include/eosio/chain/controller.hpp
+++ b/libraries/chain/include/eosio/chain/controller.hpp
@@ -57,7 +57,6 @@ namespace eosio { namespace chain {
 
    class controller {
       public:
-
          struct config {
             flat_set<account_name>   sender_bypass_whiteblacklist;
             flat_set<account_name>   actor_whitelist;
diff --git a/unittests/misc_tests.cpp b/unittests/misc_tests.cpp
index 6e465674092..7414c8a104b 100644
--- a/unittests/misc_tests.cpp
+++ b/unittests/misc_tests.cpp
@@ -1110,6 +1110,16 @@ BOOST_AUTO_TEST_CASE(stable_priority_queue_test) {
   } FC_LOG_AND_RETHROW()
 }
 
+// test that std::bad_alloc is being thrown
+BOOST_AUTO_TEST_CASE(bad_alloc_test) {
+   tester t; // force a controller to be constructed and set the new_handler
+   int* ptr = nullptr;
+   const auto fail = [&]() {
+      ptr = new int[std::numeric_limits<int64_t>::max()/16];
+   };
+   BOOST_CHECK_THROW( fail(), std::bad_alloc );
+   BOOST_CHECK( ptr == nullptr );
+}
 
 BOOST_AUTO_TEST_SUITE_END()
 

From 349de2ba1d3eb8d989c268997dd859e8b19777b0 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 10 Dec 2019 18:18:42 -0500
Subject: [PATCH 1563/1648] uncomment, hopefully should work

---
 libraries/chain/controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 1cb9d6fa992..15897e41e63 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -219,7 +219,7 @@ struct controller_impl {
    // LLVM sets the new handler, we need to reset this to throw a bad_alloc exception so we can possibly exit cleanly
    // and not just abort.
    struct reset_new_handler {
-      reset_new_handler() { /* std::set_new_handler([](){ throw std::bad_alloc(); });*/ }
+      reset_new_handler() { std::set_new_handler([](){ throw std::bad_alloc(); }); }
    };
 
    reset_new_handler              rnh; // placed here to allow for this to be set before constructing the other fields

From 42ed86a518e0630ef1ec309ed360694a4b4c7766 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 10 Dec 2019 15:04:08 -0600
Subject: [PATCH 1564/1648] Fixed corner case for failures and added debug
 logging.

---
 tests/Node.py                       |  7 ++++++-
 tests/nodeos_under_min_avail_ram.py | 10 ++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/Node.py b/tests/Node.py
index 69656c08250..adb9137c4b8 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1278,7 +1278,9 @@ def interruptAndVerifyExitStatus(self, timeout=60):
         self.killed=True
 
     def verifyAlive(self, silent=False):
-        if not silent and Utils.Debug: Utils.Print("Checking if node(pid=%s) is alive(killed=%s): %s" % (self.pid, self.killed, self.cmd))
+        logStatus=not silent and Utils.Debug
+        pid=self.pid
+        if logStatus: Utils.Print("Checking if node(pid=%s) is alive(killed=%s): %s" % (self.pid, self.killed, self.cmd))
         if self.killed or self.pid is None:
             self.killed=True
             self.pid=None
@@ -1290,10 +1292,13 @@ def verifyAlive(self, silent=False):
             # mark node as killed
             self.pid=None
             self.killed=True
+            if logStatus: Utils.Print("Determined node(formerly pid=%s) is killed" % (pid))
             return False
         except PermissionError as ex:
+            if logStatus: Utils.Print("Determined node(formerly pid=%s) is killed" % (pid))
             return True
 
+        if logStatus: Utils.Print("Determined node(pid=%s) is alive (kill command executed)" % (self.pid))
         return True
 
     def getBlockProducerByNum(self, blockNum, timeout=None, waitForBlock=True, exitOnError=True):
diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index 108c3742964..36166fbda73 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -197,19 +197,19 @@ def setName(self, num):
         errorExit("Incorrect number of store actions sent")
 
     # Make sure all the nodes are shutdown (may take a little while for this to happen, so making multiple passes)
-    allDone=False
     count=0
-    while not allDone:
+    while True:
         allDone=True
         for node in nodes:
             if node.verifyAlive():
                 allDone=False
-        if not allDone:
-            time.sleep(5)
+        if allDone:
+            break
         count+=1
         if count>5:
             Utils.cmdError("All Nodes should have died")
             errorExit("Failure - All Nodes should have died")
+        time.sleep(5)
 
     for i in range(numNodes):
         f = open(Utils.getNodeDataDir(i) + "/stderr.txt")
@@ -300,7 +300,6 @@ def setName(self, num):
     addSwapFlags={}
 
     time.sleep(10)
-    allDone=True
     for node in nodes:
         if not node.verifyAlive():
             Utils.cmdError("All Nodes should be alive")
@@ -337,7 +336,6 @@ def setName(self, num):
 
     time.sleep(10)
     Print("Check nodes are alive")
-    allDone=True
     for node in nodes:
         if not node.verifyAlive():
             Utils.cmdError("All Nodes should be alive")

From 2eb4db818b38012a4dbeb1bf6ace34f7072bfa48 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 10 Dec 2019 15:32:31 -0600
Subject: [PATCH 1565/1648] Increased time to wait for shutdown.

---
 tests/nodeos_under_min_avail_ram.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/nodeos_under_min_avail_ram.py b/tests/nodeos_under_min_avail_ram.py
index 36166fbda73..6c9d6c7fc00 100755
--- a/tests/nodeos_under_min_avail_ram.py
+++ b/tests/nodeos_under_min_avail_ram.py
@@ -206,7 +206,7 @@ def setName(self, num):
         if allDone:
             break
         count+=1
-        if count>5:
+        if count>12:
             Utils.cmdError("All Nodes should have died")
             errorExit("Failure - All Nodes should have died")
         time.sleep(5)

From bf8898456bc17de90843f48c0fecfac39adc4b41 Mon Sep 17 00:00:00 2001
From: "johnsonb@objectcomputing.com" <Brian Johnson>
Date: Tue, 10 Dec 2019 19:53:54 -0600
Subject: [PATCH 1566/1648] Cleaned up log statements.

---
 tests/Node.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Node.py b/tests/Node.py
index adb9137c4b8..da76bb68f96 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -1295,10 +1295,10 @@ def verifyAlive(self, silent=False):
             if logStatus: Utils.Print("Determined node(formerly pid=%s) is killed" % (pid))
             return False
         except PermissionError as ex:
-            if logStatus: Utils.Print("Determined node(formerly pid=%s) is killed" % (pid))
+            if logStatus: Utils.Print("Determined node(formerly pid=%s) is alive" % (pid))
             return True
 
-        if logStatus: Utils.Print("Determined node(pid=%s) is alive (kill command executed)" % (self.pid))
+        if logStatus: Utils.Print("Determined node(pid=%s) is alive" % (self.pid))
         return True
 
     def getBlockProducerByNum(self, blockNum, timeout=None, waitForBlock=True, exitOnError=True):

From 8fd141d77b0f49233f7a1efd7e482d451546123f Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Wed, 11 Dec 2019 10:56:23 -0500
Subject: [PATCH 1567/1648] Fix race in fc::message_buffer and move
 message_buffer_tests to fc.

---
 libraries/fc                       |   2 +-
 unittests/message_buffer_tests.cpp | 358 -----------------------------
 2 files changed, 1 insertion(+), 359 deletions(-)
 delete mode 100644 unittests/message_buffer_tests.cpp

diff --git a/libraries/fc b/libraries/fc
index e0e9f08b99c..f0da6a718e3 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit e0e9f08b99ce2d4ce65f6e7bf51c766dcddc65e6
+Subproject commit f0da6a718e34201a0e7878e93e727fac4767b5e4
diff --git a/unittests/message_buffer_tests.cpp b/unittests/message_buffer_tests.cpp
deleted file mode 100644
index a499aa0d3f3..00000000000
--- a/unittests/message_buffer_tests.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-#include <iostream>
-
-#include <boost/test/unit_test.hpp>
-
-#include <fc/network/message_buffer.hpp>
-
-namespace eosio {
-using namespace std;
-
-size_t mb_size(boost::asio::mutable_buffer& mb) {
-#if BOOST_VERSION >= 106600
-   return mb.size();
-#else
-   return boost::asio::detail::buffer_size_helper(mb);
-#endif
-}
-
-void* mb_data(boost::asio::mutable_buffer& mb) {
-#if BOOST_VERSION >= 106600
-   return mb.data();
-#else
-   return boost::asio::detail::buffer_cast_helper(mb);
-#endif
-}
-
-BOOST_AUTO_TEST_SUITE(message_buffer_tests)
-
-constexpr size_t     def_buffer_size_mb = 4;
-constexpr size_t     def_buffer_size = 1024*1024*def_buffer_size_mb;
-
-/// Test default construction and buffer sequence generation
-BOOST_AUTO_TEST_CASE(message_buffer_construction)
-{
-  try {
-    fc::message_buffer<def_buffer_size> mb;
-    BOOST_CHECK_EQUAL(mb.total_bytes(), def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0u);
-    BOOST_CHECK_EQUAL(mb.read_ptr(), mb.write_ptr());
-
-    auto mbs = mb.get_buffer_sequence_for_boost_async_read();
-    auto mbsi = mbs.begin();
-    BOOST_CHECK_EQUAL(mb_size(*mbsi), def_buffer_size);
-    BOOST_CHECK_EQUAL(mb_data(*mbsi), mb.write_ptr());
-    mbsi++;
-    BOOST_CHECK(mbsi == mbs.end());
-  }
-  FC_LOG_AND_RETHROW()
-}
-
-/// Test buffer growth and shrinking
-BOOST_AUTO_TEST_CASE(message_buffer_growth)
-{
-  try {
-    fc::message_buffer<def_buffer_size> mb;
-    mb.add_buffer_to_chain();
-    BOOST_CHECK_EQUAL(mb.total_bytes(), 2 * def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), 2 * def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0u);
-    BOOST_CHECK_EQUAL(mb.read_ptr(), mb.write_ptr());
-
-    {
-      auto mbs = mb.get_buffer_sequence_for_boost_async_read();
-      auto mbsi = mbs.begin();
-      BOOST_CHECK_EQUAL(mb_size(*mbsi), def_buffer_size);
-      BOOST_CHECK_EQUAL(mb_data(*mbsi), mb.write_ptr());
-      mbsi++;
-      BOOST_CHECK(mbsi != mbs.end());
-      BOOST_CHECK_EQUAL(mb_size(*mbsi), def_buffer_size);
-      BOOST_CHECK_NE(mb_data(*mbsi), nullptr);
-      mbsi++;
-      BOOST_CHECK(mbsi == mbs.end());
-    }
-
-    mb.advance_write_ptr(100);
-    BOOST_CHECK_EQUAL(mb.total_bytes(), 2 * def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), 2 * def_buffer_size - 100);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 100u);
-    BOOST_CHECK_NE(mb.read_ptr(), nullptr);
-    BOOST_CHECK_NE(mb.write_ptr(), nullptr);
-    BOOST_CHECK_EQUAL((mb.read_ptr() + 100), mb.write_ptr());
-
-    {
-      auto mbs = mb.get_buffer_sequence_for_boost_async_read();
-      auto mbsi = mbs.begin();
-      BOOST_CHECK_EQUAL(mb_size(*mbsi), def_buffer_size - 100);
-      BOOST_CHECK_EQUAL(mb_data(*mbsi), mb.write_ptr());
-      mbsi++;
-      BOOST_CHECK(mbsi != mbs.end());
-      BOOST_CHECK_EQUAL(mb_size(*mbsi), def_buffer_size);
-      BOOST_CHECK_NE(mb_data(*mbsi), nullptr);
-      mbsi++;
-      BOOST_CHECK(mbsi == mbs.end());
-    }
-
-    mb.advance_read_ptr(50);
-    BOOST_CHECK_EQUAL(mb.total_bytes(), 2 * def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), 2 * def_buffer_size - 100);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 50u);
-
-    mb.advance_write_ptr(def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.total_bytes(), 2 * def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), def_buffer_size - 100);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 50 + def_buffer_size);
-
-    // Moving read_ptr into second block should reset second block to first
-    mb.advance_read_ptr(def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.total_bytes(), def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), def_buffer_size - 100);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 50u);
-
-    // Moving read_ptr to write_ptr should shrink chain and reset ptrs
-    mb.advance_read_ptr(50);
-    BOOST_CHECK_EQUAL(mb.total_bytes(), def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0u);
-
-    mb.add_buffer_to_chain();
-    BOOST_CHECK_EQUAL(mb.total_bytes(), 2 * def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), 2 * def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0u);
-
-    mb.advance_write_ptr(50);
-    BOOST_CHECK_EQUAL(mb.total_bytes(), 2 * def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), 2 * def_buffer_size - 50);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 50u);
-
-    // Moving read_ptr to write_ptr should shrink chain and reset ptrs
-    mb.advance_read_ptr(50);
-    BOOST_CHECK_EQUAL(mb.total_bytes(), def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_write(), def_buffer_size);
-    BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0u);
-  }
-  FC_LOG_AND_RETHROW()
-}
-
-/// Test peek and read across multiple buffers
-BOOST_AUTO_TEST_CASE(message_buffer_peek_read)
-{
-  try {
-    {
-      const uint32_t small = 32;
-      fc::message_buffer<small> mb;
-      BOOST_CHECK_EQUAL(mb.total_bytes(), small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_write(), small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0);
-      BOOST_CHECK_EQUAL(mb.read_ptr(), mb.write_ptr());
-      BOOST_CHECK_EQUAL(mb.read_index().first, 0);
-      BOOST_CHECK_EQUAL(mb.read_index().second, 0);
-      BOOST_CHECK_EQUAL(mb.write_index().first, 0);
-      BOOST_CHECK_EQUAL(mb.write_index().second, 0);
-
-      mb.add_space(100 - small);
-      BOOST_CHECK_EQUAL(mb.total_bytes(), 4 * small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_write(), 4 * small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0);
-      BOOST_CHECK_EQUAL(mb.read_ptr(), mb.write_ptr());
-
-      char* write_ptr = mb.write_ptr();
-      for (char ind = 0; ind < 100; ) {
-        *write_ptr = ind;
-        ind++;
-        if (ind % small == 0) {
-          mb.advance_write_ptr(small);
-          write_ptr = mb.write_ptr();
-        } else {
-          write_ptr++;
-        }
-      }
-      mb.advance_write_ptr(100 % small);
-
-      BOOST_CHECK_EQUAL(mb.total_bytes(), 4 * small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_write(), 4 * small - 100);
-      BOOST_CHECK_EQUAL(mb.bytes_to_read(), 100);
-      BOOST_CHECK_NE((void*) mb.read_ptr(), (void*) mb.write_ptr());
-      BOOST_CHECK_EQUAL(mb.read_index().first, 0);
-      BOOST_CHECK_EQUAL(mb.read_index().second, 0);
-      BOOST_CHECK_EQUAL(mb.write_index().first, 3);
-      BOOST_CHECK_EQUAL(mb.write_index().second, 4);
-
-      char buffer[100];
-      auto index = mb.read_index();
-      mb.peek(buffer, 50, index);
-      mb.peek(buffer+50, 50, index);
-      for (int i=0; i < 100; i++) {
-        BOOST_CHECK_EQUAL(i, buffer[i]);
-      }
-
-      BOOST_CHECK_EQUAL(mb.total_bytes(), 4 * small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_write(), 4 * small - 100);
-      BOOST_CHECK_EQUAL(mb.bytes_to_read(), 100);
-      BOOST_CHECK_NE((void*) mb.read_ptr(), (void*) mb.write_ptr());
-
-      char buffer2[100];
-      mb.read(buffer2, 100);
-      for (int i=0; i < 100; i++) {
-        BOOST_CHECK_EQUAL(i, buffer2[i]);
-      }
-
-      BOOST_CHECK_EQUAL(mb.total_bytes(), small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_write(), small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0);
-      BOOST_CHECK_EQUAL(mb.read_ptr(), mb.write_ptr());
-    }
-  }
-  FC_LOG_AND_RETHROW()
-}
-
-/// Test automatic allocation when advancing the read_ptr to the end.
-BOOST_AUTO_TEST_CASE(message_buffer_write_ptr_to_end)
-{
-  try {
-    {
-      const uint32_t small = 32;
-      fc::message_buffer<small> mb;
-      BOOST_CHECK_EQUAL(mb.total_bytes(), small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_write(), small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_read(), 0);
-      BOOST_CHECK_EQUAL(mb.read_ptr(), mb.write_ptr());
-      BOOST_CHECK_EQUAL(mb.read_index().first, 0);
-      BOOST_CHECK_EQUAL(mb.read_index().second, 0);
-      BOOST_CHECK_EQUAL(mb.write_index().first, 0);
-      BOOST_CHECK_EQUAL(mb.write_index().second, 0);
-
-      char* write_ptr = mb.write_ptr();
-      for (uint32_t ind = 0; ind < small; ind++) {
-        *write_ptr = ind;
-        write_ptr++;
-      }
-      mb.advance_write_ptr(small);
-
-      BOOST_CHECK_EQUAL(mb.total_bytes(), 2 * small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_write(), small);
-      BOOST_CHECK_EQUAL(mb.bytes_to_read(), small);
-      BOOST_CHECK_NE((void*) mb.read_ptr(), (void*) mb.write_ptr());
-      BOOST_CHECK_EQUAL(mb.read_index().first, 0);
-      BOOST_CHECK_EQUAL(mb.read_index().second, 0);
-      BOOST_CHECK_EQUAL(mb.write_index().first, 1);
-      BOOST_CHECK_EQUAL(mb.write_index().second, 0);
-
-      auto mbs = mb.get_buffer_sequence_for_boost_async_read();
-      auto mbsi = mbs.begin();
-      BOOST_CHECK_EQUAL(mb_size(*mbsi), small);
-      BOOST_CHECK_EQUAL(mb_data(*mbsi), mb.write_ptr());
-      BOOST_CHECK_EQUAL(mb.read_ptr()+small, mb.write_ptr());
-      mbsi++;
-      BOOST_CHECK(mbsi == mbs.end());
-    }
-  }
-  FC_LOG_AND_RETHROW()
-}
-
-BOOST_AUTO_TEST_CASE(message_buffer_read_peek_bounds) {
-   using my_message_buffer_t = fc::message_buffer<1024>;
-   my_message_buffer_t mbuff;
-   unsigned char stuff[] = {
-      0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-   };
-   memcpy(mbuff.write_ptr(), stuff, sizeof(stuff));
-   mbuff.advance_write_ptr(sizeof(stuff));
-
-   my_message_buffer_t::index_t index = mbuff.read_index();
-   uint8_t throw_away_buffer[4];
-   mbuff.peek(&throw_away_buffer, 4, index); //8 bytes left to peek afterwards
-   mbuff.peek(&throw_away_buffer, 4, index); //4 bytes left to peek afterwards
-   mbuff.peek(&throw_away_buffer, 2, index); //2 bytes left to peek afterwards
-   BOOST_CHECK_THROW(mbuff.peek(&throw_away_buffer, 3, index), fc::out_of_range_exception);
-   mbuff.peek(&throw_away_buffer, 1, index); //1 byte left to peek afterwards
-   mbuff.peek(&throw_away_buffer, 0, index); //1 byte left to peek afterwards
-   mbuff.peek(&throw_away_buffer, 1, index); //no bytes left to peek afterwards
-   BOOST_CHECK_THROW(mbuff.peek(&throw_away_buffer, 1, index), fc::out_of_range_exception);
-
-   mbuff.read(&throw_away_buffer, 4); //8 bytes left to read afterwards
-   mbuff.read(&throw_away_buffer, 4); //4 bytes left to read afterwards
-   mbuff.read(&throw_away_buffer, 2); //2 bytes left to read afterwards
-   BOOST_CHECK_THROW(mbuff.read(&throw_away_buffer, 4), fc::out_of_range_exception);
-   mbuff.read(&throw_away_buffer, 1); //1 byte left to read afterwards
-   mbuff.read(&throw_away_buffer, 0); //1 byte left to read afterwards
-   mbuff.read(&throw_away_buffer, 1); //no bytes left to read afterwards
-   BOOST_CHECK_THROW(mbuff.read(&throw_away_buffer, 1), fc::out_of_range_exception);
-}
-
-BOOST_AUTO_TEST_CASE(message_buffer_read_peek_bounds_multi) {
-   using my_message_buffer_t = fc::message_buffer<5>;
-   my_message_buffer_t mbuff;
-   unsigned char stuff[] = {
-      0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-   };
-   memcpy(mbuff.write_ptr(), stuff, 5);
-   mbuff.advance_write_ptr(5);
-   memcpy(mbuff.write_ptr(), stuff+5, 5);
-   mbuff.advance_write_ptr(5);
-   memcpy(mbuff.write_ptr(), stuff+10, 2);
-   mbuff.advance_write_ptr(2);
-
-   my_message_buffer_t::index_t index = mbuff.read_index();
-   uint8_t throw_away_buffer[4];
-   mbuff.peek(&throw_away_buffer, 4, index); //8 bytes left to peek afterwards
-   mbuff.peek(&throw_away_buffer, 4, index); //4 bytes left to peek afterwards
-   mbuff.peek(&throw_away_buffer, 2, index); //2 bytes left to peek afterwards
-   BOOST_CHECK_THROW(mbuff.peek(&throw_away_buffer, 3, index), fc::out_of_range_exception);
-   mbuff.peek(&throw_away_buffer, 1, index); //1 bytes left to peek afterwards
-   mbuff.peek(&throw_away_buffer, 0, index); //1 bytes left to peek afterwards
-   mbuff.peek(&throw_away_buffer, 1, index); //no bytes left to peek afterwards
-   BOOST_CHECK_THROW(mbuff.peek(&throw_away_buffer, 1, index), fc::out_of_range_exception);
-
-   mbuff.read(&throw_away_buffer, 4); //8 bytes left to read afterwards
-   mbuff.read(&throw_away_buffer, 4); //4 bytes left to read afterwards
-   mbuff.read(&throw_away_buffer, 2); //2 bytes left to read afterwards
-   BOOST_CHECK_THROW(mbuff.read(&throw_away_buffer, 4), fc::out_of_range_exception);
-   mbuff.read(&throw_away_buffer, 1); //1 bytes left to read afterwards
-   mbuff.read(&throw_away_buffer, 0); //1 bytes left to read afterwards
-   mbuff.read(&throw_away_buffer, 1); //no bytes left to read afterwards
-   BOOST_CHECK_THROW(mbuff.read(&throw_away_buffer, 1), fc::out_of_range_exception);
-}
-
-BOOST_AUTO_TEST_CASE(message_buffer_datastream) {
-   using my_message_buffer_t = fc::message_buffer<1024>;
-   my_message_buffer_t mbuff;
-
-   char buf[1024];
-   fc::datastream<char*> ds( buf, 1024 );
-
-   int v = 13;
-   fc::raw::pack( ds, v );
-   v = 42;
-   fc::raw::pack( ds, 42 );
-   fc::raw::pack( ds, std::string( "hello" ) );
-
-   memcpy(mbuff.write_ptr(), buf, 1024);
-   mbuff.advance_write_ptr(1024);
-
-   for( int i = 0; i < 3; ++i ) {
-      auto ds2 = mbuff.create_peek_datastream();
-      fc::raw::unpack( ds2, v );
-      BOOST_CHECK_EQUAL( 13, v );
-      fc::raw::unpack( ds2, v );
-      BOOST_CHECK_EQUAL( 42, v );
-      std::string s;
-      fc::raw::unpack( ds2, s );
-      BOOST_CHECK_EQUAL( s, std::string( "hello" ) );
-   }
-
-   {
-      auto ds2 = mbuff.create_datastream();
-      fc::raw::unpack( ds2, v );
-      BOOST_CHECK_EQUAL( 13, v );
-      fc::raw::unpack( ds2, v );
-      BOOST_CHECK_EQUAL( 42, v );
-      std::string s;
-      fc::raw::unpack( ds2, s );
-      BOOST_CHECK_EQUAL( s, std::string( "hello" ) );
-   }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace eosio

From 947e46353b4e41c0de851edac1dd070076fef5cf Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Wed, 11 Dec 2019 13:34:16 -0500
Subject: [PATCH 1568/1648] Update controller.cpp

---
 libraries/chain/controller.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 15897e41e63..eed3e1c0d28 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -315,8 +315,6 @@ struct controller_impl {
     read_mode( cfg.read_mode ),
     thread_pool( "chain", cfg.thread_pool_size )
    {
-
-      // reset the
       fork_db.open( [this]( block_timestamp_type timestamp,
                             const flat_set<digest_type>& cur_features,
                             const vector<digest_type>& new_features )

From 4599d37b3751dd993d7efa50e9c475eb150f6f56 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Wed, 11 Dec 2019 13:34:48 -0500
Subject: [PATCH 1569/1648] Update controller.cpp

---
 libraries/chain/controller.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index eed3e1c0d28..20ca6960276 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -327,7 +327,6 @@ struct controller_impl {
       set_activation_handler<builtin_protocol_feature_t::webauthn_key>();
       set_activation_handler<builtin_protocol_feature_t::wtmsig_block_signatures>();
 
-
       self.irreversible_block.connect([this](const block_state_ptr& bsp) {
          wasmif.current_lib(bsp->block_num);
       });

From 766e657ea637ab515d8c8cad57ed4f78367ab7c5 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 11 Dec 2019 15:43:16 -0500
Subject: [PATCH 1570/1648] Do less work when closing during plugin shutdown to
 speed up shutdown

---
 plugins/net_plugin/net_plugin.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index d546c99751b..dfa0c5197c7 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -613,9 +613,12 @@ namespace eosio {
 
       bool connected();
       bool current();
-      void close( bool reconnect = true );
+
+      /// @param reconnect true if we should try and reconnect immediately after close
+      /// @param shutdown true only if plugin is shutting down
+      void close( bool reconnect = true, bool shutdown = false );
    private:
-      static void _close( connection* self, bool reconnect ); // for easy capture
+      static void _close( connection* self, bool reconnect, bool shutdown ); // for easy capture
    public:
 
       bool populate_handshake( handshake_message& hello );
@@ -905,13 +908,13 @@ namespace eosio {
       buffer_queue.clear_write_queue();
    }
 
-   void connection::close( bool reconnect ) {
-      strand.post( [self = shared_from_this(), reconnect]() {
-         connection::_close( self.get(), reconnect );
+   void connection::close( bool reconnect, bool shutdown ) {
+      strand.post( [self = shared_from_this(), reconnect, shutdown]() {
+         connection::_close( self.get(), reconnect, shutdown );
       });
    }
 
-   void connection::_close( connection* self, bool reconnect ) {
+   void connection::_close( connection* self, bool reconnect, bool shutdown ) {
       self->socket_open = false;
       boost::system::error_code ec;
       if( self->socket->is_open() ) {
@@ -933,17 +936,17 @@ namespace eosio {
          self->last_close = fc::time_point::now();
          self->conn_node_id = fc::sha256();
       }
-      if( has_last_req ) {
+      if( has_last_req && !shutdown ) {
          my_impl->dispatcher->retry_fetch( self->shared_from_this() );
       }
       self->peer_requested.reset();
       self->sent_handshake_count = 0;
-      my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
+      if( !shutdown) my_impl->sync_master->sync_reset_lib_num( self->shared_from_this() );
       fc_ilog( logger, "closing '${a}', ${p}", ("a", self->peer_address())("p", self->peer_name()) );
       fc_dlog( logger, "canceling wait on ${p}", ("p", self->peer_name()) ); // peer_name(), do not hold conn_mtx
       self->cancel_wait();
 
-      if( reconnect ) {
+      if( reconnect && !shutdown ) {
          my_impl->start_conn_timer( std::chrono::milliseconds( 100 ), connection_wptr() );
       }
    }
@@ -1739,7 +1742,7 @@ namespace eosio {
    void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
       fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_name() ) );
       if( app().is_quiting() ) {
-         c->close( false );
+         c->close( false, true );
          return;
       }
       c->consecutive_rejected_blocks = 0;
@@ -3460,7 +3463,7 @@ namespace eosio {
       }
 
       } catch( ... ) {
-         // always watn plugin_shutdown even on exception
+         // always want plugin_shutdown even on exception
          plugin_shutdown();
          throw;
       }
@@ -3493,7 +3496,7 @@ namespace eosio {
             std::lock_guard<std::shared_mutex> g( my->connections_mtx );
             for( auto& con : my->connections ) {
                fc_dlog( logger, "close: ${p}", ("p", con->peer_name()) );
-               con->close( false );
+               con->close( false, true );
             }
             my->connections.clear();
          }

From f07da89c5b35ab637c6f165467f6890e3c1f7ff5 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Dec 2019 16:30:33 -0500
Subject: [PATCH 1571/1648] Allow tags to create Contract Builders.

---
 .cicd/installation-build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/installation-build.sh b/.cicd/installation-build.sh
index 4a5ecd709cf..4942b140a9d 100755
--- a/.cicd/installation-build.sh
+++ b/.cicd/installation-build.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 . ./.cicd/helpers/general.sh
 export ENABLE_INSTALL=true
-if [[ $BUILDKITE_BRANCH =~ ^release/[0-9].[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ || $FORCE_BINARIES_BUILD == true ]]; then
+if [[ $BUILDKITE_BRANCH =~ ^release/[0-9]+.[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ || ! -z $BUILDKITE_TAG || $FORCE_BINARIES_BUILD == true ]]; then
     export BRANCH=$(echo $BUILDKITE_BRANCH | sed 's/\//\_/')
     export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04"
     export ARGS="--name ci-contracts-builder-$BUILDKITE_COMMIT --init -v $(pwd):$MOUNTED_DIR"
@@ -15,6 +15,6 @@ if [[ $BUILDKITE_BRANCH =~ ^release/[0-9].[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^mas
     docker push $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
     docker stop ci-contracts-builder-$BUILDKITE_COMMIT && docker rm ci-contracts-builder-$BUILDKITE_COMMIT
 else
-    echo "This pipeline will only generate images against master, develop, and release branches. Set FORCE_BINARIES_BUILD=true to force a build on another branch. Exiting..."
+    echo "Contract builder images are only created for tags or master, develop, and release branches. Start a new build with FORCE_BINARIES_BUILD=true to create a Contract Builder image for other branches/commits. Exiting..."
     exit 0
 fi
\ No newline at end of file

From b2afcec40d378935bb3b51d1694b7bd639aaef74 Mon Sep 17 00:00:00 2001
From: Scott Arnette <scott.a.arnette@gmail.com>
Date: Thu, 12 Dec 2019 17:25:20 -0500
Subject: [PATCH 1572/1648] Allow retries on passed steps.

---
 .cicd/generate-pipeline.sh | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 9ab5504c0b0..c5f390ef680 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -180,6 +180,9 @@ for ROUND in $(seq 1 $ROUNDS); do
       PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
+    retry:
+      manual:
+        permit_on_passed: true
     timeout: ${TIMEOUT:-30}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
@@ -206,8 +209,11 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 10
-    timeout: ${TIMEOUT:-60}
     agents: "queue=mac-anka-node-fleet"
+    retry:
+      manual:
+        permit_on_passed: true
+    timeout: ${TIMEOUT:-60}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_UNIT_TESTS}
 
 EOF
@@ -236,6 +242,9 @@ EOF
       PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
+    retry:
+      manual:
+        permit_on_passed: true
     timeout: ${TIMEOUT:-30}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_WASM_SPEC_TESTS}
 
@@ -262,8 +271,11 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 10
-    timeout: ${TIMEOUT:-60}
     agents: "queue=mac-anka-node-fleet"
+    retry:
+      manual:
+        permit_on_passed: true
+    timeout: ${TIMEOUT:-60}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_WASM_SPEC_TESTS}
 
 EOF
@@ -295,6 +307,9 @@ EOF
       PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_TEST_AGENT_QUEUE"
+    retry:
+      manual:
+        permit_on_passed: true
     timeout: ${TIMEOUT:-20}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 
@@ -321,8 +336,11 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 10
-    timeout: ${TIMEOUT:-60}
     agents: "queue=mac-anka-node-fleet"
+    retry:
+      manual:
+        permit_on_passed: true
+    timeout: ${TIMEOUT:-60}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_SERIAL_TESTS}
 EOF
             fi
@@ -355,6 +373,9 @@ EOF
       PLATFORM_TYPE: $PLATFORM_TYPE
     agents:
       queue: "$BUILDKITE_TEST_AGENT_QUEUE"
+    retry:
+      manual:
+        permit_on_passed: true
     timeout: ${TIMEOUT:-180}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 
@@ -381,8 +402,11 @@ EOF
             - 'registry_1'
             - 'registry_2'
           pre-execute-sleep: 10
-    timeout: ${TIMEOUT:-180}
     agents: "queue=mac-anka-node-fleet"
+    retry:
+      manual:
+        permit_on_passed: true
+    timeout: ${TIMEOUT:-180}
     skip: \${SKIP_$(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_UPCASE)_$(echo "$PLATFORM_JSON" | jq -r .VERSION_MAJOR)$(echo "$PLATFORM_JSON" | jq -r .VERSION_MINOR)}${SKIP_LONG_RUNNING_TESTS:-true}
 EOF
             fi

From aa04612b9fedad22f0d62249e9b68b2fbeddf991 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven.watanabe@block.one>
Date: Fri, 13 Dec 2019 14:16:34 -0500
Subject: [PATCH 1573/1648] Cumulative security fixes for 2.0 rc3

---
 .../chain/webassembly/eos-vm-oc/compile_trampoline.cpp |  3 +++
 libraries/chain/webassembly/eos-vm.cpp                 | 10 +---------
 libraries/eos-vm                                       |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
index 58940a4d5c7..f180aca0252 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
@@ -91,6 +91,9 @@ void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
    for(const TableSegment& table_segment : module.tableSegments) {
       struct table_entry* table_index_0 = (struct table_entry*)&*prologue_it;
 
+      if(table_segment.baseOffset.i32 >= module.tables.defs[0].type.size.min)
+         return;
+
       for(Uptr i = 0; i < table_segment.indices.size(); ++i) {
          const Uptr function_index = table_segment.indices[i];
          const long int effective_table_index = table_segment.baseOffset.i32 + i;
diff --git a/libraries/chain/webassembly/eos-vm.cpp b/libraries/chain/webassembly/eos-vm.cpp
index c467b65c44f..99ca29ed72e 100644
--- a/libraries/chain/webassembly/eos-vm.cpp
+++ b/libraries/chain/webassembly/eos-vm.cpp
@@ -55,16 +55,8 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
       void apply(apply_context& context) override {
          _instantiated_module->set_wasm_allocator(&context.control.get_wasm_allocator());
          _runtime->_bkend = _instantiated_module.get();
-         _runtime->_bkend->initialize(&context);
-         // clamp WASM memory to maximum_linear_memory/wasm_page_size
-         auto& module = _runtime->_bkend->get_module();
-         if (module.memories.size() && 
-               ((module.memories.at(0).limits.maximum > wasm_constraints::maximum_linear_memory / wasm_constraints::wasm_page_size) 
-               || !module.memories.at(0).limits.flags)) {
-            module.memories.at(0).limits.flags = true;
-            module.memories.at(0).limits.maximum = wasm_constraints::maximum_linear_memory / wasm_constraints::wasm_page_size;
-         }
          auto fn = [&]() {
+            _runtime->_bkend->initialize(&context);
             const auto& res = _runtime->_bkend->call(
                 &context, "env", "apply", context.get_receiver().to_uint64_t(),
                 context.get_action().account.to_uint64_t(),
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 4b2c2e76811..d2091186151 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 4b2c2e76811ff3a4a1b571b5be3bacc6035014e5
+Subproject commit d2091186151eccfb43b5372822cab1ccbf39b363

From 45b12bd6de7be014167c70e747a8fa0b9794a455 Mon Sep 17 00:00:00 2001
From: iamveritas <ovidiu.craciun@block.one>
Date: Sat, 14 Dec 2019 01:08:45 +0000
Subject: [PATCH 1574/1648] Update REAMDE.md and python script

correct the path to latest eosio.system contract

changes which make the script do more for the user; the point is user is in 2.0.x so the script should in the end launch a 2.0.x, that includes the 1.9.x (latest) eosio.system contracts not an older one.

small corrections on readme file.
---
 tutorials/bios-boot-tutorial/README.md        | 49 +++++++++++++----
 .../bios-boot-tutorial/bios-boot-tutorial.py  | 54 +++++++++++++++++--
 2 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/tutorials/bios-boot-tutorial/README.md b/tutorials/bios-boot-tutorial/README.md
index ea353898086..6e6aba98957 100644
--- a/tutorials/bios-boot-tutorial/README.md
+++ b/tutorials/bios-boot-tutorial/README.md
@@ -7,38 +7,69 @@ The `bios-boot-tutorial.py` script simulates the EOSIO bios boot sequence.
 1. Python 3.x
 2. CMake
 3. git
+4. g++
+5. build-essentials
+6. pip3
+7. openssl
+8. curl
+9. jq
+10. psmisc
+
 
 ``Steps``:
 
 1. Install eosio binaries by following the steps outlined in below tutorial
-[Install eosio binaries](https://github.com/EOSIO/eos#mac-os-x-brew-install)
+[Install eosio binaries](https://github.com/EOSIO/eos/tree/release/2.0.x#mac-os-x-brew-install).
+
+2. Install eosio.cdt version 1.6.3 binaries by following the steps outlined in below tutorial
+[Install eosio.cdt binaries](https://github.com/EOSIO/eosio.cdt/tree/release/1.6.x#binary-releases).
+
+3. Compile `eosio.contracts` version 1.8.x.
+
+```bash
+$ cd ~
+$ git clone https://github.com/EOSIO/eosio.contracts.git eosio.contracts-1.8.x
+$ cd ./eosio.contracts-1.8.x/
+$ git checkout release/1.8.x
+$ ./build.sh
+$ cd ./build/contracts/
+$ pwd
+
+```
+
+4. Make note of the directory where the contracts were compiled. 
+The last command in the previous step printed on the bash console the contracts' directory, make note of it, we'll reference it from now on as `EOSIO_OLD_CONTRACTS_DIRECTORY`.
 
-2. Install eosio.cdt binaries by following the steps outlined in below tutorial
-[Install eosio.cdt binaries](https://github.com/EOSIO/eosio.cdt#binary-releases)
+5. Install eosio.cdt version 1.7.0 binaries by following the steps outlined in below tutorial, make sure you uninstall the previous one first.
+[Install eosio.cdt binaries](https://github.com/EOSIO/eosio.cdt/tree/release/1.7.x#binary-releases)
 
-3. Compile eosio.contracts
+6. Compile `eosio.contracts` sources version 1.9.0
 
 ```bash
 $ cd ~
 $ git clone https://github.com/EOSIO/eosio.contracts.git
 $ cd ./eosio.contracts/
+$ git checkout release/1.9.x
 $ ./build.sh
+$ cd ./build/contracts/
 $ pwd
 
 ```
 
-4. Make note of the directory where the contracts were compiled
+7. Make note of the directory where the contracts were compiled
 The last command in the previous step printed on the bash console the contracts' directory, make note of it, we'll reference it from now on as `EOSIO_CONTRACTS_DIRECTORY`
 
-5. Launch the `bios-boot-tutorial.py` script
-Minimal command line to launch the script below, make sure you replace `EOSIO_CONTRACTS_DIRECTORY` with actual directory
+
+8. Launch the `bios-boot-tutorial.py` script. 
+The command line to launch the script, make sure you replace `EOSIO_OLD_CONTRACTS_DIRECTORY` and `EOSIO_CONTRACTS_DIRECTORY` with actual directory paths.
 
 ```bash
 $ cd ~
 $ git clone https://github.com/EOSIO/eos.git
 $ cd ./eos/tutorials/bios-boot-tutorial/
-$ python3 bios-boot-tutorial.py --cleos="cleos --wallet-url http://127.0.0.1:6666 " --nodeos=nodeos --keosd=keosd --contracts-dir="/EOSIO_CONTRACTS_DIRECTORY/" -a
-
+$ python3 bios-boot-tutorial.py --cleos="cleos --wallet-url http://127.0.0.1:6666 " --nodeos=nodeos --keosd=keosd --contracts-dir="EOSIO_CONTRACTS_DIRECTORY" --old-contracts-dir="EOSIO_OLD_CONTRACTS_DIRECTORY" -w -a
 ```
 
+6. At this point, when the script has finished running without error, you have a functional EOSIO based blockchain running locally with an latest version of `eosio.system` contract, 31 block producers out of which 21 active, `eosio` account resigned, 200k+ accounts with staked tokens, and votes allocated to each block producer. Enjoy exploring your freshly booted blockchain.
+
 See [EOSIO Documentation Wiki: Tutorial - Bios Boot](https://github.com/EOSIO/eos/wiki/Tutorial-Bios-Boot-Sequence) for additional information.
\ No newline at end of file
diff --git a/tutorials/bios-boot-tutorial/bios-boot-tutorial.py b/tutorials/bios-boot-tutorial/bios-boot-tutorial.py
index 321160429fc..c0e51459075 100755
--- a/tutorials/bios-boot-tutorial/bios-boot-tutorial.py
+++ b/tutorials/bios-boot-tutorial/bios-boot-tutorial.py
@@ -41,7 +41,7 @@ def run(args):
 
 def retry(args):
     while True:
-        print('bios-boot-tutorial.py:', args)
+        print('bios-boot-tutorial.py: ', args)
         logFile.write(args + '\n')
         if subprocess.call(args, shell=True):
             print('*** Retry')
@@ -103,6 +103,7 @@ def startNode(nodeIndex, account):
     cmd = (
         args.nodeos +
         '    --max-irreversible-block-age -1'
+        '    --max-transaction-time=1000'
         '    --contracts-console'
         '    --genesis-json ' + os.path.abspath(args.genesis) +
         '    --blocks-dir ' + os.path.abspath(dir) + '/blocks'
@@ -118,6 +119,8 @@ def startNode(nodeIndex, account):
         '    --private-key \'["' + account['pub'] + '","' + account['pvt'] + '"]\''
         '    --plugin eosio::http_plugin'
         '    --plugin eosio::chain_api_plugin'
+        '    --plugin eosio::chain_plugin'
+        '    --plugin eosio::producer_api_plugin'
         '    --plugin eosio::producer_plugin' +
         otherOpts)
     with open(dir + 'stderr', mode='w') as f:
@@ -293,9 +296,53 @@ def stepCreateTokens():
     run(args.cleos + 'push action eosio.token issue \'["eosio", "%s", "memo"]\' -p eosio' % intToCurrency(totalAllocation))
     sleep(1)
 def stepSetSystemContract():
-    retry(args.cleos + 'set contract eosio ' + args.contracts_dir + '/eosio.system/')
+    # All of the protocol upgrade features introduced in v1.8 first require a special protocol 
+    # feature (codename PREACTIVATE_FEATURE) to be activated and for an updated version of the system 
+    # contract that makes use of the functionality introduced by that feature to be deployed. 
+
+    # activate PREACTIVATE_FEATURE before installing eosio.system
+    retry('curl -X POST http://127.0.0.1:%d' % args.http_port + 
+        '/v1/producer/schedule_protocol_feature_activations ' +
+        '-d \'{"protocol_features_to_activate": ["0ec7e080177b2c02b278d5088611686b49d739925a92d9bfcacd7fc6b74053bd"]}\'')
+    sleep(3)
+
+    # install eosio.system the older version first
+    retry(args.cleos + 'set contract eosio ' + args.old_contracts_dir + '/eosio.system/')
+    sleep(3)
+
+    # activate remaining features
+    # GET_SENDER
+    retry(args.cleos + 'push action eosio activate \'["f0af56d2c5a48d60a4a5b5c903edfb7db3a736a94ed589d0b797df33ff9d3e1d"]\' -p eosio')
+    # FORWARD_SETCODE
+    retry(args.cleos + 'push action eosio activate \'["2652f5f96006294109b3dd0bbde63693f55324af452b799ee137a81a905eed25"]\' -p eosio')
+    # ONLY_BILL_FIRST_AUTHORIZER
+    retry(args.cleos + 'push action eosio activate \'["8ba52fe7a3956c5cd3a656a3174b931d3bb2abb45578befc59f283ecd816a405"]\' -p eosio')
+    # RESTRICT_ACTION_TO_SELF
+    retry(args.cleos + 'push action eosio activate \'["ad9e3d8f650687709fd68f4b90b41f7d825a365b02c23a636cef88ac2ac00c43"]\' -p eosio@active')
+    # DISALLOW_EMPTY_PRODUCER_SCHEDULE
+    retry(args.cleos + 'push action eosio activate \'["68dcaa34c0517d19666e6b33add67351d8c5f69e999ca1e37931bc410a297428"]\' -p eosio@active')
+     # FIX_LINKAUTH_RESTRICTION
+    retry(args.cleos + 'push action eosio activate \'["e0fb64b1085cc5538970158d05a009c24e276fb94e1a0bf6a528b48fbc4ff526"]\' -p eosio@active')
+     # REPLACE_DEFERRED
+    retry(args.cleos + 'push action eosio activate \'["ef43112c6543b88db2283a2e077278c315ae2c84719a8b25f25cc88565fbea99"]\' -p eosio@active')
+    # NO_DUPLICATE_DEFERRED_ID
+    retry(args.cleos + 'push action eosio activate \'["4a90c00d55454dc5b059055ca213579c6ea856967712a56017487886a4d4cc0f"]\' -p eosio@active')
+    # ONLY_LINK_TO_EXISTING_PERMISSION
+    retry(args.cleos + 'push action eosio activate \'["1a99a59d87e06e09ec5b028a9cbb7749b4a5ad8819004365d02dc4379a8b7241"]\' -p eosio@active')
+    # RAM_RESTRICTIONS
+    retry(args.cleos + 'push action eosio activate \'["4e7bf348da00a945489b2a681749eb56f5de00b900014e137ddae39f48f69d67"]\' -p eosio@active')
+    # WEBAUTHN_KEY
+    retry(args.cleos + 'push action eosio activate \'["4fca8bd82bbd181e714e283f83e1b45d95ca5af40fb89ad3977b653c448f78c2"]\' -p eosio@active')
+    # WTMSIG_BLOCK_SIGNATURES
+    retry(args.cleos + 'push action eosio activate \'["299dcb6af692324b899b39f16d5a530a33062804e41f09dc97e9f156b4476707"]\' -p eosio@active')
     sleep(1)
+
     run(args.cleos + 'push action eosio setpriv' + jsonArg(['eosio.msig', 1]) + '-p eosio@active')
+
+    # install eosio.system latest version
+    retry(args.cleos + 'set contract eosio ' + args.contracts_dir + '/eosio.system/')
+    sleep(3)
+
 def stepInitSystemContract():
     run(args.cleos + 'push action eosio init' + jsonArg(['0', '4,' + args.symbol]) + '-p eosio@active')
     sleep(1)
@@ -355,7 +402,8 @@ def stepLog():
 parser.add_argument('--cleos', metavar='', help="Cleos command", default='../../build/programs/cleos/cleos --wallet-url http://127.0.0.1:6666 ')
 parser.add_argument('--nodeos', metavar='', help="Path to nodeos binary", default='../../build/programs/nodeos/nodeos')
 parser.add_argument('--keosd', metavar='', help="Path to keosd binary", default='../../build/programs/keosd/keosd')
-parser.add_argument('--contracts-dir', metavar='', help="Path to contracts directory", default='../../build/contracts/')
+parser.add_argument('--contracts-dir', metavar='', help="Path to latest contracts directory", default='../../build/contracts/')
+parser.add_argument('--old-contracts-dir', metavar='', help="Path to 1.8.x contracts directory", default='../../build/contracts/')
 parser.add_argument('--nodes-dir', metavar='', help="Path to nodes directory", default='./nodes/')
 parser.add_argument('--genesis', metavar='', help="Path to genesis.json", default="./genesis.json")
 parser.add_argument('--wallet-dir', metavar='', help="Path to wallet directory", default='./wallet/')

From 53e7e9452a4c57f2be41085687eeb86231737179 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 17 Dec 2019 11:41:56 -0500
Subject: [PATCH 1575/1648] increase tester state size from 8 MiB to 16 MiB

---
 libraries/testing/include/eosio/testing/tester.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index a045191e397..c8d83ba34a0 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -392,7 +392,7 @@ namespace eosio { namespace testing {
             controller::config cfg;
             cfg.blocks_dir      = tempdir.path() / config::default_blocks_dir_name;
             cfg.state_dir  = tempdir.path() / config::default_state_dir_name;
-            cfg.state_size = 1024*1024*8;
+            cfg.state_size = 1024*1024*16;
             cfg.state_guard_size = 0;
             cfg.reversible_cache_size = 1024*1024*8;
             cfg.reversible_guard_size = 0;

From c791aee819d56c57c6ec1156ded4755a45e34d02 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 17 Dec 2019 15:00:15 -0500
Subject: [PATCH 1576/1648] modifications to trigger LRTs and Multiver on
 anything but scheduled

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c5f390ef680..ad1729b3356 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -81,7 +81,7 @@ fi
 export BUILD_SOURCE=${BUILD_SOURCE:---build \$BUILDKITE_BUILD_ID}
 # set trigger_job if master/release/develop branch and webhook
 if [[ $BUILDKITE_BRANCH =~ ^release/[0-9]+\.[0-9]+\.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ ]]; then
-    [[ $BUILDKITE_SOURCE == 'webhook' ]] && export TRIGGER_JOB=true
+    [[ $BUILDKITE_SOURCE != 'scheduled' ]] && export TRIGGER_JOB=true
 fi
 oIFS="$IFS"
 IFS=$''

From 678eb0289898c7a9be2690471f661af6eaf2f71b Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 17 Dec 2019 16:35:01 -0500
Subject: [PATCH 1577/1648] update submod

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index d2091186151..4b2c2e76811 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit d2091186151eccfb43b5372822cab1ccbf39b363
+Subproject commit 4b2c2e76811ff3a4a1b571b5be3bacc6035014e5

From d63be6ca28d7a07776c992731b3a14efe4206a96 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Tue, 17 Dec 2019 16:50:15 -0500
Subject: [PATCH 1578/1648] update submod

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 4b2c2e76811..4d2b046ad67 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 4b2c2e76811ff3a4a1b571b5be3bacc6035014e5
+Subproject commit 4d2b046ad672e0de9ed7a3461fa2bff91b10e57e

From 02f2ad0d96efd2e67239a9659c2cf552b64372ca Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 17 Dec 2019 17:25:18 -0500
Subject: [PATCH 1579/1648] bump version to 2.0.0-rc3

---
 CMakeLists.txt |  2 +-
 README.md      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb76ad618d1..f0b669298ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set( CXX_STANDARD_REQUIRED ON)
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX rc2)
+set(VERSION_SUFFIX rc3)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")
diff --git a/README.md b/README.md
index 1ab1e108124..783f8d21300 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,13 @@ $ brew remove eosio
 
 #### Ubuntu 18.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc3/eosio_2.0.0-rc3-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-rc3-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc3/eosio_2.0.0-rc3-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-rc3-ubuntu-16.04_amd64.deb
 ```
 #### Ubuntu Package Uninstall
 ```sh
@@ -58,8 +58,8 @@ $ sudo apt remove eosio
 ```
 #### Centos RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio-2.0.0-rc2.el7.x86_64.rpm
-$ sudo yum install ./eosio-2.0.0-rc2.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc3/eosio-2.0.0-rc3.el7.x86_64.rpm
+$ sudo yum install ./eosio-2.0.0-rc3.el7.x86_64.rpm
 ```
 #### Centos RPM Package Uninstall
 ```sh

From a3af39f70ba5ab0635873791878d85ac30e6cc01 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Tue, 17 Dec 2019 18:05:02 -0500
Subject: [PATCH 1580/1648] Update compile_trampoline.cpp

---
 libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
index f180aca0252..07e9ba6b086 100644
--- a/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/compile_trampoline.cpp
@@ -91,7 +91,7 @@ void run_compile(wrapped_fd&& response_sock, wrapped_fd&& wasm_code) noexcept {
    for(const TableSegment& table_segment : module.tableSegments) {
       struct table_entry* table_index_0 = (struct table_entry*)&*prologue_it;
 
-      if(table_segment.baseOffset.i32 >= module.tables.defs[0].type.size.min)
+      if(table_segment.baseOffset.i32 > module.tables.defs[0].type.size.min)
          return;
 
       for(Uptr i = 0; i < table_segment.indices.size(); ++i) {

From 20e63dad236377a6ac252967de886d1651a251e9 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 10:21:19 -0500
Subject: [PATCH 1581/1648] Fix whitespace

---
 .cicd/generate-pipeline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index ad1729b3356..8accbe76c1a 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -429,7 +429,7 @@ done
 # trigger eosio-lrt post pr
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
     if ( [[ ! $PINNED == false ]] ); then
-    cat <<EOF
+        cat <<EOF
   - label: ":pipeline: Trigger Long Running Tests"
     trigger: "eosio-lrt"
     async: true
@@ -451,7 +451,7 @@ fi
 # trigger multiversion post pr
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
     if ( [[ ! $PINNED == false ]] ); then
-    cat <<EOF
+        cat <<EOF
   - label: ":pipeline: Trigger Multiversion Test"
     trigger: "eos-multiversion-tests"
     async: true

From 7dbd7b6d23927026dff453daa41e919029b85452 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 10:21:53 -0500
Subject: [PATCH 1582/1648] Consistent package builder timeouts

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 8accbe76c1a..6b5fc79efd6 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -548,7 +548,7 @@ cat <<EOF
           pre-execute-sleep: 10
     agents:
       - "queue=mac-anka-node-fleet"
-    timeout: ${TIMEOUT:-60}
+    timeout: ${TIMEOUT:-10}
     skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
 
   - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"

From 4493a491a8292932576429902b0ce922c12cf03a Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 10:28:00 -0500
Subject: [PATCH 1583/1648] Build EOSIO Docker images for every commit

---
 .cicd/installation-build.sh | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.cicd/installation-build.sh b/.cicd/installation-build.sh
index 4942b140a9d..83dc7b48ff2 100755
--- a/.cicd/installation-build.sh
+++ b/.cicd/installation-build.sh
@@ -2,19 +2,14 @@
 set -eo pipefail
 . ./.cicd/helpers/general.sh
 export ENABLE_INSTALL=true
-if [[ $BUILDKITE_BRANCH =~ ^release/[0-9]+.[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ || ! -z $BUILDKITE_TAG || $FORCE_BINARIES_BUILD == true ]]; then
-    export BRANCH=$(echo $BUILDKITE_BRANCH | sed 's/\//\_/')
-    export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04"
-    export ARGS="--name ci-contracts-builder-$BUILDKITE_COMMIT --init -v $(pwd):$MOUNTED_DIR"
-    $CICD_DIR/build.sh
-    docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT
-    docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH
-    docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
-    docker push $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT
-    docker push $CONTRACTS_BUILDER_TAG-$BRANCH
-    docker push $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
-    docker stop ci-contracts-builder-$BUILDKITE_COMMIT && docker rm ci-contracts-builder-$BUILDKITE_COMMIT
-else
-    echo "Contract builder images are only created for tags or master, develop, and release branches. Start a new build with FORCE_BINARIES_BUILD=true to create a Contract Builder image for other branches/commits. Exiting..."
-    exit 0
-fi
\ No newline at end of file
+export BRANCH=$(echo $BUILDKITE_BRANCH | sed 's/\//\_/')
+export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04"
+export ARGS="--name ci-contracts-builder-$BUILDKITE_COMMIT --init -v $(pwd):$MOUNTED_DIR"
+$CICD_DIR/build.sh
+docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT
+docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH
+docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
+docker push $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT
+docker push $CONTRACTS_BUILDER_TAG-$BRANCH
+docker push $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
+docker stop ci-contracts-builder-$BUILDKITE_COMMIT && docker rm ci-contracts-builder-$BUILDKITE_COMMIT
\ No newline at end of file

From d247c0080a168985b7afc0d04ad1d7405b952e37 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 10:33:54 -0500
Subject: [PATCH 1584/1648] Build Docker container up front to be used for
 testing, then tag with git branch and git tag after tests have passed

---
 .cicd/docker-tag.sh         | 22 ++++++++++++++++++++++
 .cicd/generate-pipeline.sh  | 26 +++++++++++++++++++-------
 .cicd/installation-build.sh |  5 ++---
 3 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100755 .cicd/docker-tag.sh

diff --git a/.cicd/docker-tag.sh b/.cicd/docker-tag.sh
new file mode 100755
index 00000000000..d9f03c06a52
--- /dev/null
+++ b/.cicd/docker-tag.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -eo pipefail
+echo '+++ :evergreen_tree: Configuring Environment'
+REPO='eosio/ci-contracts-builder'
+PREFIX='base-ubuntu-18.04'
+IMAGE="$REPO:$PREFIX-$BUILDKITE_COMMIT"
+SANITIZED_BRANCH=$(echo "$BUILDKITE_BRANCH" | tr '/' '_')
+SANITIZED_TAG=$(echo "$BUILDKITE_TAG" | tr '/' '_')
+echo '+++ :arrow_down: Pulling Container'
+echo "Pulling \"$IMAGE\""
+docker pull "$IMAGE"
+echo '+++ :label: Tagging Container'
+docker tag "$IMAGE" "$REPO:$PREFIX-$SANITIZED_BRANCH"
+echo "Tagged \"$REPO:$PREFIX-$SANITIZED_BRANCH\"."
+[[ -z "$BUILDKITE_TAG" ]] || docker tag "$IMAGE" "$REPO:$PREFIX-$SANITIZED_TAG" && echo "Tagged \"$REPO:$PREFIX-$SANITIZED_TAG\"."
+echo '+++ :arrow_up: Pushing Container'
+docker push "$REPO:$PREFIX-$SANITIZED_BRANCH"
+[[ -z "$BUILDKITE_TAG" ]] || docker push "$REPO:$PREFIX-$SANITIZED_TAG"
+echo '+++ :put_litter_in_its_place: Cleaning Up'
+docker rmi "$REPO:$PREFIX-$SANITIZED_BRANCH"
+[[ -z "$BUILDKITE_TAG" ]] || docker rmi "$REPO:$PREFIX-$SANITIZED_TAG"
+docker rmi "$IMAGE"
\ No newline at end of file
diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 6b5fc79efd6..d76d3fe4c45 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -156,9 +156,21 @@ EOF
 EOF
     fi
 done
-echo
-echo '  - wait'
-echo ''
+cat <<EOF
+
+  - label: ":docker: Docker - Build and Install"
+    command: "./.cicd/installation-build.sh"
+    env:
+      IMAGE_TAG: "ubuntu-18.04-unpinned"
+      PLATFORM_TYPE: "unpinned"
+    agents:
+      queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
+    timeout: ${TIMEOUT:-180}
+    skip: ${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}
+
+  - wait
+
+EOF
 # tests
 IFS=$oIFS
 for ROUND in $(seq 1 $ROUNDS); do
@@ -551,15 +563,15 @@ cat <<EOF
     timeout: ${TIMEOUT:-10}
     skip: ${SKIP_MACOS_10_14}${SKIP_PACKAGE_BUILDER}${SKIP_MAC}
 
-  - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
-    command: "./.cicd/installation-build.sh"
+  - label: ":docker: Docker - Label Container with Git Branch and Git Tag"
+    command: .cicd/docker-tag.sh
     env:
       IMAGE_TAG: "ubuntu-18.04-unpinned"
       PLATFORM_TYPE: "unpinned"
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
-    timeout: ${TIMEOUT:-30}
-    skip: ${SKIP_CONTRACT_BUILDER}${SKIP_LINUX}
+    timeout: ${TIMEOUT:-10}
+    skip: ${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}${SKIP_PACKAGE_BUILDER}
 
   - wait
 
diff --git a/.cicd/installation-build.sh b/.cicd/installation-build.sh
index 83dc7b48ff2..cfcd3bc4da9 100755
--- a/.cicd/installation-build.sh
+++ b/.cicd/installation-build.sh
@@ -7,9 +7,8 @@ export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04"
 export ARGS="--name ci-contracts-builder-$BUILDKITE_COMMIT --init -v $(pwd):$MOUNTED_DIR"
 $CICD_DIR/build.sh
 docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT
-docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH
 docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
 docker push $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT
-docker push $CONTRACTS_BUILDER_TAG-$BRANCH
 docker push $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT
-docker stop ci-contracts-builder-$BUILDKITE_COMMIT && docker rm ci-contracts-builder-$BUILDKITE_COMMIT
\ No newline at end of file
+docker stop ci-contracts-builder-$BUILDKITE_COMMIT
+docker rm ci-contracts-builder-$BUILDKITE_COMMIT
\ No newline at end of file

From 60cf9566de55cd251aff192b3cb8be1e36bd16a5 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 14:36:09 -0500
Subject: [PATCH 1585/1648] Add sync-from-genesis test to every build

---
 .cicd/generate-pipeline.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d76d3fe4c45..5dbfbd89387 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -479,6 +479,23 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
 EOF
     fi
 fi
+# trigger eosio-sync-from-genesis for every build
+if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then
+    cat <<EOF
+  - label: ":pipeline: Trigger EOSIO Sync-from-Genesis Test"
+    trigger: "eosio-sync-from-genesis"
+    async: false
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        SKIP_JUNGLE: "${SKIP_JUNGLE}"
+        SKIP_KYLIN: "${SKIP_KYLIN}"
+        SKIP_MAIN: "${SKIP_MAIN}"
+
+EOF
+fi
 # pipeline tail
 cat <<EOF
   - wait:

From 59464d1fcd96a40fbe893e7c090303dff193a4da Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 15:06:24 -0500
Subject: [PATCH 1586/1648] Unified look-and-feel across pipelines

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 5dbfbd89387..bd6ce452ffa 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -482,7 +482,7 @@ fi
 # trigger eosio-sync-from-genesis for every build
 if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then
     cat <<EOF
-  - label: ":pipeline: Trigger EOSIO Sync-from-Genesis Test"
+  - label: ":chains: Sync-from-Genesis Test"
     trigger: "eosio-sync-from-genesis"
     async: false
     build:

From eb16bf5612a240bfaf640c5cc0b7e333088c8465 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 15:07:31 -0500
Subject: [PATCH 1587/1648] Include link to origin in triggered build

---
 .cicd/generate-pipeline.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index bd6ce452ffa..1370bb58d5b 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -453,6 +453,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
         SKIP_BUILD: "true"
         SKIP_WASM_SPEC_TESTS: "true"
         PINNED: "${PINNED}"
@@ -475,6 +476,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
+        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
 
 EOF
     fi
@@ -490,6 +492,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}$
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:
+        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
         SKIP_JUNGLE: "${SKIP_JUNGLE}"
         SKIP_KYLIN: "${SKIP_KYLIN}"
         SKIP_MAIN: "${SKIP_MAIN}"

From a73ef1521a3f833e3f5b146509ffa13581567d9b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 16:32:03 -0500
Subject: [PATCH 1588/1648] Pass timeout through to sync test

---
 .cicd/generate-pipeline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 1370bb58d5b..282885fa2d6 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -496,6 +496,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}$
         SKIP_JUNGLE: "${SKIP_JUNGLE}"
         SKIP_KYLIN: "${SKIP_KYLIN}"
         SKIP_MAIN: "${SKIP_MAIN}"
+        TIMEOUT: "${TIMEOUT}"
 
 EOF
 fi

From f606eaf9e43059e8776c295d67c66ba5c99324ab Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 19 Dec 2019 17:06:58 -0500
Subject: [PATCH 1589/1648] Make the "Docker - Label Container with Git Branch
 and Git Tag" step faster by skipping git checkout

---
 .cicd/generate-pipeline.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 282885fa2d6..c077a4345a0 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -589,6 +589,8 @@ cat <<EOF
     env:
       IMAGE_TAG: "ubuntu-18.04-unpinned"
       PLATFORM_TYPE: "unpinned"
+    plugins:
+      - thedyrt/skip-checkout#v0.1.1: ~
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}

From 789b46a8164d900f8619494b9970abe9a03a50e0 Mon Sep 17 00:00:00 2001
From: johndebord <john.debord@block.one>
Date: Thu, 19 Dec 2019 17:40:45 -0500
Subject: [PATCH 1590/1648] Fix linking OpenSSL

---
 CMakeModules/EosioTester.cmake.in      | 36 ++++++++++++------------
 CMakeModules/EosioTesterBuild.cmake.in | 38 +++++++++++++-------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index b43f3740d78..109b7c5c3d0 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -47,28 +47,28 @@ find_package(Boost 1.67 REQUIRED COMPONENTS
    iostreams
    unit_test_framework)
 
-find_library(libtester eosio_testing @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(libchain eosio_chain @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libtester eosio_testing @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(libchain eosio_chain @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
 if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
-   find_library(libfc fc_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-   find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+   find_library(libfc fc_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+   find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
 else()
-   find_library(libfc fc @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-   find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)  
+   find_library(libfc fc @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+   find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
 endif()
 
-find_library(libwasm WASM @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(libwast WAST @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(libwabt wabt @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(libir IR     @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
-find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
-find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
-find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib)
+find_library(libwasm WASM @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(libwast WAST @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(libwabt wabt @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(libir IR     @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH)
+find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH)
+find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
+find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
 find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
     HINTS ENV GMP_LIB_DIR
           ENV GMP_DIR
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index 54d5a3d7a8d..e92f83b4296 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -45,29 +45,29 @@ find_package(Boost 1.67 REQUIRED COMPONENTS
    iostreams
    unit_test_framework)
 
-find_library(libtester eosio_testing @CMAKE_BINARY_DIR@/libraries/testing)
-find_library(libchain eosio_chain @CMAKE_BINARY_DIR@/libraries/chain)
+find_library(libtester eosio_testing @CMAKE_BINARY_DIR@/libraries/testing NO_DEFAULT_PATH)
+find_library(libchain eosio_chain @CMAKE_BINARY_DIR@/libraries/chain NO_DEFAULT_PATH)
 if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
-   find_library(libfc fc_debug @CMAKE_BINARY_DIR@/libraries/fc)
-   find_library(libsecp256k1 secp256k1_debug @CMAKE_BINARY_DIR@/libraries/fc/secp256k1)
-   
+   find_library(libfc fc_debug @CMAKE_BINARY_DIR@/libraries/fc NO_DEFAULT_PATH)
+   find_library(libsecp256k1 secp256k1_debug @CMAKE_BINARY_DIR@/libraries/fc/secp256k1 NO_DEFAULT_PATH)
+
 else()
-   find_library(libfc fc @CMAKE_BINARY_DIR@/libraries/fc)
-   find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1)
+   find_library(libfc fc @CMAKE_BINARY_DIR@/libraries/fc NO_DEFAULT_PATH)
+   find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1 NO_DEFAULT_PATH)
 endif()
 
-find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM)
-find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST)
-find_library(libir IR     @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR)
-find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt)
-find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform)
-find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging)
-find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime)
-find_library(libsoftfloat softfloat @CMAKE_BINARY_DIR@/libraries/softfloat)
-find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
-find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
-find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase)
-find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins)
+find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM NO_DEFAULT_PATH)
+find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST NO_DEFAULT_PATH)
+find_library(libir IR     @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR NO_DEFAULT_PATH)
+find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt NO_DEFAULT_PATH)
+find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform NO_DEFAULT_PATH)
+find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging NO_DEFAULT_PATH)
+find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime NO_DEFAULT_PATH)
+find_library(libsoftfloat softfloat @CMAKE_BINARY_DIR@/libraries/softfloat NO_DEFAULT_PATH)
+find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH)
+find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH)
+find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase NO_DEFAULT_PATH)
+find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins NO_DEFAULT_PATH)
 find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
     HINTS ENV GMP_LIB_DIR
           ENV GMP_DIR

From 135d39fe9295e48049ee863cfbafeba72d64b4cb Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 20 Dec 2019 09:27:35 -0500
Subject: [PATCH 1591/1648] Delete the pipeline.yml, obsolete since
 eos-buildkite-pipelines PR 61

---
 .cicd/pipeline.yml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 .cicd/pipeline.yml

diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
deleted file mode 100644
index 900aea633e0..00000000000
--- a/.cicd/pipeline.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-steps:
-  - wait
-
-  - label: ":pipeline: Generate Pipeline Steps"
-    command:
-      - "./.cicd/generate-pipeline.sh > generated-pipeline.yml"
-      - "buildkite-agent pipeline upload < generated-pipeline.yml"
-      - "buildkite-agent artifact upload generated-pipeline.yml"
-    agents:
-      queue: "automation-basic-builder-fleet"
-    timeout: ${TIMEOUT:-10}
\ No newline at end of file

From 4260b988d1956139a6985ebd0fc120b63953b18b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 20 Dec 2019 09:43:29 -0500
Subject: [PATCH 1592/1648] Revert 'Make the "Docker - Label Container with Git
 Branch and Git Tag" step faster by skipping git checkout'

This reverts commit f606eaf9e43059e8776c295d67c66ba5c99324ab.
---
 .cicd/generate-pipeline.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c077a4345a0..282885fa2d6 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -589,8 +589,6 @@ cat <<EOF
     env:
       IMAGE_TAG: "ubuntu-18.04-unpinned"
       PLATFORM_TYPE: "unpinned"
-    plugins:
-      - thedyrt/skip-checkout#v0.1.1: ~
     agents:
       queue: "$BUILDKITE_BUILD_AGENT_QUEUE"
     timeout: ${TIMEOUT:-10}

From 9a5ff833e60f2baf5b33083915e7472f36394b33 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 20 Dec 2019 10:01:10 -0500
Subject: [PATCH 1593/1648] Commit messages sometimes have invalid YAML syntax
 which breaks the pipeline

---
 .cicd/generate-pipeline.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 282885fa2d6..73e510c5e65 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -446,7 +446,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
     trigger: "eosio-lrt"
     async: true
     build:
-      message: "${BUILDKITE_MESSAGE}"
+      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:
@@ -469,7 +469,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
     trigger: "eos-multiversion-tests"
     async: true
     build:
-      message: "${BUILDKITE_MESSAGE}"
+      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:
@@ -488,7 +488,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}$
     trigger: "eosio-sync-from-genesis"
     async: false
     build:
-      message: "${BUILDKITE_MESSAGE}"
+      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:

From 2f3118f46368ec0d835dedb17a7997e23e168766 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 19 Dec 2019 18:04:20 -0500
Subject: [PATCH 1594/1648] simplify build from source instructions

---
 .../01_download-eosio-source.md               |   0
 .../02_build-eosio-binaries.md}               |   0
 .../03_install-eosio-binaries.md              |   0
 .../04_test-eosio-binaries.md}                |   0
 .../05_uninstall-eosio.md                     |   0
 .../01_shell-scripts/index.md                 |  15 ++
 .../00_eosio-dependencies/00_macos-mojave.md  | 118 ----------
 .../00_eosio-dependencies/01_amazon-linux.md  | 169 --------------
 .../00_eosio-dependencies/02_centos-linux.md  | 185 ----------------
 .../00_eosio-dependencies/03_ubuntu-linux.md  | 208 ------------------
 .../02_build-eosio-binaries/index.md          |  12 -
 .../00_eosio-dependencies.md}                 |  16 +-
 .../02_manual-build/01_eosio-manual-build.md  |   0
 .../02_manual-build/index.md                  |  11 +-
 docs/00_install/01_build-from-source/index.md |  11 +-
 15 files changed, 27 insertions(+), 718 deletions(-)
 rename docs/00_install/01_build-from-source/{ => 01_shell-scripts}/01_download-eosio-source.md (100%)
 rename docs/00_install/01_build-from-source/{02_build-eosio-binaries/00_build-script.md => 01_shell-scripts/02_build-eosio-binaries.md} (100%)
 rename docs/00_install/01_build-from-source/{ => 01_shell-scripts}/03_install-eosio-binaries.md (100%)
 rename docs/00_install/01_build-from-source/{04_build-validation.md => 01_shell-scripts/04_test-eosio-binaries.md} (100%)
 rename docs/00_install/01_build-from-source/{ => 01_shell-scripts}/05_uninstall-eosio.md (100%)
 create mode 100644 docs/00_install/01_build-from-source/01_shell-scripts/index.md
 delete mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
 delete mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/01_amazon-linux.md
 delete mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/02_centos-linux.md
 delete mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/03_ubuntu-linux.md
 delete mode 100644 docs/00_install/01_build-from-source/02_build-eosio-binaries/index.md
 rename docs/00_install/01_build-from-source/{02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md => 02_manual-build/00_eosio-dependencies.md} (77%)
 rename docs/00_install/01_build-from-source/{02_build-eosio-binaries => }/02_manual-build/01_eosio-manual-build.md (100%)
 rename docs/00_install/01_build-from-source/{02_build-eosio-binaries => }/02_manual-build/index.md (60%)

diff --git a/docs/00_install/01_build-from-source/01_download-eosio-source.md b/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md
similarity index 100%
rename from docs/00_install/01_build-from-source/01_download-eosio-source.md
rename to docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/00_build-script.md b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
similarity index 100%
rename from docs/00_install/01_build-from-source/02_build-eosio-binaries/00_build-script.md
rename to docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
diff --git a/docs/00_install/01_build-from-source/03_install-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
similarity index 100%
rename from docs/00_install/01_build-from-source/03_install-eosio-binaries.md
rename to docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
diff --git a/docs/00_install/01_build-from-source/04_build-validation.md b/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md
similarity index 100%
rename from docs/00_install/01_build-from-source/04_build-validation.md
rename to docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md
diff --git a/docs/00_install/01_build-from-source/05_uninstall-eosio.md b/docs/00_install/01_build-from-source/01_shell-scripts/05_uninstall-eosio.md
similarity index 100%
rename from docs/00_install/01_build-from-source/05_uninstall-eosio.md
rename to docs/00_install/01_build-from-source/01_shell-scripts/05_uninstall-eosio.md
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/index.md b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
new file mode 100644
index 00000000000..e57d3ad11a2
--- /dev/null
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
@@ -0,0 +1,15 @@
+# Shell Scripts
+
+[[info | Scripts automate installation-related tasks]]
+| Shell scripts automate the process of building, installing, testing, and uninstalling the EOSIO software and dependencies.
+
+To build EOSIO from the source code using shell scripts, just follow the steps below:
+
+1. [Download EOSIO Source](01_download-eosio-source.md)
+2. [Build EOSIO Binaries](02_build-eosio-binaries.md)
+3. [Install EOSIO Binaries](03_install-eosio-binaries.md)
+4. [Test EOSIO Binaries](04_test-eosio-binaries.md)
+5. [Uninstall EOSIO](05_uinstall-eosio.md)
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../00_install-prebuilt-binaries.md) instead of building from source.
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
deleted file mode 100644
index c0ee740910e..00000000000
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/00_macos-mojave.md
+++ /dev/null
@@ -1,118 +0,0 @@
-## Dependencies - Manual Install - MacOS Mojave 10.14 or Higher
-
-[[info | Reminder]]
-| This section assumes you already have the EOSIO source code. If not, just [Download the EOSIO source](../../../../01_build-from-source/01_download-eosio-source.md).
-
-## Steps
-
-Please follow the steps below to build EOSIO on your selected OS:
-
-1. [Change to EOSIO folder](#1-change-to-eosio-folder)
-2. [Install Homebrew](#2-install-homebrew)
-3. [Install dependencies](#3-install-dependencies)
-4. [Build clang8](#4-build-clang8)
-5. [Build boost](#5-build-boost)
-6. [Build mongodb](#6-build-mongodb)
-7. [Build mongodb C driver](#7-build-mongodb-c-driver)
-8. [Build mongodb CXX driver](#8-build-mongodb-cxx-driver)
-
-### 1. Change to EOSIO folder
-```sh
-$ cd ~/eosio
-```
-
-### 2. Install Homebrew
-
-```sh
-$ which brew && echo 'brew already installed' || /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-```
-
-### 3. Install dependencies
-
-```sh
-$ brew update && brew install git cmake python@2 python libtool libusb \
-    graphviz automake wget gmp pkgconfig doxygen openssl@1.1 jq
-```
-
-<!--
-### 4. download eosio
-```sh
-mkdir -p ~/eosio && cd ~/eosio
-git clone --recursive --single-branch -b release/2.0.x https://github.com/EOSIO/eos.git
-```
--->
-
-### 4. Build clang8
-```sh
-$ git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
-    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
-    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
-    cd ~/eosio/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
-    mkdir ~/eosio/clang8/build && cd ~/eosio/clang8/build && \
-    cmake -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
-    make -j $(getconf _NPROCESSORS_ONLN) && \
-    sudo make install && \
-    cd ~/eosio && \
-    rm -rf clang8
-```
-
-### 5. Build boost
-```sh
-$ curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
-    tar -xjf boost_1_71_0.tar.bz2 && \
-    cd boost_1_71_0 && \
-    ./bootstrap.sh --prefix=/usr/local && \
-    sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install && \
-    cd ~/eosio && \
-    sudo rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
-```
-
-### 6. Build mongodb
-
-```sh
-$ curl -LO https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz && \
-    tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz && \
-    rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz && \
-    ln -s ~/mongodb-osx-x86_64-3.6.3 ~/mongodb
-```
-
-### 7. Build mongodb C driver
-```sh
-$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
-    tar -xzf mongo-c-driver-1.13.0.tar.gz && \
-    cd mongo-c-driver-1.13.0 && \
-    mkdir -p build && \
-    cd build && \
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF .. && \
-    make -j $(getconf _NPROCESSORS_ONLN) && \
-    sudo make install && \
-    cd ~/eosio && \
-    rm -rf mongo-c-driver-1.13.0.tar.gz mongo-c-driver-1.13.0
-```
-
-### 8. Build mongodb CXX driver
-```sh
-$ curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
-    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && \
-    cd mongo-cxx-driver-r3.4.0/build && \
-    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
-    make -j $(getconf _NPROCESSORS_ONLN) && \
-    sudo make install && \
-    cd ~/eosio && \
-    rm -rf mongo-cxx-driver-r3.4.0.tar.gz mongo-cxx-driver-r3.4.0
-```
-
-<!--
-### 9. build eosio
-```sh
-$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make .. && make -j $(getconf _NPROCESSORS_ONLN)"
-```
--->
-
-[[info | What's Next?]]
-| The EOSIO dependencies are now installed. Next, you can [Manually Build the EOSIO Binaries](../01_eosio-manual-build.md).
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/01_amazon-linux.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/01_amazon-linux.md
deleted file mode 100644
index ba116e0bd6d..00000000000
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/01_amazon-linux.md
+++ /dev/null
@@ -1,169 +0,0 @@
-## Dependencies - Manual Install - Amazon Linux 2017.09 or Higher
-
-[[info | Reminder]]
-| This section assumes you already have the EOSIO source code. If not, just [Download the EOSIO source](../../../../01_build-from-source/01_download-eosio-source.md).
-
-## Steps
-
-Please follow the steps below to build EOSIO on your selected OS:
-
-1. [Change to EOSIO folder](#1-change-to-eosio-folder)
-2. [Install dependencies](#2-install-dependencies)
-3. [Build cmake](#3-build-cmake)
-4. [Build clang8](#4-build-clang8) <!-- 5. [Copy clang8 cmake file](#5-copy-clang8-cmake-file) -->
-5. [Build llvm8](#5-build-llvm8)
-6. [Build boost](#6-build-boost)
-7. [Build mongodb](#7-build-mongodb)
-8. [Build mongodb C driver](#8-build-mongodb-c-driver)
-9. [Build mongodb CXX driver](#9-build-mongodb-cxx-driver)
-10. [Add mongodb to PATH](#10-add-mongodb-to-path)
-11. [Install ccache](#11-install-ccache)
-
-<!--
-### 0. download and run base docker image
-```sh
-docker pull amazonlinux:2.0.20190508
-docker run -it amazonlinux:2.0.20190508
-```
--->
-
-### 1. Change to EOSIO folder
-```sh
-$ cd ~/eosio
-```
-
-### 2. Install dependencies
-```sh
-$ yum update -y && \
-    yum install -y which git sudo procps-ng util-linux autoconf automake \
-    libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
-    libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
-    graphviz patch gcc gcc-c++ vim-common jq
-```
-
-<!--
-### 3. download eosio
-```sh
-mkdir -p ~/eosio && cd ~/eosio
-git clone --recursive --single-branch -b release/2.0.x https://github.com/EOSIO/eos.git
-```
--->
-
-### 3. Build cmake
-```sh
-$ curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
-    tar -xzf cmake-3.13.2.tar.gz && \
-    cd cmake-3.13.2 && \
-    ./bootstrap --prefix=/usr/local && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf cmake-3.13.2.tar.gz cmake-3.13.2
-```
-
-### 4. Build clang8
-```sh
-$ git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
-    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
-    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
-    cd ~/eosio/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
-    mkdir ~/eosio/clang8/build && cd ~/eosio/clang8/build && \
-    cmake -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
-    make -j $(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf clang8
-```
-
-<!--
-### 5. Copy clang8 cmake file
-```sh
-$ cp eos/.cicd/helpers/clang.make /tmp/clang.cmake
-```
--->
-
-### 5. Build llvm8
-```sh
-$ git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
-    cd llvm && \
-    mkdir build && \
-    cd build && \
-    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf llvm
-```
-
-### 6. Build boost
-```sh
-$ curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
-    tar -xjf boost_1_71_0.tar.bz2 && \
-    cd boost_1_71_0 && \
-    ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
-    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
-    cd ~/eosio && \
-    rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
-```
-
-### 7. Build mongodb
-```sh
-$ curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
-    tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \
-    rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz
-```
-
-### 8. Build mongodb C driver
-```sh
-$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
-    tar -xzf mongo-c-driver-1.13.0.tar.gz && \
-    cd mongo-c-driver-1.13.0 && \
-    mkdir -p build && \
-    cd build && \
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF  -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf mongo-c-driver-1.13.0.tar.gz mongo-c-driver-1.13.0
-```
-
-### 9. Build mongodb CXX driver
-```sh
-$ curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
-    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && \
-    cd mongo-cxx-driver-r3.4.0 && \
-    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
-    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
-    cd build && \
-    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local  -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf mongo-cxx-driver-r3.4.0.tar.gz mongo-cxx-driver-r3.4.0
-```
-
-### 10. Add mongodb to PATH
-```sh
-$ export PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
-```
-
-### 11. Install ccache
-```sh
-$ curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.3.4-1.el7.x86_64.rpm
-```
-
-<!--
-### 12. build eosio
-```sh
-$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib64/ccache:\$PATH && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
-```
--->
-
-[[info | What's Next?]]
-| The EOSIO dependencies are now installed. Next, you can [Manually Build the EOSIO Binaries](../01_eosio-manual-build.md).
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/02_centos-linux.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/02_centos-linux.md
deleted file mode 100644
index f96e326f145..00000000000
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/02_centos-linux.md
+++ /dev/null
@@ -1,185 +0,0 @@
-## Dependencies - Manual Install - CentOS 7 and higher
-
-[[info | Reminder]]
-| This section assumes you already have the EOSIO source code. If not, just [Download the EOSIO source](../../../../01_build-from-source/01_download-eosio-source.md).
-
-## Steps
-
-Please follow the steps below to build EOSIO on your selected OS:
-
-1. [Change to EOSIO folder](#1-change-to-eosio-folder)
-2. [Install dependencies](#2-install-dependencies)
-3. [Build cmake](#3-build-cmake)
-4. [Build clang8](#4-build-clang8) <!-- 5. [Copy clang8 cmake file](#5-copy-clang8-cmake-file) -->
-5. [Build llvm8](#5-build-llvm8)
-6. [Build boost](#6-build-boost)
-7. [Build mongodb](#7-build-mongodb)
-8. [Build mongodb C driver](#8-build-mongodb-c-driver)
-9. [Build mongodb CXX driver](#9-build-mongodb-cxx-driver)
-10. [Add mongodb to PATH](#10-add-mongodb-to-path)
-11. [Install ccache](#11-install-ccache)
-12. [Fix ccache for CentOS](#12-fix-ccache-for-centos)
-
-<!--
-### 0. download and run base docker image
-```sh
-docker pull centos:7.6.1810
-docker run -it centos:7.6.1810
-```
--->
-
-### 1. Change to EOSIO folder
-```sh
-$ cd ~/eosio
-```
-
-### 2. Install dependencies
-```sh
-$ yum update -y && \
-    yum install -y epel-release && \
-    yum --enablerepo=extras install -y centos-release-scl && \
-    yum --enablerepo=extras install -y devtoolset-8 && \
-    yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
-    graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
-    python python-devel rh-python36 file libusbx-devel \
-    libcurl-devel patch vim-common jq
-```
-
-<!--
-### 3. download eosio
-```sh
-mkdir -p ~/eosio && cd ~/eosio
-git clone --recursive --single-branch -b release/2.0.x https://github.com/EOSIO/eos.git
-```
--->
-
-### 3. Build cmake
-```sh
-$ curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
-    source /opt/rh/devtoolset-8/enable && \
-    source /opt/rh/rh-python36/enable && \
-    tar -xzf cmake-3.13.2.tar.gz && \
-    cd cmake-3.13.2 && \
-    ./bootstrap --prefix=/usr/local && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf cmake-3.13.2.tar.gz cmake-3.13.2
-```
-
-### 4. Build clang8
-```sh
-$ git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
-    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
-    patch -p2 < ~/eosio/eos/scripts/clang-devtoolset8-support.patch && \
-    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
-    cd ~/eosio/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
-    mkdir ~/eosio/clang8/build && cd ~/eosio/clang8/build && \
-    source /opt/rh/devtoolset-8/enable && \
-    source /opt/rh/rh-python36/enable && \
-    cmake -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
-    make -j $(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf clang8
-```
-
-<!--
-### 5. Copy clang8 cmake file
-```sh
-$ cp eos/.cicd/helpers/clang.make /tmp/clang.cmake
-```
--->
-
-### 5. Build llvm8
-```sh
-$ git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
-    cd llvm && \
-    mkdir build && \
-    cd build && \
-    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf llvm
-```
-
-### 6. Build boost
-```sh
-$ curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
-    tar -xjf boost_1_71_0.tar.bz2 && \
-    cd boost_1_71_0 && \
-    ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
-    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
-    cd ~/eosio && \
-    rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
-```
-
-### 7. Build mongodb
-```sh
-$ curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
-    tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \
-    rm -rf mongodb-linux-x86_64-amazon-3.6.3.tgz
-```
-
-### 8. Build mongodb C driver
-```sh
-$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
-    tar -xzf mongo-c-driver-1.13.0.tar.gz && \
-    cd mongo-c-driver-1.13.0 && \
-    mkdir -p build && \
-    cd build && \
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf mongo-c-driver-1.13.0.tar.gz /mongo-c-driver-1.13.0
-```
-
-### 9. Build mongodb CXX driver
-```sh
-$ curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
-    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && \
-    cd mongo-cxx-driver-r3.4.0 && \
-    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
-    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
-    cd build && \
-    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf mongo-cxx-driver-r3.4.0.tar.gz mongo-cxx-driver-r3.4.0
-```
-
-### 10. Add mongodb to PATH
-```sh
-$ export PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
-```
-
-### 11. Install ccache
-```sh
-$ curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.3.4-1.el7.x86_64.rpm
-```
-
-### 12. Fix ccache for CentOS
-```sh
-cd /usr/lib64/ccache && \
-    ln -s ../../bin/ccache c++ && \
-    export CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
-```
-
-<!--
-# 13. build eosio
-```sh
-$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib64/ccache:\$PATH && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
-```
--->
-
-[[info | What's Next?]]
-| The EOSIO dependencies are now installed. Next, you can [Manually Build the EOSIO Binaries](../01_eosio-manual-build.md).
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/03_ubuntu-linux.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/03_ubuntu-linux.md
deleted file mode 100644
index 34095b86aa2..00000000000
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/03_ubuntu-linux.md
+++ /dev/null
@@ -1,208 +0,0 @@
-## Dependencies - Manual Install - Ubuntu 16.04 or higher and Linux Mint 18
-
-[[info | Reminder]]
-| This section assumes you already have the EOSIO source code. If not, just [Download the EOSIO source](../../../../01_build-from-source/01_download-eosio-source.md).
-
-## Steps
-
-Please follow the steps below to build EOSIO on your selected OS:
-
-1. [Change to EOSIO folder](#1-change-to-eosio-folder)
-2. [Install dependencies](#2-install-dependencies)
-3. [Build cmake](#3-build-cmake)
-4. [Build clang8](#4-build-clang8) <!-- 5. [Copy clang8 cmake file](#5-copy-clang8-cmake-file) -->
-5. [Build llvm8](#5-build-llvm8)
-6. [Build boost](#6-build-boost)
-7. [Build mongodb](#7-build-mongodb)
-8. [Build mongodb C driver](#8-build-mongodb-c-driver)
-9. [Build mongodb CXX driver](#9-build-mongodb-cxx-driver)
-10. [Add mongodb to PATH](#10-add-mongodb-to-path)
-11. [Install ccache (Ubuntu 16.04 only)](#11-install-ccache-(ubuntu-16.04-only))
-
-<!--
-### 0. download and run base docker image
-```sh
-docker pull ubuntu:16.04
-docker run -it ubuntu:16.04
-  (OR)
-docker pull ubuntu:18.04
-docker run -it ubuntu:18.04
-```
--->
-
-### 1. Change to EOSIO folder
-```sh
-$ cd ~/eosio
-```
-
-### 2. Install dependencies
-
-#### Ubuntu 16.04:
-```sh
-$ apt-get update && \
-    apt-get upgrade -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git automake \
-    libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev \
-    python2.7 python2.7-dev python3 python3-dev autoconf libtool curl zlib1g-dev \
-    sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev pkg-config apt-transport-https vim-common jq
-```
-
-#### Ubuntu 18.04:
-```sh
-apt-get update && \
-    apt-get upgrade -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y git make \
-    bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
-    autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
-    autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
-    libcurl4-gnutls-dev pkg-config patch ccache vim-common jq
-```
-
-<!--
-### 3. download eosio
-```sh
-mkdir -p ~/eosio && cd ~/eosio
-git clone --recursive --single-branch -b release/2.0.x https://github.com/EOSIO/eos.git
-```
--->
-
-### 3. Build cmake
-```sh
-$ curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
-    tar -xzf cmake-3.13.2.tar.gz && \
-    cd cmake-3.13.2 && \
-    ./bootstrap --prefix=/usr/local && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf cmake-3.13.2.tar.gz cmake-3.13.2
-```
-
-### 4. Build clang8
-```sh
-$ git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
-    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
-    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
-    cd ~/eosio/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
-    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
-    mkdir ~/eosio/clang8/build && cd ~/eosio/clang8/build && \
-    cmake -DCMAKE_INSTALL_PREFIX='/usr/local' -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
-    make -j $(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf clang8
-```
-
-<!--
-### 5. Copy clang8 cmake file
-```sh
-$ cp eos/.cicd/helpers/clang.make /tmp/clang.cmake
-```
--->
-
-### 5. Build llvm8
-```sh
-$ git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
-    cd llvm && \
-    mkdir build && \
-    cd build && \
-    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf llvm
-```
-
-### 6. Build boost
-```sh
-$ curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
-    tar -xjf boost_1_71_0.tar.bz2 && \
-    cd boost_1_71_0 && \
-    ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \
-    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
-    cd ~/eosio && \
-    rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
-```
-
-### 7. Build mongodb
-
-#### Ubuntu 16.04:
-```sh
-$ curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \
-    tar -xzf mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \
-    rm -f mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz
-```
-
-#### Ubuntu 18.04:
-```sh
-$ curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
-    tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
-    rm -f mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz
-```
-
-### 8. Build mongodb C driver
-```sh
-$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
-    tar -xzf mongo-c-driver-1.13.0.tar.gz && \
-    cd mongo-c-driver-1.13.0 && \
-    mkdir -p build && \
-    cd build && \
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf mongo-c-driver-1.13.0.tar.gz mongo-c-driver-1.13.0
-```
-
-### 9. Build mongodb CXX driver
-```sh
-$ curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
-    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && \
-    cd mongo-cxx-driver-r3.4.0 && \
-    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
-    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
-    cd build && \
-    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_TOOLCHAIN_FILE='~/eosio/eos/.cicd/helpers/clang.make' .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf mongo-cxx-driver-r3.4.0.tar.gz mongo-cxx-driver-r3.4.0
-```
-
-### 10. Add mongodb to PATH
-
-#### Ubuntu 16.04:
-```sh
-$ export PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1604-3.6.3/bin
-```
-
-#### Ubuntu 18.04:
-```sh
-$ export PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1804-4.1.1/bin
-```
-
-### 11. Install ccache (Ubuntu 16.04 only)
-```sh
-$ curl -LO https://github.com/ccache/ccache/releases/download/v3.4.1/ccache-3.4.1.tar.gz && \
-    tar -xzf ccache-3.4.1.tar.gz && \
-    cd ccache-3.4.1 && \
-    ./configure && \
-    make && \
-    make install && \
-    cd ~/eosio && \
-    rm -rf ccache-3.4.1.tar.gz ccache-3.4.1
-```
-
-<!--
-### 12. build eosio
-```sh
-$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib/ccache:\${PATH} && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
-```
--->
-
-[[info | What's Next?]]
-| The EOSIO dependencies are now installed. Next, you can [Manually Build the EOSIO Binaries](../01_eosio-manual-build.md).
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/index.md b/docs/00_install/01_build-from-source/02_build-eosio-binaries/index.md
deleted file mode 100644
index 6757ba67e33..00000000000
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build EOSIO Binaries
-
-[[info | Reminder]]
-| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../00_install-prebuilt-binaries.md) instead of building from source.
-
-EOSIO can be built on several platforms using different building methods. Advanced users may opt to build EOSIO from the build script. Node operators or block producers who wish to deploy a public node, may prefer manual methods.
-
-* [Build Script](00_build-script.md) - Suitable for the majority of developers, this script builds on Mac OS and many flavors of Linux.
-* [Manual Build](02_manual-build/index.md) - Suitable for those platforms that may be hostile to the build script or for operators who need more control over their build.
-
-[[info | Installation Recommended]]
-| After building EOSIO successfully, it is highly recommended to [install the EOSIO binaries](../03_install-eosio-binaries.md). This copies the EOSIO binaries to a central location, such as `~/eosio/x.y/bin`, where `x.y` is the EOSIO release version.
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md b/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
similarity index 77%
rename from docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md
rename to docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
index fc30fed92a4..2ad3209c4b1 100644
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/00_eosio-dependencies/index.md
+++ b/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
@@ -33,23 +33,11 @@ $ cd ~/eosio/eos
 $ ./scripts/eosio_build.sh [-P]
 ```
 
-## Manual Installation of Dependencies
+### Unupported Platforms
 
-Below are instructions to install the EOSIO dependencies manually on various platforms:
-
-* [MacOS Mojave](00_macos-mojave.md)
-* [Amazon Linux](01_amazon-linux.md)
-* [CentOS Linux](02_centos-linux.md)
-* [Ubuntu Linux](03_ubuntu-linux.md)
-
-### Other Platforms
-
-EOSIO dependencies can also be built and installed manually by reproducing the same commands invoked by the [Build Script](../../00_build-script.md). The actual commands can be generated from the script directly by exporting specific environment variables and CLI parameters to the script when invoked:
+EOSIO dependencies can also be built and installed manually by reproducing the same commands invoked by the [Build Script](..//01_shell-scripts/02_build-eosio-binaries.md). The actual commands can be generated from the script directly by exporting specific environment variables and CLI parameters to the script when invoked:
 
 ```sh
 $ cd ~/eosio/eos
 $ export VERBOSE=true && export DRYRUN=true && ./scripts/eosio_build.sh -y [-P]
 ```
-
-[[info | Automatic installation of dependencies]]
-| (#automatic-installation-of-dependencies) should be preferred over manual installation if possible.
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md b/docs/00_install/01_build-from-source/02_manual-build/01_eosio-manual-build.md
similarity index 100%
rename from docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/01_eosio-manual-build.md
rename to docs/00_install/01_build-from-source/02_manual-build/01_eosio-manual-build.md
diff --git a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md b/docs/00_install/01_build-from-source/02_manual-build/index.md
similarity index 60%
rename from docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
rename to docs/00_install/01_build-from-source/02_manual-build/index.md
index fc7b15d8549..59ecc4ceba8 100644
--- a/docs/00_install/01_build-from-source/02_build-eosio-binaries/02_manual-build/index.md
+++ b/docs/00_install/01_build-from-source/02_manual-build/index.md
@@ -1,18 +1,15 @@
 # EOSIO Manual Build
 
 [[info | Manual Builds are for Advanced Developers]]
-| These manual instructions are intended for advanced developers. The [Build Script](../00_build-script.md) should be the preferred method to build EOSIO from source. If the script fails or your platform is not supported, continue with the instructions below.
+| These manual instructions are intended for advanced developers. The [Shell Scripts](../01_shell-scripts/index.md) should be the preferred method to build EOSIO from source. If the script fails or your platform is not supported, continue with the instructions below.
 
 ## EOSIO Dependencies
 
-When performing a manual build, it is necessary to install specific software packages that the EOSIO software depends on. To learn more about these dependencies, visit the [EOSIO Software Dependencies](00_eosio-dependencies/index.md) section.
+When performing a manual build, it is necessary to install specific software packages that the EOSIO software depends on. To learn more about these dependencies, visit the [EOSIO Software Dependencies](00_eosio-dependencies.md) section.
 
-## Instructions
+## Platforms
 
-The following instructions will build the EOSIO dependencies and EOSIO binaries manually by invoking commands on the shell:
-
-1. [Manual Install EOSIO Dependencies](00_eosio-dependencies/index.md#manual-installation-of-dependencies)
-2. [Manual Build EOSIO Binaries](01_eosio-manual-build.md)
+Shell commands are available to manually download, build, install, test, and uninstall the EOSIO software and dependencies for these [platforms](03_platforms/index.md).
 
 ## Out-of-source Builds
 
diff --git a/docs/00_install/01_build-from-source/index.md b/docs/00_install/01_build-from-source/index.md
index 11fd626e390..12a68aeda69 100644
--- a/docs/00_install/01_build-from-source/index.md
+++ b/docs/00_install/01_build-from-source/index.md
@@ -3,9 +3,10 @@
 [[info | Building EOSIO is for Advanced Developers]]
 | If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../00_install-prebuilt-binaries.md) instead of building from source.
 
-To build the EOSIO binaries from the source code, just follow the steps below:
+EOSIO can be built on several platforms using different build methods. Advanced users may opt to build EOSIO using our shell scripts. Node operators or block producers who wish to deploy a public node, may prefer our manual build instructions.
 
-1. [Download EOSIO Source](01_download-eosio-source.md)
-2. [Build EOSIO Binaries](02_build-eosio-binaries/index.md)
-3. [Install EOSIO Binaries](03_install-eosio-binaries.md)
-4. [Build Validation](04_build-validation.md)
+* [Shell Scripts](01_shell-scripts/index.md) - Suitable for the majority of developers, these scripts build on Mac OS and many flavors of Linux.
+* [Manual Build](02_manual-build/index.md) - Suitable for those platforms that may be hostile to the shell scripts or for operators who need more control over their builds.
+
+[[info | EOSIO Installation Recommended]]
+| After building EOSIO successfully, it is highly recommended to install the EOSIO binaries from their default build directory. This copies the EOSIO binaries to a central location, such as `/usr/local/bin`, or `~/eosio/x.y/bin`, where `x.y` is the EOSIO release version.

From 71239abdbae571ea5d01db2c737956a169c4bf2a Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 19 Dec 2019 18:08:49 -0500
Subject: [PATCH 1595/1648] remove old manual build instructions

---
 .../02_manual-build/01_eosio-manual-build.md  | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 docs/00_install/01_build-from-source/02_manual-build/01_eosio-manual-build.md

diff --git a/docs/00_install/01_build-from-source/02_manual-build/01_eosio-manual-build.md b/docs/00_install/01_build-from-source/02_manual-build/01_eosio-manual-build.md
deleted file mode 100644
index dfb625b95a0..00000000000
--- a/docs/00_install/01_build-from-source/02_manual-build/01_eosio-manual-build.md
+++ /dev/null
@@ -1,42 +0,0 @@
-
-[[info | Reminder]]
-| This section assumes that you have already installed the EOSIO dependencies manually. If not, visit the [Manual Installation of EOSIO Dependencies](00_eosio-dependencies/index.md#manual-installation-of-dependencies) section.
-
-## Instructions
-
-Please follow the steps below to build the EOSIO software manually on your selected OS:
-
-### All Platforms
-
-Create and change to the `build` folder under the `eos` folder:
-
-```sh
-$ mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build
-```
-
-### MacOS
-
-Use the following command on MacOS to build the EOSIO binaries manually:
-
-```sh
-$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make .. && make -j$(getconf _NPROCESSORS_ONLN)"
-```
-
-### Amazon Linux or CentOS Linux
-
-Use the following command on Amazon Linux or CentOS Linux to build the EOSIO binaries manually:
-
-```sh
-$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib64/ccache:\$PATH && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
-```
-
-### Ubuntu Linux
-
-Use the following command on Ubuntu Linux to build the EOSIO binaries manually:
-
-```sh
-$ bash -c "mkdir -p ~/eosio/eos/build && cd ~/eosio/eos/build && export PATH=/usr/lib/ccache:\${PATH} && cmake -DCMAKE_BUILD_TYPE='Release' -DBUILD_MONGO_DB_PLUGIN=true -DCMAKE_TOOLCHAIN_FILE=~/eosio/eos/.cicd/helpers/clang.make -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. && make -j$(nproc)"
-```
-
-[[info | What's Next?]]
-| [Install EOSIO binaries manually](../../03_install-eosio-binaries.md#eosio-manual-install)

From decd69a221fa7b2dbc6f8205458c1c46b87c719c Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 19 Dec 2019 20:23:29 -0500
Subject: [PATCH 1596/1648] add missing cleos get actions command

---
 .../03_command-reference/get/actions.md       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docs/02_cleos/03_command-reference/get/actions.md

diff --git a/docs/02_cleos/03_command-reference/get/actions.md b/docs/02_cleos/03_command-reference/get/actions.md
new file mode 100644
index 00000000000..de14e3bd8a4
--- /dev/null
+++ b/docs/02_cleos/03_command-reference/get/actions.md
@@ -0,0 +1,31 @@
+## Description
+Retrieve all actions with specific account name referenced in authorization or receiver
+
+## Positional Parameters
+- `account_name` _TEXT_ - name of account to query on (required)
+- `pos` _INT_ - sequence number of action for this account, -1 for last (optional)
+- `offset` _INT_ - get actions [pos, pos + offset] for positive offset or [pos - offset, pos] for negative offset
+
+## Options
+
+- `-j,--json` - print full json
+- `--full` - don't truncate action output
+- `--pretty` - pretty print full action json
+- `--console` - print console output generated by action
+
+## Examples
+Retrieve and save abi for eosio.token contract
+
+```shell
+$ cleos get actions eosio.token
+
+#  seq  when                              contract::action => receiver      trx id...   args
+================================================================================================================
+#  976   2018-06-01T19:54:05.000     eosio.token::transfer => eosio.token   1d1fe154... {"from":"userae","to":"useraa","quantity":"0.000...
+#  977   2018-06-01T19:54:05.000     eosio.token::transfer => eosio.token   a0c9e5bc... {"from":"userab","to":"useraa","quantity":"0.000...
+#  978   2018-06-01T19:54:05.000     eosio.token::transfer => eosio.token   3749d0d1... {"from":"userab","to":"userah","quantity":"0.000...
+#  979   2018-06-01T19:54:05.000     eosio.token::transfer => eosio.token   dda205b0... {"from":"userai","to":"useraj","quantity":"0.000...
+#  980   2018-06-01T19:54:05.000     eosio.token::transfer => eosio.token   14089e9b... {"from":"userab","to":"userae","quantity":"0.000...
+#  981   2018-06-01T19:54:05.000     eosio.token::transfer => eosio.token   6882cefc... {"from":"useraj","to":"userab","quantity":"0.000...
+...
+```

From 3d015d475e4e87881351f3a4f646c06544c6748b Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 19 Dec 2019 20:23:52 -0500
Subject: [PATCH 1597/1648] minor edit on nodeos index

---
 docs/01_nodeos/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/01_nodeos/index.md b/docs/01_nodeos/index.md
index 511c6a4f2e4..f4d08489647 100644
--- a/docs/01_nodeos/index.md
+++ b/docs/01_nodeos/index.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-`nodeos` is the core service daemon that runs on every EOSIO node. It can be configured to process smart contracts, validate transactions, produce blocks with valid transactions, and confirm blocks to record them on the blockchain.
+`nodeos` is the core service daemon that runs on every EOSIO node. It can be configured to process smart contracts, validate transactions, produce blocks containing valid transactions, and confirm blocks to record them on the blockchain.
 
 ## Installation
 
@@ -10,7 +10,7 @@
 
 ## Explore
 
-Please navigate the sections below to configure and use `nodeos`.
+Navigate the sections below to configure and use `nodeos`.
 
 * [Usage](02_usage/index.md) - Configuring and using `nodeos`, node setups/environments.
 * [Plugins](03_plugins/index.md) - Using plugins, plugin options, mandatory vs. optional.

From 81ada7ba31121759ddaec305b23c15ebeca3ffda Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 19 Dec 2019 20:24:53 -0500
Subject: [PATCH 1598/1648] minor edits on cleos get account command

---
 docs/02_cleos/03_command-reference/get/account.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/02_cleos/03_command-reference/get/account.md b/docs/02_cleos/03_command-reference/get/account.md
index 760def7f5aa..cd3597160e4 100755
--- a/docs/02_cleos/03_command-reference/get/account.md
+++ b/docs/02_cleos/03_command-reference/get/account.md
@@ -4,10 +4,13 @@ Retrieves an account from the blockchain
 ## Positional Parameters
 - `name` _TEXT_ - The name of the account to retrieve
 - `core-symbol` _TEXT_ - The expected core symbol of the chain you are querying
+
 ## Options
 - `-j,--json` - Output in JSON format
-## Example
-## Get formatted data for user **eosio**
+
+## Examples
+
+### Get formatted data for user **eosio**
 
 ```shell
 $ cleos get account eosio
@@ -30,7 +33,7 @@ cpu bandwidth: (averaged over 3 days)
 
 producers:     <not voted>
 ```
-## Get JSON data for user **eosio**
+### Get JSON data for user **eosio**
 
 ```shell
 $ cleos get account eosio --json

From 934c83e836bf6cdaf1be3a520532e0e4dde8f0a7 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 19 Dec 2019 20:47:36 -0500
Subject: [PATCH 1599/1648] minor edits on shell script index

---
 .../01_build-from-source/01_shell-scripts/index.md        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/index.md b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
index e57d3ad11a2..b0f9e4bd704 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/index.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
@@ -1,15 +1,15 @@
 # Shell Scripts
 
-[[info | Scripts automate installation-related tasks]]
+[[info | Did you know?]]
 | Shell scripts automate the process of building, installing, testing, and uninstalling the EOSIO software and dependencies.
 
-To build EOSIO from the source code using shell scripts, just follow the steps below:
+To build EOSIO from the source code using shell scripts, visit the sections below:
 
 1. [Download EOSIO Source](01_download-eosio-source.md)
 2. [Build EOSIO Binaries](02_build-eosio-binaries.md)
 3. [Install EOSIO Binaries](03_install-eosio-binaries.md)
 4. [Test EOSIO Binaries](04_test-eosio-binaries.md)
-5. [Uninstall EOSIO](05_uinstall-eosio.md)
+5. [Uninstall EOSIO](05_uninstall-eosio.md)
 
 [[info | Building EOSIO is for Advanced Developers]]
-| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../00_install-prebuilt-binaries.md) instead of building from source.
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../00_install-prebuilt-binaries.md) instead of building from source.

From cbafcf898b57673ab83a330232d452ea9c811175 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 19 Dec 2019 20:53:23 -0500
Subject: [PATCH 1600/1648] fix links in main docs folder

---
 docs/00_install/00_install-prebuilt-binaries.md              | 2 +-
 .../01_shell-scripts/01_download-eosio-source.md             | 3 +++
 .../01_shell-scripts/02_build-eosio-binaries.md              | 5 ++++-
 .../01_shell-scripts/03_install-eosio-binaries.md            | 5 +++++
 .../01_shell-scripts/04_test-eosio-binaries.md               | 4 ++--
 .../02_manual-build/00_eosio-dependencies.md                 | 4 ++--
 docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md  | 2 +-
 .../02_usage/02_node-setups/01_non-producing-node.md         | 2 +-
 .../00_local-single-node-testnet.md                          | 2 +-
 .../01_local-multi-node-testnet.md                           | 2 +-
 10 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index 9aa882860cc..bc7d529fe4d 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -1,6 +1,6 @@
 
 [[info | Previous Builds]]
-| If you have previously installed EOSIO from source using shell scripts, you must first run the [Uninstall Script](01_build-from-source/05_uninstall-eosio.md) before installing any prebuilt binaries on the same OS.
+| If you have previously installed EOSIO from source using shell scripts, you must first run the [Uninstall Script](01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md) before installing any prebuilt binaries on the same OS.
 
 ## Prebuilt Binaries
 
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md b/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md
index 2421b07d84d..3aaf65c2248 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md
@@ -23,3 +23,6 @@ When pulling changes, especially after switching branches, the submodules *must*
 $ [git checkout <branch>]  (optional)
 $ git pull --recurse-submodules
 ```
+
+[[info | What's Next?]]
+| [Build EOSIO binaries](02_build-eosio-binaries.md)
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
index 0f2dae7097f..a79b0d0e5e4 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
@@ -12,4 +12,7 @@ $ ./scripts/eosio_build.sh
 The build process writes temporary content to the `eos/build` folder. After building, the program binaries can be found at `eos/build/programs`.
 
 [[info | What's Next?]]
-| [Install EOSIO binaries](../03_install-eosio-binaries.md)
+| [Install EOSIO binaries](03_install-eosio-binaries.md)
+
+[[info | What's Next?]]
+| It is strongly suggested to [Install the EOSIO binaries](03_install-eosio-binaries.md) after building EOSIO from source as it makes local development significantly more friendly.
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
index 3dcd509f27a..0f24b8a9a76 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
@@ -16,3 +16,8 @@ In lieu of the `eosio_install.sh` script, you can install the EOSIO binaries dir
 $ cd ~/eosio/eos/build
 $ sudo make install
 ```
+
+[[info | What's Next?]]
+|
+* Optionally [Test EOSIO binaries](04_test-eosio-binaries.md)
+* Configure and use [Nodeos](../../../01_nodeos/index.md).
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md
index 718e80fe339..1381f00a53d 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md
@@ -25,5 +25,5 @@ cd ~/eosio/eos/build
 make test
 ```
 
-[[info | Recommend]]
-| It is strongly suggested to [Install the EOSIO binaries](03_install-eosio-binaries.md) after building EOSIO from source as it makes local development significantly more friendly.
+[[info | What's Next?]]
+| Configure and use [Nodeos](../../../01_nodeos/index.md).
diff --git a/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md b/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
index 2ad3209c4b1..08b9449bf7e 100644
--- a/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
+++ b/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
@@ -26,7 +26,7 @@ Regular users or application developers may prefer installing unpinned versions
 
 ## Automatic Installation of Dependencies
 
-EOSIO dependencies can be built or installed automatically from the [Build Script](../../00_build-script.md) when building EOSIO from source. To build the pinned dependencies, the optional `-P` parameter can be specified when invoking the script. Otherwise, the unpinned dependencies will be installed instead, with the exception of `boost` and `cmake` which are always pinned:
+EOSIO dependencies can be built or installed automatically from the [Build Script](../01_shell-scripts/02_build-eosio-binaries.md) when building EOSIO from source. To build the pinned dependencies, the optional `-P` parameter can be specified when invoking the script. Otherwise, the unpinned dependencies will be installed instead, with the exception of `boost` and `cmake` which are always pinned:
 
 ```sh
 $ cd ~/eosio/eos
@@ -35,7 +35,7 @@ $ ./scripts/eosio_build.sh [-P]
 
 ### Unupported Platforms
 
-EOSIO dependencies can also be built and installed manually by reproducing the same commands invoked by the [Build Script](..//01_shell-scripts/02_build-eosio-binaries.md). The actual commands can be generated from the script directly by exporting specific environment variables and CLI parameters to the script when invoked:
+EOSIO dependencies can also be built and installed manually by reproducing the same commands invoked by the [Build Script](../01_shell-scripts/02_build-eosio-binaries.md). The actual commands can be generated from the script directly by exporting specific environment variables and CLI parameters to the script when invoked:
 
 ```sh
 $ cd ~/eosio/eos
diff --git a/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md b/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
index 6368c5d2271..abc794799a9 100644
--- a/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
+++ b/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
@@ -9,7 +9,7 @@ This section describes how to set up a producing node within the EOSIO network.
 ## Before you begin
 
 * [Install the EOSIO software](../../../00_install/index.md) before starting this section.
-* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built from source, make sure to run the [install script](../../../00_install/01_build-from-source/03_install-eosio-binaries.md).
+* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built EOSIO using shell scripts, make sure to run the [Install Script](../../../00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md).
 * Know how to pass [Nodeos options](../../02_usage/00_nodeos-options.md) to enable or disable functionality.
 
 ## Steps
diff --git a/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md b/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
index d729e79cca1..6dcb6c1a5dc 100644
--- a/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
+++ b/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
@@ -6,7 +6,7 @@ This section describes how to set up a non-producing node within the EOSIO netwo
 ## Before you begin
 
 * [Install the EOSIO software](../../../00_install/index.md) before starting this section.
-* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built from source, make sure to run the [install script](../../../00_install/01_build-from-source/03_install-eosio-binaries.md).
+* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built EOSIO using shell scripts, make sure to run the [Install Script](../../../00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md).
 * Know how to pass [Nodeos options](../../02_usage/00_nodeos-options.md) to enable or disable functionality.
 
 ## Steps
diff --git a/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md b/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
index 1239b0ed71f..cbccc5f5051 100644
--- a/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
+++ b/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
@@ -10,7 +10,7 @@ This section describes how to set up a single-node blockchain configuration runn
 ## Before you begin
 
 * [Install the EOSIO software](../../../00_install/index.md) before starting this section.
-* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built from source, make sure to run the [install script](../../../00_install/01_build-from-source/03_install-eosio-binaries.md).
+* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built EOSIO using shell scripts, make sure to run the [Install Script](../../../00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md).
 * Know how to pass [Nodeos options](../../02_usage/00_nodeos-options.md) to enable or disable functionality.
 
 ## Steps
diff --git a/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md b/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
index 58df0597585..9aea73e2190 100644
--- a/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
+++ b/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
@@ -8,7 +8,7 @@ This section describes how to set up a multi-node blockchain configuration runni
 ## Before you begin
 
 * [Install the EOSIO software](../../../00_install/index.md) before starting this section.
-* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built from source, make sure to run the [install script](../../../00_install/01_build-from-source/03_install-eosio-binaries.md).
+* It is assumed that `nodeos`, `cleos`, and `keosd` are accessible through the path. If you built EOSIO using shell scripts, make sure to run the [Install Script](../../../00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md).
 * Know how to pass [Nodeos options](../../02_usage/00_nodeos-options.md) to enable or disable functionality.
 
 ## Steps

From a1eac763623bba9ad66c750a6d1a21471439b07d Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 19 Dec 2019 23:54:11 -0500
Subject: [PATCH 1601/1648] minor edits on install script

---
 .../01_shell-scripts/03_install-eosio-binaries.md             | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
index 0f24b8a9a76..c8e09bd0c5f 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
@@ -18,6 +18,4 @@ $ sudo make install
 ```
 
 [[info | What's Next?]]
-|
-* Optionally [Test EOSIO binaries](04_test-eosio-binaries.md)
-* Configure and use [Nodeos](../../../01_nodeos/index.md).
+| Configure and use [Nodeos](../../../01_nodeos/index.md), or optionally [Test the EOSIO binaries](04_test-eosio-binaries.md).

From 4f71e4cfe41fc97006ce205c889cd1fc0f3359dc Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 20 Dec 2019 10:49:09 -0500
Subject: [PATCH 1602/1648] move upgrade guides from troubleshooting to its own
 folder

---
 .../00_upgrade-issues/00_upgrade-issues-1.6-1.7.md                | 0
 .../00_upgrade-issues/01_upgrade-issues-1.7-1.8.md                | 0
 docs/01_nodeos/08_troubleshooting/00_upgrade-issues/index.md      | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 docs/01_nodeos/08_troubleshooting/00_upgrade-issues/00_upgrade-issues-1.6-1.7.md
 delete mode 100644 docs/01_nodeos/08_troubleshooting/00_upgrade-issues/01_upgrade-issues-1.7-1.8.md
 delete mode 100644 docs/01_nodeos/08_troubleshooting/00_upgrade-issues/index.md

diff --git a/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/00_upgrade-issues-1.6-1.7.md b/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/00_upgrade-issues-1.6-1.7.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/01_upgrade-issues-1.7-1.8.md b/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/01_upgrade-issues-1.7-1.8.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/index.md b/docs/01_nodeos/08_troubleshooting/00_upgrade-issues/index.md
deleted file mode 100644
index e69de29bb2d..00000000000

From de37ef0d81aaa059f172a7884af115116147060c Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 20 Dec 2019 11:05:25 -0500
Subject: [PATCH 1603/1648] remove blank index from cleos command reference

---
 docs/02_cleos/03_command-reference/index.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 docs/02_cleos/03_command-reference/index.md

diff --git a/docs/02_cleos/03_command-reference/index.md b/docs/02_cleos/03_command-reference/index.md
deleted file mode 100644
index e69de29bb2d..00000000000

From d2f1abd5fd0bee39b14214431df54e49a0349ab9 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Fri, 20 Dec 2019 11:21:58 -0500
Subject: [PATCH 1604/1648] add content_title to nodeos, cleos, keosd where
 applicable

---
 docs/00_install/00_install-prebuilt-binaries.md               | 3 +++
 .../01_shell-scripts/01_download-eosio-source.md              | 3 +++
 .../01_shell-scripts/02_build-eosio-binaries.md               | 3 +++
 .../01_shell-scripts/03_install-eosio-binaries.md             | 3 +++
 .../01_shell-scripts/04_test-eosio-binaries.md                | 3 +++
 .../01_shell-scripts/05_uninstall-eosio.md                    | 3 +++
 .../00_install/01_build-from-source/01_shell-scripts/index.md | 4 +++-
 .../02_manual-build/00_eosio-dependencies.md                  | 4 +++-
 docs/00_install/01_build-from-source/02_manual-build/index.md | 4 +++-
 docs/00_install/01_build-from-source/index.md                 | 4 +++-
 docs/00_install/index.md                                      | 4 +++-
 docs/01_nodeos/02_usage/00_nodeos-options.md                  | 3 +++
 docs/01_nodeos/02_usage/01_nodeos-configuration.md            | 3 +++
 docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md   | 3 +++
 .../02_usage/02_node-setups/01_non-producing-node.md          | 3 +++
 docs/01_nodeos/02_usage/02_node-setups/index.md               | 4 +++-
 .../00_local-single-node-testnet.md                           | 3 +++
 .../03_development-environment/01_local-multi-node-testnet.md | 3 +++
 docs/01_nodeos/02_usage/03_development-environment/index.md   | 4 +++-
 docs/01_nodeos/02_usage/05_nodeos-implementation.md           | 3 +++
 docs/01_nodeos/02_usage/index.md                              | 4 +++-
 docs/01_nodeos/03_plugins/index.md                            | 4 +++-
 docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md     | 4 +++-
 docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md       | 4 +++-
 docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md  | 4 +++-
 docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md    | 4 +++-
 docs/01_nodeos/04_replays/index.md                            | 4 +++-
 docs/01_nodeos/06_logging/00_setup-logging.json.md            | 4 ++++
 docs/01_nodeos/06_logging/01_logging-levels.md                | 4 ++++
 docs/01_nodeos/06_logging/index.md                            | 4 +++-
 docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md         | 4 +++-
 docs/01_nodeos/07_upgrade-guides/index.md                     | 4 +++-
 docs/01_nodeos/08_troubleshooting/index.md                    | 4 +++-
 docs/01_nodeos/index.md                                       | 4 +++-
 docs/02_cleos/04_troubleshooting.md                           | 4 ++++
 docs/02_cleos/05_FAQ.md                                       | 4 ++++
 docs/02_cleos/index.md                                        | 4 +++-
 docs/03_keosd/10_usage.md                                     | 3 +++
 docs/03_keosd/15_plugins/index.md                             | 4 +++-
 docs/03_keosd/20_security.md                                  | 4 ++++
 docs/03_keosd/30_how-to-guides/index.md                       | 3 +++
 docs/03_keosd/35_wallet-specification.md                      | 4 ++++
 docs/03_keosd/40_troubleshooting.md                           | 4 ++++
 docs/03_keosd/50_FAQ.md                                       | 4 ++++
 docs/03_keosd/index.md                                        | 4 +++-
 docs/index.md                                                 | 4 +++-
 46 files changed, 146 insertions(+), 23 deletions(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index bc7d529fe4d..819104bfaa1 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -1,3 +1,6 @@
+---
+content_title: Install Prebuilt Binaries
+---
 
 [[info | Previous Builds]]
 | If you have previously installed EOSIO from source using shell scripts, you must first run the [Uninstall Script](01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md) before installing any prebuilt binaries on the same OS.
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md b/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md
index 3aaf65c2248..b5fd55849e6 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/01_download-eosio-source.md
@@ -1,3 +1,6 @@
+---
+content_title: Download EOSIO Source
+---
 
 To download the EOSIO source code, clone the `eos` repo and its submodules. It is adviced to create a home `eosio` folder first and download all the EOSIO related software there:
 
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
index a79b0d0e5e4..2abd7915c41 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
@@ -1,3 +1,6 @@
+---
+content_title: Build EOSIO Binaries
+---
 
 [[info | Shell Scripts]]
 | The build script is one of various automated shell scripts provided in the EOSIO repository for building, installing, and optionally uninstalling the EOSIO software and its dependencies. They are available in the `eos/scripts` folder.
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
index c8e09bd0c5f..5ea08c6ddbc 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md
@@ -1,3 +1,6 @@
+---
+content_title: Install EOSIO Binaries
+---
 
 ## EOSIO install script
 
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md
index 1381f00a53d..c3b0cf4c9b3 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/04_test-eosio-binaries.md
@@ -1,3 +1,6 @@
+---
+content_title: Test EOSIO Binaries
+---
 
 Optionally, a set of tests can be run against your build to perform some basic validation of the EOSIO software installation.
 
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/05_uninstall-eosio.md b/docs/00_install/01_build-from-source/01_shell-scripts/05_uninstall-eosio.md
index d8a80a87b71..00688a07bab 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/05_uninstall-eosio.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/05_uninstall-eosio.md
@@ -1,3 +1,6 @@
+---
+content_title: Uninstall EOSIO
+---
 
 If you have previously built EOSIO from source and now wish to install the prebuilt binaries, or to build from source again, it is recommended to run the `eosio_uninstall.sh` script within the `eos/scripts` folder:
 
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/index.md b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
index b0f9e4bd704..6e1f1ffbbe0 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/index.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
@@ -1,4 +1,6 @@
-# Shell Scripts
+---
+content_title: Shell Scripts
+---
 
 [[info | Did you know?]]
 | Shell scripts automate the process of building, installing, testing, and uninstalling the EOSIO software and dependencies.
diff --git a/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md b/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
index 08b9449bf7e..2b52fdfe7e4 100644
--- a/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
+++ b/docs/00_install/01_build-from-source/02_manual-build/00_eosio-dependencies.md
@@ -1,4 +1,6 @@
-# EOSIO Software Dependencies
+---
+content_title: EOSIO Software Dependencies
+---
 
 The EOSIO software requires specific software dependencies to build the EOSIO binaries. These dependencies can be built from source or installed from binaries directly. Dependencies can be pinned to a specific version release or unpinned to the current version, usually the latest one. The main EOSIO dependencies hosted outside the EOSIO repos are:
 
diff --git a/docs/00_install/01_build-from-source/02_manual-build/index.md b/docs/00_install/01_build-from-source/02_manual-build/index.md
index 59ecc4ceba8..0852795c3fe 100644
--- a/docs/00_install/01_build-from-source/02_manual-build/index.md
+++ b/docs/00_install/01_build-from-source/02_manual-build/index.md
@@ -1,4 +1,6 @@
-# EOSIO Manual Build
+---
+content_title: EOSIO Manual Build
+---
 
 [[info | Manual Builds are for Advanced Developers]]
 | These manual instructions are intended for advanced developers. The [Shell Scripts](../01_shell-scripts/index.md) should be the preferred method to build EOSIO from source. If the script fails or your platform is not supported, continue with the instructions below.
diff --git a/docs/00_install/01_build-from-source/index.md b/docs/00_install/01_build-from-source/index.md
index 12a68aeda69..03f3db858f0 100644
--- a/docs/00_install/01_build-from-source/index.md
+++ b/docs/00_install/01_build-from-source/index.md
@@ -1,4 +1,6 @@
-# Build EOSIO from Source
+---
+content_title: Build EOSIO from Source
+---
 
 [[info | Building EOSIO is for Advanced Developers]]
 | If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../00_install-prebuilt-binaries.md) instead of building from source.
diff --git a/docs/00_install/index.md b/docs/00_install/index.md
index fc69df995af..ad36933624f 100644
--- a/docs/00_install/index.md
+++ b/docs/00_install/index.md
@@ -1,4 +1,6 @@
-# EOSIO Software Installation
+---
+content_title: EOSIO Software Installation
+---
 
 There are various ways to install and use the EOSIO software:
 
diff --git a/docs/01_nodeos/02_usage/00_nodeos-options.md b/docs/01_nodeos/02_usage/00_nodeos-options.md
index 97291a9ef37..d81d133ee36 100644
--- a/docs/01_nodeos/02_usage/00_nodeos-options.md
+++ b/docs/01_nodeos/02_usage/00_nodeos-options.md
@@ -1,3 +1,6 @@
+---
+content_title: Nodeos Options
+---
 
 `Nodeos` is a command line interface (CLI) application. As such, it can be started manually from the command line or through an automated script. The behavior of `nodeos` is determined mainly by which plugins are loaded and which plugin options are used. The `nodeos` application features two main option categories: *nodeos-specific* options and *plugin-specific* options.
 
diff --git a/docs/01_nodeos/02_usage/01_nodeos-configuration.md b/docs/01_nodeos/02_usage/01_nodeos-configuration.md
index 3dd689e4ba9..227dddab442 100644
--- a/docs/01_nodeos/02_usage/01_nodeos-configuration.md
+++ b/docs/01_nodeos/02_usage/01_nodeos-configuration.md
@@ -1,3 +1,6 @@
+---
+content_title: Nodeos Configuration
+---
 
 The plugin-specific options can be configured using either CLI options or a configuration file, `config.ini`. Nodeos-specific options can only be configured from the command line. All CLI options and `config.ini` options can be found by running `$ nodeos --help` as shown above.
 
diff --git a/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md b/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
index abc794799a9..583a301c927 100644
--- a/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
+++ b/docs/01_nodeos/02_usage/02_node-setups/00_producing-node.md
@@ -1,3 +1,6 @@
+---
+content_title: Producing Node Setup
+---
 
 [[info | System contracts required]]
 | These instructions assume you want to launch a producing node on a network with **system contracts loaded**. These instructions will not work on a default development node using native functionality, or one without system contracts loaded.
diff --git a/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md b/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
index 6dcb6c1a5dc..329507c3685 100644
--- a/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
+++ b/docs/01_nodeos/02_usage/02_node-setups/01_non-producing-node.md
@@ -1,3 +1,6 @@
+---
+content_title: Non-producing Node Setup
+---
 
 ## Goal
 
diff --git a/docs/01_nodeos/02_usage/02_node-setups/index.md b/docs/01_nodeos/02_usage/02_node-setups/index.md
index 7fa608fff40..ebad19d97a4 100644
--- a/docs/01_nodeos/02_usage/02_node-setups/index.md
+++ b/docs/01_nodeos/02_usage/02_node-setups/index.md
@@ -1,4 +1,6 @@
-# Nodeos Common Setups
+---
+content_title: Nodeos Common Setups
+---
 
 `Nodeos` generally runs in two modes:
 
diff --git a/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md b/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
index cbccc5f5051..5b29dff55cb 100644
--- a/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
+++ b/docs/01_nodeos/02_usage/03_development-environment/00_local-single-node-testnet.md
@@ -1,3 +1,6 @@
+---
+content_title: Local Single-Node Testnet
+---
 
 ## Goal
 
diff --git a/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md b/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
index 9aea73e2190..28dcb916f0f 100644
--- a/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
+++ b/docs/01_nodeos/02_usage/03_development-environment/01_local-multi-node-testnet.md
@@ -1,3 +1,6 @@
+---
+content_title: Local Multi-Node Testnet
+---
 
 ## Goal
 
diff --git a/docs/01_nodeos/02_usage/03_development-environment/index.md b/docs/01_nodeos/02_usage/03_development-environment/index.md
index 029dc36d0cd..c01fb17c51d 100644
--- a/docs/01_nodeos/02_usage/03_development-environment/index.md
+++ b/docs/01_nodeos/02_usage/03_development-environment/index.md
@@ -1,4 +1,6 @@
-# Development Environment
+---
+content_title: Development Environment
+---
 
 There are several ways to configure a `nodeos` environment for development and testing. Which option to use largely depends on what the project goals are. Some practical options are provided below.
 
diff --git a/docs/01_nodeos/02_usage/05_nodeos-implementation.md b/docs/01_nodeos/02_usage/05_nodeos-implementation.md
index 31e0fd841c9..aff18bf7b6e 100644
--- a/docs/01_nodeos/02_usage/05_nodeos-implementation.md
+++ b/docs/01_nodeos/02_usage/05_nodeos-implementation.md
@@ -1,3 +1,6 @@
+---
+content_title: Nodeos Implementation
+---
 
 The EOSIO platform stores blockchain information in various data structures at various stages of a transaction's lifecycle. Some of these are described below. The producing node is the `nodeos` instance run by the block producer who is currently creating blocks for the blockchain (which changes every 6 seconds, producing 12 blocks in sequence before switching to another producer.)
 
diff --git a/docs/01_nodeos/02_usage/index.md b/docs/01_nodeos/02_usage/index.md
index 7ce07849a2f..1edd34ab3f3 100644
--- a/docs/01_nodeos/02_usage/index.md
+++ b/docs/01_nodeos/02_usage/index.md
@@ -1,4 +1,6 @@
-# Nodeos Usage
+---
+content_title: Nodeos Usage
+---
 
 This section explains how to use `nodeos`, lists its configuration options, describes its local file layout, provides common setups, and discusses the potential test environments for development.
 
diff --git a/docs/01_nodeos/03_plugins/index.md b/docs/01_nodeos/03_plugins/index.md
index ad6fdaa9c32..4e0c09fd92f 100644
--- a/docs/01_nodeos/03_plugins/index.md
+++ b/docs/01_nodeos/03_plugins/index.md
@@ -1,4 +1,6 @@
-# Nodeos Plugins
+---
+content_title: Nodeos Plugins
+---
 
 ## Overview
 
diff --git a/docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md b/docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md
index 43756906e5b..3d6398082be 100644
--- a/docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md
+++ b/docs/01_nodeos/04_replays/how-to-generate-a-blocks.log.md
@@ -1,4 +1,6 @@
-<!-- ## How to generate a blocks.log file -->
+---
+content_title: How to generate a blocks.log file
+---
 
 The `blocks.log` file is used by `nodeos` to persist irreversible blocks. This is the actual local copy of the immutable blockchain maintained by the node. The default location of the `blocks.log` file is in the `data/blocks` directory. However the default data directory can be overridden with the `-d [ --data-dir ]` option on the `nodeos` command line.
 
diff --git a/docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md b/docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md
index d708595d467..972f7c329f7 100644
--- a/docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md
+++ b/docs/01_nodeos/04_replays/how-to-generate-a-snapshot.md
@@ -1,4 +1,6 @@
-<!-- ## How to generate a snapshot -->
+---
+content_title: How to generate a snapshot
+---
 
 You can force a running `nodeos` instance to create a snapshot by using the `create_snapshot` RPC API call supported by the `producer_api_plugin`. This will create a snapshot file in the `data/snapshots` directory. Snapshot files are written to disk with the name pattern `*snapshot-\<head_block_id_in_hex\>.bin*`.
 
diff --git a/docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md b/docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md
index df3f5cf2850..6489ed570f8 100644
--- a/docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md
+++ b/docs/01_nodeos/04_replays/how-to-replay-from-a-blocks.log.md
@@ -1,4 +1,6 @@
-<!-- # How to replay from a blocks.log file -->
+---
+content_title: How to replay from a blocks.log file
+---
 
 Once you have obtained a copy of the `blocks.log` file which you wish to replay the blockchain from, copy it to your `data/blocks` directory, backing up any existing contents if you wish to keep them, and remove the `blocks.index`, `forkdb.dat`, `shared_memory.bin`, and `shared_memory.meta`.
 
diff --git a/docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md b/docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md
index bca108cbc13..e94d0aba45b 100644
--- a/docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md
+++ b/docs/01_nodeos/04_replays/how-to-replay-from-a-snapshot.md
@@ -1,4 +1,6 @@
-<!-- ## How to replay from a snapshot -->
+---
+content_title: How to replay from a snapshot
+---
 
 Once you have obtained a copy of a valid snapshot file from which you wish to create a valid chain state, copy it to your data/snapshots directory, backing up (if you wish to keep them) and removing any existing contents of the data directory.
 
diff --git a/docs/01_nodeos/04_replays/index.md b/docs/01_nodeos/04_replays/index.md
index 6fd8435b425..340a9fa317f 100644
--- a/docs/01_nodeos/04_replays/index.md
+++ b/docs/01_nodeos/04_replays/index.md
@@ -1,4 +1,6 @@
-# Nodeos Replays
+---
+content_title: Nodeos Replays
+---
 
 Nodeos provides various options for replaying blockchain blocks. This can be useful if, for example, a node has downloaded a `blocks.log` file from the internet (as a faster alternative to synchronizing from the p2p network) and the node wants to use it to quickly catch up with the network, or if you want to know the chain state at specified points in a blockchain's life.
 
diff --git a/docs/01_nodeos/06_logging/00_setup-logging.json.md b/docs/01_nodeos/06_logging/00_setup-logging.json.md
index 049f1d9d416..12bc116c791 100644
--- a/docs/01_nodeos/06_logging/00_setup-logging.json.md
+++ b/docs/01_nodeos/06_logging/00_setup-logging.json.md
@@ -1,3 +1,7 @@
+---
+content_title: Setup logging.json
+---
+
 The `logging.json` file is usually located in the specified `--config-dir`, the same directory as the `config.ini` file. This path can be explicitly defined using the `-l` or `--logconf` options when starting `nodeos`.
  
 ```sh
diff --git a/docs/01_nodeos/06_logging/01_logging-levels.md b/docs/01_nodeos/06_logging/01_logging-levels.md
index 4197d3a86a1..bb68ceeeb1d 100644
--- a/docs/01_nodeos/06_logging/01_logging-levels.md
+++ b/docs/01_nodeos/06_logging/01_logging-levels.md
@@ -1,3 +1,7 @@
+---
+content_title: Logging Levels
+---
+
 There are six available logging levels:
 - all
 - debug
diff --git a/docs/01_nodeos/06_logging/index.md b/docs/01_nodeos/06_logging/index.md
index b6ad286ea06..8ad1157688f 100644
--- a/docs/01_nodeos/06_logging/index.md
+++ b/docs/01_nodeos/06_logging/index.md
@@ -1,4 +1,6 @@
-# Logging
+---
+content_title: Nodeos Logging
+---
 
 Logging for `nodeos` is controlled by the `logging.json` file. CLI options can be passed to `nodeos` to [setup `logging.json`](00_setup-logging.json.md). The logging configuration file can be used to define [appenders](#appenders) and tie them to [loggers](#loggers) and [logging levels](01_logging-levels.md).
 
diff --git a/docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md b/docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md
index 5a5e411b73f..f51102a26c1 100644
--- a/docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md
+++ b/docs/01_nodeos/07_upgrade-guides/1.8-upgrade-guide.md
@@ -1,4 +1,6 @@
-# EOSIO 1.8+ Consensus Protocol Upgrade Process
+---
+content_title: EOSIO 1.8+ Consensus Protocol Upgrade Process
+---
 
 This guide is intended to instruct node operators on the steps needed to successfully transition an EOSIO network through a consensus protocol upgrade (also known as a "hard fork") with minimal disruption to users.
 
diff --git a/docs/01_nodeos/07_upgrade-guides/index.md b/docs/01_nodeos/07_upgrade-guides/index.md
index c4c95438f1a..a1d178dd8fb 100644
--- a/docs/01_nodeos/07_upgrade-guides/index.md
+++ b/docs/01_nodeos/07_upgrade-guides/index.md
@@ -1,4 +1,6 @@
-# Upgrade Guides
+---
+content_title: Nodeos Upgrade Guides
+---
 
 This section contains important instructions for node operators and other EOSIO stakeholders to transition an EOSIO network successfully through an EOSIO version or protocol upgrade.
 
diff --git a/docs/01_nodeos/08_troubleshooting/index.md b/docs/01_nodeos/08_troubleshooting/index.md
index a9b1019e3eb..c991d5b9812 100644
--- a/docs/01_nodeos/08_troubleshooting/index.md
+++ b/docs/01_nodeos/08_troubleshooting/index.md
@@ -1,4 +1,6 @@
-# Troubleshooting
+---
+content_title: Nodeos Troubleshooting
+---
 
 ### "Database dirty flag set (likely due to unclean shutdown): replay required"
 
diff --git a/docs/01_nodeos/index.md b/docs/01_nodeos/index.md
index f4d08489647..030ffc71ca5 100644
--- a/docs/01_nodeos/index.md
+++ b/docs/01_nodeos/index.md
@@ -1,4 +1,6 @@
-# Nodeos
+---
+content_title: Nodeos
+---
 
 ## Introduction
 
diff --git a/docs/02_cleos/04_troubleshooting.md b/docs/02_cleos/04_troubleshooting.md
index e2f6b6e32c4..b41e734cf59 100644
--- a/docs/02_cleos/04_troubleshooting.md
+++ b/docs/02_cleos/04_troubleshooting.md
@@ -1,3 +1,7 @@
+---
+content_title: Cleos Troubleshooting
+---
+
 ## Cannot connect to RPC endpoint
 
 Check if your local nodeos is running by visiting the following URL in your browser:
diff --git a/docs/02_cleos/05_FAQ.md b/docs/02_cleos/05_FAQ.md
index 0b28f80a35a..1813e8dd656 100644
--- a/docs/02_cleos/05_FAQ.md
+++ b/docs/02_cleos/05_FAQ.md
@@ -1,3 +1,7 @@
+---
+content_title: Cleos FAQ
+---
+
 ## Domain Socket (IPC) vs. HTTPS (RPC)
 
 There are two options to connect `cleos` to `keosd`. You can either use domain sockets or HTTPS. Uses domain socket offering many benefits. It reduces the chance of leaking access of `keosd` to the LAN, WAN or Internet. Also, unlike HTTPS protocol where many attack vectors exist such as CORS, a domain socket can only be used for the intended use case Inter-Processes Communication
diff --git a/docs/02_cleos/index.md b/docs/02_cleos/index.md
index d4e63e56e27..4328cbeca94 100644
--- a/docs/02_cleos/index.md
+++ b/docs/02_cleos/index.md
@@ -1,4 +1,6 @@
-# Cleos
+---
+content_title: Cleos
+---
 
 ## Introduction
 
diff --git a/docs/03_keosd/10_usage.md b/docs/03_keosd/10_usage.md
index 68f4a41a295..9e1846b266f 100644
--- a/docs/03_keosd/10_usage.md
+++ b/docs/03_keosd/10_usage.md
@@ -1,3 +1,6 @@
+---
+content_title: Keosd Usage
+---
 
 [[info | Recommended Usage]]
 | For most users, the easiest way to use `keosd` is to have `cleos` launch it automatically. Wallet files will be created in the default directory (`~/eosio-wallet`).
diff --git a/docs/03_keosd/15_plugins/index.md b/docs/03_keosd/15_plugins/index.md
index 49758a973ce..77c787a117a 100644
--- a/docs/03_keosd/15_plugins/index.md
+++ b/docs/03_keosd/15_plugins/index.md
@@ -1,4 +1,6 @@
-# Keosd Plugins
+---
+content_title: Keosd Plugins
+---
 
 ## Overview
 
diff --git a/docs/03_keosd/20_security.md b/docs/03_keosd/20_security.md
index 66dd791528a..04219f8ff34 100644
--- a/docs/03_keosd/20_security.md
+++ b/docs/03_keosd/20_security.md
@@ -1,3 +1,7 @@
+---
+content_title: Keosd Security
+---
+
 ### How does `keosd` Locking/Unlocking works and what are the security implications?
 
 From a user's perspective, when a wallet is created, it remains in an `unlocked` state. Depending on the way `keosd` is launched, it may remain `unlocked` until the process is restarted. When a wallet is locked (either by timeout or process restart) the password is required to unlock it.
diff --git a/docs/03_keosd/30_how-to-guides/index.md b/docs/03_keosd/30_how-to-guides/index.md
index ea92ec5eeaf..ec0bd09ccf8 100644
--- a/docs/03_keosd/30_how-to-guides/index.md
+++ b/docs/03_keosd/30_how-to-guides/index.md
@@ -1,2 +1,5 @@
+---
+content_title: Keosd How-to Guides
+---
 
 * [How to attach a YubiHSM hard wallet](how-to-attach-a-yubihsm-hard-wallet.md)
diff --git a/docs/03_keosd/35_wallet-specification.md b/docs/03_keosd/35_wallet-specification.md
index 39bb1b3f816..f91867e624d 100644
--- a/docs/03_keosd/35_wallet-specification.md
+++ b/docs/03_keosd/35_wallet-specification.md
@@ -1,3 +1,7 @@
+---
+content_title: EOS Wallet Specification
+---
+
 ## EOS Wallet Import Format (WIF)
 
 Wallet Import Format is an encoding for a private EDSA key.  EOS uses the same version, checksum, and encoding scheme as the Bitcoin WIF addresses and should be compatible with existing libraries [1].
diff --git a/docs/03_keosd/40_troubleshooting.md b/docs/03_keosd/40_troubleshooting.md
index b384ce8dcf0..8aa9c6d9280 100644
--- a/docs/03_keosd/40_troubleshooting.md
+++ b/docs/03_keosd/40_troubleshooting.md
@@ -1,3 +1,7 @@
+---
+content_title: Keosd Troubleshooting
+---
+
 ## How to solve the error "Failed to lock access to wallet directory; is another keosd running"?
 
 Since `cleos` may auto-launch an instance of `keosd`, it is possible to end up with multiple instances of `keosd` running. That can cause unexpected behavior or the error message above.
diff --git a/docs/03_keosd/50_FAQ.md b/docs/03_keosd/50_FAQ.md
index a5b93db6717..f58052c0437 100644
--- a/docs/03_keosd/50_FAQ.md
+++ b/docs/03_keosd/50_FAQ.md
@@ -1,3 +1,7 @@
+---
+content_title: Keosd FAQ
+---
+
 ### How does `keosd` store key pairs
 
 `keosd` encrypts key pairs under-the-hood before storing them on a wallet file. Depending on the wallet implementation, say Secure Clave or YubiHSM, a specific cryptographic algorithm will be used. When the standard file system of a UNIX-based OS is used, `keosd` encrypts key pairs using 256-bit AES in CBC mode.
diff --git a/docs/03_keosd/index.md b/docs/03_keosd/index.md
index 70ea1f30c45..43f2301dbb5 100644
--- a/docs/03_keosd/index.md
+++ b/docs/03_keosd/index.md
@@ -1,4 +1,6 @@
-# Keosd
+---
+content_title: Keosd
+---
 
 ## Introduction
 
diff --git a/docs/index.md b/docs/index.md
index 2e3dcab590b..6589f21f43d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,4 +1,6 @@
-# EOSIO Overview
+---
+content_title: EOSIO Overview
+---
 
 EOSIO is the next-generation blockchain platform for creating and deploying smart contracts and distributed applications. EOSIO comes with a number of programs. The primary ones included in EOSIO are the following:
 

From 9e25ceec069bb7c6b5624ad25947ce08e105d501 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Mon, 23 Dec 2019 08:33:21 -0500
Subject: [PATCH 1605/1648] fix script uninstall link on callout

---
 docs/00_install/00_install-prebuilt-binaries.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index 819104bfaa1..054718e07a6 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -3,7 +3,7 @@ content_title: Install Prebuilt Binaries
 ---
 
 [[info | Previous Builds]]
-| If you have previously installed EOSIO from source using shell scripts, you must first run the [Uninstall Script](01_build-from-source/01_shell-scripts/03_install-eosio-binaries.md) before installing any prebuilt binaries on the same OS.
+| If you have previously installed EOSIO from source using shell scripts, you must first run the [Uninstall Script](01_build-from-source/01_shell-scripts/05_uninstall-eosio.md) before installing any prebuilt binaries on the same OS.
 
 ## Prebuilt Binaries
 

From 4b1c609648b24ef348c2e7d631e3a81172dd9346 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Mon, 23 Dec 2019 11:10:58 -0500
Subject: [PATCH 1606/1648] add platforms folder containing manual build
 instructions

---
 .../03_platforms/amazon_linux-2-pinned.md     | 136 ++++++++++++++++
 .../03_platforms/amazon_linux-2-unpinned.md   | 112 ++++++++++++++
 .../03_platforms/centos-7.7-pinned.md         | 146 ++++++++++++++++++
 .../03_platforms/centos-7.7-unpinned.md       | 122 +++++++++++++++
 .../02_manual-build/03_platforms/index.md     |  13 ++
 .../03_platforms/macos-10.14-pinned.md        | 113 ++++++++++++++
 .../03_platforms/macos-10.14-unpinned.md      |  92 +++++++++++
 .../03_platforms/ubuntu-16.04-pinned.md       | 135 ++++++++++++++++
 .../03_platforms/ubuntu-18.04-pinned.md       | 135 ++++++++++++++++
 .../03_platforms/ubuntu-18.04-unpinned.md     | 112 ++++++++++++++
 10 files changed, 1116 insertions(+)
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/amazon_linux-2-pinned.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/amazon_linux-2-unpinned.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/centos-7.7-pinned.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/centos-7.7-unpinned.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/index.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/macos-10.14-pinned.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/macos-10.14-unpinned.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-16.04-pinned.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-18.04-pinned.md
 create mode 100644 docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-18.04-unpinned.md

diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/amazon_linux-2-pinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/amazon_linux-2-pinned.md
new file mode 100644
index 00000000000..2cde1ba4ada
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/amazon_linux-2-pinned.md
@@ -0,0 +1,136 @@
+---
+content_title: Amazon Linux 2 (pinned)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on Amazon Linux 2.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+yum update -y && yum install -y git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install EOSIO Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+yum install -y which sudo procps-ng util-linux autoconf automake \
+    libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
+    libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
+    graphviz patch gcc gcc-c++ vim-common jq
+# build cmake
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=$EOSIO_INSTALL_LOCATION && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/cmake-3.13.2.tar.gz $EOSIO_INSTALL_LOCATION/cmake-3.13.2
+# build clang
+cd $EOSIO_INSTALL_LOCATION && git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    cd $EOSIO_INSTALL_LOCATION/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir $EOSIO_INSTALL_LOCATION/clang8/build && cd $EOSIO_INSTALL_LOCATION/clang8/build && \
+    cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/clang8
+# build llvm
+cd $EOSIO_INSTALL_LOCATION && git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
+    cd llvm && \
+    mkdir build && \
+    cd build && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/llvm
+# build boost
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --with-toolset=clang --prefix=$EOSIO_INSTALL_LOCATION && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I$EOSIO_INSTALL_LOCATION/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/boost_1_71_0.tar.bz2 $EOSIO_INSTALL_LOCATION/boost_1_71_0
+# build mongodb
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-amazon-3.6.3/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-amazon-3.6.3
+# build mongodb c driver
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF  -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# build mongodb cxx driver
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    mkdir -p build && cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && $EOSIO_INSTALL_LOCATION/bin/cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(nproc)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. This task is optional but recommended. Make sure to [Install EOSIO](#install-eosio) first.
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/amazon_linux-2-unpinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/amazon_linux-2-unpinned.md
new file mode 100644
index 00000000000..804e50fa2cc
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/amazon_linux-2-unpinned.md
@@ -0,0 +1,112 @@
+---
+content_title: Amazon Linux 2 (unpinned)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on Amazon Linux 2.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+yum update -y && yum install -y git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install EOSIO Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+yum install -y which sudo procps-ng util-linux autoconf automake \
+    libtool make bzip2 bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel \
+    libusbx-devel python3 python3-devel python-devel libedit-devel doxygen \
+    graphviz clang patch llvm-devel llvm-static vim-common jq
+# build cmake
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=$EOSIO_INSTALL_LOCATION && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/cmake-3.13.2.tar.gz $EOSIO_INSTALL_LOCATION/cmake-3.13.2
+# build boost
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --prefix=$EOSIO_INSTALL_LOCATION && \
+    ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/boost_1_71_0.tar.bz2 $EOSIO_INSTALL_LOCATION/boost_1_71_0
+# build mongodb
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-amazon-3.6.3/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-amazon-3.6.3
+# build mongodb c driver
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# build mongodb cxx driver
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    mkdir -p build && cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && $EOSIO_INSTALL_LOCATION/bin/cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_C_COMPILER='clang' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(nproc)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. This task is optional but recommended. Make sure to [Install EOSIO](#install-eosio) first.
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/centos-7.7-pinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/centos-7.7-pinned.md
new file mode 100644
index 00000000000..ead772956c7
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/centos-7.7-pinned.md
@@ -0,0 +1,146 @@
+---
+content_title: Centos 7.7 (pinned)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on Centos 7.7.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+yum update -y && yum install -y git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install EOSIO Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+yum update -y && \
+    yum install -y epel-release && \
+    yum --enablerepo=extras install -y centos-release-scl && \
+    yum --enablerepo=extras install -y devtoolset-8 && \
+    yum --enablerepo=extras install -y which autoconf automake libtool make bzip2 doxygen \
+    graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel python python-devel \
+    rh-python36 file libusbx-devel libcurl-devel patch vim-common jq
+# build cmake
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    source /opt/rh/devtoolset-8/enable && \
+    source /opt/rh/rh-python36/enable && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=$EOSIO_INSTALL_LOCATION && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/cmake-3.13.2.tar.gz $EOSIO_INSTALL_LOCATION/cmake-3.13.2
+# apply clang patch
+cp -f $EOSIO_LOCATION/scripts/clang-devtoolset8-support.patch /tmp/clang-devtoolset8-support.patch
+# build clang
+cd $EOSIO_INSTALL_LOCATION && git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    patch -p2 < /tmp/clang-devtoolset8-support.patch && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    cd $EOSIO_INSTALL_LOCATION/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir $EOSIO_INSTALL_LOCATION/clang8/build && cd $EOSIO_INSTALL_LOCATION/clang8/build && \
+    source /opt/rh/devtoolset-8/enable && \
+    source /opt/rh/rh-python36/enable && \
+    cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/clang8
+# build llvm
+cd $EOSIO_INSTALL_LOCATION && git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
+    cd llvm && \
+    mkdir build && \
+    cd build && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/llvm
+# build boost
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --with-toolset=clang --prefix=$EOSIO_INSTALL_LOCATION && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I$EOSIO_INSTALL_LOCATION/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/boost_1_71_0.tar.bz2 $EOSIO_INSTALL_LOCATION/boost_1_71_0
+# build mongodb
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-amazon-3.6.3/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-amazon-3.6.3
+# build mongodb c driver
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF  -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# build mongodb cxx driver
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    mkdir -p build && cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(nproc)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. This task is optional but recommended. Make sure to [Install EOSIO](#install-eosio) first.
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/centos-7.7-unpinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/centos-7.7-unpinned.md
new file mode 100644
index 00000000000..d43af130696
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/centos-7.7-unpinned.md
@@ -0,0 +1,122 @@
+---
+content_title: Centos 7.7 (unpinned)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on Centos 7.7.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+yum update -y && yum install -y git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install EOSIO Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+yum update -y && \
+    yum install -y epel-release && \
+    yum --enablerepo=extras install -y centos-release-scl && \
+    yum --enablerepo=extras install -y devtoolset-8 && \
+    yum --enablerepo=extras install -y which git autoconf automake libtool make bzip2 doxygen \
+    graphviz bzip2-devel openssl-devel gmp-devel ocaml libicu-devel \
+    python python-devel rh-python36 file libusbx-devel \
+    libcurl-devel patch vim-common jq llvm-toolset-7.0-llvm-devel llvm-toolset-7.0-llvm-static
+# build cmake
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    source /opt/rh/devtoolset-8/enable && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=$EOSIO_INSTALL_LOCATION && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/cmake-3.13.2.tar.gz $EOSIO_INSTALL_LOCATION/cmake-3.13.2
+# apply clang patch
+cp -f $EOSIO_LOCATION/scripts/clang-devtoolset8-support.patch /tmp/clang-devtoolset8-support.patch
+# build boost
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    source /opt/rh/devtoolset-8/enable && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --prefix=$EOSIO_INSTALL_LOCATION && \
+    ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/boost_1_71_0.tar.bz2 $EOSIO_INSTALL_LOCATION/boost_1_71_0
+# build mongodb
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && rm -f mongodb-linux-x86_64-amazon-3.6.3.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-amazon-3.6.3/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-amazon-3.6.3
+# build mongodb c driver
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    source /opt/rh/devtoolset-8/enable && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# build mongodb cxx driver
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    source /opt/rh/devtoolset-8/enable && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    mkdir -p build && cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && source /opt/rh/devtoolset-8/enable && cmake -DCMAKE_BUILD_TYPE='Release' -DLLVM_DIR='/opt/rh/llvm-toolset-7.0/root/usr/lib64/cmake/llvm' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(nproc)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. This task is optional but recommended. Make sure to [Install EOSIO](#install-eosio) first.
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && source /opt/rh/rh-python36/enable && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/index.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/index.md
new file mode 100644
index 00000000000..2a8b2680830
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/index.md
@@ -0,0 +1,13 @@
+---
+content_title: Platforms
+---
+
+* [Amazon Linux 2 (pinned)](amazon_linux-2-pinned.md)
+* [Amazon Linux 2 (unpinned)](amazon_linux-2-unpinned.md)
+* [CentOS 7.7 (pinned)](centos-7.7-pinned.md)
+* [CentOS 7.7 (unpinned)](centos-7.7-unpinned.md)
+* [MacOS 10.14 (pinned)](macos-10.14-pinned.md)
+* [MacOS 10.14 (unpinned)](macos-10.14-unpinned.md)
+* [Ubuntu 16.04 (pinned)](ubuntu-16.04-pinned.md)
+* [Ubuntu 18.04 (pinned)](ubuntu-18.04-pinned.md)
+* [Ubuntu 18.04 (unpinned)](ubuntu-18.04-unpinned.md)
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/macos-10.14-pinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/macos-10.14-pinned.md
new file mode 100644
index 00000000000..edd27859c0b
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/macos-10.14-pinned.md
@@ -0,0 +1,113 @@
+---
+content_title: MacOS 10.14 (pinned compiler)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on MacOS 10.14.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+brew update && brew install git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install EOSIO Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+brew install cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl@1.1 jq || :
+# Boost Fix: eosio/install/bin/../include/c++/v1/stdlib.h:94:15: fatal error: 'stdlib.h' file not found
+SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
+# build clang
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+cd $EOSIO_INSTALL_LOCATION && git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    mkdir -p $EOSIO_INSTALL_LOCATION/clang8/projects && cd $EOSIO_INSTALL_LOCATION/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir $EOSIO_INSTALL_LOCATION/clang8/build && cd $EOSIO_INSTALL_LOCATION/clang8/build && \
+    cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(getconf _NPROCESSORS_ONLN) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/clang8
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && cd boost_1_71_0 && \
+    SDKROOT="$SDKROOT" ./bootstrap.sh --prefix=$EOSIO_INSTALL_LOCATION && \
+    SDKROOT="$SDKROOT" ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/boost_1_71_0.tar.bz2 $EOSIO_INSTALL_LOCATION/boost_1_71_0
+# install mongodb
+cd $EOSIO_INSTALL_LOCATION && curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
+    tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz && rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-osx-x86_64-3.6.3/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-osx-x86_64-3.6.3
+# install mongo-c-driver from source
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p cmake-build && cd cmake-build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF .. && \
+    make -j $(getconf _NPROCESSORS_ONLN) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# install mongo-cxx-driver from source
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0/build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION .. && \
+    make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1 && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(getconf _NPROCESSORS_ONLN)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. This task is optional but recommended. Make sure to [Install EOSIO](#install-eosio) first.
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/macos-10.14-unpinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/macos-10.14-unpinned.md
new file mode 100644
index 00000000000..e3596fb21e4
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/macos-10.14-unpinned.md
@@ -0,0 +1,92 @@
+---
+content_title: MacOS 10.14 (native compiler)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on MacOS 10.14.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+brew update && brew install git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+brew install cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl@1.1 jq boost || :
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+# install mongodb
+mkdir -p $EOSIO_INSTALL_LOCATION/bin
+cd $EOSIO_INSTALL_LOCATION && curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
+    tar -xzf mongodb-osx-ssl-x86_64-3.6.3.tgz && rm -f mongodb-osx-ssl-x86_64-3.6.3.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-osx-x86_64-3.6.3/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-osx-x86_64-3.6.3 && rm -rf $EOSIO_INSTALL_LOCATION/mongodb-osx-ssl-x86_64-3.6.3.tgz
+# install mongo-c-driver from source
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p cmake-build && cd cmake-build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=DARWIN -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF .. && \
+    make -j $(getconf _NPROCESSORS_ONLN) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# install mongo-cxx-driver from source
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0/build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION .. && \
+    make -j $(getconf _NPROCESSORS_ONLN) VERBOSE=1 && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(getconf _NPROCESSORS_ONLN)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. This task is optional but recommended. Make sure to [Install EOSIO](#install-eosio) first.
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-16.04-pinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-16.04-pinned.md
new file mode 100644
index 00000000000..d127b13bdcd
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-16.04-pinned.md
@@ -0,0 +1,135 @@
+---
+content_title: Ubuntu 16.04 (pinned)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on Ubuntu 16.04.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+apt-get update && apt-get upgrade -y && DEBIAN_FRONTEND=noninteractive apt-get install -y git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install EOSIO Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+apt-get install -y build-essential automake \
+    libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev python2.7 python2.7-dev \
+    python3 python3-dev autoconf libtool curl zlib1g-dev sudo ruby libusb-1.0-0-dev libcurl4-gnutls-dev \
+    pkg-config apt-transport-https vim-common jq
+# build cmake
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=$EOSIO_INSTALL_LOCATION && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/cmake-3.13.2.tar.gz $EOSIO_INSTALL_LOCATION/cmake-3.13.2
+# build clang
+cd $EOSIO_INSTALL_LOCATION && git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    cd $EOSIO_INSTALL_LOCATION/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir $EOSIO_INSTALL_LOCATION/clang8/build && cd $EOSIO_INSTALL_LOCATION/clang8/build && \
+    cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/clang8
+# build llvm
+cd $EOSIO_INSTALL_LOCATION && git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
+    cd llvm && \
+    mkdir build && cd build && \
+    cmake -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/llvm
+# build boost
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --with-toolset=clang --prefix=$EOSIO_INSTALL_LOCATION && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I$EOSIO_INSTALL_LOCATION/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/boost_1_71_0.tar.bz2 $EOSIO_INSTALL_LOCATION/boost_1_71_0
+# build mongodb
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \
+    tar -xzf mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && rm -f mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-ubuntu1604-3.6.3/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-ubuntu1604-3.6.3
+# build mongodb c driver
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF  -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# build mongodb cxx driver
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    mkdir -p build && cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(nproc)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. This task is optional but recommended. Make sure to [Install EOSIO](#install-eosio) first.
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-18.04-pinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-18.04-pinned.md
new file mode 100644
index 00000000000..81e7952c931
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-18.04-pinned.md
@@ -0,0 +1,135 @@
+---
+content_title: Ubuntu 18.04 (pinned)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on Ubuntu 18.04.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+apt-get update && apt-get upgrade -y && DEBIAN_FRONTEND=noninteractive apt-get install -y git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install EOSIO Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+apt-get install -y make bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev autotools-dev libicu-dev \
+    python2.7 python2.7-dev python3 python3-dev autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
+    libcurl4-gnutls-dev pkg-config patch vim-common jq
+# build cmake
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=$EOSIO_INSTALL_LOCATION && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/cmake-3.13.2.tar.gz $EOSIO_INSTALL_LOCATION/cmake-3.13.2
+# build clang
+cd $EOSIO_INSTALL_LOCATION && git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 && cd clang8 && git checkout 18e41dc && \
+    cd tools && git clone --single-branch --branch release_80 https://git.llvm.org/git/lld.git && cd lld && git checkout d60a035 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/polly.git && cd polly && git checkout 1bc06e5 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang.git clang && cd clang && git checkout a03da8b && \
+    cd tools && mkdir extra && cd extra && git clone --single-branch --branch release_80 https://git.llvm.org/git/clang-tools-extra.git && cd clang-tools-extra && git checkout 6b34834 && \
+    cd $EOSIO_INSTALL_LOCATION/clang8/projects && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxx.git && cd libcxx && git checkout 1853712 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libcxxabi.git && cd libcxxabi && git checkout d7338a4 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/libunwind.git && cd libunwind && git checkout 57f6739 && \
+    cd ../ && git clone --single-branch --branch release_80 https://git.llvm.org/git/compiler-rt.git && cd compiler-rt && git checkout 5bc7979 && \
+    mkdir $EOSIO_INSTALL_LOCATION/clang8/build && cd $EOSIO_INSTALL_LOCATION/clang8/build && \
+    cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j $(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/clang8
+# build llvm
+cd $EOSIO_INSTALL_LOCATION && git clone --depth 1 --single-branch --branch release_80 https://github.com/llvm-mirror/llvm.git llvm && \
+    cd llvm && \
+    mkdir build && \
+    cd build && \
+    cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION  -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/llvm
+# build boost
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --with-toolset=clang --prefix=$EOSIO_INSTALL_LOCATION && \
+    ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I$EOSIO_INSTALL_LOCATION/include/c++/v1 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie' linkflags='-stdlib=libc++ -pie' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/boost_1_71_0.tar.bz2 $EOSIO_INSTALL_LOCATION/boost_1_71_0
+# build mongodb
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
+    tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && rm -f mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-ubuntu1804-4.1.1/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-ubuntu1804-4.1.1
+# build mongodb c driver
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF  -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# build mongodb cxx driver
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    mkdir -p build && cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_TOOLCHAIN_FILE=$EOSIO_LOCATION/scripts/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(nproc)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. This task is optional but recommended. Make sure to [Install EOSIO](#install-eosio) first.
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```
diff --git a/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-18.04-unpinned.md b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-18.04-unpinned.md
new file mode 100644
index 00000000000..6def97a519a
--- /dev/null
+++ b/docs/00_install/01_build-from-source/02_manual-build/03_platforms/ubuntu-18.04-unpinned.md
@@ -0,0 +1,112 @@
+---
+content_title: Ubuntu 18.04 (unpinned)
+---
+
+This section contains shell commands to manually download, build, install, test, and uninstall EOSIO and dependencies on Ubuntu 18.04.
+
+[[info | Building EOSIO is for Advanced Developers]]
+| If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](../../../00_install-prebuilt-binaries.md) instead of building from source.
+
+Select a task below, then copy/paste the shell commands to a Unix terminal to execute:
+
+* [Download EOSIO Repository](#download-eosio-repository)
+* [Install EOSIO Dependencies](#install-eosio-dependencies)
+* [Build EOSIO](#build-eosio)
+* [Install EOSIO](#install-eosio)
+* [Test EOSIO](#test-eosio)
+* [Uninstall EOSIO](#uninstall-eosio)
+
+[[info | Building EOSIO on another OS?]]
+| Visit the [Build EOSIO from Source](../../index.md) section.
+
+## Download EOSIO Repository
+These commands set the EOSIO directories, install git, and clone the EOSIO repository.
+```sh
+# set EOSIO directories
+export EOSIO_LOCATION=~/eosio/eos
+export EOSIO_INSTALL_LOCATION=$EOSIO_LOCATION/../install
+mkdir -p $EOSIO_INSTALL_LOCATION
+# install git
+apt-get update && apt-get upgrade -y && DEBIAN_FRONTEND=noninteractive apt-get install -y git
+# clone EOSIO repository
+git clone https://github.com/EOSIO/eos.git $EOSIO_LOCATION
+cd $EOSIO_LOCATION && git submodule update --init --recursive
+```
+
+## Install EOSIO Dependencies
+These commands install the EOSIO software dependencies. Make sure to [Download the EOSIO Repository](#download-eosio-repository) first and set the EOSIO directories.
+```sh
+# install dependencies
+apt-get install -y make bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \
+    autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \
+    autoconf libtool curl zlib1g-dev sudo ruby libusb-1.0-0-dev \
+    libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang-7 vim-common jq
+# build cmake
+export PATH=$EOSIO_INSTALL_LOCATION/bin:$PATH
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \
+    tar -xzf cmake-3.13.2.tar.gz && \
+    cd cmake-3.13.2 && \
+    ./bootstrap --prefix=$EOSIO_INSTALL_LOCATION && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/cmake-3.13.2.tar.gz $EOSIO_INSTALL_LOCATION/cmake-3.13.2
+# build boost
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \
+    tar -xjf boost_1_71_0.tar.bz2 && \
+    cd boost_1_71_0 && \
+    ./bootstrap.sh --prefix=$EOSIO_INSTALL_LOCATION && \
+    ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/boost_1_71_0.tar.bz2 $EOSIO_INSTALL_LOCATION/boost_1_71_0
+# build mongodb
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
+    tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && rm -f mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \
+    mv $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-ubuntu1804-4.1.1/bin/* $EOSIO_INSTALL_LOCATION/bin/ && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongodb-linux-x86_64-ubuntu1804-4.1.1
+# build mongodb c driver
+cd $EOSIO_INSTALL_LOCATION && curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz && \
+    tar -xzf mongo-c-driver-1.13.0.tar.gz && cd mongo-c-driver-1.13.0 && \
+    mkdir -p build && cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DENABLE_BSON=ON -DENABLE_SSL=OPENSSL -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_STATIC=ON -DENABLE_ICU=OFF -DENABLE_SNAPPY=OFF .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-c-driver-1.13.0
+# build mongodb cxx driver
+cd $EOSIO_INSTALL_LOCATION && curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o mongo-cxx-driver-r3.4.0.tar.gz && \
+    tar -xzf mongo-cxx-driver-r3.4.0.tar.gz && cd mongo-cxx-driver-r3.4.0 && \
+    sed -i 's/\"maxAwaitTimeMS\", count/\"maxAwaitTimeMS\", static_cast<int64_t>(count)/' src/mongocxx/options/change_stream.cpp && \
+    sed -i 's/add_subdirectory(test)//' src/mongocxx/CMakeLists.txt src/bsoncxx/CMakeLists.txt && \
+    mkdir -p build && cd build && \
+    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION .. && \
+    make -j$(nproc) && \
+    make install && \
+    rm -rf $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0.tar.gz $EOSIO_INSTALL_LOCATION/mongo-cxx-driver-r3.4.0
+```
+
+## Build EOSIO
+These commands build the EOSIO software on the specified OS. Make sure to [Install EOSIO Dependencies](#install-eosio-dependencies) first.
+```sh
+export EOSIO_BUILD_LOCATION=$EOSIO_LOCATION/build
+mkdir -p $EOSIO_BUILD_LOCATION
+cd $EOSIO_BUILD_LOCATION && cmake -DCMAKE_BUILD_TYPE='Release' -DCMAKE_CXX_COMPILER='clang++-7' -DCMAKE_C_COMPILER='clang-7' -DLLVM_DIR='/usr/lib/llvm-7/lib/cmake/llvm' -DCMAKE_INSTALL_PREFIX=$EOSIO_INSTALL_LOCATION -DBUILD_MONGO_DB_PLUGIN=true ..
+cd $EOSIO_BUILD_LOCATION && make -j$(nproc)
+```
+
+## Install EOSIO
+This command installs the EOSIO software on the specified OS. Make sure to [Build EOSIO](#build-eosio) first.
+```sh
+cd $EOSIO_BUILD_LOCATION && make install
+```
+
+## Test EOSIO
+These commands validate the EOSIO software installation on the specified OS. Make sure to [Install EOSIO](#install-eosio) first. (**Note**: This task is optional but recommended.)
+```sh
+$EOSIO_INSTALL_LOCATION/bin/mongod --fork --logpath $(pwd)/mongod.log --dbpath $(pwd)/mongodata
+cd $EOSIO_BUILD_LOCATION && make test
+```
+
+## Uninstall EOSIO
+These commands uninstall the EOSIO software from the specified OS.
+```sh
+xargs rm < $EOSIO_BUILD_LOCATION/install_manifest.txt
+rm -rf $EOSIO_BUILD_LOCATION
+```

From 44285921a718d59fb5c175aff243e0913853b72b Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Mon, 23 Dec 2019 23:52:15 -0500
Subject: [PATCH 1607/1648] remove redundant install eosio callout

---
 .../01_shell-scripts/02_build-eosio-binaries.md              | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
index 2abd7915c41..aec16f98e43 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
@@ -15,7 +15,4 @@ $ ./scripts/eosio_build.sh
 The build process writes temporary content to the `eos/build` folder. After building, the program binaries can be found at `eos/build/programs`.
 
 [[info | What's Next?]]
-| [Install EOSIO binaries](03_install-eosio-binaries.md)
-
-[[info | What's Next?]]
-| It is strongly suggested to [Install the EOSIO binaries](03_install-eosio-binaries.md) after building EOSIO from source as it makes local development significantly more friendly.
+| [Installing EOSIO](03_install-eosio-binaries.md) is strongly recommended after building from source as it makes local development significantly more friendly.

From bc9b951c7b230f8ef5b299ca1391f9b8f23d926d Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Wed, 1 Jan 2020 19:53:13 -0500
Subject: [PATCH 1608/1648] escaped commit

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 73e510c5e65..975cda7d9fb 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -142,7 +142,7 @@ EOF
       TEMPLATE_TAG: $MOJAVE_ANKA_TAG_BASE
       IMAGE_TAG: $(echo "$PLATFORM_JSON" | jq -r .FILE_NAME)
       PLATFORM_TYPE: $PLATFORM_TYPE
-      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f $BUILDKITE_COMMIT && git submodule update --init --recursive && export IMAGE_TAG=$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) && export PLATFORM_TYPE=$PLATFORM_TYPE && . ./.cicd/platforms/$PLATFORM_TYPE/$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME).sh && cd ~/eos && cd .. && rm -rf eos"
+      TAG_COMMANDS: "git clone ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO} eos && cd eos && $GIT_FETCH git checkout -f \$BUILDKITE_COMMIT && git submodule update --init --recursive && export IMAGE_TAG=$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME) && export PLATFORM_TYPE=$PLATFORM_TYPE && . ./.cicd/platforms/$PLATFORM_TYPE/$(echo "$PLATFORM_JSON" | jq -r .FILE_NAME).sh && cd ~/eos && cd .. && rm -rf eos"
       PROJECT_TAG: $(echo "$PLATFORM_JSON" | jq -r .HASHED_IMAGE_TAG)
     timeout: ${TIMEOUT:-180}
     agents: "queue=mac-anka-large-node-fleet"

From 81bfbbf98270e2337e7f72998e0b02d50d300455 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 2 Jan 2020 12:23:14 -0600
Subject: [PATCH 1609/1648] Propagate exceptions out of on_incoming_block
 push_block so net_plugin knows block was not applied

---
 plugins/producer_plugin/producer_plugin.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
index 87dfde02810..506050155a6 100644
--- a/plugins/producer_plugin/producer_plugin.cpp
+++ b/plugins/producer_plugin/producer_plugin.cpp
@@ -359,7 +359,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
          });
 
          // push the new block
-         bool except = false;
          try {
             chain.push_block( bsf, [this]( const branch_type& forked_branch ) {
                _unapplied_transactions.add_forked( forked_branch );
@@ -371,18 +370,14 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
             return;
          } catch( const fc::exception& e ) {
             elog((e.to_detail_string()));
-            except = true;
+            app().get_channel<channels::rejected_block>().publish( priority::medium, block );
+            throw;
          } catch ( const std::bad_alloc& ) {
             chain_plugin::handle_bad_alloc();
          } catch ( boost::interprocess::bad_alloc& ) {
             chain_plugin::handle_db_exhaustion();
          }
 
-         if( except ) {
-            app().get_channel<channels::rejected_block>().publish( priority::medium, block );
-            return;
-         }
-
          const auto& hbs = chain.head_block_state();
          if( hbs->header.timestamp.next().to_time_point() >= fc::time_point::now() ) {
             _production_enabled = true;

From 5607f95fca2994197cba6549ba1350a9531e82fe Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 Jan 2020 09:38:38 -0500
Subject: [PATCH 1610/1648] Disable eosio-sync-from-genesis test on eosio-lrt
 pipeline

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index 975cda7d9fb..bb3c1314f59 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -482,7 +482,7 @@ EOF
     fi
 fi
 # trigger eosio-sync-from-genesis for every build
-if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then
+if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then
     cat <<EOF
   - label: ":chains: Sync-from-Genesis Test"
     trigger: "eosio-sync-from-genesis"

From 1175cdc5f78f4c37b07f3d7bd3d19d0820f414ea Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 Jan 2020 09:40:55 -0500
Subject: [PATCH 1611/1648] Include the actual source pipeline slug in the
 build message

---
 .cicd/generate-pipeline.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index bb3c1314f59..f23b19d7c31 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -446,7 +446,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
     trigger: "eosio-lrt"
     async: true
     build:
-      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
+      message: "Triggered by $BUILDKITE_PIPELINE_SLUG build $BUILDKITE_BUILD_NUMBER"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:
@@ -469,7 +469,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
     trigger: "eos-multiversion-tests"
     async: true
     build:
-      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
+      message: "Triggered by $BUILDKITE_PIPELINE_SLUG build $BUILDKITE_BUILD_NUMBER"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:
@@ -488,7 +488,7 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}$
     trigger: "eosio-sync-from-genesis"
     async: false
     build:
-      message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}"
+      message: "Triggered by $BUILDKITE_PIPELINE_SLUG build $BUILDKITE_BUILD_NUMBER"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:

From d2676a9015d431bba9a153bfc50d91ad951c1084 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 Jan 2020 09:42:34 -0500
Subject: [PATCH 1612/1648] Consistent variable names across Buildkite

---
 .cicd/generate-pipeline.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index f23b19d7c31..d4eb270284d 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -453,7 +453,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
-        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
+        BUILDKITE_TRIGGERED_FROM_BUILD_URL: "${BUILDKITE_BUILD_URL}"
         SKIP_BUILD: "true"
         SKIP_WASM_SPEC_TESTS: "true"
         PINNED: "${PINNED}"
@@ -476,7 +476,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then
         BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}"
         BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
         BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}"
-        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
+        BUILDKITE_TRIGGERED_FROM_BUILD_URL: "${BUILDKITE_BUILD_URL}"
 
 EOF
     fi
@@ -492,7 +492,7 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}$
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
       env:
-        BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}"
+        BUILDKITE_TRIGGERED_FROM_BUILD_URL: "${BUILDKITE_BUILD_URL}"
         SKIP_JUNGLE: "${SKIP_JUNGLE}"
         SKIP_KYLIN: "${SKIP_KYLIN}"
         SKIP_MAIN: "${SKIP_MAIN}"

From fc6d21481787ff2818984213e0fa1f82c202c3f7 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 Jan 2020 09:49:45 -0500
Subject: [PATCH 1613/1648] Remove dashes from test name

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d4eb270284d..d405ef72b2e 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -484,7 +484,7 @@ fi
 # trigger eosio-sync-from-genesis for every build
 if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then
     cat <<EOF
-  - label: ":chains: Sync-from-Genesis Test"
+  - label: ":chains: Sync from Genesis Test"
     trigger: "eosio-sync-from-genesis"
     async: false
     build:

From 84a4fe6821cd638c09703e884d15899f6c79e7a4 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 Jan 2020 09:53:29 -0500
Subject: [PATCH 1614/1648] Add SKIP_SYNC_TESTS variable

---
 .cicd/generate-pipeline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index d405ef72b2e..c02756e8153 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -482,7 +482,7 @@ EOF
     fi
 fi
 # trigger eosio-sync-from-genesis for every build
-if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then
+if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}${SKIP_SYNC_TESTS}" ]]; then
     cat <<EOF
   - label: ":chains: Sync from Genesis Test"
     trigger: "eosio-sync-from-genesis"

From 0780c79b9bebe80e3ea83840278c57133f81b40e Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 Jan 2020 09:58:18 -0500
Subject: [PATCH 1615/1648] Fix duplicate deletion of the same docker container
 on some tagged builds

---
 .cicd/docker-tag.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/docker-tag.sh b/.cicd/docker-tag.sh
index d9f03c06a52..18ef347a0a3 100755
--- a/.cicd/docker-tag.sh
+++ b/.cicd/docker-tag.sh
@@ -18,5 +18,5 @@ docker push "$REPO:$PREFIX-$SANITIZED_BRANCH"
 [[ -z "$BUILDKITE_TAG" ]] || docker push "$REPO:$PREFIX-$SANITIZED_TAG"
 echo '+++ :put_litter_in_its_place: Cleaning Up'
 docker rmi "$REPO:$PREFIX-$SANITIZED_BRANCH"
-[[ -z "$BUILDKITE_TAG" ]] || docker rmi "$REPO:$PREFIX-$SANITIZED_TAG"
+[[ -z "$BUILDKITE_TAG" || "$SANITIZED_BRANCH" == "$SANITIZED_TAG" ]] || docker rmi "$REPO:$PREFIX-$SANITIZED_TAG"
 docker rmi "$IMAGE"
\ No newline at end of file

From 8b426162535f203efea174cbb4cf2fb0b20e4ea3 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Thu, 2 Jan 2020 17:21:12 -0500
Subject: [PATCH 1616/1648] Add eosio-resume-from-state configuration to
 pipeline.jsonc

---
 pipeline.jsonc | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pipeline.jsonc b/pipeline.jsonc
index a870d04a9ca..40772347d41 100644
--- a/pipeline.jsonc
+++ b/pipeline.jsonc
@@ -34,5 +34,17 @@
             "SKIP_V180": "true",
             "SKIP_V200": "false"
         }
+    },
+    "eosio-resume-from-state":
+    {
+        "test":
+        [
+            {
+                "tag": "v2.0.0-rc2"
+            },
+            {
+                "tag": "v2.0.0-rc3"
+            }
+        ]
     }
-}
+}
\ No newline at end of file

From b6094ec68f83df77b65c9dfa82a493b4a8733607 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Fri, 3 Jan 2020 09:58:34 -0500
Subject: [PATCH 1617/1648] Add eosio-resume-from-state test to eosio pipeline

---
 .cicd/generate-pipeline.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh
index c02756e8153..22df0570fcf 100755
--- a/.cicd/generate-pipeline.sh
+++ b/.cicd/generate-pipeline.sh
@@ -498,6 +498,25 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}$
         SKIP_MAIN: "${SKIP_MAIN}"
         TIMEOUT: "${TIMEOUT}"
 
+EOF
+fi
+# trigger eosio-resume-from-state for every build
+if [[ "$BUILDKITE_PIPELINE_SLUG" == 'eosio' && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}${SKIP_SYNC_TESTS}" ]]; then
+    cat <<EOF
+  - label: ":outbox_tray: Resume from State Test"
+    trigger: "eosio-resume-from-state"
+    async: false
+    build:
+      message: "Triggered by $BUILDKITE_PIPELINE_SLUG build $BUILDKITE_BUILD_NUMBER"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        BUILDKITE_TRIGGERED_FROM_BUILD_URL: "${BUILDKITE_BUILD_URL}"
+        SKIP_JUNGLE: "${SKIP_JUNGLE}"
+        SKIP_KYLIN: "${SKIP_KYLIN}"
+        SKIP_MAIN: "${SKIP_MAIN}"
+        TIMEOUT: "${TIMEOUT}"
+
 EOF
 fi
 # pipeline tail

From bc45c788ed40b2ee374a5887f91a067b51f80fac Mon Sep 17 00:00:00 2001
From: Jonathan Giszczak <jonrg@hypercubepc.com>
Date: Thu, 19 Dec 2019 17:06:22 -0600
Subject: [PATCH 1618/1648] Make multiversion protocol test conditional.

The multiversion protocol test does not work outside of the CI/CD
environment.  Add "ENABLE_MULTIVERSION_PROTOCOL_TEST" -D flag to
CMakeLists, defaulting to false, and enable it in CI/CD build script.
---
 .cicd/build.sh       |  2 +-
 CMakeLists.txt       |  1 +
 tests/CMakeLists.txt | 10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cicd/build.sh b/.cicd/build.sh
index aaec78cc395..8c2aa4c6ed2 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 . ./.cicd/helpers/general.sh
 mkdir -p $BUILD_DIR
-CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE='Release'"
+CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE='Release' -DENABLE_MULTIVERSION_PROTOCOL_TEST=true"
 if [[ "$(uname)" == 'Darwin' ]]; then
     # You can't use chained commands in execute
     if [[ "$TRAVIS" == 'true' ]]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0b669298ea..4787ce949ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,7 @@ endif()
 set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
 set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make")
 set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin")
+set(ENABLE_MULTIVERSION_PROTOCOL_TEST FALSE CACHE BOOL "Enable nodeos multiversion protocol test")
 
 # add defaults for openssl
 if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 68ea2e96b24..e3ba85a6c86 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -125,11 +125,13 @@ set_property(TEST nodeos_startup_catchup_lr_test PROPERTY LABELS long_running_te
 add_test(NAME nodeos_short_fork_take_over_lr_test COMMAND tests/nodeos_short_fork_take_over_test.py -v --wallet-port 9905 --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_short_fork_take_over_lr_test PROPERTY LABELS long_running_tests)
 
-set(ALTERNATE_VERSION_LABELS_FILE "${CMAKE_BINARY_DIR}/tests/multiversion_paths.conf")
+if(ENABLE_MULTIVERSION_PROTOCOL_TEST)
+  set(ALTERNATE_VERSION_LABELS_FILE "${CMAKE_BINARY_DIR}/tests/multiversion_paths.conf")
 
-add_test(NAME nodeos_multiple_version_protocol_feature_mv_test COMMAND tests/nodeos_multiple_version_protocol_feature_test.py
-         -v --clean-run --dump-error-detail --alternate-version-labels-file ${ALTERNATE_VERSION_LABELS_FILE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST nodeos_multiple_version_protocol_feature_mv_test PROPERTY LABELS mixed_version_tests)
+  add_test(NAME nodeos_multiple_version_protocol_feature_mv_test COMMAND tests/nodeos_multiple_version_protocol_feature_test.py
+           -v --clean-run --dump-error-detail --alternate-version-labels-file ${ALTERNATE_VERSION_LABELS_FILE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+  set_property(TEST nodeos_multiple_version_protocol_feature_mv_test PROPERTY LABELS mixed_version_tests)
+endif()
 
 add_test(NAME nodeos_producer_watermark_lr_test COMMAND tests/nodeos_producer_watermark_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_producer_watermark_lr_test PROPERTY LABELS long_running_tests)

From 5b80e8c499096382d5bd06736249e1cd7d778131 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 3 Jan 2020 15:59:00 -0600
Subject: [PATCH 1619/1648] Update sync_next_expected_num via checking
 sync_last_requested_num instead of checking sync_state as sync_state might be
 temp in diff state

---
 plugins/net_plugin/net_plugin.cpp | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index dfa0c5197c7..6ee4febbcdc 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -161,6 +161,7 @@ namespace eosio {
       void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
       void rejected_block( const connection_ptr& c, uint32_t blk_num );
       void sync_recv_block( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num );
+      void sync_update_expected( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num );
       void recv_handshake( const connection_ptr& c, const handshake_message& msg );
       void sync_recv_notice( const connection_ptr& c, const notice_message& msg );
    };
@@ -1739,17 +1740,9 @@ namespace eosio {
    }
 
    // called from connection strand
-   void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
-      fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_name() ) );
-      if( app().is_quiting() ) {
-         c->close( false, true );
-         return;
-      }
-      c->consecutive_rejected_blocks = 0;
+   void sync_manager::sync_update_expected( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num ) {
       std::unique_lock<std::mutex> g_sync( sync_mtx );
-      stages state = sync_state;
-      fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
-      if( state == lib_catchup ) {
+      if( blk_num <= sync_last_requested_num ) {
          fc_dlog( logger, "sync_last_requested_num: ${r}, sync_next_expected_num: ${e}, sync_known_lib_num: ${k}, sync_req_span: ${s}",
                   ("r", sync_last_requested_num)("e", sync_next_expected_num)("k", sync_known_lib_num)("s", sync_req_span) );
          if (blk_num != sync_next_expected_num) {
@@ -1761,6 +1754,20 @@ namespace eosio {
          }
          sync_next_expected_num = blk_num + 1;
       }
+   }
+
+   // called from connection strand
+   void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
+      fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_name() ) );
+      if( app().is_quiting() ) {
+         c->close( false, true );
+         return;
+      }
+      c->consecutive_rejected_blocks = 0;
+      sync_update_expected( c, blk_id, blk_num );
+      std::unique_lock<std::mutex> g_sync( sync_mtx );
+      stages state = sync_state;
+      fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
       if( state == head_catchup ) {
          fc_dlog( logger, "sync_manager in head_catchup state" );
          sync_source.reset();
@@ -2421,8 +2428,7 @@ namespace eosio {
             if( my_impl->dispatcher->have_block( blk_id ) ) {
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
                         ("p", peer_name())("num", blk_num)("id", blk_id.str().substr(8,16)) );
-               if( my_impl->sync_master->syncing_with_peer() )
-                  my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
+               my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
                cancel_wait();
 
                pending_message_buffer.advance_read_ptr( message_length );

From 1ca44e2f3b12ae351cdc6e70b6a9b2fa2b6b7a2f Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 6 Jan 2020 10:21:54 -0600
Subject: [PATCH 1620/1648] Do not retry connection as often for benign_other
 disconnect (no blocks)

---
 plugins/net_plugin/net_plugin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index 6ee4febbcdc..edc5b958ab1 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -2162,7 +2162,7 @@ namespace eosio {
 
       connection_ptr c = shared_from_this();
 
-      if( consecutive_immediate_connection_close > def_max_consecutive_immediate_connection_close ) {
+      if( consecutive_immediate_connection_close > def_max_consecutive_immediate_connection_close || no_retry == benign_other ) {
          auto connector_period_us = std::chrono::duration_cast<std::chrono::microseconds>( my_impl->connector_period );
          std::lock_guard<std::mutex> g( c->conn_mtx );
          if( last_close == fc::time_point() || last_close > fc::time_point::now() - fc::microseconds( connector_period_us.count() ) ) {
@@ -2656,6 +2656,7 @@ namespace eosio {
                         c->enqueue( go_away_message( forked ) );
                      } else if( unknown_block ) {
                         peer_ilog( c, "Peer asked for unknown block, sending: benign_other go away" );
+                        c->no_retry = benign_other;
                         c->enqueue( go_away_message( benign_other ) );
                      }
                   } );

From b8a024a9c3ad968760f983414bf0a1c43ed58dd0 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Mon, 6 Jan 2020 13:21:53 -0600
Subject: [PATCH 1621/1648] Add blk_applied to sync_update_expected

---
 plugins/net_plugin/net_plugin.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
index edc5b958ab1..d8c475dbc39 100644
--- a/plugins/net_plugin/net_plugin.cpp
+++ b/plugins/net_plugin/net_plugin.cpp
@@ -160,8 +160,8 @@ namespace eosio {
       void sync_reset_lib_num( const connection_ptr& conn );
       void sync_reassign_fetch( const connection_ptr& c, go_away_reason reason );
       void rejected_block( const connection_ptr& c, uint32_t blk_num );
-      void sync_recv_block( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num );
-      void sync_update_expected( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num );
+      void sync_recv_block( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num, bool blk_applied );
+      void sync_update_expected( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num, bool blk_applied );
       void recv_handshake( const connection_ptr& c, const handshake_message& msg );
       void sync_recv_notice( const connection_ptr& c, const notice_message& msg );
    };
@@ -1740,12 +1740,12 @@ namespace eosio {
    }
 
    // called from connection strand
-   void sync_manager::sync_update_expected( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num ) {
+   void sync_manager::sync_update_expected( const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num, bool blk_applied ) {
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       if( blk_num <= sync_last_requested_num ) {
          fc_dlog( logger, "sync_last_requested_num: ${r}, sync_next_expected_num: ${e}, sync_known_lib_num: ${k}, sync_req_span: ${s}",
                   ("r", sync_last_requested_num)("e", sync_next_expected_num)("k", sync_known_lib_num)("s", sync_req_span) );
-         if (blk_num != sync_next_expected_num) {
+         if (blk_num != sync_next_expected_num && !blk_applied) {
             auto sync_next_expected = sync_next_expected_num;
             g_sync.unlock();
             fc_dlog( logger, "expected block ${ne} but got ${bn}, from connection: ${p}",
@@ -1757,14 +1757,14 @@ namespace eosio {
    }
 
    // called from connection strand
-   void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num) {
+   void sync_manager::sync_recv_block(const connection_ptr& c, const block_id_type& blk_id, uint32_t blk_num, bool blk_applied) {
       fc_dlog( logger, "got block ${bn} from ${p}", ("bn", blk_num)( "p", c->peer_name() ) );
       if( app().is_quiting() ) {
          c->close( false, true );
          return;
       }
       c->consecutive_rejected_blocks = 0;
-      sync_update_expected( c, blk_id, blk_num );
+      sync_update_expected( c, blk_id, blk_num, blk_applied );
       std::unique_lock<std::mutex> g_sync( sync_mtx );
       stages state = sync_state;
       fc_dlog( logger, "state ${s}", ("s", stage_str( state )) );
@@ -2428,7 +2428,7 @@ namespace eosio {
             if( my_impl->dispatcher->have_block( blk_id ) ) {
                fc_dlog( logger, "canceling wait on ${p}, already received block ${num}, id ${id}...",
                         ("p", peer_name())("num", blk_num)("id", blk_id.str().substr(8,16)) );
-               my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num );
+               my_impl->sync_master->sync_recv_block( shared_from_this(), blk_id, blk_num, false );
                cancel_wait();
 
                pending_message_buffer.advance_read_ptr( message_length );
@@ -2921,8 +2921,7 @@ namespace eosio {
             c->strand.post( [sync_master = my_impl->sync_master.get(),
                              dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {
                dispatcher->add_peer_block( blk_id, c->connection_id );
-               if( my_impl->sync_master->syncing_with_peer() )
-                  sync_master->sync_recv_block( c, blk_id, blk_num );
+               sync_master->sync_recv_block( c, blk_id, blk_num, false );
             });
             return;
          }
@@ -2965,7 +2964,7 @@ namespace eosio {
          });
          c->strand.post( [sync_master = my_impl->sync_master.get(), dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {
             dispatcher->recv_block( c, blk_id, blk_num );
-            sync_master->sync_recv_block( c, blk_id, blk_num );
+            sync_master->sync_recv_block( c, blk_id, blk_num, true );
          });
       } else {
          c->strand.post( [sync_master = my_impl->sync_master.get(), dispatcher = my_impl->dispatcher.get(), c, blk_id, blk_num]() {

From 43b18a63a4bfbd77241cdc1ba8af04b4e496fe55 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 7 Jan 2020 10:11:01 -0500
Subject: [PATCH 1622/1648] fix EOS VM OC monitor thread name

---
 libraries/chain/webassembly/eos-vm-oc/code_cache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
index 7fdf9759786..b12388eb3da 100644
--- a/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
+++ b/libraries/chain/webassembly/eos-vm-oc/code_cache.cpp
@@ -49,7 +49,7 @@ code_cache_async::code_cache_async(const bfs::path data_dir, const eosvmoc::conf
    wait_on_compile_monitor_message();
 
    _monitor_reply_thread = std::thread([this]() {
-      fc::set_thread_name("oc-monitor");
+      fc::set_os_thread_name("oc-monitor");
       _ctx.run();
    });
 }

From 9da2731c74dda1f06db67539a4dc7f5295cc8033 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 Jan 2020 11:49:38 -0500
Subject: [PATCH 1623/1648] ccache-3.7.6-1.el7.x86_64.rpm

---
 .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile     | 4 ++--
 .cicd/platforms/pinned/centos-7.7-pinned.dockerfile         | 4 ++--
 .cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile | 4 ++--
 .cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
index d14acd1a795..d98ac14f073 100644
--- a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
+++ b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
@@ -80,5 +80,5 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.3.4-1.el7.x86_64.rpm
\ No newline at end of file
+RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
+    yum install -y ccache-3.7.6-1.el7.x86_64.rpm
\ No newline at end of file
diff --git a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
index 7bfb826b347..955130b3470 100644
--- a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
+++ b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
@@ -89,8 +89,8 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.3.4-1.el7.x86_64.rpm
+RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
+    yum install -y ccache-3.7.6-1.el7.x86_64.rpm
 # fix ccache for centos
 RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
 ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
\ No newline at end of file
diff --git a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
index 8dfa0be6695..4cb7db3e596 100644
--- a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
@@ -53,5 +53,5 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.3.4-1.el7.x86_64.rpm
\ No newline at end of file
+RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
+    yum install -y ccache-3.7.6-1.el7.x86_64.rpm
\ No newline at end of file
diff --git a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
index 4eedf27f0eb..fb95ce4aa9c 100644
--- a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
@@ -64,8 +64,8 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.3.4-1.el7.x86_64.rpm
+RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
+    yum install -y ccache-3.7.6-1.el7.x86_64.rpm
 # fix ccache for centos
 RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
 ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
\ No newline at end of file

From 1762d8512f79727e977f8e92d193df3ccfebf439 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 Jan 2020 14:33:04 -0500
Subject: [PATCH 1624/1648] ccache/epel is already enabled

---
 .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile     | 3 +--
 .cicd/platforms/pinned/centos-7.7-pinned.dockerfile         | 3 +--
 .cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile | 3 +--
 .cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile     | 3 +--
 eosio-wasm-spec-tests                                       | 2 +-
 libraries/appbase                                           | 2 +-
 libraries/chainbase                                         | 2 +-
 libraries/fc                                                | 2 +-
 8 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
index d98ac14f073..00245bbe34f 100644
--- a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
+++ b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
@@ -80,5 +80,4 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.7.6-1.el7.x86_64.rpm
\ No newline at end of file
+RUN yum install ccache
\ No newline at end of file
diff --git a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
index 955130b3470..222142f7708 100644
--- a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
+++ b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
@@ -89,8 +89,7 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.7.6-1.el7.x86_64.rpm
+RUN yum install ccache
 # fix ccache for centos
 RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
 ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
\ No newline at end of file
diff --git a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
index 4cb7db3e596..df290edd80d 100644
--- a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
@@ -53,5 +53,4 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.7.6-1.el7.x86_64.rpm
\ No newline at end of file
+RUN yum install ccache
\ No newline at end of file
diff --git a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
index fb95ce4aa9c..e3272ebaaaa 100644
--- a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
@@ -64,8 +64,7 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
-    yum install -y ccache-3.7.6-1.el7.x86_64.rpm
+RUN yum install ccache
 # fix ccache for centos
 RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
 ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
\ No newline at end of file
diff --git a/eosio-wasm-spec-tests b/eosio-wasm-spec-tests
index 25c46086d69..db1c839233f 160000
--- a/eosio-wasm-spec-tests
+++ b/eosio-wasm-spec-tests
@@ -1 +1 @@
-Subproject commit 25c46086d694f5973ae1123e6a8aaa6e7232a2d4
+Subproject commit db1c839233fad04e725ee500199faa131027c199
diff --git a/libraries/appbase b/libraries/appbase
index 72e93b39672..c00333db208 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit 72e93b396726916a596482897ab13f99a8197379
+Subproject commit c00333db208a70812617c64d41f3d5a78bd5f24e
diff --git a/libraries/chainbase b/libraries/chainbase
index d6632fcc1e7..e52991810ef 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit d6632fcc1e71b0ee2022621059a432ec216b6661
+Subproject commit e52991810ef9a17138b573a895a44c5c09a3e31d
diff --git a/libraries/fc b/libraries/fc
index f0da6a718e3..6ac073784aa 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit f0da6a718e34201a0e7878e93e727fac4767b5e4
+Subproject commit 6ac073784aaae8cf3f3c58fcbb36057d32354262

From 0ae0ea89912ddfecbe72b9a79ec0005c6c7c4919 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 Jan 2020 14:45:21 -0500
Subject: [PATCH 1625/1648] amazon linux 2 epel install

---
 .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile     | 2 +-
 .cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
index 00245bbe34f..f15f70897ad 100644
--- a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
+++ b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
@@ -80,4 +80,4 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN yum install ccache
\ No newline at end of file
+RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum install ccache
\ No newline at end of file
diff --git a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
index df290edd80d..9be67b6e8d3 100644
--- a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
@@ -53,4 +53,4 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN yum install ccache
\ No newline at end of file
+RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum install ccache
\ No newline at end of file

From d18bdbcd43dd188fb0589489898d700e800e7e67 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 Jan 2020 14:47:23 -0500
Subject: [PATCH 1626/1648] added -y to install

---
 .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile     | 2 +-
 .cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
index f15f70897ad..1344fd698bd 100644
--- a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
+++ b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
@@ -80,4 +80,4 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum install ccache
\ No newline at end of file
+RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum install -y ccache
\ No newline at end of file
diff --git a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
index 9be67b6e8d3..82c4c5c3d02 100644
--- a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
@@ -53,4 +53,4 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum install ccache
\ No newline at end of file
+RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum install -y ccache
\ No newline at end of file

From 1fa314ee5a781ded79d1492875bd2637492f38c6 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 Jan 2020 14:55:10 -0500
Subject: [PATCH 1627/1648] reverted accidental submodule changes

---
 eosio-wasm-spec-tests | 2 +-
 libraries/appbase     | 2 +-
 libraries/chainbase   | 2 +-
 libraries/fc          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eosio-wasm-spec-tests b/eosio-wasm-spec-tests
index db1c839233f..25c46086d69 160000
--- a/eosio-wasm-spec-tests
+++ b/eosio-wasm-spec-tests
@@ -1 +1 @@
-Subproject commit db1c839233fad04e725ee500199faa131027c199
+Subproject commit 25c46086d694f5973ae1123e6a8aaa6e7232a2d4
diff --git a/libraries/appbase b/libraries/appbase
index c00333db208..72e93b39672 160000
--- a/libraries/appbase
+++ b/libraries/appbase
@@ -1 +1 @@
-Subproject commit c00333db208a70812617c64d41f3d5a78bd5f24e
+Subproject commit 72e93b396726916a596482897ab13f99a8197379
diff --git a/libraries/chainbase b/libraries/chainbase
index e52991810ef..d6632fcc1e7 160000
--- a/libraries/chainbase
+++ b/libraries/chainbase
@@ -1 +1 @@
-Subproject commit e52991810ef9a17138b573a895a44c5c09a3e31d
+Subproject commit d6632fcc1e71b0ee2022621059a432ec216b6661
diff --git a/libraries/fc b/libraries/fc
index 6ac073784aa..f0da6a718e3 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 6ac073784aaae8cf3f3c58fcbb36057d32354262
+Subproject commit f0da6a718e34201a0e7878e93e727fac4767b5e4

From 8805c4d2d9dba8a856dfc2e17de6e7238c4a3265 Mon Sep 17 00:00:00 2001
From: Nathan Pierce <nathan.pierce@block.one>
Date: Tue, 7 Jan 2020 15:04:20 -0500
Subject: [PATCH 1628/1648] centos -y for ccache install

---
 .cicd/platforms/pinned/centos-7.7-pinned.dockerfile     | 2 +-
 .cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
index 222142f7708..53f27c3be29 100644
--- a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
+++ b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile
@@ -89,7 +89,7 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN yum install ccache
+RUN yum install -y ccache
 # fix ccache for centos
 RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
 ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
\ No newline at end of file
diff --git a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
index e3272ebaaaa..dcef2d0eeee 100644
--- a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
+++ b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
@@ -64,7 +64,7 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
 # add mongodb to path
 ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
 # install ccache
-RUN yum install ccache
+RUN yum install -y ccache
 # fix ccache for centos
 RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
 ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
\ No newline at end of file

From c21b737ad8e173faee9cc746868f5ae7109d8420 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 8 Oct 2019 14:49:25 -0400
Subject: [PATCH 1629/1648] remove WAVM runtime

---
 CMakeLists.txt                                |   16 +-
 libraries/chain/CMakeLists.txt                |    5 -
 .../include/eosio/chain/wasm_interface.hpp    |    3 +-
 .../eosio/chain/wasm_interface_private.hpp    |    5 -
 .../include/eosio/chain/webassembly/wavm.hpp  |  596 ---------
 libraries/chain/wasm_interface.cpp            |    4 +-
 .../testing/include/eosio/testing/tester.hpp  |    4 +-
 libraries/wasm-jit/CMakeLists.txt             |    2 -
 .../wasm-jit/Include/Runtime/llvmWARshim.h    |    9 -
 .../wasm-jit/Source/Emscripten/CMakeLists.txt |    9 -
 .../wasm-jit/Source/Emscripten/Emscripten.cpp |  451 -------
 .../wasm-jit/Source/Programs/Assemble.cpp     |   50 -
 libraries/wasm-jit/Source/Programs/CLI.h      |  184 ---
 .../wasm-jit/Source/Programs/CMakeLists.txt   |   15 -
 .../wasm-jit/Source/Programs/Disassemble.cpp  |   29 -
 libraries/wasm-jit/Source/Programs/Test.cpp   |  379 ------
 libraries/wasm-jit/Source/Programs/wavm.cpp   |  256 ----
 .../wasm-jit/Source/Runtime/CMakeLists.txt    |   27 +-
 .../wasm-jit/Source/Runtime/LLVMEmitIR.cpp    | 1116 -----------------
 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp |  538 --------
 libraries/wasm-jit/Source/Runtime/Memory.cpp  |  162 ---
 .../Source/Runtime/ModuleInstance.cpp         |  203 ---
 .../wasm-jit/Source/Runtime/ObjectGC.cpp      |    3 -
 libraries/wasm-jit/Source/Runtime/Runtime.cpp |  143 ---
 libraries/wasm-jit/Source/Runtime/Table.cpp   |  136 --
 libraries/wasm-jit/Source/Runtime/Threads.cpp |  374 ------
 .../wasm-jit/Source/Runtime/llvmWARshim.cpp   |   12 -
 .../Source/Runtime/llvmWARshim.llvmwar        |    1 -
 scripts/eosio_build_darwin.sh                 |    2 -
 scripts/eosio_build_darwin_deps               |    1 -
 scripts/helpers/eosio.sh                      |    2 -
 31 files changed, 11 insertions(+), 4726 deletions(-)
 delete mode 100644 libraries/wasm-jit/Include/Runtime/llvmWARshim.h
 delete mode 100644 libraries/wasm-jit/Source/Emscripten/CMakeLists.txt
 delete mode 100644 libraries/wasm-jit/Source/Emscripten/Emscripten.cpp
 delete mode 100644 libraries/wasm-jit/Source/Programs/Assemble.cpp
 delete mode 100644 libraries/wasm-jit/Source/Programs/CLI.h
 delete mode 100644 libraries/wasm-jit/Source/Programs/CMakeLists.txt
 delete mode 100644 libraries/wasm-jit/Source/Programs/Disassemble.cpp
 delete mode 100644 libraries/wasm-jit/Source/Programs/Test.cpp
 delete mode 100644 libraries/wasm-jit/Source/Programs/wavm.cpp
 delete mode 100644 libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
 delete mode 100644 libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
 delete mode 100644 libraries/wasm-jit/Source/Runtime/Memory.cpp
 delete mode 100644 libraries/wasm-jit/Source/Runtime/ModuleInstance.cpp
 delete mode 100644 libraries/wasm-jit/Source/Runtime/Runtime.cpp
 delete mode 100644 libraries/wasm-jit/Source/Runtime/Table.cpp
 delete mode 100644 libraries/wasm-jit/Source/Runtime/Threads.cpp
 delete mode 100644 libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp
 delete mode 120000 libraries/wasm-jit/Source/Runtime/llvmWARshim.llvmwar

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4787ce949ad..e14500c8647 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 
 if (UNIX AND APPLE)
-   list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/llvm@7" "/usr/local/opt/gettext")
+   list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/gettext")
 endif()
 
 include( GNUInstallDirs )
@@ -68,16 +68,14 @@ endif()
 #  * ctest entries with --runtime
 list(APPEND EOSIO_WASM_RUNTIMES wabt)   #always enable wabt; it works everywhere and parts of eosio still assume it's always available
 if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32)
-   list(APPEND EOSIO_WASM_RUNTIMES wavm)
-   # WAVM requires LLVM, but move the check up here to a central location so that the EosioTester.cmakes
-   # can be created with the exact version found
-   find_package(LLVM REQUIRED CONFIG)
-   if(LLVM_VERSION_MAJOR VERSION_LESS 7 OR LLVM_VERSION_MAJOR VERSION_GREATER 9)
-	   message(FATAL_ERROR "EOSIO requires an LLVM version 7.0 to 9.0")
-   endif()
-
    if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
       list(APPEND EOSIO_WASM_RUNTIMES eos-vm-oc)
+      # EOS VM OC requires LLVM, but move the check up here to a central location so that the EosioTester.cmakes
+      # can be created with the exact version found
+      find_package(LLVM REQUIRED CONFIG)
+      if(LLVM_VERSION_MAJOR VERSION_LESS 7 OR LLVM_VERSION_MAJOR VERSION_GREATER 9)
+	      message(FATAL_ERROR "EOSIO requires an LLVM version 7.0 to 9.0")
+      endif()
    endif()
 endif()
 
diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index f476979d515..a2bc309a8fb 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -16,10 +16,6 @@ else()
    endif()
 endif()
 
-if("wavm" IN_LIST EOSIO_WASM_RUNTIMES)
-   set(CHAIN_WAVM_SOURCES "webassembly/wavm.cpp")
-endif()
-
 if("eos-vm-oc" IN_LIST EOSIO_WASM_RUNTIMES)
    set(CHAIN_EOSVMOC_SOURCES webassembly/eos-vm-oc/code_cache.cpp
                              webassembly/eos-vm-oc/executor.cpp
@@ -86,7 +82,6 @@ add_library( eosio_chain
               asset.cpp
               snapshot.cpp
 
-             ${CHAIN_WAVM_SOURCES}
              webassembly/wabt.cpp
              ${CHAIN_EOSVMOC_SOURCES}
              ${CHAIN_EOSVM_SOURCES}
diff --git a/libraries/chain/include/eosio/chain/wasm_interface.hpp b/libraries/chain/include/eosio/chain/wasm_interface.hpp
index bddb6a88ba4..82cbe001108 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface.hpp
@@ -76,7 +76,6 @@ namespace eosio { namespace chain {
    class wasm_interface {
       public:
          enum class vm_type {
-            wavm,
             wabt,
             eos_vm,
             eos_vm_jit,
@@ -115,4 +114,4 @@ namespace eosio{ namespace chain {
    std::istream& operator>>(std::istream& in, wasm_interface::vm_type& runtime);
 }}
 
-FC_REFLECT_ENUM( eosio::chain::wasm_interface::vm_type, (wavm)(wabt)(eos_vm)(eos_vm_jit)(eos_vm_oc) )
+FC_REFLECT_ENUM( eosio::chain::wasm_interface::vm_type, (wabt)(eos_vm)(eos_vm_jit)(eos_vm_oc) )
diff --git a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
index dedc6d78de4..f891602bed4 100644
--- a/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
+++ b/libraries/chain/include/eosio/chain/wasm_interface_private.hpp
@@ -60,10 +60,6 @@ namespace eosio { namespace chain {
 #endif
 
       wasm_interface_impl(wasm_interface::vm_type vm, bool eosvmoc_tierup, const chainbase::database& d, const boost::filesystem::path data_dir, const eosvmoc::config& eosvmoc_config) : db(d), wasm_runtime_time(vm) {
-#ifdef EOSIO_WAVM_RUNTIME_ENABLED
-         if(vm == wasm_interface::vm_type::wavm)
-            runtime_interface = std::make_unique<webassembly::wavm::wavm_runtime>();
-#endif
          if(vm == wasm_interface::vm_type::wabt)
             runtime_interface = std::make_unique<webassembly::wabt_runtime::wabt_runtime>();
 #ifdef EOSIO_EOS_VM_RUNTIME_ENABLED
@@ -83,7 +79,6 @@ namespace eosio { namespace chain {
 
 #ifdef EOSIO_EOS_VM_OC_RUNTIME_ENABLED
          if(eosvmoc_tierup) {
-            EOS_ASSERT(vm != wasm_interface::vm_type::wavm, wasm_exception, "WAVM is incompatible with EOS VM OC");
             EOS_ASSERT(vm != wasm_interface::vm_type::eos_vm_oc, wasm_exception, "You can't use EOS VM OC as the base runtime when tier up is activated");
             eosvmoc.emplace(data_dir, eosvmoc_config, d);
          }
diff --git a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
index 9d479d150b3..7dde4a443bd 100644
--- a/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/wavm.hpp
@@ -145,600 +145,6 @@ struct wasm_function_type_provider<Ret(Args...)> {
 #define __INTRINSIC_NAME(LABEL, SUFFIX) LABEL##SUFFIX
 #define _INTRINSIC_NAME(LABEL, SUFFIX) __INTRINSIC_NAME(LABEL,SUFFIX)
 
-#ifdef EOSIO_WAVM_RUNTIME_ENABLED
-
-/**
- * class to represent an in-wasm-memory array
- * it is a hint to the transcriber that the next parameter will
- * be a size (in Ts) and that the pair are validated together
- * This triggers the template specialization of intrinsic_invoker_impl
- * @tparam T
- */
-template<typename T>
-inline array_ptr<T> array_ptr_impl (running_instance_context& ctx, U32 ptr, size_t length)
-{
-   MemoryInstance* mem = ctx.memory;
-   if (!mem)
-      Runtime::causeException(Exception::Cause::accessViolation);
-
-   size_t mem_total = IR::numBytesPerPage * Runtime::getMemoryNumPages(mem);
-   if (ptr >= mem_total || length > (mem_total - ptr) / sizeof(T))
-      Runtime::causeException(Exception::Cause::accessViolation);
-
-   T* ret_ptr = (T*)(getMemoryBaseAddress(mem) + ptr);
-
-   return array_ptr<T>((T*)(getMemoryBaseAddress(mem) + ptr));
-}
-
-/**
- * class to represent an in-wasm-memory char array that must be null terminated
- */
-inline null_terminated_ptr null_terminated_ptr_impl(running_instance_context& ctx, U32 ptr)
-{
-   MemoryInstance* mem = ctx.memory;
-   if(!mem)
-      Runtime::causeException(Exception::Cause::accessViolation);
-
-   char *value                     = (char*)(getMemoryBaseAddress(mem) + ptr);
-   const char* p                   = value;
-   const char* const top_of_memory = (char*)(getMemoryBaseAddress(mem) + IR::numBytesPerPage*Runtime::getMemoryNumPages(mem));
-   while(p < top_of_memory)
-      if(*p++ == '\0')
-         return null_terminated_ptr(value);
-
-   Runtime::causeException(Exception::Cause::accessViolation);
-}
-
-
-/**
- * template that maps native types to WASM VM types
- * @tparam T the native type
- */
-template<typename T>
-struct native_to_wasm {
-   using type = void;
-};
-
-/**
- * specialization for mapping pointers to int32's
- */
-template<typename T>
-struct native_to_wasm<T *> {
-   using type = I32;
-};
-
-/**
- * Mappings for native types
- */
-template<>
-struct native_to_wasm<float> {
-   using type = F32;
-};
-template<>
-struct native_to_wasm<double> {
-   using type = F64;
-};
-template<>
-struct native_to_wasm<int32_t> {
-   using type = I32;
-};
-template<>
-struct native_to_wasm<uint32_t> {
-   using type = I32;
-};
-template<>
-struct native_to_wasm<int64_t> {
-   using type = I64;
-};
-template<>
-struct native_to_wasm<uint64_t> {
-   using type = I64;
-};
-template<>
-struct native_to_wasm<bool> {
-   using type = I32;
-};
-template<>
-struct native_to_wasm<const name &> {
-   using type = I64;
-};
-template<>
-struct native_to_wasm<name> {
-   using type = I64;
-};
-template<>
-struct native_to_wasm<const fc::time_point_sec &> {
-   using type = I32;
-};
-
-template<>
-struct native_to_wasm<fc::time_point_sec> {
-   using type = I32;
-};
-
-// convenience alias
-template<typename T>
-using native_to_wasm_t = typename native_to_wasm<T>::type;
-
-template<typename T>
-inline auto convert_native_to_wasm(const running_instance_context& ctx, T val) {
-   return native_to_wasm_t<T>(val);
-}
-
-inline auto convert_native_to_wasm(const running_instance_context& ctx, const name &val) {
-   return native_to_wasm_t<const name &>(val.to_uint64_t());
-}
-
-inline auto convert_native_to_wasm(const running_instance_context& ctx, const fc::time_point_sec& val) {
-   return native_to_wasm_t<const fc::time_point_sec &>(val.sec_since_epoch());
-}
-
-inline auto convert_native_to_wasm(running_instance_context& ctx, char* ptr) {
-   MemoryInstance* mem = ctx.memory;
-   if(!mem)
-      Runtime::causeException(Exception::Cause::accessViolation);
-   char* base = (char*)getMemoryBaseAddress(mem);
-   char* top_of_memory = base + IR::numBytesPerPage*Runtime::getMemoryNumPages(mem);
-   if(ptr < base || ptr >= top_of_memory)
-      Runtime::causeException(Exception::Cause::accessViolation);
-   return (U32)(ptr - base);
-}
-
-template<typename T>
-inline auto convert_wasm_to_native(native_to_wasm_t<T> val) {
-   return T(val);
-}
-
-/**
- * Forward declaration of the invoker type which transcribes arguments to/from a native method
- * and injects the appropriate checks
- *
- * @tparam Ret - the return type of the native function
- * @tparam NativeParameters - a std::tuple of the remaining native parameters to transcribe
- * @tparam WasmParameters - a std::tuple of the transribed parameters
- */
-template<typename Ret, typename NativeParameters, typename WasmParameters>
-struct intrinsic_invoker_impl;
-
-/**
- * Specialization for the fully transcribed signature
- * @tparam Ret - the return type of the native function
- * @tparam Translated - the arguments to the wasm function
- */
-template<typename Ret, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<>, std::tuple<Translated...>> {
-   using next_method_type        = Ret (*)(running_instance_context &, Translated...);
-
-   template<next_method_type Method>
-   static native_to_wasm_t<Ret> invoke(Translated... translated) {
-      try {
-         return convert_native_to_wasm(the_running_instance_context, Method(the_running_instance_context, translated...));
-      }
-      catch(...) {
-         Platform::immediately_exit(std::current_exception());
-      }
-   }
-
-   template<next_method_type Method>
-   static const auto fn() {
-      return invoke<Method>;
-   }
-};
-
-/**
- * specialization of the fully transcribed signature for void return values
- * @tparam Translated - the arguments to the wasm function
- */
-template<typename ...Translated>
-struct intrinsic_invoker_impl<void_type, std::tuple<>, std::tuple<Translated...>> {
-   using next_method_type        = void_type (*)(running_instance_context &, Translated...);
-
-   template<next_method_type Method>
-   static void invoke(Translated... translated) {
-      try {
-         Method(the_running_instance_context, translated...);
-      }
-      catch(...) {
-         Platform::immediately_exit(std::current_exception());
-      }
-   }
-
-   template<next_method_type Method>
-   static const auto fn() {
-      return invoke<Method>;
-   }
-};
-
-/**
- * Sepcialization for transcribing  a simple type in the native method signature
- * @tparam Ret - the return type of the native method
- * @tparam Input - the type of the native parameter to transcribe
- * @tparam Inputs - the remaining native parameters to transcribe
- * @tparam Translated - the list of transcribed wasm parameters
- */
-template<typename Ret, typename Input, typename... Inputs, typename... Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<Input, Inputs...>, std::tuple<Translated...>> {
-   using translated_type = native_to_wasm_t<Input>;
-   using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., translated_type>>;
-   using then_type = Ret (*)(running_instance_context &, Input, Inputs..., Translated...);
-
-   template<then_type Then>
-   static Ret translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, translated_type last) {
-      auto native = convert_wasm_to_native<Input>(last);
-      return Then(ctx, native, rest..., translated...);
-   };
-
-   template<then_type Then>
-   static const auto fn() {
-      return next_step::template fn<translate_one<Then>>();
-   }
-};
-
-/**
- * Specialization for transcribing  a array_ptr type in the native method signature
- * This type transcribes into 2 wasm parameters: a pointer and byte length and checks the validity of that memory
- * range before dispatching to the native method
- *
- * @tparam Ret - the return type of the native method
- * @tparam Inputs - the remaining native parameters to transcribe
- * @tparam Translated - the list of transcribed wasm parameters
- */
-template<typename T, typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, uint32_t, Inputs...>, std::tuple<Translated...>> {
-   using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32, I32>>;
-   using then_type = Ret(*)(running_instance_context&, array_ptr<T>, uint32_t, Inputs..., Translated...);
-
-   template<then_type Then, typename U=T>
-   static auto translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr, I32 size) -> std::enable_if_t<std::is_const<U>::value, Ret> {
-      static_assert(!std::is_pointer<U>::value, "Currently don't support array of pointers");
-      const auto length = size_t(size);
-      T* base = array_ptr_impl<T>(ctx, (U32)ptr, length);
-      if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
-         if(ctx.apply_ctx->control.contracts_console())
-            wlog( "misaligned array of const values" );
-         std::vector<std::remove_const_t<T> > copy(length > 0 ? length : 1);
-         T* copy_ptr = &copy[0];
-         memcpy( (void*)copy_ptr, (void*)base, length * sizeof(T) );
-         return Then(ctx, static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
-      }
-      return Then(ctx, static_cast<array_ptr<T>>(base), length, rest..., translated...);
-   };
-
-   template<then_type Then, typename U=T>
-   static auto translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr, I32 size) -> std::enable_if_t<!std::is_const<U>::value, Ret> {
-      static_assert(!std::is_pointer<U>::value, "Currently don't support array of pointers");
-      const auto length = size_t(size);
-      T* base = array_ptr_impl<T>(ctx, (U32)ptr, length);
-      if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
-         if(ctx.apply_ctx->control.contracts_console())
-            wlog( "misaligned array of values" );
-         std::vector<std::remove_const_t<T> > copy(length > 0 ? length : 1);
-         T* copy_ptr = &copy[0];
-         memcpy( (void*)copy_ptr, (void*)base, length * sizeof(T) );
-         Ret ret = Then(ctx, static_cast<array_ptr<T>>(copy_ptr), length, rest..., translated...);
-         memcpy( (void*)base, (void*)copy_ptr, length * sizeof(T) );
-         return ret;
-      }
-      return Then(ctx, static_cast<array_ptr<T>>(base), length, rest..., translated...);
-   };
-
-   template<then_type Then>
-   static const auto fn() {
-      return next_step::template fn<translate_one<Then>>();
-   }
-};
-
-/**
- * Specialization for transcribing  a null_terminated_ptr type in the native method signature
- * This type transcribes 1 wasm parameters: a char pointer which is validated to contain
- * a null value before the end of the allocated memory.
- *
- * @tparam Ret - the return type of the native method
- * @tparam Inputs - the remaining native parameters to transcribe
- * @tparam Translated - the list of transcribed wasm parameters
- */
-template<typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<null_terminated_ptr, Inputs...>, std::tuple<Translated...>> {
-   using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32>>;
-   using then_type = Ret(*)(running_instance_context&, null_terminated_ptr, Inputs..., Translated...);
-
-   template<then_type Then>
-   static Ret translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr) {
-      return Then(ctx, null_terminated_ptr_impl(ctx, (U32)ptr), rest..., translated...);
-   };
-
-   template<then_type Then>
-   static const auto fn() {
-      return next_step::template fn<translate_one<Then>>();
-   }
-};
-
-/**
- * Specialization for transcribing  a pair of array_ptr types in the native method signature that share size
- * This type transcribes into 3 wasm parameters: 2 pointers and byte length and checks the validity of those memory
- * ranges before dispatching to the native method
- *
- * @tparam Ret - the return type of the native method
- * @tparam Inputs - the remaining native parameters to transcribe
- * @tparam Translated - the list of transcribed wasm parameters
- */
-template<typename T, typename U, typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<T>, array_ptr<U>, uint32_t, Inputs...>, std::tuple<Translated...>> {
-   using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32, I32, I32>>;
-   using then_type = Ret(*)(running_instance_context&, array_ptr<T>, array_ptr<U>, uint32_t, Inputs..., Translated...);
-
-   template<then_type Then>
-   static Ret translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr_t, I32 ptr_u, I32 size) {
-      static_assert(std::is_same<std::remove_const_t<T>, char>::value && std::is_same<std::remove_const_t<U>, char>::value, "Currently only support array of (const)chars");
-      const auto length = size_t(size);
-      return Then(ctx, array_ptr_impl<T>(ctx, (U32)ptr_t, length), array_ptr_impl<U>(ctx, (U32)ptr_u, length), length, rest..., translated...);
-   };
-
-   template<then_type Then>
-   static const auto fn() {
-      return next_step::template fn<translate_one<Then>>();
-   }
-};
-
-/**
- * Specialization for transcribing memset parameters
- *
- * @tparam Ret - the return type of the native method
- * @tparam Inputs - the remaining native parameters to transcribe
- * @tparam Translated - the list of transcribed wasm parameters
- */
-template<typename Ret>
-struct intrinsic_invoker_impl<Ret, std::tuple<array_ptr<char>, int, uint32_t>, std::tuple<>> {
-   using next_step = intrinsic_invoker_impl<Ret, std::tuple<>, std::tuple<I32, I32, I32>>;
-   using then_type = Ret(*)(running_instance_context&, array_ptr<char>, int, uint32_t);
-
-   template<then_type Then>
-   static Ret translate_one(running_instance_context& ctx, I32 ptr, I32 value, I32 size) {
-      const auto length = size_t(size);
-      return Then(ctx, array_ptr_impl<char>(ctx, (U32)ptr, length), value, length);
-   };
-
-   template<then_type Then>
-   static const auto fn() {
-      return next_step::template fn<translate_one<Then>>();
-   }
-};
-
-/**
- * Specialization for transcribing  a pointer type in the native method signature
- * This type transcribes into an int32  pointer checks the validity of that memory
- * range before dispatching to the native method
- *
- * @tparam Ret - the return type of the native method
- * @tparam Inputs - the remaining native parameters to transcribe
- * @tparam Translated - the list of transcribed wasm parameters
- */
-template<typename T, typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<T *, Inputs...>, std::tuple<Translated...>> {
-   using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32>>;
-   using then_type = Ret (*)(running_instance_context&, T *, Inputs..., Translated...);
-
-   template<then_type Then, typename U=T>
-   static auto translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<std::is_const<U>::value, Ret> {
-      T* base = array_ptr_impl<T>(ctx, (U32)ptr, 1);
-      if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
-         if(ctx.apply_ctx->control.contracts_console())
-            wlog( "misaligned const pointer" );
-         std::remove_const_t<T> copy;
-         T* copy_ptr = &copy;
-         memcpy( (void*)copy_ptr, (void*)base, sizeof(T) );
-         return Then(ctx, copy_ptr, rest..., translated...);
-      }
-      return Then(ctx, base, rest..., translated...);
-   };
-
-   template<then_type Then, typename U=T>
-   static auto translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<!std::is_const<U>::value, Ret> {
-      T* base = array_ptr_impl<T>(ctx, (U32)ptr, 1);
-      if ( reinterpret_cast<uintptr_t>(base) % alignof(T) != 0 ) {
-         if(ctx.apply_ctx->control.contracts_console())
-            wlog( "misaligned pointer" );
-         std::remove_const_t<T> copy;
-         T* copy_ptr = &copy;
-         memcpy( (void*)copy_ptr, (void*)base, sizeof(T) );
-         Ret ret = Then(ctx, copy_ptr, rest..., translated...);
-         memcpy( (void*)base, (void*)copy_ptr, sizeof(T) );
-         return ret;
-      }
-      return Then(ctx, base, rest..., translated...);
-   };
-
-   template<then_type Then>
-   static const auto fn() {
-      return next_step::template fn<translate_one<Then>>();
-   }
-};
-
-/**
- * Specialization for transcribing a reference to a name which can be passed as a native value
- *    This type transcribes into a native type which is loaded by value into a
- *    variable on the stack and then passed by reference to the intrinsic.
- *
- * @tparam Ret - the return type of the native method
- * @tparam Inputs - the remaining native parameters to transcribe
- * @tparam Translated - the list of transcribed wasm parameters
- */
-template<typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<const name&, Inputs...>, std::tuple<Translated...>> {
-   using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., native_to_wasm_t<const name&> >>;
-   using then_type = Ret (*)(running_instance_context&, const name&, Inputs..., Translated...);
-
-   template<then_type Then>
-   static Ret translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, native_to_wasm_t<const name&> wasm_value) {
-      auto value = name(wasm_value);
-      return Then(ctx, value, rest..., translated...);
-   }
-
-   template<then_type Then>
-   static const auto fn() {
-      return next_step::template fn<translate_one<Then>>();
-   }
-};
-
-/**
- * Specialization for transcribing  a reference type in the native method signature
- *    This type transcribes into an int32  pointer checks the validity of that memory
- *    range before dispatching to the native method
- *
- * @tparam Ret - the return type of the native method
- * @tparam Inputs - the remaining native parameters to transcribe
- * @tparam Translated - the list of transcribed wasm parameters
- */
-template<typename T, typename Ret, typename... Inputs, typename ...Translated>
-struct intrinsic_invoker_impl<Ret, std::tuple<T &, Inputs...>, std::tuple<Translated...>> {
-   using next_step = intrinsic_invoker_impl<Ret, std::tuple<Inputs...>, std::tuple<Translated..., I32>>;
-   using then_type = Ret (*)(running_instance_context &, T &, Inputs..., Translated...);
-
-   template<then_type Then, typename U=T>
-   static auto translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<std::is_const<U>::value, Ret> {
-      // references cannot be created for null pointers
-      EOS_ASSERT((U32)ptr != 0, wasm_exception, "references cannot be created for null pointers");
-      MemoryInstance* mem = ctx.memory;
-      if(!mem || (U32)ptr+sizeof(T) >= IR::numBytesPerPage*Runtime::getMemoryNumPages(mem))
-         Runtime::causeException(Exception::Cause::accessViolation);
-      T &base = *(T*)(getMemoryBaseAddress(mem)+(U32)ptr);
-      if ( reinterpret_cast<uintptr_t>(&base) % alignof(T) != 0 ) {
-         if(ctx.apply_ctx->control.contracts_console())
-            wlog( "misaligned const reference" );
-         std::remove_const_t<T> copy;
-         T* copy_ptr = &copy;
-         memcpy( (void*)copy_ptr, (void*)&base, sizeof(T) );
-         return Then(ctx, *copy_ptr, rest..., translated...);
-      }
-      return Then(ctx, base, rest..., translated...);
-   }
-
-   template<then_type Then, typename U=T>
-   static auto translate_one(running_instance_context& ctx, Inputs... rest, Translated... translated, I32 ptr) -> std::enable_if_t<!std::is_const<U>::value, Ret> {
-      // references cannot be created for null pointers
-      EOS_ASSERT((U32)ptr != 0, wasm_exception, "reference cannot be created for null pointers");
-      MemoryInstance* mem = ctx.memory;
-      if(!mem || (U32)ptr+sizeof(T) >= IR::numBytesPerPage*Runtime::getMemoryNumPages(mem))
-         Runtime::causeException(Exception::Cause::accessViolation);
-      T &base = *(T*)(getMemoryBaseAddress(mem)+(U32)ptr);
-      if ( reinterpret_cast<uintptr_t>(&base) % alignof(T) != 0 ) {
-         if(ctx.apply_ctx->control.contracts_console())
-            wlog( "misaligned reference" );
-         std::remove_const_t<T> copy;
-         T* copy_ptr = &copy;
-         memcpy( (void*)copy_ptr, (void*)&base, sizeof(T) );
-         Ret ret = Then(ctx, *copy_ptr, rest..., translated...);
-         memcpy( (void*)&base, (void*)copy_ptr, sizeof(T) );
-         return ret;
-      }
-      return Then(ctx, base, rest..., translated...);
-   }
-
-   template<then_type Then>
-   static const auto fn() {
-      return next_step::template fn<translate_one<Then>>();
-   }
-};
-
-/**
- * forward declaration of a wrapper class to call methods of the class
- */
-template<typename WasmSig, typename Ret, typename MethodSig, typename Cls, typename... Params>
-struct intrinsic_function_invoker {
-   using impl = intrinsic_invoker_impl<Ret, std::tuple<Params...>, std::tuple<>>;
-
-   template<MethodSig Method>
-   static Ret wrapper(running_instance_context& ctx, Params... params) {
-      class_from_wasm<Cls>::value(*ctx.apply_ctx).checktime();
-      return (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
-   }
-
-   template<MethodSig Method>
-   static const WasmSig *fn() {
-      auto fn = impl::template fn<wrapper<Method>>();
-      static_assert(std::is_same<WasmSig *, decltype(fn)>::value,
-                    "Intrinsic function signature does not match the ABI");
-      return fn;
-   }
-};
-
-template<typename WasmSig, typename MethodSig, typename Cls, typename... Params>
-struct intrinsic_function_invoker<WasmSig, void, MethodSig, Cls, Params...> {
-   using impl = intrinsic_invoker_impl<void_type, std::tuple<Params...>, std::tuple<>>;
-
-   template<MethodSig Method>
-   static void_type wrapper(running_instance_context& ctx, Params... params) {
-      class_from_wasm<Cls>::value(*ctx.apply_ctx).checktime();
-      (class_from_wasm<Cls>::value(*ctx.apply_ctx).*Method)(params...);
-      return void_type();
-   }
-
-   template<MethodSig Method>
-   static const WasmSig *fn() {
-      auto fn = impl::template fn<wrapper<Method>>();
-      static_assert(std::is_same<WasmSig *, decltype(fn)>::value,
-                    "Intrinsic function signature does not match the ABI");
-      return fn;
-   }
-};
-
-template<typename T>
-struct void_ret_wrapper {
-   using type = T;
-};
-
-template<>
-struct void_ret_wrapper<void> {
-   using type = char;
-};
-
-template<typename T>
-using void_ret_wrapper_t = typename void_ret_wrapper<T>::type;
-
-template<typename, typename>
-struct intrinsic_function_invoker_wrapper;
-
-template<typename WasmSig, typename Cls, typename Ret, typename... Params>
-struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...)> {
-   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
-                  "intrinsics should only return a reference or pointer with single byte alignment");
-   using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...), Cls, Params...>;
-};
-
-template<typename WasmSig, typename Cls, typename Ret, typename... Params>
-struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) const> {
-   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
-                  "intrinsics should only return a reference or pointer with single byte alignment");
-   using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) const, Cls, Params...>;
-};
-
-template<typename WasmSig, typename Cls, typename Ret, typename... Params>
-struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) volatile> {
-   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
-                  "intrinsics should only return a reference or pointer with single byte alignment");
-   using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) volatile, Cls, Params...>;
-};
-
-template<typename WasmSig, typename Cls, typename Ret, typename... Params>
-struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) const volatile> {
-   static_assert( !(std::is_pointer_v<Ret> && alignof(std::remove_pointer_t<void_ret_wrapper_t<Ret>>) != 1) &&
-                  !(std::is_lvalue_reference_v<Ret> && alignof(std::remove_reference_t<void_ret_wrapper_t<Ret>>) != 1),
-                  "intrinsics should only return a reference or pointer with single byte alignment");
-   using type = intrinsic_function_invoker<WasmSig, Ret, Ret (Cls::*)(Params...) const volatile, Cls, Params...>;
-};
-
-#define _REGISTER_WAVM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
-   static Intrinsics::Function _INTRINSIC_NAME(__intrinsic_fn, __COUNTER__) (\
-      MOD "." NAME,\
-      eosio::chain::webassembly::wavm::wasm_function_type_provider<WASM_SIG>::type(),\
-      (void *)eosio::chain::webassembly::wavm::intrinsic_function_invoker_wrapper<WASM_SIG, SIG>::type::fn<&CLS::METHOD>()\
-   );
-
-#else
-
 #define _REGISTER_WAVM_INTRINSIC(CLS, MOD, METHOD, WASM_SIG, NAME, SIG)\
    static Intrinsics::Function _INTRINSIC_NAME(__intrinsic_fn, __COUNTER__) (\
       MOD "." NAME,\
@@ -746,6 +152,4 @@ struct intrinsic_function_invoker_wrapper<WasmSig, Ret (Cls::*)(Params...) const
       nullptr\
    );
 
-#endif
-
 } } } }// eosio::chain::webassembly::wavm
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index b0cfe07745a..c29bb77838c 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -2079,9 +2079,7 @@ REGISTER_INJECTED_INTRINSICS(softfloat_api,
 std::istream& operator>>(std::istream& in, wasm_interface::vm_type& runtime) {
    std::string s;
    in >> s;
-   if (s == "wavm")
-      runtime = eosio::chain::wasm_interface::vm_type::wavm;
-   else if (s == "wabt")
+   if (s == "wabt")
       runtime = eosio::chain::wasm_interface::vm_type::wabt;
    else if (s == "eos-vm")
       runtime = eosio::chain::wasm_interface::vm_type::eos_vm;
diff --git a/libraries/testing/include/eosio/testing/tester.hpp b/libraries/testing/include/eosio/testing/tester.hpp
index c8d83ba34a0..6df94c8862b 100644
--- a/libraries/testing/include/eosio/testing/tester.hpp
+++ b/libraries/testing/include/eosio/testing/tester.hpp
@@ -400,9 +400,7 @@ namespace eosio { namespace testing {
             cfg.eosvmoc_config.cache_size = 1024*1024*8;
 
             for(int i = 0; i < boost::unit_test::framework::master_test_suite().argc; ++i) {
-               if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wavm"))
-                  cfg.wasm_runtime = chain::wasm_interface::vm_type::wavm;
-               else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
+               if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--wabt"))
                   cfg.wasm_runtime = chain::wasm_interface::vm_type::wabt;
                else if(boost::unit_test::framework::master_test_suite().argv[i] == std::string("--eos-vm"))
                   cfg.wasm_runtime = chain::wasm_interface::vm_type::eos_vm;
diff --git a/libraries/wasm-jit/CMakeLists.txt b/libraries/wasm-jit/CMakeLists.txt
index 8fcdec4e9ce..7697f6ee59f 100644
--- a/libraries/wasm-jit/CMakeLists.txt
+++ b/libraries/wasm-jit/CMakeLists.txt
@@ -67,11 +67,9 @@ endif()
 
 add_subdirectory(Include/Inline)
 
-#add_subdirectory(Source/Emscripten)
 add_subdirectory(Source/IR)
 add_subdirectory(Source/Logging)
 add_subdirectory(Source/Platform)
-#add_subdirectory(Source/Programs)
 add_subdirectory(Source/Runtime)
 add_subdirectory(Source/WASM)
 add_subdirectory(Source/WAST)
diff --git a/libraries/wasm-jit/Include/Runtime/llvmWARshim.h b/libraries/wasm-jit/Include/Runtime/llvmWARshim.h
deleted file mode 100644
index 56f9e352cbe..00000000000
--- a/libraries/wasm-jit/Include/Runtime/llvmWARshim.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <llvm/IR/IRBuilder.h>
-
-namespace LLVMJIT {
-
-llvm::Value* CreateInBoundsGEPWAR(llvm::IRBuilder<>& irBuilder, llvm::Value* Ptr, llvm::Value* v1, llvm::Value* v2 = nullptr);
-
-}
\ No newline at end of file
diff --git a/libraries/wasm-jit/Source/Emscripten/CMakeLists.txt b/libraries/wasm-jit/Source/Emscripten/CMakeLists.txt
deleted file mode 100644
index 1999cabd51f..00000000000
--- a/libraries/wasm-jit/Source/Emscripten/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-set(Sources Emscripten.cpp)
-set(PublicHeaders ${WAVM_INCLUDE_DIR}/Emscripten/Emscripten.h)
-include_directories(${WAVM_INCLUDE_DIR}/Emscripten)
-
-add_library(Emscripten STATIC ${Sources} ${PublicHeaders})
-
-add_definitions(-DEMSCRIPTEN_API=DLL_EXPORT)
-
-target_link_libraries(Emscripten Logging Platform Runtime)
diff --git a/libraries/wasm-jit/Source/Emscripten/Emscripten.cpp b/libraries/wasm-jit/Source/Emscripten/Emscripten.cpp
deleted file mode 100644
index 969d7566642..00000000000
--- a/libraries/wasm-jit/Source/Emscripten/Emscripten.cpp
+++ /dev/null
@@ -1,451 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "Logging/Logging.h"
-#include "IR/IR.h"
-#include "IR/Module.h"
-#include "Runtime/Runtime.h"
-#include "Runtime/Intrinsics.h"
-#include "Emscripten.h"
-#include <time.h>
-#include <stdio.h>
-#include <limits.h>
-#include <string.h>
-
-#ifndef _WIN32
-#include <sys/uio.h>
-#endif
-
-namespace Emscripten
-{
-	using namespace IR;
-	using namespace Runtime;
-
-	static U32 coerce32bitAddress(Uptr address)
-	{
-		if(address >= UINT32_MAX) { causeException(Exception::Cause::accessViolation); }
-		return (U32)address;
-	}
-
-	DEFINE_INTRINSIC_GLOBAL(env,STACKTOP,STACKTOP,i32,false,0);
-	DEFINE_INTRINSIC_GLOBAL(env,STACK_MAX,STACK_MAX,i32,false,0);
-	DEFINE_INTRINSIC_GLOBAL(env,tempDoublePtr,tempDoublePtr,i32,false,0);
-	DEFINE_INTRINSIC_GLOBAL(env,ABORT,ABORT,i32,false,0);
-	DEFINE_INTRINSIC_GLOBAL(env,cttz_i8,cttz_i8,i32,false,0);
-	DEFINE_INTRINSIC_GLOBAL(env,___dso_handle,___dso_handle,i32,false,0);
-	DEFINE_INTRINSIC_GLOBAL(env,_stderr,_stderr,i32,false,0);
-	DEFINE_INTRINSIC_GLOBAL(env,_stdin,_stdin,i32,false,0);
-	DEFINE_INTRINSIC_GLOBAL(env,_stdout,_stdout,i32,false,0);
-
-	DEFINE_INTRINSIC_MEMORY(env,emscriptenMemory,memory,MemoryType(false,SizeConstraints({256,UINT64_MAX})));
-	DEFINE_INTRINSIC_TABLE(env,table,table,TableType(TableElementType::anyfunc,false,SizeConstraints({1024*1024,UINT64_MAX})));
-
-	DEFINE_INTRINSIC_GLOBAL(env,memoryBase,memoryBase,i32,false,1024);
-	DEFINE_INTRINSIC_GLOBAL(env,tableBase,tableBase,i32,false,0);
-
-	DEFINE_INTRINSIC_GLOBAL(env,DYNAMICTOP_PTR,DYNAMICTOP_PTR,i32,false,0)
-	DEFINE_INTRINSIC_GLOBAL(env,em_environ,_environ,i32,false,0)
-	DEFINE_INTRINSIC_GLOBAL(env,EMTSTACKTOP,EMTSTACKTOP,i32,false,0)
-	DEFINE_INTRINSIC_GLOBAL(env,EMT_STACK_MAX,EMT_STACK_MAX,i32,false,0)
-	DEFINE_INTRINSIC_GLOBAL(env,eb,eb,i32,false,0)
-
-	Platform::Mutex* sbrkMutex = Platform::createMutex();
-	bool hasSbrkBeenCalled = false;
-	Uptr sbrkNumPages = 0;
-	U32 sbrkMinBytes = 0;
-	U32 sbrkNumBytes = 0;
-
-	static U32 sbrk(I32 numBytes)
-	{
-		Platform::Lock sbrkLock(sbrkMutex);
-
-		if(!hasSbrkBeenCalled)
-		{
-			// Do some first time initialization.
-			sbrkNumPages = getMemoryNumPages(emscriptenMemory);
-			sbrkMinBytes = sbrkNumBytes = coerce32bitAddress(sbrkNumPages << numBytesPerPageLog2);
-			hasSbrkBeenCalled = true;
-		}
-		else
-		{
-			// Ensure that nothing else is calling growMemory/shrinkMemory.
-			if(getMemoryNumPages(emscriptenMemory) != sbrkNumPages)
-			{ causeException(Exception::Cause::unknown); }
-		}
-		
-		const U32 previousNumBytes = sbrkNumBytes;
-		
-		// Round the absolute value of numBytes to an alignment boundary, and ensure it won't allocate too much or too little memory.
-		numBytes = (numBytes + 7) & ~7;
-		if(numBytes > 0 && previousNumBytes > UINT32_MAX - numBytes) { causeException(Exception::Cause::accessViolation); }
-		else if(numBytes < 0 && previousNumBytes < sbrkMinBytes - numBytes) { causeException(Exception::Cause::accessViolation); }
-
-		// Update the number of bytes allocated, and compute the number of pages needed for it.
-		sbrkNumBytes += numBytes;
-		const Uptr numDesiredPages = (sbrkNumBytes + numBytesPerPage - 1) >> numBytesPerPageLog2;
-
-		// Grow or shrink the memory object to the desired number of pages.
-		if(numDesiredPages > sbrkNumPages) { growMemory(emscriptenMemory,numDesiredPages - sbrkNumPages); }
-		else if(numDesiredPages < sbrkNumPages) { shrinkMemory(emscriptenMemory,sbrkNumPages - numDesiredPages); }
-		sbrkNumPages = numDesiredPages;
-
-		return previousNumBytes;
-	}
-
-	DEFINE_INTRINSIC_FUNCTION1(env,_sbrk,_sbrk,i32,i32,numBytes)
-	{
-		return sbrk(numBytes);
-	}
-
-	DEFINE_INTRINSIC_FUNCTION1(env,_time,_time,i32,i32,address)
-	{
-		time_t t = time(nullptr);
-		if(address)
-		{
-			memoryRef<I32>(emscriptenMemory,address) = (I32)t;
-		}
-		return (I32)t;
-	}
-
-	DEFINE_INTRINSIC_FUNCTION0(env,___errno_location,___errno_location,i32)
-	{
-		return 0;
-	}
-
-	DEFINE_INTRINSIC_FUNCTION1(env,_sysconf,_sysconf,i32,i32,a)
-	{
-		enum { sysConfPageSize = 30 };
-		switch(a)
-		{
-		case sysConfPageSize: return IR::numBytesPerPage;
-		default: causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic);
-		}
-	}
-
-	DEFINE_INTRINSIC_FUNCTION2(env,_pthread_cond_wait,_pthread_cond_wait,i32,i32,a,i32,b) { return 0; }
-	DEFINE_INTRINSIC_FUNCTION1(env,_pthread_cond_broadcast,_pthread_cond_broadcast,i32,i32,a) { return 0; }
-	DEFINE_INTRINSIC_FUNCTION2(env,_pthread_key_create,_pthread_key_create,i32,i32,a,i32,b) { causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic); }
-	DEFINE_INTRINSIC_FUNCTION1(env,_pthread_mutex_lock,_pthread_mutex_lock,i32,i32,a) { return 0; }
-	DEFINE_INTRINSIC_FUNCTION1(env,_pthread_mutex_unlock,_pthread_mutex_unlock,i32,i32,a) { return 0; }
-	DEFINE_INTRINSIC_FUNCTION2(env,_pthread_setspecific,_pthread_setspecific,i32,i32,a,i32,b) { causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic); }
-	DEFINE_INTRINSIC_FUNCTION1(env,_pthread_getspecific,_pthread_getspecific,i32,i32,a) { causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic); }
-	DEFINE_INTRINSIC_FUNCTION2(env,_pthread_once,_pthread_once,i32,i32,a,i32,b) { causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic); }
-	DEFINE_INTRINSIC_FUNCTION2(env,_pthread_cleanup_push,_pthread_cleanup_push,none,i32,a,i32,b) { }
-	DEFINE_INTRINSIC_FUNCTION1(env,_pthread_cleanup_pop,_pthread_cleanup_pop,none,i32,a) { }
-	DEFINE_INTRINSIC_FUNCTION0(env,_pthread_self,_pthread_self,i32) { return 0; }
-
-	DEFINE_INTRINSIC_FUNCTION0(env,___ctype_b_loc,___ctype_b_loc,i32)
-	{
-		unsigned short data[384] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,8195,8194,8194,8194,8194,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,24577,49156,49156,49156,49156,49156,49156,49156,49156,49156,49156,49156,49156,49156,49156,49156,55304,55304,55304,55304,55304,55304,55304,55304,55304,55304,49156,49156,49156,49156,49156,49156,49156,54536,54536,54536,54536,54536,54536,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,50440,49156,49156,49156,49156,49156,49156,54792,54792,54792,54792,54792,54792,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,50696,49156,49156,49156,49156,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-		static U32 vmAddress = 0;
-		if(vmAddress == 0)
-		{
-			vmAddress = coerce32bitAddress(sbrk(sizeof(data)));
-			memcpy(memoryArrayPtr<U8>(emscriptenMemory,vmAddress,sizeof(data)),data,sizeof(data));
-		}
-		return vmAddress + sizeof(short)*128;
-	}
-	DEFINE_INTRINSIC_FUNCTION0(env,___ctype_toupper_loc,___ctype_toupper_loc,i32)
-	{
-		I32 data[384] = {128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255};
-		static U32 vmAddress = 0;
-		if(vmAddress == 0)
-		{
-			vmAddress = coerce32bitAddress(sbrk(sizeof(data)));
-			memcpy(memoryArrayPtr<U8>(emscriptenMemory,vmAddress,sizeof(data)),data,sizeof(data));
-		}
-		return vmAddress + sizeof(I32)*128;
-	}
-	DEFINE_INTRINSIC_FUNCTION0(env,___ctype_tolower_loc,___ctype_tolower_loc,i32)
-	{
-		I32 data[384] = {128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255};
-		static U32 vmAddress = 0;
-		if(vmAddress == 0)
-		{
-			vmAddress = coerce32bitAddress(sbrk(sizeof(data)));
-			memcpy(memoryArrayPtr<U8>(emscriptenMemory,vmAddress,sizeof(data)),data,sizeof(data));
-		}
-		return vmAddress + sizeof(I32)*128;
-	}
-	DEFINE_INTRINSIC_FUNCTION4(env,___assert_fail,___assert_fail,none,i32,condition,i32,filename,i32,line,i32,function)
-	{
-		causeException(Runtime::Exception::Cause::calledAbort);
-	}
-
-	DEFINE_INTRINSIC_FUNCTION3(env,___cxa_atexit,___cxa_atexit,i32,i32,a,i32,b,i32,c)
-	{
-		return 0;
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,___cxa_guard_acquire,___cxa_guard_acquire,i32,i32,address)
-	{
-		if(!memoryRef<U8>(emscriptenMemory,address))
-		{
-			memoryRef<U8>(emscriptenMemory,address) = 1;
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,___cxa_guard_release,___cxa_guard_release,none,i32,a)
-	{}
-	DEFINE_INTRINSIC_FUNCTION3(env,___cxa_throw,___cxa_throw,none,i32,a,i32,b,i32,c)
-	{
-		causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic);
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,___cxa_begin_catch,___cxa_begin_catch,i32,i32,a)
-	{
-		causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic);
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,___cxa_allocate_exception,___cxa_allocate_exception,i32,i32,size)
-	{
-		return coerce32bitAddress(sbrk(size));
-	}
-	DEFINE_INTRINSIC_FUNCTION0(env,__ZSt18uncaught_exceptionv,__ZSt18uncaught_exceptionv,i32)
-	{
-		causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic);
-	}
-	DEFINE_INTRINSIC_FUNCTION0(env,_abort,_abort,none)
-	{
-		causeException(Runtime::Exception::Cause::calledAbort);
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,_exit,_exit,none,i32,code)
-	{
-		causeException(Runtime::Exception::Cause::calledAbort);
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,abort,abort,none,i32,code)
-	{
-		Log::printf(Log::Category::error,"env.abort(%i)\n",code);
-		causeException(Runtime::Exception::Cause::calledAbort);
-	}
-
-	static U32 currentLocale = 0;
-	DEFINE_INTRINSIC_FUNCTION1(env,_uselocale,_uselocale,i32,i32,locale)
-	{
-		auto oldLocale = currentLocale;
-		currentLocale = locale;
-		return oldLocale;
-	}
-	DEFINE_INTRINSIC_FUNCTION3(env,_newlocale,_newlocale,i32,i32,mask,i32,locale,i32,base)
-	{
-		if(!base)
-		{
-			base = coerce32bitAddress(sbrk(4));
-		}
-		return base;
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,_freelocale,_freelocale,none,i32,a)
-	{}
-
-	DEFINE_INTRINSIC_FUNCTION5(env,_strftime_l,_strftime_l,i32,i32,a,i32,b,i32,c,i32,d,i32,e) { causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic); }
-	DEFINE_INTRINSIC_FUNCTION1(env,_strerror,_strerror,i32,i32,a) { causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic); }
-
-	DEFINE_INTRINSIC_FUNCTION2(env,_catopen,_catopen,i32,i32,a,i32,b) { return (U32)-1; }
-	DEFINE_INTRINSIC_FUNCTION4(env,_catgets,_catgets,i32,i32,catd,i32,set_id,i32,msg_id,i32,s) { return s; }
-	DEFINE_INTRINSIC_FUNCTION1(env,_catclose,_catclose,i32,i32,a) { return 0; }
-
-	DEFINE_INTRINSIC_FUNCTION3(env,_emscripten_memcpy_big,_emscripten_memcpy_big,i32,i32,a,i32,b,i32,c)
-	{
-		memcpy(memoryArrayPtr<U8>(emscriptenMemory,a,c),memoryArrayPtr<U8>(emscriptenMemory,b,c),U32(c));
-		return a;
-	}
-
-	enum class ioStreamVMHandle
-	{
-		StdErr = 1,
-		StdIn = 2,
-		StdOut = 3
-	};
-	FILE* vmFile(U32 vmHandle)
-	{
-		switch((ioStreamVMHandle)vmHandle)
-		{
-		case ioStreamVMHandle::StdErr: return stderr;
-		case ioStreamVMHandle::StdIn: return stdin;
-		case ioStreamVMHandle::StdOut: return stdout;
-		default: return stdout;//std::cerr << "invalid file handle " << vmHandle << std::endl; throw;
-		}
-	}
-
-	DEFINE_INTRINSIC_FUNCTION3(env,_vfprintf,_vfprintf,i32,i32,file,i32,formatPointer,i32,argList)
-	{
-		causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic);
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,_getc,_getc,i32,i32,file)
-	{
-		return getc(vmFile(file));
-	}
-	DEFINE_INTRINSIC_FUNCTION2(env,_ungetc,_ungetc,i32,i32,character,i32,file)
-	{
-		return ungetc(character,vmFile(file));
-	}
-	DEFINE_INTRINSIC_FUNCTION4(env,_fread,_fread,i32,i32,pointer,i32,size,i32,count,i32,file)
-	{
-		return (I32)fread(memoryArrayPtr<U8>(emscriptenMemory,pointer,U64(size) * U64(count)),U64(size),U64(count),vmFile(file));
-	}
-	DEFINE_INTRINSIC_FUNCTION4(env,_fwrite,_fwrite,i32,i32,pointer,i32,size,i32,count,i32,file)
-	{
-		return (I32)fwrite(memoryArrayPtr<U8>(emscriptenMemory,pointer,U64(size) * U64(count)),U64(size),U64(count),vmFile(file));
-	}
-	DEFINE_INTRINSIC_FUNCTION2(env,_fputc,_fputc,i32,i32,character,i32,file)
-	{
-		return fputc(character,vmFile(file));
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,_fflush,_fflush,i32,i32,file)
-	{
-		return fflush(vmFile(file));
-	}
-
-	DEFINE_INTRINSIC_FUNCTION1(env,___lock,___lock,none,i32,a)
-	{
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,___unlock,___unlock,none,i32,a)
-	{
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,___lockfile,___lockfile,i32,i32,a)
-	{
-		return 1;
-	}
-	DEFINE_INTRINSIC_FUNCTION1(env,___unlockfile,___unlockfile,none,i32,a)
-	{
-	}
-
-	DEFINE_INTRINSIC_FUNCTION2(env,___syscall6,___syscall6,i32,i32,a,i32,b)
-	{
-		// close
-		causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic);
-	}
-
-	DEFINE_INTRINSIC_FUNCTION2(env,___syscall54,___syscall54,i32,i32,a,i32,b)
-	{
-		// ioctl
-		return 0;
-	}
-
-	DEFINE_INTRINSIC_FUNCTION2(env,___syscall140,___syscall140,i32,i32,a,i32,b)
-	{
-		// llseek
-		causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic);
-	}
-
-	DEFINE_INTRINSIC_FUNCTION2(env,___syscall145,___syscall145,i32,i32,file,i32,argsPtr)
-	{
-		// readv
-		causeException(Runtime::Exception::Cause::calledUnimplementedIntrinsic);
-	}
-
-	DEFINE_INTRINSIC_FUNCTION2(env,___syscall146,___syscall146,i32,i32,file,i32,argsPtr)
-	{
-		// writev
-		U32* args = memoryArrayPtr<U32>(emscriptenMemory,argsPtr,3);
-		U32 iov = args[1];
-		U32 iovcnt = args[2];
-#ifdef _WIN32
-		U32 count = 0;
-		for(U32 i = 0; i < iovcnt; i++)
-		{
-			U32 base = memoryRef<U32>(emscriptenMemory,iov + i * 8);
-			U32 len = memoryRef<U32>(emscriptenMemory,iov + i * 8 + 4);
-			U32 size = (U32)fwrite(memoryArrayPtr<U8>(emscriptenMemory,base,len), 1, len, vmFile(file));
-			count += size;
-			if (size < len)
-				break;
-		}
-#else
-		struct iovec *native_iovec = new(alloca(sizeof(iovec)*iovcnt)) struct iovec [iovcnt];
-		for(U32 i = 0; i < iovcnt; i++)
-		{
-			U32 base = memoryRef<U32>(emscriptenMemory,iov + i * 8);
-			U32 len = memoryRef<U32>(emscriptenMemory,iov + i * 8 + 4);
-
-			native_iovec[i].iov_base = memoryArrayPtr<U8>(emscriptenMemory,base,len);
-			native_iovec[i].iov_len = len;
-		}
-		Iptr count = writev(fileno(vmFile(file)), native_iovec, iovcnt);
-#endif
-		return count;
-	}
-
-	DEFINE_INTRINSIC_FUNCTION1(asm2wasm,f64_to_int,f64-to-int,i32,f64,f) { return (I32)f; }
-
-	static F64 zero = 0.0;
-
-	static F64 makeNaN() { return zero / zero; }
-	static F64 makeInf() { return 1.0/zero; }
-
-	DEFINE_INTRINSIC_GLOBAL(global,NaN,NaN,f64,false,makeNaN())
-	DEFINE_INTRINSIC_GLOBAL(global,Infinity,Infinity,f64,false,makeInf())
-
-	DEFINE_INTRINSIC_FUNCTION2(asm2wasm,i32_remu,i32u-rem,i32,i32,left,i32,right)
-	{
-		return (I32)((U32)left % (U32)right);
-	}
-	DEFINE_INTRINSIC_FUNCTION2(asm2wasm,i32_rems,i32s-rem,i32,i32,left,i32,right)
-	{
-		return left % right;
-	}
-	DEFINE_INTRINSIC_FUNCTION2(asm2wasm,i32_divu,i32u-div,i32,i32,left,i32,right)
-	{
-		return (I32)((U32)left / (U32)right);
-	}
-	DEFINE_INTRINSIC_FUNCTION2(asm2wasm,i32_divs,i32s-div,i32,i32,left,i32,right)
-	{
-		return left / right;
-	}
-
-	EMSCRIPTEN_API void initInstance(const Module& module,ModuleInstance* moduleInstance)
-	{
-		// Only initialize the module as an Emscripten module if it uses the emscripten memory by default.
-		if(getDefaultMemory(moduleInstance) == emscriptenMemory)
-		{
-			// Allocate a 5MB stack.
-			STACKTOP.reset(coerce32bitAddress(sbrk(5*1024*1024)));
-			STACK_MAX.reset(coerce32bitAddress(sbrk(0)));
-
-			// Allocate some 8 byte memory region for tempDoublePtr.
-			tempDoublePtr.reset(coerce32bitAddress(sbrk(8)));
-
-			// Setup IO stream handles.
-			_stderr.reset(coerce32bitAddress(sbrk(sizeof(U32))));
-			_stdin.reset(coerce32bitAddress(sbrk(sizeof(U32))));
-			_stdout.reset(coerce32bitAddress(sbrk(sizeof(U32))));
-			memoryRef<U32>(emscriptenMemory,_stderr) = (U32)ioStreamVMHandle::StdErr;
-			memoryRef<U32>(emscriptenMemory,_stdin) = (U32)ioStreamVMHandle::StdIn;
-			memoryRef<U32>(emscriptenMemory,_stdout) = (U32)ioStreamVMHandle::StdOut;
-
-			// Call the establishStackSpace function to set the Emscripten module's internal stack pointers.
-			FunctionInstance* establishStackSpace = asFunctionNullable(getInstanceExport(moduleInstance,"establishStackSpace"));
-			if(establishStackSpace && getFunctionType(establishStackSpace) == FunctionType::get(ResultType::none,{ValueType::i32,ValueType::i32}))
-			{
-				std::vector<Runtime::Value> parameters = {Runtime::Value(STACKTOP),Runtime::Value(STACK_MAX)};
-				Runtime::invokeFunction(establishStackSpace,parameters);
-			}
-
-			// Call the global initializer functions.
-			for(Uptr exportIndex = 0;exportIndex < module.exports.size();++exportIndex)
-			{
-				const Export& functionExport = module.exports[exportIndex];
-				if(functionExport.kind == ObjectKind::function && !strncmp(functionExport.name.c_str(),"__GLOBAL__",10))
-				{
-					FunctionInstance* functionInstance = asFunctionNullable(getInstanceExport(moduleInstance,functionExport.name));
-					if(functionInstance) { Runtime::invokeFunction(functionInstance,{}); }
-				}
-			}
-		}
-	}
-
-	EMSCRIPTEN_API void injectCommandArgs(const std::vector<const char*>& argStrings,std::vector<Runtime::Value>& outInvokeArgs)
-	{
-		U8* emscriptenMemoryBase = getMemoryBaseAddress(emscriptenMemory);
-
-		U32* argvOffsets = (U32*)(emscriptenMemoryBase + sbrk((U32)(sizeof(U32) * (argStrings.size() + 1))));
-		for(Uptr argIndex = 0;argIndex < argStrings.size();++argIndex)
-		{
-			auto stringSize = strlen(argStrings[argIndex])+1;
-			auto stringMemory = emscriptenMemoryBase + sbrk((U32)stringSize);
-			memcpy(stringMemory,argStrings[argIndex],stringSize);
-			argvOffsets[argIndex] = (U32)(stringMemory - emscriptenMemoryBase);
-		}
-		argvOffsets[argStrings.size()] = 0;
-		outInvokeArgs = {(U32)argStrings.size(), (U32)((U8*)argvOffsets - emscriptenMemoryBase) };
-	}
-}
diff --git a/libraries/wasm-jit/Source/Programs/Assemble.cpp b/libraries/wasm-jit/Source/Programs/Assemble.cpp
deleted file mode 100644
index 60ca42cf0f9..00000000000
--- a/libraries/wasm-jit/Source/Programs/Assemble.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "CLI.h"
-#include "WAST/WAST.h"
-#include "WASM/WASM.h"
-
-int commandMain(int argc,char** argv)
-{
-	if(argc < 3)
-	{
-		std::cerr << "Usage: Assemble in.wast out.wasm [switches]" << std::endl;
-		std::cerr << "  -n|--omit-names\t\tOmits WAST function and local names from the output" << std::endl;
-		return EXIT_FAILURE;
-	}
-	const char* inputFilename = argv[1];
-	const char* outputFilename = argv[2];
-	bool omitNames = false;
-	if(argc > 3)
-	{
-		for(Iptr argumentIndex = 3;argumentIndex < argc;++argumentIndex)
-		{
-			if(!strcmp(argv[argumentIndex],"-n") || !strcmp(argv[argumentIndex],"--omit-names"))
-			{
-				omitNames = true;
-			}
-			else
-			{
-				std::cerr << "Unrecognized argument: " << argv[argumentIndex] << std::endl;
-				return EXIT_FAILURE;
-			}
-		}
-	}
-	
-	// Load the WAST module.
-	IR::Module module;
-	if(!loadTextModule(inputFilename,module)) { return EXIT_FAILURE; }
-
-	// If the command-line switch to omit names was specified, strip the name section.
-	if(omitNames)
-	{
-		for(auto sectionIt = module.userSections.begin();sectionIt != module.userSections.end();++sectionIt)
-		{
-			if(sectionIt->name == "name") { module.userSections.erase(sectionIt); break; }
-		}
-	}
-
-	// Write the binary module.
-	if(!saveBinaryModule(outputFilename,module)) { return EXIT_FAILURE; }
-
-	return EXIT_SUCCESS;
-}
diff --git a/libraries/wasm-jit/Source/Programs/CLI.h b/libraries/wasm-jit/Source/Programs/CLI.h
deleted file mode 100644
index 18dce3b3670..00000000000
--- a/libraries/wasm-jit/Source/Programs/CLI.h
+++ /dev/null
@@ -1,184 +0,0 @@
-#pragma once
-
-#include "Inline/BasicTypes.h"
-#include "Inline/Floats.h"
-#include "Inline/Timing.h"
-#include "WAST/WAST.h"
-#include "WASM/WASM.h"
-#include "IR/Module.h"
-#include "IR/Validate.h"
-#include "Runtime/Runtime.h"
-
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <iomanip>
-#include <cstring>
-
-inline std::string loadFile(const char* filename)
-{
-	Timing::Timer timer;
-	std::ifstream stream(filename,std::ios::binary | std::ios::ate);
-	if(!stream.is_open())
-	{
-		std::cerr << "Failed to open " << filename << ": " << std::strerror(errno) << std::endl;
-		return std::string();
-	}
-	std::string data;
-	data.resize((unsigned int)stream.tellg());
-	stream.seekg(0);
-	stream.read(const_cast<char*>(data.data()),data.size());
-	stream.close();
-	Timing::logRatePerSecond("loaded file",timer,data.size() / 1024.0 / 1024.0,"MB");
-	return data;
-}
-
-inline bool loadTextModule(const char* filename,const std::string& wastString,IR::Module& outModule)
-{
-	std::vector<WAST::Error> parseErrors;
-	WAST::parseModule(wastString.c_str(),wastString.size(),outModule,parseErrors);
-	if(!parseErrors.size()) { return true; }
-	else
-	{
-		// Print any parse errors;
-		std::cerr << "Error parsing WebAssembly text file:" << std::endl;
-		for(auto& error : parseErrors)
-		{
-			std::cerr << filename << ":" << error.locus.describe() << ": " << error.message.c_str() << std::endl;
-			std::cerr << error.locus.sourceLine << std::endl;
-			std::cerr << std::setw(error.locus.column(8)) << "^" << std::endl;
-		}
-		return false;
-	}
-}
-
-inline bool loadTextModule(const char* filename,IR::Module& outModule)
-{
-	// Read the file into a string.
-	auto wastBytes = loadFile(filename);
-	if(!wastBytes.size()) { return false; }
-	const std::string wastString = std::move(wastBytes);
-
-	return loadTextModule(filename,wastString,outModule);
-}
-
-inline bool loadBinaryModule(const std::string& wasmBytes,IR::Module& outModule)
-{
-	Timing::Timer loadTimer;
-
-	// Load the module from a binary WebAssembly file.
-	try
-	{
-		Serialization::MemoryInputStream stream((const U8*)wasmBytes.data(),wasmBytes.size());
-		WASM::serialize(stream,outModule);
-	}
-	catch(Serialization::FatalSerializationException exception)
-	{
-		std::cerr << "Error deserializing WebAssembly binary file:" << std::endl;
-		std::cerr << exception.message << std::endl;
-		return false;
-	}
-	catch(IR::ValidationException exception)
-	{
-		std::cerr << "Error validating WebAssembly binary file:" << std::endl;
-		std::cerr << exception.message << std::endl;
-		return false;
-	}
-	catch(std::bad_alloc)
-	{
-		std::cerr << "Memory allocation failed: input is likely malformed" << std::endl;
-		return false;
-	}
-
-	Timing::logRatePerSecond("Loaded WASM",loadTimer,wasmBytes.size()/1024.0/1024.0,"MB");
-	return true;
-}
-
-inline bool loadBinaryModule(const char* wasmFilename,IR::Module& outModule)
-{
-	// Read in packed .wasm file bytes.
-	auto wasmBytes = loadFile(wasmFilename);
-	if(!wasmBytes.size()) { return false; }
-
-	return loadBinaryModule(wasmBytes,outModule);
-}
-
-inline bool loadModule(const char* filename,IR::Module& outModule)
-{
-	// Read the specified file into an array.
-	auto fileBytes = loadFile(filename);
-	if(!fileBytes.size()) { return false; }
-
-	// If the file starts with the WASM binary magic number, load it as a binary module.
-	if(*(U32*)fileBytes.data() == 0x6d736100) { return loadBinaryModule(fileBytes,outModule); }
-	else
-	{
-		// Otherwise, load it as a text module.
-		auto wastString = std::move(fileBytes);
-		return loadTextModule(filename,wastString,outModule);
-	}
-}
-
-inline bool saveBinaryModule(const char* wasmFilename,const IR::Module& module)
-{
-	Timing::Timer saveTimer;
-
-	std::vector<U8> wasmBytes;
-	try
-	{
-		// Serialize the WebAssembly module.
-		Serialization::ArrayOutputStream stream;
-		WASM::serialize(stream,module);
-		wasmBytes = stream.getBytes();
-	}
-	catch(Serialization::FatalSerializationException exception)
-	{
-		std::cerr << "Error serializing WebAssembly binary file:" << std::endl;
-		std::cerr << exception.message << std::endl;
-		return false;
-	}
-	
-	Timing::logRatePerSecond("Saved WASM",saveTimer,wasmBytes.size()/1024.0/1024.0,"MB");
-
-	// Write the serialized data to the output file.
-	std::ofstream outputStream(wasmFilename,std::ios::binary);
-	outputStream.write((char*)wasmBytes.data(),wasmBytes.size());
-	outputStream.close();
-	
-	return true;
-}
-
-inline bool endsWith(const char *str, const char *suffix)
-{
-	if(!str || !suffix) { return false; }
-	Uptr lenstr = strlen(str);
-	Uptr lensuffix = strlen(suffix);
-	if(lenstr < lensuffix) { return false; }
-	return (strncmp(str+lenstr-lensuffix, suffix, lensuffix) == 0);
-}
-
-int commandMain(int argc,char** argv);
-
-int main(int argc,char** argv)
-{
-	try
-	{
-		return commandMain(argc,argv);
-	}
-	catch(IR::ValidationException exception)
-	{
-		std::cerr << "Failed to validate module: " << exception.message << std::endl;
-		return EXIT_FAILURE;
-	}
-	catch(Runtime::Exception exception)
-	{
-		std::cerr << "Runtime exception: " << describeExceptionCause(exception.cause) << std::endl;
-		for(auto calledFunction : exception.callStack) { std::cerr << "  " << calledFunction << std::endl; }
-		return EXIT_FAILURE;
-	}
-	catch(Serialization::FatalSerializationException exception)
-	{
-		std::cerr << "Fatal serialization exception: " << exception.message << std::endl;
-		return EXIT_FAILURE;
-	}
-}
\ No newline at end of file
diff --git a/libraries/wasm-jit/Source/Programs/CMakeLists.txt b/libraries/wasm-jit/Source/Programs/CMakeLists.txt
deleted file mode 100644
index 260f4c1092c..00000000000
--- a/libraries/wasm-jit/Source/Programs/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-add_executable(Assemble Assemble.cpp CLI.h)
-target_link_libraries(Assemble Logging IR WAST WASM)
-set_target_properties(Assemble PROPERTIES FOLDER Programs)
-
-add_executable(Disassemble Disassemble.cpp CLI.h)
-target_link_libraries(Disassemble Logging IR WAST WASM)
-set_target_properties(Disassemble PROPERTIES FOLDER Programs)
-
-add_executable(Test Test.cpp CLI.h)
-target_link_libraries(Test Logging IR WAST Runtime)
-set_target_properties(Test PROPERTIES FOLDER Programs)
-
-add_executable(wavm wavm.cpp CLI.h)
-target_link_libraries(wavm Logging IR WAST WASM Runtime Emscripten)
-set_target_properties(wavm PROPERTIES FOLDER Programs)
diff --git a/libraries/wasm-jit/Source/Programs/Disassemble.cpp b/libraries/wasm-jit/Source/Programs/Disassemble.cpp
deleted file mode 100644
index 16c6af5cfe8..00000000000
--- a/libraries/wasm-jit/Source/Programs/Disassemble.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "CLI.h"
-#include "WAST/WAST.h"
-#include "WASM/WASM.h"
-
-int commandMain(int argc,char** argv)
-{
-	if(argc != 3)
-	{
-		std::cerr <<  "Usage: Disassemble in.wasm out.wast" << std::endl;
-		return EXIT_FAILURE;
-	}
-	const char* inputFilename = argv[1];
-	const char* outputFilename = argv[2];
-	
-	// Load the WASM file.
-	IR::Module module;
-	if(!loadBinaryModule(inputFilename,module)) { return EXIT_FAILURE; }
-
-	// Print the module to WAST.
-	const std::string wastString = WAST::print(module);
-	
-	// Write the serialized data to the output file.
-	std::ofstream outputStream(outputFilename);
-	outputStream.write(wastString.data(),wastString.size());
-	outputStream.close();
-
-	return EXIT_SUCCESS;
-}
diff --git a/libraries/wasm-jit/Source/Programs/Test.cpp b/libraries/wasm-jit/Source/Programs/Test.cpp
deleted file mode 100644
index d6c4f49ac8f..00000000000
--- a/libraries/wasm-jit/Source/Programs/Test.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "Inline/Serialization.h"
-#include "Platform/Platform.h"
-#include "WAST/WAST.h"
-#include "WAST/TestScript.h"
-#include "WASM/WASM.h"
-#include "Runtime/Runtime.h"
-#include "Runtime/Linker.h"
-#include "Runtime/Intrinsics.h"
-
-#include "CLI.h"
-
-#include <map>
-#include <vector>
-#include <cstdio>
-#include <cstdarg>
-
-using namespace WAST;
-using namespace IR;
-using namespace Runtime;
-
-struct TestScriptState
-{
-	bool hasInstantiatedModule;
-	ModuleInstance* lastModuleInstance;
-	
-	std::map<std::string,ModuleInstance*> moduleInternalNameToInstanceMap;
-	std::map<std::string,ModuleInstance*> moduleNameToInstanceMap;
-	
-	std::vector<WAST::Error> errors;
-	
-	TestScriptState() : hasInstantiatedModule(false), lastModuleInstance(nullptr) {}
-};
-
-struct TestScriptResolver : Resolver
-{
-	TestScriptResolver(const TestScriptState& inState): state(inState) {}
-	bool resolve(const std::string& moduleName,const std::string& exportName,ObjectType type,ObjectInstance*& outObject) override
-	{
-		// Try to resolve an intrinsic first.
-		if(IntrinsicResolver::singleton.resolve(moduleName,exportName,type,outObject)) { return true; }
-
-		// Then look for a named module.
-		auto mapIt = state.moduleNameToInstanceMap.find(moduleName);
-		if(mapIt != state.moduleNameToInstanceMap.end())
-		{
-			outObject = getInstanceExport(mapIt->second,exportName);
-			return outObject != nullptr && isA(outObject,type);
-		}
-
-		return false;
-	}
-private:
-	const TestScriptState& state;
-};
-
-void testErrorf(TestScriptState& state,const TextFileLocus& locus,const char* messageFormat,...)
-{
-	va_list messageArguments;
-	va_start(messageArguments,messageFormat);
-	char messageBuffer[1024];
-	int numPrintedChars = std::vsnprintf(messageBuffer,sizeof(messageBuffer),messageFormat,messageArguments);
-	if(numPrintedChars >= 1023 || numPrintedChars < 0) { Errors::unreachable(); }
-	messageBuffer[numPrintedChars] = 0;
-	va_end(messageArguments);
-		
-	state.errors.push_back({locus,messageBuffer});
-}
-
-void collectGarbage(TestScriptState& state)
-{
-	std::vector<ObjectInstance*> rootObjects;
-	rootObjects.push_back(asObject(state.lastModuleInstance));
-	for(auto& mapIt : state.moduleInternalNameToInstanceMap) { rootObjects.push_back(asObject(mapIt.second)); }
-	for(auto& mapIt : state.moduleNameToInstanceMap) { rootObjects.push_back(asObject(mapIt.second)); }
-	freeUnreferencedObjects(std::move(rootObjects));
-}
-
-ModuleInstance* getModuleContextByInternalName(TestScriptState& state,const TextFileLocus& locus,const char* context,const std::string& internalName)
-{
-	// Look up the module this invoke uses.
-	if(!state.hasInstantiatedModule) { testErrorf(state,locus,"no module to use in %s",context); return nullptr; }
-	ModuleInstance* moduleInstance = state.lastModuleInstance;
-	if(internalName.size())
-	{
-		auto mapIt = state.moduleInternalNameToInstanceMap.find(internalName);
-		if(mapIt == state.moduleInternalNameToInstanceMap.end())
-		{
-			testErrorf(state,locus,"unknown %s module name: %s",context,internalName.c_str());
-			return nullptr;
-		}
-		moduleInstance = mapIt->second;
-	}
-	return moduleInstance;
-}
-
-bool processAction(TestScriptState& state,Action* action,Result& outResult)
-{
-	outResult = Result();
-
-	switch(action->type)
-	{
-	case ActionType::_module:
-	{
-		auto moduleAction = (ModuleAction*)action;
-
-		// Clear the previous module.
-		state.lastModuleInstance = nullptr;
-		collectGarbage(state);
-
-		// Link and instantiate the module.
-		TestScriptResolver resolver(state);
-		LinkResult linkResult = linkModule(*moduleAction->module,resolver);
-		if(linkResult.success)
-		{
-			state.hasInstantiatedModule = true;
-			state.lastModuleInstance = instantiateModule(*moduleAction->module,std::move(linkResult.resolvedImports));
-		}
-		else
-		{
-			// Create an error for each import that couldn't be linked.
-			for(auto& missingImport : linkResult.missingImports)
-			{
-				testErrorf(
-					state,
-					moduleAction->locus,
-					"missing import module=\"%s\" export=\"%s\" type=\"%s\"",
-					missingImport.moduleName.c_str(),
-					missingImport.exportName.c_str(),
-					asString(missingImport.type).c_str()
-					);
-			}
-		}
-
-		// Register the module under its internal name.
-		if(moduleAction->internalModuleName.size())
-		{
-			state.moduleInternalNameToInstanceMap[moduleAction->internalModuleName] = state.lastModuleInstance;
-		}
-
-		return true;
-	}
-	case ActionType::invoke:
-	{
-		auto invokeAction = (InvokeAction*)action;
-
-		// Look up the module this invoke uses.
-		ModuleInstance* moduleInstance = getModuleContextByInternalName(state,invokeAction->locus,"invoke",invokeAction->internalModuleName);
-
-		// A null module instance at this point indicates a module that failed to link or instantiate, so don't produce further errors.
-		if(!moduleInstance) { return false; }
-
-		// Find the named export in the module instance.
-		auto functionInstance = asFunctionNullable(getInstanceExport(moduleInstance,invokeAction->exportName));
-		if(!functionInstance) { testErrorf(state,invokeAction->locus,"couldn't find exported function with name: %s",invokeAction->exportName.c_str()); return false; }
-
-		// Execute the invoke
-		outResult = invokeFunction(functionInstance,invokeAction->arguments);
-
-		return true;
-	}
-	case ActionType::get:
-	{
-		auto getAction = (GetAction*)action;
-
-		// Look up the module this get uses.
-		ModuleInstance* moduleInstance = getModuleContextByInternalName(state,getAction->locus,"get",getAction->internalModuleName);
-
-		// A null module instance at this point indicates a module that failed to link or instantiate, so just return without further errors.
-		if(!moduleInstance) { return false; }
-
-		// Find the named export in the module instance.
-		auto globalInstance = asGlobalNullable(getInstanceExport(moduleInstance,getAction->exportName));
-		if(!globalInstance) { testErrorf(state,getAction->locus,"couldn't find exported global with name: %s",getAction->exportName.c_str()); return false; }
-
-		// Get the value of the specified global.
-		outResult = getGlobalValue(globalInstance);
-			
-		return true;
-	}
-	default:
-		Errors::unreachable();
-	}
-}
-
-// Tests whether a float is a "canonical" NaN, which just means that it's a NaN only the MSB of its significand set.
-template<typename Float> bool isCanonicalOrArithmeticNaN(Float value,bool requireCanonical)
-{
-	Floats::FloatComponents<Float> components;
-	components.value = value;
-	return components.bits.exponent == Floats::FloatComponents<Float>::maxExponentBits
-	&& (!requireCanonical || components.bits.significand == Floats::FloatComponents<Float>::canonicalSignificand);
-}
-
-void processCommand(TestScriptState& state,const Command* command)
-{
-	try
-	{
-		switch(command->type)
-		{
-		case Command::_register:
-		{
-			auto registerCommand = (RegisterCommand*)command;
-
-			// Look up a module by internal name, and bind the result to the public name.
-			ModuleInstance* moduleInstance = getModuleContextByInternalName(state,registerCommand->locus,"register",registerCommand->internalModuleName);
-			state.moduleNameToInstanceMap[registerCommand->moduleName] = moduleInstance;
-			break;
-		}
-		case Command::action:
-		{
-			Result result;
-			processAction(state,((ActionCommand*)command)->action.get(),result);
-			break;
-		}
-		case Command::assert_return:
-		{
-			auto assertCommand = (AssertReturnCommand*)command;
-			// Execute the action and do a bitwise comparison of the result to the expected result.
-			Result actionResult;
-			if(processAction(state,assertCommand->action.get(),actionResult)
-			&& !areBitsEqual(actionResult,assertCommand->expectedReturn))
-			{
-				testErrorf(state,assertCommand->locus,"expected %s but got %s",
-					asString(assertCommand->expectedReturn).c_str(),
-					asString(actionResult).c_str());
-			}
-			break;
-		}
-		case Command::assert_return_canonical_nan: case Command::assert_return_arithmetic_nan:
-		{
-			auto assertCommand = (AssertReturnNaNCommand*)command;
-			// Execute the action and check that the result is a NaN of the expected type.
-			Result actionResult;
-			if(processAction(state,assertCommand->action.get(),actionResult))
-			{
-				const bool requireCanonicalNaN = assertCommand->type == Command::assert_return_canonical_nan;
-				const bool isError =
-						actionResult.type == ResultType::f32 ? !isCanonicalOrArithmeticNaN(actionResult.f32,requireCanonicalNaN)
-					:	actionResult.type == ResultType::f64 ? !isCanonicalOrArithmeticNaN(actionResult.f64,requireCanonicalNaN)
-					:	true;
-				if(isError)
-				{
-					testErrorf(state,assertCommand->locus,
-						requireCanonicalNaN ? "expected canonical float NaN but got %s" : "expected float NaN but got %s",
-						asString(actionResult).c_str());
-				}
-			}
-			break;
-		}
-		case Command::assert_trap:
-		{
-			auto assertCommand = (AssertTrapCommand*)command;
-			try
-			{
-				Result actionResult;
-				if(processAction(state,assertCommand->action.get(),actionResult))
-				{
-					testErrorf(state,assertCommand->locus,"expected trap but got %s",asString(actionResult).c_str());
-				}
-			}
-			catch(Runtime::Exception exception)
-			{
-				if(exception.cause != assertCommand->expectedCause)
-				{
-					testErrorf(state,assertCommand->action->locus,"expected %s trap but got %s trap",
-						describeExceptionCause(assertCommand->expectedCause),
-						describeExceptionCause(exception.cause));
-				}
-			}
-			break;
-		}
-		case Command::assert_invalid: case Command::assert_malformed:
-		{
-			auto assertCommand = (AssertInvalidOrMalformedCommand*)command;
-			if(!assertCommand->wasInvalidOrMalformed)
-			{
-				testErrorf(state,assertCommand->locus,"module was %s",
-					assertCommand->type == Command::assert_invalid ? "valid" : "well formed");
-			}
-			break;
-		}
-		case Command::assert_unlinkable:
-		{
-			auto assertCommand = (AssertUnlinkableCommand*)command;
-			Result result;
-			try
-			{
-				TestScriptResolver resolver(state);
-				LinkResult linkResult = linkModule(*assertCommand->moduleAction->module,resolver);
-				if(linkResult.success)
-				{
-					instantiateModule(*assertCommand->moduleAction->module,std::move(linkResult.resolvedImports));
-					testErrorf(state,assertCommand->locus,"module was linkable");
-				}
-			}
-			catch(Runtime::Exception)
-			{
-				// If the instantiation throws an exception, the assert_unlinkable succeeds.
-			}
-			break;
-		}
-		};
-	}
-	catch(Runtime::Exception exception)
-	{
-		testErrorf(state,command->locus,"unexpected trap: %s",describeExceptionCause(exception.cause));
-	}
-}
-
-DEFINE_INTRINSIC_FUNCTION0(spectest,spectest_print,print,none) {}
-DEFINE_INTRINSIC_FUNCTION1(spectest,spectest_print,print,none,i32,a) { std::cout << a << " : i32" << std::endl; }
-DEFINE_INTRINSIC_FUNCTION1(spectest,spectest_print,print,none,i64,a) { std::cout << a << " : i64" << std::endl; }
-DEFINE_INTRINSIC_FUNCTION1(spectest,spectest_print,print,none,f32,a) { std::cout << a << " : f32" << std::endl; }
-DEFINE_INTRINSIC_FUNCTION1(spectest,spectest_print,print,none,f64,a) { std::cout << a << " : f64" << std::endl; }
-DEFINE_INTRINSIC_FUNCTION2(spectest,spectest_print,print,none,f64,a,f64,b) { std::cout << a << " : f64" << std::endl << b << " : f64" << std::endl; }
-DEFINE_INTRINSIC_FUNCTION2(spectest,spectest_print,print,none,i32,a,f32,b) { std::cout << a << " : i32" << std::endl << b << " : f32" << std::endl; }
-DEFINE_INTRINSIC_FUNCTION2(spectest,spectest_print,print,none,i64,a,f64,b) { std::cout << a << " : i64" << std::endl << b << " : f64" << std::endl; }
-
-DEFINE_INTRINSIC_GLOBAL(spectest,spectest_globalI32,global,i32,false,666)
-DEFINE_INTRINSIC_GLOBAL(spectest,spectest_globalI64,global,i64,false,0)
-DEFINE_INTRINSIC_GLOBAL(spectest,spectest_globalF32,global,f32,false,0.0f)
-DEFINE_INTRINSIC_GLOBAL(spectest,spectest_globalF64,global,f64,false,0.0)
-
-DEFINE_INTRINSIC_TABLE(spectest,spectest_table,table,TableType(TableElementType::anyfunc,false,SizeConstraints {10,20}))
-DEFINE_INTRINSIC_MEMORY(spectest,spectest_memory,memory,MemoryType(false,SizeConstraints {1,2}))
-
-int commandMain(int argc,char** argv)
-{
-	if(argc != 2)
-	{
-		std::cerr <<  "Usage: Test in.wast" << std::endl;
-		return EXIT_FAILURE;
-	}
-	const char* filename = argv[1];
-	
-	// Always enable debug logging for tests.
-	Log::setCategoryEnabled(Log::Category::debug,true);
-
-	Runtime::init();
-	
-	// Read the file into a string.
-	const std::string testScriptString = loadFile(filename);
-	if(!testScriptString.size()) { return EXIT_FAILURE; }
-
-	// Process the test script.
-	TestScriptState testScriptState;
-	std::vector<std::unique_ptr<Command>> testCommands;
-	
-	// Parse the test script.
-	WAST::parseTestCommands(testScriptString.c_str(),testScriptString.size(),testCommands,testScriptState.errors);
-	if(!testScriptState.errors.size())
-	{
-		// Process the test script commands.
-		for(auto& command : testCommands)
-		{
-			processCommand(testScriptState,command.get());
-		}
-	}
-	
-	if(testScriptState.errors.size())
-	{
-		// Print any errors;
-		for(auto& error : testScriptState.errors)
-		{
-			std::cerr << filename << ":" << error.locus.describe() << ": " << error.message.c_str() << std::endl;
-			std::cerr << error.locus.sourceLine << std::endl;
-			std::cerr << std::setw(error.locus.column(8)) << "^" << std::endl;
-		}
-
-		std::cerr << filename << ": testing failed!" << std::endl;
-		return EXIT_FAILURE;
-	}
-	else
-	{
-		std::cout << filename << ": all tests passed." << std::endl;
-		return EXIT_SUCCESS;
-	}
-}
diff --git a/libraries/wasm-jit/Source/Programs/wavm.cpp b/libraries/wasm-jit/Source/Programs/wavm.cpp
deleted file mode 100644
index a122f0a328f..00000000000
--- a/libraries/wasm-jit/Source/Programs/wavm.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "Inline/Timing.h"
-#include "Platform/Platform.h"
-#include "WAST/WAST.h"
-#include "Runtime/Runtime.h"
-#include "Runtime/Linker.h"
-#include "Runtime/Intrinsics.h"
-#include "Emscripten/Emscripten.h"
-#include "IR/Module.h"
-#include "IR/Operators.h"
-#include "IR/Validate.h"
-
-#include "CLI.h"
-
-#include <map>
-
-using namespace IR;
-using namespace Runtime;
-
-void showHelp()
-{
-	std::cerr << "Usage: wavm [switches] [programfile] [--] [arguments]" << std::endl;
-	std::cerr << "  in.wast|in.wasm\t\tSpecify program file (.wast/.wasm)" << std::endl;
-	std::cerr << "  -f|--function name\t\tSpecify function name to run in module rather than main" << std::endl;
-	std::cerr << "  -c|--check\t\t\tExit after checking that the program is valid" << std::endl;
-	std::cerr << "  -d|--debug\t\t\tWrite additional debug information to stdout" << std::endl;
-	std::cerr << "  --\t\t\t\tStop parsing arguments" << std::endl;
-}
-
-struct RootResolver : Resolver
-{
-	std::map<std::string,Resolver*> moduleNameToResolverMap;
-
-	bool resolve(const std::string& moduleName,const std::string& exportName,ObjectType type,ObjectInstance*& outObject) override
-	{
-		// Try to resolve an intrinsic first.
-		if(IntrinsicResolver::singleton.resolve(moduleName,exportName,type,outObject)) { return true; }
-
-		// Then look for a named module.
-		auto namedResolverIt = moduleNameToResolverMap.find(moduleName);
-		if(namedResolverIt != moduleNameToResolverMap.end())
-		{
-			return namedResolverIt->second->resolve(moduleName,exportName,type,outObject);
-		}
-
-		// Finally, stub in missing function imports.
-		if(type.kind == ObjectKind::function)
-		{
-			// Generate a function body that just uses the unreachable op to fault if called.
-			Serialization::ArrayOutputStream codeStream;
-			OperatorEncoderStream encoder(codeStream);
-			encoder.unreachable();
-			encoder.end();
-
-			// Generate a module for the stub function.
-			Module stubModule;
-			DisassemblyNames stubModuleNames;
-			stubModule.types.push_back(asFunctionType(type));
-			stubModule.functions.defs.push_back({{0},{},std::move(codeStream.getBytes()),{}});
-			stubModule.exports.push_back({"importStub",ObjectKind::function,0});
-			stubModuleNames.functions.push_back({std::string(moduleName) + "." + exportName,{}});
-			IR::setDisassemblyNames(stubModule,stubModuleNames);
-			IR::validateDefinitions(stubModule);
-
-			// Instantiate the module and return the stub function instance.
-			auto stubModuleInstance = instantiateModule(stubModule,{});
-			outObject = getInstanceExport(stubModuleInstance,"importStub");
-			Log::printf(Log::Category::error,"Generated stub for missing function import %s.%s : %s\n",moduleName.c_str(),exportName.c_str(),asString(type).c_str());
-			return true;
-		}
-		else if(type.kind == ObjectKind::memory)
-		{
-			outObject = asObject(Runtime::createMemory(asMemoryType(type)));
-			Log::printf(Log::Category::error,"Generated stub for missing memory import %s.%s : %s\n",moduleName.c_str(),exportName.c_str(),asString(type).c_str());
-			return true;
-		}
-		else if(type.kind == ObjectKind::table)
-		{
-			outObject = asObject(Runtime::createTable(asTableType(type)));
-			Log::printf(Log::Category::error,"Generated stub for missing table import %s.%s : %s\n",moduleName.c_str(),exportName.c_str(),asString(type).c_str());
-			return true;
-		}
-		else if(type.kind == ObjectKind::global)
-		{
-			outObject = asObject(Runtime::createGlobal(asGlobalType(type),Runtime::Value(asGlobalType(type).valueType,Runtime::UntaggedValue())));
-			Log::printf(Log::Category::error,"Generated stub for missing global import %s.%s : %s\n",moduleName.c_str(),exportName.c_str(),asString(type).c_str());
-			return true;
-		}
-
-		return false;
-	}
-};
-
-int mainBody(const char* filename,const char* functionName,bool onlyCheck,char** args)
-{
-	Module module;
-	if(filename)
-	{
-		if(!loadModule(filename,module)) { return EXIT_FAILURE; }
-	}
-	else
-	{
-		showHelp();
-		return EXIT_FAILURE;
-	}
-
-	if(onlyCheck) { return EXIT_SUCCESS; }
-
-	// Link and instantiate the module.
-	RootResolver rootResolver;
-	LinkResult linkResult = linkModule(module,rootResolver);
-	if(!linkResult.success)
-	{
-		std::cerr << "Failed to link module:" << std::endl;
-		for(auto& missingImport : linkResult.missingImports)
-		{
-			std::cerr << "Missing import: module=\"" << missingImport.moduleName
-				<< "\" export=\"" << missingImport.exportName
-				<< "\" type=\"" << asString(missingImport.type) << "\"" << std::endl;
-		}
-		return EXIT_FAILURE;
-	}
-	ModuleInstance* moduleInstance = instantiateModule(module,std::move(linkResult.resolvedImports));
-	if(!moduleInstance) { return EXIT_FAILURE; }
-	Emscripten::initInstance(module,moduleInstance);
-
-	// Look up the function export to call.
-	FunctionInstance* functionInstance;
-	if(!functionName)
-	{
-		functionInstance = asFunctionNullable(getInstanceExport(moduleInstance,"main"));
-		if(!functionInstance) { functionInstance = asFunctionNullable(getInstanceExport(moduleInstance,"_main")); }
-		if(!functionInstance)
-		{
-			std::cerr << "Module does not export main function" << std::endl;
-			return EXIT_FAILURE;
-		}
-	}
-	else
-	{
-		functionInstance = asFunctionNullable(getInstanceExport(moduleInstance,functionName));
-		if(!functionInstance)
-		{
-			std::cerr << "Module does not export '" << functionName << "'" << std::endl;
-			return EXIT_FAILURE;
-		}
-	}
-	const FunctionType* functionType = getFunctionType(functionInstance);
-
-	// Set up the arguments for the invoke.
-	std::vector<Value> invokeArgs;
-	if(!functionName)
-	{
-		if(functionType->parameters.size() == 2)
-		{
-			MemoryInstance* defaultMemory = Runtime::getDefaultMemory(moduleInstance);
-			if(!defaultMemory)
-			{
-				std::cerr << "Module does not declare a default memory object to put arguments in." << std::endl;
-				return EXIT_FAILURE;
-			}
-
-			std::vector<const char*> argStrings;
-			argStrings.push_back(filename);
-			while(*args) { argStrings.push_back(*args++); };
-
-			Emscripten::injectCommandArgs(argStrings,invokeArgs);
-		}
-		else if(functionType->parameters.size() > 0)
-		{
-			std::cerr << "WebAssembly function requires " << functionType->parameters.size() << " argument(s), but only 0 or 2 can be passed!" << std::endl;
-			return EXIT_FAILURE;
-		}
-	}
-	else
-	{
-		for(U32 i = 0; args[i]; ++i)
-		{
-			Value value;
-			switch(functionType->parameters[i])
-			{
-			case ValueType::i32: value = (U32)atoi(args[i]); break;
-			case ValueType::i64: value = (U64)atol(args[i]); break;
-			case ValueType::f32: value = (F32)atof(args[i]); break;
-			case ValueType::f64: value = atof(args[i]); break;
-			default: Errors::unreachable();
-			}
-			invokeArgs.push_back(value);
-		}
-	}
-
-	// Invoke the function.
-	Timing::Timer executionTimer;
-	auto functionResult = invokeFunction(functionInstance,invokeArgs);
-	Timing::logTimer("Invoked function",executionTimer);
-
-	if(functionName)
-	{
-		Log::printf(Log::Category::debug,"%s returned: %s\n",functionName,asString(functionResult).c_str());
-		return EXIT_SUCCESS;
-	}
-	else if(functionResult.type == ResultType::i32) { return functionResult.i32; }
-	else { return EXIT_SUCCESS; }
-}
-
-int commandMain(int argc,char** argv)
-{
-	const char* filename = nullptr;
-	const char* functionName = nullptr;
-
-	bool onlyCheck = false;
-	auto args = argv;
-	while(*++args)
-	{
-		if(!strcmp(*args, "--function") || !strcmp(*args, "-f"))
-		{
-			if(!*++args) { showHelp(); return EXIT_FAILURE; }
-			functionName = *args;
-		}
-		else if(!strcmp(*args, "--check") || !strcmp(*args, "-c"))
-		{
-			onlyCheck = true;
-		}
-		else if(!strcmp(*args, "--debug") || !strcmp(*args, "-d"))
-		{
-			Log::setCategoryEnabled(Log::Category::debug,true);
-		}
-		else if(!strcmp(*args, "--"))
-		{
-			++args;
-			break;
-		}
-		else if(!strcmp(*args, "--help") || !strcmp(*args, "-h"))
-		{
-			showHelp();
-			return EXIT_SUCCESS;
-		}
-		else if(!filename)
-		{
-			filename = *args;
-		}
-		else { break; }
-	}
-
-	Runtime::init();
-
-	int returnCode = EXIT_FAILURE;
-	#ifdef __AFL_LOOP
-	while(__AFL_LOOP(2000))
-	#endif
-	{
-		returnCode = mainBody(filename,functionName,onlyCheck,args);
-		Runtime::freeUnreferencedObjects({});
-	}
-	return returnCode;
-}
diff --git a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
index 96291858da3..907dbf37871 100644
--- a/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Runtime/CMakeLists.txt
@@ -1,33 +1,12 @@
-if(LLVM_VERSION VERSION_LESS 7.1 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-	enable_language(ASM-LLVMWAR)
-	set(LLVM_SHIM_FILE llvmWARshim.llvmwar)
-else()
-	set(LLVM_SHIM_FILE llvmWARshim.cpp)
-endif()
-
 set(Sources
 	Intrinsics.cpp
 	Linker.cpp
 	LLVMJIT.h
 	ObjectGC.cpp
 	RuntimePrivate.h
-	Threads.cpp
 	WAVMIntrinsics.cpp
   )
 
-if("wavm" IN_LIST EOSIO_WASM_RUNTIMES)
-	list(APPEND Sources
-		LLVMEmitIR.cpp
-		LLVMJIT.cpp
-		Memory.cpp
-		ModuleInstance.cpp
-		Runtime.cpp
-		Table.cpp
-		${LLVM_SHIM_FILE}
-	)
-	llvm_map_components_to_libnames(LLVM_LIBS support core passes mcjit native DebugInfoDWARF orcjit)
-endif()
-
 set(PublicHeaders
 	${WAVM_INCLUDE_DIR}/Runtime/Intrinsics.h
 	${WAVM_INCLUDE_DIR}/Runtime/Linker.h
@@ -37,16 +16,12 @@ include_directories(${WAVM_INCLUDE_DIR}/Runtime)
 
 add_library(Runtime STATIC ${Sources} ${PublicHeaders})
 
-# Include the LLVM headers
-include_directories(${LLVM_INCLUDE_DIRS})
-add_definitions(${LLVM_DEFINITIONS})
-
 add_definitions(-DRUNTIME_API=DLL_EXPORT)
 
 target_include_directories( Runtime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../chain/include )
 
 # Link against the LLVM libraries
-target_link_libraries(Runtime Platform Logging IR ${LLVM_LIBS})
+target_link_libraries(Runtime Platform Logging IR)
 
 install(TARGETS Runtime 
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
diff --git a/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp b/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
deleted file mode 100644
index bb567113ca7..00000000000
--- a/libraries/wasm-jit/Source/Runtime/LLVMEmitIR.cpp
+++ /dev/null
@@ -1,1116 +0,0 @@
-#include "LLVMJIT.h"
-#include "llvm/ADT/SmallVector.h"
-#include "Inline/Timing.h"
-#include "IR/Operators.h"
-#include "IR/OperatorPrinter.h"
-#include "Runtime/llvmWARshim.h"
-#include "Logging/Logging.h"
-#include "llvm/Support/raw_ostream.h"
-
-#define ENABLE_LOGGING 0
-#define ENABLE_FUNCTION_ENTER_EXIT_HOOKS 0
-
-using namespace IR;
-
-namespace LLVMJIT
-{
-	// The LLVM IR for a module.
-	struct EmitModuleContext
-	{
-		const Module& module;
-		ModuleInstance* moduleInstance;
-
-		llvm::Module* llvmModule;
-		std::vector<llvm::Function*> functionDefs;
-		std::vector<llvm::Constant*> importedFunctionPointers;
-		std::vector<llvm::Constant*> globalPointers;
-		llvm::Constant* defaultTablePointer;
-		llvm::Constant* defaultTableMaxElementIndex;
-		llvm::Constant* defaultMemoryBase;
-		llvm::Constant* defaultMemoryEndOffset;
-
-		llvm::MDNode* likelyFalseBranchWeights;
-		llvm::MDNode* likelyTrueBranchWeights;
-
-		EmitModuleContext(const Module& inModule,ModuleInstance* inModuleInstance)
-		: module(inModule)
-		, moduleInstance(inModuleInstance)
-		, llvmModule(new llvm::Module("",context))
-		{
-			auto zeroAsMetadata = llvm::ConstantAsMetadata::get(emitLiteral(I32(0)));
-			auto i32MaxAsMetadata = llvm::ConstantAsMetadata::get(emitLiteral(I32(INT32_MAX)));
-			likelyFalseBranchWeights = llvm::MDTuple::getDistinct(context,{llvm::MDString::get(context,"branch_weights"),zeroAsMetadata,i32MaxAsMetadata});
-			likelyTrueBranchWeights = llvm::MDTuple::getDistinct(context,{llvm::MDString::get(context,"branch_weights"),i32MaxAsMetadata,zeroAsMetadata});
-
-		}
-		llvm::Module* emit();
-	};
-
-	// The context used by functions involved in JITing a single AST function.
-	struct EmitFunctionContext
-	{
-		typedef void Result;
-
-		EmitModuleContext& moduleContext;
-		const Module& module;
-		const FunctionDef& functionDef;
-		const FunctionType* functionType;
-		FunctionInstance* functionInstance;
-		llvm::Function* llvmFunction;
-		llvm::IRBuilder<> irBuilder;
-
-		std::vector<llvm::Value*> localPointers;
-
-		llvm::DISubprogram* diFunction;
-
-		// Information about an in-scope control structure.
-		struct ControlContext
-		{
-			enum class Type : U8
-			{
-				function,
-				block,
-				ifThen,
-				ifElse,
-				loop
-			};
-
-			Type type;
-			llvm::BasicBlock* endBlock;
-			llvm::PHINode* endPHI;
-			llvm::BasicBlock* elseBlock;
-			ResultType resultType;
-			Uptr outerStackSize;
-			Uptr outerBranchTargetStackSize;
-			bool isReachable;
-			bool isElseReachable;
-		};
-
-		struct BranchTarget
-		{
-			ResultType argumentType;
-			llvm::BasicBlock* block;
-			llvm::PHINode* phi;
-		};
-
-		std::vector<ControlContext> controlStack;
-		std::vector<BranchTarget> branchTargetStack;
-		std::vector<llvm::Value*> stack;
-
-		EmitFunctionContext(EmitModuleContext& inEmitModuleContext,const Module& inModule,const FunctionDef& inFunctionDef,FunctionInstance* inFunctionInstance,llvm::Function* inLLVMFunction)
-		: moduleContext(inEmitModuleContext)
-		, module(inModule)
-		, functionDef(inFunctionDef)
-		, functionType(inModule.types[inFunctionDef.type.index])
-		, functionInstance(inFunctionInstance)
-		, llvmFunction(inLLVMFunction)
-		, irBuilder(context)
-		{}
-
-		void emit();
-
-		// Operand stack manipulation
-		llvm::Value* pop()
-		{
-			WAVM_ASSERT_THROW(stack.size() - (controlStack.size() ? controlStack.back().outerStackSize : 0) >= 1);
-			llvm::Value* result = stack.back();
-			stack.pop_back();
-			return result;
-		}
-
-		void popMultiple(llvm::Value** outValues,Uptr num)
-		{
-			WAVM_ASSERT_THROW(stack.size() - (controlStack.size() ? controlStack.back().outerStackSize : 0) >= num);
-			std::copy(stack.end() - num,stack.end(),outValues);
-			stack.resize(stack.size() - num);
-		}
-
-		llvm::Value* getTopValue() const
-		{
-			return stack.back();
-		}
-
-		void push(llvm::Value* value)
-		{
-			stack.push_back(value);
-		}
-
-		// Creates a PHI node for the argument of branches to a basic block.
-		llvm::PHINode* createPHI(llvm::BasicBlock* basicBlock,ResultType type)
-		{
-			if(type == ResultType::none) { return nullptr; }
-			else
-			{
-				auto originalBlock = irBuilder.GetInsertBlock();
-				irBuilder.SetInsertPoint(basicBlock);
-				auto phi = irBuilder.CreatePHI(asLLVMType(type),2);
-				if(originalBlock) { irBuilder.SetInsertPoint(originalBlock); }
-				return phi;
-			}
-		}
-
-		// Debug logging.
-		void logOperator(const std::string& operatorDescription)
-		{
-			if(ENABLE_LOGGING)
-			{
-				std::string controlStackString;
-				for(Uptr stackIndex = 0;stackIndex < controlStack.size();++stackIndex)
-				{
-					if(!controlStack[stackIndex].isReachable) { controlStackString += "("; }
-					switch(controlStack[stackIndex].type)
-					{
-					case ControlContext::Type::function: controlStackString += "F"; break;
-					case ControlContext::Type::block: controlStackString += "B"; break;
-					case ControlContext::Type::ifThen: controlStackString += "T"; break;
-					case ControlContext::Type::ifElse: controlStackString += "E"; break;
-					case ControlContext::Type::loop: controlStackString += "L"; break;
-					default: Errors::unreachable();
-					};
-					if(!controlStack[stackIndex].isReachable) { controlStackString += ")"; }
-				}
-
-				std::string stackString;
-				const Uptr stackBase = controlStack.size() == 0 ? 0 : controlStack.back().outerStackSize;
-				for(Uptr stackIndex = 0;stackIndex < stack.size();++stackIndex)
-				{
-					if(stackIndex == stackBase) { stackString += "| "; }
-					{
-						llvm::raw_string_ostream stackTypeStream(stackString);
-						stack[stackIndex]->getType()->print(stackTypeStream,true);
-					}
-					stackString += " ";
-				}
-				if(stack.size() == stackBase) { stackString += "|"; }
-
-				Log::printf(Log::Category::debug,"%-50s %-50s %-50s\n",controlStackString.c_str(),operatorDescription.c_str(),stackString.c_str());
-			}
-		}
-		
-		// Coerces an I32 value to an I1, and vice-versa.
-		llvm::Value* coerceI32ToBool(llvm::Value* i32Value)
-		{
-			return irBuilder.CreateICmpNE(i32Value,typedZeroConstants[(Uptr)ValueType::i32]);
-		}
-		llvm::Value* coerceBoolToI32(llvm::Value* boolValue)
-		{
-			return irBuilder.CreateZExt(boolValue,llvmI32Type);
-		}
-		
-		// Bounds checks and converts a memory operation I32 address operand to a LLVM pointer.
-		llvm::Value* coerceByteIndexToPointer(llvm::Value* byteIndex,U32 offset,llvm::Type* memoryType)
-		{
-
-			// On a 64 bit runtime, if the address is 32-bits, zext it to 64-bits.
-			// This is crucial for security, as LLVM will otherwise implicitly sign extend it to 64-bits in the GEP below,
-			// interpreting it as a signed offset and allowing access to memory outside the sandboxed memory range.
-			// There are no 'far addresses' in a 32 bit runtime.
-			byteIndex = irBuilder.CreateZExt(byteIndex,llvmI64Type);
-
-			// Add the offset to the byte index.
-			if(offset)
-			{
-				byteIndex = irBuilder.CreateAdd(byteIndex,irBuilder.CreateZExt(emitLiteral(offset),llvmI64Type));
-			}
-
-			// If HAS_64BIT_ADDRESS_SPACE, the memory has enough virtual address space allocated to
-			// ensure that any 32-bit byte index + 32-bit offset will fall within the virtual address sandbox,
-			// so no explicit bounds check is necessary.
-		
-
-			// Cast the pointer to the appropriate type.
-			auto bytePointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultMemoryBase, byteIndex);
-
-			return irBuilder.CreatePointerCast(bytePointer,memoryType->getPointerTo());
-		}
-
-		// Traps a divide-by-zero
-		void trapDivideByZero(ValueType type,llvm::Value* divisor)
-		{
-			emitConditionalTrapIntrinsic(
-				irBuilder.CreateICmpEQ(divisor,typedZeroConstants[(Uptr)type]),
-				"wavmIntrinsics.divideByZeroOrIntegerOverflowTrap",FunctionType::get(),{});
-		}
-
-		// Traps on (x / 0) or (INT_MIN / -1).
-		void trapDivideByZeroOrIntegerOverflow(ValueType type,llvm::Value* left,llvm::Value* right)
-		{
-			emitConditionalTrapIntrinsic(
-				irBuilder.CreateOr(
-					irBuilder.CreateAnd(
-						irBuilder.CreateICmpEQ(left,type == ValueType::i32 ? emitLiteral((U32)INT32_MIN) : emitLiteral((U64)INT64_MIN)),
-						irBuilder.CreateICmpEQ(right,type == ValueType::i32 ? emitLiteral((U32)-1) : emitLiteral((U64)-1))
-						),
-					irBuilder.CreateICmpEQ(right,typedZeroConstants[(Uptr)type])
-					),
-				"wavmIntrinsics.divideByZeroOrIntegerOverflowTrap",FunctionType::get(),{});
-		}
-
-		llvm::Value* getLLVMIntrinsic(const std::initializer_list<llvm::Type*>& argTypes,llvm::Intrinsic::ID id)
-		{
-			return llvm::Intrinsic::getDeclaration(moduleContext.llvmModule,id,llvm::ArrayRef<llvm::Type*>(argTypes.begin(),argTypes.end()));
-		}
-		
-		// Emits a call to a WAVM intrinsic function.
-		llvm::Value* emitRuntimeIntrinsic(const char* intrinsicName,const FunctionType* intrinsicType,const std::initializer_list<llvm::Value*>& args)
-		{
-			ObjectInstance* intrinsicObject = Intrinsics::find(intrinsicName,intrinsicType);
-			WAVM_ASSERT_THROW(intrinsicObject);
-			FunctionInstance* intrinsicFunction = asFunction(intrinsicObject);
-			WAVM_ASSERT_THROW(intrinsicFunction->type == intrinsicType);
-			auto intrinsicFunctionPointer = emitLiteralPointer(intrinsicFunction->nativeFunction,asLLVMType(intrinsicType)->getPointerTo());
-			return irBuilder.CreateCall(intrinsicFunctionPointer,llvm::ArrayRef<llvm::Value*>(args.begin(),args.end()));
-		}
-
-		// A helper function to emit a conditional call to a non-returning intrinsic function.
-		void emitConditionalTrapIntrinsic(llvm::Value* booleanCondition,const char* intrinsicName,const FunctionType* intrinsicType,const std::initializer_list<llvm::Value*>& args)
-		{
-			auto trueBlock = llvm::BasicBlock::Create(context,llvm::Twine(intrinsicName) + "Trap",llvmFunction);
-			auto endBlock = llvm::BasicBlock::Create(context,llvm::Twine(intrinsicName) + "Skip",llvmFunction);
-
-			irBuilder.CreateCondBr(booleanCondition,trueBlock,endBlock,moduleContext.likelyFalseBranchWeights);
-
-			irBuilder.SetInsertPoint(trueBlock);
-			emitRuntimeIntrinsic(intrinsicName,intrinsicType,args);
-			irBuilder.CreateUnreachable();
-
-			irBuilder.SetInsertPoint(endBlock);
-		}
-
-		//
-		// Misc operators
-		//
-
-		void nop(NoImm) {}
-		void unknown(Opcode opcode) { Errors::unreachable(); }
-		
-		//
-		// Control structure operators
-		//
-		
-		void pushControlStack(
-			ControlContext::Type type,
-			ResultType resultType,
-			llvm::BasicBlock* endBlock,
-			llvm::PHINode* endPHI,
-			llvm::BasicBlock* elseBlock = nullptr
-			)
-		{
-			// The unreachable operator filtering should filter out any opcodes that call pushControlStack.
-			if(controlStack.size()) { errorUnless(controlStack.back().isReachable); }
-
-			controlStack.push_back({type,endBlock,endPHI,elseBlock,resultType,stack.size(),branchTargetStack.size(),true,true});
-		}
-
-		void pushBranchTarget(ResultType branchArgumentType,llvm::BasicBlock* branchTargetBlock,llvm::PHINode* branchTargetPHI)
-		{
-			branchTargetStack.push_back({branchArgumentType,branchTargetBlock,branchTargetPHI});
-		}
-
-		void block(ControlStructureImm imm)
-		{
-			// Create an end block+phi for the block result.
-			auto endBlock = llvm::BasicBlock::Create(context,"blockEnd",llvmFunction);
-			auto endPHI = createPHI(endBlock,imm.resultType);
-
-			// Push a control context that ends at the end block/phi.
-			pushControlStack(ControlContext::Type::block,imm.resultType,endBlock,endPHI);
-			
-			// Push a branch target for the end block/phi.
-			pushBranchTarget(imm.resultType,endBlock,endPHI);
-		}
-		void loop(ControlStructureImm imm)
-		{
-			// Create a loop block, and an end block+phi for the loop result.
-			auto loopBodyBlock = llvm::BasicBlock::Create(context,"loopBody",llvmFunction);
-			auto endBlock = llvm::BasicBlock::Create(context,"loopEnd",llvmFunction);
-			auto endPHI = createPHI(endBlock,imm.resultType);
-			
-			// Branch to the loop body and switch the IR builder to emit there.
-			irBuilder.CreateBr(loopBodyBlock);
-			irBuilder.SetInsertPoint(loopBodyBlock);
-
-			// Push a control context that ends at the end block/phi.
-			pushControlStack(ControlContext::Type::loop,imm.resultType,endBlock,endPHI);
-			
-			// Push a branch target for the loop body start.
-			pushBranchTarget(ResultType::none,loopBodyBlock,nullptr);
-		}
-		void if_(ControlStructureImm imm)
-		{
-			// Create a then block and else block for the if, and an end block+phi for the if result.
-			auto thenBlock = llvm::BasicBlock::Create(context,"ifThen",llvmFunction);
-			auto elseBlock = llvm::BasicBlock::Create(context,"ifElse",llvmFunction);
-			auto endBlock = llvm::BasicBlock::Create(context,"ifElseEnd",llvmFunction);
-			auto endPHI = createPHI(endBlock,imm.resultType);
-
-			// Pop the if condition from the operand stack.
-			auto condition = pop();
-			irBuilder.CreateCondBr(coerceI32ToBool(condition),thenBlock,elseBlock);
-			
-			// Switch the IR builder to emit the then block.
-			irBuilder.SetInsertPoint(thenBlock);
-
-			// Push an ifThen control context that ultimately ends at the end block/phi, but may
-			// be terminated by an else operator that changes the control context to the else block.
-			pushControlStack(ControlContext::Type::ifThen,imm.resultType,endBlock,endPHI,elseBlock);
-			
-			// Push a branch target for the if end.
-			pushBranchTarget(imm.resultType,endBlock,endPHI);
-			
-		}
-		void else_(NoImm imm)
-		{
-			WAVM_ASSERT_THROW(controlStack.size());
-			ControlContext& currentContext = controlStack.back();
-
-			if(currentContext.isReachable)
-			{
-				// If the control context expects a result, take it from the operand stack and add it to the
-				// control context's end PHI.
-				if(currentContext.resultType != ResultType::none)
-				{
-					llvm::Value* result = pop();
-					currentContext.endPHI->addIncoming(result,irBuilder.GetInsertBlock());
-				}
-
-				// Branch to the control context's end.
-				irBuilder.CreateBr(currentContext.endBlock);
-			}
-			WAVM_ASSERT_THROW(stack.size() == currentContext.outerStackSize);
-
-			// Switch the IR emitter to the else block.
-			WAVM_ASSERT_THROW(currentContext.elseBlock);
-			WAVM_ASSERT_THROW(currentContext.type == ControlContext::Type::ifThen);
-			currentContext.elseBlock->moveAfter(irBuilder.GetInsertBlock());
-			irBuilder.SetInsertPoint(currentContext.elseBlock);
-
-			// Change the top of the control stack to an else clause.
-			currentContext.type = ControlContext::Type::ifElse;
-			currentContext.isReachable = currentContext.isElseReachable;
-			currentContext.elseBlock = nullptr;
-		}
-		void end(NoImm)
-		{
-			WAVM_ASSERT_THROW(controlStack.size());
-			ControlContext& currentContext = controlStack.back();
-
-			if(currentContext.isReachable)
-			{
-				// If the control context yields a result, take the top of the operand stack and
-				// add it to the control context's end PHI.
-				if(currentContext.resultType != ResultType::none)
-				{
-					llvm::Value* result = pop();
-					currentContext.endPHI->addIncoming(result,irBuilder.GetInsertBlock());
-				}
-
-				// Branch to the control context's end.
-				irBuilder.CreateBr(currentContext.endBlock);
-			}
-			WAVM_ASSERT_THROW(stack.size() == currentContext.outerStackSize);
-
-			if(currentContext.elseBlock)
-			{
-				// If this is the end of an if without an else clause, create a dummy else clause.
-				currentContext.elseBlock->moveAfter(irBuilder.GetInsertBlock());
-				irBuilder.SetInsertPoint(currentContext.elseBlock);
-				irBuilder.CreateBr(currentContext.endBlock);
-			}
-
-			// Switch the IR emitter to the end block.
-			currentContext.endBlock->moveAfter(irBuilder.GetInsertBlock());
-			irBuilder.SetInsertPoint(currentContext.endBlock);
-
-			if(currentContext.endPHI)
-			{
-				// If the control context yields a result, take the PHI that merges all the control flow
-				// to the end and push it onto the operand stack.
-				if(currentContext.endPHI->getNumIncomingValues()) { push(currentContext.endPHI); }
-				else
-				{
-					// If there weren't any incoming values for the end PHI, remove it and push a dummy value.
-					currentContext.endPHI->eraseFromParent();
-					WAVM_ASSERT_THROW(currentContext.resultType != ResultType::none);
-					push(typedZeroConstants[(Uptr)asValueType(currentContext.resultType)]);
-				}
-			}
-
-			// Pop and branch targets introduced by this control context.
-			WAVM_ASSERT_THROW(currentContext.outerBranchTargetStackSize <= branchTargetStack.size());
-			branchTargetStack.resize(currentContext.outerBranchTargetStackSize);
-
-			// Pop this control context.
-			controlStack.pop_back();
-		}
-		
-		//
-		// Control flow operators
-		//
-		
-		BranchTarget& getBranchTargetByDepth(Uptr depth)
-		{
-			WAVM_ASSERT_THROW(depth < branchTargetStack.size());
-			return branchTargetStack[branchTargetStack.size() - depth - 1];
-		}
-		
-		// This is called after unconditional control flow to indicate that operators following it are unreachable until the control stack is popped.
-		void enterUnreachable()
-		{
-			// Unwind the operand stack to the outer control context.
-			WAVM_ASSERT_THROW(controlStack.back().outerStackSize <= stack.size());
-			stack.resize(controlStack.back().outerStackSize);
-
-			// Mark the current control context as unreachable: this will cause the outer loop to stop dispatching operators to us
-			// until an else/end for the current control context is reached.
-			controlStack.back().isReachable = false;
-		}
-		
-		void br_if(BranchImm imm)
-		{
-			// Pop the condition from operand stack.
-			auto condition = pop();
-
-			BranchTarget& target = getBranchTargetByDepth(imm.targetDepth);
-			if(target.argumentType != ResultType::none)
-			{
-				// Use the stack top as the branch argument (don't pop it) and add it to the target phi's incoming values.
-				llvm::Value* argument = getTopValue();
-				target.phi->addIncoming(argument,irBuilder.GetInsertBlock());
-			}
-
-			// Create a new basic block for the case where the branch is not taken.
-			auto falseBlock = llvm::BasicBlock::Create(context,"br_ifElse",llvmFunction);
-
-			// Emit a conditional branch to either the falseBlock or the target block.
-			irBuilder.CreateCondBr(coerceI32ToBool(condition),target.block,falseBlock);
-
-			// Resume emitting instructions in the falseBlock.
-			irBuilder.SetInsertPoint(falseBlock);
-		}
-		
-		void br(BranchImm imm)
-		{
-			BranchTarget& target = getBranchTargetByDepth(imm.targetDepth);
-			if(target.argumentType != ResultType::none)
-			{
-				// Pop the branch argument from the stack and add it to the target phi's incoming values.
-				llvm::Value* argument = pop();
-				target.phi->addIncoming(argument,irBuilder.GetInsertBlock());
-			}
-
-			// Branch to the target block.
-			irBuilder.CreateBr(target.block);
-
-			enterUnreachable();
-		}
-		void br_table(BranchTableImm imm)
-		{
-			// Pop the table index from the operand stack.
-			auto index = pop();
-			
-			// Look up the default branch target, and assume its argument type applies to all targets.
-			// (this is guaranteed by the validator)
-			BranchTarget& defaultTarget = getBranchTargetByDepth(imm.defaultTargetDepth);
-			const ResultType argumentType = defaultTarget.argumentType;
-			llvm::Value* argument = nullptr;
-			if(argumentType != ResultType::none)
-			{
-				// Pop the branch argument from the stack and add it to the default target phi's incoming values.
-				argument = pop();
-				defaultTarget.phi->addIncoming(argument,irBuilder.GetInsertBlock());
-			}
-
-			// Create a LLVM switch instruction.
-			WAVM_ASSERT_THROW(imm.branchTableIndex < functionDef.branchTables.size());
-			const std::vector<U32>& targetDepths = functionDef.branchTables[imm.branchTableIndex];
-			auto llvmSwitch = irBuilder.CreateSwitch(index,defaultTarget.block,(unsigned int)targetDepths.size());
-
-			for(Uptr targetIndex = 0;targetIndex < targetDepths.size();++targetIndex)
-			{
-				BranchTarget& target = getBranchTargetByDepth(targetDepths[targetIndex]);
-
-				// Add this target to the switch instruction.
-				llvmSwitch->addCase(emitLiteral((U32)targetIndex),target.block);
-
-				if(argumentType != ResultType::none)
-				{
-					// If this is the first case in the table for this branch target, add the branch argument to
-					// the target phi's incoming values.
-					target.phi->addIncoming(argument,irBuilder.GetInsertBlock());
-				}
-			}
-
-			enterUnreachable();
-		}
-		void return_(NoImm)
-		{
-			if(functionType->ret != ResultType::none)
-			{
-				// Pop the return value from the stack and add it to the return phi's incoming values.
-				llvm::Value* result = pop();
-				controlStack[0].endPHI->addIncoming(result,irBuilder.GetInsertBlock());
-			}
-
-			// Branch to the return block.
-			irBuilder.CreateBr(controlStack[0].endBlock);
-
-			enterUnreachable();
-		}
-
-		void unreachable(NoImm)
-		{
-			// Call an intrinsic that causes a trap, and insert the LLVM unreachable terminator.
-			emitRuntimeIntrinsic("wavmIntrinsics.unreachableTrap",FunctionType::get(),{});
-			irBuilder.CreateUnreachable();
-
-			enterUnreachable();
-		}
-
-		//
-		// Polymorphic operators
-		//
-
-		void drop(NoImm) { stack.pop_back(); }
-
-		void select(NoImm)
-		{
-			auto condition = pop();
-			auto falseValue = pop();
-			auto trueValue = pop();
-			push(irBuilder.CreateSelect(coerceI32ToBool(condition),trueValue,falseValue));
-		}
-
-		//
-		// Call operators
-		//
-
-		void call(CallImm imm)
-		{
-			// Map the callee function index to either an imported function pointer or a function in this module.
-			llvm::Value* callee;
-			const FunctionType* calleeType;
-			if(imm.functionIndex < moduleContext.importedFunctionPointers.size())
-			{
-				WAVM_ASSERT_THROW(imm.functionIndex < moduleContext.moduleInstance->functions.size());
-				callee = moduleContext.importedFunctionPointers[imm.functionIndex];
-				calleeType = moduleContext.moduleInstance->functions[imm.functionIndex]->type;
-			}
-			else
-			{
-				const Uptr calleeIndex = imm.functionIndex - moduleContext.importedFunctionPointers.size();
-				WAVM_ASSERT_THROW(calleeIndex < moduleContext.functionDefs.size());
-				callee = moduleContext.functionDefs[calleeIndex];
-				calleeType = module.types[module.functions.defs[calleeIndex].type.index];
-			}
-
-			// Pop the call arguments from the operand stack.
-			auto llvmArgs = (llvm::Value**)alloca(sizeof(llvm::Value*) * calleeType->parameters.size());
-			popMultiple(llvmArgs,calleeType->parameters.size());
-
-			// Call the function.
-			auto result = irBuilder.CreateCall(callee,llvm::ArrayRef<llvm::Value*>(llvmArgs,calleeType->parameters.size()));
-
-			// Push the result on the operand stack.
-			if(calleeType->ret != ResultType::none) { push(result); }
-		}
-		void call_indirect(CallIndirectImm imm)
-		{
-			WAVM_ASSERT_THROW(imm.type.index < module.types.size());
-			
-			auto calleeType = module.types[imm.type.index];
-			auto functionPointerType = asLLVMType(calleeType)->getPointerTo()->getPointerTo();
-
-			// Compile the function index.
-			auto tableElementIndex = pop();
-			
-			// Compile the call arguments.
-			auto llvmArgs = (llvm::Value**)alloca(sizeof(llvm::Value*) * calleeType->parameters.size());
-			popMultiple(llvmArgs,calleeType->parameters.size());
-
-			// Zero extend the function index to the pointer size.
-			auto functionIndexZExt = irBuilder.CreateZExt(tableElementIndex,sizeof(Uptr) == 4 ? llvmI32Type : llvmI64Type);
-			
-			// If the function index is larger than the function table size, trap.
-			emitConditionalTrapIntrinsic(
-				irBuilder.CreateICmpUGE(functionIndexZExt,moduleContext.defaultTableMaxElementIndex),
-				"wavmIntrinsics.indirectCallIndexOutOfBounds",FunctionType::get(),{});
-
-			// Load the type for this table entry.
-			auto functionTypePointerPointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultTablePointer, functionIndexZExt, emitLiteral((U32)0));
-			auto functionTypePointer = irBuilder.CreateLoad(functionTypePointerPointer);
-			auto llvmCalleeType = emitLiteralPointer(calleeType,llvmI8PtrType);
-			
-			// If the function type doesn't match, trap.
-			emitConditionalTrapIntrinsic(
-				irBuilder.CreateICmpNE(llvmCalleeType,functionTypePointer),
-				"wavmIntrinsics.indirectCallSignatureMismatch",
-				FunctionType::get(ResultType::none,{ValueType::i32,ValueType::i64,ValueType::i64}),
-				{	tableElementIndex,
-					irBuilder.CreatePtrToInt(llvmCalleeType,llvmI64Type),
-					emitLiteral(reinterpret_cast<U64>(moduleContext.moduleInstance->defaultTable))	}
-				);
-
-			// Call the function loaded from the table.
-			auto functionPointerPointer = CreateInBoundsGEPWAR(irBuilder, moduleContext.defaultTablePointer, functionIndexZExt, emitLiteral((U32)1));
-			auto functionPointer = irBuilder.CreateLoad(irBuilder.CreatePointerCast(functionPointerPointer,functionPointerType));
-			auto result = irBuilder.CreateCall(functionPointer,llvm::ArrayRef<llvm::Value*>(llvmArgs,calleeType->parameters.size()));
-
-			// Push the result on the operand stack.
-			if(calleeType->ret != ResultType::none) { push(result); }
-		}
-		
-		//
-		// Local/global operators
-		//
-
-		void get_local(GetOrSetVariableImm<false> imm)
-		{
-			WAVM_ASSERT_THROW(imm.variableIndex < localPointers.size());
-			push(irBuilder.CreateLoad(localPointers[imm.variableIndex]));
-		}
-		void set_local(GetOrSetVariableImm<false> imm)
-		{
-			WAVM_ASSERT_THROW(imm.variableIndex < localPointers.size());
-			auto value = irBuilder.CreateBitCast(pop(),localPointers[imm.variableIndex]->getType()->getPointerElementType());
-			irBuilder.CreateStore(value,localPointers[imm.variableIndex]);
-		}
-		void tee_local(GetOrSetVariableImm<false> imm)
-		{
-			WAVM_ASSERT_THROW(imm.variableIndex < localPointers.size());
-			auto value = irBuilder.CreateBitCast(getTopValue(),localPointers[imm.variableIndex]->getType()->getPointerElementType());
-			irBuilder.CreateStore(value,localPointers[imm.variableIndex]);
-		}
-		
-		void get_global(GetOrSetVariableImm<true> imm)
-		{
-			WAVM_ASSERT_THROW(imm.variableIndex < moduleContext.globalPointers.size());
-			push(irBuilder.CreateLoad(moduleContext.globalPointers[imm.variableIndex]));
-		}
-		void set_global(GetOrSetVariableImm<true> imm)
-		{
-			WAVM_ASSERT_THROW(imm.variableIndex < moduleContext.globalPointers.size());
-			auto value = irBuilder.CreateBitCast(pop(),moduleContext.globalPointers[imm.variableIndex]->getType()->getPointerElementType());
-			irBuilder.CreateStore(value,moduleContext.globalPointers[imm.variableIndex]);
-		}
-
-		//
-		// Memory size operators
-		// These just call out to wavmIntrinsics.growMemory/currentMemory, passing a pointer to the default memory for the module.
-		//
-
-		void grow_memory(MemoryImm)
-		{
-			auto deltaNumPages = pop();
-			auto defaultMemoryObjectAsI64 = emitLiteral(reinterpret_cast<U64>(moduleContext.moduleInstance->defaultMemory));
-			auto previousNumPages = emitRuntimeIntrinsic(
-				"wavmIntrinsics.growMemory",
-				FunctionType::get(ResultType::i32,{ValueType::i32,ValueType::i64}),
-				{deltaNumPages,defaultMemoryObjectAsI64});
-			push(previousNumPages);
-		}
-		void current_memory(MemoryImm)
-		{
-			auto defaultMemoryObjectAsI64 = emitLiteral(reinterpret_cast<U64>(moduleContext.moduleInstance->defaultMemory));
-			auto currentNumPages = emitRuntimeIntrinsic(
-				"wavmIntrinsics.currentMemory",
-				FunctionType::get(ResultType::i32,{ValueType::i64}),
-				{defaultMemoryObjectAsI64});
-			push(currentNumPages);
-		}
-
-		//
-		// Constant operators
-		//
-
-		#define EMIT_CONST(typeId,nativeType) void typeId##_const(LiteralImm<nativeType> imm) { push(emitLiteral(imm.value)); }
-		EMIT_CONST(i32,I32) EMIT_CONST(i64,I64)
-		EMIT_CONST(f32,F32) EMIT_CONST(f64,F64)
-
-		//
-		// Load/store operators
-		//
-
-		#define EMIT_LOAD_OP(valueTypeId,name,llvmMemoryType,naturalAlignmentLog2,conversionOp) \
-			void valueTypeId##_##name(LoadOrStoreImm<naturalAlignmentLog2> imm) \
-			{ \
-				auto byteIndex = pop(); \
-				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
-				auto load = irBuilder.CreateLoad(pointer); \
-				load->setAlignment(1<<imm.alignmentLog2); \
-				load->setVolatile(true); \
-				push(conversionOp(load,asLLVMType(ValueType::valueTypeId))); \
-			}
-		#define EMIT_STORE_OP(valueTypeId,name,llvmMemoryType,naturalAlignmentLog2,conversionOp) \
-			void valueTypeId##_##name(LoadOrStoreImm<naturalAlignmentLog2> imm) \
-			{ \
-				auto value = pop(); \
-				auto byteIndex = pop(); \
-				auto pointer = coerceByteIndexToPointer(byteIndex,imm.offset,llvmMemoryType); \
-				auto memoryValue = conversionOp(value,llvmMemoryType); \
-				auto store = irBuilder.CreateStore(memoryValue,pointer); \
-				store->setVolatile(true); \
-				store->setAlignment(1<<imm.alignmentLog2); \
-			}
-			
-		llvm::Value* identityConversion(llvm::Value* value,llvm::Type* type) { return value; }
-
-		EMIT_LOAD_OP(i32,load8_s,llvmI8Type,0,irBuilder.CreateSExt)  EMIT_LOAD_OP(i32,load8_u,llvmI8Type,0,irBuilder.CreateZExt)
-		EMIT_LOAD_OP(i32,load16_s,llvmI16Type,1,irBuilder.CreateSExt) EMIT_LOAD_OP(i32,load16_u,llvmI16Type,1,irBuilder.CreateZExt)
-		EMIT_LOAD_OP(i64,load8_s,llvmI8Type,0,irBuilder.CreateSExt)  EMIT_LOAD_OP(i64,load8_u,llvmI8Type,0,irBuilder.CreateZExt)
-		EMIT_LOAD_OP(i64,load16_s,llvmI16Type,1,irBuilder.CreateSExt)  EMIT_LOAD_OP(i64,load16_u,llvmI16Type,1,irBuilder.CreateZExt)
-		EMIT_LOAD_OP(i64,load32_s,llvmI32Type,2,irBuilder.CreateSExt)  EMIT_LOAD_OP(i64,load32_u,llvmI32Type,2,irBuilder.CreateZExt)
-
-		EMIT_LOAD_OP(i32,load,llvmI32Type,2,identityConversion) EMIT_LOAD_OP(i64,load,llvmI64Type,3,identityConversion)
-		EMIT_LOAD_OP(f32,load,llvmF32Type,2,identityConversion) EMIT_LOAD_OP(f64,load,llvmF64Type,3,identityConversion)
-
-		EMIT_STORE_OP(i32,store8,llvmI8Type,0,irBuilder.CreateTrunc) EMIT_STORE_OP(i64,store8,llvmI8Type,0,irBuilder.CreateTrunc)
-		EMIT_STORE_OP(i32,store16,llvmI16Type,1,irBuilder.CreateTrunc) EMIT_STORE_OP(i64,store16,llvmI16Type,1,irBuilder.CreateTrunc)
-		EMIT_STORE_OP(i32,store,llvmI32Type,2,irBuilder.CreateTrunc) EMIT_STORE_OP(i64,store32,llvmI32Type,2,irBuilder.CreateTrunc)
-		EMIT_STORE_OP(i64,store,llvmI64Type,3,identityConversion)
-		EMIT_STORE_OP(f32,store,llvmF32Type,2,identityConversion) EMIT_STORE_OP(f64,store,llvmF64Type,3,identityConversion)
-
-		//
-		// Numeric operator macros
-		//
-
-		#define EMIT_BINARY_OP(typeId,name,emitCode) void typeId##_##name(NoImm) \
-			{ \
-				const ValueType type = ValueType::typeId; SUPPRESS_UNUSED(type); \
-				auto right = pop(); \
-				auto left = pop(); \
-				push(emitCode); \
-			}
-		#define EMIT_INT_BINARY_OP(name,emitCode) EMIT_BINARY_OP(i32,name,emitCode) EMIT_BINARY_OP(i64,name,emitCode)
-		#define EMIT_FP_BINARY_OP(name,emitCode) EMIT_BINARY_OP(f32,name,emitCode) EMIT_BINARY_OP(f64,name,emitCode)
-
-		#define EMIT_UNARY_OP(typeId,name,emitCode) void typeId##_##name(NoImm) \
-			{ \
-				const ValueType type = ValueType::typeId; SUPPRESS_UNUSED(type); \
-				auto operand = pop(); \
-				push(emitCode); \
-			}
-		#define EMIT_INT_UNARY_OP(name,emitCode) EMIT_UNARY_OP(i32,name,emitCode) EMIT_UNARY_OP(i64,name,emitCode)
-		#define EMIT_FP_UNARY_OP(name,emitCode) EMIT_UNARY_OP(f32,name,emitCode) EMIT_UNARY_OP(f64,name,emitCode)
-
-		//
-		// Int operators
-		//
-
-		llvm::Value* emitSRem(ValueType type,llvm::Value* left,llvm::Value* right)
-		{
-			// Trap if the dividend is zero.
-			trapDivideByZero(type,right); 
-
-			// LLVM's srem has undefined behavior where WebAssembly's rem_s defines that it should not trap if the corresponding
-			// division would overflow a signed integer. To avoid this case, we just branch around the srem if the INT_MAX%-1 case
-			// that overflows is detected.
-			auto preOverflowBlock = irBuilder.GetInsertBlock();
-			auto noOverflowBlock = llvm::BasicBlock::Create(context,"sremNoOverflow",llvmFunction);
-			auto endBlock = llvm::BasicBlock::Create(context,"sremEnd",llvmFunction);
-			auto noOverflow = irBuilder.CreateOr(
-				irBuilder.CreateICmpNE(left,type == ValueType::i32 ? emitLiteral((U32)INT32_MIN) : emitLiteral((U64)INT64_MIN)),
-				irBuilder.CreateICmpNE(right,type == ValueType::i32 ? emitLiteral((U32)-1) : emitLiteral((U64)-1))
-				);
-			irBuilder.CreateCondBr(noOverflow,noOverflowBlock,endBlock,moduleContext.likelyTrueBranchWeights);
-
-			irBuilder.SetInsertPoint(noOverflowBlock);
-			auto noOverflowValue = irBuilder.CreateSRem(left,right);
-			irBuilder.CreateBr(endBlock);
-
-			irBuilder.SetInsertPoint(endBlock);
-			auto phi = irBuilder.CreatePHI(asLLVMType(type),2);
-			phi->addIncoming(typedZeroConstants[(Uptr)type],preOverflowBlock);
-			phi->addIncoming(noOverflowValue,noOverflowBlock);
-			return phi;
-		}
-		
-		llvm::Value* emitShiftCountMask(ValueType type,llvm::Value* shiftCount)
-		{
-			// LLVM's shifts have undefined behavior where WebAssembly specifies that the shift count will wrap numbers
-			// grather than the bit count of the operands. This matches x86's native shift instructions, but explicitly mask
-			// the shift count anyway to support other platforms, and ensure the optimizer doesn't take advantage of the UB.
-			auto bitsMinusOne = irBuilder.CreateZExt(emitLiteral((U8)(getTypeBitWidth(type) - 1)),asLLVMType(type));
-			return irBuilder.CreateAnd(shiftCount,bitsMinusOne);
-		}
-
-		llvm::Value* emitRotl(ValueType type,llvm::Value* left,llvm::Value* right)
-		{
-			auto bitWidthMinusRight = irBuilder.CreateSub(
-				irBuilder.CreateZExt(emitLiteral(getTypeBitWidth(type)),asLLVMType(type)),
-				right
-				);
-			return irBuilder.CreateOr(
-				irBuilder.CreateShl(left,emitShiftCountMask(type,right)),
-				irBuilder.CreateLShr(left,emitShiftCountMask(type,bitWidthMinusRight))
-				);
-		}
-		
-		llvm::Value* emitRotr(ValueType type,llvm::Value* left,llvm::Value* right)
-		{
-			auto bitWidthMinusRight = irBuilder.CreateSub(
-				irBuilder.CreateZExt(emitLiteral(getTypeBitWidth(type)),asLLVMType(type)),
-				right
-				);
-			return irBuilder.CreateOr(
-				irBuilder.CreateShl(left,emitShiftCountMask(type,bitWidthMinusRight)),
-				irBuilder.CreateLShr(left,emitShiftCountMask(type,right))
-				);
-		}
-
-		EMIT_INT_BINARY_OP(add,irBuilder.CreateAdd(left,right))
-		EMIT_INT_BINARY_OP(sub,irBuilder.CreateSub(left,right))
-		EMIT_INT_BINARY_OP(mul,irBuilder.CreateMul(left,right))
-		EMIT_INT_BINARY_OP(and,irBuilder.CreateAnd(left,right))
-		EMIT_INT_BINARY_OP(or,irBuilder.CreateOr(left,right))
-		EMIT_INT_BINARY_OP(xor,irBuilder.CreateXor(left,right))
-		EMIT_INT_BINARY_OP(rotr,emitRotr(type,left,right))
-		EMIT_INT_BINARY_OP(rotl,emitRotl(type,left,right))
-			
-		// Divides use trapDivideByZero to avoid the undefined behavior in LLVM's division instructions.
-		EMIT_INT_BINARY_OP(div_s, (trapDivideByZeroOrIntegerOverflow(type,left,right), irBuilder.CreateSDiv(left,right)) )
-		EMIT_INT_BINARY_OP(rem_s, emitSRem(type,left,right) )
-		EMIT_INT_BINARY_OP(div_u, (trapDivideByZero(type,right), irBuilder.CreateUDiv(left,right)) )
-		EMIT_INT_BINARY_OP(rem_u, (trapDivideByZero(type,right), irBuilder.CreateURem(left,right)) )
-
-		// Explicitly mask the shift amount operand to the word size to avoid LLVM's undefined behavior.
-		EMIT_INT_BINARY_OP(shl,irBuilder.CreateShl(left,emitShiftCountMask(type,right)))
-		EMIT_INT_BINARY_OP(shr_s,irBuilder.CreateAShr(left,emitShiftCountMask(type,right)))
-		EMIT_INT_BINARY_OP(shr_u,irBuilder.CreateLShr(left,emitShiftCountMask(type,right)))
-		
-		EMIT_INT_BINARY_OP(eq,coerceBoolToI32(irBuilder.CreateICmpEQ(left,right)))
-		EMIT_INT_BINARY_OP(ne,coerceBoolToI32(irBuilder.CreateICmpNE(left,right)))
-		EMIT_INT_BINARY_OP(lt_s,coerceBoolToI32(irBuilder.CreateICmpSLT(left,right)))
-		EMIT_INT_BINARY_OP(lt_u,coerceBoolToI32(irBuilder.CreateICmpULT(left,right)))
-		EMIT_INT_BINARY_OP(le_s,coerceBoolToI32(irBuilder.CreateICmpSLE(left,right)))
-		EMIT_INT_BINARY_OP(le_u,coerceBoolToI32(irBuilder.CreateICmpULE(left,right)))
-		EMIT_INT_BINARY_OP(gt_s,coerceBoolToI32(irBuilder.CreateICmpSGT(left,right)))
-		EMIT_INT_BINARY_OP(gt_u,coerceBoolToI32(irBuilder.CreateICmpUGT(left,right)))
-		EMIT_INT_BINARY_OP(ge_s,coerceBoolToI32(irBuilder.CreateICmpSGE(left,right)))
-		EMIT_INT_BINARY_OP(ge_u,coerceBoolToI32(irBuilder.CreateICmpUGE(left,right)))
-
-		EMIT_INT_UNARY_OP(clz,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::ctlz),llvm::ArrayRef<llvm::Value*>({operand,emitLiteral(false)})))
-		EMIT_INT_UNARY_OP(ctz,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::cttz),llvm::ArrayRef<llvm::Value*>({operand,emitLiteral(false)})))
-		EMIT_INT_UNARY_OP(popcnt,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::ctpop),llvm::ArrayRef<llvm::Value*>({operand})))
-		EMIT_INT_UNARY_OP(eqz,coerceBoolToI32(irBuilder.CreateICmpEQ(operand,typedZeroConstants[(Uptr)type])))
-
-		//
-		// FP operators
-		//
-
-		EMIT_FP_BINARY_OP(add,irBuilder.CreateFAdd(left,right))
-		EMIT_FP_BINARY_OP(sub,irBuilder.CreateFSub(left,right))
-		EMIT_FP_BINARY_OP(mul,irBuilder.CreateFMul(left,right))
-		EMIT_FP_BINARY_OP(div,irBuilder.CreateFDiv(left,right))
-		EMIT_FP_BINARY_OP(copysign,irBuilder.CreateCall(getLLVMIntrinsic({left->getType()},llvm::Intrinsic::copysign),llvm::ArrayRef<llvm::Value*>({left,right})))
-
-		EMIT_FP_UNARY_OP(neg,irBuilder.CreateFNeg(operand))
-		EMIT_FP_UNARY_OP(abs,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::fabs),llvm::ArrayRef<llvm::Value*>({operand})))
-		EMIT_FP_UNARY_OP(sqrt,irBuilder.CreateCall(getLLVMIntrinsic({operand->getType()},llvm::Intrinsic::sqrt),llvm::ArrayRef<llvm::Value*>({operand})))
-
-		EMIT_FP_BINARY_OP(eq,coerceBoolToI32(irBuilder.CreateFCmpOEQ(left,right)))
-		EMIT_FP_BINARY_OP(ne,coerceBoolToI32(irBuilder.CreateFCmpUNE(left,right)))
-		EMIT_FP_BINARY_OP(lt,coerceBoolToI32(irBuilder.CreateFCmpOLT(left,right)))
-		EMIT_FP_BINARY_OP(le,coerceBoolToI32(irBuilder.CreateFCmpOLE(left,right)))
-		EMIT_FP_BINARY_OP(gt,coerceBoolToI32(irBuilder.CreateFCmpOGT(left,right)))
-		EMIT_FP_BINARY_OP(ge,coerceBoolToI32(irBuilder.CreateFCmpOGE(left,right)))
-
-		EMIT_UNARY_OP(i32,wrap_i64,irBuilder.CreateTrunc(operand,llvmI32Type))
-		EMIT_UNARY_OP(i64,extend_s_i32,irBuilder.CreateSExt(operand,llvmI64Type))
-		EMIT_UNARY_OP(i64,extend_u_i32,irBuilder.CreateZExt(operand,llvmI64Type))
-
-		EMIT_FP_UNARY_OP(convert_s_i32,irBuilder.CreateSIToFP(operand,asLLVMType(type)))
-		EMIT_FP_UNARY_OP(convert_s_i64,irBuilder.CreateSIToFP(operand,asLLVMType(type)))
-		EMIT_FP_UNARY_OP(convert_u_i32,irBuilder.CreateUIToFP(operand,asLLVMType(type)))
-		EMIT_FP_UNARY_OP(convert_u_i64,irBuilder.CreateUIToFP(operand,asLLVMType(type)))
-
-		EMIT_UNARY_OP(f32,demote_f64,irBuilder.CreateFPTrunc(operand,llvmF32Type))
-		EMIT_UNARY_OP(f64,promote_f32,irBuilder.CreateFPExt(operand,llvmF64Type))
-		EMIT_UNARY_OP(f32,reinterpret_i32,irBuilder.CreateBitCast(operand,llvmF32Type))
-		EMIT_UNARY_OP(f64,reinterpret_i64,irBuilder.CreateBitCast(operand,llvmF64Type))
-		EMIT_UNARY_OP(i32,reinterpret_f32,irBuilder.CreateBitCast(operand,llvmI32Type))
-		EMIT_UNARY_OP(i64,reinterpret_f64,irBuilder.CreateBitCast(operand,llvmI64Type))
-
-		// These operations don't match LLVM's semantics exactly, so just call out to C++ implementations.
-		EMIT_FP_BINARY_OP(min,emitRuntimeIntrinsic("wavmIntrinsics.floatMin",FunctionType::get(asResultType(type),{type,type}),{left,right}))
-		EMIT_FP_BINARY_OP(max,emitRuntimeIntrinsic("wavmIntrinsics.floatMax",FunctionType::get(asResultType(type),{type,type}),{left,right}))
-		EMIT_FP_UNARY_OP(ceil,emitRuntimeIntrinsic("wavmIntrinsics.floatCeil",FunctionType::get(asResultType(type),{type}),{operand}))
-		EMIT_FP_UNARY_OP(floor,emitRuntimeIntrinsic("wavmIntrinsics.floatFloor",FunctionType::get(asResultType(type),{type}),{operand}))
-		EMIT_FP_UNARY_OP(trunc,emitRuntimeIntrinsic("wavmIntrinsics.floatTrunc",FunctionType::get(asResultType(type),{type}),{operand}))
-		EMIT_FP_UNARY_OP(nearest,emitRuntimeIntrinsic("wavmIntrinsics.floatNearest",FunctionType::get(asResultType(type),{type}),{operand}))
-		EMIT_INT_UNARY_OP(trunc_s_f32,emitRuntimeIntrinsic("wavmIntrinsics.floatToSignedInt",FunctionType::get(asResultType(type),{ValueType::f32}),{operand}))
-		EMIT_INT_UNARY_OP(trunc_s_f64,emitRuntimeIntrinsic("wavmIntrinsics.floatToSignedInt",FunctionType::get(asResultType(type),{ValueType::f64}),{operand}))
-		EMIT_INT_UNARY_OP(trunc_u_f32,emitRuntimeIntrinsic("wavmIntrinsics.floatToUnsignedInt",FunctionType::get(asResultType(type),{ValueType::f32}),{operand}))
-		EMIT_INT_UNARY_OP(trunc_u_f64,emitRuntimeIntrinsic("wavmIntrinsics.floatToUnsignedInt",FunctionType::get(asResultType(type),{ValueType::f64}),{operand}))
-	};
-	
-	// A do-nothing visitor used to decode past unreachable operators (but supporting logging, and passing the end operator through).
-	struct UnreachableOpVisitor
-	{
-		typedef void Result;
-
-		UnreachableOpVisitor(EmitFunctionContext& inContext): context(inContext), unreachableControlDepth(0) {}
-		#define VISIT_OP(opcode,name,nameString,Imm,...) void name(Imm imm) {}
-		ENUM_NONCONTROL_OPERATORS(VISIT_OP)
-		VISIT_OP(_,unknown,"unknown",Opcode)
-		#undef VISIT_OP
-
-		// Keep track of control structure nesting level in unreachable code, so we know when we reach the end of the unreachable code.
-		void block(ControlStructureImm) { ++unreachableControlDepth; }
-		void loop(ControlStructureImm) { ++unreachableControlDepth; }
-		void if_(ControlStructureImm) { ++unreachableControlDepth; }
-
-		// If an else or end opcode would signal an end to the unreachable code, then pass it through to the IR emitter.
-		void else_(NoImm imm)
-		{
-			if(!unreachableControlDepth) { context.else_(imm); }
-		}
-		void end(NoImm imm)
-		{
-			if(!unreachableControlDepth) { context.end(imm); }
-			else { --unreachableControlDepth; }
-		}
-
-	private:
-		EmitFunctionContext& context;
-		Uptr unreachableControlDepth;
-	};
-
-	void EmitFunctionContext::emit()
-	{
-		// Create the return basic block, and push the root control context for the function.
-		auto returnBlock = llvm::BasicBlock::Create(context,"return",llvmFunction);
-		auto returnPHI = createPHI(returnBlock,functionType->ret);
-		pushControlStack(ControlContext::Type::function,functionType->ret,returnBlock,returnPHI);
-		pushBranchTarget(functionType->ret,returnBlock,returnPHI);
-
-		// Create an initial basic block for the function.
-		auto entryBasicBlock = llvm::BasicBlock::Create(context,"entry",llvmFunction);
-		irBuilder.SetInsertPoint(entryBasicBlock);
-
-		// If enabled, emit a call to the WAVM function enter hook (for debugging).
-		if(ENABLE_FUNCTION_ENTER_EXIT_HOOKS)
-		{
-			emitRuntimeIntrinsic(
-				"wavmIntrinsics.debugEnterFunction",
-				FunctionType::get(ResultType::none,{ValueType::i64}),
-				{emitLiteral(reinterpret_cast<U64>(functionInstance))}
-				);
-		}
-
-		// Create and initialize allocas for all the locals and parameters.
-		auto llvmArgIt = llvmFunction->arg_begin();
-		for(Uptr localIndex = 0;localIndex < functionType->parameters.size() + functionDef.nonParameterLocalTypes.size();++localIndex)
-		{
-			auto localType = localIndex < functionType->parameters.size()
-				? functionType->parameters[localIndex]
-				: functionDef.nonParameterLocalTypes[localIndex - functionType->parameters.size()];
-			auto localPointer = irBuilder.CreateAlloca(asLLVMType(localType),nullptr,"");
-			localPointers.push_back(localPointer);
-
-			if(localIndex < functionType->parameters.size())
-			{
-				// Copy the parameter value into the local that stores it.
-				irBuilder.CreateStore((llvm::Argument*)&(*llvmArgIt),localPointer);
-				++llvmArgIt;
-			}
-			else
-			{
-				// Initialize non-parameter locals to zero.
-				irBuilder.CreateStore(typedZeroConstants[(Uptr)localType],localPointer);
-			}
-		}
-
-		// Decode the WebAssembly opcodes and emit LLVM IR for them.
-		OperatorDecoderStream decoder(functionDef.code);
-		UnreachableOpVisitor unreachableOpVisitor(*this);
-		OperatorPrinter operatorPrinter(module,functionDef);
-		while(decoder && controlStack.size())
-		{
-			if(ENABLE_LOGGING)
-			{
-				logOperator(decoder.decodeOpWithoutConsume(operatorPrinter));
-			}
-
-			if(controlStack.back().isReachable) { decoder.decodeOp(*this); }
-			else { decoder.decodeOp(unreachableOpVisitor); }
-		};
-		WAVM_ASSERT_THROW(irBuilder.GetInsertBlock() == returnBlock);
-		
-		// If enabled, emit a call to the WAVM function enter hook (for debugging).
-		if(ENABLE_FUNCTION_ENTER_EXIT_HOOKS)
-		{
-			emitRuntimeIntrinsic(
-				"wavmIntrinsics.debugExitFunction",
-				FunctionType::get(ResultType::none,{ValueType::i64}),
-				{emitLiteral(reinterpret_cast<U64>(functionInstance))}
-				);
-		}
-
-		// Emit the function return.
-		if(functionType->ret == ResultType::none) { irBuilder.CreateRetVoid(); }
-		else { irBuilder.CreateRet(pop()); }
-	}
-
-	llvm::Module* EmitModuleContext::emit()
-	{
-		Timing::Timer emitTimer;
-
-		// Create literals for the default memory base and mask.
-		if(moduleInstance->defaultMemory)
-		{
-			defaultMemoryBase = emitLiteralPointer(moduleInstance->defaultMemory->baseAddress,llvmI8PtrType);
-			const Uptr defaultMemoryEndOffsetValue = Uptr(moduleInstance->defaultMemory->endOffset);
-			defaultMemoryEndOffset = emitLiteral(defaultMemoryEndOffsetValue);
-		}
-		else { defaultMemoryBase = defaultMemoryEndOffset = nullptr; }
-
-		// Set up the LLVM values used to access the global table.
-		if(moduleInstance->defaultTable)
-		{
-			auto tableElementType = llvm::StructType::get(context,{
-				llvmI8PtrType,
-				llvmI8PtrType
-				});
-			defaultTablePointer = emitLiteralPointer(moduleInstance->defaultTable->baseAddress,tableElementType->getPointerTo());
-			defaultTableMaxElementIndex = emitLiteral(((Uptr)moduleInstance->defaultTable->endOffset)/sizeof(TableInstance::FunctionElement));
-		}
-		else
-		{
-			defaultTablePointer = defaultTableMaxElementIndex = nullptr;
-		}
-
-		// Create LLVM pointer constants for the module's imported functions.
-		for(Uptr functionIndex = 0;functionIndex < module.functions.imports.size();++functionIndex)
-		{
-			const FunctionInstance* functionInstance = moduleInstance->functions[functionIndex];
-			importedFunctionPointers.push_back(emitLiteralPointer(functionInstance->nativeFunction,asLLVMType(functionInstance->type)->getPointerTo()));
-		}
-
-		// Create LLVM pointer constants for the module's globals.
-		for(auto global : moduleInstance->globals)
-		{ globalPointers.push_back(emitLiteralPointer(&global->value,asLLVMType(global->type.valueType)->getPointerTo())); }
-		
-		// Create the LLVM functions.
-		functionDefs.resize(module.functions.defs.size());
-		for(Uptr functionDefIndex = 0;functionDefIndex < module.functions.defs.size();++functionDefIndex)
-		{
-			auto llvmFunctionType = asLLVMType(module.types[module.functions.defs[functionDefIndex].type.index]);
-			auto externalName = getExternalFunctionName(moduleInstance,functionDefIndex);
-			functionDefs[functionDefIndex] = llvm::Function::Create(llvmFunctionType,llvm::Function::ExternalLinkage,externalName,llvmModule);
-		}
-
-		// Compile each function in the module.
-		for(Uptr functionDefIndex = 0;functionDefIndex < module.functions.defs.size();++functionDefIndex)
-		{ EmitFunctionContext(*this,module,module.functions.defs[functionDefIndex],moduleInstance->functionDefs[functionDefIndex],functionDefs[functionDefIndex]).emit(); }
-
-		Timing::logRatePerSecond("Emitted LLVM IR",emitTimer,(F64)llvmModule->size(),"functions");
-
-		return llvmModule;
-	}
-
-	llvm::Module* emitModule(const Module& module,ModuleInstance* moduleInstance)
-	{
-		return EmitModuleContext(module,moduleInstance).emit();
-	}
-}
diff --git a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp b/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
deleted file mode 100644
index 6e7c7ef7124..00000000000
--- a/libraries/wasm-jit/Source/Runtime/LLVMJIT.cpp
+++ /dev/null
@@ -1,538 +0,0 @@
-#include "LLVMJIT.h"
-#include "Inline/BasicTypes.h"
-#include "Inline/Timing.h"
-#include "Logging/Logging.h"
-#include "RuntimePrivate.h"
-#include "IR/Validate.h"
-
-#if LLVM_VERSION_MAJOR == 7
-namespace llvm { namespace orc {
-	using LegacyRTDyldObjectLinkingLayer = RTDyldObjectLinkingLayer;
-	template<typename A, typename B>
-	using LegacyIRCompileLayer = IRCompileLayer<A, B>;
-}}
-#endif
-
-#ifdef _DEBUG
-	// This needs to be 1 to allow debuggers such as Visual Studio to place breakpoints and step through the JITed code.
-	#define USE_WRITEABLE_JIT_CODE_PAGES 1
-
-	#define DUMP_UNOPTIMIZED_MODULE 1
-	#define VERIFY_MODULE 1
-	#define DUMP_OPTIMIZED_MODULE 1
-	#define PRINT_DISASSEMBLY 0
-#else
-	#define USE_WRITEABLE_JIT_CODE_PAGES 0
-	#define DUMP_UNOPTIMIZED_MODULE 0
-	#define VERIFY_MODULE 0
-	#define DUMP_OPTIMIZED_MODULE 0
-	#define PRINT_DISASSEMBLY 0
-#endif
-
-#include "llvm-c/Disassembler.h"
-void disassembleFunction(U8* bytes,Uptr numBytes)
-{
-	LLVMDisasmContextRef disasmRef = LLVMCreateDisasm(llvm::sys::getProcessTriple().c_str(),nullptr,0,nullptr,nullptr);
-
-	U8* nextByte = bytes;
-	Uptr numBytesRemaining = numBytes;
-	while(numBytesRemaining)
-	{
-		char instructionBuffer[256];
-		const Uptr numInstructionBytes = LLVMDisasmInstruction(
-			disasmRef,
-			nextByte,
-			numBytesRemaining,
-			reinterpret_cast<Uptr>(nextByte),
-			instructionBuffer,
-			sizeof(instructionBuffer)
-			);
-		if(numInstructionBytes == 0 || numInstructionBytes > numBytesRemaining)
-			break;
-		numBytesRemaining -= numInstructionBytes;
-		nextByte += numInstructionBytes;
-
-		printf("\t\t%s\n",instructionBuffer);
-	};
-
-	LLVMDisasmDispose(disasmRef);
-}
-
-namespace LLVMJIT
-{
-	llvm::LLVMContext context;
-	llvm::TargetMachine* targetMachine = nullptr;
-	llvm::Type* llvmResultTypes[(Uptr)ResultType::num];
-
-	llvm::Type* llvmI8Type;
-	llvm::Type* llvmI16Type;
-	llvm::Type* llvmI32Type;
-	llvm::Type* llvmI64Type;
-	llvm::Type* llvmF32Type;
-	llvm::Type* llvmF64Type;
-	llvm::Type* llvmVoidType;
-	llvm::Type* llvmBoolType;
-	llvm::Type* llvmI8PtrType;
-
-	llvm::Constant* typedZeroConstants[(Uptr)ValueType::num];
-	
-	// A map from address to loaded JIT symbols.
-	Platform::Mutex* addressToSymbolMapMutex = Platform::createMutex();
-	std::map<Uptr,struct JITSymbol*> addressToSymbolMap;
-
-	// A map from function types to function indices in the invoke thunk unit.
-	std::map<const FunctionType*,struct JITSymbol*> invokeThunkTypeToSymbolMap;
-
-	// Information about a JIT symbol, used to map instruction pointers to descriptive names.
-	struct JITSymbol
-	{
-		enum class Type
-		{
-			functionInstance,
-			invokeThunk
-		};
-		Type type;
-		union
-		{
-			FunctionInstance* functionInstance;
-			const FunctionType* invokeThunkType;
-		};
-		Uptr baseAddress;
-		Uptr numBytes;
-		std::map<U32,U32> offsetToOpIndexMap;
-		
-		JITSymbol(FunctionInstance* inFunctionInstance,Uptr inBaseAddress,Uptr inNumBytes,std::map<U32,U32>&& inOffsetToOpIndexMap)
-		: type(Type::functionInstance), functionInstance(inFunctionInstance), baseAddress(inBaseAddress), numBytes(inNumBytes), offsetToOpIndexMap(inOffsetToOpIndexMap) {}
-
-		JITSymbol(const FunctionType* inInvokeThunkType,Uptr inBaseAddress,Uptr inNumBytes,std::map<U32,U32>&& inOffsetToOpIndexMap)
-		: type(Type::invokeThunk), invokeThunkType(inInvokeThunkType), baseAddress(inBaseAddress), numBytes(inNumBytes), offsetToOpIndexMap(inOffsetToOpIndexMap) {}
-	};
-
-	// Allocates memory for the LLVM object loader.
-	struct UnitMemoryManager : llvm::RTDyldMemoryManager
-	{
-		UnitMemoryManager()
-		: imageBaseAddress(nullptr)
-		, numAllocatedImagePages(0)
-		, isFinalized(false)
-		, codeSection({0})
-		, readOnlySection({0})
-		, readWriteSection({0})
-		{}
-		virtual ~UnitMemoryManager() override
-		{
-			// Decommit the image pages, but leave them reserved to catch any references to them that might erroneously remain.
-			if(numAllocatedImagePages)
-				Platform::decommitVirtualPages(imageBaseAddress,numAllocatedImagePages);
-		}
-		
-		virtual bool needsToReserveAllocationSpace() override { return true; }
-		virtual void reserveAllocationSpace(uintptr_t numCodeBytes,U32 codeAlignment,uintptr_t numReadOnlyBytes,U32 readOnlyAlignment,uintptr_t numReadWriteBytes,U32 readWriteAlignment) override
-		{
-			//in llvm7+ it's signaling unwinding frames as being R/W on macos. This appears to be due to Mach-O not supporting read-only data sections?
-			//Let's only clutch in this safety guard for Linux
-#ifndef __APPLE__
-			if(numReadWriteBytes)
-				 Runtime::causeException(Exception::Cause::outOfMemory);
-#endif
-			// Calculate the number of pages to be used by each section.
-			codeSection.numPages = shrAndRoundUp(numCodeBytes,Platform::getPageSizeLog2());
-			readOnlySection.numPages = shrAndRoundUp(numReadOnlyBytes,Platform::getPageSizeLog2());
-			readWriteSection.numPages = shrAndRoundUp(numReadWriteBytes,Platform::getPageSizeLog2());
-			numAllocatedImagePages = codeSection.numPages + readOnlySection.numPages + readWriteSection.numPages;
-			if(numAllocatedImagePages)
-			{
-				// Reserve enough contiguous pages for all sections.
-				imageBaseAddress = Platform::allocateVirtualPages(numAllocatedImagePages);
-				if(!imageBaseAddress || !Platform::commitVirtualPages(imageBaseAddress,numAllocatedImagePages)) { Errors::fatal("memory allocation for JIT code failed"); }
-				codeSection.baseAddress = imageBaseAddress;
-				readOnlySection.baseAddress = codeSection.baseAddress + (codeSection.numPages << Platform::getPageSizeLog2());
-				readWriteSection.baseAddress = readOnlySection.baseAddress + (readOnlySection.numPages << Platform::getPageSizeLog2());
-			}
-		}
-		virtual U8* allocateCodeSection(uintptr_t numBytes,U32 alignment,U32 sectionID,llvm::StringRef sectionName) override
-		{
-			return allocateBytes((Uptr)numBytes,alignment,codeSection);
-		}
-		virtual U8* allocateDataSection(uintptr_t numBytes,U32 alignment,U32 sectionID,llvm::StringRef SectionName,bool isReadOnly) override
-		{
-			return allocateBytes((Uptr)numBytes,alignment,isReadOnly ? readOnlySection : readWriteSection);
-		}
-		virtual bool finalizeMemory(std::string* ErrMsg = nullptr) override
-		{
-			WAVM_ASSERT_THROW(!isFinalized);
-			isFinalized = true;
-			// Set the requested final memory access for each section's pages.
-			const Platform::MemoryAccess codeAccess = USE_WRITEABLE_JIT_CODE_PAGES ? Platform::MemoryAccess::ReadWriteExecute : Platform::MemoryAccess::Execute;
-			if(codeSection.numPages && !Platform::setVirtualPageAccess(codeSection.baseAddress,codeSection.numPages,codeAccess)) { return false; }
-			if(readOnlySection.numPages && !Platform::setVirtualPageAccess(readOnlySection.baseAddress,readOnlySection.numPages,Platform::MemoryAccess::ReadOnly)) { return false; }
-			if(readWriteSection.numPages && !Platform::setVirtualPageAccess(readWriteSection.baseAddress,readWriteSection.numPages,Platform::MemoryAccess::ReadWrite)) { return false; }
-			return true;
-		}
-
-		U8* getImageBaseAddress() const { return imageBaseAddress; }
-
-	private:
-		struct Section
-		{
-			U8* baseAddress;
-			Uptr numPages;
-			Uptr numCommittedBytes;
-		};
-		
-		U8* imageBaseAddress;
-		Uptr numAllocatedImagePages;
-		bool isFinalized;
-
-		Section codeSection;
-		Section readOnlySection;
-		Section readWriteSection;
-
-		U8* allocateBytes(Uptr numBytes,Uptr alignment,Section& section)
-		{
-			WAVM_ASSERT_THROW(section.baseAddress);
-			WAVM_ASSERT_THROW(!(alignment & (alignment - 1)));
-			WAVM_ASSERT_THROW(!isFinalized);
-			
-			// Allocate the section at the lowest uncommitted byte of image memory.
-			U8* allocationBaseAddress = section.baseAddress + align(section.numCommittedBytes,alignment);
-			WAVM_ASSERT_THROW(!(reinterpret_cast<Uptr>(allocationBaseAddress) & (alignment-1)));
-			section.numCommittedBytes = align(section.numCommittedBytes,alignment) + align(numBytes,alignment);
-
-			// Check that enough space was reserved in the section.
-			if(section.numCommittedBytes > (section.numPages << Platform::getPageSizeLog2())) { Errors::fatal("didn't reserve enough space in section"); }
-
-			return allocationBaseAddress;
-		}
-		
-		static Uptr align(Uptr size,Uptr alignment) { return (size + alignment - 1) & ~(alignment - 1); }
-		static Uptr shrAndRoundUp(Uptr value,Uptr shift) { return (value + (Uptr(1)<<shift) - 1) >> shift; }
-
-		UnitMemoryManager(const UnitMemoryManager&) = delete;
-		void operator=(const UnitMemoryManager&) = delete;
-	};
-
-	// A unit of JIT compilation.
-	// Encapsulates the LLVM JIT compilation pipeline but allows subclasses to define how the resulting code is used.
-	struct JITUnit
-	{
-		JITUnit(bool inShouldLogMetrics = true)
-		: shouldLogMetrics(inShouldLogMetrics)
-		{
-			objectLayer = llvm::make_unique<llvm::orc::LegacyRTDyldObjectLinkingLayer>(ES,[](llvm::orc::VModuleKey K) {
-									return llvm::orc::LegacyRTDyldObjectLinkingLayer::Resources{
-										std::make_shared<UnitMemoryManager>(), std::make_shared<llvm::orc::NullResolver>()
-									};
-							  },
-							  [](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
-									//nothing to do
-							  },
-							  [this](llvm::orc::VModuleKey, const llvm::object::ObjectFile &Obj, const llvm::RuntimeDyld::LoadedObjectInfo &o) {
-									for(auto symbolSizePair : llvm::object::computeSymbolSizes(Obj)) {
-										auto symbol = symbolSizePair.first;
-										auto name = symbol.getName();
-										auto address = symbol.getAddress();
-										if(symbol.getType() && symbol.getType().get() == llvm::object::SymbolRef::ST_Function && name && address) {
-											Uptr loadedAddress = Uptr(*address);
-											auto symbolSection = symbol.getSection();
-											if(symbolSection)
-												loadedAddress += (Uptr)o.getSectionLoadAddress(*symbolSection.get());
-											//printf(">>> %s 0x%lX\n", symbolSizePair.first.getName()->data(), loadedAddress);
-											std::map<U32,U32> offsetToOpIndexMap;
-											notifySymbolLoaded(name->data(), loadedAddress, 0, std::move(offsetToOpIndexMap));
-											//disassembleFunction((U8*)loadedAddress, symbolSizePair.second);
-										}
-									}
-							  }
-							  );
-			objectLayer->setProcessAllSections(true);
-			compileLayer = llvm::make_unique<CompileLayer>(*objectLayer,llvm::orc::SimpleCompiler(*targetMachine));
-		}
-
-		void compile(llvm::Module* llvmModule);
-
-		virtual void notifySymbolLoaded(const char* name,Uptr baseAddress,Uptr numBytes,std::map<U32,U32>&& offsetToOpIndexMap) = 0;
-
-	private:
-		typedef llvm::orc::LegacyIRCompileLayer<llvm::orc::LegacyRTDyldObjectLinkingLayer, llvm::orc::SimpleCompiler> CompileLayer;
-
-		llvm::orc::ExecutionSession ES;
-		std::unique_ptr<llvm::orc::LegacyRTDyldObjectLinkingLayer> objectLayer;
-		std::unique_ptr<CompileLayer> compileLayer;
-		bool shouldLogMetrics;
-	};
-
-	// The JIT compilation unit for a WebAssembly module instance.
-	struct JITModule : JITUnit, JITModuleBase
-	{
-		ModuleInstance* moduleInstance;
-
-		std::vector<JITSymbol*> functionDefSymbols;
-
-		JITModule(ModuleInstance* inModuleInstance): moduleInstance(inModuleInstance) {}
-		~JITModule() override
-		{
-		}
-
-		void notifySymbolLoaded(const char* name,Uptr baseAddress,Uptr numBytes,std::map<U32,U32>&& offsetToOpIndexMap) override
-		{
-			// Save the address range this function was loaded at for future address->symbol lookups.
-			Uptr functionDefIndex;
-			if(getFunctionIndexFromExternalName(name,functionDefIndex))
-			{
-				WAVM_ASSERT_THROW(moduleInstance);
-				WAVM_ASSERT_THROW(functionDefIndex < moduleInstance->functionDefs.size());
-				FunctionInstance* functionInstance = moduleInstance->functionDefs[functionDefIndex];
-				functionInstance->nativeFunction = reinterpret_cast<void*>(baseAddress);
-			}
-		}
-	};
-
-	// The JIT compilation unit for a single invoke thunk.
-	struct JITInvokeThunkUnit : JITUnit
-	{
-		const FunctionType* functionType;
-
-		JITSymbol* symbol;
-
-		JITInvokeThunkUnit(const FunctionType* inFunctionType): JITUnit(false), functionType(inFunctionType), symbol(nullptr) {}
-
-		void notifySymbolLoaded(const char* name,Uptr baseAddress,Uptr numBytes,std::map<U32,U32>&& offsetToOpIndexMap) override
-		{
-#ifndef __APPLE__
-			const char thunkPrefix[] = "invokeThunk";
-#else
-			const char thunkPrefix[] = "_invokeThunk";
-#endif
-			WAVM_ASSERT_THROW(!strcmp(name,thunkPrefix));
-			symbol = new JITSymbol(functionType,baseAddress,numBytes,std::move(offsetToOpIndexMap));
-		}
-	};
-
-	static Uptr printedModuleId = 0;
-
-	void printModule(const llvm::Module* llvmModule,const char* filename)
-	{
-		std::error_code errorCode;
-		std::string augmentedFilename = std::string(filename) + std::to_string(printedModuleId++) + ".ll";
-		llvm::raw_fd_ostream dumpFileStream(augmentedFilename,errorCode,llvm::sys::fs::OpenFlags::F_Text);
-		llvmModule->print(dumpFileStream,nullptr);
-		Log::printf(Log::Category::debug,"Dumped LLVM module to: %s\n",augmentedFilename.c_str());
-	}
-
-	void JITUnit::compile(llvm::Module* llvmModule)
-	{
-		// Get a target machine object for this host, and set the module to use its data layout.
-		llvmModule->setDataLayout(targetMachine->createDataLayout());
-
-		// Verify the module.
-		if(DUMP_UNOPTIMIZED_MODULE) { printModule(llvmModule,"llvmDump"); }
-		if(VERIFY_MODULE)
-		{
-			std::string verifyOutputString;
-			llvm::raw_string_ostream verifyOutputStream(verifyOutputString);
-			if(llvm::verifyModule(*llvmModule,&verifyOutputStream))
-			{ Errors::fatalf("LLVM verification errors:\n%s\n",verifyOutputString.c_str()); }
-			Log::printf(Log::Category::debug,"Verified LLVM module\n");
-		}
-
-		// Run some optimization on the module's functions.
-		Timing::Timer optimizationTimer;
-
-		auto fpm = new llvm::legacy::FunctionPassManager(llvmModule);
-		fpm->add(llvm::createPromoteMemoryToRegisterPass());
-		fpm->add(llvm::createInstructionCombiningPass());
-		fpm->add(llvm::createCFGSimplificationPass());
-		fpm->add(llvm::createJumpThreadingPass());
-		fpm->add(llvm::createConstantPropagationPass());
-		fpm->doInitialization();
-
-		for(auto functionIt = llvmModule->begin();functionIt != llvmModule->end();++functionIt)
-		{ fpm->run(*functionIt); }
-		delete fpm;
-
-		if(DUMP_OPTIMIZED_MODULE) { printModule(llvmModule,"llvmOptimizedDump"); }
-
-		// Pass the module to the JIT compiler.
-		Timing::Timer machineCodeTimer;
-		llvm::orc::VModuleKey K = ES.allocateVModule();
-		std::unique_ptr<llvm::Module> mod(llvmModule);
-		WAVM_ASSERT_THROW(!compileLayer->addModule(K, std::move(mod)));
-		WAVM_ASSERT_THROW(!compileLayer->emitAndFinalize(K));
-	}
-
-	void instantiateModule(const IR::Module& module,ModuleInstance* moduleInstance)
-	{
-		// Emit LLVM IR for the module.
-		auto llvmModule = emitModule(module,moduleInstance);
-
-		// Construct the JIT compilation pipeline for this module.
-		auto jitModule = new JITModule(moduleInstance);
-		moduleInstance->jitModule = jitModule;
-
-		// Compile the module.
-		jitModule->compile(llvmModule);
-	}
-
-	std::string getExternalFunctionName(ModuleInstance* moduleInstance,Uptr functionDefIndex)
-	{
-		WAVM_ASSERT_THROW(functionDefIndex < moduleInstance->functionDefs.size());
-		return "wasmFunc" + std::to_string(functionDefIndex)
-			+ "_" + moduleInstance->functionDefs[functionDefIndex]->debugName;
-	}
-
-	bool getFunctionIndexFromExternalName(const char* externalName,Uptr& outFunctionDefIndex)
-	{
-#ifndef __APPLE__
-		const char wasmFuncPrefix[] = "wasmFunc";
-#else
-		const char wasmFuncPrefix[] = "_wasmFunc";
-#endif
-		const Uptr numPrefixChars = sizeof(wasmFuncPrefix) - 1;
-		if(!strncmp(externalName,wasmFuncPrefix,numPrefixChars))
-		{
-			char* numberEnd = nullptr;
-			U64 functionDefIndex64 = std::strtoull(externalName + numPrefixChars,&numberEnd,10);
-			if(functionDefIndex64 > UINTPTR_MAX) { return false; }
-			outFunctionDefIndex = Uptr(functionDefIndex64);
-			return true;
-		}
-		else { return false; }
-	}
-
-	bool describeInstructionPointer(Uptr ip,std::string& outDescription)
-	{
-		JITSymbol* symbol;
-		{
-			Platform::Lock addressToSymbolMapLock(addressToSymbolMapMutex);
-			auto symbolIt = addressToSymbolMap.upper_bound(ip);
-			if(symbolIt == addressToSymbolMap.end()) { return false; }
-			symbol = symbolIt->second;
-		}
-		if(ip < symbol->baseAddress || ip >= symbol->baseAddress + symbol->numBytes) { return false; }
-
-		switch(symbol->type)
-		{
-		case JITSymbol::Type::functionInstance:
-			outDescription = symbol->functionInstance->debugName;
-			if(!outDescription.size()) { outDescription = "<unnamed function>"; }
-			break;
-		case JITSymbol::Type::invokeThunk:
-			outDescription = "<invoke thunk : " + asString(symbol->invokeThunkType) + ">";
-			break;
-		default: Errors::unreachable();
-		};
-		
-		// Find the highest entry in the offsetToOpIndexMap whose offset is <= the symbol-relative IP.
-		U32 ipOffset = (U32)(ip - symbol->baseAddress);
-		Iptr opIndex = -1;
-		for(auto offsetMapIt : symbol->offsetToOpIndexMap)
-		{
-			if(offsetMapIt.first <= ipOffset) { opIndex = offsetMapIt.second; }
-			else { break; }
-		}
-		if(opIndex >= 0) { outDescription += " (op " + std::to_string(opIndex) + ")"; }
-		return true;
-	}
-
-	InvokeFunctionPointer getInvokeThunk(const FunctionType* functionType)
-	{
-		// Reuse cached invoke thunks for the same function type.
-		auto mapIt = invokeThunkTypeToSymbolMap.find(functionType);
-		if(mapIt != invokeThunkTypeToSymbolMap.end()) { return reinterpret_cast<InvokeFunctionPointer>(mapIt->second->baseAddress); }
-
-		auto llvmModule = new llvm::Module("",context);
-		auto llvmFunctionType = llvm::FunctionType::get(
-			llvmVoidType,
-			{asLLVMType(functionType)->getPointerTo(),llvmI64Type->getPointerTo()},
-			false);
-		auto llvmFunction = llvm::Function::Create(llvmFunctionType,llvm::Function::ExternalLinkage,"invokeThunk",llvmModule);
-		auto argIt = llvmFunction->args().begin();
-		llvm::Value* functionPointer = &*argIt++;
-		llvm::Value* argBaseAddress = &*argIt;
-		auto entryBlock = llvm::BasicBlock::Create(context,"entry",llvmFunction);
-		llvm::IRBuilder<> irBuilder(entryBlock);
-
-		// Load the function's arguments from an array of 64-bit values at an address provided by the caller.
-		std::vector<llvm::Value*> structArgLoads;
-		for(Uptr parameterIndex = 0;parameterIndex < functionType->parameters.size();++parameterIndex)
-		{
-			structArgLoads.push_back(irBuilder.CreateLoad(
-				irBuilder.CreatePointerCast(
-					irBuilder.CreateInBoundsGEP(argBaseAddress,{emitLiteral((Uptr)parameterIndex)}),
-					asLLVMType(functionType->parameters[parameterIndex])->getPointerTo()
-					)
-				));
-		}
-
-		// Call the llvm function with the actual implementation.
-		auto returnValue = irBuilder.CreateCall(functionPointer,structArgLoads);
-
-		// If the function has a return value, write it to the end of the argument array.
-		if(functionType->ret != ResultType::none)
-		{
-			auto llvmResultType = asLLVMType(functionType->ret);
-			irBuilder.CreateStore(
-				returnValue,
-				irBuilder.CreatePointerCast(
-					irBuilder.CreateInBoundsGEP(argBaseAddress,{emitLiteral((Uptr)functionType->parameters.size())}),
-					llvmResultType->getPointerTo()
-					)
-				);
-		}
-
-		irBuilder.CreateRetVoid();
-
-		// Compile the invoke thunk.
-		auto jitUnit = new JITInvokeThunkUnit(functionType);
-		jitUnit->compile(llvmModule);
-
-		WAVM_ASSERT_THROW(jitUnit->symbol);
-		invokeThunkTypeToSymbolMap[functionType] = jitUnit->symbol;
-
-		{
-			Platform::Lock addressToSymbolMapLock(addressToSymbolMapMutex);
-			addressToSymbolMap[jitUnit->symbol->baseAddress + jitUnit->symbol->numBytes] = jitUnit->symbol;
-		}
-
-		return reinterpret_cast<InvokeFunctionPointer>(jitUnit->symbol->baseAddress);
-	}
-
-	void init()
-	{
-		llvm::InitializeNativeTarget();
-		llvm::InitializeNativeTargetAsmPrinter();
-		llvm::InitializeNativeTargetAsmParser();
-		llvm::InitializeNativeTargetDisassembler();
-		llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr);
-
-		auto targetTriple = llvm::sys::getProcessTriple();
-
-		targetMachine = llvm::EngineBuilder().selectTarget(
-			llvm::Triple(targetTriple),"","",llvm::SmallVector<std::string,0>()
-			);
-
-		llvmI8Type = llvm::Type::getInt8Ty(context);
-		llvmI16Type = llvm::Type::getInt16Ty(context);
-		llvmI32Type = llvm::Type::getInt32Ty(context);
-		llvmI64Type = llvm::Type::getInt64Ty(context);
-		llvmF32Type = llvm::Type::getFloatTy(context);
-		llvmF64Type = llvm::Type::getDoubleTy(context);
-		llvmVoidType = llvm::Type::getVoidTy(context);
-		llvmBoolType = llvm::Type::getInt1Ty(context);
-		llvmI8PtrType = llvmI8Type->getPointerTo();
-
-		llvmResultTypes[(Uptr)ResultType::none] = llvm::Type::getVoidTy(context);
-		llvmResultTypes[(Uptr)ResultType::i32] = llvmI32Type;
-		llvmResultTypes[(Uptr)ResultType::i64] = llvmI64Type;
-		llvmResultTypes[(Uptr)ResultType::f32] = llvmF32Type;
-		llvmResultTypes[(Uptr)ResultType::f64] = llvmF64Type;
-
-		// Create zero constants of each type.
-		typedZeroConstants[(Uptr)ValueType::any] = nullptr;
-		typedZeroConstants[(Uptr)ValueType::i32] = emitLiteral((U32)0);
-		typedZeroConstants[(Uptr)ValueType::i64] = emitLiteral((U64)0);
-		typedZeroConstants[(Uptr)ValueType::f32] = emitLiteral((F32)0.0f);
-		typedZeroConstants[(Uptr)ValueType::f64] = emitLiteral((F64)0.0);
-	}
-}
diff --git a/libraries/wasm-jit/Source/Runtime/Memory.cpp b/libraries/wasm-jit/Source/Runtime/Memory.cpp
deleted file mode 100644
index 3fc3b58a7c6..00000000000
--- a/libraries/wasm-jit/Source/Runtime/Memory.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "Runtime.h"
-#include "Platform/Platform.h"
-#include "RuntimePrivate.h"
-
-namespace Runtime
-{
-	// Global lists of memories; used to query whether an address is reserved by one of them.
-	std::vector<MemoryInstance*> memories;
-
-	static Uptr getPlatformPagesPerWebAssemblyPageLog2()
-	{
-		errorUnless(Platform::getPageSizeLog2() <= IR::numBytesPerPageLog2);
-		return IR::numBytesPerPageLog2 - Platform::getPageSizeLog2();
-	}
-
-	U8* allocateVirtualPagesAligned(Uptr numBytes,Uptr alignmentBytes,U8*& outUnalignedBaseAddress,Uptr& outUnalignedNumPlatformPages)
-	{
-		const Uptr numAllocatedVirtualPages = numBytes >> Platform::getPageSizeLog2();
-		const Uptr alignmentPages = alignmentBytes >> Platform::getPageSizeLog2();
-		outUnalignedNumPlatformPages = numAllocatedVirtualPages + alignmentPages;
-		outUnalignedBaseAddress = Platform::allocateVirtualPages(outUnalignedNumPlatformPages);
-		if(!outUnalignedBaseAddress) { outUnalignedNumPlatformPages = 0; return nullptr; }
-		else { return (U8*)((Uptr)(outUnalignedBaseAddress + alignmentBytes - 1) & ~(alignmentBytes - 1)); }
-	}
-
-	MemoryInstance* createMemory(MemoryType type)
-	{
-		MemoryInstance* memory = new MemoryInstance(type);
-
-		// On a 64-bit runtime, allocate 8GB of address space for the memory.
-		// This allows eliding bounds checks on memory accesses, since a 32-bit index + 32-bit offset will always be within the reserved address-space.
-		// On a 32-bit runtime, allocate 256MB.
-		const Uptr memoryMaxBytes = HAS_64BIT_ADDRESS_SPACE ? Uptr(8ull*1024*1024*1024) : 0x10000000;
-		
-		// On a 64 bit runtime, align the instance memory base to a 4GB boundary, so the lower 32-bits will all be zero. Maybe it will allow better code generation?
-		// Note that this reserves a full extra 4GB, but only uses (4GB-1 page) for alignment, so there will always be a guard page at the end to
-		// protect against unaligned loads/stores that straddle the end of the address-space.
-		const Uptr alignmentBytes = HAS_64BIT_ADDRESS_SPACE ? Uptr(4ull*1024*1024*1024) : ((Uptr)1 << Platform::getPageSizeLog2());
-		memory->baseAddress = allocateVirtualPagesAligned(memoryMaxBytes,alignmentBytes,memory->reservedBaseAddress,memory->reservedNumPlatformPages);
-		memory->endOffset = memoryMaxBytes;
-		if(!memory->baseAddress) { delete memory; return nullptr; }
-
-		// Grow the memory to the type's minimum size.
-		WAVM_ASSERT_THROW(type.size.min <= UINTPTR_MAX);
-		if(growMemory(memory,Uptr(type.size.min)) == -1) { delete memory; return nullptr; }
-
-		// Add the memory to the global array.
-		memories.push_back(memory);
-		return memory;
-	}
-
-	MemoryInstance::~MemoryInstance()
-	{
-		// Decommit all default memory pages.
-		if(numPages > 0) { Platform::decommitVirtualPages(baseAddress,numPages << getPlatformPagesPerWebAssemblyPageLog2()); }
-
-		// Free the virtual address space.
-		if(reservedNumPlatformPages > 0) { Platform::freeVirtualPages(reservedBaseAddress,reservedNumPlatformPages); }
-		reservedBaseAddress = baseAddress = nullptr;
-		reservedNumPlatformPages = 0;
-
-		// Remove the memory from the global array.
-		for(Uptr memoryIndex = 0;memoryIndex < memories.size();++memoryIndex)
-		{
-			if(memories[memoryIndex] == this) { memories.erase(memories.begin() + memoryIndex); break; }
-		}
-
-		theMemoryInstance = nullptr;
-	}
-	
-	bool isAddressOwnedByMemory(U8* address)
-	{
-		// Iterate over all memories and check if the address is within the reserved address space for each.
-		for(auto memory : memories)
-		{
-			U8* startAddress = memory->reservedBaseAddress;
-			U8* endAddress = memory->reservedBaseAddress + (memory->reservedNumPlatformPages << Platform::getPageSizeLog2());
-			if(address >= startAddress && address < endAddress) { return true; }
-		}
-		return false;
-	}
-
-	Uptr getMemoryNumPages(MemoryInstance* memory) { return memory->numPages; }
-	Uptr getMemoryMaxPages(MemoryInstance* memory)
-	{
-		WAVM_ASSERT_THROW(memory->type.size.max <= UINTPTR_MAX);
-		return Uptr(memory->type.size.max);
-	}
-
-	void resetMemory(MemoryInstance* memory, MemoryType& newMemoryType) {
-		memory->type.size.min = 1;
-		if(shrinkMemory(memory, memory->numPages - 1) == -1)
-			causeException(Exception::Cause::outOfMemory);
-		memset(memory->baseAddress, 0, 1<<IR::numBytesPerPageLog2);
-		memory->type = newMemoryType;
-		if(growMemory(memory, memory->type.size.min - 1) == -1)
-			causeException(Exception::Cause::outOfMemory);
-   }
-
-	Iptr growMemory(MemoryInstance* memory,Uptr numNewPages)
-	{
-		const Uptr previousNumPages = memory->numPages;
-		if(numNewPages > 0)
-		{
-			// If the number of pages to grow would cause the memory's size to exceed its maximum, return -1.
-			if(numNewPages > memory->type.size.max || memory->numPages > memory->type.size.max - numNewPages) { return -1; }
-
-			// Try to commit the new pages, and return -1 if the commit fails.
-			if(!Platform::commitVirtualPages(
-				memory->baseAddress + (memory->numPages << IR::numBytesPerPageLog2),
-				numNewPages << getPlatformPagesPerWebAssemblyPageLog2()
-				))
-			{
-				return -1;
-			}
-			memset(memory->baseAddress + (memory->numPages << IR::numBytesPerPageLog2), 0, numNewPages << IR::numBytesPerPageLog2);
-			memory->numPages += numNewPages;
-		}
-		return previousNumPages;
-	}
-
-	Iptr shrinkMemory(MemoryInstance* memory,Uptr numPagesToShrink)
-	{
-		const Uptr previousNumPages = memory->numPages;
-		if(numPagesToShrink > 0)
-		{
-			// If the number of pages to shrink would cause the memory's size to drop below its minimum, return -1.
-			if(numPagesToShrink > memory->numPages
-			|| memory->numPages - numPagesToShrink < memory->type.size.min)
-			{ return -1; }
-			memory->numPages -= numPagesToShrink;
-
-			// Decommit the pages that were shrunk off the end of the memory.
-			Platform::decommitVirtualPages(
-				memory->baseAddress + (memory->numPages << IR::numBytesPerPageLog2),
-				numPagesToShrink << getPlatformPagesPerWebAssemblyPageLog2()
-				);
-		}
-		return previousNumPages;
-	}
-
-	U8* getMemoryBaseAddress(MemoryInstance* memory)
-	{
-		return memory->baseAddress;
-	}
-	
-	U8* getValidatedMemoryOffsetRange(MemoryInstance* memory,Uptr offset,Uptr numBytes)
-	{
-		// Validate that the range [offset..offset+numBytes) is contained by the memory's reserved pages.
-		U8* address = memory->baseAddress + offset;
-		if(	!memory
-		||	address < memory->reservedBaseAddress
-		||	address + numBytes < address
-		||	address + numBytes >= memory->reservedBaseAddress + (memory->reservedNumPlatformPages << Platform::getPageSizeLog2()))
-		{
-			causeException(Exception::Cause::accessViolation);
-		}
-		return address;
-	}
-
-}
diff --git a/libraries/wasm-jit/Source/Runtime/ModuleInstance.cpp b/libraries/wasm-jit/Source/Runtime/ModuleInstance.cpp
deleted file mode 100644
index 436439e4a99..00000000000
--- a/libraries/wasm-jit/Source/Runtime/ModuleInstance.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "Runtime.h"
-#include "RuntimePrivate.h"
-#include "IR/Module.h"
-
-#include <string.h>
-
-namespace Runtime
-{
-	std::vector<ModuleInstance*> moduleInstances;
-	
-	Value evaluateInitializer(ModuleInstance* moduleInstance,InitializerExpression expression)
-	{
-		switch(expression.type)
-		{
-		case InitializerExpression::Type::i32_const: return expression.i32;
-		case InitializerExpression::Type::i64_const: return expression.i64;
-		case InitializerExpression::Type::f32_const: return expression.f32;
-		case InitializerExpression::Type::f64_const: return expression.f64;
-		case InitializerExpression::Type::get_global:
-		{
-			// Find the import this refers to.
-			errorUnless(expression.globalIndex < moduleInstance->globals.size());
-			GlobalInstance* globalInstance = moduleInstance->globals[expression.globalIndex];
-			return Runtime::Value(globalInstance->type.valueType,globalInstance->value);
-		}
-		default: Errors::unreachable();
-		};
-	}
-
-	MemoryInstance* MemoryInstance::theMemoryInstance = nullptr;
-
-	ModuleInstance* instantiateModule(const IR::Module& module,ImportBindings&& imports)
-	{
-		ModuleInstance* moduleInstance = new ModuleInstance(
-			std::move(imports.functions),
-			std::move(imports.tables),
-			std::move(imports.memories),
-			std::move(imports.globals)
-			);
-		
-		// Get disassembly names for the module's objects.
-		DisassemblyNames disassemblyNames;
-		IR::getDisassemblyNames(module,disassemblyNames);
-
-		// Check the type of the ModuleInstance's imports.
-		errorUnless(moduleInstance->functions.size() == module.functions.imports.size());
-		for(Uptr importIndex = 0;importIndex < module.functions.imports.size();++importIndex)
-		{
-			errorUnless(isA(moduleInstance->functions[importIndex],module.types[module.functions.imports[importIndex].type.index]));
-		}
-		errorUnless(moduleInstance->tables.size() == module.tables.imports.size());
-		for(Uptr importIndex = 0;importIndex < module.tables.imports.size();++importIndex)
-		{
-			errorUnless(isA(moduleInstance->tables[importIndex],module.tables.imports[importIndex].type));
-		}
-		errorUnless(moduleInstance->memories.size() == module.memories.imports.size());
-		for(Uptr importIndex = 0;importIndex < module.memories.imports.size();++importIndex)
-		{
-			errorUnless(isA(moduleInstance->memories[importIndex],module.memories.imports[importIndex].type));
-		}
-		errorUnless(moduleInstance->globals.size() == module.globals.imports.size());
-		for(Uptr importIndex = 0;importIndex < module.globals.imports.size();++importIndex)
-		{
-			errorUnless(isA(moduleInstance->globals[importIndex],module.globals.imports[importIndex].type));
-		}
-
-		// Instantiate the module's memory and table definitions.
-		for(const TableDef& tableDef : module.tables.defs)
-		{
-			auto table = createTable(tableDef.type);
-			if(!table) { causeException(Exception::Cause::outOfMemory); }
-			moduleInstance->tables.push_back(table);
-		}
-		for(const MemoryDef& memoryDef : module.memories.defs)
-		{
-			if(!MemoryInstance::theMemoryInstance) {
-				MemoryInstance::theMemoryInstance = createMemory(memoryDef.type);
-				if(!MemoryInstance::theMemoryInstance) { causeException(Exception::Cause::outOfMemory); }
-			}
-			moduleInstance->memories.push_back(MemoryInstance::theMemoryInstance);
-		}
-
-		// Find the default memory and table for the module.
-		if(moduleInstance->memories.size() != 0)
-		{
-			WAVM_ASSERT_THROW(moduleInstance->memories.size() == 1);
-			moduleInstance->defaultMemory = moduleInstance->memories[0];
-		}
-		if(moduleInstance->tables.size() != 0)
-		{
-			WAVM_ASSERT_THROW(moduleInstance->tables.size() == 1);
-			moduleInstance->defaultTable = moduleInstance->tables[0];
-		}
-
-		// If any memory or table segment doesn't fit, throw an exception before mutating any memory/table.
-		for(auto& tableSegment : module.tableSegments)
-		{
-			TableInstance* table = moduleInstance->tables[tableSegment.tableIndex];
-			const Value baseOffsetValue = evaluateInitializer(moduleInstance,tableSegment.baseOffset);
-			errorUnless(baseOffsetValue.type == ValueType::i32);
-			const U32 baseOffset = baseOffsetValue.i32;
-			if(baseOffset > table->elements.size()
-			|| table->elements.size() - baseOffset < tableSegment.indices.size())
-			{ causeException(Exception::Cause::invalidSegmentOffset); }
-		}
-
-		//Previously, the module instantiation would write in to the memoryInstance here. Don't do that
-      //since the memoryInstance is shared across all moduleInstances and we could be compiling
-      //a new instance while another instance is running
-		
-		// Instantiate the module's global definitions.
-		for(const GlobalDef& globalDef : module.globals.defs)
-		{
-			const Value initialValue = evaluateInitializer(moduleInstance,globalDef.initializer);
-			errorUnless(initialValue.type == globalDef.type.valueType);
-			moduleInstance->globals.push_back(new GlobalInstance(globalDef.type,initialValue));
-		}
-		
-		// Create the FunctionInstance objects for the module's function definitions.
-		for(Uptr functionDefIndex = 0;functionDefIndex < module.functions.defs.size();++functionDefIndex)
-		{
-			const Uptr functionIndex = moduleInstance->functions.size();
-			const DisassemblyNames::Function& functionNames = disassemblyNames.functions[functionIndex];
-			std::string debugName = functionNames.name;
-			if(!debugName.size()) { debugName = "<function #" + std::to_string(functionDefIndex) + ">"; }
-			auto functionInstance = new FunctionInstance(moduleInstance,module.types[module.functions.defs[functionDefIndex].type.index],nullptr,debugName.c_str());
-			moduleInstance->functionDefs.push_back(functionInstance);
-			moduleInstance->functions.push_back(functionInstance);
-		}
-
-		// Generate machine code for the module.
-		LLVMJIT::instantiateModule(module,moduleInstance);
-
-		// Set up the instance's exports.
-		for(const Export& exportIt : module.exports)
-		{
-			ObjectInstance* exportedObject = nullptr;
-			switch(exportIt.kind)
-			{
-			case ObjectKind::function: exportedObject = moduleInstance->functions[exportIt.index]; break;
-			case ObjectKind::table: exportedObject = moduleInstance->tables[exportIt.index]; break;
-			case ObjectKind::memory: exportedObject = moduleInstance->memories[exportIt.index]; break;
-			case ObjectKind::global: exportedObject = moduleInstance->globals[exportIt.index]; break;
-			default: Errors::unreachable();
-			}
-			moduleInstance->exportMap[exportIt.name] = exportedObject;
-		}
-		
-		// Copy the module's table segments into the module's default table.
-		for(const TableSegment& tableSegment : module.tableSegments)
-		{
-			TableInstance* table = moduleInstance->tables[tableSegment.tableIndex];
-			
-			const Value baseOffsetValue = evaluateInitializer(moduleInstance,tableSegment.baseOffset);
-			errorUnless(baseOffsetValue.type == ValueType::i32);
-			const U32 baseOffset = baseOffsetValue.i32;
-			WAVM_ASSERT_THROW(baseOffset + tableSegment.indices.size() <= table->elements.size());
-
-			for(Uptr index = 0;index < tableSegment.indices.size();++index)
-			{
-				const Uptr functionIndex = tableSegment.indices[index];
-				WAVM_ASSERT_THROW(functionIndex < moduleInstance->functions.size());
-				setTableElement(table,baseOffset + index,moduleInstance->functions[functionIndex]);
-			}
-		}
-
-		// Call the module's start function.
-		if(module.startFunctionIndex != UINTPTR_MAX)
-		{
-			WAVM_ASSERT_THROW(moduleInstance->functions[module.startFunctionIndex]->type == IR::FunctionType::get());
-			moduleInstance->startFunctionIndex = module.startFunctionIndex;
-		}
-
-		moduleInstances.push_back(moduleInstance);
-		return moduleInstance;
-	}
-
-	ModuleInstance::~ModuleInstance()
-	{
-		delete jitModule;
-	}
-
-	MemoryInstance* getDefaultMemory(ModuleInstance* moduleInstance) { return moduleInstance->defaultMemory; }
-	uint64_t getDefaultMemorySize(ModuleInstance* moduleInstance) { return moduleInstance->defaultMemory->numPages << IR::numBytesPerPageLog2; }
-	TableInstance* getDefaultTable(ModuleInstance* moduleInstance) { return moduleInstance->defaultTable; }
-
-	void runInstanceStartFunc(ModuleInstance* moduleInstance) {
-		if(moduleInstance->startFunctionIndex != UINTPTR_MAX)
-			invokeFunction(moduleInstance->functions[moduleInstance->startFunctionIndex],{});
-	}
-
-	void resetGlobalInstances(ModuleInstance* moduleInstance) {
-		for(GlobalInstance*& gi : moduleInstance->globals)
-			memcpy(&gi->value, &gi->initialValue, sizeof(gi->value));
-	}
-	
-	ObjectInstance* getInstanceExport(ModuleInstance* moduleInstance,const std::string& name)
-	{
-		auto mapIt = moduleInstance->exportMap.find(name);
-		return mapIt == moduleInstance->exportMap.end() ? nullptr : mapIt->second;
-	}
-}
diff --git a/libraries/wasm-jit/Source/Runtime/ObjectGC.cpp b/libraries/wasm-jit/Source/Runtime/ObjectGC.cpp
index 7c099e61659..5c815fdd8a3 100644
--- a/libraries/wasm-jit/Source/Runtime/ObjectGC.cpp
+++ b/libraries/wasm-jit/Source/Runtime/ObjectGC.cpp
@@ -40,9 +40,6 @@ namespace Runtime
 		std::set<ObjectInstance*> referencedObjects;
 		std::vector<ObjectInstance*> pendingScanObjects;
 
-		// Gather GC roots from running WASM threads.
-		getThreadGCRoots(rootObjectReferences);
-
 		// Initialize the referencedObjects set from the rootObjectReferences and intrinsic objects.
 		for(auto object : rootObjectReferences)
 		{
diff --git a/libraries/wasm-jit/Source/Runtime/Runtime.cpp b/libraries/wasm-jit/Source/Runtime/Runtime.cpp
deleted file mode 100644
index 2de03ef7801..00000000000
--- a/libraries/wasm-jit/Source/Runtime/Runtime.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "Platform/Platform.h"
-#include "Logging/Logging.h"
-#include "Runtime.h"
-#include "RuntimePrivate.h"
-
-#include <iostream>
-
-namespace Runtime
-{
-	void init()
-	{
-		LLVMJIT::init();
-		initWAVMIntrinsics();
-	}
-	
-	// Returns a vector of strings, each element describing a frame of the call stack.
-	// If the frame is a JITed function, use the JIT's information about the function
-	// to describe it, otherwise fallback to whatever platform-specific symbol resolution
-	// is available.
-	std::vector<std::string> describeCallStack(const Platform::CallStack& callStack)
-	{
-		std::vector<std::string> frameDescriptions;
-		for(auto frame : callStack.stackFrames)
-		{
-			std::string frameDescription;
-			if(	LLVMJIT::describeInstructionPointer(frame.ip,frameDescription)
-			||	Platform::describeInstructionPointer(frame.ip,frameDescription))
-			{
-				frameDescriptions.push_back(frameDescription);
-			}
-			else { frameDescriptions.push_back("<unknown function>"); }
-		}
-		return frameDescriptions;
-	}
-
-	[[noreturn]] void causeException(Exception::Cause cause)
-	{
-		auto callStack = Platform::captureCallStack();
-		throw Exception {cause,describeCallStack(callStack)};
-	}
-
-	[[noreturn]] void handleHardwareTrap(Platform::HardwareTrapType trapType,Platform::CallStack&& trapCallStack,Uptr trapOperand)
-	{
-      std::cerr << "handle hardware trap\n";
-		std::vector<std::string> callStackDescription = describeCallStack(trapCallStack);
-
-		switch(trapType)
-		{
-		case Platform::HardwareTrapType::accessViolation:
-		{
-			// If the access violation occured in a Table's reserved pages, treat it as an undefined table element runtime error.
-			if(isAddressOwnedByTable(reinterpret_cast<U8*>(trapOperand))) { throw Exception { Exception::Cause::undefinedTableElement, callStackDescription }; }
-			// If the access violation occured in a Memory's reserved pages, treat it as an access violation runtime error.
-			else if(isAddressOwnedByMemory(reinterpret_cast<U8*>(trapOperand))) { throw Exception { Exception::Cause::accessViolation, callStackDescription }; }
-			else
-			{
-				// If the access violation occured outside of a Table or Memory, treat it as a bug (possibly a security hole)
-				// rather than a runtime error in the WebAssembly code.
-				Log::printf(Log::Category::error,"Access violation outside of table or memory reserved addresses. Call stack:\n");
-				for(auto calledFunction : callStackDescription) { Log::printf(Log::Category::error,"  %s\n",calledFunction.c_str()); }
-				Errors::fatalf("unsandboxed access violation");
-			}
-		}
-		case Platform::HardwareTrapType::stackOverflow: throw Exception { Exception::Cause::stackOverflow, callStackDescription };
-		case Platform::HardwareTrapType::intDivideByZeroOrOverflow: throw Exception { Exception::Cause::integerDivideByZeroOrIntegerOverflow, callStackDescription };
-		default: Errors::unreachable();
-		};
-	}
-
-
-	Result invokeFunction(FunctionInstance* function,const std::vector<Value>& parameters)
-	{
-		const FunctionType* functionType = function->type;
-		
-		// Check that the parameter types match the function, and copy them into a memory block that stores each as a 64-bit value.
-		if(parameters.size() != functionType->parameters.size())
-		{ 
-       throw Exception {Exception::Cause::invokeSignatureMismatch}; 
-    }
-
-		U64* thunkMemory = (U64*)alloca((functionType->parameters.size() + getArity(functionType->ret)) * sizeof(U64));
-		for(Uptr parameterIndex = 0;parameterIndex < functionType->parameters.size();++parameterIndex)
-		{
-			if(functionType->parameters[parameterIndex] != parameters[parameterIndex].type)
-			{
-				throw Exception {Exception::Cause::invokeSignatureMismatch};
-			}
-
-			thunkMemory[parameterIndex] = parameters[parameterIndex].i64;
-		}
-		
-		// Get the invoke thunk for this function type.
-		LLVMJIT::InvokeFunctionPointer invokeFunctionPointer = LLVMJIT::getInvokeThunk(functionType);
-
-		// Catch platform-specific runtime exceptions and turn them into Runtime::Values.
-		Result result;
-		Platform::HardwareTrapType trapType;
-		Platform::CallStack trapCallStack;
-		Uptr trapOperand;
-		trapType = Platform::catchHardwareTraps(trapCallStack,trapOperand,
-			[&]
-			{
-				// Call the invoke thunk.
-				(*invokeFunctionPointer)(function->nativeFunction,thunkMemory);
-
-				// Read the return value out of the thunk memory block.
-				if(functionType->ret != ResultType::none)
-				{
-					result.type = functionType->ret;
-					result.i64 = thunkMemory[functionType->parameters.size()];
-				}
-			});
-
-		// If there was no hardware trap, just return the result.
-		if(trapType == Platform::HardwareTrapType::none) { return result; }
-		else { handleHardwareTrap(trapType,std::move(trapCallStack),trapOperand); }
-	}
-
-	const FunctionType* getFunctionType(FunctionInstance* function)
-	{
-		return function->type;
-	}
-
-	GlobalInstance* createGlobal(GlobalType type,Value initialValue)
-	{
-		return new GlobalInstance(type,initialValue);
-	}
-
-	Value getGlobalValue(GlobalInstance* global)
-	{
-		return Value(global->type.valueType,global->value);
-	}
-
-	Value setGlobalValue(GlobalInstance* global,Value newValue)
-	{
-		WAVM_ASSERT_THROW(newValue.type == global->type.valueType);
-		WAVM_ASSERT_THROW(global->type.isMutable);
-		const Value previousValue = Value(global->type.valueType,global->value);
-		global->value = newValue;
-		return previousValue;
-	}
-}
diff --git a/libraries/wasm-jit/Source/Runtime/Table.cpp b/libraries/wasm-jit/Source/Runtime/Table.cpp
deleted file mode 100644
index f871d48e505..00000000000
--- a/libraries/wasm-jit/Source/Runtime/Table.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "Runtime.h"
-#include "Platform/Platform.h"
-#include "RuntimePrivate.h"
-#include <eosio/chain/wasm_eosio_constraints.hpp>
-
-namespace Runtime
-{
-	// Global lists of tables; used to query whether an address is reserved by one of them.
-	std::vector<TableInstance*> tables;
-
-	static Uptr getNumPlatformPages(Uptr numBytes)
-	{
-		return (numBytes + (Uptr(1)<<Platform::getPageSizeLog2()) - 1) >> Platform::getPageSizeLog2();
-	}
-
-	TableInstance* createTable(TableType type)
-	{
-		TableInstance* table = new TableInstance(type);
-
-		const Uptr tableMaxBytes = sizeof(TableInstance::FunctionElement)*eosio::chain::wasm_constraints::maximum_table_elements;
-		
-		const Uptr alignmentBytes = 1U << Platform::getPageSizeLog2();
-		table->baseAddress = (TableInstance::FunctionElement*)allocateVirtualPagesAligned(tableMaxBytes,alignmentBytes,table->reservedBaseAddress,table->reservedNumPlatformPages);
-		table->endOffset = tableMaxBytes;
-		if(!table->baseAddress) { delete table; return nullptr; }
-		
-		// Grow the table to the type's minimum size.
-		WAVM_ASSERT_THROW(type.size.min <= UINTPTR_MAX);
-		if(growTable(table,Uptr(type.size.min)) == -1) { delete table; return nullptr; }
-		
-		// Add the table to the global array.
-		tables.push_back(table);
-		return table;
-	}
-	
-	TableInstance::~TableInstance()
-	{
-		// Decommit all pages.
-		if(elements.size() > 0) { Platform::decommitVirtualPages((U8*)baseAddress,getNumPlatformPages(elements.size() * sizeof(TableInstance::FunctionElement))); }
-
-		// Free the virtual address space.
-		if(reservedNumPlatformPages > 0) { Platform::freeVirtualPages((U8*)reservedBaseAddress,reservedNumPlatformPages); }
-		reservedBaseAddress = nullptr;
-		reservedNumPlatformPages = 0;
-		baseAddress = nullptr;
-		
-		// Remove the table from the global array.
-		for(Uptr tableIndex = 0;tableIndex < tables.size();++tableIndex)
-		{
-			if(tables[tableIndex] == this) { tables.erase(tables.begin() + tableIndex); break; }
-		}
-	}
-
-	bool isAddressOwnedByTable(U8* address)
-	{
-		// Iterate over all tables and check if the address is within the reserved address space for each.
-		for(auto table : tables)
-		{
-			U8* startAddress = (U8*)table->reservedBaseAddress;
-			U8* endAddress = ((U8*)table->reservedBaseAddress) + (table->reservedNumPlatformPages << Platform::getPageSizeLog2());
-			if(address >= startAddress && address < endAddress) { return true; }
-		}
-		return false;
-	}
-
-	ObjectInstance* setTableElement(TableInstance* table,Uptr index,ObjectInstance* newValue)
-	{
-		// Write the new table element to both the table's elements array and its indirect function call data.
-		WAVM_ASSERT_THROW(index < table->elements.size());
-		FunctionInstance* functionInstance = asFunction(newValue);
-		WAVM_ASSERT_THROW(functionInstance->nativeFunction);
-		table->baseAddress[index].type = functionInstance->type;
-		table->baseAddress[index].value = functionInstance->nativeFunction;
-		auto oldValue = table->elements[index];
-		table->elements[index] = newValue;
-		return oldValue;
-	}
-
-	Uptr getTableNumElements(TableInstance* table)
-	{
-		return table->elements.size();
-	}
-
-	Iptr growTable(TableInstance* table,Uptr numNewElements)
-	{
-		const Uptr previousNumElements = table->elements.size();
-		if(numNewElements > 0)
-		{
-			// If the number of elements to grow would cause the table's size to exceed its maximum, return -1.
-			if(numNewElements > table->type.size.max || table->elements.size() > table->type.size.max - numNewElements) { return -1; }
-			
-			// Try to commit pages for the new elements, and return -1 if the commit fails.
-			const Uptr previousNumPlatformPages = getNumPlatformPages(table->elements.size() * sizeof(TableInstance::FunctionElement));
-			const Uptr newNumPlatformPages = getNumPlatformPages((table->elements.size()+numNewElements) * sizeof(TableInstance::FunctionElement));
-			if(newNumPlatformPages != previousNumPlatformPages
-			&& !Platform::commitVirtualPages(
-				(U8*)table->baseAddress + (previousNumPlatformPages << Platform::getPageSizeLog2()),
-				newNumPlatformPages - previousNumPlatformPages
-				))
-			{
-				return -1;
-			}
-
-			// Also grow the table's elements array.
-			table->elements.insert(table->elements.end(),numNewElements,nullptr);
-		}
-		return previousNumElements;
-	}
-
-	Iptr shrinkTable(TableInstance* table,Uptr numElementsToShrink)
-	{
-		const Uptr previousNumElements = table->elements.size();
-		if(numElementsToShrink > 0)
-		{
-			// If the number of elements to shrink would cause the tables's size to drop below its minimum, return -1.
-			if(numElementsToShrink > table->elements.size()
-			|| table->elements.size() - numElementsToShrink < table->type.size.min) { return -1; }
-
-			// Shrink the table's elements array.
-			table->elements.resize(table->elements.size() - numElementsToShrink);
-			
-			// Decommit the pages that were shrunk off the end of the table's indirect function call data.
-			const Uptr previousNumPlatformPages = getNumPlatformPages(previousNumElements * sizeof(TableInstance::FunctionElement));
-			const Uptr newNumPlatformPages = getNumPlatformPages(table->elements.size() * sizeof(TableInstance::FunctionElement));
-			if(newNumPlatformPages != previousNumPlatformPages)
-			{
-				Platform::decommitVirtualPages(
-					(U8*)table->baseAddress + (newNumPlatformPages << Platform::getPageSizeLog2()),
-					(previousNumPlatformPages - newNumPlatformPages) << Platform::getPageSizeLog2()
-					);
-			}
-		}
-		return previousNumElements;
-	}
-}
diff --git a/libraries/wasm-jit/Source/Runtime/Threads.cpp b/libraries/wasm-jit/Source/Runtime/Threads.cpp
deleted file mode 100644
index 551f92a4ac6..00000000000
--- a/libraries/wasm-jit/Source/Runtime/Threads.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-#include "Inline/BasicTypes.h"
-#include "Logging/Logging.h"
-#include "Intrinsics.h"
-#include "RuntimePrivate.h"
-
-#include <thread>
-#include <vector>
-#include <atomic>
-#include <cmath>
-#include <algorithm>
-
-#if ENABLE_THREADING_PROTOTYPE
-// Keeps track of the entry and error functions used by a running WebAssembly-spawned thread.
-// Used to find garbage collection roots.
-struct Thread
-{
-	Runtime::FunctionInstance* entryFunction;
-	Runtime::FunctionInstance* errorFunction;
-};
-
-// Holds a list of threads (in the form of events that will wake them) that
-// are waiting on a specific address.
-struct WaitList
-{
-	Platform::Mutex* mutex;
-	std::vector<Platform::Event*> wakeEvents;
-	std::atomic<Uptr> numReferences;
-
-	WaitList(): mutex(Platform::createMutex()), numReferences(1) {}
-	~WaitList() { destroyMutex(mutex); }
-};
-
-// An event that is reused within a thread when it waits on a WaitList.
-THREAD_LOCAL Platform::Event* threadWakeEvent = nullptr;
-
-// A map from address to a list of threads waiting on that address.
-static Platform::Mutex* addressToWaitListMapMutex = Platform::createMutex();
-static std::map<Uptr,WaitList*> addressToWaitListMap;
-
-// A global list of running threads created by WebAssembly code.
-static Platform::Mutex* threadsMutex = Platform::createMutex();
-static std::vector<Thread*> threads;
-
-// Opens the wait list for a given address.
-// Increases the wait list's reference count, and returns a pointer to it.
-// Note that it does not lock the wait list mutex.
-// A call to openWaitList should be followed by a call to closeWaitList to avoid leaks.
-static WaitList* openWaitList(Uptr address)
-{
-	Platform::Lock mapLock(addressToWaitListMapMutex);
-	auto mapIt = addressToWaitListMap.find(address);
-	if(mapIt != addressToWaitListMap.end())
-	{
-		++mapIt->second->numReferences;
-		return mapIt->second;
-	}
-	else
-	{
-		WaitList* waitList = new WaitList();
-		addressToWaitListMap.emplace(address,waitList);
-		return waitList;
-	}
-}
-
-// Closes a wait list, deleting it and removing it from the global map if it was the last reference.
-static void closeWaitList(Uptr address,WaitList* waitList)
-{
-	if(--waitList->numReferences == 0)
-	{
-		Platform::Lock mapLock(addressToWaitListMapMutex);
-		if(!waitList->numReferences)
-		{
-			WAVM_ASSERT_THROW(!waitList->wakeEvents.size());
-			delete waitList;
-			addressToWaitListMap.erase(address);
-		}
-	}
-}
-
-// Loads a value from memory with seq_cst memory order.
-// The caller must ensure that the pointer is naturally aligned.
-template<typename Value>
-static Value atomicLoad(const Value* valuePointer)
-{
-	static_assert(sizeof(std::atomic<Value>) == sizeof(Value),"relying on non-standard behavior");
-	std::atomic<Value>* valuePointerAtomic = (std::atomic<Value>*)valuePointer;
-	return valuePointerAtomic->load();
-}
-
-// Stores a value to memory with seq_cst memory order.
-// The caller must ensure that the pointer is naturally aligned.
-template<typename Value>
-static void atomicStore(Value* valuePointer,Value newValue)
-{
-	static_assert(sizeof(std::atomic<Value>) == sizeof(Value),"relying on non-standard behavior");
-	std::atomic<Value>* valuePointerAtomic = (std::atomic<Value>*)valuePointer;
-	valuePointerAtomic->store(newValue);
-}
-
-// Decodes a floating-point timeout value relative to startTime.
-U64 getEndTimeFromTimeout(U64 startTime,F64 timeout)
-{
-	const F64 timeoutMicroseconds = timeout * 1000.0;
-	U64 endTime = UINT64_MAX;
-	if(!std::isnan(timeoutMicroseconds) && std::isfinite(timeoutMicroseconds))
-	{
-		if(timeoutMicroseconds <= 0.0)
-		{
-			endTime = startTime;
-		}
-		else if(timeoutMicroseconds <= F64(UINT64_MAX - 1))
-		{
-			endTime = startTime + U64(timeoutMicroseconds);
-			errorUnless(endTime >= startTime);
-		}
-	}
-	return endTime;
-}
-
-template<typename Value>
-static U32 waitOnAddress(Value* valuePointer,Value expectedValue,F64 timeout)
-{
-	const U64 endTime = getEndTimeFromTimeout(Platform::getMonotonicClock(),timeout);
-
-	// Open the wait list for this address.
-	const Uptr address = reinterpret_cast<Uptr>(valuePointer);
-	WaitList* waitList = openWaitList(address);
-
-	// Lock the wait list, and check that *valuePointer is still what the caller expected it to be.
-	lockMutex(waitList->mutex);
-	if(atomicLoad(valuePointer) != expectedValue)
-	{
-		// If *valuePointer wasn't the expected value, unlock the wait list and return.
-		unlockMutex(waitList->mutex);
-		closeWaitList(address,waitList);
-		return 1;
-	}
-	else
-	{
-		// If the thread hasn't yet created a wake event, do so.
-		if(!threadWakeEvent) { threadWakeEvent = Platform::createEvent(); }
-
-		// Add the wake event to the wait list, and unlock the wait list.
-		waitList->wakeEvents.push_back(threadWakeEvent);
-		unlockMutex(waitList->mutex);
-	}
-
-	// Wait for the thread's wake event to be signaled.
-	bool timedOut = false;
-	if(!Platform::waitForEvent(threadWakeEvent,endTime))
-	{
-		// If the wait timed out, lock the wait list and check if the thread's wake event is still in the wait list.
-		Platform::Lock waitListLock(waitList->mutex);
-		auto wakeEventIt = std::find(waitList->wakeEvents.begin(),waitList->wakeEvents.end(),threadWakeEvent);
-		if(wakeEventIt != waitList->wakeEvents.end())
-		{
-			// If the event was still on the wait list, remove it, and return the "timed out" result.
-			waitList->wakeEvents.erase(wakeEventIt);
-			timedOut = true;
-		}
-		else
-		{
-			// In between the wait timing out and locking the wait list, some other thread tried to wake this thread.
-			// The event will now be signaled, so use an immediately expiring wait on it to reset it.
-			errorUnless(Platform::waitForEvent(threadWakeEvent,Platform::getMonotonicClock()));
-		}
-	}
-
-	closeWaitList(address,waitList);
-	return timedOut ? 2 : 0;
-}
-
-static U32 wakeAddress(Uptr address,U32 numToWake)
-{
-	if(numToWake == 0) { return 0; }
-
-	// Open the wait list for this address.
-	WaitList* waitList = openWaitList(address);
-	{
-		Platform::Lock waitListLock(waitList->mutex);
-
-		// Determine how many threads to wake.
-		// numToWake==UINT32_MAX means wake all waiting threads.
-		Uptr actualNumToWake = numToWake;
-		if(numToWake == UINT32_MAX || numToWake > waitList->wakeEvents.size())
-		{
-			actualNumToWake = waitList->wakeEvents.size();
-		}
-
-		// Signal the events corresponding to the oldest waiting threads.
-		for(Uptr wakeIndex = 0;wakeIndex < actualNumToWake;++wakeIndex)
-		{
-			signalEvent(waitList->wakeEvents[wakeIndex]);
-		}
-
-		// Remove the events from the wait list.
-		waitList->wakeEvents.erase(waitList->wakeEvents.begin(),waitList->wakeEvents.begin() + actualNumToWake);
-	}
-	closeWaitList(address,waitList);
-
-	return numToWake;
-}
-
-namespace Runtime
-{
-	DEFINE_INTRINSIC_FUNCTION1(wavmIntrinsics,misalignedAtomicTrap,misalignedAtomicTrap,none,i32,address)
-	{
-		causeException(Exception::Cause::misalignedAtomicMemoryAccess);
-	}
-
-	DEFINE_INTRINSIC_FUNCTION1(wavmIntrinsics,isLockFree,isLockFree,i32,i32,numBytes)
-	{
-		// Assume we're running on X86.
-		switch(numBytes)
-		{
-		case 1: case 2: case 4: case 8: return true;
-		default: return false;
-		};
-	}
-
-	DEFINE_INTRINSIC_FUNCTION3(wavmIntrinsics,wake,wake,i32,i32,addressOffset,i32,numToWake,i64,memoryInstanceBits)
-	{
-		MemoryInstance* memoryInstance = reinterpret_cast<MemoryInstance*>(memoryInstanceBits);
-
-		// Validate that the address is within the memory's bounds and 4-byte aligned.
-		if(U32(addressOffset) > memoryInstance->endOffset) { causeException(Exception::Cause::accessViolation); }
-		if(addressOffset & 3) { causeException(Exception::Cause::misalignedAtomicMemoryAccess); }
-
-		const Uptr address = reinterpret_cast<Uptr>(getMemoryBaseAddress(memoryInstance)) + addressOffset;
-		return wakeAddress(address,numToWake);
-	}
-
-	DEFINE_INTRINSIC_FUNCTION4(wavmIntrinsics,wait,wait,i32,i32,addressOffset,i32,expectedValue,f64,timeout,i64,memoryInstanceBits)
-	{
-		MemoryInstance* memoryInstance = reinterpret_cast<MemoryInstance*>(memoryInstanceBits);
-
-		// Validate that the address is within the memory's bounds and naturally aligned.
-		if(U32(addressOffset) > memoryInstance->endOffset) { causeException(Exception::Cause::accessViolation); }
-		if(addressOffset & 3) { causeException(Exception::Cause::misalignedAtomicMemoryAccess); }
-
-		I32* valuePointer = reinterpret_cast<I32*>(getMemoryBaseAddress(memoryInstance) + addressOffset);
-		return waitOnAddress(valuePointer,expectedValue,timeout);
-	}
-	DEFINE_INTRINSIC_FUNCTION4(wavmIntrinsics,wait,wait,i32,i32,addressOffset,i64,expectedValue,f64,timeout,i64,memoryInstanceBits)
-	{
-		MemoryInstance* memoryInstance = reinterpret_cast<MemoryInstance*>(memoryInstanceBits);
-
-		// Validate that the address is within the memory's bounds and naturally aligned.
-		if(U32(addressOffset) > memoryInstance->endOffset) { causeException(Exception::Cause::accessViolation); }
-		if(addressOffset & 7) { causeException(Exception::Cause::misalignedAtomicMemoryAccess); }
-
-		I64* valuePointer = reinterpret_cast<I64*>(getMemoryBaseAddress(memoryInstance) + addressOffset);
-		return waitOnAddress(valuePointer,expectedValue,timeout);
-	}
-
-	FunctionInstance* getFunctionFromTable(TableInstance* table,const FunctionType* expectedType,U32 elementIndex)
-	{
-		// Validate that the index is valid.
-		if(elementIndex * sizeof(TableInstance::FunctionElement) >= table->endOffset)
-		{
-			causeException(Runtime::Exception::Cause::undefinedTableElement);
-		}
-		// Validate  that the indexed function's type matches the expected type.
-		const FunctionType* actualSignature = table->baseAddress[elementIndex].type;
-		if(actualSignature != expectedType)
-		{
-			causeException(Runtime::Exception::Cause::indirectCallSignatureMismatch);
-		}
-		return asFunction(table->elements[elementIndex]);
-	}
-
-	void callAndTurnHardwareTrapsIntoRuntimeExceptions(void (*function)(I32),I32 argument)
-	{
-		Platform::CallStack trapCallStack;
-		Uptr trapOperand;
-		const Platform::HardwareTrapType trapType = Platform::catchHardwareTraps(
-			trapCallStack,trapOperand,
-			[function,argument]{(*function)(argument);}
-			);
-		if(trapType != Platform::HardwareTrapType::none)
-		{
-			handleHardwareTrap(trapType,std::move(trapCallStack),trapOperand);
-		}
-	}
-	
-	static void threadFunc(Thread* thread,I32 argument)
-	{
-		try
-		{
-			// Call the thread entry function.
-			callAndTurnHardwareTrapsIntoRuntimeExceptions((void(*)(I32))thread->entryFunction->nativeFunction,argument);
-		}
-		catch(Runtime::Exception exception)
-		{
-			// Log that a runtime exception was handled by a thread error function.
-			Log::printf(Log::Category::error,"Runtime exception in thread: %s\n",describeExceptionCause(exception.cause));
-			for(auto calledFunction : exception.callStack) { Log::printf(Log::Category::error,"  %s\n",calledFunction.c_str()); }
-			Log::printf(Log::Category::error,"Passing exception on to thread error handler\n");
-
-			try
-			{
-				// Call the thread error function.
-				callAndTurnHardwareTrapsIntoRuntimeExceptions((void(*)(I32))thread->errorFunction->nativeFunction,argument);
-			}
-			catch(Runtime::Exception secondException)
-			{
-				// Log that the thread error function caused a runtime exception, and exit with a fatal error.
-				Log::printf(Log::Category::error,"Runtime exception in thread error handler: %s\n",describeExceptionCause(secondException.cause));
-				for(auto calledFunction : secondException.callStack) { Log::printf(Log::Category::error,"  %s\n",calledFunction.c_str()); }
-				Errors::fatalf("double fault");
-			}
-		}
-
-		// Destroy the thread wake event before exiting the thread.
-		if(threadWakeEvent)
-		{
-			Platform::destroyEvent(threadWakeEvent);
-		}
-		
-		// Remove the thread from the global list.
-		{
-			Platform::Lock threadsLock(threadsMutex);
-			auto threadIt = std::find(threads.begin(),threads.end(),thread);
-			threads.erase(threadIt);
-		}
-
-		// Delete the thread object.
-		delete thread;
-	}
-	
-	DEFINE_INTRINSIC_FUNCTION4(wavmIntrinsics,launchThread,launchThread,none,
-		i32,entryFunctionIndex,
-		i32,argument,
-		i32,errorFunctionIndex,
-		i64,functionTablePointer)
-	{
-		TableInstance* defaultTable = reinterpret_cast<TableInstance*>(functionTablePointer);
-		const FunctionType* functionType = FunctionType::get(ResultType::none,{ValueType::i32});
-
-		// Create a thread object that will expose its entry and error functions to the garbage collector as roots.
-		Thread* thread = new Thread();
-		thread->entryFunction = getFunctionFromTable(defaultTable,functionType,entryFunctionIndex);
-		thread->errorFunction = getFunctionFromTable(defaultTable,functionType,errorFunctionIndex);
-		{
-			Platform::Lock threadsLock(threadsMutex);
-			threads.push_back(thread);
-		}
-
-		// Use a std::thread to spawn the thread.
-		std::thread stdThread([thread,argument]()
-		{
-			threadFunc(thread,argument);
-		});
-
-		// Detach the std::thread from the underlying thread.
-		stdThread.detach();
-	}
-
-	void getThreadGCRoots(std::vector<ObjectInstance*>& outGCRoots)
-	{
-		Platform::Lock threadsLock(threadsMutex);
-		for(auto thread : threads)
-		{
-			outGCRoots.push_back(thread->entryFunction);
-			outGCRoots.push_back(thread->errorFunction);
-		}
-	}
-}
-#else
-namespace Runtime
-{
-	void getThreadGCRoots(std::vector<ObjectInstance*>& outGCRoots) {}
-}
-#endif
\ No newline at end of file
diff --git a/libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp b/libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp
deleted file mode 100644
index 723ea39a029..00000000000
--- a/libraries/wasm-jit/Source/Runtime/llvmWARshim.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "Runtime/llvmWARshim.h"
-
-namespace LLVMJIT {
-
-llvm::Value* CreateInBoundsGEPWAR(llvm::IRBuilder<>& irBuilder, llvm::Value* Ptr, llvm::Value* v1, llvm::Value* v2) {
-   if(!v2)
-      return irBuilder.CreateInBoundsGEP(Ptr, v1);
-   else
-      return irBuilder.CreateInBoundsGEP(Ptr, {v1, v2});
-}
-
-}
\ No newline at end of file
diff --git a/libraries/wasm-jit/Source/Runtime/llvmWARshim.llvmwar b/libraries/wasm-jit/Source/Runtime/llvmWARshim.llvmwar
deleted file mode 120000
index 1e2596579da..00000000000
--- a/libraries/wasm-jit/Source/Runtime/llvmWARshim.llvmwar
+++ /dev/null
@@ -1 +0,0 @@
-llvmWARshim.cpp
\ No newline at end of file
diff --git a/scripts/eosio_build_darwin.sh b/scripts/eosio_build_darwin.sh
index d06afd8bb42..d6c8d11389e 100755
--- a/scripts/eosio_build_darwin.sh
+++ b/scripts/eosio_build_darwin.sh
@@ -36,8 +36,6 @@ ensure-brew-packages "${REPO_ROOT}/scripts/eosio_build_darwin_deps"
 [[ -z "${CMAKE}" ]] && export CMAKE="/usr/local/bin/cmake"
 # CLANG Installation
 build-clang
-# LLVM Installation
-ensure-llvm
 # BOOST Installation
 ensure-boost
 # MONGO Installation
diff --git a/scripts/eosio_build_darwin_deps b/scripts/eosio_build_darwin_deps
index 02caeed9142..d9a3bdb9e26 100755
--- a/scripts/eosio_build_darwin_deps
+++ b/scripts/eosio_build_darwin_deps
@@ -4,7 +4,6 @@ libtool,/usr/local/bin/glibtool
 automake,/usr/local/bin/automake
 wget,/usr/local/bin/wget
 gmp,/usr/local/opt/gmp/include/gmpxx.h
-llvm@7,/usr/local/opt/llvm@7
 pkgconfig,/usr/local/bin/pkg-config
 python,/usr/local/opt/python3
 python@2,/usr/local/opt/python2
diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh
index d240c8c64b4..5e92d19513f 100755
--- a/scripts/helpers/eosio.sh
+++ b/scripts/helpers/eosio.sh
@@ -286,8 +286,6 @@ function ensure-llvm() {
         && ${CMAKE} -DCMAKE_INSTALL_PREFIX='${LLVM_ROOT}' -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=false -DLLVM_ENABLE_RTTI=1 -DCMAKE_BUILD_TYPE=Release $LLVM_PINNED_CMAKE_ARGS .. \
         && make -j${JOBS} install"
         echo " - LLVM successfully installed @ ${LLVM_ROOT}"
-    elif [[ $ARCH == "Darwin" ]]; then
-        execute ln -snf /usr/local/opt/llvm@7 $LLVM_ROOT
     elif [[ $NAME == "Ubuntu" ]]; then
         execute ln -snf /usr/lib/llvm-7 $LLVM_ROOT
     elif [[ $NAME == "Amazon Linux" ]]; then

From 05f43e9cda13270d2e1696a3721ef14f0253443b Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Mon, 21 Oct 2019 16:52:50 -0400
Subject: [PATCH 1630/1648] remove lingering wavm runtime file that escaped the
 first purge

---
 libraries/chain/webassembly/wavm.cpp | 175 ---------------------------
 1 file changed, 175 deletions(-)
 delete mode 100644 libraries/chain/webassembly/wavm.cpp

diff --git a/libraries/chain/webassembly/wavm.cpp b/libraries/chain/webassembly/wavm.cpp
deleted file mode 100644
index a190445cb91..00000000000
--- a/libraries/chain/webassembly/wavm.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-#include <eosio/chain/webassembly/wavm.hpp>
-#include <eosio/chain/wasm_eosio_constraints.hpp>
-#include <eosio/chain/wasm_eosio_injection.hpp>
-#include <eosio/chain/apply_context.hpp>
-#include <eosio/chain/exceptions.hpp>
-
-#include "IR/Module.h"
-#include "Platform/Platform.h"
-#include "WAST/WAST.h"
-#include "IR/Operators.h"
-#include "IR/Validate.h"
-#include "Runtime/Linker.h"
-#include "Runtime/Intrinsics.h"
-
-#include <vector>
-#include <iterator>
-
-using namespace IR;
-using namespace Runtime;
-
-namespace eosio { namespace chain { namespace webassembly { namespace wavm {
-
-running_instance_context the_running_instance_context;
-
-namespace detail {
-struct wavm_runtime_initializer {
-   wavm_runtime_initializer() {
-      Runtime::init();
-   }
-};
-
-using live_module_ref = std::list<ObjectInstance*>::iterator;
-
-struct wavm_live_modules {
-   live_module_ref add_live_module(ModuleInstance* module_instance) {
-      return live_modules.insert(live_modules.begin(), asObject(module_instance));
-   }
-
-   void remove_live_module(live_module_ref it) {
-      live_modules.erase(it);
-      run_wavm_garbage_collection();
-   }
-
-   void run_wavm_garbage_collection() {
-      //need to pass in a mutable list of root objects we want the garbage collector to retain
-      std::vector<ObjectInstance*> root;
-      std::copy(live_modules.begin(), live_modules.end(), std::back_inserter(root));
-      Runtime::freeUnreferencedObjects(std::move(root));
-   }
-
-   std::list<ObjectInstance*> live_modules;
-};
-
-static wavm_live_modules the_wavm_live_modules;
-
-}
-
-class wavm_instantiated_module : public wasm_instantiated_module_interface {
-   public:
-      wavm_instantiated_module(ModuleInstance* instance, std::unique_ptr<Module> module, std::vector<uint8_t> initial_mem) :
-         _initial_memory(initial_mem),
-         _instance(instance),
-         _module_ref(detail::the_wavm_live_modules.add_live_module(instance))
-      {
-         //The memory instance is reused across all wavm_instantiated_modules, but for wasm instances
-         // that didn't declare "memory", getDefaultMemory() won't see it. It would also be possible
-         // to say something like if(module->memories.size()) here I believe
-         if(getDefaultMemory(_instance))
-            _initial_memory_config = module->memories.defs.at(0).type;
-      }
-
-      ~wavm_instantiated_module() {
-         detail::the_wavm_live_modules.remove_live_module(_module_ref);
-      }
-
-      void apply(apply_context& context) override {
-         vector<Value> args = {Value(context.get_receiver().to_uint64_t()),
-	                            Value(context.get_action().account.to_uint64_t()),
-                               Value(context.get_action().name.to_uint64_t())};
-
-         call("apply", args, context);
-      }
-
-   private:
-      void call(const string &entry_point, const vector <Value> &args, apply_context &context) {
-         try {
-            FunctionInstance* call = asFunctionNullable(getInstanceExport(_instance,entry_point));
-            if( !call )
-               return;
-
-            EOS_ASSERT( getFunctionType(call)->parameters.size() == args.size(), wasm_exception, "" );
-
-            //The memory instance is reused across all wavm_instantiated_modules, but for wasm instances
-            // that didn't declare "memory", getDefaultMemory() won't see it
-            MemoryInstance* default_mem = getDefaultMemory(_instance);
-            if(default_mem) {
-               //reset memory resizes the sandbox'ed memory to the module's init memory size and then
-               // (effectively) memzeros it all
-               resetMemory(default_mem, _initial_memory_config);
-
-               char* memstart = &memoryRef<char>(getDefaultMemory(_instance), 0);
-               memcpy(memstart, _initial_memory.data(), _initial_memory.size());
-            }
-
-            the_running_instance_context.memory = default_mem;
-            the_running_instance_context.apply_ctx = &context;
-
-            resetGlobalInstances(_instance);
-            runInstanceStartFunc(_instance);
-            Runtime::invokeFunction(call,args);
-         } catch( const wasm_exit& e ) {
-         } catch( const Runtime::Exception& e ) {
-             FC_THROW_EXCEPTION(wasm_execution_error,
-                         "cause: ${cause}\n${callstack}",
-                         ("cause", string(describeExceptionCause(e.cause)))
-                         ("callstack", e.callStack));
-         } FC_CAPTURE_AND_RETHROW()
-      }
-
-
-      std::vector<uint8_t>     _initial_memory;
-      //naked pointer because ModuleInstance is opaque
-      //_instance is deleted via WAVM's object garbage collection when wavm_rutime is deleted
-      ModuleInstance*          _instance;
-      detail::live_module_ref  _module_ref;
-      MemoryType               _initial_memory_config;
-};
-
-wavm_runtime::wavm_runtime() {
-   static detail::wavm_runtime_initializer the_wavm_runtime_initializer;
-}
-
-wavm_runtime::~wavm_runtime() {
-}
-
-bool wavm_runtime::inject_module(IR::Module& module) {
-   wasm_injections::wasm_binary_injection<true> injector(module);
-   injector.inject();
-   return true;
-}
-
-std::unique_ptr<wasm_instantiated_module_interface> wavm_runtime::instantiate_module(const char* code_bytes, size_t code_size, std::vector<uint8_t> initial_memory,
-                                                                                     const digest_type& code_hash, const uint8_t& vm_type, const uint8_t& vm_version) {
-   std::unique_ptr<Module> module = std::make_unique<Module>();
-   try {
-      Serialization::MemoryInputStream stream((const U8*)code_bytes, code_size);
-      WASM::serialize(stream, *module);
-   } catch(const Serialization::FatalSerializationException& e) {
-      EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
-   } catch(const IR::ValidationException& e) {
-      EOS_ASSERT(false, wasm_serialization_error, e.message.c_str());
-   }
-
-   try {
-      eosio::chain::webassembly::common::root_resolver resolver;
-      LinkResult link_result = linkModule(*module, resolver);
-      ModuleInstance *instance = instantiateModule(*module, std::move(link_result.resolvedImports));
-      EOS_ASSERT(instance != nullptr, wasm_exception, "Fail to Instantiate WAVM Module");
-
-      return std::make_unique<wavm_instantiated_module>(instance, std::move(module), initial_memory);
-   }
-   catch(const Runtime::Exception& e) {
-      EOS_THROW(wasm_execution_error, "Failed to stand up WAVM instance: ${m}", ("m", describeExceptionCause(e.cause)));
-   }
-}
-
-void wavm_runtime::immediately_exit_currently_running_module() {
-#ifdef _WIN32
-   throw wasm_exit();
-#else
-   Platform::immediately_exit(nullptr);
-#endif
-}
-
-}}}}

From 967baf54f989107a14a802146470f8bd399e1298 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 25 Oct 2019 17:22:04 -0400
Subject: [PATCH 1631/1648] explicitly link to zlib when compiling executables
 using the add_eosio_test_executable CMake macro

---
 CMakeModules/EosioTester.cmake.in      | 1 +
 CMakeModules/EosioTesterBuild.cmake.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index 109b7c5c3d0..5a5c0e8da6c 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -106,6 +106,7 @@ macro(add_eosio_test_executable test_name)
        ${Boost_SYSTEM_LIBRARY}
        ${Boost_CHRONO_LIBRARY}
        ${Boost_IOSTREAMS_LIBRARY}
+       "-lz" # Needed by Boost iostreams
        ${Boost_DATE_TIME_LIBRARY}
 
        ${LLVM_LIBS}
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index e92f83b4296..524ba4afbcf 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -105,6 +105,7 @@ macro(add_eosio_test_executable test_name)
        ${Boost_SYSTEM_LIBRARY}
        ${Boost_CHRONO_LIBRARY}
        ${Boost_IOSTREAMS_LIBRARY}
+       "-lz" # Needed by Boost iostreams
        ${Boost_DATE_TIME_LIBRARY}
 
        ${LLVM_LIBS}

From 86e7ba04126b0c3c403082ba86bbccac35a13c7f Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Wed, 8 Jan 2020 17:07:13 -0500
Subject: [PATCH 1632/1648] fix install location of prebuilt binaries

---
 docs/00_install/00_install-prebuilt-binaries.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index 054718e07a6..de91586b827 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -52,7 +52,13 @@ $ sudo yum remove eosio
 
 ## Location of EOSIO binaries
 
-After installing the prebuilt binaries, the actual EOSIO binaries will be located under the `~/eosio/x.y/bin` folder, where `x.y` is the EOSIO release version that was installed.
+After installing the prebuilt packages, the actual EOSIO binaries will be located under:
+* `/usr/opt/eosio/<version-string>/bin` (Linux-based); or
+* `/usr/local/Cellar/eosio/<version-string>/bin` (MacOS )
+
+where `version-string` is the EOSIO version that was installed; e.g. `2.0.0-rc2`.
+
+Also, soft links for each EOSIO program (`nodeos`, `cleos`, `keosd`, etc.) will be created under `usr/bin` or `usr/local/bin` to allow them to be executed from any directory.
 
 ## Previous Versions
 

From 00e7a47aa864addb4bd77869e12bdaa95fc0b9aa Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Wed, 8 Jan 2020 17:20:54 -0500
Subject: [PATCH 1633/1648] replace/move down duplicate license in README

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c30ea84dda0..6cc553a69c6 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,6 @@ Some of the groundbreaking features of EOSIO include:
 1. Designed for Parallel Execution of Context Free Validation Logic
 1. Designed for Inter Blockchain Communication
 
-## License
-
-EOSIO is released under the open source MIT license and is offered “AS IS” without warranty of any kind, express or implied. Any security provided by the EOSIO software depends in part on how it is used, configured, and deployed. EOSIO is built upon many third-party libraries such as WABT (Apache License) and WAVM (BSD 3-clause) which are also provided “AS IS” without warranty of any kind. Without limiting the generality of the foregoing, Block.one makes no representation or guarantee that EOSIO or any third-party libraries will perform as intended or will be free of errors, bugs or faulty code. Both may fail in large or small ways that could completely or partially limit functionality or compromise computer systems. If you use or implement EOSIO, you do so at your own risk. In no event will Block.one be liable to any party for any damages whatsoever, even if it had been advised of the possibility of damage.  
-
 ## Disclaimer
 
 Block.one is neither launching nor operating any initial public blockchains based upon the EOSIO software. This release refers only to version 1.0 of our open source software. We caution those who wish to use blockchains built on EOSIO to carefully vet the companies and organizations launching blockchains based on EOSIO before disclosing any private keys to their derivative software.
@@ -162,7 +158,7 @@ Instructions detailing the process of getting the software, building it, running
 
 ## License
 
-[MIT](./LICENSE)
+EOSIO is released under the open source [MIT](./LICENSE) license and is offered “AS IS” without warranty of any kind, express or implied. Any security provided by the EOSIO software depends in part on how it is used, configured, and deployed. EOSIO is built upon many third-party libraries such as WABT (Apache License) and WAVM (BSD 3-clause) which are also provided “AS IS” without warranty of any kind. Without limiting the generality of the foregoing, Block.one makes no representation or guarantee that EOSIO or any third-party libraries will perform as intended or will be free of errors, bugs or faulty code. Both may fail in large or small ways that could completely or partially limit functionality or compromise computer systems. If you use or implement EOSIO, you do so at your own risk. In no event will Block.one be liable to any party for any damages whatsoever, even if it had been advised of the possibility of damage.  
 
 ## Important
 

From 353856e082be2e481a9e48379dcf368839130bfe Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Wed, 8 Jan 2020 17:47:47 -0500
Subject: [PATCH 1634/1648] remove supported os section from README

---
 README.md | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 6cc553a69c6..64ac4211a09 100644
--- a/README.md
+++ b/README.md
@@ -28,22 +28,6 @@ Block.one is neither launching nor operating any initial public blockchains base
 
 There is no public testnet running currently.
 
-## Supported Operating Systems
-
-EOSIO currently supports the following operating systems:  
-
-1. Amazon Linux 2
-2. CentOS 7
-3. Ubuntu 16.04
-4. Ubuntu 18.04
-5. MacOS 10.14 (Mojave)
-
----
-
-**Note: It may be possible to install EOSIO on other Unix-based operating systems. This is not officially supported, though.**
-
----
-
 ## Software Installation
 
 There are currently two methods to install the EOSIO software:
@@ -61,7 +45,7 @@ Installing EOSIO from prebuilt binaries is recommended for most users. Building
 
 ## Prebuilt Binaries
 
-Prebuilt software packages are available for the EOSIO [supported operating systems](#supported-operating-systems) above. Find the instructions below for your OS.
+EOSIO prebuilt software packages are available for the operating systems below. Find and follow the instructions for your given OS:
 
 ### Mac OS X:
 

From b46db79a345e4134089a02b1be16c6dcbaf070f0 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Wed, 8 Jan 2020 18:22:16 -0500
Subject: [PATCH 1635/1648] move supported os section from install index to
 shell scripts file

---
 docs/00_install/00_install-prebuilt-binaries.md     |  2 +-
 .../01_shell-scripts/02_build-eosio-binaries.md     |  2 +-
 .../01_build-from-source/01_shell-scripts/index.md  | 13 +++++++++++++
 docs/00_install/index.md                            | 10 ----------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index de91586b827..bc98a0334c0 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -7,7 +7,7 @@ content_title: Install Prebuilt Binaries
 
 ## Prebuilt Binaries
 
-EOSIO prebuilt binary packages are available for specific [Operating Systems](index.md#supported-operating-systems). Find the instructions below for your given OS:
+EOSIO prebuilt software packages are available for the operating systems below. Find and follow the instructions for your OS:
 
 ### Mac OS X:
 
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
index aec16f98e43..1f9c655c2c4 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
@@ -5,7 +5,7 @@ content_title: Build EOSIO Binaries
 [[info | Shell Scripts]]
 | The build script is one of various automated shell scripts provided in the EOSIO repository for building, installing, and optionally uninstalling the EOSIO software and its dependencies. They are available in the `eos/scripts` folder.
 
-The build script first installs all dependencies and then builds EOSIO. The script supports these [Operating Systems](../../index.md#supported-operating-systems). To run it, first change to the `~/eosio/eos` folder, then launch the script:
+The build script first installs all dependencies and then builds EOSIO. To run it, first change to the `~/eosio/eos` folder, then launch the script:
 
 ```sh
 $ cd ~/eosio/eos
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/index.md b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
index 6e1f1ffbbe0..8f74e2b76da 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/index.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
@@ -5,6 +5,19 @@ content_title: Shell Scripts
 [[info | Did you know?]]
 | Shell scripts automate the process of building, installing, testing, and uninstalling the EOSIO software and dependencies.
 
+## Supported Operating Systems
+
+EOSIO currently supports the following operating systems:  
+
+1. Amazon Linux 2
+2. CentOS 7
+3. Ubuntu 16.04
+4. Ubuntu 18.04
+5. MacOS 10.14 (Mojave)
+
+[[info | Note]]
+| It may be possible to install EOSIO on other Unix-based operating systems. This is not officially supported, though.
+
 To build EOSIO from the source code using shell scripts, visit the sections below:
 
 1. [Download EOSIO Source](01_download-eosio-source.md)
diff --git a/docs/00_install/index.md b/docs/00_install/index.md
index ad36933624f..589ce8459e2 100644
--- a/docs/00_install/index.md
+++ b/docs/00_install/index.md
@@ -9,13 +9,3 @@ There are various ways to install and use the EOSIO software:
 
 [[info]]
 | If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](00_install-prebuilt-binaries.md), then proceed to the [Getting Started](https://developers.eos.io/eosio-home/docs/) section of the [EOSIO Developer Portal](https://developers.eos.io/). If you are an advanced developer, a block producer, or no binaries are available for your platform, you may need to [Build EOSIO from source](01_build-from-source/index.md) instead.
-
-## Supported Operating Systems
-
-EOSIO currently supports the following operating systems:
-
-1. Amazon Linux 2
-2. CentOS 7
-3. Ubuntu 16.04
-4. Ubuntu 18.04
-5. MacOS 10.14 (Mojave)

From 3c48b8160ab1ff7e433cba709d16693d89522b86 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Thu, 9 Jan 2020 08:32:53 -0600
Subject: [PATCH 1636/1648] Add better logging of exceptions in emit

---
 libraries/chain/controller.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 20ca6960276..480ea01cbd1 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -366,16 +366,18 @@ struct controller_impl {
       try {
          s( std::forward<Arg>( a ));
       } catch (std::bad_alloc& e) {
-         wlog( "std::bad_alloc" );
+         wlog( "std::bad_alloc: ${w}", ("w", e.what()) );
          throw e;
       } catch (boost::interprocess::bad_alloc& e) {
-         wlog( "bad alloc" );
+         wlog( "boost::interprocess::bad alloc: ${w}", ("w", e.what()) );
          throw e;
       } catch ( controller_emit_signal_exception& e ) {
-         wlog( "${details}", ("details", e.to_detail_string()) );
+         wlog( "controller_emit_signal_exception: ${details}", ("details", e.to_detail_string()) );
          throw e;
       } catch ( fc::exception& e ) {
-         wlog( "${details}", ("details", e.to_detail_string()) );
+         wlog( "fc::exception: ${details}", ("details", e.to_detail_string()) );
+      } catch ( std::exception& e ) {
+         wlog( "std::exception: ${details}", ("details", e.what()) );
       } catch ( ... ) {
          wlog( "signal handler threw exception" );
       }

From 3992cd8ca2db6e4db5c510526ab737bb3b49fbdc Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 9 Jan 2020 09:52:15 -0500
Subject: [PATCH 1637/1648] Revert "remove supported os section from README"

This reverts commit 353856e082be2e481a9e48379dcf368839130bfe.
---
 README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 64ac4211a09..6cc553a69c6 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,22 @@ Block.one is neither launching nor operating any initial public blockchains base
 
 There is no public testnet running currently.
 
+## Supported Operating Systems
+
+EOSIO currently supports the following operating systems:  
+
+1. Amazon Linux 2
+2. CentOS 7
+3. Ubuntu 16.04
+4. Ubuntu 18.04
+5. MacOS 10.14 (Mojave)
+
+---
+
+**Note: It may be possible to install EOSIO on other Unix-based operating systems. This is not officially supported, though.**
+
+---
+
 ## Software Installation
 
 There are currently two methods to install the EOSIO software:
@@ -45,7 +61,7 @@ Installing EOSIO from prebuilt binaries is recommended for most users. Building
 
 ## Prebuilt Binaries
 
-EOSIO prebuilt software packages are available for the operating systems below. Find and follow the instructions for your given OS:
+Prebuilt software packages are available for the EOSIO [supported operating systems](#supported-operating-systems) above. Find the instructions below for your OS.
 
 ### Mac OS X:
 

From 936a4eaf66f8ce17c58f5ab4cdd01867e99afa22 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 9 Jan 2020 09:57:34 -0500
Subject: [PATCH 1638/1648] Revert "move supported os section from install
 index to shell scripts file"

This reverts commit b46db79a345e4134089a02b1be16c6dcbaf070f0.
---
 docs/00_install/00_install-prebuilt-binaries.md     |  2 +-
 .../01_shell-scripts/02_build-eosio-binaries.md     |  2 +-
 .../01_build-from-source/01_shell-scripts/index.md  | 13 -------------
 docs/00_install/index.md                            | 10 ++++++++++
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index bc98a0334c0..de91586b827 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -7,7 +7,7 @@ content_title: Install Prebuilt Binaries
 
 ## Prebuilt Binaries
 
-EOSIO prebuilt software packages are available for the operating systems below. Find and follow the instructions for your OS:
+EOSIO prebuilt binary packages are available for specific [Operating Systems](index.md#supported-operating-systems). Find the instructions below for your given OS:
 
 ### Mac OS X:
 
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
index 1f9c655c2c4..aec16f98e43 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/02_build-eosio-binaries.md
@@ -5,7 +5,7 @@ content_title: Build EOSIO Binaries
 [[info | Shell Scripts]]
 | The build script is one of various automated shell scripts provided in the EOSIO repository for building, installing, and optionally uninstalling the EOSIO software and its dependencies. They are available in the `eos/scripts` folder.
 
-The build script first installs all dependencies and then builds EOSIO. To run it, first change to the `~/eosio/eos` folder, then launch the script:
+The build script first installs all dependencies and then builds EOSIO. The script supports these [Operating Systems](../../index.md#supported-operating-systems). To run it, first change to the `~/eosio/eos` folder, then launch the script:
 
 ```sh
 $ cd ~/eosio/eos
diff --git a/docs/00_install/01_build-from-source/01_shell-scripts/index.md b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
index 8f74e2b76da..6e1f1ffbbe0 100644
--- a/docs/00_install/01_build-from-source/01_shell-scripts/index.md
+++ b/docs/00_install/01_build-from-source/01_shell-scripts/index.md
@@ -5,19 +5,6 @@ content_title: Shell Scripts
 [[info | Did you know?]]
 | Shell scripts automate the process of building, installing, testing, and uninstalling the EOSIO software and dependencies.
 
-## Supported Operating Systems
-
-EOSIO currently supports the following operating systems:  
-
-1. Amazon Linux 2
-2. CentOS 7
-3. Ubuntu 16.04
-4. Ubuntu 18.04
-5. MacOS 10.14 (Mojave)
-
-[[info | Note]]
-| It may be possible to install EOSIO on other Unix-based operating systems. This is not officially supported, though.
-
 To build EOSIO from the source code using shell scripts, visit the sections below:
 
 1. [Download EOSIO Source](01_download-eosio-source.md)
diff --git a/docs/00_install/index.md b/docs/00_install/index.md
index 589ce8459e2..ad36933624f 100644
--- a/docs/00_install/index.md
+++ b/docs/00_install/index.md
@@ -9,3 +9,13 @@ There are various ways to install and use the EOSIO software:
 
 [[info]]
 | If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](00_install-prebuilt-binaries.md), then proceed to the [Getting Started](https://developers.eos.io/eosio-home/docs/) section of the [EOSIO Developer Portal](https://developers.eos.io/). If you are an advanced developer, a block producer, or no binaries are available for your platform, you may need to [Build EOSIO from source](01_build-from-source/index.md) instead.
+
+## Supported Operating Systems
+
+EOSIO currently supports the following operating systems:
+
+1. Amazon Linux 2
+2. CentOS 7
+3. Ubuntu 16.04
+4. Ubuntu 18.04
+5. MacOS 10.14 (Mojave)

From d5886d69ae21082a70857c2f0ab65b32b3a97fea Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 9 Jan 2020 10:10:44 -0500
Subject: [PATCH 1639/1648] add official support callout in install index

---
 docs/00_install/00_install-prebuilt-binaries.md | 2 +-
 docs/00_install/index.md                        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index de91586b827..bc98a0334c0 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -7,7 +7,7 @@ content_title: Install Prebuilt Binaries
 
 ## Prebuilt Binaries
 
-EOSIO prebuilt binary packages are available for specific [Operating Systems](index.md#supported-operating-systems). Find the instructions below for your given OS:
+EOSIO prebuilt software packages are available for the operating systems below. Find and follow the instructions for your OS:
 
 ### Mac OS X:
 
diff --git a/docs/00_install/index.md b/docs/00_install/index.md
index ad36933624f..3153b2547c6 100644
--- a/docs/00_install/index.md
+++ b/docs/00_install/index.md
@@ -19,3 +19,6 @@ EOSIO currently supports the following operating systems:
 3. Ubuntu 16.04
 4. Ubuntu 18.04
 5. MacOS 10.14 (Mojave)
+
+[[info | Note]]
+| It may be possible to install EOSIO on other Unix-based operating systems. This is not officially supported, though.

From 0369950a3ea36823bf35ba02394323a9aa6518a3 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 9 Jan 2020 16:12:59 -0500
Subject: [PATCH 1640/1648] rewrite (friendlier) software install section in
 README

---
 README.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 6cc553a69c6..78896afe653 100644
--- a/README.md
+++ b/README.md
@@ -46,19 +46,14 @@ EOSIO currently supports the following operating systems:
 
 ## Software Installation
 
-There are currently two methods to install the EOSIO software:
-
-* Install from [Prebuilt Binaries](#prebuilt-binaries)
-* Build/Install from [Shell Scripts](#shell-scripts)
+If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](#prebuilt-binaries), then proceed to the [Getting Started](https://eosio.github.io/getting-started) section of the [EOSIO Developer Portal](https://eosio.github.io). If you are an advanced developer, a block producer, or no binaries are available for your platform, you may need to [Build EOSIO from source](https://eosio.github.io/eos/latest/install/build-from-source).
 
 ---
 
-**Note: If you used our shell scripts to build/install EOSIO, please run the [Uninstall Script](#uninstall-script) before using our prebuilt binary packages.**
+**Note: If you used our scripts to build/install EOSIO, please run the [Uninstall Script](#uninstall-script) before using our prebuilt binary packages.**
 
 ---
 
-Installing EOSIO from prebuilt binaries is recommended for most users. Building and installing from source code is available for advanced users.
-
 ## Prebuilt Binaries
 
 Prebuilt software packages are available for the EOSIO [supported operating systems](#supported-operating-systems) above. Find the instructions below for your OS.

From 2807d7c35390de65a15fd9fdc30b124569cfd8a1 Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 9 Jan 2020 16:16:03 -0500
Subject: [PATCH 1641/1648] minor edit on install prebuilt binaries doc

---
 docs/00_install/00_install-prebuilt-binaries.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index bc98a0334c0..206a9dd64f4 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -7,7 +7,7 @@ content_title: Install Prebuilt Binaries
 
 ## Prebuilt Binaries
 
-EOSIO prebuilt software packages are available for the operating systems below. Find and follow the instructions for your OS:
+Prebuilt EOSIO software packages are available for the operating systems below. Find and follow the instructions for your OS:
 
 ### Mac OS X:
 

From 2dabcce2acf09610be478782b07713afa0899fec Mon Sep 17 00:00:00 2001
From: Luis Paris <luis.paris@block.one>
Date: Thu, 9 Jan 2020 16:18:20 -0500
Subject: [PATCH 1642/1648] minor edit on install prebuilt binaries section in
 README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 78896afe653..842530a87ea 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt
 
 ## Prebuilt Binaries
 
-Prebuilt software packages are available for the EOSIO [supported operating systems](#supported-operating-systems) above. Find the instructions below for your OS.
+Prebuilt EOSIO software packages are available for the operating systems below. Find and follow the instructions for your OS:
 
 ### Mac OS X:
 

From 1ba1389e35909413caf4f8f1710325b739c90cc1 Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Fri, 10 Jan 2020 00:14:38 +0100
Subject: [PATCH 1643/1648] Link corrections and new section

Add documentation links section, fix links caused by misunderstanding
---
 README.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 842530a87ea..d74260532f5 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ EOSIO currently supports the following operating systems:
 
 ## Software Installation
 
-If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](#prebuilt-binaries), then proceed to the [Getting Started](https://eosio.github.io/getting-started) section of the [EOSIO Developer Portal](https://eosio.github.io). If you are an advanced developer, a block producer, or no binaries are available for your platform, you may need to [Build EOSIO from source](https://eosio.github.io/eos/latest/install/build-from-source).
+If you are new to EOSIO, it is recommended that you install the [EOSIO Prebuilt Binaries](#prebuilt-binaries), then proceed to the [Getting Started](https://developers.eos.io/eosio-home/docs) walkthrough. If you are an advanced developer, a block producer, or no binaries are available for your platform, you may need to [Build EOSIO from source](https://eosio.github.io/eos/latest/install/build-from-source).
 
 ---
 
@@ -131,6 +131,15 @@ To uninstall the EOSIO built/installed binaries and dependencies, run:
 ./scripts/eosio_uninstall.sh
 ```
 
+## Documentation 
+1. [Nodeos](http://eosio.github.io/eos/nodeos/)
+    - [Usage](http://eosio.github.io/eos/nodeos/usage/index)
+    - [Replays](http://eosio.github.io/eos/nodeos/replays/index)
+    - [Chain API Reference](http://eosio.github.io/eos/nodeos/plugins/chain_api_plugin/api-reference/index)
+    - [Troubleshooting](http://eosio.github.io/eos/nodeos/troubleshooting/index)
+1. [Cleos](http://eosio.github.io/eos/cleos/)
+1. [Keosd](http://eosio.github.io/eos/keosd/)
+
 ## Resources
 1. [Website](https://eos.io)
 1. [Blog](https://medium.com/eosio)
@@ -143,7 +152,7 @@ To uninstall the EOSIO built/installed binaries and dependencies, run:
 
 <a name="gettingstarted"></a>
 ## Getting Started
-Instructions detailing the process of getting the software, building it, running a simple test network that produces blocks, account creation and uploading a sample contract to the blockchain can be found in [Getting Started](https://developers.eos.io/eosio-home/docs) on the [EOSIO Developer Portal](https://developers.eos.io).
+Instructions detailing the process of getting the software, building it, running a simple test network that produces blocks, account creation and uploading a sample contract to the blockchain can be found in the [Getting Started](https://developers.eos.io/eosio-home/docs) walkthrough. 
 
 ## Contributing
 

From 359fc26e45c0f52d4f06b3bd8e8f06e5ae46fdc5 Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Fri, 10 Jan 2020 00:24:37 +0100
Subject: [PATCH 1644/1648] Remove shell scripts section from README

---
 README.md | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/README.md b/README.md
index d74260532f5..15f7bc4e82b 100644
--- a/README.md
+++ b/README.md
@@ -99,33 +99,7 @@ $ sudo yum install ./eosio-2.0.0-rc2.el7.x86_64.rpm
 $ sudo yum remove eosio
 ```
 
-## Shell Scripts
-
-Shell scripts are provided in the EOSIO repository for building, installing, and uninstalling the EOSIO binaries and dependencies from source code.
-
----
-
-**Note: If you used our shell scripts and the EOSIO installation failed, please run the [Uninstall Script](#uninstall-script) before building EOSIO.**
-
----
-
-Check the **Build from Source** section in the documentation for more information. Below are the basic shell scripts to get started quickly.
-
-### Build Script
-To build the EOSIO binaries and install dependencies, run:
-```sh
-git clone --recursive https://github.com/eosio/eos
-cd eos
-./scripts/eosio_build.sh
-```
-
-### Install Script
-To install the EOSIO built binaries, run:
-```sh
-./scripts/eosio_install.sh
-```
-
-### Uninstall Script
+## Uninstall Script
 To uninstall the EOSIO built/installed binaries and dependencies, run:
 ```sh
 ./scripts/eosio_uninstall.sh

From cd91cf87fb92cc5d57e02b258432ac2647670efa Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Tue, 17 Dec 2019 16:33:04 -0600
Subject: [PATCH 1645/1648] v2.0.x consolidated fixes

---
 libraries/chain/abi_serializer.cpp            | 123 +++++++++---------
 .../include/eosio/chain/abi_serializer.hpp    |  74 ++++++-----
 libraries/eos-vm                              |   2 +-
 libraries/fc                                  |   2 +-
 plugins/http_plugin/http_plugin.cpp           | 104 ++++++++++-----
 plugins/mongo_db_plugin/mongo_db_plugin.cpp   |  34 +++--
 programs/cleos/help_text.cpp.in               |   2 +-
 programs/cleos/httpc.cpp                      |   2 +-
 programs/cleos/main.cpp                       |  21 +--
 programs/eosio-blocklog/main.cpp              |   2 +-
 programs/eosio-launcher/main.cpp              |   4 +-
 tests/Cluster.py                              |   2 +-
 tests/Node.py                                 |   2 +-
 unittests/abi_tests.cpp                       |   6 +-
 unittests/wasm_tests.cpp                      |   2 +-
 15 files changed, 228 insertions(+), 154 deletions(-)

diff --git a/libraries/chain/abi_serializer.cpp b/libraries/chain/abi_serializer.cpp
index bd3ac712c79..d5e100428c0 100644
--- a/libraries/chain/abi_serializer.cpp
+++ b/libraries/chain/abi_serializer.cpp
@@ -1,6 +1,4 @@
 #include <eosio/chain/abi_serializer.hpp>
-#include <eosio/chain/contract_types.hpp>
-#include <eosio/chain/authority.hpp>
 #include <eosio/chain/chain_config.hpp>
 #include <eosio/chain/transaction.hpp>
 #include <eosio/chain/asset.hpp>
@@ -18,6 +16,7 @@ namespace eosio { namespace chain {
 
    using boost::algorithm::ends_with;
    using std::string;
+   using std::string_view;
 
    template <typename T>
    inline fc::variant variant_from_stream(fc::datastream<const char*>& stream) {
@@ -116,7 +115,8 @@ namespace eosio { namespace chain {
          structs[st.name] = st;
 
       for( const auto& td : abi.types ) {
-         EOS_ASSERT(!_is_type(td.new_type_name, ctx), duplicate_abi_type_def_exception, "type already exists", ("new_type_name",td.new_type_name));
+         EOS_ASSERT(!_is_type(td.new_type_name, ctx), duplicate_abi_type_def_exception,
+                    "type already exists", ("new_type_name",impl::limit_size(td.new_type_name)));
          typedefs[td.new_type_name] = td.type;
       }
 
@@ -146,60 +146,58 @@ namespace eosio { namespace chain {
       validate(ctx);
    }
 
-   bool abi_serializer::is_builtin_type(const type_name& type)const {
+   bool abi_serializer::is_builtin_type(const std::string_view& type)const {
       return built_in_types.find(type) != built_in_types.end();
    }
 
-   bool abi_serializer::is_integer(const type_name& type) const {
-      string stype = type;
-      return boost::starts_with(stype, "uint") || boost::starts_with(stype, "int");
+   bool abi_serializer::is_integer(const std::string_view& type) const {
+      return boost::starts_with(type, "uint") || boost::starts_with(type, "int");
    }
 
-   int abi_serializer::get_integer_size(const type_name& type) const {
-      string stype = type;
-      EOS_ASSERT( is_integer(type), invalid_type_inside_abi, "${stype} is not an integer type", ("stype",stype));
-      if( boost::starts_with(stype, "uint") ) {
-         return boost::lexical_cast<int>(stype.substr(4));
+   int abi_serializer::get_integer_size(const std::string_view& type) const {
+      EOS_ASSERT( is_integer(type), invalid_type_inside_abi, "${type} is not an integer type", ("type",impl::limit_size(type)));
+      if( boost::starts_with(type, "uint") ) {
+         return boost::lexical_cast<int>(type.substr(4));
       } else {
-         return boost::lexical_cast<int>(stype.substr(3));
+         return boost::lexical_cast<int>(type.substr(3));
       }
    }
 
-   bool abi_serializer::is_struct(const type_name& type)const {
+   bool abi_serializer::is_struct(const std::string_view& type)const {
       return structs.find(resolve_type(type)) != structs.end();
    }
 
-   bool abi_serializer::is_array(const type_name& type)const {
-      return ends_with(string(type), "[]");
+   bool abi_serializer::is_array(const string_view& type)const {
+      return ends_with(type, "[]");
    }
 
-   bool abi_serializer::is_optional(const type_name& type)const {
-      return ends_with(string(type), "?");
+   bool abi_serializer::is_optional(const string_view& type)const {
+      return ends_with(type, "?");
    }
 
-   bool abi_serializer::is_type(const type_name& type, const fc::microseconds& max_serialization_time)const {
+   bool abi_serializer::is_type(const std::string_view& type, const fc::microseconds& max_serialization_time)const {
       impl::abi_traverse_context ctx(max_serialization_time);
       return _is_type(type, ctx);
    }
 
-   type_name abi_serializer::fundamental_type(const type_name& type)const {
+   std::string_view abi_serializer::fundamental_type(const std::string_view& type)const {
       if( is_array(type) ) {
-         return type_name(string(type).substr(0, type.size()-2));
+         return type.substr(0, type.size()-2);
       } else if ( is_optional(type) ) {
-         return type_name(string(type).substr(0, type.size()-1));
+         return type.substr(0, type.size()-1);
       } else {
        return type;
       }
    }
 
-   type_name abi_serializer::_remove_bin_extension(const type_name& type) {
+   std::string_view abi_serializer::_remove_bin_extension(const std::string_view& type) {
       if( ends_with(type, "$") )
          return type.substr(0, type.size()-1);
       else
          return type;
    }
 
-   bool abi_serializer::_is_type(const type_name& rtype, impl::abi_traverse_context& ctx )const {
+   bool abi_serializer::_is_type(const std::string_view& rtype, impl::abi_traverse_context& ctx )const {
       auto h = ctx.enter_scope();
       auto type = fundamental_type(rtype);
       if( built_in_types.find(type) != built_in_types.end() ) return true;
@@ -209,65 +207,68 @@ namespace eosio { namespace chain {
       return false;
    }
 
-   const struct_def& abi_serializer::get_struct(const type_name& type)const {
+   const struct_def& abi_serializer::get_struct(const std::string_view& type)const {
       auto itr = structs.find(resolve_type(type) );
-      EOS_ASSERT( itr != structs.end(), invalid_type_inside_abi, "Unknown struct ${type}", ("type",type) );
+      EOS_ASSERT( itr != structs.end(), invalid_type_inside_abi, "Unknown struct ${type}", ("type",impl::limit_size(type)) );
       return itr->second;
    }
 
    void abi_serializer::validate( impl::abi_traverse_context& ctx )const {
       for( const auto& t : typedefs ) { try {
-         vector<type_name> types_seen{t.first, t.second};
+         vector<std::string_view> types_seen{t.first, t.second};
          auto itr = typedefs.find(t.second);
          while( itr != typedefs.end() ) {
             ctx.check_deadline();
-            EOS_ASSERT( find(types_seen.begin(), types_seen.end(), itr->second) == types_seen.end(), abi_circular_def_exception, "Circular reference in type ${type}", ("type",t.first) );
+            EOS_ASSERT( find(types_seen.begin(), types_seen.end(), itr->second) == types_seen.end(), abi_circular_def_exception,
+                        "Circular reference in type ${type}", ("type", impl::limit_size(t.first)) );
             types_seen.emplace_back(itr->second);
             itr = typedefs.find(itr->second);
          }
       } FC_CAPTURE_AND_RETHROW( (t) ) }
       for( const auto& t : typedefs ) { try {
-         EOS_ASSERT(_is_type(t.second, ctx), invalid_type_inside_abi, "${type}", ("type",t.second) );
+         EOS_ASSERT(_is_type(t.second, ctx), invalid_type_inside_abi, "${type}", ("type",impl::limit_size(t.second)) );
       } FC_CAPTURE_AND_RETHROW( (t) ) }
       for( const auto& s : structs ) { try {
          if( s.second.base != type_name() ) {
-            struct_def current = s.second;
-            vector<type_name> types_seen{current.name};
-            while( current.base != type_name() ) {
+            const struct_def* current = &s.second;
+            vector<std::string_view> types_seen{current->name};
+            while( current->base != type_name() ) {
                ctx.check_deadline();
-               const auto& base = get_struct(current.base); //<-- force struct to inherit from another struct
-               EOS_ASSERT( find(types_seen.begin(), types_seen.end(), base.name) == types_seen.end(), abi_circular_def_exception, "Circular reference in struct ${type}", ("type",s.second.name) );
+               const struct_def& base = get_struct(current->base); //<-- force struct to inherit from another struct
+               EOS_ASSERT( find(types_seen.begin(), types_seen.end(), base.name) == types_seen.end(), abi_circular_def_exception,
+                           "Circular reference in struct ${type}", ("type",impl::limit_size(s.second.name)) );
                types_seen.emplace_back(base.name);
-               current = base;
+               current = &base;
             }
          }
          for( const auto& field : s.second.fields ) { try {
             ctx.check_deadline();
-            EOS_ASSERT(_is_type(_remove_bin_extension(field.type), ctx), invalid_type_inside_abi, "${type}", ("type",field.type) );
+            EOS_ASSERT(_is_type(_remove_bin_extension(field.type), ctx), invalid_type_inside_abi,
+                       "${type}", ("type",impl::limit_size(field.type)) );
          } FC_CAPTURE_AND_RETHROW( (field) ) }
       } FC_CAPTURE_AND_RETHROW( (s) ) }
       for( const auto& s : variants ) { try {
          for( const auto& type : s.second.types ) { try {
             ctx.check_deadline();
-            EOS_ASSERT(_is_type(type, ctx), invalid_type_inside_abi, "${type}", ("type",type) );
+            EOS_ASSERT(_is_type(type, ctx), invalid_type_inside_abi, "${type}", ("type",impl::limit_size(type)) );
          } FC_CAPTURE_AND_RETHROW( (type) ) }
       } FC_CAPTURE_AND_RETHROW( (s) ) }
       for( const auto& a : actions ) { try {
         ctx.check_deadline();
-        EOS_ASSERT(_is_type(a.second, ctx), invalid_type_inside_abi, "${type}", ("type",a.second) );
+        EOS_ASSERT(_is_type(a.second, ctx), invalid_type_inside_abi, "${type}", ("type",impl::limit_size(a.second)) );
       } FC_CAPTURE_AND_RETHROW( (a)  ) }
 
       for( const auto& t : tables ) { try {
         ctx.check_deadline();
-        EOS_ASSERT(_is_type(t.second, ctx), invalid_type_inside_abi, "${type}", ("type",t.second) );
+        EOS_ASSERT(_is_type(t.second, ctx), invalid_type_inside_abi, "${type}", ("type",impl::limit_size(t.second)) );
       } FC_CAPTURE_AND_RETHROW( (t)  ) }
    }
 
-   type_name abi_serializer::resolve_type(const type_name& type)const {
+   std::string_view abi_serializer::resolve_type(const std::string_view& type)const {
       auto itr = typedefs.find(type);
       if( itr != typedefs.end() ) {
          for( auto i = typedefs.size(); i > 0; --i ) { // avoid infinite recursion
-            const type_name& t = itr->second;
+            const std::string_view& t = itr->second;
             itr = typedefs.find( t );
             if( itr == typedefs.end() ) return t;
          }
@@ -275,7 +276,7 @@ namespace eosio { namespace chain {
       return type;
    }
 
-   void abi_serializer::_binary_to_variant( const type_name& type, fc::datastream<const char *>& stream,
+   void abi_serializer::_binary_to_variant( const std::string_view& type, fc::datastream<const char *>& stream,
                                             fc::mutable_variant_object& obj, impl::binary_to_variant_context& ctx )const
    {
       auto h = ctx.enter_scope();
@@ -308,11 +309,11 @@ namespace eosio { namespace chain {
       }
    }
 
-   fc::variant abi_serializer::_binary_to_variant( const type_name& type, fc::datastream<const char *>& stream,
+   fc::variant abi_serializer::_binary_to_variant( const std::string_view& type, fc::datastream<const char *>& stream,
                                                    impl::binary_to_variant_context& ctx )const
    {
       auto h = ctx.enter_scope();
-      type_name rtype = resolve_type(type);
+      auto rtype = resolve_type(type);
       auto ftype = fundamental_type(rtype);
       auto btype = built_in_types.find(ftype );
       if( btype != built_in_types.end() ) {
@@ -320,7 +321,7 @@ namespace eosio { namespace chain {
             return btype->second.first(stream, is_array(rtype), is_optional(rtype));
          } EOS_RETHROW_EXCEPTIONS( unpack_exception, "Unable to unpack ${class} type '${type}' while processing '${p}'",
                                    ("class", is_array(rtype) ? "array of built-in" : is_optional(rtype) ? "optional of built-in" : "built-in")
-                                   ("type", ftype)("p", ctx.get_path_string()) )
+                                   ("type", impl::limit_size(ftype))("p", ctx.get_path_string()) )
       }
       if ( is_array(rtype) ) {
          ctx.hint_array_type_if_in_array();
@@ -373,26 +374,26 @@ namespace eosio { namespace chain {
       return fc::variant( std::move(mvo) );
    }
 
-   fc::variant abi_serializer::_binary_to_variant( const type_name& type, const bytes& binary, impl::binary_to_variant_context& ctx )const
+   fc::variant abi_serializer::_binary_to_variant( const std::string_view& type, const bytes& binary, impl::binary_to_variant_context& ctx )const
    {
       auto h = ctx.enter_scope();
       fc::datastream<const char*> ds( binary.data(), binary.size() );
       return _binary_to_variant(type, ds, ctx);
    }
 
-   fc::variant abi_serializer::binary_to_variant( const type_name& type, const bytes& binary, const fc::microseconds& max_serialization_time, bool short_path )const {
+   fc::variant abi_serializer::binary_to_variant( const std::string_view& type, const bytes& binary, const fc::microseconds& max_serialization_time, bool short_path )const {
       impl::binary_to_variant_context ctx(*this, max_serialization_time, type);
       ctx.short_path = short_path;
       return _binary_to_variant(type, binary, ctx);
    }
 
-   fc::variant abi_serializer::binary_to_variant( const type_name& type, fc::datastream<const char*>& binary, const fc::microseconds& max_serialization_time, bool short_path )const {
+   fc::variant abi_serializer::binary_to_variant( const std::string_view& type, fc::datastream<const char*>& binary, const fc::microseconds& max_serialization_time, bool short_path )const {
       impl::binary_to_variant_context ctx(*this, max_serialization_time, type);
       ctx.short_path = short_path;
       return _binary_to_variant(type, binary, ctx);
    }
 
-   void abi_serializer::_variant_to_binary( const type_name& type, const fc::variant& var, fc::datastream<char *>& ds, impl::variant_to_binary_context& ctx )const
+   void abi_serializer::_variant_to_binary( const std::string_view& type, const fc::variant& var, fc::datastream<char *>& ds, impl::variant_to_binary_context& ctx )const
    { try {
       auto h = ctx.enter_scope();
       auto rtype = resolve_type(type);
@@ -495,9 +496,9 @@ namespace eosio { namespace chain {
       } else {
          EOS_THROW( invalid_type_inside_abi, "Unknown type ${type}", ("type",ctx.maybe_shorten(type)) );
       }
-   } FC_CAPTURE_AND_RETHROW( (type)(var) ) }
+   } FC_CAPTURE_AND_RETHROW() }
 
-   bytes abi_serializer::_variant_to_binary( const type_name& type, const fc::variant& var, impl::variant_to_binary_context& ctx )const
+   bytes abi_serializer::_variant_to_binary( const std::string_view& type, const fc::variant& var, impl::variant_to_binary_context& ctx )const
    { try {
       auto h = ctx.enter_scope();
       if( !_is_type(type, ctx) ) {
@@ -509,15 +510,15 @@ namespace eosio { namespace chain {
       _variant_to_binary(type, var, ds, ctx);
       temp.resize(ds.tellp());
       return temp;
-   } FC_CAPTURE_AND_RETHROW( (type)(var) ) }
+   } FC_CAPTURE_AND_RETHROW() }
 
-   bytes abi_serializer::variant_to_binary( const type_name& type, const fc::variant& var, const fc::microseconds& max_serialization_time, bool short_path )const {
+   bytes abi_serializer::variant_to_binary( const std::string_view& type, const fc::variant& var, const fc::microseconds& max_serialization_time, bool short_path )const {
       impl::variant_to_binary_context ctx(*this, max_serialization_time, type);
       ctx.short_path = short_path;
       return _variant_to_binary(type, var, ctx);
    }
 
-   void  abi_serializer::variant_to_binary( const type_name& type, const fc::variant& var, fc::datastream<char*>& ds, const fc::microseconds& max_serialization_time, bool short_path )const {
+   void  abi_serializer::variant_to_binary( const std::string_view& type, const fc::variant& var, fc::datastream<char*>& ds, const fc::microseconds& max_serialization_time, bool short_path )const {
       impl::variant_to_binary_context ctx(*this, max_serialization_time, type);
       ctx.short_path = short_path;
       _variant_to_binary(type, var, ds, ctx);
@@ -563,7 +564,7 @@ namespace eosio { namespace chain {
          return {std::move(callback)};
       }
 
-      void abi_traverse_context_with_path::set_path_root( const type_name& type ) {
+      void abi_traverse_context_with_path::set_path_root( const std::string_view& type ) {
          auto rtype = abis.resolve_type(type);
 
          if( abis.is_array(rtype) ) {
@@ -629,7 +630,7 @@ namespace eosio { namespace chain {
           return (*str == 0) ? 0 : const_strlen(str + 1) + 1;
       }
 
-      void output_name( std::ostream& s, const string& str, bool shorten, size_t max_length = 64 ) {
+      void output_name( std::ostream& s, const string_view& str, bool shorten, size_t max_length = 64 ) {
          constexpr size_t min_num_characters_at_ends = 4;
          constexpr size_t preferred_num_tail_end_characters = 6;
          constexpr const char* fill_in = "...";
@@ -792,15 +793,21 @@ namespace eosio { namespace chain {
          return visitor.s.str();
       }
 
-      string abi_traverse_context_with_path::maybe_shorten( const string& str ) {
+      string abi_traverse_context_with_path::maybe_shorten( const std::string_view& str ) {
          if( !short_path )
-            return str;
+            return std::string(str);
 
          std::stringstream s;
          output_name( s, str, true );
          return s.str();
       }
 
+      string limit_size( const std::string_view& str ) {
+         std::stringstream s;
+         output_name( s, str, false );
+         return s.str();
+      }
+
       fc::scoped_exit<std::function<void()>> variant_to_binary_context::disallow_extensions_unless( bool condition ) {
          std::function<void()> callback = [old_allow_extensions=allow_extensions, this](){
             allow_extensions = old_allow_extensions;
diff --git a/libraries/chain/include/eosio/chain/abi_serializer.hpp b/libraries/chain/include/eosio/chain/abi_serializer.hpp
index 6322eb7945b..c8c2efc1c8d 100644
--- a/libraries/chain/include/eosio/chain/abi_serializer.hpp
+++ b/libraries/chain/include/eosio/chain/abi_serializer.hpp
@@ -32,28 +32,31 @@ struct abi_serializer {
    abi_serializer( const abi_def& abi, const fc::microseconds& max_serialization_time );
    void set_abi(const abi_def& abi, const fc::microseconds& max_serialization_time);
 
-   type_name resolve_type(const type_name& t)const;
-   bool      is_array(const type_name& type)const;
-   bool      is_optional(const type_name& type)const;
-   bool      is_type(const type_name& type, const fc::microseconds& max_serialization_time)const;
-   bool      is_builtin_type(const type_name& type)const;
-   bool      is_integer(const type_name& type) const;
-   int       get_integer_size(const type_name& type) const;
-   bool      is_struct(const type_name& type)const;
-   type_name fundamental_type(const type_name& type)const;
-
-   const struct_def& get_struct(const type_name& type)const;
+   /// @return string_view of `t` or internal string type
+   std::string_view resolve_type(const std::string_view& t)const;
+   bool      is_array(const std::string_view& type)const;
+   bool      is_optional(const std::string_view& type)const;
+   bool      is_type(const std::string_view& type, const fc::microseconds& max_serialization_time)const;
+   bool      is_builtin_type(const std::string_view& type)const;
+   bool      is_integer(const std::string_view& type) const;
+   int       get_integer_size(const std::string_view& type) const;
+   bool      is_struct(const std::string_view& type)const;
+
+   /// @return string_view of `type`
+   std::string_view fundamental_type(const std::string_view& type)const;
+
+   const struct_def& get_struct(const std::string_view& type)const;
 
    type_name get_action_type(name action)const;
    type_name get_table_type(name action)const;
 
    optional<string>  get_error_message( uint64_t error_code )const;
 
-   fc::variant binary_to_variant( const type_name& type, const bytes& binary, const fc::microseconds& max_serialization_time, bool short_path = false )const;
-   fc::variant binary_to_variant( const type_name& type, fc::datastream<const char*>& binary, const fc::microseconds& max_serialization_time, bool short_path = false )const;
+   fc::variant binary_to_variant( const std::string_view& type, const bytes& binary, const fc::microseconds& max_serialization_time, bool short_path = false )const;
+   fc::variant binary_to_variant( const std::string_view& type, fc::datastream<const char*>& binary, const fc::microseconds& max_serialization_time, bool short_path = false )const;
 
-   bytes       variant_to_binary( const type_name& type, const fc::variant& var, const fc::microseconds& max_serialization_time, bool short_path = false )const;
-   void        variant_to_binary( const type_name& type, const fc::variant& var, fc::datastream<char*>& ds, const fc::microseconds& max_serialization_time, bool short_path = false )const;
+   bytes       variant_to_binary( const std::string_view& type, const fc::variant& var, const fc::microseconds& max_serialization_time, bool short_path = false )const;
+   void        variant_to_binary( const std::string_view& type, const fc::variant& var, fc::datastream<char*>& ds, const fc::microseconds& max_serialization_time, bool short_path = false )const;
 
    template<typename T, typename Resolver>
    static void to_variant( const T& o, fc::variant& vo, Resolver resolver, const fc::microseconds& max_serialization_time );
@@ -87,27 +90,27 @@ struct abi_serializer {
 
 private:
 
-   map<type_name, type_name>     typedefs;
-   map<type_name, struct_def>    structs;
-   map<name,type_name>           actions;
-   map<name,type_name>           tables;
-   map<uint64_t, string>         error_messages;
-   map<type_name, variant_def>   variants;
+   map<type_name, type_name, std::less<>>     typedefs;
+   map<type_name, struct_def, std::less<>>    structs;
+   map<name,type_name>                        actions;
+   map<name,type_name>                        tables;
+   map<uint64_t, string>                      error_messages;
+   map<type_name, variant_def, std::less<>>   variants;
 
-   map<type_name, pair<unpack_function, pack_function>> built_in_types;
+   map<type_name, pair<unpack_function, pack_function>, std::less<>> built_in_types;
    void configure_built_in_types();
 
-   fc::variant _binary_to_variant( const type_name& type, const bytes& binary, impl::binary_to_variant_context& ctx )const;
-   fc::variant _binary_to_variant( const type_name& type, fc::datastream<const char*>& binary, impl::binary_to_variant_context& ctx )const;
-   void        _binary_to_variant( const type_name& type, fc::datastream<const char*>& stream,
+   fc::variant _binary_to_variant( const std::string_view& type, const bytes& binary, impl::binary_to_variant_context& ctx )const;
+   fc::variant _binary_to_variant( const std::string_view& type, fc::datastream<const char*>& binary, impl::binary_to_variant_context& ctx )const;
+   void        _binary_to_variant( const std::string_view& type, fc::datastream<const char*>& stream,
                                    fc::mutable_variant_object& obj, impl::binary_to_variant_context& ctx )const;
 
-   bytes       _variant_to_binary( const type_name& type, const fc::variant& var, impl::variant_to_binary_context& ctx )const;
-   void        _variant_to_binary( const type_name& type, const fc::variant& var,
+   bytes       _variant_to_binary( const std::string_view& type, const fc::variant& var, impl::variant_to_binary_context& ctx )const;
+   void        _variant_to_binary( const std::string_view& type, const fc::variant& var,
                                    fc::datastream<char*>& ds, impl::variant_to_binary_context& ctx )const;
 
-   static type_name _remove_bin_extension(const type_name& type);
-   bool _is_type( const type_name& type, impl::abi_traverse_context& ctx )const;
+   static std::string_view _remove_bin_extension(const std::string_view& type);
+   bool _is_type( const std::string_view& type, impl::abi_traverse_context& ctx )const;
 
    void validate( impl::abi_traverse_context& ctx )const;
 
@@ -180,25 +183,25 @@ namespace impl {
    using path_item = static_variant<empty_path_item, array_index_path_item, field_path_item, variant_path_item>;
 
    struct abi_traverse_context_with_path : public abi_traverse_context {
-      abi_traverse_context_with_path( const abi_serializer& abis, fc::microseconds max_serialization_time, const type_name& type )
+      abi_traverse_context_with_path( const abi_serializer& abis, fc::microseconds max_serialization_time, const std::string_view& type )
       : abi_traverse_context( max_serialization_time ), abis(abis)
       {
          set_path_root(type);
       }
 
-      abi_traverse_context_with_path( const abi_serializer& abis, fc::microseconds max_serialization_time, fc::time_point deadline, const type_name& type )
+      abi_traverse_context_with_path( const abi_serializer& abis, fc::microseconds max_serialization_time, fc::time_point deadline, const std::string_view& type )
       : abi_traverse_context( max_serialization_time, deadline ), abis(abis)
       {
          set_path_root(type);
       }
 
-      abi_traverse_context_with_path( const abi_serializer& abis, const abi_traverse_context& ctx, const type_name& type )
+      abi_traverse_context_with_path( const abi_serializer& abis, const abi_traverse_context& ctx, const std::string_view& type )
       : abi_traverse_context(ctx), abis(abis)
       {
          set_path_root(type);
       }
 
-      void set_path_root( const type_name& type );
+      void set_path_root( const std::string_view& type );
 
       fc::scoped_exit<std::function<void()>> push_to_path( const path_item& item );
 
@@ -209,7 +212,7 @@ namespace impl {
 
       string get_path_string()const;
 
-      string maybe_shorten( const string& str );
+      string maybe_shorten( const std::string_view& str );
 
    protected:
       const abi_serializer&  abis;
@@ -234,6 +237,9 @@ namespace impl {
       bool                   allow_extensions = true;
    };
 
+   /// limits the string size to default max_length of output_name
+   string limit_size( const std::string_view& str );
+
    /**
     * Determine if a type contains ABI related info, perhaps deeply nested
     * @tparam T - the type to check
diff --git a/libraries/eos-vm b/libraries/eos-vm
index 4d2b046ad67..7109334f2fd 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 4d2b046ad672e0de9ed7a3461fa2bff91b10e57e
+Subproject commit 7109334f2fd055378003f29cad7c39f14367b162
diff --git a/libraries/fc b/libraries/fc
index f0da6a718e3..e95a03eed17 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit f0da6a718e34201a0e7878e93e727fac4767b5e4
+Subproject commit e95a03eed1796a3054e02e67f1171f8c9fdb57e5
diff --git a/plugins/http_plugin/http_plugin.cpp b/plugins/http_plugin/http_plugin.cpp
index 0ab7653b7af..7a720fa7564 100644
--- a/plugins/http_plugin/http_plugin.cpp
+++ b/plugins/http_plugin/http_plugin.cpp
@@ -9,6 +9,7 @@
 #include <fc/log/logger_config.hpp>
 #include <fc/reflect/variant.hpp>
 #include <fc/io/json.hpp>
+#include <fc/io/raw.hpp>
 #include <fc/crypto/openssl.hpp>
 
 #include <boost/asio.hpp>
@@ -145,7 +146,7 @@ namespace eosio {
          string                   access_control_allow_headers;
          string                   access_control_max_age;
          bool                     access_control_allow_credentials = false;
-         size_t                   max_body_size;
+         size_t                   max_body_size{1024*1024};
 
          websocket_server_type    server;
 
@@ -153,6 +154,7 @@ namespace eosio {
          optional<eosio::chain::named_thread_pool>   thread_pool;
          std::atomic<size_t>                         bytes_in_flight{0};
          size_t                                      max_bytes_in_flight = 0;
+         fc::microseconds                            max_response_time{30*1000};
 
          optional<tcp::endpoint>  https_listen_endpoint;
          string                   https_cert_chain;
@@ -226,29 +228,37 @@ namespace eosio {
          template<class T>
          static void handle_exception(typename websocketpp::server<T>::connection_ptr con) {
             string err = "Internal Service error, http: ";
+            const auto deadline = fc::time_point::now() + fc::exception::format_time_limit;
             try {
                con->set_status( websocketpp::http::status_code::internal_server_error );
                try {
                   throw;
                } catch (const fc::exception& e) {
                   err += e.to_detail_string();
-                  fc_elog( logger, "${e}", ("e", err) );
+                  fc_elog( logger, "${e}", ("e", err));
                   error_results results{websocketpp::http::status_code::internal_server_error,
-                                        "Internal Service Error", error_results::error_info(e, verbose_http_errors )};
-                  con->set_body( fc::json::to_string( results ));
+                                        "Internal Service Error", error_results::error_info( e, verbose_http_errors )};
+                  con->set_body( fc::json::to_string( results, deadline ));
                } catch (const std::exception& e) {
                   err += e.what();
-                  fc_elog( logger, "${e}", ("e", err) );
+                  fc_elog( logger, "${e}", ("e", err));
                   error_results results{websocketpp::http::status_code::internal_server_error,
-                                        "Internal Service Error", error_results::error_info(fc::exception( FC_LOG_MESSAGE( error, e.what())), verbose_http_errors )};
-                  con->set_body( fc::json::to_string( results ));
+                                        "Internal Service Error",
+                                        error_results::error_info( fc::exception( FC_LOG_MESSAGE( error, e.what())),
+                                                                   verbose_http_errors )};
+                  con->set_body( fc::json::to_string( results, deadline ));
                } catch (...) {
                   err += "Unknown Exception";
                   error_results results{websocketpp::http::status_code::internal_server_error,
                                         "Internal Service Error",
-                                        error_results::error_info(fc::exception( FC_LOG_MESSAGE( error, "Unknown Exception" )), verbose_http_errors )};
-                  con->set_body( fc::json::to_string( results ));
+                                        error_results::error_info(
+                                              fc::exception( FC_LOG_MESSAGE( error, "Unknown Exception" )),
+                                              verbose_http_errors )};
+                  con->set_body( fc::json::to_string( results, deadline ));
                }
+            } catch (fc::timeout_exception& e) {
+               con->set_body( R"xxx({"message": "Internal Server Error"})xxx" );
+               fc_elog( logger, "Timeout exception ${te} attempting to handle exception: ${e}", ("te", e.to_detail_string())("e", err) );
             } catch (...) {
                con->set_body( R"xxx({"message": "Internal Server Error"})xxx" );
                fc_elog( logger, "Exception attempting to handle exception: ${e}", ("e", err) );
@@ -269,6 +279,18 @@ namespace eosio {
             return true;
          }
 
+         template<typename T>
+         bool verify_max_bytes_in_flight( const T& con ) {
+            if( bytes_in_flight > max_bytes_in_flight ) {
+               fc_dlog( logger, "503 - too many bytes in flight: ${bytes}", ("bytes", bytes_in_flight.load()) );
+               error_results results{websocketpp::http::status_code::too_many_requests, "Busy", error_results::error_info()};
+               con->set_body( fc::json::to_string( results, fc::time_point::maximum() ));
+               con->set_status( websocketpp::http::status_code::too_many_requests );
+               return false;
+            }
+            return true;
+         }
+
          template<class T>
          void handle_http_request(typename websocketpp::server<T>::connection_ptr con) {
             try {
@@ -297,13 +319,7 @@ namespace eosio {
 
                con->append_header( "Content-type", "application/json" );
 
-               if( bytes_in_flight > max_bytes_in_flight ) {
-                  fc_dlog( logger, "503 - too many bytes in flight: ${bytes}", ("bytes", bytes_in_flight.load()) );
-                  error_results results{websocketpp::http::status_code::too_many_requests, "Busy", error_results::error_info()};
-                  con->set_body( fc::json::to_string( results ));
-                  con->set_status( websocketpp::http::status_code::too_many_requests );
-                  return;
-               }
+               if( !verify_max_bytes_in_flight( con ) ) return;
 
                std::string body = con->get_request_body();
                std::string resource = con->get_uri()->get_resource();
@@ -312,34 +328,57 @@ namespace eosio {
                   con->defer_http_response();
                   bytes_in_flight += body.size();
                   app().post( appbase::priority::low,
-                              [&ioc = thread_pool->get_executor(), &bytes_in_flight = this->bytes_in_flight, handler_itr,
-                               resource{std::move( resource )}, body{std::move( body )}, con]() {
+                              [&ioc = thread_pool->get_executor(), &bytes_in_flight = this->bytes_in_flight,
+                               handler_itr, this, resource{std::move( resource )}, body{std::move( body )}, con]() mutable {
+                     const size_t body_size = body.size();
+                     if( !verify_max_bytes_in_flight( con ) ) {
+                        con->send_http_response();
+                        bytes_in_flight -= body_size;
+                        return;
+                     }
                      try {
-                        handler_itr->second( resource, body,
-                              [&ioc, &bytes_in_flight, con]( int code, fc::variant response_body ) {
-                           boost::asio::post( ioc, [response_body{std::move( response_body )}, &bytes_in_flight, con, code]() mutable {
-                              std::string json = fc::json::to_string( response_body );
-                              response_body.clear();
-                              const size_t json_size = json.size();
-                              bytes_in_flight += json_size;
-                              con->set_body( std::move( json ) );
-                              con->set_status( websocketpp::http::status_code::value( code ) );
+                        handler_itr->second( std::move( resource ), std::move( body ),
+                                 [&ioc, &bytes_in_flight, con, this]( int code, fc::variant response_body ) {
+                           size_t response_size = 0;
+                           try {
+                              response_size = fc::raw::pack_size( response_body );
+                           } catch(...) {}
+                           bytes_in_flight += response_size;
+                           if( !verify_max_bytes_in_flight( con ) ) {
                               con->send_http_response();
-                              bytes_in_flight -= json_size;
-                           } );
+                              bytes_in_flight -= response_size;
+                           } else {
+                              boost::asio::post( ioc,
+                                 [response_body{std::move( response_body )}, response_size, &bytes_in_flight,
+                                  con, code, max_response_time=max_response_time]() mutable {
+                                 std::string json;
+                                 try {
+                                    json = fc::json::to_string( response_body, fc::time_point::now() + max_response_time );
+                                    con->set_body( std::move( json ) );
+                                    con->set_status( websocketpp::http::status_code::value( code ) );
+                                 } catch( ... ) {
+                                    handle_exception<T>( con );
+                                 }
+                                 response_body.clear();
+                                 const size_t json_size = json.size();
+                                 bytes_in_flight += json_size;
+                                 con->send_http_response();
+                                 bytes_in_flight -= (json_size + response_size);
+                              } );
+                           }
                         });
-                        bytes_in_flight -= body.size();
                      } catch( ... ) {
                         handle_exception<T>( con );
                         con->send_http_response();
                      }
+                     bytes_in_flight -= body_size;
                   } );
 
                } else {
                   fc_dlog( logger, "404 - not found: ${ep}", ("ep", resource) );
                   error_results results{websocketpp::http::status_code::not_found,
                                         "Not Found", error_results::error_info(fc::exception( FC_LOG_MESSAGE( error, "Unknown Endpoint" )), verbose_http_errors )};
-                  con->set_body( fc::json::to_string( results ));
+                  con->set_body( fc::json::to_string( results, fc::time_point::now() + max_response_time ));
                   con->set_status( websocketpp::http::status_code::not_found );
                }
             } catch( ... ) {
@@ -453,6 +492,8 @@ namespace eosio {
              "The maximum body size in bytes allowed for incoming RPC requests")
             ("http-max-bytes-in-flight-mb", bpo::value<uint32_t>()->default_value(500),
              "Maximum size in megabytes http_plugin should use for processing http requests. 503 error response when exceeded." )
+            ("http-max-response-time-ms", bpo::value<uint32_t>()->default_value(30),
+             "Maximum time for processing a request.")
             ("verbose-http-errors", bpo::bool_switch()->default_value(false),
              "Append the error log to HTTP responses")
             ("http-validate-host", boost::program_options::value<bool>()->default_value(true),
@@ -542,6 +583,7 @@ namespace eosio {
                      "http-threads ${num} must be greater than 0", ("num", my->thread_pool_size));
 
          my->max_bytes_in_flight = options.at( "http-max-bytes-in-flight-mb" ).as<uint32_t>() * 1024 * 1024;
+         my->max_response_time = fc::microseconds( options.at("http-max-response-time-ms").as<uint32_t>() * 1000 );
 
          //watch out for the returns above when adding new code here
       } FC_LOG_AND_RETHROW()
diff --git a/plugins/mongo_db_plugin/mongo_db_plugin.cpp b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
index 3d65af55ccc..60cc44d47e3 100644
--- a/plugins/mongo_db_plugin/mongo_db_plugin.cpp
+++ b/plugins/mongo_db_plugin/mongo_db_plugin.cpp
@@ -763,7 +763,9 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
       trans_doc.append( bsoncxx::builder::concatenate_doc{trx_value.view()} );
    } catch( bsoncxx::exception& e) {
       elog( "Unable to convert transaction to BSON: ${e}", ("e", e.what()) );
-      elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
+      try {
+         elog( "  JSON: ${j}", ("j", fc::json::to_string( v, fc::time_point::now() + fc::exception::format_time_limit )) );
+      } catch(...) {}
    }
 
    fc::variant signing_keys;
@@ -785,7 +787,9 @@ void mongo_db_plugin_impl::_process_accepted_transaction( const chain::transacti
          trans_doc.append( kvp( "signing_keys", keys_value.extract_array() ) );
       } catch( bsoncxx::exception& e ) {
          elog( "Unable to convert signing keys to BSON: ${e}", ("e", e.what()) );
-         elog( "  JSON: ${j}", ("j", fc::json::to_string(signing_keys)) );
+         try {
+            elog( "  JSON: ${j}", ("j", fc::json::to_string( signing_keys, fc::time_point::now() + fc::exception::format_time_limit )) );
+         } catch(...) {}
       }
    }
 
@@ -835,7 +839,9 @@ mongo_db_plugin_impl::add_action_trace( mongocxx::bulk_write& bulk_action_traces
          action_traces_doc.append( bsoncxx::builder::concatenate_doc{to_bson( v )} );
       } catch( bsoncxx::exception& e ) {
          elog( "Unable to convert action trace to BSON: ${e}", ("e", e.what()) );
-         elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
+         try {
+            elog( "  JSON: ${j}", ("j", fc::json::to_string( v, fc::time_point::now() + fc::exception::format_time_limit )) );
+         } catch(...) {}
       }
       if( t->receipt.valid() ) {
          action_traces_doc.append( kvp( "trx_status", std::string( t->receipt->status ) ) );
@@ -886,7 +892,9 @@ void mongo_db_plugin_impl::_process_applied_transaction( const chain::transactio
             trans_traces_doc.append( bsoncxx::builder::concatenate_doc{to_bson( v )} );
          } catch( bsoncxx::exception& e ) {
             elog( "Unable to convert transaction to BSON: ${e}", ("e", e.what()) );
-            elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
+            try {
+               elog( "  JSON: ${j}", ("j", fc::json::to_string( v, fc::time_point::now() + fc::exception::format_time_limit )) );
+            } catch(...) {}
          }
          trans_traces_doc.append( kvp( "createdAt", b_date{now} ) );
 
@@ -895,7 +903,7 @@ void mongo_db_plugin_impl::_process_applied_transaction( const chain::transactio
                EOS_ASSERT( false, chain::mongo_db_insert_fail, "Failed to insert trans ${id}", ("id", t->id) );
             }
          } catch( ... ) {
-            handle_mongo_exception( "trans_traces insert: " + fc::json::to_string( v ), __LINE__ );
+            handle_mongo_exception( "trans_traces insert: " + t->id.str(), __LINE__ );
          }
       } catch( ... ) {
          handle_mongo_exception( "trans_traces serialization: " + t->id.str(), __LINE__ );
@@ -946,7 +954,9 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
          block_state_doc.append( kvp( "block_header_state", to_bson( fc::variant(bhs) ) ) );
       } catch( bsoncxx::exception& e ) {
          elog( "Unable to convert block_header_state to BSON: ${e}", ("e", e.what()) );
-         elog( "  JSON: ${j}", ("j", fc::json::to_string( bhs )) );
+         try {
+            elog( "  JSON: ${j}", ("j", fc::json::to_string( bhs, fc::time_point::now() + fc::exception::format_time_limit )) );
+         } catch(...) {}
       }
       block_state_doc.append( kvp( "createdAt", b_date{now} ) );
 
@@ -963,7 +973,7 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
             }
          }
       } catch( ... ) {
-         handle_mongo_exception( "block_states insert: " + fc::json::to_string( bhs ), __LINE__ );
+         handle_mongo_exception( "block_states insert: " + block_id_str, __LINE__ );
       }
    }
 
@@ -977,7 +987,9 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
          block_doc.append( kvp( "block", to_bson( v ) ) );
       } catch( bsoncxx::exception& e ) {
          elog( "Unable to convert block to BSON: ${e}", ("e", e.what()) );
-         elog( "  JSON: ${j}", ("j", fc::json::to_string( v )) );
+         try {
+            elog( "  JSON: ${j}", ("j", fc::json::to_string( v, fc::time_point::now() + fc::exception::format_time_limit )) );
+         } catch(...) {}
       }
       block_doc.append( kvp( "createdAt", b_date{now} ) );
 
@@ -994,7 +1006,7 @@ void mongo_db_plugin_impl::_process_accepted_block( const chain::block_state_ptr
             }
          }
       } catch( ... ) {
-         handle_mongo_exception( "blocks insert: " + fc::json::to_string( v ), __LINE__ );
+         handle_mongo_exception( "blocks insert: " + block_id_str, __LINE__ );
       }
    }
 }
@@ -1287,7 +1299,9 @@ void mongo_db_plugin_impl::update_account(const chain::action& act)
                }
             } catch( bsoncxx::exception& e ) {
                elog( "Unable to convert abi JSON to BSON: ${e}", ("e", e.what()));
-               elog( "  JSON: ${j}", ("j", fc::json::to_string( v )));
+               try {
+                  elog( "  JSON: ${j}", ("j", fc::json::to_string( v, fc::time_point::now() + fc::exception::format_time_limit )) );
+               } catch(...) {}
             }
          }
       }
diff --git a/programs/cleos/help_text.cpp.in b/programs/cleos/help_text.cpp.in
index 75a60800977..5b8ee07d493 100644
--- a/programs/cleos/help_text.cpp.in
+++ b/programs/cleos/help_text.cpp.in
@@ -285,7 +285,7 @@ bool print_recognized_errors(const fc::exception& e, const bool verbose_errors)
             explanation += "\n" + localized_with_variant(log.get_format().data(), log.get_data());
          } else if (log.get_data().size() > 0 && verbose_errors) {
             // Show data-only log only if verbose_errors option is enabled
-            explanation += "\n" + fc::json::to_string(log.get_data());
+            explanation += "\n" + fc::json::to_string(log.get_data(), fc::time_point::maximum());
          }
          // Check if there's stack trace to be added
          if (!log.get_context().get_method().empty() && verbose_errors) {
diff --git a/programs/cleos/httpc.cpp b/programs/cleos/httpc.cpp
index 7d9326b9ed7..96cc13975c3 100644
--- a/programs/cleos/httpc.cpp
+++ b/programs/cleos/httpc.cpp
@@ -189,7 +189,7 @@ namespace eosio { namespace client { namespace http {
                              bool print_response ) {
    std::string postjson;
    if( !postdata.is_null() ) {
-      postjson = print_request ? fc::json::to_pretty_string( postdata ) : fc::json::to_string( postdata );
+      postjson = print_request ? fc::json::to_pretty_string( postdata ) : fc::json::to_string( postdata, fc::time_point::maximum() );
    }
 
    const auto& url = cp.url;
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index 51a1a092e16..0c827426af1 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -368,7 +368,7 @@ void print_action( const fc::variant& at ) {
    const auto& act = at["act"].get_object();
    auto code = act["account"].as_string();
    auto func = act["name"].as_string();
-   auto args = fc::json::to_string( act["data"] );
+   auto args = fc::json::to_string( act["data"], fc::time_point::maximum() );
    auto console = at["console"].as_string();
 
    /*
@@ -689,7 +689,8 @@ authority parse_json_authority(const std::string& authorityJsonOrFile) {
    fc::variant authority_var = json_from_file_or_string(authorityJsonOrFile);
    try {
       return authority_var.as<authority>();
-   } EOS_RETHROW_EXCEPTIONS(authority_type_exception, "Invalid authority format '${data}'", ("data", fc::json::to_string(authority_var)))
+   } EOS_RETHROW_EXCEPTIONS(authority_type_exception, "Invalid authority format '${data}'",
+                            ("data", fc::json::to_string(authority_var, fc::time_point::maximum())))
 }
 
 authority parse_json_authority_or_key(const std::string& authorityJsonOrFile) {
@@ -1334,7 +1335,7 @@ struct get_schedule_subcommand {
             static_assert( std::is_same<decltype(a), static_variant<block_signing_authority_v0>>::value,
                            "Updates maybe needed if block_signing_authority changes" );
             block_signing_authority_v0 auth = a.get<block_signing_authority_v0>();
-            printf( "%s\n", fc::json::to_string( auth ).c_str() );
+            printf( "%s\n", fc::json::to_string( auth, fc::time_point::maximum() ).c_str() );
          }
       }
       printf("\n");
@@ -2478,7 +2479,8 @@ int main( int argc, char** argv ) {
          signed_transaction trx;
          try {
             abi_serializer::from_variant( trx_var, trx, abi_serializer_resolver, abi_serializer_max_time );
-         } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid transaction format: '${data}'", ("data", fc::json::to_string(trx_var)))
+         } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid transaction format: '${data}'",
+                                   ("data", fc::json::to_string(trx_var, fc::time_point::maximum())))
          std::cout << fc::json::to_pretty_string( packed_transaction( trx, packed_transaction::compression_type::none )) << std::endl;
       } else {
          try {
@@ -2499,7 +2501,8 @@ int main( int argc, char** argv ) {
       packed_transaction packed_trx;
       try {
          fc::from_variant<packed_transaction>( packed_trx_var, packed_trx );
-      } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid packed transaction format: '${data}'", ("data", fc::json::to_string(packed_trx_var)))
+      } EOS_RETHROW_EXCEPTIONS( transaction_type_exception, "Invalid packed transaction format: '${data}'",
+                                ("data", fc::json::to_string(packed_trx_var, fc::time_point::maximum())))
       signed_transaction strx = packed_trx.get_signed_transaction();
       fc::variant trx_var;
       if( unpack_action_data_flag ) {
@@ -2868,7 +2871,7 @@ int main( int argc, char** argv ) {
                   args = fc::json::to_pretty_string( act["data"] );
               }
               else {
-                 args = fc::json::to_string( act["data"] );
+                 args = fc::json::to_string( act["data"], fc::time_point::maximum() );
                  if( !fullact ) {
                     args = args.substr(0,60) + "...";
                  }
@@ -3380,7 +3383,8 @@ int main( int argc, char** argv ) {
       signed_transaction trx;
       try {
         trx = trx_var.as<signed_transaction>();
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'", ("data", fc::json::to_string(trx_var)))
+      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'",
+                               ("data", fc::json::to_string(trx_var, fc::time_point::maximum())))
 
       fc::optional<chain_id_type> chain_id;
 
@@ -3521,7 +3525,8 @@ int main( int argc, char** argv ) {
       transaction proposed_trx;
       try {
          proposed_trx = trx_var.as<transaction>();
-      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'", ("data", fc::json::to_string(trx_var)))
+      } EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'",
+                               ("data", fc::json::to_string(trx_var, fc::time_point::maximum())))
       bytes proposed_trx_serialized = variant_to_bin( name(proposed_contract), name(proposed_action), trx_var );
 
       vector<permission_level> reqperm;
diff --git a/programs/eosio-blocklog/main.cpp b/programs/eosio-blocklog/main.cpp
index bbe368cc96f..0220a2f23cb 100644
--- a/programs/eosio-blocklog/main.cpp
+++ b/programs/eosio-blocklog/main.cpp
@@ -134,7 +134,7 @@ void blocklog::read_log() {
                  (pretty_output.get_object());
       fc::variant v(std::move(enhanced_object));
       if (no_pretty_print)
-         fc::json::to_stream(*out, v, fc::json::stringify_large_ints_and_doubles);
+         fc::json::to_stream(*out, v, fc::time_point::maximum(), fc::json::stringify_large_ints_and_doubles);
       else
          *out << fc::json::to_pretty_string(v) << "\n";
    };
diff --git a/programs/eosio-launcher/main.cpp b/programs/eosio-launcher/main.cpp
index ba16ebf24c2..74e3ac3340d 100644
--- a/programs/eosio-launcher/main.cpp
+++ b/programs/eosio-launcher/main.cpp
@@ -1194,7 +1194,7 @@ launcher_def::write_logging_config_file(tn_node_def &node) {
   if( gelf_enabled ) pp.appenders.push_back( "net" );
   log_config.loggers.emplace_back( pp );
 
-  auto str = fc::json::to_pretty_string( log_config, fc::json::stringify_large_ints_and_doubles );
+  auto str = fc::json::to_pretty_string( log_config, fc::time_point::maximum(), fc::json::stringify_large_ints_and_doubles );
   cfg.write( str.c_str(), str.size() );
   cfg.close();
 }
@@ -1244,7 +1244,7 @@ launcher_def::write_setprods_file() {
       if (p.producer_name != "eosio")
          no_bios.schedule.push_back(p);
    }
-  auto str = fc::json::to_pretty_string( no_bios, fc::json::stringify_large_ints_and_doubles );
+  auto str = fc::json::to_pretty_string( no_bios, fc::time_point::maximum(), fc::json::stringify_large_ints_and_doubles );
   psfile.write( str.c_str(), str.size() );
   psfile.close();
 }
diff --git a/tests/Cluster.py b/tests/Cluster.py
index c9009e29041..4102e3343f9 100644
--- a/tests/Cluster.py
+++ b/tests/Cluster.py
@@ -220,7 +220,7 @@ def launch(self, pnodes=1, unstartedNodes=0, totalNodes=1, prodCount=1, topo="me
         if self.staging:
             cmdArr.append("--nogen")
 
-        nodeosArgs="--max-transaction-time -1 --abi-serializer-max-time-ms 990000 --filter-on \"*\" --p2p-max-nodes-per-host %d" % (totalNodes)
+        nodeosArgs="--max-transaction-time -1 --http-max-response-time-ms 9999 --abi-serializer-max-time-ms 990000 --filter-on \"*\" --p2p-max-nodes-per-host %d" % (totalNodes)
         if not self.walletd:
             nodeosArgs += " --plugin eosio::wallet_api_plugin"
         if self.enableMongo:
diff --git a/tests/Node.py b/tests/Node.py
index da76bb68f96..49251710d4b 100644
--- a/tests/Node.py
+++ b/tests/Node.py
@@ -921,7 +921,7 @@ def publishContract(self, account, contractDir, wasmFile, abiFile, waitForTransB
             if not shouldFail:
                 end=time.perf_counter()
                 msg=ex.output.decode("utf-8")
-                Utils.Print("ERROR: Exception during code hash retrieval.  cmd Duration: %.3f sec.  %s" % (end-start, msg))
+                Utils.Print("ERROR: Exception during set contract.  cmd Duration: %.3f sec.  %s" % (end-start, msg))
                 return None
             else:
                 retMap={}
diff --git a/unittests/abi_tests.cpp b/unittests/abi_tests.cpp
index c039882d294..9c7a2b2d6ed 100644
--- a/unittests/abi_tests.cpp
+++ b/unittests/abi_tests.cpp
@@ -35,7 +35,7 @@ fc::variant verify_byte_round_trip_conversion( const abi_serializer& abis, const
 
    auto var2 = abis.binary_to_variant(type, bytes, max_serialization_time);
 
-   std::string r = fc::json::to_string(var2);
+   std::string r = fc::json::to_string(var2, fc::time_point::now() + max_serialization_time);
 
    auto bytes2 = abis.variant_to_binary(type, var2, max_serialization_time);
 
@@ -50,7 +50,7 @@ void verify_round_trip_conversion( const abi_serializer& abis, const type_name&
    auto bytes = abis.variant_to_binary(type, var, max_serialization_time);
    BOOST_REQUIRE_EQUAL(fc::to_hex(bytes), hex);
    auto var2 = abis.binary_to_variant(type, bytes, max_serialization_time);
-   BOOST_REQUIRE_EQUAL(fc::json::to_string(var2), expected_json);
+   BOOST_REQUIRE_EQUAL(fc::json::to_string(var2, fc::time_point::now() + max_serialization_time), expected_json);
    auto bytes2 = abis.variant_to_binary(type, var2, max_serialization_time);
    BOOST_REQUIRE_EQUAL(fc::to_hex(bytes2), hex);
 }
@@ -80,7 +80,7 @@ fc::variant verify_type_round_trip_conversion( const abi_serializer& abis, const
    fc::variant var2;
    abi_serializer::to_variant(obj, var2, get_resolver(), max_serialization_time);
 
-   std::string r = fc::json::to_string(var2);
+   std::string r = fc::json::to_string(var2, fc::time_point::now() + max_serialization_time);
 
 
    auto bytes2 = abis.variant_to_binary(type, var2, max_serialization_time);
diff --git a/unittests/wasm_tests.cpp b/unittests/wasm_tests.cpp
index 3eaa592e895..da482058b07 100644
--- a/unittests/wasm_tests.cpp
+++ b/unittests/wasm_tests.cpp
@@ -1047,7 +1047,7 @@ BOOST_FIXTURE_TEST_CASE(eosio_abi, TESTER) try {
    // see abi_serializer::to_abi()
    abi_serializer::to_variant(*result, pretty_output, get_resolver(), abi_serializer_max_time);
 
-   BOOST_TEST(fc::json::to_string(pretty_output).find("newaccount") != std::string::npos);
+   BOOST_TEST(fc::json::to_string(pretty_output, fc::time_point::now() + abi_serializer_max_time).find("newaccount") != std::string::npos);
 
    produce_block();
 } FC_LOG_AND_RETHROW()

From 42c0548999be4299e26b664bef3861eb1a712259 Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larry.kittinger@block.one>
Date: Fri, 10 Jan 2020 11:29:48 -0500
Subject: [PATCH 1646/1648] omnibus. Co-Authored-By:
 heifnerk@objectcomputing.com, steven.watanabe@block.one &
 larry.kittinger@block.one

---
 libraries/eos-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/eos-vm b/libraries/eos-vm
index 7109334f2fd..c5afecd4705 160000
--- a/libraries/eos-vm
+++ b/libraries/eos-vm
@@ -1 +1 @@
-Subproject commit 7109334f2fd055378003f29cad7c39f14367b162
+Subproject commit c5afecd4705317e28d97eb0d950dc50ea1bb58c7

From ba4276699243b38165b3463b2d23aaeb1eaf8174 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Fri, 10 Jan 2020 13:30:45 -0500
Subject: [PATCH 1647/1648] bump version to 2.0.0

---
 CMakeLists.txt                                  |  2 +-
 README.md                                       | 12 ++++++------
 docs/00_install/00_install-prebuilt-binaries.md | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e14500c8647..9a490f97988 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set( CXX_STANDARD_REQUIRED ON)
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX rc3)
+#set(VERSION_SUFFIX rc3)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")
diff --git a/README.md b/README.md
index 55618e46b26..652c195e26a 100644
--- a/README.md
+++ b/README.md
@@ -74,13 +74,13 @@ $ brew remove eosio
 
 #### Ubuntu 18.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc3/eosio_2.0.0-rc3-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_2.0.0-rc3-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0/eosio_2.0.0-1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-1-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc3/eosio_2.0.0-rc3-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_2.0.0-rc3-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0/eosio_2.0.0-1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-1-ubuntu-16.04_amd64.deb
 ```
 #### Ubuntu Package Uninstall
 ```sh
@@ -91,8 +91,8 @@ $ sudo apt remove eosio
 
 #### RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc3/eosio-2.0.0-rc3.el7.x86_64.rpm
-$ sudo yum install ./eosio-2.0.0-rc3.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0/eosio-2.0.0-1.el7.x86_64.rpm
+$ sudo yum install ./eosio-2.0.0-1.el7.x86_64.rpm
 ```
 #### RPM Package Uninstall
 ```sh
diff --git a/docs/00_install/00_install-prebuilt-binaries.md b/docs/00_install/00_install-prebuilt-binaries.md
index 206a9dd64f4..d2c9beb9208 100644
--- a/docs/00_install/00_install-prebuilt-binaries.md
+++ b/docs/00_install/00_install-prebuilt-binaries.md
@@ -25,13 +25,13 @@ $ brew remove eosio
 
 #### Ubuntu 18.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_2.0.0-rc2-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0/eosio_2.0.0-1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-1-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_2.0.0-rc2-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0/eosio_2.0.0-1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_2.0.0-1-ubuntu-16.04_amd64.deb
 ```
 #### Ubuntu Package Uninstall
 ```sh
@@ -42,8 +42,8 @@ $ sudo apt remove eosio
 
 #### RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v2.0.0-rc2/eosio-2.0.0-rc2.el7.x86_64.rpm
-$ sudo yum install ./eosio-2.0.0-rc2.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v2.0.0/eosio-2.0.0-1.el7.x86_64.rpm
+$ sudo yum install ./eosio-2.0.0-1.el7.x86_64.rpm
 ```
 #### RPM Package Uninstall
 ```sh

From d850f28fcfb1e82e9d5f45a69e9e3491b7b90c17 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Fri, 10 Jan 2020 15:25:15 -0500
Subject: [PATCH 1648/1648] fix discovery of openssl in tester cmake when
 OPENSSL_ROOT_DIR not set

---
 CMakeModules/EosioTester.cmake.in      | 6 ++++--
 CMakeModules/EosioTesterBuild.cmake.in | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
index 5a5c0e8da6c..988fd241095 100644
--- a/CMakeModules/EosioTester.cmake.in
+++ b/CMakeModules/EosioTester.cmake.in
@@ -65,8 +65,10 @@ find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PR
 find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
 find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
 find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
-find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH)
-find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH)
+get_filename_component(cryptodir @OPENSSL_CRYPTO_LIBRARY@ DIRECTORY)
+find_library(liboscrypto crypto "${cryptodir}" NO_DEFAULT_PATH)
+get_filename_component(ssldir @OPENSSL_SSL_LIBRARY@ DIRECTORY)
+find_library(libosssl ssl "${ssldir}" NO_DEFAULT_PATH)
 find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
 find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH)
 find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
index 524ba4afbcf..62704dcf78d 100644
--- a/CMakeModules/EosioTesterBuild.cmake.in
+++ b/CMakeModules/EosioTesterBuild.cmake.in
@@ -64,8 +64,10 @@ find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/P
 find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging NO_DEFAULT_PATH)
 find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime NO_DEFAULT_PATH)
 find_library(libsoftfloat softfloat @CMAKE_BINARY_DIR@/libraries/softfloat NO_DEFAULT_PATH)
-find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH)
-find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH)
+get_filename_component(cryptodir @OPENSSL_CRYPTO_LIBRARY@ DIRECTORY)
+find_library(liboscrypto crypto "${cryptodir}" NO_DEFAULT_PATH)
+get_filename_component(ssldir @OPENSSL_SSL_LIBRARY@ DIRECTORY)
+find_library(libosssl ssl "${ssldir}" NO_DEFAULT_PATH)
 find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase NO_DEFAULT_PATH)
 find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins NO_DEFAULT_PATH)
 find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir